mirrors/labwc
1
0
Fork 0
mirror of https://github.com/labwc/labwc.git synced 2026-04-10 08:21:07 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

tearing: handle case where test commit is positive, but actual commit fails

Browse source
This commit is contained in:
Ricardo Steijn 2024-11-03 16:39:37 +01:00
parent 840a0c0155
commit b44c703064
1 changed files with 15 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

22
src/common/scene-helpers.c
View file

@ -118,14 +118,22 @@ lab_wlr_scene_output_commit(struct wlr_scene_output *scene_output,
magnify(output, state->buffer, &additional_damage);
}
if (state == &output->pending) {
if (!output_state_commit(output)) {
wlr_log(WLR_INFO, "Failed to commit output %s",
wlr_output->name);
return false;
bool committed = wlr_output_commit_state(wlr_output, state);
/*
* Handle case where the ouput state test for tearing succeeded,
* but actual commit failed. Retry wihout tearing.
*/
if (!committed && state->tearing_page_flip) {
state->tearing_page_flip = false;
committed = wlr_output_commit_state(wlr_output, state);
}
if (committed) {
if (state == &output->pending) {
wlr_output_state_finish(&output->pending);
wlr_output_state_init(&output->pending);
}
} else if (!wlr_output_commit_state(wlr_output, state)) {
wlr_log(WLR_INFO, "Failed to commit state for output %s",
} else {
wlr_log(WLR_INFO, "Failed to commit output %s",
wlr_output->name);
return false;
}