hyprwm/Hyprland
1
0
Fork 0
mirror of https://github.com/hyprwm/Hyprland synced 2024-11-07 21:25:58 +01:00
Code Issues Projects Releases Packages Wiki Activity

stuff

Browse source
This commit is contained in:
Vaxry 2024-03-18 22:00:17 +00:00
parent 0d478497f8
commit a8dc0d3824
3 changed files with 16 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/events/Monitors.cpp
View file

@ -237,5 +237,6 @@ void Events::listener_monitorBind(void* owner, void* data) {
void Events::listener_monitorPresent(void* owner, void* data) { void Events::listener_monitorPresent(void* owner, void* data) {
const auto PMONITOR = (CMonitor*)owner; const auto PMONITOR = (CMonitor*)owner;
g_pFrameSchedulingManager->onPresent(PMONITOR); const auto DATA = (wlr_output_event_present*)data;
g_pFrameSchedulingManager->onPresent(PMONITOR, DATA);
} }

20
src/managers/FrameSchedulingManager.cpp
View file

@ -23,20 +23,21 @@ void CFrameSchedulingManager::unregisterMonitor(CMonitor* pMonitor) {
void CFrameSchedulingManager::onFrameNeeded(CMonitor* pMonitor) { void CFrameSchedulingManager::onFrameNeeded(CMonitor* pMonitor) {
const auto DATA = dataFor(pMonitor); const auto DATA = dataFor(pMonitor);
RASSERT(DATA, "No data in gpuDone"); RASSERT(DATA, "No data in onFrameNeeded");
if (pMonitor->tearingState.activelyTearing) if (pMonitor->tearingState.activelyTearing)
return; return;
if (DATA->activelyPushing) { if (DATA->activelyPushing && DATA->lastPresent.getMillis() < 100) {
DATA->forceFrames++; if (DATA->forceFrames < 1)
DATA->forceFrames++;
return; return;
} }
Debug::log(LOG, "onFrameNeeded"); Debug::log(LOG, "onFrameNeeded");
DATA->noVblankTimer = true; DATA->noVblankTimer = true;
onPresent(pMonitor); onPresent(pMonitor, nullptr);
} }
void CFrameSchedulingManager::gpuDone(wlr_buffer* pBuffer) { void CFrameSchedulingManager::gpuDone(wlr_buffer* pBuffer) {
@ -71,7 +72,7 @@ void CFrameSchedulingManager::dropBuffer(wlr_buffer* pBuffer) {
} }
} }
void CFrameSchedulingManager::onPresent(CMonitor* pMonitor) { void CFrameSchedulingManager::onPresent(CMonitor* pMonitor, wlr_output_event_present* presentationData) {
const auto DATA = dataFor(pMonitor); const auto DATA = dataFor(pMonitor);
RASSERT(DATA, "No data in onPresent"); RASSERT(DATA, "No data in onPresent");
@ -117,10 +118,13 @@ void CFrameSchedulingManager::onPresent(CMonitor* pMonitor) {
Debug::log(LOG, "remder!"); Debug::log(LOG, "remder!");
// we can't do this on wayland // we can't do this on wayland
if (!wlr_backend_is_wl(pMonitor->output->backend) && !DATA->noVblankTimer) { if (!wlr_backend_is_wl(pMonitor->output->backend) && !DATA->noVblankTimer && presentationData) {
const float TIMEUNTILVBLANK = 1000.0 / pMonitor->refreshRate; const std::chrono::system_clock::time_point LASTVBLANK{std::chrono::duration_cast<std::chrono::system_clock::duration>(
std::chrono::seconds{presentationData->when->tv_sec} + std::chrono::nanoseconds{presentationData->when->tv_nsec})};
const float MSUNTILVBLANK = (presentationData->refresh ? presentationData->refresh / 1000000.0 : pMonitor->refreshRate / 1000.0) -
std::chrono::duration_cast<std::chrono::milliseconds>(std::chrono::system_clock::now() - LASTVBLANK).count();
wl_event_source_timer_update(DATA->event, 0); wl_event_source_timer_update(DATA->event, 0);
wl_event_source_timer_update(DATA->event, std::floor(TIMEUNTILVBLANK)); wl_event_source_timer_update(DATA->event, std::floor(MSUNTILVBLANK));
} }
renderMonitor(DATA); renderMonitor(DATA);

3
src/managers/FrameSchedulingManager.hpp
View file

@ -6,6 +6,7 @@
class CMonitor; class CMonitor;
struct wlr_buffer; struct wlr_buffer;
struct wlr_output_event_present;
class CFrameSchedulingManager { class CFrameSchedulingManager {
public: public:
@ -18,7 +19,7 @@ class CFrameSchedulingManager {
void onFrameNeeded(CMonitor* pMonitor); void onFrameNeeded(CMonitor* pMonitor);
void onPresent(CMonitor* pMonitor); void onPresent(CMonitor* pMonitor, wlr_output_event_present* presentationData);
int onVblankTimer(void* data); int onVblankTimer(void* data);