From 1430b06e9b2f885bb6323040a1a0508184ec8c92 Mon Sep 17 00:00:00 2001 From: Pierre-Eric Pelloux-Prayer Date: Thu, 23 Oct 2025 15:22:31 +0200 Subject: [PATCH] mesa: fix function prototype MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Replace void* by GLvoid* and add GLAPIENTRY to match the gl_API.xml version. Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/14164 Fixes: ae75b59cb52 ("glthread, tc: Fix buffer release with glthread and tc") Reviewed-by: Marek Olšák (cherry picked from commit 671e943c9b96e8d518eedaf972bb095b61b8ad09) Part-of: --- .pick_status.json | 2 +- src/mesa/main/glthread.h | 2 +- src/mesa/main/glthread_bufferobj.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 099b7aaab70..0f723538a8a 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -1184,7 +1184,7 @@ "description": "mesa: fix function prototype", "nominated": true, "nomination_type": 2, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "ae75b59cb526eff5de906726b105e33258a283cf", "notes": null diff --git a/src/mesa/main/glthread.h b/src/mesa/main/glthread.h index 1447d686ce1..c2debd7e87e 100644 --- a/src/mesa/main/glthread.h +++ b/src/mesa/main/glthread.h @@ -405,7 +405,7 @@ void _mesa_glthread_unbind_uploaded_vbos(struct gl_context *ctx); void _mesa_glthread_PixelStorei(struct gl_context *ctx, GLenum pname, GLint param); -void _mesa_InternalReleaseBufferMESA(void *buffer); +void GLAPIENTRY _mesa_InternalReleaseBufferMESA(GLvoid *buffer); #ifdef __cplusplus } diff --git a/src/mesa/main/glthread_bufferobj.c b/src/mesa/main/glthread_bufferobj.c index 66499a9c90f..a92ca40a860 100644 --- a/src/mesa/main/glthread_bufferobj.c +++ b/src/mesa/main/glthread_bufferobj.c @@ -64,7 +64,7 @@ new_upload_buffer(struct gl_context *ctx, GLsizeiptr size, uint8_t **ptr) return obj; } -void _mesa_InternalReleaseBufferMESA(void *buffer) +void GLAPIENTRY _mesa_InternalReleaseBufferMESA(GLvoid *buffer) { GET_CURRENT_CONTEXT(ctx); struct gl_buffer_object *buf = buffer;