diff options
| -rw-r--r-- | include/core/SkPreConfig.h | 6 | ||||
| -rw-r--r-- | src/core/SkUtilsArm.cpp | 22 |
2 files changed, 28 insertions, 0 deletions
diff --git a/include/core/SkPreConfig.h b/include/core/SkPreConfig.h index 393a348ea8..4f977ead9a 100644 --- a/include/core/SkPreConfig.h +++ b/include/core/SkPreConfig.h @@ -55,6 +55,12 @@ #define SK_BUILD_FOR_ANDROID #endif +// USE_CHROMIUM_SKIA is defined when building Skia for the Chromium +// browser. +#if defined(USE_CHROMIUM_SKIA) + #define SK_BUILD_FOR_CHROMIUM +#endif + ////////////////////////////////////////////////////////////////////// #if !defined(SK_DEBUG) && !defined(SK_RELEASE) diff --git a/src/core/SkUtilsArm.cpp b/src/core/SkUtilsArm.cpp index 1c49316d9e..b0eaac00bb 100644 --- a/src/core/SkUtilsArm.cpp +++ b/src/core/SkUtilsArm.cpp @@ -16,6 +16,20 @@ #include <string.h> #include <pthread.h> +// Set USE_ANDROID_NDK_CPU_FEATURES to use the Android NDK's +// cpu-features helper library to detect NEON at runtime. See +// http://crbug.com/164154 to see why this is needed in Chromium +// for Android. +#if defined(SK_BUILD_FOR_ANDROID) && defined(SK_BUILD_FOR_CHROMIUM) +# define USE_ANDROID_NDK_CPU_FEATURES 1 +#else +# define USE_ANDROID_NDK_CPU_FEATURES 0 +#endif + +#if USE_ANDROID_NDK_CPU_FEATURES +# include <cpu-features.h> +#endif + // Set NEON_DEBUG to 1 to allow debugging of the CPU features probing. // For now, we always set it for SK_DEBUG builds. #ifdef SK_DEBUG @@ -62,6 +76,12 @@ static bool sk_cpu_arm_check_neon(void) { SkDebugf("Running dynamic CPU feature detection\n"); #endif +#if USE_ANDROID_NDK_CPU_FEATURES + + result = (android_getCpuFeatures() & ANDROID_CPU_ARM_FEATURE_NEON) != 0; + +#else // USE_ANDROID_NDK_CPU_FEATURES + // There is no user-accessible CPUID instruction on ARM that we can use. // Instead, we must parse /proc/cpuinfo and look for the 'neon' feature. // For example, here's a typical output (Nexus S running ICS 4.0.3): @@ -151,6 +171,8 @@ static bool sk_cpu_arm_check_neon(void) { } while (0); +#endif // USE_ANDROID_NDK_CPU_FEATURES + if (result) { SkDebugf("Device supports ARM NEON instructions!\n"); } else { |