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

ecore-evas wayland: move frame sending to pre-flush callback 

it was possible to deadlock rendering if a pre-render occurred but
the resulting render had no updated regions

@fix
This commit is contained in:
Mike Blumenkrantz 2015-12-15 17:14:43 -05:00
parent cb23fd2af2
commit 54df1d9c6a
3 changed files with 1 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c
View File

@ -1289,7 +1289,7 @@ static const struct wl_callback_listener _anim_listener =
};
void
_ecore_evas_wl_common_render_pre(void *data, Evas *evas EINA_UNUSED, void *event EINA_UNUSED)
_ecore_evas_wl_common_render_flush_pre(void *data, Evas *evas EINA_UNUSED, void *event EINA_UNUSED)
{
Ecore_Evas *ee = data;
Ecore_Evas_Engine_Wl_Data *wdata;
@ -1299,15 +1299,6 @@ _ecore_evas_wl_common_render_pre(void *data, Evas *evas EINA_UNUSED, void *event
wl_surface_frame(ecore_wl2_window_surface_get(wdata->win));
wl_callback_add_listener(wdata->anim_callback, &_anim_listener, ee);
ecore_evas_manual_render_set(ee, 1);
}
void
_ecore_evas_wl_common_render_flush_pre(void *data, Evas *evas EINA_UNUSED, void *event EINA_UNUSED)
{
Ecore_Evas *ee = data;
Ecore_Evas_Engine_Wl_Data *wdata;
wdata = ee->engine.data;
if (wdata->win->configure_ack && wdata->win->configure_serial)
wdata->win->configure_ack(wdata->win->xdg_surface,
wdata->win->configure_serial);

3
src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_egl.c
View File

@ -314,9 +314,6 @@ ecore_evas_wayland_egl_new_internal(const char *disp_name, unsigned int parent,
evas_event_callback_add(ee->evas, EVAS_CALLBACK_RENDER_POST,
_ecore_evas_wl_common_render_updates, ee);
evas_event_callback_add(ee->evas, EVAS_CALLBACK_RENDER_PRE,
_ecore_evas_wl_common_render_pre, ee);
evas_event_callback_add(ee->evas, EVAS_CALLBACK_RENDER_FLUSH_PRE,
_ecore_evas_wl_common_render_flush_pre, ee);

3
src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_shm.c
View File

@ -312,9 +312,6 @@ ecore_evas_wayland_shm_new_internal(const char *disp_name, unsigned int parent,
evas_event_callback_add(ee->evas, EVAS_CALLBACK_RENDER_POST,
_ecore_evas_wl_common_render_updates, ee);
evas_event_callback_add(ee->evas, EVAS_CALLBACK_RENDER_PRE,
_ecore_evas_wl_common_render_pre, ee);
evas_event_callback_add(ee->evas, EVAS_CALLBACK_RENDER_FLUSH_PRE,
_ecore_evas_wl_common_render_flush_pre, ee);