Merge "Don't skip blurring recently-decomposed cachedsets." into main (f41ef91c) · Commits · e / os / android_frameworks_native

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

+3 −1

Original line number	Diff line number	Diff line
		@@ -325,6 +325,7 @@ bool Flattener::mergeWithCachedSets(const std::vector<const LayerState*>& layers
		priorBlurLayer == (*incomingLayerIter)->getOutputLayer();
		OutputLayer::CompositionState& state =
		(*incomingLayerIter)->getOutputLayer()->editState();

		state.overrideInfo = {
		.buffer = mNewCachedSet->getBuffer(),
		.acquireFence = mNewCachedSet->getDrawFence(),
		@@ -378,6 +379,7 @@ bool Flattener::mergeWithCachedSets(const std::vector<const LayerState*>& layers
		};
		++incomingLayerIter;
		}
		priorBlurLayer = currentLayerIter->getBlurLayer();
		} else if (currentLayerIter->getLayerCount() > 1) {
		// Break the current layer into its constituent layers
		++mInvalidatedCachedSetAges[currentLayerIter->getAge()];
		@@ -400,8 +402,8 @@ bool Flattener::mergeWithCachedSets(const std::vector<const LayerState*>& layers
		currentLayerIter->updateAge(now);
		merged.emplace_back(*currentLayerIter);
		++incomingLayerIter;
		}
		priorBlurLayer = currentLayerIter->getBlurLayer();
		}
		++currentLayerIter;
		}