derekf pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=e4122da2113d8945086f70ced96c211fbc0dfdb5
commit e4122da2113d8945086f70ced96c211fbc0dfdb5 Author: Derek Foreman <[email protected]> Date: Fri Jan 26 10:52:14 2018 -0600 ecore_wl2: Remove force from surface reconfigure It no longer has any users or need to exist. --- src/lib/ecore_wl2/Ecore_Wl2.h | 4 ++-- src/lib/ecore_wl2/ecore_wl2_surface.c | 8 ++++---- src/modules/evas/engines/wayland_shm/evas_outbuf.c | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/lib/ecore_wl2/Ecore_Wl2.h b/src/lib/ecore_wl2/Ecore_Wl2.h index e214894058..62d3888ea2 100644 --- a/src/lib/ecore_wl2/Ecore_Wl2.h +++ b/src/lib/ecore_wl2/Ecore_Wl2.h @@ -421,7 +421,7 @@ typedef struct _Ecore_Wl2_Surface_Interface { Eina_Bool (*check)(Ecore_Wl2_Window *win); void (*destroy)(Ecore_Wl2_Surface *surface); - void (*reconfigure)(Ecore_Wl2_Surface *surface, int w, int h, uint32_t flags, Eina_Bool force); + void (*reconfigure)(Ecore_Wl2_Surface *surface, int w, int h, uint32_t flags); void *(*data_get)(Ecore_Wl2_Surface *surface, int *w, int *h); int (*assign)(Ecore_Wl2_Surface *surface); void (*post)(Ecore_Wl2_Surface *surface, Eina_Rectangle *rects, unsigned int count); @@ -2016,7 +2016,7 @@ EAPI Eina_Bool ecore_wl2_buffer_fit(Ecore_Wl2_Buffer *b, int w, int h); EAPI Ecore_Wl2_Surface *ecore_wl2_surface_create(Ecore_Wl2_Window *win, Eina_Bool alpha); EAPI void ecore_wl2_surface_destroy(Ecore_Wl2_Surface *surface); -EAPI void ecore_wl2_surface_reconfigure(Ecore_Wl2_Surface *surface, int w, int h, uint32_t flags, Eina_Bool force); +EAPI void ecore_wl2_surface_reconfigure(Ecore_Wl2_Surface *surface, int w, int h, uint32_t flags); EAPI void *ecore_wl2_surface_data_get(Ecore_Wl2_Surface *surface, int *w, int *h); EAPI int ecore_wl2_surface_assign(Ecore_Wl2_Surface *surface); EAPI void ecore_wl2_surface_post(Ecore_Wl2_Surface *surface, Eina_Rectangle *rects, unsigned int count); diff --git a/src/lib/ecore_wl2/ecore_wl2_surface.c b/src/lib/ecore_wl2/ecore_wl2_surface.c index 94804dd0f3..ca5bfc5a51 100644 --- a/src/lib/ecore_wl2/ecore_wl2_surface.c +++ b/src/lib/ecore_wl2/ecore_wl2_surface.c @@ -30,7 +30,7 @@ _evas_dmabuf_surface_check(Ecore_Wl2_Window *win) } static void -_evas_dmabuf_surface_reconfigure(Ecore_Wl2_Surface *s, int w, int h, uint32_t flags EINA_UNUSED, Eina_Bool force) +_evas_dmabuf_surface_reconfigure(Ecore_Wl2_Surface *s, int w, int h, uint32_t flags EINA_UNUSED) { Ecore_Wl2_Buffer *b; Eina_List *l, *tmp; @@ -38,7 +38,7 @@ _evas_dmabuf_surface_reconfigure(Ecore_Wl2_Surface *s, int w, int h, uint32_t fl if ((!w) || (!h)) return; EINA_LIST_FOREACH_SAFE(s->buffers, l, tmp, b) { - if (!force && ecore_wl2_buffer_fit(b, w, h)) + if (ecore_wl2_buffer_fit(b, w, h)) continue; ecore_wl2_buffer_destroy(b); @@ -183,11 +183,11 @@ ecore_wl2_surface_destroy(Ecore_Wl2_Surface *surface) } EAPI void -ecore_wl2_surface_reconfigure(Ecore_Wl2_Surface *surface, int w, int h, uint32_t flags, Eina_Bool force) +ecore_wl2_surface_reconfigure(Ecore_Wl2_Surface *surface, int w, int h, uint32_t flags) { EINA_SAFETY_ON_NULL_RETURN(surface); - surface->funcs->reconfigure(surface, w, h, flags, force); + surface->funcs->reconfigure(surface, w, h, flags); } EAPI void * diff --git a/src/modules/evas/engines/wayland_shm/evas_outbuf.c b/src/modules/evas/engines/wayland_shm/evas_outbuf.c index 9b520e7120..be077107ec 100644 --- a/src/modules/evas/engines/wayland_shm/evas_outbuf.c +++ b/src/modules/evas/engines/wayland_shm/evas_outbuf.c @@ -285,11 +285,11 @@ _evas_outbuf_reconfigure(Outbuf *ob, int w, int h, int rot, Outbuf_Depth depth, if ((ob->rotation == 0) || (ob->rotation == 180)) { - ecore_wl2_surface_reconfigure(ob->surface, w, h, resize, EINA_FALSE); + ecore_wl2_surface_reconfigure(ob->surface, w, h, resize); } else if ((ob->rotation == 90) || (ob->rotation == 270)) { - ecore_wl2_surface_reconfigure(ob->surface, h, w, resize, EINA_FALSE); + ecore_wl2_surface_reconfigure(ob->surface, h, w, resize); } _evas_outbuf_idle_flush(ob); --
