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.cpp | |
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.cpp')
-rw-r--r-- | mesalib/src/glsl/glsl_parser_extras.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/mesalib/src/glsl/glsl_parser_extras.cpp b/mesalib/src/glsl/glsl_parser_extras.cpp index 872fcda71..f1fdd3a47 100644 --- a/mesalib/src/glsl/glsl_parser_extras.cpp +++ b/mesalib/src/glsl/glsl_parser_extras.cpp @@ -289,6 +289,7 @@ static const _mesa_glsl_extension _mesa_glsl_supported_extensions[] = { 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), + EXT(ARB_texture_cube_map_array, true, false, true, true, false, ARB_texture_cube_map_array), }; #undef EXT |