From 03838cbe19e25d31bc38e8f66bf0656737906783 Mon Sep 17 00:00:00 2001 From: SooChan Lim Date: Thu, 18 Jul 2019 11:15:45 +0900 Subject: [PATCH] e_hwc_window: remove the hwc parameter at e_hwc_window_init/deinit Change-Id: Idf8f6ec479b0e412a3fc9abfd8c2af5211024a7c --- src/bin/e_hwc.c | 4 ++-- src/bin/e_hwc_window.c | 14 ++------------ src/bin/e_hwc_window.h | 4 ++-- 3 files changed, 6 insertions(+), 16 deletions(-) diff --git a/src/bin/e_hwc.c b/src/bin/e_hwc.c index 2845607738..9ea75ff46c 100644 --- a/src/bin/e_hwc.c +++ b/src/bin/e_hwc.c @@ -380,7 +380,7 @@ e_hwc_new(E_Output *output) goto fail; } - if (!e_hwc_window_init(hwc)) + if (!e_hwc_window_init()) { EHERR("E_Hwc_Window init failed", hwc); goto fail; @@ -418,7 +418,7 @@ e_hwc_del(E_Hwc *hwc) else { e_hwc_windows_deinit(hwc); - e_hwc_window_deinit(hwc); + e_hwc_window_deinit(); e_hwc_window_queue_deinit(); } diff --git a/src/bin/e_hwc_window.c b/src/bin/e_hwc_window.c index 46c9eadb50..64386a1271 100644 --- a/src/bin/e_hwc_window.c +++ b/src/bin/e_hwc_window.c @@ -640,13 +640,8 @@ _e_hwc_window_commit_data_acquire_device(E_Hwc_Window *hwc_window) } EINTERN Eina_Bool -e_hwc_window_init(E_Hwc *hwc) +e_hwc_window_init(void) { - EINA_SAFETY_ON_NULL_RETURN_VAL(hwc, EINA_FALSE); - - if (e_hwc_policy_get(hwc) == E_HWC_POLICY_PLANES) - return EINA_FALSE; - E_LIST_HOOK_APPEND(hwc_window_client_hooks, E_CLIENT_HOOK_DEL, _e_hwc_window_client_cb_del, NULL); E_LIST_HANDLER_APPEND(hwc_window_event_hdlrs, E_EVENT_CLIENT_ZONE_SET, @@ -656,13 +651,8 @@ e_hwc_window_init(E_Hwc *hwc) } EINTERN void -e_hwc_window_deinit(E_Hwc *hwc) +e_hwc_window_deinit(void) { - EINA_SAFETY_ON_NULL_RETURN(hwc); - - if (e_hwc_policy_get(hwc) == E_HWC_POLICY_PLANES) - return; - E_FREE_LIST(hwc_window_client_hooks, e_client_hook_del); E_FREE_LIST(hwc_window_event_hdlrs, ecore_event_handler_del); } diff --git a/src/bin/e_hwc_window.h b/src/bin/e_hwc_window.h index 6652da209c..60813fd0f8 100644 --- a/src/bin/e_hwc_window.h +++ b/src/bin/e_hwc_window.h @@ -160,8 +160,8 @@ struct _E_Hwc_Window_Commit_Data { tdm_hwc_window_info info; }; -EINTERN Eina_Bool e_hwc_window_init(E_Hwc *hwc); -EINTERN void e_hwc_window_deinit(E_Hwc *hwc); // TODO: +EINTERN Eina_Bool e_hwc_window_init(void); +EINTERN void e_hwc_window_deinit(void); EINTERN E_Hwc_Window *e_hwc_window_new(E_Hwc *hwc, E_Client *ec, E_Hwc_Window_State state); EINTERN void e_hwc_window_free(E_Hwc_Window *hwc_window); -- 2.34.1