Merge "Reset buffer tracking state in VulkanSurface." into sc-dev am: 5da361b85c

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14901133

Change-Id: Ib8d33548587a766769f2899f33bd2e05a4ea92ec
This commit is contained in:
Greg Daniel
2021-06-08 22:15:16 +00:00
committed by Automerger Merge Worker

View File

@@ -429,7 +429,9 @@ VulkanSurface::NativeBufferInfo* VulkanSurface::dequeueNativeBuffer() {
kTopLeft_GrSurfaceOrigin, mWindowInfo.colorspace, nullptr); kTopLeft_GrSurfaceOrigin, mWindowInfo.colorspace, nullptr);
if (bufferInfo->skSurface.get() == nullptr) { if (bufferInfo->skSurface.get() == nullptr) {
ALOGE("SkSurface::MakeFromAHardwareBuffer failed"); 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; return nullptr;
} }
} }