commit 9b7e453d71e9c17477c097f5f28f1b9d3a134998
author Hrishikesh Manohar <hrishikeshm@nvidia.com> Tue Jan 10 17:52:11 2017 +0530
committer Mike Stroyan <stroyan@google.com> Fri Mar 03 09:11:19 2017 -0700
tree 7d3092023ea5d7842a71811164fc4122c3542273
parent fbffe92a46731bbba9f2b6f66ee4afd94b45dcb3

libvulkan : Handle VK_PRESENT_MODE_MAILBOX_KHR CASES correctly

The vulkan swapchain creation code set async mode for
VK_PRESENT_MODE_MAILBOX_KHR cases. However it goes so after
setting the buffer count for the native window being used.
This causes a mismatch between the minUndequeuedBuffers and
maxDequeuedBuffers count maintained by the libvulkan layer and
buffer queue code.
Fix this by setting the async mode correctly before the buffer
count for a native window is set.

Bug 200266758, b/32882690

Change-Id: I5d5e18e659b8d31f3d3fd9570b18a92f83a1516d
Test: dEQP-VK.wsi.android.incremental_present.*.mailbox.*

vulkan/libvulkan/swapchain.cpp

diff --git a/vulkan/libvulkan/swapchain.cpp b/vulkan/libvulkan/swapchain.cpp
index e105922..b35e534 100644
--- a/vulkan/libvulkan/swapchain.cpp
+++ b/vulkan/libvulkan/swapchain.cpp
@@ -651,7 +651,9 @@
         return VK_ERROR_INITIALIZATION_FAILED;
     }
 
-    err = surface.window->setSwapInterval(surface.window.get(), 1);
+    int swap_interval =
+        create_info->presentMode == VK_PRESENT_MODE_MAILBOX_KHR ? 0 : 1;
+    err = surface.window->setSwapInterval(surface.window.get(), swap_interval);
     if (err != 0) {
         // TODO(jessehall): Improve error reporting. Can we enumerate possible
         // errors and translate them to valid Vulkan result codes?
@@ -763,13 +765,6 @@
         return VK_ERROR_INITIALIZATION_FAILED;
     }
     uint32_t min_undequeued_buffers = static_cast<uint32_t>(query_value);
-    // The MIN_UNDEQUEUED_BUFFERS query doesn't know whether we'll be using
-    // async mode or not, and assumes not. But in async mode, the BufferQueue
-    // requires an extra undequeued buffer.
-    // See BufferQueueCore::getMinUndequeuedBufferCountLocked().
-    if (create_info->presentMode == VK_PRESENT_MODE_MAILBOX_KHR)
-        min_undequeued_buffers += 1;
-
     uint32_t num_images =
         (create_info->minImageCount - 1) + min_undequeued_buffers;
     err = native_window_set_buffer_count(surface.window.get(), num_images);
@@ -850,17 +845,6 @@
         return VK_ERROR_INITIALIZATION_FAILED;
     }
 
-    int swap_interval =
-        create_info->presentMode == VK_PRESENT_MODE_MAILBOX_KHR ? 0 : 1;
-    err = surface.window->setSwapInterval(surface.window.get(), swap_interval);
-    if (err != 0) {
-        // TODO(jessehall): Improve error reporting. Can we enumerate possible
-        // errors and translate them to valid Vulkan result codes?
-        ALOGE("native_window->setSwapInterval(%d) failed: %s (%d)",
-              swap_interval, strerror(-err), err);
-        return VK_ERROR_INITIALIZATION_FAILED;
-    }
-
     // -- Allocate our Swapchain object --
     // After this point, we must deallocate the swapchain on error.