diff options
| author |  reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-02-04 21:03:11 +0000 |
|---|---|---|
| committer | reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-02-04 21:03:11 +0000 |
| commit | ae97c065d35cc837dc83979b04df2b5c35de2141 (patch) | |
| tree | c98b5887f9688ad964fcec5ae08aad2e9fb704a2 | |
| parent | 394c8854b3fc8949ae87408471fc517645302d64 (diff) | |
remove vestiges of 32BIT_GRADIENT flag, as we always dither gradients now
(even in chrome)
Review URL: https://codereview.appspot.com/7281049
git-svn-id: http://skia.googlecode.com/svn/trunk@7558 2bbb7eff-a529-9590-31e7-b0007b416f81
| -rw-r--r-- | src/effects/gradients/SkGradientShaderPriv.h | 8 | ||||
| -rw-r--r-- | src/effects/gradients/SkLinearGradient.cpp | 4 | ||||
| -rw-r--r-- | src/effects/gradients/SkRadialGradient.cpp | 4 |
3 files changed, 0 insertions, 16 deletions
diff --git a/src/effects/gradients/SkGradientShaderPriv.h b/src/effects/gradients/SkGradientShaderPriv.h index 82535de5d3..464c7396c8 100644 --- a/src/effects/gradients/SkGradientShaderPriv.h +++ b/src/effects/gradients/SkGradientShaderPriv.h @@ -21,10 +21,6 @@ #define SK_IGNORE_GRADIENT_DITHER_FIX -#ifndef SK_DISABLE_DITHER_32BIT_GRADIENT - #define USE_DITHER_32BIT_GRADIENT -#endif - static inline void sk_memset32_dither(uint32_t dst[], uint32_t v0, uint32_t v1, int count) { if (count > 0) { @@ -115,11 +111,7 @@ public: /// This value is used to *read* the dither cache; it may be 0 /// if dithering is disabled. -#ifdef USE_DITHER_32BIT_GRADIENT kDitherStride32 = kCache32Count, -#else - kDitherStride32 = 0, -#endif kDitherStride16 = kCache16Count, }; diff --git a/src/effects/gradients/SkLinearGradient.cpp b/src/effects/gradients/SkLinearGradient.cpp index 059cc93493..16a1168647 100644 --- a/src/effects/gradients/SkLinearGradient.cpp +++ b/src/effects/gradients/SkLinearGradient.cpp @@ -223,11 +223,7 @@ void SkLinearGradient::shadeSpan(int x, int y, SkPMColor* SK_RESTRICT dstC, SkMatrix::MapXYProc dstProc = fDstToIndexProc; TileProc proc = fTileProc; const SkPMColor* SK_RESTRICT cache = this->getCache32(); -#ifdef USE_DITHER_32BIT_GRADIENT int toggle = init_dither_toggle(x, y); -#else - int toggle = 0; -#endif if (fDstToIndexClass != kPerspective_MatrixClass) { dstProc(fDstToIndex, SkIntToScalar(x) + SK_ScalarHalf, diff --git a/src/effects/gradients/SkRadialGradient.cpp b/src/effects/gradients/SkRadialGradient.cpp index fdca340f3a..07f1c19715 100644 --- a/src/effects/gradients/SkRadialGradient.cpp +++ b/src/effects/gradients/SkRadialGradient.cpp @@ -424,11 +424,7 @@ void SkRadialGradient::shadeSpan(int x, int y, SkMatrix::MapXYProc dstProc = fDstToIndexProc; TileProc proc = fTileProc; const SkPMColor* SK_RESTRICT cache = this->getCache32(); -#ifdef USE_DITHER_32BIT_GRADIENT int toggle = init_dither_toggle(x, y); -#else - int toggle = 0; -#endif if (fDstToIndexClass != kPerspective_MatrixClass) { dstProc(fDstToIndex, SkIntToScalar(x) + SK_ScalarHalf, |