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

Commit 9674ffa1 authored by Surbhi Kadam's avatar Surbhi Kadam
Browse files

surfaceflinger: Add clientDrawnCornerRadius and clientDrawnShadowLength layer properties 

Modify RoundedCornerState and ShadowSettings to account for client drawn corners and shadows. When equal to the requested values, SurfaceFlinger will not draw corners and shadows for the layer.

Bug: 375624570
Flag: com.android.window.flags.ignore_corner_radius_and_shadows
Test: atest SurfaceFlinger_test; manual test - PIP, freeform window, recents, app launch

Change-Id: Idde115b51a253a34cfadfbd1ff6c7b15c44518ef
parent 9bf3e87d

libs/gui/LayerState.cpp

+16 −0
Original line number Original line Diff line number Diff line
@@ -66,6 +66,8 @@ layer_state_t::layer_state_t() 
        mask(0),

        mask(0),

        reserved(0),

        reserved(0),

        cornerRadius(0.0f),

        cornerRadius(0.0f),

        clientDrawnCornerRadius(0.0f),

        clientDrawnShadowRadius(0.0f),

        backgroundBlurRadius(0),

        backgroundBlurRadius(0),

        color(0),

        color(0),

        bufferTransform(0),

        bufferTransform(0),
@@ -140,6 +142,8 @@ status_t layer_state_t::write(Parcel& output) const 




    SAFE_PARCEL(output.write, colorTransform.asArray(), 16 * sizeof(float));

    SAFE_PARCEL(output.write, colorTransform.asArray(), 16 * sizeof(float));

    SAFE_PARCEL(output.writeFloat, cornerRadius);

    SAFE_PARCEL(output.writeFloat, cornerRadius);

    SAFE_PARCEL(output.writeFloat, clientDrawnCornerRadius);

    SAFE_PARCEL(output.writeFloat, clientDrawnShadowRadius);

    SAFE_PARCEL(output.writeUint32, backgroundBlurRadius);

    SAFE_PARCEL(output.writeUint32, backgroundBlurRadius);

    SAFE_PARCEL(output.writeParcelable, metadata);

    SAFE_PARCEL(output.writeParcelable, metadata);

    SAFE_PARCEL(output.writeFloat, bgColor.r);

    SAFE_PARCEL(output.writeFloat, bgColor.r);
@@ -274,6 +278,8 @@ status_t layer_state_t::read(const Parcel& input) 




    SAFE_PARCEL(input.read, &colorTransform, 16 * sizeof(float));

    SAFE_PARCEL(input.read, &colorTransform, 16 * sizeof(float));

    SAFE_PARCEL(input.readFloat, &cornerRadius);

    SAFE_PARCEL(input.readFloat, &cornerRadius);

    SAFE_PARCEL(input.readFloat, &clientDrawnCornerRadius);

    SAFE_PARCEL(input.readFloat, &clientDrawnShadowRadius);

    SAFE_PARCEL(input.readUint32, &backgroundBlurRadius);

    SAFE_PARCEL(input.readUint32, &backgroundBlurRadius);

    SAFE_PARCEL(input.readParcelable, &metadata);

    SAFE_PARCEL(input.readParcelable, &metadata);
@@ -596,6 +602,14 @@ void layer_state_t::merge(const layer_state_t& other) { 
        what |= eCornerRadiusChanged;

        what |= eCornerRadiusChanged;

        cornerRadius = other.cornerRadius;

        cornerRadius = other.cornerRadius;

    }

    }

    if (other.what & eClientDrawnCornerRadiusChanged) {

        what |= eClientDrawnCornerRadiusChanged;

        clientDrawnCornerRadius = other.clientDrawnCornerRadius;

    }

    if (other.what & eClientDrawnShadowsChanged) {

        what |= eClientDrawnShadowsChanged;

        clientDrawnShadowRadius = other.clientDrawnShadowRadius;

    }

    if (other.what & eBackgroundBlurRadiusChanged) {

    if (other.what & eBackgroundBlurRadiusChanged) {

        what |= eBackgroundBlurRadiusChanged;

        what |= eBackgroundBlurRadiusChanged;

        backgroundBlurRadius = other.backgroundBlurRadius;

        backgroundBlurRadius = other.backgroundBlurRadius;
@@ -809,6 +823,8 @@ uint64_t layer_state_t::diff(const layer_state_t& other) const { 
    }

    }

    CHECK_DIFF(diff, eLayerStackChanged, other, layerStack);

    CHECK_DIFF(diff, eLayerStackChanged, other, layerStack);

    CHECK_DIFF(diff, eCornerRadiusChanged, other, cornerRadius);

    CHECK_DIFF(diff, eCornerRadiusChanged, other, cornerRadius);

    CHECK_DIFF(diff, eClientDrawnCornerRadiusChanged, other, clientDrawnCornerRadius);

    CHECK_DIFF(diff, eClientDrawnShadowsChanged, other, clientDrawnShadowRadius);

    CHECK_DIFF(diff, eBackgroundBlurRadiusChanged, other, backgroundBlurRadius);

    CHECK_DIFF(diff, eBackgroundBlurRadiusChanged, other, backgroundBlurRadius);

    if (other.what & eBlurRegionsChanged) diff |= eBlurRegionsChanged;

    if (other.what & eBlurRegionsChanged) diff |= eBlurRegionsChanged;

    if (other.what & eRelativeLayerChanged) {

    if (other.what & eRelativeLayerChanged) {

libs/gui/SurfaceComposerClient.cpp

+23 −0
Original line number Original line Diff line number Diff line
@@ -1695,6 +1695,29 @@ SurfaceComposerClient::Transaction& SurfaceComposerClient::Transaction::setCorne 
    return *this;

    return *this;

}

}





SurfaceComposerClient::Transaction& SurfaceComposerClient::Transaction::setClientDrawnCornerRadius(

        const sp<SurfaceControl>& sc, float clientDrawnCornerRadius) {

    layer_state_t* s = getLayerState(sc);

    if (!s) {

        mStatus = BAD_INDEX;

        return *this;

    }

    s->what |= layer_state_t::eClientDrawnCornerRadiusChanged;

    s->clientDrawnCornerRadius = clientDrawnCornerRadius;

    return *this;

}



SurfaceComposerClient::Transaction& SurfaceComposerClient::Transaction::setClientDrawnShadowRadius(

        const sp<SurfaceControl>& sc, float clientDrawnShadowRadius) {

    layer_state_t* s = getLayerState(sc);

    if (!s) {

        mStatus = BAD_INDEX;

        return *this;

    }

    s->what |= layer_state_t::eClientDrawnShadowsChanged;

    s->clientDrawnShadowRadius = clientDrawnShadowRadius;

    return *this;

}

SurfaceComposerClient::Transaction& SurfaceComposerClient::Transaction::setBackgroundBlurRadius(

SurfaceComposerClient::Transaction& SurfaceComposerClient::Transaction::setBackgroundBlurRadius(

        const sp<SurfaceControl>& sc, int backgroundBlurRadius) {

        const sp<SurfaceControl>& sc, int backgroundBlurRadius) {

    layer_state_t* s = getLayerState(sc);

    layer_state_t* s = getLayerState(sc);

libs/gui/include/gui/LayerState.h

+9 −5
Original line number Original line Diff line number Diff line
@@ -231,6 +231,8 @@ struct layer_state_t { 
        eBufferReleaseChannelChanged = 0x40000'00000000,

        eBufferReleaseChannelChanged = 0x40000'00000000,

        ePictureProfileHandleChanged = 0x80000'00000000,

        ePictureProfileHandleChanged = 0x80000'00000000,

        eAppContentPriorityChanged = 0x100000'00000000,

        eAppContentPriorityChanged = 0x100000'00000000,

        eClientDrawnCornerRadiusChanged = 0x200000'00000000,

        eClientDrawnShadowsChanged = 0x400000'00000000,

    };

    };





    layer_state_t();

    layer_state_t();
@@ -251,9 +253,9 @@ struct layer_state_t { 
    // Geometry updates.

    // Geometry updates.

    static constexpr uint64_t GEOMETRY_CHANGES = layer_state_t::eBufferCropChanged |

    static constexpr uint64_t GEOMETRY_CHANGES = layer_state_t::eBufferCropChanged |

            layer_state_t::eBufferTransformChanged | layer_state_t::eCornerRadiusChanged |

            layer_state_t::eBufferTransformChanged | layer_state_t::eCornerRadiusChanged |

            layer_state_t::eCropChanged | layer_state_t::eDestinationFrameChanged |

            layer_state_t::eClientDrawnCornerRadiusChanged | layer_state_t::eCropChanged |

            layer_state_t::eMatrixChanged | layer_state_t::ePositionChanged |

            layer_state_t::eDestinationFrameChanged | layer_state_t::eMatrixChanged |

            layer_state_t::eTransformToDisplayInverseChanged |

            layer_state_t::ePositionChanged | layer_state_t::eTransformToDisplayInverseChanged |

            layer_state_t::eTransparentRegionChanged | layer_state_t::eEdgeExtensionChanged;

            layer_state_t::eTransparentRegionChanged | layer_state_t::eEdgeExtensionChanged;





    // Buffer and related updates.

    // Buffer and related updates.
@@ -274,8 +276,8 @@ struct layer_state_t { 
            layer_state_t::eColorSpaceAgnosticChanged | layer_state_t::eColorTransformChanged |

            layer_state_t::eColorSpaceAgnosticChanged | layer_state_t::eColorTransformChanged |

            layer_state_t::eCornerRadiusChanged | layer_state_t::eDimmingEnabledChanged |

            layer_state_t::eCornerRadiusChanged | layer_state_t::eDimmingEnabledChanged |

            layer_state_t::eHdrMetadataChanged | layer_state_t::eShadowRadiusChanged |

            layer_state_t::eHdrMetadataChanged | layer_state_t::eShadowRadiusChanged |

            layer_state_t::eStretchChanged | layer_state_t::ePictureProfileHandleChanged |

            layer_state_t::eClientDrawnShadowsChanged | layer_state_t::eStretchChanged |

            layer_state_t::eAppContentPriorityChanged;

            layer_state_t::ePictureProfileHandleChanged | layer_state_t::eAppContentPriorityChanged;





    // Changes which invalidates the layer's visible region in CE.

    // Changes which invalidates the layer's visible region in CE.

    static constexpr uint64_t CONTENT_DIRTY = layer_state_t::CONTENT_CHANGES |

    static constexpr uint64_t CONTENT_DIRTY = layer_state_t::CONTENT_CHANGES |
@@ -328,6 +330,8 @@ struct layer_state_t { 
    uint8_t reserved;

    uint8_t reserved;

    matrix22_t matrix;

    matrix22_t matrix;

    float cornerRadius;

    float cornerRadius;

    float clientDrawnCornerRadius;

    float clientDrawnShadowRadius;

    uint32_t backgroundBlurRadius;

    uint32_t backgroundBlurRadius;





    sp<SurfaceControl> relativeLayerSurfaceControl;

    sp<SurfaceControl> relativeLayerSurfaceControl;

libs/gui/include/gui/SurfaceComposerClient.h

+9 −0
Original line number Original line Diff line number Diff line
@@ -567,6 +567,15 @@ public: 
        Transaction& setCrop(const sp<SurfaceControl>& sc, const Rect& crop);

        Transaction& setCrop(const sp<SurfaceControl>& sc, const Rect& crop);

        Transaction& setCrop(const sp<SurfaceControl>& sc, const FloatRect& crop);

        Transaction& setCrop(const sp<SurfaceControl>& sc, const FloatRect& crop);

        Transaction& setCornerRadius(const sp<SurfaceControl>& sc, float cornerRadius);

        Transaction& setCornerRadius(const sp<SurfaceControl>& sc, float cornerRadius);

        // Sets the client drawn corner radius for the layer. If both a corner radius and a client

        // radius are sent to SF, the client radius will be used. This indicates that the corner

        // radius is drawn by the client and not SurfaceFlinger.

        Transaction& setClientDrawnCornerRadius(const sp<SurfaceControl>& sc,

                                                float clientDrawnCornerRadius);

        // Sets the client drawn shadow radius for the layer. This indicates that the shadows

        // are drawn by the client and not SurfaceFlinger.

        Transaction& setClientDrawnShadowRadius(const sp<SurfaceControl>& sc,

                                                float clientDrawnShadowRadius);

        Transaction& setBackgroundBlurRadius(const sp<SurfaceControl>& sc,

        Transaction& setBackgroundBlurRadius(const sp<SurfaceControl>& sc,

                                             int backgroundBlurRadius);

                                             int backgroundBlurRadius);

        Transaction& setBlurRegions(const sp<SurfaceControl>& sc,

        Transaction& setBlurRegions(const sp<SurfaceControl>& sc,

libs/ui/include/ui/ShadowSettings.h

+4 −0
Original line number Original line Diff line number Diff line
@@ -46,6 +46,9 @@ struct ShadowSettings { 
    // Length of the cast shadow. If length is <= 0.f no shadows will be drawn.

    // Length of the cast shadow. If length is <= 0.f no shadows will be drawn.

    float length = 0.f;

    float length = 0.f;





    // Length of the cast shadow that is drawn by the client.

    float clientDrawnLength = 0.f;



    // If true fill in the casting layer is translucent and the shadow needs to fill the bounds.

    // If true fill in the casting layer is translucent and the shadow needs to fill the bounds.

    // Otherwise the shadow will only be drawn around the edges of the casting layer.

    // Otherwise the shadow will only be drawn around the edges of the casting layer.

    bool casterIsTranslucent = false;

    bool casterIsTranslucent = false;
@@ -55,6 +58,7 @@ static inline bool operator==(const ShadowSettings& lhs, const ShadowSettings& r 
    return lhs.boundaries == rhs.boundaries && lhs.ambientColor == rhs.ambientColor &&

    return lhs.boundaries == rhs.boundaries && lhs.ambientColor == rhs.ambientColor &&

            lhs.spotColor == rhs.spotColor && lhs.lightPos == rhs.lightPos &&

            lhs.spotColor == rhs.spotColor && lhs.lightPos == rhs.lightPos &&

            lhs.lightRadius == rhs.lightRadius && lhs.length == rhs.length &&

            lhs.lightRadius == rhs.lightRadius && lhs.length == rhs.length &&

            lhs.clientDrawnLength == rhs.clientDrawnLength &&

            lhs.casterIsTranslucent == rhs.casterIsTranslucent;

            lhs.casterIsTranslucent == rhs.casterIsTranslucent;

}

}