From b9b87125f0bc7b461094490958fa066c5c81dfe5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?John=20K=C3=A5re=20Alsaker?= Date: Thu, 4 Oct 2012 20:42:16 +0200 Subject: [PATCH] compositor-wayland: Make sure border fields are set before wayland_compositor_create_output and document some function dependencies. --- src/compositor-wayland.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/src/compositor-wayland.c b/src/compositor-wayland.c index 05f21c27..21940105 100644 --- a/src/compositor-wayland.c +++ b/src/compositor-wayland.c @@ -237,11 +237,6 @@ create_border(struct wayland_compositor *c) 0, GL_BGRA_EXT, GL_UNSIGNED_BYTE, pixman_image_get_data(image)); - c->border.top = 25; - c->border.bottom = 50; - c->border.left = 25; - c->border.right = 25; - pixman_image_unref(image); } @@ -843,12 +838,20 @@ wayland_compositor_create(struct wl_display *display, c->base.destroy = wayland_destroy; c->base.restore = wayland_restore; + c->border.top = 25; + c->border.bottom = 50; + c->border.left = 25; + c->border.right = 25; + + /* requires border fields */ if (wayland_compositor_create_output(c, width, height) < 0) goto err_display; + /* requires wayland_compositor_create_output */ if (gles2_renderer_init(&c->base) < 0) goto err_display; + /* requires gles2_renderer_init */ create_border(c); loop = wl_display_get_event_loop(c->base.wl_display);