diff options
| author | David Marcec <dmarcecguzman@gmail.com> | 2019-09-21 11:37:03 +0200 |
|---|---|---|
| committer | David Marcec <dmarcecguzman@gmail.com> | 2019-09-22 08:38:03 +0200 |
| commit | 4d220964df2ab1fee6ff2873c576b40cbe106bd2 (patch) | |
| tree | 1fb2cde3f6a64819c9775432d01ab5cbef8eb3bd /src/core | |
| parent | Deglobalize System: Time (diff) | |
| download | yuzu-4d220964df2ab1fee6ff2873c576b40cbe106bd2.tar yuzu-4d220964df2ab1fee6ff2873c576b40cbe106bd2.tar.gz yuzu-4d220964df2ab1fee6ff2873c576b40cbe106bd2.tar.bz2 yuzu-4d220964df2ab1fee6ff2873c576b40cbe106bd2.tar.lz yuzu-4d220964df2ab1fee6ff2873c576b40cbe106bd2.tar.xz yuzu-4d220964df2ab1fee6ff2873c576b40cbe106bd2.tar.zst yuzu-4d220964df2ab1fee6ff2873c576b40cbe106bd2.zip | |
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/hle/service/nvflinger/nvflinger.cpp | 10 | ||||
| -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 |
3 files changed, 8 insertions, 8 deletions
diff --git a/src/core/hle/service/nvflinger/nvflinger.cpp b/src/core/hle/service/nvflinger/nvflinger.cpp index 04adfc7d8..9217ef040 100644 --- a/src/core/hle/service/nvflinger/nvflinger.cpp +++ b/src/core/hle/service/nvflinger/nvflinger.cpp @@ -31,11 +31,11 @@ constexpr s64 frame_ticks_30fps = static_cast<s64>(Core::Timing::BASE_CLOCK_RATE NVFlinger::NVFlinger(Core::Timing::CoreTiming& core_timing, Core::System& system) : core_timing{core_timing}, system(system) { - displays.emplace_back(0, "Default"); - displays.emplace_back(1, "External"); - displays.emplace_back(2, "Edid"); - displays.emplace_back(3, "Internal"); - displays.emplace_back(4, "Null"); + displays.emplace_back(0, "Default", system); + displays.emplace_back(1, "External", system); + displays.emplace_back(2, "Edid", system); + displays.emplace_back(3, "Internal", system); + displays.emplace_back(4, "Null", system); // Schedule the screen composition events composition_event = core_timing.RegisterEvent("ScreenComposition", [this](u64 userdata, 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; |