discomfitor pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=78688b226f2683f1c7438962ec419642c09e4d43

commit 78688b226f2683f1c7438962ec419642c09e4d43
Author: Derek Foreman <der...@osg.samsung.com>
Date:   Fri Apr 8 15:04:33 2016 -0500

    wayland_shm: Move Shm private structures into evas_shm
    
    Refactor all the shm specific stuff into evas_shm so it can better
    co-exist with upcoming dmabuf allocations
---
 src/modules/evas/engines/wayland_shm/evas_engine.h | 42 ---------------------
 src/modules/evas/engines/wayland_shm/evas_shm.c    | 44 ++++++++++++++++++++++
 2 files changed, 44 insertions(+), 42 deletions(-)

diff --git a/src/modules/evas/engines/wayland_shm/evas_engine.h 
b/src/modules/evas/engines/wayland_shm/evas_engine.h
index 341575e..880b878 100644
--- a/src/modules/evas/engines/wayland_shm/evas_engine.h
+++ b/src/modules/evas/engines/wayland_shm/evas_engine.h
@@ -71,49 +71,7 @@ extern int _evas_engine_way_shm_log_dom;
 
 # define MAX_BUFFERS 4
 
-typedef struct _Shm_Pool Shm_Pool;
-struct _Shm_Pool
-{
-   struct wl_shm_pool *pool;
-   size_t size, used;
-   void *data;
-};
-
-typedef struct _Shm_Data Shm_Data;
-struct _Shm_Data
-{
-   struct wl_buffer *buffer;
-   Shm_Pool *pool;
-   void *map;
-};
-
-typedef struct _Shm_Leaf Shm_Leaf;
-struct _Shm_Leaf
-{
-   int w, h, busy, age;
-   Shm_Data *data;
-   Shm_Pool *resize_pool;
-   Eina_Bool valid : 1;
-   Eina_Bool reconfigure : 1;
-   Eina_Bool drawn : 1;
-};
-
 typedef struct _Shm_Surface Shm_Surface;
-struct _Shm_Surface
-{
-   struct wl_display *disp;
-   struct wl_shm *shm;
-   struct wl_surface *surface;
-   int w, h;
-   int dx, dy;
-   int num_buff;
-   int compositor_version;
-
-   Shm_Leaf leaf[MAX_BUFFERS];
-   Shm_Leaf *current;
-
-   Eina_Bool alpha : 1;
-};
 
 struct _Outbuf
 {
diff --git a/src/modules/evas/engines/wayland_shm/evas_shm.c 
b/src/modules/evas/engines/wayland_shm/evas_shm.c
index 9a2f5bb..69e776f 100644
--- a/src/modules/evas/engines/wayland_shm/evas_shm.c
+++ b/src/modules/evas/engines/wayland_shm/evas_shm.c
@@ -31,6 +31,50 @@
 #include "evas_engine.h"
 #include <sys/mman.h>
 
+typedef struct _Shm_Pool Shm_Pool;
+struct _Shm_Pool
+{
+   struct wl_shm_pool *pool;
+   size_t size, used;
+   void *data;
+};
+
+typedef struct _Shm_Data Shm_Data;
+struct _Shm_Data
+{
+   struct wl_buffer *buffer;
+   Shm_Pool *pool;
+   void *map;
+};
+
+typedef struct _Shm_Leaf Shm_Leaf;
+struct _Shm_Leaf
+{
+   int w, h, busy, age;
+   Shm_Data *data;
+   Shm_Pool *resize_pool;
+   Eina_Bool valid : 1;
+   Eina_Bool reconfigure : 1;
+   Eina_Bool drawn : 1;
+};
+
+typedef struct _Shm_Surface Shm_Surface;
+struct _Shm_Surface
+{
+   struct wl_display *disp;
+   struct wl_shm *shm;
+   struct wl_surface *surface;
+   int w, h;
+   int dx, dy;
+   int num_buff;
+   int compositor_version;
+
+   Shm_Leaf leaf[MAX_BUFFERS];
+   Shm_Leaf *current;
+
+   Eina_Bool alpha : 1;
+};
+
 static Eina_Bool _shm_leaf_create(Shm_Surface *surface, Shm_Leaf *leaf, int w, 
int h);
 static void _shm_leaf_release(Shm_Leaf *leaf);
 static void _shm_leaf_destroy(Shm_Leaf *leaf);

-- 


Reply via email to