From 8a4456348605fffd1e1b781f8e5a4e09ec74392c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Sch=C3=BCrmann?= Date: Fri, 8 Jul 2022 12:57:32 +0200 Subject: [PATCH] radv/shader_info: fix load_frag_coord and load_sample_pos read masks Fixes: a8c471f962e3a86f0cb6a91f14090b0c8cfb73ff ('radv: gather more information about PS in the shader info pass') Reviewed-by: Samuel Pitoiset Part-of: (cherry picked from commit 676700d660c8b5ead660b2c694fafde0a57c635d) --- .pick_status.json | 2 +- src/amd/vulkan/radv_shader_info.c | 4 ++-- src/gallium/drivers/zink/ci/zink-radv-fails.txt | 2 -- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 4bc0ebefb18..0954f025c5c 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -490,7 +490,7 @@ "description": "radv/shader_info: fix load_frag_coord and load_sample_pos read masks", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "a8c471f962e3a86f0cb6a91f14090b0c8cfb73ff" }, diff --git a/src/amd/vulkan/radv_shader_info.c b/src/amd/vulkan/radv_shader_info.c index f374ad29773..efb238fb5df 100644 --- a/src/amd/vulkan/radv_shader_info.c +++ b/src/amd/vulkan/radv_shader_info.c @@ -200,10 +200,10 @@ gather_intrinsic_info(const nir_shader *nir, const nir_intrinsic_instr *instr, info->ps.reads_front_face = true; break; case nir_intrinsic_load_frag_coord: - info->ps.reads_frag_coord_mask = nir_ssa_def_components_read(&instr->dest.ssa); + info->ps.reads_frag_coord_mask |= nir_ssa_def_components_read(&instr->dest.ssa); break; case nir_intrinsic_load_sample_pos: - info->ps.reads_sample_pos_mask = nir_ssa_def_components_read(&instr->dest.ssa); + info->ps.reads_sample_pos_mask |= nir_ssa_def_components_read(&instr->dest.ssa); break; case nir_intrinsic_load_view_index: info->uses_view_index = true; diff --git a/src/gallium/drivers/zink/ci/zink-radv-fails.txt b/src/gallium/drivers/zink/ci/zink-radv-fails.txt index 0a9b1707940..075ba5b6a5d 100644 --- a/src/gallium/drivers/zink/ci/zink-radv-fails.txt +++ b/src/gallium/drivers/zink/ci/zink-radv-fails.txt @@ -180,8 +180,6 @@ dEQP-GLES3.functional.fbo.depth.depth_write_clamp.depth_component32f,Fail dEQP-GLES3.functional.polygon_offset.fixed16_render_with_units,Fail dEQP-GLES3.functional.rasterization.primitives.line_loop_wide,Fail dEQP-GLES3.functional.rasterization.primitives.line_strip_wide,Fail -dEQP-GLES3.functional.shaders.metamorphic.bubblesort_flag.variant_1,Fail -dEQP-GLES3.functional.shaders.metamorphic.bubblesort_flag.variant_2,Fail dEQP-GLES3.functional.shaders.texture_functions.textureprojlodoffset.sampler2dshadow_vertex,Fail dEQP-GLES3.functional.shaders.texture_functions.textureprojoffset.sampler2dshadow_vertex,Fail