derekf pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=ceb90779ff1068c50c1a4362ad7b13886870231a
commit ceb90779ff1068c50c1a4362ad7b13886870231a Author: Derek Foreman <[email protected]> Date: Tue Sep 12 08:37:04 2017 -0500 evas_shm: Remove wl_dmabuf and wl_shm from engine info All queries for these are now on the ecore_wl2_display --- src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c | 4 ---- src/modules/evas/engines/wayland_common/Evas_Engine_Wayland.h | 3 --- src/modules/evas/engines/wayland_shm/evas_dmabuf.c | 5 +---- src/modules/evas/engines/wayland_shm/evas_shm.c | 2 -- 4 files changed, 1 insertion(+), 13 deletions(-) diff --git a/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c b/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c index b5f7695c6d..ddeb4b5f1a 100644 --- a/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c +++ b/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c @@ -2170,8 +2170,6 @@ _ee_cb_sync_done(void *data, int type EINA_UNUSED, void *event EINA_UNUSED) if ((einfo = (Evas_Engine_Info_Wayland *)evas_engine_info_get(ee->evas))) { einfo->info.wl2_display = wdata->display; - einfo->info.wl_dmabuf = ecore_wl2_display_dmabuf_get(wdata->display); - einfo->info.wl_shm = ecore_wl2_display_shm_get(wdata->display); einfo->info.compositor_version = ecore_wl2_display_compositor_version_get(wdata->display); einfo->info.destination_alpha = EINA_TRUE; @@ -2477,8 +2475,6 @@ _ecore_evas_wl_common_new_internal(const char *disp_name, unsigned int parent, i einfo->info.rotation = ee->rotation; einfo->info.depth = 32; einfo->info.wl2_win = wdata->win; - einfo->info.wl_dmabuf = ecore_wl2_display_dmabuf_get(ewd); - einfo->info.wl_shm = ecore_wl2_display_shm_get(ewd); einfo->info.compositor_version = ecore_wl2_display_compositor_version_get(ewd); einfo->info.hidden = EINA_TRUE; diff --git a/src/modules/evas/engines/wayland_common/Evas_Engine_Wayland.h b/src/modules/evas/engines/wayland_common/Evas_Engine_Wayland.h index c2c0b53b35..bce8a691f4 100644 --- a/src/modules/evas/engines/wayland_common/Evas_Engine_Wayland.h +++ b/src/modules/evas/engines/wayland_common/Evas_Engine_Wayland.h @@ -14,9 +14,6 @@ struct _Evas_Engine_Info_Wayland /* engine specific data & parameters it needs to set up */ struct { - /* the wayland shm object used to create new shm pool */ - struct wl_shm *wl_shm; - struct zwp_linux_dmabuf_v1 *wl_dmabuf; Ecore_Wl2_Display *wl2_display; Ecore_Wl2_Window *wl2_win; int depth, rotation, edges; diff --git a/src/modules/evas/engines/wayland_shm/evas_dmabuf.c b/src/modules/evas/engines/wayland_shm/evas_dmabuf.c index 6045b8f140..84265366ac 100644 --- a/src/modules/evas/engines/wayland_shm/evas_dmabuf.c +++ b/src/modules/evas/engines/wayland_shm/evas_dmabuf.c @@ -71,7 +71,6 @@ struct _Dmabuf_Surface { Surface *surface; struct wl_display *wl_display; - struct zwp_linux_dmabuf_v1 *dmabuf; int compositor_version; Dmabuf_Buffer *current; @@ -782,15 +781,13 @@ _evas_dmabuf_surface_create(Surface *s, int w, int h, int num_buff) int i = 0; if (dmabuf_totally_hosed) return EINA_FALSE; - - if (!s->info->info.wl_dmabuf) return EINA_FALSE; + if (!ecore_wl2_display_dmabuf_get(s->info->info.wl2_display)) return EINA_FALSE; if (!(s->surf.dmabuf = calloc(1, sizeof(Dmabuf_Surface)))) return EINA_FALSE; surf = s->surf.dmabuf; surf->surface = s; surf->wl_display = ecore_wl2_display_get(s->info->info.wl2_display); - surf->dmabuf = s->info->info.wl_dmabuf; surf->alpha = s->info->info.destination_alpha; surf->compositor_version = s->info->info.compositor_version; diff --git a/src/modules/evas/engines/wayland_shm/evas_shm.c b/src/modules/evas/engines/wayland_shm/evas_shm.c index 4553edc7c1..5246b49e69 100644 --- a/src/modules/evas/engines/wayland_shm/evas_shm.c +++ b/src/modules/evas/engines/wayland_shm/evas_shm.c @@ -61,7 +61,6 @@ struct _Shm_Leaf typedef struct _Shm_Surface Shm_Surface; struct _Shm_Surface { - struct wl_shm *shm; int w, h; int num_buff; int compositor_version; @@ -588,7 +587,6 @@ _evas_shm_surface_create(Surface *s, int w, int h, int num_buff) surf->w = w; surf->h = h; - surf->shm = s->info->info.wl_shm; surf->num_buff = num_buff; surf->alpha = s->info->info.destination_alpha; surf->compositor_version = s->info->info.compositor_version; --
