From f3f4ad31765e87f07156a20606c58b389d352673 Mon Sep 17 00:00:00 2001 From: devilhorns Date: Thu, 29 Mar 2012 01:28:28 +0000 Subject: [PATCH] Ecore_Evas (wayland): Be sure to call 'iterate' if this is the first initialize of ecore_wl (needed for running clients under the Weston Compositor). Remove extra flush call when rendering. git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/ecore@69708 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33 --- src/lib/ecore_evas/ecore_evas_wayland_egl.c | 6 +++--- src/lib/ecore_evas/ecore_evas_wayland_shm.c | 16 +++++----------- 2 files changed, 8 insertions(+), 14 deletions(-) diff --git a/src/lib/ecore_evas/ecore_evas_wayland_egl.c b/src/lib/ecore_evas/ecore_evas_wayland_egl.c index c65fd8f..b7b6de4 100644 --- a/src/lib/ecore_evas/ecore_evas_wayland_egl.c +++ b/src/lib/ecore_evas/ecore_evas_wayland_egl.c @@ -178,8 +178,8 @@ ecore_evas_wayland_egl_new(const char *disp_name, unsigned int parent, int x, in ERR("Failed to initialize Ecore_Wayland"); return NULL; } - else if (count >= 1) - ecore_wl_sync(); + else if (count == 1) + ecore_wl_display_iterate(); if (!(ee = calloc(1, sizeof(Ecore_Evas)))) { @@ -763,7 +763,7 @@ _ecore_evas_wl_render(Ecore_Evas *ee) ecore_wl_window_damage(ee->engine.wl.win, r->x, r->y, r->w, r->h); - ecore_wl_flush(); + /* ecore_wl_flush(); */ evas_render_updates_free(updates); _ecore_evas_idle_timeout_update(ee); diff --git a/src/lib/ecore_evas/ecore_evas_wayland_shm.c b/src/lib/ecore_evas/ecore_evas_wayland_shm.c index 481f4a2..611469e 100644 --- a/src/lib/ecore_evas/ecore_evas_wayland_shm.c +++ b/src/lib/ecore_evas/ecore_evas_wayland_shm.c @@ -179,8 +179,8 @@ ecore_evas_wayland_shm_new(const char *disp_name, unsigned int parent, int x, in ERR("Failed to initialize Ecore_Wayland"); return NULL; } - else if (count >= 1) - ecore_wl_sync(); + else if (count == 1) + ecore_wl_display_iterate(); if (!(ee = calloc(1, sizeof(Ecore_Evas)))) { @@ -810,16 +810,10 @@ _ecore_evas_wl_render(Ecore_Evas *ee) LOGFN(__FILE__, __LINE__, __FUNCTION__); EINA_LIST_FOREACH(updates, l, r) - { - /* if (ee->engine.wl.buffer) */ - /* wl_buffer_damage(ee->engine.wl.buffer, */ - /* r->x, r->y, r->w, r->h); */ + ecore_wl_window_damage(ee->engine.wl.win, + r->x, r->y, r->w, r->h); - ecore_wl_window_damage(ee->engine.wl.win, - r->x, r->y, r->w, r->h); - } - - ecore_wl_flush(); + /* ecore_wl_flush(); */ evas_render_updates_free(updates); _ecore_evas_idle_timeout_update(ee); -- 2.7.4