antognolli pushed a commit to branch master.
commit f69cde81076363d8b9a0ab7a10cd1df8498b1621
Author: Rafael Antognolli <[email protected]>
Date: Thu Aug 29 17:25:40 2013 -0300
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 91015dc..1b78d4c 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
--
------------------------------------------------------------------------------
Learn the latest--Visual Studio 2012, SharePoint 2013, SQL 2012, more!
Discover the easy way to master current and previous Microsoft technologies
and advance your career. Get an incredible 1,500+ hours of step-by-step
tutorial videos with LearnDevNow. Subscribe today and save!
http://pubads.g.doubleclick.net/gampad/clk?id=58040911&iu=/4140/ostg.clktrk
