summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIlia Mirkin <[email protected]>2015-04-30 02:01:22 -0400
committerIlia Mirkin <[email protected]>2015-04-30 02:02:47 -0400
commit33f0d1138d6ffa4596d3deda68fa5ba9a3d7cf86 (patch)
tree6c3af0674d30e8009345dd4ba7c6be17088e5e20
parentdb269ae495425849804fb1d05cfe42b0d3d304b3 (diff)
nvc0/ir: fix predicated PFETCH for real
Commit a9d08a250 accidentally didn't make use of the new src1 variable. Use it. Signed-off-by: Ilia Mirkin <[email protected]> Cc: [email protected]
-rw-r--r--src/gallium/drivers/nouveau/codegen/nv50_ir_emit_gk110.cpp2
-rw-r--r--src/gallium/drivers/nouveau/codegen/nv50_ir_emit_nvc0.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/gallium/drivers/nouveau/codegen/nv50_ir_emit_gk110.cpp b/src/gallium/drivers/nouveau/codegen/nv50_ir_emit_gk110.cpp
index a6e6c1fa120..6bb9620d5f7 100644
--- a/src/gallium/drivers/nouveau/codegen/nv50_ir_emit_gk110.cpp
+++ b/src/gallium/drivers/nouveau/codegen/nv50_ir_emit_gk110.cpp
@@ -1336,7 +1336,7 @@ CodeEmitterGK110::emitPFETCH(const Instruction *i)
const int src1 = (i->predSrc == 1) ? 2 : 1; // if predSrc == 1, !srcExists(2)
defId(i->def(0), 2);
- srcId(i, 1, 10);
+ srcId(i, src1, 10);
}
void
diff --git a/src/gallium/drivers/nouveau/codegen/nv50_ir_emit_nvc0.cpp b/src/gallium/drivers/nouveau/codegen/nv50_ir_emit_nvc0.cpp
index 4ad098eed50..d9aed34a0ce 100644
--- a/src/gallium/drivers/nouveau/codegen/nv50_ir_emit_nvc0.cpp
+++ b/src/gallium/drivers/nouveau/codegen/nv50_ir_emit_nvc0.cpp
@@ -1498,7 +1498,7 @@ CodeEmitterNVC0::emitPFETCH(const Instruction *i)
const int src1 = (i->predSrc == 1) ? 2 : 1; // if predSrc == 1, !srcExists(2)
defId(i->def(0), 14);
- srcId(i, 1, 20);
+ srcId(i, src1, 20);
}
void