summaryrefslogtreecommitdiff
path: root/src/config/ConfigManager.cpp
diff options
context:
space:
mode:
authorVaxry <vaxry@vaxry.net>2024-01-27 13:58:13 +0000
committerVaxry <vaxry@vaxry.net>2024-01-27 13:58:28 +0000
commit7b3d03938888f399c3c14adfce73ea22bbe461ea (patch)
tree871448bf8b8b3a942629793af27132686247a3ed /src/config/ConfigManager.cpp
parent12d79d63421e2ed3f31130755c7a37f0e4fb5cb1 (diff)
deps: update wlroots
drops requirement for WLR_DRM_NO_ATOMIC provided kernel >= 6.8
Diffstat (limited to 'src/config/ConfigManager.cpp')
-rw-r--r--src/config/ConfigManager.cpp26
1 files changed, 13 insertions, 13 deletions
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);
}
}