Module: Mesa Branch: main Commit: 22ef66bcc96d14c70a501e36f50f01e71d84b430 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=22ef66bcc96d14c70a501e36f50f01e71d84b430
Author: Iago Toral Quiroga <[email protected]> Date: Wed Jan 11 09:31:06 2023 +0100 v3d/compiler: remove unused sample_coverage field from fs key. Reviewed-by: Alejandro Piñeiro <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/20634> --- src/broadcom/compiler/v3d_compiler.h | 1 - src/broadcom/vulkan/v3dv_pipeline.c | 10 ++-------- src/broadcom/vulkan/v3dv_private.h | 1 - src/gallium/drivers/v3d/v3d_program.c | 2 -- 4 files changed, 2 insertions(+), 12 deletions(-) diff --git a/src/broadcom/compiler/v3d_compiler.h b/src/broadcom/compiler/v3d_compiler.h index 3ec9ec4e5c6..6817237e626 100644 --- a/src/broadcom/compiler/v3d_compiler.h +++ b/src/broadcom/compiler/v3d_compiler.h @@ -418,7 +418,6 @@ struct v3d_fs_key { bool line_smoothing; bool point_coord_upper_left; bool msaa; - bool sample_coverage; bool sample_alpha_to_coverage; bool sample_alpha_to_one; /* Mask of which color render targets are present. */ diff --git a/src/broadcom/vulkan/v3dv_pipeline.c b/src/broadcom/vulkan/v3dv_pipeline.c index 54f40942a3f..e5bf665e8eb 100644 --- a/src/broadcom/vulkan/v3dv_pipeline.c +++ b/src/broadcom/vulkan/v3dv_pipeline.c @@ -1081,11 +1081,8 @@ pipeline_populate_v3d_fs_key(struct v3d_fs_key *key, ms_info->rasterizationSamples == VK_SAMPLE_COUNT_4_BIT); key->msaa = ms_info->rasterizationSamples > VK_SAMPLE_COUNT_1_BIT; - if (key->msaa) { - key->sample_coverage = - p_stage->pipeline->sample_mask != (1 << V3D_MAX_SAMPLES) - 1; + if (key->msaa) key->sample_alpha_to_coverage = ms_info->alphaToCoverageEnable; - } key->sample_alpha_to_one = ms_info->alphaToOneEnable; } @@ -1901,11 +1898,8 @@ pipeline_populate_graphics_key(struct v3dv_pipeline *pipeline, ms_info->rasterizationSamples == VK_SAMPLE_COUNT_4_BIT); key->msaa = ms_info->rasterizationSamples > VK_SAMPLE_COUNT_1_BIT; - if (key->msaa) { - key->sample_coverage = - pipeline->sample_mask != (1 << V3D_MAX_SAMPLES) - 1; + if (key->msaa) key->sample_alpha_to_coverage = ms_info->alphaToCoverageEnable; - } key->sample_alpha_to_one = ms_info->alphaToOneEnable; } diff --git a/src/broadcom/vulkan/v3dv_private.h b/src/broadcom/vulkan/v3dv_private.h index e4d23c8decd..a241ce6e62f 100644 --- a/src/broadcom/vulkan/v3dv_private.h +++ b/src/broadcom/vulkan/v3dv_private.h @@ -316,7 +316,6 @@ struct v3dv_pipeline_key { uint8_t topology; uint8_t logicop_func; bool msaa; - bool sample_coverage; bool sample_alpha_to_coverage; bool sample_alpha_to_one; uint8_t cbufs; diff --git a/src/gallium/drivers/v3d/v3d_program.c b/src/gallium/drivers/v3d/v3d_program.c index e017dc72b03..d10c89c69da 100644 --- a/src/gallium/drivers/v3d/v3d_program.c +++ b/src/gallium/drivers/v3d/v3d_program.c @@ -573,8 +573,6 @@ v3d_update_compiled_fs(struct v3d_context *v3d, uint8_t prim_mode) } if (job->msaa) { key->msaa = v3d->rasterizer->base.multisample; - key->sample_coverage = (v3d->rasterizer->base.multisample && - v3d->sample_mask != (1 << V3D_MAX_SAMPLES) - 1); key->sample_alpha_to_coverage = v3d->blend->base.alpha_to_coverage; key->sample_alpha_to_one = v3d->blend->base.alpha_to_one; }
