From: Derek Foreman <derekf@osg.samsung.com>
Date: Thu, 30 Nov 2017 17:58:18 +0000 (-0600)
Subject: wayland_shm: move surface structure to evas_dmabuf.c
X-Git-Tag: submit/sandbox/upgrade/efl120/20180319.053334~1421
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e1031f5249f4b00367342b460df98f0855d939a4;p=platform%2Fupstream%2Fefl.git

wayland_shm: move surface structure to evas_dmabuf.c

This is no longer needed by the outbuf code.
---

diff --git a/src/modules/evas/engines/wayland_shm/evas_dmabuf.c b/src/modules/evas/engines/wayland_shm/evas_dmabuf.c
index 7a45265..77df4a7 100644
--- a/src/modules/evas/engines/wayland_shm/evas_dmabuf.c
+++ b/src/modules/evas/engines/wayland_shm/evas_dmabuf.c
@@ -7,6 +7,25 @@
 
 #include "linux-dmabuf-unstable-v1-client-protocol.h"
 
+typedef struct _Surface Surface;
+struct _Surface
+{
+   Ecore_Wl2_Window *wl2_win;
+   Ecore_Wl2_Buffer *current;
+   Eina_List *buffers;
+
+   int w, h;
+   Eina_Bool alpha : 1;
+   struct
+     {
+        void (*destroy)(Surface *surface);
+        void (*reconfigure)(Surface *surface, int w, int h, uint32_t flags, Eina_Bool force);
+        void *(*data_get)(Surface *surface, int *w, int *h);
+        int  (*assign)(Surface *surface);
+        void (*post)(Surface *surface, Eina_Rectangle *rects, unsigned int count);
+     } funcs;
+};
+
 static void
 _evas_dmabuf_surface_reconfigure(Surface *s, int w, int h, uint32_t flags EINA_UNUSED, Eina_Bool force)
 {
diff --git a/src/modules/evas/engines/wayland_shm/evas_engine.h b/src/modules/evas/engines/wayland_shm/evas_engine.h
index 0fd318f..bcf3971 100644
--- a/src/modules/evas/engines/wayland_shm/evas_engine.h
+++ b/src/modules/evas/engines/wayland_shm/evas_engine.h
@@ -73,23 +73,6 @@ extern int _evas_engine_way_shm_log_dom;
 # define MAX_BUFFERS 4
 
 typedef struct _Surface Surface;
-struct _Surface
-{
-   Ecore_Wl2_Window *wl2_win;
-   Ecore_Wl2_Buffer *current;
-   Eina_List *buffers;
-
-   int w, h;
-   Eina_Bool alpha : 1;
-   struct
-     {
-        void (*destroy)(Surface *surface);
-        void (*reconfigure)(Surface *surface, int w, int h, uint32_t flags, Eina_Bool force);
-        void *(*data_get)(Surface *surface, int *w, int *h);
-        int  (*assign)(Surface *surface);
-        void (*post)(Surface *surface, Eina_Rectangle *rects, unsigned int count);
-     } funcs;
-};
 
 struct _Outbuf
 {