diff --git a/rpcs3/Emu/System.cpp b/rpcs3/Emu/System.cpp index 4b412a2b78..76c272c49c 100644 --- a/rpcs3/Emu/System.cpp +++ b/rpcs3/Emu/System.cpp @@ -475,11 +475,11 @@ void Emulator::Init() g_cfg.name.clear(); // Not all renderers are known at compile time, so set a provided default if possible - if (m_default_renderer == video_renderer::vulkan && !m_default_graphics_adapter.empty()) - { - g_cfg.video.renderer.set(m_default_renderer); - g_cfg.video.vk.adapter.from_string(m_default_graphics_adapter); - } + // TODO: Also initialize render_creator in headless mode + ensure(m_supported_renderers.contains(m_default_renderer)); + ensure(!(m_default_renderer == video_renderer::vulkan && m_default_graphics_adapter.empty())); + g_cfg.video.renderer.set(m_default_renderer); + g_cfg.video.vk.adapter.set(m_default_graphics_adapter); g_cfg_defaults = g_cfg.to_string(); diff --git a/rpcs3/rpcs3qt/emu_settings.cpp b/rpcs3/rpcs3qt/emu_settings.cpp index fd48aea94d..734aa3504d 100644 --- a/rpcs3/rpcs3qt/emu_settings.cpp +++ b/rpcs3/rpcs3qt/emu_settings.cpp @@ -118,6 +118,11 @@ bool emu_settings::Init() supported_renderers.insert(video_renderer::vulkan); } + else if (m_render_creator->OpenGL.supported) + { + cfg_log.notice("Setting the default renderer to OpenGl"); + Emu.SetDefaultRenderer(video_renderer::opengl); + } Emu.SetSupportedRenderers(supported_renderers);