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

Commit b5521674 authored by Ady Abraham's avatar Ady Abraham Committed by Android (Google) Code Review
Browse files

Merge "SurfaceFlinger: remove SurfaceControl level vsyncId setting" into sc-dev

parents 9d52f998 8db10109

libs/gui/BLASTBufferQueue.cpp

+1 −1
Original line number Diff line number Diff line
@@ -399,7 +399,7 @@ void BLASTBufferQueue::processNextBufferLocked(bool useNextTransaction) { 
    t->setFrameNumber(mSurfaceControl, bufferItem.mFrameNumber);



    if (!mNextFrameTimelineInfoQueue.empty()) {

        t->setFrameTimelineInfo(mSurfaceControl, mNextFrameTimelineInfoQueue.front());

        t->setFrameTimelineInfo(mNextFrameTimelineInfoQueue.front());

        mNextFrameTimelineInfoQueue.pop();

    }

libs/gui/LayerState.cpp

+0 −7
Original line number Diff line number Diff line
@@ -63,7 +63,6 @@ layer_state_t::layer_state_t() 
        shouldBeSeamless(true),

        fixedTransformHint(ui::Transform::ROT_INVALID),

        frameNumber(0),

        frameTimelineInfo(),

        autoRefresh(false),

        releaseBufferListener(nullptr) {

    matrix.dsdx = matrix.dtdy = 1.0f;
@@ -152,7 +151,6 @@ status_t layer_state_t::write(Parcel& output) const 
    SAFE_PARCEL(output.writeBool, shouldBeSeamless);

    SAFE_PARCEL(output.writeUint32, fixedTransformHint);

    SAFE_PARCEL(output.writeUint64, frameNumber);

    SAFE_PARCEL(frameTimelineInfo.write, output);

    SAFE_PARCEL(output.writeBool, autoRefresh);

    SAFE_PARCEL(output.writeStrongBinder, IInterface::asBinder(releaseBufferListener));
@@ -275,7 +273,6 @@ status_t layer_state_t::read(const Parcel& input) 
    SAFE_PARCEL(input.readUint32, &tmpUint32);

    fixedTransformHint = static_cast<ui::Transform::RotationFlags>(tmpUint32);

    SAFE_PARCEL(input.readUint64, &frameNumber);

    SAFE_PARCEL(frameTimelineInfo.read, input);

    SAFE_PARCEL(input.readBool, &autoRefresh);



    tmpBinder = nullptr;
@@ -544,10 +541,6 @@ void layer_state_t::merge(const layer_state_t& other) { 
        what |= eFrameNumberChanged;

        frameNumber = other.frameNumber;

    }

    if (other.what & eFrameTimelineInfoChanged) {

        what |= eFrameTimelineInfoChanged;

        frameTimelineInfo.merge(other.frameTimelineInfo);

    }

    if (other.what & eAutoRefreshChanged) {

        what |= eAutoRefreshChanged;

        autoRefresh = other.autoRefresh;

libs/gui/SurfaceComposerClient.cpp

+1 −14
Original line number Diff line number Diff line
@@ -1621,20 +1621,7 @@ SurfaceComposerClient::Transaction& SurfaceComposerClient::Transaction::setFixed 


SurfaceComposerClient::Transaction& SurfaceComposerClient::Transaction::setFrameTimelineInfo(

        const FrameTimelineInfo& frameTimelineInfo) {

    mFrameTimelineInfo = frameTimelineInfo;

    return *this;

}



SurfaceComposerClient::Transaction& SurfaceComposerClient::Transaction::setFrameTimelineInfo(

        const sp<SurfaceControl>& sc, const FrameTimelineInfo& frameTimelineInfo) {

    layer_state_t* s = getLayerState(sc);

    if (!s) {

        mStatus = BAD_INDEX;

        return *this;

    }



    s->what |= layer_state_t::eFrameTimelineInfoChanged;

    s->frameTimelineInfo = frameTimelineInfo;

    mFrameTimelineInfo.merge(frameTimelineInfo);

    return *this;

}

libs/gui/include/gui/LayerState.h

+3 −6
Original line number Diff line number Diff line
@@ -117,10 +117,9 @@ struct layer_state_t { 
        eProducerDisconnect = 0x100'00000000,

        eFixedTransformHintChanged = 0x200'00000000,

        eFrameNumberChanged = 0x400'00000000,

        eFrameTimelineInfoChanged = 0x800'00000000,

        eBlurRegionsChanged = 0x1000'00000000,

        eAutoRefreshChanged = 0x2000'00000000,

        eStretchChanged = 0x4000'00000000,

        eBlurRegionsChanged = 0x800'00000000,

        eAutoRefreshChanged = 0x1000'00000000,

        eStretchChanged = 0x2000'00000000,

    };



    layer_state_t();
@@ -223,8 +222,6 @@ struct layer_state_t { 
    // graphics producer.

    uint64_t frameNumber;



    FrameTimelineInfo frameTimelineInfo;



    // Indicates that the consumer should acquire the next frame as soon as it

    // can and not wait for a frame to become available. This is only relevant

    // in shared buffer mode.

libs/gui/include/gui/SurfaceComposerClient.h

+0 −3
Original line number Diff line number Diff line
@@ -529,9 +529,6 @@ public: 
        // to the transaction, and the input event id that identifies the input event that caused

        // the current frame.

        Transaction& setFrameTimelineInfo(const FrameTimelineInfo& frameTimelineInfo);

        // Variant that only applies to a specific SurfaceControl.

        Transaction& setFrameTimelineInfo(const sp<SurfaceControl>& sc,

                                          const FrameTimelineInfo& frameTimelineInfo);



        // Indicates that the consumer should acquire the next frame as soon as it

        // can and not wait for a frame to become available. This is only relevant