summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDerek Foreman <derekf@osg.samsung.com>2017-09-12 08:37:04 -0500
committerDerek Foreman <derekf@osg.samsung.com>2017-10-12 12:24:03 -0500
commitceb90779ff1068c50c1a4362ad7b13886870231a (patch)
tree9e8b28d2a761739d814fe55bdb73cde2d739241a
parent4a23e69bcc506b5ac7a77fa01044c26c4cc0c743 (diff)
evas_shm: Remove wl_dmabuf and wl_shm from engine info
All queries for these are now on the ecore_wl2_display
-rw-r--r--src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c4
-rw-r--r--src/modules/evas/engines/wayland_common/Evas_Engine_Wayland.h3
-rw-r--r--src/modules/evas/engines/wayland_shm/evas_dmabuf.c5
-rw-r--r--src/modules/evas/engines/wayland_shm/evas_shm.c2
4 files changed, 1 insertions, 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 b5f7695..ddeb4b5 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)
2170 if ((einfo = (Evas_Engine_Info_Wayland *)evas_engine_info_get(ee->evas))) 2170 if ((einfo = (Evas_Engine_Info_Wayland *)evas_engine_info_get(ee->evas)))
2171 { 2171 {
2172 einfo->info.wl2_display = wdata->display; 2172 einfo->info.wl2_display = wdata->display;
2173 einfo->info.wl_dmabuf = ecore_wl2_display_dmabuf_get(wdata->display);
2174 einfo->info.wl_shm = ecore_wl2_display_shm_get(wdata->display);
2175 einfo->info.compositor_version = 2173 einfo->info.compositor_version =
2176 ecore_wl2_display_compositor_version_get(wdata->display); 2174 ecore_wl2_display_compositor_version_get(wdata->display);
2177 einfo->info.destination_alpha = EINA_TRUE; 2175 einfo->info.destination_alpha = EINA_TRUE;
@@ -2477,8 +2475,6 @@ _ecore_evas_wl_common_new_internal(const char *disp_name, unsigned int parent, i
2477 einfo->info.rotation = ee->rotation; 2475 einfo->info.rotation = ee->rotation;
2478 einfo->info.depth = 32; 2476 einfo->info.depth = 32;
2479 einfo->info.wl2_win = wdata->win; 2477 einfo->info.wl2_win = wdata->win;
2480 einfo->info.wl_dmabuf = ecore_wl2_display_dmabuf_get(ewd);
2481 einfo->info.wl_shm = ecore_wl2_display_shm_get(ewd);
2482 einfo->info.compositor_version = 2478 einfo->info.compositor_version =
2483 ecore_wl2_display_compositor_version_get(ewd); 2479 ecore_wl2_display_compositor_version_get(ewd);
2484 einfo->info.hidden = EINA_TRUE; 2480 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 c2c0b53..bce8a69 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
14 /* engine specific data & parameters it needs to set up */ 14 /* engine specific data & parameters it needs to set up */
15 struct 15 struct
16 { 16 {
17 /* the wayland shm object used to create new shm pool */
18 struct wl_shm *wl_shm;
19 struct zwp_linux_dmabuf_v1 *wl_dmabuf;
20 Ecore_Wl2_Display *wl2_display; 17 Ecore_Wl2_Display *wl2_display;
21 Ecore_Wl2_Window *wl2_win; 18 Ecore_Wl2_Window *wl2_win;
22 int depth, rotation, edges; 19 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 6045b8f..8426536 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
71{ 71{
72 Surface *surface; 72 Surface *surface;
73 struct wl_display *wl_display; 73 struct wl_display *wl_display;
74 struct zwp_linux_dmabuf_v1 *dmabuf;
75 int compositor_version; 74 int compositor_version;
76 75
77 Dmabuf_Buffer *current; 76 Dmabuf_Buffer *current;
@@ -782,15 +781,13 @@ _evas_dmabuf_surface_create(Surface *s, int w, int h, int num_buff)
782 int i = 0; 781 int i = 0;
783 782
784 if (dmabuf_totally_hosed) return EINA_FALSE; 783 if (dmabuf_totally_hosed) return EINA_FALSE;
785 784 if (!ecore_wl2_display_dmabuf_get(s->info->info.wl2_display)) return EINA_FALSE;
786 if (!s->info->info.wl_dmabuf) return EINA_FALSE;
787 785
788 if (!(s->surf.dmabuf = calloc(1, sizeof(Dmabuf_Surface)))) return EINA_FALSE; 786 if (!(s->surf.dmabuf = calloc(1, sizeof(Dmabuf_Surface)))) return EINA_FALSE;
789 surf = s->surf.dmabuf; 787 surf = s->surf.dmabuf;
790 788
791 surf->surface = s; 789 surf->surface = s;
792 surf->wl_display = ecore_wl2_display_get(s->info->info.wl2_display); 790 surf->wl_display = ecore_wl2_display_get(s->info->info.wl2_display);
793 surf->dmabuf = s->info->info.wl_dmabuf;
794 surf->alpha = s->info->info.destination_alpha; 791 surf->alpha = s->info->info.destination_alpha;
795 surf->compositor_version = s->info->info.compositor_version; 792 surf->compositor_version = s->info->info.compositor_version;
796 793
diff --git a/src/modules/evas/engines/wayland_shm/evas_shm.c b/src/modules/evas/engines/wayland_shm/evas_shm.c
index 4553edc..5246b49 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
61typedef struct _Shm_Surface Shm_Surface; 61typedef struct _Shm_Surface Shm_Surface;
62struct _Shm_Surface 62struct _Shm_Surface
63{ 63{
64 struct wl_shm *shm;
65 int w, h; 64 int w, h;
66 int num_buff; 65 int num_buff;
67 int compositor_version; 66 int compositor_version;
@@ -588,7 +587,6 @@ _evas_shm_surface_create(Surface *s, int w, int h, int num_buff)
588 587
589 surf->w = w; 588 surf->w = w;
590 surf->h = h; 589 surf->h = h;
591 surf->shm = s->info->info.wl_shm;
592 surf->num_buff = num_buff; 590 surf->num_buff = num_buff;
593 surf->alpha = s->info->info.destination_alpha; 591 surf->alpha = s->info->info.destination_alpha;
594 surf->compositor_version = s->info->info.compositor_version; 592 surf->compositor_version = s->info->info.compositor_version;