[Mesa-dev] [PATCH] glsl: Remove version check when looking for identifiers containing "__"

[Kenneth Graunke]

On 10/06/2011 01:23 PM, Jason Wood wrote:
> Match the comments regarding identifiers containing "__" being reserved
> in GLSL 1.10
> 
> From: Jason Wood <sandain at hotmail.com>
> 
> --- b/src/glsl/ast_to_hir.cpp    2011-10-06 12:03:01.378402382 -0600
> +++ a/src/glsl/ast_to_hir.cpp    2011-10-06 12:05:21.338400674 -0600
> @@ -2803,8 +2803,7 @@
>          _mesa_glsl_error(& loc, state,
>                   "identifier `%s' uses reserved `gl_' prefix",
>                   decl->identifier);
> -     else if (state->language_version >= 130 &&
> -          strstr(decl->identifier, "__")) {
> +     else if (strstr(decl->identifier, "__")) {
>          /* From page 14 (page 20 of the PDF) of the GLSL 1.10
>           * spec:
>           *

That is indeed what we talked about...apparently Eric updated it with a
comment but accidentally forgot to take out the check.  Oops :)

Pushed.  Thanks!