fdo-mirrors/weston
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wayland/weston.git synced 2026-05-05 14:38:07 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

compositor: Make weston_surface_commit handle subsurfaces

Browse source 
Push the subsurface vs surface logic into weston_surface_commit so there's
just one function to call from surface_commit to handle both.

This is mostly preparation for splitting off a bunch of surface handling
functions into their own file later.

Signed-off-by: Derek Foreman <derek.foreman@collabora.com>
This commit is contained in:
Derek Foreman 2025-07-04 10:52:53 -05:00
parent 76dc730d3d
commit 3b017341b7
1 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
libweston/compositor.c
View file

@ -5084,7 +5084,15 @@ weston_surface_apply(struct weston_surface *surface,
static enum weston_surface_status
weston_surface_commit(struct weston_surface *surface)
{
return weston_surface_apply(surface, &surface->pending);
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
@ -5092,7 +5100,6 @@ surface_commit(struct wl_client *client, struct wl_resource *resource)
{
struct weston_surface *surface = wl_resource_get_user_data(resource);
WESTON_TRACE_FUNC_FLOW(&surface->flow_id);
struct weston_subsurface *sub = weston_surface_to_subsurface(surface);
enum weston_surface_status status;
if (!weston_surface_is_pending_viewport_source_valid(surface)) {
@ -5148,11 +5155,7 @@ surface_commit(struct wl_client *client, struct wl_resource *resource)
return;
}
if (sub) {
status = weston_subsurface_commit(sub);
} else {
status = weston_surface_commit(surface);
}
status = weston_surface_commit(surface);
if (status & WESTON_SURFACE_DIRTY_SUBSURFACE_CONFIG)
surface->compositor->view_list_needs_rebuild = true;