fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-21 02:10:17 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

zink: don't destroy any simple_mtx_t objects during screen destroy

Browse source 
these don't allocate anything on init, but they assert if destroy is
called without an init, which is annoying for error handling

cc: mesa-stable

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/25663>
This commit is contained in:
Mike Blumenkrantz 2023-10-11 12:11:45 -04:00 • committed by Marge Bot
parent 01f2aa846e
commit dfd6a2d878
1 changed files with 0 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/gallium/drivers/zink/zink_screen.c
View file

@ -1470,9 +1470,7 @@ zink_destroy_screen(struct pipe_screen *pscreen)
hash_table_foreach(&screen->dts, entry)
zink_kopper_deinit_displaytarget(screen, entry->data);
simple_mtx_destroy(&screen->dt_lock);
simple_mtx_destroy(&screen->copy_context_lock);
if (screen->copy_context)
screen->copy_context->base.destroy(&screen->copy_context->base);
@ -1500,8 +1498,6 @@ zink_destroy_screen(struct pipe_screen *pscreen)
for (unsigned i = 0; i < ARRAY_SIZE(screen->pipeline_libs); i++)
_mesa_set_clear(&screen->pipeline_libs[i], NULL);
for (unsigned i = 0; i < ARRAY_SIZE(screen->pipeline_libs_lock); i++)
simple_mtx_destroy(&screen->pipeline_libs_lock[i]);
zink_bo_deinit(screen);
util_live_shader_cache_deinit(&screen->shaders);
@ -1517,7 +1513,6 @@ zink_destroy_screen(struct pipe_screen *pscreen)
if (util_queue_is_initialized(&screen->flush_queue))
util_queue_destroy(&screen->flush_queue);
simple_mtx_destroy(&screen->semaphores_lock);
while (util_dynarray_contains(&screen->semaphores, VkSemaphore))
VKSCR(DestroySemaphore)(screen->dev, util_dynarray_pop(&screen->semaphores, VkSemaphore), NULL);
while (util_dynarray_contains(&screen->fd_semaphores, VkSemaphore))
@ -1525,10 +1520,6 @@ zink_destroy_screen(struct pipe_screen *pscreen)
if (screen->bindless_layout)
VKSCR(DestroyDescriptorSetLayout)(screen->dev, screen->bindless_layout, NULL);
if (zink_debug & ZINK_DEBUG_MEM)
simple_mtx_destroy(&screen->debug_mem_lock);
simple_mtx_destroy(&screen->queue_lock);
VKSCR(DestroyDevice)(screen->dev, NULL);
VKSCR(DestroyInstance)(screen->instance, NULL);
util_idalloc_mt_fini(&screen->buffer_ids);