From 885bf61df09d7fb670823c74d59a9f8e14accfdc Mon Sep 17 00:00:00 2001
From: Leon Styhre <leon@leonstyhre.com>
Date: Sat, 15 Aug 2020 09:33:08 +0200
Subject: [PATCH] Tweaked the description and setting name for the GPU
 statistics overlay.

---
 es-app/src/emulationstation.6.gz | Bin 1102 -> 1099 bytes
 es-app/src/guis/GuiMenu.cpp      |   6 +++---
 es-app/src/main.cpp              |   4 ++--
 es-core/src/Settings.cpp         |   2 +-
 es-core/src/Window.cpp           |   7 +++++--
 5 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/es-app/src/emulationstation.6.gz b/es-app/src/emulationstation.6.gz
index df4045bf61dba8ca4be48f4689c904ccf7ca6329..1ef348f52ba2cb6bd6597fbda37aa40c8a611aa7 100644
GIT binary patch
literal 1099
zcmV-R1ho4fiwFoFayDN817&S>Y+-b1Z*FsRVRUJ4ZZ0+eg;h;&<2Dez>sL&DSqF&a
zBwciYMNz<6JB`seHY}&bBFcf1D2a_ksv>E}{q_4uIUC#Sv<JiDaOTa|n_(FDXgsI;
z`HE)q@$}{^t!}3g-AwN$KM_q0ZJ4HlOWrcWGfK8p@~XM2nWW3`<EQZQ=P(FYw=|hO
z+>KV#`F*tVf7JV>N4=3PtTuFYadm+cuWiMQP*NNJN9)V*BD@$R+%R1K&T6iEK^WcA
z{b)7`eo!CK<W&^yL}RX>jcRC;33v9!(bxO=BAP})cumI`!DF0H<8#$`Sv-vM<&!rW
zPogi&>B5B`{GS&Rni%B_nK7ABUhx-^RGjiwNi*P1q*_W^wb4QrUZ-MKrlmU-E=#9c
z(^lD*;LC_X1BWoGspY0sUWrmwRXlYL!yuTN51NEDKt~&lqJ)#x_!JU~@^8TV&^E%9
zyR22KN!zp}bkLNXmJWK<LXfJKYxHfg2z>H$pEnA&S_E-^9S`CG6jWs$BuYe&8<Cmv
zi5^QXiqbp<t9I*xK*%XaEgIGuk-}+9Z-)DDE}=?j6AzTEwtx(xXVDO|M%Acs+GV_)
z&q#BI5YNf!0gPo`tzH4bm%7>q7KKDIdkz3S^)jFHtC(_8q3nH>EVq^K4~k*YHC-xY
z(3rD*R0ucmpcGlgWjye<K4yrilkNb0|5cUoR=;oWTYhZsh5I&A#RCw@XE0XsgCU3F
zvv6YSIP3cDL^YT8*jj@{x;$auU64*&&JWs>@x&I+V9|nG<d5*+n8=P>xDhf_8=g7!
zzjohLtBjvJN4ClwB~w)=LgK>n@D!K!A<>Ge3(6$`pOsU%_h0mO>Ak#Xm#7xiM=yMZ
zufLy;?WxbI4clrE3(Rc}+P&6WnR=dI4si`~Tnts7gXXrymU6e$$swhF#&d?Lb!$M$
z1E89{0Ig-U2h-wT{uIpE3;nqq&D^|ze$+<?Yo3T?Yq&l`(Q-#ty<trQ8XgQyW6@N%
zgEU6O=QkFvms`vP=;KzhXP}3-niZVX8tJp`LABhFc13d#H-2UvEgq&_Wf0g6E>GAz
zi|k#KKSXxYLh0xKu)*yKt4wHyS@ff3FiSrGz_y!oLYXQ7g6%ZjJiHG131A@`i=~4N
znTz5LwL9CkTkk3-uLu6GMS8%rQq|n|vSHYND1VEMth(jrnu*owRLET)Fbbh{d_V7|
zV7=eH-R*mm=3dx0OFz(&t!o%CtVd}Ce&=X>;o`6f^E-U>u)3WugAtw#yt|dsrRdR}
z%Kx!${q<EV3L!C8JKtwP;NOFV;Pge+wUxqbssCMuz@DLV$Kf?H+Y*)UA3uYgj&t6N
zCKDRnMe|<Zm_(UMEjHBd`E<|anu*G_n3(xYzm~={`txvD2m@(|tud^)d!(JC;qjx5
RH8uP#_y+Z_l1{1!003N<EnNTr

literal 1102
zcmV-U1hM-ciwFq%pe|nk17&S>Y+-b1Z*FsRVRUJ4ZZ0+eg;i~D;zkhu?q4zG%MmG<
zBt7+{Q&ou^q_G+T!lczH&WE+Vwzsi&-F<<$zy4;{<N_RNKOnrbGtay|GaDuYm@eRc
zv4;6#8r^(_^=%ZxO>{T=2_UktWd=$vxn`E<kake<y1i<cgv;>br||OUFbLPTFq=Qz
zP1e!kK3@Aj82mDT!Nir$Sh%{ly1)}}T+OUd(pdioo6GPbycnh2GQ9qsHQWq>FusNR
z$$S?4pgw}xt0>-yrrbPR)xs<nboR#a*ZajXj^ZG^hGUH2F)5<tT(w@7jFV#Z<c+4Y
z_{%C<Qs}||c>!U7LBTLHCUYoi{vy(vL!p(lBTgcvA=PSYge<*I&790CI+c_qsW#9l
zrvZIgF>28v8a1G~)ygYDrs|q!<S-0^$bK*&q(yXWgH@1na0WkxL`C^G!u!y+!dAPi
zl{R2pRsnX<RvcCYJ<%x0l;#Hewp<22`GwCL3$|VcNpYQwk`XGX+7Tp{2p+d0x78Co
zR$P>oeG1mPqaZNkjAJcYrme`(sfIVheK<;}7RDwcCF>3$gZNprz?@YL);Q}kUM=Qe
zIKvRnf%FiJ<$bMQ0m7H2-Uk+?#ANmyAavwqKId046r#qm53yv0t9^g47!JE;Dy1wo
z=4>Aoh1+CQi9F{r8F^bDGm4>??f`xNRh@Hf-naKHKeqS6eH*Eg5faH~Fjew{1w!#z
zkQjQ-Qol*maOsY%4YJ5oC+zzRFq!83pe;F1T}cK@jobo%L=VJ7cHF|Pkh$9OoYeo?
zeM6&ieol^Dof9Q9)uck=h3DZZF6~2NE9yQdN&tP<q;T)Q;O)|TdCx9Y8mo`J@D;xP
zemb^?A*;8nGe|6CZhO$~jp=0Od44&@Yb3|TSQQ1*+-clWbPK&4r7+BS!EkD64Jdg4
z)UX#s)2#7eM*Pd4f;oGEKUb4E%?r{GhS<S|ry}hvH)mM1g2-yNtZk8o2Sd|3Y%1*_
zgCpYen`*Yjfk5uiKKAtU*v_z$gW6#3tUD+bO=w>+vcK^IOPqL!`m$hDH+Xr%=2_(L
zn*1U1lNQQ6|A!6Up0LV=VK|6>&MXen4*+P}k2zqCYJu$9Y0@yfPWTC6AzOzV2iIdE
z$~V;h>~z1|RRLZP$-fcV0nIAaaNo$5;qnWnLgPAC{pO=i;$9^cpz8xVVQ4+s&-)SB
z_|^#;!wz=0?~NHfuWy!qnq${AXuxncN-OYpj*TxV4wo{&z$Xvu+r=uF;Cq3OZmmou
z25_f}e;n<;q0*uh5@%}X`z#3jW3Ut)zNn^gQrHfL-(?usGwR%N^cvf)!paYi-@smn
zoDbsJ3?_H+Vh|9MAXk~g^|X6C>8;!_QB#Y7+0XE6Wo>IdkH@93C=GFCjB8FWG&vd{
Uzu35=#=iyM09^s)iKhqv0JQog>Hq)$

diff --git a/es-app/src/guis/GuiMenu.cpp b/es-app/src/guis/GuiMenu.cpp
index 80fc5669a..8d7f1afb7 100644
--- a/es-app/src/guis/GuiMenu.cpp
+++ b/es-app/src/guis/GuiMenu.cpp
@@ -678,9 +678,9 @@ void GuiMenu::openOtherSettings()
 
     // GPU statistics.
     auto gpu_statistics = std::make_shared<SwitchComponent>(mWindow);
-    gpu_statistics->setState(Settings::getInstance()->getBool("DrawGPUStatistics"));
-    s->addWithLabel("GPU STATISTICS OVERLAY", gpu_statistics);
-    s->addSaveFunc([gpu_statistics] { Settings::getInstance()->setBool("DrawGPUStatistics",
+    gpu_statistics->setState(Settings::getInstance()->getBool("DisplayGPUStatistics"));
+    s->addWithLabel("DISPLAY GPU STATISTICS OVERLAY", gpu_statistics);
+    s->addSaveFunc([gpu_statistics] { Settings::getInstance()->setBool("DisplayGPUStatistics",
             gpu_statistics->getState()); });
 
     // Hide Reboot System option in the quit menu.
diff --git a/es-app/src/main.cpp b/es-app/src/main.cpp
index 042759026..7a12e5a28 100644
--- a/es-app/src/main.cpp
+++ b/es-app/src/main.cpp
@@ -271,7 +271,7 @@ bool parseArgs(int argc, char* argv[])
             i++; // Skip vsync value.
         }
         else if (strcmp(argv[i], "--gpu-statistics") == 0) {
-            Settings::getInstance()->setBool("DrawGPUStatistics", "true");
+            Settings::getInstance()->setBool("DisplayGPUStatistics", "true");
         }
         else if (strcmp(argv[i], "--force-full") == 0) {
             Settings::getInstance()->setString("UIMode", "full");
@@ -313,7 +313,7 @@ bool parseArgs(int argc, char* argv[])
 #endif
 "  --vsync [1/on or 0/off]         Turn vsync on or off (default is on)\n"
 "  --max-vram [size]               Max VRAM to use (in mebibytes) before swapping\n"
-"  --gpu-statistics                Draw framerate and VRAM usage overlay\n"
+"  --gpu-statistics                Display framerate and VRAM usage overlay\n"
 "  --force-full                    Force the UI mode to Full\n"
 "  --force-kid                     Force the UI mode to Kid\n"
 "  --force-kiosk                   Force the UI mode to Kiosk\n"
diff --git a/es-core/src/Settings.cpp b/es-core/src/Settings.cpp
index 7fbf2d3e5..12800c293 100644
--- a/es-core/src/Settings.cpp
+++ b/es-core/src/Settings.cpp
@@ -204,7 +204,7 @@ void Settings::setDefaults()
     mBoolMap["LocalArt"] = false;
     mBoolMap["ShowHiddenFiles"] = true;
     mBoolMap["ShowHiddenGames"] = true;
-    mBoolMap["DrawGPUStatistics"] = false;
+    mBoolMap["DisplayGPUStatistics"] = false;
     mBoolMap["ShowRebootSystem"] = true;
     mBoolMap["ShowPoweroffSystem"] = true;
 
diff --git a/es-core/src/Window.cpp b/es-core/src/Window.cpp
index e9a895105..84ec5a624 100644
--- a/es-core/src/Window.cpp
+++ b/es-core/src/Window.cpp
@@ -207,7 +207,7 @@ void Window::update(int deltaTime)
     if (mFrameTimeElapsed > 500) {
         mAverageDeltaTime = mFrameTimeElapsed / mFrameCountElapsed;
 
-        if (Settings::getInstance()->getBool("DrawGPUStatistics")) {
+        if (Settings::getInstance()->getBool("DisplayGPUStatistics")) {
             std::stringstream ss;
 
             // FPS.
@@ -216,6 +216,9 @@ void Window::update(int deltaTime)
             ss << std::fixed << std::setprecision(2) <<
                     ((float)mFrameTimeElapsed / (float)mFrameCountElapsed) << " ms)";
 
+            // The following calculations are not accurate, and the font calculation is completely
+            // broken. For now, still report the figures as it's somehow useful to locate memory
+            // leaks and similar. But this needs to be completely overhauled later on.
             // VRAM.
             float textureVramUsageMiB = TextureResource::getTotalMemUsage() / 1024.0f / 1024.0f;
             float textureTotalUsageMiB = TextureResource::getTotalTextureSize() / 1024.0f / 1024.0f;
@@ -263,7 +266,7 @@ void Window::render()
     if (!mRenderedHelpPrompts)
         mHelp->render(transform);
 
-    if (Settings::getInstance()->getBool("DrawGPUStatistics") && mFrameDataText) {
+    if (Settings::getInstance()->getBool("DisplayGPUStatistics") && mFrameDataText) {
         Renderer::setMatrix(Transform4x4f::Identity());
         mDefaultFonts.at(1)->renderTextCache(mFrameDataText.get());
     }