projects / mesa.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: db269ae)
nvc0/ir: fix predicated PFETCH for real
authorIlia Mirkin <imirkin@alum.mit.edu>
Thu, 30 Apr 2015 06:01:22 +0000 (02:01 -0400)
committerIlia Mirkin <imirkin@alum.mit.edu>
Thu, 30 Apr 2015 06:02:47 +0000 (02:02 -0400)
Commit a9d08a250 accidentally didn't make use of the new src1 variable.
Use it.

Signed-off-by: Ilia Mirkin <imirkin@alum.mit.edu>
Cc: mesa-stable@lists.freedesktop.org
src/gallium/drivers/nouveau/codegen/nv50_ir_emit_gk110.cpp patch | blob | history
src/gallium/drivers/nouveau/codegen/nv50_ir_emit_nvc0.cpp patch | blob | history

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 a6e6c1fa120df727ce04bb74ce6cde7da01d7d38..6bb9620d5f728cb9475f0cf3e9d8f120305de017 100644 (file)
--- 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 4ad098eed50fb89fbad39daa64b65170a5d76a83..d9aed34a0cecf27c91d5708212f091bb0b8a389e 100644 (file)
--- 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