Mesa (main): radv/shader_info: fix load_frag_coord and load_sample_pos read masks

[GitLab Mirror]

Module: Mesa
Branch: main
Commit: 676700d660c8b5ead660b2c694fafde0a57c635d
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=676700d660c8b5ead660b2c694fafde0a57c635d

Author: Daniel Schürmann <daniel at schuermann.dev>
Date:   Fri Jul  8 12:57:32 2022 +0200

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 <samuel.pitoiset at gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17417>

---

 src/amd/vulkan/radv_shader_info.c               | 4 ++--
 src/gallium/drivers/zink/ci/zink-radv-fails.txt | 2 --
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/amd/vulkan/radv_shader_info.c b/src/amd/vulkan/radv_shader_info.c
index 38f346b86e6..61317c88cbd 100644
--- a/src/amd/vulkan/radv_shader_info.c
+++ b/src/amd/vulkan/radv_shader_info.c
@@ -158,10 +158,10 @@ gather_intrinsic_info(const nir_shader *nir, const nir_intrinsic_instr *instr,
       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_push_constant:
       gather_push_constant_info(nir, instr, info);
diff --git a/src/gallium/drivers/zink/ci/zink-radv-fails.txt b/src/gallium/drivers/zink/ci/zink-radv-fails.txt
index 18bf7c23a96..a52a95bea25 100644
--- a/src/gallium/drivers/zink/ci/zink-radv-fails.txt
+++ b/src/gallium/drivers/zink/ci/zink-radv-fails.txt
@@ -27,8 +27,6 @@ dEQP-GLES3.functional.clipping.point.wide_point_clip_viewport_center,Fail
 dEQP-GLES3.functional.clipping.point.wide_point_clip_viewport_corner,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