derekf pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=e207e050679446183ae794f30982ac545d888bd2
commit e207e050679446183ae794f30982ac545d888bd2 Author: Derek Foreman <[email protected]> Date: Thu Sep 14 12:35:16 2017 -0500 wayland_shm: Remove hidden from the outbuf Outbuf shouldn't have to track its hidden status, that should be ecore_evas problem. Until now we were doing this because our kludgey wayland ticking made things difficult, but I think it's safe to remove now. --- src/modules/evas/engines/wayland_shm/evas_engine.c | 3 +-- src/modules/evas/engines/wayland_shm/evas_engine.h | 3 +-- src/modules/evas/engines/wayland_shm/evas_outbuf.c | 13 ++----------- 3 files changed, 4 insertions(+), 15 deletions(-) diff --git a/src/modules/evas/engines/wayland_shm/evas_engine.c b/src/modules/evas/engines/wayland_shm/evas_engine.c index 0131d36bd0..11f10a1b24 100644 --- a/src/modules/evas/engines/wayland_shm/evas_engine.c +++ b/src/modules/evas/engines/wayland_shm/evas_engine.c @@ -115,8 +115,7 @@ eng_output_resize(void *engine EINA_UNUSED, void *data, int w, int h) _evas_outbuf_reconfigure(re->generic.ob, w, h, einfo->info.rotation, einfo->info.depth, - einfo->info.destination_alpha, resize, - einfo->info.hidden); + einfo->info.destination_alpha, resize); evas_common_tilebuf_free(re->generic.tb); if ((re->generic.tb = evas_common_tilebuf_new(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 d7302f47d0..6a0cd68c03 100644 --- a/src/modules/evas/engines/wayland_shm/evas_engine.h +++ b/src/modules/evas/engines/wayland_shm/evas_engine.h @@ -136,7 +136,6 @@ struct _Outbuf Eina_Bool destination_alpha : 1; } priv; - Eina_Bool hidden : 1; Eina_Bool dirty : 1; }; @@ -150,7 +149,7 @@ void _evas_outbuf_idle_flush(Outbuf *ob); Render_Output_Swap_Mode _evas_outbuf_swap_mode_get(Outbuf *ob); int _evas_outbuf_rotation_get(Outbuf *ob); -void _evas_outbuf_reconfigure(Outbuf *ob, int w, int h, int rot, Outbuf_Depth depth, Eina_Bool alpha, Eina_Bool resize, Eina_Bool hidden); +void _evas_outbuf_reconfigure(Outbuf *ob, int w, int h, int rot, Outbuf_Depth depth, Eina_Bool alpha, Eina_Bool resize); void *_evas_outbuf_update_region_new(Outbuf *ob, int x, int y, int w, int h, int *cx, int *cy, int *cw, int *ch); void _evas_outbuf_update_region_push(Outbuf *ob, RGBA_Image *update, int x, int y, int w, int h); void _evas_outbuf_update_region_free(Outbuf *ob, RGBA_Image *update); diff --git a/src/modules/evas/engines/wayland_shm/evas_outbuf.c b/src/modules/evas/engines/wayland_shm/evas_outbuf.c index 20ec6e0bb2..dbc40ebf93 100644 --- a/src/modules/evas/engines/wayland_shm/evas_outbuf.c +++ b/src/modules/evas/engines/wayland_shm/evas_outbuf.c @@ -56,7 +56,6 @@ _evas_outbuf_setup(int w, int h, Evas_Engine_Info_Wayland *info) ob->rotation = info->info.rotation; ob->depth = info->info.depth; ob->priv.destination_alpha = info->info.destination_alpha; - ob->hidden = info->info.hidden; ob->ewd = info->info.wl2_display; /* default to triple buffer */ @@ -207,8 +206,6 @@ _evas_outbuf_flush(Outbuf *ob, Tilebuf_Rect *surface_damage EINA_UNUSED, Tilebuf LOGFN(__FILE__, __LINE__, __FUNCTION__); - if (ob->hidden) return; - if (render_mode == EVAS_RENDER_MODE_ASYNC_INIT) return; if (ob->priv.rect_count) free(ob->priv.rects); @@ -346,7 +343,7 @@ _evas_outbuf_rotation_get(Outbuf *ob) } void -_evas_outbuf_reconfigure(Outbuf *ob, int w, int h, int rot, Outbuf_Depth depth, Eina_Bool alpha, Eina_Bool resize, Eina_Bool hidden) +_evas_outbuf_reconfigure(Outbuf *ob, int w, int h, int rot, Outbuf_Depth depth, Eina_Bool alpha, Eina_Bool resize) { Eina_Bool dirty; @@ -358,8 +355,7 @@ _evas_outbuf_reconfigure(Outbuf *ob, int w, int h, int rot, Outbuf_Depth depth, if (!ob->dirty && (ob->w == w) && (ob->h == h) && (ob->rotation == rot) && (ob->depth == depth) && - (ob->priv.destination_alpha == alpha) && - (ob->hidden == hidden)) + (ob->priv.destination_alpha == alpha)) return; dirty = ob->dirty; @@ -370,7 +366,6 @@ _evas_outbuf_reconfigure(Outbuf *ob, int w, int h, int rot, Outbuf_Depth depth, ob->rotation = rot; ob->depth = depth; ob->priv.destination_alpha = alpha; - ob->hidden = hidden; if ((ob->rotation == 0) || (ob->rotation == 180)) { @@ -392,8 +387,6 @@ _evas_outbuf_update_region_new(Outbuf *ob, int x, int y, int w, int h, int *cx, LOGFN(__FILE__, __LINE__, __FUNCTION__); - if (ob->hidden) return NULL; - RECTS_CLIP_TO_RECT(x, y, w, h, 0, 0, ob->w, ob->h); if ((w <= 0) || (h <= 0)) return NULL; @@ -522,8 +515,6 @@ _evas_outbuf_update_region_push(Outbuf *ob, RGBA_Image *update, int x, int y, in /* check for pending writes */ if (!ob->priv.pending_writes) return; - if (ob->hidden) return; - if ((ob->rotation == 0) || (ob->rotation == 180)) { func = --
