From 79be2cc383f45e3e1e36e1ab774f2a3ea268cad5 Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Tue, 16 Sep 2014 17:24:03 -0700 Subject: [PATCH] vc4: Make sure thread end doesn't have a uniform read. Prevents regression when I start doing copy propagation on uniforms. --- src/gallium/drivers/vc4/vc4_qpu_emit.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/gallium/drivers/vc4/vc4_qpu_emit.c b/src/gallium/drivers/vc4/vc4_qpu_emit.c index 6c4c76d3217..592fab90785 100644 --- a/src/gallium/drivers/vc4/vc4_qpu_emit.c +++ b/src/gallium/drivers/vc4/vc4_qpu_emit.c @@ -528,6 +528,14 @@ vc4_generate_code(struct vc4_compile *c) serialize_one_inst(c, qpu_NOP()); } + /* thread end can't have uniform read */ + if (QPU_GET_FIELD(c->qpu_insts[c->qpu_inst_count - 1], + QPU_RADDR_A) == QPU_R_UNIF || + QPU_GET_FIELD(c->qpu_insts[c->qpu_inst_count - 1], + QPU_RADDR_B) == QPU_R_UNIF) { + serialize_one_inst(c, qpu_NOP()); + } + c->qpu_insts[c->qpu_inst_count - 1] = qpu_set_sig(c->qpu_insts[c->qpu_inst_count - 1], QPU_SIG_PROG_END); -- 2.30.2