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

compositor-wayland: use new config struture to create backend

Browse source 
Signed-off-by: Benoit Gschwind <gschwind@gnu-log.net>
Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
This commit is contained in:
Benoit Gschwind 2016-04-28 20:33:10 +02:00 • committed by Pekka Paalanen
parent 079b626919
commit 3a49b51f8e
1 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/compositor-wayland.c
View file

@ -2226,9 +2226,9 @@ fullscreen_binding(struct weston_keyboard *keyboard, uint32_t time,
}
static struct wayland_backend *
wayland_backend_create(struct weston_compositor *compositor, int use_pixman,
const char *display_name, int *argc, char *argv[],
struct weston_config *config)
wayland_backend_create(struct weston_compositor *compositor,
struct weston_wayland_backend_config *new_config,
int *argc, char *argv[], struct weston_config *config)
{
struct wayland_backend *b;
struct wl_event_loop *loop;
@ -2242,7 +2242,7 @@ wayland_backend_create(struct weston_compositor *compositor, int use_pixman,
if (weston_compositor_set_presentation_clock_software(compositor) < 0)
goto err_compositor;
b->parent.wl_display = wl_display_connect(display_name);
b->parent.wl_display = wl_display_connect(new_config->display_name);
if (b->parent.wl_display == NULL) {
weston_log("failed to create display: %m\n");
goto err_compositor;
@ -2256,7 +2256,7 @@ wayland_backend_create(struct weston_compositor *compositor, int use_pixman,
create_cursor(b, config);
b->use_pixman = use_pixman;
b->use_pixman = new_config->use_pixman;
if (!b->use_pixman) {
gl_renderer = weston_load_module("gl-renderer.so",
@ -2366,8 +2366,7 @@ backend_init(struct weston_compositor *compositor, int *argc, char *argv[],
parse_options(wayland_options,
ARRAY_LENGTH(wayland_options), argc, argv);
b = wayland_backend_create(compositor, new_config.use_pixman,
new_config.display_name, argc, argv, config);
b = wayland_backend_create(compositor, &new_config, argc, argv, config);
if (!b)
return -1;