enlightenment/efl
enlightenment
/
efl
8
7
Fork 15
Code Issues 12 Pull Requests 1 Projects Releases Wiki Activity

evas update buf - dont ref and unref outbug as an evas image - it's not 

we need calls to ref/unref them from engines, but atm it's ok because
they dont get deleted until the flush is done and not used after that...

@fix
This commit is contained in:
Carsten Haitzler 2016-07-03 15:43:04 +09:00
parent 6ab167afa1
commit 5fa3815e01
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/lib/evas/cache/evas_cache_image.c vendored
View File

@ -965,8 +965,11 @@ evas_cache_image_drop(Image_Entry *im)
_evas_cache_image_entry_delete(cache, im); _evas_cache_image_entry_delete(cache, im);
return; return;
} }
_evas_cache_image_lru_add(im); if (cache)
if (cache) evas_cache_image_flush(cache); {
_evas_cache_image_lru_add(im);
evas_cache_image_flush(cache);
}
} }
} }

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

@ -2771,10 +2771,10 @@ evas_render_updates_internal(Evas *eo_e,
{ {
ru = malloc(sizeof(*ru)); ru = malloc(sizeof(*ru));
ru->surface = surface; ru->surface = surface;
//XXX: need a way of reffing output surfaces
NEW_RECT(ru->area, ux, uy, uw, uh); NEW_RECT(ru->area, ux, uy, uw, uh);
eina_spinlock_take(&(e->render.lock)); eina_spinlock_take(&(e->render.lock));
e->render.updates = eina_list_append(e->render.updates, ru); e->render.updates = eina_list_append(e->render.updates, ru);
evas_cache_image_ref(surface);
eina_spinlock_release(&(e->render.lock)); eina_spinlock_release(&(e->render.lock));
} }
@ -2952,7 +2952,7 @@ evas_render_updates_internal(Evas *eo_e,
EINA_LIST_FOREACH(e->render.updates, l, ru) EINA_LIST_FOREACH(e->render.updates, l, ru)
{ {
post.updated_area = eina_list_append(post.updated_area, ru->area); post.updated_area = eina_list_append(post.updated_area, ru->area);
evas_cache_image_drop(ru->surface); //XXX: need a way of unreffing output surfaces
ru->surface = NULL; ru->surface = NULL;
} }
eina_spinlock_take(&(e->render.lock)); eina_spinlock_take(&(e->render.lock));
@ -3073,7 +3073,7 @@ evas_render_pipe_wakeup(void *data)
ru->area->x, ru->area->y, ru->area->w, ru->area->h, ru->area->x, ru->area->y, ru->area->w, ru->area->h,
EVAS_RENDER_MODE_ASYNC_END); EVAS_RENDER_MODE_ASYNC_END);
eina_evlog("-render_push", e->evas, 0.0, NULL); eina_evlog("-render_push", e->evas, 0.0, NULL);
evas_cache_image_drop(ru->surface); //XXX: need a way to unref render output surfaces
ru->surface = NULL; ru->surface = NULL;
} }
eina_evlog("+render_output_flush", e->evas, 0.0, NULL); eina_evlog("+render_output_flush", e->evas, 0.0, NULL);