diff options
| author | Chris Forbes <[email protected]> | 2013-11-06 20:09:46 +1300 |
|---|---|---|
| committer | Chris Forbes <[email protected]> | 2013-11-25 22:01:35 +1300 |
| commit | 5127318ae8c1ac4d9b502356bc456a8d513215c0 (patch) | |
| tree | c2ecf23213422d11a549a4b976855766f4791a34 /src/mapi/glapi/gen | |
| parent | 80ac616fca709ab10f7aae062d96ec18d05097a7 (diff) | |
glapi: add plumbing for GL_ARB_draw_indirect and GL_ARB_multi_draw_indirect
Based on part of Patch 2 of Christoph Bumiller's ARB_draw_indirect series.
Signed-off-by: Chris Forbes <[email protected]>
Reviewed-by: Kenneth Graunke <[email protected]>
Reviewed-by: Eric Anholt <[email protected]>
Diffstat (limited to 'src/mapi/glapi/gen')
| -rw-r--r-- | src/mapi/glapi/gen/ARB_draw_indirect.xml | 45 | ||||
| -rw-r--r-- | src/mapi/glapi/gen/Makefile.am | 1 | ||||
| -rw-r--r-- | src/mapi/glapi/gen/gl_API.xml | 4 |
3 files changed, 49 insertions, 1 deletions
diff --git a/src/mapi/glapi/gen/ARB_draw_indirect.xml b/src/mapi/glapi/gen/ARB_draw_indirect.xml new file mode 100644 index 00000000000..7de03cd3502 --- /dev/null +++ b/src/mapi/glapi/gen/ARB_draw_indirect.xml @@ -0,0 +1,45 @@ +<?xml version="1.0"?> +<!DOCTYPE OpenGLAPI SYSTEM "gl_API.dtd"> + +<OpenGLAPI> + +<category name="GL_ARB_draw_indirect" number="87"> + + <enum name="DRAW_INDIRECT_BUFFER" value="0x8F3F"/> + <enum name="DRAW_INDIRECT_BUFFER_BINDING" value="0x8F43"/> + + <function name="DrawArraysIndirect" offset="assign" exec="dynamic"> + <param name="mode" type="GLenum"/> + <param name="indirect" type="const GLvoid *"/> + </function> + + <function name="DrawElementsIndirect" offset="assign" exec="dynamic"> + <param name="mode" type="GLenum"/> + <param name="type" type="GLenum"/> + <param name="indirect" type="const GLvoid *"/> + </function> + +</category> + + +<category name="GL_ARB_multi_draw_indirect" number="133"> + + <function name="MultiDrawArraysIndirect" offset="assign" exec="dynamic"> + <param name="mode" type="GLenum"/> + <param name="indirect" type="const GLvoid *"/> + <param name="primcount" type="GLsizei"/> + <param name="stride" type="GLsizei"/> + </function> + + <function name="MultiDrawElementsIndirect" offset="assign" exec="dynamic"> + <param name="mode" type="GLenum"/> + <param name="type" type="GLenum"/> + <param name="indirect" type="const GLvoid *"/> + <param name="primcount" type="GLsizei"/> + <param name="stride" type="GLsizei"/> + </function> + +</category> + + +</OpenGLAPI> diff --git a/src/mapi/glapi/gen/Makefile.am b/src/mapi/glapi/gen/Makefile.am index 476d943dd93..7af769acf96 100644 --- a/src/mapi/glapi/gen/Makefile.am +++ b/src/mapi/glapi/gen/Makefile.am @@ -98,6 +98,7 @@ API_XML = \ ARB_draw_buffers.xml \ ARB_draw_buffers_blend.xml \ ARB_draw_elements_base_vertex.xml \ + ARB_draw_indirect.xml \ ARB_draw_instanced.xml \ ARB_ES2_compatibility.xml \ ARB_ES3_compatibility.xml \ diff --git a/src/mapi/glapi/gen/gl_API.xml b/src/mapi/glapi/gen/gl_API.xml index a2d914ac46f..5c877aa3f94 100644 --- a/src/mapi/glapi/gen/gl_API.xml +++ b/src/mapi/glapi/gen/gl_API.xml @@ -8241,6 +8241,8 @@ <!-- ARB extensions #86...#93 --> +<xi:include href="ARB_draw_indirect.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/> + <category name="GL_ARB_transform_feedback3" number="94"> <enum name="MAX_TRANSFORM_FEEDBACK_BUFFERS" value="0x8E70"/> <enum name="MAX_VERTEX_STREAMS" value="0x8E71"/> @@ -8470,7 +8472,7 @@ <xi:include href="ARB_invalidate_subdata.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/> -<!-- ARB extensions #133...#138 --> +<!-- ARB extensions #134...#138 --> <xi:include href="ARB_texture_buffer_range.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/> |