From 3da8528846773e936850b51ae7d6287758c45b7b Mon Sep 17 00:00:00 2001 From: Samuel Pitoiset Date: Tue, 26 Apr 2016 18:12:59 +0200 Subject: [PATCH] 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 Reviewed-by: Ilia Mirkin Cc: "11.1 11.2" --- src/gallium/drivers/nouveau/codegen/nv50_ir_emit_nvc0.cpp | 4 ++-- 1 file 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 d61109f0040..6a795e71359 100644 --- a/src/gallium/drivers/nouveau/codegen/nv50_ir_emit_nvc0.cpp +++ b/src/gallium/drivers/nouveau/codegen/nv50_ir_emit_nvc0.cpp @@ -815,8 +815,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; } -- 2.30.2