summaryrefslogtreecommitdiffstats
path: root/src/compiler/glsl/glsl_parser_extras.cpp
diff options
context:
space:
mode:
authorIan Romanick <[email protected]>2017-09-25 20:29:35 -0700
committerIan Romanick <[email protected]>2017-10-30 09:27:09 -0700
commit792acfc44aabc09a19a1d2ef77369159ddb41e66 (patch)
tree8a7ba85cf94f4249ab1e66d8e0c139b638d6909c /src/compiler/glsl/glsl_parser_extras.cpp
parentfc07ab165b1aaf6a64e61ade9eb605165146cd96 (diff)
glsl/parser: Move anonymous struct name handling to the parser
There are two callers of the constructor, and they are right next to each other. Move the "#anon_struct" name handling to the parser so that the conditional can be removed. I've also deleted part of the comment (about the memory leak) because I don't think it's quite accurate or relevant. text data bss dec hex filename 8310399 269336 294072 8873807 87674f 32-bit i965_dri.so before 8310339 269336 294072 8873747 876713 32-bit i965_dri.so after 7845611 346552 420592 8612755 836b93 64-bit i965_dri.so before 7845579 346552 420592 8612723 836b73 64-bit i965_dri.so after Signed-off-by: Ian Romanick <[email protected]> Reviewed-by: Nicolai Hähnle <[email protected]>
Diffstat (limited to 'src/compiler/glsl/glsl_parser_extras.cpp')
-rw-r--r--src/compiler/glsl/glsl_parser_extras.cpp15
1 files changed, 2 insertions, 13 deletions
diff --git a/src/compiler/glsl/glsl_parser_extras.cpp b/src/compiler/glsl/glsl_parser_extras.cpp
index 77c0ea206f4..94ceb5eb873 100644
--- a/src/compiler/glsl/glsl_parser_extras.cpp
+++ b/src/compiler/glsl/glsl_parser_extras.cpp
@@ -1674,21 +1674,10 @@ ast_struct_specifier::print(void) const
ast_struct_specifier::ast_struct_specifier(const char *identifier,
ast_declarator_list *declarator_list)
+ : name(identifier), layout(NULL), declarations(), is_declaration(true),
+ type(NULL)
{
- if (identifier == NULL) {
- /* All anonymous structs have the same name. This simplifies matching of
- * globals whose type is an unnamed struct.
- *
- * It also avoids a memory leak when the same shader is compiled over and
- * over again.
- */
- identifier = "#anon_struct";
- }
- name = identifier;
this->declarations.push_degenerate_list_at_head(&declarator_list->link);
- is_declaration = true;
- layout = NULL;
- type = NULL;
}
void ast_subroutine_list::print(void) const