From 7b3d03938888f399c3c14adfce73ea22bbe461ea Mon Sep 17 00:00:00 2001 From: Vaxry Date: Sat, 27 Jan 2024 13:58:13 +0000 Subject: deps: update wlroots drops requirement for WLR_DRM_NO_ATOMIC provided kernel >= 6.8 --- src/config/ConfigManager.cpp | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) (limited to 'src/config/ConfigManager.cpp') diff --git a/src/config/ConfigManager.cpp b/src/config/ConfigManager.cpp index 532a8a38..e9d2e512 100644 --- a/src/config/ConfigManager.cpp +++ b/src/config/ConfigManager.cpp @@ -2310,30 +2310,30 @@ void CConfigManager::ensureVRR(CMonitor* pMonitor) { static auto* const PVRR = &getConfigValuePtr("misc:vrr")->intValue; static auto ensureVRRForDisplay = [&](CMonitor* m) -> void { - if (!m->output) + if (!m->output || m->createdByUser) return; const auto USEVRR = m->activeMonitorRule.vrr.has_value() ? m->activeMonitorRule.vrr.value() : *PVRR; if (USEVRR == 0) { if (m->vrrActive) { - wlr_output_enable_adaptive_sync(m->output, 0); + wlr_output_state_set_adaptive_sync_enabled(&m->outputState, 0); - if (!wlr_output_commit(m->output)) + if (!wlr_output_commit_state(m->output, &m->outputState)) Debug::log(ERR, "Couldn't commit output {} in ensureVRR -> false", m->output->name); } m->vrrActive = false; return; } else if (USEVRR == 1) { if (!m->vrrActive) { - wlr_output_enable_adaptive_sync(m->output, 1); + wlr_output_state_set_adaptive_sync_enabled(&m->outputState, 1); - if (!wlr_output_test(m->output)) { + if (!wlr_output_test_state(m->output, &m->outputState)) { Debug::log(LOG, "Pending output {} does not accept VRR.", m->output->name); - wlr_output_enable_adaptive_sync(m->output, 0); + wlr_output_state_set_adaptive_sync_enabled(&m->outputState, 0); } - if (!wlr_output_commit(m->output)) + if (!wlr_output_commit_state(m->output, &m->outputState)) Debug::log(ERR, "Couldn't commit output {} in ensureVRR -> true", m->output->name); } m->vrrActive = true; @@ -2350,20 +2350,20 @@ void CConfigManager::ensureVRR(CMonitor* pMonitor) { const auto WORKSPACEFULL = PWORKSPACE->m_bHasFullscreenWindow && PWORKSPACE->m_efFullscreenMode == FULLSCREEN_FULL; if (WORKSPACEFULL && m->output->adaptive_sync_status == WLR_OUTPUT_ADAPTIVE_SYNC_DISABLED) { - wlr_output_enable_adaptive_sync(m->output, 1); + wlr_output_state_set_adaptive_sync_enabled(&m->outputState, 1); - if (!wlr_output_test(m->output)) { + if (!wlr_output_test_state(m->output, &m->outputState)) { Debug::log(LOG, "Pending output {} does not accept VRR.", m->output->name); - wlr_output_enable_adaptive_sync(m->output, 0); + wlr_output_state_set_adaptive_sync_enabled(&m->outputState, 0); } - if (!wlr_output_commit(m->output)) + if (!wlr_output_commit_state(m->output, &m->outputState)) Debug::log(ERR, "Couldn't commit output {} in ensureVRR -> true", m->output->name); } else if (!WORKSPACEFULL && m->output->adaptive_sync_status == WLR_OUTPUT_ADAPTIVE_SYNC_ENABLED) { - wlr_output_enable_adaptive_sync(m->output, 0); + wlr_output_state_set_adaptive_sync_enabled(&m->outputState, 0); - if (!wlr_output_commit(m->output)) + if (!wlr_output_commit_state(m->output, &m->outputState)) Debug::log(ERR, "Couldn't commit output {} in ensureVRR -> false", m->output->name); } } -- cgit v1.2.3