From: Ilia Mirkin <imirkin@alum.mit.edu>
Date: Sun, 29 May 2016 13:58:40 +0000 (-0400)
Subject: nvc0/ir: fix emission of predicate spill to register
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=8cc80e396e0f604bdeb962fe35c32ca1e6b361f3;p=mesa.git

nvc0/ir: fix emission of predicate spill to register

The lane mask only applies to real mov's, while here we're using PSET.

Signed-off-by: Ilia Mirkin <imirkin@alum.mit.edu>
---

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 1bb962f9e26..9159e342193 100644
--- a/src/gallium/drivers/nouveau/codegen/nv50_ir_emit_nvc0.cpp
+++ b/src/gallium/drivers/nouveau/codegen/nv50_ir_emit_nvc0.cpp
@@ -1981,7 +1981,8 @@ CodeEmitterNVC0::emitMOV(const Instruction *i)
       else
          opc = HEX64(28000000, 00000004);
 
-      opc |= i->lanes << 5;
+      if (i->src(0).getFile() != FILE_PREDICATE)
+         opc |= i->lanes << 5;
 
       emitForm_B(i, opc);
    } else {