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

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

Merge "SurfaceComposerClient: Clean up layer state"

parents f1f601e0 bbceb46b

libs/gui/LayerState.cpp

+14 −17
Original line number Diff line number Diff line
@@ -40,13 +40,13 @@ layer_state_t::layer_state_t() 
        x(0),

        y(0),

        z(0),

        alpha(0),

        flags(0),

        mask(0),

        reserved(0),

        cornerRadius(0.0f),

        backgroundBlurRadius(0),

        transform(0),

        color(0),

        bufferTransform(0),

        transformToDisplayInverse(false),

        crop(Rect::INVALID_RECT),

        dataspace(ui::Dataspace::UNKNOWN),
@@ -83,20 +83,19 @@ status_t layer_state_t::write(Parcel& output) const 
    SAFE_PARCEL(output.writeFloat, y);

    SAFE_PARCEL(output.writeInt32, z);

    SAFE_PARCEL(output.writeUint32, layerStack.id);

    SAFE_PARCEL(output.writeFloat, alpha);

    SAFE_PARCEL(output.writeUint32, flags);

    SAFE_PARCEL(output.writeUint32, mask);

    SAFE_PARCEL(matrix.write, output);

    SAFE_PARCEL(output.write, crop);

    SAFE_PARCEL(SurfaceControl::writeNullableToParcel, output, reparentSurfaceControl);

    SAFE_PARCEL(SurfaceControl::writeNullableToParcel, output, relativeLayerSurfaceControl);

    SAFE_PARCEL(SurfaceControl::writeNullableToParcel, output, parentSurfaceControlForChild);

    SAFE_PARCEL(output.writeFloat, color.r);

    SAFE_PARCEL(output.writeFloat, color.g);

    SAFE_PARCEL(output.writeFloat, color.b);

    SAFE_PARCEL(output.writeFloat, color.a);

    SAFE_PARCEL(windowInfoHandle->writeToParcel, &output);

    SAFE_PARCEL(output.write, transparentRegion);

    SAFE_PARCEL(output.writeUint32, transform);

    SAFE_PARCEL(output.writeUint32, bufferTransform);

    SAFE_PARCEL(output.writeBool, transformToDisplayInverse);

    SAFE_PARCEL(output.writeBool, borderEnabled);

    SAFE_PARCEL(output.writeFloat, borderWidth);
@@ -177,7 +176,6 @@ status_t layer_state_t::read(const Parcel& input) 
    SAFE_PARCEL(input.readFloat, &y);

    SAFE_PARCEL(input.readInt32, &z);

    SAFE_PARCEL(input.readUint32, &layerStack.id);

    SAFE_PARCEL(input.readFloat, &alpha);



    SAFE_PARCEL(input.readUint32, &flags);
@@ -185,7 +183,6 @@ status_t layer_state_t::read(const Parcel& input) 


    SAFE_PARCEL(matrix.read, input);

    SAFE_PARCEL(input.read, crop);

    SAFE_PARCEL(SurfaceControl::readNullableFromParcel, input, &reparentSurfaceControl);



    SAFE_PARCEL(SurfaceControl::readNullableFromParcel, input, &relativeLayerSurfaceControl);

    SAFE_PARCEL(SurfaceControl::readNullableFromParcel, input, &parentSurfaceControlForChild);
@@ -197,10 +194,13 @@ status_t layer_state_t::read(const Parcel& input) 
    color.g = tmpFloat;

    SAFE_PARCEL(input.readFloat, &tmpFloat);

    color.b = tmpFloat;

    SAFE_PARCEL(input.readFloat, &tmpFloat);

    color.a = tmpFloat;



    SAFE_PARCEL(windowInfoHandle->readFromParcel, &input);



    SAFE_PARCEL(input.read, transparentRegion);

    SAFE_PARCEL(input.readUint32, &transform);

    SAFE_PARCEL(input.readUint32, &bufferTransform);

    SAFE_PARCEL(input.readBool, &transformToDisplayInverse);

    SAFE_PARCEL(input.readBool, &borderEnabled);

    SAFE_PARCEL(input.readFloat, &tmpFloat);
@@ -453,7 +453,7 @@ void layer_state_t::merge(const layer_state_t& other) { 
    }

    if (other.what & eAlphaChanged) {

        what |= eAlphaChanged;

        alpha = other.alpha;

        color.a = other.color.a;

    }

    if (other.what & eMatrixChanged) {

        what |= eMatrixChanged;
@@ -495,12 +495,9 @@ void layer_state_t::merge(const layer_state_t& other) { 
        what |= eReparent;

        parentSurfaceControlForChild = other.parentSurfaceControlForChild;

    }

    if (other.what & eDestroySurface) {

        what |= eDestroySurface;

    }

    if (other.what & eTransformChanged) {

        what |= eTransformChanged;

        transform = other.transform;

    if (other.what & eBufferTransformChanged) {

        what |= eBufferTransformChanged;

        bufferTransform = other.bufferTransform;

    }

    if (other.what & eTransformToDisplayInverseChanged) {

        what |= eTransformToDisplayInverseChanged;
@@ -547,7 +544,7 @@ void layer_state_t::merge(const layer_state_t& other) { 
    }

    if (other.what & eBackgroundColorChanged) {

        what |= eBackgroundColorChanged;

        color = other.color;

        color.rgb = other.color.rgb;

        bgColorAlpha = other.bgColorAlpha;

        bgColorDataspace = other.bgColorDataspace;

    }
@@ -612,7 +609,7 @@ void layer_state_t::merge(const layer_state_t& other) { 
    }

    if (other.what & eColorChanged) {

        what |= eColorChanged;

        color = other.color;

        color.rgb = other.color.rgb;

    }

    if (other.what & eColorSpaceAgnosticChanged) {

        what |= eColorSpaceAgnosticChanged;

libs/gui/SurfaceComposerClient.cpp

+5 −5
Original line number Diff line number Diff line
@@ -1293,7 +1293,7 @@ SurfaceComposerClient::Transaction& SurfaceComposerClient::Transaction::setAlpha 
        ALOGE("SurfaceComposerClient::Transaction::setAlpha: invalid alpha %f, clamping", alpha);

    }

    s->what |= layer_state_t::eAlphaChanged;

    s->alpha = std::clamp(alpha, 0.f, 1.f);

    s->color.a = std::clamp(alpha, 0.f, 1.f);



    registerSurfaceControlForCallback(sc);

    return *this;
@@ -1424,7 +1424,7 @@ SurfaceComposerClient::Transaction& SurfaceComposerClient::Transaction::setColor 
        return *this;

    }

    s->what |= layer_state_t::eColorChanged;

    s->color = color;

    s->color.rgb = color;



    registerSurfaceControlForCallback(sc);

    return *this;
@@ -1439,7 +1439,7 @@ SurfaceComposerClient::Transaction& SurfaceComposerClient::Transaction::setBackg 
    }



    s->what |= layer_state_t::eBackgroundColorChanged;

    s->color = color;

    s->color.rgb = color;

    s->bgColorAlpha = alpha;

    s->bgColorDataspace = dataspace;
@@ -1454,8 +1454,8 @@ SurfaceComposerClient::Transaction& SurfaceComposerClient::Transaction::setTrans 
        mStatus = BAD_INDEX;

        return *this;

    }

    s->what |= layer_state_t::eTransformChanged;

    s->transform = transform;

    s->what |= layer_state_t::eBufferTransformChanged;

    s->bufferTransform = transform;



    registerSurfaceControlForCallback(sc);

    return *this;

libs/gui/include/gui/LayerState.h

+7 −8
Original line number Diff line number Diff line
@@ -148,12 +148,14 @@ struct layer_state_t { 
    enum {

        ePositionChanged = 0x00000001,

        eLayerChanged = 0x00000002,

        // unused = 0x00000004,

        /* unused = 0x00000004, */

        eAlphaChanged = 0x00000008,

        eMatrixChanged = 0x00000010,

        eTransparentRegionChanged = 0x00000020,

        eFlagsChanged = 0x00000040,

        eLayerStackChanged = 0x00000080,

        /* unused = 0x00000100, */

        /* unused = 0x00000200, */

        eDimmingEnabledChanged = 0x00000400,

        eShadowRadiusChanged = 0x00000800,

        eRenderBorderChanged = 0x00001000,
@@ -161,8 +163,8 @@ struct layer_state_t { 
        eRelativeLayerChanged = 0x00004000,

        eReparent = 0x00008000,

        eColorChanged = 0x00010000,

        eDestroySurface = 0x00020000,

        eTransformChanged = 0x00040000,

        /* unused = 0x00020000, */

        eBufferTransformChanged = 0x00040000,

        eTransformToDisplayInverseChanged = 0x00080000,

        eCropChanged = 0x00100000,

        eBufferChanged = 0x00200000,
@@ -218,25 +220,22 @@ struct layer_state_t { 
    float y;

    int32_t z;

    ui::LayerStack layerStack = ui::DEFAULT_LAYER_STACK;

    float alpha;

    uint32_t flags;

    uint32_t mask;

    uint8_t reserved;

    matrix22_t matrix;

    float cornerRadius;

    uint32_t backgroundBlurRadius;

    sp<SurfaceControl> reparentSurfaceControl;



    sp<SurfaceControl> relativeLayerSurfaceControl;



    sp<SurfaceControl> parentSurfaceControlForChild;



    half3 color;

    half4 color;



    // non POD must be last. see write/read

    Region transparentRegion;



    uint32_t transform;

    uint32_t bufferTransform;

    bool transformToDisplayInverse;

    Rect crop;

    std::shared_ptr<BufferData> bufferData = nullptr;

services/surfaceflinger/Layer.cpp

+6 −9
Original line number Diff line number Diff line
@@ -3633,7 +3633,7 @@ bool Layer::simpleBufferUpdate(const layer_state_t& s) const { 
    }



    if (s.what & layer_state_t::eAlphaChanged) {

        if (mDrawingState.color.a != s.alpha) {

        if (mDrawingState.color.a != s.color.a) {

            ALOGV("%s: false [eAlphaChanged changed]", __func__);

            return false;

        }
@@ -3677,9 +3677,9 @@ bool Layer::simpleBufferUpdate(const layer_state_t& s) const { 
        }

    }



    if (s.what & layer_state_t::eTransformChanged) {

        if (mDrawingState.bufferTransform != s.transform) {

            ALOGV("%s: false [eTransformChanged changed]", __func__);

    if (s.what & layer_state_t::eBufferTransformChanged) {

        if (mDrawingState.bufferTransform != s.bufferTransform) {

            ALOGV("%s: false [eBufferTransformChanged changed]", __func__);

            return false;

        }

    }
@@ -4177,15 +4177,12 @@ const std::shared_ptr<renderengine::ExternalTexture>& Layer::getExternalTexture( 
}



bool Layer::setColor(const half3& color) {

    if (mDrawingState.color.r == color.r && mDrawingState.color.g == color.g &&

        mDrawingState.color.b == color.b) {

    if (mDrawingState.color.rgb == color) {

        return false;

    }



    mDrawingState.sequence++;

    mDrawingState.color.r = color.r;

    mDrawingState.color.g = color.g;

    mDrawingState.color.b = color.b;

    mDrawingState.color.rgb = color;

    mDrawingState.modified = true;

    setTransactionFlags(eTransactionNeeded);

    return true;

services/surfaceflinger/SurfaceFlinger.cpp

+5 −7
Original line number Diff line number Diff line
@@ -4131,12 +4131,10 @@ uint32_t SurfaceFlinger::setClientStateLocked(const FrameTimelineInfo& frameTime 
        }

    }

    if (what & layer_state_t::eAlphaChanged) {

        if (layer->setAlpha(s.alpha))

            flags |= eTraversalNeeded;

        if (layer->setAlpha(s.color.a)) flags |= eTraversalNeeded;

    }

    if (what & layer_state_t::eColorChanged) {

        if (layer->setColor(s.color))

            flags |= eTraversalNeeded;

        if (layer->setColor(s.color.rgb)) flags |= eTraversalNeeded;

    }

    if (what & layer_state_t::eColorTransformChanged) {

        if (layer->setColorTransform(s.colorTransform)) {
@@ -4144,7 +4142,7 @@ uint32_t SurfaceFlinger::setClientStateLocked(const FrameTimelineInfo& frameTime 
        }

    }

    if (what & layer_state_t::eBackgroundColorChanged) {

        if (layer->setBackgroundColor(s.color, s.bgColorAlpha, s.bgColorDataspace)) {

        if (layer->setBackgroundColor(s.color.rgb, s.bgColorAlpha, s.bgColorDataspace)) {

            flags |= eTraversalNeeded;

        }

    }
@@ -4193,8 +4191,8 @@ uint32_t SurfaceFlinger::setClientStateLocked(const FrameTimelineInfo& frameTime 
            flags |= eTransactionNeeded | eTraversalNeeded | eTransformHintUpdateNeeded;

        }

    }

    if (what & layer_state_t::eTransformChanged) {

        if (layer->setTransform(s.transform)) flags |= eTraversalNeeded;

    if (what & layer_state_t::eBufferTransformChanged) {

        if (layer->setTransform(s.bufferTransform)) flags |= eTraversalNeeded;

    }

    if (what & layer_state_t::eTransformToDisplayInverseChanged) {

        if (layer->setTransformToDisplayInverse(s.transformToDisplayInverse))