mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-01-31 09:33:06 +00:00
Disable Arbitrary Mipmap Detection checkbox when GPU Texture Decoding is enabled
See https://bugs.dolphin-emu.org/issues/13049
This commit is contained in:
parent
b969d89103
commit
d0afe36269
@ -41,6 +41,8 @@ EnhancementsWidget::EnhancementsWidget(GraphicsWindow* parent) : m_block_save(fa
|
|||||||
[this](const QString& backend) { LoadSettings(); });
|
[this](const QString& backend) { LoadSettings(); });
|
||||||
connect(parent, &GraphicsWindow::UseFastTextureSamplingChanged, this,
|
connect(parent, &GraphicsWindow::UseFastTextureSamplingChanged, this,
|
||||||
&EnhancementsWidget::LoadSettings);
|
&EnhancementsWidget::LoadSettings);
|
||||||
|
connect(parent, &GraphicsWindow::UseGPUTextureDecodingChanged, this,
|
||||||
|
&EnhancementsWidget::LoadSettings);
|
||||||
}
|
}
|
||||||
|
|
||||||
constexpr int TEXTURE_FILTERING_DEFAULT = 0;
|
constexpr int TEXTURE_FILTERING_DEFAULT = 0;
|
||||||
@ -295,6 +297,7 @@ void EnhancementsWidget::LoadSettings()
|
|||||||
{
|
{
|
||||||
m_block_save = true;
|
m_block_save = true;
|
||||||
m_texture_filtering_combo->setEnabled(Config::Get(Config::GFX_HACK_FAST_TEXTURE_SAMPLING));
|
m_texture_filtering_combo->setEnabled(Config::Get(Config::GFX_HACK_FAST_TEXTURE_SAMPLING));
|
||||||
|
m_arbitrary_mipmap_detection->setEnabled(!Config::Get(Config::GFX_ENABLE_GPU_TEXTURE_DECODING));
|
||||||
|
|
||||||
// Anti-Aliasing
|
// Anti-Aliasing
|
||||||
|
|
||||||
|
@ -25,6 +25,7 @@ public:
|
|||||||
signals:
|
signals:
|
||||||
void BackendChanged(const QString& backend);
|
void BackendChanged(const QString& backend);
|
||||||
void UseFastTextureSamplingChanged();
|
void UseFastTextureSamplingChanged();
|
||||||
|
void UseGPUTextureDecodingChanged();
|
||||||
|
|
||||||
private:
|
private:
|
||||||
void CreateMainLayout();
|
void CreateMainLayout();
|
||||||
|
@ -31,6 +31,10 @@ HacksWidget::HacksWidget(GraphicsWindow* parent)
|
|||||||
connect(parent, &GraphicsWindow::BackendChanged, this, &HacksWidget::OnBackendChanged);
|
connect(parent, &GraphicsWindow::BackendChanged, this, &HacksWidget::OnBackendChanged);
|
||||||
OnBackendChanged(QString::fromStdString(Config::Get(Config::MAIN_GFX_BACKEND)));
|
OnBackendChanged(QString::fromStdString(Config::Get(Config::MAIN_GFX_BACKEND)));
|
||||||
connect(&Settings::Instance(), &Settings::ConfigChanged, this, &HacksWidget::LoadSettings);
|
connect(&Settings::Instance(), &Settings::ConfigChanged, this, &HacksWidget::LoadSettings);
|
||||||
|
connect(m_gpu_texture_decoding, &QCheckBox::toggled, [this, parent] {
|
||||||
|
SaveSettings();
|
||||||
|
emit parent->UseGPUTextureDecodingChanged();
|
||||||
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
void HacksWidget::CreateWidgets()
|
void HacksWidget::CreateWidgets()
|
||||||
@ -264,8 +268,8 @@ void HacksWidget::AddDescriptions()
|
|||||||
static const char TR_GPU_DECODING_DESCRIPTION[] = QT_TR_NOOP(
|
static const char TR_GPU_DECODING_DESCRIPTION[] = QT_TR_NOOP(
|
||||||
"Enables texture decoding using the GPU instead of the CPU.<br><br>This may result in "
|
"Enables texture decoding using the GPU instead of the CPU.<br><br>This may result in "
|
||||||
"performance gains in some scenarios, or on systems where the CPU is the "
|
"performance gains in some scenarios, or on systems where the CPU is the "
|
||||||
"bottleneck.<br><br><dolphin_emphasis>If unsure, leave this "
|
"bottleneck.<br><br>This option is incompatible with Arbitrary Mipmap Detection.<br><br>"
|
||||||
"unchecked.</dolphin_emphasis>");
|
"<dolphin_emphasis>If unsure, leave this unchecked.</dolphin_emphasis>");
|
||||||
static const char TR_FAST_DEPTH_CALC_DESCRIPTION[] = QT_TR_NOOP(
|
static const char TR_FAST_DEPTH_CALC_DESCRIPTION[] = QT_TR_NOOP(
|
||||||
"Uses a less accurate algorithm to calculate depth values.<br><br>Causes issues in a few "
|
"Uses a less accurate algorithm to calculate depth values.<br><br>Causes issues in a few "
|
||||||
"games, but can result in a decent speed increase depending on the game and/or "
|
"games, but can result in a decent speed increase depending on the game and/or "
|
||||||
|
Loading…
x
Reference in New Issue
Block a user