From: Jason Wood <sandain@hotmail.com>
Date: Fri, 7 Oct 2011 05:37:48 +0000 (-0700)
Subject: glsl: Remove version check when looking for identifiers containing "__".
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=c475a54578bf5473c6c62bc5468ef4fe555164d7;p=mesa.git

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

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

diff --git a/src/glsl/ast_to_hir.cpp b/src/glsl/ast_to_hir.cpp
index 4f8a5482bed..70afb67dfc1 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:
 	     *