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

libretro: Work around crash in RetroArch Vulkan driver

Browse Source
This commit is contained in:
Connor McLaughlin
2020-11-25 23:06:39 +10:00
parent 917fa5dd0e
commit b45bee5954
7 changed files with 34 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -376,7 +376,7 @@ bool LibretroHostInterface::retro_serialize(void* data, size_t size)
bool LibretroHostInterface::retro_unserialize(const void* data, size_t size)
{
std::unique_ptr<ByteStream> stream = ByteStream_CreateReadOnlyMemoryStream(data, static_cast<u32>(size));
if (!System::LoadState(stream.get()))
if (!System::LoadState(stream.get(), false))
{
Log_ErrorPrintf("Failed to load save state from memory stream");
return false;
@ -1229,15 +1229,22 @@ void LibretroHostInterface::HardwareRendererContextDestroy()
void LibretroHostInterface::SwitchToSoftwareRenderer()
{
// keep the hw renderer around in case we need it later
// but keep it active until we've recreated the GPU so we can save the state
std::unique_ptr<HostDisplay> save_display;
if (m_using_hardware_renderer)
{
m_hw_render_display = std::move(m_display);
m_hw_render_display->DestroyResources();
save_display = std::move(m_display);
m_using_hardware_renderer = false;
}
m_display = std::make_unique<LibretroHostDisplay>();
System::RecreateGPU(GPURenderer::Software);
System::RecreateGPU(GPURenderer::Software, false);
if (save_display)
{
save_display->DestroyResources();
m_hw_render_display = std::move(save_display);
}
}
bool LibretroHostInterface::DiskControlSetEjectState(bool ejected)