VERY experimental Nintendo Switch 2 emulator
C++
video_core: Removed AF for all mip modes option as it's default now
Wollnashorn62b0b6bde04e
diff --git a/src/common/settings.cpp b/src/common/settings.cppindex da5cca5890..9ff3edabba 100644--- a/src/common/settings.cpp+++ b/src/common/settings.cpp@@ -236,7 +236,6 @@ void RestoreGlobalState(bool is_powered_on) {values.bg_blue.SetGlobal(true);values.enable_compute_pipelines.SetGlobal(true);values.use_video_framerate.SetGlobal(true);- values.use_aggressive_anisotropic_filtering.SetGlobal(true);// Systemvalues.language_index.SetGlobal(true);diff --git a/src/common/settings.h b/src/common/settings.hindex 78ca73e42b..9682281b08 100644--- a/src/common/settings.h+++ b/src/common/settings.h@@ -483,8 +483,6 @@ struct Values {AstcRecompression::Uncompressed, AstcRecompression::Uncompressed, AstcRecompression::Bc3,"astc_recompression"};SwitchableSetting<bool> use_video_framerate{false, "use_video_framerate"};- SwitchableSetting<bool> use_aggressive_anisotropic_filtering{- false, "use_aggressive_anisotropic_filtering"};SwitchableSetting<u8> bg_red{0, "bg_red"};SwitchableSetting<u8> bg_green{0, "bg_green"};diff --git a/src/video_core/textures/texture.cpp b/src/video_core/textures/texture.cppindex 63ebdfa827..d8b88d9bc2 100644--- a/src/video_core/textures/texture.cpp+++ b/src/video_core/textures/texture.cpp@@ -62,14 +62,12 @@ std::array<float, 4> TSCEntry::BorderColor() const noexcept {}float TSCEntry::MaxAnisotropy() const noexcept {- const bool is_suitable_mipmap_filter = Settings::values.use_aggressive_anisotropic_filtering- ? mipmap_filter != TextureMipmapFilter::None- : mipmap_filter == TextureMipmapFilter::Linear;+ const bool is_suitable_mipmap_filter = mipmap_filter != TextureMipmapFilter::None;const bool has_regular_lods = min_lod_clamp == 0 && max_lod_clamp >= 256;const bool is_bilinear_filter = min_filter == TextureFilter::Linear &&reduction_filter == SamplerReduction::WeightedAverage;- if (max_anisotropy == 0 && (depth_compare_enabled || !has_regular_lods || !is_bilinear_filter ||- !is_suitable_mipmap_filter)) {+ if (max_anisotropy == 0 && (!is_suitable_mipmap_filter || !has_regular_lods ||+ !is_bilinear_filter || depth_compare_enabled)) {return 1.0f;}const auto anisotropic_settings = Settings::values.max_anisotropy.GetValue();diff --git a/src/yuzu/configuration/config.cpp b/src/yuzu/configuration/config.cppindex 27839daaa2..bac9dff90b 100644--- a/src/yuzu/configuration/config.cpp+++ b/src/yuzu/configuration/config.cpp@@ -761,7 +761,6 @@ void Config::ReadRendererValues() {ReadGlobalSetting(Settings::values.use_vulkan_driver_pipeline_cache);ReadGlobalSetting(Settings::values.enable_compute_pipelines);ReadGlobalSetting(Settings::values.use_video_framerate);- ReadGlobalSetting(Settings::values.use_aggressive_anisotropic_filtering);ReadGlobalSetting(Settings::values.bg_red);ReadGlobalSetting(Settings::values.bg_green);ReadGlobalSetting(Settings::values.bg_blue);@@ -1418,7 +1417,6 @@ void Config::SaveRendererValues() {WriteGlobalSetting(Settings::values.use_vulkan_driver_pipeline_cache);WriteGlobalSetting(Settings::values.enable_compute_pipelines);WriteGlobalSetting(Settings::values.use_video_framerate);- WriteGlobalSetting(Settings::values.use_aggressive_anisotropic_filtering);WriteGlobalSetting(Settings::values.bg_red);WriteGlobalSetting(Settings::values.bg_green);WriteGlobalSetting(Settings::values.bg_blue);diff --git a/src/yuzu/configuration/configure_graphics_advanced.cpp b/src/yuzu/configuration/configure_graphics_advanced.cppindex 3dce739683..0463ac8b9f 100644--- a/src/yuzu/configuration/configure_graphics_advanced.cpp+++ b/src/yuzu/configuration/configure_graphics_advanced.cpp@@ -31,7 +31,6 @@ void ConfigureGraphicsAdvanced::SetConfiguration() {ui->use_asynchronous_shaders->setEnabled(runtime_lock);ui->anisotropic_filtering_combobox->setEnabled(runtime_lock);ui->enable_compute_pipelines_checkbox->setEnabled(runtime_lock);- ui->use_aggressive_anisotropic_filtering->setEnabled(runtime_lock);ui->async_present->setChecked(Settings::values.async_presentation.GetValue());ui->renderer_force_max_clock->setChecked(Settings::values.renderer_force_max_clock.GetValue());@@ -44,8 +43,6 @@ void ConfigureGraphicsAdvanced::SetConfiguration() {ui->enable_compute_pipelines_checkbox->setChecked(Settings::values.enable_compute_pipelines.GetValue());ui->use_video_framerate_checkbox->setChecked(Settings::values.use_video_framerate.GetValue());- ui->use_aggressive_anisotropic_filtering->setChecked(- Settings::values.use_aggressive_anisotropic_filtering.GetValue());if (Settings::IsConfiguringGlobal()) {ui->gpu_accuracy->setCurrentIndex(@@ -97,9 +94,6 @@ void ConfigureGraphicsAdvanced::ApplyConfiguration() {enable_compute_pipelines);ConfigurationShared::ApplyPerGameSetting(&Settings::values.use_video_framerate,ui->use_video_framerate_checkbox, use_video_framerate);- ConfigurationShared::ApplyPerGameSetting(&Settings::values.use_aggressive_anisotropic_filtering,- ui->use_aggressive_anisotropic_filtering,- use_aggressive_anisotropic_filtering);}void ConfigureGraphicsAdvanced::changeEvent(QEvent* event) {@@ -136,8 +130,6 @@ void ConfigureGraphicsAdvanced::SetupPerGameUI() {Settings::values.enable_compute_pipelines.UsingGlobal());ui->use_video_framerate_checkbox->setEnabled(Settings::values.use_video_framerate.UsingGlobal());- ui->use_aggressive_anisotropic_filtering->setEnabled(- Settings::values.use_aggressive_anisotropic_filtering.UsingGlobal());return;}@@ -165,9 +157,6 @@ void ConfigureGraphicsAdvanced::SetupPerGameUI() {ConfigurationShared::SetColoredTristate(ui->use_video_framerate_checkbox,Settings::values.use_video_framerate,use_video_framerate);- ConfigurationShared::SetColoredTristate(ui->use_aggressive_anisotropic_filtering,- Settings::values.use_aggressive_anisotropic_filtering,- use_aggressive_anisotropic_filtering);ConfigurationShared::SetColoredComboBox(ui->gpu_accuracy, ui->label_gpu_accuracy,static_cast<int>(Settings::values.gpu_accuracy.GetValue(true)));diff --git a/src/yuzu/configuration/configure_graphics_advanced.h b/src/yuzu/configuration/configure_graphics_advanced.hindex 4b52e5d612..a4dc8ceb09 100644--- a/src/yuzu/configuration/configure_graphics_advanced.h+++ b/src/yuzu/configuration/configure_graphics_advanced.h@@ -48,7 +48,6 @@ private:ConfigurationShared::CheckState use_vulkan_driver_pipeline_cache;ConfigurationShared::CheckState enable_compute_pipelines;ConfigurationShared::CheckState use_video_framerate;- ConfigurationShared::CheckState use_aggressive_anisotropic_filtering;const Core::System& system;};diff --git a/src/yuzu/configuration/configure_graphics_advanced.ui b/src/yuzu/configuration/configure_graphics_advanced.uiindex 06771c0807..e7f0ef6be4 100644--- a/src/yuzu/configuration/configure_graphics_advanced.ui+++ b/src/yuzu/configuration/configure_graphics_advanced.ui@@ -260,19 +260,6 @@ Compute pipelines are always enabled on all other drivers.</string></layout></widget></item>- <item>- <widget class="QCheckBox" name="use_aggressive_anisotropic_filtering">- <property name="toolTip">- <string>Enable this option for a more aggressive approach to applying Anisotropic Filtering to textures.-By toggling this, Anisotropic Filtering is added to textures with both nearest and linear mipmapping modes.-This may result in improved visual quality for a wider range of textures, but can also introduce artifacts in-some titles.</string>- </property>- <property name="text">- <string>Apply Anisotropic Filtering for all mipmap modes</string>- </property>- </widget>- </item></layout></widget></item>diff --git a/src/yuzu_cmd/config.cpp b/src/yuzu_cmd/config.cppindex f5a5364da8..c5bc472ca2 100644--- a/src/yuzu_cmd/config.cpp+++ b/src/yuzu_cmd/config.cpp@@ -321,7 +321,6 @@ void Config::ReadValues() {ReadSetting("Renderer", Settings::values.astc_recompression);ReadSetting("Renderer", Settings::values.use_fast_gpu_time);ReadSetting("Renderer", Settings::values.use_vulkan_driver_pipeline_cache);- ReadSetting("Renderer", Settings::values.use_aggressive_anisotropic_filtering);ReadSetting("Renderer", Settings::values.bg_red);ReadSetting("Renderer", Settings::values.bg_green);diff --git a/src/yuzu_cmd/default_ini.h b/src/yuzu_cmd/default_ini.hindex f12e2dfc9a..911d461e40 100644--- a/src/yuzu_cmd/default_ini.h+++ b/src/yuzu_cmd/default_ini.h@@ -325,10 +325,6 @@ aspect_ratio =# 0: Default, 1: 2x, 2: 4x, 3: 8x, 4: 16xmax_anisotropy =-# Apply Anisotropic Filtering to all mipmap modes.-# 0 (default): Off, 1: On-use_aggressive_anisotropic_filtering =-# Whether to enable VSync or not.# OpenGL: Values other than 0 enable VSync# Vulkan: FIFO is selected if the requested mode is not supported by the driver.