diff --git a/rpcs3/rpcs3qt/render_creator.cpp b/rpcs3/rpcs3qt/render_creator.cpp index c939c729fb..8e16e66d95 100644 --- a/rpcs3/rpcs3qt/render_creator.cpp +++ b/rpcs3/rpcs3qt/render_creator.cpp @@ -98,7 +98,7 @@ render_creator::render_creator(QObject *parent) : QObject(parent) #endif // Graphics Adapter - Vulkan = render_info(vulkan_adapters, supports_vulkan, emu_settings_type::VulkanAdapter, true); + Vulkan = render_info(vulkan_adapters, supports_vulkan, emu_settings_type::VulkanAdapter); OpenGL = render_info(); NullRender = render_info(); diff --git a/rpcs3/rpcs3qt/render_creator.h b/rpcs3/rpcs3qt/render_creator.h index 8203f09bb8..c433c77353 100644 --- a/rpcs3/rpcs3qt/render_creator.h +++ b/rpcs3/rpcs3qt/render_creator.h @@ -23,16 +23,14 @@ public: emu_settings_type type = emu_settings_type::VulkanAdapter; bool supported = true; bool has_adapters = true; - bool has_msaa = false; render_info() : has_adapters(false) {} - render_info(QStringList adapters, bool supported, emu_settings_type type, bool has_msaa) + render_info(QStringList adapters, bool supported, emu_settings_type type) : adapters(std::move(adapters)) , type(type) - , supported(supported) - , has_msaa(has_msaa) {} + , supported(supported) {} }; bool abort_requested = false; diff --git a/rpcs3/rpcs3qt/settings_dialog.cpp b/rpcs3/rpcs3qt/settings_dialog.cpp index 12c62c4dbf..02bc57a3aa 100644 --- a/rpcs3/rpcs3qt/settings_dialog.cpp +++ b/rpcs3/rpcs3qt/settings_dialog.cpp @@ -838,12 +838,6 @@ settings_dialog::settings_dialog(std::shared_ptr gui_settings, std } } - // Enable/disable MSAA depending on renderer - ui->antiAliasing->setEnabled(renderer.has_msaa); - ui->antiAliasing->blockSignals(true); - ui->antiAliasing->setCurrentText(renderer.has_msaa ? qstr(m_emu_settings->GetSetting(emu_settings_type::MSAA)) : tr("Disabled", "MSAA")); - ui->antiAliasing->blockSignals(false); - ui->graphicsAdapterBox->clear(); // Fill combobox with placeholder if no adapters needed @@ -1070,7 +1064,7 @@ settings_dialog::settings_dialog(std::shared_ptr gui_settings, std get_audio_output_devices(false); change_audio_output_device(0); // Set device to 'Default' }); - + m_emu_settings->EnhanceComboBox(ui->combo_audio_channel_layout, emu_settings_type::AudioChannelLayout); SubscribeTooltip(ui->gb_audio_channel_layout, tooltips.settings.audio_channel_layout); @@ -1512,7 +1506,7 @@ settings_dialog::settings_dialog(std::shared_ptr gui_settings, std m_emu_settings->SetSetting(emu_settings_type::PSNCountry, country_code.toString().toStdString()); }); - + SubscribeTooltip(ui->gb_psnCountryBox, tooltips.settings.psn_country); if (!game)