From 4e852723934aea5c921238ab75206300d49a6945 Mon Sep 17 00:00:00 2001 From: TheTechnician27 Date: Wed, 8 Oct 2025 16:41:34 -0500 Subject: [PATCH] Settings: Remove obsolete transitionary function --- pcsx2-qt/Settings/GraphicsSettingsWidget.cpp | 64 -------------------- pcsx2-qt/Settings/GraphicsSettingsWidget.h | 1 - 2 files changed, 65 deletions(-) diff --git a/pcsx2-qt/Settings/GraphicsSettingsWidget.cpp b/pcsx2-qt/Settings/GraphicsSettingsWidget.cpp index 29ca6c0de1..acbc46228f 100644 --- a/pcsx2-qt/Settings/GraphicsSettingsWidget.cpp +++ b/pcsx2-qt/Settings/GraphicsSettingsWidget.cpp @@ -71,15 +71,6 @@ GraphicsSettingsWidget::GraphicsSettingsWidget(SettingsWindow* settings_dialog, setupTab(m_capture, tr("Media Capture")); m_advanced_tab = setupTab(m_advanced, tr("Advanced")); -#ifndef PCSX2_DEVBUILD - if (!dialog()->isPerGameSettings()) - { - // We removed hardware fixes from global settings, but people in the past did set this stuff globally. - // So, just reset it all. We can remove this code at some point in the future. - resetManualHardwareFixes(); - } -#endif - ////////////////////////////////////////////////////////////////////////// // Display Settings ////////////////////////////////////////////////////////////////////////// @@ -1315,58 +1306,3 @@ void GraphicsSettingsWidget::onUpscaleMultiplierChanged() dialog()->setFloatSettingValue("EmuCore/GS", "upscale_multiplier", data.isValid() ? std::optional(data.toFloat()) : std::optional()); } - -void GraphicsSettingsWidget::resetManualHardwareFixes() -{ - bool changed = false; - { - auto lock = Host::GetSettingsLock(); - SettingsInterface* const si = Host::Internal::GetBaseSettingsLayer(); - - auto check_bool = [&](const char* section, const char* key, bool expected) { - if (si->GetBoolValue(section, key, expected) != expected) - { - si->SetBoolValue(section, key, expected); - changed = true; - } - }; - auto check_int = [&](const char* section, const char* key, s32 expected) { - if (si->GetIntValue(section, key, expected) != expected) - { - si->SetIntValue(section, key, expected); - changed = true; - } - }; - - check_bool("EmuCore/GS", "UserHacks", false); - - check_int("EmuCore/GS", "UserHacks_CPUSpriteRenderBW", 0); - check_int("EmuCore/GS", "UserHacks_CPUCLUTRender", 0); - check_int("EmuCore/GS", "UserHacks_GPUTargetCLUTMode", 0); - check_int("EmuCore/GS", "UserHacks_SkipDraw_Start", 0); - check_int("EmuCore/GS", "UserHacks_SkipDraw_End", 0); - check_bool("EmuCore/GS", "UserHacks_AutoFlush", false); - check_bool("EmuCore/GS", "UserHacks_CPU_FB_Conversion", false); - check_bool("EmuCore/GS", "UserHacks_DisableDepthSupport", false); - check_bool("EmuCore/GS", "UserHacks_Disable_Safe_Features", false); - check_bool("EmuCore/GS", "UserHacks_DisableRenderFixes", false); - check_bool("EmuCore/GS", "preload_frame_with_gs_data", false); - check_bool("EmuCore/GS", "UserHacks_DisablePartialInvalidation", false); - check_int("EmuCore/GS", "UserHacks_TextureInsideRt", static_cast(GSTextureInRtMode::Disabled)); - check_bool("EmuCore/GS", "UserHacks_ReadTCOnClose", false); - check_bool("EmuCore/GS", "UserHacks_EstimateTextureRegion", false); - check_bool("EmuCore/GS", "paltex", false); - check_int("EmuCore/GS", "UserHacks_HalfPixelOffset", 0); - check_int("EmuCore/GS", "UserHacks_native_scaling", static_cast(GSNativeScaling::Off)); - check_int("EmuCore/GS", "UserHacks_round_sprite_offset", 0); - check_int("EmuCore/GS", "UserHacks_TCOffsetX", 0); - check_int("EmuCore/GS", "UserHacks_TCOffsetY", 0); - check_bool("EmuCore/GS", "UserHacks_align_sprite_X", false); - check_bool("EmuCore/GS", "UserHacks_merge_pp_sprite", false); - check_bool("EmuCore/GS", "UserHacks_ForceEvenSpritePosition", false); - check_bool("EmuCore/GS", "UserHacks_BilinearHack", false); - } - - if (changed) - Host::CommitBaseSettingChanges(); -} diff --git a/pcsx2-qt/Settings/GraphicsSettingsWidget.h b/pcsx2-qt/Settings/GraphicsSettingsWidget.h index bc3d5f2ec0..1dcfba7b89 100644 --- a/pcsx2-qt/Settings/GraphicsSettingsWidget.h +++ b/pcsx2-qt/Settings/GraphicsSettingsWidget.h @@ -60,7 +60,6 @@ private: GSRendererType getEffectiveRenderer() const; void updateRendererDependentOptions(); void populateUpscaleMultipliers(u32 max_upscale_multiplier); - void resetManualHardwareFixes(); Ui::GraphicsSettingsHeader m_header; Ui::GraphicsDisplaySettingsTab m_display;