summaryrefslogtreecommitdiffstats
path: root/src/mapi
diff options
context:
space:
mode:
authorMarek Olšák <[email protected]>2020-03-22 19:35:28 -0400
committerMarge Bot <[email protected]>2020-04-27 11:56:06 +0000
commit41671ec544dc76e7eb926910e3db69803550c3aa (patch)
tree21299ad38f796ecd4135f138cdc14194eab3c49e /src/mapi
parent00b57915414da01868ff40ecacfe61db9af0d9c5 (diff)
mesa: remove exec="dynamic" from Draw functions that are not really dynamic
Acked-by: Pierre-Eric Pelloux-Prayer <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4758>
Diffstat (limited to 'src/mapi')
-rw-r--r--src/mapi/glapi/gen/ARB_base_instance.xml6
-rw-r--r--src/mapi/glapi/gen/ARB_draw_elements_base_vertex.xml2
-rw-r--r--src/mapi/glapi/gen/ARB_draw_indirect.xml12
-rw-r--r--src/mapi/glapi/gen/ARB_draw_instanced.xml4
-rw-r--r--src/mapi/glapi/gen/ARB_indirect_parameters.xml4
-rw-r--r--src/mapi/glapi/gen/EXT_transform_feedback.xml2
-rw-r--r--src/mapi/glapi/gen/es_EXT.xml4
-rw-r--r--src/mapi/glapi/gen/gl_API.xml10
8 files changed, 22 insertions, 22 deletions
diff --git a/src/mapi/glapi/gen/ARB_base_instance.xml b/src/mapi/glapi/gen/ARB_base_instance.xml
index f9a7661e952..c4c2a5b99ab 100644
--- a/src/mapi/glapi/gen/ARB_base_instance.xml
+++ b/src/mapi/glapi/gen/ARB_base_instance.xml
@@ -8,7 +8,7 @@
<category name="GL_ARB_base_instance" number="107">
- <function name="DrawArraysInstancedBaseInstance" exec="dynamic" marshal="draw"
+ <function name="DrawArraysInstancedBaseInstance" marshal="draw"
marshal_sync="_mesa_glthread_has_non_vbo_vertices(ctx)">
<param name="mode" type="GLenum"/>
<param name="first" type="GLint"/>
@@ -17,7 +17,7 @@
<param name="baseinstance" type="GLuint"/>
</function>
- <function name="DrawElementsInstancedBaseInstance" exec="dynamic" marshal="draw"
+ <function name="DrawElementsInstancedBaseInstance" marshal="draw"
marshal_sync="_mesa_glthread_has_non_vbo_vertices_or_indices(ctx)">
<param name="mode" type="GLenum"/>
<param name="count" type="GLsizei"/>
@@ -27,7 +27,7 @@
<param name="baseinstance" type="GLuint"/>
</function>
- <function name="DrawElementsInstancedBaseVertexBaseInstance" exec="dynamic" marshal="draw"
+ <function name="DrawElementsInstancedBaseVertexBaseInstance" marshal="draw"
marshal_sync="_mesa_glthread_has_non_vbo_vertices_or_indices(ctx)">
<param name="mode" type="GLenum"/>
<param name="count" type="GLsizei"/>
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 915501a9c28..18940b84223 100644
--- a/src/mapi/glapi/gen/ARB_draw_elements_base_vertex.xml
+++ b/src/mapi/glapi/gen/ARB_draw_elements_base_vertex.xml
@@ -38,7 +38,7 @@
<param name="basevertex" type="const GLint *" count="primcount"/>
</function>
- <function name="DrawElementsInstancedBaseVertex" es2="3.2" exec="dynamic" marshal="draw"
+ <function name="DrawElementsInstancedBaseVertex" es2="3.2" marshal="draw"
marshal_sync="_mesa_glthread_has_non_vbo_vertices_or_indices(ctx)">
<param name="mode" type="GLenum"/>
<param name="count" type="GLsizei"/>
diff --git a/src/mapi/glapi/gen/ARB_draw_indirect.xml b/src/mapi/glapi/gen/ARB_draw_indirect.xml
index dc50cc3bd9e..6dc1d6feeec 100644
--- a/src/mapi/glapi/gen/ARB_draw_indirect.xml
+++ b/src/mapi/glapi/gen/ARB_draw_indirect.xml
@@ -8,14 +8,14 @@
<enum name="DRAW_INDIRECT_BUFFER" value="0x8F3F"/>
<enum name="DRAW_INDIRECT_BUFFER_BINDING" value="0x8F43"/>
- <function name="DrawArraysIndirect" exec="dynamic" es2="3.1"
+ <function name="DrawArraysIndirect" es2="3.1"
marshal="draw"
marshal_sync="_mesa_glthread_has_non_vbo_vertices_or_indirect(ctx)">
<param name="mode" type="GLenum"/>
<param name="indirect" type="const GLvoid *"/>
</function>
- <function name="DrawElementsIndirect" exec="dynamic" es2="3.1"
+ <function name="DrawElementsIndirect" es2="3.1"
marshal="draw"
marshal_sync="_mesa_glthread_has_non_vbo_vertices_or_indices_or_indirect(ctx)">
<param name="mode" type="GLenum"/>
@@ -28,7 +28,7 @@
<category name="GL_ARB_multi_draw_indirect" number="133">
- <function name="MultiDrawArraysIndirect" exec="dynamic" marshal="draw"
+ <function name="MultiDrawArraysIndirect" marshal="draw"
marshal_sync="_mesa_glthread_has_non_vbo_vertices_or_indirect(ctx)">
<param name="mode" type="GLenum"/>
<param name="indirect" type="const GLvoid *"/>
@@ -36,7 +36,7 @@
<param name="stride" type="GLsizei"/>
</function>
- <function name="MultiDrawElementsIndirect" exec="dynamic" marshal="draw"
+ <function name="MultiDrawElementsIndirect" marshal="draw"
marshal_sync="_mesa_glthread_has_non_vbo_vertices_or_indices_or_indirect(ctx)">
<param name="mode" type="GLenum"/>
<param name="type" type="GLenum"/>
@@ -50,14 +50,14 @@
<category name="GL_AMD_multi_draw_indirect" number="408">
- <function name="MultiDrawArraysIndirectAMD" exec="dynamic" alias="MultiDrawArraysIndirect">
+ <function name="MultiDrawArraysIndirectAMD" alias="MultiDrawArraysIndirect">
<param name="mode" type="GLenum"/>
<param name="indirect" type="const GLvoid *"/>
<param name="primcount" type="GLsizei"/>
<param name="stride" type="GLsizei"/>
</function>
- <function name="MultiDrawElementsIndirectAMD" exec="dynamic" alias="MultiDrawElementsIndirect">
+ <function name="MultiDrawElementsIndirectAMD" alias="MultiDrawElementsIndirect">
<param name="mode" type="GLenum"/>
<param name="type" type="GLenum"/>
<param name="indirect" type="const GLvoid *"/>
diff --git a/src/mapi/glapi/gen/ARB_draw_instanced.xml b/src/mapi/glapi/gen/ARB_draw_instanced.xml
index 52006c223c3..67846ea1b42 100644
--- a/src/mapi/glapi/gen/ARB_draw_instanced.xml
+++ b/src/mapi/glapi/gen/ARB_draw_instanced.xml
@@ -8,7 +8,7 @@
<category name="GL_ARB_draw_instanced" number="44">
- <function name="DrawArraysInstancedARB" exec="dynamic" marshal="draw"
+ <function name="DrawArraysInstancedARB" marshal="draw"
marshal_sync="_mesa_glthread_has_non_vbo_vertices(ctx)">
<param name="mode" type="GLenum"/>
<param name="first" type="GLint"/>
@@ -16,7 +16,7 @@
<param name="primcount" type="GLsizei"/>
</function>
- <function name="DrawElementsInstancedARB" exec="dynamic" marshal="draw"
+ <function name="DrawElementsInstancedARB" marshal="draw"
marshal_sync="_mesa_glthread_has_non_vbo_vertices_or_indices(ctx)">
<param name="mode" type="GLenum"/>
<param name="count" type="GLsizei"/>
diff --git a/src/mapi/glapi/gen/ARB_indirect_parameters.xml b/src/mapi/glapi/gen/ARB_indirect_parameters.xml
index 7d4f15d8250..2739f153875 100644
--- a/src/mapi/glapi/gen/ARB_indirect_parameters.xml
+++ b/src/mapi/glapi/gen/ARB_indirect_parameters.xml
@@ -8,7 +8,7 @@
<enum name="PARAMETER_BUFFER_ARB" value="0x80EE"/>
<enum name="PARAMETER_BUFFER_BINDING_ARB" value="0x80EF"/>
- <function name="MultiDrawArraysIndirectCountARB" exec="dynamic" marshal="draw"
+ <function name="MultiDrawArraysIndirectCountARB" marshal="draw"
marshal_sync="_mesa_glthread_has_non_vbo_vertices(ctx)">
<param name="mode" type="GLenum"/>
<param name="indirect" type="GLintptr"/>
@@ -18,7 +18,7 @@
</function>
<!-- Use "...has_non_vbo_vertices", because indices always come from a buffer object. -->
- <function name="MultiDrawElementsIndirectCountARB" exec="dynamic" marshal="draw"
+ <function name="MultiDrawElementsIndirectCountARB" marshal="draw"
marshal_sync="_mesa_glthread_has_non_vbo_vertices(ctx)">
<param name="mode" type="GLenum"/>
<param name="type" type="GLenum"/>
diff --git a/src/mapi/glapi/gen/EXT_transform_feedback.xml b/src/mapi/glapi/gen/EXT_transform_feedback.xml
index 9982a3f81a5..604ab7cd0d5 100644
--- a/src/mapi/glapi/gen/EXT_transform_feedback.xml
+++ b/src/mapi/glapi/gen/EXT_transform_feedback.xml
@@ -108,7 +108,7 @@
<function name="ResumeTransformFeedback" es2="3.0" no_error="true">
</function>
- <function name="DrawTransformFeedback" exec="dynamic" marshal="draw">
+ <function name="DrawTransformFeedback" marshal="draw">
<param name="mode" type="GLenum"/>
<param name="id" type="GLuint"/>
</function>
diff --git a/src/mapi/glapi/gen/es_EXT.xml b/src/mapi/glapi/gen/es_EXT.xml
index a5653313605..de3c14dafed 100644
--- a/src/mapi/glapi/gen/es_EXT.xml
+++ b/src/mapi/glapi/gen/es_EXT.xml
@@ -1101,7 +1101,7 @@
</function>
<function name="DrawElementsInstancedBaseVertexEXT" alias="DrawElementsInstancedBaseVertex"
- es2="3.0" exec="dynamic">
+ es2="3.0">
<param name="mode" type="GLenum"/>
<param name="count" type="GLsizei"/>
<param name="type" type="GLenum"/>
@@ -1243,7 +1243,7 @@
</function>
<function name="DrawElementsInstancedBaseVertexOES" alias="DrawElementsInstancedBaseVertex"
- es2="3.0" exec="dynamic">
+ es2="3.0">
<param name="mode" type="GLenum"/>
<param name="count" type="GLsizei"/>
<param name="type" type="GLenum"/>
diff --git a/src/mapi/glapi/gen/gl_API.xml b/src/mapi/glapi/gen/gl_API.xml
index 39c80dabbf4..d421e778091 100644
--- a/src/mapi/glapi/gen/gl_API.xml
+++ b/src/mapi/glapi/gen/gl_API.xml
@@ -2523,7 +2523,7 @@
<glx rop="154"/>
</function>
- <function name="EvalMesh1" deprecated="3.1" exec="dynamic">
+ <function name="EvalMesh1" deprecated="3.1">
<param name="mode" type="GLenum"/>
<param name="i1" type="GLint"/>
<param name="i2" type="GLint"/>
@@ -2535,7 +2535,7 @@
<glx rop="156"/>
</function>
- <function name="EvalMesh2" deprecated="3.1" exec="dynamic">
+ <function name="EvalMesh2" deprecated="3.1">
<param name="mode" type="GLenum"/>
<param name="i1" type="GLint"/>
<param name="i2" type="GLint"/>
@@ -8144,7 +8144,7 @@
<enum name="MAX_TRANSFORM_FEEDBACK_BUFFERS" value="0x8E70"/>
<enum name="MAX_VERTEX_STREAMS" value="0x8E71"/>
- <function name="DrawTransformFeedbackStream" exec="dynamic" marshal="draw">
+ <function name="DrawTransformFeedbackStream" marshal="draw">
<param name="mode" type="GLenum"/>
<param name="id" type="GLuint"/>
<param name="stream" type="GLuint"/>
@@ -8192,13 +8192,13 @@
<xi:include href="ARB_base_instance.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
<category name="GL_ARB_transform_feedback_instanced" number="109">
- <function name="DrawTransformFeedbackInstanced" exec="dynamic" marshal="draw">
+ <function name="DrawTransformFeedbackInstanced" marshal="draw">
<param name="mode" type="GLenum"/>
<param name="id" type="GLuint"/>
<param name="primcount" type="GLsizei"/>
</function>
- <function name="DrawTransformFeedbackStreamInstanced" exec="dynamic" marshal="draw">
+ <function name="DrawTransformFeedbackStreamInstanced" marshal="draw">
<param name="mode" type="GLenum"/>
<param name="id" type="GLuint"/>
<param name="stream" type="GLuint"/>