[PATCH 1/2] compositor-drm: call EGL cleanup functions on exit

Kristian Hoegsberg hoegsberg at gmail.com
Mon Apr 30 10:08:41 PDT 2012


On Mon, Apr 30, 2012 at 01:31:28PM +0300, Ander Conselvan de Oliveira wrote:

That looks good, applied.

Kristian

> ---
>  src/compositor-drm.c |    6 ++++++
>  1 files changed, 6 insertions(+), 0 deletions(-)
> 
> diff --git a/src/compositor-drm.c b/src/compositor-drm.c
> index dcd5e99..e7433f7 100644
> --- a/src/compositor-drm.c
> +++ b/src/compositor-drm.c
> @@ -1578,6 +1578,12 @@ drm_destroy(struct weston_compositor *ec)
>  
>  	weston_compositor_shutdown(ec);
>  
> +	/* Work around crash in egl_dri2.c's dri2_make_current() */
> +	eglMakeCurrent(ec->display, EGL_NO_SURFACE, EGL_NO_SURFACE,
> +		       EGL_NO_CONTEXT);
> +	eglTerminate(ec->display);
> +	eglReleaseThread();
> +
>  	gbm_device_destroy(d->gbm);
>  	destroy_sprites(d);
>  	if (weston_launcher_drm_set_master(&d->base, d->drm.fd, 0) < 0)
> -- 
> 1.7.4.1
> 
> _______________________________________________
> wayland-devel mailing list
> wayland-devel at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/wayland-devel


More information about the wayland-devel mailing list