Merge "SF Bounds caching 1/3: Defer calls that use layer bounds until the... (e04bf9f9) · Commits · e / os / platform_frameworks_native

services/surfaceflinger/BufferLayer.cpp

+17 −18

Original line number	Diff line number	Diff line
		@@ -365,20 +365,18 @@ bool BufferLayer::onPostComposition(const std::optional<DisplayId>& displayId,
		return true;
		}

		Region BufferLayer::latchBuffer(bool& recomputeVisibleRegions, nsecs_t latchTime,
		bool BufferLayer::latchBuffer(bool& recomputeVisibleRegions, nsecs_t latchTime,
		const sp<Fence>& releaseFence) {
		ATRACE_CALL();

		std::optional<Region> sidebandStreamDirtyRegion = latchSidebandStream(recomputeVisibleRegions);
		bool refreshRequired = latchSidebandStream(recomputeVisibleRegions);

		if (sidebandStreamDirtyRegion) {
		return *sidebandStreamDirtyRegion;
		if (refreshRequired) {
		return refreshRequired;
		}

		Region dirtyRegion;

		if (!hasReadyFrame()) {
		return dirtyRegion;
		return false;
		}

		// if we've already called updateTexImage() without going through
		@@ -387,14 +385,14 @@ Region BufferLayer::latchBuffer(bool& recomputeVisibleRegions, nsecs_t latchTime
		// compositionComplete() call.
		// we'll trigger an update in onPreComposition().
		if (mRefreshPending) {
		return dirtyRegion;
		return false;
		}

		// If the head buffer's acquire fence hasn't signaled yet, return and
		// try again later
		if (!fenceHasSignaled()) {
		mFlinger->signalLayerUpdate();
		return dirtyRegion;
		return false;
		}

		// Capture the old state of the layer for comparisons later
		@@ -404,24 +402,24 @@ Region BufferLayer::latchBuffer(bool& recomputeVisibleRegions, nsecs_t latchTime

		if (!allTransactionsSignaled()) {
		mFlinger->signalLayerUpdate();
		return dirtyRegion;
		return false;
		}

		status_t err = updateTexImage(recomputeVisibleRegions, latchTime, releaseFence);
		if (err != NO_ERROR) {
		return dirtyRegion;
		return false;
		}

		err = updateActiveBuffer();
		if (err != NO_ERROR) {
		return dirtyRegion;
		return false;
		}

		mBufferLatched = true;

		err = updateFrameNumber(latchTime);
		if (err != NO_ERROR) {
		return dirtyRegion;
		return false;
		}

		mRefreshPending = true;
		@@ -461,11 +459,14 @@ Region BufferLayer::latchBuffer(bool& recomputeVisibleRegions, nsecs_t latchTime
		Rect crop(getDrawingCrop());
		const uint32_t transform(getDrawingTransform());
		const uint32_t scalingMode(getDrawingScalingMode());
		const bool transformToDisplayInverse(getTransformToDisplayInverse());
		if ((crop != mCurrentCrop) \|\| (transform != mCurrentTransform) \|\|
		(scalingMode != mCurrentScalingMode)) {
		(scalingMode != mCurrentScalingMode) \|\|
		(transformToDisplayInverse != mTransformToDisplayInverse)) {
		mCurrentCrop = crop;
		mCurrentTransform = transform;
		mCurrentScalingMode = scalingMode;
		mTransformToDisplayInverse = transformToDisplayInverse;
		recomputeVisibleRegions = true;
		}

		@@ -502,9 +503,7 @@ Region BufferLayer::latchBuffer(bool& recomputeVisibleRegions, nsecs_t latchTime
		}
		}

		// FIXME: postedRegion should be dirty & bounds
		// transform the dirty region to window-manager space
		return getTransform().transform(Region(getBufferSize(s)));
		return true;
		}

		// transaction

services/surfaceflinger/BufferLayer.h

+6 −3

Original line number	Diff line number	Diff line
		@@ -99,7 +99,7 @@ public:
		// If there was a GL composition step rendering the previous frame, then
		// releaseFence will be populated with a native fence that fires when
		// composition has completed.
		Region latchBuffer(bool& recomputeVisibleRegions, nsecs_t latchTime,
		bool latchBuffer(bool& recomputeVisibleRegions, nsecs_t latchTime,
		const sp<Fence>& releaseFence) override;

		bool isBufferLatched() const override { return mRefreshPending; }
		@@ -137,7 +137,8 @@ private:
		virtual bool getAutoRefresh() const = 0;
		virtual bool getSidebandStreamChanged() const = 0;

		virtual std::optional<Region> latchSidebandStream(bool& recomputeVisibleRegions) = 0;
		// Latch sideband stream and returns true if the dirty region should be updated.
		virtual bool latchSidebandStream(bool& recomputeVisibleRegions) = 0;

		virtual bool hasFrameUpdate() const = 0;

		@@ -179,6 +180,8 @@ private:

		uint32_t mCurrentScalingMode{NATIVE_WINDOW_SCALING_MODE_FREEZE};

		bool mTransformToDisplayInverse{false};

		// main thread.
		bool mBufferLatched{false}; // TODO: Use mActiveBuffer?

services/surfaceflinger/BufferQueueLayer.cpp

+3 −4

Original line number	Diff line number	Diff line
		@@ -190,7 +190,7 @@ bool BufferQueueLayer::getSidebandStreamChanged() const {
		return mSidebandStreamChanged;
		}

		std::optional<Region> BufferQueueLayer::latchSidebandStream(bool& recomputeVisibleRegions) {
		bool BufferQueueLayer::latchSidebandStream(bool& recomputeVisibleRegions) {
		bool sidebandStreamChanged = true;
		if (mSidebandStreamChanged.compare_exchange_strong(sidebandStreamChanged, false)) {
		// mSidebandStreamChanged was changed to false
		@@ -202,10 +202,9 @@ std::optional<Region> BufferQueueLayer::latchSidebandStream(bool& recomputeVisib
		}
		recomputeVisibleRegions = true;

		const State& s(getDrawingState());
		return getTransform().transform(Region(Rect(s.active_legacy.w, s.active_legacy.h)));
		return true;
		}
		return {};
		return false;
		}

		bool BufferQueueLayer::hasFrameUpdate() const {

services/surfaceflinger/BufferQueueLayer.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -81,7 +81,7 @@ private:
		bool getAutoRefresh() const override;
		bool getSidebandStreamChanged() const override;

		std::optional<Region> latchSidebandStream(bool& recomputeVisibleRegions) override;
		bool latchSidebandStream(bool& recomputeVisibleRegions) override;

		bool hasFrameUpdate() const override;

services/surfaceflinger/BufferStateLayer.cpp

+3 −3

Original line number	Diff line number	Diff line
		@@ -420,7 +420,7 @@ bool BufferStateLayer::getSidebandStreamChanged() const {
		return mSidebandStreamChanged.load();
		}

		std::optional<Region> BufferStateLayer::latchSidebandStream(bool& recomputeVisibleRegions) {
		bool BufferStateLayer::latchSidebandStream(bool& recomputeVisibleRegions) {
		if (mSidebandStreamChanged.exchange(false)) {
		const State& s(getDrawingState());
		// mSidebandStreamChanged was true
		@@ -432,9 +432,9 @@ std::optional<Region> BufferStateLayer::latchSidebandStream(bool& recomputeVisib
		}
		recomputeVisibleRegions = true;

		return getTransform().transform(Region(Rect(s.active.w, s.active.h)));
		return true;
		}
		return {};
		return false;
		}

		bool BufferStateLayer::hasFrameUpdate() const {