mirrors
/
weston
mirror of https://gitlab.freedesktop.org/wayland/weston.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

backend-headless: store backend on struct headless_output 

To avoid retrieving the backend from the compositor all the time, store
a pointer to the headless backend on its headless_output structures.

This will be useful once the compositor contains more than one backend.

Signed-off-by: Philipp Zabel <philipp.zabel@gmail.com>
This commit is contained in:
Philipp Zabel 2022-05-29 08:01:29 +02:00 committed by Philipp Zabel
parent 97e9ee5b10
commit 39aebcabcb
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
libweston/backend-headless/headless.c
View File

@ -67,6 +67,7 @@ struct headless_head {
struct headless_output { struct headless_output {
struct weston_output base; struct weston_output base;
struct headless_backend *backend;
struct weston_mode mode; struct weston_mode mode;
struct wl_event_source *finish_frame_timer; struct wl_event_source *finish_frame_timer;
@ -137,7 +138,7 @@ finish_frame_handler(void *data)
static void static void
headless_output_update_gl_border(struct headless_output *output) headless_output_update_gl_border(struct headless_output *output)
{ {
struct headless_backend *backend = to_headless_backend(output->base.compositor); struct headless_backend *backend = output->backend;
if (!output->frame) if (!output->frame)
return; return;
@ -174,8 +175,7 @@ headless_output_repaint(struct weston_output *output_base,
static void static void
headless_output_disable_gl(struct headless_output *output) headless_output_disable_gl(struct headless_output *output)
{ {
struct weston_compositor *compositor = output->base.compositor; struct headless_backend *b = output->backend;
struct headless_backend *b = to_headless_backend(compositor);
weston_gl_borders_fini(&output->gl.borders, &output->base, b->glri); weston_gl_borders_fini(&output->gl.borders, &output->base, b->glri);
@ -205,7 +205,7 @@ headless_output_disable(struct weston_output *base)
if (!output->base.enabled) if (!output->base.enabled)
return 0; return 0;
b = to_headless_backend(base->compositor); b = output->backend;
wl_event_source_remove(output->finish_frame_timer); wl_event_source_remove(output->finish_frame_timer);
@ -242,8 +242,7 @@ headless_output_destroy(struct weston_output *base)
static int static int
headless_output_enable_gl(struct headless_output *output) headless_output_enable_gl(struct headless_output *output)
{ {
struct weston_compositor *compositor = output->base.compositor; struct headless_backend *b = output->backend;
struct headless_backend *b = to_headless_backend(compositor);
const struct weston_mode *mode = output->base.current_mode; const struct weston_mode *mode = output->base.current_mode;
struct gl_renderer_pbuffer_options options = { struct gl_renderer_pbuffer_options options = {
.drm_formats = headless_formats, .drm_formats = headless_formats,
@ -333,7 +332,7 @@ headless_output_enable(struct weston_output *base)
assert(output); assert(output);
b = to_headless_backend(base->compositor); b = output->backend;
loop = wl_display_get_event_loop(b->compositor->wl_display); loop = wl_display_get_event_loop(b->compositor->wl_display);
output->finish_frame_timer = output->finish_frame_timer =
@ -433,6 +432,8 @@ headless_output_create(struct weston_backend *backend, const char *name)
output->base.enable = headless_output_enable; output->base.enable = headless_output_enable;
output->base.attach_head = NULL; output->base.attach_head = NULL;
output->backend = b;
weston_compositor_add_pending_output(&output->base, compositor); weston_compositor_add_pending_output(&output->base, compositor);
return &output->base; return &output->base;