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

Commit ef68d6d4 authored by Vishnu Nair's avatar Vishnu Nair
Browse files

[sf] use snapshots to update layer history 

Avoid directly accessing layer drawing state from layer
history, instead provide a snapshot of the layer data
needed.

Test: atest android.graphics.cts.MatchContentFrameRateTest android.graphics.cts.SetFrameRateTest
Bug: 238781169
Change-Id: I120e89cca70beb9811a8ee9c5c3203f2a5cfabb4
parent 6b733639

services/surfaceflinger/FrontEnd/LayerLifecycleManager.cpp

+4 −0
Original line number Diff line number Diff line
@@ -187,6 +187,10 @@ void LayerLifecycleManager::applyTransactions(const std::vector<TransactionState 
                continue;

            }



            if (transaction.flags & ISurfaceComposer::eAnimation) {

                layer->changes |= RequestedLayerState::Changes::Animation;

            }



            uint32_t oldParentId = layer->parentId;

            uint32_t oldRelativeParentId = layer->relativeParentId;

            uint32_t oldTouchCropId = layer->touchCropId;

services/surfaceflinger/FrontEnd/LayerSnapshot.h

+1 −0
Original line number Diff line number Diff line
@@ -90,6 +90,7 @@ struct LayerSnapshot : public compositionengine::LayerFECompositionState { 
    scheduler::LayerInfo::FrameRate frameRate;

    ui::Transform::RotationFlags fixedTransformHint;

    bool handleSkipScreenshotFlag = false;

    int32_t frameRateSelectionPriority;

    LayerHierarchy::TraversalPath mirrorRootPath;

    bool unreachable = true;

    ChildState childState;

services/surfaceflinger/FrontEnd/LayerSnapshotBuilder.cpp

+1 −0
Original line number Diff line number Diff line
@@ -773,6 +773,7 @@ void LayerSnapshotBuilder::updateSnapshot(LayerSnapshot& snapshot, const Args& a 
        snapshot.layerOpaqueFlagSet =

                (requested.flags & layer_state_t::eLayerOpaque) == layer_state_t::eLayerOpaque;

        snapshot.cachingHint = requested.cachingHint;

        snapshot.frameRateSelectionPriority = requested.frameRateSelectionPriority;

    }



    if (forceUpdate || snapshot.changes.any(RequestedLayerState::Changes::Content)) {

services/surfaceflinger/FrontEnd/RequestedLayerState.h

+1 −0
Original line number Diff line number Diff line
@@ -53,6 +53,7 @@ struct RequestedLayerState : layer_state_t { 
        VisibleRegion = 1u << 14,

        Buffer = 1u << 15,

        SidebandStream = 1u << 16,

        Animation = 1u << 17,

    };

    static Rect reduce(const Rect& win, const Region& exclude);

    RequestedLayerState(const LayerCreationArgs&);

services/surfaceflinger/Layer.cpp

+47 −18
Original line number Diff line number Diff line
@@ -1254,7 +1254,7 @@ bool Layer::propagateFrameRateForLayerTree(FrameRate parentFrameRate, bool* tran 
        return parentFrameRate;

    }();



    *transactionNeeded |= setFrameRateForLayerTree(frameRate);

    *transactionNeeded |= setFrameRateForLayerTreeLegacy(frameRate);



    // The frame rate is propagated to the children

    bool childrenHaveFrameRate = false;
@@ -1268,7 +1268,7 @@ bool Layer::propagateFrameRateForLayerTree(FrameRate parentFrameRate, bool* tran 
    if (!frameRate.rate.isValid() && frameRate.type != FrameRateCompatibility::NoVote &&

        childrenHaveFrameRate) {

        *transactionNeeded |=

                setFrameRateForLayerTree(FrameRate(Fps(), FrameRateCompatibility::NoVote));

                setFrameRateForLayerTreeLegacy(FrameRate(Fps(), FrameRateCompatibility::NoVote));

    }



    // We return whether this layer ot its children has a vote. We ignore ExactOrMultiple votes for
@@ -1420,7 +1420,7 @@ std::shared_ptr<frametimeline::SurfaceFrame> Layer::createSurfaceFrameForBuffer( 
    return surfaceFrame;

}



bool Layer::setFrameRateForLayerTree(FrameRate frameRate) {

bool Layer::setFrameRateForLayerTreeLegacy(FrameRate frameRate) {

    if (mDrawingState.frameRateForLayerTree == frameRate) {

        return false;

    }
@@ -1433,9 +1433,21 @@ bool Layer::setFrameRateForLayerTree(FrameRate frameRate) { 
    mDrawingState.modified = true;

    setTransactionFlags(eTransactionNeeded);



    using LayerUpdateType = scheduler::LayerHistory::LayerUpdateType;

    mFlinger->mScheduler->recordLayerHistory(this, systemTime(), LayerUpdateType::SetFrameRate);

    mFlinger->mScheduler

            ->recordLayerHistory(sequence, getLayerProps(), systemTime(),

                                 scheduler::LayerHistory::LayerUpdateType::SetFrameRate);

    return true;

}



bool Layer::setFrameRateForLayerTree(FrameRate frameRate, const scheduler::LayerProps& layerProps) {

    if (mDrawingState.frameRateForLayerTree == frameRate) {

        return false;

    }



    mDrawingState.frameRateForLayerTree = frameRate;

    mFlinger->mScheduler

            ->recordLayerHistory(sequence, layerProps, systemTime(),

                                 scheduler::LayerHistory::LayerUpdateType::SetFrameRate);

    return true;

}
@@ -3061,7 +3073,7 @@ bool Layer::setBuffer(std::shared_ptr<renderengine::ExternalTexture>& buffer, 
    } else {

        mCallbackHandleAcquireTimeOrFence = mDrawingState.acquireFenceTime->getSignalTime();

    }



    mDrawingState.latchedVsyncId = info.vsyncId;

    mDrawingState.modified = true;

    setTransactionFlags(eTransactionNeeded);
@@ -3071,18 +3083,9 @@ bool Layer::setBuffer(std::shared_ptr<renderengine::ExternalTexture>& buffer, 
    mDrawingState.desiredPresentTime = desiredPresentTime;

    mDrawingState.isAutoTimestamp = isAutoTimestamp;



    const nsecs_t presentTime = [&] {

        if (!isAutoTimestamp) return desiredPresentTime;



        const auto prediction =

                mFlinger->mFrameTimeline->getTokenManager()->getPredictionsForToken(info.vsyncId);

        if (prediction.has_value()) return prediction->presentTime;



        return static_cast<nsecs_t>(0);

    }();



    using LayerUpdateType = scheduler::LayerHistory::LayerUpdateType;

    mFlinger->mScheduler->recordLayerHistory(this, presentTime, LayerUpdateType::Buffer);

    if (mFlinger->mLegacyFrontEndEnabled) {

        recordLayerHistoryBufferUpdate(getLayerProps());

    }



    setFrameTimelineVsyncForBufferTransaction(info, postTime);
@@ -3099,6 +3102,32 @@ bool Layer::setBuffer(std::shared_ptr<renderengine::ExternalTexture>& buffer, 
    return true;

}



void Layer::setDesiredPresentTime(nsecs_t desiredPresentTime, bool isAutoTimestamp) {

    mDrawingState.desiredPresentTime = desiredPresentTime;

    mDrawingState.isAutoTimestamp = isAutoTimestamp;

}



void Layer::recordLayerHistoryBufferUpdate(const scheduler::LayerProps& layerProps) {

    const nsecs_t presentTime = [&] {

        if (!mDrawingState.isAutoTimestamp) return mDrawingState.desiredPresentTime;



        const auto prediction = mFlinger->mFrameTimeline->getTokenManager()->getPredictionsForToken(

                mDrawingState.latchedVsyncId);

        if (prediction.has_value()) return prediction->presentTime;



        return static_cast<nsecs_t>(0);

    }();

    mFlinger->mScheduler->recordLayerHistory(sequence, layerProps, presentTime,

                                             scheduler::LayerHistory::LayerUpdateType::Buffer);

}



void Layer::recordLayerHistoryAnimationTx(const scheduler::LayerProps& layerProps) {

    const nsecs_t presentTime =

            mDrawingState.isAutoTimestamp ? 0 : mDrawingState.desiredPresentTime;

    mFlinger->mScheduler->recordLayerHistory(sequence, layerProps, presentTime,

                                             scheduler::LayerHistory::LayerUpdateType::AnimationTX);

}



bool Layer::setDataspace(ui::Dataspace dataspace) {

    mDrawingState.dataspaceRequested = true;

    if (mDrawingState.dataspace == dataspace) return false;