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

Commit b302b4cf authored by Kevin Lubick's avatar Kevin Lubick Committed by Android (Google) Code Review
Browse files

Merge "Update deprecated MutableTextureState Vulkan constructor call" into main

parents f86c140b 41403bd3

libs/hwui/AutoBackendTextureRelease.cpp

+4 −2
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ 
#include <include/gpu/GrDirectContext.h>

#include <include/gpu/GrBackendSurface.h>

#include <include/gpu/MutableTextureState.h>

#include <include/gpu/vk/VulkanMutableTextureState.h>

#include "renderthread/RenderThread.h"

#include "utils/Color.h"

#include "utils/PaintUtils.h"
@@ -142,7 +143,8 @@ void AutoBackendTextureRelease::releaseQueueOwnership(GrDirectContext* context) 
    LOG_ALWAYS_FATAL_IF(Properties::getRenderPipelineType() != RenderPipelineType::SkiaVulkan);

    if (mBackendTexture.isValid()) {

        // Passing in VK_IMAGE_LAYOUT_UNDEFINED means we keep the old layout.

        skgpu::MutableTextureState newState(VK_IMAGE_LAYOUT_UNDEFINED,

        skgpu::MutableTextureState newState = skgpu::MutableTextureStates::MakeVulkan(

                                                                  VK_IMAGE_LAYOUT_UNDEFINED,

                                                                  VK_QUEUE_FAMILY_FOREIGN_EXT);



        // The unref for this ref happens in the releaseProc passed into setBackendTextureState. The