diff options
| -rw-r--r-- | gyp/core.gypi | 2 | ||||
| -rw-r--r-- | include/effects/SkPerlinNoiseShader.h | 1 | ||||
| -rw-r--r-- | src/core/SkDither.h (renamed from include/core/SkDither.h) | 0 | ||||
| -rw-r--r-- | src/effects/SkPerlinNoiseShader.cpp | 14 |
4 files changed, 1 insertions, 16 deletions
diff --git a/gyp/core.gypi b/gyp/core.gypi index 050477cd73..9be95429f3 100644 --- a/gyp/core.gypi +++ b/gyp/core.gypi @@ -94,6 +94,7 @@ '<(skia_src_path)/core/SkDistanceFieldGen.cpp', '<(skia_src_path)/core/SkDistanceFieldGen.h', '<(skia_src_path)/core/SkDither.cpp', + '<(skia_src_path)/core/SkDither.h', '<(skia_src_path)/core/SkDraw.cpp', '<(skia_src_path)/core/SkDrawable.cpp', '<(skia_src_path)/core/SkDrawLooper.cpp', @@ -328,7 +329,6 @@ '<(skia_include_path)/core/SkData.h', '<(skia_include_path)/core/SkDeque.h', '<(skia_include_path)/core/SkDevice.h', - '<(skia_include_path)/core/SkDither.h', '<(skia_include_path)/core/SkDraw.h', '<(skia_include_path)/core/SkDrawable.h', '<(skia_include_path)/core/SkDrawFilter.h', diff --git a/include/effects/SkPerlinNoiseShader.h b/include/effects/SkPerlinNoiseShader.h index 0cb1b47a9f..ec7c08c8ea 100644 --- a/include/effects/SkPerlinNoiseShader.h +++ b/include/effects/SkPerlinNoiseShader.h @@ -80,7 +80,6 @@ public: virtual ~PerlinNoiseShaderContext(); void shadeSpan(int x, int y, SkPMColor[], int count) override; - void shadeSpan16(int x, int y, uint16_t[], int count) override; private: SkPMColor shade(const SkPoint& point, StitchData& stitchData) const; diff --git a/include/core/SkDither.h b/src/core/SkDither.h index d82b4167b5..d82b4167b5 100644 --- a/include/core/SkDither.h +++ b/src/core/SkDither.h diff --git a/src/effects/SkPerlinNoiseShader.cpp b/src/effects/SkPerlinNoiseShader.cpp index 51d84989a8..60e96017b2 100644 --- a/src/effects/SkPerlinNoiseShader.cpp +++ b/src/effects/SkPerlinNoiseShader.cpp @@ -5,7 +5,6 @@ * found in the LICENSE file. */ -#include "SkDither.h" #include "SkPerlinNoiseShader.h" #include "SkColorFilter.h" #include "SkReadBuffer.h" @@ -467,19 +466,6 @@ void SkPerlinNoiseShader::PerlinNoiseShaderContext::shadeSpan( } } -void SkPerlinNoiseShader::PerlinNoiseShaderContext::shadeSpan16( - int x, int y, uint16_t result[], int count) { - SkPoint point = SkPoint::Make(SkIntToScalar(x), SkIntToScalar(y)); - StitchData stitchData; - DITHER_565_SCAN(y); - for (int i = 0; i < count; ++i) { - unsigned dither = DITHER_VALUE(x); - result[i] = SkDitherRGB32To565(shade(point, stitchData), dither); - DITHER_INC_X(x); - point.fX += SK_Scalar1; - } -} - ///////////////////////////////////////////////////////////////////// #if SK_SUPPORT_GPU |