summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_egl.c17
1 files changed, 8 insertions, 9 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 b9fa475529..88366306c5 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
@@ -118,7 +118,7 @@ static Eina_Bool
118_ee_cb_sync_done(void *data, int type EINA_UNUSED, void *event EINA_UNUSED) 118_ee_cb_sync_done(void *data, int type EINA_UNUSED, void *event EINA_UNUSED)
119{ 119{
120 Ecore_Evas *ee; 120 Ecore_Evas *ee;
121 Evas_Engine_Info_Wayland_Shm *einfo; 121 Evas_Engine_Info_Wayland_Egl *einfo;
122 Ecore_Evas_Engine_Wl_Data *wdata; 122 Ecore_Evas_Engine_Wl_Data *wdata;
123 123
124 ee = data; 124 ee = data;
@@ -126,13 +126,12 @@ _ee_cb_sync_done(void *data, int type EINA_UNUSED, void *event EINA_UNUSED)
126 if (wdata->sync_done) return ECORE_CALLBACK_PASS_ON; 126 if (wdata->sync_done) return ECORE_CALLBACK_PASS_ON;
127 wdata->sync_done = EINA_TRUE; 127 wdata->sync_done = EINA_TRUE;
128 128
129 if ((einfo = (Evas_Engine_Info_Wayland_Shm *)evas_engine_info_get(ee->evas))) 129 if ((einfo = (Evas_Engine_Info_Wayland_Egl *)evas_engine_info_get(ee->evas)))
130 { 130 {
131 einfo->info.wl_disp = ecore_wl2_display_get(wdata->display); 131 einfo->info.display = ecore_wl2_display_get(wdata->display);
132 einfo->info.wl_shm = ecore_wl2_display_shm_get(wdata->display);
133 einfo->info.destination_alpha = EINA_TRUE; 132 einfo->info.destination_alpha = EINA_TRUE;
134 einfo->info.rotation = ee->rotation; 133 einfo->info.rotation = ee->rotation;
135 einfo->info.wl_surface = ecore_wl2_window_surface_get(wdata->win); 134 einfo->info.surface = ecore_wl2_window_surface_get(wdata->win);
136 135
137 if (!evas_engine_info_set(ee->evas, (Evas_Engine_Info *)einfo)) 136 if (!evas_engine_info_set(ee->evas, (Evas_Engine_Info *)einfo))
138 { 137 {
@@ -159,15 +158,15 @@ _ee_cb_sync_done(void *data, int type EINA_UNUSED, void *event EINA_UNUSED)
159 if (wdata->win) 158 if (wdata->win)
160 { 159 {
161 160
162 einfo = (Evas_Engine_Info_Wayland_Shm *)evas_engine_info_get(ee->evas); 161 einfo = (Evas_Engine_Info_Wayland_Egl *)evas_engine_info_get(ee->evas);
163 if (einfo) 162 if (einfo)
164 { 163 {
165 struct wl_surface *surf; 164 struct wl_surface *surf;
166 165
167 surf = ecore_wl2_window_surface_get(wdata->win); 166 surf = ecore_wl2_window_surface_get(wdata->win);
168 if ((!einfo->info.wl_surface) || (einfo->info.wl_surface != surf)) 167 if ((!einfo->info.surface) || (einfo->info.surface != surf))
169 { 168 {
170 einfo->info.wl_surface = surf; 169 einfo->info.surface = surf;
171 evas_engine_info_set(ee->evas, (Evas_Engine_Info *)einfo); 170 evas_engine_info_set(ee->evas, (Evas_Engine_Info *)einfo);
172 evas_damage_rectangle_add(ee->evas, 0, 0, ee->w + fw, ee->h + fh); 171 evas_damage_rectangle_add(ee->evas, 0, 0, ee->w + fw, ee->h + fh);
173 } 172 }
@@ -371,7 +370,7 @@ ecore_evas_wayland_egl_new_internal(const char *disp_name, unsigned int parent,
371 (Ecore_Event_Multi_Down_Cb)_ecore_evas_mouse_multi_down_process, 370 (Ecore_Event_Multi_Down_Cb)_ecore_evas_mouse_multi_down_process,
372 (Ecore_Event_Multi_Up_Cb)_ecore_evas_mouse_multi_up_process); 371 (Ecore_Event_Multi_Up_Cb)_ecore_evas_mouse_multi_up_process);
373 372
374 ecore_event_handler_add(ECORE_WL2_EVENT_SYNC_DONER, _ee_cb_sync_done, ee); 373 ecore_event_handler_add(ECORE_WL2_EVENT_SYNC_DONE, _ee_cb_sync_done, ee);
375 374
376 return ee; 375 return ee;
377 376