From 42def0ad822c770e9b350df4c2a90da33efc1ef1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20R=C3=BChle?= Date: Sun, 6 Dec 2015 21:31:26 +0100 Subject: [PATCH] Trigger problem --- src/gallium/drivers/nouveau/codegen/nv50_ir_from_tgsi.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/gallium/drivers/nouveau/codegen/nv50_ir_from_tgsi.cpp b/src/gallium/drivers/nouveau/codegen/nv50_ir_from_tgsi.cpp index 1d2caab..cc6a11b 100644 --- a/src/gallium/drivers/nouveau/codegen/nv50_ir_from_tgsi.cpp +++ b/src/gallium/drivers/nouveau/codegen/nv50_ir_from_tgsi.cpp @@ -2852,6 +2852,10 @@ Converter::handleInstruction(const struct tgsi_full_instruction *insn) BasicBlock *prevBB = reinterpret_cast(condBBs.pop().u.p); BasicBlock *forkBB = reinterpret_cast(joinBBs.pop().u.p); + if (prevBB->getExit()->op == OP_BRA) { + prevBB->cfg.attach(&convBB->cfg, Graph::Edge::FORWARD); + prevBB->getExit()->asFlow()->target.bb = convBB; + } if (!bb->isTerminated()) { // we only want join if none of the clauses ended with CONT/BREAK/RET if (prevBB->getExit()->op == OP_BRA && joinBBs.getSize() < 6) @@ -2860,10 +2864,6 @@ Converter::handleInstruction(const struct tgsi_full_instruction *insn) bb->cfg.attach(&convBB->cfg, Graph::Edge::FORWARD); } - if (prevBB->getExit()->op == OP_BRA) { - prevBB->cfg.attach(&convBB->cfg, Graph::Edge::FORWARD); - prevBB->getExit()->asFlow()->target.bb = convBB; - } setPosition(convBB, true); } break; -- 2.1.4