From 57cd2483f91cc8a4c12cdcc29700fadd14883a5d Mon Sep 17 00:00:00 2001 From: Daniel Stone Date: Tue, 27 Jun 2023 08:05:55 +0100 Subject: [PATCH] surface: Don't create new views in view_list_add() Now we create subsurface views both when linking to the parent subsurface, and when creating new views for the parent surface, we no longer need to magically materialise new views when building the view list. Signed-off-by: Daniel Stone --- libweston/compositor.c | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/libweston/compositor.c b/libweston/compositor.c index 339554a49..a37e6772f 100644 --- a/libweston/compositor.c +++ b/libweston/compositor.c @@ -3084,17 +3084,11 @@ view_list_add_subsurface_view(struct weston_compositor *compositor, } } - if (view) { - /* Put it back in the surface's list of views */ - wl_list_remove(&view->surface_link); - wl_list_insert(&sub->surface->views, &view->surface_link); - } else { - view = weston_view_create_internal(sub->surface); - weston_view_set_transform_parent(view, parent); - weston_view_set_rel_position(view, sub->position.offset); - } + assert(view); + /* Put it back in the surface's list of views */ + wl_list_remove(&view->surface_link); + wl_list_insert(&sub->surface->views, &view->surface_link); - view->parent_view = parent; weston_view_update_transform(view); view->is_mapped = true;