glsl2: Move temp declaration to correct side of if-statement in IR

diff --git a/src/glsl/ast_to_hir.cpp b/src/glsl/ast_to_hir.cpp
index a9ab17f4216e2458ee6c0992583c58c2aca81de0..98090d2b01b0c31b22a799c9c511e26ea2a0dc73 100644 (file)
--- a/src/glsl/ast_to_hir.cpp
+++ b/src/glsl/ast_to_hir.cpp
@@ -805,6 +805,10 @@ ast_expression::hir(exec_list *instructions,
         }
         type = glsl_type::bool_type;
       } else {
+        ir_variable *const tmp = new(ctx) ir_variable(glsl_type::bool_type,
+                                                      "and_tmp");
+        instructions->push_tail(tmp);
+
         ir_if *const stmt = new(ctx) ir_if(op[0]);
         instructions->push_tail(stmt);
 
@@ -819,10 +823,6 @@ ast_expression::hir(exec_list *instructions,
            error_emitted = true;
         }
 
-        ir_variable *const tmp = new(ctx) ir_variable(glsl_type::bool_type,
-                                                      "and_tmp");
-        instructions->push_tail(tmp);
-
         ir_dereference *const then_deref = new(ctx) ir_dereference_variable(tmp);
         ir_assignment *const then_assign =
            new(ctx) ir_assignment(then_deref, op[1], NULL);
@@ -869,13 +869,13 @@ ast_expression::hir(exec_list *instructions,
         }
         type = glsl_type::bool_type;
       } else {
-        ir_if *const stmt = new(ctx) ir_if(op[0]);
-        instructions->push_tail(stmt);
-
         ir_variable *const tmp = new(ctx) ir_variable(glsl_type::bool_type,
                                                       "or_tmp");
         instructions->push_tail(tmp);
 
+        ir_if *const stmt = new(ctx) ir_if(op[0]);
+        instructions->push_tail(stmt);
+
         op[1] = this->subexpressions[1]->hir(&stmt->then_instructions, state);
 
         if (!op[1]->type->is_boolean() || !op[1]->type->is_scalar()) {