diff options
| author |  reed <reed@google.com> | 2015-01-16 07:18:10 -0800 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-01-16 07:18:10 -0800 |
| commit | 15fd47f8a07615a7f5d78581aee4c80ff9f17fd9 (patch) | |
| tree | 705f38c1a3f53b5a6d0e6e02defdac7df9246978 /src/core/SkMipMap.cpp | |
| parent | 45fa447460f70ec21d22cf4e1531490acfd3c578 (diff) | |
use log2(scale) to compute mip level
BUG=skia:
Review URL: https://codereview.chromium.org/849333002
Diffstat (limited to 'src/core/SkMipMap.cpp')
| -rw-r--r-- | src/core/SkMipMap.cpp | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/src/core/SkMipMap.cpp b/src/core/SkMipMap.cpp index 83164b1526..2dad6d9c57 100644 --- a/src/core/SkMipMap.cpp +++ b/src/core/SkMipMap.cpp @@ -225,8 +225,7 @@ SkMipMap* SkMipMap::Build(const SkBitmap& src, SkDiscardableFactoryProc fact) { /////////////////////////////////////////////////////////////////////////////// -//static int gCounter; - +#ifdef SK_SUPPORT_LEGACY_MIPLEVELCHOICE static SkFixed compute_level(SkScalar scale) { SkScalar inv = SkScalarAbs(SkScalarInvert(scale)); if (inv > 32767) { // Watch out for SkFixed overflow. @@ -241,17 +240,29 @@ static SkFixed compute_level(SkScalar scale) { SkASSERT(clz >= 1 && clz <= 15); return SkIntToFixed(15 - clz) + ((unsigned)(s << (clz + 1)) >> 16); } +#endif bool SkMipMap::extractLevel(SkScalar scale, Level* levelPtr) const { if (NULL == fLevels) { return false; } - if (scale >= SK_Scalar1) { + if (scale >= SK_Scalar1 || scale <= 0 || !SkScalarIsFinite(scale)) { return false; } +#ifdef SK_SUPPORT_LEGACY_MIPLEVELCHOICE int level = compute_level(scale) >> 16; +#else + SkScalar L = -SkScalarLog2(scale); + if (!SkScalarIsFinite(L)) { + return false; + } + SkASSERT(L >= 0); + int level = SkScalarRoundToInt(L); +// SkDebugf("mipmap scale=%g L=%g level=%d\n", scale, L, level); +#endif + SkASSERT(level >= 0); if (level <= 0) { return false; |