diff options
| author |  Yuri Kunde Schlesner | 2016-03-09 20:08:38 -0800 |
|---|---|---|
| committer | Yuri Kunde Schlesner | 2016-03-09 20:08:38 -0800 |
| commit | 305e63d9eafb74774cb3d390eea0da74a64665d7 (patch) | |
| tree | 234a7facd4f953885d195d3c44d5f77f3cddcb14 /src/common | |
| parent | Merge pull request #1478 from JayFoxRox/master (diff) | |
| parent | Common: Get rid of alignment macros (diff) | |
| download | yuzu-305e63d9eafb74774cb3d390eea0da74a64665d7.tar.gz yuzu-305e63d9eafb74774cb3d390eea0da74a64665d7.tar.xz yuzu-305e63d9eafb74774cb3d390eea0da74a64665d7.zip | |
Merge pull request #1475 from lioncash/align
Common: Get rid of alignment macros
Diffstat (limited to 'src/common')
| -rw-r--r-- | src/common/common_funcs.h | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/src/common/common_funcs.h b/src/common/common_funcs.h index ed20c3629..aa6aff7b9 100644 --- a/src/common/common_funcs.h +++ b/src/common/common_funcs.h | |||
| @@ -18,19 +18,11 @@ | |||
| 18 | #define INSERT_PADDING_BYTES(num_bytes) u8 CONCAT2(pad, __LINE__)[(num_bytes)] | 18 | #define INSERT_PADDING_BYTES(num_bytes) u8 CONCAT2(pad, __LINE__)[(num_bytes)] |
| 19 | #define INSERT_PADDING_WORDS(num_words) u32 CONCAT2(pad, __LINE__)[(num_words)] | 19 | #define INSERT_PADDING_WORDS(num_words) u32 CONCAT2(pad, __LINE__)[(num_words)] |
| 20 | 20 | ||
| 21 | // Inlining | ||
| 21 | #ifdef _WIN32 | 22 | #ifdef _WIN32 |
| 22 | // Alignment | ||
| 23 | #define FORCE_INLINE __forceinline | 23 | #define FORCE_INLINE __forceinline |
| 24 | #define MEMORY_ALIGNED16(x) __declspec(align(16)) x | ||
| 25 | #define MEMORY_ALIGNED32(x) __declspec(align(32)) x | ||
| 26 | #define MEMORY_ALIGNED64(x) __declspec(align(64)) x | ||
| 27 | #define MEMORY_ALIGNED128(x) __declspec(align(128)) x | ||
| 28 | #else | 24 | #else |
| 29 | #define FORCE_INLINE inline __attribute__((always_inline)) | 25 | #define FORCE_INLINE inline __attribute__((always_inline)) |
| 30 | #define MEMORY_ALIGNED16(x) __attribute__((aligned(16))) x | ||
| 31 | #define MEMORY_ALIGNED32(x) __attribute__((aligned(32))) x | ||
| 32 | #define MEMORY_ALIGNED64(x) __attribute__((aligned(64))) x | ||
| 33 | #define MEMORY_ALIGNED128(x) __attribute__((aligned(128))) x | ||
| 34 | #endif | 26 | #endif |
| 35 | 27 | ||
| 36 | #ifndef _MSC_VER | 28 | #ifndef _MSC_VER |