Module: Mesa Branch: main Commit: 513ac52e47d38059a1425e8fc21d00ba258c5dab URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=513ac52e47d38059a1425e8fc21d00ba258c5dab
Author: Marek Olšák <[email protected]> Date: Mon Sep 26 20:16:48 2022 -0400 glthread remove the unused *last pointer from unmarshal functions Acked-By: Mike Blumenkrantz <[email protected]> Reviewed-by: Pierre-Eric Pelloux-Prayer <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/18199> --- src/mapi/glapi/gen/gl_marshal.py | 2 +- src/mapi/glapi/gen/gl_marshal_h.py | 2 +- src/mesa/main/glthread.c | 3 +-- src/mesa/main/glthread_bufferobj.c | 21 +++++---------- src/mesa/main/glthread_draw.c | 54 +++++++++++++------------------------- src/mesa/main/glthread_get.c | 3 +-- src/mesa/main/glthread_list.c | 2 +- src/mesa/main/glthread_marshal.h | 2 +- src/mesa/main/glthread_shaderobj.c | 6 ++--- 9 files changed, 33 insertions(+), 62 deletions(-) diff --git a/src/mapi/glapi/gen/gl_marshal.py b/src/mapi/glapi/gen/gl_marshal.py index 0cb632f6ee5..0f4400695db 100644 --- a/src/mapi/glapi/gen/gl_marshal.py +++ b/src/mapi/glapi/gen/gl_marshal.py @@ -191,7 +191,7 @@ class PrintCode(gl_XML.gl_print_base): out('uint32_t') out(('_mesa_unmarshal_{0}(struct gl_context *ctx, ' - 'const struct marshal_cmd_{0} *cmd, const uint64_t *last)').format(func.name)) + 'const struct marshal_cmd_{0} *cmd)').format(func.name)) out('{') with indent(): for p in fixed_params: diff --git a/src/mapi/glapi/gen/gl_marshal_h.py b/src/mapi/glapi/gen/gl_marshal_h.py index aaf7403d1ff..e3c94697163 100644 --- a/src/mapi/glapi/gen/gl_marshal_h.py +++ b/src/mapi/glapi/gen/gl_marshal_h.py @@ -70,7 +70,7 @@ class PrintCode(gl_XML.gl_print_base): if flavor in ('custom', 'async'): print('struct marshal_cmd_{0};'.format(func.name)) print(('uint32_t _mesa_unmarshal_{0}(struct gl_context *ctx, ' - 'const struct marshal_cmd_{0} *cmd, const uint64_t *last);').format(func.name)) + 'const struct marshal_cmd_{0} *cmd);').format(func.name)) if flavor in ('custom', 'async', 'sync') and not func.marshal_is_static(): print('{0} GLAPIENTRY _mesa_marshal_{1}({2});'.format(func.return_type, func.name, func.get_parameter_string())) diff --git a/src/mesa/main/glthread.c b/src/mesa/main/glthread.c index 279d1db063d..edda1a54b34 100644 --- a/src/mesa/main/glthread.c +++ b/src/mesa/main/glthread.c @@ -50,7 +50,6 @@ glthread_unmarshal_batch(void *job, void *gdata, int thread_index) unsigned pos = 0; unsigned used = batch->used; uint64_t *buffer = batch->buffer; - const uint64_t *last = &buffer[used]; _glapi_set_dispatch(ctx->CurrentServerDispatch); @@ -63,7 +62,7 @@ glthread_unmarshal_batch(void *job, void *gdata, int thread_index) const struct marshal_cmd_base *cmd = (const struct marshal_cmd_base *)&buffer[pos]; - pos += _mesa_unmarshal_dispatch[cmd->cmd_id](ctx, cmd, last); + pos += _mesa_unmarshal_dispatch[cmd->cmd_id](ctx, cmd); } ctx->TexturesLocked = false; diff --git a/src/mesa/main/glthread_bufferobj.c b/src/mesa/main/glthread_bufferobj.c index 80af250fab3..aa64d0596a2 100644 --- a/src/mesa/main/glthread_bufferobj.c +++ b/src/mesa/main/glthread_bufferobj.c @@ -224,8 +224,7 @@ struct marshal_cmd_BindBuffer uint32_t _mesa_unmarshal_BindBuffer(struct gl_context *ctx, - const struct marshal_cmd_BindBuffer *cmd, - const uint64_t *last) + const struct marshal_cmd_BindBuffer *cmd) { CALL_BindBuffer(ctx->CurrentServerDispatch, (cmd->target[0], cmd->buffer[0])); @@ -323,8 +322,7 @@ struct marshal_cmd_BufferData uint32_t _mesa_unmarshal_BufferData(struct gl_context *ctx, - const struct marshal_cmd_BufferData *cmd, - const uint64_t *last) + const struct marshal_cmd_BufferData *cmd) { const GLuint target_or_name = cmd->target_or_name; const GLsizei size = cmd->size; @@ -353,8 +351,7 @@ _mesa_unmarshal_BufferData(struct gl_context *ctx, uint32_t _mesa_unmarshal_NamedBufferData(struct gl_context *ctx, - const struct marshal_cmd_NamedBufferData *cmd, - const uint64_t *last) + const struct marshal_cmd_NamedBufferData *cmd) { unreachable("never used - all BufferData variants use DISPATCH_CMD_BufferData"); return 0; @@ -362,8 +359,7 @@ _mesa_unmarshal_NamedBufferData(struct gl_context *ctx, uint32_t _mesa_unmarshal_NamedBufferDataEXT(struct gl_context *ctx, - const struct marshal_cmd_NamedBufferDataEXT *cmd, - const uint64_t *last) + const struct marshal_cmd_NamedBufferDataEXT *cmd) { unreachable("never used - all BufferData variants use DISPATCH_CMD_BufferData"); return 0; @@ -450,8 +446,7 @@ struct marshal_cmd_BufferSubData uint32_t _mesa_unmarshal_BufferSubData(struct gl_context *ctx, - const struct marshal_cmd_BufferSubData *cmd, - const uint64_t *last) + const struct marshal_cmd_BufferSubData *cmd) { const GLenum target_or_name = cmd->target_or_name; const GLintptr offset = cmd->offset; @@ -473,8 +468,7 @@ _mesa_unmarshal_BufferSubData(struct gl_context *ctx, uint32_t _mesa_unmarshal_NamedBufferSubData(struct gl_context *ctx, - const struct marshal_cmd_NamedBufferSubData *cmd, - const uint64_t *last) + const struct marshal_cmd_NamedBufferSubData *cmd) { unreachable("never used - all BufferSubData variants use DISPATCH_CMD_BufferSubData"); return 0; @@ -482,8 +476,7 @@ _mesa_unmarshal_NamedBufferSubData(struct gl_context *ctx, uint32_t _mesa_unmarshal_NamedBufferSubDataEXT(struct gl_context *ctx, - const struct marshal_cmd_NamedBufferSubDataEXT *cmd, - const uint64_t *last) + const struct marshal_cmd_NamedBufferSubDataEXT *cmd) { unreachable("never used - all BufferSubData variants use DISPATCH_CMD_BufferSubData"); return 0; diff --git a/src/mesa/main/glthread_draw.c b/src/mesa/main/glthread_draw.c index b43b0b539a6..b77e0b3cb5d 100644 --- a/src/mesa/main/glthread_draw.c +++ b/src/mesa/main/glthread_draw.c @@ -274,8 +274,7 @@ struct marshal_cmd_DrawArrays uint32_t _mesa_unmarshal_DrawArrays(struct gl_context *ctx, - const struct marshal_cmd_DrawArrays *cmd, - const uint64_t *last) + const struct marshal_cmd_DrawArrays *cmd) { const GLenum mode = cmd->mode; const GLint first = cmd->first; @@ -300,8 +299,7 @@ struct marshal_cmd_DrawArraysInstancedBaseInstance uint32_t _mesa_unmarshal_DrawArraysInstancedBaseInstance(struct gl_context *ctx, - const struct marshal_cmd_DrawArraysInstancedBaseInstance *cmd, - const uint64_t *last) + const struct marshal_cmd_DrawArraysInstancedBaseInstance *cmd) { const GLenum mode = cmd->mode; const GLint first = cmd->first; @@ -356,8 +354,7 @@ struct marshal_cmd_DrawArraysUserBuf uint32_t _mesa_unmarshal_DrawArraysUserBuf(struct gl_context *ctx, - const struct marshal_cmd_DrawArraysUserBuf *cmd, - const uint64_t *last) + const struct marshal_cmd_DrawArraysUserBuf *cmd) { const GLenum mode = cmd->mode; const GLint first = cmd->first; @@ -466,8 +463,7 @@ struct marshal_cmd_MultiDrawArraysUserBuf uint32_t _mesa_unmarshal_MultiDrawArraysUserBuf(struct gl_context *ctx, - const struct marshal_cmd_MultiDrawArraysUserBuf *cmd, - const uint64_t *last) + const struct marshal_cmd_MultiDrawArraysUserBuf *cmd) { const GLenum mode = cmd->mode; const GLsizei draw_count = cmd->draw_count; @@ -612,8 +608,7 @@ struct marshal_cmd_DrawElementsInstanced uint32_t _mesa_unmarshal_DrawElementsInstanced(struct gl_context *ctx, - const struct marshal_cmd_DrawElementsInstanced *cmd, - const uint64_t *last) + const struct marshal_cmd_DrawElementsInstanced *cmd) { const GLenum mode = cmd->mode; const GLsizei count = cmd->count; @@ -641,8 +636,7 @@ struct marshal_cmd_DrawElementsBaseVertex uint32_t _mesa_unmarshal_DrawElementsBaseVertex(struct gl_context *ctx, - const struct marshal_cmd_DrawElementsBaseVertex *cmd, - const uint64_t *last) + const struct marshal_cmd_DrawElementsBaseVertex *cmd) { const GLenum mode = cmd->mode; const GLsizei count = cmd->count; @@ -672,8 +666,7 @@ struct marshal_cmd_DrawElementsInstancedBaseVertexBaseInstance uint32_t _mesa_unmarshal_DrawElementsInstancedBaseVertexBaseInstance(struct gl_context *ctx, - const struct marshal_cmd_DrawElementsInstancedBaseVertexBaseInstance *cmd, - const uint64_t *last) + const struct marshal_cmd_DrawElementsInstancedBaseVertexBaseInstance *cmd) { const GLenum mode = cmd->mode; const GLsizei count = cmd->count; @@ -706,8 +699,7 @@ struct marshal_cmd_DrawRangeElementsBaseVertex uint32_t _mesa_unmarshal_DrawRangeElementsBaseVertex(struct gl_context *ctx, - const struct marshal_cmd_DrawRangeElementsBaseVertex *cmd, - const uint64_t *last) + const struct marshal_cmd_DrawRangeElementsBaseVertex *cmd) { const GLenum mode = cmd->mode; const GLsizei count = cmd->count; @@ -801,8 +793,7 @@ struct marshal_cmd_DrawElementsUserBuf uint32_t _mesa_unmarshal_DrawElementsUserBuf(struct gl_context *ctx, - const struct marshal_cmd_DrawElementsUserBuf *cmd, - const uint64_t *last) + const struct marshal_cmd_DrawElementsUserBuf *cmd) { const GLenum mode = cmd->mode; const GLsizei count = cmd->count; @@ -1005,8 +996,7 @@ struct marshal_cmd_MultiDrawElementsUserBuf uint32_t _mesa_unmarshal_MultiDrawElementsUserBuf(struct gl_context *ctx, - const struct marshal_cmd_MultiDrawElementsUserBuf *cmd, - const uint64_t *last) + const struct marshal_cmd_MultiDrawElementsUserBuf *cmd) { const GLenum mode = cmd->mode; const GLenum type = cmd->type; @@ -1350,8 +1340,7 @@ _mesa_marshal_MultiDrawElements(GLenum mode, const GLsizei *count, uint32_t _mesa_unmarshal_DrawArraysInstanced(struct gl_context *ctx, - const struct marshal_cmd_DrawArraysInstanced *cmd, - const uint64_t *last) + const struct marshal_cmd_DrawArraysInstanced *cmd) { unreachable("should never end up here"); return 0; @@ -1359,8 +1348,7 @@ _mesa_unmarshal_DrawArraysInstanced(struct gl_context *ctx, uint32_t _mesa_unmarshal_MultiDrawArrays(struct gl_context *ctx, - const struct marshal_cmd_MultiDrawArrays *cmd, - const uint64_t *last) + const struct marshal_cmd_MultiDrawArrays *cmd) { unreachable("should never end up here"); return 0; @@ -1368,8 +1356,7 @@ _mesa_unmarshal_MultiDrawArrays(struct gl_context *ctx, uint32_t _mesa_unmarshal_DrawElements(struct gl_context *ctx, - const struct marshal_cmd_DrawElements *cmd, - const uint64_t *last) + const struct marshal_cmd_DrawElements *cmd) { unreachable("should never end up here"); return 0; @@ -1377,8 +1364,7 @@ _mesa_unmarshal_DrawElements(struct gl_context *ctx, uint32_t _mesa_unmarshal_DrawRangeElements(struct gl_context *ctx, - const struct marshal_cmd_DrawRangeElements *cmd, - const uint64_t *last) + const struct marshal_cmd_DrawRangeElements *cmd) { unreachable("should never end up here"); return 0; @@ -1386,8 +1372,7 @@ _mesa_unmarshal_DrawRangeElements(struct gl_context *ctx, uint32_t _mesa_unmarshal_DrawElementsInstancedBaseVertex(struct gl_context *ctx, - const struct marshal_cmd_DrawElementsInstancedBaseVertex *cmd, - const uint64_t *last) + const struct marshal_cmd_DrawElementsInstancedBaseVertex *cmd) { unreachable("should never end up here"); return 0; @@ -1395,8 +1380,7 @@ _mesa_unmarshal_DrawElementsInstancedBaseVertex(struct gl_context *ctx, uint32_t _mesa_unmarshal_DrawElementsInstancedBaseInstance(struct gl_context *ctx, - const struct marshal_cmd_DrawElementsInstancedBaseInstance *cmd, - const uint64_t *last) + const struct marshal_cmd_DrawElementsInstancedBaseInstance *cmd) { unreachable("should never end up here"); return 0; @@ -1404,8 +1388,7 @@ _mesa_unmarshal_DrawElementsInstancedBaseInstance(struct gl_context *ctx, uint32_t _mesa_unmarshal_MultiDrawElements(struct gl_context *ctx, - const struct marshal_cmd_MultiDrawElements *cmd, - const uint64_t *last) + const struct marshal_cmd_MultiDrawElements *cmd) { unreachable("should never end up here"); return 0; @@ -1413,8 +1396,7 @@ _mesa_unmarshal_MultiDrawElements(struct gl_context *ctx, uint32_t _mesa_unmarshal_MultiDrawElementsBaseVertex(struct gl_context *ctx, - const struct marshal_cmd_MultiDrawElementsBaseVertex *cmd, - const uint64_t *last) + const struct marshal_cmd_MultiDrawElementsBaseVertex *cmd) { unreachable("should never end up here"); return 0; diff --git a/src/mesa/main/glthread_get.c b/src/mesa/main/glthread_get.c index 6a3ed67c081..55581eea87f 100644 --- a/src/mesa/main/glthread_get.c +++ b/src/mesa/main/glthread_get.c @@ -26,8 +26,7 @@ uint32_t _mesa_unmarshal_GetIntegerv(struct gl_context *ctx, - const struct marshal_cmd_GetIntegerv *cmd, - const uint64_t *last) + const struct marshal_cmd_GetIntegerv *cmd) { unreachable("never executed"); return 0; diff --git a/src/mesa/main/glthread_list.c b/src/mesa/main/glthread_list.c index 7e214879dde..c0bcba7d141 100644 --- a/src/mesa/main/glthread_list.c +++ b/src/mesa/main/glthread_list.c @@ -34,7 +34,7 @@ struct marshal_cmd_CallList }; uint32_t -_mesa_unmarshal_CallList(struct gl_context *ctx, const struct marshal_cmd_CallList *cmd, const uint64_t *last) +_mesa_unmarshal_CallList(struct gl_context *ctx, const struct marshal_cmd_CallList *cmd) { const GLuint num = cmd->num; diff --git a/src/mesa/main/glthread_marshal.h b/src/mesa/main/glthread_marshal.h index 605e332bb10..b033dfa3a2b 100644 --- a/src/mesa/main/glthread_marshal.h +++ b/src/mesa/main/glthread_marshal.h @@ -48,7 +48,7 @@ struct marshal_cmd_base uint16_t cmd_size; }; -typedef uint32_t (*_mesa_unmarshal_func)(struct gl_context *ctx, const void *cmd, const uint64_t *last); +typedef uint32_t (*_mesa_unmarshal_func)(struct gl_context *ctx, const void *cmd); extern const _mesa_unmarshal_func _mesa_unmarshal_dispatch[NUM_DISPATCH_CMD]; static inline void * diff --git a/src/mesa/main/glthread_shaderobj.c b/src/mesa/main/glthread_shaderobj.c index 773e7c3af61..aae1ad294c0 100644 --- a/src/mesa/main/glthread_shaderobj.c +++ b/src/mesa/main/glthread_shaderobj.c @@ -38,8 +38,7 @@ _mesa_glthread_ProgramChanged(struct gl_context *ctx) uint32_t _mesa_unmarshal_GetActiveUniform(struct gl_context *ctx, - const struct marshal_cmd_GetActiveUniform *cmd, - const uint64_t *last) + const struct marshal_cmd_GetActiveUniform *cmd) { unreachable("never executed"); return 0; @@ -87,8 +86,7 @@ _mesa_marshal_GetActiveUniform(GLuint program, GLuint index, GLsizei bufSize, uint32_t _mesa_unmarshal_GetUniformLocation(struct gl_context *ctx, - const struct marshal_cmd_GetUniformLocation *cmd, - const uint64_t *last) + const struct marshal_cmd_GetUniformLocation *cmd) { unreachable("never executed"); return 0;
