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

Merge "Improve comparison of fractions"

Browse Source 
am: 0517cd144f

Change-Id: I211f5ea4546e400b328c244908e23cb7c375eb04
This commit is contained in:
Stan Iliev
2019-10-01 10:49:14 -07:00
committed by android-build-merger
parent e65e064e22 0517cd144f
commit b7cdf14a1f
1 changed files with 6 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -43,41 +43,28 @@ static bool shouldFilterRect(const SkMatrix& matrix, const SkRect& srcRect, cons
if (!matrix.rectStaysRect()) return true; if (!matrix.rectStaysRect()) return true;
SkRect dstDevRect = matrix.mapRect(dstRect); SkRect dstDevRect = matrix.mapRect(dstRect);
float dstW, dstH; float dstW, dstH;
bool requiresIntegerTranslate = false;
if (MathUtils::isZero(matrix.getScaleX()) && MathUtils::isZero(matrix.getScaleY())) { if (MathUtils::isZero(matrix.getScaleX()) && MathUtils::isZero(matrix.getScaleY())) {
// Has a 90 or 270 degree rotation, although total matrix may also have scale factors // Has a 90 or 270 degree rotation, although total matrix may also have scale factors
// in m10 and m01. Those scalings are automatically handled by mapRect so comparing // in m10 and m01. Those scalings are automatically handled by mapRect so comparing
// dimensions is sufficient, but swap width and height comparison. // dimensions is sufficient, but swap width and height comparison.
dstW = dstDevRect.height(); dstW = dstDevRect.height();
dstH = dstDevRect.width(); dstH = dstDevRect.width();
requiresIntegerTranslate = true;
} else { } else {
// Handle H/V flips or 180 rotation matrices. Axes may have been mirrored, but // Handle H/V flips or 180 rotation matrices. Axes may have been mirrored, but
// dimensions are still safe to compare directly. // dimensions are still safe to compare directly.
dstW = dstDevRect.width(); dstW = dstDevRect.width();
dstH = dstDevRect.height(); dstH = dstDevRect.height();
requiresIntegerTranslate =
matrix.getScaleX() < -NON_ZERO_EPSILON || matrix.getScaleY() < -NON_ZERO_EPSILON;
} }
if (!(MathUtils::areEqual(dstW, srcRect.width()) && if (!(MathUtils::areEqual(dstW, srcRect.width()) &&
MathUtils::areEqual(dstH, srcRect.height()))) { MathUtils::areEqual(dstH, srcRect.height()))) {
return true; return true;
} }
if (requiresIntegerTranslate) {
// Device rect and source rect should be integer aligned to ensure there's no difference // Device rect and source rect should be integer aligned to ensure there's no difference
// in how nearest-neighbor sampling is resolved. // in how nearest-neighbor sampling is resolved.
return !(isIntegerAligned(srcRect.x()) && return !(isIntegerAligned(srcRect.x()) &&
isIntegerAligned(srcRect.y()) && isIntegerAligned(srcRect.y()) &&
isIntegerAligned(dstDevRect.x()) && isIntegerAligned(dstDevRect.x()) &&
isIntegerAligned(dstDevRect.y())); isIntegerAligned(dstDevRect.y()));
} else {
// As long as src and device rects are translated by the same fractional amount,
// filtering won't be needed
return !(MathUtils::areEqual(SkScalarFraction(srcRect.x()),
SkScalarFraction(dstDevRect.x())) &&
MathUtils::areEqual(SkScalarFraction(srcRect.y()),
SkScalarFraction(dstDevRect.y())));
}
} }
bool LayerDrawable::DrawLayer(GrContext* context, SkCanvas* canvas, Layer* layer, bool LayerDrawable::DrawLayer(GrContext* context, SkCanvas* canvas, Layer* layer,