brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

wayland/surface: Discard presentation feedback in _state_merge_into

Browse Source 
Newly merged state is always from a different surface commit than the
existing state.

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1880>
This commit is contained in:
Michel Dänzer 2021-05-25 15:51:52 +02:00 committed by Michel Dänzer
parent d43150573e
commit 854c02651f
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/wayland/meta-wayland-surface.c
View File

@ -658,6 +658,11 @@ meta_wayland_surface_state_merge_into (MetaWaylandSurfaceState *from,
from->subsurface_placement_ops = NULL;
}
/*
* A new commit indicates a new content update, so any previous
* content update did not go on screen and needs to be discarded.
*/
meta_wayland_surface_state_discard_presentation_feedback (to);
wl_list_insert_list (&to->presentation_feedback_list,
&from->presentation_feedback_list);
wl_list_init (&from->presentation_feedback_list);
@ -1025,12 +1030,6 @@ meta_wayland_surface_commit (MetaWaylandSurface *surface)
{
ensure_cached_state (surface);
/*
* A new commit indicates a new content update, so any previous
* cached content update did not go on screen and needs to be discarded.
*/
meta_wayland_surface_state_discard_presentation_feedback (surface->cached_state);
meta_wayland_surface_state_merge_into (pending, surface->cached_state);
}
else