Mesa (master): glsl: Bump standalone compiler versions to 1.50.

Kenneth Graunke kwg at kemper.freedesktop.org
Wed Mar 20 17:40:49 UTC 2013


Module: Mesa
Branch: master
Commit: f1ca2ed5387a6252a09b88324c1c239f16025ee2
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=f1ca2ed5387a6252a09b88324c1c239f16025ee2

Author: Kenneth Graunke <kenneth at whitecape.org>
Date:   Mon Mar 18 18:57:26 2013 -0700

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

---

 src/glsl/builtins/tools/generate_builtins.py |    4 ++--
 src/glsl/main.cpp                            |    2 +-
 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 6da29c0..748a689 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 ed6f122..ce084b4 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;




More information about the mesa-commit mailing list