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

Merge pull request #4126 from FearlessTobi/port-892

Browse Source 
Port #892 from yuzu: "Make global EmuWindow instance part of the base renderer class"
This commit is contained in:
James Rowe
2018-08-26 12:00:55 -06:00
committed by GitHub
parent 50270fd791 f61c9c3eb7
commit a6723ec2eb
14 changed files with 49 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/core/core.cpp
View File

@ -83,7 +83,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(filepath);
if (!app_loader) {
@ -152,7 +152,7 @@ void System::Reschedule() {
Kernel::Reschedule();
}
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();