From: Ilia Mirkin <imirkin@alum.mit.edu>
Date: Wed, 1 Oct 2014 00:02:37 +0000 (-0400)
Subject: freedreno/ir3: shadow comes before array
X-Git-Tag: upstream/17.1.0~23002
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=5bba74c64b30390114c105d58792301a222b0cdc;p=platform%2Fupstream%2Fmesa.git

freedreno/ir3: shadow comes before array

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

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

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;