From 538aa3197f30bbdae5747dfde5501df4d3cb6d45 Mon Sep 17 00:00:00 2001 From: spycrab Date: Sat, 26 May 2018 17:23:32 +0200 Subject: [PATCH 1/3] Qt/EnhancementsWidget: Fix "feature not supported" not disappearing when switching backends --- .../Config/Graphics/EnhancementsWidget.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Source/Core/DolphinQt2/Config/Graphics/EnhancementsWidget.cpp b/Source/Core/DolphinQt2/Config/Graphics/EnhancementsWidget.cpp index 0d0c1915ac..ea12e165bc 100644 --- a/Source/Core/DolphinQt2/Config/Graphics/EnhancementsWidget.cpp +++ b/Source/Core/DolphinQt2/Config/Graphics/EnhancementsWidget.cpp @@ -21,7 +21,9 @@ #include "DolphinQt2/Config/Graphics/PostProcessingConfigWindow.h" #include "DolphinQt2/Settings.h" #include "UICommon/VideoUtils.h" + #include "VideoCommon/PostProcessing.h" +#include "VideoCommon/VideoBackendBase.h" #include "VideoCommon/VideoConfig.h" EnhancementsWidget::EnhancementsWidget(GraphicsWindow* parent) @@ -165,12 +167,10 @@ void EnhancementsWidget::LoadPPShaders() const bool supports_postprocessing = g_Config.backend_info.bSupportsPostProcessing; m_pp_effect->setEnabled(supports_postprocessing); - if (!supports_postprocessing) - { - m_pp_effect->setToolTip( - tr("%1 doesn't support this feature.") - .arg(QString::fromStdString(SConfig::GetInstance().m_strVideoBackend))); - } + m_pp_effect->setToolTip(supports_postprocessing ? + QStringLiteral("") : + tr("%1 doesn't support this feature.") + .arg(QString::fromStdString(g_video_backend->GetDisplayName()))); PostProcessingShaderConfiguration pp_shader; if (selected_shader != "(off)") From 30aa291e837e5a32e59d53b5b69fdb91d59a5ec7 Mon Sep 17 00:00:00 2001 From: spycrab Date: Sat, 26 May 2018 17:34:12 +0200 Subject: [PATCH 2/3] Qt/EnhacementsWidget: Default anaglyph to "dubois" --- .../Config/Graphics/EnhancementsWidget.cpp | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/Source/Core/DolphinQt2/Config/Graphics/EnhancementsWidget.cpp b/Source/Core/DolphinQt2/Config/Graphics/EnhancementsWidget.cpp index ea12e165bc..0d015f5f5c 100644 --- a/Source/Core/DolphinQt2/Config/Graphics/EnhancementsWidget.cpp +++ b/Source/Core/DolphinQt2/Config/Graphics/EnhancementsWidget.cpp @@ -146,6 +146,7 @@ void EnhancementsWidget::ConnectWidgets() void EnhancementsWidget::LoadPPShaders() { + const bool anaglyph = g_Config.stereo_mode == StereoMode::Anaglyph; std::vector shaders = g_Config.stereo_mode == StereoMode::Anaglyph ? PostProcessingShaderImplementation::GetAnaglyphShaderList( @@ -153,17 +154,27 @@ void EnhancementsWidget::LoadPPShaders() PostProcessingShaderImplementation::GetShaderList(g_Config.backend_info.api_type); m_pp_effect->clear(); - m_pp_effect->addItem(tr("(off)")); - const auto selected_shader = Config::Get(Config::GFX_ENHANCE_POST_SHADER); + if (!anaglyph) + m_pp_effect->addItem(tr("(off)")); + + auto selected_shader = Config::Get(Config::GFX_ENHANCE_POST_SHADER); + + bool found = false; for (const auto& shader : shaders) { m_pp_effect->addItem(QString::fromStdString(shader)); if (selected_shader == shader) + { m_pp_effect->setCurrentIndex(m_pp_effect->count() - 1); + found = true; + } } + if (anaglyph && !found) + m_pp_effect->setCurrentIndex(m_pp_effect->findText(QStringLiteral("dubois"))); + const bool supports_postprocessing = g_Config.backend_info.bSupportsPostProcessing; m_pp_effect->setEnabled(supports_postprocessing); From d3eff9314046ff4b7ae6593f5aa672d437ef8903 Mon Sep 17 00:00:00 2001 From: spycrab Date: Sat, 26 May 2018 17:52:28 +0200 Subject: [PATCH 3/3] Qt/EnhancementsWidget: Fix missing / duplicate anaglyph options --- Source/Core/DolphinQt2/Config/Graphics/EnhancementsWidget.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/Core/DolphinQt2/Config/Graphics/EnhancementsWidget.cpp b/Source/Core/DolphinQt2/Config/Graphics/EnhancementsWidget.cpp index 0d015f5f5c..437d7caa43 100644 --- a/Source/Core/DolphinQt2/Config/Graphics/EnhancementsWidget.cpp +++ b/Source/Core/DolphinQt2/Config/Graphics/EnhancementsWidget.cpp @@ -217,7 +217,7 @@ void EnhancementsWidget::LoadSettings() bool has_3dvision = m_3d_mode->count() == 6; if (has_3dvision && !supports_3dvision) - m_3d_mode->removeItem(4); + m_3d_mode->removeItem(5); if (!has_3dvision && supports_3dvision) m_3d_mode->addItem(tr("NVIDIA 3D Vision"));