diff options
| author | Eric Anholt <[email protected]> | 2011-10-03 16:27:59 -0700 |
|---|---|---|
| committer | Eric Anholt <[email protected]> | 2011-10-05 12:49:17 -0700 |
| commit | 684b701c124cf258ba9012adf51357e072ae61f9 (patch) | |
| tree | 44f4677e50e4bba8e68dca0349f335f1e97aff80 /src/glsl/ast_to_hir.cpp | |
| parent | bf059ebd33b4654334c1d96b6022fd6eef278782 (diff) | |
glsl: Consider "__" in identifers as reserved.
Fixes double-underscore-*.frag.
Reviewed-by: Kenneth Graunke <[email protected]>
Diffstat (limited to 'src/glsl/ast_to_hir.cpp')
| -rw-r--r-- | src/glsl/ast_to_hir.cpp | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/src/glsl/ast_to_hir.cpp b/src/glsl/ast_to_hir.cpp index 91a2231605d..4f8a5482bed 100644 --- a/src/glsl/ast_to_hir.cpp +++ b/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 |