commit fad113c6d5a87e48c3a2438bed9cc1ebdf6745f5
author TreeHugger Robot <treehugger-gerrit@google.com> Fri May 01 18:20:06 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri May 01 18:20:06 2020 +0000
tree bb782791ac42a14c674d2fdd29c8a09ef7ea3195
parent 548e27c43023bc67874d946088c678d41cdd13dc
parent 854680c3bb23649b69c502641a6cd29a19bbb98e

Merge "Vulkan: handle INVALID_OPERATION from BQ in the timeout case" into rvc-dev am: 40dbb5fb41 am: efbf83626a am: 854680c3bb

Change-Id: I4ab61fcade3bcce2c743e745948c26d5e8d7880d

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) {