summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Berry <stereotype441@gmail.com>2013-09-27 17:47:02 -0700
committerPaul Berry <stereotype441@gmail.com>2013-10-10 14:27:17 -0700
commit78b072b2bcbd9e730b7a6e09d85c85b44bdd64da (patch)
treea7b3e98db2dc799677e6018a0c1a325400c25b79
parent9fb6f5955276154f04320d096b679b2ae8f61da5 (diff)
glsl: Don't allow invalid identifiers as struct names.
Fixes piglit test spec/glsl-1.10/compiler/struct/struct-name-uses-gl-prefix.vert. Reviewed-by: Kenneth Graunke <kenneth@whitecape.org> Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
-rw-r--r--src/glsl/ast_to_hir.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/glsl/ast_to_hir.cpp b/src/glsl/ast_to_hir.cpp
index 1a5df71201..c7c0a0e2a5 100644
--- a/src/glsl/ast_to_hir.cpp
+++ b/src/glsl/ast_to_hir.cpp
@@ -4575,6 +4575,8 @@ ast_struct_specifier::hir(exec_list *instructions,
false,
false /* allow_reserved_names */);
+ validate_identifier(this->name, loc, state);
+
const glsl_type *t =
glsl_type::get_record_instance(fields, decl_count, this->name);