From 1bc71e8b655f2f02b3e3a0af34c7cad12b9cb83d Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Fri, 12 Apr 2019 09:38:03 -0700 Subject: [PATCH] v3d: Only look up the 3rd texture gather offset for non-arrays. Fixes assertion failures in the CTS since Karol's cleanup when NIR started noticing that we were reading an invalid component. Fixes: 5450f1c9fb09 ("v3d: prefer using nir_src_comp_as_int over nir_src_as_const_value") --- src/broadcom/compiler/v3d40_tex.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/broadcom/compiler/v3d40_tex.c b/src/broadcom/compiler/v3d40_tex.c index 3bed32d839f..679f1f15f81 100644 --- a/src/broadcom/compiler/v3d40_tex.c +++ b/src/broadcom/compiler/v3d40_tex.c @@ -142,7 +142,7 @@ v3d40_vir_emit_tex(struct v3d_compile *c, nir_tex_instr *instr) if (instr->coord_components >= 2) p2_unpacked.offset_t = nir_src_comp_as_int(instr->src[i].src, 1); - if (instr->coord_components >= 3) + if (non_array_components >= 3) p2_unpacked.offset_r = nir_src_comp_as_int(instr->src[i].src, 2); } else { -- 2.30.2