blankie
/
wlroots
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

surface: allow locking pending state in commit handler 

We were bumping the pending sequence number after emitting the
commit event, so commit handlers were seeing inconsistent state
where current.seq == pending.seq. This prevents commit handlers
from immediately locking the pending state.

Fix this by bumping the pending sequence number before firing the
commit event.
This commit is contained in:
Simon Ser 2021-07-02 11:49:53 +02:00
parent 0a522cb798
commit c7018a45b7
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
types/wlr_surface.c
View File

@ -415,6 +415,8 @@ static void surface_cache_pending(struct wlr_surface *surface) {
surface_state_move(cached, &surface->pending); surface_state_move(cached, &surface->pending);
wl_list_insert(surface->cached.prev, &cached->cached_state_link); wl_list_insert(surface->cached.prev, &cached->cached_state_link);
surface->pending.seq++;
} }
static void surface_commit_state(struct wlr_surface *surface, static void surface_commit_state(struct wlr_surface *surface,
@ -459,6 +461,12 @@ static void surface_commit_state(struct wlr_surface *surface,
} }
} }
// If we're committing the pending state, bump the pending sequence number
// here, to allow commit listeners to lock the new pending state.
if (next == &surface->pending) {
surface->pending.seq++;
}
if (surface->role && surface->role->commit) { if (surface->role && surface->role->commit) {
surface->role->commit(surface); surface->role->commit(surface);
} }
@ -473,13 +481,11 @@ static void surface_commit_pending(struct wlr_surface *surface) {
surface->role->precommit(surface); surface->role->precommit(surface);
} }
uint32_t next_seq = surface->pending.seq + 1;
if (surface->pending.cached_state_locks > 0 || !wl_list_empty(&surface->cached)) { if (surface->pending.cached_state_locks > 0 || !wl_list_empty(&surface->cached)) {
surface_cache_pending(surface); surface_cache_pending(surface);
} else { } else {
surface_commit_state(surface, &surface->pending); surface_commit_state(surface, &surface->pending);
} }
surface->pending.seq = next_seq;
} }
static bool subsurface_is_synchronized(struct wlr_subsurface *subsurface) { static bool subsurface_is_synchronized(struct wlr_subsurface *subsurface) {