glsl: avoid hitting assert for arrays of arrays

[mesa.git] / src / glsl / opt_if_simplification.cpp

diff --git a/src/glsl/opt_if_simplification.cpp b/src/glsl/opt_if_simplification.cpp
index 2bec8252ea510d67077a8caeb803a3c2d34929f4..e05f03190aa10e8d7035e4787b0e4e231b18be8b 100644 (file)
--- a/src/glsl/opt_if_simplification.cpp
+++ b/src/glsl/opt_if_simplification.cpp
@@ -90,15 +90,9 @@ ir_if_simplification_visitor::visit_leave(ir_if *ir)
        * that matters out.
        */
       if (condition_constant->value.b[0]) {
-        foreach_list_safe(n, &ir->then_instructions) {
-           ir_instruction *then_ir = (ir_instruction *) n;
-           ir->insert_before(then_ir);
-        }
+         ir->insert_before(&ir->then_instructions);
       } else {
-        foreach_list_safe(n, &ir->else_instructions) {
-           ir_instruction *else_ir = (ir_instruction *) n;
-           ir->insert_before(else_ir);
-        }
+         ir->insert_before(&ir->else_instructions);
       }
       ir->remove();
       this->made_progress = true;