diff options
| author | 2015-08-24 18:30:11 -0700 | |
|---|---|---|
| committer | 2015-08-24 18:30:11 -0700 | |
| commit | ac0104b8b0584023cfbd7a4800f1ca1db890188f (patch) | |
| tree | a1651d48113413e2de1e6e309362511b1ff7ffa8 /src/citra/citra.cpp | |
| parent | Merge pull request #1063 from Subv/hw_renderer_debug_fb (diff) | |
| parent | Integrate the MicroProfile profiling library (diff) | |
| download | yuzu-ac0104b8b0584023cfbd7a4800f1ca1db890188f.tar.gz yuzu-ac0104b8b0584023cfbd7a4800f1ca1db890188f.tar.xz yuzu-ac0104b8b0584023cfbd7a4800f1ca1db890188f.zip | |
Merge pull request #1048 from yuriks/microprofile
Integrate the MicroProfile profiling library
Diffstat (limited to 'src/citra/citra.cpp')
| -rw-r--r-- | src/citra/citra.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/citra/citra.cpp b/src/citra/citra.cpp index d6fcb66a5..46f4a07c9 100644 --- a/src/citra/citra.cpp +++ b/src/citra/citra.cpp | |||
| @@ -6,6 +6,9 @@ | |||
| 6 | #include <thread> | 6 | #include <thread> |
| 7 | #include <iostream> | 7 | #include <iostream> |
| 8 | 8 | ||
| 9 | // This needs to be included before getopt.h because the latter #defines symbols used by it | ||
| 10 | #include "common/microprofile.h" | ||
| 11 | |||
| 9 | #ifdef _MSC_VER | 12 | #ifdef _MSC_VER |
| 10 | #include <getopt.h> | 13 | #include <getopt.h> |
| 11 | #else | 14 | #else |
| @@ -59,6 +62,8 @@ int main(int argc, char **argv) { | |||
| 59 | Log::Filter log_filter(Log::Level::Debug); | 62 | Log::Filter log_filter(Log::Level::Debug); |
| 60 | Log::SetFilter(&log_filter); | 63 | Log::SetFilter(&log_filter); |
| 61 | 64 | ||
| 65 | MicroProfileOnThreadCreate("EmuThread"); | ||
| 66 | |||
| 62 | if (boot_filename.empty()) { | 67 | if (boot_filename.empty()) { |
| 63 | LOG_CRITICAL(Frontend, "Failed to load ROM: No ROM specified"); | 68 | LOG_CRITICAL(Frontend, "Failed to load ROM: No ROM specified"); |
| 64 | return -1; | 69 | return -1; |
| @@ -89,5 +94,7 @@ int main(int argc, char **argv) { | |||
| 89 | 94 | ||
| 90 | delete emu_window; | 95 | delete emu_window; |
| 91 | 96 | ||
| 97 | MicroProfileShutdown(); | ||
| 98 | |||
| 92 | return 0; | 99 | return 0; |
| 93 | } | 100 | } |