[EGIT] [core/efl] master 01/03: evas - gl engine - look for extension in the right extension string set

[Carsten Haitzler]

raster pushed a commit to branch master.

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

commit f323664bc701a7548c26dd64cf1e9dca4e1b90bf
Author: Carsten Haitzler (Rasterman) <ras...@rasterman.com>
Date:   Fri Feb 5 13:26:55 2021 +0000

    evas - gl engine - look for extension in the right extension string set
    
    this fixes slow operation on what seems to be a minority of instances
    that dont advertise the extension in both egl and gl strings
    
    @fix
---
 src/modules/evas/engines/gl_common/evas_gl_context.c | 3 ++-
 src/modules/evas/engines/gl_x11/evas_engine.c        | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

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 5b40037560..26ff021cd4 100644
--- a/src/modules/evas/engines/gl_common/evas_gl_context.c
+++ b/src/modules/evas/engines/gl_common/evas_gl_context.c
@@ -381,7 +381,8 @@ evas_gl_symbols(void *(*GetProcAddress)(const char *name), 
const char *extsn)
    FINDSYM(glsym_glProgramParameteri, "glProgramParameteriEXT", 
"GL_EXT_geometry_shader4", glsym_func_void);
    FINDSYM(glsym_glProgramParameteri, "glProgramParameteriARB", 
"GL_ARB_geometry_shader4", glsym_func_void);
 
-   FINDSYMN(secsym_glEGLImageTargetTexture2DOES, 
"glEGLImageTargetTexture2DOES", "GL_OES_EGL_image_external", glsym_func_void);
+   FINDSYM(secsym_glEGLImageTargetTexture2DOES, 
"glEGLImageTargetTexture2DOES", "GL_OES_EGL_image_external", glsym_func_void);
+   FINDSYM(secsym_glEGLImageTargetTexture2DOES, 
"glEGLImageTargetTexture2DOES", "GL_OES_EGL_image", glsym_func_void);
 
    // Old SEC extensions
    FINDSYMN(secsym_eglMapImageSEC, "eglMapImageSEC", NULL, 
secsym_func_void_ptr);
diff --git a/src/modules/evas/engines/gl_x11/evas_engine.c 
b/src/modules/evas/engines/gl_x11/evas_engine.c
index a22e9d95db..580921ff01 100644
--- a/src/modules/evas/engines/gl_x11/evas_engine.c
+++ b/src/modules/evas/engines/gl_x11/evas_engine.c
@@ -1376,8 +1376,8 @@ eng_gl_symbols(Outbuf *ob)
 
    // This is a GL extension
    exts = (const char *) glGetString(GL_EXTENSIONS);
-   FINDSYM(glsym_glEGLImageTargetTexture2DOES, "glEGLImageTargetTexture2DOES", 
"GL_OES_EGL_image", glsym_func_void);
    FINDSYM(glsym_glEGLImageTargetTexture2DOES, "glEGLImageTargetTexture2DOES", 
"GL_OES_EGL_image_external", glsym_func_void);
+   FINDSYM(glsym_glEGLImageTargetTexture2DOES, "glEGLImageTargetTexture2DOES", 
"GL_OES_EGL_image", glsym_func_void);
 
 #else
 

--