From b12ebe3e8133f7d698a74d80a5b4f486089f5fda Mon Sep 17 00:00:00 2001 From: "Kristian H. Kristensen" Date: Tue, 22 Oct 2019 20:21:13 -0700 Subject: [PATCH] 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 Acked-by: Eric Anholt Reviewed-by: Rob Clark --- src/freedreno/ir3/ir3_compiler_nir.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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]; -- 2.30.2