diff options
| author | bunnei <bunneidev@gmail.com> | 2019-03-25 21:06:33 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-25 21:06:33 -0400 |
| commit | 595511876e9669c09c7b60a2fa4a1164dc5d0e66 (patch) | |
| tree | dc2ab78d68f54f61d06fe0596d104cd16cbd3fbe /src/core/hle/service/nvflinger/nvflinger.cpp | |
| parent | 8a24a804c588867f51f7193581e0b4ddb5d9d7c2 (diff) | |
| parent | c5d41fd812d7eb1a04f36b76c08fe971cee0868c (diff) | |
Merge pull request #2287 from lioncash/coretiming-cb
core/core_timing: Make callback parameters consistent
Diffstat (limited to 'src/core/hle/service/nvflinger/nvflinger.cpp')
| -rw-r--r-- | src/core/hle/service/nvflinger/nvflinger.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/hle/service/nvflinger/nvflinger.cpp b/src/core/hle/service/nvflinger/nvflinger.cpp index fc496b654..c7f5bbf28 100644 --- a/src/core/hle/service/nvflinger/nvflinger.cpp +++ b/src/core/hle/service/nvflinger/nvflinger.cpp @@ -26,7 +26,7 @@ namespace Service::NVFlinger { constexpr std::size_t SCREEN_REFRESH_RATE = 60; -constexpr u64 frame_ticks = static_cast<u64>(Core::Timing::BASE_CLOCK_RATE / SCREEN_REFRESH_RATE); +constexpr s64 frame_ticks = static_cast<s64>(Core::Timing::BASE_CLOCK_RATE / SCREEN_REFRESH_RATE); NVFlinger::NVFlinger(Core::Timing::CoreTiming& core_timing) : core_timing{core_timing} { displays.emplace_back(0, "Default"); @@ -37,7 +37,7 @@ NVFlinger::NVFlinger(Core::Timing::CoreTiming& core_timing) : core_timing{core_t // Schedule the screen composition events composition_event = - core_timing.RegisterEvent("ScreenComposition", [this](u64 userdata, int cycles_late) { + core_timing.RegisterEvent("ScreenComposition", [this](u64 userdata, s64 cycles_late) { Compose(); this->core_timing.ScheduleEvent(frame_ticks - cycles_late, composition_event); }); |