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

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

DolphinQt: Fix selection of PP shader when using anaglyph 3D.
This commit is contained in:
Connor McLaughlin 2019-01-28 11:01:17 +10:00 committed by GitHub
parent 55da8473c9 c386a6a875
commit 84794a6f0c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -153,10 +153,9 @@ void EnhancementsWidget::LoadPPShaders()
{ {
const bool anaglyph = g_Config.stereo_mode == StereoMode::Anaglyph; const bool anaglyph = g_Config.stereo_mode == StereoMode::Anaglyph;
std::vector<std::string> shaders = std::vector<std::string> shaders =
g_Config.stereo_mode == StereoMode::Anaglyph ? anaglyph ? PostProcessingShaderImplementation::GetAnaglyphShaderList(
PostProcessingShaderImplementation::GetAnaglyphShaderList( g_Config.backend_info.api_type) :
g_Config.backend_info.api_type) : PostProcessingShaderImplementation::GetShaderList(g_Config.backend_info.api_type);
PostProcessingShaderImplementation::GetShaderList(g_Config.backend_info.api_type);
m_pp_effect->clear(); m_pp_effect->clear();
@ -261,9 +260,11 @@ void EnhancementsWidget::SaveSettings()
Config::SetBaseOrCurrent(Config::GFX_SSAA, is_ssaa); Config::SetBaseOrCurrent(Config::GFX_SSAA, is_ssaa);
Config::SetBaseOrCurrent( const bool anaglyph = g_Config.stereo_mode == StereoMode::Anaglyph;
Config::GFX_ENHANCE_POST_SHADER, Config::SetBaseOrCurrent(Config::GFX_ENHANCE_POST_SHADER,
m_pp_effect->currentIndex() == 0 ? "(off)" : m_pp_effect->currentText().toStdString()); (!anaglyph && m_pp_effect->currentIndex() == 0) ?
"(off)" :
m_pp_effect->currentText().toStdString());
PostProcessingShaderConfiguration pp_shader; PostProcessingShaderConfiguration pp_shader;
if (Config::Get(Config::GFX_ENHANCE_POST_SHADER) != "(off)") if (Config::Get(Config::GFX_ENHANCE_POST_SHADER) != "(off)")