diff options
| author |  Yuri Kunde Schlesner | 2016-09-21 11:29:48 -0700 |
|---|---|---|
| committer |  GitHub | 2016-09-21 11:29:48 -0700 |
| commit | d5d2ca8058a0f1c00ab7ca9fe2c058ba47546c0a (patch) | |
| tree | 8a22ca73ff838f3f0090b29a548ae81087fc90ed /src/common/microprofile.h | |
| parent | README: Specify master branch for Travis CI badge (diff) | |
| parent | Fix Travis clang-format check (diff) | |
| download | yuzu-d5d2ca8058a0f1c00ab7ca9fe2c058ba47546c0a.tar.gz yuzu-d5d2ca8058a0f1c00ab7ca9fe2c058ba47546c0a.tar.xz yuzu-d5d2ca8058a0f1c00ab7ca9fe2c058ba47546c0a.zip | |
Merge pull request #2086 from linkmauve/clang-format
Add clang-format as part of our {commit,travis}-time checks
Diffstat (limited to 'src/common/microprofile.h')
| -rw-r--r-- | src/common/microprofile.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/common/microprofile.h b/src/common/microprofile.h index 670a58fe5..54e7f3cc4 100644 --- a/src/common/microprofile.h +++ b/src/common/microprofile.h | |||
| @@ -13,7 +13,7 @@ | |||
| 13 | #define MICROPROFILE_WEBSERVER 0 | 13 | #define MICROPROFILE_WEBSERVER 0 |
| 14 | #define MICROPROFILE_GPU_TIMERS 0 // TODO: Implement timer queries when we upgrade to OpenGL 3.3 | 14 | #define MICROPROFILE_GPU_TIMERS 0 // TODO: Implement timer queries when we upgrade to OpenGL 3.3 |
| 15 | #define MICROPROFILE_CONTEXT_SWITCH_TRACE 0 | 15 | #define MICROPROFILE_CONTEXT_SWITCH_TRACE 0 |
| 16 | #define MICROPROFILE_PER_THREAD_BUFFER_SIZE (2048<<13) // 16 MB | 16 | #define MICROPROFILE_PER_THREAD_BUFFER_SIZE (2048 << 13) // 16 MB |
| 17 | 17 | ||
| 18 | #ifdef _WIN32 | 18 | #ifdef _WIN32 |
| 19 | // This isn't defined by the standard library in MSVC2015 | 19 | // This isn't defined by the standard library in MSVC2015 |