Mirrors/yuzu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

NVFlinger: Correct GCC compile error

Browse source
This commit is contained in:
Fernando Sahmkow 2019-06-18 16:58:29 -04:00 • committed by FernandoS27
parent 0335a25d1f
commit b391e5f638
8 changed files with 21 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/core/hle/service/nvflinger/buffer_queue.h
View file

@ -4,9 +4,9 @@
#pragma once
#include <list>
#include <optional>
#include <vector>
#include <list>
#include "common/common_funcs.h"
#include "common/math_util.h"

14
src/core/hle/service/nvflinger/nvflinger.cpp
View file

@ -37,14 +37,14 @@ NVFlinger::NVFlinger(Core::Timing::CoreTiming& core_timing) : core_timing{core_t
displays.emplace_back(4, "Null");
// Schedule the screen composition events
//const auto ticks = Settings::values.force_30fps_mode ? frame_ticks_30fps : frame_ticks;
// const auto ticks = Settings::values.force_30fps_mode ? frame_ticks_30fps : frame_ticks;
composition_event = core_timing.RegisterEvent(
"ScreenComposition", [this](u64 userdata, s64 cycles_late) {
Compose();
const auto ticks = Settings::values.force_30fps_mode ? frame_ticks_30fps : GetNextTicks();
this->core_timing.ScheduleEvent(std::max(0LL,ticks - cycles_late), composition_event);
});
composition_event = core_timing.RegisterEvent("ScreenComposition", [this](u64 userdata,
s64 cycles_late) {
Compose();
const auto ticks = Settings::values.force_30fps_mode ? frame_ticks_30fps : GetNextTicks();
this->core_timing.ScheduleEvent(std::max<s64>(0LL, ticks - cycles_late), composition_event);
});
core_timing.ScheduleEvent(frame_ticks, composition_event);
}