From ea6d276a46d1594b0cc021ce46ede3e3cd4af2a0 Mon Sep 17 00:00:00 2001 From: lightningterror <18107717+lightningterror@users.noreply.github.com> Date: Mon, 28 Nov 2022 16:33:27 +0100 Subject: [PATCH] config: Remove external shader support. --- pcsx2/Config.h | 5 ----- pcsx2/GS/GS.cpp | 8 +------- pcsx2/Pcsx2Config.cpp | 12 +----------- 3 files changed, 2 insertions(+), 23 deletions(-) diff --git a/pcsx2/Config.h b/pcsx2/Config.h index f6176d9901..9e5888bd83 100644 --- a/pcsx2/Config.h +++ b/pcsx2/Config.h @@ -531,9 +531,6 @@ struct Pcsx2Config UserHacks_TextureInsideRt : 1, FXAA : 1, ShadeBoost : 1, -#ifndef PCSX2_CORE - ShaderFX : 1, -#endif DumpGSData : 1, SaveRT : 1, SaveFrame : 1, @@ -616,8 +613,6 @@ struct Pcsx2Config int SaveN{0}; int SaveL{5000}; std::string Adapter; - std::string ShaderFX_Conf; - std::string ShaderFX_GLSL; GSOptions(); diff --git a/pcsx2/GS/GS.cpp b/pcsx2/GS/GS.cpp index 4750dabb1c..284a958dcc 100644 --- a/pcsx2/GS/GS.cpp +++ b/pcsx2/GS/GS.cpp @@ -798,10 +798,7 @@ void GSUpdateConfig(const Pcsx2Config::GSOptions& new_config) GSConfig.SWExtraThreadsHeight != old_config.SWExtraThreadsHeight || GSConfig.SaveN != old_config.SaveN || - GSConfig.SaveL != old_config.SaveL || - - GSConfig.ShaderFX_Conf != old_config.ShaderFX_Conf || - GSConfig.ShaderFX_GLSL != old_config.ShaderFX_GLSL) + GSConfig.SaveL != old_config.SaveL) { if (!GSreopen(false, old_config)) pxFailRel("Failed to do quick GS reopen"); @@ -1504,9 +1501,6 @@ void GSApp::Init() m_default_configuration["ShadeBoost_Brightness"] = "50"; m_default_configuration["ShadeBoost_Contrast"] = "50"; m_default_configuration["ShadeBoost_Saturation"] = "50"; - m_default_configuration["shaderfx"] = "0"; - m_default_configuration["shaderfx_conf"] = "shaders/GS_FX_Settings.ini"; - m_default_configuration["shaderfx_glsl"] = "shaders/GS.fx"; m_default_configuration["SkipDuplicateFrames"] = "0"; m_default_configuration["texture_preloading"] = "2"; m_default_configuration["ThreadedPresentation"] = "0"; diff --git a/pcsx2/Pcsx2Config.cpp b/pcsx2/Pcsx2Config.cpp index 6530ca46b0..19c685a8a7 100644 --- a/pcsx2/Pcsx2Config.cpp +++ b/pcsx2/Pcsx2Config.cpp @@ -350,9 +350,6 @@ Pcsx2Config::GSOptions::GSOptions() LoadTextureReplacements = false; LoadTextureReplacementsAsync = true; PrecacheTextureReplacements = false; - - ShaderFX_Conf = "shaders/GS_FX_Settings.ini"; - ShaderFX_GLSL = "shaders/GS.fx"; } bool Pcsx2Config::GSOptions::operator==(const GSOptions& right) const @@ -433,9 +430,7 @@ bool Pcsx2Config::GSOptions::OptionsAreEqual(const GSOptions& right) const OpEqu(ShadeBoost_Saturation) && OpEqu(SaveN) && OpEqu(SaveL) && - OpEqu(Adapter) && - OpEqu(ShaderFX_Conf) && - OpEqu(ShaderFX_GLSL)); + OpEqu(Adapter)); } bool Pcsx2Config::GSOptions::operator!=(const GSOptions& right) const @@ -569,9 +564,6 @@ void Pcsx2Config::GSOptions::ReloadIniSettings() GSSettingBoolEx(UserHacks_TextureInsideRt, "UserHacks_TextureInsideRt"); GSSettingBoolEx(FXAA, "fxaa"); GSSettingBool(ShadeBoost); -#ifndef PCSX2_CORE - GSSettingBoolEx(ShaderFX, "shaderfx"); -#endif GSSettingBoolEx(DumpGSData, "dump"); GSSettingBoolEx(SaveRT, "save"); GSSettingBoolEx(SaveFrame, "savef"); @@ -633,8 +625,6 @@ void Pcsx2Config::GSOptions::ReloadIniSettings() GSSettingIntEx(SaveL, "savel"); GSSettingString(Adapter); - GSSettingStringEx(ShaderFX_Conf, "shaderfx_conf"); - GSSettingStringEx(ShaderFX_GLSL, "shaderfx_glsl"); #undef GSSettingInt #undef GSSettingIntEx