[EGIT] [core/efl] master 01/05: Evas GL: Don't call eglMakeCurrent if already null

[Jean-Philippe ANDRÉ]

jpeg pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=079436d4f190faed842dce14276231a0907cba2a

commit 079436d4f190faed842dce14276231a0907cba2a
Author: Jean-Philippe Andre <jp.an...@samsung.com>
Date:   Wed Oct 14 21:32:11 2015 +0900

    Evas GL: Don't call eglMakeCurrent if already null
    
    If the current context & surface are already null, avoid
    calling eglMakeCurrent again, since it can return an error
    (EGL_FALSE but with no error code, thanks Nvidia).
---
 src/modules/evas/engines/gl_x11/evas_engine.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/modules/evas/engines/gl_x11/evas_engine.c 
b/src/modules/evas/engines/gl_x11/evas_engine.c
index bdbd86f..930092d 100644
--- a/src/modules/evas/engines/gl_x11/evas_engine.c
+++ b/src/modules/evas/engines/gl_x11/evas_engine.c
@@ -179,6 +179,10 @@ evgl_eng_make_current(void *data, void *surface, void 
*context, int flush)
 
    if ((!context) && (!surface))
      {
+        if (!eglGetCurrentContext() &&
+            !eglGetCurrentSurface(EGL_READ) &&
+            !eglGetCurrentSurface(EGL_DRAW))
+          return 1;
         ret = eglMakeCurrent(dpy, EGL_NO_SURFACE, EGL_NO_SURFACE, 
EGL_NO_CONTEXT);
         if (!ret)
           {

--