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

Commit 26531f10 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Update to use new skia getBackendRenderTarget calls."

parents 59f24916 1834a8cf

libs/hwui/renderthread/VulkanManager.cpp

+17 −9
Original line number Diff line number Diff line
@@ -239,11 +239,14 @@ SkSurface* VulkanManager::getBackbufferSurface(VulkanSurface* surface) { 
    mQueueSubmit(mBackendContext->fQueue, 1, &submitInfo, backbuffer->mUsageFences[0]);



    // We need to notify Skia that we changed the layout of the wrapped VkImage

    GrVkImageInfo* imageInfo;

    sk_sp<SkSurface> skSurface = surface->mImageInfos[backbuffer->mImageIndex].mSurface;

    skSurface->getRenderTargetHandle((GrBackendObject*)&imageInfo,

    GrBackendRenderTarget backendRT = skSurface->getBackendRenderTarget(

            SkSurface::kFlushRead_BackendHandleAccess);

    imageInfo->updateImageLayout(VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL);

    if (!backendRT.isValid()) {

        SkASSERT(backendRT.isValid());

        return nullptr;

    }

    backendRT.setVkImageLayout(VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL);



    surface->mBackbuffer = std::move(skSurface);

    return surface->mBackbuffer.get();
@@ -608,16 +611,21 @@ void VulkanManager::swapBuffers(VulkanSurface* surface) { 
    SkASSERT(surface->mBackbuffers);

    VulkanSurface::BackbufferInfo* backbuffer =

            surface->mBackbuffers + surface->mCurrentBackbufferIndex;

    GrVkImageInfo* imageInfo;



    SkSurface* skSurface = surface->mImageInfos[backbuffer->mImageIndex].mSurface.get();

    skSurface->getRenderTargetHandle((GrBackendObject*)&imageInfo,

    GrBackendRenderTarget backendRT = skSurface->getBackendRenderTarget(

            SkSurface::kFlushRead_BackendHandleAccess);

    SkASSERT(backendRT.isValid());



    GrVkImageInfo imageInfo;

    SkAssertResult(backendRT.getVkImageInfo(&imageInfo));



    // Check to make sure we never change the actually wrapped image

    SkASSERT(imageInfo->fImage == surface->mImages[backbuffer->mImageIndex]);

    SkASSERT(imageInfo.fImage == surface->mImages[backbuffer->mImageIndex]);



    // We need to transition the image to VK_IMAGE_LAYOUT_PRESENT_SRC_KHR and make sure that all

    // previous work is complete for before presenting. So we first add the necessary barrier here.

    VkImageLayout layout = imageInfo->fImageLayout;

    VkImageLayout layout = imageInfo.fImageLayout;

    VkPipelineStageFlags srcStageMask = layoutToPipelineStageFlags(layout);

    VkPipelineStageFlags dstStageMask = VK_PIPELINE_STAGE_BOTTOM_OF_PIPE_BIT;

    VkAccessFlags srcAccessMask = layoutToSrcAccessMask(layout);