From b91a1953e81ef502d61a9ae2a01ec531a1cfa537 Mon Sep 17 00:00:00 2001 From: Jason Ekstrand Date: Thu, 16 Nov 2017 08:59:21 -0800 Subject: [PATCH] vulkan/wsi: Refactor result handling in queue_present Reviewed-by: Dave Airlie Reviewed-by: Chad Versace --- src/vulkan/wsi/wsi_common.c | 54 +++++++++++++++++++------------------ 1 file changed, 28 insertions(+), 26 deletions(-) diff --git a/src/vulkan/wsi/wsi_common.c b/src/vulkan/wsi/wsi_common.c index 5920359c631..f149846e454 100644 --- a/src/vulkan/wsi/wsi_common.c +++ b/src/vulkan/wsi/wsi_common.c @@ -514,14 +514,14 @@ wsi_common_queue_present(const struct wsi_device *wsi, int queue_family_index, const VkPresentInfoKHR *pPresentInfo) { - VkResult result = VK_SUCCESS; + VkResult final_result = VK_SUCCESS; const VkPresentRegionsKHR *regions = vk_find_struct_const(pPresentInfo->pNext, PRESENT_REGIONS_KHR); for (uint32_t i = 0; i < pPresentInfo->swapchainCount; i++) { WSI_FROM_HANDLE(wsi_swapchain, swapchain, pPresentInfo->pSwapchains[i]); - VkResult item_result; + VkResult result; if (swapchain->fences[0] == VK_NULL_HANDLE) { const VkFenceCreateInfo fence_info = { @@ -529,15 +529,11 @@ wsi_common_queue_present(const struct wsi_device *wsi, .pNext = NULL, .flags = 0, }; - item_result = wsi->CreateFence(device, &fence_info, - &swapchain->alloc, - &swapchain->fences[0]); - if (pPresentInfo->pResults != NULL) - pPresentInfo->pResults[i] = item_result; - result = result == VK_SUCCESS ? item_result : result; - if (item_result != VK_SUCCESS) { - continue; - } + result = wsi->CreateFence(device, &fence_info, + &swapchain->alloc, + &swapchain->fences[0]); + if (result != VK_SUCCESS) + goto fail_present; } else { wsi->ResetFences(device, 1, &swapchain->fences[0]); } @@ -548,25 +544,22 @@ wsi_common_queue_present(const struct wsi_device *wsi, .waitSemaphoreCount = pPresentInfo->waitSemaphoreCount, .pWaitSemaphores = pPresentInfo->pWaitSemaphores, }; - wsi->QueueSubmit(queue, 1, &submit_info, swapchain->fences[0]); + result = wsi->QueueSubmit(queue, 1, &submit_info, swapchain->fences[0]); + if (result != VK_SUCCESS) + goto fail_present; const VkPresentRegionKHR *region = NULL; if (regions && regions->pRegions) region = ®ions->pRegions[i]; - item_result = swapchain->queue_present(swapchain, - queue, - pPresentInfo->waitSemaphoreCount, - pPresentInfo->pWaitSemaphores, - pPresentInfo->pImageIndices[i], - region); - - if (pPresentInfo->pResults != NULL) - pPresentInfo->pResults[i] = item_result; - result = result == VK_SUCCESS ? item_result : result; - if (item_result != VK_SUCCESS) { - continue; - } + result = swapchain->queue_present(swapchain, + queue, + pPresentInfo->waitSemaphoreCount, + pPresentInfo->pWaitSemaphores, + pPresentInfo->pImageIndices[i], + region); + if (result != VK_SUCCESS) + goto fail_present; VkFence last = swapchain->fences[2]; swapchain->fences[2] = swapchain->fences[1]; @@ -576,6 +569,15 @@ wsi_common_queue_present(const struct wsi_device *wsi, if (last != VK_NULL_HANDLE) { wsi->WaitForFences(device, 1, &last, true, 1); } + + fail_present: + if (pPresentInfo->pResults != NULL) + pPresentInfo->pResults[i] = result; + + /* Let the final result be our first unsuccessful result */ + if (final_result == VK_SUCCESS) + final_result = result; } - return VK_SUCCESS; + + return final_result; } -- 2.30.2