evas gl: do not assume querying extension strings are extns in glx and egl.

diff --git a/src/modules/evas/engines/gl_common/evas_gl_context.c b/src/modules/evas/engines/gl_common/evas_gl_context.c
index 8e749f1..ae4f06a 100644 (file)
--- a/src/modules/evas/engines/gl_common/evas_gl_context.c
+++ b/src/modules/evas/engines/gl_common/evas_gl_context.c
@@ -37,7 +37,6 @@ typedef unsigned int  (*secsym_func_uint) ();
 typedef void         *(*secsym_func_void_ptr) ();
 
 static _eng_fn  (*glsym_eglGetProcAddress)            (const char *a) = NULL;
-static const char *(*glsym_eglQueryString)             (void *a, int name) = NULL;
 
 void          *(*secsym_eglCreateImage)               (void *a, void *b, GLenum c, void *d, const int *e) = NULL;
 unsigned int   (*secsym_eglDestroyImage)              (void *a, void *b) = NULL;
@@ -50,7 +49,6 @@ typedef void (*_eng_fn) (void);
 
 typedef _eng_fn (*glsym_func_eng_fn) ();
 static _eng_fn  (*glsym_glXGetProcAddress)  (const char *a) = NULL;
-static const char *(*glsym_glXQueryExtensionsString) (void *a, int screen) = NULL;
 #endif
 
 static int dbgflushnum = -1;
@@ -82,8 +80,6 @@ gl_symbols(void)
    FINDSYM(glsym_eglGetProcAddress, "eglGetProcAddressEXT", glsym_func_eng_fn);
    FINDSYM(glsym_eglGetProcAddress, "eglGetProcAddressARB", glsym_func_eng_fn);
    FINDSYM(glsym_eglGetProcAddress, "eglGetProcAddress", glsym_func_eng_fn);
-   
-   FINDSYM(glsym_eglQueryString, "eglQueryString", glsym_func_const_char_ptr);
 #else
 #define FINDSYM(dst, sym, typ) \
    if (glsym_glXGetProcAddress) { \
@@ -94,8 +90,6 @@ gl_symbols(void)
    FINDSYM(glsym_glXGetProcAddress, "glXGetProcAddressEXT", glsym_func_eng_fn);
    FINDSYM(glsym_glXGetProcAddress, "glXGetProcAddressARB", glsym_func_eng_fn);
    FINDSYM(glsym_glXGetProcAddress, "glXGetProcAddress", glsym_func_eng_fn);
-   
-   FINDSYM(glsym_glXQueryExtensionsString, "glXQueryExtensionsString", glsym_func_const_char_ptr);
 #endif
 #define FINDSYM2(dst, sym, typ) if (!dst) dst = (typ)dlsym(RTLD_DEFAULT, sym)
 #define FALLBAK(dst, typ) if (!dst) dst = (typ)sym_missing

diff --git a/src/modules/evas/engines/gl_x11/evas_engine.c b/src/modules/evas/engines/gl_x11/evas_engine.c
index 6b6f164..a6cc1ec 100644 (file)
--- a/src/modules/evas/engines/gl_x11/evas_engine.c
+++ b/src/modules/evas/engines/gl_x11/evas_engine.c
@@ -82,7 +82,6 @@ void     (*glsym_eglDestroyImage)              (EGLDisplay a, void *b) = NULL;
 void     (*glsym_glEGLImageTargetTexture2DOES) (int a, void *b)  = NULL;
 void          *(*glsym_eglMapImageSEC)         (void *a, void *b, int c, int d) = NULL;
 unsigned int   (*glsym_eglUnmapImageSEC)       (void *a, void *b, int c) = NULL;
-const char    *(*glsym_eglQueryString)         (EGLDisplay a, int name) = NULL;
 void           (*glsym_eglSwapBuffersRegion)   (EGLDisplay a, void *b, EGLint c, const EGLint *d) = NULL;
 
 #else
@@ -103,7 +102,6 @@ void     (*glsym_glXDestroyPixmap)   (Display *a, XID b) = NULL;
 void     (*glsym_glXQueryDrawable)   (Display *a, XID b, int c, unsigned int *d) = NULL;
 int      (*glsym_glXSwapIntervalSGI) (int a) = NULL;
 void     (*glsym_glXSwapIntervalEXT) (Display *s, GLXDrawable b, int c) = NULL;
-const char *(*glsym_glXQueryExtensionsString) (Display *a, int screen) = NULL;
 void     (*glsym_glXReleaseBuffersMESA)   (Display *a, XID b) = NULL;
 
 #endif
@@ -537,11 +535,7 @@ evgl_eng_string_get(void *data)
      }
 
 #ifdef GL_GLES
-   // EGL Extensions
-   if (glsym_eglQueryString)
-      return glsym_eglQueryString(re->win->egl_disp, EGL_EXTENSIONS);
-   else
-      return "";
+   return eglQueryString(re->win->egl_disp, EGL_EXTENSIONS);
 #else
    return glXQueryExtensionsString(re->info->info.display,
                                    re->info->info.screen);
@@ -635,8 +629,6 @@ gl_symbols(void)
    FINDSYM(glsym_eglMapImageSEC, "eglMapImageSEC", glsym_func_void_ptr);
    FINDSYM(glsym_eglUnmapImageSEC, "eglUnmapImageSEC", glsym_func_uint);
 
-   FINDSYM(glsym_eglQueryString, "eglQueryString", glsym_func_const_char_ptr);
-
    FINDSYM(glsym_eglSwapBuffersRegion, "eglSwapBuffersRegionSEC", glsym_func_void_ptr);
    FINDSYM(glsym_eglSwapBuffersRegion, "eglSwapBuffersRegion", glsym_func_void_ptr);
 
@@ -677,10 +669,6 @@ gl_symbols(void)
    FINDSYM(glsym_glXQueryDrawable, "glXQueryDrawableARB", glsym_func_void);
    FINDSYM(glsym_glXQueryDrawable, "glXQueryDrawable", glsym_func_void);
 
-   FINDSYM(glsym_glXQueryExtensionsString, "glXQueryExtensionsStringEXT", glsym_func_const_char_ptr);
-   FINDSYM(glsym_glXQueryExtensionsString, "glXQueryExtensionsStringARB", glsym_func_const_char_ptr);
-   FINDSYM(glsym_glXQueryExtensionsString, "glXQueryExtensionsString", glsym_func_const_char_ptr);
-
    FINDSYM(glsym_glXSwapIntervalSGI, "glXSwapIntervalMESA", glsym_func_int);
    FINDSYM(glsym_glXSwapIntervalSGI, "glXSwapIntervalSGI", glsym_func_int);
 
@@ -698,8 +686,7 @@ gl_extn_veto(Render_Engine *re)
 {
    const char *str = NULL;
 #ifdef GL_GLES
-   if (glsym_eglQueryString)
-     str = glsym_eglQueryString(re->win->egl_disp, EGL_EXTENSIONS);
+   str = eglQueryString(re->win->egl_disp, EGL_EXTENSIONS);
    if (str)
      {
         if (getenv("EVAS_GL_INFO"))
@@ -716,9 +703,8 @@ gl_extn_veto(Render_Engine *re)
         extn_have_buffer_age = 0;
      }
 #else
-   if (glsym_glXQueryExtensionsString)
-     str = glsym_glXQueryExtensionsString(re->info->info.display,
-                                          re->info->info.screen);
+   str = glXQueryExtensionsString(re->info->info.display,
+                                  re->info->info.screen);
    if (str)
      {
         if (getenv("EVAS_GL_INFO"))