summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFabian Bieler <der.fabe@gmx.net>2010-12-01 14:44:58 +0100
committerKenneth Graunke <kenneth@whitecape.org>2010-12-09 11:28:06 -0800
commitef534f3838f23d757a40426728789183ed36c3bb (patch)
treed96a0e91eb46902c8aab586150dc1de24d4c60a6
parent834cc8e501c2632fd8f9fc78502a1a99803e6fb9 (diff)
glsl: fix lowering conditional returns in subroutines
this fix applies to the lower_sub_return 'branch' of the lower_jumps pass Fixes piglit tests glsl-functions-5 and glsl-functions-6.
-rw-r--r--src/glsl/lower_jumps.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/glsl/lower_jumps.cpp b/src/glsl/lower_jumps.cpp
index 9cd15ef736..d99e0aa739 100644
--- a/src/glsl/lower_jumps.cpp
+++ b/src/glsl/lower_jumps.cpp
@@ -512,7 +512,11 @@ lower_continue:
if(this->loop.may_set_return_flag) {
assert(this->function.return_flag);
ir_if* return_if = new(ir) ir_if(new(ir) ir_dereference_variable(this->function.return_flag));
- return_if->then_instructions.push_tail(new(ir) ir_loop_jump(saved_loop.loop ? ir_loop_jump::jump_break : ir_loop_jump::jump_continue));
+ saved_loop.may_set_return_flag = true;
+ if(saved_loop.loop)
+ return_if->then_instructions.push_tail(new(ir) ir_loop_jump(ir_loop_jump::jump_break));
+ else
+ move_outer_block_inside(ir, &return_if->else_instructions);
ir->insert_after(return_if);
}