[PATCH 1/3] compositor-wayland: Assign func pointers pre init

Benjamin Franzke benjaminfranzke at googlemail.com
Sat Jan 15 03:34:48 PST 2011


---
 compositor/compositor-wayland.c |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/compositor/compositor-wayland.c b/compositor/compositor-wayland.c
index ed8a2ba..8a40137 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;
 }
-- 
1.7.3.4



More information about the wayland-devel mailing list