diff --git a/src/mesa/main/glthread.c b/src/mesa/main/glthread.c
index dd557a026cc..b0779435af0 100644
--- a/src/mesa/main/glthread.c
+++ b/src/mesa/main/glthread.c
@@ -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);
 }
diff --git a/src/mesa/main/hash.c b/src/mesa/main/hash.c
index c70f15a6d32..4f06ce2cda4 100644
--- a/src/mesa/main/hash.c
+++ b/src/mesa/main/hash.c
@@ -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;
diff --git a/src/mesa/main/hash.h b/src/mesa/main/hash.h
index b3052f97d86..03eadd6ab8f 100644
--- a/src/mesa/main/hash.h
+++ b/src/mesa/main/hash.h
@@ -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
diff --git a/src/mesa/main/performance_monitor.c b/src/mesa/main/performance_monitor.c
index d7ab836dd60..e972b878268 100644
--- a/src/mesa/main/performance_monitor.c
+++ b/src/mesa/main/performance_monitor.c
@@ -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;
diff --git a/src/mesa/main/performance_query.c b/src/mesa/main/performance_query.c
index ce1dd966536..3afee5c89b7 100644
--- a/src/mesa/main/performance_query.c
+++ b/src/mesa/main/performance_query.c
@@ -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;
diff --git a/src/mesa/main/pipelineobj.c b/src/mesa/main/pipelineobj.c
index 3ec5cdb3767..2229efd4087 100644
--- a/src/mesa/main/pipelineobj.c
+++ b/src/mesa/main/pipelineobj.c
@@ -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;
diff --git a/src/mesa/main/queryobj.c b/src/mesa/main/queryobj.c
index 7696721a8ae..620d2221a09 100644
--- a/src/mesa/main/queryobj.c
+++ b/src/mesa/main/queryobj.c
@@ -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;
diff --git a/src/mesa/main/shared.c b/src/mesa/main/shared.c
index 07a78b4c3fd..b4f92065652 100644
--- a/src/mesa/main/shared.c
+++ b/src/mesa/main/shared.c
@@ -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;
diff --git a/src/mesa/main/transformfeedback.c b/src/mesa/main/transformfeedback.c
index ecbefe0c429..696e07cdbe3 100644
--- a/src/mesa/main/transformfeedback.c
+++ b/src/mesa/main/transformfeedback.c
@@ -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 =
diff --git a/src/mesa/main/varray.c b/src/mesa/main/varray.c
index 42da68b8ed5..5c67afc2158 100644
--- a/src/mesa/main/varray.c
+++ b/src/mesa/main/varray.c
@@ -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;