enlightenment/enlightenment
enlightenment
/
enlightenment
10
9
Fork 12
Code Issues 24 Pull Requests 2 Projects Releases Wiki Activity

Revert "reset comp object update regions when a render occurs" 

This reverts commit e6ab84ffd5.

fix T5817
This commit is contained in:
Mike Blumenkrantz 2017-08-03 10:21:39 -04:00
parent db3b7e136d
commit a9f6017209
1 changed files with 10 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/bin/e_comp_object.c
View File

@ -949,20 +949,6 @@ _e_comp_object_mirror_pixels_get(void *data, Evas_Object *obj)
/////////////////////////////////////////////
static void
_e_comp_object_updates_reset(E_Comp_Object *cw)
{
if (cw->pending_updates)
eina_tiler_clear(cw->updates);
else
{
cw->pending_updates = cw->updates;
cw->updates = eina_tiler_new(cw->ec->client.w, cw->ec->client.h);
eina_tiler_tile_size_set(cw->updates, 1, 1);
}
cw->update_count = cw->updates_full = cw->updates_exist = 0;
}
/* for fast path evas rendering; only called during render */
static void
_e_comp_object_pixels_get(void *data, Evas_Object *obj)
@ -975,7 +961,6 @@ _e_comp_object_pixels_get(void *data, Evas_Object *obj)
if ((!ec->pixmap) || (!e_pixmap_size_get(ec->pixmap, &pw, &ph)))
{
evas_object_image_data_set(obj, NULL);
_e_comp_object_updates_reset(cw);
return;
}
//INF("PIXEL GET %p: %dx%d || %dx%d", ec, ec->w, ec->h, pw, ph);
@ -1010,7 +995,6 @@ _e_comp_object_pixels_get(void *data, Evas_Object *obj)
msg2.val = id;
edje_object_message_send(cw->shobj, EDJE_MESSAGE_INT, 0, &msg2);
}
_e_comp_object_updates_reset(cw);
if (cw->native)
{
E_FREE_FUNC(cw->pending_updates, eina_tiler_free);
@ -4120,12 +4104,20 @@ e_comp_object_dirty(Evas_Object *obj)
}
eina_iterator_free(it);
}
if (cw->pending_updates)
eina_tiler_clear(cw->updates);
else
{
cw->pending_updates = cw->updates;
cw->updates = eina_tiler_new(w, h);
eina_tiler_tile_size_set(cw->updates, 1, 1);
}
cw->update_count = cw->updates_full = cw->updates_exist = 0;
evas_object_smart_callback_call(obj, "dirty", NULL);
if (cw->real_hid || cw->visible || (!visible) || (!cw->updates) || cw->native) return;
if (cw->real_hid || cw->visible || (!visible) || (!cw->pending_updates) || cw->native) return;
/* force render if main object is hidden but mirrors are visible */
RENDER_DEBUG("FORCING RENDER %p", cw->ec);
e_comp_object_render(obj);
_e_comp_object_updates_reset(cw);
}
E_API Eina_Bool