Skip to content
Permalink
Browse files

Merge pull request #7749 from jordan-woyak/fix-anaglyph-pp-selection

DolphinQt: Fix selection of PP shader when using anaglyph 3D.
  • Loading branch information...
stenzek committed Jan 28, 2019
2 parents 55da847 + c386a6a commit 84794a6f0cdfc63a957b5bb8dd887a0ea30dd4f7
Showing with 8 additions and 7 deletions.
  1. +8 −7 Source/Core/DolphinQt/Config/Graphics/EnhancementsWidget.cpp
@@ -153,10 +153,9 @@ void EnhancementsWidget::LoadPPShaders()
{
const bool anaglyph = g_Config.stereo_mode == StereoMode::Anaglyph;
std::vector<std::string> shaders =
g_Config.stereo_mode == StereoMode::Anaglyph ?
PostProcessingShaderImplementation::GetAnaglyphShaderList(
g_Config.backend_info.api_type) :
PostProcessingShaderImplementation::GetShaderList(g_Config.backend_info.api_type);
anaglyph ? PostProcessingShaderImplementation::GetAnaglyphShaderList(
g_Config.backend_info.api_type) :
PostProcessingShaderImplementation::GetShaderList(g_Config.backend_info.api_type);

m_pp_effect->clear();

@@ -261,9 +260,11 @@ void EnhancementsWidget::SaveSettings()

Config::SetBaseOrCurrent(Config::GFX_SSAA, is_ssaa);

Config::SetBaseOrCurrent(
Config::GFX_ENHANCE_POST_SHADER,
m_pp_effect->currentIndex() == 0 ? "(off)" : m_pp_effect->currentText().toStdString());
const bool anaglyph = g_Config.stereo_mode == StereoMode::Anaglyph;
Config::SetBaseOrCurrent(Config::GFX_ENHANCE_POST_SHADER,
(!anaglyph && m_pp_effect->currentIndex() == 0) ?
"(off)" :
m_pp_effect->currentText().toStdString());

PostProcessingShaderConfiguration pp_shader;
if (Config::Get(Config::GFX_ENHANCE_POST_SHADER) != "(off)")

0 comments on commit 84794a6

Please sign in to comment.
You can’t perform that action at this time.