mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2025-11-03 09:01:43 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

config/output: Skip VRR tests when not supported

Browse source 
Adaptive sync is a "soft" setting which we degrade of off when not
supported. Some outputs types do not support turning it off (Wayland,
X11), which makes for an awkward three-way test where we first enable,
disable and finally unset the setting.

wlr_output.adaptive_sync_supported tells us whether the output
definitely does not support making changes (backend without support,
connector without the feature), or whether it might work.

Use this to avoid wasting time on adaptive sync test that can never
succeed, and to avoid the Wayland/X11-backend specific unset step.
This commit is contained in:
Kenny Levinsen 2024-07-02 00:39:21 +02:00 • committed by Simon Ser
parent 1e0031781f
commit 4e38f93f36
1 changed files with 6 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

15
sway/config/output.c
View file

@ -721,21 +721,18 @@ static bool search_adaptive_sync(struct search_context *ctx, size_t output_idx)
struct wlr_backend_output_state *backend_state = &ctx->states[output_idx]; struct wlr_backend_output_state *backend_state = &ctx->states[output_idx];
struct wlr_output_state *state = &backend_state->base; struct wlr_output_state *state = &backend_state->base;
if (!backend_state->output->adaptive_sync_supported) {
return search_finish(ctx, output_idx);
}
if (cfg->config && cfg->config->adaptive_sync == 1) { if (cfg->config && cfg->config->adaptive_sync == 1) {
wlr_output_state_set_adaptive_sync_enabled(state, true); wlr_output_state_set_adaptive_sync_enabled(state, true);
if (search_finish(ctx, output_idx)) { if (search_finish(ctx, output_idx)) {
return true; return true;
} }
} }
if (!cfg->config || cfg->config->adaptive_sync != -1) {
wlr_output_state_set_adaptive_sync_enabled(state, false); wlr_output_state_set_adaptive_sync_enabled(state, false);
if (search_finish(ctx, output_idx)) {
return true;
}
}
// If adaptive sync has not been set, or fallback in case we are on a
// backend that cannot disable adaptive sync such as the wayland backend.
state->committed &= ~WLR_OUTPUT_STATE_ADAPTIVE_SYNC_ENABLED;
return search_finish(ctx, output_idx); return search_finish(ctx, output_idx);
} }