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

Commit c638470e authored by Vishnu Nair's avatar Vishnu Nair
Browse files

[sf] respect parent alpha when calculating blur radius and blur regions 

Fixes a regression caused by breaking front end and composition engine dependencies.

Test: atest BlurTests
Bug: 293532283

Change-Id: If9962a46bc7dba3b8f4256ae23307094a9c93290
parent 774bcbe5

services/surfaceflinger/Layer.cpp

+4 −4
Original line number Diff line number Diff line
@@ -594,8 +594,8 @@ void Layer::prepareBasicGeometryCompositionState() { 
    snapshot->localTransformInverse = snapshot->localTransform.inverse();

    snapshot->blendMode = static_cast<Hwc2::IComposerClient::BlendMode>(blendMode);

    snapshot->alpha = alpha;

    snapshot->backgroundBlurRadius = drawingState.backgroundBlurRadius;

    snapshot->blurRegions = drawingState.blurRegions;

    snapshot->backgroundBlurRadius = getBackgroundBlurRadius();

    snapshot->blurRegions = getBlurRegions();

    snapshot->stretchEffect = getStretchEffect();

}
@@ -664,8 +664,8 @@ void Layer::preparePerFrameCompositionState() { 
        snapshot->forceClientComposition = true;

    }

    // If there are no visible region changes, we still need to update blur parameters.

    snapshot->blurRegions = drawingState.blurRegions;

    snapshot->backgroundBlurRadius = drawingState.backgroundBlurRadius;

    snapshot->blurRegions = getBlurRegions();

    snapshot->backgroundBlurRadius = getBackgroundBlurRadius();



    // Layer framerate is used in caching decisions.

    // Retrieve it from the scheduler which maintains an instance of LayerHistory, and store it in

services/surfaceflinger/LayerFE.cpp

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 


// #define LOG_NDEBUG 0

#undef LOG_TAG

#define LOG_TAG "LayerFE"

#define LOG_TAG "SurfaceFlinger"

#define ATRACE_TAG ATRACE_TAG_GRAPHICS



#include <gui/GLConsumer.h>