Mesa (10.6): gm107/ir: fix indirect txq emission
Emil Velikov
evelikov at kemper.freedesktop.org
Thu Jul 23 11:36:47 UTC 2015
Module: Mesa
Branch: 10.6
Commit: 2a77b82a92494d91e90b516ad5fed8e6e0a10a6b
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=2a77b82a92494d91e90b516ad5fed8e6e0a10a6b
Author: Ilia Mirkin <imirkin at alum.mit.edu>
Date: Sat Jul 18 19:02:29 2015 -0400
gm107/ir: fix indirect txq emission
Signed-off-by: Ilia Mirkin <imirkin at alum.mit.edu>
Cc: mesa-stable at lists.freedesktop.org
(cherry picked from commit 8c8a71f0d125bb655b17a32914ffecf8d159593b)
---
src/gallium/drivers/nouveau/codegen/nv50_ir_emit_gm107.cpp | 10 ++++++++--
1 file 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 22db368..689e2bb 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));
More information about the mesa-commit
mailing list