diff options
| author |  fmalita <fmalita@chromium.org> | 2016-02-09 08:20:18 -0800 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-02-09 08:20:19 -0800 |
| commit | 33ed3ad9f62b3c84d439b92ab45732d4fa6d05ad (patch) | |
| tree | f31bc05dd8c237e9f2f1fa1a9a3223b44f2c3d45 /src/core/SkMipMap.cpp | |
| parent | a525cb151bb39fb6362af051f69b6d633f660fd9 (diff) | |
Relocate anisotropic mipmap logic to SkMipMap::extractLevel()
Pass a full x/y scale and defer the anisotropic heuristic to SkMipMap.
R=reed@google.com
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1686563002
Review URL: https://codereview.chromium.org/1686563002
Diffstat (limited to 'src/core/SkMipMap.cpp')
| -rw-r--r-- | src/core/SkMipMap.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/core/SkMipMap.cpp b/src/core/SkMipMap.cpp index 08602b7e00..7266dc6b21 100644 --- a/src/core/SkMipMap.cpp +++ b/src/core/SkMipMap.cpp @@ -320,11 +320,15 @@ SkMipMap* SkMipMap::Build(const SkPixmap& src, SkDiscardableFactoryProc fact) { /////////////////////////////////////////////////////////////////////////////// -bool SkMipMap::extractLevel(SkScalar scale, Level* levelPtr) const { +bool SkMipMap::extractLevel(const SkSize& scaleSize, Level* levelPtr) const { if (nullptr == fLevels) { return false; } + SkASSERT(scaleSize.width() >= 0 && scaleSize.height() >= 0); + // Use the smallest scale to match the GPU impl. + const SkScalar scale = SkTMin(scaleSize.width(), scaleSize.height()); + if (scale >= SK_Scalar1 || scale <= 0 || !SkScalarIsFinite(scale)) { return false; } |