summaryrefslogtreecommitdiffstats
path: root/src/gallium/drivers
diff options
context:
space:
mode:
authorChristoph Bumiller <[email protected]>2013-02-25 14:45:52 +0100
committerChristoph Bumiller <[email protected]>2013-03-12 12:55:34 +0100
commitee431b12ec9586e9fad058014ec9f4c667055d48 (patch)
tree866badf6a9019f0e9ea37e1648205102a0aa5e12 /src/gallium/drivers
parentf1dfa414f4737f8c36d1ce7f371e80a29dffbbd4 (diff)
nv50/ir/ra: also add pre-existing MERGE,SPLIT to constraint list
Diffstat (limited to 'src/gallium/drivers')
-rw-r--r--src/gallium/drivers/nv50/codegen/nv50_ir_ra.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/gallium/drivers/nv50/codegen/nv50_ir_ra.cpp b/src/gallium/drivers/nv50/codegen/nv50_ir_ra.cpp
index 7e3291db417..5e5255fc4f8 100644
--- a/src/gallium/drivers/nv50/codegen/nv50_ir_ra.cpp
+++ b/src/gallium/drivers/nv50/codegen/nv50_ir_ra.cpp
@@ -1955,7 +1955,9 @@ RegAlloc::InsertConstraintsPass::visit(BasicBlock *bb)
if (i->src(0).isIndirect(0) && typeSizeof(i->dType) >= 8)
addHazard(i, i->src(0).getIndirect(0));
} else
- if (i->op == OP_UNION) {
+ if (i->op == OP_UNION ||
+ i->op == OP_MERGE ||
+ i->op == OP_SPLIT) {
constrList.push_back(i);
}
}