discomfitor pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=2c33bae2d51995a84a1a71b0fc9cdc8a5130de11

commit 2c33bae2d51995a84a1a71b0fc9cdc8a5130de11
Author: Derek Foreman <der...@osg.samsung.com>
Date:   Tue Apr 12 15:46:52 2016 -0500

    wayland_shm: Don't pass num_buff to reconfigure
    
    We can't really reconfigure the number of buffers after they're created,
    there's nothing above us that would try to do it...
---
 src/modules/evas/engines/wayland_shm/evas_engine.h | 2 +-
 src/modules/evas/engines/wayland_shm/evas_outbuf.c | 6 ++----
 src/modules/evas/engines/wayland_shm/evas_shm.c    | 3 +--
 3 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/src/modules/evas/engines/wayland_shm/evas_engine.h 
b/src/modules/evas/engines/wayland_shm/evas_engine.h
index 5c3d01c..75342e9 100644
--- a/src/modules/evas/engines/wayland_shm/evas_engine.h
+++ b/src/modules/evas/engines/wayland_shm/evas_engine.h
@@ -89,7 +89,7 @@ struct _Surface
    struct
      {
         void (*destroy)(Surface *surface);
-        void (*reconfigure)(Surface *surface, int w, int h, int num_buff, 
uint32_t flags);
+        void (*reconfigure)(Surface *surface, int w, int h, uint32_t flags);
         void *(*data_get)(Surface *surface, int *w, int *h);
         int  (*assign)(Surface *surface);
         void (*post)(Surface *surface, Eina_Rectangle *rects, unsigned int 
count);
diff --git a/src/modules/evas/engines/wayland_shm/evas_outbuf.c 
b/src/modules/evas/engines/wayland_shm/evas_outbuf.c
index 606cac1..7473e33 100644
--- a/src/modules/evas/engines/wayland_shm/evas_outbuf.c
+++ b/src/modules/evas/engines/wayland_shm/evas_outbuf.c
@@ -316,13 +316,11 @@ _evas_outbuf_reconfigure(Outbuf *ob, int w, int h, int 
rot, Outbuf_Depth depth,
 
    if ((ob->rotation == 0) || (ob->rotation == 180))
      {
-        ob->surface->funcs.reconfigure(ob->surface, w, h,
-                                       ob->num_buff, resize);
+        ob->surface->funcs.reconfigure(ob->surface, w, h, resize);
      }
    else if ((ob->rotation == 90) || (ob->rotation == 270))
      {
-        ob->surface->funcs.reconfigure(ob->surface, h, w,
-                                       ob->num_buff, resize);
+        ob->surface->funcs.reconfigure(ob->surface, h, w, 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 d73f391..6e8c711 100644
--- a/src/modules/evas/engines/wayland_shm/evas_shm.c
+++ b/src/modules/evas/engines/wayland_shm/evas_shm.c
@@ -411,7 +411,7 @@ _evas_shm_surface_destroy(Surface *surface)
 }
 
 void 
-_evas_shm_surface_reconfigure(Surface *s, int w, int h, int num_buff, uint32_t 
flags)
+_evas_shm_surface_reconfigure(Surface *s, int w, int h, uint32_t flags)
 {
    Shm_Surface *surface;
    int i = 0, resize = 0;
@@ -436,7 +436,6 @@ _evas_shm_surface_reconfigure(Surface *s, int w, int h, int 
num_buff, uint32_t f
 
    surface->w = w;
    surface->h = h;
-   surface->num_buff = num_buff;
 
    for (i = 0; i < surface->num_buff; i++)
      {

-- 


Reply via email to