From: Eric Anholt <eric@anholt.net>
Date: Thu, 29 Jul 2010 00:36:07 +0000 (-0700)
Subject: glsl2: Actually fix glsl-version-define.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=d6942460cec5ffb69dfee7492f7dac59872735de;p=mesa.git

glsl2: Actually fix glsl-version-define.
---

diff --git a/src/glsl/glcpp/glcpp-parse.c b/src/glsl/glcpp/glcpp-parse.c
index f0ad4a08ec7..9dc4bfb3ab1 100644
--- a/src/glsl/glcpp/glcpp-parse.c
+++ b/src/glsl/glcpp/glcpp-parse.c
@@ -3265,9 +3265,6 @@ glcpp_parser_create (const struct gl_extensions *extensions)
 	}
 
 	language_version = 110;
-	if (extensions && extensions->ARB_shading_language_120) {
-	   language_version = 120;
-	}
 	add_builtin_define(parser, "__VERSION__", language_version);
 
 	return parser;
diff --git a/src/glsl/glcpp/glcpp-parse.y b/src/glsl/glcpp/glcpp-parse.y
index e82fc92c8c1..855448ff20d 100644
--- a/src/glsl/glcpp/glcpp-parse.y
+++ b/src/glsl/glcpp/glcpp-parse.y
@@ -963,9 +963,6 @@ glcpp_parser_create (const struct gl_extensions *extensions)
 	}
 
 	language_version = 110;
-	if (extensions && extensions->ARB_shading_language_120) {
-	   language_version = 120;
-	}
 	add_builtin_define(parser, "__VERSION__", language_version);
 
 	return parser;