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

Commit 1dc4bfa7 authored by Alec Mouri's avatar Alec Mouri
Browse files

Remove buffer occupancy stats 

These statistics tracked double and triple buffering rates in
SurfaceFlinger, both of which are not possible to track in
BufferStateLayer, nor were these histograms particularly looked at when
BufferQueueLayer was using this.

Bug: 170662799
Bug: 199699421
Test: builds
Change-Id: I6c65db1cb4de790e5bf46eaff5dee5f3491a6641
parent f76d573a

services/surfaceflinger/BufferLayer.cpp

+2 −3
Original line number Diff line number Diff line
@@ -346,13 +346,13 @@ TimeStats::SetFrameRateVote frameRateToSetFrameRateVotePayload(Layer::FrameRate 
}

} // namespace



bool BufferLayer::onPostComposition(const DisplayDevice* display,

void BufferLayer::onPostComposition(const DisplayDevice* display,

                                    const std::shared_ptr<FenceTime>& glDoneFence,

                                    const std::shared_ptr<FenceTime>& presentFence,

                                    const CompositorTiming& compositorTiming) {

    // mFrameLatencyNeeded is true when a new frame was latched for the

    // composition.

    if (!mBufferInfo.mFrameLatencyNeeded) return false;

    if (!mBufferInfo.mFrameLatencyNeeded) return;



    // Update mFrameEventHistory.

    {
@@ -426,7 +426,6 @@ bool BufferLayer::onPostComposition(const DisplayDevice* display, 


    mFrameTracker.advanceFrame();

    mBufferInfo.mFrameLatencyNeeded = false;

    return true;

}



void BufferLayer::gatherBufferInfo() {

services/surfaceflinger/BufferLayer.h

+1 −1
Original line number Diff line number Diff line
@@ -77,7 +77,7 @@ public: 


    bool isHdrY410() const override;



    bool onPostComposition(const DisplayDevice*, const std::shared_ptr<FenceTime>& glDoneFence,

    void onPostComposition(const DisplayDevice*, const std::shared_ptr<FenceTime>& glDoneFence,

                           const std::shared_ptr<FenceTime>& presentFence,

                           const CompositorTiming&) override;

services/surfaceflinger/BufferQueueLayer.cpp

+0 −10
Original line number Diff line number Diff line
@@ -65,16 +65,6 @@ void BufferQueueLayer::setTransformHint(ui::Transform::RotationFlags displayTran 
    mConsumer->setTransformHint(mTransformHint);

}



std::vector<OccupancyTracker::Segment> BufferQueueLayer::getOccupancyHistory(bool forceFlush) {

    std::vector<OccupancyTracker::Segment> history;

    status_t result = mConsumer->getOccupancyHistory(forceFlush, &history);

    if (result != NO_ERROR) {

        ALOGW("[%s] Failed to obtain occupancy history (%d)", getDebugName(), result);

        return {};

    }

    return history;

}



void BufferQueueLayer::releasePendingBuffer(nsecs_t dequeueReadyTime) {

    if (!mConsumer->releasePendingBuffer()) {

        return;

services/surfaceflinger/BufferQueueLayer.h

+0 −2
Original line number Diff line number Diff line
@@ -44,8 +44,6 @@ public: 


    void onLayerDisplayed(const sp<Fence>& releaseFence) override;



    std::vector<OccupancyTracker::Segment> getOccupancyHistory(bool forceFlush) override;



    // If a buffer was replaced this frame, release the former buffer

    void releasePendingBuffer(nsecs_t dequeueReadyTime) override;

services/surfaceflinger/Layer.h

+2 −8
Original line number Diff line number Diff line
@@ -533,12 +533,10 @@ public: 
     * called after composition.

     * returns true if the layer latched a new buffer this frame.

     */

    virtual bool onPostComposition(const DisplayDevice*,

    virtual void onPostComposition(const DisplayDevice*,

                                   const std::shared_ptr<FenceTime>& /*glDoneFence*/,

                                   const std::shared_ptr<FenceTime>& /*presentFence*/,

                                   const CompositorTiming&) {

        return false;

    }

                                   const CompositorTiming&) {}



    // If a buffer was replaced this frame, release the former buffer

    virtual void releasePendingBuffer(nsecs_t /*dequeueReadyTime*/) { }
@@ -599,10 +597,6 @@ public: 
    }

    virtual FrameRate getFrameRateForLayerTree() const;



    virtual std::vector<OccupancyTracker::Segment> getOccupancyHistory(bool /*forceFlush*/) {

        return {};

    }



    virtual bool getTransformToDisplayInverse() const { return false; }



    // Returns how rounded corners should be drawn for this layer.