summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCedric BAIL <cedric@osg.samsung.com>2015-12-16 15:19:57 -0800
committerJean-Philippe Andre <jp.andre@samsung.com>2016-01-05 15:43:43 +0900
commit34a892dbab13b14bd01ac30474a30f230c6b135d (patch)
tree682ec23497edb52e9427f05d60ba2686033feb7d
parente3238c5620d53c897bb175a003c2d5c88e9bbe92 (diff)
evas: provide ector with a way to get GL symbol.
-rw-r--r--src/modules/evas/engines/gl_generic/evas_engine.c4
-rw-r--r--src/modules/evas/engines/software_generic/evas_engine.c3
2 files changed, 7 insertions, 0 deletions
diff --git a/src/modules/evas/engines/gl_generic/evas_engine.c b/src/modules/evas/engines/gl_generic/evas_engine.c
index 6e4c2c88fc..f67ffda148 100644
--- a/src/modules/evas/engines/gl_generic/evas_engine.c
+++ b/src/modules/evas/engines/gl_generic/evas_engine.c
@@ -2667,6 +2667,9 @@ module_open(Evas_Module *em)
2667 return 0; 2667 return 0;
2668 } 2668 }
2669 2669
2670 ector_init();
2671 ector_glsym_set(dlsym, RTLD_DEFAULT);
2672
2670 /* store it for later use */ 2673 /* store it for later use */
2671 func = pfunc; 2674 func = pfunc;
2672 /* now to override methods */ 2675 /* now to override methods */
@@ -2810,6 +2813,7 @@ module_open(Evas_Module *em)
2810static void 2813static void
2811module_close(Evas_Module *em EINA_UNUSED) 2814module_close(Evas_Module *em EINA_UNUSED)
2812{ 2815{
2816 ector_shutdown();
2813 eina_log_domain_unregister(_evas_engine_GL_log_dom); 2817 eina_log_domain_unregister(_evas_engine_GL_log_dom);
2814 evas_gl_common_module_close(); 2818 evas_gl_common_module_close();
2815} 2819}
diff --git a/src/modules/evas/engines/software_generic/evas_engine.c b/src/modules/evas/engines/software_generic/evas_engine.c
index 728a736acb..b71399f04f 100644
--- a/src/modules/evas/engines/software_generic/evas_engine.c
+++ b/src/modules/evas/engines/software_generic/evas_engine.c
@@ -5269,7 +5269,9 @@ module_open(Evas_Module *em)
5269 eina_mempool_add("chained_mempool", "Evas_Thread_Command_Ector_Surface", 5269 eina_mempool_add("chained_mempool", "Evas_Thread_Command_Ector_Surface",
5270 NULL, sizeof(Evas_Thread_Command_Ector_Surface), 128); 5270 NULL, sizeof(Evas_Thread_Command_Ector_Surface), 128);
5271 5271
5272 ector_init();
5272 init_gl(); 5273 init_gl();
5274 ector_glsym_set(dlsym, RTLD_DEFAULT);
5273 evas_common_pipe_init(); 5275 evas_common_pipe_init();
5274 5276
5275 em->functions = (void *)(&func); 5277 em->functions = (void *)(&func);
@@ -5280,6 +5282,7 @@ module_open(Evas_Module *em)
5280static void 5282static void
5281module_close(Evas_Module *em EINA_UNUSED) 5283module_close(Evas_Module *em EINA_UNUSED)
5282{ 5284{
5285 ector_shutdown();
5283 eina_mempool_del(_mp_command_rect); 5286 eina_mempool_del(_mp_command_rect);
5284 eina_mempool_del(_mp_command_line); 5287 eina_mempool_del(_mp_command_line);
5285 eina_mempool_del(_mp_command_polygon); 5288 eina_mempool_del(_mp_command_polygon);