mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2024-11-25 09:21:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

desktop/output: unify page-flip codepath

Browse source 
Instead of having a special codepath for applying gamma LUTs, have
a single codepath for regular page-flips and gamma LUT updates.
Should make it easier to add more logic on top e.g. for tearing
page-flips.
This commit is contained in:
Simon Ser 2024-07-01 09:21:53 +02:00
parent 5d237679f5
commit 1e0031781f
1 changed files with 12 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
sway/desktop/output.c
View file

@ -247,13 +247,13 @@ static int output_repaint_timer_handler(void *data) {
.color_transform = output->color_transform, .color_transform = output->color_transform,
}; };
if (output->gamma_lut_changed) {
struct wlr_output_state pending; struct wlr_output_state pending;
wlr_output_state_init(&pending); wlr_output_state_init(&pending);
if (!wlr_scene_output_build_state(output->scene_output, &pending, &opts)) { if (!wlr_scene_output_build_state(output->scene_output, &pending, &opts)) {
return 0; return 0;
} }
if (output->gamma_lut_changed) {
output->gamma_lut_changed = false; output->gamma_lut_changed = false;
struct wlr_gamma_control_v1 *gamma_control = struct wlr_gamma_control_v1 *gamma_control =
wlr_gamma_control_manager_v1_get_control( wlr_gamma_control_manager_v1_get_control(
@ -263,17 +263,16 @@ static int output_repaint_timer_handler(void *data) {
return 0; return 0;
} }
if (!wlr_output_commit_state(output->wlr_output, &pending)) { if (!wlr_output_test_state(output->wlr_output, &pending)) {
wlr_gamma_control_v1_send_failed_and_destroy(gamma_control); wlr_gamma_control_v1_send_failed_and_destroy(gamma_control);
wlr_output_state_finish(&pending); wlr_output_state_set_gamma_lut(&pending, 0, NULL, NULL, NULL);
return 0; }
} }
wlr_output_state_finish(&pending); if (!wlr_output_commit_state(output->wlr_output, &pending)) {
return 0; sway_log(SWAY_ERROR, "Page-flip failed on output %s", output->wlr_output->name);
} }
wlr_output_state_finish(&pending);
wlr_scene_output_commit(output->scene_output, &opts);
return 0; return 0;
} }