Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 | 1 |
| 2 /* | 2 /* |
| 3 * Copyright 2006 The Android Open Source Project | 3 * Copyright 2006 The Android Open Source Project |
| 4 * | 4 * |
| 5 * Use of this source code is governed by a BSD-style license that can be | 5 * Use of this source code is governed by a BSD-style license that can be |
| 6 * found in the LICENSE file. | 6 * found in the LICENSE file. |
| 7 */ | 7 */ |
| 8 | 8 |
| 9 | 9 |
| 10 #ifndef SkPreConfig_DEFINED | 10 #ifndef SkPreConfig_DEFINED |
| (...skipping 119 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 130 #if defined (_M_IX86_FP) | 130 #if defined (_M_IX86_FP) |
| 131 #if _M_IX86_FP == 1 | 131 #if _M_IX86_FP == 1 |
| 132 #define SK_CPU_SSE_LEVEL SK_CPU_SSE_LEVEL_SSE1 | 132 #define SK_CPU_SSE_LEVEL SK_CPU_SSE_LEVEL_SSE1 |
| 133 #elif _M_IX86_FP >= 2 | 133 #elif _M_IX86_FP >= 2 |
| 134 #define SK_CPU_SSE_LEVEL SK_CPU_SSE_LEVEL_SSE2 | 134 #define SK_CPU_SSE_LEVEL SK_CPU_SSE_LEVEL_SSE2 |
| 135 #endif | 135 #endif |
| 136 #endif | 136 #endif |
| 137 #endif | 137 #endif |
| 138 | 138 |
| 139 // 64bit intel guarantees at least SSE2 | 139 // 64bit intel guarantees at least SSE2 |
| 140 #if defined(__x86_64__) || defined(_WIN64) | 140 #if defined(__x86_64__) || defined(_WIN64) |
|
mtklein
2014/02/21 19:24:31
Shouldn't we be able to just not do these platform
djsollen
2014/02/21 19:38:22
I'll leave this untouched in the CL, but feel to c
| |
| 141 #if !defined(SK_CPU_SSE_LEVEL) || (SK_CPU_SSE_LEVEL < SK_CPU_SSE_LEVEL_SSE2) | 141 #if !defined(SK_CPU_SSE_LEVEL) || (SK_CPU_SSE_LEVEL < SK_CPU_SSE_LEVEL_SSE2) |
| 142 #undef SK_CPU_SSE_LEVEL | 142 #undef SK_CPU_SSE_LEVEL |
| 143 #define SK_CPU_SSE_LEVEL SK_CPU_SSE_LEVEL_SSE2 | 143 #define SK_CPU_SSE_LEVEL SK_CPU_SSE_LEVEL_SSE2 |
| 144 #endif | 144 #endif |
| 145 #endif | 145 #endif |
| 146 | 146 |
| 147 // Android x86 NDK ABI requires SSE3 support | 147 // Android x86 NDK ABI requires SSE3 support |
| 148 #if defined(SK_BUILD_FOR_ANDROID) | 148 #if defined(SK_BUILD_FOR_ANDROID) |
|
mtklein
2014/02/21 19:24:31
Same here. Won't we just get this for free becaus
djsollen
2014/02/21 19:38:22
Agreed that we should rely on this. I'll dump the
| |
| 149 #undef SK_CPU_SSE_LEVEL | 149 #if !defined(SK_CPU_SSE_LEVEL) || (SK_CPU_SSE_LEVEL < SK_CPU_SSE_LEVEL_SSE3) |
| 150 #define SK_CPU_SSE_LEVEL SK_CPU_SSE_LEVEL_SSE3 | 150 #undef SK_CPU_SSE_LEVEL |
| 151 #define SK_CPU_SSE_LEVEL SK_CPU_SSE_LEVEL_SSE3 | |
|
reed1
2014/02/21 19:24:29
1. is there no way we can push this off to android
| |
| 152 #endif | |
| 151 #endif | 153 #endif |
| 152 | 154 |
| 153 ////////////////////////////////////////////////////////////////////// | 155 ////////////////////////////////////////////////////////////////////// |
| 154 // ARM defines | 156 // ARM defines |
| 155 | 157 |
| 156 #if defined(__arm__) && (!defined(__APPLE__) || !TARGET_IPHONE_SIMULATOR) | 158 #if defined(__arm__) && (!defined(__APPLE__) || !TARGET_IPHONE_SIMULATOR) |
| 157 #define SK_CPU_ARM | 159 #define SK_CPU_ARM |
| 158 | 160 |
| 159 #if defined(__GNUC__) | 161 #if defined(__GNUC__) |
| 160 #if defined(__ARM_ARCH_7__) || defined(__ARM_ARCH_7A__) \ | 162 #if defined(__ARM_ARCH_7__) || defined(__ARM_ARCH_7A__) \ |
| (...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 242 * | 244 * |
| 243 * NOTE: Clang/ARM (r161757) does not support the 'optimize' attribute. | 245 * NOTE: Clang/ARM (r161757) does not support the 'optimize' attribute. |
| 244 */ | 246 */ |
| 245 #if SK_HAS_ATTRIBUTE(optimize) | 247 #if SK_HAS_ATTRIBUTE(optimize) |
| 246 # define SK_ATTRIBUTE_OPTIMIZE_O1 __attribute__((optimize("O1"))) | 248 # define SK_ATTRIBUTE_OPTIMIZE_O1 __attribute__((optimize("O1"))) |
| 247 #else | 249 #else |
| 248 # define SK_ATTRIBUTE_OPTIMIZE_O1 /* nothing */ | 250 # define SK_ATTRIBUTE_OPTIMIZE_O1 /* nothing */ |
| 249 #endif | 251 #endif |
| 250 | 252 |
| 251 #endif | 253 #endif |
| OLD | NEW |