Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove two macros

Browse Source 
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
This commit is contained in:
John Reck
2021-02-08 19:32:21 -05:00
parent dba0fb5580
commit 9a7c192ebe
4 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libs/hwui/Layer.cpp
View File

@@ -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

2
libs/hwui/pipeline/skia/LayerDrawable.cpp
View File

@@ -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

4
libs/hwui/pipeline/skia/ReorderBarrierDrawables.cpp
View File

@@ -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;

6
libs/hwui/utils/MathUtils.h
View File

@@ -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.
*/