summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_egl.c10
-rw-r--r--src/modules/evas/engines/wayland_egl/Evas_Engine_Wayland_Egl.h2
-rw-r--r--src/modules/evas/engines/wayland_egl/evas_engine.c6
-rw-r--r--src/modules/evas/engines/wayland_egl/evas_wl_main.c2
4 files changed, 10 insertions, 10 deletions
diff --git a/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_egl.c b/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_egl.c
index 3b2ad37..1aae6dd 100644
--- a/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_egl.c
+++ b/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_egl.c
@@ -151,7 +151,7 @@ _ee_cb_sync_done(void *data, int type EINA_UNUSED, void *event EINA_UNUSED)
151 einfo->info.display = ecore_wl2_display_get(wdata->display); 151 einfo->info.display = ecore_wl2_display_get(wdata->display);
152 einfo->info.destination_alpha = EINA_TRUE; 152 einfo->info.destination_alpha = EINA_TRUE;
153 einfo->info.rotation = ee->rotation; 153 einfo->info.rotation = ee->rotation;
154 einfo->info.surface = ecore_wl2_window_surface_get(wdata->win); 154 einfo->info.wl_surface = ecore_wl2_window_surface_get(wdata->win);
155 155
156 if (wdata->reset_pending) 156 if (wdata->reset_pending)
157 { 157 {
@@ -395,7 +395,7 @@ ecore_evas_wayland_egl_new_internal(const char *disp_name, unsigned int parent,
395 einfo->info.destination_alpha = EINA_TRUE; 395 einfo->info.destination_alpha = EINA_TRUE;
396 einfo->info.rotation = ee->rotation; 396 einfo->info.rotation = ee->rotation;
397 einfo->info.depth = 32; 397 einfo->info.depth = 32;
398 einfo->info.surface = ecore_wl2_window_surface_get(wdata->win); 398 einfo->info.wl_surface = ecore_wl2_window_surface_get(wdata->win);
399 if (!evas_engine_info_set(ee->evas, (Evas_Engine_Info *)einfo)) 399 if (!evas_engine_info_set(ee->evas, (Evas_Engine_Info *)einfo))
400 { 400 {
401 ERR("Failed to set Evas Engine Info for '%s'", ee->driver); 401 ERR("Failed to set Evas Engine Info for '%s'", ee->driver);
@@ -500,9 +500,9 @@ _ecore_evas_wl_show(Ecore_Evas *ee)
500 struct wl_surface *surf; 500 struct wl_surface *surf;
501 501
502 surf = ecore_wl2_window_surface_get(wdata->win); 502 surf = ecore_wl2_window_surface_get(wdata->win);
503 if ((!einfo->info.surface) || (einfo->info.surface != surf)) 503 if ((!einfo->info.wl_surface) || (einfo->info.wl_surface != surf))
504 { 504 {
505 einfo->info.surface = surf; 505 einfo->info.wl_surface = surf;
506 evas_engine_info_set(ee->evas, (Evas_Engine_Info *)einfo); 506 evas_engine_info_set(ee->evas, (Evas_Engine_Info *)einfo);
507 evas_damage_rectangle_add(ee->evas, 0, 0, ee->w + fw, ee->h + fh); 507 evas_damage_rectangle_add(ee->evas, 0, 0, ee->w + fw, ee->h + fh);
508 } 508 }
@@ -543,7 +543,7 @@ _ecore_evas_wl_hide(Ecore_Evas *ee)
543 einfo = (Evas_Engine_Info_Wayland_Egl *)evas_engine_info_get(ee->evas); 543 einfo = (Evas_Engine_Info_Wayland_Egl *)evas_engine_info_get(ee->evas);
544 if (einfo) 544 if (einfo)
545 { 545 {
546 einfo->info.surface = NULL; 546 einfo->info.wl_surface = NULL;
547 evas_engine_info_set(ee->evas, (Evas_Engine_Info *)einfo); 547 evas_engine_info_set(ee->evas, (Evas_Engine_Info *)einfo);
548 } 548 }
549 549
diff --git a/src/modules/evas/engines/wayland_egl/Evas_Engine_Wayland_Egl.h b/src/modules/evas/engines/wayland_egl/Evas_Engine_Wayland_Egl.h
index 97e81a8..5541d1f 100644
--- a/src/modules/evas/engines/wayland_egl/Evas_Engine_Wayland_Egl.h
+++ b/src/modules/evas/engines/wayland_egl/Evas_Engine_Wayland_Egl.h
@@ -13,7 +13,7 @@ struct _Evas_Engine_Info_Wayland_Egl
13 struct 13 struct
14 { 14 {
15 struct wl_display *display; 15 struct wl_display *display;
16 struct wl_surface *surface; 16 struct wl_surface *wl_surface;
17 struct wl_egl_window *win; 17 struct wl_egl_window *win;
18 int depth, rotation, edges; 18 int depth, rotation, edges;
19 unsigned int destination_alpha : 1; 19 unsigned int destination_alpha : 1;
diff --git a/src/modules/evas/engines/wayland_egl/evas_engine.c b/src/modules/evas/engines/wayland_egl/evas_engine.c
index f50b9f8..146f3b2 100644
--- a/src/modules/evas/engines/wayland_egl/evas_engine.c
+++ b/src/modules/evas/engines/wayland_egl/evas_engine.c
@@ -283,7 +283,7 @@ evgl_eng_native_window_create(void *data)
283 if (!(re = (Render_Engine *)data)) return NULL; 283 if (!(re = (Render_Engine *)data)) return NULL;
284 if (!(ob = eng_get_ob(re))) return NULL; 284 if (!(ob = eng_get_ob(re))) return NULL;
285 285
286 if (!(win = wl_egl_window_create(ob->info->info.surface, 1, 1))) 286 if (!(win = wl_egl_window_create(ob->info->info.wl_surface, 1, 1)))
287 { 287 {
288 ERR("Could not create wl_egl window"); 288 ERR("Could not create wl_egl window");
289 return NULL; 289 return NULL;
@@ -637,7 +637,7 @@ eng_setup(Evas *evas, void *info)
637 re = epd->engine.data.output; 637 re = epd->engine.data.output;
638 ob = eng_get_ob(re); 638 ob = eng_get_ob(re);
639 639
640 if (!inf->info.surface && (ob->egl_surface[0] != EGL_NO_SURFACE)) 640 if (!inf->info.wl_surface && (ob->egl_surface[0] != EGL_NO_SURFACE))
641 { 641 {
642 eglDestroySurface(ob->egl_disp, ob->egl_surface[0]); 642 eglDestroySurface(ob->egl_disp, ob->egl_surface[0]);
643 eglMakeCurrent(ob->egl_disp, EGL_NO_SURFACE, EGL_NO_SURFACE, 643 eglMakeCurrent(ob->egl_disp, EGL_NO_SURFACE, EGL_NO_SURFACE,
@@ -650,7 +650,7 @@ eng_setup(Evas *evas, void *info)
650 { 650 {
651 ob->info = inf; 651 ob->info = inf;
652 if ((ob->info->info.display != ob->disp) || 652 if ((ob->info->info.display != ob->disp) ||
653 (ob->info->info.surface != ob->surface) || 653 (ob->info->info.wl_surface != ob->surface) ||
654 /* FIXME: comment out below line. 654 /* FIXME: comment out below line.
655 * since there is no place set the info->info.win for now, 655 * since there is no place set the info->info.win for now,
656 * it causes renew the window unnecessarily. 656 * it causes renew the window unnecessarily.
diff --git a/src/modules/evas/engines/wayland_egl/evas_wl_main.c b/src/modules/evas/engines/wayland_egl/evas_wl_main.c
index 7885845..04eeaff 100644
--- a/src/modules/evas/engines/wayland_egl/evas_wl_main.c
+++ b/src/modules/evas/engines/wayland_egl/evas_wl_main.c
@@ -33,7 +33,7 @@ eng_window_new(Evas *evas, Evas_Engine_Info_Wayland_Egl *einfo, int w, int h, Re
33 if (display && (display != gw->disp)) 33 if (display && (display != gw->disp))
34 context = EGL_NO_CONTEXT; 34 context = EGL_NO_CONTEXT;
35 display = gw->disp; 35 display = gw->disp;
36 gw->surface = einfo->info.surface; 36 gw->surface = einfo->info.wl_surface;
37 gw->depth = einfo->info.depth; 37 gw->depth = einfo->info.depth;
38 gw->alpha = einfo->info.destination_alpha; 38 gw->alpha = einfo->info.destination_alpha;
39 gw->rot = einfo->info.rotation; 39 gw->rot = einfo->info.rotation;