aboutsummaryrefslogtreecommitdiff
path: root/mesalib/src/mapi
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2013-10-18 11:59:15 +0200
committermarha <marha@users.sourceforge.net>2013-10-18 11:59:15 +0200
commitb821fe861f33d7e8a39fe4c7d885b7ff379dc476 (patch)
tree7b3c0b22d35eadf598cff3965413a96c76d5ad39 /mesalib/src/mapi
parent56e12b1310b1b52d00bc27e919d915255af5bf03 (diff)
parentb8a77c943fa53005b6cdb1ab792acf5ff0a131be (diff)
downloadvcxsrv-b821fe861f33d7e8a39fe4c7d885b7ff379dc476.tar.gz
vcxsrv-b821fe861f33d7e8a39fe4c7d885b7ff379dc476.tar.bz2
vcxsrv-b821fe861f33d7e8a39fe4c7d885b7ff379dc476.zip
Merge remote-tracking branch 'origin/released'
* origin/released: mesa pixman git update 18 okt 2013 Conflicts: mesalib/include/GL/glext.h mesalib/include/GL/glxext.h
Diffstat (limited to 'mesalib/src/mapi')
-rw-r--r--mesalib/src/mapi/glapi/gen/ARB_texture_multisample.xml4
-rw-r--r--mesalib/src/mapi/glapi/gen/Makefile.am8
2 files changed, 10 insertions, 2 deletions
diff --git a/mesalib/src/mapi/glapi/gen/ARB_texture_multisample.xml b/mesalib/src/mapi/glapi/gen/ARB_texture_multisample.xml
index f0dd4f5f7..1f65a8bcf 100644
--- a/mesalib/src/mapi/glapi/gen/ARB_texture_multisample.xml
+++ b/mesalib/src/mapi/glapi/gen/ARB_texture_multisample.xml
@@ -37,7 +37,7 @@
<function name="TexImage2DMultisample" offset="assign">
<param name="target" type="GLenum"/>
<param name="samples" type="GLsizei"/>
- <param name="internalformat" type="GLint"/>
+ <param name="internalformat" type="GLenum"/>
<param name="width" type="GLsizei"/>
<param name="height" type="GLsizei"/>
<param name="fixedsamplelocations" type="GLboolean"/>
@@ -46,7 +46,7 @@
<function name="TexImage3DMultisample" offset="assign">
<param name="target" type="GLenum"/>
<param name="samples" type="GLsizei"/>
- <param name="internalformat" type="GLint"/>
+ <param name="internalformat" type="GLenum"/>
<param name="width" type="GLsizei"/>
<param name="height" type="GLsizei"/>
<param name="depth" type="GLsizei"/>
diff --git a/mesalib/src/mapi/glapi/gen/Makefile.am b/mesalib/src/mapi/glapi/gen/Makefile.am
index 6bb2f1ec7..d71d5d2a8 100644
--- a/mesalib/src/mapi/glapi/gen/Makefile.am
+++ b/mesalib/src/mapi/glapi/gen/Makefile.am
@@ -89,11 +89,13 @@ XORG_OUTPUTS = \
API_XML = \
gl_API.xml \
ARB_base_instance.xml \
+ ARB_blend_func_extended.xml \
ARB_color_buffer_float.xml \
ARB_copy_buffer.xml \
ARB_debug_output.xml \
ARB_depth_buffer_float.xml \
ARB_depth_clamp.xml \
+ ARB_draw_buffers.xml \
ARB_draw_buffers_blend.xml \
ARB_draw_elements_base_vertex.xml \
ARB_draw_instanced.xml \
@@ -102,6 +104,8 @@ API_XML = \
ARB_framebuffer_object.xml \
ARB_geometry_shader4.xml \
ARB_instanced_arrays.xml \
+ ARB_internalformat_query.xml \
+ ARB_invalidate_subdata.xml \
ARB_map_buffer_range.xml \
ARB_robustness.xml \
ARB_sampler_objects.xml \
@@ -110,9 +114,13 @@ API_XML = \
ARB_texture_buffer_object.xml \
ARB_texture_buffer_range.xml \
ARB_texture_compression_rgtc.xml \
+ ARB_texture_cube_map_array.xml \
ARB_texture_float.xml \
ARB_texture_gather.xml \
+ ARB_texture_multisample.xml \
+ ARB_texture_rgb10_a2ui.xml \
ARB_texture_rg.xml \
+ ARB_texture_storage_multisample.xml \
ARB_texture_storage.xml \
ARB_vertex_array_object.xml \
AMD_draw_buffers_blend.xml \