diff --git a/rpcs3/Emu/Cell/PPUModule.cpp b/rpcs3/Emu/Cell/PPUModule.cpp index 3100016ea8..868d59009f 100644 --- a/rpcs3/Emu/Cell/PPUModule.cpp +++ b/rpcs3/Emu/Cell/PPUModule.cpp @@ -1469,7 +1469,7 @@ void ppu_load_exec(const ppu_exec_object& elf) mem_size += 0xC000000; } - fxm::make_always(mem_size); + fxm::make(mem_size); ppu->cmd_push({ppu_cmd::initialize, 0}); diff --git a/rpcs3/Emu/IdManager.h b/rpcs3/Emu/IdManager.h index b99357aa45..3f69e74d41 100644 --- a/rpcs3/Emu/IdManager.h +++ b/rpcs3/Emu/IdManager.h @@ -631,25 +631,6 @@ public: return ptr; } - // Create the object unconditionally (old object will be removed if it exists) - template - static std::enable_if_t::value, std::shared_ptr> make_always(Args&&... args) - { - std::shared_ptr ptr; - std::shared_ptr old; - { - std::lock_guard lock(id_manager::g_mutex); - - auto& cur = g_vec[get_type()]; - - ptr = std::make_shared(std::forward(args)...); - old = std::move(cur); - cur = ptr; - } - - return ptr; - } - // Emplace the object returned by provider() and return it if no object exists template static auto import(F&& provider, Args&&... args) -> decltype(static_cast>(provider(std::forward(args)...))) diff --git a/rpcs3/Emu/RSX/Capture/rsx_replay.cpp b/rpcs3/Emu/RSX/Capture/rsx_replay.cpp index 15585b6be8..9968643279 100644 --- a/rpcs3/Emu/RSX/Capture/rsx_replay.cpp +++ b/rpcs3/Emu/RSX/Capture/rsx_replay.cpp @@ -27,8 +27,8 @@ namespace rsx // User memory + fifo size buffer_size = ::align(buffer_size, 0x100000) + 0x10000000; - // We are not allowed to drain all memory so add a little - fxm::make_always(buffer_size + 0x1000000); + // We are not allowed to drain all memory so add a little + fxm::make(buffer_size + 0x1000000); const u32 contextAddr = vm::alloc(sizeof(rsx_context), vm::main); if (contextAddr == 0)