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

Commit 3496937c authored by Alec Mouri's avatar Alec Mouri Committed by Android (Google) Code Review
Browse files

Merge "Remove some unused fields from Layer" into main

parents 1f113da8 0df8c2e6

services/surfaceflinger/Layer.cpp

+0 −5
Original line number Diff line number Diff line
@@ -2932,11 +2932,6 @@ void Layer::onLayerDisplayed(ftl::SharedFuture<FenceResult> futureFenceResult, 
        }

    }



    // Prevent tracing the same release multiple times.

    if (mPreviousFrameNumber != mPreviousReleasedFrameNumber) {

        mPreviousReleasedFrameNumber = mPreviousFrameNumber;

    }



    if (ch != nullptr) {

        ch->previousReleaseCallbackId = mPreviousReleaseCallbackId;

        ch->previousReleaseFences.emplace_back(std::move(futureFenceResult));

services/surfaceflinger/Layer.h

+0 −3
Original line number Diff line number Diff line
@@ -1235,9 +1235,6 @@ private: 


    ReleaseCallbackId mPreviousReleaseCallbackId = ReleaseCallbackId::INVALID_ID;

    sp<IBinder> mPreviousReleaseBufferEndpoint;

    uint64_t mPreviousReleasedFrameNumber = 0;



    uint64_t mPreviousBarrierFrameNumber = 0;



    bool mReleasePreviousBuffer = false;