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

Commit b552ff5e authored by Robert Carr's avatar Robert Carr
Browse files

Coalesce handlePageFlip and doTransaction traversal 

Previous moved code had to execute either before commitTransaction or
update input-flinger. The remaining code in the doTransaction traversal
can execute later (around handlePageFlip). There is still room
for optimization here, in just removing this code, but it will
take more time, and the runtime is pretty fast at this point
once we coalesce the traversal.

Test: Existing tests pass. simpleperf
Bug: 186200583
Change-Id: I53d64db0c17df759904bbb6c1581cc2603a67a48
parent bf14dbb6

services/surfaceflinger/SurfaceFlinger.cpp

+12 −20
Original line number Original line Diff line number Diff line
@@ -2923,24 +2923,8 @@ void SurfaceFlinger::handleTransactionLocked(uint32_t transactionFlags) { 
        processDisplayChangesLocked();

        processDisplayChangesLocked();

        processDisplayHotplugEventsLocked();

        processDisplayHotplugEventsLocked();

    }

    }



    // Commit layer transactions. This needs to happen after display transactions are

    // committed because some geometry logic relies on display orientation.

    if ((transactionFlags & eTraversalNeeded) || mForceTraversal || displayTransactionNeeded) {

    mForceTraversal = false;

    mForceTraversal = false;

        mCurrentState.traverse([&](Layer* layer) {

    mForceTransactionDisplayChange = displayTransactionNeeded;

            uint32_t trFlags = layer->getTransactionFlags(eTransactionNeeded);

            if (!trFlags && !displayTransactionNeeded) return;



            const uint32_t flags = layer->doTransaction(0);

            if (flags & Layer::eVisibleRegion)

                mVisibleRegionsDirty = true;



            if (flags & Layer::eInputInfoChanged) {

                mInputInfoChanged = true;

            }

        });

    }





    if (mSomeChildrenChanged) {

    if (mSomeChildrenChanged) {

        mVisibleRegionsDirty = true;

        mVisibleRegionsDirty = true;
@@ -3301,6 +3285,13 @@ bool SurfaceFlinger::handlePageFlip() { 
    // Display is now waiting on Layer 1's frame, which is behind layer 0's

    // Display is now waiting on Layer 1's frame, which is behind layer 0's

    // second frame. But layer 0's second frame could be waiting on display.

    // second frame. But layer 0's second frame could be waiting on display.

    mDrawingState.traverse([&](Layer* layer) {

    mDrawingState.traverse([&](Layer* layer) {

         uint32_t trFlags = layer->getTransactionFlags(eTransactionNeeded);

         if (trFlags || mForceTransactionDisplayChange) {

             const uint32_t flags = layer->doTransaction(0);

             if (flags & Layer::eVisibleRegion)

                 mVisibleRegionsDirty = true;

         }



         if (layer->hasReadyFrame()) {

         if (layer->hasReadyFrame()) {

            frameQueued = true;

            frameQueued = true;

            if (layer->shouldPresentNow(expectedPresentTime)) {

            if (layer->shouldPresentNow(expectedPresentTime)) {
@@ -3313,6 +3304,7 @@ bool SurfaceFlinger::handlePageFlip() { 
            layer->useEmptyDamage();

            layer->useEmptyDamage();

        }

        }

    });

    });

    mForceTransactionDisplayChange = false;





    // The client can continue submitting buffers for offscreen layers, but they will not

    // The client can continue submitting buffers for offscreen layers, but they will not

    // be shown on screen. Therefore, we need to latch and release buffers of offscreen

    // be shown on screen. Therefore, we need to latch and release buffers of offscreen

services/surfaceflinger/SurfaceFlinger.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -1234,6 +1234,7 @@ private: 
    // TODO: Also move visibleRegions over to a boolean system.

    // TODO: Also move visibleRegions over to a boolean system.

    bool mInputInfoChanged = false;

    bool mInputInfoChanged = false;

    bool mSomeChildrenChanged;

    bool mSomeChildrenChanged;

    bool mForceTransactionDisplayChange = false;





    bool mGeometryInvalid = false;

    bool mGeometryInvalid = false;

    bool mAnimCompositionPending = false;

    bool mAnimCompositionPending = false;