diff options
| author | Ilia Mirkin <[email protected]> | 2015-06-17 22:18:09 -0400 |
|---|---|---|
| committer | Ilia Mirkin <[email protected]> | 2015-06-17 22:23:20 -0400 |
| commit | 36e3eb6a957f8f20ed187ec88a067fc65cb81432 (patch) | |
| tree | 193364dfc49eb93777986da3611c5654076f0f6b | |
| parent | ff06901082b84c91ee64d3a54bf372f0c809f4bf (diff) | |
nvc0/ir: can't have a join on a load with an indirect source
Triggers an INVALID_OPCODE warning on GK208. Seems rare enough to not
warrant verification on other chips. Fixes the new piglits:
ubo_array_indexing/fs-nonuniform-control-flow.shader_test
ubo_array_indexing/vs-nonuniform-control-flow.shader_test
Signed-off-by: Ilia Mirkin <[email protected]>
Cc: "10.5 10.6" <[email protected]>
| -rw-r--r-- | src/gallium/drivers/nouveau/codegen/nv50_ir_peephole.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gallium/drivers/nouveau/codegen/nv50_ir_peephole.cpp b/src/gallium/drivers/nouveau/codegen/nv50_ir_peephole.cpp index b7fcd56724d..ae739eeda83 100644 --- a/src/gallium/drivers/nouveau/codegen/nv50_ir_peephole.cpp +++ b/src/gallium/drivers/nouveau/codegen/nv50_ir_peephole.cpp @@ -2288,7 +2288,7 @@ FlatteningPass::visit(BasicBlock *bb) insn->op != OP_LINTERP && // probably just nve4 insn->op != OP_PINTERP && // probably just nve4 ((insn->op != OP_LOAD && insn->op != OP_STORE) || - typeSizeof(insn->dType) <= 4) && + (typeSizeof(insn->dType) <= 4 && !insn->src(0).isIndirect(0))) && !insn->isNop()) { insn->join = 1; bb->remove(bb->getExit()); |