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

config: Remove external shader support.

This commit is contained in:
lightningterror 2022-11-28 16:33:27 +01:00
parent a323145344
commit ea6d276a46
3 changed files with 2 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pcsx2/Config.h
View File

@ -531,9 +531,6 @@ struct Pcsx2Config
UserHacks_TextureInsideRt : 1, UserHacks_TextureInsideRt : 1,
FXAA : 1, FXAA : 1,
ShadeBoost : 1, ShadeBoost : 1,
#ifndef PCSX2_CORE
ShaderFX : 1,
#endif
DumpGSData : 1, DumpGSData : 1,
SaveRT : 1, SaveRT : 1,
SaveFrame : 1, SaveFrame : 1,
@ -616,8 +613,6 @@ struct Pcsx2Config
int SaveN{0}; int SaveN{0};
int SaveL{5000}; int SaveL{5000};
std::string Adapter; std::string Adapter;
std::string ShaderFX_Conf;
std::string ShaderFX_GLSL;
GSOptions(); GSOptions();

8
pcsx2/GS/GS.cpp
View File

@ -798,10 +798,7 @@ void GSUpdateConfig(const Pcsx2Config::GSOptions& new_config)
GSConfig.SWExtraThreadsHeight != old_config.SWExtraThreadsHeight || GSConfig.SWExtraThreadsHeight != old_config.SWExtraThreadsHeight ||
GSConfig.SaveN != old_config.SaveN || GSConfig.SaveN != old_config.SaveN ||
GSConfig.SaveL != old_config.SaveL || GSConfig.SaveL != old_config.SaveL)
GSConfig.ShaderFX_Conf != old_config.ShaderFX_Conf ||
GSConfig.ShaderFX_GLSL != old_config.ShaderFX_GLSL)
{ {
if (!GSreopen(false, old_config)) if (!GSreopen(false, old_config))
pxFailRel("Failed to do quick GS reopen"); pxFailRel("Failed to do quick GS reopen");
@ -1504,9 +1501,6 @@ void GSApp::Init()
m_default_configuration["ShadeBoost_Brightness"] = "50"; m_default_configuration["ShadeBoost_Brightness"] = "50";
m_default_configuration["ShadeBoost_Contrast"] = "50"; m_default_configuration["ShadeBoost_Contrast"] = "50";
m_default_configuration["ShadeBoost_Saturation"] = "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["SkipDuplicateFrames"] = "0";
m_default_configuration["texture_preloading"] = "2"; m_default_configuration["texture_preloading"] = "2";
m_default_configuration["ThreadedPresentation"] = "0"; m_default_configuration["ThreadedPresentation"] = "0";

12
pcsx2/Pcsx2Config.cpp
View File

@ -350,9 +350,6 @@ Pcsx2Config::GSOptions::GSOptions()
LoadTextureReplacements = false; LoadTextureReplacements = false;
LoadTextureReplacementsAsync = true; LoadTextureReplacementsAsync = true;
PrecacheTextureReplacements = false; PrecacheTextureReplacements = false;
ShaderFX_Conf = "shaders/GS_FX_Settings.ini";
ShaderFX_GLSL = "shaders/GS.fx";
} }
bool Pcsx2Config::GSOptions::operator==(const GSOptions& right) const bool Pcsx2Config::GSOptions::operator==(const GSOptions& right) const
@ -433,9 +430,7 @@ bool Pcsx2Config::GSOptions::OptionsAreEqual(const GSOptions& right) const
OpEqu(ShadeBoost_Saturation) && OpEqu(ShadeBoost_Saturation) &&
OpEqu(SaveN) && OpEqu(SaveN) &&
OpEqu(SaveL) && OpEqu(SaveL) &&
OpEqu(Adapter) && OpEqu(Adapter));
OpEqu(ShaderFX_Conf) &&
OpEqu(ShaderFX_GLSL));
} }
bool Pcsx2Config::GSOptions::operator!=(const GSOptions& right) const bool Pcsx2Config::GSOptions::operator!=(const GSOptions& right) const
@ -569,9 +564,6 @@ void Pcsx2Config::GSOptions::ReloadIniSettings()
GSSettingBoolEx(UserHacks_TextureInsideRt, "UserHacks_TextureInsideRt"); GSSettingBoolEx(UserHacks_TextureInsideRt, "UserHacks_TextureInsideRt");
GSSettingBoolEx(FXAA, "fxaa"); GSSettingBoolEx(FXAA, "fxaa");
GSSettingBool(ShadeBoost); GSSettingBool(ShadeBoost);
#ifndef PCSX2_CORE
GSSettingBoolEx(ShaderFX, "shaderfx");
#endif
GSSettingBoolEx(DumpGSData, "dump"); GSSettingBoolEx(DumpGSData, "dump");
GSSettingBoolEx(SaveRT, "save"); GSSettingBoolEx(SaveRT, "save");
GSSettingBoolEx(SaveFrame, "savef"); GSSettingBoolEx(SaveFrame, "savef");
@ -633,8 +625,6 @@ void Pcsx2Config::GSOptions::ReloadIniSettings()
GSSettingIntEx(SaveL, "savel"); GSSettingIntEx(SaveL, "savel");
GSSettingString(Adapter); GSSettingString(Adapter);
GSSettingStringEx(ShaderFX_Conf, "shaderfx_conf");
GSSettingStringEx(ShaderFX_GLSL, "shaderfx_glsl");
#undef GSSettingInt #undef GSSettingInt
#undef GSSettingIntEx #undef GSSettingIntEx