From d8e0d1e882e40b0da0237ef6e9b4ef21b7a3b3bf Mon Sep 17 00:00:00 2001 From: Ilia Mirkin Date: Sat, 15 Mar 2014 10:22:22 -0400 Subject: [PATCH] nv50/ir/gk110: set not modifier on first source of logic op Signed-off-by: Ilia Mirkin --- src/gallium/drivers/nouveau/codegen/nv50_ir_emit_gk110.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/gallium/drivers/nouveau/codegen/nv50_ir_emit_gk110.cpp b/src/gallium/drivers/nouveau/codegen/nv50_ir_emit_gk110.cpp index 07d7e1929fe..81134a21212 100644 --- a/src/gallium/drivers/nouveau/codegen/nv50_ir_emit_gk110.cpp +++ b/src/gallium/drivers/nouveau/codegen/nv50_ir_emit_gk110.cpp @@ -661,17 +661,16 @@ CodeEmitterGK110::emitNOT(const Instruction *i) void CodeEmitterGK110::emitLogicOp(const Instruction *i, uint8_t subOp) { - assert(!(i->src(0).mod & Modifier(NV50_IR_MOD_NOT))); // XXX: find me - if (isLIMM(i->src(1), TYPE_S32)) { emitForm_L(i, 0x200, 0, i->src(1).mod); code[1] |= subOp << 24; + NOT_(3a, 0); } else { emitForm_21(i, 0x220, 0xc20); code[1] |= subOp << 12; + NOT_(2a, 0); NOT_(2b, 1); } - assert(!(code[0] & 0x1) || !(i->src(1).mod & Modifier(NV50_IR_MOD_NOT))); } void -- 2.30.2