From b1bb88b8f227659c8a10adeed300937cd23e0193 Mon Sep 17 00:00:00 2001 From: Chris Michael Date: Thu, 30 Jul 2015 15:09:55 -0400 Subject: [PATCH] evas-wayland-shm: Modify existing engine functions to take a wl_display parameter Summary: These functions need to have an additional wl_display parameter so that we can set the field inside the Surface structure Signed-off-by: Chris Michael --- src/modules/evas/engines/wayland_shm/evas_engine.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/modules/evas/engines/wayland_shm/evas_engine.c b/src/modules/evas/engines/wayland_shm/evas_engine.c index b88207c..66913b8 100644 --- a/src/modules/evas/engines/wayland_shm/evas_engine.c +++ b/src/modules/evas/engines/wayland_shm/evas_engine.c @@ -23,7 +23,7 @@ struct _Render_Engine /* LOCAL FUNCTIONS */ Render_Engine * -_render_engine_swapbuf_setup(int w, int h, unsigned int rotation, unsigned int depth, Eina_Bool alpha, struct wl_shm *shm, struct wl_surface *surface) +_render_engine_swapbuf_setup(int w, int h, unsigned int rotation, unsigned int depth, Eina_Bool alpha, struct wl_shm *shm, struct wl_surface *surface, struct wl_display *disp) { Render_Engine *re; Outbuf *ob; @@ -33,7 +33,7 @@ _render_engine_swapbuf_setup(int w, int h, unsigned int rotation, unsigned int d /* try to allocate space for new render engine */ if (!(re = calloc(1, sizeof(Render_Engine)))) return NULL; - ob = _evas_outbuf_setup(w, h, rotation, depth, alpha, shm, surface); + ob = _evas_outbuf_setup(w, h, rotation, depth, alpha, shm, surface, disp); if (!ob) goto err; if (!evas_render_engine_software_generic_init(&re->generic, ob, @@ -121,7 +121,8 @@ eng_setup(Evas *eo_evas, void *info) einfo->info.depth, einfo->info.destination_alpha, einfo->info.wl_shm, - einfo->info.wl_surface); + einfo->info.wl_surface, + einfo->info.wl_disp); if (re) re->generic.ob->info = einfo; @@ -135,7 +136,8 @@ eng_setup(Evas *eo_evas, void *info) ob = _evas_outbuf_setup(epd->output.w, epd->output.h, einfo->info.rotation, einfo->info.depth, einfo->info.destination_alpha, - einfo->info.wl_shm, einfo->info.wl_surface); + einfo->info.wl_shm, einfo->info.wl_surface, + einfo->info.wl_disp); if (ob) { ob->info = einfo; -- 2.7.4