Mesa (master): nvc0/ir/emit: fix emitTXQ 2nd src

Christoph Bumiller chrisbmr at kemper.freedesktop.org
Sun Apr 29 16:06:51 UTC 2012


Module: Mesa
Branch: master
Commit: d9baa004ea814bef70c8c90b342aca2ad992415c
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=d9baa004ea814bef70c8c90b342aca2ad992415c

Author: Christoph Bumiller <e0425955 at student.tuwien.ac.at>
Date:   Sat Apr 28 18:04:05 2012 +0200

nvc0/ir/emit: fix emitTXQ 2nd src

---

 .../drivers/nvc0/codegen/nv50_ir_emit_nvc0.cpp     |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/src/gallium/drivers/nvc0/codegen/nv50_ir_emit_nvc0.cpp b/src/gallium/drivers/nvc0/codegen/nv50_ir_emit_nvc0.cpp
index 912540d..48d99bf 100644
--- a/src/gallium/drivers/nvc0/codegen/nv50_ir_emit_nvc0.cpp
+++ b/src/gallium/drivers/nvc0/codegen/nv50_ir_emit_nvc0.cpp
@@ -1063,9 +1063,11 @@ CodeEmitterNVC0::emitTXQ(const TexInstruction *i)
    if (i->tex.sIndirectSrc >= 0 || i->tex.rIndirectSrc >= 0)
       code[1] |= 1 << 18;
 
+   const int src1 = (i->predSrc == 1) ? 2 : 1; // if predSrc == 1, !srcExists(2)
+
    defId(i->def(0), 14);
    srcId(i->src(0), 20);
-   srcId(i->src(1), 26);
+   srcId(i, src1, 26);
 
    emitPredicate(i);
 }




More information about the mesa-commit mailing list