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

Jason Wood sandain at hotmail.com
Thu Oct 6 13:23:07 PDT 2011


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:
           *


More information about the mesa-dev mailing list