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

2
src/mesa/main/glthread.c
View File

@@ -132,7 +132,7 @@ _mesa_glthread_init(struct gl_context *ctx)
}
static void
free_vao(GLuint key, void *data, void *userData)
free_vao(void *data, UNUSED void *userData)
{
free(data);
}

6
src/mesa/main/hash.c
View File

@@ -309,18 +309,18 @@ _mesa_HashRemove(struct _mesa_HashTable *table, GLuint key)
*/
void
_mesa_HashDeleteAll(struct _mesa_HashTable *table,
void (*callback)(GLuint key, void *data, void *userData),
void (*callback)(void *data, void *userData),
void *userData)
{
assert(callback);
_mesa_HashLockMutex(table);
table->InDeleteAll = GL_TRUE;
hash_table_foreach(table->ht, entry) {
callback((uintptr_t)entry->key, entry->data, userData);
callback(entry->data, userData);
_mesa_hash_table_remove(table->ht, entry);
}
if (table->deleted_key_data) {
callback(DELETED_KEY_VALUE, table->deleted_key_data, userData);
callback(table->deleted_key_data, userData);
table->deleted_key_data = NULL;
}
table->InDeleteAll = GL_FALSE;

2
src/mesa/main/hash.h
View File

@@ -161,7 +161,7 @@ extern void _mesa_HashRemoveLocked(struct _mesa_HashTable *table, GLuint key);
extern void
_mesa_HashDeleteAll(struct _mesa_HashTable *table,
void (*callback)(GLuint key, void *data, void *userData),
void (*callback)(void *data, void *userData),
void *userData);
extern void

2
src/mesa/main/performance_monitor.c
View File

@@ -101,7 +101,7 @@ fail:
}
static void
free_performance_monitor(GLuint key, void *data, void *user)
free_performance_monitor(void *data, void *user)
{
struct gl_perf_monitor_object *m = data;
struct gl_context *ctx = user;

2
src/mesa/main/performance_query.c
View File

@@ -43,7 +43,7 @@ _mesa_init_performance_queries(struct gl_context *ctx)
}
static void
free_performance_query(GLuint key, void *data, void *user)
free_performance_query(void *data, void *user)
{
struct gl_perf_query_object *m = data;
struct gl_context *ctx = user;

2
src/mesa/main/pipelineobj.c
View File

@@ -106,7 +106,7 @@ _mesa_init_pipeline(struct gl_context *ctx)
* Callback for deleting a pipeline object. Called by _mesa_HashDeleteAll().
*/
static void
delete_pipelineobj_cb(UNUSED GLuint id, void *data, void *userData)
delete_pipelineobj_cb(void *data, void *userData)
{
struct gl_pipeline_object *obj = (struct gl_pipeline_object *) data;
struct gl_context *ctx = (struct gl_context *) userData;

2
src/mesa/main/queryobj.c
View File

@@ -1057,7 +1057,7 @@ _mesa_init_queryobj(struct gl_context *ctx)
* Callback for deleting a query object. Called by _mesa_HashDeleteAll().
*/
static void
delete_queryobj_cb(GLuint id, void *data, void *userData)
delete_queryobj_cb(void *data, void *userData)
{
struct gl_query_object *q= (struct gl_query_object *) data;
struct gl_context *ctx = (struct gl_context *)userData;

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;

2
src/mesa/main/transformfeedback.c
View File

@@ -153,7 +153,7 @@ _mesa_init_transform_feedback(struct gl_context *ctx)
* Callback for _mesa_HashDeleteAll().
*/
static void
delete_cb(GLuint key, void *data, void *userData)
delete_cb(void *data, void *userData)
{
struct gl_context *ctx = (struct gl_context *) userData;
struct gl_transform_feedback_object *obj =

2
src/mesa/main/varray.c
View File

@@ -3930,7 +3930,7 @@ _mesa_init_varray(struct gl_context *ctx)
* Callback for deleting an array object. Called by _mesa_HashDeleteAll().
*/
static void
delete_arrayobj_cb(GLuint id, void *data, void *userData)
delete_arrayobj_cb(void *data, void *userData)
{
struct gl_vertex_array_object *vao = (struct gl_vertex_array_object *) data;
struct gl_context *ctx = (struct gl_context *) userData;