summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c24
-rw-r--r--src/modules/evas/engines/wayland_egl/Evas_Engine_Wayland_Egl.h7
-rw-r--r--src/modules/evas/engines/wayland_egl/evas_wl_main.c6
3 files changed, 0 insertions, 37 deletions
diff --git a/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c b/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c
index fdfcc99..fd5b91c 100644
--- a/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c
+++ b/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c
@@ -1884,25 +1884,6 @@ _ecore_evas_wayland_window_get(const Ecore_Evas *ee)
1884 return wdata->win; 1884 return wdata->win;
1885} 1885}
1886 1886
1887#ifdef BUILD_ECORE_EVAS_WAYLAND_EGL
1888static void
1889_ecore_evas_wayland_pre_post_swap_callback_set(const Ecore_Evas *ee, void *data, void (*pre_cb) (void *data, Evas *e), void (*post_cb) (void *data, Evas *e))
1890{
1891 Evas_Engine_Info_Wayland_Egl *einfo;
1892
1893 if (!(!strcmp(ee->driver, "wayland_egl"))) return;
1894
1895 if ((einfo = (Evas_Engine_Info_Wayland_Egl *)evas_engine_info_get(ee->evas)))
1896 {
1897 einfo->callback.pre_swap = pre_cb;
1898 einfo->callback.post_swap = post_cb;
1899 einfo->callback.data = data;
1900 if (!evas_engine_info_set(ee->evas, (Evas_Engine_Info *)einfo))
1901 ERR("evas_engine_info_set() for engine '%s' failed.", ee->driver);
1902 }
1903}
1904#endif
1905
1906/* static void */ 1887/* static void */
1907/* _ecore_evas_wayland_pointer_set(Ecore_Evas *ee EINA_UNUSED, int hot_x EINA_UNUSED, int hot_y EINA_UNUSED) */ 1888/* _ecore_evas_wayland_pointer_set(Ecore_Evas *ee EINA_UNUSED, int hot_x EINA_UNUSED, int hot_y EINA_UNUSED) */
1908/* { */ 1889/* { */
@@ -1926,10 +1907,5 @@ _ecore_evas_wl_interface_new(void)
1926 iface->type_set = _ecore_evas_wayland_type_set; 1907 iface->type_set = _ecore_evas_wayland_type_set;
1927 iface->window2_get = _ecore_evas_wayland_window_get; 1908 iface->window2_get = _ecore_evas_wayland_window_get;
1928 1909
1929#ifdef BUILD_ECORE_EVAS_WAYLAND_EGL
1930 iface->pre_post_swap_callback_set =
1931 _ecore_evas_wayland_pre_post_swap_callback_set;
1932#endif
1933
1934 return iface; 1910 return iface;
1935} 1911}
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 a3f0e1a..97e81a8 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
@@ -19,13 +19,6 @@ struct _Evas_Engine_Info_Wayland_Egl
19 unsigned int destination_alpha : 1; 19 unsigned int destination_alpha : 1;
20 } info; 20 } info;
21 21
22 struct
23 {
24 void (*pre_swap) (void *data, Evas *evas);
25 void (*post_swap) (void *data, Evas *evas);
26 void *data;
27 } callback;
28
29 /* non-blocking or blocking mode */ 22 /* non-blocking or blocking mode */
30 Evas_Engine_Render_Mode render_mode; 23 Evas_Engine_Render_Mode render_mode;
31 24
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 c78be60..7885845 100644
--- a/src/modules/evas/engines/wayland_egl/evas_wl_main.c
+++ b/src/modules/evas/engines/wayland_egl/evas_wl_main.c
@@ -509,9 +509,6 @@ eng_outbuf_flush(Outbuf *ob, Tilebuf_Rect *surface_damage, Tilebuf_Rect *buffer_
509 ob->vsync = EINA_TRUE; 509 ob->vsync = EINA_TRUE;
510 } 510 }
511 511
512 if (ob->info->callback.pre_swap)
513 ob->info->callback.pre_swap(ob->info->callback.data, ob->evas);
514
515 if ((glsym_eglSwapBuffersWithDamage) && (surface_damage) && 512 if ((glsym_eglSwapBuffersWithDamage) && (surface_damage) &&
516 (ob->swap_mode != MODE_FULL)) 513 (ob->swap_mode != MODE_FULL))
517 { 514 {
@@ -535,9 +532,6 @@ eng_outbuf_flush(Outbuf *ob, Tilebuf_Rect *surface_damage, Tilebuf_Rect *buffer_
535 else 532 else
536 eglSwapBuffers(ob->egl_disp, ob->egl_surface[0]); 533 eglSwapBuffers(ob->egl_disp, ob->egl_surface[0]);
537 534
538 if (ob->info->callback.post_swap)
539 ob->info->callback.post_swap(ob->info->callback.data, ob->evas);
540
541 ob->frame_cnt++; 535 ob->frame_cnt++;
542 536
543 end: 537 end: