diff options
| author | Ilia Mirkin <imirkin@alum.mit.edu> | 2015-07-18 19:02:29 -0400 |
|---|---|---|
| committer | Emil Velikov <emil.l.velikov@gmail.com> | 2015-07-22 17:09:40 +0100 |
| commit | 2a77b82a92494d91e90b516ad5fed8e6e0a10a6b (patch) | |
| tree | fd16f23007a1939546e4ae72378c266cad6f4833 | |
| parent | 7efc693ef26c91c545c78f4b751432e43011b541 (diff) | |
gm107/ir: fix indirect txq emission
Signed-off-by: Ilia Mirkin <imirkin@alum.mit.edu>
Cc: mesa-stable@lists.freedesktop.org
(cherry picked from commit 8c8a71f0d125bb655b17a32914ffecf8d159593b)
| -rw-r--r-- | src/gallium/drivers/nouveau/codegen/nv50_ir_emit_gm107.cpp | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/gallium/drivers/nouveau/codegen/nv50_ir_emit_gm107.cpp b/src/gallium/drivers/nouveau/codegen/nv50_ir_emit_gm107.cpp index 22db368b371..689e2bbf50f 100644 --- a/src/gallium/drivers/nouveau/codegen/nv50_ir_emit_gm107.cpp +++ b/src/gallium/drivers/nouveau/codegen/nv50_ir_emit_gm107.cpp @@ -2437,8 +2437,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)); |