glsl2: Actually fix glsl-version-define.

diff --git a/src/glsl/glcpp/glcpp-parse.c b/src/glsl/glcpp/glcpp-parse.c
index f0ad4a0..9dc4bfb 100644 (file)
--- 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 (file)
--- 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;