mesa: Remove the key parameter from the _mesa_HashWalk callback

_mesa_HashWalkLocked too.  After the previous couple commits, there are
no users.  This eliminates a lot of unused parameter warnings.

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>

src/mesa/drivers/dri/i965/brw_performance_query.c

@@ -111,7 +111,7 @@ brw_is_perf_query_ready(struct gl_context *ctx,
                         struct gl_perf_query_object *o);
 
 static void
-dump_perf_query_callback(UNUSED GLuint id, void *query_void, void *brw_void)
+dump_perf_query_callback(void *query_void, void *brw_void)
 {
    struct brw_context *ctx = brw_void;
    struct gen_perf_context *perf_ctx = ctx->perf_ctx;

src/mesa/main/bufferobj.c

@@ -568,13 +568,12 @@ _mesa_initialize_buffer_object(struct gl_context *ctx,
  * Callback called from _mesa_HashWalk()
  */
 static void
-count_buffer_size(GLuint key, void *data, void *userData)
+count_buffer_size(void *data, void *userData)
 {
    const struct gl_buffer_object *bufObj =
       (const struct gl_buffer_object *) data;
    GLuint *total = (GLuint *) userData;
 
-   (void) key;
    *total = *total + bufObj->Size;
 }
 

src/mesa/main/debug.c

@@ -393,10 +393,9 @@ _mesa_dump_texture(GLuint texture, GLuint writeImages)
 
 
 static void
-dump_texture_cb(GLuint id, void *data, void *userData)
+dump_texture_cb(void *data, UNUSED void *userData)
 {
    struct gl_texture_object *texObj = (struct gl_texture_object *) data;
-   (void) userData;
    dump_texture(texObj, WriteImages);
 }
 
@@ -427,10 +426,9 @@ dump_renderbuffer(const struct gl_renderbuffer *rb, GLboolean writeImage)
 
 
 static void
-dump_renderbuffer_cb(GLuint id, void *data, void *userData)
+dump_renderbuffer_cb(void *data, UNUSED void *userData)
 {
    const struct gl_renderbuffer *rb = (const struct gl_renderbuffer *) data;
-   (void) userData;
    dump_renderbuffer(rb, WriteImages);
 }
 

src/mesa/main/dlist.c

@@ -1407,7 +1407,7 @@ _mesa_delete_list(struct gl_context *ctx, struct gl_display_list *dlist)
  * deleted belongs to a bitmap texture atlas.
  */
 static void
-check_atlas_for_deleted_list(UNUSED GLuint key, void *data, void *userData)
+check_atlas_for_deleted_list(void *data, void *userData)
 {
    struct gl_bitmap_atlas *atlas = (struct gl_bitmap_atlas *) data;
    GLuint list_id = *((GLuint *) userData);  /* the list being deleted */

src/mesa/main/fbobject.c

@@ -2433,7 +2433,7 @@ _mesa_base_fbo_format(const struct gl_context *ctx, GLenum internalFormat)
  * Invalidate a renderbuffer attachment.  Called from _mesa_HashWalk().
  */
 static void
-invalidate_rb(GLuint key, void *data, void *userData)
+invalidate_rb(void *data, void *userData)
 {
    struct gl_framebuffer *fb = (struct gl_framebuffer *) data;
    struct gl_renderbuffer *rb = (struct gl_renderbuffer *) userData;

src/mesa/main/hash.c

@@ -343,23 +343,23 @@ _mesa_HashDeleteAll(struct _mesa_HashTable *table,
  */
 static void
 hash_walk_unlocked(const struct _mesa_HashTable *table,
-                   void (*callback)(GLuint key, void *data, void *userData),
+                   void (*callback)(void *data, void *userData),
                    void *userData)
 {
    assert(table);
    assert(callback);
 
    hash_table_foreach(table->ht, entry) {
-      callback((uintptr_t)entry->key, entry->data, userData);
+      callback(entry->data, userData);
    }
    if (table->deleted_key_data)
-      callback(DELETED_KEY_VALUE, table->deleted_key_data, userData);
+      callback(table->deleted_key_data, userData);
 }
 
 
 void
 _mesa_HashWalk(const struct _mesa_HashTable *table,
-               void (*callback)(GLuint key, void *data, void *userData),
+               void (*callback)(void *data, void *userData),
                void *userData)
 {
    /* cast-away const */
@@ -372,7 +372,7 @@ _mesa_HashWalk(const struct _mesa_HashTable *table,
 
 void
 _mesa_HashWalkLocked(const struct _mesa_HashTable *table,
-               void (*callback)(GLuint key, void *data, void *userData),
+               void (*callback)(void *data, void *userData),
                void *userData)
 {
    hash_walk_unlocked(table, callback, userData);

src/mesa/main/hash.h

@@ -166,12 +166,12 @@ _mesa_HashDeleteAll(struct _mesa_HashTable *table,
 
 extern void
 _mesa_HashWalk(const struct _mesa_HashTable *table,
-               void (*callback)(GLuint key, void *data, void *userData),
+               void (*callback)(void *data, void *userData),
                void *userData);
 
 extern void
 _mesa_HashWalkLocked(const struct _mesa_HashTable *table,
-                     void (*callback)(GLuint key, void *data, void *userData),
+                     void (*callback)(void *data, void *userData),
                      void *userData);
 
 extern void _mesa_HashPrint(const struct _mesa_HashTable *table);

src/mesa/main/shaderapi.c

@@ -1257,7 +1257,7 @@ struct update_programs_in_pipeline_params
 };
 
 static void
-update_programs_in_pipeline(GLuint key, void *data, void *userData)
+update_programs_in_pipeline(void *data, void *userData)
 {
    struct update_programs_in_pipeline_params *params =
       (struct update_programs_in_pipeline_params *) userData;

src/mesa/main/shared.c

@@ -226,7 +226,7 @@ delete_bufferobj_cb(GLuint id, void *data, void *userData)
  * to avoid memory access error.
  */
 static void
-free_shader_program_data_cb(GLuint id, void *data, void *userData)
+free_shader_program_data_cb(void *data, void *userData)
 {
    struct gl_context *ctx = (struct gl_context *) userData;
    struct gl_shader_program *shProg = (struct gl_shader_program *) data;

src/mesa/main/teximage.c

@@ -2678,7 +2678,7 @@ struct cb_info
  * Check render to texture callback.  Called from _mesa_HashWalk().
  */
 static void
-check_rtt_cb(UNUSED GLuint key, void *data, void *userData)
+check_rtt_cb(void *data, void *userData)
 {
    struct gl_framebuffer *fb = (struct gl_framebuffer *) data;
    const struct cb_info *info = (struct cb_info *) userData;

src/mesa/main/texobj.c

@@ -1101,14 +1101,12 @@ texture_size(const struct gl_texture_object *texObj)
  * Callback called from _mesa_HashWalk()
  */
 static void
-count_tex_size(GLuint key, void *data, void *userData)
+count_tex_size(void *data, void *userData)
 {
    const struct gl_texture_object *texObj =
       (const struct gl_texture_object *) data;
    GLuint *total = (GLuint *) userData;
 
-   (void) key;
-
    *total = *total + texture_size(texObj);
 }
 

src/mesa/main/transformfeedback.c

@@ -52,7 +52,7 @@ struct using_program_tuple
 };
 
 static void
-active_xfb_object_references_program(GLuint key, void *data, void *user_data)
+active_xfb_object_references_program(void *data, void *user_data)
 {
    struct using_program_tuple *callback_data = user_data;
    struct gl_transform_feedback_object *obj = data;
@@ -78,7 +78,7 @@ _mesa_transform_feedback_is_using_program(struct gl_context *ctx,
                         active_xfb_object_references_program, &callback_data);
 
    /* Also check DefaultObject, as it's not in the Objects hash table. */
-   active_xfb_object_references_program(0, ctx->TransformFeedback.DefaultObject,
+   active_xfb_object_references_program(ctx->TransformFeedback.DefaultObject,
                                         &callback_data);
 
    return callback_data.found;

src/mesa/state_tracker/st_context.c

@@ -1036,7 +1036,7 @@ st_create_context(gl_api api, struct pipe_context *pipe,
  * texture's sampler views which belong to the context.
  */
 static void
-destroy_tex_sampler_cb(GLuint id, void *data, void *userData)
+destroy_tex_sampler_cb(void *data, void *userData)
 {
    struct gl_texture_object *texObj = (struct gl_texture_object *) data;
    struct st_context *st = (struct st_context *) userData;
@@ -1045,7 +1045,7 @@ destroy_tex_sampler_cb(GLuint id, void *data, void *userData)
 }
 
 static void
-destroy_framebuffer_attachment_sampler_cb(GLuint id, void *data, void *userData)
+destroy_framebuffer_attachment_sampler_cb(void *data, void *userData)
 {
    struct gl_framebuffer* glfb = (struct gl_framebuffer*) data;
    struct st_context *st = (struct st_context *) userData;

src/mesa/state_tracker/st_program.c

@@ -1850,7 +1850,7 @@ destroy_program_variants(struct st_context *st, struct gl_program *target)
  * which match the given context.
  */
 static void
-destroy_shader_program_variants_cb(GLuint key, void *data, void *userData)
+destroy_shader_program_variants_cb(void *data, void *userData)
 {
    struct st_context *st = (struct st_context *) userData;
    struct gl_shader *shader = (struct gl_shader *) data;
@@ -1885,7 +1885,7 @@ destroy_shader_program_variants_cb(GLuint key, void *data, void *userData)
  * the given context.
  */
 static void
-destroy_program_variants_cb(GLuint key, void *data, void *userData)
+destroy_program_variants_cb(void *data, void *userData)
 {
    struct st_context *st = (struct st_context *) userData;
    struct gl_program *program = (struct gl_program *) data;