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

glsl: remove remaining is_array variables

Browse Source 
Previously the reason we needed is_array was because we used array_size == NULL to
 represent both non-arrays and unsized arrays.  Now that we use a non-NULL
array_specifier to represent an unsized array, is_array is redundant.

Signed-off-by: Timothy Arceri <t_arceri@yahoo.com.au>
Reviewed-by: Paul Berry <stereotype441@gmail.com>
This commit is contained in:
Timothy Arceri
2014-01-23 23:22:01 +11:00
parent 61a5846099
commit b0c64d3cc6
5 changed files with 35 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/glsl/glsl_parser_extras.cpp
View File

@@ -790,12 +790,10 @@ ast_node::ast_node(void)
static void
ast_opt_array_dimensions_print(bool is_array, const ast_array_specifier *array_specifier)
ast_opt_array_dimensions_print(const ast_array_specifier *array_specifier)
{
if (is_array) {
if (array_specifier)
array_specifier->print();
}
if (array_specifier)
array_specifier->print();
}
@@ -1018,7 +1016,7 @@ ast_parameter_declarator::print(void) const
type->print();
if (identifier)
printf("%s ", identifier);
ast_opt_array_dimensions_print(is_array, array_specifier);
ast_opt_array_dimensions_print(array_specifier);
}
@@ -1034,7 +1032,7 @@ void
ast_declaration::print(void) const
{
printf("%s ", identifier);
ast_opt_array_dimensions_print(is_array, array_specifier);
ast_opt_array_dimensions_print(array_specifier);
if (initializer) {
printf("= ");
@@ -1043,12 +1041,11 @@ ast_declaration::print(void) const
}
ast_declaration::ast_declaration(const char *identifier, bool is_array,
ast_declaration::ast_declaration(const char *identifier,
ast_array_specifier *array_specifier,
ast_expression *initializer)
{
this->identifier = identifier;
this->is_array = is_array;
this->array_specifier = array_specifier;
this->initializer = initializer;
}