diff options
| author | marha <marha@users.sourceforge.net> | 2012-08-03 09:39:10 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-08-03 09:39:10 +0200 |
| commit | e158f8fc4a9cf2f884d156ff2dfc0870facfbcba (patch) | |
| tree | 9642a988d6674f27d6971ec2be7e2cdacc784862 /mesalib/src/glsl | |
| parent | ebfd1ae8f80dd16f99f9ef89c28a06f809d07f8d (diff) | |
| parent | 18e75aa6ae27a6e44d93babd96afbbe0cd6077c8 (diff) | |
| download | vcxsrv-e158f8fc4a9cf2f884d156ff2dfc0870facfbcba.tar.gz vcxsrv-e158f8fc4a9cf2f884d156ff2dfc0870facfbcba.tar.bz2 vcxsrv-e158f8fc4a9cf2f884d156ff2dfc0870facfbcba.zip | |
Merge remote-tracking branch 'origin/released'
Diffstat (limited to 'mesalib/src/glsl')
| -rw-r--r-- | mesalib/src/glsl/SConscript | 4 | ||||
| -rw-r--r-- | mesalib/src/glsl/glsl_parser_extras.cpp | 1 | ||||
| -rw-r--r-- | mesalib/src/glsl/glsl_parser_extras.h | 2 |
3 files changed, 7 insertions, 0 deletions
diff --git a/mesalib/src/glsl/SConscript b/mesalib/src/glsl/SConscript index 2fc57c6dd..0855c67bb 100644 --- a/mesalib/src/glsl/SConscript +++ b/mesalib/src/glsl/SConscript @@ -25,6 +25,10 @@ parser_env.Append(YACCFLAGS = [ '-p', '_mesa_glsl_', ]) +# without this line scons will expect "glsl_parser.hpp" instead of +# "glsl_parser.h", causing glsl_parser.cpp to be regenerated every time +parser_env['YACCHXXFILESUFFIX'] = '.h' + glcpp_lexer = env.CFile('glcpp/glcpp-lex.c', 'glcpp/glcpp-lex.l') glcpp_parser = env.CFile('glcpp/glcpp-parse.c', 'glcpp/glcpp-parse.y') glsl_lexer = parser_env.CXXFile('glsl_lexer.cpp', 'glsl_lexer.ll') diff --git a/mesalib/src/glsl/glsl_parser_extras.cpp b/mesalib/src/glsl/glsl_parser_extras.cpp index 09e1e590d..872fcda71 100644 --- a/mesalib/src/glsl/glsl_parser_extras.cpp +++ b/mesalib/src/glsl/glsl_parser_extras.cpp @@ -288,6 +288,7 @@ static const _mesa_glsl_extension _mesa_glsl_supported_extensions[] = { EXT(OES_EGL_image_external, true, false, true, false, true, OES_EGL_image_external), EXT(ARB_shader_bit_encoding, true, true, true, true, false, ARB_shader_bit_encoding), EXT(ARB_uniform_buffer_object, true, false, true, true, false, ARB_uniform_buffer_object), + EXT(OES_standard_derivatives, false, false, true, false, true, OES_standard_derivatives), }; #undef EXT diff --git a/mesalib/src/glsl/glsl_parser_extras.h b/mesalib/src/glsl/glsl_parser_extras.h index 5fc243ffe..e5cbbbed5 100644 --- a/mesalib/src/glsl/glsl_parser_extras.h +++ b/mesalib/src/glsl/glsl_parser_extras.h @@ -207,6 +207,8 @@ struct _mesa_glsl_parse_state { bool ARB_shader_bit_encoding_warn; bool ARB_uniform_buffer_object_enable; bool ARB_uniform_buffer_object_warn; + bool OES_standard_derivatives_enable; + bool OES_standard_derivatives_warn; /*@}*/ /** Extensions supported by the OpenGL implementation. */ |