[EGIT] [core/efl] efl-1.13 01/01: Evas GL: Fix list of extensions with GLESv1

[Jean-Philippe ANDRÉ]

jpeg pushed a commit to branch efl-1.13.

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

commit ed2402f168d1193281691648e3d3c261d0d0d0f3
Author: Jean-Philippe Andre <jp.an...@samsung.com>
Date:   Thu Mar 5 18:16:05 2015 +0900

    Evas GL: Fix list of extensions with GLESv1
    
    EGL/EvasGL extensions are also valid with GLESv1.
    This means evasglCreateImage could be used.
    
    @fix
---
 src/modules/evas/engines/gl_common/evas_gl_api_ext.c | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 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 87869ed..4d84bf6 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
@@ -550,7 +550,7 @@ _evgl_api_gles1_ext_init(void)
 #ifdef GL_GLES
    int _curext_supported = 0;
    Evas_GL_API *gles1_funcs;
-   const char *gles1_exts;
+   const char *gles1_exts, *eglexts;
    EVGL_Resource *rsc;
    EGLint context_version;
    EGLDisplay dpy = EGLDISPLAY_GET();
@@ -605,6 +605,13 @@ _evgl_api_gles1_ext_init(void)
 
    _gles1_ext_string[0] = '\0';
 
+   eglexts = eglQueryString(dpy, EGL_EXTENSIONS);
+   if (!eglexts)
+     {
+        ERR("eglQueryString(EGL_EXTENSIONS) returned NULL!");
+        eglexts = "";
+     }
+
    
/////////////////////////////////////////////////////////////////////////////////////////////////////
    // Scanning supported extensions, sets the variables
    
/////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -622,7 +629,7 @@ _evgl_api_gles1_ext_init(void)
    }
 
 #define _EVASGL_EXT_CHECK_SUPPORT(name) \
-   (strstr(gles1_exts, name) != NULL)
+   ((strstr(gles1_exts, name) != NULL) || (strstr(eglexts, name) != NULL))
 
 #define _EVASGL_EXT_DISCARD_SUPPORT() \
    *ext_support = 0;

--