radeonsi/nir: get correct type for images inside structs

Reviewed-by: Marek Olšák <marek.olsak@amd.com>

diff --git a/src/gallium/drivers/radeonsi/si_shader_nir.c b/src/gallium/drivers/radeonsi/si_shader_nir.c
index a1bc4cbd1aa9bad2fa30f3e1f87010aab28940c7..c89a1e6f91b2bb201b1af0a4a683be2988afd7d9 100644 (file)
--- a/src/gallium/drivers/radeonsi/si_shader_nir.c
+++ b/src/gallium/drivers/radeonsi/si_shader_nir.c
@@ -163,11 +163,12 @@ static void scan_instruction(struct tgsi_shader_info *info,
                        break;
                }
                case nir_intrinsic_image_deref_store: {
+                       const nir_deref_instr *image_deref = nir_instr_as_deref(intr->src[0].ssa->parent_instr);
                        nir_variable *var = intrinsic_get_var(intr);
                        if (var->data.bindless) {
                                info->uses_bindless_images = true;
 
-                               if (glsl_get_sampler_dim(var->type) == GLSL_SAMPLER_DIM_BUF)
+                               if (glsl_get_sampler_dim(image_deref->type) == GLSL_SAMPLER_DIM_BUF)
                                        info->uses_bindless_buffer_store = true;
                                else
                                        info->uses_bindless_image_store = true;