diff options
| author | Fernando Sahmkow <fsahmkow27@gmail.com> | 2019-09-22 09:38:13 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-22 09:38:13 -0400 |
| commit | 4ace69de9c90eb7d4a758aa3c3616a9c0d55bc5b (patch) | |
| tree | cbf3e722bf583a48f851744c8276a2caf0b2e8ef /src/core/hle/service/vi | |
| parent | 9d69206cd00982e02f90845c98d7d6c9887645c3 (diff) | |
| parent | 9513abbb0a0fcc9a1bf52eb320e015ba81856bf1 (diff) | |
Merge pull request #2884 from ogniK5377/deglobal-sys-services
Remove usage of System::CurrentInterface() from most services
Diffstat (limited to 'src/core/hle/service/vi')
| -rw-r--r-- | src/core/hle/service/vi/display/vi_display.cpp | 4 | ||||
| -rw-r--r-- | src/core/hle/service/vi/display/vi_display.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/core/hle/service/vi/display/vi_display.cpp b/src/core/hle/service/vi/display/vi_display.cpp index a8d088305..006a6d9ff 100644 --- a/src/core/hle/service/vi/display/vi_display.cpp +++ b/src/core/hle/service/vi/display/vi_display.cpp @@ -15,8 +15,8 @@ namespace Service::VI { -Display::Display(u64 id, std::string name) : id{id}, name{std::move(name)} { - auto& kernel = Core::System::GetInstance().Kernel(); +Display::Display(u64 id, std::string name, Core::System& system) : id{id}, name{std::move(name)} { + auto& kernel = system.Kernel(); vsync_event = Kernel::WritableEvent::CreateEventPair(kernel, Kernel::ResetType::Manual, fmt::format("Display VSync Event {}", id)); } diff --git a/src/core/hle/service/vi/display/vi_display.h b/src/core/hle/service/vi/display/vi_display.h index 2acd46ff8..f56b5badc 100644 --- a/src/core/hle/service/vi/display/vi_display.h +++ b/src/core/hle/service/vi/display/vi_display.h @@ -26,7 +26,7 @@ public: /// @param id The unique ID for this display. /// @param name The name for this display. /// - Display(u64 id, std::string name); + Display(u64 id, std::string name, Core::System& system); ~Display(); Display(const Display&) = delete; |