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

Commit a2468669 authored by Lloyd Pique's avatar Lloyd Pique
Browse files

SF: Move layer visibility state to CompositionEngine 

The layer visibility/coverage state was the last bit of
display-dependent data that had not yet been moved to
OutputLayerCompositionState. This moves it, and fixes up all references
to the data to get it in a display-dependent way.

Test: atest libsurfaceflinger_unittest libcompositionengine_test
Bug: 121291683
Change-Id: Id9f314f05b743212dba3a113df2baeb38fd19eb8
parent 26d03fdb

services/surfaceflinger/BufferLayer.cpp

+2 −1
Original line number Diff line number Diff line
@@ -158,7 +158,8 @@ std::optional<renderengine::LayerSettings> BufferLayer::prepareClientComposition 
                finished = true;

                return;

            }

            under.orSelf(layer->visibleRegion);



            under.orSelf(layer->getScreenBounds());

        });

        // if not everything below us is covered, we plug the holes!

        Region holes(targetSettings.clip.subtract(under));

services/surfaceflinger/CompositionEngine/include/compositionengine/LayerFECompositionState.h

+0 −4
Original line number Diff line number Diff line
@@ -56,10 +56,6 @@ struct LayerFECompositionState { 
    Region geomActiveTransparentRegion;

    FloatRect geomLayerBounds;



    // TODO(lpique): b/121291683 Remove this one we are sure we don't need the

    // value recomputed / set every frame.

    Region geomVisibleRegion;



    /*

     * Presentation

     */

services/surfaceflinger/CompositionEngine/include/compositionengine/impl/LayerCompositionState.h

+2 −1
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ 


#include <compositionengine/LayerFECompositionState.h>

#include <renderengine/Mesh.h>

#include <ui/Region.h>



namespace android {
@@ -28,7 +29,7 @@ namespace compositionengine::impl { 


struct LayerCompositionState {

    /*

     * State intended to be set by LayerFE::getCompositionState

     * State set by LayerFE::getCompositionState

     */



    LayerFECompositionState frontEnd;

services/surfaceflinger/CompositionEngine/include/compositionengine/impl/OutputLayerCompositionState.h

+11 −2
Original line number Diff line number Diff line
@@ -40,9 +40,18 @@ class HWComposer; 
namespace compositionengine::impl {



struct OutputLayerCompositionState {

    // The region of this layer which is visible on this output

    // The portion of the layer that is not obscured by opaque layers on top

    Region visibleRegion;



    // The portion of the layer that is not obscured and is also opaque

    Region visibleNonTransparentRegion;



    // The portion of the layer that is obscured by opaque layers on top

    Region coveredRegion;



    // The visibleRegion transformed to output space

    Region outputSpaceVisibleRegion;



    // If true, client composition will be used on this output

    bool forceClientComposition{false};
@@ -62,7 +71,7 @@ struct OutputLayerCompositionState { 
    ui::Dataspace dataspace{ui::Dataspace::UNKNOWN};



    // The Z order index of this layer on this output

    uint32_t z;

    uint32_t z{0};



    /*

     * HWC state

services/surfaceflinger/CompositionEngine/src/Output.cpp

+1 −1
Original line number Diff line number Diff line
@@ -601,7 +601,7 @@ std::vector<renderengine::LayerSettings> Output::generateClientCompositionReques 
        const auto& layerFEState = layer->getLayer().getState().frontEnd;

        auto& layerFE = layer->getLayerFE();



        const Region clip(viewportRegion.intersect(layerFEState.geomVisibleRegion));

        const Region clip(viewportRegion.intersect(layerState.visibleRegion));

        ALOGV("Layer: %s", layerFE.getDebugName());

        if (clip.isEmpty()) {

            ALOGV("  Skipping for empty clip");