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

Commit 396dd97e authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "CE: Layers only have FE layer state"

parents c388ddd2 9755fb75

services/surfaceflinger/BufferLayer.cpp

+0 −2
Original line number Diff line number Diff line
@@ -22,12 +22,10 @@ 
#include "BufferLayer.h"



#include <compositionengine/CompositionEngine.h>

#include <compositionengine/Display.h>

#include <compositionengine/Layer.h>

#include <compositionengine/LayerCreationArgs.h>

#include <compositionengine/LayerFECompositionState.h>

#include <compositionengine/OutputLayer.h>

#include <compositionengine/impl/LayerCompositionState.h>

#include <compositionengine/impl/OutputLayerCompositionState.h>

#include <cutils/compiler.h>

#include <cutils/native_handle.h>

services/surfaceflinger/BufferQueueLayer.cpp

+5 −7
Original line number Diff line number Diff line
@@ -17,15 +17,13 @@ 
#undef LOG_TAG

#define LOG_TAG "BufferQueueLayer"

#define ATRACE_TAG ATRACE_TAG_GRAPHICS

#include <compositionengine/Display.h>

#include "BufferQueueLayer.h"



#include <compositionengine/Layer.h>

#include <compositionengine/OutputLayer.h>

#include <compositionengine/impl/LayerCompositionState.h>

#include <compositionengine/impl/OutputLayerCompositionState.h>

#include <compositionengine/LayerFECompositionState.h>

#include <gui/BufferQueueConsumer.h>

#include <system/window.h>



#include "BufferQueueLayer.h"

#include "LayerRejecter.h"

#include "SurfaceInterceptor.h"
@@ -197,7 +195,7 @@ bool BufferQueueLayer::latchSidebandStream(bool& recomputeVisibleRegions) { 
    if (mSidebandStreamChanged.compare_exchange_strong(sidebandStreamChanged, false)) {

        // mSidebandStreamChanged was changed to false

        mSidebandStream = mConsumer->getSidebandStream();

        auto& layerCompositionState = getCompositionLayer()->editState().frontEnd;

        auto& layerCompositionState = getCompositionLayer()->editFEState();

        layerCompositionState.sidebandStream = mSidebandStream;

        if (layerCompositionState.sidebandStream != nullptr) {

            setTransactionFlags(eTransactionNeeded);
@@ -335,7 +333,7 @@ status_t BufferQueueLayer::updateActiveBuffer() { 
    mPreviousBufferId = getCurrentBufferId();

    mBufferInfo.mBuffer =

            mConsumer->getCurrentBuffer(&mBufferInfo.mBufferSlot, &mBufferInfo.mFence);

    auto& layerCompositionState = getCompositionLayer()->editState().frontEnd;

    auto& layerCompositionState = getCompositionLayer()->editFEState();

    layerCompositionState.buffer = mBufferInfo.mBuffer;



    if (mBufferInfo.mBuffer == nullptr) {

services/surfaceflinger/BufferStateLayer.cpp

+5 −7
Original line number Diff line number Diff line
@@ -19,18 +19,16 @@ 
#define LOG_TAG "BufferStateLayer"

#define ATRACE_TAG ATRACE_TAG_GRAPHICS



#include "BufferStateLayer.h"



#include <limits>



#include <compositionengine/Display.h>

#include <compositionengine/Layer.h>

#include <compositionengine/OutputLayer.h>

#include <compositionengine/impl/LayerCompositionState.h>

#include <compositionengine/impl/OutputLayerCompositionState.h>

#include <compositionengine/LayerFECompositionState.h>

#include <gui/BufferQueue.h>

#include <private/gui/SyncFeatures.h>

#include <renderengine/Image.h>



#include "BufferStateLayer.h"

#include "ColorLayer.h"

#include "FrameTracer/FrameTracer.h"

#include "TimeStats/TimeStats.h"
@@ -415,7 +413,7 @@ bool BufferStateLayer::latchSidebandStream(bool& recomputeVisibleRegions) { 
        // mSidebandStreamChanged was true

        LOG_ALWAYS_FATAL_IF(!getCompositionLayer());

        mSidebandStream = s.sidebandStream;

        getCompositionLayer()->editState().frontEnd.sidebandStream = mSidebandStream;

        getCompositionLayer()->editFEState().sidebandStream = mSidebandStream;

        if (mSidebandStream != nullptr) {

            setTransactionFlags(eTransactionNeeded);

            mFlinger->setTransactionFlags(eTraversalNeeded);
@@ -520,7 +518,7 @@ status_t BufferStateLayer::updateActiveBuffer() { 
    mPreviousBufferId = getCurrentBufferId();

    mBufferInfo.mBuffer = s.buffer;

    mBufferInfo.mFence = s.acquireFence;

    auto& layerCompositionState = getCompositionLayer()->editState().frontEnd;

    auto& layerCompositionState = getCompositionLayer()->editFEState();

    layerCompositionState.buffer = mBufferInfo.mBuffer;



    return NO_ERROR;

services/surfaceflinger/ColorLayer.cpp

+0 −4
Original line number Diff line number Diff line
@@ -25,13 +25,9 @@ 
#include <sys/types.h>



#include <compositionengine/CompositionEngine.h>

#include <compositionengine/Display.h>

#include <compositionengine/Layer.h>

#include <compositionengine/LayerCreationArgs.h>

#include <compositionengine/LayerFECompositionState.h>

#include <compositionengine/OutputLayer.h>

#include <compositionengine/impl/LayerCompositionState.h>

#include <compositionengine/impl/OutputLayerCompositionState.h>

#include <renderengine/RenderEngine.h>

#include <ui/GraphicBuffer.h>

#include <utils/Errors.h>

services/surfaceflinger/CompositionEngine/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ cc_library { 
        "src/DumpHelpers.cpp",

        "src/HwcBufferCache.cpp",

        "src/Layer.cpp",

        "src/LayerCompositionState.cpp",

        "src/LayerFECompositionState.cpp",

        "src/Output.cpp",

        "src/OutputCompositionState.cpp",

        "src/OutputLayer.cpp",