diff options
| author |  mtklein <mtklein@chromium.org> | 2014-06-03 12:07:31 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2014-06-03 12:07:31 -0700 |
| commit | 3a2682a77f996f649de7699c9f7bee046c6d4f17 (patch) | |
| tree | 604c10a616880247b9f08fb76d395a2ea0832fa8 /src | |
| parent | 1800b1f51e48c186870e7687e33648a0b1cfa389 (diff) | |
SK_CPU_ARM --> SK_CPU_ARM32
That's what it means. It keeps confusing us as named today.
BUG=skia:
R=djsollen@google.com, mtklein@google.com, reed@google.com
Author: mtklein@chromium.org
Review URL: https://codereview.chromium.org/314643004
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/SkUtilsArm.h | 4 | ||||
| -rw-r--r-- | src/opts/SkBlitRow_opts_arm_neon.cpp | 12 |
2 files changed, 8 insertions, 8 deletions
diff --git a/src/core/SkUtilsArm.h b/src/core/SkUtilsArm.h index 93f626c6e7..09ddaf3946 100644 --- a/src/core/SkUtilsArm.h +++ b/src/core/SkUtilsArm.h @@ -21,9 +21,9 @@ #define SK_ARM_NEON_MODE_ALWAYS 1 #define SK_ARM_NEON_MODE_DYNAMIC 2 -#if defined(SK_CPU_ARM) && defined(__ARM_HAVE_OPTIONAL_NEON_SUPPORT) +#if defined(SK_CPU_ARM32) && defined(__ARM_HAVE_OPTIONAL_NEON_SUPPORT) # define SK_ARM_NEON_MODE SK_ARM_NEON_MODE_DYNAMIC -#elif defined(SK_CPU_ARM) && defined(__ARM_HAVE_NEON) || defined(SK_CPU_ARM64) +#elif defined(SK_CPU_ARM32) && defined(__ARM_HAVE_NEON) || defined(SK_CPU_ARM64) # define SK_ARM_NEON_MODE SK_ARM_NEON_MODE_ALWAYS #else # define SK_ARM_NEON_MODE SK_ARM_NEON_MODE_NONE diff --git a/src/opts/SkBlitRow_opts_arm_neon.cpp b/src/opts/SkBlitRow_opts_arm_neon.cpp index 1410649431..6ec1b4f787 100644 --- a/src/opts/SkBlitRow_opts_arm_neon.cpp +++ b/src/opts/SkBlitRow_opts_arm_neon.cpp @@ -17,7 +17,7 @@ #include "SkColor_opts_neon.h" #include <arm_neon.h> -#ifdef SK_CPU_ARM +#ifdef SK_CPU_ARM32 void S32_D565_Opaque_neon(uint16_t* SK_RESTRICT dst, const SkPMColor* SK_RESTRICT src, int count, U8CPU alpha, int /*x*/, int /*y*/) { @@ -921,7 +921,7 @@ void S32_Blend_BlitRow32_neon(SkPMColor* SK_RESTRICT dst, } } -#ifdef SK_CPU_ARM +#ifdef SK_CPU_ARM32 void S32A_Blend_BlitRow32_neon(SkPMColor* SK_RESTRICT dst, const SkPMColor* SK_RESTRICT src, int count, U8CPU alpha) { @@ -1405,7 +1405,7 @@ void Color32_arm_neon(SkPMColor* dst, const SkPMColor* src, int count, // load src color, 8 pixels, 4 64 bit registers // (and increment src). uint32x2x4_t vsrc; -#if defined(SK_CPU_ARM) && ((__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ > 6))) +#if defined(SK_CPU_ARM32) && ((__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ > 6))) asm ( "vld1.32 %h[vsrc], [%[src]]!" : [vsrc] "=w" (vsrc), [src] "+r" (src) @@ -1447,7 +1447,7 @@ void Color32_arm_neon(SkPMColor* dst, const SkPMColor* src, int count, // store back the 8 calculated pixels (2 128 bit // registers), and increment dst. -#if defined(SK_CPU_ARM) && ((__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ > 6))) +#if defined(SK_CPU_ARM32) && ((__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ > 6))) asm ( "vst1.32 %h[vdst], [%[dst]]!" : [dst] "+r" (dst) @@ -1475,7 +1475,7 @@ void Color32_arm_neon(SkPMColor* dst, const SkPMColor* src, int count, /////////////////////////////////////////////////////////////////////////////// const SkBlitRow::Proc sk_blitrow_platform_565_procs_arm_neon[] = { -#ifdef SK_CPU_ARM +#ifdef SK_CPU_ARM32 // no dither S32_D565_Opaque_neon, S32_D565_Blend_neon, @@ -1511,7 +1511,7 @@ const SkBlitRow::Proc32 sk_blitrow_platform_32_procs_arm_neon[] = { #else S32A_Opaque_BlitRow32_neon, // S32A_Opaque, #endif -#ifdef SK_CPU_ARM +#ifdef SK_CPU_ARM32 S32A_Blend_BlitRow32_neon // S32A_Blend #else NULL |