forked from enlightenment/efl
wayland_egl: Rename surface to wl_surface
Making this code more closely match the wayland_shm engine
This commit is contained in:
parent
9e43a15526
commit
3f75c45122
|
@ -151,7 +151,7 @@ _ee_cb_sync_done(void *data, int type EINA_UNUSED, void *event EINA_UNUSED)
|
|||
einfo->info.display = ecore_wl2_display_get(wdata->display);
|
||||
einfo->info.destination_alpha = EINA_TRUE;
|
||||
einfo->info.rotation = ee->rotation;
|
||||
einfo->info.surface = ecore_wl2_window_surface_get(wdata->win);
|
||||
einfo->info.wl_surface = ecore_wl2_window_surface_get(wdata->win);
|
||||
|
||||
if (wdata->reset_pending)
|
||||
{
|
||||
|
@ -395,7 +395,7 @@ ecore_evas_wayland_egl_new_internal(const char *disp_name, unsigned int parent,
|
|||
einfo->info.destination_alpha = EINA_TRUE;
|
||||
einfo->info.rotation = ee->rotation;
|
||||
einfo->info.depth = 32;
|
||||
einfo->info.surface = ecore_wl2_window_surface_get(wdata->win);
|
||||
einfo->info.wl_surface = ecore_wl2_window_surface_get(wdata->win);
|
||||
if (!evas_engine_info_set(ee->evas, (Evas_Engine_Info *)einfo))
|
||||
{
|
||||
ERR("Failed to set Evas Engine Info for '%s'", ee->driver);
|
||||
|
@ -500,9 +500,9 @@ _ecore_evas_wl_show(Ecore_Evas *ee)
|
|||
struct wl_surface *surf;
|
||||
|
||||
surf = ecore_wl2_window_surface_get(wdata->win);
|
||||
if ((!einfo->info.surface) || (einfo->info.surface != surf))
|
||||
if ((!einfo->info.wl_surface) || (einfo->info.wl_surface != surf))
|
||||
{
|
||||
einfo->info.surface = surf;
|
||||
einfo->info.wl_surface = surf;
|
||||
evas_engine_info_set(ee->evas, (Evas_Engine_Info *)einfo);
|
||||
evas_damage_rectangle_add(ee->evas, 0, 0, ee->w + fw, ee->h + fh);
|
||||
}
|
||||
|
@ -543,7 +543,7 @@ _ecore_evas_wl_hide(Ecore_Evas *ee)
|
|||
einfo = (Evas_Engine_Info_Wayland_Egl *)evas_engine_info_get(ee->evas);
|
||||
if (einfo)
|
||||
{
|
||||
einfo->info.surface = NULL;
|
||||
einfo->info.wl_surface = NULL;
|
||||
evas_engine_info_set(ee->evas, (Evas_Engine_Info *)einfo);
|
||||
}
|
||||
|
||||
|
|
|
@ -13,7 +13,7 @@ struct _Evas_Engine_Info_Wayland_Egl
|
|||
struct
|
||||
{
|
||||
struct wl_display *display;
|
||||
struct wl_surface *surface;
|
||||
struct wl_surface *wl_surface;
|
||||
struct wl_egl_window *win;
|
||||
int depth, rotation, edges;
|
||||
unsigned int destination_alpha : 1;
|
||||
|
|
|
@ -283,7 +283,7 @@ evgl_eng_native_window_create(void *data)
|
|||
if (!(re = (Render_Engine *)data)) return NULL;
|
||||
if (!(ob = eng_get_ob(re))) return NULL;
|
||||
|
||||
if (!(win = wl_egl_window_create(ob->info->info.surface, 1, 1)))
|
||||
if (!(win = wl_egl_window_create(ob->info->info.wl_surface, 1, 1)))
|
||||
{
|
||||
ERR("Could not create wl_egl window");
|
||||
return NULL;
|
||||
|
@ -637,7 +637,7 @@ eng_setup(Evas *evas, void *info)
|
|||
re = epd->engine.data.output;
|
||||
ob = eng_get_ob(re);
|
||||
|
||||
if (!inf->info.surface && (ob->egl_surface[0] != EGL_NO_SURFACE))
|
||||
if (!inf->info.wl_surface && (ob->egl_surface[0] != EGL_NO_SURFACE))
|
||||
{
|
||||
eglDestroySurface(ob->egl_disp, ob->egl_surface[0]);
|
||||
eglMakeCurrent(ob->egl_disp, EGL_NO_SURFACE, EGL_NO_SURFACE,
|
||||
|
@ -650,7 +650,7 @@ eng_setup(Evas *evas, void *info)
|
|||
{
|
||||
ob->info = inf;
|
||||
if ((ob->info->info.display != ob->disp) ||
|
||||
(ob->info->info.surface != ob->surface) ||
|
||||
(ob->info->info.wl_surface != ob->surface) ||
|
||||
/* FIXME: comment out below line.
|
||||
* since there is no place set the info->info.win for now,
|
||||
* it causes renew the window unnecessarily.
|
||||
|
|
|
@ -33,7 +33,7 @@ eng_window_new(Evas *evas, Evas_Engine_Info_Wayland_Egl *einfo, int w, int h, Re
|
|||
if (display && (display != gw->disp))
|
||||
context = EGL_NO_CONTEXT;
|
||||
display = gw->disp;
|
||||
gw->surface = einfo->info.surface;
|
||||
gw->surface = einfo->info.wl_surface;
|
||||
gw->depth = einfo->info.depth;
|
||||
gw->alpha = einfo->info.destination_alpha;
|
||||
gw->rot = einfo->info.rotation;
|
||||
|
|
Loading…
Reference in New Issue