diff options
Diffstat (limited to 'services/surfaceflinger/BufferQueueLayer.cpp')
| -rw-r--r-- | services/surfaceflinger/BufferQueueLayer.cpp | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/services/surfaceflinger/BufferQueueLayer.cpp b/services/surfaceflinger/BufferQueueLayer.cpp index e85281d8a9..128739394b 100644 --- a/services/surfaceflinger/BufferQueueLayer.cpp +++ b/services/surfaceflinger/BufferQueueLayer.cpp @@ -23,7 +23,6 @@ #define ATRACE_TAG ATRACE_TAG_GRAPHICS #include "BufferQueueLayer.h" -#include <compositionengine/Layer.h> #include <compositionengine/LayerFECompositionState.h> #include <gui/BufferQueueConsumer.h> #include <system/window.h> @@ -215,9 +214,9 @@ bool BufferQueueLayer::latchSidebandStream(bool& recomputeVisibleRegions) { if (mSidebandStreamChanged.compare_exchange_strong(sidebandStreamChanged, false)) { // mSidebandStreamChanged was changed to false mSidebandStream = mConsumer->getSidebandStream(); - auto& layerCompositionState = getCompositionLayer()->editFEState(); - layerCompositionState.sidebandStream = mSidebandStream; - if (layerCompositionState.sidebandStream != nullptr) { + auto* layerCompositionState = editCompositionState(); + layerCompositionState->sidebandStream = mSidebandStream; + if (layerCompositionState->sidebandStream != nullptr) { setTransactionFlags(eTransactionNeeded); mFlinger->setTransactionFlags(eTraversalNeeded); } @@ -351,8 +350,8 @@ status_t BufferQueueLayer::updateActiveBuffer() { mPreviousBufferId = getCurrentBufferId(); mBufferInfo.mBuffer = mConsumer->getCurrentBuffer(&mBufferInfo.mBufferSlot, &mBufferInfo.mFence); - auto& layerCompositionState = getCompositionLayer()->editFEState(); - layerCompositionState.buffer = mBufferInfo.mBuffer; + auto* layerCompositionState = editCompositionState(); + layerCompositionState->buffer = mBufferInfo.mBuffer; if (mBufferInfo.mBuffer == nullptr) { // this can only happen if the very first buffer was rejected. @@ -372,18 +371,19 @@ status_t BufferQueueLayer::updateFrameNumber(nsecs_t latchTime) { return NO_ERROR; } -void BufferQueueLayer::latchPerFrameState( - compositionengine::LayerFECompositionState& compositionState) const { - BufferLayer::latchPerFrameState(compositionState); - if (compositionState.compositionType == Hwc2::IComposerClient::Composition::SIDEBAND) { +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) + compositionState->buffer = mBufferInfo.mBuffer; + compositionState->bufferSlot = (mBufferInfo.mBufferSlot == BufferQueue::INVALID_BUFFER_SLOT) ? 0 : mBufferInfo.mBufferSlot; - compositionState.acquireFence = mBufferInfo.mFence; + compositionState->acquireFence = mBufferInfo.mFence; } // ----------------------------------------------------------------------- |