From cd58c45daa4782ee6d28a746f28c4f69179e81a1 Mon Sep 17 00:00:00 2001 From: Derek Foreman Date: Thu, 4 Sep 2025 12:43:06 -0500 Subject: [PATCH] compositor: Move weston_surface_commit() Moving this later in the file lets us drop the prototype for weston_subsurface_commit(). Signed-off-by: Derek Foreman --- libweston/surface-state.c | 31 ++++++++++++++----------------- 1 file changed, 14 insertions(+), 17 deletions(-) diff --git a/libweston/surface-state.c b/libweston/surface-state.c index 4f66e0973..47709af09 100644 --- a/libweston/surface-state.c +++ b/libweston/surface-state.c @@ -419,9 +419,6 @@ weston_surface_apply_state(struct weston_surface *surface, return status; } -static enum weston_surface_status -weston_subsurface_commit(struct weston_subsurface *sub); - static enum weston_surface_status weston_subsurface_apply_from_cache(struct weston_subsurface *sub) { @@ -479,20 +476,6 @@ weston_surface_apply(struct weston_surface *surface, return status; } -enum weston_surface_status -weston_surface_commit(struct weston_surface *surface) -{ - struct weston_subsurface *sub = weston_surface_to_subsurface(surface); - enum weston_surface_status status; - - if (sub) - status = weston_subsurface_commit(sub); - else - status = weston_surface_apply(surface, &surface->pending); - - return status; -} - static void weston_surface_state_merge_from(struct weston_surface_state *dst, struct weston_surface_state *src, @@ -595,6 +578,20 @@ weston_subsurface_commit(struct weston_subsurface *sub) return weston_subsurface_apply_from_cache(sub); } +enum weston_surface_status +weston_surface_commit(struct weston_surface *surface) +{ + struct weston_subsurface *sub = weston_surface_to_subsurface(surface); + enum weston_surface_status status; + + if (sub) + status = weston_subsurface_commit(sub); + else + status = weston_surface_apply(surface, &surface->pending); + + return status; +} + /** Recursively update effectively_synchronized state for a subsurface tree * * \param sub Subsurface to start from