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

Use g_fxo for rsx::thread

Browse source
This commit is contained in:
Nekotekina 2019-09-26 18:32:31 +03:00
parent b48cdc2260
commit 5f9c5e8765
8 changed files with 42 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

7
rpcs3/Emu/System.cpp
View file

@ -649,12 +649,9 @@ bool Emulator::BootRsxCapture(const std::string& path)
m_state = system_state::ready;
GetCallbacks().on_ready();
auto gsrender = fxm::import<GSRender>(Emu.GetCallbacks().get_gs_render);
Emu.GetCallbacks().init_gs_render();
Emu.GetCallbacks().init_pad_handler("");
if (gsrender.get() == nullptr)
return false;
GetCallbacks().on_run();
m_state = system_state::running;
@ -1582,7 +1579,7 @@ void Emulator::Load(const std::string& title_id, bool add_only, bool force_globa
}
g_fxo->init();
fxm::import<GSRender>(Emu.GetCallbacks().get_gs_render); // TODO: must be created in appropriate sys_rsx syscall
Emu.GetCallbacks().init_gs_render();
Emu.GetCallbacks().init_pad_handler(m_title_id);
Emu.GetCallbacks().init_kb_handler();
Emu.GetCallbacks().init_mouse_handler();