From: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Date: Sun, 28 Feb 2016 21:44:24 +0000 (+0100)
Subject: gk110/ir: add missing src predicate emission for BAR.RED
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=8a109c0375ba1faa987329ab6355f7bcb497bd78;p=mesa.git

gk110/ir: add missing src predicate emission for BAR.RED

Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-by: Ilia Mirkin <imirkin@alum.mit.edu>
---

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 e5d638b5a8a..0d7d95e3105 100644
--- a/src/gallium/drivers/nouveau/codegen/nv50_ir_emit_gk110.cpp
+++ b/src/gallium/drivers/nouveau/codegen/nv50_ir_emit_gk110.cpp
@@ -1300,6 +1300,14 @@ CodeEmitterGK110::emitBAR(const Instruction *i)
       code[1] |= imm->reg.data.u32 >> 9;
       code[1] |= 0x4000;
    }
+
+   if (i->srcExists(2) && (i->predSrc != 2)) {
+      srcId(i->src(2), 32 + 10);
+      if (i->src(2).mod == Modifier(NV50_IR_MOD_NOT))
+         code[1] |= 1 << 13;
+   } else {
+      code[1] |= 7 << 10;
+   }
 }
 
 void CodeEmitterGK110::emitMEMBAR(const Instruction *i)