From f9763bc2efd418628570ee65b7a5120b79fcd38e Mon Sep 17 00:00:00 2001 From: Abhijit Potnis Date: Thu, 13 Sep 2012 11:22:55 -0400 Subject: [PATCH] compositor-android: Add output before gles2_renderer_init() Calling android_compositor_add_output() before gles2_renderer_init(), or else in gles-renderer_init will have an invalid EGLSurface. Signed-off-by: Abhijit Potnis Reviewed-by: Pekka Paalanen --- src/compositor-android.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/compositor-android.c b/src/compositor-android.c index 50c66e6..3c0273a 100644 --- a/src/compositor-android.c +++ b/src/compositor-android.c @@ -476,11 +476,11 @@ android_compositor_create(struct wl_display *display, int argc, char *argv[], if (android_init_egl(compositor, output) < 0) goto err_output; + android_compositor_add_output(compositor, output); + if (gles2_renderer_init(&compositor->base) < 0) goto err_egl; - android_compositor_add_output(compositor, output); - compositor->seat = android_seat_create(compositor); if (!compositor->seat) goto err_egl; -- 2.7.4