diff --git a/src/core/host_interface.cpp b/src/core/host_interface.cpp index 9995d08a..1124866d 100644 --- a/src/core/host_interface.cpp +++ b/src/core/host_interface.cpp @@ -501,7 +501,6 @@ void HostInterface::SetDefaultSettings(SettingsInterface& si) si.SetStringValue("GPU", "Renderer", Settings::GetRendererName(Settings::DEFAULT_GPU_RENDERER)); si.SetIntValue("GPU", "ResolutionScale", 1); - si.SetIntValue("GPU", "ResolutionSoftScale", 1); si.SetIntValue("GPU", "Multisamples", 1); si.SetBoolValue("GPU", "UseDebugDevice", false); si.SetBoolValue("GPU", "UseSoftwareRendererForReadbacks", false); @@ -631,7 +630,6 @@ void HostInterface::FixIncompatibleSettings(bool display_osd_messages) g_settings.cpu_overclock_active = false; g_settings.enable_8mb_ram = false; g_settings.gpu_resolution_scale = 1; - g_settings.gpu_resolution_soft_scale = 1; g_settings.gpu_multisamples = 1; g_settings.gpu_per_sample_shading = false; g_settings.gpu_true_color = false; @@ -768,7 +766,6 @@ void HostInterface::CheckForSettingsChanges(const Settings& old_settings) m_audio_stream->SetOutputVolume(GetAudioOutputVolume()); if (g_settings.gpu_resolution_scale != old_settings.gpu_resolution_scale || - g_settings.gpu_resolution_soft_scale != old_settings.gpu_resolution_soft_scale || g_settings.gpu_multisamples != old_settings.gpu_multisamples || g_settings.gpu_per_sample_shading != old_settings.gpu_per_sample_shading || g_settings.gpu_use_thread != old_settings.gpu_use_thread || @@ -1092,13 +1089,10 @@ void HostInterface::ModifyResolutionScale(s32 increment) { const u32 new_resolution_scale = std::clamp( static_cast(static_cast(g_settings.gpu_resolution_scale) + increment), 1, GPU::MAX_RESOLUTION_SCALE); - const u32 new_resolution_soft_scale = std::clamp( - static_cast(static_cast(g_settings.gpu_resolution_soft_scale) + increment), 1, GPU::MAX_RESOLUTION_SCALE); - if (new_resolution_scale == g_settings.gpu_resolution_scale || new_resolution_soft_scale == g_settings.gpu_resolution_soft_scale) + if (new_resolution_scale == g_settings.gpu_resolution_scale) return; g_settings.gpu_resolution_scale = new_resolution_scale; - g_settings.gpu_resolution_soft_scale = new_resolution_soft_scale; if (!System::IsShutdown()) { diff --git a/src/core/settings.cpp b/src/core/settings.cpp index 17932207..2ecc8e4f 100644 --- a/src/core/settings.cpp +++ b/src/core/settings.cpp @@ -183,7 +183,6 @@ void Settings::Load(SettingsInterface& si) .value_or(DEFAULT_GPU_RENDERER); gpu_adapter = si.GetStringValue("GPU", "Adapter", ""); gpu_resolution_scale = static_cast(si.GetIntValue("GPU", "ResolutionScale", 1)); - gpu_resolution_soft_scale = static_cast(si.GetIntValue("GPU", "ResolutionSoftScale", 1)); gpu_multisamples = static_cast(si.GetIntValue("GPU", "Multisamples", 1)); gpu_use_debug_device = si.GetBoolValue("GPU", "UseDebugDevice", false); gpu_per_sample_shading = si.GetBoolValue("GPU", "PerSampleShading", false); @@ -379,7 +378,6 @@ void Settings::Save(SettingsInterface& si) const si.SetStringValue("GPU", "Renderer", GetRendererName(gpu_renderer)); si.SetStringValue("GPU", "Adapter", gpu_adapter.c_str()); si.SetIntValue("GPU", "ResolutionScale", static_cast(gpu_resolution_scale)); - si.SetIntValue("GPU", "ResolutionSoftScale", static_cast(gpu_resolution_soft_scale)); si.SetIntValue("GPU", "Multisamples", static_cast(gpu_multisamples)); si.SetBoolValue("GPU", "UseDebugDevice", gpu_use_debug_device); si.SetBoolValue("GPU", "PerSampleShading", gpu_per_sample_shading); diff --git a/src/core/settings.h b/src/core/settings.h index 3209a50e..72880687 100644 --- a/src/core/settings.h +++ b/src/core/settings.h @@ -109,7 +109,6 @@ struct Settings std::string gpu_adapter; std::string display_post_process_chain; u32 gpu_resolution_scale = 1; - u32 gpu_resolution_soft_scale = 1; u32 gpu_multisamples = 1; bool gpu_use_thread = true; bool gpu_use_software_renderer_for_readbacks = false; diff --git a/src/duckstation-libretro/libretro_host_interface.cpp b/src/duckstation-libretro/libretro_host_interface.cpp index fb63b228..9ba4de42 100644 --- a/src/duckstation-libretro/libretro_host_interface.cpp +++ b/src/duckstation-libretro/libretro_host_interface.cpp @@ -977,6 +977,17 @@ void LibretroHostInterface::UpdateSettings() LibretroSettingsInterface si; LoadSettings(si); ApplyGameSettings(); + + if (System::IsValid()) + { + if (g_settings.gpu_renderer != old_settings.gpu_renderer) + { + ReportFormattedMessage("Switch to %s renderer pending, please restart the core to apply.", + Settings::GetRendererDisplayName(g_settings.gpu_renderer)); + g_settings.gpu_renderer = old_settings.gpu_renderer; + } + } + FixIncompatibleSettings(false); if (System::IsValid()) @@ -1000,13 +1011,6 @@ void LibretroHostInterface::UpdateSettings() old_settings.gpu_resolution_scale = g_settings.gpu_resolution_scale; } - if (g_settings.gpu_renderer != old_settings.gpu_renderer) - { - ReportFormattedMessage("Switch to %s renderer pending, please restart the core to apply.", - Settings::GetRendererDisplayName(g_settings.gpu_renderer)); - g_settings.gpu_renderer = old_settings.gpu_renderer; - } - if (g_settings.memory_card_types[0] == MemoryCardType::Libretro && old_settings.memory_card_types[0] != MemoryCardType::Libretro) { ReportFormattedMessage("Setting memory card 1 to Save RAM mode will apply on core reload, to prevent save loss.");