summaryrefslogtreecommitdiffstats
path: root/src/gallium/drivers/nouveau
diff options
context:
space:
mode:
authorIlia Mirkin <[email protected]>2013-11-25 03:19:06 -0500
committerMaarten Lankhorst <[email protected]>2014-01-27 16:40:42 +0100
commit42dc414cc6306a51d6b290e72e687b0ad82d5830 (patch)
tree5522b88d95d33bf19b5cb6914b9f6c0d713f2774 /src/gallium/drivers/nouveau
parent20929963d389c237f50192a75157cbc98c57c8d3 (diff)
nv50/ir: disallow predicates on emit/restart ops
Diffstat (limited to 'src/gallium/drivers/nouveau')
-rw-r--r--src/gallium/drivers/nouveau/codegen/nv50_ir_target_nv50.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/gallium/drivers/nouveau/codegen/nv50_ir_target_nv50.cpp b/src/gallium/drivers/nouveau/codegen/nv50_ir_target_nv50.cpp
index 618cc694c18..c27d4532e5a 100644
--- a/src/gallium/drivers/nouveau/codegen/nv50_ir_target_nv50.cpp
+++ b/src/gallium/drivers/nouveau/codegen/nv50_ir_target_nv50.cpp
@@ -130,7 +130,8 @@ void TargetNV50::initOpInfo()
};
static const operation noPredList[] =
{
- OP_CALL, OP_PREBREAK, OP_PRERET, OP_QUADON, OP_QUADPOP, OP_JOINAT
+ OP_CALL, OP_PREBREAK, OP_PRERET, OP_QUADON, OP_QUADPOP, OP_JOINAT,
+ OP_EMIT, OP_RESTART
};
for (i = 0; i < DATA_FILE_COUNT; ++i)