From e1031f5249f4b00367342b460df98f0855d939a4 Mon Sep 17 00:00:00 2001 From: Derek Foreman Date: Thu, 30 Nov 2017 11:58:18 -0600 Subject: [PATCH] wayland_shm: move surface structure to evas_dmabuf.c This is no longer needed by the outbuf code. --- .../evas/engines/wayland_shm/evas_dmabuf.c | 19 +++++++++++++++++++ .../evas/engines/wayland_shm/evas_engine.h | 17 ----------------- 2 files changed, 19 insertions(+), 17 deletions(-) diff --git a/src/modules/evas/engines/wayland_shm/evas_dmabuf.c b/src/modules/evas/engines/wayland_shm/evas_dmabuf.c index 7a452650cd..77df4a7eb5 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 0fd318fde0..bcf3971702 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 {