raster pushed a commit to branch master.
commit 4eed45ae88e607b9b179865bebafd24482f84203
Author: Carsten Haitzler (Rasterman) <[email protected]>
Date: Fri Mar 8 19:35:36 2013 +0900
Small adjustment to gl engines to use procaddress if found and NOT
fall back to dlsym if such a "getprocaddress" is around.
---
.../evas/engines/gl_common/evas_gl_api_ext.c | 10 +++--
.../evas/engines/gl_common/evas_gl_context.c | 43 +++++++++++++++-------
src/modules/evas/engines/gl_x11/evas_engine.c | 14 +++++--
src/modules/evas/engines/wayland_egl/evas_engine.c | 9 +++--
4 files changed, 52 insertions(+), 24 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 0fc757e..f6b38a5 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
@@ -122,12 +122,14 @@ evgl_api_ext_init(void *getproc, const char *glueexts)
fp_getproc gp = (fp_getproc)getproc;
- memset(_gl_ext_string, 0x00, MAX_EXTENSION_STRING_BUFFER);
-
+ memset(_gl_ext_string, 0x00, MAX_EXTENSION_STRING_BUFFER);
#define FINDSYM(getproc, dst, sym) \
- if ((!dst) && (getproc)) dst = (__typeof__(dst))getproc(sym); \
- if (!dst) dst = (__typeof__(dst))dlsym(RTLD_DEFAULT, sym);
+ if (getproc) { \
+ if (!dst) dst = (__typeof__(dst))getproc(sym); \
+ } else { \
+ if (!dst) dst = (__typeof__(dst))dlsym(RTLD_DEFAULT, sym); \
+ }
// GLES Extensions
glexts = (const char*)glGetString(GL_EXTENSIONS);
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 dc0c4be..ac5d2c4 100644
--- a/src/modules/evas/engines/gl_common/evas_gl_context.c
+++ b/src/modules/evas/engines/gl_common/evas_gl_context.c
@@ -31,11 +31,11 @@ GLboolean (*glsym_glUnmapBuffer) (GLenum a) =
NULL;
// just used for finding symbols :)
typedef void (*_eng_fn) (void);
-typedef _eng_fn (*secsym_func_eng_fn) ();
+typedef _eng_fn (*glsym_func_eng_fn) ();
typedef unsigned int (*secsym_func_uint) ();
typedef void *(*secsym_func_void_ptr) ();
-static _eng_fn (*secsym_eglGetProcAddress) (const char *a) = NULL;
+static _eng_fn (*glsym_eglGetProcAddress) (const char *a) = 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;
@@ -43,6 +43,11 @@ void (*secsym_glEGLImageTargetTexture2DOES) (int
a, void *b) = NULL;
void *(*secsym_eglMapImageSEC) (void *a, void *b) =
NULL;
unsigned int (*secsym_eglUnmapImageSEC) (void *a, void *b) =
NULL;
unsigned int (*secsym_eglGetImageAttribSEC) (void *a, void *b, int
c, int *d) = NULL;
+#else
+typedef void (*_eng_fn) (void);
+
+typedef _eng_fn (*glsym_func_eng_fn) ();
+static _eng_fn (*glsym_glXGetProcAddress) (const char *a) = NULL;
#endif
static int dbgflushnum = -1;
@@ -63,9 +68,30 @@ gl_symbols(void)
* instead of dlsym
* if (!dst) dst = (typ)SDL_GL_GetProcAddress(sym)
*/
-#define FINDSYM(dst, sym, typ) if (!dst) dst = (typ)dlsym(RTLD_DEFAULT, sym)
+#ifdef GL_GLES
+#define FINDSYM(dst, sym, typ) \
+ if (glsym_eglGetProcAddress) { \
+ if (!dst) dst = (typ)glsym_eglGetProcAddress(sym); \
+ } else { \
+ if (!dst) dst = (typ)dlsym(RTLD_DEFAULT, sym); \
+ }
+ FINDSYM(glsym_eglGetProcAddress, "eglGetProcAddress", glsym_func_eng_fn);
+ FINDSYM(glsym_eglGetProcAddress, "eglGetProcAddressEXT", glsym_func_eng_fn);
+ FINDSYM(glsym_eglGetProcAddress, "eglGetProcAddressARB", glsym_func_eng_fn);
+ FINDSYM(glsym_eglGetProcAddress, "eglGetProcAddressKHR", glsym_func_eng_fn);
+#else
+#define FINDSYM(dst, sym, typ) \
+ if (glsym_glXGetProcAddress) { \
+ if (!dst) dst = (typ)glsym_glXGetProcAddress(sym); \
+ } else { \
+ if (!dst) dst = (typ)dlsym(RTLD_DEFAULT, sym); \
+ }
+ FINDSYM(glsym_glXGetProcAddress, "glXGetProcAddress", glsym_func_eng_fn);
+ FINDSYM(glsym_glXGetProcAddress, "glXGetProcAddressEXT", glsym_func_eng_fn);
+ FINDSYM(glsym_glXGetProcAddress, "glXGetProcAddressARB", glsym_func_eng_fn);
+#endif
#define FALLBAK(dst, typ) if (!dst) dst = (typ)sym_missing;
-
+
FINDSYM(glsym_glGenFramebuffers, "glGenFramebuffers", glsym_func_void);
FINDSYM(glsym_glGenFramebuffers, "glGenFramebuffersEXT", glsym_func_void);
FINDSYM(glsym_glGenFramebuffers, "glGenFramebuffersARB", glsym_func_void);
@@ -119,21 +145,12 @@ gl_symbols(void)
}
#ifdef GL_GLES
-#undef FINDSYM
-#define FINDSYM(dst, sym, typ) \
- if ((!dst) && (secsym_eglGetProcAddress)) dst =
(typ)secsym_eglGetProcAddress(sym); \
- if (!dst) dst = (typ)dlsym(RTLD_DEFAULT, sym)
// yes - gl core looking for egl stuff. i know it's odd. a reverse-layer thing
// but it will work as the egl/glx layer calls gl core common stuff and thus
// these symbols will work. making the glx/egl + x11 layer do this kind-of is
// wrong as this is not x11 (output) layer specific like the native surface
// stuff. this is generic zero-copy textures for gl
- FINDSYM(secsym_eglGetProcAddress, "eglGetProcAddress", secsym_func_eng_fn);
- FINDSYM(secsym_eglGetProcAddress, "eglGetProcAddressEXT",
secsym_func_eng_fn);
- FINDSYM(secsym_eglGetProcAddress, "eglGetProcAddressARB",
secsym_func_eng_fn);
- FINDSYM(secsym_eglGetProcAddress, "eglGetProcAddressKHR",
secsym_func_eng_fn);
-
FINDSYM(secsym_eglCreateImage, "eglCreateImage", secsym_func_void_ptr);
FINDSYM(secsym_eglCreateImage, "eglCreateImageEXT", secsym_func_void_ptr);
FINDSYM(secsym_eglCreateImage, "eglCreateImageARB", 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 d6df932..7904cc0 100644
--- a/src/modules/evas/engines/gl_x11/evas_engine.c
+++ b/src/modules/evas/engines/gl_x11/evas_engine.c
@@ -520,8 +520,11 @@ gl_symbols(void)
#ifdef GL_GLES
#define FINDSYM(dst, sym, typ) \
- if ((!dst) && (glsym_eglGetProcAddress)) dst =
(typ)glsym_eglGetProcAddress(sym); \
- if (!dst) dst = (typ)dlsym(RTLD_DEFAULT, sym)
+ if (glsym_eglGetProcAddress) { \
+ if (!dst) dst = (typ)glsym_eglGetProcAddress(sym); \
+ } else { \
+ if (!dst) dst = (typ)dlsym(RTLD_DEFAULT, sym); \
+ }
FINDSYM(glsym_eglGetProcAddress, "eglGetProcAddress", glsym_func_eng_fn);
FINDSYM(glsym_eglGetProcAddress, "eglGetProcAddressEXT", glsym_func_eng_fn);
@@ -546,8 +549,11 @@ gl_symbols(void)
FINDSYM(glsym_eglQueryString, "eglQueryString", glsym_func_const_char_ptr);
#else
#define FINDSYM(dst, sym, typ) \
- if ((!dst) && (glsym_glXGetProcAddress)) dst =
(typ)glsym_glXGetProcAddress(sym); \
- if (!dst) dst = (typ)dlsym(RTLD_DEFAULT, sym)
+ if (glsym_glXGetProcAddress) { \
+ if (!dst) dst = (typ)glsym_glXGetProcAddress(sym); \
+ } else { \
+ if (!dst) dst = (typ)dlsym(RTLD_DEFAULT, sym); \
+ }
FINDSYM(glsym_glXGetProcAddress, "glXGetProcAddress", glsym_func_eng_fn);
FINDSYM(glsym_glXGetProcAddress, "glXGetProcAddressEXT", glsym_func_eng_fn);
diff --git a/src/modules/evas/engines/wayland_egl/evas_engine.c
b/src/modules/evas/engines/wayland_egl/evas_engine.c
index 965030e..cb856f1 100644
--- a/src/modules/evas/engines/wayland_egl/evas_engine.c
+++ b/src/modules/evas/engines/wayland_egl/evas_engine.c
@@ -274,9 +274,12 @@ _sym_init(void)
if (done) return;
#define FINDSYM(dst, sym, typ) \
- if ((!dst) && (glsym_eglGetProcAddress)) dst =
(typ)glsym_eglGetProcAddress(sym); \
- if (!dst) dst = (typ)dlsym(RTLD_DEFAULT, sym)
-
+ if (glsym_eglGetProcAddress) { \
+ if (!dst) dst = (typ)glsym_eglGetProcAddress(sym); \
+ } else { \
+ if (!dst) dst = (typ)dlsym(RTLD_DEFAULT, sym); \
+ }
+
FINDSYM(glsym_eglGetProcAddress, "eglGetProcAddress", glsym_func_eng_fn);
FINDSYM(glsym_eglGetProcAddress, "eglGetProcAddressEXT", glsym_func_eng_fn);
FINDSYM(glsym_eglGetProcAddress, "eglGetProcAddressARB", glsym_func_eng_fn);
--
------------------------------------------------------------------------------
Symantec Endpoint Protection 12 positioned as A LEADER in The Forrester
Wave(TM): Endpoint Security, Q1 2013 and "remains a good choice" in the
endpoint security space. For insight on selecting the right partner to
tackle endpoint security challenges, access the full report.
http://p.sf.net/sfu/symantec-dev2dev
