octo/citra
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

VideoCore: pass in memory system

Browse Source 
currently set as global. Will change when videocore itself is wrapped as a class
This commit is contained in:
Weiyi Wang
2018-11-21 11:20:20 -05:00
parent 8c618c3fc3
commit 8bb404c82a
3 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/video_core/video_core.cpp
View File

@ -29,8 +29,11 @@ void* g_screenshot_bits;
std::function<void()> g_screenshot_complete_callback;
Layout::FramebufferLayout g_screenshot_framebuffer_layout;
Memory::MemorySystem* g_memory;
/// Initialize the video core
Core::System::ResultStatus Init(EmuWindow& emu_window) {
Core::System::ResultStatus Init(EmuWindow& emu_window, Memory::MemorySystem& memory) {
g_memory = &memory;
Pica::Init();
g_renderer = std::make_unique<OpenGL::RendererOpenGL>(emu_window);