projects / mesa.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 69e8b47)
nv50/ir: can't have predication and immediates
authorIlia Mirkin <imirkin@alum.mit.edu>
Thu, 10 Dec 2015 17:18:51 +0000 (12:18 -0500)
committerIlia Mirkin <imirkin@alum.mit.edu>
Sat, 12 Dec 2015 23:10:15 +0000 (18:10 -0500)
Signed-off-by: Ilia Mirkin <imirkin@alum.mit.edu>
Cc: "11.0 11.1" <mesa-stable@lists.freedesktop.org>
src/gallium/drivers/nouveau/codegen/nv50_ir_peephole.cpp patch | blob | history

diff --git a/src/gallium/drivers/nouveau/codegen/nv50_ir_peephole.cpp b/src/gallium/drivers/nouveau/codegen/nv50_ir_peephole.cpp
index 834fc7d7e30b57dda68a1a8bb6d1b5e00fbb8621..23454f30e097de524f31ac49ff84279a9097b94a 100644 (file)
--- 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);