From e106e0f2dd6d80554c70cbba32e8e196bf1186ec Mon Sep 17 00:00:00 2001 From: Timothy Arceri Date: Wed, 9 Jan 2019 14:53:52 +1100 Subject: [PATCH] radeonsi/nir: get correct type for images inside structs MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Reviewed-by: Marek Olšák --- src/gallium/drivers/radeonsi/si_shader_nir.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/gallium/drivers/radeonsi/si_shader_nir.c b/src/gallium/drivers/radeonsi/si_shader_nir.c index a1bc4cbd1aa..c89a1e6f91b 100644 --- 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; -- 2.30.2