aboutsummaryrefslogtreecommitdiff
path: root/mesalib/src/mapi
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2012-11-09 13:28:28 +0100
committermarha <marha@users.sourceforge.net>2012-11-09 13:28:28 +0100
commit19b61957dbf473cddbae72792ddeeaee4d4a7077 (patch)
tree0839a8b0cc9c6ea5f3ae63cc34726d4ef936995d /mesalib/src/mapi
parent480a7a0a6c9a8fae5b8fc7b7688173d5e425ae0e (diff)
parent8d57b7fcb22cf1a52203ee57c745b64bba649249 (diff)
downloadvcxsrv-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/mapi')
-rw-r--r--mesalib/src/mapi/glapi/gen/ARB_texture_cube_map_array.xml18
-rw-r--r--mesalib/src/mapi/glapi/gen/gl_API.xml2
2 files changed, 19 insertions, 1 deletions
diff --git a/mesalib/src/mapi/glapi/gen/ARB_texture_cube_map_array.xml b/mesalib/src/mapi/glapi/gen/ARB_texture_cube_map_array.xml
new file mode 100644
index 000000000..bf101925c
--- /dev/null
+++ b/mesalib/src/mapi/glapi/gen/ARB_texture_cube_map_array.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<!DOCTYPE OpenGLAPI SYSTEM "gl_API.dtd">
+
+<OpenGLAPI>
+
+<category name="GL_ARB_texture_cube_map_array" number="71">
+
+ <enum name="TEXTURE_CUBE_MAP_ARRAY_ARB" value="0x9009"/>
+ <enum name="TEXTURE_BINDING_CUBE_MAP_ARRAY_ARB" value="0x900A"/>
+ <enum name="PROXY_TEXTURE_CUBE_MAP_ARRAY_ARB" value="0x900B"/>
+ <enum name="SAMPLER_CUBE_MAP_ARRAY_ARB" value="0x900C"/>
+ <enum name="SAMPLER_CUBE_MAP_ARRAY_SHADOW_ARB" value="0x900D"/>
+ <enum name="INT_SAMPLER_CUBE_MAP_ARRAY_ARB" value="0x900E"/>
+ <enum name="UNSIGNED_INT_SAMPLER_CUBE_MAP_ARRAY_ARB" value="0x900F"/>
+
+</category>
+
+</OpenGLAPI>
diff --git a/mesalib/src/mapi/glapi/gen/gl_API.xml b/mesalib/src/mapi/glapi/gen/gl_API.xml
index bc85534cc..a0382162b 100644
--- a/mesalib/src/mapi/glapi/gen/gl_API.xml
+++ b/mesalib/src/mapi/glapi/gen/gl_API.xml
@@ -8174,7 +8174,7 @@
<xi:include href="AMD_draw_buffers_blend.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
<!-- 70. GL_ARB_sample_shading -->
-<!-- 71. GL_ARB_texture_cube_map_array -->
+<xi:include href="ARB_texture_cube_map_array.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
<!-- 72. GL_ARB_texture_gather -->
<!-- 73. GL_ARB_texture_query_lod -->