| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright 2006 The Android Open Source Project | 2 * Copyright 2006 The Android Open Source Project |
| 3 * | 3 * |
| 4 * Use of this source code is governed by a BSD-style license that can be | 4 * Use of this source code is governed by a BSD-style license that can be |
| 5 * found in the LICENSE file. | 5 * found in the LICENSE file. |
| 6 */ | 6 */ |
| 7 | 7 |
| 8 #ifndef SkTypes_DEFINED | 8 #ifndef SkTypes_DEFINED |
| 9 #define SkTypes_DEFINED | 9 #define SkTypes_DEFINED |
| 10 | 10 |
| 11 #include "SkPreConfig.h" | 11 #include "SkPreConfig.h" |
| 12 #include "SkUserConfig.h" | 12 #include "SkUserConfig.h" |
| 13 #include "SkPostConfig.h" | 13 #include "SkPostConfig.h" |
| 14 #include <stdint.h> | 14 #include <stdint.h> |
| 15 #include <sys/types.h> | 15 #include <sys/types.h> |
| 16 | 16 |
| 17 #if defined(SK_ARM_HAS_NEON) | |
| 18 #include <arm_neon.h> | |
| 19 #elif SK_CPU_SSE_LEVEL >= SK_CPU_LEVEL_SSE2 | |
| 20 #include <immintrin.h> | |
| 21 #endif | |
| 22 | |
| 23 /** \file SkTypes.h | 17 /** \file SkTypes.h |
| 24 */ | 18 */ |
| 25 | 19 |
| 26 /** See SkGraphics::GetVersion() to retrieve these at runtime | 20 /** See SkGraphics::GetVersion() to retrieve these at runtime |
| 27 */ | 21 */ |
| 28 #define SKIA_VERSION_MAJOR 1 | 22 #define SKIA_VERSION_MAJOR 1 |
| 29 #define SKIA_VERSION_MINOR 0 | 23 #define SKIA_VERSION_MINOR 0 |
| 30 #define SKIA_VERSION_PATCH 0 | 24 #define SKIA_VERSION_PATCH 0 |
| 31 | 25 |
| 32 /* | 26 /* |
| (...skipping 642 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 675 private: | 669 private: |
| 676 void* fPtr; | 670 void* fPtr; |
| 677 size_t fSize; // can be larger than the requested size (see kReuse) | 671 size_t fSize; // can be larger than the requested size (see kReuse) |
| 678 uint32_t fStorage[(kSize + 3) >> 2]; | 672 uint32_t fStorage[(kSize + 3) >> 2]; |
| 679 }; | 673 }; |
| 680 // Can't guard the constructor because it's a template class. | 674 // Can't guard the constructor because it's a template class. |
| 681 | 675 |
| 682 #endif /* C++ */ | 676 #endif /* C++ */ |
| 683 | 677 |
| 684 #endif | 678 #endif |
| OLD | NEW |