From e423fd10c69beb57fc4f9030565cbcb9c3a5f501 Mon Sep 17 00:00:00 2001
From: Jordan <jordanh48@ymail.com>
Date: Wed, 28 Aug 2024 21:08:49 +0100
Subject: [PATCH] Misc: Minor text and settings changes (#11751)

* VMManager: Update CPU detection text

* Settings: Move texture preload to advanced

* Settings: Move spin during readback to advanced

* Translations: Add extra comment to mailbox presentation

Update GraphicsSettingsWidget.ui
---
 pcsx2-qt/Settings/GraphicsSettingsWidget.ui | 118 ++++++++++----------
 pcsx2/VMManager.cpp                         |  19 +++-
 2 files changed, 72 insertions(+), 65 deletions(-)

diff --git a/pcsx2-qt/Settings/GraphicsSettingsWidget.ui b/pcsx2-qt/Settings/GraphicsSettingsWidget.ui
index de1240e5f5..220815443a 100644
--- a/pcsx2-qt/Settings/GraphicsSettingsWidget.ui
+++ b/pcsx2-qt/Settings/GraphicsSettingsWidget.ui
@@ -609,62 +609,22 @@
          </item>
         </widget>
        </item>
-       <item row="7" column="0">
-        <widget class="QLabel" name="texturePreloadingLabel">
-         <property name="text">
-          <string>Texture Preloading:</string>
-         </property>
-        </widget>
-       </item>
-       <item row="7" column="1">
-        <widget class="QComboBox" name="texturePreloading">
-         <item>
-          <property name="text">
-           <string>None</string>
-          </property>
-         </item>
-         <item>
-          <property name="text">
-           <string>Partial</string>
-          </property>
-         </item>
-         <item>
-          <property name="text">
-           <string>Full (Hash Cache)</string>
-          </property>
-         </item>
-        </widget>
-       </item>
-       <item row="8" column="0" colspan="2">
+       <item row="7" column="0" colspan="2">
         <layout class="QGridLayout" name="hardwareRenderingOptionsLayout">
-         <item row="0" column="0">
-          <widget class="QCheckBox" name="spinGPUDuringReadbacks">
-           <property name="text">
-            <string>Spin GPU During Readbacks</string>
-           </property>
-          </widget>
-         </item>
-         <item row="1" column="0">
-          <widget class="QCheckBox" name="mipmapping">
-           <property name="text">
-            <string>Mipmapping</string>
-           </property>
-          </widget>
-         </item>
          <item row="0" column="1">
-          <widget class="QCheckBox" name="spinCPUDuringReadbacks">
-           <property name="text">
-            <string>Spin CPU During Readbacks</string>
-           </property>
-          </widget>
-         </item>
-         <item row="1" column="1">
           <widget class="QCheckBox" name="enableHWFixes">
            <property name="text">
             <string>Manual Hardware Renderer Fixes</string>
            </property>
           </widget>
          </item>
+         <item row="0" column="0">
+          <widget class="QCheckBox" name="mipmapping">
+           <property name="text">
+            <string>Mipmapping</string>
+           </property>
+          </widget>
+         </item>
         </layout>
        </item>
       </layout>
@@ -2147,46 +2107,60 @@
             </item>
            </widget>
           </item>
-          <item row="3" column="0" colspan="2">
+          <item row="10" column="0" colspan="2">
            <layout class="QGridLayout" name="gridLayout_9">
-            <item row="0" column="1">
-             <widget class="QCheckBox" name="skipPresentingDuplicateFrames">
+            <item row="2" column="0">
+             <widget class="QCheckBox" name="disableMailboxPresentation">
               <property name="text">
-               <string>Skip Presenting Duplicate Frames</string>
+               <string extracomment="Mailbox Presentation: a type of graphics-rendering technique that has not been exposed to the public that often, so chances are you will need to keep the word mailbox in English. It does not have anything to do with postal mailboxes or email inboxes/outboxes.">Disable Mailbox Presentation</string>
               </property>
              </widget>
             </item>
-            <item row="0" column="0">
+            <item row="1" column="0">
              <widget class="QCheckBox" name="useBlitSwapChain">
               <property name="text">
                <string extracomment="Blit = a data operation. You might want to write it as-is, but fully uppercased. More information: https://en.wikipedia.org/wiki/Bit_blit \nSwap chain: see Microsoft's Terminology Portal.">Use Blit Swap Chain</string>
               </property>
              </widget>
             </item>
-            <item row="1" column="0">
-             <widget class="QCheckBox" name="disableMailboxPresentation">
+            <item row="1" column="1">
+             <widget class="QCheckBox" name="skipPresentingDuplicateFrames">
               <property name="text">
-               <string>Disable Mailbox Presentation</string>
+               <string>Skip Presenting Duplicate Frames</string>
               </property>
              </widget>
             </item>
-            <item row="1" column="1">
+            <item row="2" column="1">
              <widget class="QCheckBox" name="extendedUpscales">
               <property name="text">
                <string>Extended Upscaling Multipliers</string>
               </property>
              </widget>
             </item>
+            <item row="3" column="1">
+             <widget class="QCheckBox" name="spinGPUDuringReadbacks">
+              <property name="text">
+               <string>Spin GPU During Readbacks</string>
+              </property>
+             </widget>
+            </item>
+            <item row="3" column="0">
+             <widget class="QCheckBox" name="spinCPUDuringReadbacks">
+              <property name="text">
+               <string>Spin CPU During Readbacks</string>
+              </property>
+             </widget>
+            </item>
            </layout>
           </item>
-          <item row="2" column="0">
+          <item row="6" column="0">
            <widget class="QLabel" name="exclussiveFSLabel">
             <property name="text">
              <string>Allow Exclusive Fullscreen:</string>
             </property>
            </widget>
           </item>
-          <item row="2" column="1">
+          <item row="6" column="1">
            <widget class="QComboBox" name="exclusiveFullscreenControl">
             <item>
              <property name="text">
@@ -2205,6 +2179,32 @@
             </item>
            </widget>
           </item>
+          <item row="5" column="1">
+           <widget class="QComboBox" name="texturePreloading">
+            <item>
+             <property name="text">
+              <string>None</string>
+             </property>
+            </item>
+            <item>
+             <property name="text">
+              <string>Partial</string>
+             </property>
+            </item>
+            <item>
+             <property name="text">
+              <string>Full (Hash Cache)</string>
+             </property>
+            </item>
+           </widget>
+          </item>
+          <item row="5" column="0">
+           <widget class="QLabel" name="label">
+            <property name="text">
+             <string>Texture Preloading:</string>
+            </property>
+           </widget>
+          </item>
          </layout>
         </widget>
        </item>
diff --git a/pcsx2/VMManager.cpp b/pcsx2/VMManager.cpp
index 01d08c11b9..4d38938540 100644
--- a/pcsx2/VMManager.cpp
+++ b/pcsx2/VMManager.cpp
@@ -2514,21 +2514,28 @@ void VMManager::LogCPUCapabilities()
 	Console.WriteLnFmt("  Processor        = {}", cpuinfo_get_package(0)->name);
 	Console.WriteLnFmt("  Core Count       = {} cores", cpuinfo_get_cores_count());
 	Console.WriteLnFmt("  Thread Count     = {} threads", cpuinfo_get_processors_count());
+	Console.WriteLnFmt("  Cluster Count    = {} clusters", cpuinfo_get_clusters_count());
 #ifdef _WIN32
 	LogUserPowerPlan();
 #endif
 
 #ifdef _M_X86
-	std::string features;
+	std::string extensions;
 	if (cpuinfo_has_x86_avx())
-		features += "AVX ";
+		extensions += "AVX ";
 	if (cpuinfo_has_x86_avx2())
-		features += "AVX2 ";
+		extensions += "AVX2 ";
+	if (cpuinfo_has_x86_avx512f())
+		extensions += "AVX512F ";
+#ifdef _M_ARM64
+	if (cpuinfo_has_arm_neon())
+		extensions += "NEON ";
+#endif
 
-	StringUtil::StripWhitespace(&features);
+	StringUtil::StripWhitespace(&extensions);
 
-	Console.WriteLn(Color_StrongBlack, "x86 Features Detected:");
-	Console.WriteLnFmt("  {}", features);
+	Console.WriteLn(Color_StrongBlack, "CPU Extensions Detected:");
+	Console.WriteLnFmt("  {}", extensions);
 	Console.WriteLn();
 #endif