sung pushed a commit to branch master.
commit 5ac17a52d5ecf9f81b6f3441b183078a53851810
Author: Sung W. Park <[email protected]>
Date: Tue Jul 30 19:45:40 2013 +0900
Evas: Fix Evas_GL engine shutdown error.
It was trying to use access a struct for egl_disp after the struct
was freed..
---
src/modules/evas/engines/gl_x11/evas_engine.c | 3 ++-
src/modules/evas/engines/wayland_egl/evas_engine.c | 3 ++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/modules/evas/engines/gl_x11/evas_engine.c
b/src/modules/evas/engines/gl_x11/evas_engine.c
index 2bf934c..82f97d6 100644
--- a/src/modules/evas/engines/gl_x11/evas_engine.c
+++ b/src/modules/evas/engines/gl_x11/evas_engine.c
@@ -1051,6 +1051,8 @@ eng_output_free(void *data)
#endif
if (re->win)
{
+ if (gl_wins == 1) evgl_engine_shutdown(re);
+
#ifdef GL_GLES
eng_window_free(re->win);
#else
@@ -1069,7 +1071,6 @@ eng_output_free(void *data)
if (re->rects_prev[1])
evas_common_tilebuf_free_render_rects(re->rects_prev[1]);
if (re->rects_prev[2])
evas_common_tilebuf_free_render_rects(re->rects_prev[2]);
- if (gl_wins == 0) evgl_engine_shutdown(re);
free(re);
}
diff --git a/src/modules/evas/engines/wayland_egl/evas_engine.c
b/src/modules/evas/engines/wayland_egl/evas_engine.c
index 65edcca..afcc508 100644
--- a/src/modules/evas/engines/wayland_egl/evas_engine.c
+++ b/src/modules/evas/engines/wayland_egl/evas_engine.c
@@ -879,6 +879,8 @@ eng_output_free(void *data)
if (re->win)
{
+ if (gl_wins == 1) evgl_engine_shutdown(re);
+
eng_window_free(re->win);
gl_wins--;
}
@@ -893,7 +895,6 @@ eng_output_free(void *data)
if (re->rects_prev[2])
evas_common_tilebuf_free_render_rects(re->rects_prev[2]);
- if (gl_wins == 0) evgl_engine_shutdown(re);
free(re);
}
--
------------------------------------------------------------------------------
Get your SQL database under version control now!
Version control is standard for application code, but databases havent
caught up. So what steps can you take to put your SQL databases under
version control? Why should you start doing it? Read more to find out.
http://pubads.g.doubleclick.net/gampad/clk?id=49501711&iu=/4140/ostg.clktrk
