devilhorns pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=997e84f14e8d43f2b63e0ce38c222164fe57c9ee
commit 997e84f14e8d43f2b63e0ce38c222164fe57c9ee Author: Derek Foreman <der...@osg.samsung.com> Date: Thu Jul 30 11:45:32 2015 -0400 wayland-shm: Assign buffers in the swap_mode callback Summary: This is when we're about to start a new render, so it's the best time to set up the next buffer to draw to. Reviewers: zmike, devilhorns Reviewed By: devilhorns Subscribers: cedric Differential Revision: https://phab.enlightenment.org/D2892 --- src/modules/evas/engines/wayland_shm/evas_outbuf.c | 2 ++ src/modules/evas/engines/wayland_shm/evas_shm.c | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/modules/evas/engines/wayland_shm/evas_outbuf.c b/src/modules/evas/engines/wayland_shm/evas_outbuf.c index 03ff7a2..e1e8f63 100644 --- a/src/modules/evas/engines/wayland_shm/evas_outbuf.c +++ b/src/modules/evas/engines/wayland_shm/evas_outbuf.c @@ -255,6 +255,8 @@ _evas_outbuf_swap_mode_get(Outbuf *ob) LOGFN(__FILE__, __LINE__, __FUNCTION__); + if (!_evas_shm_surface_assign(ob->surface)) return MODE_FULL; + /* This was broken, for now we just do full redraws */ return MODE_FULL; diff --git a/src/modules/evas/engines/wayland_shm/evas_shm.c b/src/modules/evas/engines/wayland_shm/evas_shm.c index 90df693..9860d9f 100644 --- a/src/modules/evas/engines/wayland_shm/evas_shm.c +++ b/src/modules/evas/engines/wayland_shm/evas_shm.c @@ -426,8 +426,6 @@ _evas_shm_surface_data_get(Shm_Surface *surface, int *w, int *h) { LOGFN(__FILE__, __LINE__, __FUNCTION__); - _evas_shm_surface_assign(surface); - if (w) *w = 0; if (h) *h = 0; --