diff options
author | marha <marha@users.sourceforge.net> | 2012-11-09 13:28:28 +0100 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2012-11-09 13:28:28 +0100 |
commit | 19b61957dbf473cddbae72792ddeeaee4d4a7077 (patch) | |
tree | 0839a8b0cc9c6ea5f3ae63cc34726d4ef936995d /mesalib/src/glsl/glsl_parser_extras.h | |
parent | 480a7a0a6c9a8fae5b8fc7b7688173d5e425ae0e (diff) | |
parent | 8d57b7fcb22cf1a52203ee57c745b64bba649249 (diff) | |
download | vcxsrv-19b61957dbf473cddbae72792ddeeaee4d4a7077.tar.gz vcxsrv-19b61957dbf473cddbae72792ddeeaee4d4a7077.tar.bz2 vcxsrv-19b61957dbf473cddbae72792ddeeaee4d4a7077.zip |
Merge remote-tracking branch 'origin/released'
* origin/released:
mesa git update 9 nov 2012
Diffstat (limited to 'mesalib/src/glsl/glsl_parser_extras.h')
-rw-r--r-- | mesalib/src/glsl/glsl_parser_extras.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/mesalib/src/glsl/glsl_parser_extras.h b/mesalib/src/glsl/glsl_parser_extras.h index a5f6845c4..17ebc76a7 100644 --- a/mesalib/src/glsl/glsl_parser_extras.h +++ b/mesalib/src/glsl/glsl_parser_extras.h @@ -209,6 +209,8 @@ struct _mesa_glsl_parse_state { bool ARB_uniform_buffer_object_warn; bool OES_standard_derivatives_enable; bool OES_standard_derivatives_warn; + bool ARB_texture_cube_map_array_enable; + bool ARB_texture_cube_map_array_warn; /*@}*/ /** Extensions supported by the OpenGL implementation. */ |