aboutsummaryrefslogtreecommitdiff
path: root/mesalib/src/mapi/glapi/gen
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2012-06-21 08:09:37 +0200
committermarha <marha@users.sourceforge.net>2012-06-21 08:09:37 +0200
commitda6ea6d64418710cbf7e0639dfefd2d856d53f1a (patch)
tree23900712d7923a4e77aa095f68e7a955321ba538 /mesalib/src/mapi/glapi/gen
parent36237c651fab7aa9e65da9c33eb89a619827edff (diff)
downloadvcxsrv-da6ea6d64418710cbf7e0639dfefd2d856d53f1a.tar.gz
vcxsrv-da6ea6d64418710cbf7e0639dfefd2d856d53f1a.tar.bz2
vcxsrv-da6ea6d64418710cbf7e0639dfefd2d856d53f1a.zip
mesa pixman xkeyboard-config xserver git update 21 Jun 2012
Diffstat (limited to 'mesalib/src/mapi/glapi/gen')
-rw-r--r--mesalib/src/mapi/glapi/gen/ARB_base_instance.xml40
-rw-r--r--mesalib/src/mapi/glapi/gen/Makefile1
-rw-r--r--mesalib/src/mapi/glapi/gen/gl_API.xml3
3 files changed, 43 insertions, 1 deletions
diff --git a/mesalib/src/mapi/glapi/gen/ARB_base_instance.xml b/mesalib/src/mapi/glapi/gen/ARB_base_instance.xml
new file mode 100644
index 000000000..8e81553f6
--- /dev/null
+++ b/mesalib/src/mapi/glapi/gen/ARB_base_instance.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0"?>
+<!DOCTYPE OpenGLAPI SYSTEM "gl_API.dtd">
+
+<!-- Note: no GLX protocol info yet. -->
+
+
+<OpenGLAPI>
+
+<category name="GL_ARB_base_instance" number="107">
+
+ <function name="DrawArraysInstancedBaseInstance" offset="assign">
+ <param name="mode" type="GLenum"/>
+ <param name="first" type="GLint"/>
+ <param name="count" type="GLsizei"/>
+ <param name="primcount" type="GLsizei"/>
+ <param name="baseinstance" type="GLuint"/>
+ </function>
+
+ <function name="DrawElementsInstancedBaseInstance" offset="assign">
+ <param name="mode" type="GLenum"/>
+ <param name="count" type="GLsizei"/>
+ <param name="type" type="GLenum"/>
+ <param name="indices" type="const GLvoid *"/>
+ <param name="primcount" type="GLsizei"/>
+ <param name="baseinstance" type="GLuint"/>
+ </function>
+
+ <function name="DrawElementsInstancedBaseVertexBaseInstance" offset="assign">
+ <param name="mode" type="GLenum"/>
+ <param name="count" type="GLsizei"/>
+ <param name="type" type="GLenum"/>
+ <param name="indices" type="const GLvoid *"/>
+ <param name="primcount" type="GLsizei"/>
+ <param name="basevertex" type="GLint"/>
+ <param name="baseinstance" type="GLuint"/>
+ </function>
+
+</category>
+
+</OpenGLAPI>
diff --git a/mesalib/src/mapi/glapi/gen/Makefile b/mesalib/src/mapi/glapi/gen/Makefile
index 75dbb1446..0ac798957 100644
--- a/mesalib/src/mapi/glapi/gen/Makefile
+++ b/mesalib/src/mapi/glapi/gen/Makefile
@@ -63,6 +63,7 @@ XORG_OUTPUTS = \
API_XML = \
gl_API.xml \
+ ARB_base_instance.xml \
ARB_color_buffer_float.xml \
ARB_copy_buffer.xml \
ARB_debug_output.xml \
diff --git a/mesalib/src/mapi/glapi/gen/gl_API.xml b/mesalib/src/mapi/glapi/gen/gl_API.xml
index 4bd0fc6b2..c96b2a00f 100644
--- a/mesalib/src/mapi/glapi/gen/gl_API.xml
+++ b/mesalib/src/mapi/glapi/gen/gl_API.xml
@@ -7995,8 +7995,9 @@
<!-- ARB extensions #106...#116 -->
-<xi:include href="ARB_texture_storage.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+<xi:include href="ARB_base_instance.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+<xi:include href="ARB_texture_storage.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
<!-- Non-ARB extensions sorted by extension number. -->