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

Qt: Fix skipdraw not being hidden globally again 

And slience a warning in TC.
This commit is contained in:
Stenzek 2023-03-02 19:02:38 +10:00 committed by refractionpcsx2
parent 35d05b8653
commit 9b813f4ae3
3 changed files with 30 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pcsx2-qt/Settings/GraphicsSettingsWidget.cpp
View File

@ -298,7 +298,7 @@ GraphicsSettingsWidget::GraphicsSettingsWidget(SettingsDialog* dialog, QWidget*
// Remove texture offset and skipdraw range for global settings. // Remove texture offset and skipdraw range for global settings.
m_ui.upscalingFixesLayout->removeRow(2); m_ui.upscalingFixesLayout->removeRow(2);
m_ui.hardwareFixesLayout->removeRow(4); m_ui.hardwareFixesLayout->removeRow(5);
m_ui.skipDrawStart = nullptr; m_ui.skipDrawStart = nullptr;
m_ui.skipDrawEnd = nullptr; m_ui.skipDrawEnd = nullptr;
m_ui.textureOffsetX = nullptr; m_ui.textureOffsetX = nullptr;

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

@ -1005,24 +1005,10 @@
</item> </item>
<item row="6" column="0" colspan="2"> <item row="6" column="0" colspan="2">
<layout class="QGridLayout" name="gridLayout"> <layout class="QGridLayout" name="gridLayout">
<item row="1" column="1"> <item row="0" column="0">
<widget class="QCheckBox" name="preloadFrameData"> <widget class="QCheckBox" name="hwAutoFlush">
<property name="text"> <property name="text">
<string>Preload Frame Data</string> <string>Auto Flush</string>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QCheckBox" name="disableDepthEmulation">
<property name="text">
<string>Disable Depth Emulation</string>
</property>
</widget>
</item>
<item row="3" column="0">
<widget class="QCheckBox" name="disablePartialInvalidation">
<property name="text">
<string>Disable Partial Source Invalidation</string>
</property> </property>
</widget> </widget>
</item> </item>
@ -1033,10 +1019,10 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="3" column="1"> <item row="1" column="0">
<widget class="QCheckBox" name="targetPartialInvalidation"> <widget class="QCheckBox" name="disableDepthEmulation">
<property name="text"> <property name="text">
<string>Target Partial Invalidation</string> <string>Disable Depth Emulation</string>
</property> </property>
</widget> </widget>
</item> </item>
@ -1047,13 +1033,6 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="0" column="0">
<widget class="QCheckBox" name="hwAutoFlush">
<property name="text">
<string>Auto Flush</string>
</property>
</widget>
</item>
<item row="2" column="1"> <item row="2" column="1">
<widget class="QCheckBox" name="readTCOnClose"> <widget class="QCheckBox" name="readTCOnClose">
<property name="text"> <property name="text">
@ -1061,7 +1040,28 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="4" column="1"> <item row="3" column="0">
<widget class="QCheckBox" name="disablePartialInvalidation">
<property name="text">
<string>Disable Partial Source Invalidation</string>
</property>
</widget>
</item>
<item row="3" column="1">
<widget class="QCheckBox" name="targetPartialInvalidation">
<property name="text">
<string>Target Partial Invalidation</string>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QCheckBox" name="preloadFrameData">
<property name="text">
<string>Preload Frame Data</string>
</property>
</widget>
</item>
<item row="4" column="0">
<widget class="QCheckBox" name="estimateTextureRegion"> <widget class="QCheckBox" name="estimateTextureRegion">
<property name="text"> <property name="text">
<string>Estimate Texture Region</string> <string>Estimate Texture Region</string>

2
pcsx2/GS/Renderers/HW/GSTextureCache.cpp
View File

@ -2812,7 +2812,7 @@ GSTextureCache::Source* GSTextureCache::CreateMergedSource(GIFRegTEX0 TEX0, GIFR
page_x++; page_x++;
if (page_x == width_in_pages) if (page_x == width_in_pages)
{ {
start_TBP0 += row_page_increment * page_blocks; start_TBP0 += page_block_increment;
current_TBP0 = start_TBP0; current_TBP0 = start_TBP0;
page_x = 0; page_x = 0;
page_y++; page_y++;