Mesa (master): glsl: Remove version check when looking for identifiers containing "__".

Kenneth Graunke kwg at kemper.freedesktop.org
Thu Oct 6 22:40:21 PDT 2011


Module: Mesa
Branch: master
Commit: c475a54578bf5473c6c62bc5468ef4fe555164d7
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=c475a54578bf5473c6c62bc5468ef4fe555164d7

Author: Jason Wood <sandain at hotmail.com>
Date:   Thu Oct  6 22:37:48 2011 -0700

glsl: Remove version check when looking for identifiers containing "__".

Signed-off-by: Kenneth Graunke <kenneth at whitecape.org>

---

 src/glsl/ast_to_hir.cpp |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/src/glsl/ast_to_hir.cpp b/src/glsl/ast_to_hir.cpp
index 4f8a548..70afb67 100644
--- a/src/glsl/ast_to_hir.cpp
+++ b/src/glsl/ast_to_hir.cpp
@@ -2803,8 +2803,7 @@ 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, "__")) {
+	 else if (strstr(decl->identifier, "__")) {
 	    /* From page 14 (page 20 of the PDF) of the GLSL 1.10
 	     * spec:
 	     *



More information about the mesa-commit mailing list