Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 960adc8e authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Modify the log information of semaphore in finishFrame" into main am: e4603f09 

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



Change-Id: If2b53c17436f30f7f06cb08a55c560809ef1cf36
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 3e3d9093 e4603f09

libs/hwui/renderthread/VulkanManager.cpp

+2 −2
Original line number Diff line number Diff line
@@ -674,7 +674,7 @@ VulkanManager::VkDrawResult VulkanManager::finishFrame(SkSurface* surface) { 
        VkSemaphore semaphore;

        VkResult err = mCreateSemaphore(mDevice, &semaphoreInfo, nullptr, &semaphore);

        ALOGE_IF(VK_SUCCESS != err,

                 "VulkanManager::makeSwapSemaphore(): Failed to create semaphore");

                 "VulkanManager::finishFrame(): Failed to create semaphore");



        if (err == VK_SUCCESS) {

            sharedSemaphore = sp<SharedSemaphoreInfo>::make(mDestroySemaphore, mDevice, semaphore);
@@ -722,7 +722,7 @@ VulkanManager::VkDrawResult VulkanManager::finishFrame(SkSurface* surface) { 


        int fenceFd = -1;

        VkResult err = mGetSemaphoreFdKHR(mDevice, &getFdInfo, &fenceFd);

        ALOGE_IF(VK_SUCCESS != err, "VulkanManager::swapBuffers(): Failed to get semaphore Fd");

        ALOGE_IF(VK_SUCCESS != err, "VulkanManager::finishFrame(): Failed to get semaphore Fd");

        drawResult.presentFence.reset(fenceFd);

    } else {

        ALOGE("VulkanManager::finishFrame(): Semaphore submission failed");