*/
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;
* 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;
* 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;
* 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;
* 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;
* 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;
* 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;
* 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;
* 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
* 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;
* 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;
* 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;
* 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;