michael@0: From: George Wright michael@0: Date: Thu, 25 Apr 2013 20:47:06 -0400 michael@0: Subject: Bug 848491 - Re-apply bug 687188 - Expand the gradient cache by 2 to store 0/1 colour stop values for clamping. michael@0: michael@0: michael@0: diff --git a/gfx/skia/src/effects/gradients/SkGradientShader.cpp b/gfx/skia/src/effects/gradients/SkGradientShader.cpp michael@0: index 684355d..27a9c46 100644 michael@0: --- a/gfx/skia/src/effects/gradients/SkGradientShader.cpp michael@0: +++ b/gfx/skia/src/effects/gradients/SkGradientShader.cpp michael@0: @@ -453,15 +453,15 @@ const uint16_t* SkGradientShaderBase::getCache16() const { michael@0: michael@0: const SkPMColor* SkGradientShaderBase::getCache32() const { michael@0: if (fCache32 == NULL) { michael@0: - // double the count for dither entries michael@0: - const int entryCount = kCache32Count * 4; michael@0: + // double the count for dither entries, and have an extra two entries for clamp values michael@0: + const int entryCount = kCache32Count * 4 + 2; michael@0: const size_t allocSize = sizeof(SkPMColor) * entryCount; michael@0: michael@0: if (NULL == fCache32PixelRef) { michael@0: fCache32PixelRef = SkNEW_ARGS(SkMallocPixelRef, michael@0: (NULL, allocSize, NULL)); michael@0: } michael@0: - fCache32 = (SkPMColor*)fCache32PixelRef->getAddr(); michael@0: + fCache32 = (SkPMColor*)fCache32PixelRef->getAddr() + 1; michael@0: if (fColorCount == 2) { michael@0: Build32bitCache(fCache32, fOrigColors[0], fOrigColors[1], michael@0: kCache32Count, fCacheAlpha); michael@0: @@ -484,7 +484,7 @@ const SkPMColor* SkGradientShaderBase::getCache32() const { michael@0: SkMallocPixelRef* newPR = SkNEW_ARGS(SkMallocPixelRef, michael@0: (NULL, allocSize, NULL)); michael@0: SkPMColor* linear = fCache32; // just computed linear data michael@0: - SkPMColor* mapped = (SkPMColor*)newPR->getAddr(); // storage for mapped data michael@0: + SkPMColor* mapped = (SkPMColor*)newPR->getAddr() + 1; // storage for mapped data michael@0: SkUnitMapper* map = fMapper; michael@0: for (int i = 0; i < kCache32Count; i++) { michael@0: int index = map->mapUnit16((i << 8) | i) >> 8; michael@0: @@ -495,9 +495,21 @@ const SkPMColor* SkGradientShaderBase::getCache32() const { michael@0: } michael@0: fCache32PixelRef->unref(); michael@0: fCache32PixelRef = newPR; michael@0: - fCache32 = (SkPMColor*)newPR->getAddr(); michael@0: + fCache32 = (SkPMColor*)newPR->getAddr() + 1; michael@0: } michael@0: } michael@0: + michael@0: + // Write the clamp colours into the first and last entries of fCache32 michael@0: + fCache32[kCache32ClampLower] = SkPackARGB32(fCacheAlpha, michael@0: + SkColorGetR(fOrigColors[0]), michael@0: + SkColorGetG(fOrigColors[0]), michael@0: + SkColorGetB(fOrigColors[0])); michael@0: + michael@0: + fCache32[kCache32ClampUpper] = SkPackARGB32(fCacheAlpha, michael@0: + SkColorGetR(fOrigColors[fColorCount - 1]), michael@0: + SkColorGetG(fOrigColors[fColorCount - 1]), michael@0: + SkColorGetB(fOrigColors[fColorCount - 1])); michael@0: + michael@0: return fCache32; michael@0: } michael@0: michael@0: diff --git a/gfx/skia/src/effects/gradients/SkGradientShaderPriv.h b/gfx/skia/src/effects/gradients/SkGradientShaderPriv.h michael@0: index 729ce4e..2cb6a9d 100644 michael@0: --- a/gfx/skia/src/effects/gradients/SkGradientShaderPriv.h michael@0: +++ b/gfx/skia/src/effects/gradients/SkGradientShaderPriv.h michael@0: @@ -86,6 +86,9 @@ public: michael@0: /// if dithering is disabled. michael@0: kDitherStride32 = kCache32Count, michael@0: kDitherStride16 = kCache16Count, michael@0: + michael@0: + kCache32ClampLower = -1, michael@0: + kCache32ClampUpper = kCache32Count * 4 michael@0: }; michael@0: michael@0: michael@0: diff --git a/gfx/skia/src/effects/gradients/SkLinearGradient.cpp b/gfx/skia/src/effects/gradients/SkLinearGradient.cpp michael@0: index e0f216c..40ab918 100644 michael@0: --- a/gfx/skia/src/effects/gradients/SkLinearGradient.cpp michael@0: +++ b/gfx/skia/src/effects/gradients/SkLinearGradient.cpp michael@0: @@ -127,6 +127,17 @@ void shadeSpan_linear_vertical_lerp(TileProc proc, SkFixed dx, SkFixed fx, michael@0: SkPMColor* SK_RESTRICT dstC, michael@0: const SkPMColor* SK_RESTRICT cache, michael@0: int toggle, int count) { michael@0: + if (proc == clamp_tileproc) { michael@0: + // No need to lerp or dither for clamp values michael@0: + if (fx < 0) { michael@0: + sk_memset32(dstC, cache[SkGradientShaderBase::kCache32ClampLower], count); michael@0: + return; michael@0: + } else if (fx > 0xffff) { michael@0: + sk_memset32(dstC, cache[SkGradientShaderBase::kCache32ClampUpper], count); michael@0: + return; michael@0: + } michael@0: + } michael@0: + michael@0: // We're a vertical gradient, so no change in a span. michael@0: // If colors change sharply across the gradient, dithering is michael@0: // insufficient (it subsamples the color space) and we need to lerp. michael@0: @@ -154,10 +165,7 @@ void shadeSpan_linear_clamp(TileProc proc, SkFixed dx, SkFixed fx, michael@0: range.init(fx, dx, count, 0, SkGradientShaderBase::kCache32Count - 1); michael@0: michael@0: if ((count = range.fCount0) > 0) { michael@0: - sk_memset32_dither(dstC, michael@0: - cache[toggle + range.fV0], michael@0: - cache[next_dither_toggle(toggle) + range.fV0], michael@0: - count); michael@0: + sk_memset32(dstC, cache[SkGradientShaderBase::kCache32ClampLower], count); michael@0: dstC += count; michael@0: } michael@0: if ((count = range.fCount1) > 0) { michael@0: @@ -176,10 +184,7 @@ void shadeSpan_linear_clamp(TileProc proc, SkFixed dx, SkFixed fx, michael@0: } michael@0: } michael@0: if ((count = range.fCount2) > 0) { michael@0: - sk_memset32_dither(dstC, michael@0: - cache[toggle + range.fV1], michael@0: - cache[next_dither_toggle(toggle) + range.fV1], michael@0: - count); michael@0: + sk_memset32(dstC, cache[SkGradientShaderBase::kCache32ClampUpper], count); michael@0: } michael@0: } michael@0: michael@0: diff --git a/gfx/skia/src/effects/gradients/SkTwoPointConicalGradient.cpp b/gfx/skia/src/effects/gradients/SkTwoPointConicalGradient.cpp michael@0: index abd974b..601fff4 100644 michael@0: --- a/gfx/skia/src/effects/gradients/SkTwoPointConicalGradient.cpp michael@0: +++ b/gfx/skia/src/effects/gradients/SkTwoPointConicalGradient.cpp michael@0: @@ -124,10 +124,14 @@ static void twopoint_clamp(TwoPtRadial* rec, SkPMColor* SK_RESTRICT dstC, michael@0: if (TwoPtRadial::DontDrawT(t)) { michael@0: *dstC++ = 0; michael@0: } else { michael@0: - SkFixed index = SkClampMax(t, 0xFFFF); michael@0: - SkASSERT(index <= 0xFFFF); michael@0: - *dstC++ = cache[toggle + michael@0: - (index >> SkGradientShaderBase::kCache32Shift)]; michael@0: + if (t < 0) { michael@0: + *dstC++ = cache[SkGradientShaderBase::kCache32ClampLower]; michael@0: + } else if (t > 0xFFFF) { michael@0: + *dstC++ = cache[SkGradientShaderBase::kCache32ClampUpper]; michael@0: + } else { michael@0: + SkASSERT(t <= 0xFFFF); michael@0: + *dstC++ = cache[t >> SkGradientShaderBase::kCache32Shift]; michael@0: + } michael@0: } michael@0: toggle = next_dither_toggle(toggle); michael@0: } michael@0: diff --git a/gfx/skia/src/effects/gradients/SkTwoPointRadialGradient.cpp b/gfx/skia/src/effects/gradients/SkTwoPointRadialGradient.cpp michael@0: index f70b67d..ec2ae75 100644 michael@0: --- a/gfx/skia/src/effects/gradients/SkTwoPointRadialGradient.cpp michael@0: +++ b/gfx/skia/src/effects/gradients/SkTwoPointRadialGradient.cpp michael@0: @@ -120,9 +120,14 @@ void shadeSpan_twopoint_clamp(SkScalar fx, SkScalar dx, michael@0: for (; count > 0; --count) { michael@0: SkFixed t = two_point_radial(b, fx, fy, fSr2D2, foura, michael@0: fOneOverTwoA, posRoot); michael@0: - SkFixed index = SkClampMax(t, 0xFFFF); michael@0: - SkASSERT(index <= 0xFFFF); michael@0: - *dstC++ = cache[index >> SkGradientShaderBase::kCache32Shift]; michael@0: + if (t < 0) { michael@0: + *dstC++ = cache[SkGradientShaderBase::kCache32ClampLower]; michael@0: + } else if (t > 0xFFFF) { michael@0: + *dstC++ = cache[SkGradientShaderBase::kCache32ClampUpper]; michael@0: + } else { michael@0: + SkASSERT(t <= 0xFFFF); michael@0: + *dstC++ = cache[t >> SkGradientShaderBase::kCache32Shift]; michael@0: + } michael@0: fx += dx; michael@0: fy += dy; michael@0: b += db; michael@0: -- michael@0: 1.7.11.7 michael@0: