diff options
| author | 2021-12-15 12:04:37 -0800 | |
|---|---|---|
| committer | 2021-12-15 12:04:37 -0800 | |
| commit | b3fc36d9898543d3aa1db336d6b398efb003552d (patch) | |
| tree | 21c4230e9b7f64a9f04843f8ef5811f8f7da4f38 | |
| parent | Merge pull request #7589 from yuzu-emu/revert-7565-fix-linux-decoding (diff) | |
| parent | yuzu/main: Fix host memory byte units. GB to GiB (diff) | |
| download | yuzu-b3fc36d9898543d3aa1db336d6b398efb003552d.tar.gz yuzu-b3fc36d9898543d3aa1db336d6b398efb003552d.tar.xz yuzu-b3fc36d9898543d3aa1db336d6b398efb003552d.zip | |
Merge pull request #7588 from Wunkolo/gibibibi-bytes
yuzu/main: Fix host memory byte units. GB to GiB
| -rw-r--r-- | src/yuzu/main.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/yuzu/main.cpp b/src/yuzu/main.cpp index cc84ea11c..df736513b 100644 --- a/src/yuzu/main.cpp +++ b/src/yuzu/main.cpp | |||
| @@ -77,6 +77,7 @@ static FileSys::VirtualFile VfsDirectoryCreateFileWrapper(const FileSys::Virtual | |||
| 77 | #include "common/fs/fs.h" | 77 | #include "common/fs/fs.h" |
| 78 | #include "common/fs/fs_paths.h" | 78 | #include "common/fs/fs_paths.h" |
| 79 | #include "common/fs/path_util.h" | 79 | #include "common/fs/path_util.h" |
| 80 | #include "common/literals.h" | ||
| 80 | #include "common/logging/backend.h" | 81 | #include "common/logging/backend.h" |
| 81 | #include "common/logging/filter.h" | 82 | #include "common/logging/filter.h" |
| 82 | #include "common/logging/log.h" | 83 | #include "common/logging/log.h" |
| @@ -134,6 +135,8 @@ static FileSys::VirtualFile VfsDirectoryCreateFileWrapper(const FileSys::Virtual | |||
| 134 | #include "yuzu/main.h" | 135 | #include "yuzu/main.h" |
| 135 | #include "yuzu/uisettings.h" | 136 | #include "yuzu/uisettings.h" |
| 136 | 137 | ||
| 138 | using namespace Common::Literals; | ||
| 139 | |||
| 137 | #ifdef USE_DISCORD_PRESENCE | 140 | #ifdef USE_DISCORD_PRESENCE |
| 138 | #include "yuzu/discord_impl.h" | 141 | #include "yuzu/discord_impl.h" |
| 139 | #endif | 142 | #endif |
| @@ -259,10 +262,9 @@ GMainWindow::GMainWindow() | |||
| 259 | LOG_INFO(Frontend, "Host CPU: {}", cpu_string); | 262 | LOG_INFO(Frontend, "Host CPU: {}", cpu_string); |
| 260 | #endif | 263 | #endif |
| 261 | LOG_INFO(Frontend, "Host OS: {}", QSysInfo::prettyProductName().toStdString()); | 264 | LOG_INFO(Frontend, "Host OS: {}", QSysInfo::prettyProductName().toStdString()); |
| 262 | LOG_INFO(Frontend, "Host RAM: {:.2f} GB", | 265 | LOG_INFO(Frontend, "Host RAM: {:.2f} GiB", |
| 263 | Common::GetMemInfo().TotalPhysicalMemory / 1024.0f / 1024 / 1024); | 266 | Common::GetMemInfo().TotalPhysicalMemory / f64{1_GiB}); |
| 264 | LOG_INFO(Frontend, "Host Swap: {:.2f} GB", | 267 | LOG_INFO(Frontend, "Host Swap: {:.2f} GiB", Common::GetMemInfo().TotalSwapMemory / f64{1_GiB}); |
| 265 | Common::GetMemInfo().TotalSwapMemory / 1024.0f / 1024 / 1024); | ||
| 266 | UpdateWindowTitle(); | 268 | UpdateWindowTitle(); |
| 267 | 269 | ||
| 268 | show(); | 270 | show(); |