tstarr/yuzu
1
0
Fork 0
mirror of https://github.com/starr-dusT/yuzu-mainline synced 2024-03-05 21:12:25 -08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #9608 from liamwhite/fps

Browse Source 
nvnflinger: correct swap interval handling
This commit is contained in:
bunnei 2023-01-17 23:13:47 -08:00 committed by GitHub
commit 1551f97950
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/core/hle/service/nvflinger/nvflinger.cpp
View File

@ -312,8 +312,6 @@ void NVFlinger::Compose() {
} }
s64 NVFlinger::GetNextTicks() const { s64 NVFlinger::GetNextTicks() const {
static constexpr s64 max_hertz = 120LL;
const auto& settings = Settings::values; const auto& settings = Settings::values;
auto speed_scale = 1.f; auto speed_scale = 1.f;
if (settings.use_multi_core.GetValue()) { if (settings.use_multi_core.GetValue()) {
@ -327,9 +325,11 @@ s64 NVFlinger::GetNextTicks() const {
} }
} }
const auto next_ticks = ((1000000000 * (1LL << swap_interval)) / max_hertz); // As an extension, treat nonpositive swap interval as framerate multiplier.
const f32 effective_fps = swap_interval <= 0 ? 120.f * static_cast<f32>(1 - swap_interval)
: 60.f / static_cast<f32>(swap_interval);
return static_cast<s64>(speed_scale * static_cast<float>(next_ticks)); return static_cast<s64>(speed_scale * (1000000000.f / effective_fps));
} }
} // namespace Service::NVFlinger } // namespace Service::NVFlinger

2
src/core/hle/service/nvflinger/nvflinger.h
View File

@ -133,7 +133,7 @@ private:
/// layers. /// layers.
u32 next_buffer_queue_id = 1; u32 next_buffer_queue_id = 1;
u32 swap_interval = 1; s32 swap_interval = 1;
/// Event that handles screen composition. /// Event that handles screen composition.
std::shared_ptr<Core::Timing::EventType> multi_composition_event; std::shared_ptr<Core::Timing::EventType> multi_composition_event;