Revert "Evas GL: Applied 'Fix linking to 'context_restore_set'' patch for wayland_egl...

This reverts commit 4e43d2c3a82f6471ca1f3e4028f2115d47f91cea.

Change-Id: Ic2a26071e42db61efb54446e458f031d45e4f2ec

diff --git a/src/modules/evas/engines/wayland_egl/evas_engine.c b/src/modules/evas/engines/wayland_egl/evas_engine.c
index bb142b9..92a1f14 100755 (executable)
--- a/src/modules/evas/engines/wayland_egl/evas_engine.c
+++ b/src/modules/evas/engines/wayland_egl/evas_engine.c
@@ -77,6 +77,7 @@ Evas_GL_Preload_Render_Call glsym_evas_gl_preload_render_relax = NULL;
 glsym_func_void     glsym_evas_gl_common_error_set = NULL;
 glsym_func_int      glsym_evas_gl_common_error_get = NULL;
 glsym_func_void_ptr glsym_evas_gl_common_current_context_get = NULL;
+void (*glsym_evas_gl_context_restore_set) (Eina_Bool enable) = NULL;
 
 _eng_fn (*glsym_eglGetProcAddress) (const char *a) = NULL;
 void *(*glsym_eglCreateImage) (EGLDisplay a, EGLContext b, EGLenum c, EGLClientBuffer d, const int *e) = NULL;
@@ -149,6 +150,7 @@ gl_symbols(void)
    LINK2GENERIC(evas_gl_common_error_get);
    LINK2GENERIC(evas_gl_common_error_set);
    LINK2GENERIC(evas_gl_common_current_context_get);
+   LINK2GENERIC(evas_gl_context_restore_set);
 
 #define FINDSYM(dst, sym, typ) \
    if (glsym_eglGetProcAddress) { \

diff --git a/src/modules/evas/engines/wayland_egl/evas_engine.h b/src/modules/evas/engines/wayland_egl/evas_engine.h
index e9f4da0..29c479b 100755 (executable)
--- a/src/modules/evas/engines/wayland_egl/evas_engine.h
+++ b/src/modules/evas/engines/wayland_egl/evas_engine.h
@@ -153,5 +153,6 @@ _re_wincheck(Outbuf *ob)
    return 0;
 }
 
+extern void (*glsym_evas_gl_context_restore_set) (Eina_Bool enable);
 
 #endif

diff --git a/src/modules/evas/engines/wayland_egl/evas_wl_main.c b/src/modules/evas/engines/wayland_egl/evas_wl_main.c
index ae6bf47..7011389 100644 (file)
--- a/src/modules/evas/engines/wayland_egl/evas_wl_main.c
+++ b/src/modules/evas/engines/wayland_egl/evas_wl_main.c
@@ -1,11 +1,8 @@
 #include "evas_engine.h"
-#include <dlfcn.h>
 
-# define SET_RESTORE_CONTEXT() do { if (glsym_evas_gl_common_context_restore_set) glsym_evas_gl_common_context_restore_set(EINA_TRUE); } while(0)
+# define SET_RESTORE_CONTEXT() do { if (glsym_evas_gl_context_restore_set) glsym_evas_gl_context_restore_set(EINA_TRUE); } while(0)
 
 /* local function prototypes */
-typedef void (*glsym_func_void) ();
-glsym_func_void glsym_evas_gl_common_context_restore_set = NULL;
 
 /* local variables */
 static Outbuf *_evas_gl_wl_window = NULL;
@@ -28,14 +25,6 @@ eng_window_new(Evas *evas, Evas_Engine_Info_Wayland_Egl *einfo, int w, int h, Re
    /* try to allocate space for our window */
    if (!(gw = calloc(1, sizeof(Outbuf))))
      return NULL;
-#define LINK2GENERIC(sym) \
-   do { \
-   if (!glsym_##sym) {\
-   glsym_##sym = dlsym(RTLD_DEFAULT, #sym); \
-   if (!glsym_##sym) ERR("Could not find function '%s'", #sym); }\
-   } while(0)
-
-   LINK2GENERIC(evas_gl_common_context_restore_set);
 
    win_count++;
    gw->info = einfo;