summaryrefslogtreecommitdiffstats
path: root/src/gallium/drivers/lima
diff options
context:
space:
mode:
authorMarek Olšák <[email protected]>2020-02-05 14:52:38 -0500
committerMarge Bot <[email protected]>2020-02-26 20:35:50 +0000
commitf6d1dd34d76c1930b6f5223ae7e1c6b7f52ec4cd (patch)
treeb83dac41c23afe083a8ffff554b1eb90528e7d15 /src/gallium/drivers/lima
parent502840855acac744fbc8dd090d931adc07755ead (diff)
gallium/hash_table: remove some function wrappers
Reviewed-by: Kristian H. Kristensen <[email protected]> Tested-by: Marge Bot <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/3722> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/3722>
Diffstat (limited to 'src/gallium/drivers/lima')
-rw-r--r--src/gallium/drivers/lima/lima_bo.c20
1 files changed, 10 insertions, 10 deletions
diff --git a/src/gallium/drivers/lima/lima_bo.c b/src/gallium/drivers/lima/lima_bo.c
index 17197c48279..cccf2f64cac 100644
--- a/src/gallium/drivers/lima/lima_bo.c
+++ b/src/gallium/drivers/lima/lima_bo.c
@@ -54,7 +54,7 @@ bool lima_bo_table_init(struct lima_screen *screen)
return true;
err_out0:
- util_hash_table_destroy(screen->bo_handles);
+ _mesa_hash_table_destroy(screen->bo_handles, NULL);
return false;
}
@@ -71,8 +71,8 @@ bool lima_bo_cache_init(struct lima_screen *screen)
void lima_bo_table_fini(struct lima_screen *screen)
{
mtx_destroy(&screen->bo_table_lock);
- util_hash_table_destroy(screen->bo_handles);
- util_hash_table_destroy(screen->bo_flink_names);
+ _mesa_hash_table_destroy(screen->bo_handles, NULL);
+ _mesa_hash_table_destroy(screen->bo_flink_names, NULL);
}
static void
@@ -101,10 +101,10 @@ lima_bo_free(struct lima_bo *bo)
bo, bo->size);
mtx_lock(&screen->bo_table_lock);
- util_hash_table_remove(screen->bo_handles,
+ _mesa_hash_table_remove_key(screen->bo_handles,
(void *)(uintptr_t)bo->handle);
if (bo->flink_name)
- util_hash_table_remove(screen->bo_flink_names,
+ _mesa_hash_table_remove_key(screen->bo_flink_names,
(void *)(uintptr_t)bo->flink_name);
mtx_unlock(&screen->bo_table_lock);
@@ -378,7 +378,7 @@ bool lima_bo_export(struct lima_bo *bo, struct winsys_handle *handle)
bo->flink_name = flink.name;
mtx_lock(&screen->bo_table_lock);
- util_hash_table_set(screen->bo_flink_names,
+ _mesa_hash_table_insert(screen->bo_flink_names,
(void *)(uintptr_t)bo->flink_name, bo);
mtx_unlock(&screen->bo_table_lock);
}
@@ -387,7 +387,7 @@ bool lima_bo_export(struct lima_bo *bo, struct winsys_handle *handle)
case WINSYS_HANDLE_TYPE_KMS:
mtx_lock(&screen->bo_table_lock);
- util_hash_table_set(screen->bo_handles,
+ _mesa_hash_table_insert(screen->bo_handles,
(void *)(uintptr_t)bo->handle, bo);
mtx_unlock(&screen->bo_table_lock);
@@ -400,7 +400,7 @@ bool lima_bo_export(struct lima_bo *bo, struct winsys_handle *handle)
return false;
mtx_lock(&screen->bo_table_lock);
- util_hash_table_set(screen->bo_handles,
+ _mesa_hash_table_insert(screen->bo_handles,
(void *)(uintptr_t)bo->handle, bo);
mtx_unlock(&screen->bo_table_lock);
return true;
@@ -504,9 +504,9 @@ struct lima_bo *lima_bo_import(struct lima_screen *screen,
if (lima_bo_get_info(bo)) {
if (handle->type == WINSYS_HANDLE_TYPE_SHARED)
- util_hash_table_set(screen->bo_flink_names,
+ _mesa_hash_table_insert(screen->bo_flink_names,
(void *)(uintptr_t)bo->flink_name, bo);
- util_hash_table_set(screen->bo_handles,
+ _mesa_hash_table_insert(screen->bo_handles,
(void*)(uintptr_t)bo->handle, bo);
}
else {