diff options
| author |  mtklein <mtklein@google.com> | 2015-04-17 14:02:40 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-04-17 14:02:40 -0700 |
| commit | f3f9440372099bb44b29438ee0c445b7e1bd836d (patch) | |
| tree | 32db008e76f76ad9d1487ffabd09dba151ac497e /include/core/SkPreConfig.h | |
| parent | e85a754a4ce9b279159270faa6717932f7a8548f (diff) | |
Revert of Allow NEON on iOS. (patchset #3 id:40001 of https://codereview.chromium.org/1091823002/)
Reason for revert:
need to coordinate this with chrome gyps/gn
Original issue's description:
> Allow NEON on iOS.
>
> I have nanobench building and running (Color32_arm_neon) on my iPad.
>
> No public API changes.
> TBR=reed@google.com
>
> BUG=skia:
>
> Committed: https://skia.googlesource.com/skia/+/e5043b7ea5170a639367b67c986568907576be4b
TBR=caryclark@google.com,mtklein@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=skia:
Review URL: https://codereview.chromium.org/1094843005
Diffstat (limited to 'include/core/SkPreConfig.h')
| -rw-r--r-- | include/core/SkPreConfig.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/core/SkPreConfig.h b/include/core/SkPreConfig.h index 6c49bbd0d4..745ba90f37 100644 --- a/include/core/SkPreConfig.h +++ b/include/core/SkPreConfig.h @@ -198,7 +198,9 @@ #endif // All 64-bit ARM chips have NEON. Many 32-bit ARM chips do too. -#if !defined(SK_ARM_HAS_NEON) && (defined(SK_CPU_ARM64) || defined(__ARM_NEON__)) +// TODO: Why don't we want NEON on iOS? +#if !defined(SK_ARM_HAS_NEON) && !defined(SK_BUILD_FOR_IOS) && \ + (defined(SK_CPU_ARM64) || defined(__ARM_NEON__)) #define SK_ARM_HAS_NEON #endif |