fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-24 19:40:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

glapi: remove EXT and ARB suffixes from Draw functions

Browse source 
This swaps the function names with aliased names that don't have those
suffixes.

Acked-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
Acked-By: Mike Blumenkrantz <michael.blumenkrantz@gmail.com>
Reviewed-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/18199>
This commit is contained in:
Marek Olšák 2022-08-21 18:27:08 -04:00 • committed by Marge Bot
parent 58f738bf5e
commit 5679ef99b8
11 changed files with 62 additions and 62 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/glx/indirect_vertex_array.c
View file

@ -1096,9 +1096,9 @@ __indirect_glMultiDrawArrays(GLenum mode, const GLint *first,
void
__indirect_glMultiDrawElementsEXT(GLenum mode, const GLsizei * count,
GLenum type, const GLvoid * const * indices,
GLsizei primcount)
__indirect_glMultiDrawElements(GLenum mode, const GLsizei * count,
GLenum type, const GLvoid * const * indices,
GLsizei primcount)
{
struct glx_context *gc = __glXGetCurrentContext();
const __GLXattribute *state =

4
src/glx/tests/indirect_api.cpp
View file

@ -590,7 +590,7 @@ void __indirect_glSecondaryColor3us(GLushort red, GLushort green, GLushort blue)
void __indirect_glSecondaryColor3usv(const GLushort *v) { }
void __indirect_glSecondaryColorPointer(GLint size, GLenum type, GLsizei stride, const void *pointer) { }
void __indirect_glMultiDrawArrays(GLenum mode, const GLint *first, const GLsizei *count, GLsizei drawcount) { }
void __indirect_glMultiDrawElementsEXT(GLenum mode, const GLsizei *count, GLenum type, const void *const*indices, GLsizei primcount) { }
void __indirect_glMultiDrawElements(GLenum mode, const GLsizei *count, GLenum type, const void *const*indices, GLsizei primcount) { }
void __indirect_glFogCoordPointer(GLenum type, GLsizei stride, const void *pointer) { }
void __indirect_glFogCoordd(GLdouble coord) { }
void __indirect_glFogCoorddv(const GLdouble *coord) { }
@ -1363,7 +1363,7 @@ TEST_F(IndirectAPI, EXT_secondary_color)
TEST_F(IndirectAPI, EXT_multi_draw_arrays)
{
EXPECT_EQ((_glapi_proc) __indirect_glMultiDrawArrays, table[_glapi_get_proc_offset("glMultiDrawArraysEXT")]);
EXPECT_EQ((_glapi_proc) __indirect_glMultiDrawElementsEXT, table[_glapi_get_proc_offset("glMultiDrawElementsEXT")]);
EXPECT_EQ((_glapi_proc) __indirect_glMultiDrawElements, table[_glapi_get_proc_offset("glMultiDrawElementsEXT")]);
}
TEST_F(IndirectAPI, EXT_fog_coord)

8
src/mapi/glapi/gen/ARB_draw_instanced.xml
View file

@ -8,14 +8,14 @@
<category name="GL_ARB_draw_instanced" number="44">
<function name="DrawArraysInstancedARB" marshal="custom" exec="dlist">
<function name="DrawArraysInstanced" marshal="custom" exec="dlist" es2="2.0">
<param name="mode" type="GLenum"/>
<param name="first" type="GLint"/>
<param name="count" type="GLsizei"/>
<param name="primcount" type="GLsizei"/>
</function>
<function name="DrawElementsInstancedARB" marshal="custom" exec="dlist">
<function name="DrawElementsInstanced" marshal="custom" exec="dlist" es2="2.0">
<param name="mode" type="GLenum"/>
<param name="count" type="GLsizei"/>
<param name="type" type="GLenum"/>
@ -28,14 +28,14 @@
<category name="GL_EXT_draw_instanced" number="327">
<function name="DrawArraysInstancedEXT" alias="DrawArraysInstancedARB">
<function name="DrawArraysInstancedEXT" alias="DrawArraysInstanced">
<param name="mode" type="GLenum"/>
<param name="first" type="GLint"/>
<param name="count" type="GLsizei"/>
<param name="primcount" type="GLsizei"/>
</function>
<function name="DrawElementsInstancedEXT" alias="DrawElementsInstancedARB">
<function name="DrawElementsInstancedEXT" alias="DrawElementsInstanced">
<param name="mode" type="GLenum"/>
<param name="count" type="GLsizei"/>
<param name="type" type="GLenum"/>

4
src/mapi/glapi/gen/GL3x.xml
View file

@ -542,14 +542,14 @@
<enum name="PRIMITIVE_RESTART" value="0x8F9D"/>
<enum name="PRIMITIVE_RESTART_INDEX" value="0x8F9E"/>
<function name="DrawArraysInstanced" alias="DrawArraysInstancedARB" es2="2.0">
<function name="DrawArraysInstancedARB" alias="DrawArraysInstanced">
<param name="mode" type="GLenum"/>
<param name="first" type="GLint"/>
<param name="count" type="GLsizei"/>
<param name="primcount" type="GLsizei"/>
</function>
<function name="DrawElementsInstanced" alias="DrawElementsInstancedARB" es2="2.0">
<function name="DrawElementsInstancedARB" alias="DrawElementsInstanced">
<param name="mode" type="GLenum"/>
<param name="count" type="GLsizei"/>
<param name="type" type="GLenum"/>

4
src/mapi/glapi/gen/gl_API.xml
View file

@ -4804,7 +4804,7 @@
<glx handcode="true"/>
</function>
<function name="MultiDrawElements" alias="MultiDrawElementsEXT">
<function name="MultiDrawElementsEXT" alias="MultiDrawElements">
<param name="mode" type="GLenum"/>
<param name="count" type="const GLsizei *"/>
<param name="type" type="GLenum"/>
@ -9861,7 +9861,7 @@
<param name="primcount" type="GLsizei"/>
</function>
<function name="MultiDrawElementsEXT" es1="1.0" es2="2.0" marshal="custom" exec="dlist">
<function name="MultiDrawElements" es1="1.0" es2="2.0" marshal="custom" exec="dlist">
<param name="mode" type="GLenum"/>
<param name="count" type="const GLsizei *" count="primcount"/>
<param name="type" type="GLenum"/>

6
src/mapi/glapi/gen/static_data.py
View file

@ -692,8 +692,8 @@ offsets = {
"GetInfoLogARB": 656,
"GetObjectParameterfvARB": 657,
"GetObjectParameterivARB": 658,
"DrawArraysInstancedARB": 659,
"DrawElementsInstancedARB": 660,
"DrawArraysInstanced": 659,
"DrawElementsInstanced": 660,
"BindFramebuffer": 661,
"BindRenderbuffer": 662,
"BlitFramebuffer": 663,
@ -1206,7 +1206,7 @@ offsets = {
"PushDebugGroup": 1170,
"SecondaryColor3fEXT": 1171,
"SecondaryColor3fvEXT": 1172,
"MultiDrawElementsEXT": 1173,
"MultiDrawElements": 1173,
"FogCoordfEXT": 1174,
"FogCoordfvEXT": 1175,
"ResizeBuffersMESA": 1176,

2
src/mapi/glapi/tests/check_table.cpp
View file

@ -1290,7 +1290,7 @@ const struct name_offset known_dispatch[] = {
{ "glSecondaryColor3usv", _O(SecondaryColor3usv) },
{ "glSecondaryColorPointer", _O(SecondaryColorPointer) },
{ "glMultiDrawArrays", _O(MultiDrawArrays) },
{ "glMultiDrawElementsEXT", _O(MultiDrawElementsEXT) },
{ "glMultiDrawElements", _O(MultiDrawElements) },
{ "glFogCoordPointer", _O(FogCoordPointer) },
{ "glFogCoordd", _O(FogCoordd) },
{ "glFogCoorddv", _O(FogCoorddv) },

18
src/mesa/main/dlist.c
View file

@ -1532,10 +1532,10 @@ save_BlendEquationSeparateiARB(GLuint buf, GLenum modeRGB, GLenum modeA)
/* GL_ARB_draw_instanced. */
void GLAPIENTRY
save_DrawArraysInstancedARB(UNUSED GLenum mode,
UNUSED GLint first,
UNUSED GLsizei count,
UNUSED GLsizei primcount)
save_DrawArraysInstanced(UNUSED GLenum mode,
UNUSED GLint first,
UNUSED GLsizei count,
UNUSED GLsizei primcount)
{
GET_CURRENT_CONTEXT(ctx);
_mesa_error(ctx, GL_INVALID_OPERATION,
@ -1543,11 +1543,11 @@ save_DrawArraysInstancedARB(UNUSED GLenum mode,
}
void GLAPIENTRY
save_DrawElementsInstancedARB(UNUSED GLenum mode,
UNUSED GLsizei count,
UNUSED GLenum type,
UNUSED const GLvoid *indices,
UNUSED GLsizei primcount)
save_DrawElementsInstanced(UNUSED GLenum mode,
UNUSED GLsizei count,
UNUSED GLenum type,
UNUSED const GLvoid *indices,
UNUSED GLsizei primcount)
{
GET_CURRENT_CONTEXT(ctx);
_mesa_error(ctx, GL_INVALID_OPERATION,

12
src/mesa/main/draw.c
View file

@ -1393,8 +1393,8 @@ _mesa_DrawArrays(GLenum mode, GLint start, GLsizei count)
* display list mode).
*/
void GLAPIENTRY
_mesa_DrawArraysInstancedARB(GLenum mode, GLint start, GLsizei count,
GLsizei numInstances)
_mesa_DrawArraysInstanced(GLenum mode, GLint start, GLsizei count,
GLsizei numInstances)
{
GET_CURRENT_CONTEXT(ctx);
FLUSH_FOR_DRAW(ctx);
@ -1835,8 +1835,8 @@ _mesa_DrawElementsBaseVertex(GLenum mode, GLsizei count, GLenum type,
* Called by glDrawElementsInstanced() in immediate mode.
*/
void GLAPIENTRY
_mesa_DrawElementsInstancedARB(GLenum mode, GLsizei count, GLenum type,
const GLvoid * indices, GLsizei numInstances)
_mesa_DrawElementsInstanced(GLenum mode, GLsizei count, GLenum type,
const GLvoid * indices, GLsizei numInstances)
{
GET_CURRENT_CONTEXT(ctx);
FLUSH_FOR_DRAW(ctx);
@ -2076,8 +2076,8 @@ _mesa_validated_multidrawelements(struct gl_context *ctx, GLenum mode,
void GLAPIENTRY
_mesa_MultiDrawElementsEXT(GLenum mode, const GLsizei *count, GLenum type,
const GLvoid * const *indices, GLsizei primcount)
_mesa_MultiDrawElements(GLenum mode, const GLsizei *count, GLenum type,
const GLvoid * const *indices, GLsizei primcount)
{
GET_CURRENT_CONTEXT(ctx);
FLUSH_FOR_DRAW(ctx);

56
src/mesa/main/glthread_draw.c
View file

@ -292,7 +292,7 @@ _mesa_unmarshal_DrawArrays(struct gl_context *ctx,
}
/* DrawArraysInstancedBaseInstance and NOT supporting user buffers. Ignore the name. */
struct marshal_cmd_DrawArraysInstancedARB
struct marshal_cmd_DrawArraysInstanced
{
struct marshal_cmd_base cmd_base;
GLenum mode;
@ -303,9 +303,9 @@ struct marshal_cmd_DrawArraysInstancedARB
};
uint32_t
_mesa_unmarshal_DrawArraysInstancedARB(struct gl_context *ctx,
const struct marshal_cmd_DrawArraysInstancedARB *cmd,
const uint64_t *last)
_mesa_unmarshal_DrawArraysInstanced(struct gl_context *ctx,
const struct marshal_cmd_DrawArraysInstanced *cmd,
const uint64_t *last)
{
/* Ignore the function name. We use DISPATCH_CMD_DrawArrays{Instanced}
* for all DrawArrays variants without user buffers, and
@ -339,9 +339,9 @@ draw_arrays_async(struct gl_context *ctx, GLenum mode, GLint first,
cmd->first = first;
cmd->count = count;
} else {
int cmd_size = sizeof(struct marshal_cmd_DrawArraysInstancedARB);
struct marshal_cmd_DrawArraysInstancedARB *cmd =
_mesa_glthread_allocate_command(ctx, DISPATCH_CMD_DrawArraysInstancedARB, cmd_size);
int cmd_size = sizeof(struct marshal_cmd_DrawArraysInstanced);
struct marshal_cmd_DrawArraysInstanced *cmd =
_mesa_glthread_allocate_command(ctx, DISPATCH_CMD_DrawArraysInstanced, cmd_size);
cmd->mode = mode;
cmd->first = first;
@ -613,7 +613,7 @@ sync:
}
/* DrawElementsInstanced not supporting user buffers. */
struct marshal_cmd_DrawElementsInstancedARB
struct marshal_cmd_DrawElementsInstanced
{
struct marshal_cmd_base cmd_base;
GLenum16 mode;
@ -628,9 +628,9 @@ struct marshal_cmd_DrawElementsInstancedARB
*/
uint32_t
_mesa_unmarshal_DrawElementsInstancedARB(struct gl_context *ctx,
const struct marshal_cmd_DrawElementsInstancedARB *cmd,
const uint64_t *last)
_mesa_unmarshal_DrawElementsInstanced(struct gl_context *ctx,
const struct marshal_cmd_DrawElementsInstanced *cmd,
const uint64_t *last)
{
/* Ignore the function name. We use DISPATCH_CMD_DrawElementsInstanced-
* BaseVertexBaseInstance for all DrawElements variants with user buffers,
@ -644,8 +644,8 @@ _mesa_unmarshal_DrawElementsInstancedARB(struct gl_context *ctx,
const GLvoid *indices = cmd->indices;
const GLsizei instance_count = cmd->instance_count;
CALL_DrawElementsInstancedARB(ctx->CurrentServerDispatch,
(mode, count, type, indices, instance_count));
CALL_DrawElementsInstanced(ctx->CurrentServerDispatch,
(mode, count, type, indices, instance_count));
const unsigned cmd_size = align(sizeof(*cmd), 8) / 8;
assert(cmd_size == cmd->cmd_base.cmd_size);
return cmd_size;
@ -794,9 +794,9 @@ draw_elements_async(struct gl_context *ctx, GLenum mode, GLsizei count,
}
} else {
if (basevertex == 0 && baseinstance == 0) {
int cmd_size = sizeof(struct marshal_cmd_DrawElementsInstancedARB);
struct marshal_cmd_DrawElementsInstancedARB *cmd =
_mesa_glthread_allocate_command(ctx, DISPATCH_CMD_DrawElementsInstancedARB, cmd_size);
int cmd_size = sizeof(struct marshal_cmd_DrawElementsInstanced);
struct marshal_cmd_DrawElementsInstanced *cmd =
_mesa_glthread_allocate_command(ctx, DISPATCH_CMD_DrawElementsInstanced, cmd_size);
cmd->mode = MIN2(mode, 0xffff);
cmd->type = MIN2(type, 0xffff);
@ -1086,8 +1086,8 @@ _mesa_unmarshal_MultiDrawElementsBaseVertex(struct gl_context *ctx,
(mode, count, type, indices, draw_count,
basevertex));
} else {
CALL_MultiDrawElementsEXT(ctx->CurrentServerDispatch,
(mode, count, type, indices, draw_count));
CALL_MultiDrawElements(ctx->CurrentServerDispatch,
(mode, count, type, indices, draw_count));
}
/* Restore states. */
@ -1294,8 +1294,8 @@ sync:
(mode, count, type, indices, draw_count,
basevertex));
} else {
CALL_MultiDrawElementsEXT(ctx->CurrentServerDispatch,
(mode, count, type, indices, draw_count));
CALL_MultiDrawElements(ctx->CurrentServerDispatch,
(mode, count, type, indices, draw_count));
}
}
@ -1306,8 +1306,8 @@ _mesa_marshal_DrawArrays(GLenum mode, GLint first, GLsizei count)
}
void GLAPIENTRY
_mesa_marshal_DrawArraysInstancedARB(GLenum mode, GLint first, GLsizei count,
GLsizei instance_count)
_mesa_marshal_DrawArraysInstanced(GLenum mode, GLint first, GLsizei count,
GLsizei instance_count)
{
draw_arrays(mode, first, count, instance_count, 0, false);
}
@ -1336,8 +1336,8 @@ _mesa_marshal_DrawRangeElements(GLenum mode, GLuint start, GLuint end,
}
void GLAPIENTRY
_mesa_marshal_DrawElementsInstancedARB(GLenum mode, GLsizei count, GLenum type,
const GLvoid *indices, GLsizei instance_count)
_mesa_marshal_DrawElementsInstanced(GLenum mode, GLsizei count, GLenum type,
const GLvoid *indices, GLsizei instance_count)
{
draw_elements(mode, count, type, indices, instance_count, 0, 0, false, 0, 0, false);
}
@ -1383,9 +1383,9 @@ _mesa_marshal_DrawElementsInstancedBaseVertexBaseInstance(GLenum mode, GLsizei c
}
void GLAPIENTRY
_mesa_marshal_MultiDrawElementsEXT(GLenum mode, const GLsizei *count,
GLenum type, const GLvoid *const *indices,
GLsizei draw_count)
_mesa_marshal_MultiDrawElements(GLenum mode, const GLsizei *count,
GLenum type, const GLvoid *const *indices,
GLsizei draw_count)
{
_mesa_marshal_MultiDrawElementsBaseVertex(mode, count, type, indices,
draw_count, NULL);
@ -1413,7 +1413,7 @@ _mesa_unmarshal_DrawElementsInstancedBaseInstance(struct gl_context *ctx, const
}
uint32_t
_mesa_unmarshal_MultiDrawElementsEXT(struct gl_context *ctx, const struct marshal_cmd_MultiDrawElementsEXT *cmd, const uint64_t *last)
_mesa_unmarshal_MultiDrawElements(struct gl_context *ctx, const struct marshal_cmd_MultiDrawElements *cmd, const uint64_t *last)
{
unreachable("never used - MultiDrawElementsBaseVertex is used instead");
return 0;

4
src/mesa/vbo/vbo_save_api.c
View file

@ -1881,8 +1881,8 @@ save_DrawRangeElementsBaseVertex(GLenum mode, GLuint start, GLuint end,
}
void GLAPIENTRY
save_MultiDrawElementsEXT(GLenum mode, const GLsizei *count, GLenum type,
const GLvoid * const *indices, GLsizei primcount)
save_MultiDrawElements(GLenum mode, const GLsizei *count, GLenum type,
const GLvoid * const *indices, GLsizei primcount)
{
GET_CURRENT_CONTEXT(ctx);
struct _glapi_table *dispatch = ctx->CurrentServerDispatch;