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

Commit 3a2a24f5 authored by Lyn Han's avatar Lyn Han Committed by Android (Google) Code Review
Browse files

Merge "Revert "Respect LayerSettings::alpha in Skia-RE for buffer layers""

parents 023e314f 1bdedb30

libs/renderengine/skia/SkiaGLRenderEngine.cpp

+1 −3
Original line number Original line Diff line number Diff line
@@ -668,8 +668,6 @@ status_t SkiaGLRenderEngine::drawLayers(const DisplaySettings& display, 
            } else {

            } else {

                paint.setShader(shader);

                paint.setShader(shader);

            }

            }

            // Make sure to take into the account the alpha set on the layer.

            paint.setAlphaf(layer->alpha);

        } else {

        } else {

            ATRACE_NAME("DrawColor");

            ATRACE_NAME("DrawColor");

            const auto color = layer->source.solidColor;

            const auto color = layer->source.solidColor;
@@ -816,7 +814,7 @@ void SkiaGLRenderEngine::drawBlurRegion(SkCanvas* canvas, const BlurRegion& effe 
    ATRACE_CALL();

    ATRACE_CALL();





    SkPaint paint;

    SkPaint paint;

    paint.setAlphaf(effectRegion.alpha);

    paint.setAlpha(static_cast<int>(effectRegion.alpha * 255));

    const auto matrix = mBlurFilter->getShaderMatrix();

    const auto matrix = mBlurFilter->getShaderMatrix();

    paint.setShader(blurredSurface->makeImageSnapshot()->makeShader(matrix));

    paint.setShader(blurredSurface->makeImageSnapshot()->makeShader(matrix));