From a75b3126b296f9c07bf2cc500fc17a52a49e1b7c Mon Sep 17 00:00:00 2001 From: Christopher Michael Date: Thu, 12 Jan 2012 12:25:21 +0000 Subject: [PATCH] Evas (gl_x11): Move make current so we only have one if. SVN revision: 67137 --- legacy/evas/src/modules/engines/gl_x11/evas_x_main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/legacy/evas/src/modules/engines/gl_x11/evas_x_main.c b/legacy/evas/src/modules/engines/gl_x11/evas_x_main.c index 72b60f250c..c29ab67e20 100644 --- a/legacy/evas/src/modules/engines/gl_x11/evas_x_main.c +++ b/legacy/evas/src/modules/engines/gl_x11/evas_x_main.c @@ -531,13 +531,13 @@ eng_window_free(Evas_GL_X11_Window *gw) #if defined (GLES_VARIETY_S3C6410) || defined (GLES_VARIETY_SGX) if (gw->egl_surface[0] != EGL_NO_SURFACE) eglDestroySurface(gw->egl_disp, gw->egl_surface[0]); + eglMakeCurrent(gw->egl_disp, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT); if (ref == 0) { if (context) eglDestroyContext(gw->egl_disp, context); + eglTerminate(gw->egl_disp); context = EGL_NO_CONTEXT; } - eglMakeCurrent(gw->egl_disp, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT); - if (ref == 0) eglTerminate(gw->egl_disp); #else if (gw->glxwin) glXDestroyWindow(gw->disp, gw->glxwin); if (ref == 0)