diff options
| author | Samuel Pitoiset <samuel.pitoiset@gmail.com> | 2016-04-26 18:12:59 +0200 |
|---|---|---|
| committer | Emil Velikov <emil.l.velikov@gmail.com> | 2016-05-05 11:47:52 +0100 |
| commit | 4a5f2332b2cda4557b356edea55ad267adf0f1b8 (patch) | |
| tree | ae852e807f76398a9512028e816d557c60cf2da1 /src/gallium/drivers/nouveau/codegen | |
| parent | de9cbb2eb68ded17b6fc1b52ca0591abc4b1f0e5 (diff) | |
nvc0/ir: fix wrong emission of (a OP b) OP c
The third source must be emitted at offset 49 instead of 17 and the
not modifier is at 52 instead of 20. If you look a bit above in
emitLogicOp() you will see that the dest is emitted at 17 which
confirms that src(2) is obviously wrong.
Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-by: Ilia Mirkin <imirkin@alum.mit.edu>
Cc: "11.1 11.2" <mesa-stable@lists.freedesktop.org>
(cherry picked from commit 3da8528846773e936850b51ae7d6287758c45b7b)
Diffstat (limited to 'src/gallium/drivers/nouveau/codegen')
| -rw-r--r-- | src/gallium/drivers/nouveau/codegen/nv50_ir_emit_nvc0.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
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 8d5cb216ae6..1e2f7a642a5 100644 --- a/src/gallium/drivers/nouveau/codegen/nv50_ir_emit_nvc0.cpp +++ b/src/gallium/drivers/nouveau/codegen/nv50_ir_emit_nvc0.cpp @@ -808,8 +808,8 @@ CodeEmitterNVC0::emitLogicOp(const Instruction *i, uint8_t subOp) // (a OP b) OP c if (i->predSrc != 2 && i->srcExists(2)) { code[1] |= subOp << 21; - srcId(i->src(2), 17); - if (i->src(2).mod == Modifier(NV50_IR_MOD_NOT)) code[0] |= 1 << 20; + srcId(i->src(2), 49); + if (i->src(2).mod == Modifier(NV50_IR_MOD_NOT)) code[1] |= 1 << 20; } else { code[1] |= 0x000e0000; } |