summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDerek Foreman <derekf@osg.samsung.com>2015-07-30 11:45:32 -0400
committerChris Michael <cp.michael@samsung.com>2015-07-30 11:45:32 -0400
commit997e84f14e8d43f2b63e0ce38c222164fe57c9ee (patch)
treeb0863b74ec0465374add741cca25e5902529de69
parentebea504cbc7aacb01336f557255e71f6883263f1 (diff)
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
-rw-r--r--src/modules/evas/engines/wayland_shm/evas_outbuf.c2
-rw-r--r--src/modules/evas/engines/wayland_shm/evas_shm.c2
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 03ff7a2cbc..e1e8f63d1f 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)
255 255
256 LOGFN(__FILE__, __LINE__, __FUNCTION__); 256 LOGFN(__FILE__, __LINE__, __FUNCTION__);
257 257
258 if (!_evas_shm_surface_assign(ob->surface)) return MODE_FULL;
259
258 /* This was broken, for now we just do full redraws */ 260 /* This was broken, for now we just do full redraws */
259 return MODE_FULL; 261 return MODE_FULL;
260 262
diff --git a/src/modules/evas/engines/wayland_shm/evas_shm.c b/src/modules/evas/engines/wayland_shm/evas_shm.c
index 90df6933bb..9860d9f3d7 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)
426{ 426{
427 LOGFN(__FILE__, __LINE__, __FUNCTION__); 427 LOGFN(__FILE__, __LINE__, __FUNCTION__);
428 428
429 _evas_shm_surface_assign(surface);
430
431 if (w) *w = 0; 429 if (w) *w = 0;
432 if (h) *h = 0; 430 if (h) *h = 0;
433 431