mirrors/wlroots
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wlroots/wlroots.git synced 2026-04-18 06:47:31 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'output-adaptive-sync' into 'master'

Browse source 
output: Replace wlr_output_adaptive_sync_status with bool

See merge request wlroots/wlroots!4222
This commit is contained in:
Alexander Orzechowski 2024-02-23 21:12:56 +00:00
commit 8fa643f951
8 changed files with 15 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

9
types/output/output.c
View file

@ -532,12 +532,9 @@ static uint32_t output_compare_state(struct wlr_output *output,
output->transform == state->transform) {
fields |= WLR_OUTPUT_STATE_TRANSFORM;
}
if (state->committed & WLR_OUTPUT_STATE_ADAPTIVE_SYNC_ENABLED) {
bool enabled =
output->adaptive_sync_status != WLR_OUTPUT_ADAPTIVE_SYNC_DISABLED;
if (enabled == state->adaptive_sync_enabled) {
fields |= WLR_OUTPUT_STATE_ADAPTIVE_SYNC_ENABLED;
}
if (state->committed & WLR_OUTPUT_STATE_ADAPTIVE_SYNC_ENABLED &&
output->adaptive_sync_enabled != state->adaptive_sync_enabled) {
fields |= WLR_OUTPUT_STATE_ADAPTIVE_SYNC_ENABLED;
}
if ((state->committed & WLR_OUTPUT_STATE_RENDER_FORMAT) &&
output->render_format == state->render_format) {

3
types/wlr_output_management_v1.c
View file

@ -159,8 +159,7 @@ struct wlr_output_configuration_head_v1 *
config_head->state.custom_mode.refresh = output->refresh;
config_head->state.transform = output->transform;
config_head->state.scale = output->scale;
config_head->state.adaptive_sync_enabled =
output->adaptive_sync_status == WLR_OUTPUT_ADAPTIVE_SYNC_ENABLED;
config_head->state.adaptive_sync_enabled = output->adaptive_sync_enabled;
return config_head;
}