Skip to content

Commit

Permalink
Misc: Minor text and settings changes (#11751)
Browse files Browse the repository at this point in the history 
* 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
  • Loading branch information
@JordanTheToaster
JordanTheToaster authored Aug 28, 2024
1 parent f73a9e8 commit e423fd1
Show file tree
Hide file tree
Showing 2 changed files with 69 additions and 62 deletions.
112 changes: 56 additions & 56 deletions pcsx2-qt/Settings/GraphicsSettingsWidget.ui
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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">
<item row="0" column="1">
<widget class="QCheckBox" name="enableHWFixes">
<property name="text">
<string>Spin GPU During Readbacks</string>
<string>Manual Hardware Renderer Fixes</string>
</property>
</widget>
</item>
<item row="1" column="0">
<item row="0" 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>
</layout>
</item>
</layout>
Expand Down Expand Up @@ -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">
Expand All @@ -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>
Expand Down
19 changes: 13 additions & 6 deletions pcsx2/VMManager.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down

0 comments on commit e423fd1

Please sign in to comment.