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

Disable Texture Filtering dropdown when Manual Texture Sampling is checked 

See https://bugs.dolphin-emu.org/issues/13049
This commit is contained in:
Pokechu22 2022-09-24 23:50:41 -07:00
parent 900439ea0d
commit b969d89103
3 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Source/Core/DolphinQt/Config/Graphics/AdvancedWidget.cpp
View File

@ -36,6 +36,10 @@ AdvancedWidget::AdvancedWidget(GraphicsWindow* parent)
connect(&Settings::Instance(), &Settings::EmulationStateChanged, this, [this](Core::State state) { connect(&Settings::Instance(), &Settings::EmulationStateChanged, this, [this](Core::State state) {
OnEmulationStateChanged(state != Core::State::Uninitialized); OnEmulationStateChanged(state != Core::State::Uninitialized);
}); });
connect(m_manual_texture_sampling, &QCheckBox::toggled, [this, parent] {
SaveSettings();
emit parent->UseFastTextureSamplingChanged();
});
OnBackendChanged(); OnBackendChanged();
OnEmulationStateChanged(Core::GetState() != Core::State::Uninitialized); OnEmulationStateChanged(Core::GetState() != Core::State::Uninitialized);

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

@ -39,6 +39,8 @@ EnhancementsWidget::EnhancementsWidget(GraphicsWindow* parent) : m_block_save(fa
AddDescriptions(); AddDescriptions();
connect(parent, &GraphicsWindow::BackendChanged, connect(parent, &GraphicsWindow::BackendChanged,
[this](const QString& backend) { LoadSettings(); }); [this](const QString& backend) { LoadSettings(); });
connect(parent, &GraphicsWindow::UseFastTextureSamplingChanged, this,
&EnhancementsWidget::LoadSettings);
} }
constexpr int TEXTURE_FILTERING_DEFAULT = 0; constexpr int TEXTURE_FILTERING_DEFAULT = 0;
@ -292,6 +294,8 @@ void EnhancementsWidget::LoadPPShaders()
void EnhancementsWidget::LoadSettings() void EnhancementsWidget::LoadSettings()
{ {
m_block_save = true; m_block_save = true;
m_texture_filtering_combo->setEnabled(Config::Get(Config::GFX_HACK_FAST_TEXTURE_SAMPLING));
// Anti-Aliasing // Anti-Aliasing
const u32 aa_selection = Config::Get(Config::GFX_MSAA); const u32 aa_selection = Config::Get(Config::GFX_MSAA);
@ -488,7 +492,8 @@ void EnhancementsWidget::AddDescriptions()
"that are at oblique viewing angles. Force Nearest and Force Linear override the texture " "that are at oblique viewing angles. Force Nearest and Force Linear override the texture "
"scaling filter selected by the game.<br><br>Any option except 'Default' will alter the look " "scaling filter selected by the game.<br><br>Any option except 'Default' will alter the look "
"of the game's textures and might cause issues in a small number of " "of the game's textures and might cause issues in a small number of "
"games.<br><br><dolphin_emphasis>If unsure, select 'Default'.</dolphin_emphasis>"); "games.<br><br>This option is incompatible with Manual Texture Sampling.<br><br>"
"<dolphin_emphasis>If unsure, select 'Default'.</dolphin_emphasis>");
static const char TR_OUTPUT_RESAMPLING_DESCRIPTION[] = static const char TR_OUTPUT_RESAMPLING_DESCRIPTION[] =
QT_TR_NOOP("Affects how the game output is scaled to the window resolution." QT_TR_NOOP("Affects how the game output is scaled to the window resolution."
"<br>The performance mostly depends on the number of samples each method uses." "<br>The performance mostly depends on the number of samples each method uses."

1
Source/Core/DolphinQt/Config/Graphics/GraphicsWindow.h
View File

@ -24,6 +24,7 @@ public:
signals: signals:
void BackendChanged(const QString& backend); void BackendChanged(const QString& backend);
void UseFastTextureSamplingChanged();
private: private:
void CreateMainLayout(); void CreateMainLayout();