mirror/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-01-31 09:33:06 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #12358 from rsgnz/master

Browse Source 
VideoCommon: Fix "Post-processing shader not found" when (off) is selected.
This commit is contained in:
Tilka 2023-12-17 09:50:41 +00:00 committed by GitHub
commit 18f9b966a0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Source/Core/DolphinQt/Config/Graphics/EnhancementsWidget.cpp
View File

@ -297,7 +297,7 @@ void EnhancementsWidget::LoadPPShaders()
.arg(tr(g_video_backend->GetDisplayName().c_str()))); .arg(tr(g_video_backend->GetDisplayName().c_str())));
VideoCommon::PostProcessingConfiguration pp_shader; VideoCommon::PostProcessingConfiguration pp_shader;
if (selected_shader != "(off)" && supports_postprocessing) if (selected_shader != "" && supports_postprocessing)
{ {
pp_shader.LoadShader(selected_shader); pp_shader.LoadShader(selected_shader);
m_configure_pp_effect->setEnabled(pp_shader.HasOptions()); m_configure_pp_effect->setEnabled(pp_shader.HasOptions());
@ -473,11 +473,11 @@ void EnhancementsWidget::SaveSettings()
const bool passive = g_Config.stereo_mode == StereoMode::Passive; const bool passive = g_Config.stereo_mode == StereoMode::Passive;
Config::SetBaseOrCurrent(Config::GFX_ENHANCE_POST_SHADER, Config::SetBaseOrCurrent(Config::GFX_ENHANCE_POST_SHADER,
(!anaglyph && !passive && m_pp_effect->currentIndex() == 0) ? (!anaglyph && !passive && m_pp_effect->currentIndex() == 0) ?
"(off)" : "" :
m_pp_effect->currentText().toStdString()); m_pp_effect->currentText().toStdString());
VideoCommon::PostProcessingConfiguration pp_shader; VideoCommon::PostProcessingConfiguration pp_shader;
if (Config::Get(Config::GFX_ENHANCE_POST_SHADER) != "(off)") if (Config::Get(Config::GFX_ENHANCE_POST_SHADER) != "")
{ {
pp_shader.LoadShader(Config::Get(Config::GFX_ENHANCE_POST_SHADER)); pp_shader.LoadShader(Config::Get(Config::GFX_ENHANCE_POST_SHADER));
m_configure_pp_effect->setEnabled(pp_shader.HasOptions()); m_configure_pp_effect->setEnabled(pp_shader.HasOptions());