From: Alyssa Rosenzweig Date: Fri, 30 Aug 2019 18:01:15 +0000 (-0700) Subject: pan/midgard: Cleanup fragment writeout branch X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=76529836ecf53c977762283cf944a5c123c2b6db;p=mesa.git pan/midgard: Cleanup fragment writeout branch I'm not sure if this is strictly necessary but it makes debugging easier and minimizes the diff with the experimental scheduler. Signed-off-by: Alyssa Rosenzweig --- diff --git a/src/panfrost/midgard/midgard_compile.c b/src/panfrost/midgard/midgard_compile.c index 2223f92f1bd..8a0ac08803a 100644 --- a/src/panfrost/midgard/midgard_compile.c +++ b/src/panfrost/midgard/midgard_compile.c @@ -1416,13 +1416,14 @@ emit_fragment_store(compiler_context *ctx, unsigned src, unsigned rt) /* Next, generate the branch. For R render targets in the writeout, the * i'th render target jumps to pseudo-offset [2(R-1) + i] */ - unsigned offset = (2 * (ctx->nir->num_outputs - 1)) + rt; + unsigned outputs = ctx->is_blend ? 1 : ctx->nir->num_outputs; + unsigned offset = (2 * (outputs - 1)) + rt; struct midgard_instruction ins = v_alu_br_compact_cond(midgard_jmp_writeout_op_writeout, TAG_ALU_4, offset, midgard_condition_always); /* Add dependencies */ - ins.src[0] = move.dest; + ins.src[0] = src; ins.src[1] = rt_move.dest; /* Emit the branch */