From 1e59dbf66b4f65d8eb711120427d321181f6b509 Mon Sep 17 00:00:00 2001 From: Dave Airlie Date: Fri, 9 Jan 2026 14:14:53 +1000 Subject: [PATCH] gallivm: swap 1d array coords before casting. This fixes a llvm validation error seen in dEQP-VK.robustness.robustness2.push.notemplate.rgba32f.dontunroll.nonvolatile.sampled_image.no_fmt_qual.img.samples_1.1d_array.rgen Cc: mesa-stable Reviewed-by: Georg Lehmann Part-of: --- src/gallium/auxiliary/gallivm/lp_bld_nir_soa.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/gallium/auxiliary/gallivm/lp_bld_nir_soa.c b/src/gallium/auxiliary/gallivm/lp_bld_nir_soa.c index 2b56a527cb0..8cb512021be 100644 --- a/src/gallium/auxiliary/gallivm/lp_bld_nir_soa.c +++ b/src/gallium/auxiliary/gallivm/lp_bld_nir_soa.c @@ -5535,6 +5535,12 @@ visit_tex(struct lp_build_nir_soa_context *bld, nir_tex_instr *instr) if (!sampler_resource) sampler_resource = texture_resource; + if (instr->is_array && instr->sampler_dim == GLSL_SAMPLER_DIM_1D) { + /* move layer coord for 1d arrays. */ + coords[2] = coords[1]; + coords[1] = coord_zero; + } + switch (instr->op) { case nir_texop_tex: case nir_texop_tg4: @@ -5554,12 +5560,6 @@ visit_tex(struct lp_build_nir_soa_context *bld, nir_tex_instr *instr) ; } - if (instr->is_array && instr->sampler_dim == GLSL_SAMPLER_DIM_1D) { - /* move layer coord for 1d arrays. */ - coords[2] = coords[1]; - coords[1] = coord_zero; - } - uint32_t samp_base_index = 0, tex_base_index = 0; if (!sampler_deref_instr) { int samp_src_index = nir_tex_instr_src_index(instr, nir_tex_src_sampler_handle);