From: Kristian H. Kristensen <hoegsberg@google.com>
Date: Wed, 23 Oct 2019 03:21:13 +0000 (-0700)
Subject: freedreno/ir3: Don't assume binning shader is always VS
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=b12ebe3e8133f7d698a74d80a5b4f486089f5fda;p=mesa.git

freedreno/ir3: Don't assume binning shader is always VS

In tessellation mode, the TES is (probably) the binning shader.

Signed-off-by: Kristian H. Kristensen <hoegsberg@google.com>
Acked-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Rob Clark <robdclark@gmail.com>
---

diff --git a/src/freedreno/ir3/ir3_compiler_nir.c b/src/freedreno/ir3/ir3_compiler_nir.c
index f58f1a04b55..66b274d1787 100644
--- a/src/freedreno/ir3/ir3_compiler_nir.c
+++ b/src/freedreno/ir3/ir3_compiler_nir.c
@@ -3332,8 +3332,8 @@ ir3_compile_shader_nir(struct ir3_compiler *compiler,
 	 * need to make sure not to remove any inputs that are used by
 	 * the nonbinning VS.
 	 */
-	if (ctx->compiler->gpu_id >= 600 && so->binning_pass) {
-		debug_assert(so->type == MESA_SHADER_VERTEX);
+	if (ctx->compiler->gpu_id >= 600 && so->binning_pass &&
+			so->type == MESA_SHADER_VERTEX) {
 		for (int i = 0; i < ir->ninputs; i++) {
 			struct ir3_instruction *in = ir->inputs[i];