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

Revert "Temporarily disable NEON on Android framework builds."

Browse Source 
R=scroggo@google.com

Author: djsollen@google.com

Review URL: https://codereview.chromium.org/294183002

git-svn-id: http://skia.googlecode.com/svn/trunk@14844 2bbb7eff-a529-9590-31e7-b0007b416f81
This commit is contained in:
commit-bot@chromium.org 2014-05-22 13:42:34 +00:00
parent 4885d500f1
commit ab08437e39
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gyp/opts.gyp
View File

@ -102,8 +102,7 @@
}],
[ '(skia_arch_type == "mips") or (skia_arch_type == "arm" and arm_version < 7) \
or (skia_os == "ios") \
or (skia_os == "android" and skia_arch_type not in ["x86", "arm", "mips", "arm64"]) \
or (skia_android_framework and skia_arch_type == "arm64")', {
or (skia_os == "android" and skia_arch_type not in ["x86", "arm", "mips", "arm64"])', {
'sources': [
'../src/opts/SkBitmapProcState_opts_none.cpp',
'../src/opts/SkBlitMask_opts_none.cpp',
@ -122,7 +121,7 @@
'-mno-apcs-frame',
]
}],
[ 'skia_arch_type == "arm64" and skia_android_framework == 0', {
[ 'skia_arch_type == "arm64"', {
'sources': [
'../src/opts/SkBitmapProcState_arm_neon.cpp',
'../src/opts/SkBitmapProcState_matrixProcs_neon.cpp',

3
src/core/SkUtilsArm.h
View File

@ -23,9 +23,6 @@
#if defined(SK_CPU_ARM) && defined(__ARM_HAVE_OPTIONAL_NEON_SUPPORT)
# define SK_ARM_NEON_MODE SK_ARM_NEON_MODE_DYNAMIC
/* b/14056351 - temporarily disable NEON support for arm64 */
#elif defined(SK_CPU_ARM64) && defined(SK_BUILD_FOR_ANDROID_FRAMEWORK)
# define SK_ARM_NEON_MODE SK_ARM_NEON_MODE_NONE
#elif defined(SK_CPU_ARM) && defined(__ARM_HAVE_NEON) || defined(SK_CPU_ARM64)
# define SK_ARM_NEON_MODE SK_ARM_NEON_MODE_ALWAYS
#else