From 5b797bd48555ea70a4313d68e34a0899e568b30b Mon Sep 17 00:00:00 2001 From: Samuel Pitoiset Date: Mon, 18 Oct 2021 16:47:53 +0200 Subject: [PATCH] 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 Reviewed-by: Bas Nieuwenhuizen Part-of: --- src/amd/vulkan/radv_shader_info.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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);