diff options
author | mtklein <mtklein@chromium.org> | 2014-12-01 10:23:11 -0800 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2014-12-01 10:23:11 -0800 |
commit | 52c293547b973f7fb5de3c83f5062b07d759ab88 (patch) | |
tree | fab64afa678274991465ddde70f44e8fdca88c2e /src/opts | |
parent | 01d6e5f462d1d52203ee1a6660415877e4cf2dde (diff) |
Remove SK_SUPPORT_LEGACY_DEEPFLATTENING.
This was needed for pictures before v33, and we're now requiring v35+.
Will follow up with the same for skia/ext/pixel_ref_utils_unittest.cc
BUG=skia:
Review URL: https://codereview.chromium.org/769953002
Diffstat (limited to 'src/opts')
-rw-r--r-- | src/opts/SkXfermode_opts_SSE2.cpp | 7 | ||||
-rw-r--r-- | src/opts/SkXfermode_opts_SSE2.h | 4 | ||||
-rw-r--r-- | src/opts/SkXfermode_opts_arm_neon.cpp | 6 | ||||
-rw-r--r-- | src/opts/SkXfermode_opts_arm_neon.h | 4 |
4 files changed, 0 insertions, 21 deletions
diff --git a/src/opts/SkXfermode_opts_SSE2.cpp b/src/opts/SkXfermode_opts_SSE2.cpp index 02ca0382dd..fccf665147 100644 --- a/src/opts/SkXfermode_opts_SSE2.cpp +++ b/src/opts/SkXfermode_opts_SSE2.cpp @@ -641,13 +641,6 @@ typedef __m128i (*SkXfermodeProcSIMD)(const __m128i& src, const __m128i& dst); extern SkXfermodeProcSIMD gSSE2XfermodeProcs[]; -#ifdef SK_SUPPORT_LEGACY_DEEPFLATTENING -SkSSE2ProcCoeffXfermode::SkSSE2ProcCoeffXfermode(SkReadBuffer& buffer) : INHERITED(buffer) { - fProcSIMD = reinterpret_cast<void*>(gSSE2XfermodeProcs[this->getMode()]); - buffer.validate(fProcSIMD != NULL); -} -#endif - void SkSSE2ProcCoeffXfermode::xfer32(SkPMColor dst[], const SkPMColor src[], int count, const SkAlpha aa[]) const { SkASSERT(dst && src && count >= 0); diff --git a/src/opts/SkXfermode_opts_SSE2.h b/src/opts/SkXfermode_opts_SSE2.h index 8512aee094..7ccce488fd 100644 --- a/src/opts/SkXfermode_opts_SSE2.h +++ b/src/opts/SkXfermode_opts_SSE2.h @@ -25,10 +25,6 @@ public: SK_TO_STRING_OVERRIDE() private: -#ifdef SK_SUPPORT_LEGACY_DEEPFLATTENING - SkSSE2ProcCoeffXfermode(SkReadBuffer& buffer); -#endif - void* fProcSIMD; typedef SkProcCoeffXfermode INHERITED; }; diff --git a/src/opts/SkXfermode_opts_arm_neon.cpp b/src/opts/SkXfermode_opts_arm_neon.cpp index dca58eb53e..7534c986ca 100644 --- a/src/opts/SkXfermode_opts_arm_neon.cpp +++ b/src/opts/SkXfermode_opts_arm_neon.cpp @@ -743,12 +743,6 @@ typedef uint8x8x4_t (*SkXfermodeProcSIMD)(uint8x8x4_t src, uint8x8x4_t dst); extern SkXfermodeProcSIMD gNEONXfermodeProcs[]; -#ifdef SK_SUPPORT_LEGACY_DEEPFLATTENING -SkNEONProcCoeffXfermode::SkNEONProcCoeffXfermode(SkReadBuffer& buffer) : INHERITED(buffer) { - fProcSIMD = reinterpret_cast<void*>(gNEONXfermodeProcs[this->getMode()]); -} -#endif - void SkNEONProcCoeffXfermode::xfer32(SkPMColor* SK_RESTRICT dst, const SkPMColor* SK_RESTRICT src, int count, const SkAlpha* SK_RESTRICT aa) const { diff --git a/src/opts/SkXfermode_opts_arm_neon.h b/src/opts/SkXfermode_opts_arm_neon.h index 745bfe260c..f091432d88 100644 --- a/src/opts/SkXfermode_opts_arm_neon.h +++ b/src/opts/SkXfermode_opts_arm_neon.h @@ -17,10 +17,6 @@ public: SK_TO_STRING_OVERRIDE() private: -#ifdef SK_SUPPORT_LEGACY_DEEPFLATTENING - SkNEONProcCoeffXfermode(SkReadBuffer& buffer); -#endif - // void* is used to avoid pulling arm_neon.h in the core and having to build // it with -mfpu=neon. void* fProcSIMD; |