sgilissen/llamaplayer
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

libretro: Re-query hardware render interface after AV system info change

Browse Source 
I suspect the frontend is supposed to call context_reset/destroy here,
but it's not for whatever reason, and this works around it.
This commit is contained in:
Connor McLaughlin
2020-11-26 01:32:29 +10:00
parent b45bee5954
commit 627a3109b3
7 changed files with 87 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/duckstation-libretro/libretro_host_interface.cpp
View File

@ -1145,6 +1145,16 @@ void LibretroHostInterface::HardwareRendererContextReset()
void LibretroHostInterface::SwitchToHardwareRenderer()
{
struct retro_system_av_info avi;
g_libretro_host_interface.GetSystemAVInfo(&avi, true);
WindowInfo wi;
wi.type = WindowInfo::Type::Libretro;
wi.display_connection = &g_libretro_host_interface.m_hw_render_callback;
wi.surface_width = avi.geometry.base_width;
wi.surface_height = avi.geometry.base_height;
wi.surface_scale = 1.0f;
// use the existing device if we just resized the window
std::optional<GPURenderer> renderer;
std::unique_ptr<HostDisplay> display = std::move(m_hw_render_display);
@ -1152,10 +1162,15 @@ void LibretroHostInterface::SwitchToHardwareRenderer()
{
Log_InfoPrintf("Using existing hardware display");
renderer = RenderAPIToRenderer(display->GetRenderAPI());
if (!display->CreateResources())
Panic("Failed to recreate resources after reinit");
if (!display->ChangeRenderWindow(wi) || !display->CreateResources())
{
Log_ErrorPrintf("Failed to recreate resources after reinit");
display->DestroyRenderDevice();
display.reset();
}
}
else
if (!display)
{
renderer = RetroHwContextToRenderer(m_hw_render_callback.context_type);
if (!renderer.has_value())
@ -1184,16 +1199,6 @@ void LibretroHostInterface::SwitchToHardwareRenderer()
Log_ErrorPrintf("Unhandled renderer '%s'", Settings::GetRendererName(renderer.value()));
return;
}
struct retro_system_av_info avi;
g_libretro_host_interface.GetSystemAVInfo(&avi, true);
WindowInfo wi;
wi.type = WindowInfo::Type::Libretro;
wi.display_connection = &g_libretro_host_interface.m_hw_render_callback;
wi.surface_width = avi.geometry.base_width;
wi.surface_height = avi.geometry.base_height;
wi.surface_scale = 1.0f;
if (!display || !display->CreateRenderDevice(wi, {}, g_settings.gpu_use_debug_device) ||
!display->InitializeRenderDevice(GetShaderCacheBasePath(), g_settings.gpu_use_debug_device))
{