derekf pushed a commit to branch master.

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

commit cdc33f5874b2c94f87b0321828e2bdb844c11021
Author: Derek Foreman <[email protected]>
Date:   Thu Mar 8 14:22:50 2018 -0600

    gl_drm: Use gl extension string helper instead of strstr
---
 src/modules/evas/engines/gl_drm/evas_engine.c | 15 ++++++++++-----
 src/modules/evas/engines/gl_drm/evas_engine.h |  1 +
 src/modules/evas/engines/gl_drm/evas_outbuf.c |  2 +-
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/src/modules/evas/engines/gl_drm/evas_engine.c 
b/src/modules/evas/engines/gl_drm/evas_engine.c
index 0861d47d16..ed6a8e7b89 100644
--- a/src/modules/evas/engines/gl_drm/evas_engine.c
+++ b/src/modules/evas/engines/gl_drm/evas_engine.c
@@ -58,6 +58,7 @@ Evas_GL_Preload glsym_evas_gl_preload_shutdown = NULL;
 EVGL_Engine_Call glsym_evgl_engine_shutdown = NULL;
 EVGL_Current_Native_Context_Get_Call glsym_evgl_current_native_context_get = 
NULL;
 Evas_Gl_Symbols glsym_evas_gl_symbols = NULL;
+Evas_Gl_Extension_String_Check _ckext = NULL;
 
 Evas_GL_Common_Context_New glsym_evas_gl_common_context_new = NULL;
 Evas_GL_Common_Context_Call glsym_evas_gl_common_context_flush = NULL;
@@ -169,6 +170,7 @@ eng_gbm_shutdown(Evas_Engine_Info_GL_Drm *info)
 static void
 symbols(void)
 {
+   Evas_Gl_Extension_String_Check glsym_evas_gl_extension_string_check = NULL;
    static Eina_Bool done = EINA_FALSE;
 
    if (done) return;
@@ -203,6 +205,9 @@ symbols(void)
    LINK2GENERIC(eglGetProcAddress);
    LINK2GENERIC(evas_gl_common_eglCreateImage);
    LINK2GENERIC(evas_gl_common_eglDestroyImage);
+   LINK2GENERIC(evas_gl_extension_string_check);
+
+   _ckext = glsym_evas_gl_extension_string_check;
 
    done = EINA_TRUE;
 }
@@ -236,7 +241,7 @@ eng_egl_symbols(EGLDisplay edsp)
    FINDSYM(glsym_eglQueryWaylandBufferWL, "eglQueryWaylandBufferWL",
            glsym_func_uint);
 
-   if (strstr(exts, "EGL_IMG_context_priority"))
+   if (evas_gl_extension_string_check(exts, "EGL_IMG_context_priority"))
      _extn_have_context_priority = 1;
 
    done = EINA_TRUE;
@@ -262,15 +267,15 @@ gl_extn_veto(Render_Engine *re)
              glsym_eglSwapBuffersWithDamage = NULL;
              glsym_eglSetDamageRegionKHR = NULL;
           }
-        if (!strstr(str, "EGL_EXT_buffer_age"))
+        if (!_ckext(str, "EGL_EXT_buffer_age"))
           _extn_have_buffer_age = 0;
 
-        if (!strstr(str, "EGL_KHR_partial_update"))
+        if (!_ckext(str, "EGL_KHR_partial_update"))
           glsym_eglSetDamageRegionKHR = NULL;
 
-        if (!strstr(str, "EGL_EXT_swap_buffers_with_damage"))
+        if (!_ckext(str, "EGL_EXT_swap_buffers_with_damage"))
           glsym_eglSwapBuffersWithDamage = NULL;
-        if (strstr(str, "EGL_EXT_image_dma_buf_import"))
+        if (_ckext(str, "EGL_EXT_image_dma_buf_import"))
           dmabuf_present = EINA_TRUE;
      }
    else
diff --git a/src/modules/evas/engines/gl_drm/evas_engine.h 
b/src/modules/evas/engines/gl_drm/evas_engine.h
index a6a3fad177..705d565d4f 100644
--- a/src/modules/evas/engines/gl_drm/evas_engine.h
+++ b/src/modules/evas/engines/gl_drm/evas_engine.h
@@ -67,6 +67,7 @@ extern Evas_GL_Preload_Render_Call 
glsym_evas_gl_preload_render_lock;
 extern Evas_GL_Preload_Render_Call glsym_evas_gl_preload_render_unlock;
 extern Evas_Gl_Symbols glsym_evas_gl_symbols;
 extern void * (*glsym_eglGetProcAddress) (const char *a);
+extern Evas_Gl_Extension_String_Check _ckext;
 
 typedef struct _Render_Engine Render_Engine;
 struct _Render_Engine
diff --git a/src/modules/evas/engines/gl_drm/evas_outbuf.c 
b/src/modules/evas/engines/gl_drm/evas_outbuf.c
index b28dd57f9d..4ab45bd694 100644
--- a/src/modules/evas/engines/gl_drm/evas_outbuf.c
+++ b/src/modules/evas/engines/gl_drm/evas_outbuf.c
@@ -151,7 +151,7 @@ _evas_outbuf_init(void)
      const char *exts;
 
      exts = eglQueryString(NULL, EGL_EXTENSIONS);
-     if (exts && strstr(exts, "EGL_EXT_platform_base"))
+     if (_ckext(exts, "EGL_EXT_platform_base"))
        {
           dlsym_eglGetPlatformDisplayEXT = (PFNEGLGETPLATFORMDISPLAYEXTPROC)
                 eglGetProcAddress("eglGetPlatformDisplayEXT");

-- 


Reply via email to