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

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

SF: Remove DisplayDevice visible layer members 

There are no longer any consumers of it, so the data and related functions
are removed, and the bit of code that was still setting it is removed.

Test: atest libsurfaceflinger_unittest libcompositionengine_test
Bug: 121291683
Change-Id: If09254dc44645b816d88b89cda64284822dd43ed
parent 3eb1b21a

services/surfaceflinger/DisplayDevice.cpp

+0 −11
Original line number Diff line number Diff line
@@ -116,16 +116,6 @@ uint32_t DisplayDevice::getPageFlipCount() const { 
    return mCompositionDisplay->getRenderSurface()->getPageFlipCount();

}



// ----------------------------------------------------------------------------



void DisplayDevice::setVisibleLayersSortedByZ(const Vector< sp<Layer> >& layers) {

    mVisibleLayersSortedByZ = layers;

}



const Vector< sp<Layer> >& DisplayDevice::getVisibleLayersSortedByZ() const {

    return mVisibleLayersSortedByZ;

}



// ----------------------------------------------------------------------------

void DisplayDevice::setPowerMode(int mode) {

    mPowerMode = mode;
@@ -291,7 +281,6 @@ void DisplayDevice::dump(std::string& result) const { 
    result.append("   ");

    StringAppendF(&result, "powerMode=%d, ", mPowerMode);

    StringAppendF(&result, "activeConfig=%d, ", mActiveConfig);

    StringAppendF(&result, "numLayers=%zu\n", mVisibleLayersSortedByZ.size());

    getCompositionDisplay()->dump(result);

}

services/surfaceflinger/DisplayDevice.h

+0 −6
Original line number Diff line number Diff line
@@ -87,9 +87,6 @@ public: 
    int         getHeight() const;

    int         getInstallOrientation() const { return mDisplayInstallOrientation; }



    void                    setVisibleLayersSortedByZ(const Vector< sp<Layer> >& layers);

    const Vector< sp<Layer> >& getVisibleLayersSortedByZ() const;



    void                    setLayerStack(uint32_t stack);

    void                    setDisplaySize(const int newWidth, const int newHeight);

    void                    setProjection(int orientation, const Rect& viewport, const Rect& frame);
@@ -179,9 +176,6 @@ private: 
     * don't need synchronization.

     */



    // list of visible layers on that display

    Vector< sp<Layer> > mVisibleLayersSortedByZ;



    /*

     * Transaction state

     */

services/surfaceflinger/SurfaceFlinger.cpp

+0 −5
Original line number Diff line number Diff line
@@ -2093,7 +2093,6 @@ void SurfaceFlinger::rebuildLayerStacks() { 
            Region dirtyRegion;

            compositionengine::Output::OutputLayers layersSortedByZ;

            compositionengine::Output::ReleasedLayers releasedLayers;

            Vector<sp<Layer>> deprecated_layersSortedByZ;

            const ui::Transform& tr = displayState.transform;

            const Rect bounds = displayState.bounds;

            if (displayState.isEnabled) {
@@ -2125,8 +2124,6 @@ void SurfaceFlinger::rebuildLayerStacks() { 
                        layersSortedByZ.emplace_back(

                                display->getOrCreateOutputLayer(displayId, compositionLayer,

                                                                layerFE));

                        deprecated_layersSortedByZ.add(layer);



                        auto& outputLayerState = layersSortedByZ.back()->editState();

                        outputLayerState.visibleRegion =

                                tr.transform(layer->visibleRegion.intersect(displayState.viewport));
@@ -2150,8 +2147,6 @@ void SurfaceFlinger::rebuildLayerStacks() { 
            display->setOutputLayersOrderedByZ(std::move(layersSortedByZ));

            display->setReleasedLayers(std::move(releasedLayers));



            displayDevice->setVisibleLayersSortedByZ(deprecated_layersSortedByZ);



            Region undefinedRegion{bounds};

            undefinedRegion.subtractSelf(tr.transform(opaqueRegion));

services/surfaceflinger/tests/unittests/CompositionTest.cpp

+0 −5
Original line number Diff line number Diff line
@@ -805,9 +805,6 @@ struct BaseLayerVariant { 


        Mock::VerifyAndClear(test->mComposer);



        Vector<sp<Layer>> layers;

        layers.add(layer);

        test->mDisplay->setVisibleLayersSortedByZ(layers);

        test->mFlinger.mutableDrawingState().layersSortedByZ.add(layer);

    }
@@ -1096,8 +1093,6 @@ struct CompositionCase { 
        for (auto& hwcDisplay : test->mFlinger.mFakeHwcDisplays) {

            hwcDisplay->mutableLayers().clear();

        }



        test->mDisplay->setVisibleLayersSortedByZ(Vector<sp<android::Layer>>());

    }

};