From 498856ebc6f22d7018071bd6696756d7cd077ab8 Mon Sep 17 00:00:00 2001 From: mtklein Date: Mon, 27 Apr 2015 14:17:37 -0700 Subject: Revert of De-proc Color32 (patchset #4 id:60001 of https://codereview.chromium.org/1104183004/) Reason for revert: MIPS Original issue's description: > De-proc Color32 > > Also strips SK_SUPPORT_LEGACY_COLOR32_MATH, > which is no longer needed. > > Seems handy to have SkTypes include the relevant intrinsics when > we know we've got them, but I'm not married to it. > > Locally this looks like a pointlessly small perf win, but I'm mostly > keen to get all the code together. > > BUG=skia: > > Committed: https://skia.googlesource.com/skia/+/376e9bc206b69d9190f38dfebb132a8769bbd72b TBR=reed@google.com,mtklein@chromium.org NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=skia: Review URL: https://codereview.chromium.org/1108163002 --- include/core/SkBlitRow.h | 9 +++++++++ include/core/SkTypes.h | 6 ------ 2 files changed, 9 insertions(+), 6 deletions(-) (limited to 'include') diff --git a/include/core/SkBlitRow.h b/include/core/SkBlitRow.h index 56121eba78..89aa214913 100644 --- a/include/core/SkBlitRow.h +++ b/include/core/SkBlitRow.h @@ -64,12 +64,20 @@ public: static Proc32 Factory32(unsigned flags32); + /** Function pointer that blends a single color with a row of 32-bit colors + onto a 32-bit destination + */ + typedef void (*ColorProc)(SkPMColor dst[], const SkPMColor src[], int count, SkPMColor color); + /** Blend a single color onto a row of S32 pixels, writing the result into a row of D32 pixels. src and dst may be the same memory, but if they are not, they may not overlap. */ static void Color32(SkPMColor dst[], const SkPMColor src[], int count, SkPMColor color); + //! Public entry-point to return a blit function ptr + static ColorProc ColorProcFactory(); + /** These static functions are called by the Factory and Factory32 functions, and should return either NULL, or a platform-specific function-ptr to be used in place of the @@ -77,6 +85,7 @@ public: */ static Proc32 PlatformProcs32(unsigned flags); + static ColorProc PlatformColorProc(); static Proc16 PlatformFactory565(unsigned flags); static ColorProc16 PlatformColorFactory565(unsigned flags); diff --git a/include/core/SkTypes.h b/include/core/SkTypes.h index d680ca5ecc..c2c8f0a80b 100644 --- a/include/core/SkTypes.h +++ b/include/core/SkTypes.h @@ -14,12 +14,6 @@ #include #include -#if defined(SK_ARM_HAS_NEON) - #include -#elif SK_CPU_SSE_LEVEL >= SK_CPU_LEVEL_SSE2 - #include -#endif - /** \file SkTypes.h */ -- cgit v1.2.3