From b5d5817a886ebc7785dac63e33a5415440f04789 Mon Sep 17 00:00:00 2001 From: Carsten Haitzler Date: Fri, 13 Nov 2009 08:28:47 +0000 Subject: [PATCH] fix some valgrind issues SVN revision: 43657 --- .../src/modules/engines/gl_common/evas_gl_context.c | 6 ++++-- legacy/evas/src/modules/engines/gl_x11/evas_engine.c | 12 +++++++----- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/legacy/evas/src/modules/engines/gl_common/evas_gl_context.c b/legacy/evas/src/modules/engines/gl_common/evas_gl_context.c index fb14f5a8f6..d78f8166c4 100644 --- a/legacy/evas/src/modules/engines/gl_common/evas_gl_context.c +++ b/legacy/evas/src/modules/engines/gl_common/evas_gl_context.c @@ -238,6 +238,9 @@ evas_gl_common_context_free(Evas_GL_Context *gc) gc->references--; if (gc->references > 0) return; gc->shared->references--; + + evas_gl_common_image_free(gc->def_surface); + if (gc->shared->references == 0) { while (gc->shared->images) @@ -261,8 +264,7 @@ evas_gl_common_context_free(Evas_GL_Context *gc) shared = NULL; } - evas_gl_common_image_free(gc->def_surface); - + free(gc->array.vertex); free(gc->array.color); free(gc->array.texuv); diff --git a/legacy/evas/src/modules/engines/gl_x11/evas_engine.c b/legacy/evas/src/modules/engines/gl_x11/evas_engine.c index 29146973f0..b4d4b0142c 100644 --- a/legacy/evas/src/modules/engines/gl_x11/evas_engine.c +++ b/legacy/evas/src/modules/engines/gl_x11/evas_engine.c @@ -38,7 +38,8 @@ static void eng_info_free(Evas *e __UNUSED__, void *info) { Evas_Engine_Info_GL_X11 *in; - eina_log_domain_unregister(_evas_engine_GL_X11_log_dom); +// dont free! why bother? its not worth it +// eina_log_domain_unregister(_evas_engine_GL_X11_log_dom); in = (Evas_Engine_Info_GL_X11 *)info; free(in); } @@ -1106,11 +1107,12 @@ module_open(Evas_Module *em) if (!em) return 0; /* get whatever engine module we inherit from */ if (!_evas_module_engine_inherit(&pfunc, "software_generic")) return 0; - _evas_engine_GL_X11_log_dom = eina_log_domain_register("EvasEngineGLX11", EVAS_DEFAULT_LOG_COLOR); - if(_evas_engine_GL_X11_log_dom<0) + if (_evas_engine_GL_X11_log_dom < 0) + _evas_engine_GL_X11_log_dom = eina_log_domain_register("EvasEngineGLX11", EVAS_DEFAULT_LOG_COLOR); + if (_evas_engine_GL_X11_log_dom < 0) { - EINA_LOG_ERR("Impossible to create a log domain for GL X11 engine.\n"); - return 0; + EINA_LOG_ERR("Impossible to create a log domain for GL X11 engine.\n"); + return 0; } /* store it for later use */ func = pfunc;