compositor: introduce struct weston_backend
This is a preliminary change for libweston, with no functional modifications.
Separate the backends and the core weston_compositor struct, by creating
the weston_compositor in the main(), and having the various backends extend
the weston_backend struct, an instance of which is returned by the backend
entry point.
This enable us to logically separate the compositor core from the backend,
allowing the core to be extended without messing with the backends.
Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
diff --git a/src/compositor.h b/src/compositor.h
index 9069fe1..bec404a 100644
--- a/src/compositor.h
+++ b/src/compositor.h
@@ -603,6 +603,11 @@
WESTON_CAP_VIEW_CLIP_MASK = 0x0010,
};
+struct weston_backend {
+ void (*destroy)(struct weston_compositor *ec);
+ void (*restore)(struct weston_compositor *ec);
+};
+
struct weston_compositor {
struct wl_signal destroy_signal;
@@ -664,8 +669,7 @@
pixman_format_code_t read_format;
- void (*destroy)(struct weston_compositor *ec);
- void (*restore)(struct weston_compositor *ec);
+ struct weston_backend *backend;
struct weston_launcher *launcher;
@@ -1334,7 +1338,7 @@
weston_compositor_get_time(void);
int
-weston_compositor_init(struct weston_compositor *ec, struct wl_display *display,
+weston_compositor_init(struct weston_compositor *ec,
int *argc, char *argv[], struct weston_config *config);
int
weston_compositor_set_presentation_clock(struct weston_compositor *compositor,
@@ -1539,10 +1543,10 @@
int
noop_renderer_init(struct weston_compositor *ec);
-struct weston_compositor *
-backend_init(struct wl_display *display, int *argc, char *argv[],
+int
+backend_init(struct weston_compositor *c,
+ int *argc, char *argv[],
struct weston_config *config);
-
int
module_init(struct weston_compositor *compositor,
int *argc, char *argv[]);