Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6bdefc7f authored by Jorim Jaggi's avatar Jorim Jaggi Committed by android-build-merger
Browse files

Merge "Fix transaction phase offsets" into pi-dev 

am: 68f97b10

Change-Id: I71c65003b9ea4522c9f11faa772873a50629c9ba
parents d2121cf8 68f97b10

services/surfaceflinger/SurfaceFlinger.cpp

+1 −1
Original line number Diff line number Diff line
@@ -2166,7 +2166,7 @@ void SurfaceFlinger::handleTransaction(uint32_t transactionFlags) 
    // with mStateLock held to guarantee that mCurrentState won't change

    // until the transaction is committed.



    mVsyncModulator.setTransactionStart(VSyncModulator::TransactionStart::NORMAL);

    mVsyncModulator.onTransactionHandled();

    transactionFlags = getTransactionFlags(eTransactionMask);

    handleTransactionLocked(transactionFlags);

services/surfaceflinger/VSyncModulator.h

+10 −1
Original line number Diff line number Diff line
@@ -55,11 +55,20 @@ public: 
    }



    void setTransactionStart(TransactionStart transactionStart) {

        if (transactionStart == mTransactionStart) return;

        // An early transaction stays an early transaction.

        if (transactionStart == mTransactionStart || mTransactionStart == TransactionStart::EARLY) {

            return;

        }

        mTransactionStart = transactionStart;

        updatePhaseOffsets();

    }



    void onTransactionHandled() {

        if (mTransactionStart == TransactionStart::NORMAL) return;

        mTransactionStart = TransactionStart::NORMAL;

        updatePhaseOffsets();

    }



    void setLastFrameUsedRenderEngine(bool re) {

        if (re == mLastFrameUsedRenderEngine) return;

        mLastFrameUsedRenderEngine = re;