summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDerek Foreman <derekf@osg.samsung.com>2015-07-30 11:44:39 -0400
committerChris Michael <cp.michael@samsung.com>2015-07-30 11:44:39 -0400
commitf59f83810c8d1b6c68385272435f665127ff9bea (patch)
treec761108da4634f886e68bd2e062c17baae7cfb78
parentec48df78c3e13e70dd9685db468573c7e64639c1 (diff)
wayland-shm: remove _evas_shm_surface_swap()
Summary: It no longer does anything useful Reviewers: zmike, devilhorns Reviewed By: devilhorns Subscribers: cedric Differential Revision: https://phab.enlightenment.org/D2886
-rw-r--r--src/modules/evas/engines/wayland_shm/evas_engine.h2
-rw-r--r--src/modules/evas/engines/wayland_shm/evas_outbuf.c6
-rw-r--r--src/modules/evas/engines/wayland_shm/evas_shm.c11
3 files changed, 0 insertions, 19 deletions
diff --git a/src/modules/evas/engines/wayland_shm/evas_engine.h b/src/modules/evas/engines/wayland_shm/evas_engine.h
index f8406ae658..c55c860b66 100644
--- a/src/modules/evas/engines/wayland_shm/evas_engine.h
+++ b/src/modules/evas/engines/wayland_shm/evas_engine.h
@@ -79,7 +79,6 @@ struct _Shm_Surface
79 int w, h; 79 int w, h;
80 int dx, dy; 80 int dx, dy;
81 int num_buff; 81 int num_buff;
82 int last_buff;
83 int curr_buff; 82 int curr_buff;
84 83
85 Shm_Leaf leaf[MAX_BUFFERS]; 84 Shm_Leaf leaf[MAX_BUFFERS];
@@ -120,7 +119,6 @@ struct _Outbuf
120Shm_Surface *_evas_shm_surface_create(struct wl_shm *shm, struct wl_surface *surface, int w, int h, int num_buff, Eina_Bool alpha); 119Shm_Surface *_evas_shm_surface_create(struct wl_shm *shm, struct wl_surface *surface, int w, int h, int num_buff, Eina_Bool alpha);
121void _evas_shm_surface_destroy(Shm_Surface *surface); 120void _evas_shm_surface_destroy(Shm_Surface *surface);
122void _evas_shm_surface_reconfigure(Shm_Surface *surface, int dx, int dy, int w, int h, int num_buff, uint32_t flags); 121void _evas_shm_surface_reconfigure(Shm_Surface *surface, int dx, int dy, int w, int h, int num_buff, uint32_t flags);
123void _evas_shm_surface_swap(Shm_Surface *surface);
124void *_evas_shm_surface_data_get(Shm_Surface *surface, int *w, int *h); 122void *_evas_shm_surface_data_get(Shm_Surface *surface, int *w, int *h);
125void _evas_shm_surface_redraw(Shm_Surface *surface, Eina_Rectangle *rects, unsigned int count); 123void _evas_shm_surface_redraw(Shm_Surface *surface, Eina_Rectangle *rects, unsigned int count);
126 124
diff --git a/src/modules/evas/engines/wayland_shm/evas_outbuf.c b/src/modules/evas/engines/wayland_shm/evas_outbuf.c
index ad3182d62c..7d01c52dbf 100644
--- a/src/modules/evas/engines/wayland_shm/evas_outbuf.c
+++ b/src/modules/evas/engines/wayland_shm/evas_outbuf.c
@@ -164,9 +164,6 @@ _evas_outbuf_flush(Outbuf *ob, Tilebuf_Rect *rects EINA_UNUSED, Evas_Render_Mode
164 164
165 _evas_shm_surface_redraw(ob->surface, result, n); 165 _evas_shm_surface_redraw(ob->surface, result, n);
166 166
167 /* force a buffer swap */
168 _evas_shm_surface_swap(ob->surface);
169
170 /* clean array */ 167 /* clean array */
171 eina_array_clean(&ob->priv.onebuf_regions); 168 eina_array_clean(&ob->priv.onebuf_regions);
172 169
@@ -248,9 +245,6 @@ _evas_outbuf_flush(Outbuf *ob, Tilebuf_Rect *rects EINA_UNUSED, Evas_Render_Mode
248 } 245 }
249 246
250 _evas_shm_surface_redraw(ob->surface, result, n); 247 _evas_shm_surface_redraw(ob->surface, result, n);
251
252 /* force a buffer swap */
253 _evas_shm_surface_swap(ob->surface);
254 } 248 }
255} 249}
256 250
diff --git a/src/modules/evas/engines/wayland_shm/evas_shm.c b/src/modules/evas/engines/wayland_shm/evas_shm.c
index 7574a271a8..8a2e604c2c 100644
--- a/src/modules/evas/engines/wayland_shm/evas_shm.c
+++ b/src/modules/evas/engines/wayland_shm/evas_shm.c
@@ -404,17 +404,6 @@ _evas_shm_surface_reconfigure(Shm_Surface *surface, int dx, int dy, int w, int h
404 } 404 }
405} 405}
406 406
407void
408_evas_shm_surface_swap(Shm_Surface *surface)
409{
410 LOGFN(__FILE__, __LINE__, __FUNCTION__);
411
412 surface->last_buff = surface->curr_buff;
413
414 surface->dx = 0;
415 surface->dy = 0;
416}
417
418void * 407void *
419_evas_shm_surface_data_get(Shm_Surface *surface, int *w, int *h) 408_evas_shm_surface_data_get(Shm_Surface *surface, int *w, int *h)
420{ 409{