Mirrors/citra-nightly
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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
commit a6723ec2eb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
14 changed files with 49 additions and 54 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/core/core.h
View file

@ -82,11 +82,12 @@ public:
/**
* Load an executable application.
* @param emu_window Pointer to the host-system window used for video output and keyboard input.
* @param emu_window Reference to the host-system window used for video output and keyboard
* input.
* @param filepath String path to the executable application to load on the host file system.
* @returns ResultStatus code, indicating if the operation succeeded.
*/
ResultStatus Load(EmuWindow* emu_window, const std::string& filepath);
ResultStatus Load(EmuWindow& emu_window, const std::string& filepath);
/**
* Indicates if the emulated system is powered on (all subsystems initialized and able to run an
@ -171,11 +172,12 @@ public:
private:
/**
* Initialize the emulated system.
* @param emu_window Pointer to the host-system window used for video output and keyboard input.
* @param emu_window Reference to the host-system window used for video output and keyboard
* input.
* @param system_mode The system mode.
* @return ResultStatus code, indicating if the operation succeeded.
*/
ResultStatus Init(EmuWindow* emu_window, u32 system_mode);
ResultStatus Init(EmuWindow& emu_window, u32 system_mode);
/// Reschedule the core emulation
void Reschedule();