mainnika/weston
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix simple-egl tear-down order to prevent a crash on exit time

Browse Source 
wl_egl_window_destory() destroys the window handle that
dri2_destroy_surface() later uses when eglTerminate() is called.

Reordering the tear down order prevents such case from occuring.
This commit is contained in:
Yeh, Sinclair
2013-04-19 17:49:12 +00:00
committed by Kristian Høgsberg
parent 93c76fe4b1
commit 952e6df8fc
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
clients/simple-egl.c
+6 -5
View File
@@ -146,11 +146,6 @@ init_egl(struct display *display, int opaque)
static void
fini_egl(struct display *display)
{
/* Required, otherwise segfault in egl_dri2.c: dri2_make_current()
* on eglReleaseThread(). */
eglMakeCurrent(display->egl.dpy, EGL_NO_SURFACE, EGL_NO_SURFACE,
EGL_NO_CONTEXT);
eglTerminate(display->egl.dpy);
eglReleaseThread();
}
@@ -330,6 +325,12 @@ create_surface(struct window *window)
static void
destroy_surface(struct window *window)
{
/* Required, otherwise segfault in egl_dri2.c: dri2_make_current()
* on eglReleaseThread(). */
eglMakeCurrent(window->display->egl.dpy, EGL_NO_SURFACE, EGL_NO_SURFACE,
EGL_NO_CONTEXT);
eglDestroySurface(window->display->egl.dpy, window->egl_surface);
wl_egl_window_destroy(window->native);
wl_shell_surface_destroy(window->shell_surface);