diff options
| -rw-r--r-- | libs/hwui/Layer.cpp | 2 | ||||
| -rw-r--r-- | libs/hwui/pipeline/skia/LayerDrawable.cpp | 2 | ||||
| -rw-r--r-- | libs/hwui/pipeline/skia/ReorderBarrierDrawables.cpp | 4 | ||||
| -rw-r--r-- | libs/hwui/utils/MathUtils.h | 6 |
4 files changed, 7 insertions, 7 deletions
diff --git a/libs/hwui/Layer.cpp b/libs/hwui/Layer.cpp index ca2ada9e8141..b14ade97ca5f 100644 --- a/libs/hwui/Layer.cpp +++ b/libs/hwui/Layer.cpp @@ -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 diff --git a/libs/hwui/pipeline/skia/LayerDrawable.cpp b/libs/hwui/pipeline/skia/LayerDrawable.cpp index 34df5ddbb210..471a7f7af3b1 100644 --- a/libs/hwui/pipeline/skia/LayerDrawable.cpp +++ b/libs/hwui/pipeline/skia/LayerDrawable.cpp @@ -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 diff --git a/libs/hwui/pipeline/skia/ReorderBarrierDrawables.cpp b/libs/hwui/pipeline/skia/ReorderBarrierDrawables.cpp index 3b8caeb3aab1..7cfccb56382c 100644 --- a/libs/hwui/pipeline/skia/ReorderBarrierDrawables.cpp +++ b/libs/hwui/pipeline/skia/ReorderBarrierDrawables.cpp @@ -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; diff --git a/libs/hwui/utils/MathUtils.h b/libs/hwui/utils/MathUtils.h index 62bf39ca8a7a..1d3f9d701eed 100644 --- a/libs/hwui/utils/MathUtils.h +++ b/libs/hwui/utils/MathUtils.h @@ -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. */ |