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

Commit 0f249cea authored by Derek Sollenberger's avatar Derek Sollenberger Committed by Android (Google) Code Review
Browse files

Merge "Ensure that blurRegions take into account the buffers rotation." into sc-dev

parents 0aaca716 39feade9

libs/renderengine/include/renderengine/LayerSettings.h

+4 −0
Original line number Diff line number Diff line
@@ -156,6 +156,10 @@ struct LayerSettings { 


    std::vector<BlurRegion> blurRegions;



    // Transform matrix used to convert the blurRegions geometry into the same

    // coordinate space as LayerSettings.geometry

    mat4 blurRegionTransform = mat4();



    StretchEffect stretchEffect;



    // Name associated with the layer for debugging purposes.

libs/renderengine/skia/SkiaGLRenderEngine.cpp

+2 −0
Original line number Diff line number Diff line
@@ -834,6 +834,8 @@ status_t SkiaGLRenderEngine::drawLayers(const DisplaySettings& display, 
                    mBlurFilter->drawBlurRegion(canvas, getBlurRegion(layer), blurRect,

                                                blurredImage, blurInput);

                }

                SkAutoCanvasRestore acr(canvas, true);

                canvas->concat(getSkM44(layer->blurRegionTransform).asM33());

                for (auto region : layer->blurRegions) {

                    if (cachedBlurs[region.blurRadius] == nullptr) {

                        ATRACE_NAME("BlurRegion");

services/surfaceflinger/Layer.cpp

+2 −0
Original line number Diff line number Diff line
@@ -632,6 +632,8 @@ std::optional<compositionengine::LayerFE::LayerSettings> Layer::prepareClientCom 
    if (!targetSettings.disableBlurs) {

        layerSettings.backgroundBlurRadius = getBackgroundBlurRadius();

        layerSettings.blurRegions = getBlurRegions();

        layerSettings.blurRegionTransform =

                getActiveTransform(getDrawingState()).inverse().asMatrix4();

    }

    layerSettings.stretchEffect = getDrawingState().stretchEffect;

    // Record the name of the layer for debugging further down the stack.