From: Kristian H. Kristensen <hoegsberg@google.com>
Date: Fri, 11 Oct 2019 19:34:54 +0000 (-0700)
Subject: freedreno/ir3: Pre-color GS header and primitive ID
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=c347708bea00907de3f290090e7769c72a12a15a;p=mesa.git

freedreno/ir3: Pre-color GS header and primitive ID

These sysvals have to be unclobbered by VS and in the same registers
in both VS and GS, since the chsh from VS to GS doesn't reload the
values. We use the pre-color argument to ir3_ra() to always place
these values in r0.x and r0.y.

Signed-off-by: Kristian H. Kristensen <hoegsberg@google.com>
---

diff --git a/src/freedreno/ir3/ir3_compiler_nir.c b/src/freedreno/ir3/ir3_compiler_nir.c
index 1d51bb0aaec..1924b0a5493 100644
--- a/src/freedreno/ir3/ir3_compiler_nir.c
+++ b/src/freedreno/ir3/ir3_compiler_nir.c
@@ -3172,6 +3172,15 @@ ir3_compile_shader_nir(struct ir3_compiler *compiler,
 		}
 
 		ret = ir3_ra(so, ir->inputs, ir->ninputs);
+	} else if (ctx->gs_header) {
+		/* We need to have these values in the same registers between VS and GS
+		 * since the VS chains to GS and doesn't get the sysvals redelivered.
+		 */
+
+		ctx->gs_header->regs[0]->num = 0;
+		ctx->primitive_id->regs[0]->num = 1;
+		struct ir3_instruction *precolor[] = { ctx->gs_header, ctx->primitive_id };
+		ret = ir3_ra(so, precolor, ARRAY_SIZE(precolor));
 	} else {
 		ret = ir3_ra(so, NULL, 0);
 	}