summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorEric Anholt <[email protected]>2010-07-28 17:36:07 -0700
committerEric Anholt <[email protected]>2010-07-28 17:36:07 -0700
commitd6942460cec5ffb69dfee7492f7dac59872735de (patch)
treee6ac862de7816fc939026deb386b5d8dbcbc6fe6 /src
parentd4a04f315560704bf1103df0b93723e468725df7 (diff)
glsl2: Actually fix glsl-version-define.
Diffstat (limited to 'src')
-rw-r--r--src/glsl/glcpp/glcpp-parse.c3
-rw-r--r--src/glsl/glcpp/glcpp-parse.y3
2 files changed, 0 insertions, 6 deletions
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;