ShuriZma
/
pcsx2
mirror of https://github.com/PCSX2/pcsx2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
Jordan 2024-08-28 21:08:49 +01:00 committed by GitHub
parent f73a9e89f6
commit e423fd10c6
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 72 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

118
pcsx2-qt/Settings/GraphicsSettingsWidget.ui
View File

@ -609,62 +609,22 @@
</item> </item>
</widget> </widget>
</item> </item>
<item row="7" column="0"> <item row="7" column="0" colspan="2">
<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">
<layout class="QGridLayout" name="hardwareRenderingOptionsLayout"> <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"> <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"> <widget class="QCheckBox" name="enableHWFixes">
<property name="text"> <property name="text">
<string>Manual Hardware Renderer Fixes</string> <string>Manual Hardware Renderer Fixes</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="0" column="0">
<widget class="QCheckBox" name="mipmapping">
<property name="text">
<string>Mipmapping</string>
</property>
</widget>
</item>
</layout> </layout>
</item> </item>
</layout> </layout>
@ -2147,46 +2107,60 @@
</item> </item>
</widget> </widget>
</item> </item>
<item row="3" column="0" colspan="2"> <item row="10" column="0" colspan="2">
<layout class="QGridLayout" name="gridLayout_9"> <layout class="QGridLayout" name="gridLayout_9">
<item row="0" column="1"> <item row="2" column="0">
<widget class="QCheckBox" name="skipPresentingDuplicateFrames"> <widget class="QCheckBox" name="disableMailboxPresentation">
<property name="text"> <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> </property>
</widget> </widget>
</item> </item>
<item row="0" column="0"> <item row="1" column="0">
<widget class="QCheckBox" name="useBlitSwapChain"> <widget class="QCheckBox" name="useBlitSwapChain">
<property name="text"> <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> <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> </property>
</widget> </widget>
</item> </item>
<item row="1" column="0"> <item row="1" column="1">
<widget class="QCheckBox" name="disableMailboxPresentation"> <widget class="QCheckBox" name="skipPresentingDuplicateFrames">
<property name="text"> <property name="text">
<string>Disable Mailbox Presentation</string> <string>Skip Presenting Duplicate Frames</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="1"> <item row="2" column="1">
<widget class="QCheckBox" name="extendedUpscales"> <widget class="QCheckBox" name="extendedUpscales">
<property name="text"> <property name="text">
<string>Extended Upscaling Multipliers</string> <string>Extended Upscaling Multipliers</string>
</property> </property>
</widget> </widget>
</item> </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> </layout>
</item> </item>
<item row="2" column="0"> <item row="6" column="0">
<widget class="QLabel" name="exclussiveFSLabel"> <widget class="QLabel" name="exclussiveFSLabel">
<property name="text"> <property name="text">
<string>Allow Exclusive Fullscreen:</string> <string>Allow Exclusive Fullscreen:</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="2" column="1"> <item row="6" column="1">
<widget class="QComboBox" name="exclusiveFullscreenControl"> <widget class="QComboBox" name="exclusiveFullscreenControl">
<item> <item>
<property name="text"> <property name="text">
@ -2205,6 +2179,32 @@
</item> </item>
</widget> </widget>
</item> </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> </layout>
</widget> </widget>
</item> </item>

19
pcsx2/VMManager.cpp
View File

@ -2514,21 +2514,28 @@ void VMManager::LogCPUCapabilities()
Console.WriteLnFmt(" Processor = {}", cpuinfo_get_package(0)->name); Console.WriteLnFmt(" Processor = {}", cpuinfo_get_package(0)->name);
Console.WriteLnFmt(" Core Count = {} cores", cpuinfo_get_cores_count()); Console.WriteLnFmt(" Core Count = {} cores", cpuinfo_get_cores_count());
Console.WriteLnFmt(" Thread Count = {} threads", cpuinfo_get_processors_count()); Console.WriteLnFmt(" Thread Count = {} threads", cpuinfo_get_processors_count());
Console.WriteLnFmt(" Cluster Count = {} clusters", cpuinfo_get_clusters_count());
#ifdef _WIN32 #ifdef _WIN32
LogUserPowerPlan(); LogUserPowerPlan();
#endif #endif
#ifdef _M_X86 #ifdef _M_X86
std::string features; std::string extensions;
if (cpuinfo_has_x86_avx()) if (cpuinfo_has_x86_avx())
features += "AVX "; extensions += "AVX ";
if (cpuinfo_has_x86_avx2()) 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.WriteLn(Color_StrongBlack, "CPU Extensions Detected:");
Console.WriteLnFmt(" {}", features); Console.WriteLnFmt(" {}", extensions);
Console.WriteLn(); Console.WriteLn();
#endif #endif