fdo-mirrors/weston
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wayland/weston.git synced 2025-12-20 15:10:09 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

compositor: Push subsurface order application into apply_state

Browse source 
Seems like it makes sense to have it there, and this cleans up a bunch of
paths where we return status bits so a caller can do this.

We can also drop the explicit setting of view_list_needs_rebuild, as it's
going to happen automatically when applying subsurface order.

Signed-off-by: Derek Foreman <derek.foreman@collabora.com>
This commit is contained in:
Derek Foreman 2025-10-09 13:31:35 -05:00
parent 7bfedba650
commit 6a280a8fad
3 changed files with 16 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
libweston/compositor.c
View file

@ -4731,7 +4731,6 @@ surface_commit(struct wl_client *client, struct wl_resource *resource)
{ {
struct weston_surface *surface = wl_resource_get_user_data(resource); struct weston_surface *surface = wl_resource_get_user_data(resource);
WESTON_TRACE_FUNC_FLOW(&surface->pending.flow_id); WESTON_TRACE_FUNC_FLOW(&surface->pending.flow_id);
enum weston_surface_status status;
struct weston_buffer *buffer; struct weston_buffer *buffer;
int32_t tmp_w, tmp_h; int32_t tmp_w, tmp_h;
@ -4828,10 +4827,7 @@ surface_commit(struct wl_client *client, struct wl_resource *resource)
return; return;
} }
status = weston_surface_commit(surface); weston_surface_commit(surface);
if (status & WESTON_SURFACE_DIRTY_SUBSURFACE_CONFIG)
surface->compositor->view_list_needs_rebuild = true;
} }
static void static void

2
libweston/libweston-internal.h
View file

@ -847,7 +847,7 @@ weston_surface_update_size(struct weston_surface *surface);
/* Surface state helpers from surface-state.c */ /* Surface state helpers from surface-state.c */
enum weston_surface_status void
weston_surface_commit(struct weston_surface *surface); weston_surface_commit(struct weston_surface *surface);
void void

34
libweston/surface-state.c
View file

@ -38,7 +38,7 @@
#include "timeline.h" #include "timeline.h"
#include "weston-trace.h" #include "weston-trace.h"
static enum weston_surface_status static void
weston_surface_apply(struct weston_surface *surface, weston_surface_apply(struct weston_surface *surface,
struct weston_surface_state *state); struct weston_surface_state *state);
@ -186,6 +186,7 @@ weston_surface_attach(struct weston_surface *surface,
static void static void
weston_surface_apply_subsurface_order(struct weston_surface *surface) weston_surface_apply_subsurface_order(struct weston_surface *surface)
{ {
struct weston_compositor *comp = surface->compositor;
struct weston_subsurface *sub; struct weston_subsurface *sub;
struct weston_view *view; struct weston_view *view;
@ -196,6 +197,7 @@ weston_surface_apply_subsurface_order(struct weston_surface *surface)
wl_list_for_each(view, &sub->surface->views, surface_link) wl_list_for_each(view, &sub->surface->views, surface_link)
weston_view_geometry_dirty(view); weston_view_geometry_dirty(view);
} }
weston_assert_true(comp, comp->view_list_needs_rebuild);
} }
/* Translate pending damage in buffer co-ordinates to surface /* Translate pending damage in buffer co-ordinates to surface
@ -395,6 +397,9 @@ weston_surface_apply_state(struct weston_surface *surface,
wl_signal_emit(&surface->commit_signal, surface); wl_signal_emit(&surface->commit_signal, surface);
if (status & WESTON_SURFACE_DIRTY_SUBSURFACE_CONFIG)
weston_surface_apply_subsurface_order(surface);
/* Surface is now quiescent */ /* Surface is now quiescent */
surface->is_unmapping = false; surface->is_unmapping = false;
surface->is_mapping = false; surface->is_mapping = false;
@ -403,10 +408,9 @@ weston_surface_apply_state(struct weston_surface *surface,
return status; return status;
} }
static enum weston_surface_status static void
weston_subsurface_parent_apply(struct weston_subsurface *sub) weston_subsurface_parent_apply(struct weston_subsurface *sub)
{ {
enum weston_surface_status status = WESTON_SURFACE_CLEAN;
struct weston_view *view; struct weston_view *view;
if (sub->position.changed) { if (sub->position.changed) {
@ -418,9 +422,7 @@ weston_subsurface_parent_apply(struct weston_subsurface *sub)
} }
if (sub->effectively_synchronized) if (sub->effectively_synchronized)
status = weston_surface_apply(sub->surface, &sub->cached); weston_surface_apply(sub->surface, &sub->cached);
return status;
} }
@ -441,27 +443,21 @@ weston_surface_schedule_repaint(struct weston_surface *surface)
} }
} }
static enum weston_surface_status static void
weston_surface_apply(struct weston_surface *surface, weston_surface_apply(struct weston_surface *surface,
struct weston_surface_state *state) struct weston_surface_state *state)
{ {
WESTON_TRACE_FUNC_FLOW(&state->flow_id); WESTON_TRACE_FUNC_FLOW(&state->flow_id);
enum weston_surface_status status;
struct weston_subsurface *sub; struct weston_subsurface *sub;
status = weston_surface_apply_state(surface, state); weston_surface_apply_state(surface, state);
if (status & WESTON_SURFACE_DIRTY_SUBSURFACE_CONFIG)
weston_surface_apply_subsurface_order(surface);
weston_surface_schedule_repaint(surface); weston_surface_schedule_repaint(surface);
wl_list_for_each(sub, &surface->subsurface_list, parent_link) { wl_list_for_each(sub, &surface->subsurface_list, parent_link) {
if (sub->surface != surface) if (sub->surface != surface)
status |= weston_subsurface_parent_apply(sub); weston_subsurface_parent_apply(sub);
} }
return status;
} }
static void static void
@ -545,26 +541,24 @@ weston_surface_state_merge_from(struct weston_surface_state *dst,
src->status = WESTON_SURFACE_CLEAN; src->status = WESTON_SURFACE_CLEAN;
} }
enum weston_surface_status void
weston_surface_commit(struct weston_surface *surface) weston_surface_commit(struct weston_surface *surface)
{ {
WESTON_TRACE_FUNC_FLOW(&surface->pending.flow_id); WESTON_TRACE_FUNC_FLOW(&surface->pending.flow_id);
struct weston_subsurface *sub = weston_surface_to_subsurface(surface); struct weston_subsurface *sub = weston_surface_to_subsurface(surface);
struct weston_surface_state *state = &surface->pending; struct weston_surface_state *state = &surface->pending;
enum weston_surface_status status;
if (sub) { if (sub) {
weston_surface_state_merge_from(&sub->cached, weston_surface_state_merge_from(&sub->cached,
state, state,
surface); surface);
if (sub->effectively_synchronized) if (sub->effectively_synchronized)
return WESTON_SURFACE_CLEAN; return;
state = &sub->cached; state = &sub->cached;
} }
status = weston_surface_apply(surface, state); weston_surface_apply(surface, state);
return status;
} }
/** Recursively update effectively_synchronized state for a subsurface tree /** Recursively update effectively_synchronized state for a subsurface tree