From 100682f92280605387bb18d5dec8d8be4ae33e08 Mon Sep 17 00:00:00 2001 From: Changyeon Lee Date: Thu, 13 Aug 2020 19:07:48 +0900 Subject: [PATCH] e_hwc_window: change _e_hwc_window_buffer_set to EINTERN api Change-Id: If8a1f7e828c46563da5f10a6e8308b1f09e50738 --- src/bin/e_hwc_window.c | 36 +++++++++++++++--------------------- src/bin/e_hwc_window.h | 2 +- src/bin/e_hwc_windows.c | 6 +++--- 3 files changed, 19 insertions(+), 25 deletions(-) diff --git a/src/bin/e_hwc_window.c b/src/bin/e_hwc_window.c index abdbf6abf0..cdcb3dbe27 100644 --- a/src/bin/e_hwc_window.c +++ b/src/bin/e_hwc_window.c @@ -269,11 +269,13 @@ _e_hwc_window_buffer_cb_queue_destroy(struct wl_listener *listener, void *data) window_buffer->queue = NULL; } -static void -_e_hwc_window_buffer_set(E_Hwc_Window_Buffer *window_buffer, - tbm_surface_h tsurface, - E_Hwc_Window_Queue *queue) +EINTERN void +e_hwc_window_buffer_set(E_Hwc_Window_Buffer *window_buffer, + tbm_surface_h tsurface, + E_Hwc_Window_Queue *queue) { + EINA_SAFETY_ON_NULL_RETURN(window_buffer); + if (window_buffer->queue != queue) { if (window_buffer->queue_destroy_listener.notify) @@ -732,8 +734,8 @@ _e_hwc_window_commit_data_acquire_device(E_Hwc_Window *hwc_window) memcpy(&commit_data->info, &hwc_window->info, sizeof(tdm_hwc_window_info)); - _e_hwc_window_buffer_set(&commit_data->buffer, hwc_window->buffer.tsurface, - hwc_window->buffer.queue); + e_hwc_window_buffer_set(&commit_data->buffer, hwc_window->buffer.tsurface, + hwc_window->buffer.queue); tbm_surface_internal_ref(commit_data->buffer.tsurface); @@ -1361,9 +1363,9 @@ e_hwc_window_buffer_fetch(E_Hwc_Window *hwc_window) /* exist tsurface for update hwc_window */ if (tsurface) - _e_hwc_window_buffer_set(&hwc_window->buffer, tsurface, hwc_window->queue); + e_hwc_window_buffer_set(&hwc_window->buffer, tsurface, hwc_window->queue); else - _e_hwc_window_buffer_set(&hwc_window->buffer, NULL, NULL); + e_hwc_window_buffer_set(&hwc_window->buffer, NULL, NULL); error = tdm_hwc_window_set_buffer(thwc_window, hwc_window->buffer.tsurface); EINA_SAFETY_ON_TRUE_RETURN_VAL(error != TDM_ERROR_NONE, EINA_FALSE); @@ -1442,7 +1444,7 @@ e_hwc_window_commit_data_acquire(E_Hwc_Window *hwc_window) commit_data = E_NEW(E_Hwc_Window_Commit_Data, 1); EINA_SAFETY_ON_NULL_RETURN_VAL(commit_data, EINA_FALSE); - _e_hwc_window_buffer_set(&commit_data->buffer, NULL, NULL); + e_hwc_window_buffer_set(&commit_data->buffer, NULL, NULL); } EHWTRACE("COM ts:%10p ------- {%25s}, state:%s, zpos:%d, deleted:%s", @@ -1574,7 +1576,7 @@ e_hwc_window_commit_data_release(E_Hwc_Window *hwc_window) } e_comp_wl_buffer_reference(&hwc_window->display.buffer_ref, NULL); - _e_hwc_window_buffer_set(&hwc_window->display.buffer, NULL, NULL); + e_hwc_window_buffer_set(&hwc_window->display.buffer, NULL, NULL); CLEAR(hwc_window->display.info); } @@ -1600,7 +1602,7 @@ e_hwc_window_commit_data_release(E_Hwc_Window *hwc_window) e_comp_wl_buffer_reference(&hwc_window->display.buffer_ref, hwc_window->commit_data->buffer_ref.buffer); /* update hwc_window display info */ - _e_hwc_window_buffer_set(&hwc_window->display.buffer, tsurface, queue); + e_hwc_window_buffer_set(&hwc_window->display.buffer, tsurface, queue); memcpy(&hwc_window->display.info, &hwc_window->commit_data->info, sizeof(tdm_hwc_window_info)); @@ -1608,7 +1610,7 @@ e_hwc_window_commit_data_release(E_Hwc_Window *hwc_window) } e_comp_wl_buffer_reference(&hwc_window->commit_data->buffer_ref, NULL); - _e_hwc_window_buffer_set(&hwc_window->commit_data->buffer, NULL, NULL); + e_hwc_window_buffer_set(&hwc_window->commit_data->buffer, NULL, NULL); free(hwc_window->commit_data); hwc_window->commit_data = NULL; @@ -2192,14 +2194,6 @@ e_hwc_window_rendered_window_update(E_Hwc_Window *hwc_window) return EINA_TRUE; } -EINTERN void -e_hwc_window_buffer_set(E_Hwc_Window *hwc_window, tbm_surface_h tsurface, E_Hwc_Window_Queue *queue) -{ - EINA_SAFETY_ON_NULL_RETURN(hwc_window); - - _e_hwc_window_buffer_set(&hwc_window->buffer, tsurface,queue); -} - EINTERN void e_hwc_window_client_type_override(E_Hwc_Window *hwc_window) { @@ -2597,7 +2591,7 @@ e_hwc_window_pp_commit_data_acquire(E_Hwc_Window *hwc_window, Eina_Bool pp_hwc_m commit_data = E_NEW(E_Hwc_Window_Commit_Data, 1); EINA_SAFETY_ON_NULL_RETURN_VAL(commit_data, EINA_FALSE); - _e_hwc_window_buffer_set(&commit_data->buffer, NULL, NULL); + e_hwc_window_buffer_set(&commit_data->buffer, NULL, NULL); } } diff --git a/src/bin/e_hwc_window.h b/src/bin/e_hwc_window.h index 527762fb9e..30448d5156 100644 --- a/src/bin/e_hwc_window.h +++ b/src/bin/e_hwc_window.h @@ -213,7 +213,7 @@ EINTERN const char* e_hwc_window_restriction_string_get(E_Hwc_Window EINTERN Eina_Bool e_hwc_window_constraints_update(E_Hwc_Window *hwc_window); EINTERN void e_hwc_window_constraints_reset(E_Hwc_Window *hwc_window); EINTERN Eina_Bool e_hwc_window_rendered_window_update(E_Hwc_Window *hwc_window); -EINTERN void e_hwc_window_buffer_set(E_Hwc_Window *hwc_window, tbm_surface_h tsurface, E_Hwc_Window_Queue *queue); +EINTERN void e_hwc_window_buffer_set(E_Hwc_Window_Buffer *window_buffer, tbm_surface_h tsurface, E_Hwc_Window_Queue *queue); EINTERN const char *e_hwc_window_state_string_get(E_Hwc_Window_State hwc_window_state); EINTERN const char *e_hwc_window_name_get(E_Hwc_Window *hwc_window); EINTERN void e_hwc_window_name_set(E_Hwc_Window *hwc_window); diff --git a/src/bin/e_hwc_windows.c b/src/bin/e_hwc_windows.c index 740a1bf49f..ec7ccbd9aa 100644 --- a/src/bin/e_hwc_windows.c +++ b/src/bin/e_hwc_windows.c @@ -499,7 +499,7 @@ _e_hwc_windows_target_window_buffer_skip(E_Hwc *hwc, Eina_Bool tdm_set) e_hwc_window_queue_buffer_release(hwc_window->buffer.queue, queue_buffer); } - e_hwc_window_buffer_set(hwc_window, hwc_window->display.buffer.tsurface, hwc_window->display.buffer.queue); + e_hwc_window_buffer_set(&hwc_window->buffer, hwc_window->display.buffer.tsurface, hwc_window->display.buffer.queue); if (tdm_set) tdm_hwc_set_client_target_buffer(thwc, hwc_window->display.buffer.tsurface, fb_damage); @@ -575,7 +575,7 @@ _e_hwc_windows_target_buffer_fetch(E_Hwc *hwc, Eina_Bool tdm_set) e_hwc_window_queue_buffer_release(hwc_window->buffer.queue, queue_buffer); } - e_hwc_window_buffer_set(hwc_window, tsurface, hwc_window->queue); + e_hwc_window_buffer_set(&hwc_window->buffer, tsurface, hwc_window->queue); e_hwc_window_info_update(hwc_window); /* the damage isn't supported by hwc extension yet */ @@ -642,7 +642,7 @@ _e_hwc_windows_target_buffer_fetch(E_Hwc *hwc, Eina_Bool tdm_set) } } - e_hwc_window_buffer_set(hwc_window, NULL, NULL); + e_hwc_window_buffer_set(&hwc_window->buffer, NULL, NULL); e_hwc_window_info_update(hwc_window); CLEAR(fb_damage); -- 2.34.1