diff options
| author | Kenneth Graunke <[email protected]> | 2013-08-23 16:52:07 -0700 |
|---|---|---|
| committer | Kenneth Graunke <[email protected]> | 2013-08-25 20:32:39 -0700 |
| commit | 8f00409d230a84a3f84220738486ab739bcfab93 (patch) | |
| tree | a83dcab54f6cd7c67e6982d48da2712b92b7484b | |
| parent | 7950315583244f03a58ac00d7b0516860475914c (diff) | |
glsl: Bump standalone compiler versions to 3.30.
These are necessary in order to compile the built-in functions.
Signed-off-by: Kenneth Graunke <[email protected]>
Reviewed-by: Matt Turner <[email protected]>
| -rwxr-xr-x | src/glsl/builtins/tools/generate_builtins.py | 4 | ||||
| -rw-r--r-- | 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 54c5a49fb23..70e9d75b2ea 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 = 150; + fakeCtx.Const.GLSLVersion = 330; 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 = 150; + st->language_version = 330; 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 60bc6282709..e13d5c45296 100644 --- a/src/glsl/main.cpp +++ b/src/glsl/main.cpp @@ -46,7 +46,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 = 150; + ctx->Const.GLSLVersion = 330; ctx->Extensions.ARB_ES3_compatibility = true; ctx->Const.MaxClipPlanes = 8; |