mainnika/weston
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert 'main: Remove unused function load_backend_new()'

Browse Source 
This reverts commit 5ffbfffaf7.

Restore load_backend_new() for use with libweston backend configuration.

Signed-off-by: Bryce Harrington <bryce@osg.samsung.com>
Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
This commit is contained in:
Bryce Harrington
2016-04-15 20:28:27 -07:00
committed by Pekka Paalanen
parent 20b66c3004
commit 6ca25b3faa
1 changed files with 17 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main.c
+17
View File
@@ -653,6 +653,23 @@ load_backend_old(struct weston_compositor *compositor, const char *backend,
return backend_init(compositor, argc, argv, wc, NULL); 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 static int
load_backend(struct weston_compositor *compositor, const char *backend, load_backend(struct weston_compositor *compositor, const char *backend,
int *argc, char **argv, struct weston_config *config) int *argc, char **argv, struct weston_config *config)