Mesa (glsl2): glsl2: Actually fix glsl-version-define.

Eric Anholt anholt at kemper.freedesktop.org
Thu Jul 29 00:39:32 UTC 2010


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

Author: Eric Anholt <eric at anholt.net>
Date:   Wed Jul 28 17:36:07 2010 -0700

glsl2: Actually fix glsl-version-define.

---

 src/glsl/glcpp/glcpp-parse.c |    3 ---
 src/glsl/glcpp/glcpp-parse.y |    3 ---
 2 files changed, 0 insertions(+), 6 deletions(-)

diff --git a/src/glsl/glcpp/glcpp-parse.c b/src/glsl/glcpp/glcpp-parse.c
index f0ad4a0..9dc4bfb 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 e82fc92..855448f 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;




More information about the mesa-commit mailing list