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

Add g_typemap and g_idm alias

Browse source 
Future idm/fxm replacement
This commit is contained in:
Nekotekina 2018-10-01 20:57:08 +03:00
parent 3359e9a51b
commit 19a64e0e94
3 changed files with 16 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
rpcs3/Emu/System.cpp
View file

@ -44,6 +44,8 @@
#include "Emu/RSX/VK/VulkanAPI.h"
#endif
utils::typemap g_typemap{nullptr};
cfg_root g_cfg;
bool g_use_rtm;
@ -52,8 +54,6 @@ std::string g_cfg_defaults;
extern atomic_t<u32> g_thread_count;
extern u64 get_system_time();
extern void ppu_load_exec(const ppu_exec_object&);
extern void spu_load_exec(const spu_exec_object&);
extern void ppu_initialize(const ppu_module&);
@ -266,6 +266,7 @@ void Emulator::Init()
idm::init();
fxm::init();
g_idm->init();
// Reset defaults, cache them
g_cfg.from_default();
@ -1381,6 +1382,7 @@ void Emulator::Stop(bool restart)
lv2_obj::cleanup();
idm::clear();
fxm::clear();
g_idm->init();
LOG_NOTICE(GENERAL, "Objects cleared...");