Merge "Early wake-up for transitions (1/2)" into pi-dev (d93c8ee4) · Commits · e / devices / smdk4412 / android_frameworks_native

libs/gui/SurfaceComposerClient.cpp

+10 −1

Original line number	Diff line number	Diff line
		@@ -101,7 +101,8 @@ void ComposerService::composerServiceDied()
		SurfaceComposerClient::Transaction::Transaction(const Transaction& other) :
		mForceSynchronous(other.mForceSynchronous),
		mTransactionNestCount(other.mTransactionNestCount),
		mAnimation(other.mAnimation) {
		mAnimation(other.mAnimation),
		mEarlyWakeup(other.mEarlyWakeup) {
		mDisplayStates = other.mDisplayStates;
		mComposerStates = other.mComposerStates;
		}
		@@ -157,9 +158,13 @@ status_t SurfaceComposerClient::Transaction::apply(bool synchronous) {
		if (mAnimation) {
		flags \|= ISurfaceComposer::eAnimation;
		}
		if (mEarlyWakeup) {
		flags \|= ISurfaceComposer::eEarlyWakeup;
		}

		mForceSynchronous = false;
		mAnimation = false;
		mEarlyWakeup = false;

		sf->setTransactionState(composerStates, displayStates, flags);
		mStatus = NO_ERROR;
		@@ -185,6 +190,10 @@ void SurfaceComposerClient::Transaction::setAnimationTransaction() {
		mAnimation = true;
		}

		void SurfaceComposerClient::Transaction::setEarlyWakeup() {
		mEarlyWakeup = true;
		}

		layer_state_t* SurfaceComposerClient::Transaction::getLayerState(const sp<SurfaceControl>& sc) {
		if (mComposerStates.count(sc) == 0) {
		// we don't have it, add an initialized layer_state to our list

+5 −0

Original line number	Diff line number	Diff line
		@@ -61,6 +61,11 @@ public:
		enum {
		eSynchronous = 0x01,
		eAnimation = 0x02,

		// Indicates that this transaction will likely result in a lot of layers being composed, and
		// thus, SurfaceFlinger should wake-up earlier to avoid missing frame deadlines. In this
		// case SurfaceFlinger will wake up at (sf vsync offset - debug.sf.early_phase_offset_ns)
		eEarlyWakeup = 0x04
		};

		enum {

+2 −0

Original line number	Diff line number	Diff line
		@@ -154,6 +154,7 @@ public:
		uint32_t mForceSynchronous = 0;
		uint32_t mTransactionNestCount = 0;
		bool mAnimation = false;
		bool mEarlyWakeup = false;

		int mStatus = NO_ERROR;

		@@ -273,6 +274,7 @@ public:
		const Rect& displayRect);
		void setDisplaySize(const sp<IBinder>& token, uint32_t width, uint32_t height);
		void setAnimationTransaction();
		void setEarlyWakeup();
		};

		status_t destroySurface(const sp<IBinder>& id);

+1 −0

Original line number	Diff line number	Diff line
		@@ -778,6 +778,7 @@ bool BufferLayer::getOpacityForFormat(uint32_t format) {
		}

		void BufferLayer::drawWithOpenGL(const RenderArea& renderArea, bool useIdentityTransform) const {
		ATRACE_CALL();
		const State& s(getDrawingState());

		computeGeometry(renderArea, getBE().mMesh, useIdentityTransform);

+1 −0

Original line number	Diff line number	Diff line
		@@ -356,6 +356,7 @@ status_t BufferLayerConsumer::updateAndReleaseLocked(const BufferItem& item,
		}

		status_t BufferLayerConsumer::bindTextureImageLocked() {
		ATRACE_CALL();
		mRE.checkErrors();

		if (mCurrentTexture == BufferQueue::INVALID_BUFFER_SLOT && mCurrentTextureImage == nullptr) {