wl_egl_window_tizen_merge_sync_fds will be deprecated.

Change-Id: Idc4898f83829fe482d23fc8e862cd0d26b992e8c
Signed-off-by: Joonbum Ko <joonbum.ko@samsung.com>

diff --git a/src/tpl_wayland_egl_thread.c b/src/tpl_wayland_egl_thread.c
index 4c7f2f9..070273c 100755 (executable)
--- a/src/tpl_wayland_egl_thread.c
+++ b/src/tpl_wayland_egl_thread.c
@@ -1552,30 +1552,6 @@ __cb_create_presentation_sync_fd(struct wl_egl_window *wl_egl_window, void *priv
        return presentation_sync_fd;
 }
 
-static int
-__cb_merge_sync_fds(void *private, int sync_fd1, int sync_fd2)
-{
-       TPL_ASSERT(private);
-
-       struct tizen_private *tizen_private = (struct tizen_private *)private;
-       twe_wl_surf_source *surf_source = NULL;
-       tbm_fd merged_fd;
-
-       surf_source = (twe_wl_surf_source *)tizen_private->data;
-       if (!surf_source) {
-               TPL_ERR("Invalid parameter. twe_surface(%p)", surf_source);
-               return -1;
-       }
-
-       merged_fd = tbm_sync_fence_merge(NULL, sync_fd1, sync_fd2);
-
-       TPL_DEBUG("[FENCE_MERGE] surf_source(%p) fence1(%d) + fence2(%d) = merged(%d)",
-                         surf_source, sync_fd1, sync_fd2, merged_fd);
-
-       return merged_fd;
-}
-
-
 static void __cb_tss_flusher_flush_callback(void *data,
                struct tizen_surface_shm_flusher *tss_flusher)
 {
@@ -3333,7 +3309,6 @@ twe_surface_add(twe_thread* thread,
                                __cb_set_window_serial_callback;
                        private->create_commit_sync_fd = (void *)__cb_create_commit_sync_fd;
                        private->create_presentation_sync_fd = (void *)__cb_create_presentation_sync_fd;
-                       private->merge_sync_fds = (void *)__cb_merge_sync_fds;
 
                        wl_egl_window->destroy_window_callback = (void *)__cb_destroy_callback;
                        wl_egl_window->resize_callback = (void *)__cb_resize_callback;

diff --git a/src/wayland-egl-tizen/wayland-egl-tizen.h b/src/wayland-egl-tizen/wayland-egl-tizen.h
index 921b193..206f632 100644 (file)
--- a/src/wayland-egl-tizen/wayland-egl-tizen.h
+++ b/src/wayland-egl-tizen/wayland-egl-tizen.h
@@ -120,6 +120,11 @@ int
 wl_egl_window_tizen_create_presentation_sync_fd(struct wl_egl_window *egl_window);
 
 /**
+ * [DEPRECATED]
+ * The commit_sync_fd and presentation_sync_fd have been modified
+ *  to do not use sync_timeline.
+ * Therefore, this merge function cannot be used.
+ *
  * Get a new fence fd with fence1 and fence2 merged
  *
  * It returns a new fence fd waiting for both fences to be signaled.