summaryrefslogtreecommitdiff
path: root/src/core/core.cpp
diff options
context:
space:
mode:
authorGravatar bunnei2018-08-03 00:31:32 -0400
committerGravatar GitHub2018-08-03 00:31:32 -0400
commit00ba704a7fe55460e606075ce280e8933a80e973 (patch)
tree773d3cd59cffd5682f9625e354f68f734be77351 /src/core/core.cpp
parentMerge pull request #894 from lioncash/object (diff)
parentvideo_core: Make global EmuWindow instance part of the base renderer class (diff)
downloadyuzu-00ba704a7fe55460e606075ce280e8933a80e973.tar.gz
yuzu-00ba704a7fe55460e606075ce280e8933a80e973.tar.xz
yuzu-00ba704a7fe55460e606075ce280e8933a80e973.zip
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.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/core.cpp b/src/core/core.cpp
index 32551094d..54fc4170f 100644
--- a/src/core/core.cpp
+++ b/src/core/core.cpp
@@ -84,7 +84,7 @@ System::ResultStatus System::SingleStep() {
84 return RunLoop(false); 84 return RunLoop(false);
85} 85}
86 86
87System::ResultStatus System::Load(EmuWindow* emu_window, const std::string& filepath) { 87System::ResultStatus System::Load(EmuWindow& emu_window, const std::string& filepath) {
88 app_loader = Loader::GetLoader(std::make_shared<FileSys::RealVfsFile>(filepath)); 88 app_loader = Loader::GetLoader(std::make_shared<FileSys::RealVfsFile>(filepath));
89 89
90 if (!app_loader) { 90 if (!app_loader) {
@@ -161,7 +161,7 @@ Cpu& System::CpuCore(size_t core_index) {
161 return *cpu_cores[core_index]; 161 return *cpu_cores[core_index];
162} 162}
163 163
164System::ResultStatus System::Init(EmuWindow* emu_window, u32 system_mode) { 164System::ResultStatus System::Init(EmuWindow& emu_window, u32 system_mode) {
165 LOG_DEBUG(HW_Memory, "initialized OK"); 165 LOG_DEBUG(HW_Memory, "initialized OK");
166 166
167 CoreTiming::Init(); 167 CoreTiming::Init();