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

Commit 64100671 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Buffer(Queue/State)Layer: Consolidate preparePerFrameCompositionState"... 

Merge "Buffer(Queue/State)Layer: Consolidate preparePerFrameCompositionState" into rvc-dev am: 8aa787d2 am: 10157e49 am: 393cc376 am: 1f47a9d3

Change-Id: I183a75ad6588f8bd78758ad2ba9a62782321b55b
parents 3112a73d 1f47a9d3

services/surfaceflinger/BufferLayer.cpp

+7 −0
Original line number Diff line number Diff line
@@ -294,6 +294,7 @@ void BufferLayer::preparePerFrameCompositionState() { 
    auto* compositionState = editCompositionState();

    if (compositionState->sidebandStream.get()) {

        compositionState->compositionType = Hwc2::IComposerClient::Composition::SIDEBAND;

        return;

    } else {

        // Normal buffer layers

        compositionState->hdrMetadata = mBufferInfo.mHdrMetadata;
@@ -301,6 +302,12 @@ void BufferLayer::preparePerFrameCompositionState() { 
                ? Hwc2::IComposerClient::Composition::CURSOR

                : Hwc2::IComposerClient::Composition::DEVICE;

    }



    compositionState->buffer = mBufferInfo.mBuffer;

    compositionState->bufferSlot = (mBufferInfo.mBufferSlot == BufferQueue::INVALID_BUFFER_SLOT)

            ? 0

            : mBufferInfo.mBufferSlot;

    compositionState->acquireFence = mBufferInfo.mFence;

}



bool BufferLayer::onPreComposition(nsecs_t refreshStartTime) {

services/surfaceflinger/BufferQueueLayer.cpp

+0 −15
Original line number Diff line number Diff line
@@ -365,21 +365,6 @@ status_t BufferQueueLayer::updateFrameNumber(nsecs_t latchTime) { 
    return NO_ERROR;

}



void BufferQueueLayer::preparePerFrameCompositionState() {

    BufferLayer::preparePerFrameCompositionState();



    auto* compositionState = editCompositionState();

    if (compositionState->compositionType == Hwc2::IComposerClient::Composition::SIDEBAND) {

        return;

    }



    compositionState->buffer = mBufferInfo.mBuffer;

    compositionState->bufferSlot = (mBufferInfo.mBufferSlot == BufferQueue::INVALID_BUFFER_SLOT)

            ? 0

            : mBufferInfo.mBufferSlot;

    compositionState->acquireFence = mBufferInfo.mFence;

}



// -----------------------------------------------------------------------

// Interface implementation for BufferLayerConsumer::ContentsChangedListener

// -----------------------------------------------------------------------

services/surfaceflinger/BufferQueueLayer.h

+0 −1
Original line number Diff line number Diff line
@@ -82,7 +82,6 @@ private: 
    status_t updateActiveBuffer() override;

    status_t updateFrameNumber(nsecs_t latchTime) override;



    void preparePerFrameCompositionState() override;

    sp<Layer> createClone() override;



    void onFrameAvailable(const BufferItem& item);

services/surfaceflinger/BufferStateLayer.cpp

+0 −13
Original line number Diff line number Diff line
@@ -631,19 +631,6 @@ status_t BufferStateLayer::updateFrameNumber(nsecs_t latchTime) { 
    return NO_ERROR;

}



void BufferStateLayer::preparePerFrameCompositionState() {

    BufferLayer::preparePerFrameCompositionState();



    auto* compositionState = editCompositionState();

    if (compositionState->compositionType == Hwc2::IComposerClient::Composition::SIDEBAND) {

        return;

    }



    compositionState->buffer = mBufferInfo.mBuffer;

    compositionState->bufferSlot = mBufferInfo.mBufferSlot;

    compositionState->acquireFence = mBufferInfo.mFence;

}



void BufferStateLayer::HwcSlotGenerator::bufferErased(const client_cache_t& clientCacheId) {

    std::lock_guard lock(mMutex);

    if (!clientCacheId.isValid()) {

services/surfaceflinger/BufferStateLayer.h

+0 −1
Original line number Diff line number Diff line
@@ -138,7 +138,6 @@ private: 
    status_t updateActiveBuffer() override;

    status_t updateFrameNumber(nsecs_t latchTime) override;



    void preparePerFrameCompositionState() override;

    sp<Layer> createClone() override;



    // Crop that applies to the buffer