diff options
| author | marha <marha@users.sourceforge.net> | 2011-01-16 16:33:47 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-01-16 16:33:47 +0000 |
| commit | 5d0def58c0a3124e70076584cadc7c761e1f9e57 (patch) | |
| tree | e87238976fbf7b0845aaa60876e417ca42146e1a /mesalib/src/mapi/glapi/gen/gl_API.xml | |
| parent | 8b668e29799ccd203f12719c6ef92c08027f6592 (diff) | |
| parent | 367c91bebcdc1f5ba4278b68eb8715218d9640ad (diff) | |
| download | vcxsrv-5d0def58c0a3124e70076584cadc7c761e1f9e57.tar.gz vcxsrv-5d0def58c0a3124e70076584cadc7c761e1f9e57.tar.bz2 vcxsrv-5d0def58c0a3124e70076584cadc7c761e1f9e57.zip | |
svn merge ^/branches/released .
Diffstat (limited to 'mesalib/src/mapi/glapi/gen/gl_API.xml')
| -rw-r--r-- | mesalib/src/mapi/glapi/gen/gl_API.xml | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/mesalib/src/mapi/glapi/gen/gl_API.xml b/mesalib/src/mapi/glapi/gen/gl_API.xml index 846ce863b..b792c7815 100644 --- a/mesalib/src/mapi/glapi/gen/gl_API.xml +++ b/mesalib/src/mapi/glapi/gen/gl_API.xml @@ -7949,6 +7949,8 @@ </enum>
</category>
+<xi:include href="ARB_ES2_compatibility.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+
<xi:include href="ARB_framebuffer_object.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
<xi:include href="ARB_copy_buffer.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
@@ -12521,5 +12523,8 @@ <xi:include href="EXT_gpu_shader4.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
<xi:include href="GL3x.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+<xi:include href="ARB_instanced_arrays.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+
+<xi:include href="ARB_draw_buffers_blend.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
</OpenGLAPI>
|