Fix VK_NOT_READY for vkAcquireNextImageKHR

The error was not handled, as is the cause for the bug. So far we'd better wait until a valid image index is ready. BUG=angleproject:2301 Change-Id: I49a5545d0f2e0cf6cfbb3f604ab0602f8a131d12 Reviewed-on: https://chromium-review.googlesource.com/895402 Commit-Queue: Yuly Novikov <ynovikov@chromium.org> Reviewed-by: Jamie Madill <jmadill@chromium.org> Reviewed-by: Yuly Novikov <ynovikov@chromium.org>

Fix VK_NOT_READY for vkAcquireNextImageKHR
191a84a8 · jchen10 · Commit Bot · 9bf55527 · 191a84a8 · 191a84a8
Commit 191a84a8 authored Jan 31, 2018 by jchen10 Committed by Commit Bot Jan 31, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 6 deletions

SurfaceVk.cpp src/libANGLE/renderer/vulkan/SurfaceVk.cpp +1 -3

SimpleOperationTest.cpp src/tests/gl_tests/SimpleOperationTest.cpp +0 -3

No files found.
--- a/src/libANGLE/renderer/vulkan/SurfaceVk.cpp
+++ b/src/libANGLE/renderer/vulkan/SurfaceVk.cpp
@@ -462,9 +462,7 @@ vk::Error WindowSurfaceVk::nextSwapchainImage(RendererVk *renderer)
 {
    VkDevice device = renderer->getDevice();

-    // Use a timeout of zero for AcquireNextImage so we don't actually block.
-    // TODO(jmadill): We should handle VK_NOT_READY and block until we can acquire the image.
-    ANGLE_VK_TRY(vkAcquireNextImageKHR(device, mSwapchain, 0,
+    ANGLE_VK_TRY(vkAcquireNextImageKHR(device, mSwapchain, UINT64_MAX,
                                       mAcquireNextImageSemaphore.getHandle(), VK_NULL_HANDLE,
                                       &mCurrentSwapchainImageIndex));


--- a/src/tests/gl_tests/SimpleOperationTest.cpp
+++ b/src/tests/gl_tests/SimpleOperationTest.cpp
@@ -245,9 +245,6 @@ TEST_P(SimpleOperationTest, DrawQuad)
 // Simple repeated draw and swap test.
 TEST_P(SimpleOperationTest, DrawQuadAndSwap)
 {
-    // anglebug.com/2301
-    ANGLE_SKIP_TEST_IF(IsLinux() && IsIntel() && IsVulkan());
-
    const std::string &vertexShader =
        "attribute vec3 position;\n"
        "void main()\n"