OSDN Git Service
(root)
/
android-x86
/
external-mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
nv50/ir: copy joinAt when splitting both before and after
[android-x86/external-mesa.git]
/
src
/
gallium
/
drivers
/
nouveau
/
codegen
/
nv50_ir_lowering_nv50.cpp
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
0d7612e
..
b0ed75f
100644
(file)
--- a/
src/gallium/drivers/nouveau/codegen/nv50_ir_lowering_nv50.cpp
+++ b/
src/gallium/drivers/nouveau/codegen/nv50_ir_lowering_nv50.cpp
@@
-871,6
+871,7
@@
NV50LoweringPreSSA::handleTXL(TexInstruction *i)
BasicBlock *joinBB = i->bb->splitAfter(i);
bld.setPosition(currBB, true);
+ assert(!currBB->joinAt);
currBB->joinAt = bld.mkFlow(OP_JOINAT, joinBB, CC_ALWAYS, NULL);
for (int l = 0; l <= 3; ++l) {