summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Michael <cp.michael@samsung.com>2015-07-30 15:09:55 -0400
committerChris Michael <cp.michael@samsung.com>2015-07-30 15:09:55 -0400
commitb1bb88b8f227659c8a10adeed300937cd23e0193 (patch)
tree3add0f017f06cfe07f28bedee8dabc63ca6dff10
parenta48c54cddd789a570d9eb64f9844a420ecd99c0b (diff)
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 <cp.michael@samsung.com>
-rw-r--r--src/modules/evas/engines/wayland_shm/evas_engine.c10
1 files 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 b88207cc6a..66913b88fe 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
23 23
24/* LOCAL FUNCTIONS */ 24/* LOCAL FUNCTIONS */
25Render_Engine * 25Render_Engine *
26_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) 26_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)
27{ 27{
28 Render_Engine *re; 28 Render_Engine *re;
29 Outbuf *ob; 29 Outbuf *ob;
@@ -33,7 +33,7 @@ _render_engine_swapbuf_setup(int w, int h, unsigned int rotation, unsigned int d
33 /* try to allocate space for new render engine */ 33 /* try to allocate space for new render engine */
34 if (!(re = calloc(1, sizeof(Render_Engine)))) return NULL; 34 if (!(re = calloc(1, sizeof(Render_Engine)))) return NULL;
35 35
36 ob = _evas_outbuf_setup(w, h, rotation, depth, alpha, shm, surface); 36 ob = _evas_outbuf_setup(w, h, rotation, depth, alpha, shm, surface, disp);
37 if (!ob) goto err; 37 if (!ob) goto err;
38 38
39 if (!evas_render_engine_software_generic_init(&re->generic, ob, 39 if (!evas_render_engine_software_generic_init(&re->generic, ob,
@@ -121,7 +121,8 @@ eng_setup(Evas *eo_evas, void *info)
121 einfo->info.depth, 121 einfo->info.depth,
122 einfo->info.destination_alpha, 122 einfo->info.destination_alpha,
123 einfo->info.wl_shm, 123 einfo->info.wl_shm,
124 einfo->info.wl_surface); 124 einfo->info.wl_surface,
125 einfo->info.wl_disp);
125 126
126 if (re) 127 if (re)
127 re->generic.ob->info = einfo; 128 re->generic.ob->info = einfo;
@@ -135,7 +136,8 @@ eng_setup(Evas *eo_evas, void *info)
135 ob = _evas_outbuf_setup(epd->output.w, epd->output.h, 136 ob = _evas_outbuf_setup(epd->output.w, epd->output.h,
136 einfo->info.rotation, einfo->info.depth, 137 einfo->info.rotation, einfo->info.depth,
137 einfo->info.destination_alpha, 138 einfo->info.destination_alpha,
138 einfo->info.wl_shm, einfo->info.wl_surface); 139 einfo->info.wl_shm, einfo->info.wl_surface,
140 einfo->info.wl_disp);
139 if (ob) 141 if (ob)
140 { 142 {
141 ob->info = einfo; 143 ob->info = einfo;