enlightenment/efl
enlightenment
/
efl
8
7
Fork 14
Code Issues 13 Pull Requests 1 Projects Releases Wiki Activity

wayland_shm: Stop using outbuf and engine info in surface code 

The surface stuff now no longer needs knowledge of those structures.
This commit is contained in:
Derek Foreman 2017-11-29 15:56:04 -06:00
parent 7eb0af45d6
commit 8a6c4fe5ff
3 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/modules/evas/engines/wayland_shm/evas_dmabuf.c
View File

@ -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);

4
src/modules/evas/engines/wayland_shm/evas_engine.h
View File

@ -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);

2
src/modules/evas/engines/wayland_shm/evas_outbuf.c
View File

@ -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);