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

Commit 94faf290 authored by Chris Craik's avatar Chris Craik Committed by Android Git Automerger
Browse files

am 6b4ace29: Merge "Add back alpha atrace log" into mnc-dev 

* commit '6b4ace29':
  Add back alpha atrace log
parents a82e4878 6b4ace29

libs/hwui/RenderNode.cpp

+7 −0
Original line number Original line Diff line number Diff line
@@ -392,6 +392,13 @@ void RenderNode::setViewProperties(OpenGLRenderer& renderer, T& handler) { 
        }

        }

        LOG_ALWAYS_FATAL_IF(!isLayer && properties().getHasOverlappingRendering());

        LOG_ALWAYS_FATAL_IF(!isLayer && properties().getHasOverlappingRendering());

        renderer.scaleAlpha(properties().getAlpha());

        renderer.scaleAlpha(properties().getAlpha());



        if (CC_UNLIKELY(ATRACE_ENABLED() && properties().promotedToLayer())) {

            // pretend to cause savelayer to warn about performance problem affecting old versions

            ATRACE_FORMAT("%s alpha caused saveLayer %dx%d", getName(),

                    static_cast<int>(getWidth()),

                    static_cast<int>(getHeight()));

        }

    }

    }

    if (clipFlags) {

    if (clipFlags) {

        Rect clipRect;

        Rect clipRect;

libs/hwui/RenderProperties.h

+7 −7
Original line number Original line Diff line number Diff line
@@ -576,15 +576,15 @@ public: 
                && getOutline().getAlpha() != 0.0f;

                && getOutline().getAlpha() != 0.0f;

    }

    }





    LayerType effectiveLayerType() const {

    bool promotedToLayer() const {

        LayerType type = mLayerProperties.mType;

        return mLayerProperties.mType == LayerType::None

        if (type == LayerType::None

                && !MathUtils::isZero(mPrimitiveFields.mAlpha)

                && !MathUtils::isZero(mPrimitiveFields.mAlpha)

                && mPrimitiveFields.mAlpha < 1

                && mPrimitiveFields.mAlpha < 1

                && mPrimitiveFields.mHasOverlappingRendering) {

                && mPrimitiveFields.mHasOverlappingRendering;

            return LayerType::RenderLayer;

    }

    }

        return type;



    LayerType effectiveLayerType() const {

        return promotedToLayer() ? LayerType::RenderLayer : mLayerProperties.mType;

    }

    }





private:

private:

libs/hwui/utils/TraceUtils.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -35,7 +35,7 @@ public: 
    };

    };





    static void atraceFormatBegin(const char* fmt, ...) {

    static void atraceFormatBegin(const char* fmt, ...) {

        if (CC_UNLIKELY(!ATRACE_ENABLED())) return;

        if (CC_LIKELY(!ATRACE_ENABLED())) return;





        const int BUFFER_SIZE = 256;

        const int BUFFER_SIZE = 256;

        va_list ap;

        va_list ap;