compositor-android: should output be added to compositor one step before

[Pekka Paalanen]

On Thu, 13 Sep 2012 16:20:21 +0530
Abhijit Potnis <abhijitpotnis at gmail.com> wrote:

> From 8e1adf2e8024e2ef804df2d1b8b1cfd49c91186f Mon Sep 17 00:00:00 2001
> From: Abhijit Potnis <abhijitpotnis at gmail.com>
> Date: Thu, 13 Sep 2012 12:32:55 +0530
> Subject: [PATCH] text: Adding output to compositor before calling
>  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 <abhijitpotnis at gmail.com>
> ---
>  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..0194379 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;

Now I tested it, and it really works. This also means that the android
backend as of d7f282b84e1729f4692488a8af7e696e4d6b69d7 of weston
upstream master works, too, although I had to remove the RTLD_NOLOAD
check from compositor.c.

http://cgit.collabora.com/git/android/platform/external/collabora/weston.git/


Thanks again :-)
- pq