Mesa (staging/21.3): radv: fix OpImageQuerySamples with non-zero descriptor set

[GitLab Mirror]

Module: Mesa
Branch: staging/21.3
Commit: 65f091d54aebb9e25b34245926ce5582ef94cfb1
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=65f091d54aebb9e25b34245926ce5582ef94cfb1

Author: Samuel Pitoiset <samuel.pitoiset at gmail.com>
Date:   Mon Oct 18 16:47:53 2021 +0200

radv: fix OpImageQuerySamples with non-zero descriptor set

The descriptor set was always 0 because it wasn't gathered by the
shader info pass.

This fixes CPU crashes with
arb_shader_texture_image_samples-builtin-image and Zink.

Cc: 21.3 mesa-stable
Signed-off-by: Samuel Pitoiset <samuel.pitoiset at gmail.com>
Reviewed-by: Bas Nieuwenhuizen <bas at basnieuwenhuizen.nl>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/13411>
(cherry picked from commit 5b797bd48555ea70a4313d68e34a0899e568b30b)

---

 .pick_status.json                 | 2 +-
 src/amd/vulkan/radv_shader_info.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.pick_status.json b/.pick_status.json
index d6415968e3f..6b53e0ac7c8 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -94,7 +94,7 @@
         "description": "radv: fix OpImageQuerySamples with non-zero descriptor set",
         "nominated": true,
         "nomination_type": 0,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": null
     },
diff --git a/src/amd/vulkan/radv_shader_info.c b/src/amd/vulkan/radv_shader_info.c
index 40042e3b4fe..6fe4083839f 100644
--- a/src/amd/vulkan/radv_shader_info.c
+++ b/src/amd/vulkan/radv_shader_info.c
@@ -247,7 +247,8 @@ gather_intrinsic_info(const nir_shader *nir, const nir_intrinsic_instr *instr,
    case nir_intrinsic_image_deref_atomic_comp_swap:
    case nir_intrinsic_image_deref_atomic_fmin:
    case nir_intrinsic_image_deref_atomic_fmax:
-   case nir_intrinsic_image_deref_size: {
+   case nir_intrinsic_image_deref_size:
+   case nir_intrinsic_image_deref_samples: {
       nir_variable *var =
          nir_deref_instr_get_variable(nir_instr_as_deref(instr->src[0].ssa->parent_instr));
       mark_sampler_desc(var, info);