diff options
| author | marha <marha@users.sourceforge.net> | 2012-06-21 08:11:16 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-06-21 08:11:16 +0200 |
| commit | 478ec8cab167e7d8be4973fc3f8d425b1baa4496 (patch) | |
| tree | 0b05eb5a0e3a989a66baff04a954db416444f7c5 /mesalib/src/mapi | |
| parent | 62d040da7ea0a76d48014b5247d98b428ca50a15 (diff) | |
| parent | da6ea6d64418710cbf7e0639dfefd2d856d53f1a (diff) | |
| download | vcxsrv-478ec8cab167e7d8be4973fc3f8d425b1baa4496.tar.gz vcxsrv-478ec8cab167e7d8be4973fc3f8d425b1baa4496.tar.bz2 vcxsrv-478ec8cab167e7d8be4973fc3f8d425b1baa4496.zip | |
Merge remote-tracking branch 'origin/released'
Diffstat (limited to 'mesalib/src/mapi')
| -rw-r--r-- | mesalib/src/mapi/glapi/gen/ARB_base_instance.xml | 40 | ||||
| -rw-r--r-- | mesalib/src/mapi/glapi/gen/Makefile | 1 | ||||
| -rw-r--r-- | mesalib/src/mapi/glapi/gen/gl_API.xml | 3 |
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 b3756a87c..10b6ba91a 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. --> |