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

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

Merge "Update skia framework to use new MakeFromTexture calls"

parents 27c92a6e 03d50fa9

libs/hwui/pipeline/skia/LayerDrawable.cpp

+4 −3
Original line number Diff line number Diff line
@@ -49,11 +49,12 @@ bool LayerDrawable::DrawLayer(GrContext* context, SkCanvas* canvas, Layer* layer 
        GlLayer* glLayer = static_cast<GlLayer*>(layer);

        GrGLTextureInfo externalTexture;

        externalTexture.fTarget = glLayer->getRenderTarget();

        SkASSERT(GL_RGBA == glLayer->getTexture().internalFormat());

        externalTexture.fFormat = GL_RGBA8;

        externalTexture.fID = glLayer->getTextureId();

        GrBackendTexture backendTexture(layerWidth, layerHeight, kRGBA_8888_GrPixelConfig,

                                        externalTexture);

        GrBackendTexture backendTexture(layerWidth, layerHeight, GrMipMapped::kNo, externalTexture);

        layerImage = SkImage::MakeFromTexture(context, backendTexture, kTopLeft_GrSurfaceOrigin,

                                              kPremul_SkAlphaType, nullptr);

                                              kRGBA_8888_SkColorType, kPremul_SkAlphaType, nullptr);

    } else {

        SkASSERT(layer->getApi() == Layer::Api::Vulkan);

        VkLayer* vkLayer = static_cast<VkLayer*>(layer);