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

Commit 265ad538 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:... 

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

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



Change-Id: I13e6dcd1c2011419ccd41487e98b60631be72cfd
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 1a8afecb 960adc8e

libs/hwui/renderthread/VulkanManager.cpp

+2 −2
Original line number Diff line number Diff line
@@ -729,7 +729,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);
@@ -777,7 +777,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");