i915g: Use X tiling for textures
[mesa.git] / src / glsl / ast_to_hir.cpp
index f4dfc4ce34cf11fd066e44cda45d3806ffd305bb..5157661b39eca7c6e15bc58a3157026ed1bfd618 100644 (file)
 #include "program/hash_table.h"
 #include "ir.h"
 
+static void
+detect_conflicting_assignments(struct _mesa_glsl_parse_state *state,
+                              exec_list *instructions);
+
 void
 _mesa_ast_to_hir(exec_list *instructions, struct _mesa_glsl_parse_state *state)
 {
@@ -87,6 +91,7 @@ _mesa_ast_to_hir(exec_list *instructions, struct _mesa_glsl_parse_state *state)
       ast->hir(instructions, state);
 
    detect_recursion_unlinked(state, instructions);
+   detect_conflicting_assignments(state, instructions);
 
    state->toplevel_ir = NULL;
 }
@@ -672,6 +677,10 @@ do_assignment(exec_list *instructions, struct _mesa_glsl_parse_state *state,
    void *ctx = state;
    bool error_emitted = (lhs->type->is_error() || rhs->type->is_error());
 
+   ir_variable *lhs_var = lhs->variable_referenced();
+   if (lhs_var)
+      lhs_var->assigned = true;
+
    if (!error_emitted) {
       if (non_lvalue_description != NULL) {
          _mesa_glsl_error(&lhs_loc, state,
@@ -751,13 +760,11 @@ do_assignment(exec_list *instructions, struct _mesa_glsl_parse_state *state,
                                           ir_var_temporary);
    ir_dereference_variable *deref_var = new(ctx) ir_dereference_variable(var);
    instructions->push_tail(var);
-   instructions->push_tail(new(ctx) ir_assignment(deref_var,
-                                                 rhs,
-                                                 NULL));
+   instructions->push_tail(new(ctx) ir_assignment(deref_var, rhs));
    deref_var = new(ctx) ir_dereference_variable(var);
 
    if (!error_emitted)
-      instructions->push_tail(new(ctx) ir_assignment(lhs, deref_var, NULL));
+      instructions->push_tail(new(ctx) ir_assignment(lhs, deref_var));
 
    return new(ctx) ir_dereference_variable(var);
 }
@@ -774,7 +781,7 @@ get_lvalue_copy(exec_list *instructions, ir_rvalue *lvalue)
    var->mode = ir_var_auto;
 
    instructions->push_tail(new(ctx) ir_assignment(new(ctx) ir_dereference_variable(var),
-                                                 lvalue, NULL));
+                                                 lvalue));
 
    return new(ctx) ir_dereference_variable(var);
 }
@@ -1214,12 +1221,12 @@ ast_expression::hir(exec_list *instructions,
         stmt->then_instructions.append_list(&rhs_instructions);
         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);
+           new(ctx) ir_assignment(then_deref, op[1]);
         stmt->then_instructions.push_tail(then_assign);
 
         ir_dereference *const else_deref = new(ctx) ir_dereference_variable(tmp);
         ir_assignment *const else_assign =
-           new(ctx) ir_assignment(else_deref, new(ctx) ir_constant(false), NULL);
+           new(ctx) ir_assignment(else_deref, new(ctx) ir_constant(false));
         stmt->else_instructions.push_tail(else_assign);
 
         result = new(ctx) ir_dereference_variable(tmp);
@@ -1249,13 +1256,13 @@ ast_expression::hir(exec_list *instructions,
 
         ir_dereference *const then_deref = new(ctx) ir_dereference_variable(tmp);
         ir_assignment *const then_assign =
-           new(ctx) ir_assignment(then_deref, new(ctx) ir_constant(true), NULL);
+           new(ctx) ir_assignment(then_deref, new(ctx) ir_constant(true));
         stmt->then_instructions.push_tail(then_assign);
 
         stmt->else_instructions.append_list(&rhs_instructions);
         ir_dereference *const else_deref = new(ctx) ir_dereference_variable(tmp);
         ir_assignment *const else_assign =
-           new(ctx) ir_assignment(else_deref, op[1], NULL);
+           new(ctx) ir_assignment(else_deref, op[1]);
         stmt->else_instructions.push_tail(else_assign);
 
         result = new(ctx) ir_dereference_variable(tmp);
@@ -1443,14 +1450,14 @@ ast_expression::hir(exec_list *instructions,
         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);
+           new(ctx) ir_assignment(then_deref, op[1]);
         stmt->then_instructions.push_tail(then_assign);
 
         else_instructions.move_nodes_to(& stmt->else_instructions);
         ir_dereference *const else_deref =
            new(ctx) ir_dereference_variable(tmp);
         ir_assignment *const else_assign =
-           new(ctx) ir_assignment(else_deref, op[2], NULL);
+           new(ctx) ir_assignment(else_deref, op[2]);
         stmt->else_instructions.push_tail(else_assign);
 
         result = new(ctx) ir_dereference_variable(tmp);
@@ -1910,7 +1917,8 @@ static void
 apply_type_qualifier_to_variable(const struct ast_type_qualifier *qual,
                                 ir_variable *var,
                                 struct _mesa_glsl_parse_state *state,
-                                YYLTYPE *loc)
+                                YYLTYPE *loc,
+                                bool ubo_qualifiers_valid)
 {
    if (qual->flags.q.invariant) {
       if (var->used) {
@@ -2003,24 +2011,10 @@ apply_type_qualifier_to_variable(const struct ast_type_qualifier *qual,
    if (var->interpolation != INTERP_QUALIFIER_NONE &&
        !(state->target == vertex_shader && var->mode == ir_var_out) &&
        !(state->target == fragment_shader && var->mode == ir_var_in)) {
-      const char *qual_string = NULL;
-      switch (var->interpolation) {
-      case INTERP_QUALIFIER_FLAT:
-        qual_string = "flat";
-        break;
-      case INTERP_QUALIFIER_NOPERSPECTIVE:
-        qual_string = "noperspective";
-        break;
-      case INTERP_QUALIFIER_SMOOTH:
-        qual_string = "smooth";
-        break;
-      }
-
       _mesa_glsl_error(loc, state,
                       "interpolation qualifier `%s' can only be applied to "
                       "vertex shader outputs and fragment shader inputs.",
-                      qual_string);
-
+                      var->interpolation_string());
    }
 
    var->pixel_center_integer = qual->flags.q.pixel_center_integer;
@@ -2092,14 +2086,36 @@ apply_type_qualifier_to_variable(const struct ast_type_qualifier *qual,
         } else {
            var->location = qual->location;
         }
+
+        if (qual->flags.q.explicit_index) {
+            /* From the GLSL 4.30 specification, section 4.4.2 (Output
+             * Layout Qualifiers):
+             *
+             * "It is also a compile-time error if a fragment shader
+             *  sets a layout index to less than 0 or greater than 1."
+             *
+             * Older specifications don't mandate a behavior; we take
+             * this as a clarification and always generate the error.
+             */
+            if (qual->index < 0 || qual->index > 1) {
+               _mesa_glsl_error(loc, state,
+                                "explicit index may only be 0 or 1\n");
+            } else {
+               var->explicit_index = true;
+               var->index = qual->index;
+            }
+        }
       }
+   } else if (qual->flags.q.explicit_index) {
+        _mesa_glsl_error(loc, state,
+                         "explicit index requires explicit location\n");
    }
 
    /* Does the declaration use the 'layout' keyword?
     */
    const bool uses_layout = qual->flags.q.pixel_center_integer
       || qual->flags.q.origin_upper_left
-      || qual->flags.q.explicit_location;
+      || qual->flags.q.explicit_location; /* no need for index since it relies on location */
 
    /* Does the declaration use the deprecated 'attribute' or 'varying'
     * keywords?
@@ -2177,6 +2193,23 @@ apply_type_qualifier_to_variable(const struct ast_type_qualifier *qual,
        var->depth_layout = ir_depth_layout_unchanged;
    else
        var->depth_layout = ir_depth_layout_none;
+
+   if (qual->flags.q.std140 ||
+       qual->flags.q.packed ||
+       qual->flags.q.shared) {
+      _mesa_glsl_error(loc, state,
+                       "uniform block layout qualifiers std140, packed, and "
+                      "shared can only be applied to uniform blocks, not "
+                      "members");
+   }
+
+   if (!ubo_qualifiers_valid &&
+       (qual->flags.q.row_major || qual->flags.q.column_major)) {
+      _mesa_glsl_error(loc, state,
+                       "uniform block layout qualifiers row_major and "
+                      "column_major can only be applied to uniform block "
+                      "members");
+   }
 }
 
 /**
@@ -2597,7 +2630,7 @@ ast_declarator_list::hir(exec_list *instructions,
       }
 
       apply_type_qualifier_to_variable(& this->type->qualifier, var, state,
-                                      & loc);
+                                      & loc, this->ubo_qualifiers_valid);
 
       if (this->type->qualifier.flags.q.invariant) {
         if ((state->target == vertex_shader) && !(var->mode == ir_var_out ||
@@ -3014,7 +3047,8 @@ ast_parameter_declarator::hir(exec_list *instructions,
    /* Apply any specified qualifiers to the parameter declaration.  Note that
     * for function parameters the default mode is 'in'.
     */
-   apply_type_qualifier_to_variable(& this->type->qualifier, var, state, & loc);
+   apply_type_qualifier_to_variable(& this->type->qualifier, var, state, & loc,
+                                   false);
 
    /* From page 17 (page 23 of the PDF) of the GLSL 1.20 spec:
     *
@@ -3422,9 +3456,7 @@ ast_jump_statement::hir(exec_list *instructions,
               new(ctx) ir_dereference_variable(is_break_var);
            ir_constant *const true_val = new(ctx) ir_constant(true);
            ir_assignment *const set_break_var =
-              new(ctx) ir_assignment(deref_is_break_var,
-                                     true_val,
-                                     NULL);
+              new(ctx) ir_assignment(deref_is_break_var, true_val);
            
            instructions->push_tail(set_break_var);
         }
@@ -3505,11 +3537,9 @@ ast_switch_statement::hir(exec_list *instructions,
     *
     *    "The type of init-expression in a switch statement must be a 
     *     scalar integer." 
-    *
-    * The checks are separated so that higher quality diagnostics can be
-    * generated for cases where the rule is violated.
     */
-   if (!test_expression->type->is_integer()) {
+   if (!test_expression->type->is_scalar() ||
+       !test_expression->type->is_integer()) {
       YYLTYPE loc = this->test_expression->get_location();
 
       _mesa_glsl_error(& loc,
@@ -3540,8 +3570,7 @@ ast_switch_statement::hir(exec_list *instructions,
    ir_dereference_variable *deref_is_fallthru_var =
       new(ctx) ir_dereference_variable(state->switch_state.is_fallthru_var);
    instructions->push_tail(new(ctx) ir_assignment(deref_is_fallthru_var,
-                                                 is_fallthru_val,
-                                                 NULL));
+                                                 is_fallthru_val));
 
    /* Initalize is_break state to false.
     */
@@ -3554,13 +3583,12 @@ ast_switch_statement::hir(exec_list *instructions,
    ir_dereference_variable *deref_is_break_var =
       new(ctx) ir_dereference_variable(state->switch_state.is_break_var);
    instructions->push_tail(new(ctx) ir_assignment(deref_is_break_var,
-                                                 is_break_val,
-                                                 NULL));
+                                                 is_break_val));
 
    /* Cache test expression.
     */
    test_to_hir(instructions, state);
-   
+
    /* Emit code for body of switch stmt.
     */
    body->hir(instructions, state);
@@ -3569,290 +3597,264 @@ ast_switch_statement::hir(exec_list *instructions,
 
    state->switch_state = saved;
 
-     /* Switch statements do not have r-values.
-      */
-     return NULL;
-  }
+   /* Switch statements do not have r-values. */
+   return NULL;
+}
 
 
-  void
-  ast_switch_statement::test_to_hir(exec_list *instructions,
-                                   struct _mesa_glsl_parse_state *state)
-  {
-     void *ctx = state;
+void
+ast_switch_statement::test_to_hir(exec_list *instructions,
+                                 struct _mesa_glsl_parse_state *state)
+{
+   void *ctx = state;
 
-     /* Cache value of test expression.
-      */
-     ir_rvalue *const test_val =
-       test_expression->hir(instructions,
-                            state);
+   /* Cache value of test expression. */
+   ir_rvalue *const test_val =
+      test_expression->hir(instructions,
+                          state);
 
-     state->switch_state.test_var = new(ctx) ir_variable(glsl_type::int_type,
-                                                        "switch_test_tmp",
-                                                        ir_var_temporary);
-     ir_dereference_variable *deref_test_var =
-       new(ctx) ir_dereference_variable(state->switch_state.test_var);
+   state->switch_state.test_var = new(ctx) ir_variable(test_val->type,
+                                                      "switch_test_tmp",
+                                                      ir_var_temporary);
+   ir_dereference_variable *deref_test_var =
+      new(ctx) ir_dereference_variable(state->switch_state.test_var);
 
-     instructions->push_tail(state->switch_state.test_var);
-     instructions->push_tail(new(ctx) ir_assignment(deref_test_var,
-                                                   test_val,
-                                                   NULL));
-  }
+   instructions->push_tail(state->switch_state.test_var);
+   instructions->push_tail(new(ctx) ir_assignment(deref_test_var, test_val));
+}
 
 
-  ir_rvalue *
-  ast_switch_body::hir(exec_list *instructions,
-                      struct _mesa_glsl_parse_state *state)
-  {
-     if (stmts != NULL)
-       stmts->hir(instructions, state);
+ir_rvalue *
+ast_switch_body::hir(exec_list *instructions,
+                    struct _mesa_glsl_parse_state *state)
+{
+   if (stmts != NULL)
+      stmts->hir(instructions, state);
 
-     /* Switch bodies do not have r-values.
-      */
-     return NULL;
-  }
+   /* Switch bodies do not have r-values. */
+   return NULL;
+}
 
+ir_rvalue *
+ast_case_statement_list::hir(exec_list *instructions,
+                            struct _mesa_glsl_parse_state *state)
+{
+   foreach_list_typed (ast_case_statement, case_stmt, link, & this->cases)
+      case_stmt->hir(instructions, state);
 
-  ir_rvalue *
-  ast_case_statement_list::hir(exec_list *instructions,
-                              struct _mesa_glsl_parse_state *state)
-  {
-     foreach_list_typed (ast_case_statement, case_stmt, link, & this->cases)
-       case_stmt->hir(instructions, state);
+   /* Case statements do not have r-values. */
+   return NULL;
+}
 
-     /* Case statements do not have r-values.
-      */
-     return NULL;
-  }
+ir_rvalue *
+ast_case_statement::hir(exec_list *instructions,
+                       struct _mesa_glsl_parse_state *state)
+{
+   labels->hir(instructions, state);
+
+   /* Conditionally set fallthru state based on break state. */
+   ir_constant *const false_val = new(state) ir_constant(false);
+   ir_dereference_variable *const deref_is_fallthru_var =
+      new(state) ir_dereference_variable(state->switch_state.is_fallthru_var);
+   ir_dereference_variable *const deref_is_break_var =
+      new(state) ir_dereference_variable(state->switch_state.is_break_var);
+   ir_assignment *const reset_fallthru_on_break =
+      new(state) ir_assignment(deref_is_fallthru_var,
+                              false_val,
+                              deref_is_break_var);
+   instructions->push_tail(reset_fallthru_on_break);
+
+   /* Guard case statements depending on fallthru state. */
+   ir_dereference_variable *const deref_fallthru_guard =
+      new(state) ir_dereference_variable(state->switch_state.is_fallthru_var);
+   ir_if *const test_fallthru = new(state) ir_if(deref_fallthru_guard);
+
+   foreach_list_typed (ast_node, stmt, link, & this->stmts)
+      stmt->hir(& test_fallthru->then_instructions, state);
+
+   instructions->push_tail(test_fallthru);
+
+   /* Case statements do not have r-values. */
+   return NULL;
+}
 
 
-  ir_rvalue *
-  ast_case_statement::hir(exec_list *instructions,
-                         struct _mesa_glsl_parse_state *state)
-  {
-     labels->hir(instructions, state);
-
-     /* Conditionally set fallthru state based on break state.
-      */
-     ir_constant *const false_val = new(state) ir_constant(false);
-     ir_dereference_variable *const deref_is_fallthru_var =
-       new(state) ir_dereference_variable(state->switch_state.is_fallthru_var);
-     ir_dereference_variable *const deref_is_break_var =
-       new(state) ir_dereference_variable(state->switch_state.is_break_var);
-     ir_assignment *const reset_fallthru_on_break =
-       new(state) ir_assignment(deref_is_fallthru_var,
-                                false_val,
-                                deref_is_break_var);
-     instructions->push_tail(reset_fallthru_on_break);
-
-     /* Guard case statements depending on fallthru state.
-      */
-     ir_dereference_variable *const deref_fallthru_guard =
-       new(state) ir_dereference_variable(state->switch_state.is_fallthru_var);
-     ir_if *const test_fallthru = new(state) ir_if(deref_fallthru_guard);
-
-     foreach_list_typed (ast_node, stmt, link, & this->stmts)
-       stmt->hir(& test_fallthru->then_instructions, state);
-
-     instructions->push_tail(test_fallthru);
-
-     /* Case statements do not have r-values.
-      */
-     return NULL;
-  }
-
-
-  ir_rvalue *
-  ast_case_label_list::hir(exec_list *instructions,
-                          struct _mesa_glsl_parse_state *state)
-  {
-     foreach_list_typed (ast_case_label, label, link, & this->labels)
-       label->hir(instructions, state);
-
-     /* Case labels do not have r-values.
-      */
-     return NULL;
-  }
-
-
-  ir_rvalue *
-  ast_case_label::hir(exec_list *instructions,
-                     struct _mesa_glsl_parse_state *state)
-  {
-     void *ctx = state;
-
-     ir_dereference_variable *deref_fallthru_var =
-       new(ctx) ir_dereference_variable(state->switch_state.is_fallthru_var);
-
-     ir_rvalue *const true_val = new(ctx) ir_constant(true);
-
-     /* If not default case, ...
-      */
-     if (this->test_value != NULL) {
-       /* Conditionally set fallthru state based on
-        * comparison of cached test expression value to case label.
-        */
-       ir_rvalue *const label_rval = this->test_value->hir(instructions, state);
-       ir_constant *label_const = label_rval->constant_expression_value();
-
-       if (!label_const) {
-          YYLTYPE loc = this->test_value->get_location();
-
-          _mesa_glsl_error(& loc, state,
-                           "switch statement case label must be a "
-                           "constant expression");
-
-          /* Stuff a dummy value in to allow processing to continue. */
-          label_const = new(ctx) ir_constant(0);
-       } else {
-          ast_expression *previous_label = (ast_expression *)
-             hash_table_find(state->switch_state.labels_ht,
+ir_rvalue *
+ast_case_label_list::hir(exec_list *instructions,
+                        struct _mesa_glsl_parse_state *state)
+{
+   foreach_list_typed (ast_case_label, label, link, & this->labels)
+      label->hir(instructions, state);
+
+   /* Case labels do not have r-values. */
+   return NULL;
+}
+
+ir_rvalue *
+ast_case_label::hir(exec_list *instructions,
+                   struct _mesa_glsl_parse_state *state)
+{
+   void *ctx = state;
+
+   ir_dereference_variable *deref_fallthru_var =
+      new(ctx) ir_dereference_variable(state->switch_state.is_fallthru_var);
+
+   ir_rvalue *const true_val = new(ctx) ir_constant(true);
+
+   /* If not default case, ... */
+   if (this->test_value != NULL) {
+      /* Conditionally set fallthru state based on
+       * comparison of cached test expression value to case label.
+       */
+      ir_rvalue *const label_rval = this->test_value->hir(instructions, state);
+      ir_constant *label_const = label_rval->constant_expression_value();
+
+      if (!label_const) {
+        YYLTYPE loc = this->test_value->get_location();
+
+        _mesa_glsl_error(& loc, state,
+                         "switch statement case label must be a "
+                         "constant expression");
+
+        /* Stuff a dummy value in to allow processing to continue. */
+        label_const = new(ctx) ir_constant(0);
+      } else {
+        ast_expression *previous_label = (ast_expression *)
+           hash_table_find(state->switch_state.labels_ht,
+                           (void *)(uintptr_t)label_const->value.u[0]);
+
+        if (previous_label) {
+           YYLTYPE loc = this->test_value->get_location();
+           _mesa_glsl_error(& loc, state,
+                            "duplicate case value");
+
+           loc = previous_label->get_location();
+           _mesa_glsl_error(& loc, state,
+                            "this is the previous case label");
+        } else {
+           hash_table_insert(state->switch_state.labels_ht,
+                             this->test_value,
                              (void *)(uintptr_t)label_const->value.u[0]);
+        }
+      }
 
-          if (previous_label) {
-             YYLTYPE loc = this->test_value->get_location();
-             _mesa_glsl_error(& loc, state,
-                              "duplicate case value");
-
-             loc = previous_label->get_location();
-             _mesa_glsl_error(& loc, state,
-                              "this is the previous case label");
-          } else {
-             hash_table_insert(state->switch_state.labels_ht,
-                               this->test_value,
-                               (void *)(uintptr_t)label_const->value.u[0]);
-          }
-       }
-
-       ir_dereference_variable *deref_test_var =
-          new(ctx) ir_dereference_variable(state->switch_state.test_var);
-
-       ir_rvalue *const test_cond = new(ctx) ir_expression(ir_binop_all_equal,
-                                                           glsl_type::bool_type,
-                                                           label_const,
-                                                           deref_test_var);
-
-       ir_assignment *set_fallthru_on_test =
-          new(ctx) ir_assignment(deref_fallthru_var,
-                                 true_val,
-                                 test_cond);
-
-       instructions->push_tail(set_fallthru_on_test);
-     } else { /* default case */
-       if (state->switch_state.previous_default) {
-          printf("a\n");
-          YYLTYPE loc = this->get_location();
-          _mesa_glsl_error(& loc, state,
-                              "multiple default labels in one switch");
-
-          printf("b\n");
-
-          loc = state->switch_state.previous_default->get_location();
-          _mesa_glsl_error(& loc, state,
-                           "this is the first default label");
-       }
-       state->switch_state.previous_default = this;
-
-       /* Set falltrhu state.
-        */
-       ir_assignment *set_fallthru =
-          new(ctx) ir_assignment(deref_fallthru_var,
-                                 true_val,
-                                 NULL);
-
-       instructions->push_tail(set_fallthru);
-     }
-
-     /* Case statements do not have r-values.
-      */
-     return NULL;
-  }
-
-
-  void
-  ast_iteration_statement::condition_to_hir(ir_loop *stmt,
-                                           struct _mesa_glsl_parse_state *state)
-  {
-     void *ctx = state;
-
-     if (condition != NULL) {
-       ir_rvalue *const cond =
-          condition->hir(& stmt->body_instructions, state);
-
-       if ((cond == NULL)
-           || !cond->type->is_boolean() || !cond->type->is_scalar()) {
-          YYLTYPE loc = condition->get_location();
-
-          _mesa_glsl_error(& loc, state,
-                           "loop condition must be scalar boolean");
-       } else {
-          /* As the first code in the loop body, generate a block that looks
-           * like 'if (!condition) break;' as the loop termination condition.
-           */
-          ir_rvalue *const not_cond =
-             new(ctx) ir_expression(ir_unop_logic_not, glsl_type::bool_type, cond,
-                                    NULL);
-
-          ir_if *const if_stmt = new(ctx) ir_if(not_cond);
-
-          ir_jump *const break_stmt =
-             new(ctx) ir_loop_jump(ir_loop_jump::jump_break);
-
-          if_stmt->then_instructions.push_tail(break_stmt);
-          stmt->body_instructions.push_tail(if_stmt);
-       }
-     }
-  }
-
-
-  ir_rvalue *
-  ast_iteration_statement::hir(exec_list *instructions,
-                              struct _mesa_glsl_parse_state *state)
-  {
-     void *ctx = state;
-
-     /* For-loops and while-loops start a new scope, but do-while loops do not.
-      */
-     if (mode != ast_do_while)
-       state->symbols->push_scope();
-
-     if (init_statement != NULL)
-       init_statement->hir(instructions, state);
-
-     ir_loop *const stmt = new(ctx) ir_loop();
-     instructions->push_tail(stmt);
-
-     /* Track the current loop nesting.
-      */
-     ast_iteration_statement *nesting_ast = state->loop_nesting_ast;
-
-     state->loop_nesting_ast = this;
-
-     /* Likewise, indicate that following code is closest to a loop,
-      * NOT closest to a switch.
-      */
-     bool saved_is_switch_innermost = state->switch_state.is_switch_innermost;
-     state->switch_state.is_switch_innermost = false;
-
-     if (mode != ast_do_while)
-       condition_to_hir(stmt, state);
+      ir_dereference_variable *deref_test_var =
+        new(ctx) ir_dereference_variable(state->switch_state.test_var);
 
-     if (body != NULL)
-       body->hir(& stmt->body_instructions, state);
+      ir_rvalue *const test_cond = new(ctx) ir_expression(ir_binop_all_equal,
+                                                         label_const,
+                                                         deref_test_var);
 
-     if (rest_expression != NULL)
-       rest_expression->hir(& stmt->body_instructions, state);
+      ir_assignment *set_fallthru_on_test =
+        new(ctx) ir_assignment(deref_fallthru_var,
+                               true_val,
+                               test_cond);
 
-     if (mode == ast_do_while)
-       condition_to_hir(stmt, state);
+      instructions->push_tail(set_fallthru_on_test);
+   } else { /* default case */
+      if (state->switch_state.previous_default) {
+        YYLTYPE loc = this->get_location();
+        _mesa_glsl_error(& loc, state,
+                         "multiple default labels in one switch");
 
-     if (mode != ast_do_while)
-       state->symbols->pop_scope();
+        loc = state->switch_state.previous_default->get_location();
+        _mesa_glsl_error(& loc, state,
+                         "this is the first default label");
+      }
+      state->switch_state.previous_default = this;
+
+      /* Set falltrhu state. */
+      ir_assignment *set_fallthru =
+        new(ctx) ir_assignment(deref_fallthru_var, true_val);
+
+      instructions->push_tail(set_fallthru);
+   }
+
+   /* Case statements do not have r-values. */
+   return NULL;
+}
 
-     /* Restore previous nesting before returning.
-      */
-     state->loop_nesting_ast = nesting_ast;
-     state->switch_state.is_switch_innermost = saved_is_switch_innermost;
+void
+ast_iteration_statement::condition_to_hir(ir_loop *stmt,
+                                         struct _mesa_glsl_parse_state *state)
+{
+   void *ctx = state;
+
+   if (condition != NULL) {
+      ir_rvalue *const cond =
+        condition->hir(& stmt->body_instructions, state);
+
+      if ((cond == NULL)
+         || !cond->type->is_boolean() || !cond->type->is_scalar()) {
+        YYLTYPE loc = condition->get_location();
+
+        _mesa_glsl_error(& loc, state,
+                         "loop condition must be scalar boolean");
+      } else {
+        /* As the first code in the loop body, generate a block that looks
+         * like 'if (!condition) break;' as the loop termination condition.
+         */
+        ir_rvalue *const not_cond =
+           new(ctx) ir_expression(ir_unop_logic_not, cond);
+
+        ir_if *const if_stmt = new(ctx) ir_if(not_cond);
+
+        ir_jump *const break_stmt =
+           new(ctx) ir_loop_jump(ir_loop_jump::jump_break);
+
+        if_stmt->then_instructions.push_tail(break_stmt);
+        stmt->body_instructions.push_tail(if_stmt);
+      }
+   }
+}
+
+
+ir_rvalue *
+ast_iteration_statement::hir(exec_list *instructions,
+                            struct _mesa_glsl_parse_state *state)
+{
+   void *ctx = state;
+
+   /* For-loops and while-loops start a new scope, but do-while loops do not.
+    */
+   if (mode != ast_do_while)
+      state->symbols->push_scope();
+
+   if (init_statement != NULL)
+      init_statement->hir(instructions, state);
+
+   ir_loop *const stmt = new(ctx) ir_loop();
+   instructions->push_tail(stmt);
+
+   /* Track the current loop nesting. */
+   ast_iteration_statement *nesting_ast = state->loop_nesting_ast;
+
+   state->loop_nesting_ast = this;
+
+   /* Likewise, indicate that following code is closest to a loop,
+    * NOT closest to a switch.
+    */
+   bool saved_is_switch_innermost = state->switch_state.is_switch_innermost;
+   state->switch_state.is_switch_innermost = false;
+
+   if (mode != ast_do_while)
+      condition_to_hir(stmt, state);
+
+   if (body != NULL)
+      body->hir(& stmt->body_instructions, state);
+
+   if (rest_expression != NULL)
+      rest_expression->hir(& stmt->body_instructions, state);
+
+   if (mode == ast_do_while)
+      condition_to_hir(stmt, state);
+
+   if (mode != ast_do_while)
+      state->symbols->pop_scope();
+
+   /* Restore previous nesting before returning. */
+   state->loop_nesting_ast = nesting_ast;
+   state->switch_state.is_switch_innermost = saved_is_switch_innermost;
 
    /* Loops do not have r-values.
     */
@@ -4006,3 +4008,154 @@ ast_struct_specifier::hir(exec_list *instructions,
     */
    return NULL;
 }
+
+static struct gl_uniform_block *
+get_next_uniform_block(struct _mesa_glsl_parse_state *state)
+{
+   if (state->num_uniform_blocks >= state->uniform_block_array_size) {
+      state->uniform_block_array_size *= 2;
+      if (state->uniform_block_array_size <= 4)
+        state->uniform_block_array_size = 4;
+
+      state->uniform_blocks = reralloc(state,
+                                      state->uniform_blocks,
+                                      struct gl_uniform_block,
+                                      state->uniform_block_array_size);
+   }
+
+   memset(&state->uniform_blocks[state->num_uniform_blocks],
+         0, sizeof(*state->uniform_blocks));
+   return &state->uniform_blocks[state->num_uniform_blocks++];
+}
+
+ir_rvalue *
+ast_uniform_block::hir(exec_list *instructions,
+                      struct _mesa_glsl_parse_state *state)
+{
+   /* The ast_uniform_block has a list of ast_declarator_lists.  We
+    * need to turn those into ir_variables with an association
+    * with this uniform block.
+    */
+   struct gl_uniform_block *ubo = get_next_uniform_block(state);
+   ubo->Name = ralloc_strdup(state->uniform_blocks, this->block_name);
+
+   unsigned int num_variables = 0;
+   foreach_list_typed(ast_declarator_list, decl_list, link, &declarations) {
+      foreach_list_const(node, &decl_list->declarations) {
+        num_variables++;
+      }
+   }
+
+   bool block_row_major = this->layout.flags.q.row_major;
+
+   ubo->Uniforms = rzalloc_array(state->uniform_blocks,
+                                struct gl_uniform_buffer_variable,
+                                num_variables);
+
+   foreach_list_typed(ast_declarator_list, decl_list, link, &declarations) {
+      exec_list declared_variables;
+
+      decl_list->hir(&declared_variables, state);
+
+      foreach_list_const(node, &declared_variables) {
+        struct ir_variable *var = (ir_variable *)node;
+
+        struct gl_uniform_buffer_variable *ubo_var =
+           &ubo->Uniforms[ubo->NumUniforms++];
+
+        var->uniform_block = ubo - state->uniform_blocks;
+
+        ubo_var->Name = ralloc_strdup(state->uniform_blocks, var->name);
+        ubo_var->Type = var->type;
+        ubo_var->Buffer = ubo - state->uniform_blocks;
+        ubo_var->Offset = 0; /* Assigned at link time. */
+
+        if (var->type->is_matrix() ||
+            (var->type->is_array() && var->type->fields.array->is_matrix())) {
+           ubo_var->RowMajor = block_row_major;
+           if (decl_list->type->qualifier.flags.q.row_major)
+              ubo_var->RowMajor = true;
+           else if (decl_list->type->qualifier.flags.q.column_major)
+              ubo_var->RowMajor = false;
+        }
+
+        /* From the GL_ARB_uniform_buffer_object spec:
+         *
+         *     "Sampler types are not allowed inside of uniform
+         *      blocks. All other types, arrays, and structures
+         *      allowed for uniforms are allowed within a uniform
+         *      block."
+         */
+        if (var->type->contains_sampler()) {
+           YYLTYPE loc = decl_list->get_location();
+           _mesa_glsl_error(&loc, state,
+                            "Uniform in non-default uniform block contains sampler\n");
+        }
+      }
+
+      instructions->append_list(&declared_variables);
+   }
+
+   return NULL;
+}
+
+static void
+detect_conflicting_assignments(struct _mesa_glsl_parse_state *state,
+                              exec_list *instructions)
+{
+   bool gl_FragColor_assigned = false;
+   bool gl_FragData_assigned = false;
+   bool user_defined_fs_output_assigned = false;
+   ir_variable *user_defined_fs_output = NULL;
+
+   /* It would be nice to have proper location information. */
+   YYLTYPE loc;
+   memset(&loc, 0, sizeof(loc));
+
+   foreach_list(node, instructions) {
+      ir_variable *var = ((ir_instruction *)node)->as_variable();
+
+      if (!var || !var->assigned)
+        continue;
+
+      if (strcmp(var->name, "gl_FragColor") == 0)
+        gl_FragColor_assigned = true;
+      else if (strcmp(var->name, "gl_FragData") == 0)
+        gl_FragData_assigned = true;
+      else if (strncmp(var->name, "gl_", 3) != 0) {
+        if (state->target == fragment_shader &&
+            (var->mode == ir_var_out || var->mode == ir_var_inout)) {
+           user_defined_fs_output_assigned = true;
+           user_defined_fs_output = var;
+        }
+      }
+   }
+
+   /* From the GLSL 1.30 spec:
+    *
+    *     "If a shader statically assigns a value to gl_FragColor, it
+    *      may not assign a value to any element of gl_FragData. If a
+    *      shader statically writes a value to any element of
+    *      gl_FragData, it may not assign a value to
+    *      gl_FragColor. That is, a shader may assign values to either
+    *      gl_FragColor or gl_FragData, but not both. Multiple shaders
+    *      linked together must also consistently write just one of
+    *      these variables.  Similarly, if user declared output
+    *      variables are in use (statically assigned to), then the
+    *      built-in variables gl_FragColor and gl_FragData may not be
+    *      assigned to. These incorrect usages all generate compile
+    *      time errors."
+    */
+   if (gl_FragColor_assigned && gl_FragData_assigned) {
+      _mesa_glsl_error(&loc, state, "fragment shader writes to both "
+                      "`gl_FragColor' and `gl_FragData'\n");
+   } else if (gl_FragColor_assigned && user_defined_fs_output_assigned) {
+      _mesa_glsl_error(&loc, state, "fragment shader writes to both "
+                      "`gl_FragColor' and `%s'\n",
+                      user_defined_fs_output->name);
+   } else if (gl_FragData_assigned && user_defined_fs_output_assigned) {
+      _mesa_glsl_error(&loc, state, "fragment shader writes to both "
+                      "`gl_FragData' and `%s'\n",
+                      user_defined_fs_output->name);
+   }
+}