From 4c8bca5afbd1aee9960c85b42dedbd2d35ce53cd Mon Sep 17 00:00:00 2001 From: Iago Toral Quiroga Date: Wed, 11 Jan 2023 09:08:11 +0100 Subject: [PATCH] v3dv: fix alpha-to-one for single sample setup MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit In Vulkan this is expected to work with single sample scenarios too. Fixes new test in CTS main: dEQP-VK.pipeline.monolithic.multisample.alpha_to_one.samples_1 cc: mesa-stable Reviewed-by: Alejandro Piñeiro Part-of: (cherry picked from commit 09782e5e6d5cc0a44b907544f55bdaebbb4feb84) --- .pick_status.json | 2 +- src/broadcom/vulkan/v3dv_pipeline.c | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 614ba84..23f634c 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -49,7 +49,7 @@ "description": "v3dv: fix alpha-to-one for single sample setup", "nominated": true, "nomination_type": 0, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": null }, diff --git a/src/broadcom/vulkan/v3dv_pipeline.c b/src/broadcom/vulkan/v3dv_pipeline.c index a78f209..b19fd93 100644 --- a/src/broadcom/vulkan/v3dv_pipeline.c +++ b/src/broadcom/vulkan/v3dv_pipeline.c @@ -1085,8 +1085,9 @@ pipeline_populate_v3d_fs_key(struct v3d_fs_key *key, key->sample_coverage = p_stage->pipeline->sample_mask != (1 << V3D_MAX_SAMPLES) - 1; key->sample_alpha_to_coverage = ms_info->alphaToCoverageEnable; - key->sample_alpha_to_one = ms_info->alphaToOneEnable; } + + key->sample_alpha_to_one = ms_info->alphaToOneEnable; } /* This is intended for V3D versions before 4.1, otherwise we just use the @@ -1904,8 +1905,9 @@ pipeline_populate_graphics_key(struct v3dv_pipeline *pipeline, key->sample_coverage = pipeline->sample_mask != (1 << V3D_MAX_SAMPLES) - 1; key->sample_alpha_to_coverage = ms_info->alphaToCoverageEnable; - key->sample_alpha_to_one = ms_info->alphaToOneEnable; } + + key->sample_alpha_to_one = ms_info->alphaToOneEnable; } const struct v3dv_render_pass *pass = -- 2.7.4