nir/spirv: Add a missing break statement

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

diff --git a/src/glsl/lower_subroutine.cpp b/src/glsl/lower_subroutine.cpp
index e45ccfea6d92722b090d57e95ef27be4eecf043f..a0df5e1df817e8b36e19574f9b384e2a147c694c 100644 (file)
--- a/src/glsl/lower_subroutine.cpp
+++ b/src/glsl/lower_subroutine.cpp
@@ -37,7 +37,8 @@ namespace {
 
 class lower_subroutine_visitor : public ir_hierarchical_visitor {
 public:
-   lower_subroutine_visitor()
+   lower_subroutine_visitor(struct _mesa_glsl_parse_state *state)
+      : state(state)
    {
       this->progress = false;
    }
@@ -52,8 +53,7 @@ public:
 bool
 lower_subroutine(exec_list *instructions, struct _mesa_glsl_parse_state *state)
 {
-   lower_subroutine_visitor v;
-   v.state = state;
+   lower_subroutine_visitor v(state);
    visit_list_elements(&v, instructions);
    return v.progress;
 }
@@ -84,7 +84,7 @@ lower_subroutine_visitor::visit_leave(ir_call *ir)
          continue;
 
       if (ir->array_idx != NULL)
-         var = new(mem_ctx) ir_dereference_array(ir->sub_var, ir->array_idx->clone(mem_ctx, NULL));
+         var = ir->array_idx->clone(mem_ctx, NULL);
       else
          var = new(mem_ctx) ir_dereference_variable(ir->sub_var);
 
@@ -98,7 +98,7 @@ lower_subroutine_visitor::visit_leave(ir_call *ir)
       else
          last_branch = if_tree(equal(subr_to_int(var), lc), new_call, last_branch);
 
-      if (s > 0)
+      if (return_deref && s > 0)
         return_deref = return_deref->clone(mem_ctx, NULL);
    }
    if (last_branch)