Mesa (9.2): glsl: Remove ubo_qualifiers_allowed variable.

[Ian Romanick]

Module: Mesa
Branch: 9.2
Commit: c1c076dd8dedc508f225428ff7e3df4094ae3611
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=c1c076dd8dedc508f225428ff7e3df4094ae3611

Author: Matt Turner <mattst88 at gmail.com>
Date:   Thu Aug 15 11:14:00 2013 -0700

glsl: Remove ubo_qualifiers_allowed variable.

No longer used.

Reviewed-by: Ian Romanick <ian.d.romanick at intel.com>
Reviewed-by: Anuj Phogat <anuj.phogat at gmail.com>
(cherry picked from commit 921ef55a72dd07a6db0f170767d4a278c46d9ae6)

---

 src/glsl/ast.h                  |    6 ------
 src/glsl/ast_to_hir.cpp         |    5 ++---
 src/glsl/glsl_parser.yy         |    1 -
 src/glsl/glsl_parser_extras.cpp |    1 -
 4 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/src/glsl/ast.h b/src/glsl/ast.h
index f25f02b..e129d5d 100644
--- a/src/glsl/ast.h
+++ b/src/glsl/ast.h
@@ -627,12 +627,6 @@ public:
     * is used to note these cases when no type is specified.
     */
    int invariant;
-
-   /**
-    * Flag indicating that these declarators are in a uniform block,
-    * allowing UBO type qualifiers.
-    */
-   bool ubo_qualifiers_allowed;
 };
 
 
diff --git a/src/glsl/ast_to_hir.cpp b/src/glsl/ast_to_hir.cpp
index fddd3fc..b712be4 100644
--- a/src/glsl/ast_to_hir.cpp
+++ b/src/glsl/ast_to_hir.cpp
@@ -1949,7 +1949,6 @@ apply_type_qualifier_to_variable(const struct ast_type_qualifier *qual,
 				 ir_variable *var,
 				 struct _mesa_glsl_parse_state *state,
 				 YYLTYPE *loc,
-				 bool ubo_qualifiers_allowed,
                                  bool is_parameter)
 {
    if (qual->flags.q.invariant) {
@@ -2735,7 +2734,7 @@ ast_declarator_list::hir(exec_list *instructions,
       }
 
       apply_type_qualifier_to_variable(& this->type->qualifier, var, state,
-				       & loc, this->ubo_qualifiers_allowed, false);
+				       & loc, false);
 
       if (this->type->qualifier.flags.q.invariant) {
 	 if ((state->target == vertex_shader) &&
@@ -3230,7 +3229,7 @@ ast_parameter_declarator::hir(exec_list *instructions,
     * for function parameters the default mode is 'in'.
     */
    apply_type_qualifier_to_variable(& this->type->qualifier, var, state, & loc,
-				    false, true);
+				    true);
 
    /* From page 17 (page 23 of the PDF) of the GLSL 1.20 spec:
     *
diff --git a/src/glsl/glsl_parser.yy b/src/glsl/glsl_parser.yy
index 76b2495..d60a1e0 100644
--- a/src/glsl/glsl_parser.yy
+++ b/src/glsl/glsl_parser.yy
@@ -2251,7 +2251,6 @@ member_declaration:
 
       $$ = new(ctx) ast_declarator_list(type);
       $$->set_location(yylloc);
-      $$->ubo_qualifiers_allowed = true;
 
       $$->declarations.push_degenerate_list_at_head(& $2->link);
    }
diff --git a/src/glsl/glsl_parser_extras.cpp b/src/glsl/glsl_parser_extras.cpp
index d13ddd7..e97461d 100644
--- a/src/glsl/glsl_parser_extras.cpp
+++ b/src/glsl/glsl_parser_extras.cpp
@@ -1199,7 +1199,6 @@ ast_declarator_list::ast_declarator_list(ast_fully_specified_type *type)
 {
    this->type = type;
    this->invariant = false;
-   this->ubo_qualifiers_allowed = false;
 }
 
 void