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

Commit c7b95f65 authored by Eric Sum's avatar Eric Sum Committed by Android (Google) Code Review
Browse files

Merge "Remove mInvalidatedCachedSetAges from Flattener." into main

parents 4ef6d544 adcc7ba0

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

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

    size_t mCachedSetCreationCount = 0;

    size_t mCachedSetCreationCost = 0;

    std::unordered_map<size_t, size_t> mInvalidatedCachedSetAges;

};



} // namespace compositionengine::impl::planner

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

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


    mCurrentGeometry = hash;

    mLastGeometryUpdate = now;



    for (const CachedSet& cachedSet : mLayers) {

        if (cachedSet.getLayerCount() > 1) {

            ++mInvalidatedCachedSetAges[cachedSet.getAge()];

        }

    }



    mLayers.clear();



    if (mNewCachedSet) {

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

        mNewCachedSet = std::nullopt;

    }

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

            if (mNewCachedSet->hasBufferUpdate()) {

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

                ++mInvalidatedCachedSetAges[0];

                mNewCachedSet = std::nullopt;

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

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

                        ++incomingLayerIter;

                    }



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

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

                    }

                    ++currentLayerIter;



                    skipCount -= layerCount;
@@ -382,7 +369,6 @@ bool Flattener::mergeWithCachedSets(const std::vector<const LayerState*>& layers 
            priorBlurLayer = currentLayerIter->getBlurLayer();

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

            // Break the current layer into its constituent layers

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

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

                bool disableBlur =

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