derekf pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=2071122f0116c359e4ceb83bb3f321dfb7727ead
commit 2071122f0116c359e4ceb83bb3f321dfb7727ead Author: Derek Foreman <[email protected]> Date: Mon Nov 13 15:04:29 2017 -0600 wayland_shm: rename Surface_Type to Ecore_Wl2_Buffer_Type --- src/modules/evas/engines/wayland_shm/evas_dmabuf.c | 8 ++++---- src/modules/evas/engines/wayland_shm/evas_engine.h | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/modules/evas/engines/wayland_shm/evas_dmabuf.c b/src/modules/evas/engines/wayland_shm/evas_dmabuf.c index 041b275243..ef0a4bb3d5 100644 --- a/src/modules/evas/engines/wayland_shm/evas_dmabuf.c +++ b/src/modules/evas/engines/wayland_shm/evas_dmabuf.c @@ -413,8 +413,8 @@ static Eina_Bool ecore_wl2_buffer_init(Ecore_Wl2_Buffer_Type types) { int fd; - Eina_Bool dmabuf = types & SURFACE_DMABUF; - Eina_Bool shm = types & SURFACE_SHM; + Eina_Bool dmabuf = types & ECORE_WL2_BUFFER_DMABUF; + Eina_Bool shm = types & ECORE_WL2_BUFFER_SHM; Eina_Bool success = EINA_FALSE; if (buffer_manager) @@ -751,9 +751,9 @@ _evas_dmabuf_surface_create(Surface *s, int w, int h, int num_buff) if (dmabuf_totally_hosed) return EINA_FALSE; if (ecore_wl2_display_shm_get(s->info->info.wl2_display)) - types |= SURFACE_SHM; + types |= ECORE_WL2_BUFFER_SHM; if (ecore_wl2_display_dmabuf_get(s->info->info.wl2_display)) - types |= SURFACE_DMABUF; + types |= ECORE_WL2_BUFFER_DMABUF; if (!(s->surf.dmabuf = calloc(1, sizeof(Dmabuf_Surface)))) return EINA_FALSE; surf = s->surf.dmabuf; diff --git a/src/modules/evas/engines/wayland_shm/evas_engine.h b/src/modules/evas/engines/wayland_shm/evas_engine.h index b9af2285bd..338b9ba2df 100644 --- a/src/modules/evas/engines/wayland_shm/evas_engine.h +++ b/src/modules/evas/engines/wayland_shm/evas_engine.h @@ -78,9 +78,9 @@ typedef struct _Dmabuf_Surface Dmabuf_Surface; typedef enum _Ecore_Wl2_Buffer_Type Ecore_Wl2_Buffer_Type; enum _Ecore_Wl2_Buffer_Type { - SURFACE_EMPTY, - SURFACE_SHM, - SURFACE_DMABUF + ECORE_WL2_BUFFER_NONE = 0, + ECORE_WL2_BUFFER_SHM = 1, + ECORE_WL2_BUFFER_DMABUF = 2 }; typedef struct _Surface Surface; --
