diff options
author | 2011-10-21 14:05:33 +0000 | |
---|---|---|
committer | 2011-10-21 14:05:33 +0000 | |
commit | 5a0920c22c0dfc62109efdda08ed7e150806e2ff (patch) | |
tree | 6d15a06a15c76a0b09122409b1efe7636fd77309 /src | |
parent | f0f617a502ae9298056654811542c62769a906c8 (diff) |
don't mention the neon functions if no neon is available
git-svn-id: http://skia.googlecode.com/svn/trunk@2514 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src')
-rw-r--r-- | src/opts/opts_check_arm.cpp | 34 |
1 files changed, 13 insertions, 21 deletions
diff --git a/src/opts/opts_check_arm.cpp b/src/opts/opts_check_arm.cpp index 9d87b23a14..20ec8a13f6 100644 --- a/src/opts/opts_check_arm.cpp +++ b/src/opts/opts_check_arm.cpp @@ -15,40 +15,32 @@ #include "SkUtils.h" +#if defined(__ARM_HAVE_NEON) && defined(SK_CPU_LENDIAN) extern "C" void memset16_neon(uint16_t dst[], uint16_t value, int count); extern "C" void memset32_neon(uint32_t dst[], uint32_t value, int count); +#endif +#if defined(SK_CPU_LENDIAN) extern "C" void arm_memset16(uint16_t* dst, uint16_t value, int count); extern "C" void arm_memset32(uint32_t* dst, uint32_t value, int count); - -static inline bool hasNeonRegisters() { -#if defined(__ARM_HAVE_NEON) && defined(SK_CPU_LENDIAN) - return true; -#else - return false; #endif -} SkMemset16Proc SkMemset16GetPlatformProc() { - if (hasNeonRegisters()) { - return memset16_neon; - } else { -#if defined(SK_CPU_LENDIAN) - return arm_memset16; +#if defined(__ARM_HAVE_NEON) && defined(SK_CPU_LENDIAN) + return memset16_neon; +#elif defined(SK_CPU_LENDIAN) + return arm_memset16; #else - return NULL; + return NULL; #endif - } } SkMemset32Proc SkMemset32GetPlatformProc() { - if (hasNeonRegisters()) { - return memset32_neon; - } else { -#if defined(SK_CPU_LENDIAN) - return arm_memset32; +#if defined(__ARM_HAVE_NEON) && defined(SK_CPU_LENDIAN) + return memset32_neon; +#elif defined(SK_CPU_LENDIAN) + return arm_memset32; #else - return NULL; + return NULL; #endif - } } |