diff options
author | Marek Olšák <marek.olsak@amd.com> | 2020-02-05 14:52:38 -0500 |
---|---|---|
committer | Marge Bot <eric+marge@anholt.net> | 2020-02-26 20:35:50 +0000 |
commit | f6d1dd34d76c1930b6f5223ae7e1c6b7f52ec4cd (patch) | |
tree | b83dac41c23afe083a8ffff554b1eb90528e7d15 /src/gallium/winsys/svga/drm | |
parent | 502840855acac744fbc8dd090d931adc07755ead (diff) |
gallium/hash_table: remove some function wrappers
Reviewed-by: Kristian H. Kristensen <hoegsberg@google.com>
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/winsys/svga/drm')
-rw-r--r-- | src/gallium/winsys/svga/drm/vmw_context.c | 20 | ||||
-rw-r--r-- | src/gallium/winsys/svga/drm/vmw_screen.c | 8 |
2 files changed, 9 insertions, 19 deletions
diff --git a/src/gallium/winsys/svga/drm/vmw_context.c b/src/gallium/winsys/svga/drm/vmw_context.c index bc6883ee08c..432f9afcd1f 100644 --- a/src/gallium/winsys/svga/drm/vmw_context.c +++ b/src/gallium/winsys/svga/drm/vmw_context.c @@ -260,7 +260,7 @@ vmw_swc_flush(struct svga_winsys_context *swc, vmw_svga_winsys_surface_reference(&isurf->vsurf, NULL); } - util_hash_table_clear(vswc->hash); + _mesa_hash_table_clear(vswc->hash, NULL); vswc->surface.used = 0; vswc->surface.reserved = 0; @@ -504,12 +504,8 @@ vmw_swc_surface_only_relocation(struct svga_winsys_context *swc, isrf = &vswc->surface.items[vswc->surface.used + vswc->surface.staged]; vmw_svga_winsys_surface_reference(&isrf->vsurf, vsurf); isrf->referenced = FALSE; - /* - * Note that a failure here may just fall back to unhashed behavior - * and potentially cause unnecessary flushing, so ignore the - * return code. - */ - (void) util_hash_table_set(vswc->hash, vsurf, isrf); + + _mesa_hash_table_insert(vswc->hash, vsurf, isrf); ++vswc->surface.staged; vswc->seen_surfaces += vsurf->size; @@ -600,12 +596,8 @@ vmw_swc_shader_relocation(struct svga_winsys_context *swc, ishader = &vswc->shader.items[vswc->shader.used + vswc->shader.staged]; vmw_svga_winsys_shader_reference(&ishader->vshader, vshader); ishader->referenced = FALSE; - /* - * Note that a failure here may just fall back to unhashed behavior - * and potentially cause unnecessary flushing, so ignore the - * return code. - */ - (void) util_hash_table_set(vswc->hash, vshader, ishader); + + _mesa_hash_table_insert(vswc->hash, vshader, ishader); ++vswc->shader.staged; } @@ -682,7 +674,7 @@ vmw_swc_destroy(struct svga_winsys_context *swc) vmw_svga_winsys_shader_reference(&ishader->vshader, NULL); } - util_hash_table_destroy(vswc->hash); + _mesa_hash_table_destroy(vswc->hash, NULL); pb_validate_destroy(vswc->validate); vmw_ioctl_context_destroy(vswc->vws, swc->cid); #ifdef DEBUG diff --git a/src/gallium/winsys/svga/drm/vmw_screen.c b/src/gallium/winsys/svga/drm/vmw_screen.c index cecb932c4c7..8b4b89981b2 100644 --- a/src/gallium/winsys/svga/drm/vmw_screen.c +++ b/src/gallium/winsys/svga/drm/vmw_screen.c @@ -69,7 +69,7 @@ vmw_winsys_create( int fd ) struct stat stat_buf; if (dev_hash == NULL) { - dev_hash = util_hash_table_create(vmw_dev_hash, vmw_dev_compare); + dev_hash = _mesa_hash_table_create(NULL, vmw_dev_hash, vmw_dev_compare); if (dev_hash == NULL) return NULL; } @@ -107,14 +107,12 @@ vmw_winsys_create( int fd ) if (!vmw_winsys_screen_init_svga(vws)) goto out_no_svga; - if (util_hash_table_set(dev_hash, &vws->device, vws) != PIPE_OK) - goto out_no_hash_insert; + _mesa_hash_table_insert(dev_hash, &vws->device, vws); cnd_init(&vws->cs_cond); mtx_init(&vws->cs_mutex, mtx_plain); return vws; -out_no_hash_insert: out_no_svga: vmw_pools_cleanup(vws); out_no_pools: @@ -132,7 +130,7 @@ void vmw_winsys_destroy(struct vmw_winsys_screen *vws) { if (--vws->open_count == 0) { - util_hash_table_remove(dev_hash, &vws->device); + _mesa_hash_table_remove_key(dev_hash, &vws->device); vmw_pools_cleanup(vws); vws->fence_ops->destroy(vws->fence_ops); vmw_ioctl_cleanup(vws); |