From f69cde81076363d8b9a0ab7a10cd1df8498b1621 Mon Sep 17 00:00:00 2001 From: Rafael Antognolli Date: Thu, 29 Aug 2013 17:25:40 -0300 Subject: [PATCH] evas/gl_x11: eng_window_use will not always force makecurrent. If the egl_surface is different from the current one, it may be that the it has been destroyed already. Removing the below check (and just checking for different contexts) will avoid calling makecurrent when destroying a window. That was always failing anyway. Should fix https://phab.enlightenment.org/T311 for gl_x11 too. --- src/modules/evas/engines/gl_x11/evas_x_main.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/src/modules/evas/engines/gl_x11/evas_x_main.c b/src/modules/evas/engines/gl_x11/evas_x_main.c index 91015dcb3f..1b78d4c01b 100644 --- a/src/modules/evas/engines/gl_x11/evas_x_main.c +++ b/src/modules/evas/engines/gl_x11/evas_x_main.c @@ -508,12 +508,7 @@ eng_window_use(Evas_GL_X11_Window *gw) #ifdef GL_GLES if (_evas_gl_x11_window) { - if ((eglGetCurrentContext() != - _evas_gl_x11_window->egl_context[0]) || - (eglGetCurrentSurface(EGL_READ) != - _evas_gl_x11_window->egl_surface[0]) || - (eglGetCurrentSurface(EGL_DRAW) != - _evas_gl_x11_window->egl_surface[0])) + if (eglGetCurrentContext() != _evas_gl_x11_window->egl_context[0]) force_use = EINA_TRUE; } #else