diff options
| author | 2023-12-23 13:58:09 -0500 | |
|---|---|---|
| committer | 2023-12-23 15:36:44 -0500 | |
| commit | f34d3d7e84a1396d4d4f07ec1434b06b1f39bb8a (patch) | |
| tree | e04a08b7ecf57be7aa7a9d2801f09eddd5d19018 /src/core/hle/service/nvnflinger | |
| parent | Merge pull request #12412 from ameerj/gl-query-prims (diff) | |
| download | yuzu-f34d3d7e84a1396d4d4f07ec1434b06b1f39bb8a.tar.gz yuzu-f34d3d7e84a1396d4d4f07ec1434b06b1f39bb8a.tar.xz yuzu-f34d3d7e84a1396d4d4f07ec1434b06b1f39bb8a.zip | |
core_timing: remove user data value
Diffstat (limited to 'src/core/hle/service/nvnflinger')
| -rw-r--r-- | src/core/hle/service/nvnflinger/nvnflinger.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/core/hle/service/nvnflinger/nvnflinger.cpp b/src/core/hle/service/nvnflinger/nvnflinger.cpp index 6352b09a9..aa8aaa2d9 100644 --- a/src/core/hle/service/nvnflinger/nvnflinger.cpp +++ b/src/core/hle/service/nvnflinger/nvnflinger.cpp | |||
| @@ -67,7 +67,7 @@ Nvnflinger::Nvnflinger(Core::System& system_, HosBinderDriverServer& hos_binder_ | |||
| 67 | // Schedule the screen composition events | 67 | // Schedule the screen composition events |
| 68 | multi_composition_event = Core::Timing::CreateEvent( | 68 | multi_composition_event = Core::Timing::CreateEvent( |
| 69 | "ScreenComposition", | 69 | "ScreenComposition", |
| 70 | [this](std::uintptr_t, s64 time, | 70 | [this](s64 time, |
| 71 | std::chrono::nanoseconds ns_late) -> std::optional<std::chrono::nanoseconds> { | 71 | std::chrono::nanoseconds ns_late) -> std::optional<std::chrono::nanoseconds> { |
| 72 | vsync_signal.Set(); | 72 | vsync_signal.Set(); |
| 73 | return std::chrono::nanoseconds(GetNextTicks()); | 73 | return std::chrono::nanoseconds(GetNextTicks()); |
| @@ -75,7 +75,7 @@ Nvnflinger::Nvnflinger(Core::System& system_, HosBinderDriverServer& hos_binder_ | |||
| 75 | 75 | ||
| 76 | single_composition_event = Core::Timing::CreateEvent( | 76 | single_composition_event = Core::Timing::CreateEvent( |
| 77 | "ScreenComposition", | 77 | "ScreenComposition", |
| 78 | [this](std::uintptr_t, s64 time, | 78 | [this](s64 time, |
| 79 | std::chrono::nanoseconds ns_late) -> std::optional<std::chrono::nanoseconds> { | 79 | std::chrono::nanoseconds ns_late) -> std::optional<std::chrono::nanoseconds> { |
| 80 | const auto lock_guard = Lock(); | 80 | const auto lock_guard = Lock(); |
| 81 | Compose(); | 81 | Compose(); |
| @@ -93,11 +93,11 @@ Nvnflinger::Nvnflinger(Core::System& system_, HosBinderDriverServer& hos_binder_ | |||
| 93 | 93 | ||
| 94 | Nvnflinger::~Nvnflinger() { | 94 | Nvnflinger::~Nvnflinger() { |
| 95 | if (system.IsMulticore()) { | 95 | if (system.IsMulticore()) { |
| 96 | system.CoreTiming().UnscheduleEvent(multi_composition_event, {}); | 96 | system.CoreTiming().UnscheduleEvent(multi_composition_event); |
| 97 | vsync_thread.request_stop(); | 97 | vsync_thread.request_stop(); |
| 98 | vsync_signal.Set(); | 98 | vsync_signal.Set(); |
| 99 | } else { | 99 | } else { |
| 100 | system.CoreTiming().UnscheduleEvent(single_composition_event, {}); | 100 | system.CoreTiming().UnscheduleEvent(single_composition_event); |
| 101 | } | 101 | } |
| 102 | 102 | ||
| 103 | ShutdownLayers(); | 103 | ShutdownLayers(); |