wayland_shm: Stop using outbuf and engine info in surface code

The surface stuff now no longer needs knowledge of those structures.

diff --git a/src/modules/evas/engines/wayland_shm/evas_dmabuf.c b/src/modules/evas/engines/wayland_shm/evas_dmabuf.c
index 0ac182b..0208d89 100644 (file)
--- a/src/modules/evas/engines/wayland_shm/evas_dmabuf.c
+++ b/src/modules/evas/engines/wayland_shm/evas_dmabuf.c
@@ -169,7 +169,7 @@ _evas_dmabuf_surface_destroy(Surface *s)
 }
 
 Surface *
-_evas_surface_create(Ecore_Wl2_Window *win, Eina_Bool alpha, Evas_Engine_Info_Wayland *info, Outbuf *ob)
+_evas_surface_create(Ecore_Wl2_Window *win, Eina_Bool alpha)
 {
    Surface *out = NULL;
    Dmabuf_Surface *surf = NULL;
@@ -178,8 +178,6 @@ _evas_surface_create(Ecore_Wl2_Window *win, Eina_Bool alpha, Evas_Engine_Info_Wa
 
    out = calloc(1, sizeof(*out));
    if (!out) return NULL;
-   out->info = info;
-   out->ob = ob;
    out->wl2_win = win;
 
    ewd = ecore_wl2_window_display_get(win);

diff --git a/src/modules/evas/engines/wayland_shm/evas_engine.h b/src/modules/evas/engines/wayland_shm/evas_engine.h
index 8154259..a93f18b 100644 (file)
--- a/src/modules/evas/engines/wayland_shm/evas_engine.h
+++ b/src/modules/evas/engines/wayland_shm/evas_engine.h
@@ -77,10 +77,8 @@ typedef struct _Dmabuf_Surface Dmabuf_Surface;
 typedef struct _Surface Surface;
 struct _Surface
 {
-   Outbuf *ob;
    Ecore_Wl2_Window *wl2_win;
    Dmabuf_Surface *dmabuf;
-   Evas_Engine_Info_Wayland *info;
    struct
      {
         void (*destroy)(Surface *surface);
@@ -125,7 +123,7 @@ struct _Outbuf
    Eina_Bool dirty : 1;
 };
 
-Surface *_evas_surface_create(Ecore_Wl2_Window *win, Eina_Bool alpha, Evas_Engine_Info_Wayland *info, Outbuf *ob);
+Surface *_evas_surface_create(Ecore_Wl2_Window *win, Eina_Bool alpha);
 
 Outbuf *_evas_outbuf_setup(int w, int h, Evas_Engine_Info_Wayland *info);
 void _evas_outbuf_free(Outbuf *ob);

diff --git a/src/modules/evas/engines/wayland_shm/evas_outbuf.c b/src/modules/evas/engines/wayland_shm/evas_outbuf.c
index cfb3384..43ce340 100644 (file)
--- a/src/modules/evas/engines/wayland_shm/evas_outbuf.c
+++ b/src/modules/evas/engines/wayland_shm/evas_outbuf.c
@@ -29,7 +29,7 @@ _evas_outbuf_setup(int w, int h, Evas_Engine_Info_Wayland *info)
    ob->ewd = ecore_wl2_window_display_get(info->info.wl2_win);
 
    ob->surface = _evas_surface_create(info->info.wl2_win,
-                                      ob->priv.destination_alpha, info, ob);
+                                      ob->priv.destination_alpha);
    if (!ob->surface) goto surf_err;
 
    eina_array_step_set(&ob->priv.onebuf_regions, sizeof(Eina_Array), 8);