RPCSX/rpcsx
1
0
Fork 0
mirror of https://github.com/RPCSX/rpcsx.git synced 2026-04-05 22:47:03 +00:00
Code Issues Projects Releases Packages Wiki Activity

Use g_fxo for global ppu_module instance

Browse source 
Also fix autonomous PRX/SPU loading sequence.
This commit is contained in:
Nekotekina 2019-09-26 17:06:43 +03:00
parent 240b4a8bd8
commit b48cdc2260
4 changed files with 13 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

4
rpcs3/Emu/Cell/PPUModule.cpp
View file

@ -992,7 +992,7 @@ std::shared_ptr<lv2_prx> ppu_load_prx(const ppu_prx_object& elf, const std::stri
LOG_NOTICE(LOADER, "PRX library hash: %s (<- %u)", hash, applied);
if (Emu.IsReady() && fxm::import<ppu_module>([&] { return prx; }))
if (Emu.IsReady() && g_fxo->get<ppu_module>()->segs.empty())
{
// Special loading mode
ppu_thread_params p{};
@ -1043,7 +1043,7 @@ void ppu_unload_prx(const lv2_prx& prx)
void ppu_load_exec(const ppu_exec_object& elf)
{
// Set for delayed initialization in ppu_initialize()
const auto _main = fxm::make<ppu_module>();
const auto _main = g_fxo->get<ppu_module>();
// Access linkage information object
const auto link = g_fxo->init<ppu_linkage_info>();