aboutsummaryrefslogtreecommitdiff
path: root/mesalib/src/glsl/ast_to_hir.cpp
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2011-10-06 08:50:17 +0200
committermarha <marha@users.sourceforge.net>2011-10-06 08:50:17 +0200
commit543c5ecf97b067fe5e0824f996c227e30ee693b0 (patch)
tree7207e6216bd20423b473153e10d1975ca17700fd /mesalib/src/glsl/ast_to_hir.cpp
parenta411d3abb8352c0f65fd4f045d825c0b023dadf4 (diff)
parentb520df571e0a319eae5231d09f36b98f28b8914a (diff)
downloadvcxsrv-543c5ecf97b067fe5e0824f996c227e30ee693b0.tar.gz
vcxsrv-543c5ecf97b067fe5e0824f996c227e30ee693b0.tar.bz2
vcxsrv-543c5ecf97b067fe5e0824f996c227e30ee693b0.zip
Merge remote-tracking branch 'origin/released'
Diffstat (limited to 'mesalib/src/glsl/ast_to_hir.cpp')
-rw-r--r--mesalib/src/glsl/ast_to_hir.cpp13
1 files changed, 13 insertions, 0 deletions
diff --git a/mesalib/src/glsl/ast_to_hir.cpp b/mesalib/src/glsl/ast_to_hir.cpp
index 91a223160..4f8a5482b 100644
--- a/mesalib/src/glsl/ast_to_hir.cpp
+++ b/mesalib/src/glsl/ast_to_hir.cpp
@@ -2803,6 +2803,19 @@ ast_declarator_list::hir(exec_list *instructions,
_mesa_glsl_error(& loc, state,
"identifier `%s' uses reserved `gl_' prefix",
decl->identifier);
+ else if (state->language_version >= 130 &&
+ strstr(decl->identifier, "__")) {
+ /* From page 14 (page 20 of the PDF) of the GLSL 1.10
+ * spec:
+ *
+ * "In addition, all identifiers containing two
+ * consecutive underscores (__) are reserved as
+ * possible future keywords."
+ */
+ _mesa_glsl_error(& loc, state,
+ "identifier `%s' uses reserved `__' string",
+ decl->identifier);
+ }
/* Add the variable to the symbol table. Note that the initializer's
* IR was already processed earlier (though it hasn't been emitted