Merge changes Id305effe,I065f1968,I18b6d921 into sc-dev am: cdc6088148 (487f7ae4) · Commits · e / os / android_frameworks_native

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -108,7 +108,7 @@ public:
		private:
		CachedSet() = default;

		NonBufferHash mFingerprint = 0;
		const NonBufferHash mFingerprint;
		std::chrono::steady_clock::time_point mLastUpdate = std::chrono::steady_clock::now();
		std::vector<Layer> mLayers;
		Rect mBounds = Rect::EMPTY_RECT;

+1 −2

Original line number	Diff line number	Diff line
		@@ -54,7 +54,7 @@ private:

		void resetActivities(NonBufferHash, std::chrono::steady_clock::time_point now);

		void updateLayersHash();
		NonBufferHash computeLayersHash() const;

		bool mergeWithCachedSets(const std::vector<const LayerState*>& layers,
		std::chrono::steady_clock::time_point now);
		@@ -69,7 +69,6 @@ private:
		std::chrono::steady_clock::time_point mLastGeometryUpdate;

		std::vector<CachedSet> mLayers;
		NonBufferHash mLayersHash = 0;
		std::optional<CachedSet> mNewCachedSet;

		// Statistics

+13 −7

Original line number	Diff line number	Diff line
		@@ -40,13 +40,17 @@ NonBufferHash Flattener::flattenLayers(const std::vector<const LayerState*>& lay

		++mInitialLayerCounts[layers.size()];

		if (mergeWithCachedSets(layers, now)) {
		hash = mLayersHash;
		}
		// Only buildCachedSets if these layers are already stored in mLayers.
		// Otherwise (i.e. mergeWithCachedSets returns false), the time has not
		// changed, so buildCachedSets will never find any runs.
		const bool alreadyHadCachedSets = mergeWithCachedSets(layers, now);

		++mFinalLayerCounts[mLayers.size()];

		if (alreadyHadCachedSets) {
		buildCachedSets(now);
		hash = computeLayersHash();
		}

		return hash;
		}
		@@ -157,14 +161,17 @@ void Flattener::resetActivities(NonBufferHash hash, time_point now) {
		}
		}

		void Flattener::updateLayersHash() {
		NonBufferHash Flattener::computeLayersHash() const{
		size_t hash = 0;
		for (const auto& layer : mLayers) {
		android::hashCombineSingleHashed(hash, layer.getNonBufferHash());
		}
		mLayersHash = hash;
		return hash;
		}

		// Only called if the geometry matches the last frame. Return true if mLayers
		// was already populated with these layers, i.e. on the second and following
		// calls with the same geometry.
		bool Flattener::mergeWithCachedSets(const std::vector<const LayerState*>& layers, time_point now) {
		std::vector<CachedSet> merged;

		@@ -272,7 +279,6 @@ bool Flattener::mergeWithCachedSets(const std::vector<const LayerState*>& layers
		}

		mLayers = std::move(merged);
		updateLayersHash();
		return true;
		}