Avoid recreating swapchain for preRotation

Android will return VK_SUBOPTIMAL_KHR if the orientation of the screen is not optimial for the orientation of the device. We were re-creating the swapchain when this happens but we weren't changing the orientation and would get this return code every time we call vkQueuePresent and re-create the swapchain each time. Apparently recreating the swapchain causes visual artifacts on some devices. Just ignoring VK_SUBOPTIMAL_KHR allows things to work. Bug: angleproject:3497 Need to implement proper preRotation support for longterm fix. Bug: angleproject:3502 Change-Id: I0904eb60b742d24618d502c111510117758a8502 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/1641206Reviewed-by: Jamie Madill <jmadill@chromium.org> Reviewed-by: Geoff Lang <geofflang@chromium.org> Commit-Queue: Courtney Goeltzenleuchter <courtneygo@google.com>

Avoid recreating swapchain for preRotation
3f17f929 · Courtney Goeltzenleuchter · Commit Bot · a4a24af3 · 3f17f929
Commit 3f17f929 authored Jun 05, 2019 by Courtney Goeltzenleuchter Committed by Commit Bot Jun 06, 2019
Hide whitespace changes
Inline Side-by-side

Showing with 10 additions and 6 deletions

SurfaceVk.cpp src/libANGLE/renderer/vulkan/SurfaceVk.cpp +10 -6

No files found.
--- a/src/libANGLE/renderer/vulkan/SurfaceVk.cpp
+++ b/src/libANGLE/renderer/vulkan/SurfaceVk.cpp
@@ -690,7 +690,7 @@ bool WindowSurfaceVk::isMultiSampled() const

 angle::Result WindowSurfaceVk::checkForOutOfDateSwapchain(ContextVk *contextVk,
                                                          uint32_t swapHistoryIndex,
-                                                          bool presentOutOfDate)
+                                                          bool swapchainOutOfDate)
 {
    bool swapIntervalChanged = mSwapchainPresentMode != mDesiredSwapchainPresentMode;

@@ -721,7 +721,7 @@ angle::Result WindowSurfaceVk::checkForOutOfDateSwapchain(ContextVk *contextVk,
    }

    // If anything has changed, recreate the swapchain.
-    if (presentOutOfDate || swapIntervalChanged || currentExtents != swapchainExtents)
+    if (swapchainOutOfDate || swapIntervalChanged || currentExtents != swapchainExtents)
    {
        ANGLE_TRY(recreateSwapchain(contextVk, currentExtents, swapHistoryIndex));
    }
@@ -950,10 +950,14 @@ angle::Result WindowSurfaceVk::present(ContextVk *contextVk,

    VkResult result = contextVk->getRenderer()->queuePresent(presentInfo);

-    // If SUBOPTIMAL/OUT_OF_DATE is returned, it's ok, we just need to recreate the swapchain before
+    // If OUT_OF_DATE is returned, it's ok, we just need to recreate the swapchain before
    // continuing.
-    swapchainOutOfDate = result == VK_SUBOPTIMAL_KHR || result == VK_ERROR_OUT_OF_DATE_KHR;
-    if (!swapchainOutOfDate)
+    // If VK_SUBOPTIMAL_KHR is returned we it's because the device orientation changed and we should
+    // recreate the swapchain with a new window orientation. We aren't quite ready for that so just
+    // ignore for now.
+    // TODO: Check for preRotation: http://anglebug.com/3502
+    swapchainOutOfDate = result == VK_ERROR_OUT_OF_DATE_KHR;
+    if (!swapchainOutOfDate && result != VK_SUBOPTIMAL_KHR)
    {
        ANGLE_VK_TRY(contextVk, result);
    }
@@ -966,7 +970,7 @@ angle::Result WindowSurfaceVk::swapImpl(const gl::Context *context, EGLint *rect
    ContextVk *contextVk = vk::GetImpl(context);
    DisplayVk *displayVk = vk::GetImpl(context->getDisplay());

-    bool swapchainOutOfDate;
+    bool swapchainOutOfDate = false;
    // Save this now, since present() will increment the value.
    size_t currentSwapHistoryIndex = mCurrentSwapHistoryIndex;