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 <kenneth@whitecape.org>
Reviewed-by: Jordan Justen <jordan.l.justen@intel.com>
Reviewed-by: Chris Forbes <chrisf@ijw.co.nz>

diff --git a/src/glsl/builtins/tools/generate_builtins.py b/src/glsl/builtins/tools/generate_builtins.py
index 6da29c073e90c6ac1a6be60c8333f42fb1c43200..748a689fe3a7b13255938776d288be4ffcaf956b 100755 (executable)
--- 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 ed6f122798aa654cc2017ed64996b3feb1baf225..ce084b4d7ac39c9672eebcbc51e94f501d0a8dc9 100644 (file)
--- 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;