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

GS: Enable memory wrapping always

This commit is contained in:
refractionpcsx2 2022-12-11 22:24:12 +00:00
parent d93b49cc4f
commit 6d5c05fba3
9 changed files with 10 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -226,7 +226,6 @@ GraphicsSettingsWidget::GraphicsSettingsWidget(SettingsDialog* dialog, QWidget*
SettingWidgetBinder::BindWidgetToBoolSetting(sif, m_ui.hwAutoFlush, "EmuCore/GS", "UserHacks_AutoFlush", false);
SettingWidgetBinder::BindWidgetToBoolSetting(sif, m_ui.frameBufferConversion, "EmuCore/GS", "UserHacks_CPU_FB_Conversion", false);
SettingWidgetBinder::BindWidgetToBoolSetting(sif, m_ui.disableDepthEmulation, "EmuCore/GS", "UserHacks_DisableDepthSupport", false);
SettingWidgetBinder::BindWidgetToBoolSetting(sif, m_ui.memoryWrapping, "EmuCore/GS", "wrap_gs_mem", false);
SettingWidgetBinder::BindWidgetToBoolSetting(sif, m_ui.disableSafeFeatures, "EmuCore/GS", "UserHacks_Disable_Safe_Features", false);
SettingWidgetBinder::BindWidgetToBoolSetting(sif, m_ui.preloadFrameData, "EmuCore/GS", "preload_frame_with_gs_data", false);
SettingWidgetBinder::BindWidgetToBoolSetting(sif, m_ui.disablePartialInvalidation, "EmuCore/GS", "UserHacks_DisablePartialInvalidation", false);
@ -481,11 +480,6 @@ GraphicsSettingsWidget::GraphicsSettingsWidget(SettingsDialog* dialog, QWidget*
tr("Convert 4-bit and 8-bit frame buffer on the CPU instead of the GPU. "
"Helps Harry Potter and Stuntman games. It has a big impact on performance."));
dialog->registerWidgetHelp(m_ui.memoryWrapping, tr("Memory Wrapping"), tr("Unchecked"),
tr("Emulates GS memory wrapping accurately. "
"This fixes issues where part of the image is cut-off by block shaped sections such as the FMVs in "
"Wallace & Gromit: The Curse of the Were-Rabbit and Thrillville."));
dialog->registerWidgetHelp(m_ui.preloadFrameData, tr("Preload Frame Data"), tr("Unchecked"),
tr("Uploads GS data when rendering a new frame to reproduce some effects accurately. "
"Fixes black screen issues in games like Armored Core: Last Raven."));

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

@ -58,7 +58,7 @@
<item>
<widget class="QTabWidget" name="tabs">
<property name="currentIndex">
<number>0</number>
<number>3</number>
</property>
<property name="documentMode">
<bool>true</bool>
@ -968,13 +968,6 @@
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QCheckBox" name="memoryWrapping">
<property name="text">
<string>Memory Wrapping</string>
</property>
</widget>
</item>
<item row="2" column="0">
<widget class="QCheckBox" name="disableSafeFeatures">
<property name="text">
@ -982,13 +975,6 @@
</property>
</widget>
</item>
<item row="2" column="1">
<widget class="QCheckBox" name="preloadFrameData">
<property name="text">
<string>Preload Frame Data</string>
</property>
</widget>
</item>
<item row="3" column="0">
<widget class="QCheckBox" name="disablePartialInvalidation">
<property name="text">
@ -996,7 +982,14 @@
</property>
</widget>
</item>
<item row="3" column="1">
<item row="1" column="1">
<widget class="QCheckBox" name="preloadFrameData">
<property name="text">
<string>Preload Frame Data</string>
</property>
</widget>
</item>
<item row="2" column="1">
<widget class="QCheckBox" name="textureInsideRt">
<property name="text">
<string>Texture Inside RT</string>

2
pcsx2/Frontend/FullscreenUI.cpp
View File

@ -2938,8 +2938,6 @@ void FullscreenUI::DrawGraphicsSettingsPage()
"EmuCore/GS", "UserHacks_CPU_FB_Conversion", false, manual_hw_fixes);
DrawToggleSetting(bsi, "Disable Depth Support", "Disable the support of depth buffer in the texture cache.", "EmuCore/GS",
"UserHacks_DisableDepthSupport", false, manual_hw_fixes);
DrawToggleSetting(
bsi, "Wrap GS Memory", "Emulates GS memory wrapping accurately.", "EmuCore/GS", "wrap_gs_mem", false, manual_hw_fixes);
DrawToggleSetting(bsi, "Disable Safe Features", "This option disables multiple safe features.", "EmuCore/GS",
"UserHacks_Disable_Safe_Features", false, manual_hw_fixes);
DrawToggleSetting(bsi, "Preload Frame", "Uploads GS data when rendering a new frame to reproduce some effects accurately.",

1
pcsx2/GS/GS.cpp
View File

@ -1556,7 +1556,6 @@ void GSApp::Init()
m_default_configuration["UserHacks_TCOffsetY"] = "0";
m_default_configuration["UserHacks_TextureInsideRt"] = "0";
m_default_configuration["UserHacks_WildHack"] = "0";
m_default_configuration["wrap_gs_mem"] = "0";
m_default_configuration["vsync"] = "0";
// clang-format on
}

7
pcsx2/GS/GSLocalMemory.cpp
View File

@ -62,15 +62,10 @@ GSLocalMemory::readImage GSLocalMemory::m_readImageX;
GSLocalMemory::GSLocalMemory()
: m_clut(this)
{
m_use_fifo_alloc = theApp.GetConfigB("UserHacks") && theApp.GetConfigB("wrap_gs_mem");
if (!GSConfig.UseHardwareRenderer())
m_use_fifo_alloc = true;
if (m_use_fifo_alloc)
m_vm8 = (u8*)fifo_alloc(m_vmsize, 4);
else
m_vm8 = nullptr;
m_vm8 = (u8*)fifo_alloc(m_vmsize, 4);
// Either we don't use fifo alloc or we get an error.
if (m_vm8 == nullptr)

3
pcsx2/GS/Window/GSSetting.cpp
View File

@ -154,9 +154,6 @@ const char* dialog_message(int ID, bool* updateText)
"It can help Xenosaga games.\n\n"
"Disables accurate GS Memory Clearing to be done on the CPU, and let only the GPU handle it.\n"
"It can help Kingdom Hearts games.");
case IDC_MEMORY_WRAPPING:
return cvtString("Emulates GS memory wrapping accurately. This fixes issues where part of the image is cut-off by block shaped sections such as the FMVs in Wallace & Gromit: The Curse of the Were-Rabbit and Thrillville.\n\n"
"Note: This hack can have a small impact on performance.");
case IDC_MERGE_PP_SPRITE:
return cvtString("Replaces post-processing multiple paving sprites by a single fat sprite.\n"
"It reduces various upscaling lines.\n\n"

1
pcsx2/GS/Window/GSSetting.h
View File

@ -61,7 +61,6 @@ enum
IDC_SAFE_FEATURES,
IDC_DISABLE_PARTIAL_TC_INV,
IDC_CPU_FB_CONVERSION,
IDC_MEMORY_WRAPPING,
IDC_PRELOAD_GS,
IDC_HALF_SCREEN_TS,
IDC_SKIPDRAWEND,

1
pcsx2/GS/Window/GSwxDialog.cpp
View File

@ -356,7 +356,6 @@ HacksTab::HacksTab(wxWindow* parent)
m_ui.addCheckBox(rend_hacks_grid, "Auto Flush", "UserHacks_AutoFlush", IDC_AUTO_FLUSH_HW, hacks_prereq);
m_ui.addCheckBox(rend_hacks_grid, "Frame Buffer Conversion", "UserHacks_CPU_FB_Conversion", IDC_CPU_FB_CONVERSION, hacks_prereq);
m_ui.addCheckBox(rend_hacks_grid, "Disable Depth Emulation", "UserHacks_DisableDepthSupport", IDC_TC_DEPTH, hacks_prereq);
m_ui.addCheckBox(rend_hacks_grid, "Memory Wrapping", "wrap_gs_mem", IDC_MEMORY_WRAPPING, hacks_prereq);
m_ui.addCheckBox(rend_hacks_grid, "Disable Safe Features", "UserHacks_Disable_Safe_Features", IDC_SAFE_FEATURES, hacks_prereq);
m_ui.addCheckBox(rend_hacks_grid, "Preload Frame Data", "preload_frame_with_gs_data", IDC_PRELOAD_GS, hacks_prereq);
m_ui.addCheckBox(rend_hacks_grid, "Disable Partial Invalidation", "UserHacks_DisablePartialInvalidation", IDC_DISABLE_PARTIAL_TC_INV, hacks_prereq);

1
pcsx2/Pcsx2Config.cpp
View File

@ -553,7 +553,6 @@ void Pcsx2Config::GSOptions::ReloadIniSettings()
GSSettingBoolEx(GPUPaletteConversion, "paltex");
GSSettingBoolEx(AutoFlushSW, "autoflush_sw");
GSSettingBoolEx(PreloadFrameWithGSData, "preload_frame_with_gs_data");
GSSettingBoolEx(WrapGSMem, "wrap_gs_mem");
GSSettingBoolEx(Mipmap, "mipmap");
GSSettingBoolEx(ManualUserHacks, "UserHacks");
GSSettingBoolEx(UserHacks_AlignSpriteX, "UserHacks_align_sprite_X");