[Mesa-dev] [PATCH 1/2] glsl: Bump standalone compiler versions to 3.30.

2013-08-23 Thread Kenneth Graunke
These are necessary in order to compile the built-in functions.

Signed-off-by: Kenneth Graunke kenn...@whitecape.org
---
 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 54c5a49..70e9d75 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 60bc628..e13d5c4 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;
-- 
1.8.3.4

___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev


Re: [Mesa-dev] [PATCH 1/2] glsl: Bump standalone compiler versions to 3.30.

2013-08-23 Thread Matt Turner
On Fri, Aug 23, 2013 at 4:57 PM, Kenneth Graunke kenn...@whitecape.org wrote:
 These are necessary in order to compile the built-in functions.

 Signed-off-by: Kenneth Graunke kenn...@whitecape.org
 ---

Both are Reviewed-by: Matt Turner matts...@gmail.com
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev