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

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

Merge "SF: Fix blur region transform regression"

parents dc6e0d37 e7613db2

services/surfaceflinger/Layer.cpp

+1 −1
Original line number Diff line number Diff line
@@ -472,7 +472,7 @@ void Layer::prepareBasicGeometryCompositionState() { 
    snapshot->geomLayerTransform = getTransform();

    snapshot->geomInverseLayerTransform = snapshot->geomLayerTransform.inverse();

    snapshot->transparentRegionHint = getActiveTransparentRegion(drawingState);



    snapshot->blurRegionTransform = getActiveTransform(drawingState).inverse();

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

    snapshot->alpha = alpha;

    snapshot->backgroundBlurRadius = drawingState.backgroundBlurRadius;

services/surfaceflinger/LayerFE.cpp

+2 −2
Original line number Diff line number Diff line
@@ -148,14 +148,14 @@ std::optional<compositionengine::LayerFE::LayerSettings> LayerFE::prepareClientC 
        case LayerFE::ClientCompositionTargetSettings::BlurSetting::Enabled:

            layerSettings.backgroundBlurRadius = mSnapshot->backgroundBlurRadius;

            layerSettings.blurRegions = mSnapshot->blurRegions;

            layerSettings.blurRegionTransform = mSnapshot->geomInverseLayerTransform.asMatrix4();

            layerSettings.blurRegionTransform = mSnapshot->blurRegionTransform.asMatrix4();

            break;

        case LayerFE::ClientCompositionTargetSettings::BlurSetting::BackgroundBlurOnly:

            layerSettings.backgroundBlurRadius = mSnapshot->backgroundBlurRadius;

            break;

        case LayerFE::ClientCompositionTargetSettings::BlurSetting::BlurRegionsOnly:

            layerSettings.blurRegions = mSnapshot->blurRegions;

            layerSettings.blurRegionTransform = mSnapshot->geomInverseLayerTransform.asMatrix4();

            layerSettings.blurRegionTransform = mSnapshot->blurRegionTransform.asMatrix4();

            break;

        case LayerFE::ClientCompositionTargetSettings::BlurSetting::Disabled:

        default:

services/surfaceflinger/LayerFE.h

+1 −0
Original line number Diff line number Diff line
@@ -57,6 +57,7 @@ struct LayerSnapshot : public compositionengine::LayerFECompositionState { 
    gui::LayerMetadata relativeLayerMetadata;

    bool contentDirty;

    bool hasReadyFrame;

    ui::Transform blurRegionTransform;

};



struct CompositionResult {