diff options
| author | bunnei <bunneidev@gmail.com> | 2018-08-03 00:31:32 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-03 00:31:32 -0400 |
| commit | 299975e4a8ec8e55338cfa808e226e39f16c5f48 (patch) | |
| tree | 773d3cd59cffd5682f9625e354f68f734be77351 /src/core/core.cpp | |
| parent | 20b6c798595db8f299d3d2c016e4e7e3904417ea (diff) | |
| parent | 153a00ebc09bc3d92fdd1f33aba669fd507832fb (diff) | |
Merge pull request #892 from lioncash/global
video_core: Make global EmuWindow instance part of the base renderer …
Diffstat (limited to 'src/core/core.cpp')
| -rw-r--r-- | src/core/core.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/core.cpp b/src/core/core.cpp index 32551094dd..54fc4170ff 100644 --- a/src/core/core.cpp +++ b/src/core/core.cpp @@ -84,7 +84,7 @@ System::ResultStatus System::SingleStep() { return RunLoop(false); } -System::ResultStatus System::Load(EmuWindow* emu_window, const std::string& filepath) { +System::ResultStatus System::Load(EmuWindow& emu_window, const std::string& filepath) { app_loader = Loader::GetLoader(std::make_shared<FileSys::RealVfsFile>(filepath)); if (!app_loader) { @@ -161,7 +161,7 @@ Cpu& System::CpuCore(size_t core_index) { return *cpu_cores[core_index]; } -System::ResultStatus System::Init(EmuWindow* emu_window, u32 system_mode) { +System::ResultStatus System::Init(EmuWindow& emu_window, u32 system_mode) { LOG_DEBUG(HW_Memory, "initialized OK"); CoreTiming::Init(); |