summaryrefslogtreecommitdiffstats
path: root/src/glsl
diff options
context:
space:
mode:
authorKenneth Graunke <[email protected]>2013-03-18 18:57:26 -0700
committerKenneth Graunke <[email protected]>2013-03-20 10:38:20 -0700
commitf1ca2ed5387a6252a09b88324c1c239f16025ee2 (patch)
treefc2668b629adde3b3938397eb839f386f37b7457 /src/glsl
parentd86efc075ed84a8c45bfb71cee56dcd18858f727 (diff)
glsl: Bump standalone compiler versions to 1.50.
The version bumps are necessary in order to compile built-ins for 1.50. Signed-off-by: Kenneth Graunke <[email protected]> Reviewed-by: Jordan Justen <[email protected]> Reviewed-by: Chris Forbes <[email protected]>
Diffstat (limited to 'src/glsl')
-rwxr-xr-xsrc/glsl/builtins/tools/generate_builtins.py4
-rw-r--r--src/glsl/main.cpp2
2 files changed, 3 insertions, 3 deletions
diff --git a/src/glsl/builtins/tools/generate_builtins.py b/src/glsl/builtins/tools/generate_builtins.py
index 6da29c073e9..748a689fe3a 100755
--- a/src/glsl/builtins/tools/generate_builtins.py
+++ b/src/glsl/builtins/tools/generate_builtins.py
@@ -174,7 +174,7 @@ read_builtins(GLenum target, const char *protos, const char **functions, unsigne
{
struct gl_context fakeCtx;
fakeCtx.API = API_OPENGL_COMPAT;
- fakeCtx.Const.GLSLVersion = 140;
+ fakeCtx.Const.GLSLVersion = 150;
fakeCtx.Extensions.ARB_ES2_compatibility = true;
fakeCtx.Extensions.ARB_ES3_compatibility = true;
fakeCtx.Const.ForceGLSLExtensionsWarn = false;
@@ -182,7 +182,7 @@ read_builtins(GLenum target, const char *protos, const char **functions, unsigne
struct _mesa_glsl_parse_state *st =
new(sh) _mesa_glsl_parse_state(&fakeCtx, target, sh);
- st->language_version = 140;
+ st->language_version = 150;
st->symbols->separate_function_namespace = false;
st->ARB_texture_rectangle_enable = true;
st->EXT_texture_array_enable = true;
diff --git a/src/glsl/main.cpp b/src/glsl/main.cpp
index ed6f122798a..ce084b4d7ac 100644
--- a/src/glsl/main.cpp
+++ b/src/glsl/main.cpp
@@ -47,7 +47,7 @@ initialize_context(struct gl_context *ctx, gl_api api)
/* The standalone compiler needs to claim support for almost
* everything in order to compile the built-in functions.
*/
- ctx->Const.GLSLVersion = 140;
+ ctx->Const.GLSLVersion = 150;
ctx->Extensions.ARB_ES3_compatibility = true;
ctx->Const.MaxClipPlanes = 8;