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

backend-pipewire: move pixman setup into helper functions

Browse source 
Use helper function for setting up the pixman renderer to simplify the addition
of the GL renderer.

Signed-off-by: Michael Tretter <m.tretter@pengutronix.de>
This commit is contained in:
Michael Tretter 2023-05-03 09:28:37 +02:00 • committed by Daniel Stone
parent 0bf2d82e0c
commit 7155d00929
1 changed files with 24 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
libweston/backend-pipewire/pipewire.c
View file

@ -270,13 +270,9 @@ finish_frame_handler(void *data)
}
static int
pipewire_output_enable(struct weston_output *base)
pipewire_output_enable_pixman(struct pipewire_output *output)
{
struct weston_renderer *renderer = base->compositor->renderer;
struct pipewire_output *output = to_pipewire_output(base);
struct pipewire_backend *backend;
struct wl_event_loop *loop;
int ret;
struct weston_renderer *renderer = output->base.compositor->renderer;
const struct pixman_renderer_output_options options = {
.use_shadow = true,
.fb_size = {
@ -286,9 +282,28 @@ pipewire_output_enable(struct weston_output *base)
.format = output->pixel_format,
};
return renderer->pixman->output_create(&output->base, &options);
}
static void
pipewire_output_disable_pixman(struct pipewire_output *output)
{
struct weston_renderer *renderer = output->base.compositor->renderer;
renderer->pixman->output_destroy(&output->base);
}
static int
pipewire_output_enable(struct weston_output *base)
{
struct pipewire_output *output = to_pipewire_output(base);
struct pipewire_backend *backend;
struct wl_event_loop *loop;
int ret = -1;
backend = output->backend;
ret = renderer->pixman->output_create(&output->base, &options);
ret = pipewire_output_enable_pixman(output);
if (ret < 0)
return ret;
@ -303,7 +318,7 @@ pipewire_output_enable(struct weston_output *base)
return 0;
err:
renderer->pixman->output_destroy(&output->base);
pipewire_output_disable_pixman(output);
wl_event_source_remove(output->finish_frame_timer);
@ -313,7 +328,6 @@ err:
static int
pipewire_output_disable(struct weston_output *base)
{
struct weston_renderer *renderer = base->compositor->renderer;
struct pipewire_output *output = to_pipewire_output(base);
if (!output->base.enabled)
@ -321,7 +335,7 @@ pipewire_output_disable(struct weston_output *base)
pw_stream_disconnect(output->stream);
renderer->pixman->output_destroy(&output->base);
pipewire_output_disable_pixman(output);
wl_event_source_remove(output->finish_frame_timer);