fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-05 16:08:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

zink: fix zink_destroy_screen for early screen creation fails

Browse source 
Fixes crashes on at least my system with multiple GPUs.

Fixes: 0c2045553f ("zink: use screen destructor for creation fails")
Signed-off-by: Karol Herbst <kherbst@redhat.com>
Acked-by: Mike Blumenkrantz <michael.blumenkrantz@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/25844>
This commit is contained in:
Karol Herbst 2023-10-22 16:11:36 +02:00 • committed by Marge Bot
parent 90cd5f3799
commit e0301659f1
1 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1478,7 +1478,8 @@ zink_destroy_screen(struct pipe_screen *pscreen)
util_vertex_state_cache_deinit(&screen->vertex_state_cache);
VKSCR(DestroyPipelineLayout)(screen->dev, screen->gfx_push_constant_layout, NULL);
if (screen->gfx_push_constant_layout)
VKSCR(DestroyPipelineLayout)(screen->dev, screen->gfx_push_constant_layout, NULL);
u_transfer_helper_destroy(pscreen->transfer_helper);
if (util_queue_is_initialized(&screen->cache_get_thread)) {
@ -1494,8 +1495,10 @@ zink_destroy_screen(struct pipe_screen *pscreen)
#endif
disk_cache_destroy(screen->disk_cache);
/* we don't have an API to check if a set is already initialized */
for (unsigned i = 0; i < ARRAY_SIZE(screen->pipeline_libs); i++)
_mesa_set_clear(&screen->pipeline_libs[i], NULL);
if (screen->pipeline_libs[i].table)
_mesa_set_clear(&screen->pipeline_libs[i], NULL);
zink_bo_deinit(screen);
util_live_shader_cache_deinit(&screen->shaders);
@ -1518,7 +1521,9 @@ zink_destroy_screen(struct pipe_screen *pscreen)
if (screen->bindless_layout)
VKSCR(DestroyDescriptorSetLayout)(screen->dev, screen->bindless_layout, NULL);
VKSCR(DestroyDevice)(screen->dev, NULL);
if (screen->dev)
VKSCR(DestroyDevice)(screen->dev, NULL);
VKSCR(DestroyInstance)(screen->instance, NULL);
util_idalloc_mt_fini(&screen->buffer_ids);