Merge "Modifying BLAST frame number to match BufferQueue" (4274794a) · Commits · e / os / android_frameworks_native-old

services/surfaceflinger/BufferStateLayer.cpp

+4 −2

Original line number	Diff line number	Diff line
		@@ -239,6 +239,8 @@ bool BufferStateLayer::setBuffer(const sp<GraphicBuffer>& buffer, nsecs_t postTi
		mReleasePreviousBuffer = true;
		}

		mFrameCounter++;

		mCurrentState.buffer = buffer;
		mCurrentState.clientCacheId = clientCacheId;
		mCurrentState.modified = true;
		@@ -496,6 +498,8 @@ status_t BufferStateLayer::updateTexImage(bool& /recomputeVisibleRegions/, nse
		handle->latchTime = latchTime;
		}

		mFrameNumber = mFrameCounter;

		if (!SyncFeatures::getInstance().useNativeFenceSync()) {
		// Bind the new buffer to the GL texture.
		//
		@@ -557,8 +561,6 @@ void BufferStateLayer::latchPerFrameState(
		compositionState.buffer = mBufferInfo.mBuffer;
		compositionState.bufferSlot = mBufferInfo.mBufferSlot;
		compositionState.acquireFence = mBufferInfo.mFence;

		mFrameNumber++;
		}

		void BufferStateLayer::HwcSlotGenerator::bufferErased(const client_cache_t& clientCacheId) {

+1 −0

Original line number	Diff line number	Diff line
		@@ -142,6 +142,7 @@ private:
		std::atomic<bool> mSidebandStreamChanged{false};

		mutable uint32_t mFrameNumber{0};
		uint64_t mFrameCounter{0};

		sp<Fence> mPreviousReleaseFence;
		uint64_t mPreviousBufferId = 0;