Allow MSAA selection in the UI
This commit is contained in:
@@ -98,7 +98,7 @@ render_creator::render_creator(QObject *parent) : QObject(parent)
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
// Graphics Adapter
|
// 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();
|
OpenGL = render_info();
|
||||||
NullRender = render_info();
|
NullRender = render_info();
|
||||||
|
|
||||||
|
|||||||
@@ -23,16 +23,14 @@ public:
|
|||||||
emu_settings_type type = emu_settings_type::VulkanAdapter;
|
emu_settings_type type = emu_settings_type::VulkanAdapter;
|
||||||
bool supported = true;
|
bool supported = true;
|
||||||
bool has_adapters = true;
|
bool has_adapters = true;
|
||||||
bool has_msaa = false;
|
|
||||||
|
|
||||||
render_info()
|
render_info()
|
||||||
: has_adapters(false) {}
|
: 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))
|
: adapters(std::move(adapters))
|
||||||
, type(type)
|
, type(type)
|
||||||
, supported(supported)
|
, supported(supported) {}
|
||||||
, has_msaa(has_msaa) {}
|
|
||||||
};
|
};
|
||||||
|
|
||||||
bool abort_requested = false;
|
bool abort_requested = false;
|
||||||
|
|||||||
@@ -838,12 +838,6 @@ settings_dialog::settings_dialog(std::shared_ptr<gui_settings> 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();
|
ui->graphicsAdapterBox->clear();
|
||||||
|
|
||||||
// Fill combobox with placeholder if no adapters needed
|
// Fill combobox with placeholder if no adapters needed
|
||||||
|
|||||||
Reference in New Issue
Block a user