derekf pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=9e43a155261622eb23124d6aac8cee80cd919a8d
commit 9e43a155261622eb23124d6aac8cee80cd919a8d Author: Derek Foreman <[email protected]> Date: Tue Nov 1 11:26:14 2016 -0500 wayland_egl: Remove pre_post_swap_callback_set This stuff seems copied from gl_x11 which actually has API to use it. In this engine nothing can actually set it, so it's just all dead code. --- .../engines/wayland/ecore_evas_wayland_common.c | 24 ---------------------- .../engines/wayland_egl/Evas_Engine_Wayland_Egl.h | 7 ------- .../evas/engines/wayland_egl/evas_wl_main.c | 6 ------ 3 files changed, 37 deletions(-) diff --git a/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c b/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c index fdfcc99..fd5b91c 100644 --- a/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c +++ b/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c @@ -1884,25 +1884,6 @@ _ecore_evas_wayland_window_get(const Ecore_Evas *ee) return wdata->win; } -#ifdef BUILD_ECORE_EVAS_WAYLAND_EGL -static void -_ecore_evas_wayland_pre_post_swap_callback_set(const Ecore_Evas *ee, void *data, void (*pre_cb) (void *data, Evas *e), void (*post_cb) (void *data, Evas *e)) -{ - Evas_Engine_Info_Wayland_Egl *einfo; - - if (!(!strcmp(ee->driver, "wayland_egl"))) return; - - if ((einfo = (Evas_Engine_Info_Wayland_Egl *)evas_engine_info_get(ee->evas))) - { - einfo->callback.pre_swap = pre_cb; - einfo->callback.post_swap = post_cb; - einfo->callback.data = data; - if (!evas_engine_info_set(ee->evas, (Evas_Engine_Info *)einfo)) - ERR("evas_engine_info_set() for engine '%s' failed.", ee->driver); - } -} -#endif - /* static void */ /* _ecore_evas_wayland_pointer_set(Ecore_Evas *ee EINA_UNUSED, int hot_x EINA_UNUSED, int hot_y EINA_UNUSED) */ /* { */ @@ -1926,10 +1907,5 @@ _ecore_evas_wl_interface_new(void) iface->type_set = _ecore_evas_wayland_type_set; iface->window2_get = _ecore_evas_wayland_window_get; -#ifdef BUILD_ECORE_EVAS_WAYLAND_EGL - iface->pre_post_swap_callback_set = - _ecore_evas_wayland_pre_post_swap_callback_set; -#endif - return iface; } diff --git a/src/modules/evas/engines/wayland_egl/Evas_Engine_Wayland_Egl.h b/src/modules/evas/engines/wayland_egl/Evas_Engine_Wayland_Egl.h index a3f0e1a..97e81a8 100644 --- a/src/modules/evas/engines/wayland_egl/Evas_Engine_Wayland_Egl.h +++ b/src/modules/evas/engines/wayland_egl/Evas_Engine_Wayland_Egl.h @@ -19,13 +19,6 @@ struct _Evas_Engine_Info_Wayland_Egl unsigned int destination_alpha : 1; } info; - struct - { - void (*pre_swap) (void *data, Evas *evas); - void (*post_swap) (void *data, Evas *evas); - void *data; - } callback; - /* non-blocking or blocking mode */ Evas_Engine_Render_Mode render_mode; diff --git a/src/modules/evas/engines/wayland_egl/evas_wl_main.c b/src/modules/evas/engines/wayland_egl/evas_wl_main.c index c78be60..7885845 100644 --- a/src/modules/evas/engines/wayland_egl/evas_wl_main.c +++ b/src/modules/evas/engines/wayland_egl/evas_wl_main.c @@ -509,9 +509,6 @@ eng_outbuf_flush(Outbuf *ob, Tilebuf_Rect *surface_damage, Tilebuf_Rect *buffer_ ob->vsync = EINA_TRUE; } - if (ob->info->callback.pre_swap) - ob->info->callback.pre_swap(ob->info->callback.data, ob->evas); - if ((glsym_eglSwapBuffersWithDamage) && (surface_damage) && (ob->swap_mode != MODE_FULL)) { @@ -535,9 +532,6 @@ eng_outbuf_flush(Outbuf *ob, Tilebuf_Rect *surface_damage, Tilebuf_Rect *buffer_ else eglSwapBuffers(ob->egl_disp, ob->egl_surface[0]); - if (ob->info->callback.post_swap) - ob->info->callback.post_swap(ob->info->callback.data, ob->evas); - ob->frame_cnt++; end: --
