fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-07 09:18:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

vc4: Fix overzealous raddr conflict resolution.

Browse source 
We only need to do the fixup when both args are in the same file, not just
when both are in physical registers.
This commit is contained in:
Eric Anholt 2014-09-23 12:50:05 -07:00
parent 2e48b286bf
commit 3e5325e8c9
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/gallium/drivers/vc4/vc4_qpu_emit.c
View file

@ -79,12 +79,14 @@ static void
fixup_raddr_conflict(struct vc4_compile *c,
struct qpu_reg src0, struct qpu_reg *src1)
{
if ((src0.mux == QPU_MUX_A || src0.mux == QPU_MUX_B) &&
(src1->mux == QPU_MUX_A || src1->mux == QPU_MUX_B) &&
src0.addr != src1->addr) {
queue(c, qpu_a_MOV(qpu_r3(), *src1));
*src1 = qpu_r3();
if ((src0.mux != QPU_MUX_A && src0.mux != QPU_MUX_B) ||
src0.mux != src1->mux ||
src0.addr == src1->addr) {
return;
}
queue(c, qpu_a_MOV(qpu_r3(), *src1));
*src1 = qpu_r3();
}
static void