gm107/ir: fix indirect txq emission
authorIlia Mirkin <imirkin@alum.mit.edu>
Sat, 18 Jul 2015 23:02:29 +0000 (19:02 -0400)
committerIlia Mirkin <imirkin@alum.mit.edu>
Sat, 18 Jul 2015 23:03:07 +0000 (19:03 -0400)
Signed-off-by: Ilia Mirkin <imirkin@alum.mit.edu>
Cc: mesa-stable@lists.freedesktop.org
src/gallium/drivers/nouveau/codegen/nv50_ir_emit_gm107.cpp

index 399a6f1db13496d77715c4345f9773192c74e05b..65c1f23e1013ea583e1e107c12f340b8f803304b 100644 (file)
@@ -2441,8 +2441,14 @@ CodeEmitterGM107::emitTXQ()
       break;
    }
 
-   emitInsn (0xdf4a0000);
-   emitField(0x24, 13, insn->tex.r);
+   if (insn->tex.rIndirectSrc >= 0) {
+      emitInsn (0xdf500000);
+   } else {
+      emitInsn (0xdf480000);
+      emitField(0x24, 13, insn->tex.r);
+   }
+
+   emitField(0x31, 1, insn->tex.liveOnly);
    emitField(0x1f, 4, insn->tex.mask);
    emitField(0x16, 6, type);
    emitGPR  (0x08, insn->src(0));