rvandegrift
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

wayland evas engines: rename wayland display to wl_display 

Continuing to make the shm and egl engines closer to eachother.
This commit is contained in:
Derek Foreman 2016-11-01 12:07:10 -05:00
parent 3f75c45122
commit 54cf6dac4a
8 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_egl.c
View File

@ -128,7 +128,7 @@ _ee_egl_display_unset(Ecore_Evas *ee)
Ecore_Evas_Engine_Wl_Data *wdata;
einfo = (Evas_Engine_Info_Wayland_Egl *)evas_engine_info_get(ee->evas);
einfo->info.display = NULL;
einfo->info.wl_display = NULL;
wdata = ee->engine.data;
wdata->regen_objs = _evas_canvas_image_data_unset(ecore_evas_get(ee));
evas_engine_info_set(ee->evas, (Evas_Engine_Info *)einfo);
@ -148,7 +148,7 @@ _ee_cb_sync_done(void *data, int type EINA_UNUSED, void *event EINA_UNUSED)
if ((einfo = (Evas_Engine_Info_Wayland_Egl *)evas_engine_info_get(ee->evas)))
{
einfo->info.display = ecore_wl2_display_get(wdata->display);
einfo->info.wl_display = ecore_wl2_display_get(wdata->display);
einfo->info.destination_alpha = EINA_TRUE;
einfo->info.rotation = ee->rotation;
einfo->info.wl_surface = ecore_wl2_window_surface_get(wdata->win);
@ -391,7 +391,7 @@ ecore_evas_wayland_egl_new_internal(const char *disp_name, unsigned int parent,
wdata->sync_done = EINA_TRUE;
if ((einfo = (Evas_Engine_Info_Wayland_Egl *)evas_engine_info_get(ee->evas)))
{
einfo->info.display = ecore_wl2_display_get(ewd);
einfo->info.wl_display = ecore_wl2_display_get(ewd);
einfo->info.destination_alpha = EINA_TRUE;
einfo->info.rotation = ee->rotation;
einfo->info.depth = 32;

4
src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_shm.c
View File

@ -133,7 +133,7 @@ _ee_cb_sync_done(void *data, int type EINA_UNUSED, void *event EINA_UNUSED)
if ((einfo = (Evas_Engine_Info_Wayland_Shm *)evas_engine_info_get(ee->evas)))
{
ecore_evas_manual_render_set(ee, 0);
einfo->info.wl_disp = ecore_wl2_display_get(wdata->display);
einfo->info.wl_display = ecore_wl2_display_get(wdata->display);
einfo->info.wl_dmabuf = ecore_wl2_display_dmabuf_get(wdata->display);
einfo->info.wl_shm = ecore_wl2_display_shm_get(wdata->display);
einfo->info.compositor_version = ecore_wl2_display_compositor_version_get(wdata->display);
@ -316,7 +316,7 @@ ecore_evas_wayland_shm_new_internal(const char *disp_name, unsigned int parent,
wdata->sync_done = EINA_TRUE;
if ((einfo = (Evas_Engine_Info_Wayland_Shm *)evas_engine_info_get(ee->evas)))
{
einfo->info.wl_disp = ecore_wl2_display_get(ewd);
einfo->info.wl_display = ecore_wl2_display_get(ewd);
einfo->info.wl_dmabuf = ecore_wl2_display_dmabuf_get(ewd);
einfo->info.wl_shm = ecore_wl2_display_shm_get(ewd);
einfo->info.destination_alpha = EINA_TRUE;

2
src/modules/evas/engines/wayland_egl/Evas_Engine_Wayland_Egl.h
View File

@ -12,7 +12,7 @@ struct _Evas_Engine_Info_Wayland_Egl
/* engine specific data & parameters it needs to set up */
struct
{
struct wl_display *display;
struct wl_display *wl_display;
struct wl_surface *wl_surface;
struct wl_egl_window *win;
int depth, rotation, edges;

4
src/modules/evas/engines/wayland_egl/evas_engine.c
View File

@ -649,7 +649,7 @@ eng_setup(Evas *evas, void *info)
if ((ob) && (_re_wincheck(ob)))
{
ob->info = inf;
if ((ob->info->info.display != ob->disp) ||
if ((ob->info->info.wl_display != ob->disp) ||
(ob->info->info.wl_surface != ob->surface) ||
/* FIXME: comment out below line.
* since there is no place set the info->info.win for now,
@ -660,7 +660,7 @@ eng_setup(Evas *evas, void *info)
(ob->info->info.destination_alpha != ob->alpha))
{
gl_wins--;
if (!ob->info->info.display)
if (!ob->info->info.wl_display)
{
eng_window_free(re->generic.software.ob);
re->generic.software.ob = NULL;

2
src/modules/evas/engines/wayland_egl/evas_wl_main.c
View File

@ -29,7 +29,7 @@ eng_window_new(Evas *evas, Evas_Engine_Info_Wayland_Egl *einfo, int w, int h, Re
gw->w = w;
gw->h = h;
gw->swap_mode = swap_mode;
gw->disp = einfo->info.display;
gw->disp = einfo->info.wl_display;
if (display && (display != gw->disp))
context = EGL_NO_CONTEXT;
display = gw->disp;

2
src/modules/evas/engines/wayland_shm/Evas_Engine_Wayland_Shm.h
View File

@ -21,7 +21,7 @@ struct _Evas_Engine_Info_Wayland_Shm
Eina_Bool destination_alpha : 1;
int edges;
struct wl_display *wl_disp;
struct wl_display *wl_display;
int compositor_version;
} info;

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

@ -701,7 +701,7 @@ _evas_dmabuf_surface_create(Surface *s, int w, int h, int num_buff)
surf = s->surf.dmabuf;
surf->surface = s;
surf->wl_display = s->info->info.wl_disp;
surf->wl_display = s->info->info.wl_display;
surf->dmabuf = s->info->info.wl_dmabuf;
surf->wl_surface = s->info->info.wl_surface;
surf->alpha = s->info->info.destination_alpha;

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

@ -585,7 +585,7 @@ _evas_shm_surface_create(Surface *s, int w, int h, int num_buff)
surf->w = w;
surf->h = h;
surf->disp = s->info->info.wl_disp;
surf->disp = s->info->info.wl_display;
surf->shm = s->info->info.wl_shm;
surf->surface = s->info->info.wl_surface;
surf->num_buff = num_buff;