derekf pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=d960adee723a6a5198b4c770486e4c90480adb13
commit d960adee723a6a5198b4c770486e4c90480adb13 Author: Derek Foreman <[email protected]> Date: Tue Nov 1 07:41:09 2016 -0500 wayland_egl: Remove some leftovers from www The render post callback and "wobbling" variable were only required for the client side effect. --- .../engines/wayland/ecore_evas_wayland_egl.c | 19 ------------------- .../engines/wayland_egl/Evas_Engine_Wayland_Egl.h | 1 - 2 files changed, 20 deletions(-) diff --git a/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_egl.c b/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_egl.c index 305b095..9880e85 100644 --- a/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_egl.c +++ b/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_egl.c @@ -257,23 +257,6 @@ _ecore_evas_wl_egl_render_flush_pre(void *data, Evas *e, void *event_info EINA_U einfo->drag_ack = wdata->dragging; } -static void -_ecore_evas_wl_egl_render_post(void *data, Evas *e, void *event_info EINA_UNUSED) -{ - Ecore_Evas *ee = data; - Evas_Engine_Info_Wayland_Egl *einfo; - Ecore_Evas_Engine_Wl_Data *wdata; - int fw, fh; - - einfo = (Evas_Engine_Info_Wayland_Egl *)evas_engine_info_get(e); - wdata = ee->engine.data; - if (!einfo->wobbling) return; - evas_output_framespace_get(e, NULL, NULL, &fw, &fh); - evas_damage_rectangle_add(e, 0, 0, ee->w + fw, ee->h + fh); - ecore_wl2_window_opaque_region_set(wdata->win, - wdata->win->opaque.x, wdata->win->opaque.y, wdata->win->opaque.w, wdata->win->opaque.h); -} - /* external functions */ EAPI Ecore_Evas * ecore_evas_wayland_egl_new_internal(const char *disp_name, unsigned int parent, @@ -399,8 +382,6 @@ ecore_evas_wayland_egl_new_internal(const char *disp_name, unsigned int parent, _ecore_evas_wl_common_render_flush_pre, ee); evas_event_callback_add(ee->evas, EVAS_CALLBACK_RENDER_FLUSH_PRE, _ecore_evas_wl_egl_render_flush_pre, ee); - evas_event_callback_add(ee->evas, EVAS_CALLBACK_RENDER_POST, - _ecore_evas_wl_egl_render_post, ee); /* FIXME: This needs to be set based on theme & scale */ if (ee->prop.draw_frame) 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 204e286..a087ee9 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 @@ -44,7 +44,6 @@ struct _Evas_Engine_Info_Wayland_Egl Eina_Bool vsync : 1; Eina_Bool indirect : 1; - Eina_Bool wobbling : 1; Eina_Bool www_avail : 1; Eina_Bool just_mapped : 1; Eina_Rectangle window; --
