commit 5da361b85c13a67c055c7dd9fbfba8e4971b4d49
author Greg Daniel <egdaniel@google.com> Tue Jun 08 21:58:19 2021 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Jun 08 21:58:19 2021 +0000
tree dffab3ecedc17f0671c2394f3c8ef71fb60c02f9
parent 50638c6a55faf6180cc6ee58c18066a6481e7d23
parent ffc50c689fe8e577fd9ed1e6ecf828e27b4344e3

Merge "Reset buffer tracking state in VulkanSurface." into sc-dev

libs/hwui/renderthread/VulkanSurface.cpp

diff --git a/libs/hwui/renderthread/VulkanSurface.cpp b/libs/hwui/renderthread/VulkanSurface.cpp
index 01a2ec5..fe9a30a 100644
--- a/libs/hwui/renderthread/VulkanSurface.cpp
+++ b/libs/hwui/renderthread/VulkanSurface.cpp
@@ -429,7 +429,9 @@
                 kTopLeft_GrSurfaceOrigin, mWindowInfo.colorspace, nullptr);
         if (bufferInfo->skSurface.get() == nullptr) {
             ALOGE("SkSurface::MakeFromAHardwareBuffer failed");
-            mNativeWindow->cancelBuffer(mNativeWindow.get(), buffer, fence_fd.release());
+            mNativeWindow->cancelBuffer(mNativeWindow.get(), buffer,
+                                        mNativeBuffers[idx].dequeue_fence.release());
+            mNativeBuffers[idx].dequeued = false;
             return nullptr;
         }
     }