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

vulkan/wsi/headless: properly cleanup swapchain init failure

Browse source 
Currently the wsi_headless_surface_create_swapchain() function abuses
the corresponding destroy function to perform cleanup operations when
any failure happens during images creation. This practice sounds
fragile and prevents further changes to the swapchain creation
procedure.

Implement a proper cleanup sequence to reverse all operations.

As another cleanup codepath above already contains call of vk_free(),
the call is changed to a goto targetting the corresponding label.

Regression tested with `dEQP-VK.wsi.headless.swapchain.simulate_oom.*`
on RADV.

Signed-off-by: Icenowy Zheng <zhengxingda@iscas.ac.cn>
Reviewed-by: Yiwei Zhang <zzyiwei@chromium.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/40347>
This commit is contained in:
Icenowy Zheng 2026-03-11 22:21:19 +08:00 • committed by Marge Bot
parent c0e0591999
commit 2f540283b3
1 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
src/vulkan/wsi/wsi_common_headless.c
View file

@ -491,10 +491,8 @@ wsi_headless_surface_create_swapchain(VkIcdSurfaceBase *icd_surface,
STACK_ARRAY_FINISH(mods);
STACK_ARRAY_FINISH(mod_props);
if (result != VK_SUCCESS) {
vk_free(pAllocator, chain);
return result;
}
if (result != VK_SUCCESS)
goto fail_free_chain;
chain->base.destroy = wsi_headless_swapchain_destroy;
chain->base.get_wsi_image = wsi_headless_swapchain_get_wsi_image;
@ -504,25 +502,27 @@ wsi_headless_surface_create_swapchain(VkIcdSurfaceBase *icd_surface,
chain->base.present_mode = wsi_swapchain_get_present_mode(wsi_device, pCreateInfo);
chain->base.image_count = num_images;
for (uint32_t i = 0; i < chain->base.image_count; i++) {
uint32_t image = 0;
for (; image < chain->base.image_count; image++) {
result = wsi_create_image(&chain->base, &chain->base.image_info,
&chain->images[i].base);
if (result != VK_SUCCESS) {
/* Record how many images need to be torn down */
chain->base.image_count = i;
goto fail;
}
&chain->images[image].base);
if (result != VK_SUCCESS)
goto fail_destroy_images;
chain->images[i].busy_on_host = false;
chain->images[i].busy_on_device = false;
chain->images[image].busy_on_host = false;
chain->images[image].busy_on_device = false;
}
*swapchain_out = &chain->base;
return VK_SUCCESS;
fail:
wsi_headless_swapchain_destroy(&chain->base, pAllocator);
fail_destroy_images:
for (uint32_t i = 0; i < image; i++)
wsi_destroy_image(&chain->base, &chain->images[i].base);
wsi_swapchain_finish(&chain->base);
fail_free_chain:
vk_free(pAllocator, chain);
return result;
}