summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBryan Cain <[email protected]>2012-07-17 23:46:39 -0500
committerChristoph Bumiller <[email protected]>2012-07-20 20:30:07 +0200
commit248e6f03313afdfd3c23be269b0da7a1aa31cff2 (patch)
tree6d0b2df01f377b5dd111652b8d6a94e70f6bb912
parentb2a44cde6468fb6065169194fe3a67b2f4738b71 (diff)
nv50/ir: set position before i instead of i->next in NV50LoweringPreSSA::visit
Fixes rendering glitches in Psychonauts such as Raz's eyes flickering white. Fixes https://bugs.freedesktop.org/show_bug.cgi?id=51962.
-rw-r--r--src/gallium/drivers/nv50/codegen/nv50_ir_lowering_nv50.cpp9
1 files changed, 2 insertions, 7 deletions
diff --git a/src/gallium/drivers/nv50/codegen/nv50_ir_lowering_nv50.cpp b/src/gallium/drivers/nv50/codegen/nv50_ir_lowering_nv50.cpp
index 39e0cfa613d..3e0dc755d56 100644
--- a/src/gallium/drivers/nv50/codegen/nv50_ir_lowering_nv50.cpp
+++ b/src/gallium/drivers/nv50/codegen/nv50_ir_lowering_nv50.cpp
@@ -701,6 +701,7 @@ NV50LoweringPreSSA::handleTXL(TexInstruction *i)
BasicBlock *texiBB = i->bb->splitBefore(i, false);
BasicBlock *joinBB = i->bb->splitAfter(i);
+ bld.setPosition(currBB, true);
currBB->joinAt = bld.mkFlow(OP_JOINAT, joinBB, CC_ALWAYS, NULL);
for (int l = 0; l <= 3; ++l) {
@@ -1030,13 +1031,7 @@ NV50LoweringPreSSA::checkPredicate(Instruction *insn)
bool
NV50LoweringPreSSA::visit(Instruction *i)
{
- if (i->prev)
- bld.setPosition(i->prev, true);
- else
- if (i->next)
- bld.setPosition(i->next, false);
- else
- bld.setPosition(i->bb, true);
+ bld.setPosition(i, false);
if (i->cc != CC_ALWAYS)
checkPredicate(i);