diff options
| author | Corentin Noël <corentin.noel@collabora.com> | 2023-03-28 16:56:17 +0200 |
|---|---|---|
| committer | Marge Bot <emma+marge@anholt.net> | 2023-04-11 10:22:35 +0000 |
| commit | 45a682650ca566baecd9960bfb7af5dffb94c247 (patch) | |
| tree | b574f8e12712919c923bcb35b5ba5676cc327011 /src/mapi | |
| parent | 8aa4d37b8335401a583fe5659efbc60b1a940c0d (diff) | |
| download | mesa-45a682650ca566baecd9960bfb7af5dffb94c247.tar.gz | |
mesa: Add EXT_instanced_arrays support
The support for ARB_instanced_arrays already exists for big GL, reuse the same
PIPE_CAP_VERTEX_ELEMENT_INSTANCE_DIVISOR for this extension.
The OES_draw_elements_base_vertex and EXT_draw_elements_base_vertex both define
the DrawElementsInstancedBaseVertex method when EXT_instanced_arrays is defined.
Signed-off-by: Corentin Noël <corentin.noel@collabora.com>
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Acked-by: Erik Faye-Lund <erik.faye-lund@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/22167>
Diffstat (limited to 'src/mapi')
| -rw-r--r-- | src/mapi/glapi/gen/ARB_draw_elements_base_vertex.xml | 2 | ||||
| -rw-r--r-- | src/mapi/glapi/gen/ARB_instanced_arrays.xml | 11 | ||||
| -rw-r--r-- | src/mapi/glapi/gen/es_EXT.xml | 4 |
3 files changed, 14 insertions, 3 deletions
diff --git a/src/mapi/glapi/gen/ARB_draw_elements_base_vertex.xml b/src/mapi/glapi/gen/ARB_draw_elements_base_vertex.xml index a7b1be1c6ee..2666d56a7aa 100644 --- a/src/mapi/glapi/gen/ARB_draw_elements_base_vertex.xml +++ b/src/mapi/glapi/gen/ARB_draw_elements_base_vertex.xml @@ -35,7 +35,7 @@ <param name="basevertex" type="const GLint *" count="primcount"/> </function> - <function name="DrawElementsInstancedBaseVertex" es2="3.2" marshal="custom" exec="dlist"> + <function name="DrawElementsInstancedBaseVertex" es2="2.0" marshal="custom" exec="dlist"> <param name="mode" type="GLenum"/> <param name="count" type="GLsizei"/> <param name="type" type="GLenum"/> diff --git a/src/mapi/glapi/gen/ARB_instanced_arrays.xml b/src/mapi/glapi/gen/ARB_instanced_arrays.xml index 49f92cfe8ec..6f68a71b0e5 100644 --- a/src/mapi/glapi/gen/ARB_instanced_arrays.xml +++ b/src/mapi/glapi/gen/ARB_instanced_arrays.xml @@ -24,5 +24,16 @@ </category> +<category name="GL_EXT_instanced_arrays" number="156"> + + <enum name="VERTEX_ATTRIB_ARRAY_DIVISOR_EXT" value="0x88FE"/> + + <function name="VertexAttribDivisorEXT" alias="VertexAttribDivisor" es2="2.0"> + <param name="index" type="GLuint"/> + <param name="divisor" type="GLuint"/> + </function> + <!-- The rest of the bits for this is already in ARB_draw_instanced.xml. --> + +</category> </OpenGLAPI> diff --git a/src/mapi/glapi/gen/es_EXT.xml b/src/mapi/glapi/gen/es_EXT.xml index 5b02dc847db..7127e66d68d 100644 --- a/src/mapi/glapi/gen/es_EXT.xml +++ b/src/mapi/glapi/gen/es_EXT.xml @@ -1106,7 +1106,7 @@ </function> <function name="DrawElementsInstancedBaseVertexEXT" alias="DrawElementsInstancedBaseVertex" - es2="3.0"> + es2="2.0"> <param name="mode" type="GLenum"/> <param name="count" type="GLsizei"/> <param name="type" type="GLenum"/> @@ -1248,7 +1248,7 @@ </function> <function name="DrawElementsInstancedBaseVertexOES" alias="DrawElementsInstancedBaseVertex" - es2="3.0"> + es2="2.0"> <param name="mode" type="GLenum"/> <param name="count" type="GLsizei"/> <param name="type" type="GLenum"/> |