diff options
| author |  fmalita <fmalita@chromium.org> | 2016-01-30 18:56:34 -0800 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-01-30 18:56:34 -0800 |
| commit | 8a8eb5242b11ac0b9851b350fbdab0a797ab4a9f (patch) | |
| tree | 62707c9f74fab25204c109419752fac0439cc436 /src/core/SkBitmapProcState.cpp | |
| parent | 395eabeb0e72334c45324874c6e009b54634df21 (diff) | |
Remove SkBitmapProcStateAutoMapper's overflow check
(follow-up to https://codereview.chromium.org/1642273002)
Add an optional SkPoint outparam, and relocate the overflow check to
the only client which needs it.
R=reed@google.com
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1650403002
Review URL: https://codereview.chromium.org/1650403002
Diffstat (limited to 'src/core/SkBitmapProcState.cpp')
| -rw-r--r-- | src/core/SkBitmapProcState.cpp | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/src/core/SkBitmapProcState.cpp b/src/core/SkBitmapProcState.cpp index c4b29392f1..d9d47a270f 100644 --- a/src/core/SkBitmapProcState.cpp +++ b/src/core/SkBitmapProcState.cpp @@ -586,29 +586,28 @@ static void DoNothing_shaderproc(const void*, int x, int y, } bool SkBitmapProcState::setupForTranslate() { -#ifdef SK_SUPPORT_LEGACY_SAMPLER_BIAS SkPoint pt; - fInvProc(fInvMatrix, SK_ScalarHalf, SK_ScalarHalf, &pt); - const SkScalar too_big = SkIntToScalar(1 << 30); - if (SkScalarAbs(pt.fX) > too_big || SkScalarAbs(pt.fY) > too_big) { - return false; - } - - fFilterOneX = SkScalarFloorToInt(pt.fX); - fFilterOneY = SkScalarFloorToInt(pt.fY); +#ifdef SK_SUPPORT_LEGACY_SAMPLER_BIAS + fInvProc(fInvMatrix, SK_ScalarHalf, SK_ScalarHalf, &pt); #else - SkBitmapProcStateAutoMapper mapper(*this, 0, 0); + const SkBitmapProcStateAutoMapper mapper(*this, 0, 0, &pt); +#endif /* * if the translate is larger than our ints, we can get random results, or * worse, we might get 0x80000000, which wreaks havoc on us, since we can't * negate it. */ - if (mapper.isOverflow()) { + const SkScalar too_big = SkIntToScalar(1 << 30); + if (SkScalarAbs(pt.fX) > too_big || SkScalarAbs(pt.fY) > too_big) { return false; } +#ifdef SK_SUPPORT_LEGACY_SAMPLER_BIAS + fFilterOneX = SkScalarFloorToInt(pt.fX); + fFilterOneY = SkScalarFloorToInt(pt.fY); +#else // Since we know we're not filtered, we re-purpose these fields allow // us to go from device -> src coordinates w/ just an integer add, // rather than running through the inverse-matrix |