diff options
author | Lioncash <mathew1800@gmail.com> | 2018-08-02 02:59:42 +0200 |
---|---|---|
committer | Lioncash <mathew1800@gmail.com> | 2018-08-02 03:40:30 +0200 |
commit | 0f2ac928f291101bd74aac661cff7d14dfa8c984 (patch) | |
tree | 39d1ba26d25bd06874b58990c5deb4d1f4ed252d /src/core | |
parent | Merge pull request #885 from greggameplayer/R32-Float (diff) | |
download | yuzu-0f2ac928f291101bd74aac661cff7d14dfa8c984.tar yuzu-0f2ac928f291101bd74aac661cff7d14dfa8c984.tar.gz yuzu-0f2ac928f291101bd74aac661cff7d14dfa8c984.tar.bz2 yuzu-0f2ac928f291101bd74aac661cff7d14dfa8c984.tar.lz yuzu-0f2ac928f291101bd74aac661cff7d14dfa8c984.tar.xz yuzu-0f2ac928f291101bd74aac661cff7d14dfa8c984.tar.zst yuzu-0f2ac928f291101bd74aac661cff7d14dfa8c984.zip |
Diffstat (limited to '')
-rw-r--r-- | src/core/core.cpp | 4 | ||||
-rw-r--r-- | src/core/core.h | 10 | ||||
-rw-r--r-- | src/core/settings.cpp | 8 |
3 files changed, 11 insertions, 11 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() { 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) { @@ -163,7 +163,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(); diff --git a/src/core/core.h b/src/core/core.h index c123fe401..515923a24 100644 --- a/src/core/core.h +++ b/src/core/core.h @@ -81,11 +81,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 @@ -186,11 +187,12 @@ 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); /// AppLoader used to load the current executing application std::unique_ptr<Loader::AppLoader> app_loader; diff --git a/src/core/settings.cpp b/src/core/settings.cpp index 444bcc387..79e0b347b 100644 --- a/src/core/settings.cpp +++ b/src/core/settings.cpp @@ -5,10 +5,9 @@ #include "core/gdbstub/gdbstub.h" #include "core/hle/service/hid/hid.h" #include "core/settings.h" +#include "video_core/renderer_base.h" #include "video_core/video_core.h" -#include "core/frontend/emu_window.h" - namespace Settings { Values values = {}; @@ -20,9 +19,8 @@ void Apply() { VideoCore::g_toggle_framelimit_enabled = values.toggle_framelimit; - if (VideoCore::g_emu_window) { - auto layout = VideoCore::g_emu_window->GetFramebufferLayout(); - VideoCore::g_emu_window->UpdateCurrentFramebufferLayout(layout.width, layout.height); + if (VideoCore::g_renderer) { + VideoCore::g_renderer->UpdateCurrentFramebufferLayout(); } Service::HID::ReloadInputDevices(); |