Module: Mesa
Branch: master
Commit: 6aca7fecb7f7b6c67cf0315e781060a8d1d4b704
URL:    
http://cgit.freedesktop.org/mesa/mesa/commit/?id=6aca7fecb7f7b6c67cf0315e781060a8d1d4b704

Author: Ilia Mirkin <[email protected]>
Date:   Thu Dec 10 12:18:51 2015 -0500

nv50/ir: can't have predication and immediates

Signed-off-by: Ilia Mirkin <[email protected]>
Cc: "11.0 11.1" <[email protected]>

---

 src/gallium/drivers/nouveau/codegen/nv50_ir_peephole.cpp |    3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/gallium/drivers/nouveau/codegen/nv50_ir_peephole.cpp 
b/src/gallium/drivers/nouveau/codegen/nv50_ir_peephole.cpp
index 834fc7d..23454f3 100644
--- a/src/gallium/drivers/nouveau/codegen/nv50_ir_peephole.cpp
+++ b/src/gallium/drivers/nouveau/codegen/nv50_ir_peephole.cpp
@@ -2812,6 +2812,9 @@ NV50PostRaConstantFolding::visit(BasicBlock *bb)
              i->getSrc(0)->reg.data.id >= 64)
             break;
 
+         if (i->getPredicate())
+            break;
+
          def = i->getSrc(1)->getInsn();
          if (def && def->op == OP_MOV && def->src(0).getFile() == 
FILE_IMMEDIATE) {
             vtmp = i->getSrc(1);

_______________________________________________
mesa-commit mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/mesa-commit

Reply via email to