diff options
| author | 2024-03-06 17:49:51 +0000 | |
|---|---|---|
| committer | 2024-03-06 17:49:51 +0000 | |
| commit | 890890a2fc0772004445f3ff1cb357e4ab3da2fc (patch) | |
| tree | fab5444ebdb71e19389caabce915c61f88a85962 | |
| parent | 776cfe43d0ca7c487088af537d6c120339ad8653 (diff) | |
| parent | 9f20708f66db424a1a7246be38d1da4ba72a11b7 (diff) | |
Merge "[native] Migrate deprecated GrBackendSemaphore methods" into main
| -rw-r--r-- | libs/renderengine/skia/SkiaVkRenderEngine.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/libs/renderengine/skia/SkiaVkRenderEngine.cpp b/libs/renderengine/skia/SkiaVkRenderEngine.cpp index eb7a9d5bfa..feb76a1ccd 100644 --- a/libs/renderengine/skia/SkiaVkRenderEngine.cpp +++ b/libs/renderengine/skia/SkiaVkRenderEngine.cpp @@ -25,6 +25,7 @@ #include <GrContextOptions.h> #include <vk/GrVkExtensions.h> #include <vk/GrVkTypes.h> +#include <include/gpu/ganesh/vk/GrVkBackendSemaphore.h> #include <include/gpu/ganesh/vk/GrVkDirectContext.h> #include <android-base/stringprintf.h> @@ -766,8 +767,7 @@ void SkiaVkRenderEngine::waitFence(GrDirectContext* grContext, base::borrowed_fd base::unique_fd fenceDup(dupedFd); VkSemaphore waitSemaphore = getVulkanInterface(isProtected()).importSemaphoreFromSyncFd(fenceDup.release()); - GrBackendSemaphore beSemaphore; - beSemaphore.initVulkan(waitSemaphore); + GrBackendSemaphore beSemaphore = GrBackendSemaphores::MakeVk(waitSemaphore); grContext->wait(1, &beSemaphore, true /* delete after wait */); } @@ -775,8 +775,7 @@ base::unique_fd SkiaVkRenderEngine::flushAndSubmit(GrDirectContext* grContext) { VulkanInterface& vi = getVulkanInterface(isProtected()); VkSemaphore semaphore = vi.createExportableSemaphore(); - GrBackendSemaphore backendSemaphore; - backendSemaphore.initVulkan(semaphore); + GrBackendSemaphore backendSemaphore = GrBackendSemaphores::MakeVk(semaphore); GrFlushInfo flushInfo; DestroySemaphoreInfo* destroySemaphoreInfo = nullptr; |