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

Commit 0b785d86 authored by Lloyd Pique's avatar Lloyd Pique
Browse files

SF: Introduce LayerCompositionState 

This moves the remaining display-independent state from LayerBE.h to a
new LayerFECompositionState state structure.

LayerFECompositionState is also set up as a subset of a new
LayerCompositionState structure, which is owned by each
compositionengine::Layer.

The existing front-end SurfaceFlinger code is minimally adjusted to
store the state in the new structures.

Test: atest libsurfaceflinger_unittest libcompositionengine_test
Bug: 121291683
Change-Id: I20e4aa1a51b2ccbb19d5a1f0a1fad42ee9b7f41a
parent 37c2c9b2

services/surfaceflinger/BufferLayer.cpp

+14 −12
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ 
#include <compositionengine/Layer.h>

#include <compositionengine/LayerCreationArgs.h>

#include <compositionengine/OutputLayer.h>

#include <compositionengine/impl/LayerCompositionState.h>

#include <compositionengine/impl/OutputLayerCompositionState.h>

#include <cutils/compiler.h>

#include <cutils/native_handle.h>
@@ -93,7 +94,7 @@ void BufferLayer::useEmptyDamage() { 
bool BufferLayer::isOpaque(const Layer::State& s) const {

    // if we don't have a buffer or sidebandStream yet, we're translucent regardless of the

    // layer's opaque flag.

    if ((getBE().compositionInfo.hwc.sidebandStream == nullptr) && (mActiveBuffer == nullptr)) {

    if ((mSidebandStream == nullptr) && (mActiveBuffer == nullptr)) {

        return false;

    }
@@ -104,7 +105,7 @@ bool BufferLayer::isOpaque(const Layer::State& s) const { 


bool BufferLayer::isVisible() const {

    return !(isHiddenByPolicy()) && getAlpha() > 0.0f &&

            (mActiveBuffer != nullptr || getBE().compositionInfo.hwc.sidebandStream != nullptr);

            (mActiveBuffer != nullptr || mSidebandStream != nullptr);

}



bool BufferLayer::isFixedSize() const {
@@ -240,7 +241,7 @@ bool BufferLayer::isHdrY410() const { 
    // pixel format is HDR Y410 masquerading as RGBA_1010102

    return (mCurrentDataSpace == ui::Dataspace::BT2020_ITU_PQ &&

            getDrawingApi() == NATIVE_WINDOW_API_MEDIA &&

            getBE().compositionInfo.mBuffer->getPixelFormat() == HAL_PIXEL_FORMAT_RGBA_1010102);

            mActiveBuffer->getPixelFormat() == HAL_PIXEL_FORMAT_RGBA_1010102);

}



void BufferLayer::setPerFrameData(const sp<const DisplayDevice>& displayDevice,
@@ -264,25 +265,27 @@ void BufferLayer::setPerFrameData(const sp<const DisplayDevice>& displayDevice, 
    }

    outputLayer->editState().visibleRegion = visible;



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



    error = hwcLayer->setSurfaceDamage(surfaceDamageRegion);

    if (error != HWC2::Error::None) {

        ALOGE("[%s] Failed to set surface damage: %s (%d)", mName.string(),

              to_string(error).c_str(), static_cast<int32_t>(error));

        surfaceDamageRegion.dump(LOG_TAG);

    }

    getBE().compositionInfo.hwc.surfaceDamage = surfaceDamageRegion;

    layerCompositionState.surfaceDamage = surfaceDamageRegion;



    // Sideband layers

    if (getBE().compositionInfo.hwc.sidebandStream.get()) {

    if (layerCompositionState.sidebandStream.get()) {

        setCompositionType(displayDevice, Hwc2::IComposerClient::Composition::SIDEBAND);

        ALOGV("[%s] Requesting Sideband composition", mName.string());

        error = hwcLayer->setSidebandStream(getBE().compositionInfo.hwc.sidebandStream->handle());

        error = hwcLayer->setSidebandStream(layerCompositionState.sidebandStream->handle());

        if (error != HWC2::Error::None) {

            ALOGE("[%s] Failed to set sideband stream %p: %s (%d)", mName.string(),

                  getBE().compositionInfo.hwc.sidebandStream->handle(), to_string(error).c_str(),

                  layerCompositionState.sidebandStream->handle(), to_string(error).c_str(),

                  static_cast<int32_t>(error));

        }

        getBE().compositionInfo.compositionType = HWC2::Composition::Sideband;

        layerCompositionState.compositionType = Hwc2::IComposerClient::Composition::SIDEBAND;

        return;

    }
@@ -314,10 +317,9 @@ void BufferLayer::setPerFrameData(const sp<const DisplayDevice>& displayDevice, 
        ALOGE("[%s] Failed to setColorTransform: %s (%d)", mName.string(),

                to_string(error).c_str(), static_cast<int32_t>(error));

    }

    getBE().compositionInfo.hwc.dataspace = mCurrentDataSpace;

    getBE().compositionInfo.hwc.hdrMetadata = getDrawingHdrMetadata();

    getBE().compositionInfo.hwc.supportedPerFrameMetadata = supportedPerFrameMetadata;

    getBE().compositionInfo.hwc.colorTransform = getColorTransform();

    layerCompositionState.dataspace = mCurrentDataSpace;

    layerCompositionState.colorTransform = getColorTransform();

    layerCompositionState.hdrMetadata = metadata;



    setHwcLayerBuffer(displayDevice);

}

services/surfaceflinger/BufferQueueLayer.cpp

+15 −10
Original line number Diff line number Diff line
@@ -15,7 +15,9 @@ 
 */



#include <compositionengine/Display.h>

#include <compositionengine/Layer.h>

#include <compositionengine/OutputLayer.h>

#include <compositionengine/impl/LayerCompositionState.h>

#include <compositionengine/impl/OutputLayerCompositionState.h>

#include <system/window.h>
@@ -198,8 +200,9 @@ bool BufferQueueLayer::latchSidebandStream(bool& recomputeVisibleRegions) { 
    if (mSidebandStreamChanged.compare_exchange_strong(sidebandStreamChanged, false)) {

        // mSidebandStreamChanged was changed to false

        // replicated in LayerBE until FE/BE is ready to be synchronized

        getBE().compositionInfo.hwc.sidebandStream = mConsumer->getSidebandStream();

        if (getBE().compositionInfo.hwc.sidebandStream != nullptr) {

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

        layerCompositionState.sidebandStream = mConsumer->getSidebandStream();

        if (layerCompositionState.sidebandStream != nullptr) {

            setTransactionFlags(eTransactionNeeded);

            mFlinger->setTransactionFlags(eTraversalNeeded);

        }
@@ -328,8 +331,9 @@ status_t BufferQueueLayer::updateTexImage(bool& recomputeVisibleRegions, nsecs_t 
status_t BufferQueueLayer::updateActiveBuffer() {

    // update the active buffer

    mActiveBuffer = mConsumer->getCurrentBuffer(&mActiveBufferSlot, &mActiveBufferFence);

    getBE().compositionInfo.mBuffer = mActiveBuffer;

    getBE().compositionInfo.mBufferSlot = mActiveBufferSlot;

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

    layerCompositionState.buffer = mActiveBuffer;

    layerCompositionState.bufferSlot = mActiveBufferSlot;



    if (mActiveBuffer == nullptr) {

        // this can only happen if the very first buffer was rejected.
@@ -367,13 +371,14 @@ void BufferQueueLayer::setHwcLayerBuffer(const sp<const DisplayDevice>& display) 
    auto acquireFence = mConsumer->getCurrentFence();

    auto error = hwcLayer->setBuffer(hwcSlot, hwcBuffer, acquireFence);

    if (error != HWC2::Error::None) {

        ALOGE("[%s] Failed to set buffer %p: %s (%d)", mName.string(),

              getBE().compositionInfo.mBuffer->handle, to_string(error).c_str(),

              static_cast<int32_t>(error));

        ALOGE("[%s] Failed to set buffer %p: %s (%d)", mName.string(), mActiveBuffer->handle,

              to_string(error).c_str(), static_cast<int32_t>(error));

    }

    getBE().compositionInfo.mBufferSlot = mActiveBufferSlot;

    getBE().compositionInfo.mBuffer = mActiveBuffer;

    getBE().compositionInfo.hwc.fence = acquireFence;



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

    layerCompositionState.bufferSlot = mActiveBufferSlot;

    layerCompositionState.buffer = mActiveBuffer;

    layerCompositionState.acquireFence = acquireFence;

}



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

services/surfaceflinger/BufferStateLayer.cpp

+9 −5
Original line number Diff line number Diff line
@@ -22,7 +22,9 @@ 
#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 <private/gui/SyncFeatures.h>

#include <renderengine/Image.h>
@@ -440,9 +442,10 @@ bool BufferStateLayer::latchSidebandStream(bool& recomputeVisibleRegions) { 
    if (mSidebandStreamChanged.exchange(false)) {

        const State& s(getDrawingState());

        // mSidebandStreamChanged was true

        // replicated in LayerBE until FE/BE is ready to be synchronized

        getBE().compositionInfo.hwc.sidebandStream = s.sidebandStream;

        if (getBE().compositionInfo.hwc.sidebandStream != nullptr) {

        LOG_ALWAYS_FATAL_IF(!getCompositionLayer());

        mSidebandStream = s.sidebandStream;

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

        if (mSidebandStream != nullptr) {

            setTransactionFlags(eTransactionNeeded);

            mFlinger->setTransactionFlags(eTraversalNeeded);

        }
@@ -596,8 +599,9 @@ status_t BufferStateLayer::updateActiveBuffer() { 


    mActiveBuffer = s.buffer;

    mActiveBufferFence = s.acquireFence;

    getBE().compositionInfo.mBuffer = mActiveBuffer;

    getBE().compositionInfo.mBufferSlot = 0;

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

    layerCompositionState.buffer = mActiveBuffer;

    layerCompositionState.bufferSlot = 0;



    return NO_ERROR;

}

services/surfaceflinger/ColorLayer.cpp

+9 −6
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ 
#include <compositionengine/Layer.h>

#include <compositionengine/LayerCreationArgs.h>

#include <compositionengine/OutputLayer.h>

#include <compositionengine/impl/LayerCompositionState.h>

#include <compositionengine/impl/OutputLayerCompositionState.h>

#include <renderengine/RenderEngine.h>

#include <ui/GraphicBuffer.h>
@@ -103,7 +104,9 @@ void ColorLayer::setPerFrameData(const sp<const DisplayDevice>& display, 
        ALOGE("[%s] Failed to set dataspace %d: %s (%d)", mName.string(), mCurrentDataSpace,

              to_string(error).c_str(), static_cast<int32_t>(error));

    }

    getBE().compositionInfo.hwc.dataspace = mCurrentDataSpace;



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

    layerCompositionState.dataspace = mCurrentDataSpace;



    half4 color = getColor();

    error = hwcLayer->setColor({static_cast<uint8_t>(std::round(255.0f * color.r)),
@@ -113,7 +116,7 @@ void ColorLayer::setPerFrameData(const sp<const DisplayDevice>& display, 
        ALOGE("[%s] Failed to set color: %s (%d)", mName.string(), to_string(error).c_str(),

              static_cast<int32_t>(error));

    }

    getBE().compositionInfo.hwc.color = { static_cast<uint8_t>(std::round(255.0f * color.r)),

    layerCompositionState.color = {static_cast<uint8_t>(std::round(255.0f * color.r)),

                                   static_cast<uint8_t>(std::round(255.0f * color.g)),

                                   static_cast<uint8_t>(std::round(255.0f * color.b)), 255};
@@ -130,7 +133,7 @@ void ColorLayer::setPerFrameData(const sp<const DisplayDevice>& display, 
        ALOGE("[%s] Failed to setColorTransform: %s (%d)", mName.string(),

                to_string(error).c_str(), static_cast<int32_t>(error));

    }

    getBE().compositionInfo.hwc.colorTransform = getColorTransform();

    layerCompositionState.colorTransform = getColorTransform();



    error = hwcLayer->setSurfaceDamage(surfaceDamageRegion);

    if (error != HWC2::Error::None) {
@@ -138,7 +141,7 @@ void ColorLayer::setPerFrameData(const sp<const DisplayDevice>& display, 
              to_string(error).c_str(), static_cast<int32_t>(error));

        surfaceDamageRegion.dump(LOG_TAG);

    }

    getBE().compositionInfo.hwc.surfaceDamage = surfaceDamageRegion;

    layerCompositionState.surfaceDamage = surfaceDamageRegion;

}



std::shared_ptr<compositionengine::Layer> ColorLayer::getCompositionLayer() const {

services/surfaceflinger/CompositionEngine/Android.bp

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

        "src/HwcBufferCache.cpp",

        "src/Layer.cpp",

        "src/LayerCompositionState.cpp",

        "src/Output.cpp",

        "src/OutputCompositionState.cpp",

        "src/OutputLayer.cpp",