diff options
author | reed <reed@google.com> | 2016-01-16 18:50:35 -0800 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2016-01-16 18:50:35 -0800 |
commit | 67b09bf6b7422c7a3209781cbb7827224e3ffc17 (patch) | |
tree | abbf8933a1cc4d7ffd52b02d98560133d030c552 /src | |
parent | 879caf86fd9b906d326f9cffe6933817019078b2 (diff) |
use pixmaps in mipmap api
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1598803002
Review URL: https://codereview.chromium.org/1598803002
Diffstat (limited to 'src')
-rw-r--r-- | src/core/SkBitmapController.cpp | 3 | ||||
-rw-r--r-- | src/core/SkMipMap.cpp | 59 | ||||
-rw-r--r-- | src/core/SkMipMap.h | 6 |
3 files changed, 28 insertions, 40 deletions
diff --git a/src/core/SkBitmapController.cpp b/src/core/SkBitmapController.cpp index 7182ea7382..61c14dc7b8 100644 --- a/src/core/SkBitmapController.cpp +++ b/src/core/SkBitmapController.cpp @@ -185,10 +185,9 @@ bool SkDefaultBitmapControllerState::processMediumRequest(const SkBitmapProvider SkScalar invScaleFixup = level.fScale; fInvMatrix.postScale(invScaleFixup, invScaleFixup); - const SkImageInfo info = provider.info().makeWH(level.fWidth, level.fHeight); // todo: if we could wrap the fCurrMip in a pixelref, then we could just install // that here, and not need to explicitly track it ourselves. - return fResultBitmap.installPixels(info, level.fPixels, level.fRowBytes); + return fResultBitmap.installPixels(level.fPixmap); } else { // failed to extract, so release the mipmap fCurrMip.reset(nullptr); diff --git a/src/core/SkMipMap.cpp b/src/core/SkMipMap.cpp index eba50bcb4d..5ea40f4048 100644 --- a/src/core/SkMipMap.cpp +++ b/src/core/SkMipMap.cpp @@ -183,7 +183,7 @@ size_t SkMipMap::AllocLevelsSize(int levelCount, size_t pixelSize) { typedef void SkDownSampleProc(void*, int x, int y, const void* srcPtr, const SkPixmap& srcPM); -SkMipMap* SkMipMap::Build(const SkBitmap& src, SkDiscardableFactoryProc fact) { +SkMipMap* SkMipMap::Build(const SkPixmap& src, SkDiscardableFactoryProc fact) { SkDownSampleProc* proc_nocheck, *proc_check; const SkColorType ct = src.colorType(); @@ -236,16 +236,6 @@ SkMipMap* SkMipMap::Build(const SkBitmap& src, SkDiscardableFactoryProc fact) { return nullptr; } - SkAutoPixmapUnlock srcUnlocker; - if (!src.requestLock(&srcUnlocker)) { - return nullptr; - } - const SkPixmap& srcPixmap = srcUnlocker.pixmap(); - // Try to catch where we might have returned nullptr for src crbug.com/492818 - if (nullptr == srcPixmap.addr()) { - sk_throw(); - } - SkMipMap* mipmap; if (fact) { SkDiscardableMemory* dm = fact(storageSize); @@ -267,17 +257,14 @@ SkMipMap* SkMipMap::Build(const SkBitmap& src, SkDiscardableFactoryProc fact) { int width = src.width(); int height = src.height(); uint32_t rowBytes; - SkPixmap srcPM(srcPixmap); + SkPixmap srcPM(src); for (int i = 0; i < countLevels; ++i) { width >>= 1; height >>= 1; rowBytes = SkToU32(SkColorTypeMinRowBytes(ct, width)); - levels[i].fPixels = addr; - levels[i].fWidth = width; - levels[i].fHeight = height; - levels[i].fRowBytes = rowBytes; + levels[i].fPixmap = SkPixmap(SkImageInfo::Make(width, height, ct, at), addr, rowBytes); levels[i].fScale = (float)width / src.width(); SkPixmap dstPM(SkImageInfo::Make(width, height, ct, at), addr, rowBytes); @@ -487,7 +474,7 @@ size_t SkMipMap::AllocLevelsSize(int levelCount, size_t pixelSize) { return sk_64_asS32(size); } -SkMipMap* SkMipMap::Build(const SkBitmap& src, SkDiscardableFactoryProc fact) { +SkMipMap* SkMipMap::Build(const SkPixmap& src, SkDiscardableFactoryProc fact) { typedef void FilterProc(void*, const void* srcPtr, size_t srcRB, int count); FilterProc* proc_2_2 = nullptr; @@ -555,16 +542,6 @@ SkMipMap* SkMipMap::Build(const SkBitmap& src, SkDiscardableFactoryProc fact) { return nullptr; } - SkAutoPixmapUnlock srcUnlocker; - if (!src.requestLock(&srcUnlocker)) { - return nullptr; - } - const SkPixmap& srcPixmap = srcUnlocker.pixmap(); - // Try to catch where we might have returned nullptr for src crbug.com/492818 - if (nullptr == srcPixmap.addr()) { - sk_throw(); - } - SkMipMap* mipmap; if (fact) { SkDiscardableMemory* dm = fact(storageSize); @@ -586,7 +563,7 @@ SkMipMap* SkMipMap::Build(const SkBitmap& src, SkDiscardableFactoryProc fact) { int width = src.width(); int height = src.height(); uint32_t rowBytes; - SkPixmap srcPM(srcPixmap); + SkPixmap srcPM(src); for (int i = 0; i < countLevels; ++i) { FilterProc* proc; @@ -607,14 +584,10 @@ SkMipMap* SkMipMap::Build(const SkBitmap& src, SkDiscardableFactoryProc fact) { height >>= 1; rowBytes = SkToU32(SkColorTypeMinRowBytes(ct, width)); - levels[i].fPixels = addr; - levels[i].fWidth = width; - levels[i].fHeight = height; - levels[i].fRowBytes = rowBytes; - levels[i].fScale = (float)width / src.width(); - - SkPixmap dstPM(SkImageInfo::Make(width, height, ct, at), addr, rowBytes); + levels[i].fPixmap = SkPixmap(SkImageInfo::Make(width, height, ct, at), addr, rowBytes); + levels[i].fScale = (float)width / src.width(); + const SkPixmap& dstPM = levels[i].fPixmap; const void* srcBasePtr = srcPM.addr(); void* dstBasePtr = dstPM.writable_addr(); @@ -666,3 +639,19 @@ bool SkMipMap::extractLevel(SkScalar scale, Level* levelPtr) const { } return true; } + +// Helper which extacts a pixmap from the src bitmap +// +SkMipMap* SkMipMap::Build(const SkBitmap& src, SkDiscardableFactoryProc fact) { + SkAutoPixmapUnlock srcUnlocker; + if (!src.requestLock(&srcUnlocker)) { + return nullptr; + } + const SkPixmap& srcPixmap = srcUnlocker.pixmap(); + // Try to catch where we might have returned nullptr for src crbug.com/492818 + if (nullptr == srcPixmap.addr()) { + sk_throw(); + } + return Build(srcPixmap, fact); +} + diff --git a/src/core/SkMipMap.h b/src/core/SkMipMap.h index 36c17ba91e..b3e958d63c 100644 --- a/src/core/SkMipMap.h +++ b/src/core/SkMipMap.h @@ -9,6 +9,7 @@ #define SkMipMap_DEFINED #include "SkCachedData.h" +#include "SkPixmap.h" #include "SkScalar.h" class SkBitmap; @@ -18,12 +19,11 @@ typedef SkDiscardableMemory* (*SkDiscardableFactoryProc)(size_t bytes); class SkMipMap : public SkCachedData { public: + static SkMipMap* Build(const SkPixmap& src, SkDiscardableFactoryProc); static SkMipMap* Build(const SkBitmap& src, SkDiscardableFactoryProc); struct Level { - void* fPixels; - uint32_t fRowBytes; - uint32_t fWidth, fHeight; + SkPixmap fPixmap; float fScale; // < 1.0 }; |