From 0cf0fe06bf5fae2ee30b96775d899173927f16c6 Mon Sep 17 00:00:00 2001 From: devilhorns Date: Wed, 4 Jul 2012 07:12:46 +0000 Subject: [PATCH] Evas (wayland_shm): Fix regression where resizing window down would leave artifacts. git-svn-id: http://svn.enlightenment.org/svn/e/trunk/evas@73253 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33 --- src/modules/engines/wayland_shm/evas_engine.c | 6 +++--- src/modules/engines/wayland_shm/evas_engine.h | 4 ---- src/modules/engines/wayland_shm/evas_outbuf.c | 6 ------ 3 files changed, 3 insertions(+), 13 deletions(-) diff --git a/src/modules/engines/wayland_shm/evas_engine.c b/src/modules/engines/wayland_shm/evas_engine.c index ac37ff9..dcf3aa1 100644 --- a/src/modules/engines/wayland_shm/evas_engine.c +++ b/src/modules/engines/wayland_shm/evas_engine.c @@ -261,9 +261,9 @@ eng_output_redraws_next_update_get(void *data, int *x, int *y, int *w, int *h, i re->rects = NULL; re->end = EINA_TRUE; } - /* if ((ux + uw) > re->ob->w) uw = re->ob->w - ux; */ - /* if ((uy + uh) > re->ob->h) uh = re->ob->h - uy; */ - /* if ((uw <= 0) || (uh <= 0)) return NULL; */ + if ((ux + uw) > re->ob->w) uw = re->ob->w - ux; + if ((uy + uh) > re->ob->h) uh = re->ob->h - uy; + if ((uw <= 0) || (uh <= 0)) return NULL; surface = re->outbuf_new_region_for_update(re->ob, ux, uy, uw, uh, cx, cy, cw, ch); if (x) *x = ux; diff --git a/src/modules/engines/wayland_shm/evas_engine.h b/src/modules/engines/wayland_shm/evas_engine.h index 8806207..8af227d 100644 --- a/src/modules/engines/wayland_shm/evas_engine.h +++ b/src/modules/engines/wayland_shm/evas_engine.h @@ -48,10 +48,6 @@ struct _Outbuf void *dest; RGBA_Image *buffer; - Eina_List *buffer_regions; - - Eina_List *pending_writes; - Eina_List *prev_pending_writes; Eina_Bool destination_alpha : 1; } priv; diff --git a/src/modules/engines/wayland_shm/evas_outbuf.c b/src/modules/engines/wayland_shm/evas_outbuf.c index 352b2c2..631304a 100644 --- a/src/modules/engines/wayland_shm/evas_outbuf.c +++ b/src/modules/engines/wayland_shm/evas_outbuf.c @@ -125,10 +125,6 @@ evas_outbuf_push_updated_region(Outbuf *ob, RGBA_Image *update, int x, int y, in bytes = ((w * sizeof(int)) * h); dest = (DATA32 *)((DATA8 *)(ob->priv.dest) + (y * bytes) + (x * 4)); - /* if (ob->func.new_update_region) */ - /* { */ - /* dest = ob->func.new_update_region(x, y, w, h, &bytes); */ - /* } */ if (!ob->priv.buffer) { @@ -148,8 +144,6 @@ evas_outbuf_push_updated_region(Outbuf *ob, RGBA_Image *update, int x, int y, in } } } - /* if (ob->func.free_update_region) */ - /* ob->func.free_update_region(x, y, w, h, dest); */ } void -- 2.7.4