diff options
author | Cary Clark <caryclark@skia.org> | 2017-09-15 11:59:23 -0400 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-09-15 16:31:35 +0000 |
commit | a4083c97d48e8a4f88e2797d7363f141e3d42553 (patch) | |
tree | ab01d3982edcf50b7d69dc3e4475568964daa5fe /src/opts | |
parent | 3bf6366c6fc5d619358458e50909b60deb4cfe4a (diff) |
make most of SkColorPriv.h private
created new file src/core/SkColorData.h for
internal consumption. Note that many of the
functions there are unused as well.
Bug: skia: 6898
R: reed@google.com
Change-Id: I25bfd5a9c21f53558c4ca65a77eb5d322d897c6d
Reviewed-on: https://skia-review.googlesource.com/46848
Commit-Queue: Cary Clark <caryclark@google.com>
Reviewed-by: Mike Reed <reed@google.com>
Diffstat (limited to 'src/opts')
-rw-r--r-- | src/opts/SkBitmapProcState_arm_neon.cpp | 2 | ||||
-rw-r--r-- | src/opts/SkBitmapProcState_filter_neon.h | 2 | ||||
-rw-r--r-- | src/opts/SkBitmapProcState_opts_SSE2.cpp | 2 | ||||
-rw-r--r-- | src/opts/SkBitmapProcState_opts_SSSE3.cpp | 2 | ||||
-rw-r--r-- | src/opts/SkBlitMask_opts_arm.cpp | 2 | ||||
-rw-r--r-- | src/opts/SkBlitRow_opts.h | 2 | ||||
-rw-r--r-- | src/opts/SkBlitRow_opts_SSE2.cpp | 2 | ||||
-rw-r--r-- | src/opts/SkBlitRow_opts_arm_neon.cpp | 2 | ||||
-rw-r--r-- | src/opts/SkBlurImageFilter_opts.h | 2 | ||||
-rw-r--r-- | src/opts/SkColor_opts_SSE2.h | 8 | ||||
-rw-r--r-- | src/opts/SkColor_opts_neon.h | 2 | ||||
-rw-r--r-- | src/opts/SkSwizzler_opts.h | 2 |
12 files changed, 15 insertions, 15 deletions
diff --git a/src/opts/SkBitmapProcState_arm_neon.cpp b/src/opts/SkBitmapProcState_arm_neon.cpp index 51dbb5cf50..b954d8512a 100644 --- a/src/opts/SkBitmapProcState_arm_neon.cpp +++ b/src/opts/SkBitmapProcState_arm_neon.cpp @@ -7,7 +7,7 @@ #include "SkBitmapProcState.h" #include "SkBitmapProcState_filter.h" -#include "SkColorPriv.h" +#include "SkColorData.h" #include "SkPaint.h" #include "SkShader.h" // for tilemodes #include "SkUtilsArm.h" diff --git a/src/opts/SkBitmapProcState_filter_neon.h b/src/opts/SkBitmapProcState_filter_neon.h index 5cf0ac4622..5352ce41e5 100644 --- a/src/opts/SkBitmapProcState_filter_neon.h +++ b/src/opts/SkBitmapProcState_filter_neon.h @@ -6,7 +6,7 @@ */ #include <arm_neon.h> -#include "SkColorPriv.h" +#include "SkColorData.h" /* * Filter_32_opaque diff --git a/src/opts/SkBitmapProcState_opts_SSE2.cpp b/src/opts/SkBitmapProcState_opts_SSE2.cpp index 6a739dc1be..d0b93503a9 100644 --- a/src/opts/SkBitmapProcState_opts_SSE2.cpp +++ b/src/opts/SkBitmapProcState_opts_SSE2.cpp @@ -8,7 +8,7 @@ #include <emmintrin.h> #include "SkBitmapProcState_opts_SSE2.h" #include "SkBitmapProcState_utils.h" -#include "SkColorPriv.h" +#include "SkColorData.h" #include "SkPaint.h" #include "SkUtils.h" diff --git a/src/opts/SkBitmapProcState_opts_SSSE3.cpp b/src/opts/SkBitmapProcState_opts_SSSE3.cpp index 7890e8a4c6..baabe69510 100644 --- a/src/opts/SkBitmapProcState_opts_SSSE3.cpp +++ b/src/opts/SkBitmapProcState_opts_SSSE3.cpp @@ -6,7 +6,7 @@ */ #include "SkBitmapProcState_opts_SSSE3.h" -#include "SkColorPriv.h" +#include "SkColorData.h" #include "SkPaint.h" #include "SkUtils.h" diff --git a/src/opts/SkBlitMask_opts_arm.cpp b/src/opts/SkBlitMask_opts_arm.cpp index c5a9ea4f3e..f283ac8396 100644 --- a/src/opts/SkBlitMask_opts_arm.cpp +++ b/src/opts/SkBlitMask_opts_arm.cpp @@ -6,7 +6,7 @@ */ #include "SkColor.h" -#include "SkColorPriv.h" +#include "SkColorData.h" #include "SkBlitMask.h" #include "SkUtilsArm.h" #include "SkBlitMask_opts_arm_neon.h" diff --git a/src/opts/SkBlitRow_opts.h b/src/opts/SkBlitRow_opts.h index 3cf858527b..b35849263b 100644 --- a/src/opts/SkBlitRow_opts.h +++ b/src/opts/SkBlitRow_opts.h @@ -9,7 +9,7 @@ #define SkBlitRow_opts_DEFINED #include "Sk4px.h" -#include "SkColorPriv.h" +#include "SkColorData.h" #include "SkMSAN.h" #if SK_CPU_SSE_LEVEL >= SK_CPU_SSE_LEVEL_SSE2 diff --git a/src/opts/SkBlitRow_opts_SSE2.cpp b/src/opts/SkBlitRow_opts_SSE2.cpp index 7f03907d1c..d0ba5f5a54 100644 --- a/src/opts/SkBlitRow_opts_SSE2.cpp +++ b/src/opts/SkBlitRow_opts_SSE2.cpp @@ -8,7 +8,7 @@ #include <emmintrin.h> #include "SkBitmapProcState_opts_SSE2.h" #include "SkBlitRow_opts_SSE2.h" -#include "SkColorPriv.h" +#include "SkColorData.h" #include "SkColor_opts_SSE2.h" #include "SkDither.h" #include "SkMSAN.h" diff --git a/src/opts/SkBlitRow_opts_arm_neon.cpp b/src/opts/SkBlitRow_opts_arm_neon.cpp index 7a9534ca84..530eac5693 100644 --- a/src/opts/SkBlitRow_opts_arm_neon.cpp +++ b/src/opts/SkBlitRow_opts_arm_neon.cpp @@ -9,7 +9,7 @@ #include "SkBlitMask.h" #include "SkBlitRow.h" -#include "SkColorPriv.h" +#include "SkColorData.h" #include "SkDither.h" #include "SkMathPriv.h" #include "SkUtils.h" diff --git a/src/opts/SkBlurImageFilter_opts.h b/src/opts/SkBlurImageFilter_opts.h index b6b429816c..08c2121778 100644 --- a/src/opts/SkBlurImageFilter_opts.h +++ b/src/opts/SkBlurImageFilter_opts.h @@ -8,7 +8,7 @@ #ifndef SkBlurImageFilter_opts_DEFINED #define SkBlurImageFilter_opts_DEFINED -#include "SkColorPriv.h" +#include "SkColorData.h" #include "SkRect.h" #if SK_CPU_SSE_LEVEL >= SK_CPU_SSE_LEVEL_SSE2 diff --git a/src/opts/SkColor_opts_SSE2.h b/src/opts/SkColor_opts_SSE2.h index 5453f20d4b..d998ed50b8 100644 --- a/src/opts/SkColor_opts_SSE2.h +++ b/src/opts/SkColor_opts_SSE2.h @@ -42,7 +42,7 @@ static inline __m128i SkAlphaMulAlpha_SSE2(const __m128i& a, return prod; } -// Portable version SkAlphaMulQ is in SkColorPriv.h. +// Portable version SkAlphaMulQ is in SkColorData.h. static inline __m128i SkAlphaMulQ_SSE2(const __m128i& c, const __m128i& scale) { const __m128i mask = _mm_set1_epi32(0xFF00FF); __m128i s = _mm_or_si128(_mm_slli_epi32(scale, 16), scale); @@ -80,7 +80,7 @@ static inline __m128i SkAlphaMulQ_SSE2(const __m128i& c, const unsigned scale) { return _mm_or_si128(rb, ag); } -// Portable version SkFastFourByteInterp256 is in SkColorPriv.h. +// Portable version SkFastFourByteInterp256 is in SkColorData.h. static inline __m128i SkFastFourByteInterp256_SSE2(const __m128i& src, const __m128i& dst, const unsigned src_scale) { // Computes dst + (((src - dst)*src_scale)>>8) const __m128i mask = _mm_set1_epi32(0x00FF00FF); @@ -107,7 +107,7 @@ static inline __m128i SkFastFourByteInterp256_SSE2(const __m128i& src, const __m return _mm_add_epi8(dst, diff); } -// Portable version SkPMLerp is in SkColorPriv.h +// Portable version SkPMLerp is in SkColorData.h static inline __m128i SkPMLerp_SSE2(const __m128i& src, const __m128i& dst, const unsigned scale) { return SkFastFourByteInterp256_SSE2(src, dst, scale); } @@ -238,7 +238,7 @@ static inline __m128i SkPixel32ToPixel16_ToU16_SSE2(const __m128i& src_pixel1, return d_pixel; } -// Portable version is SkPMSrcOver in SkColorPriv.h. +// Portable version is SkPMSrcOver in SkColorData.h. static inline __m128i SkPMSrcOver_SSE2(const __m128i& src, const __m128i& dst) { return _mm_add_epi32(src, SkAlphaMulQ_SSE2(dst, _mm_sub_epi32(_mm_set1_epi32(256), diff --git a/src/opts/SkColor_opts_neon.h b/src/opts/SkColor_opts_neon.h index c316ab4031..ca00301148 100644 --- a/src/opts/SkColor_opts_neon.h +++ b/src/opts/SkColor_opts_neon.h @@ -9,7 +9,7 @@ #define SkColor_opts_neon_DEFINED #include "SkTypes.h" -#include "SkColorPriv.h" +#include "SkColorData.h" #include <arm_neon.h> diff --git a/src/opts/SkSwizzler_opts.h b/src/opts/SkSwizzler_opts.h index 4d9da5cc8d..699b11cb16 100644 --- a/src/opts/SkSwizzler_opts.h +++ b/src/opts/SkSwizzler_opts.h @@ -8,7 +8,7 @@ #ifndef SkSwizzler_opts_DEFINED #define SkSwizzler_opts_DEFINED -#include "SkColorPriv.h" +#include "SkColorData.h" #if SK_CPU_SSE_LEVEL >= SK_CPU_SSE_LEVEL_SSSE3 #include <immintrin.h> |