summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorIlia Mirkin <[email protected]>2015-12-10 12:18:51 -0500
committerIlia Mirkin <[email protected]>2015-12-12 18:10:15 -0500
commit6aca7fecb7f7b6c67cf0315e781060a8d1d4b704 (patch)
tree4d434d5436b193d7faa2b39759e897d6ab78d13d /src
parent69e8b476d07544d6ef06414a1a78ce5c04761fdb (diff)
nv50/ir: can't have predication and immediates
Signed-off-by: Ilia Mirkin <[email protected]> Cc: "11.0 11.1" <[email protected]>
Diffstat (limited to 'src')
-rw-r--r--src/gallium/drivers/nouveau/codegen/nv50_ir_peephole.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/gallium/drivers/nouveau/codegen/nv50_ir_peephole.cpp b/src/gallium/drivers/nouveau/codegen/nv50_ir_peephole.cpp
index 834fc7d7e30..23454f30e09 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);