diff options
| author |  reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2011-04-18 12:43:32 +0000 |
|---|---|---|
| committer | reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2011-04-18 12:43:32 +0000 |
| commit | 17705075b1ca4247f5e712e231c86b19aae3e6ed (patch) | |
| tree | 18a4dbed6ac7ecad61b9de358520d702d0f94120 /src/effects | |
| parent | 77bcaa324a574584331322d98768582d9232f7fc (diff) | |
disable fast linear until we handle the overflow cases
git-svn-id: http://skia.googlecode.com/svn/trunk@1143 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src/effects')
| -rw-r--r-- | src/effects/SkGradientShader.cpp | 40 |
1 files changed, 22 insertions, 18 deletions
diff --git a/src/effects/SkGradientShader.cpp b/src/effects/SkGradientShader.cpp index 84d7440a3d..b0e85f93e4 100644 --- a/src/effects/SkGradientShader.cpp +++ b/src/effects/SkGradientShader.cpp @@ -27,6 +27,9 @@ #define USE_DITHER_32BIT_GRADIENT #endif +#define SK_ENABLE_FAST_LINEAR_GRADIENTS + +#ifdef SK_ENABLE_FAST_LINEAR_GRADIENTS static void sk_memset32_dither(uint32_t dst[], uint32_t v0, uint32_t v1, int count) { if (count > 0) { @@ -44,6 +47,7 @@ static void sk_memset32_dither(uint32_t dst[], uint32_t v0, uint32_t v1, } } } +#endif /////////////////////////////////////////////////////////////////////////////// @@ -858,15 +862,7 @@ void Linear_Gradient::shadeSpan(int x, int y, SkPMColor dstC[], int count) { // TODO: dither version sk_memset32(dstC, cache[fi >> (16 - kCache32Bits)], count); } else if (proc == clamp_tileproc) { -#if 0 - do { - unsigned fi = SkClampMax(fx >> 8, 0xFF); - SkASSERT(fi <= 0xFF); - fx += dx; - *dstC++ = cache[toggle + fi]; - toggle ^= TOGGLE_MASK; - } while (--count != 0); -#else +#ifdef SK_ENABLE_FAST_LINEAR_GRADIENTS SkClampRange range; range.init(fx, dx, count, 0, 0xFF); @@ -898,6 +894,14 @@ void Linear_Gradient::shadeSpan(int x, int y, SkPMColor dstC[], int count) { cache[(toggle ^ TOGGLE_MASK) + range.fV1], count); } +#else + do { + unsigned fi = SkClampMax(fx >> 8, 0xFF); + SkASSERT(fi <= 0xFF); + fx += dx; + *dstC++ = cache[toggle + fi]; + toggle ^= TOGGLE_MASK; + } while (--count != 0); #endif } else if (proc == mirror_tileproc) { do { @@ -1012,15 +1016,7 @@ void Linear_Gradient::shadeSpan16(int x, int y, uint16_t dstC[], int count) { dither_memset16(dstC, cache[toggle + fi], cache[(toggle ^ TOGGLE_MASK) + fi], count); } else if (proc == clamp_tileproc) { -#if 0 - do { - unsigned fi = SkClampMax(fx >> kCache16Shift, kCache16Mask); - SkASSERT(fi <= kCache16Mask); - fx += dx; - *dstC++ = cache[toggle + fi]; - toggle ^= TOGGLE_MASK; - } while (--count != 0); -#else +#ifdef SK_ENABLE_FAST_LINEAR_GRADIENTS SkClampRange range; range.init(fx, dx, count, 0, kCache16Mask); @@ -1052,6 +1048,14 @@ void Linear_Gradient::shadeSpan16(int x, int y, uint16_t dstC[], int count) { cache[(toggle ^ TOGGLE_MASK) + range.fV1], count); } +#else + do { + unsigned fi = SkClampMax(fx >> kCache16Shift, kCache16Mask); + SkASSERT(fi <= kCache16Mask); + fx += dx; + *dstC++ = cache[toggle + fi]; + toggle ^= TOGGLE_MASK; + } while (--count != 0); #endif } else if (proc == mirror_tileproc) { do { |