OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mesa: Remove the key parameter from the _mesa_HashDeleteAll callback

Browse Source 
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Reviewed-by: Kristian H. Kristensen <hoegsberg@google.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7171>
This commit is contained in:
Ian Romanick
2020-10-15 10:57:58 -07:00
committed by Marge Bot
parent cc6dcc6ab4
commit 390887ff58
10 changed files with 23 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/mesa/main/shared.c
View File

@@ -146,7 +146,7 @@ _mesa_alloc_shared_state(struct gl_context *ctx)
* Callback for deleting a display list. Called by _mesa_HashDeleteAll().
*/
static void
delete_displaylist_cb(GLuint id, void *data, void *userData)
delete_displaylist_cb(void *data, void *userData)
{
struct gl_display_list *list = (struct gl_display_list *) data;
struct gl_context *ctx = (struct gl_context *) userData;
@@ -158,7 +158,7 @@ delete_displaylist_cb(GLuint id, void *data, void *userData)
* Callback for deleting a bitmap atlas. Called by _mesa_HashDeleteAll().
*/
static void
delete_bitmap_atlas_cb(GLuint id, void *data, void *userData)
delete_bitmap_atlas_cb(void *data, void *userData)
{
struct gl_bitmap_atlas *atlas = (struct gl_bitmap_atlas *) data;
struct gl_context *ctx = (struct gl_context *) userData;
@@ -170,7 +170,7 @@ delete_bitmap_atlas_cb(GLuint id, void *data, void *userData)
* Callback for deleting a texture object. Called by _mesa_HashDeleteAll().
*/
static void
delete_texture_cb(GLuint id, void *data, void *userData)
delete_texture_cb(void *data, void *userData)
{
struct gl_texture_object *texObj = (struct gl_texture_object *) data;
struct gl_context *ctx = (struct gl_context *) userData;
@@ -182,7 +182,7 @@ delete_texture_cb(GLuint id, void *data, void *userData)
* Callback for deleting a program object. Called by _mesa_HashDeleteAll().
*/
static void
delete_program_cb(GLuint id, void *data, void *userData)
delete_program_cb(void *data, void *userData)
{
struct gl_program *prog = (struct gl_program *) data;
struct gl_context *ctx = (struct gl_context *) userData;
@@ -199,7 +199,7 @@ delete_program_cb(GLuint id, void *data, void *userData)
* Called by _mesa_HashDeleteAll().
*/
static void
delete_fragshader_cb(GLuint id, void *data, void *userData)
delete_fragshader_cb(void *data, void *userData)
{
struct ati_fragment_shader *shader = (struct ati_fragment_shader *) data;
struct gl_context *ctx = (struct gl_context *) userData;
@@ -211,7 +211,7 @@ delete_fragshader_cb(GLuint id, void *data, void *userData)
* Callback for deleting a buffer object. Called by _mesa_HashDeleteAll().
*/
static void
delete_bufferobj_cb(GLuint id, void *data, void *userData)
delete_bufferobj_cb(void *data, void *userData)
{
struct gl_buffer_object *bufObj = (struct gl_buffer_object *) data;
struct gl_context *ctx = (struct gl_context *) userData;
@@ -242,7 +242,7 @@ free_shader_program_data_cb(void *data, void *userData)
* Called by _mesa_HashDeleteAll().
*/
static void
delete_shader_cb(GLuint id, void *data, void *userData)
delete_shader_cb(void *data, void *userData)
{
struct gl_context *ctx = (struct gl_context *) userData;
struct gl_shader *sh = (struct gl_shader *) data;
@@ -261,7 +261,7 @@ delete_shader_cb(GLuint id, void *data, void *userData)
* Callback for deleting a framebuffer object. Called by _mesa_HashDeleteAll()
*/
static void
delete_framebuffer_cb(GLuint id, void *data, void *userData)
delete_framebuffer_cb(void *data, UNUSED void *userData)
{
struct gl_framebuffer *fb = (struct gl_framebuffer *) data;
/* The fact that the framebuffer is in the hashtable means its refcount
@@ -282,7 +282,7 @@ delete_framebuffer_cb(GLuint id, void *data, void *userData)
* Callback for deleting a renderbuffer object. Called by _mesa_HashDeleteAll()
*/
static void
delete_renderbuffer_cb(GLuint id, void *data, void *userData)
delete_renderbuffer_cb(void *data, void *userData)
{
struct gl_context *ctx = (struct gl_context *) userData;
struct gl_renderbuffer *rb = (struct gl_renderbuffer *) data;
@@ -296,7 +296,7 @@ delete_renderbuffer_cb(GLuint id, void *data, void *userData)
* Callback for deleting a sampler object. Called by _mesa_HashDeleteAll()
*/
static void
delete_sampler_object_cb(GLuint id, void *data, void *userData)
delete_sampler_object_cb(void *data, void *userData)
{
struct gl_context *ctx = (struct gl_context *) userData;
struct gl_sampler_object *sampObj = (struct gl_sampler_object *) data;
@@ -307,7 +307,7 @@ delete_sampler_object_cb(GLuint id, void *data, void *userData)
* Callback for deleting a memory object. Called by _mesa_HashDeleteAll().
*/
static void
delete_memory_object_cb(GLuint id, void *data, void *userData)
delete_memory_object_cb(void *data, void *userData)
{
struct gl_memory_object *memObj = (struct gl_memory_object *) data;
struct gl_context *ctx = (struct gl_context *) userData;
@@ -318,7 +318,7 @@ delete_memory_object_cb(GLuint id, void *data, void *userData)
* Callback for deleting a memory object. Called by _mesa_HashDeleteAll().
*/
static void
delete_semaphore_object_cb(GLuint id, void *data, void *userData)
delete_semaphore_object_cb(void *data, void *userData)
{
struct gl_semaphore_object *semObj = (struct gl_semaphore_object *) data;
struct gl_context *ctx = (struct gl_context *) userData;