From 312c3c93711ba34ddf372b9512d2d7ae38284b26 Mon Sep 17 00:00:00 2001 From: SooChan Lim Date: Fri, 31 May 2024 15:51:38 +0900 Subject: [PATCH] e_server: move the init/deinit of e_explicit_sync to the e_server directory Change-Id: Ia3b04b1f5898e7420ea01adfe72f250e9b6f1274 --- src/bin/e_comp_screen.c | 6 ------ src/bin/server/e_server.c | 11 +++++++++++ src/bin/server/e_server_intern.h | 1 + 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/src/bin/e_comp_screen.c b/src/bin/e_comp_screen.c index 438851f..71b22d1 100644 --- a/src/bin/e_comp_screen.c +++ b/src/bin/e_comp_screen.c @@ -589,7 +589,6 @@ _e_comp_screen_deinit_outputs(E_Comp_Screen *e_comp_screen) e_output_del(output); } - e_explicit_sync_deinit(); e_egl_sync_deinit(); e_hwc_deinit(); e_hwc_windows_deinit(); @@ -1036,11 +1035,6 @@ e_comp_screen_init() ELOGF("E_EGL_SYNC", "Enabled the E_Egl_Sync", NULL); e_main_ts_end("\tE_Egl_Sync Init Done"); - e_main_ts_begin("\tE_Explicit_Sync Init"); - if (e_explicit_sync_init()) - ELOGF("EX-SYNC", "Enabled the E_Explicit_Sync", NULL); - e_main_ts_end("\tE_Explicit_Sync Init Done"); - e_main_ts_begin("\tE_Linux_Dmabuf Init"); e_linux_dmabuf_init(e_comp_wl->wl.disp); e_main_ts_end("\tE_Linux_Dmabuf Init Done"); diff --git a/src/bin/server/e_server.c b/src/bin/server/e_server.c index f1f15c8..6fd2af0 100644 --- a/src/bin/server/e_server.c +++ b/src/bin/server/e_server.c @@ -15,6 +15,7 @@ #include "e_blender_intern.h" #include "e_blur_intern.h" #include "e_foreign_intern.h" +#include "e_explicit_sync_intern.h" #include "e_tizen_screen_manager_intern.h" typedef struct _E_Server E_Server; @@ -43,6 +44,7 @@ struct _E_Server Dummy_Handle *tizen_blender_handle; Dummy_Handle *tizen_blur_manager_handle; Dummy_Handle *tizen_foreign_handle; + Dummy_Handle *explicit_sync_handle; E_Tizen_Screen_Manager *tizen_screen_manager; } handles; // feature handles }; @@ -95,6 +97,8 @@ e_server_init(void) e_server_feature_register(E_SERVER_FEATURE_TIZEN_BLUR_MANAGER, &dummy_handle); if (e_foreign_global_init(e_comp_wl->wl.disp)) e_server_feature_register(E_SERVER_FEATURE_TIZEN_FOREIGN, &dummy_handle); + if (e_explicit_sync_init()) + e_server_feature_register(E_SERVER_FEATURE_EXPLICIT_SYNC, &dummy_handle); e_server_feature_register(E_SERVER_FEATURE_TIZEN_SRCREEN_MANAGER, e_tizen_screen_manager_init()); @@ -104,6 +108,7 @@ e_server_init(void) EINTERN void e_server_shutdown(void) { + e_explicit_sync_deinit(); e_foreign_global_shutdown(); e_blur_manager_shutdown(); e_blender_shutdown(); @@ -183,6 +188,9 @@ e_server_feature_register(E_SERVER_FEATURE feature, void *handle) case E_SERVER_FEATURE_TIZEN_FOREIGN: g_server->handles.tizen_foreign_handle = handle; break; + case E_SERVER_FEATURE_EXPLICIT_SYNC: + g_server->handles.explicit_sync_handle = handle; + break; case E_SERVER_FEATURE_TIZEN_SRCREEN_MANAGER: g_server->handles.tizen_screen_manager = handle; break; @@ -249,6 +257,9 @@ e_server_feature_handle_get(E_SERVER_FEATURE feature) case E_SERVER_FEATURE_TIZEN_FOREIGN: handle = g_server->handles.tizen_foreign_handle; break; + case E_SERVER_FEATURE_EXPLICIT_SYNC: + handle = g_server->handles.explicit_sync_handle; + break; case E_SERVER_FEATURE_TIZEN_SRCREEN_MANAGER: handle = g_server->handles.tizen_screen_manager; break; diff --git a/src/bin/server/e_server_intern.h b/src/bin/server/e_server_intern.h index 38aeded..9d31cee 100644 --- a/src/bin/server/e_server_intern.h +++ b/src/bin/server/e_server_intern.h @@ -20,6 +20,7 @@ typedef enum _E_SERVER_FEATURE { E_SERVER_FEATURE_TIZEN_BLENDER, E_SERVER_FEATURE_TIZEN_BLUR_MANAGER, E_SERVER_FEATURE_TIZEN_FOREIGN, + E_SERVER_FEATURE_EXPLICIT_SYNC, E_SERVER_FEATURE_TIZEN_SRCREEN_MANAGER, E_SERVER_FEATURE_MAX } E_SERVER_FEATURE; -- 2.7.4