Merge "In VuklanManager make sure we have a valid semaphore context before destroying it." into sc-dev am: f560a753fd

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

Change-Id: Ia4ab07afab6a5bf332c5aec6561b46760fb4b160
This commit is contained in:
TreeHugger Robot
2021-07-16 21:59:34 +00:00
committed by Automerger Merge Worker

View File

@@ -579,7 +579,9 @@ void VulkanManager::swapBuffers(VulkanSurface* surface, const SkRect& dirtyRect)
std::lock_guard<std::mutex> lock(mGraphicsQueueMutex); std::lock_guard<std::mutex> lock(mGraphicsQueueMutex);
mQueueWaitIdle(mGraphicsQueue); mQueueWaitIdle(mGraphicsQueue);
} }
destroy_semaphore(mDestroySemaphoreContext); if (mDestroySemaphoreContext) {
destroy_semaphore(mDestroySemaphoreContext);
}
surface->presentCurrentBuffer(dirtyRect, fenceFd); surface->presentCurrentBuffer(dirtyRect, fenceFd);
mSwapSemaphore = VK_NULL_HANDLE; mSwapSemaphore = VK_NULL_HANDLE;