mirrors/wlroots
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wlroots/wlroots.git synced 2026-04-02 07:23:52 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

surface: inline surface_commit_pending

Browse source 
It's only used at one call-site and doesn't increase indentation.
Let's just inline the function to get rid of the indirection.
This commit is contained in:
Simon Ser 2021-03-25 19:44:09 +01:00
parent 80dbb9ba71
commit 659c4bd133
1 changed files with 15 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

34
types/wlr_surface.c
View file

@ -457,24 +457,6 @@ static void surface_commit_state(struct wlr_surface *surface,
wlr_signal_emit_safe(&surface->events.commit, surface); wlr_signal_emit_safe(&surface->events.commit, surface);
} }
static void surface_commit_pending(struct wlr_surface *surface) {
if (!surface_state_finalize(surface, &surface->pending)) {
return;
}
if (surface->role && surface->role->precommit) {
surface->role->precommit(surface);
}
uint32_t next_seq = surface->pending.seq + 1;
if (surface->pending.cached_state_locks > 0 || !wl_list_empty(&surface->cached)) {
surface_cache_pending(surface);
} else {
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) {
while (subsurface != NULL) { while (subsurface != NULL) {
if (subsurface->synchronized) { if (subsurface->synchronized) {
@ -538,7 +520,21 @@ static void surface_commit(struct wl_client *client,
subsurface_commit(subsurface); subsurface_commit(subsurface);
} }
surface_commit_pending(surface); if (!surface_state_finalize(surface, &surface->pending)) {
return;
}
if (surface->role && surface->role->precommit) {
surface->role->precommit(surface);
}
uint32_t next_seq = surface->pending.seq + 1;
if (surface->pending.cached_state_locks > 0 || !wl_list_empty(&surface->cached)) {
surface_cache_pending(surface);
} else {
surface_commit_state(surface, &surface->pending);
}
surface->pending.seq = next_seq;
wl_list_for_each(subsurface, &surface->subsurfaces, parent_link) { wl_list_for_each(subsurface, &surface->subsurfaces, parent_link) {
subsurface_parent_commit(subsurface, false); subsurface_parent_commit(subsurface, false);