From: Enlightenment S. <no-...@en...> - 2009-11-13 08:28:59
|
Log: fix some valgrind issues Author: raster Date: 2009-11-13 00:28:47 -0800 (Fri, 13 Nov 2009) New Revision: 43657 Modified: trunk/evas/src/modules/engines/gl_common/evas_gl_context.c trunk/evas/src/modules/engines/gl_x11/evas_engine.c Modified: trunk/evas/src/modules/engines/gl_common/evas_gl_context.c =================================================================== --- trunk/evas/src/modules/engines/gl_common/evas_gl_context.c 2009-11-13 08:19:13 UTC (rev 43656) +++ trunk/evas/src/modules/engines/gl_common/evas_gl_context.c 2009-11-13 08:28:47 UTC (rev 43657) @@ -238,6 +238,9 @@ 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 @@ shared = NULL; } - evas_gl_common_image_free(gc->def_surface); - + free(gc->array.vertex); free(gc->array.color); free(gc->array.texuv); Modified: trunk/evas/src/modules/engines/gl_x11/evas_engine.c =================================================================== --- trunk/evas/src/modules/engines/gl_x11/evas_engine.c 2009-11-13 08:19:13 UTC (rev 43656) +++ trunk/evas/src/modules/engines/gl_x11/evas_engine.c 2009-11-13 08:28:47 UTC (rev 43657) @@ -38,7 +38,8 @@ 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 @@ 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; |