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

compositor: Move some surface state functions

Browse source 
Just code motion to get rid of an unnecessary prototype.

Signed-off-by: Derek Foreman <derek.foreman@collabora.com>
This commit is contained in:
Derek Foreman 2025-09-04 12:31:28 -05:00
parent 0ea8141195
commit f4bad074e6
1 changed files with 32 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

67
libweston/surface-state.c
View file

@ -423,7 +423,38 @@ static enum weston_surface_status
weston_subsurface_commit(struct weston_subsurface *sub);
static enum weston_surface_status
weston_subsurface_parent_apply(struct weston_subsurface *sub);
weston_subsurface_apply_from_cache(struct weston_subsurface *sub)
{
WESTON_TRACE_FUNC();
struct weston_surface *surface = sub->surface;
enum weston_surface_status status;
status = weston_surface_apply(surface, &sub->cached);
weston_buffer_reference(&sub->cached_buffer_ref, NULL,
BUFFER_WILL_NOT_BE_ACCESSED);
return status;
}
static enum weston_surface_status
weston_subsurface_parent_apply(struct weston_subsurface *sub)
{
enum weston_surface_status status = WESTON_SURFACE_CLEAN;
struct weston_view *view;
if (sub->position.changed) {
wl_list_for_each(view, &sub->surface->views, surface_link)
weston_view_set_rel_position(view,
sub->position.offset);
sub->position.changed = false;
}
if (sub->effectively_synchronized)
status = weston_subsurface_apply_from_cache(sub);
return status;
}
static enum weston_surface_status
weston_surface_apply(struct weston_surface *surface,
@ -462,20 +493,6 @@ weston_surface_commit(struct weston_surface *surface)
return status;
}
static enum weston_surface_status
weston_subsurface_apply_from_cache(struct weston_subsurface *sub)
{
WESTON_TRACE_FUNC();
struct weston_surface *surface = sub->surface;
enum weston_surface_status status;
status = weston_surface_apply(surface, &sub->cached);
weston_buffer_reference(&sub->cached_buffer_ref, NULL,
BUFFER_WILL_NOT_BE_ACCESSED);
return status;
}
static void
weston_surface_state_merge_from(struct weston_surface_state *dst,
struct weston_surface_state *src,
@ -578,26 +595,6 @@ weston_subsurface_commit(struct weston_subsurface *sub)
return weston_subsurface_apply_from_cache(sub);
}
static enum weston_surface_status
weston_subsurface_parent_apply(struct weston_subsurface *sub)
{
enum weston_surface_status status = WESTON_SURFACE_CLEAN;
struct weston_view *view;
if (sub->position.changed) {
wl_list_for_each(view, &sub->surface->views, surface_link)
weston_view_set_rel_position(view,
sub->position.offset);
sub->position.changed = false;
}
if (sub->effectively_synchronized)
status = weston_subsurface_apply_from_cache(sub);
return status;
}
/** Recursively update effectively_synchronized state for a subsurface tree
*
* \param sub Subsurface to start from