[PATCH 6/8] dxgi: Handle VK_ERROR_OUT_OF_DATE_KHR returned from vkAcquireNextImageKHR().

[Józef Kucia]

Signed-off-by: Józef Kucia 
---
 dlls/dxgi/swapchain.c | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c
index 22feeaeb825f..991a505ef6fa 100644
--- a/dlls/dxgi/swapchain.c
+++ b/dlls/dxgi/swapchain.c
@@ -1421,7 +1421,7 @@ static VkResult d3d12_swapchain_acquire_next_image(struct d3d12_swapchain *swapc
     if ((vr = vk_funcs->p_vkAcquireNextImageKHR(vk_device, swapchain->vk_swapchain, UINT64_MAX,
             VK_NULL_HANDLE, vk_fence, &swapchain->current_buffer_index)) < 0)
     {
-        ERR("Failed to acquire next Vulkan image, vr %d.\n", vr);
+        WARN("Failed to acquire next Vulkan image, vr %d.\n", vr);
         return vr;
     }

@@ -2136,6 +2136,14 @@ static HRESULT STDMETHODCALLTYPE d3d12_swapchain_Present1(IDXGISwapChain3 *iface
     }

vr = d3d12_swapchain_acquire_next_image(swapchain);
+    if (vr == VK_ERROR_OUT_OF_DATE_KHR)
+    {
+        TRACE("Recreating Vulkan swapchain.\n");
+        d3d12_swapchain_destroy_buffers(swapchain, FALSE);
+        return d3d12_swapchain_recreate_vulkan_swapchain(swapchain);
+    }
+    if (vr < 0)
+        ERR("Failed to acquire next Vulkan image, vr %d.\n", vr);
     return hresult_from_vk_result(vr);
 }

@@ -2570,6 +2578,7 @@ static HRESULT d3d12_swapchain_init(struct d3d12_swapchain *swapchain, IWineDXGI

if ((vr = d3d12_swapchain_acquire_next_image(swapchain)) < 0)
     {
+        ERR("Failed to acquire Vulkan image, vr %d.\n", vr);
         d3d12_swapchain_destroy(swapchain);
         return hresult_from_vk_result(vr);
     }

[Marvin]

Hi,

While running your changed tests on Windows, I think I found new failures.
Being a bot and all I'm not very good at pattern recognition, so I might be
wrong, but could you please double-check?

Full results can be found at:
https://testbot.winehq.org/JobDetails.pl?Key=48528

Your paranoid android.

=== debian9 (build log) ===

error: patch failed: dlls/dxgi/swapchain.c:1067
error: patch failed: dlls/dxgi/swapchain.c:1422
error: patch failed: dlls/dxgi/swapchain.c:1421
Task: Patch failed to apply

=== debian9 (build log) ===

error: patch failed: dlls/dxgi/swapchain.c:1067
error: patch failed: dlls/dxgi/swapchain.c:1422
error: patch failed: dlls/dxgi/swapchain.c:1421
Task: Patch failed to apply

[Henri Verbeet]

Signed-off-by: Henri Verbeet