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

Commit e2e4dcbb authored by Nader Jawad's avatar Nader Jawad Committed by Automerger Merge Worker
Browse files

Merge "Updated SkiaGLRenderEngine stretch logic" into sc-dev am: 5c234abd 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/14489964

Change-Id: I1fb5d659b018f39d2a7a5890adffcc1cd9fc4bd1
parents 577debe8 5c234abd

libs/renderengine/skia/SkiaGLRenderEngine.cpp

+3 −3
Original line number Original line Diff line number Diff line
@@ -564,10 +564,10 @@ sk_sp<SkShader> SkiaGLRenderEngine::createRuntimeEffectShader( 
    // which gets similar results for most surfaces

    // which gets similar results for most surfaces

    // Determine later on if we need to leverage the stertch shader within

    // Determine later on if we need to leverage the stertch shader within

    // surface flinger

    // surface flinger

    if (stretchEffect.hasEffect() && /* DISABLES CODE */ (false)) {

    if (stretchEffect.hasEffect()) {

        const auto targetBuffer = layer->source.buffer.buffer;

        const auto targetBuffer = layer->source.buffer.buffer;

        const auto graphicsBuffer = targetBuffer ? targetBuffer->getBuffer() : nullptr;

        const auto graphicBuffer = targetBuffer ? targetBuffer->getBuffer() : nullptr;

        if (graphicsBuffer && shader) {

        if (graphicBuffer && shader) {

            shader = mStretchShaderFactory.createSkShader(shader, stretchEffect);

            shader = mStretchShaderFactory.createSkShader(shader, stretchEffect);

        }

        }

    }

    }

libs/renderengine/skia/SkiaGLRenderEngine.h

+5 −4
Original line number Original line Diff line number Diff line
@@ -120,14 +120,15 @@ private: 




    // Identifier used or various mappings of layers to various

    // Identifier used or various mappings of layers to various

    // textures or shaders

    // textures or shaders

    using LayerId = uint64_t;

    using GraphicBufferId = uint64_t;





    // Number of external holders of ExternalTexture references, per GraphicBuffer ID.

    // Number of external holders of ExternalTexture references, per GraphicBuffer ID.

    std::unordered_map<LayerId, int32_t> mGraphicBufferExternalRefs GUARDED_BY(mRenderingMutex);

    std::unordered_map<GraphicBufferId, int32_t> mGraphicBufferExternalRefs

            GUARDED_BY(mRenderingMutex);

    // Cache of GL textures that we'll store per GraphicBuffer ID, sliced by GPU context.

    // Cache of GL textures that we'll store per GraphicBuffer ID, sliced by GPU context.

    std::unordered_map<LayerId, std::shared_ptr<AutoBackendTexture::LocalRef>> mTextureCache

    std::unordered_map<GraphicBufferId, std::shared_ptr<AutoBackendTexture::LocalRef>> mTextureCache

            GUARDED_BY(mRenderingMutex);

            GUARDED_BY(mRenderingMutex);

    std::unordered_map<LayerId, std::shared_ptr<AutoBackendTexture::LocalRef>>

    std::unordered_map<GraphicBufferId, std::shared_ptr<AutoBackendTexture::LocalRef>>

            mProtectedTextureCache GUARDED_BY(mRenderingMutex);

            mProtectedTextureCache GUARDED_BY(mRenderingMutex);

    std::unordered_map<LinearEffect, sk_sp<SkRuntimeEffect>, LinearEffectHasher> mRuntimeEffects;

    std::unordered_map<LinearEffect, sk_sp<SkRuntimeEffect>, LinearEffectHasher> mRuntimeEffects;