Revert "[base] Migrate deprecated GrBackendSemaphore methods"
This reverts commit bcb613c8ca8f2ef2754423407fefbb572a518d5b.
Reason for revert: Droid-monitored triggered revert due to b/328489884. Will be verifying through ABTD before submitting the revert.
Change-Id: I866b19f0b7427dfdb3e6f5ecb0096df9c8d6c8ad
diff --git a/libs/hwui/renderthread/VulkanManager.cpp b/libs/hwui/renderthread/VulkanManager.cpp
index 6ced91f..b5f7caa 100644
--- a/libs/hwui/renderthread/VulkanManager.cpp
+++ b/libs/hwui/renderthread/VulkanManager.cpp
@@ -25,7 +25,6 @@
#include <android/sync.h>
#include <gui/TraceUtils.h>
#include <include/gpu/ganesh/SkSurfaceGanesh.h>
-#include <include/gpu/ganesh/vk/GrVkBackendSemaphore.h>
#include <include/gpu/ganesh/vk/GrVkBackendSurface.h>
#include <include/gpu/ganesh/vk/GrVkDirectContext.h>
#include <ui/FatVector.h>
@@ -598,14 +597,15 @@
close(fence_clone);
sync_wait(bufferInfo->dequeue_fence, -1 /* forever */);
} else {
- GrBackendSemaphore beSemaphore = GrBackendSemaphores::MakeVk(semaphore);
+ GrBackendSemaphore backendSemaphore;
+ backendSemaphore.initVulkan(semaphore);
// Skia will take ownership of the VkSemaphore and delete it once the wait
// has finished. The VkSemaphore also owns the imported fd, so it will
// close the fd when it is deleted.
- bufferInfo->skSurface->wait(1, &beSemaphore);
+ bufferInfo->skSurface->wait(1, &backendSemaphore);
// The following flush blocks the GPU immediately instead of waiting for
// other drawing ops. It seems dequeue_fence is not respected otherwise.
- // TODO: remove the flush after finding why beSemaphore is not working.
+ // TODO: remove the flush after finding why backendSemaphore is not working.
skgpu::ganesh::FlushAndSubmit(bufferInfo->skSurface.get());
}
}
@@ -625,8 +625,8 @@
SharedSemaphoreInfo(PFN_vkDestroySemaphore destroyFunction, VkDevice device,
VkSemaphore semaphore)
- : mDestroyFunction(destroyFunction), mDevice(device),
- mGrBackendSemaphore(GrBackendSemaphores::MakeVk(semaphore)) {
+ : mDestroyFunction(destroyFunction), mDevice(device), mSemaphore(semaphore) {
+ mGrBackendSemaphore.initVulkan(semaphore);
}
~SharedSemaphoreInfo() { mDestroyFunction(mDevice, mSemaphore, nullptr); }
@@ -798,7 +798,8 @@
return UNKNOWN_ERROR;
}
- GrBackendSemaphore beSemaphore = GrBackendSemaphores::MakeVk(semaphore);
+ GrBackendSemaphore beSemaphore;
+ beSemaphore.initVulkan(semaphore);
// Skia will take ownership of the VkSemaphore and delete it once the wait has finished. The
// VkSemaphore also owns the imported fd, so it will close the fd when it is deleted.