compositor-wayland: Assign func pointers pre init
authorBenjamin Franzke <benjaminfranzke@googlemail.com>
Sat, 15 Jan 2011 11:34:48 +0000 (12:34 +0100)
committerKristian Høgsberg <krh@bitplanet.net>
Mon, 17 Jan 2011 02:09:04 +0000 (21:09 -0500)
compositor/compositor-wayland.c

index ed8a2ba..8a40137 100644 (file)
@@ -530,6 +530,11 @@ wayland_compositor_create(struct wl_display *display, int width, int height)
        if (wayland_compositor_init_egl(c) < 0)
                return NULL;
 
+       c->base.destroy = wayland_destroy;
+       c->base.authenticate = wayland_authenticate;
+       c->base.present = wayland_compositor_present;
+       c->base.create_buffer = wlsc_drm_buffer_create;
+
        /* Can't init base class until we have a current egl context */
        if (wlsc_compositor_init(&c->base, display) < 0)
                return NULL;
@@ -549,9 +554,5 @@ wayland_compositor_create(struct wl_display *display, int width, int height)
        if (c->parent.wl_source == NULL)
                return NULL;
 
-       c->base.destroy = wayland_destroy;
-       c->base.authenticate = wayland_authenticate;
-       c->base.present = wayland_compositor_present;
-
        return &c->base;
 }