Mesa (master): freedreno/ir3: shadow comes before array

[Rob Clark]

Module: Mesa
Branch: master
Commit: 5bba74c64b30390114c105d58792301a222b0cdc
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=5bba74c64b30390114c105d58792301a222b0cdc

Author: Ilia Mirkin <imirkin at alum.mit.edu>
Date:   Tue Sep 30 20:02:37 2014 -0400

freedreno/ir3: shadow comes before array

Experimentally, this makes *ArrayShadow tex-miplevel-selection tests
pass.

Signed-off-by: Ilia Mirkin <imirkin at alum.mit.edu>

---

 src/gallium/drivers/freedreno/ir3/ir3_compiler.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/gallium/drivers/freedreno/ir3/ir3_compiler.c b/src/gallium/drivers/freedreno/ir3/ir3_compiler.c
index ba6afa4..38ac22a 100644
--- a/src/gallium/drivers/freedreno/ir3/ir3_compiler.c
+++ b/src/gallium/drivers/freedreno/ir3/ir3_compiler.c
@@ -1170,10 +1170,10 @@ fill_tex_info(struct ir3_compile_context *ctx,
 		info->order[arg] = pos++;
 	if (tgt->dims == 1)
 		info->order[pos++] = -1;
+	if (tgt->shadow)
+		info->order[pos++] = MAX2(arg + tgt->array, 2);
 	if (tgt->array)
 		info->order[pos++] = arg++;
-	if (tgt->shadow)
-		info->order[pos++] = MAX2(arg, 2);
 	if (info->flags & IR3_INSTR_P)
 		info->order[pos++] = 3;