diff options
author | 2016-09-15 08:40:21 -0700 | |
---|---|---|
committer | 2016-09-15 08:40:21 -0700 | |
commit | 93110a84aad00f91dd2eb128279f4b9586fe7a11 (patch) | |
tree | 80bdddb831f400b82af59bb997ec63f18914cb77 /src/effects/gradients/SkGradientShader.cpp | |
parent | 9f1f6e2c28066c7d7ff26727ce7d7504c7d032bd (diff) |
Remove the unused 16-bit gradient cache
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2343863002
Review-Url: https://codereview.chromium.org/2343863002
Diffstat (limited to 'src/effects/gradients/SkGradientShader.cpp')
-rw-r--r-- | src/effects/gradients/SkGradientShader.cpp | 89 |
1 files changed, 1 insertions, 88 deletions
diff --git a/src/effects/gradients/SkGradientShader.cpp b/src/effects/gradients/SkGradientShader.cpp index 14e67842b3..8f07419da5 100644 --- a/src/effects/gradients/SkGradientShader.cpp +++ b/src/effects/gradients/SkGradientShader.cpp @@ -306,69 +306,15 @@ SkGradientShaderBase::GradientShaderCache::GradientShaderCache( , fCacheDither(dither) , fShader(shader) { - // Only initialize the cache in getCache16/32. - fCache16 = nullptr; + // Only initialize the cache in getCache32. fCache32 = nullptr; - fCache16Storage = nullptr; fCache32PixelRef = nullptr; } SkGradientShaderBase::GradientShaderCache::~GradientShaderCache() { - sk_free(fCache16Storage); SkSafeUnref(fCache32PixelRef); } -#define Fixed_To_Dot8(x) (((x) + 0x80) >> 8) - -/** We take the original colors, not our premultiplied PMColors, since we can - build a 16bit table as long as the original colors are opaque, even if the - paint specifies a non-opaque alpha. -*/ -void SkGradientShaderBase::GradientShaderCache::Build16bitCache( - uint16_t cache[], SkColor c0, SkColor c1, int count, bool dither) { - SkASSERT(count > 1); - SkASSERT(SkColorGetA(c0) == 0xFF); - SkASSERT(SkColorGetA(c1) == 0xFF); - - SkFixed r = SkColorGetR(c0); - SkFixed g = SkColorGetG(c0); - SkFixed b = SkColorGetB(c0); - - SkFixed dr = SkIntToFixed(SkColorGetR(c1) - r) / (count - 1); - SkFixed dg = SkIntToFixed(SkColorGetG(c1) - g) / (count - 1); - SkFixed db = SkIntToFixed(SkColorGetB(c1) - b) / (count - 1); - - r = SkIntToFixed(r) + 0x8000; - g = SkIntToFixed(g) + 0x8000; - b = SkIntToFixed(b) + 0x8000; - - if (dither) { - do { - unsigned rr = r >> 16; - unsigned gg = g >> 16; - unsigned bb = b >> 16; - cache[0] = SkPackRGB16(SkR32ToR16(rr), SkG32ToG16(gg), SkB32ToB16(bb)); - cache[kCache16Count] = SkDitherPack888ToRGB16(rr, gg, bb); - cache += 1; - r += dr; - g += dg; - b += db; - } while (--count != 0); - } else { - do { - unsigned rr = r >> 16; - unsigned gg = g >> 16; - unsigned bb = b >> 16; - cache[0] = SkPackRGB16(SkR32ToR16(rr), SkG32ToG16(gg), SkB32ToB16(bb)); - cache[kCache16Count] = cache[0]; - cache += 1; - r += dr; - g += dg; - b += db; - } while (--count != 0); - } -} - /* * r,g,b used to be SkFixed, but on gcc (4.2.1 mac and 4.6.3 goobuntu) in * release builds, we saw a compiler error where the 0xFF parameter in @@ -525,39 +471,6 @@ static inline int SkFixedToFFFF(SkFixed x) { return x - (x >> 16); } -const uint16_t* SkGradientShaderBase::GradientShaderCache::getCache16() { - fCache16InitOnce(SkGradientShaderBase::GradientShaderCache::initCache16, this); - SkASSERT(fCache16); - return fCache16; -} - -void SkGradientShaderBase::GradientShaderCache::initCache16(GradientShaderCache* cache) { - // double the count for dither entries - const int entryCount = kCache16Count * 2; - const size_t allocSize = sizeof(uint16_t) * entryCount; - - SkASSERT(nullptr == cache->fCache16Storage); - cache->fCache16Storage = (uint16_t*)sk_malloc_throw(allocSize); - cache->fCache16 = cache->fCache16Storage; - if (cache->fShader.fColorCount == 2) { - Build16bitCache(cache->fCache16, cache->fShader.fOrigColors[0], - cache->fShader.fOrigColors[1], kCache16Count, cache->fCacheDither); - } else { - Rec* rec = cache->fShader.fRecs; - int prevIndex = 0; - for (int i = 1; i < cache->fShader.fColorCount; i++) { - int nextIndex = SkFixedToFFFF(rec[i].fPos) >> kCache16Shift; - SkASSERT(nextIndex < kCache16Count); - - if (nextIndex > prevIndex) - Build16bitCache(cache->fCache16 + prevIndex, cache->fShader.fOrigColors[i-1], - cache->fShader.fOrigColors[i], nextIndex - prevIndex + 1, - cache->fCacheDither); - prevIndex = nextIndex; - } - } -} - const SkPMColor* SkGradientShaderBase::GradientShaderCache::getCache32() { fCache32InitOnce(SkGradientShaderBase::GradientShaderCache::initCache32, this); SkASSERT(fCache32); |