Vulkan: Handle VK_ERROR_OUT_OF_DATE returned by vkAcquireNextImageKHR()

src/libANGLE/renderer/vulkan/SurfaceVk.cpp

@@ -537,7 +537,14 @@ angle::Result WindowSurfaceVk::initializeImpl(DisplayVk *displayVk)
 
     ANGLE_TRY(createSwapChain(displayVk, extents, VK_NULL_HANDLE));
 
-    return nextSwapchainImage(displayVk);
+    VkResult vkResult = nextSwapchainImage(displayVk);
+    // VK_SUBOPTIMAL_KHR is ok since we still have an Image that can be presented successfully
+    if (ANGLE_UNLIKELY((vkResult != VK_SUCCESS) && (vkResult != VK_SUBOPTIMAL_KHR)))
+    {
+        ANGLE_VK_TRY(displayVk, vkResult);
+    }
+
+    return angle::Result::Continue;
 }
 
 angle::Result WindowSurfaceVk::recreateSwapchain(ContextVk *contextVk,
@@ -983,7 +990,17 @@ angle::Result WindowSurfaceVk::swapImpl(const gl::Context *context, EGLint *rect
         // http://anglebug.com/2927
         TRACE_EVENT0("gpu.angle", "nextSwapchainImage");
         // Get the next available swapchain image.
-        ANGLE_TRY(nextSwapchainImage(contextVk));
+
+        VkResult result = nextSwapchainImage(contextVk);
+        // If SUBOPTIMAL/OUT_OF_DATE is returned, it's ok, we just need to recreate the swapchain
+        // before continuing.
+        if (ANGLE_UNLIKELY((result == VK_ERROR_OUT_OF_DATE_KHR) || (result == VK_SUBOPTIMAL_KHR)))
+        {
+            ANGLE_TRY(checkForOutOfDateSwapchain(contextVk, currentSwapHistoryIndex, true));
+            // Try one more time and bail if we fail
+            result = nextSwapchainImage(contextVk);
+        }
+        ANGLE_VK_TRY(contextVk, result);
     }
 
     RendererVk *renderer = contextVk->getRenderer();
@@ -992,16 +1009,24 @@ angle::Result WindowSurfaceVk::swapImpl(const gl::Context *context, EGLint *rect
     return angle::Result::Continue;
 }
 
-angle::Result WindowSurfaceVk::nextSwapchainImage(vk::Context *context)
+VkResult WindowSurfaceVk::nextSwapchainImage(vk::Context *context)
 {
     VkDevice device = context->getDevice();
 
     vk::Scoped<vk::Semaphore> aquireImageSemaphore(device);
-    ANGLE_VK_TRY(context, aquireImageSemaphore.get().init(device));
+    VkResult result = aquireImageSemaphore.get().init(device);
+    if (ANGLE_UNLIKELY(result != VK_SUCCESS))
+    {
+        return result;
+    }
 
-    ANGLE_VK_TRY(context, vkAcquireNextImageKHR(device, mSwapchain, UINT64_MAX,
-                                                aquireImageSemaphore.get().getHandle(),
-                                                VK_NULL_HANDLE, &mCurrentSwapchainImageIndex));
+    result = vkAcquireNextImageKHR(device, mSwapchain, UINT64_MAX,
+                                   aquireImageSemaphore.get().getHandle(), VK_NULL_HANDLE,
+                                   &mCurrentSwapchainImageIndex);
+    if (ANGLE_UNLIKELY(result != VK_SUCCESS))
+    {
+        return result;
+    }
 
     // After presenting, the flush semaphore chain is cleared. The semaphore returned by
     // vkAcquireNextImage will start a new chain.
@@ -1029,7 +1054,7 @@ angle::Result WindowSurfaceVk::nextSwapchainImage(vk::Context *context)
         mColorRenderTarget.updateSwapchainImage(&image.image, &image.imageView);
     }
 
-    return angle::Result::Continue;
+    return VK_SUCCESS;
 }
 
 egl::Error WindowSurfaceVk::postSubBuffer(const gl::Context *context,

src/libANGLE/renderer/vulkan/SurfaceVk.h

@@ -167,7 +167,7 @@ class WindowSurfaceVk : public SurfaceVk
                                              bool presentOutOfDate);
     void releaseSwapchainImages(ContextVk *contextVk);
     void destroySwapChainImages(DisplayVk *displayVk);
-    angle::Result nextSwapchainImage(vk::Context *context);
+    VkResult nextSwapchainImage(vk::Context *context);
     angle::Result present(ContextVk *contextVk,
                           EGLint *rects,
                           EGLint n_rects,