OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

glsl: rename ast_uniform_block to ast_interface_block

Browse Source 
Signed-off-by: Jordan Justen <jordan.l.justen@intel.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
This commit is contained in:
Jordan Justen
2013-03-09 10:40:41 -08:00
parent 7bfb4bea65
commit c9f58544be
3 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/glsl/ast.h
View File

@@ -805,9 +805,9 @@ public:
ast_compound_statement *body; ast_compound_statement *body;
}; };
class ast_uniform_block : public ast_node { class ast_interface_block : public ast_node {
public: public:
ast_uniform_block(ast_type_qualifier layout, ast_interface_block(ast_type_qualifier layout,
const char *instance_name, const char *instance_name,
ast_expression *array_size) ast_expression *array_size)
: layout(layout), block_name(NULL), instance_name(instance_name), : layout(layout), block_name(NULL), instance_name(instance_name),

4
src/glsl/ast_to_hir.cpp
View File

@@ -4120,12 +4120,12 @@ ast_struct_specifier::hir(exec_list *instructions,
} }
ir_rvalue * ir_rvalue *
ast_uniform_block::hir(exec_list *instructions, ast_interface_block::hir(exec_list *instructions,
struct _mesa_glsl_parse_state *state) struct _mesa_glsl_parse_state *state)
{ {
YYLTYPE loc = this->get_location(); 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 * need to turn those into ir_variables with an association
* with this uniform block. * with this uniform block.
*/ */

14
src/glsl/glsl_parser.yy
View File

@@ -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_label_list *case_label_list;
ast_case_statement *case_statement; ast_case_statement *case_statement;
ast_case_statement_list *case_statement_list; ast_case_statement_list *case_statement_list;
ast_uniform_block *uniform_block; ast_interface_block *interface_block;
struct { struct {
ast_node *cond; ast_node *cond;
@@ -1900,7 +1900,7 @@ uniform_block:
} }
| layout_qualifier basic_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)) { if (!block->layout.merge_qualifier(& @1, state, $1)) {
YYERROR; YYERROR;
} }
@@ -1911,7 +1911,7 @@ uniform_block:
basic_uniform_block: basic_uniform_block:
UNIFORM NEW_IDENTIFIER '{' member_list '}' instance_name_opt ';' 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->block_name = $2;
block->declarations.push_degenerate_list_at_head(& $4->link); block->declarations.push_degenerate_list_at_head(& $4->link);
@@ -1944,19 +1944,19 @@ basic_uniform_block:
instance_name_opt: instance_name_opt:
/* empty */ /* empty */
{ {
$$ = new(state) ast_uniform_block(*state->default_uniform_qualifier, $$ = new(state) ast_interface_block(*state->default_uniform_qualifier,
NULL, NULL,
NULL); NULL);
} }
| NEW_IDENTIFIER | NEW_IDENTIFIER
{ {
$$ = new(state) ast_uniform_block(*state->default_uniform_qualifier, $$ = new(state) ast_interface_block(*state->default_uniform_qualifier,
$1, $1,
NULL); NULL);
} }
| NEW_IDENTIFIER '[' constant_expression ']' | NEW_IDENTIFIER '[' constant_expression ']'
{ {
$$ = new(state) ast_uniform_block(*state->default_uniform_qualifier, $$ = new(state) ast_interface_block(*state->default_uniform_qualifier,
$1, $1,
$3); $3);
} }
@@ -1965,7 +1965,7 @@ instance_name_opt:
_mesa_glsl_error(& @1, state, _mesa_glsl_error(& @1, state,
"instance block arrays must be explicitly sized\n"); "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, $1,
NULL); NULL);
} }