Skip to content

Commit

Permalink
Merge pull request #6687 from spycrab/qt_graphics_caps
Browse files Browse the repository at this point in the history
Qt/GraphicsWindow: Disable unsupported options
  • Loading branch information
leoetlino committed Apr 27, 2018
2 parents 3b70da2 + 4caca2b commit 9c63bae
Show file tree
Hide file tree
Showing 3 changed files with 31 additions and 0 deletions.
10 changes: 10 additions & 0 deletions Source/Core/DolphinQt2/Config/Graphics/EnhancementsWidget.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -165,6 +165,16 @@ void EnhancementsWidget::LoadSettings()
m_pp_effect->setCurrentIndex(m_pp_effect->count() - 1);
}

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)));
}

PostProcessingShaderConfiguration pp_shader;
if (selected_shader != "(off)")
{
Expand Down
19 changes: 19 additions & 0 deletions Source/Core/DolphinQt2/Config/Graphics/HacksWidget.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
#include "Core/ConfigManager.h"
#include "DolphinQt2/Config/Graphics/GraphicsBool.h"
#include "DolphinQt2/Config/Graphics/GraphicsSlider.h"
#include "DolphinQt2/Config/Graphics/GraphicsWindow.h"
#include "VideoCommon/VideoConfig.h"

HacksWidget::HacksWidget(GraphicsWindow* parent) : GraphicsWidget(parent)
Expand All @@ -21,6 +22,9 @@ HacksWidget::HacksWidget(GraphicsWindow* parent) : GraphicsWidget(parent)
LoadSettings();
ConnectWidgets();
AddDescriptions();

connect(parent, &GraphicsWindow::BackendChanged, this, &HacksWidget::OnBackendChanged);
OnBackendChanged(QString::fromStdString(SConfig::GetInstance().m_strVideoBackend));
}

void HacksWidget::CreateWidgets()
Expand Down Expand Up @@ -98,6 +102,21 @@ void HacksWidget::CreateWidgets()
setLayout(main_layout);
}

void HacksWidget::OnBackendChanged(const QString& backend_name)
{
const bool bbox = g_Config.backend_info.bSupportsBBox;
const bool gpu_texture_decoding = g_Config.backend_info.bSupportsGPUTextureDecoding;

m_gpu_texture_decoding->setEnabled(gpu_texture_decoding);
m_disable_bounding_box->setEnabled(bbox);

if (!gpu_texture_decoding)
m_gpu_texture_decoding->setToolTip(tr("%1 doesn't support this feature.").arg(backend_name));

if (!bbox)
m_disable_bounding_box->setToolTip(tr("%1 doesn't support this feature.").arg(backend_name));
}

void HacksWidget::ConnectWidgets()
{
connect(m_accuracy, &QSlider::valueChanged, [this](int) { SaveSettings(); });
Expand Down
2 changes: 2 additions & 0 deletions Source/Core/DolphinQt2/Config/Graphics/HacksWidget.h
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@ class HacksWidget final : public GraphicsWidget
void LoadSettings() override;
void SaveSettings() override;

void OnBackendChanged(const QString& backend_name);

// EFB
QCheckBox* m_skip_efb_cpu;
QCheckBox* m_ignore_format_changes;
Expand Down

0 comments on commit 9c63bae

Please sign in to comment.