glsl: rename ast_uniform_block to ast_interface_block

Signed-off-by: Jordan Justen <jordan.l.justen@intel.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>

diff --git a/src/glsl/ast.h b/src/glsl/ast.h
index 730027177e8912f9bb22047c844f6082980ca3b6..df2a21f793165f1eb9e740701632893b07360b9b 100644 (file)
--- a/src/glsl/ast.h
+++ b/src/glsl/ast.h
@@ -805,9 +805,9 @@ public:
    ast_compound_statement *body;
 };
 
-class ast_uniform_block : public ast_node {
+class ast_interface_block : public ast_node {
 public:
-   ast_uniform_block(ast_type_qualifier layout,
+   ast_interface_block(ast_type_qualifier layout,
                      const char *instance_name,
                     ast_expression *array_size)
    : layout(layout), block_name(NULL), instance_name(instance_name),

diff --git a/src/glsl/ast_to_hir.cpp b/src/glsl/ast_to_hir.cpp
index b206380a7527d0e1403f7506b716b80d8bc05ae9..e5780198955fc335a486484fd889aaf5f28a8bba 100644 (file)
--- a/src/glsl/ast_to_hir.cpp
+++ b/src/glsl/ast_to_hir.cpp
@@ -4120,12 +4120,12 @@ ast_struct_specifier::hir(exec_list *instructions,
 }
 
 ir_rvalue *
-ast_uniform_block::hir(exec_list *instructions,
-                      struct _mesa_glsl_parse_state *state)
+ast_interface_block::hir(exec_list *instructions,
+                         struct _mesa_glsl_parse_state *state)
 {
    YYLTYPE loc = this->get_location();
 
-   /* The ast_uniform_block has a list of ast_declarator_lists.  We
+   /* The ast_interface_block has a list of ast_declarator_lists.  We
     * need to turn those into ir_variables with an association
     * with this uniform block.
     */

diff --git a/src/glsl/glsl_parser.yy b/src/glsl/glsl_parser.yy
index f52ed9b0a944b9f82337d015dfc6d4a730960a36..cd33078e241c64adb46128626d6d635e62b2cba4 100644 (file)
--- a/src/glsl/glsl_parser.yy
+++ b/src/glsl/glsl_parser.yy
@@ -79,7 +79,7 @@ static void yyerror(YYLTYPE *loc, _mesa_glsl_parse_state *st, const char *msg)
    ast_case_label_list *case_label_list;
    ast_case_statement *case_statement;
    ast_case_statement_list *case_statement_list;
-   ast_uniform_block *uniform_block;
+   ast_interface_block *interface_block;
 
    struct {
       ast_node *cond;
@@ -1900,7 +1900,7 @@ uniform_block:
        }
        | layout_qualifier basic_uniform_block
        {
-          ast_uniform_block *block = $2;
+          ast_interface_block *block = $2;
           if (!block->layout.merge_qualifier(& @1, state, $1)) {
              YYERROR;
           }
@@ -1911,7 +1911,7 @@ uniform_block:
 basic_uniform_block:
        UNIFORM NEW_IDENTIFIER '{' member_list '}' instance_name_opt ';'
        {
-          ast_uniform_block *const block = $6;
+          ast_interface_block *const block = $6;
 
           block->block_name = $2;
           block->declarations.push_degenerate_list_at_head(& $4->link);
@@ -1944,19 +1944,19 @@ basic_uniform_block:
 instance_name_opt:
        /* empty */
        {
-          $$ = new(state) ast_uniform_block(*state->default_uniform_qualifier,
+          $$ = new(state) ast_interface_block(*state->default_uniform_qualifier,
                                             NULL,
                                             NULL);
        }
        | NEW_IDENTIFIER
        {
-          $$ = new(state) ast_uniform_block(*state->default_uniform_qualifier,
+          $$ = new(state) ast_interface_block(*state->default_uniform_qualifier,
                                             $1,
                                             NULL);
        }
        | NEW_IDENTIFIER '[' constant_expression ']'
        {
-          $$ = new(state) ast_uniform_block(*state->default_uniform_qualifier,
+          $$ = new(state) ast_interface_block(*state->default_uniform_qualifier,
                                             $1,
                                             $3);
        }
@@ -1965,7 +1965,7 @@ instance_name_opt:
           _mesa_glsl_error(& @1, state,
                            "instance block arrays must be explicitly sized\n");
 
-          $$ = new(state) ast_uniform_block(*state->default_uniform_qualifier,
+          $$ = new(state) ast_interface_block(*state->default_uniform_qualifier,
                                             $1,
                                             NULL);
        }