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

Commit a112637c authored by Chavi Weingarten's avatar Chavi Weingarten Committed by Automerger Merge Worker
Browse files

Merge "Don't create CE Layer when EffectLayer has nothing to draw." into... 

Merge "Don't create CE Layer when EffectLayer has nothing to draw." into tm-dev am: 01709c20 am: 2ec1c91c

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



Change-Id: Ic5f9fdd5a3f831df6debeda58adc574079c0760b
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents f73f7b2d 2ec1c91c

services/surfaceflinger/EffectLayer.cpp

+7 −1
Original line number Diff line number Diff line
@@ -114,7 +114,13 @@ void EffectLayer::preparePerFrameCompositionState() { 
}



sp<compositionengine::LayerFE> EffectLayer::getCompositionEngineLayerFE() const {

    // There's no need to get a CE Layer if the EffectLayer isn't going to draw anything. In that

    // case, it acts more like a ContainerLayer so returning a null CE Layer makes more sense

    if (hasSomethingToDraw()) {

        return asLayerFE();

    } else {

        return nullptr;

    }

}



compositionengine::LayerFECompositionState* EffectLayer::editCompositionState() {