diff options
| -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 | |||
| 31 | 31 | ||
| 32 | NVFlinger::NVFlinger(Core::Timing::CoreTiming& core_timing, Core::System& system) | 32 | NVFlinger::NVFlinger(Core::Timing::CoreTiming& core_timing, Core::System& system) |
| 33 | : core_timing{core_timing}, system(system) { | 33 | : core_timing{core_timing}, system(system) { |
| 34 | displays.emplace_back(0, "Default"); | 34 | displays.emplace_back(0, "Default", system); |
| 35 | displays.emplace_back(1, "External"); | 35 | displays.emplace_back(1, "External", system); |
| 36 | displays.emplace_back(2, "Edid"); | 36 | displays.emplace_back(2, "Edid", system); |
| 37 | displays.emplace_back(3, "Internal"); | 37 | displays.emplace_back(3, "Internal", system); |
| 38 | displays.emplace_back(4, "Null"); | 38 | displays.emplace_back(4, "Null", system); |
| 39 | 39 | ||
| 40 | // Schedule the screen composition events | 40 | // Schedule the screen composition events |
| 41 | composition_event = core_timing.RegisterEvent("ScreenComposition", [this](u64 userdata, | 41 | 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 @@ | |||
| 15 | 15 | ||
| 16 | namespace Service::VI { | 16 | namespace Service::VI { |
| 17 | 17 | ||
| 18 | Display::Display(u64 id, std::string name) : id{id}, name{std::move(name)} { | 18 | Display::Display(u64 id, std::string name, Core::System& system) : id{id}, name{std::move(name)} { |
| 19 | auto& kernel = Core::System::GetInstance().Kernel(); | 19 | auto& kernel = system.Kernel(); |
| 20 | vsync_event = Kernel::WritableEvent::CreateEventPair(kernel, Kernel::ResetType::Manual, | 20 | vsync_event = Kernel::WritableEvent::CreateEventPair(kernel, Kernel::ResetType::Manual, |
| 21 | fmt::format("Display VSync Event {}", id)); | 21 | fmt::format("Display VSync Event {}", id)); |
| 22 | } | 22 | } |
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: | |||
| 26 | /// @param id The unique ID for this display. | 26 | /// @param id The unique ID for this display. |
| 27 | /// @param name The name for this display. | 27 | /// @param name The name for this display. |
| 28 | /// | 28 | /// |
| 29 | Display(u64 id, std::string name); | 29 | Display(u64 id, std::string name, Core::System& system); |
| 30 | ~Display(); | 30 | ~Display(); |
| 31 | 31 | ||
| 32 | Display(const Display&) = delete; | 32 | Display(const Display&) = delete; |