Giovanni Mascellani : dxgi: Do not allow vkd3d_acquire_vk_queue() to fail.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 3dad51fba8b9c835732820677477cb04ba50f588
URL:    https://gitlab.winehq.org/wine/wine/-/commit/3dad51fba8b9c835732820677477cb0...

Author: Giovanni Mascellani 
Date:   Sun Jul  2 22:06:11 2023 +0200

dxgi: Do not allow vkd3d_acquire_vk_queue() to fail.

The implementation even asserts its return value.

---

dlls/dxgi/swapchain.c | 25 +++++--------------------
 1 file changed, 5 insertions(+), 20 deletions(-)

diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c
index 81cb6dcd575..e70e4b042c1 100644
--- a/dlls/dxgi/swapchain.c
+++ b/dlls/dxgi/swapchain.c
@@ -1663,16 +1663,9 @@ static void d3d12_swapchain_destroy_vulkan_resources(struct d3d12_swapchain *swa

if (swapchain->command_queue)
     {
-        if ((vk_queue = vkd3d_acquire_vk_queue(swapchain->command_queue)))
-        {
-            vk_funcs->p_vkQueueWaitIdle(vk_queue);
-
-            vkd3d_release_vk_queue(swapchain->command_queue);
-        }
-        else
-        {
-            WARN("Failed to acquire Vulkan queue.\n");
-        }
+        vk_queue = vkd3d_acquire_vk_queue(swapchain->command_queue);
+        vk_funcs->p_vkQueueWaitIdle(vk_queue);
+        vkd3d_release_vk_queue(swapchain->command_queue);
     }

if (swapchain->vk_device)
@@ -2147,11 +2140,7 @@ static HRESULT d3d12_swapchain_op_present_execute(struct d3d12_swapchain *swapch
     if (FAILED(hr = d3d12_swapchain_set_sync_interval(swapchain, op->present.sync_interval)))
         return hr;

-    if (!(vk_queue = vkd3d_acquire_vk_queue(swapchain->command_queue)))
-    {
-        ERR("Failed to acquire Vulkan queue.\n");
-        return E_FAIL;
-    }
+    vk_queue = vkd3d_acquire_vk_queue(swapchain->command_queue);

vr = d3d12_swapchain_queue_present(swapchain, vk_queue, op->present.vk_image);
     if (vr == VK_ERROR_OUT_OF_DATE_KHR)
@@ -2164,11 +2153,7 @@ static HRESULT d3d12_swapchain_op_present_execute(struct d3d12_swapchain *swapch
         if (FAILED(hr = d3d12_swapchain_create_vulkan_resources(swapchain)))
             return hr;

-        if (!(vk_queue = vkd3d_acquire_vk_queue(swapchain->command_queue)))
-        {
-            ERR("Failed to acquire Vulkan queue.\n");
-            return E_FAIL;
-        }
+        vk_queue = vkd3d_acquire_vk_queue(swapchain->command_queue);

if ((vr = d3d12_swapchain_queue_present(swapchain, vk_queue, op->present.vk_image)) < 0)
             ERR("Failed to present after recreating swapchain, vr %d.\n", vr);