From 64c618e47e92cbb847afdd97fa0d83f70d4e02ee Mon Sep 17 00:00:00 2001 From: Derek Foreman Date: Tue, 8 Feb 2022 10:33:08 -0600 Subject: [PATCH] libweston: Remove x,y from weston_plane_init This is always passed as 0 right now. Signed-off-by: Derek Foreman --- libweston/backend-drm/drm-virtual.c | 2 +- libweston/backend-drm/drm.c | 2 +- libweston/compositor.c | 10 ++++------ libweston/libweston-internal.h | 5 ++--- 4 files changed, 8 insertions(+), 11 deletions(-) diff --git a/libweston/backend-drm/drm-virtual.c b/libweston/backend-drm/drm-virtual.c index cf8de76a..5cfd3ab9 100644 --- a/libweston/backend-drm/drm-virtual.c +++ b/libweston/backend-drm/drm-virtual.c @@ -124,7 +124,7 @@ drm_virtual_plane_create(struct drm_device *device, struct drm_output *output) if (weston_drm_format_add_modifier(fmt, mod) < 0) goto err; - weston_plane_init(&plane->base, b->compositor, 0, 0); + weston_plane_init(&plane->base, b->compositor); wl_list_insert(&device->plane_list, &plane->link); return plane; diff --git a/libweston/backend-drm/drm.c b/libweston/backend-drm/drm.c index a1f64208..b1b4e1c4 100644 --- a/libweston/backend-drm/drm.c +++ b/libweston/backend-drm/drm.c @@ -831,7 +831,7 @@ drm_plane_create(struct drm_device *device, const drmModePlane *kplane) if (plane->type == WDRM_PLANE_TYPE__COUNT) goto err_props; - weston_plane_init(&plane->base, compositor, 0, 0); + weston_plane_init(&plane->base, compositor); wl_list_for_each(tmp, &device->plane_list, link) { if (tmp->zpos_max < plane->zpos_max) { diff --git a/libweston/compositor.c b/libweston/compositor.c index 7ec760db..590830d8 100644 --- a/libweston/compositor.c +++ b/libweston/compositor.c @@ -5205,14 +5205,12 @@ idle_handler(void *data) } WL_EXPORT void -weston_plane_init(struct weston_plane *plane, - struct weston_compositor *ec, - int32_t x, int32_t y) +weston_plane_init(struct weston_plane *plane, struct weston_compositor *ec) { pixman_region32_init(&plane->damage); pixman_region32_init(&plane->clip); - plane->x = x; - plane->y = y; + plane->x = 0; + plane->y = 0; plane->compositor = ec; /* Init the link so that the call to wl_list_remove() when releasing @@ -8210,7 +8208,7 @@ weston_compositor_create(struct wl_display *display, wl_list_init(&ec->plugin_api_list); - weston_plane_init(&ec->primary_plane, ec, 0, 0); + weston_plane_init(&ec->primary_plane, ec); weston_compositor_stack_plane(ec, &ec->primary_plane, NULL); wl_data_device_manager_init(ec->wl_display); diff --git a/libweston/libweston-internal.h b/libweston/libweston-internal.h index 88b05a17..49598909 100644 --- a/libweston/libweston-internal.h +++ b/libweston/libweston-internal.h @@ -196,9 +196,8 @@ weston_output_disable_planes_decr(struct weston_output *output); /* weston_plane */ void -weston_plane_init(struct weston_plane *plane, - struct weston_compositor *ec, - int32_t x, int32_t y); +weston_plane_init(struct weston_plane *plane, struct weston_compositor *ec); + void weston_plane_release(struct weston_plane *plane);