commit 40dbb5fb4132379406f72c6d2b6519a89ed97d9d
author TreeHugger Robot <treehugger-gerrit@google.com> Fri May 01 17:38:41 2020 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri May 01 17:38:41 2020 +0000
tree bb782791ac42a14c674d2fdd29c8a09ef7ea3195
parent 5a1f5498456814a8f4ed364d495792b27ca85104
parent c0f8a2ce8eb1ad221b3a5f34e3b75b7f002ab2d5

Merge "Vulkan: handle INVALID_OPERATION from BQ in the timeout case" into rvc-dev

vulkan/libvulkan/swapchain.cpp

diff --git a/vulkan/libvulkan/swapchain.cpp b/vulkan/libvulkan/swapchain.cpp
index a44b9e7..d3ed88d 100644
--- a/vulkan/libvulkan/swapchain.cpp
+++ b/vulkan/libvulkan/swapchain.cpp
@@ -1478,7 +1478,7 @@
     ANativeWindowBuffer* buffer;
     int fence_fd;
     err = window->dequeueBuffer(window, &buffer, &fence_fd);
-    if (err == android::TIMED_OUT) {
+    if (err == android::TIMED_OUT || err == android::INVALID_OPERATION) {
         ALOGW("dequeueBuffer timed out: %s (%d)", strerror(-err), err);
         return timeout ? VK_TIMEOUT : VK_NOT_READY;
     } else if (err != android::OK) {