diff options
author | marha <marha@users.sourceforge.net> | 2014-07-04 19:50:15 +0200 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2014-07-04 19:50:15 +0200 |
commit | fe03d6aef6338e43593f164b09ae993bcd0ecbdd (patch) | |
tree | 0fdb7e12fc82894e07b8b8141f2dbb00a93c60ad /mesalib/src/glsl/lower_if_to_cond_assign.cpp | |
parent | cfc5bafcb2db8c6e05d7be6bb7315960be08c0d8 (diff) | |
download | vcxsrv-fe03d6aef6338e43593f164b09ae993bcd0ecbdd.tar.gz vcxsrv-fe03d6aef6338e43593f164b09ae993bcd0ecbdd.tar.bz2 vcxsrv-fe03d6aef6338e43593f164b09ae993bcd0ecbdd.zip |
fontconfig mesa pixman xserver git update 4 July 2014
xserver commit a61ca6f006d70343c88fe45206fae0669d1e8971
pixman commit 6d2cf40166d81bfc63108504c8022dc4fec37ff5
fontconfig commit 5b22776999b6052afe0e829b1a0c0935bbe1e9f7
mesa commit 9a37eb8adb6558a4abf47774b583cb582a0ae116
Diffstat (limited to 'mesalib/src/glsl/lower_if_to_cond_assign.cpp')
-rw-r--r-- | mesalib/src/glsl/lower_if_to_cond_assign.cpp | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/mesalib/src/glsl/lower_if_to_cond_assign.cpp b/mesalib/src/glsl/lower_if_to_cond_assign.cpp index f15b217e0..3232ce92a 100644 --- a/mesalib/src/glsl/lower_if_to_cond_assign.cpp +++ b/mesalib/src/glsl/lower_if_to_cond_assign.cpp @@ -116,9 +116,7 @@ move_block_to_cond_assign(void *mem_ctx, exec_list *instructions, struct hash_table *ht) { - foreach_list_safe(node, instructions) { - ir_instruction *ir = (ir_instruction *) node; - + foreach_in_list_safe(ir_instruction, ir, instructions) { if (ir->ir_type == ir_type_assignment) { ir_assignment *assign = (ir_assignment *)ir; @@ -178,12 +176,10 @@ ir_if_to_cond_assign_visitor::visit_leave(ir_if *ir) ir_assignment *assign; /* Check that both blocks don't contain anything we can't support. */ - foreach_list(n, &ir->then_instructions) { - ir_instruction *then_ir = (ir_instruction *) n; + foreach_in_list(ir_instruction, then_ir, &ir->then_instructions) { visit_tree(then_ir, check_control_flow, &found_control_flow); } - foreach_list(n, &ir->else_instructions) { - ir_instruction *else_ir = (ir_instruction *) n; + foreach_in_list(ir_instruction, else_ir, &ir->else_instructions) { visit_tree(else_ir, check_control_flow, &found_control_flow); } if (found_control_flow) |