archive/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-07-09 08:21:29 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions

Savestates: Fix unintentional pause when saving with HLE VDEC contexts

Browse source
This commit is contained in:
Eladash 2022-10-03 11:29:09 +03:00 • committed by Ivan
parent f34773ed73
commit 58dd2bff41
2 changed files with 10 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

8
rpcs3/Emu/CPU/CPUThread.cpp
View file

@ -1306,13 +1306,19 @@ u32 CPUDisAsm::DisAsmBranchTarget(s32 /*imm*/)
return 0; return 0;
} }
extern bool try_lock_spu_threads_in_a_state_compatible_with_savestates() extern bool try_lock_spu_threads_in_a_state_compatible_with_savestates(bool revert_lock)
{ {
const u64 start = get_system_time(); const u64 start = get_system_time();
// Attempt to lock for half a second, if somehow takes longer abort it // Attempt to lock for half a second, if somehow takes longer abort it
do do
{ {
if (revert_lock)
{
// Revert the operation of this function
break;
}
if (cpu_thread::suspend_all(nullptr, {}, []() if (cpu_thread::suspend_all(nullptr, {}, []()
{ {
return idm::select<named_thread<spu_thread>>([](u32, spu_thread& spu) return idm::select<named_thread<spu_thread>>([](u32, spu_thread& spu)

4
rpcs3/Emu/System.cpp
View file

@ -2222,7 +2222,7 @@ void Emulator::GracefulShutdown(bool allow_autoexit, bool async_op, bool savesta
} }
extern bool try_lock_vdec_context_creation(); extern bool try_lock_vdec_context_creation();
extern bool try_lock_spu_threads_in_a_state_compatible_with_savestates(); extern bool try_lock_spu_threads_in_a_state_compatible_with_savestates(bool revert_lock = false);
std::shared_ptr<utils::serial> Emulator::Kill(bool allow_autoexit, bool savestate) std::shared_ptr<utils::serial> Emulator::Kill(bool allow_autoexit, bool savestate)
{ {
@ -2235,6 +2235,8 @@ std::shared_ptr<utils::serial> Emulator::Kill(bool allow_autoexit, bool savestat
if (savestate && !try_lock_vdec_context_creation()) if (savestate && !try_lock_vdec_context_creation())
{ {
try_lock_spu_threads_in_a_state_compatible_with_savestates(true);
sys_log.error("Failed to savestate: HLE VDEC (video decoder) context(s) exist." sys_log.error("Failed to savestate: HLE VDEC (video decoder) context(s) exist."
"\nLLE libvdec.sprx by selecting it in Adavcned tab -> Firmware Libraries." "\nLLE libvdec.sprx by selecting it in Adavcned tab -> Firmware Libraries."
"\nYou need to close the game for to take effect." "\nYou need to close the game for to take effect."