jpeg pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=13c3d3d7d6fe69ccbc289ed49c887efb3a4c43f0

commit 13c3d3d7d6fe69ccbc289ed49c887efb3a4c43f0
Author: Jean-Philippe Andre <[email protected]>
Date:   Mon Mar 16 17:42:07 2015 +0900

    Evas GL: Fix GL_X11 engine when using GLX
    
    eglGetProcAddress is obviously not supported in that case.
---
 src/modules/evas/engines/gl_common/evas_gl_api_ext.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/modules/evas/engines/gl_common/evas_gl_api_ext.c 
b/src/modules/evas/engines/gl_common/evas_gl_api_ext.c
index 2f3a879..4554172 100644
--- a/src/modules/evas/engines/gl_common/evas_gl_api_ext.c
+++ b/src/modules/evas/engines/gl_common/evas_gl_api_ext.c
@@ -826,12 +826,11 @@ _evgl_api_gles3_ext_init(void)
    if (_evgl_api_ext_status & 0x4)
      return EINA_TRUE;
 
+#ifdef GL_GLES
    Eina_Strbuf *sb = eina_strbuf_new();
    int _curext_supported = 0;
    Evas_GL_API *gles3_funcs;
    const char *gles3_exts;
-
-#ifdef GL_GLES
    EVGL_Resource *rsc;
    EGLint context_version;
    EGLDisplay dpy = EGLDISPLAY_GET();
@@ -863,7 +862,6 @@ _evgl_api_gles3_ext_init(void)
         DBG("GLESv3 context not bound");
         return EINA_FALSE;
      }
-#endif
 
    gles3_funcs = _evgl_api_gles3_internal_get();
    if (!gles3_funcs || !gles3_funcs->glGetString)
@@ -1013,6 +1011,11 @@ _evgl_api_gles3_ext_init(void)
    // GLESv3 version has been initialized!
    _evgl_api_ext_status |= 0x4;
    return EINA_TRUE;
+
+#else
+   ERR("GLES3 is not supported with GLX (yet)!");
+   return EINA_FALSE;
+#endif
 }
 
 void

-- 


Reply via email to