orbea
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

evas/async_render: fixing mix of sync and async rendering 

SVN revision: 82776
This commit is contained in:
Ulisses Furquim 2013-01-14 20:02:43 +00:00
parent 90bba3a87e
commit 0f435b7eae
1 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/lib/evas/canvas/evas_render.c
View File

@ -1352,10 +1352,15 @@ evas_render_updates_internal(Evas *eo_e,
if (e->rendering) if (e->rendering)
{ {
if (!do_async) if (do_async)
ERR("Cannot render sync as already doing async render! e=%p [%s]", return EINA_FALSE;
e, e->engine.module->definition->name); else
return EINA_FALSE; {
WRN("Mixing render sync as already doing async "
"render! Syncing! e=%p [%s]", e,
e->engine.module->definition->name);
evas_render_rendering_wait(e);
}
} }
#ifdef EVAS_CSERVE2 #ifdef EVAS_CSERVE2
@ -1845,6 +1850,8 @@ evas_render_wakeup(Evas *eo_e)
Eina_Bool haveup = EINA_FALSE; Eina_Bool haveup = EINA_FALSE;
Eina_List *ret_updates = NULL; Eina_List *ret_updates = NULL;
Evas_Public_Data *e = eo_data_get(eo_e, EVAS_CLASS); Evas_Public_Data *e = eo_data_get(eo_e, EVAS_CLASS);
Evas_Event_Cb up_cb;
void *up_data;
EINA_LIST_FREE(e->render.updates, ru) EINA_LIST_FREE(e->render.updates, ru)
{ {
@ -1881,14 +1888,15 @@ evas_render_wakeup(Evas *eo_e)
eina_array_foreach(&e->glyph_unref_queue, _drop_glyph_ref, NULL); eina_array_foreach(&e->glyph_unref_queue, _drop_glyph_ref, NULL);
eina_array_clean(&e->glyph_unref_queue); eina_array_clean(&e->glyph_unref_queue);
evas_event_callback_call(eo_e, EVAS_CALLBACK_RENDER_POST, NULL); up_cb = e->render.updates_cb;
up_data = e->render.data;
if (e->render.updates_cb)
e->render.updates_cb(e->render.data, eo_e, ret_updates);
e->rendering = EINA_FALSE;
e->render.updates_cb = NULL; e->render.updates_cb = NULL;
e->render.data = NULL; e->render.data = NULL;
e->rendering = EINA_FALSE;
evas_event_callback_call(eo_e, EVAS_CALLBACK_RENDER_POST, NULL);
if (up_cb) up_cb(up_data, eo_e, ret_updates);
eo_unref(eo_e); eo_unref(eo_e);
} }