radv: fix texel fetch offset with 2d arrays.

The code didn't limit the offsets to the number supplied, so
if we expected 3 but only got 2 we were accessing undefined memory.

This fixes random failures in:
dEQP-VK.glsl.texture_functions.texelfetchoffset.sampler2darray_*

Reviewed-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
Cc: "13.0" <mesa-stable@lists.freedesktop.org>
Signed-off-by: Dave Airlie <airlied@redhat.com>

diff --git a/src/amd/common/ac_nir_to_llvm.c b/src/amd/common/ac_nir_to_llvm.c
index 06645be..76d6d88 100644 (file)
--- a/src/amd/common/ac_nir_to_llvm.c
+++ b/src/amd/common/ac_nir_to_llvm.c
@@ -3601,12 +3601,13 @@ static void visit_tex(struct nir_to_llvm_context *ctx, nir_tex_instr *instr)
        if (offsets && instr->op == nir_texop_txf) {
                nir_const_value *const_offset =
                        nir_src_as_const_value(instr->src[const_src].src);
-
+               int num_offsets = instr->src[const_src].src.ssa->num_components;
                assert(const_offset);
-               if (instr->coord_components > 2)
+               num_offsets = MIN2(num_offsets, instr->coord_components);
+               if (num_offsets > 2)
                        address[2] = LLVMBuildAdd(ctx->builder,
                                                  address[2], LLVMConstInt(ctx->i32, const_offset->i32[2], false), "");
-               if (instr->coord_components > 1)
+               if (num_offsets > 1)
                        address[1] = LLVMBuildAdd(ctx->builder,
                                                  address[1], LLVMConstInt(ctx->i32, const_offset->i32[1], false), "");
                address[0] = LLVMBuildAdd(ctx->builder,