cedric pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=93333ede152082c434e79e44b77d7d816b5305ea
commit 93333ede152082c434e79e44b77d7d816b5305ea
Author: Cedric BAIL <ced...@osg.samsung.com>
Date: Mon Feb 23 11:35:29 2015 +0100
evas: refactor shutdown.
---
src/lib/evas/common/evas_draw_main.c | 2 ++
src/modules/evas/engines/buffer/evas_engine.c | 3 +--
src/modules/evas/engines/drm/evas_engine.c | 3 +--
src/modules/evas/engines/fb/evas_engine.c | 6 ++----
src/modules/evas/engines/gl_cocoa/evas_engine.c | 3 +--
src/modules/evas/engines/gl_drm/evas_engine.c | 3 +--
src/modules/evas/engines/gl_x11/evas_engine.c | 3 +--
src/modules/evas/engines/psl1ght/evas_engine.c | 3 +--
src/modules/evas/engines/software_ddraw/evas_engine.c | 3 +--
src/modules/evas/engines/software_gdi/evas_engine.c | 3 +--
src/modules/evas/engines/software_x11/evas_engine.c | 3 +--
src/modules/evas/engines/wayland_egl/evas_engine.c | 3 +--
src/modules/evas/engines/wayland_shm/evas_engine.c | 3 +--
13 files changed, 15 insertions(+), 26 deletions(-)
diff --git a/src/lib/evas/common/evas_draw_main.c
b/src/lib/evas/common/evas_draw_main.c
index 5eae8fb..76328ff 100644
--- a/src/lib/evas/common/evas_draw_main.c
+++ b/src/lib/evas/common/evas_draw_main.c
@@ -54,6 +54,8 @@ EAPI void
evas_common_shutdown(void)
{
evas_font_dir_cache_free();
+ evas_common_font_shutdown();
+ evas_common_image_shutdown();
evas_common_image_cache_free();
evas_common_scale_sample_shutdown();
}
diff --git a/src/modules/evas/engines/buffer/evas_engine.c
b/src/modules/evas/engines/buffer/evas_engine.c
index 27f8806..e12381b 100644
--- a/src/modules/evas/engines/buffer/evas_engine.c
+++ b/src/modules/evas/engines/buffer/evas_engine.c
@@ -173,8 +173,7 @@ eng_output_free(void *data)
evas_render_engine_software_generic_clean(&re->generic);
free(re);
- evas_common_font_shutdown();
- evas_common_image_shutdown();
+ evas_common_shutdown();
}
static Eina_Bool
diff --git a/src/modules/evas/engines/drm/evas_engine.c
b/src/modules/evas/engines/drm/evas_engine.c
index ba9cebd..2a7bbfe 100644
--- a/src/modules/evas/engines/drm/evas_engine.c
+++ b/src/modules/evas/engines/drm/evas_engine.c
@@ -149,8 +149,7 @@ eng_output_free(void *data)
evas_render_engine_software_generic_clean(&re->generic);
free(re);
- evas_common_font_shutdown();
- evas_common_image_shutdown();
+ evas_common_shutdown();
}
/* module api functions */
diff --git a/src/modules/evas/engines/fb/evas_engine.c
b/src/modules/evas/engines/fb/evas_engine.c
index b4822d9..21e124b 100644
--- a/src/modules/evas/engines/fb/evas_engine.c
+++ b/src/modules/evas/engines/fb/evas_engine.c
@@ -64,8 +64,7 @@ _output_setup(int w, int h, int rot, int vt, int dev, int
refresh)
on_error:
if (ob) evas_fb_outbuf_fb_free(ob);
free(re);
- evas_common_font_shutdown();
- evas_common_image_shutdown();
+ evas_common_shutdown();
return NULL;
}
@@ -120,8 +119,7 @@ eng_output_free(void *data)
evas_render_engine_software_generic_clean(&re->generic);
free(re);
- evas_common_font_shutdown();
- evas_common_image_shutdown();
+ evas_common_shutdown();
}
static Eina_Bool
diff --git a/src/modules/evas/engines/gl_cocoa/evas_engine.c
b/src/modules/evas/engines/gl_cocoa/evas_engine.c
index 2273ec4..ea6dcf6 100644
--- a/src/modules/evas/engines/gl_cocoa/evas_engine.c
+++ b/src/modules/evas/engines/gl_cocoa/evas_engine.c
@@ -142,8 +142,7 @@ eng_output_free(void *data)
eng_window_free(re->win);
free(re);
- evas_common_font_shutdown();
- evas_common_image_shutdown();
+ evas_common_shutdown();
}
static void
diff --git a/src/modules/evas/engines/gl_drm/evas_engine.c
b/src/modules/evas/engines/gl_drm/evas_engine.c
index 0599e98..6e4b119 100644
--- a/src/modules/evas/engines/gl_drm/evas_engine.c
+++ b/src/modules/evas/engines/gl_drm/evas_engine.c
@@ -805,8 +805,7 @@ eng_output_free(void *data)
if ((initted == EINA_TRUE) && (gl_wins == 0))
{
glsym_evas_gl_preload_shutdown();
- evas_common_image_shutdown();
- evas_common_font_shutdown();
+ evas_common_shutdown();
initted = EINA_FALSE;
}
}
diff --git a/src/modules/evas/engines/gl_x11/evas_engine.c
b/src/modules/evas/engines/gl_x11/evas_engine.c
index faeee6d..08c39a8 100644
--- a/src/modules/evas/engines/gl_x11/evas_engine.c
+++ b/src/modules/evas/engines/gl_x11/evas_engine.c
@@ -1709,8 +1709,7 @@ eng_output_free(void *data)
if ((initted == 1) && (gl_wins == 0))
{
glsym_evas_gl_preload_shutdown();
- evas_common_image_shutdown();
- evas_common_font_shutdown();
+ evas_common_shutdown();
initted = 0;
}
}
diff --git a/src/modules/evas/engines/psl1ght/evas_engine.c
b/src/modules/evas/engines/psl1ght/evas_engine.c
index 56ed5f8..b87cf46 100644
--- a/src/modules/evas/engines/psl1ght/evas_engine.c
+++ b/src/modules/evas/engines/psl1ght/evas_engine.c
@@ -202,8 +202,7 @@ eng_output_free(void *data)
free(re);
- evas_common_font_shutdown();
- evas_common_image_shutdown();
+ evas_common_shutdown();
}
static void
diff --git a/src/modules/evas/engines/software_ddraw/evas_engine.c
b/src/modules/evas/engines/software_ddraw/evas_engine.c
index dd1982c..91b36d8 100644
--- a/src/modules/evas/engines/software_ddraw/evas_engine.c
+++ b/src/modules/evas/engines/software_ddraw/evas_engine.c
@@ -143,8 +143,7 @@ eng_output_free(void *data)
evas_render_engine_software_generic_clean(&re->generic);
free(re);
- evas_common_font_shutdown();
- evas_common_image_shutdown();
+ evas_common_shutdown();
}
static Eina_Bool
diff --git a/src/modules/evas/engines/software_gdi/evas_engine.c
b/src/modules/evas/engines/software_gdi/evas_engine.c
index b7216e7..e80a629 100644
--- a/src/modules/evas/engines/software_gdi/evas_engine.c
+++ b/src/modules/evas/engines/software_gdi/evas_engine.c
@@ -151,8 +151,7 @@ eng_output_free(void *data)
evas_render_engine_software_generic_clean(&re->generic);
free(re);
- evas_common_font_shutdown();
- evas_common_image_shutdown();
+ evas_common_shutdown();
}
static Eina_Bool
diff --git a/src/modules/evas/engines/software_x11/evas_engine.c
b/src/modules/evas/engines/software_x11/evas_engine.c
index ddbbfdc..2361226 100644
--- a/src/modules/evas/engines/software_x11/evas_engine.c
+++ b/src/modules/evas/engines/software_x11/evas_engine.c
@@ -596,8 +596,7 @@ eng_output_free(void *data)
free(re);
}
- evas_common_font_shutdown();
- evas_common_image_shutdown();
+ evas_common_shutdown();
}
static Eina_Bool
diff --git a/src/modules/evas/engines/wayland_egl/evas_engine.c
b/src/modules/evas/engines/wayland_egl/evas_engine.c
index 596e696..3841211 100644
--- a/src/modules/evas/engines/wayland_egl/evas_engine.c
+++ b/src/modules/evas/engines/wayland_egl/evas_engine.c
@@ -750,8 +750,7 @@ eng_output_free(void *data)
if ((initted == EINA_TRUE) && (gl_wins == 0))
{
glsym_evas_gl_preload_shutdown();
- evas_common_image_shutdown();
- evas_common_font_shutdown();
+ evas_common_shutdown();
initted = EINA_FALSE;
}
}
diff --git a/src/modules/evas/engines/wayland_shm/evas_engine.c
b/src/modules/evas/engines/wayland_shm/evas_engine.c
index e94e603..21f4ef3 100644
--- a/src/modules/evas/engines/wayland_shm/evas_engine.c
+++ b/src/modules/evas/engines/wayland_shm/evas_engine.c
@@ -186,8 +186,7 @@ eng_output_free(void *data)
evas_render_engine_software_generic_clean(&re->generic);
free(re);
- evas_common_font_shutdown();
- evas_common_image_shutdown();
+ evas_common_shutdown();
}
static void
--
