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

2021-06-08 21:58:19 +00:00
parent 50638c6a55 ffc50c689f
commit 5da361b85c
1 changed files with 3 additions and 1 deletions
--- a/libs/hwui/renderthread/VulkanSurface.cpp
+++ b/libs/hwui/renderthread/VulkanSurface.cpp
@@ -429,7 +429,9 @@ VulkanSurface::NativeBufferInfo* VulkanSurface::dequeueNativeBuffer() {
                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;
        }
    }