summaryrefslogtreecommitdiff
path: root/src/core/core.cpp
diff options
context:
space:
mode:
authorGravatar Lioncash2018-08-01 20:59:42 -0400
committerGravatar Lioncash2018-08-01 21:40:30 -0400
commit0f2ac928f291101bd74aac661cff7d14dfa8c984 (patch)
tree39d1ba26d25bd06874b58990c5deb4d1f4ed252d /src/core/core.cpp
parentMerge pull request #885 from greggameplayer/R32-Float (diff)
downloadyuzu-0f2ac928f291101bd74aac661cff7d14dfa8c984.tar.gz
yuzu-0f2ac928f291101bd74aac661cff7d14dfa8c984.tar.xz
yuzu-0f2ac928f291101bd74aac661cff7d14dfa8c984.zip
video_core: Make global EmuWindow instance part of the base renderer class
Makes the global a member of the RendererBase class. We also change this to be a reference. Passing any form of null pointer to these functions is incorrect entirely, especially given the code itself assumes that the pointer would always be in a valid state. This also makes it easier to follow the lifecycle of instances being used, as we explicitly interact the renderer with the rasterizer, rather than it just operating on a global pointer.
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 b7f4b4532..be8cf9c2b 100644
--- a/src/core/core.cpp
+++ b/src/core/core.cpp
@@ -86,7 +86,7 @@ System::ResultStatus System::SingleStep() {
86 return RunLoop(false); 86 return RunLoop(false);
87} 87}
88 88
89System::ResultStatus System::Load(EmuWindow* emu_window, const std::string& filepath) { 89System::ResultStatus System::Load(EmuWindow& emu_window, const std::string& filepath) {
90 app_loader = Loader::GetLoader(std::make_shared<FileSys::RealVfsFile>(filepath)); 90 app_loader = Loader::GetLoader(std::make_shared<FileSys::RealVfsFile>(filepath));
91 91
92 if (!app_loader) { 92 if (!app_loader) {
@@ -163,7 +163,7 @@ Cpu& System::CpuCore(size_t core_index) {
163 return *cpu_cores[core_index]; 163 return *cpu_cores[core_index];
164} 164}
165 165
166System::ResultStatus System::Init(EmuWindow* emu_window, u32 system_mode) { 166System::ResultStatus System::Init(EmuWindow& emu_window, u32 system_mode) {
167 LOG_DEBUG(HW_Memory, "initialized OK"); 167 LOG_DEBUG(HW_Memory, "initialized OK");
168 168
169 CoreTiming::Init(); 169 CoreTiming::Init();