cry/Hyprland
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

monitor: fix DS deactivation (#13188)

Browse source
This commit is contained in:
UjinT34 2026-02-04 15:42:43 +03:00 • committed by GitHub
parent 1bc857b12c
commit 02ff413002
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 4 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/helpers/Monitor.hpp
View file

@ -177,6 +177,7 @@ class CMonitor {
// for direct scanout // for direct scanout
PHLWINDOWREF m_lastScanout; PHLWINDOWREF m_lastScanout;
bool m_directScanoutIsActive = false; // for cleanup logic. m_lastScanout.expired() can become true before the DS cleanup if client crashes/exits while DS is active.
bool m_scanoutNeedsCursorUpdate = false; bool m_scanoutNeedsCursorUpdate = false;
// for special fade/blur // for special fade/blur

4
src/render/Renderer.cpp
View file

@ -1315,10 +1315,12 @@ void CHyprRenderer::renderMonitor(PHLMONITOR pMonitor, bool commit) {
bool shouldTear = pMonitor->updateTearing(); bool shouldTear = pMonitor->updateTearing();
if (pMonitor->attemptDirectScanout()) { if (pMonitor->attemptDirectScanout()) {
pMonitor->m_directScanoutIsActive = true;
return; return;
} else if (!pMonitor->m_lastScanout.expired()) { } else if (!pMonitor->m_lastScanout.expired() || pMonitor->m_directScanoutIsActive) {
Log::logger->log(Log::DEBUG, "Left a direct scanout."); Log::logger->log(Log::DEBUG, "Left a direct scanout.");
pMonitor->m_lastScanout.reset(); pMonitor->m_lastScanout.reset();
pMonitor->m_directScanoutIsActive = false;
// reset DRM format, but only if needed since it might modeset // reset DRM format, but only if needed since it might modeset
if (pMonitor->m_output->state->state().drmFormat != pMonitor->m_prevDrmFormat) if (pMonitor->m_output->state->state().drmFormat != pMonitor->m_prevDrmFormat)