diff options
| author | Jürgen Rühle <[email protected]> | 2015-06-06 18:37:20 +0200 |
|---|---|---|
| committer | Ilia Mirkin <[email protected]> | 2015-06-15 11:46:32 -0400 |
| commit | 2e42deb29c878fb4c52aed6d2d54833aacba18ae (patch) | |
| tree | 296a1b8d1b27349ff0e0de8e71eee6df6efb07fc | |
| parent | 061c9bc2042b0686867e4321d94ba18761a6a1a7 (diff) | |
nv50/ir: OP_JOIN is a flow instruction
OP_JOIN instructions are assumed to be flow instructions and mercilessly
casted to FlowInstruction.
This patch fixes an instance where an OP_JOIN is created as a plain
instruction. This can cause crashes in the ir printer.
[imirkin: add ->fixed = 1]
Reviewed-by: Ilia Mirkin <[email protected]>
| -rw-r--r-- | src/gallium/drivers/nouveau/codegen/nv50_ir_lowering_nv50.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gallium/drivers/nouveau/codegen/nv50_ir_lowering_nv50.cpp b/src/gallium/drivers/nouveau/codegen/nv50_ir_lowering_nv50.cpp index 1ad086094dc..2c7f7e326b2 100644 --- a/src/gallium/drivers/nouveau/codegen/nv50_ir_lowering_nv50.cpp +++ b/src/gallium/drivers/nouveau/codegen/nv50_ir_lowering_nv50.cpp @@ -887,7 +887,7 @@ NV50LoweringPreSSA::handleTXL(TexInstruction *i) } } bld.setPosition(joinBB, false); - bld.mkOp(OP_JOIN, TYPE_NONE, NULL); + bld.mkFlow(OP_JOIN, NULL, CC_ALWAYS, NULL)->fixed = 1; return true; } |