summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorDerek Foreman <derekf@osg.samsung.com>2017-11-10 13:41:00 -0600
committerDerek Foreman <derekf@osg.samsung.com>2017-11-10 13:43:45 -0600
commit8cf0bfc9ef78b4a51bcff446a0a358a2e0055c3d (patch)
treed10a342b0501b54ab8580d3e39b457434f08c9a8 /src
parent6ea82f9f7e8361fb9cfe162395a81f006e4f8da8 (diff)
wayland: stop tracking compositor_version in engine
We don't need it anymore now that damage is posted from inside ecore_wl2.
Diffstat (limited to 'src')
-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.h1
-rw-r--r--src/modules/evas/engines/wayland_shm/evas_dmabuf.c2
3 files changed, 0 insertions, 7 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 163c88762e..e43469b63b 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
@@ -2211,8 +2211,6 @@ _ee_cb_sync_done(void *data, int type EINA_UNUSED, void *event EINA_UNUSED)
2211 if ((einfo = (Evas_Engine_Info_Wayland *)evas_engine_info_get(ee->evas))) 2211 if ((einfo = (Evas_Engine_Info_Wayland *)evas_engine_info_get(ee->evas)))
2212 { 2212 {
2213 einfo->info.wl2_display = wdata->display; 2213 einfo->info.wl2_display = wdata->display;
2214 einfo->info.compositor_version =
2215 ecore_wl2_display_compositor_version_get(wdata->display);
2216 einfo->info.destination_alpha = EINA_TRUE; 2214 einfo->info.destination_alpha = EINA_TRUE;
2217 einfo->info.rotation = ee->rotation; 2215 einfo->info.rotation = ee->rotation;
2218 einfo->info.wl2_win = wdata->win; 2216 einfo->info.wl2_win = wdata->win;
@@ -2518,8 +2516,6 @@ _ecore_evas_wl_common_new_internal(const char *disp_name, unsigned int parent, i
2518 einfo->info.rotation = ee->rotation; 2516 einfo->info.rotation = ee->rotation;
2519 einfo->info.depth = 32; 2517 einfo->info.depth = 32;
2520 einfo->info.wl2_win = wdata->win; 2518 einfo->info.wl2_win = wdata->win;
2521 einfo->info.compositor_version =
2522 ecore_wl2_display_compositor_version_get(ewd);
2523 einfo->info.hidden = EINA_TRUE; 2519 einfo->info.hidden = EINA_TRUE;
2524 2520
2525 if (!evas_engine_info_set(ee->evas, (Evas_Engine_Info *)einfo)) 2521 if (!evas_engine_info_set(ee->evas, (Evas_Engine_Info *)einfo))
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 bce8a691f4..4961132da8 100644
--- a/src/modules/evas/engines/wayland_common/Evas_Engine_Wayland.h
+++ b/src/modules/evas/engines/wayland_common/Evas_Engine_Wayland.h
@@ -17,7 +17,6 @@ struct _Evas_Engine_Info_Wayland
17 Ecore_Wl2_Display *wl2_display; 17 Ecore_Wl2_Display *wl2_display;
18 Ecore_Wl2_Window *wl2_win; 18 Ecore_Wl2_Window *wl2_win;
19 int depth, rotation, edges; 19 int depth, rotation, edges;
20 int compositor_version;
21 Eina_Bool destination_alpha : 1; 20 Eina_Bool destination_alpha : 1;
22 Eina_Bool hidden : 1; 21 Eina_Bool hidden : 1;
23 } info; 22 } info;
diff --git a/src/modules/evas/engines/wayland_shm/evas_dmabuf.c b/src/modules/evas/engines/wayland_shm/evas_dmabuf.c
index 9447ebc4c0..375635ddea 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_Buffer
71struct _Dmabuf_Surface 71struct _Dmabuf_Surface
72{ 72{
73 Surface *surface; 73 Surface *surface;
74 int compositor_version;
75 74
76 Dmabuf_Buffer *current; 75 Dmabuf_Buffer *current;
77 Dmabuf_Buffer **buffer; 76 Dmabuf_Buffer **buffer;
@@ -762,7 +761,6 @@ _evas_dmabuf_surface_create(Surface *s, int w, int h, int num_buff)
762 761
763 surf->surface = s; 762 surf->surface = s;
764 surf->alpha = s->info->info.destination_alpha; 763 surf->alpha = s->info->info.destination_alpha;
765 surf->compositor_version = s->info->info.compositor_version;
766 764
767 /* create surface buffers */ 765 /* create surface buffers */
768 surf->nbuf = num_buff; 766 surf->nbuf = num_buff;