summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGravatar Wunkolo2021-12-14 23:49:25 -0800
committerGravatar Wunkolo2021-12-14 23:57:33 -0800
commit44b3abdfc0d746a13443b3c386f0ce971d0148ce (patch)
treebb3ed9be9344d37bbdf4eb7456813246bda3da1f /src
parentMerge pull request #7565 from liushuyu/fix-linux-decoding (diff)
downloadyuzu-44b3abdfc0d746a13443b3c386f0ce971d0148ce.tar.gz
yuzu-44b3abdfc0d746a13443b3c386f0ce971d0148ce.tar.xz
yuzu-44b3abdfc0d746a13443b3c386f0ce971d0148ce.zip
yuzu/main: Fix host memory byte units. GB to GiB
I have `134850146304` bytes of ram and Yuzu was saying that I had `125.59 GB` of ram. But `125.59` is actually the amount of gi**bi**bytes I have. In gi**ga**bytes I would have `134.9`. Additionally, I changed the `1024 / 1024 / 1024` here into the `_GiB` user-literals that I added a while ago(#6519). https://www.wolframalpha.com/input/?i=134850146304+bytes
Diffstat (limited to 'src')
-rw-r--r--src/yuzu/main.cpp10
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
138using 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();