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

Commit 9a7c192e authored by John Reck's avatar John Reck
Browse files

Remove two macros 

This is colliding with ag/13519705 and causing
build issues. So replace the macros with constexpr's which are
better

Bug: 179047472
Test: make
Change-Id: Icf7c38077ef608ec97e737d47d3d6c25246190bf
parent dba0fb55

libs/hwui/Layer.cpp

+1 −1
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ SkBlendMode Layer::getMode() const { 
}



static inline SkScalar isIntegerAligned(SkScalar x) {

    return fabsf(roundf(x) - x) <= NON_ZERO_EPSILON;

    return MathUtils::isZero(roundf(x) - x);

}



// Disable filtering when there is no scaling in screen coordinates and the corners have the same

libs/hwui/pipeline/skia/LayerDrawable.cpp

+1 −1
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ void LayerDrawable::onDraw(SkCanvas* canvas) { 
}



static inline SkScalar isIntegerAligned(SkScalar x) {

    return fabsf(roundf(x) - x) <= NON_ZERO_EPSILON;

    return MathUtils::isZero(roundf(x) - x);

}



// Disable filtering when there is no scaling in screen coordinates and the corners have the same

libs/hwui/pipeline/skia/ReorderBarrierDrawables.cpp

+2 −2
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ void StartReorderBarrierDrawable::onDraw(SkCanvas* canvas) { 
        RenderNodeDrawable* childNode = mChildren[drawIndex];

        SkASSERT(childNode);

        const float casterZ = childNode->getNodeProperties().getZ();

        if (casterZ >= -NON_ZERO_EPSILON) {  // draw only children with negative Z

        if (casterZ >= -MathUtils::NON_ZERO_EPSILON) {  // draw only children with negative Z

            return;

        }

        SkAutoCanvasRestore acr(canvas, true);
@@ -86,7 +86,7 @@ void EndReorderBarrierDrawable::onDraw(SkCanvas* canvas) { 


    const size_t endIndex = zChildren.size();

    while (drawIndex < endIndex  // draw only children with positive Z

           && zChildren[drawIndex]->getNodeProperties().getZ() <= NON_ZERO_EPSILON)

           && zChildren[drawIndex]->getNodeProperties().getZ() <= MathUtils::NON_ZERO_EPSILON)

        drawIndex++;

    size_t shadowIndex = drawIndex;

libs/hwui/utils/MathUtils.h

+3 −3
Original line number Diff line number Diff line
@@ -22,11 +22,11 @@ 
namespace android {

namespace uirenderer {



#define NON_ZERO_EPSILON (0.001f)

#define ALPHA_EPSILON (0.001f)



class MathUtils {

public:

    static constexpr float NON_ZERO_EPSILON = 0.001f;

    static constexpr float ALPHA_EPSILON = 0.001f;



    /**

     * Check for floats that are close enough to zero.

     */