From 67fba0fd7f7a83ceb8a98ea968050d18113026af Mon Sep 17 00:00:00 2001 From: Ady Abraham Date: Mon, 15 Mar 2021 16:13:36 -0700 Subject: SurfaceFlinger: remove ISurfaceComposer::eEarlyWakeup This flag is deprecated. Test: build Bug: 159125966 Change-Id: I7422ba741a25c2247097cd4530dd84da50f02fe1 --- libs/gui/SurfaceComposerClient.cpp | 13 ------------- libs/gui/include/gui/ISurfaceComposer.h | 3 --- libs/gui/include/gui/SurfaceComposerClient.h | 2 -- 3 files changed, 18 deletions(-) (limited to 'libs') diff --git a/libs/gui/SurfaceComposerClient.cpp b/libs/gui/SurfaceComposerClient.cpp index 5e8ab929f5..9e81fa922c 100644 --- a/libs/gui/SurfaceComposerClient.cpp +++ b/libs/gui/SurfaceComposerClient.cpp @@ -419,7 +419,6 @@ SurfaceComposerClient::Transaction::Transaction(const Transaction& other) mForceSynchronous(other.mForceSynchronous), mTransactionNestCount(other.mTransactionNestCount), mAnimation(other.mAnimation), - mEarlyWakeup(other.mEarlyWakeup), mExplicitEarlyWakeupStart(other.mExplicitEarlyWakeupStart), mExplicitEarlyWakeupEnd(other.mExplicitEarlyWakeupEnd), mContainsBuffer(other.mContainsBuffer), @@ -450,7 +449,6 @@ status_t SurfaceComposerClient::Transaction::readFromParcel(const Parcel* parcel const uint32_t forceSynchronous = parcel->readUint32(); const uint32_t transactionNestCount = parcel->readUint32(); const bool animation = parcel->readBool(); - const bool earlyWakeup = parcel->readBool(); const bool explicitEarlyWakeupStart = parcel->readBool(); const bool explicitEarlyWakeupEnd = parcel->readBool(); const bool containsBuffer = parcel->readBool(); @@ -527,7 +525,6 @@ status_t SurfaceComposerClient::Transaction::readFromParcel(const Parcel* parcel mForceSynchronous = forceSynchronous; mTransactionNestCount = transactionNestCount; mAnimation = animation; - mEarlyWakeup = earlyWakeup; mExplicitEarlyWakeupStart = explicitEarlyWakeupStart; mExplicitEarlyWakeupEnd = explicitEarlyWakeupEnd; mContainsBuffer = containsBuffer; @@ -559,7 +556,6 @@ status_t SurfaceComposerClient::Transaction::writeToParcel(Parcel* parcel) const parcel->writeUint32(mForceSynchronous); parcel->writeUint32(mTransactionNestCount); parcel->writeBool(mAnimation); - parcel->writeBool(mEarlyWakeup); parcel->writeBool(mExplicitEarlyWakeupStart); parcel->writeBool(mExplicitEarlyWakeupEnd); parcel->writeBool(mContainsBuffer); @@ -639,7 +635,6 @@ SurfaceComposerClient::Transaction& SurfaceComposerClient::Transaction::merge(Tr mInputWindowCommands.merge(other.mInputWindowCommands); mContainsBuffer |= other.mContainsBuffer; - mEarlyWakeup = mEarlyWakeup || other.mEarlyWakeup; mExplicitEarlyWakeupStart = mExplicitEarlyWakeupStart || other.mExplicitEarlyWakeupStart; mExplicitEarlyWakeupEnd = mExplicitEarlyWakeupEnd || other.mExplicitEarlyWakeupEnd; mApplyToken = other.mApplyToken; @@ -659,7 +654,6 @@ void SurfaceComposerClient::Transaction::clear() { mForceSynchronous = 0; mTransactionNestCount = 0; mAnimation = false; - mEarlyWakeup = false; mExplicitEarlyWakeupStart = false; mExplicitEarlyWakeupEnd = false; mDesiredPresentTime = 0; @@ -780,9 +774,6 @@ status_t SurfaceComposerClient::Transaction::apply(bool synchronous) { if (mAnimation) { flags |= ISurfaceComposer::eAnimation; } - if (mEarlyWakeup) { - flags |= ISurfaceComposer::eEarlyWakeup; - } // If both mExplicitEarlyWakeupStart and mExplicitEarlyWakeupEnd are set // it is equivalent for none @@ -841,10 +832,6 @@ void SurfaceComposerClient::Transaction::setAnimationTransaction() { mAnimation = true; } -void SurfaceComposerClient::Transaction::setEarlyWakeup() { - mEarlyWakeup = true; -} - void SurfaceComposerClient::Transaction::setExplicitEarlyWakeupStart() { mExplicitEarlyWakeupStart = true; } diff --git a/libs/gui/include/gui/ISurfaceComposer.h b/libs/gui/include/gui/ISurfaceComposer.h index 88cfe4b9ac..8b5f5b2812 100644 --- a/libs/gui/include/gui/ISurfaceComposer.h +++ b/libs/gui/include/gui/ISurfaceComposer.h @@ -89,9 +89,6 @@ public: eSynchronous = 0x01, eAnimation = 0x02, - // DEPRECATED - use eExplicitEarlyWakeup[Start|End] - eEarlyWakeup = 0x04, - // Explicit indication that this transaction and others to follow 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 diff --git a/libs/gui/include/gui/SurfaceComposerClient.h b/libs/gui/include/gui/SurfaceComposerClient.h index de88943cde..685be2489f 100644 --- a/libs/gui/include/gui/SurfaceComposerClient.h +++ b/libs/gui/include/gui/SurfaceComposerClient.h @@ -349,7 +349,6 @@ public: uint32_t mForceSynchronous = 0; uint32_t mTransactionNestCount = 0; bool mAnimation = false; - bool mEarlyWakeup = false; bool mExplicitEarlyWakeupStart = false; bool mExplicitEarlyWakeupEnd = false; @@ -561,7 +560,6 @@ public: const Rect& layerStackRect, const Rect& displayRect); void setDisplaySize(const sp& token, uint32_t width, uint32_t height); void setAnimationTransaction(); - void setEarlyWakeup(); void setExplicitEarlyWakeupStart(); void setExplicitEarlyWakeupEnd(); }; -- cgit v1.2.3-59-g8ed1b From 8cbd3075e57963c7bfc2e863cca3d7d2176e3e73 Mon Sep 17 00:00:00 2001 From: Ady Abraham Date: Mon, 15 Mar 2021 16:39:06 -0700 Subject: SF: rename ExplicitEarlyWakeup -> EarlyWakeup Bug: 159125966 Test: build Change-Id: I3ab95491ac5fe64b0dc56290ad05bbaf7b8e5009 --- libs/gui/SurfaceComposerClient.cpp | 42 +++++++++++----------- libs/gui/include/gui/ISurfaceComposer.h | 6 ++-- libs/gui/include/gui/SurfaceComposerClient.h | 8 ++--- .../surfaceflinger/Scheduler/VsyncModulator.cpp | 18 +++++----- services/surfaceflinger/Scheduler/VsyncModulator.h | 2 +- services/surfaceflinger/SurfaceFlinger.cpp | 10 +++--- 6 files changed, 43 insertions(+), 43 deletions(-) (limited to 'libs') diff --git a/libs/gui/SurfaceComposerClient.cpp b/libs/gui/SurfaceComposerClient.cpp index 9e81fa922c..38c52b7890 100644 --- a/libs/gui/SurfaceComposerClient.cpp +++ b/libs/gui/SurfaceComposerClient.cpp @@ -419,8 +419,8 @@ SurfaceComposerClient::Transaction::Transaction(const Transaction& other) mForceSynchronous(other.mForceSynchronous), mTransactionNestCount(other.mTransactionNestCount), mAnimation(other.mAnimation), - mExplicitEarlyWakeupStart(other.mExplicitEarlyWakeupStart), - mExplicitEarlyWakeupEnd(other.mExplicitEarlyWakeupEnd), + mEarlyWakeupStart(other.mEarlyWakeupStart), + mEarlyWakeupEnd(other.mEarlyWakeupEnd), mContainsBuffer(other.mContainsBuffer), mDesiredPresentTime(other.mDesiredPresentTime), mIsAutoTimestamp(other.mIsAutoTimestamp), @@ -449,8 +449,8 @@ status_t SurfaceComposerClient::Transaction::readFromParcel(const Parcel* parcel const uint32_t forceSynchronous = parcel->readUint32(); const uint32_t transactionNestCount = parcel->readUint32(); const bool animation = parcel->readBool(); - const bool explicitEarlyWakeupStart = parcel->readBool(); - const bool explicitEarlyWakeupEnd = parcel->readBool(); + const bool earlyWakeupStart = parcel->readBool(); + const bool earlyWakeupEnd = parcel->readBool(); const bool containsBuffer = parcel->readBool(); const int64_t desiredPresentTime = parcel->readInt64(); const bool isAutoTimestamp = parcel->readBool(); @@ -525,8 +525,8 @@ status_t SurfaceComposerClient::Transaction::readFromParcel(const Parcel* parcel mForceSynchronous = forceSynchronous; mTransactionNestCount = transactionNestCount; mAnimation = animation; - mExplicitEarlyWakeupStart = explicitEarlyWakeupStart; - mExplicitEarlyWakeupEnd = explicitEarlyWakeupEnd; + mEarlyWakeupStart = earlyWakeupStart; + mEarlyWakeupEnd = earlyWakeupEnd; mContainsBuffer = containsBuffer; mDesiredPresentTime = desiredPresentTime; mIsAutoTimestamp = isAutoTimestamp; @@ -556,8 +556,8 @@ status_t SurfaceComposerClient::Transaction::writeToParcel(Parcel* parcel) const parcel->writeUint32(mForceSynchronous); parcel->writeUint32(mTransactionNestCount); parcel->writeBool(mAnimation); - parcel->writeBool(mExplicitEarlyWakeupStart); - parcel->writeBool(mExplicitEarlyWakeupEnd); + parcel->writeBool(mEarlyWakeupStart); + parcel->writeBool(mEarlyWakeupEnd); parcel->writeBool(mContainsBuffer); parcel->writeInt64(mDesiredPresentTime); parcel->writeBool(mIsAutoTimestamp); @@ -635,8 +635,8 @@ SurfaceComposerClient::Transaction& SurfaceComposerClient::Transaction::merge(Tr mInputWindowCommands.merge(other.mInputWindowCommands); mContainsBuffer |= other.mContainsBuffer; - mExplicitEarlyWakeupStart = mExplicitEarlyWakeupStart || other.mExplicitEarlyWakeupStart; - mExplicitEarlyWakeupEnd = mExplicitEarlyWakeupEnd || other.mExplicitEarlyWakeupEnd; + mEarlyWakeupStart = mEarlyWakeupStart || other.mEarlyWakeupStart; + mEarlyWakeupEnd = mEarlyWakeupEnd || other.mEarlyWakeupEnd; mApplyToken = other.mApplyToken; mFrameTimelineInfo.merge(other.mFrameTimelineInfo); @@ -654,8 +654,8 @@ void SurfaceComposerClient::Transaction::clear() { mForceSynchronous = 0; mTransactionNestCount = 0; mAnimation = false; - mExplicitEarlyWakeupStart = false; - mExplicitEarlyWakeupEnd = false; + mEarlyWakeupStart = false; + mEarlyWakeupEnd = false; mDesiredPresentTime = 0; mIsAutoTimestamp = true; mFrameTimelineInfo.clear(); @@ -775,13 +775,13 @@ status_t SurfaceComposerClient::Transaction::apply(bool synchronous) { flags |= ISurfaceComposer::eAnimation; } - // If both mExplicitEarlyWakeupStart and mExplicitEarlyWakeupEnd are set + // If both mEarlyWakeupStart and mEarlyWakeupEnd are set // it is equivalent for none - if (mExplicitEarlyWakeupStart && !mExplicitEarlyWakeupEnd) { - flags |= ISurfaceComposer::eExplicitEarlyWakeupStart; + if (mEarlyWakeupStart && !mEarlyWakeupEnd) { + flags |= ISurfaceComposer::eEarlyWakeupStart; } - if (mExplicitEarlyWakeupEnd && !mExplicitEarlyWakeupStart) { - flags |= ISurfaceComposer::eExplicitEarlyWakeupEnd; + if (mEarlyWakeupEnd && !mEarlyWakeupStart) { + flags |= ISurfaceComposer::eEarlyWakeupEnd; } sp applyToken = mApplyToken @@ -832,12 +832,12 @@ void SurfaceComposerClient::Transaction::setAnimationTransaction() { mAnimation = true; } -void SurfaceComposerClient::Transaction::setExplicitEarlyWakeupStart() { - mExplicitEarlyWakeupStart = true; +void SurfaceComposerClient::Transaction::setEarlyWakeupStart() { + mEarlyWakeupStart = true; } -void SurfaceComposerClient::Transaction::setExplicitEarlyWakeupEnd() { - mExplicitEarlyWakeupEnd = true; +void SurfaceComposerClient::Transaction::setEarlyWakeupEnd() { + mEarlyWakeupEnd = true; } layer_state_t* SurfaceComposerClient::Transaction::getLayerState(const sp& sc) { diff --git a/libs/gui/include/gui/ISurfaceComposer.h b/libs/gui/include/gui/ISurfaceComposer.h index 8b5f5b2812..50d400d046 100644 --- a/libs/gui/include/gui/ISurfaceComposer.h +++ b/libs/gui/include/gui/ISurfaceComposer.h @@ -93,11 +93,11 @@ public: // 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). SurfaceFlinger will continue to be - // in the early configuration until it receives eExplicitEarlyWakeupEnd. These flags are + // in the early configuration until it receives eEarlyWakeupEnd. These flags are // expected to be used by WindowManager only and are guarded by // android.permission.ACCESS_SURFACE_FLINGER - eExplicitEarlyWakeupStart = 0x08, - eExplicitEarlyWakeupEnd = 0x10, + eEarlyWakeupStart = 0x08, + eEarlyWakeupEnd = 0x10, }; enum VsyncSource { diff --git a/libs/gui/include/gui/SurfaceComposerClient.h b/libs/gui/include/gui/SurfaceComposerClient.h index 685be2489f..ffb67e8a3b 100644 --- a/libs/gui/include/gui/SurfaceComposerClient.h +++ b/libs/gui/include/gui/SurfaceComposerClient.h @@ -349,8 +349,8 @@ public: uint32_t mForceSynchronous = 0; uint32_t mTransactionNestCount = 0; bool mAnimation = false; - bool mExplicitEarlyWakeupStart = false; - bool mExplicitEarlyWakeupEnd = false; + bool mEarlyWakeupStart = false; + bool mEarlyWakeupEnd = false; // Indicates that the Transaction contains a buffer that should be cached bool mContainsBuffer = false; @@ -560,8 +560,8 @@ public: const Rect& layerStackRect, const Rect& displayRect); void setDisplaySize(const sp& token, uint32_t width, uint32_t height); void setAnimationTransaction(); - void setExplicitEarlyWakeupStart(); - void setExplicitEarlyWakeupEnd(); + void setEarlyWakeupStart(); + void setEarlyWakeupEnd(); }; status_t clearLayerFrameStats(const sp& token) const; diff --git a/services/surfaceflinger/Scheduler/VsyncModulator.cpp b/services/surfaceflinger/Scheduler/VsyncModulator.cpp index 1e16cf6a17..194d808836 100644 --- a/services/surfaceflinger/Scheduler/VsyncModulator.cpp +++ b/services/surfaceflinger/Scheduler/VsyncModulator.cpp @@ -50,23 +50,23 @@ VsyncModulator::VsyncConfigOpt VsyncModulator::setTransactionSchedule( TransactionSchedule schedule) { switch (schedule) { case Schedule::EarlyStart: - ALOGW_IF(mExplicitEarlyWakeup, "%s: Duplicate EarlyStart", __FUNCTION__); - mExplicitEarlyWakeup = true; + ALOGW_IF(mEarlyWakeup, "%s: Duplicate EarlyStart", __FUNCTION__); + mEarlyWakeup = true; break; case Schedule::EarlyEnd: - ALOGW_IF(!mExplicitEarlyWakeup, "%s: Unexpected EarlyEnd", __FUNCTION__); - mExplicitEarlyWakeup = false; + ALOGW_IF(!mEarlyWakeup, "%s: Unexpected EarlyEnd", __FUNCTION__); + mEarlyWakeup = false; break; case Schedule::Late: - // No change to mExplicitEarlyWakeup for non-explicit states. + // No change to mEarlyWakeup for non-explicit states. break; } if (mTraceDetailedInfo) { - ATRACE_INT("mExplicitEarlyWakeup", mExplicitEarlyWakeup); + ATRACE_INT("mEarlyWakeup", mEarlyWakeup); } - if (!mExplicitEarlyWakeup && schedule == Schedule::EarlyEnd) { + if (!mEarlyWakeup && schedule == Schedule::EarlyEnd) { mEarlyTransactionFrames = MIN_EARLY_TRANSACTION_FRAMES; mEarlyTransactionStartTime = mNow(); } @@ -128,8 +128,8 @@ VsyncModulator::VsyncConfig VsyncModulator::getVsyncConfig() const { const VsyncModulator::VsyncConfig& VsyncModulator::getNextVsyncConfig() const { // Early offsets are used if we're in the middle of a refresh rate // change, or if we recently begin a transaction. - if (mExplicitEarlyWakeup || mTransactionSchedule == Schedule::EarlyEnd || - mEarlyTransactionFrames > 0 || mRefreshRateChangePending) { + if (mEarlyWakeup || mTransactionSchedule == Schedule::EarlyEnd || mEarlyTransactionFrames > 0 || + mRefreshRateChangePending) { return mVsyncConfigSet.early; } else if (mEarlyGpuFrames > 0) { return mVsyncConfigSet.earlyGpu; diff --git a/services/surfaceflinger/Scheduler/VsyncModulator.h b/services/surfaceflinger/Scheduler/VsyncModulator.h index f02680bd95..fcde279070 100644 --- a/services/surfaceflinger/Scheduler/VsyncModulator.h +++ b/services/surfaceflinger/Scheduler/VsyncModulator.h @@ -113,7 +113,7 @@ private: using Schedule = TransactionSchedule; std::atomic mTransactionSchedule = Schedule::Late; - std::atomic mExplicitEarlyWakeup = false; + std::atomic mEarlyWakeup = false; std::atomic mRefreshRateChangePending = false; diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp index 73554df324..9fadca2413 100644 --- a/services/surfaceflinger/SurfaceFlinger.cpp +++ b/services/surfaceflinger/SurfaceFlinger.cpp @@ -3474,8 +3474,8 @@ void SurfaceFlinger::queueTransaction(TransactionState& state) { ATRACE_INT("TransactionQueue", mTransactionQueue.size()); const auto schedule = [](uint32_t flags) { - if (flags & eExplicitEarlyWakeupEnd) return TransactionSchedule::EarlyEnd; - if (flags & eExplicitEarlyWakeupStart) return TransactionSchedule::EarlyStart; + if (flags & eEarlyWakeupEnd) return TransactionSchedule::EarlyEnd; + if (flags & eEarlyWakeupStart) return TransactionSchedule::EarlyStart; return TransactionSchedule::Late; }(state.flags); @@ -3528,9 +3528,9 @@ status_t SurfaceFlinger::setTransactionState( } if (!(permissions & Permission::ACCESS_SURFACE_FLINGER) && - (flags & (eExplicitEarlyWakeupStart | eExplicitEarlyWakeupEnd))) { - ALOGE("Only WindowManager is allowed to use eExplicitEarlyWakeup[Start|End] flags"); - flags &= ~(eExplicitEarlyWakeupStart | eExplicitEarlyWakeupEnd); + (flags & (eEarlyWakeupStart | eEarlyWakeupEnd))) { + ALOGE("Only WindowManager is allowed to use eEarlyWakeup[Start|End] flags"); + flags &= ~(eEarlyWakeupStart | eEarlyWakeupEnd); } const int64_t postTime = systemTime(); -- cgit v1.2.3-59-g8ed1b