From 843255a1752bd90ab08f3388689cc9c0e3ba6703 Mon Sep 17 00:00:00 2001 From: ChunEon Park Date: Tue, 24 Jul 2012 03:57:27 +0000 Subject: [PATCH] evas/gl - +null & less code This fixes the incorrect operations when evas gl is re-initialized in one same process SVN revision: 74339 --- legacy/evas/ChangeLog | 5 +++++ legacy/evas/src/modules/engines/gl_x11/evas_engine.c | 12 ++++-------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/legacy/evas/ChangeLog b/legacy/evas/ChangeLog index ac59b5116f..0a0a24130e 100644 --- a/legacy/evas/ChangeLog +++ b/legacy/evas/ChangeLog @@ -908,3 +908,8 @@ 2012-07-24 Ingvaldur Sigurjonsson * Fix typoe in docs + +2012-07-24 Hermet (ChunEon Park) + + * Fixed evas_gl resource list have cleared properly when it is released + so it would be no problem when it is reinitialized in one same process. 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 d22736134a..78cc98c190 100644 --- a/legacy/evas/src/modules/engines/gl_x11/evas_engine.c +++ b/legacy/evas/src/modules/engines/gl_x11/evas_engine.c @@ -900,11 +900,6 @@ _destroy_internal_glue_resources(void *data) eglDestroyContext(re->win->egl_disp, rsc->context); free(rsc); } - eina_list_free(resource_list); - LKU(resource_lock); - - // Destroy TLS - eina_tls_free(resource_key); #else // GLX // Delete the Resources @@ -917,19 +912,20 @@ _destroy_internal_glue_resources(void *data) free(rsc); } } +#endif eina_list_free(resource_list); + resource_list = NULL; LKU(resource_lock); // Destroy TLS eina_tls_free(resource_key); -#endif // Free the extension strings if (_ext_initted) { - if (_gl_ext_string) + if (_gl_ext_string) free(_gl_ext_string); - if (_evasgl_ext_string) + if (_evasgl_ext_string) free(_evasgl_ext_string); _gl_ext_string = NULL;