From d110b38d327a6a99579ab4ada307889c101277b2 Mon Sep 17 00:00:00 2001 From: Aitor Camacho Date: Tue, 2 Dec 2025 03:35:59 +0900 Subject: [PATCH] vulkan/wsi: Fix double destroy of present_id_timeline at swapchain create Fixes: c888da3d48a ("vulkan/wsi: Add mechanism to wait for WSI semaphore unsignal.") Reviewed-by: Hans-Kristian Arntzen Signed-off-by: Aitor Camacho (cherry picked from commit df19ec302093b5e47c0d7556ea41af47d2b7af67) Part-of: --- .pick_status.json | 2 +- src/vulkan/wsi/wsi_common.c | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 8f15e0f36ff..1cd7875de5c 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -54,7 +54,7 @@ "description": "vulkan/wsi: Fix double destroy of present_id_timeline at swapchain create", "nominated": true, "nomination_type": 2, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "c888da3d48a55ad7be4fedf783369fb12163b03e", "notes": null diff --git a/src/vulkan/wsi/wsi_common.c b/src/vulkan/wsi/wsi_common.c index 362e50f2aec..0c4a4ce652e 100644 --- a/src/vulkan/wsi/wsi_common.c +++ b/src/vulkan/wsi/wsi_common.c @@ -1098,7 +1098,6 @@ wsi_CreateSwapchainKHR(VkDevice _device, sizeof (*swapchain->blit.semaphores), VK_SYSTEM_ALLOCATION_SCOPE_OBJECT); if (!swapchain->blit.semaphores) { - wsi_device->DestroySemaphore(_device, swapchain->present_id_timeline, alloc); swapchain->destroy(swapchain, alloc); return VK_ERROR_OUT_OF_HOST_MEMORY; }