diff options
author | Marek Olšák <marek.olsak@amd.com> | 2020-12-23 07:10:06 -0500 |
---|---|---|
committer | Marge Bot <eric+marge@anholt.net> | 2021-01-21 00:12:35 +0000 |
commit | e31d8fa0ad614af16d2111cd80b422c82132ae63 (patch) | |
tree | 9b5dc7f2b94327b18a653d90a6876b948596946d /src/mapi/glapi | |
parent | 33ad9e77c531fc191e2b747814cc146889d082eb (diff) |
mesa: remove _mesa_initialize_exec_dispatch from draw.c by autogenerating it
The glapi scripts are fully capable of generating this correctly for all
GL APIs if we don't set exec="dynamic".
exec="dynamic" should only be used for glBegin, glEnd, and all functions
that are legal inside Begin/End.
Acked-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8297>
Diffstat (limited to 'src/mapi/glapi')
-rw-r--r-- | src/mapi/glapi/gen/ARB_draw_elements_base_vertex.xml | 6 | ||||
-rw-r--r-- | src/mapi/glapi/gen/es_EXT.xml | 10 | ||||
-rw-r--r-- | src/mapi/glapi/gen/gl_API.xml | 26 | ||||
-rw-r--r-- | src/mapi/glapi/gen/gl_genexec.py | 2 |
4 files changed, 21 insertions, 23 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 0350dd735a7..08ea7a31ca0 100644 --- a/src/mapi/glapi/gen/ARB_draw_elements_base_vertex.xml +++ b/src/mapi/glapi/gen/ARB_draw_elements_base_vertex.xml @@ -8,7 +8,7 @@ <category name="GL_ARB_draw_elements_base_vertex" number="62"> - <function name="DrawElementsBaseVertex" es2="3.2" exec="dynamic" marshal="custom"> + <function name="DrawElementsBaseVertex" es2="3.2" marshal="custom"> <param name="mode" type="GLenum"/> <param name="count" type="GLsizei"/> <param name="type" type="GLenum"/> @@ -16,7 +16,7 @@ <param name="basevertex" type="GLint"/> </function> - <function name="DrawRangeElementsBaseVertex" es2="3.2" exec="dynamic" marshal="custom"> + <function name="DrawRangeElementsBaseVertex" es2="3.2" marshal="custom"> <param name="mode" type="GLenum"/> <param name="start" type="GLuint"/> <param name="end" type="GLuint"/> @@ -26,7 +26,7 @@ <param name="basevertex" type="GLint"/> </function> - <function name="MultiDrawElementsBaseVertex" exec="dynamic" marshal="custom"> + <function name="MultiDrawElementsBaseVertex" marshal="custom"> <param name="mode" type="GLenum"/> <param name="count" type="const GLsizei *" count="primcount"/> <param name="type" type="GLenum"/> diff --git a/src/mapi/glapi/gen/es_EXT.xml b/src/mapi/glapi/gen/es_EXT.xml index 4386375940f..929b40bbd4a 100644 --- a/src/mapi/glapi/gen/es_EXT.xml +++ b/src/mapi/glapi/gen/es_EXT.xml @@ -1076,7 +1076,7 @@ <category name="GL_EXT_draw_elements_base_vertex" number="204"> <function name="DrawElementsBaseVertexEXT" alias="DrawElementsBaseVertex" - es2="2.0" exec="dynamic"> + es2="2.0"> <param name="mode" type="GLenum"/> <param name="count" type="GLsizei"/> <param name="type" type="GLenum"/> @@ -1085,7 +1085,7 @@ </function> <function name="DrawRangeElementsBaseVertexEXT" alias="DrawRangeElementsBaseVertex" - es2="3.0" exec="dynamic"> + es2="3.0"> <param name="mode" type="GLenum"/> <param name="start" type="GLuint"/> <param name="end" type="GLuint"/> @@ -1096,7 +1096,7 @@ </function> <function name="MultiDrawElementsBaseVertexEXT" alias="MultiDrawElementsBaseVertex" - es2="2.0" exec="dynamic"> + es2="2.0"> <param name="mode" type="GLenum"/> <param name="count" type="const GLsizei *"/> <param name="type" type="GLenum"/> @@ -1228,7 +1228,7 @@ <category name="GL_OES_draw_elements_base_vertex" number="219"> <function name="DrawElementsBaseVertexOES" alias="DrawElementsBaseVertex" - es2="2.0" exec="dynamic"> + es2="2.0"> <param name="mode" type="GLenum"/> <param name="count" type="GLsizei"/> <param name="type" type="GLenum"/> @@ -1237,7 +1237,7 @@ </function> <function name="DrawRangeElementsBaseVertexOES" alias="DrawRangeElementsBaseVertex" - es2="3.0" exec="dynamic"> + es2="3.0"> <param name="mode" type="GLenum"/> <param name="start" type="GLuint"/> <param name="end" type="GLuint"/> diff --git a/src/mapi/glapi/gen/gl_API.xml b/src/mapi/glapi/gen/gl_API.xml index 9abc045ce87..f97aea70061 100644 --- a/src/mapi/glapi/gen/gl_API.xml +++ b/src/mapi/glapi/gen/gl_API.xml @@ -1598,53 +1598,53 @@ <glx rop="44"/> </function> - <function name="Rectd" vectorequiv="Rectdv" deprecated="3.1" exec="dynamic"> + <function name="Rectd" vectorequiv="Rectdv" deprecated="3.1"> <param name="x1" type="GLdouble"/> <param name="y1" type="GLdouble"/> <param name="x2" type="GLdouble"/> <param name="y2" type="GLdouble"/> </function> - <function name="Rectdv" deprecated="3.1" exec="dynamic"> + <function name="Rectdv" deprecated="3.1"> <param name="v1" type="const GLdouble *" count="2"/> <param name="v2" type="const GLdouble *" count="2"/> <glx rop="45"/> </function> - <function name="Rectf" vectorequiv="Rectfv" deprecated="3.1" exec="dynamic"> + <function name="Rectf" vectorequiv="Rectfv" deprecated="3.1"> <param name="x1" type="GLfloat"/> <param name="y1" type="GLfloat"/> <param name="x2" type="GLfloat"/> <param name="y2" type="GLfloat"/> </function> - <function name="Rectfv" deprecated="3.1" exec="dynamic"> + <function name="Rectfv" deprecated="3.1"> <param name="v1" type="const GLfloat *" count="2"/> <param name="v2" type="const GLfloat *" count="2"/> <glx rop="46"/> </function> - <function name="Recti" vectorequiv="Rectiv" deprecated="3.1" exec="dynamic"> + <function name="Recti" vectorequiv="Rectiv" deprecated="3.1"> <param name="x1" type="GLint"/> <param name="y1" type="GLint"/> <param name="x2" type="GLint"/> <param name="y2" type="GLint"/> </function> - <function name="Rectiv" deprecated="3.1" exec="dynamic"> + <function name="Rectiv" deprecated="3.1"> <param name="v1" type="const GLint *" count="2"/> <param name="v2" type="const GLint *" count="2"/> <glx rop="47"/> </function> - <function name="Rects" vectorequiv="Rectsv" deprecated="3.1" exec="dynamic"> + <function name="Rects" vectorequiv="Rectsv" deprecated="3.1"> <param name="x1" type="GLshort"/> <param name="y1" type="GLshort"/> <param name="x2" type="GLshort"/> <param name="y2" type="GLshort"/> </function> - <function name="Rectsv" deprecated="3.1" exec="dynamic"> + <function name="Rectsv" deprecated="3.1"> <param name="v1" type="const GLshort *" count="2"/> <param name="v2" type="const GLshort *" count="2"/> <glx rop="48"/> @@ -3199,14 +3199,14 @@ <glx handcode="true"/> </function> - <function name="DrawArrays" es1="1.0" es2="2.0" exec="dynamic" marshal="custom"> + <function name="DrawArrays" es1="1.0" es2="2.0" marshal="custom"> <param name="mode" type="GLenum"/> <param name="first" type="GLint"/> <param name="count" type="GLsizei"/> <glx rop="193" handcode="true"/> </function> - <function name="DrawElements" es1="1.0" es2="2.0" exec="dynamic" marshal="custom"> + <function name="DrawElements" es1="1.0" es2="2.0" marshal="custom"> <param name="mode" type="GLenum"/> <param name="count" type="GLsizei"/> <param name="type" type="GLenum"/> @@ -3777,7 +3777,7 @@ <glx rop="4097"/> </function> - <function name="DrawRangeElements" es2="3.0" exec="dynamic" marshal="custom"> + <function name="DrawRangeElements" es2="3.0" marshal="custom"> <param name="mode" type="GLenum"/> <param name="start" type="GLuint"/> <param name="end" type="GLuint"/> @@ -10298,14 +10298,14 @@ </category> <category name="GL_EXT_multi_draw_arrays" number="148"> - <function name="MultiDrawArraysEXT" es1="1.0" es2="2.0" exec="dynamic" alias="MultiDrawArrays"> + <function name="MultiDrawArraysEXT" es1="1.0" es2="2.0" alias="MultiDrawArrays"> <param name="mode" type="GLenum"/> <param name="first" type="const GLint *"/> <param name="count" type="const GLsizei *"/> <param name="primcount" type="GLsizei"/> </function> - <function name="MultiDrawElementsEXT" es1="1.0" es2="2.0" exec="dynamic" marshal="custom"> + <function name="MultiDrawElementsEXT" es1="1.0" es2="2.0" marshal="custom"> <param name="mode" type="GLenum"/> <param name="count" type="const GLsizei *" count="primcount"/> <param name="type" type="GLenum"/> diff --git a/src/mapi/glapi/gen/gl_genexec.py b/src/mapi/glapi/gen/gl_genexec.py index 9f7c8ca8baa..8bca9ed6904 100644 --- a/src/mapi/glapi/gen/gl_genexec.py +++ b/src/mapi/glapi/gen/gl_genexec.py @@ -149,8 +149,6 @@ _mesa_initialize_exec_table(struct gl_context *ctx) assert(exec != NULL); assert(ctx->Version > 0); - - _mesa_initialize_exec_dispatch(ctx, exec); """ |