[PATCH weston v6 02/12] Revert 'main: Remove unused function load_backend_new()'
Bryce Harrington
bryce at osg.samsung.com
Sat Apr 16 03:28:27 UTC 2016
This reverts commit 5ffbfffaf7758c33791978516d0a1100773b85e2.
Restore load_backend_new() for use with libweston backend configuration.
Signed-off-by: Bryce Harrington <bryce at osg.samsung.com>
Reviewed-by: Pekka Paalanen <pekka.paalanen at collabora.co.uk>
---
src/main.c | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
diff --git a/src/main.c b/src/main.c
index 1850fa6..43de354 100644
--- a/src/main.c
+++ b/src/main.c
@@ -653,6 +653,23 @@ load_backend_old(struct weston_compositor *compositor, const char *backend,
return backend_init(compositor, argc, argv, wc, NULL);
}
+/* Temporary function to be replaced by weston_compositor_load_backend(). */
+static int
+load_backend_new(struct weston_compositor *compositor, const char *backend,
+ struct weston_backend_config *config_base)
+{
+ int (*backend_init)(struct weston_compositor *c,
+ int *argc, char *argv[],
+ struct weston_config *config,
+ struct weston_backend_config *config_base);
+
+ backend_init = weston_load_module(backend, "backend_init");
+ if (!backend_init)
+ return -1;
+
+ return backend_init(compositor, NULL, NULL, NULL, config_base);
+}
+
static int
load_backend(struct weston_compositor *compositor, const char *backend,
int *argc, char **argv, struct weston_config *config)
--
1.9.1
More information about the wayland-devel
mailing list