Skip to content

Commit adcc7ba

Browse files
committed
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
1 parent 1e9f87e commit adcc7ba

2 files changed

Lines changed: 0 additions & 15 deletions

File tree

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -253,7 +253,6 @@ class Flattener {
253253
std::unordered_map<size_t, size_t> mFinalLayerCounts;
254254
size_t mCachedSetCreationCount = 0;
255255
size_t mCachedSetCreationCost = 0;
256-
std::unordered_map<size_t, size_t> mInvalidatedCachedSetAges;
257256
};
258257

259258
} // namespace compositionengine::impl::planner

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

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -243,17 +243,9 @@ void Flattener::resetActivities(NonBufferHash hash, time_point now) {
243243

244244
mCurrentGeometry = hash;
245245
mLastGeometryUpdate = now;
246-
247-
for (const CachedSet& cachedSet : mLayers) {
248-
if (cachedSet.getLayerCount() > 1) {
249-
++mInvalidatedCachedSetAges[cachedSet.getAge()];
250-
}
251-
}
252-
253246
mLayers.clear();
254247

255248
if (mNewCachedSet) {
256-
++mInvalidatedCachedSetAges[mNewCachedSet->getAge()];
257249
mNewCachedSet = std::nullopt;
258250
}
259251
}
@@ -312,7 +304,6 @@ bool Flattener::mergeWithCachedSets(const std::vector<const LayerState*>& layers
312304
mNewCachedSet->getFirstLayer().getState()->getId() == (*incomingLayerIter)->getId()) {
313305
if (mNewCachedSet->hasBufferUpdate()) {
314306
ALOGV("[%s] Dropping new cached set", __func__);
315-
++mInvalidatedCachedSetAges[0];
316307
mNewCachedSet = std::nullopt;
317308
} else if (mNewCachedSet->hasReadyBuffer()) {
318309
ALOGV("[%s] Found ready buffer", __func__);
@@ -338,10 +329,6 @@ bool Flattener::mergeWithCachedSets(const std::vector<const LayerState*>& layers
338329
};
339330
++incomingLayerIter;
340331
}
341-
342-
if (currentLayerIter->getLayerCount() > 1) {
343-
++mInvalidatedCachedSetAges[currentLayerIter->getAge()];
344-
}
345332
++currentLayerIter;
346333

347334
skipCount -= layerCount;
@@ -380,7 +367,6 @@ bool Flattener::mergeWithCachedSets(const std::vector<const LayerState*>& layers
380367
}
381368
} else if (currentLayerIter->getLayerCount() > 1) {
382369
// Break the current layer into its constituent layers
383-
++mInvalidatedCachedSetAges[currentLayerIter->getAge()];
384370
for (CachedSet& layer : currentLayerIter->decompose()) {
385371
bool disableBlur =
386372
priorBlurLayer && priorBlurLayer == (*incomingLayerIter)->getOutputLayer();

0 commit comments

Comments
 (0)