AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Revert of Allow NEON on iOS. (patchset #3 id:40001 of https://codereview.chromium.org/1091823002/)

Browse Source 
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
This commit is contained in:
mtklein 2015-04-17 14:02:40 -07:00 committed by Commit bot
parent e85a754a4c
commit f3f9440372
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gyp/opts.gyp
View File

@ -48,8 +48,10 @@
}],
[ '(skia_arch_type == "arm" and arm_version < 7) \
or (skia_os == "ios") \
or (skia_os == "android" \
and skia_arch_type not in ["x86", "x86_64", "arm", "mips", "arm64"])', {
and skia_arch_type not in ["x86", "x86_64", "arm", "mips", \
"arm64"])', {
'sources': [ '<@(none_sources)' ],
}],

4
include/core/SkPreConfig.h
View File

@ -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