diff options
| author | 2014-05-22 22:57:45 -0400 | |
|---|---|---|
| committer | 2014-05-22 22:57:45 -0400 | |
| commit | 32c314c99290a52f1f870ecf8c677e3792ed09c4 (patch) | |
| tree | 1cea62bc320d51ebb217e7c361ae10b65b71dd45 /src/common/common_funcs.h | |
| parent | Merge branch 'master' of https://github.com/citra-emu/citra (diff) | |
| parent | core: added Kernel::Reschedule() call to check for thread changes, shortened ... (diff) | |
| download | yuzu-32c314c99290a52f1f870ecf8c677e3792ed09c4.tar.gz yuzu-32c314c99290a52f1f870ecf8c677e3792ed09c4.tar.xz yuzu-32c314c99290a52f1f870ecf8c677e3792ed09c4.zip | |
Merge branch 'threading'
Diffstat (limited to 'src/common/common_funcs.h')
| -rw-r--r-- | src/common/common_funcs.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/common/common_funcs.h b/src/common/common_funcs.h index f8d10eb3e..dca4dc47f 100644 --- a/src/common/common_funcs.h +++ b/src/common/common_funcs.h | |||
| @@ -22,6 +22,11 @@ template<> struct CompileTimeAssert<true> {}; | |||
| 22 | #define b32(x) (b16(x) | (b16(x) >>16) ) | 22 | #define b32(x) (b16(x) | (b16(x) >>16) ) |
| 23 | #define ROUND_UP_POW2(x) (b32(x - 1) + 1) | 23 | #define ROUND_UP_POW2(x) (b32(x - 1) + 1) |
| 24 | 24 | ||
| 25 | #define MIN(a, b) ((a)<(b)?(a):(b)) | ||
| 26 | #define MAX(a, b) ((a)>(b)?(a):(b)) | ||
| 27 | |||
| 28 | #define CLAMP(x, min, max) (((x) > max) ? max : (((x) < min) ? min : (x))) | ||
| 29 | |||
| 25 | #define ARRAY_SIZE(a) (sizeof(a) / sizeof(a[0])) | 30 | #define ARRAY_SIZE(a) (sizeof(a) / sizeof(a[0])) |
| 26 | 31 | ||
| 27 | #ifndef _WIN32 | 32 | #ifndef _WIN32 |