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

Commit 10eb6ab9 authored by Chris Craik's avatar Chris Craik Committed by Android (Google) Code Review
Browse files

Merge "Early return when the scale is 0." into mnc-dr-dev

parents c4aaf0f4 cdce35a7

libs/hwui/RenderNode.cpp

+7 −2
Original line number Diff line number Diff line
@@ -666,7 +666,9 @@ template <class T> 
void RenderNode::issueDrawShadowOperation(const Matrix4& transformFromParent, T& handler) {

    if (properties().getAlpha() <= 0.0f

            || properties().getOutline().getAlpha() <= 0.0f

            || !properties().getOutline().getPath()) {

            || !properties().getOutline().getPath()

            || properties().getScaleX() == 0

            || properties().getScaleY() == 0) {

        // no shadow to draw

        return;

    }
@@ -856,7 +858,10 @@ void RenderNode::issueOperations(OpenGLRenderer& renderer, T& handler) { 
    const bool useViewProperties = (!mLayer || drawLayer);

    if (useViewProperties) {

        const Outline& outline = properties().getOutline();

        if (properties().getAlpha() <= 0 || (outline.getShouldClip() && outline.isEmpty())) {

        if (properties().getAlpha() <= 0

                || (outline.getShouldClip() && outline.isEmpty())

                || properties().getScaleX() == 0

                || properties().getScaleY() == 0) {

            DISPLAY_LIST_LOGD("%*sRejected display list (%p, %s)", handler.level() * 2, "",

                    this, getName());

            return;

libs/hwui/ShadowTessellator.cpp

+2 −2
Original line number Diff line number Diff line
@@ -77,8 +77,8 @@ void ShadowTessellator::tessellateSpotShadow(bool isCasterOpaque, 
    }



#if DEBUG_SHADOW

    ALOGD("light center %f %f %f",

            adjustedLightCenter.x, adjustedLightCenter.y, adjustedLightCenter.z);

    ALOGD("light center %f %f %f %d",

            adjustedLightCenter.x, adjustedLightCenter.y, adjustedLightCenter.z, lightRadius);

#endif



    // light position (because it's in local space) needs to compensate for receiver transform

libs/hwui/SpotShadow.cpp

+1 −1
Original line number Diff line number Diff line
@@ -1052,7 +1052,7 @@ void SpotShadow::dumpPolygon(const Vector2* poly, int polyLength, const char* po 
 */

void SpotShadow::dumpPolygon(const Vector3* poly, int polyLength, const char* polyName) {

    for (int i = 0; i < polyLength; i++) {

        ALOGD("polygon %s i %d x %f y %f", polyName, i, poly[i].x, poly[i].y);

        ALOGD("polygon %s i %d x %f y %f z %f", polyName, i, poly[i].x, poly[i].y, poly[i].z);

    }

}