From ecfb2b93f3f0a9bd79b4155acf5e8c6efc5516df Mon Sep 17 00:00:00 2001 From: Benjamin Franzke Date: Sat, 15 Jan 2011 12:34:48 +0100 Subject: [PATCH] compositor-wayland: Assign func pointers pre init --- compositor/compositor-wayland.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/compositor/compositor-wayland.c b/compositor/compositor-wayland.c index ed8a2bab..8a40137d 100644 --- a/compositor/compositor-wayland.c +++ b/compositor/compositor-wayland.c @@ -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; }