From d7e8cfba62d30001c8e43d6301946659a9ffbd9e Mon Sep 17 00:00:00 2001
From: Carsten Haitzler <raster@rasterman.com>
Date: Fri, 7 Jan 2011 10:16:17 +0000
Subject: [PATCH] egl actually doesnt need a full reset - we CAN get the
 current context and draw/read surfaces.

SVN revision: 55977
---
 .../src/modules/engines/gl_x11/evas_engine.c  |  4 +++
 .../src/modules/engines/gl_x11/evas_x_main.c  | 31 ++++++++++++++-----
 2 files changed, 27 insertions(+), 8 deletions(-)

diff --git a/legacy/evas/src/modules/engines/gl_x11/evas_engine.c b/legacy/evas/src/modules/engines/gl_x11/evas_engine.c
index 1f27e1eaa8..d80a6ad072 100644
--- a/legacy/evas/src/modules/engines/gl_x11/evas_engine.c
+++ b/legacy/evas/src/modules/engines/gl_x11/evas_engine.c
@@ -541,7 +541,11 @@ eng_output_redraws_next_update_get(void *data, int *x, int *y, int *w, int *h, i
    re = (Render_Engine *)data;
    /* get the upate rect surface - return engine data as dummy */
    if (!re->win->draw.redraw) return NULL;
+#if defined (GLES_VARIETY_S3C6410) || defined (GLES_VARIETY_SGX)
+   // dont need to for egl - eng_window_use() can check for other ctxt's
+#else
    eng_window_use(NULL);
+#endif   
    eng_window_use(re->win);
    if (!_re_wincheck(re)) return NULL;
    evas_gl_common_context_flush(re->win->gl_context);
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 f1810f0e17..6953620a84 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
@@ -477,7 +477,22 @@ eng_window_free(Evas_GL_X11_Window *gw)
 void
 eng_window_use(Evas_GL_X11_Window *gw)
 {
-   if (_evas_gl_x11_window != gw)
+   Eina_Bool force_use = EINA_FALSE;
+   
+#if defined (GLES_VARIETY_S3C6410) || defined (GLES_VARIETY_SGX)
+   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]))
+           force_use = EINA_TRUE;
+     }
+#else   
+#endif   
+   if ((_evas_gl_x11_window != gw) || (force_use))
      {
         if (_evas_gl_x11_window)
           evas_gl_common_context_flush(_evas_gl_x11_window->gl_context);
@@ -488,13 +503,13 @@ eng_window_use(Evas_GL_X11_Window *gw)
 #if defined (GLES_VARIETY_S3C6410) || defined (GLES_VARIETY_SGX)
            if (gw->egl_surface[0] != EGL_NO_SURFACE)
              {
-               if (eglMakeCurrent(gw->egl_disp, 
-                                  gw->egl_surface[0], 
-                                  gw->egl_surface[0],
-                                  gw->egl_context[0]) == EGL_FALSE)
-                 {
-                   ERR("eglMakeCurrent() failed!");
-                 }
+                if (eglMakeCurrent(gw->egl_disp, 
+                                   gw->egl_surface[0], 
+                                   gw->egl_surface[0],
+                                   gw->egl_context[0]) == EGL_FALSE)
+                  {
+                     ERR("eglMakeCurrent() failed!");
+                  }
              }
 // GLX        
 #else