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

Commit adcc7ba0 authored by Eric Sum's avatar Eric Sum
Browse files

Remove mInvalidatedCachedSetAges from Flattener. 

This member is effectively unused. It's being maintained and updated
throughout the code, but it's never being read.

Flag: EXEMPT cleanup
Bug: None
Test: atest FlattenerTest
Change-Id: Idf1a6faf5933a81116178ee88b8604d606ab80f5
parent 1e9f87ea

services/surfaceflinger/CompositionEngine/include/compositionengine/impl/planner/Flattener.h

+0 −1
Original line number Original line Diff line number Diff line
@@ -253,7 +253,6 @@ private: 
    std::unordered_map<size_t, size_t> mFinalLayerCounts;

    std::unordered_map<size_t, size_t> mFinalLayerCounts;

    size_t mCachedSetCreationCount = 0;

    size_t mCachedSetCreationCount = 0;

    size_t mCachedSetCreationCost = 0;

    size_t mCachedSetCreationCost = 0;

    std::unordered_map<size_t, size_t> mInvalidatedCachedSetAges;

};

};





} // namespace compositionengine::impl::planner

} // namespace compositionengine::impl::planner

services/surfaceflinger/CompositionEngine/src/planner/Flattener.cpp

+0 −14
Original line number Original line Diff line number Diff line
@@ -243,17 +243,9 @@ void Flattener::resetActivities(NonBufferHash hash, time_point now) { 




    mCurrentGeometry = hash;

    mCurrentGeometry = hash;

    mLastGeometryUpdate = now;

    mLastGeometryUpdate = now;



    for (const CachedSet& cachedSet : mLayers) {

        if (cachedSet.getLayerCount() > 1) {

            ++mInvalidatedCachedSetAges[cachedSet.getAge()];

        }

    }



    mLayers.clear();

    mLayers.clear();





    if (mNewCachedSet) {

    if (mNewCachedSet) {

        ++mInvalidatedCachedSetAges[mNewCachedSet->getAge()];

        mNewCachedSet = std::nullopt;

        mNewCachedSet = std::nullopt;

    }

    }

}

}
@@ -312,7 +304,6 @@ bool Flattener::mergeWithCachedSets(const std::vector<const LayerState*>& layers 
            mNewCachedSet->getFirstLayer().getState()->getId() == (*incomingLayerIter)->getId()) {

            mNewCachedSet->getFirstLayer().getState()->getId() == (*incomingLayerIter)->getId()) {

            if (mNewCachedSet->hasBufferUpdate()) {

            if (mNewCachedSet->hasBufferUpdate()) {

                ALOGV("[%s] Dropping new cached set", __func__);

                ALOGV("[%s] Dropping new cached set", __func__);

                ++mInvalidatedCachedSetAges[0];

                mNewCachedSet = std::nullopt;

                mNewCachedSet = std::nullopt;

            } else if (mNewCachedSet->hasReadyBuffer()) {

            } else if (mNewCachedSet->hasReadyBuffer()) {

                ALOGV("[%s] Found ready buffer", __func__);

                ALOGV("[%s] Found ready buffer", __func__);
@@ -338,10 +329,6 @@ bool Flattener::mergeWithCachedSets(const std::vector<const LayerState*>& layers 
                        };

                        };

                        ++incomingLayerIter;

                        ++incomingLayerIter;

                    }

                    }



                    if (currentLayerIter->getLayerCount() > 1) {

                        ++mInvalidatedCachedSetAges[currentLayerIter->getAge()];

                    }

                    ++currentLayerIter;

                    ++currentLayerIter;





                    skipCount -= layerCount;

                    skipCount -= layerCount;
@@ -380,7 +367,6 @@ bool Flattener::mergeWithCachedSets(const std::vector<const LayerState*>& layers 
            }

            }

        } else if (currentLayerIter->getLayerCount() > 1) {

        } else if (currentLayerIter->getLayerCount() > 1) {

            // Break the current layer into its constituent layers

            // Break the current layer into its constituent layers

            ++mInvalidatedCachedSetAges[currentLayerIter->getAge()];

            for (CachedSet& layer : currentLayerIter->decompose()) {

            for (CachedSet& layer : currentLayerIter->decompose()) {

                bool disableBlur =

                bool disableBlur =

                        priorBlurLayer && priorBlurLayer == (*incomingLayerIter)->getOutputLayer();

                        priorBlurLayer && priorBlurLayer == (*incomingLayerIter)->getOutputLayer();