derekf pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=4a23e69bcc506b5ac7a77fa01044c26c4cc0c743
commit 4a23e69bcc506b5ac7a77fa01044c26c4cc0c743 Author: Derek Foreman <[email protected]> Date: Mon Sep 11 17:16:17 2017 -0500 wayland_shm: Remove surface_set function Now that we use the display's shm and dmabuf pointers we don't need to update them. --- src/modules/evas/engines/wayland_shm/evas_dmabuf.c | 15 --------------- src/modules/evas/engines/wayland_shm/evas_engine.c | 3 --- src/modules/evas/engines/wayland_shm/evas_engine.h | 2 -- src/modules/evas/engines/wayland_shm/evas_outbuf.c | 6 ------ src/modules/evas/engines/wayland_shm/evas_shm.c | 15 --------------- 5 files changed, 41 deletions(-) diff --git a/src/modules/evas/engines/wayland_shm/evas_dmabuf.c b/src/modules/evas/engines/wayland_shm/evas_dmabuf.c index 0b5f5f77ce..6045b8f140 100644 --- a/src/modules/evas/engines/wayland_shm/evas_dmabuf.c +++ b/src/modules/evas/engines/wayland_shm/evas_dmabuf.c @@ -776,20 +776,6 @@ _evas_dmabuf_surface_destroy(Surface *s) } Eina_Bool -_evas_dmabuf_surface_surface_set(Surface *s, struct wl_shm *wl_shm EINA_UNUSED, struct zwp_linux_dmabuf_v1 *wl_dmabuf) -{ - Dmabuf_Surface *surf; - - surf = s->surf.dmabuf; - - if ((surf->dmabuf == wl_dmabuf)) - return EINA_FALSE; - - surf->dmabuf = wl_dmabuf; - return EINA_TRUE; -} - -Eina_Bool _evas_dmabuf_surface_create(Surface *s, int w, int h, int num_buff) { Dmabuf_Surface *surf = NULL; @@ -835,7 +821,6 @@ _evas_dmabuf_surface_create(Surface *s, int w, int h, int num_buff) s->funcs.data_get = _evas_dmabuf_surface_data_get; s->funcs.assign = _evas_dmabuf_surface_assign; s->funcs.post = _evas_dmabuf_surface_post; - s->funcs.surface_set = _evas_dmabuf_surface_surface_set; return EINA_TRUE; diff --git a/src/modules/evas/engines/wayland_shm/evas_engine.c b/src/modules/evas/engines/wayland_shm/evas_engine.c index 786ddb46ee..0131d36bd0 100644 --- a/src/modules/evas/engines/wayland_shm/evas_engine.c +++ b/src/modules/evas/engines/wayland_shm/evas_engine.c @@ -140,9 +140,6 @@ eng_output_update(void *engine, void *data, void *info, unsigned int w, unsigned ob->dirty = EINA_TRUE; re->generic.ob->ewd = einfo->info.wl2_display; } - _evas_outbuf_surface_set(ob, - einfo->info.wl_shm, - einfo->info.wl_dmabuf); eng_output_resize(engine, data, w, h); diff --git a/src/modules/evas/engines/wayland_shm/evas_engine.h b/src/modules/evas/engines/wayland_shm/evas_engine.h index b9393da974..ca6a172ffe 100644 --- a/src/modules/evas/engines/wayland_shm/evas_engine.h +++ b/src/modules/evas/engines/wayland_shm/evas_engine.h @@ -101,7 +101,6 @@ struct _Surface void *(*data_get)(Surface *surface, int *w, int *h); int (*assign)(Surface *surface); void (*post)(Surface *surface, Eina_Rectangle *rects, unsigned int count, Eina_Bool hidden); - Eina_Bool (*surface_set)(Surface *surface, struct wl_shm *wl_shm, struct zwp_linux_dmabuf_v1 *wl_dmabuf); } funcs; }; @@ -157,7 +156,6 @@ void _evas_outbuf_update_region_push(Outbuf *ob, RGBA_Image *update, int x, int void _evas_outbuf_update_region_free(Outbuf *ob, RGBA_Image *update); void _evas_surface_damage(struct wl_surface *s, int compositor_version, int w, int h, Eina_Rectangle *rects, unsigned int count); void _evas_outbuf_redraws_clear(Outbuf *ob); -void _evas_outbuf_surface_set(Outbuf *ob, struct wl_shm *shm, struct zwp_linux_dmabuf_v1 *dmabuf); Eina_Bool _evas_surface_init(Surface *s, int w, int h, int num_buf); diff --git a/src/modules/evas/engines/wayland_shm/evas_outbuf.c b/src/modules/evas/engines/wayland_shm/evas_outbuf.c index 1f599e19f1..e26222f474 100644 --- a/src/modules/evas/engines/wayland_shm/evas_outbuf.c +++ b/src/modules/evas/engines/wayland_shm/evas_outbuf.c @@ -650,9 +650,3 @@ _evas_outbuf_redraws_clear(Outbuf *ob) free(ob->priv.rects); ob->priv.rect_count = 0; } - -void -_evas_outbuf_surface_set(Outbuf *ob, struct wl_shm *wl_shm, struct zwp_linux_dmabuf_v1 *wl_dmabuf) -{ - ob->surface->funcs.surface_set(ob->surface, wl_shm, wl_dmabuf); -} diff --git a/src/modules/evas/engines/wayland_shm/evas_shm.c b/src/modules/evas/engines/wayland_shm/evas_shm.c index 6ad24c48fc..4553edc7c1 100644 --- a/src/modules/evas/engines/wayland_shm/evas_shm.c +++ b/src/modules/evas/engines/wayland_shm/evas_shm.c @@ -576,20 +576,6 @@ _evas_shm_surface_post(Surface *s, Eina_Rectangle *rects, unsigned int count, Ei } Eina_Bool -_evas_shm_surface_surface_set(Surface *s, struct wl_shm *wl_shm, struct zwp_linux_dmabuf_v1 *wl_dmabuf EINA_UNUSED) -{ - Shm_Surface *surf; - - surf = s->surf.shm; - - if ((surf->shm == wl_shm)) - return EINA_FALSE; - - surf->shm = wl_shm; - return EINA_TRUE; -} - -Eina_Bool _evas_shm_surface_create(Surface *s, int w, int h, int num_buff) { Shm_Surface *surf; @@ -626,7 +612,6 @@ _evas_shm_surface_create(Surface *s, int w, int h, int num_buff) s->funcs.data_get = _evas_shm_surface_data_get; s->funcs.assign = _evas_shm_surface_assign; s->funcs.post = _evas_shm_surface_post; - s->funcs.surface_set = _evas_shm_surface_surface_set; return EINA_TRUE; --
