From 7e2f5e759e2eaf00f3850b84aa39384b3d0acc42 Mon Sep 17 00:00:00 2001 From: Derek Foreman Date: Fri, 8 Apr 2016 14:51:40 -0500 Subject: [PATCH] wayland_shm: Remove flags We only used this for resize, and didn't actually even need it then. --- src/modules/evas/engines/wayland_shm/evas_engine.h | 2 -- src/modules/evas/engines/wayland_shm/evas_outbuf.c | 9 ++------- src/modules/evas/engines/wayland_shm/evas_shm.c | 4 +--- 3 files changed, 3 insertions(+), 12 deletions(-) diff --git a/src/modules/evas/engines/wayland_shm/evas_engine.h b/src/modules/evas/engines/wayland_shm/evas_engine.h index daea5df01e..341575e2bc 100644 --- a/src/modules/evas/engines/wayland_shm/evas_engine.h +++ b/src/modules/evas/engines/wayland_shm/evas_engine.h @@ -70,7 +70,6 @@ extern int _evas_engine_way_shm_log_dom; # include "Evas_Engine_Wayland_Shm.h" # define MAX_BUFFERS 4 -# define SURFACE_HINT_RESIZING 0x10 typedef struct _Shm_Pool Shm_Pool; struct _Shm_Pool @@ -105,7 +104,6 @@ struct _Shm_Surface struct wl_display *disp; struct wl_shm *shm; struct wl_surface *surface; - uint32_t flags; int w, h; int dx, dy; int num_buff; diff --git a/src/modules/evas/engines/wayland_shm/evas_outbuf.c b/src/modules/evas/engines/wayland_shm/evas_outbuf.c index 85fb15a698..f78fc8fcff 100644 --- a/src/modules/evas/engines/wayland_shm/evas_outbuf.c +++ b/src/modules/evas/engines/wayland_shm/evas_outbuf.c @@ -306,20 +306,15 @@ _evas_outbuf_reconfigure(Outbuf *ob, int x, int y, int w, int h, int rot, Outbuf ob->depth = depth; ob->priv.destination_alpha = alpha; - if (resize) - ob->surface->flags = SURFACE_HINT_RESIZING; - else - ob->surface->flags = 0; - if ((ob->rotation == 0) || (ob->rotation == 180)) { _evas_shm_surface_reconfigure(ob->surface, x, y, w, h, - ob->num_buff, ob->surface->flags); + ob->num_buff, resize); } else if ((ob->rotation == 90) || (ob->rotation == 270)) { _evas_shm_surface_reconfigure(ob->surface, x, y, h, w, - ob->num_buff, ob->surface->flags); + ob->num_buff, resize); } _evas_outbuf_idle_flush(ob); diff --git a/src/modules/evas/engines/wayland_shm/evas_shm.c b/src/modules/evas/engines/wayland_shm/evas_shm.c index 6fd8153b1a..9a2f5bb5f4 100644 --- a/src/modules/evas/engines/wayland_shm/evas_shm.c +++ b/src/modules/evas/engines/wayland_shm/evas_shm.c @@ -370,7 +370,6 @@ _evas_shm_surface_create(struct wl_display *disp, struct wl_shm *shm, struct wl_ surf->surface = surface; surf->num_buff = num_buff; surf->alpha = alpha; - surf->flags = 0; surf->compositor_version = compositor_version; /* create surface buffers */ @@ -410,7 +409,7 @@ _evas_shm_surface_reconfigure(Shm_Surface *surface, int dx, int dy, int w, int h LOGFN(__FILE__, __LINE__, __FUNCTION__); - resize = !!(flags & SURFACE_HINT_RESIZING); + resize = !!flags; for (; i < surface->num_buff; i++) { @@ -429,7 +428,6 @@ _evas_shm_surface_reconfigure(Shm_Surface *surface, int dx, int dy, int w, int h surface->h = h; surface->dx = dx; surface->dy = dy; - surface->flags = flags; surface->num_buff = num_buff; for (i = 0; i < surface->num_buff; i++)