derekf pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=3f576e8436c5426f506efed61e2fa7ac51898cbf
commit 3f576e8436c5426f506efed61e2fa7ac51898cbf Author: Derek Foreman <[email protected]> Date: Mon Sep 11 16:57:05 2017 -0500 wayland_shm: Add Outbuf to Surface struct We're going to need that soon. --- src/modules/evas/engines/wayland_shm/evas_engine.h | 1 + src/modules/evas/engines/wayland_shm/evas_outbuf.c | 7 ++++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/modules/evas/engines/wayland_shm/evas_engine.h b/src/modules/evas/engines/wayland_shm/evas_engine.h index 2b014c3a2d..b9393da974 100644 --- a/src/modules/evas/engines/wayland_shm/evas_engine.h +++ b/src/modules/evas/engines/wayland_shm/evas_engine.h @@ -87,6 +87,7 @@ typedef struct _Surface Surface; struct _Surface { Surface_Type type; + Outbuf *ob; union { Shm_Surface *shm; diff --git a/src/modules/evas/engines/wayland_shm/evas_outbuf.c b/src/modules/evas/engines/wayland_shm/evas_outbuf.c index 9caa52974d..1f599e19f1 100644 --- a/src/modules/evas/engines/wayland_shm/evas_outbuf.c +++ b/src/modules/evas/engines/wayland_shm/evas_outbuf.c @@ -21,7 +21,7 @@ _evas_surface_init(Surface *s, int w, int h, int num_buf) } static Surface * -_evas_surface_create(Evas_Engine_Info_Wayland *info, int w, int h, int num_buf) +_evas_surface_create(Evas_Engine_Info_Wayland *info, int w, int h, Outbuf *ob) { Surface *out; @@ -29,8 +29,9 @@ _evas_surface_create(Evas_Engine_Info_Wayland *info, int w, int h, int num_buf) if (!out) return NULL; out->type = SURFACE_EMPTY; out->info = info; + out->ob = ob; - if (_evas_surface_init(out, w, h, num_buf)) return out; + if (_evas_surface_init(out, w, h, ob->num_buff)) return out; free(out); return NULL; @@ -87,7 +88,7 @@ _evas_outbuf_setup(int w, int h, Evas_Engine_Info_Wayland *info) else goto unhandled_rotation; - ob->surface = _evas_surface_create(info, sw, sh, ob->num_buff); + ob->surface = _evas_surface_create(info, sw, sh, ob); if (!ob->surface) goto surf_err; unhandled_rotation: --
