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

Loader: Make executable analyzation not halt UI when launching games

Browse source
This commit is contained in:
Eladash 2023-04-08 18:03:05 +03:00 • committed by Ivan
parent 17e6ad1fe8
commit 0e388639cc
8 changed files with 51 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

16
rpcs3/Emu/System.cpp
View file

@ -185,7 +185,7 @@ void Emulator::BlockingCallFromMainThread(std::function<void()>&& func) const
// This function ensures constant initialization order between different compilers and builds
void init_fxo_for_exec(utils::serial* ar, bool full = false)
{
g_fxo->init<ppu_module>();
g_fxo->init<main_ppu_module>();
void init_ppu_functions(utils::serial* ar, bool full);
@ -1352,7 +1352,7 @@ game_boot_result Emulator::Load(const std::string& title_id, bool add_only, bool
{
m_state = system_state::ready;
GetCallbacks().on_ready();
g_fxo->init<ppu_module>();
g_fxo->init<main_ppu_module>();
vm::init();
m_force_boot = false;
@ -1435,7 +1435,7 @@ game_boot_result Emulator::Load(const std::string& title_id, bool add_only, bool
if (obj == elf_error::ok && ppu_load_exec(obj))
{
g_fxo->get<ppu_module>().path = path;
g_fxo->get<main_ppu_module>().path = path;
}
else
{
@ -1455,14 +1455,14 @@ game_boot_result Emulator::Load(const std::string& title_id, bool add_only, bool
}
}
if (auto& _main = g_fxo->get<ppu_module>(); _main.path.empty())
if (auto& _main = g_fxo->get<main_ppu_module>(); _main.path.empty())
{
init_fxo_for_exec(nullptr, false);
}
g_fxo->init<named_thread>("SPRX Loader"sv, [this, dir_queue]() mutable
{
if (auto& _main = g_fxo->get<ppu_module>(); !_main.path.empty())
if (auto& _main = g_fxo->get<main_ppu_module>(); !_main.path.empty())
{
ppu_initialize(_main);
}
@ -2020,7 +2020,7 @@ game_boot_result Emulator::Load(const std::string& title_id, bool add_only, bool
sys_log.error("Booting HG category outside of HDD0!");
}
g_fxo->init<ppu_module>();
g_fxo->init<main_ppu_module>();
if (ppu_load_exec(ppu_exec, DeserialManager()))
{
@ -2032,7 +2032,7 @@ game_boot_result Emulator::Load(const std::string& title_id, bool add_only, bool
}
else
{
// Preserve emulation state for OVL excutable
// Preserve emulation state for OVL executable
Pause(true);
}
@ -3026,7 +3026,7 @@ s32 error_code::error_report(s32 result, const logs::message* channel, const cha
void Emulator::ConfigurePPUCache() const
{
auto& _main = g_fxo->get<ppu_module>();
auto& _main = g_fxo->get<main_ppu_module>();
_main.cache = rpcs3::utils::get_cache_dir();