glsl2: Actually fix glsl-version-define.

diff --git a/src/glsl/glcpp/glcpp-parse.c b/src/glsl/glcpp/glcpp-parse.c
index f0ad4a08ec771cf5641b2923304b94be2af6dffc..9dc4bfb3ab1477dd9491c20c8d7e9821d6123fd4 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 e82fc92c8c1fe338aeae8116bbd5620148f5d274..855448ff20d91d446965b887f783b49e9a44779b 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;