From cdedf77bea20bd44b5dcb91369f0a34dd3fc8c8f Mon Sep 17 00:00:00 2001 From: SooChan Lim Date: Mon, 25 Nov 2024 17:51:03 +0900 Subject: [PATCH] e_hwc: move the symbols to internal header Move the unused symbols in public header for hwc to internal headers Change-Id: I2cdd4a0ad7777e62b51ffee6d40c101b4c4ed8f1 --- src/bin/compmgr/e_comp_canvas.c | 1 + src/bin/core/e_client.c | 1 + src/bin/core/e_view_edje.c | 1 + src/bin/displaymgr/e_hwc_intern.h | 138 ++++++++++++++ src/bin/displaymgr/e_hwc_window.c | 1 + src/bin/displaymgr/e_hwc_window_intern.h | 163 ++++++++++++++++- .../displaymgr/e_hwc_window_queue_intern.h | 2 +- src/bin/displaymgr/video/e_video_hwc.c | 1 + src/bin/server/e_comp_wl_tizen_hwc.c | 2 + src/bin/server/e_explicit_sync.c | 1 + src/bin/server/e_presentation_time.c | 1 + src/bin/windowmgr/e_pointer.c | 1 + src/include/e_hwc.h | 103 +---------- src/include/e_hwc_window.h | 170 +----------------- src/include/e_types.h | 35 ---- 15 files changed, 312 insertions(+), 309 deletions(-) diff --git a/src/bin/compmgr/e_comp_canvas.c b/src/bin/compmgr/e_comp_canvas.c index 6386703d8d..49068db4ce 100644 --- a/src/bin/compmgr/e_comp_canvas.c +++ b/src/bin/compmgr/e_comp_canvas.c @@ -10,6 +10,7 @@ #include "e_display_intern.h" #include "e_utils_intern.h" #include "e_view_intern.h" +#include "e_view_rect.h" #include "e_view_edje_intern.h" #include "e_policy_zone_intern.h" #include "e_policy_desk_intern.h" diff --git a/src/bin/core/e_client.c b/src/bin/core/e_client.c index 5c32abd65e..8d505e4ec0 100644 --- a/src/bin/core/e_client.c +++ b/src/bin/core/e_client.c @@ -25,6 +25,7 @@ #include "e_view_client_intern.h" #include "e_policy_zone_intern.h" #include "e_comp_canvas_intern.h" +#include "e_hwc_window_intern.h" #define PRI(ec) ((E_Client_Private *)e_object_data_get(E_OBJECT(ec))) diff --git a/src/bin/core/e_view_edje.c b/src/bin/core/e_view_edje.c index 6c500f5d9a..f07931f103 100644 --- a/src/bin/core/e_view_edje.c +++ b/src/bin/core/e_view_edje.c @@ -1,6 +1,7 @@ #include "e_view_edje_intern.h" #include "e_view_intern.h" #include "e_view_image.h" +#include "e_view_rect.h" #include "e_theme_intern.h" #include "e_comp_intern.h" #include "e_comp_object_intern.h" diff --git a/src/bin/displaymgr/e_hwc_intern.h b/src/bin/displaymgr/e_hwc_intern.h index 78c375aaaa..1e019ae89c 100644 --- a/src/bin/displaymgr/e_hwc_intern.h +++ b/src/bin/displaymgr/e_hwc_intern.h @@ -4,6 +4,144 @@ #include "e_intern.h" #include "e_hwc.h" +typedef struct _E_Hwc_Window_Buffer E_Hwc_Window_Buffer; +typedef struct _E_Hwc_Window_Target E_Hwc_Window_Target; +typedef struct _E_Hwc_Window_Update_Data E_Hwc_Window_Update_Data; +typedef struct _E_Hwc_Window_Commit_Data E_Hwc_Window_Commit_Data; + +typedef struct _E_Hwc_Window_Queue E_Hwc_Window_Queue; +typedef struct _E_Hwc_Window_Queue_Buffer E_Hwc_Window_Queue_Buffer; +typedef struct _E_Hwc_Window_Queue_Buffer_Ref E_Hwc_Window_Queue_Buffer_Ref; + +// struct of e_hwc_window_intern.h +struct _E_Hwc_Window_Buffer +{ + tbm_surface_h tsurface; + E_Hwc_Window_Queue *queue; + struct wl_listener queue_destroy_listener; + Eina_Bool from_queue; + int transform; +}; + +// struct of e_hwc_window_queue_intern.h +struct _E_Hwc_Window_Queue_Buffer_Ref +{ + E_Hwc_Window_Queue_Buffer *buffer; + struct wl_listener destroy_listener; +}; + +// struct of e_hwc_window.h +struct _E_Hwc_Window_Update_Data +{ + E_Comp_Wl_Buffer_Ref buffer_ref; + E_Hwc_Window_Queue_Buffer_Ref queue_buffer_ref; + E_Hwc_Window_Buffer buffer; + tdm_hwc_window_info info; + E_Hwc_Window *hwc_window; +}; + +#include "e_hwc_window_queue_intern.h" +#include "e_hwc_window_intern.h" + +struct _E_Hwc +{ + E_Output *output; + + E_Hwc_Policy hwc_policy; + E_Hwc_Mode hwc_mode; + Eina_Bool hwc_deactive : 1; // deactive hwc policy + + Ecore_Evas *ee; + Evas *evas; + + Eina_Bool primary_output; + + /* variables for hwc_windows policy */ + tdm_hwc *thwc; + Eina_Bool hwc_wins; + Eina_List *hwc_windows; + E_Hwc_Window_Target *target_hwc_window; + tbm_surface_queue_h target_buffer_queue; + E_Hwc_Window_Target *root_target_hwc_window; + Eina_Bool wait_commit; + Eina_List *visible_windows; + int num_visible_windows; + Eina_Bool re_evaluate; + Eina_Bool property_changed; + + void *gsurface; + int gsurface_width; + int gsurface_height; + int gsurface_format; + + /* capabilities */ + Eina_Bool tdm_hwc_video_stream; + Eina_Bool tdm_hwc_video_scale; + Eina_Bool tdm_hwc_video_transform; + Eina_Bool tdm_hwc_video_scanout; + + Eina_Bool intercept_pol; + + /* variables for pp at hwc_windows policy */ + tdm_pp *tpp; + tbm_surface_queue_h pp_tqueue; + E_Hwc_Window_Queue *pp_queue; + Eina_Bool pp_set; + Eina_Bool pp_commit; + Eina_Rectangle pp_src_rect, pp_dst_rect; + int pp_minw, pp_minh, pp_maxw, pp_maxh; + int pp_align; + int pp_align_vertical; + E_Hwc_Window *pp_hwc_window; + E_Hwc_Window_Update_Data pp_update; + + /* external output */ + Eina_Rectangle mirror_rect; + E_Hwc *mirror_src_hwc; + Eina_List *mirror_dst_hwc; + + Eina_Rectangle zoom_rect; + Eina_Bool zoom_enabled; + + int norender; + + /* for fps */ + double fps; + double old_fps; + double frametimes[122]; + double time; + double lapse; + int cframes; + int flapse; + + Eina_Bool present_sync; + + Eina_Bool tdm_hwc_fence; + int commit_fence_fd; + + Eina_List *wins_commit_data_list; + + Eina_List *sync_callback_list; + + int gbm_format; + + E_Hwc_Window *below_transparent_window; + + struct + { + int min_w; + int min_h; + int max_w; + int max_h; + } output_available; + + Eina_Bool comp_override; + + unsigned int restriction; + unsigned int changed; + Eina_List *changed_windows; +}; + struct _E_Hwc_Hook { EINA_INLIST; diff --git a/src/bin/displaymgr/e_hwc_window.c b/src/bin/displaymgr/e_hwc_window.c index a9ab6f88d9..e1ad172cb3 100644 --- a/src/bin/displaymgr/e_hwc_window.c +++ b/src/bin/displaymgr/e_hwc_window.c @@ -19,6 +19,7 @@ #include "e_blur_intern.h" #include "e_view_intern.h" #include "e_view_client_intern.h" +#include "e_output_intern.h" #include #include diff --git a/src/bin/displaymgr/e_hwc_window_intern.h b/src/bin/displaymgr/e_hwc_window_intern.h index d37e286db7..eec7c15735 100644 --- a/src/bin/displaymgr/e_hwc_window_intern.h +++ b/src/bin/displaymgr/e_hwc_window_intern.h @@ -2,7 +2,9 @@ #define E_HWC_WINDOW_INTERN_H #include "e_intern.h" -#include "e_hwc_window.h" +#include "e_hwc_intern.h" +#include "e_egl_sync_intern.h" +#include "e_view_rect.h" #define E_HWC_WINDOW_TYPE (int)0xE0b11003 #define E_HWC_WINDOW_ZPOS_NONE -999 @@ -20,11 +22,25 @@ } \ while (0) -typedef struct _E_Hwc_Window_Commit_Data E_Hwc_Window_Commit_Data; -typedef struct _E_Hwc_Window_Hook E_Hwc_Window_Hook; +typedef struct _E_Hwc_Window_Hook E_Hwc_Window_Hook; typedef void (*E_Hwc_Window_Hook_Cb) (void *data, E_Hwc_Window *hwc_window); +typedef enum _E_Hwc_Window_State +{ + E_HWC_WINDOW_STATE_NONE, + E_HWC_WINDOW_STATE_CLIENT, + E_HWC_WINDOW_STATE_DEVICE, + E_HWC_WINDOW_STATE_VIDEO, + E_HWC_WINDOW_STATE_CURSOR, +} E_Hwc_Window_State; + +typedef enum _E_Hwc_Window_Activation_State +{ + E_HWC_WINDOW_ACTIVATION_STATE_DEACTIVATED = 0, + E_HWC_WINDOW_ACTIVATION_STATE_ACTIVATED, +} E_Hwc_Window_Activation_State; + typedef enum { E_HWC_WINS_CHANGED_NONE = 0, @@ -67,6 +83,147 @@ typedef enum _E_Hwc_Window_Hook_Point E_HWC_WINDOW_HOOK_LAST } E_Hwc_Window_Hook_Point; +struct _E_Hwc_Window +{ + E_Object e_obj_inherit; + + E_Client *ec; + E_Object_Delfn *ec_delfn; + E_Hwc *hwc; + tdm_hwc_window *thwc_window; + int zpos; + Eina_Bool is_target; + Eina_Bool is_root_target; + Eina_Bool is_video; + Eina_Bool is_cursor; + Eina_Bool is_deleted; + Eina_Bool set_name; + + E_Hwc_Window_Activation_State activation_state; /* hwc_window has occupied the hw layer or not */ + + E_Hwc_Window_State state; + E_Hwc_Window_State accepted_state; + + E_Hwc_Window_Update_Data current; + Eina_List *pending_update_list; + + Eina_List *prop_list; + + E_Hwc_Window_Update_Data commit; + Eina_List *commit_data_list; + + /* current display information */ + E_Hwc_Window_Update_Data display; + + struct + { + int rotation; + E_Comp_Wl_Buffer *buffer; + void *img_ptr; + int img_w; + int img_h; + int img_stride; + } cursor; + struct wl_listener cursor_buffer_destroy_listener; + + struct + { + /* for fps */ + double fps; + double old_fps; + double frametimes[122]; + double time; + double lapse; + int cframes; + int flapse; + } fps; + + int constraints; + + E_Hwc_Window_Queue *queue; + struct wl_listener queue_destroy_listener; + + Eina_Bool render_target; + Eina_Bool on_rendered_target; + + unsigned int restriction; + + E_Presentation_Time_Container presentation_container; + + Eina_Bool present_sync; + + E_Hwc_Presentation_Callback_List pending_presentation_callbacks; + E_Hwc_Presentation_Callback_List presentation_callbacks; + + struct wayland_tbm_client_queue *cqueue; + + E_Zone *zone; + E_Object_Delfn *zone_delfn; + + E_View_Rect *below_transparent_view; + + Eina_Bool comp_override; + Eina_Bool never_hwc; + Eina_Bool visible_skip; + + struct wl_listener image_filter_set_listener; + struct wl_listener render_op_set_listener; + struct wl_listener content_type_set_listener; + struct wl_listener color_set_listener; + struct wl_listener color_visible_set_listener; + + Eina_Bool evas_visible; + Eina_Bool hwc_visible; + + Eina_Bool changed; + + // view listener + struct wl_listener show_listener; + struct wl_listener hide_listener; + struct wl_listener move_listener; + struct wl_listener resize_listener; + struct wl_listener restack_listener; + + struct wl_listener transparent_show_listener; + struct wl_listener transparent_hide_listener; + struct wl_listener transparent_move_listener; + struct wl_listener transparent_resize_listener; + struct wl_listener transparent_restack_listener; +}; + +struct _E_Hwc_Window_Target +{ + E_Hwc_Window hwc_window; /* don't move this field */ + E_Hwc *hwc; + + Ecore_Evas *ee; + Evas *evas; + int event_fd; + Ecore_Fd_Handler *event_hdlr; + + /* a surface the rendering is currently performing at */ + tbm_surface_h dequeued_tsurface; + Eina_List *rendering_tsurfaces; + Eina_List *rendered_windows; + Eina_Bool is_rendering; + + E_Hwc_Window_Queue *pp_queue; + struct wl_listener pp_queue_destroy_listener; + + E_Egl_Sync *end_render_sync; + + Eina_List *present_sync_windows; + Eina_List *pending_presentation_cb_wins; +}; + +struct _E_Hwc_Window_Commit_Data { + E_Hwc_Window *hwc_window; + E_Comp_Wl_Buffer_Ref buffer_ref; + E_Hwc_Window_Queue_Buffer_Ref queue_buffer_ref; + E_Hwc_Window_Buffer buffer; + tdm_hwc_window_info info; +}; + struct _E_Hwc_Window_Hook { EINA_INLIST; diff --git a/src/bin/displaymgr/e_hwc_window_queue_intern.h b/src/bin/displaymgr/e_hwc_window_queue_intern.h index 7425297efd..102413ea0f 100644 --- a/src/bin/displaymgr/e_hwc_window_queue_intern.h +++ b/src/bin/displaymgr/e_hwc_window_queue_intern.h @@ -2,7 +2,7 @@ #define E_HWC_WINDOW_QUEUE_INTERN_H #include "e_intern.h" -#include "e_hwc_window_intern.h" +#include "e_hwc_intern.h" #include #include diff --git a/src/bin/displaymgr/video/e_video_hwc.c b/src/bin/displaymgr/video/e_video_hwc.c index 9002d096b1..c3b37276e4 100644 --- a/src/bin/displaymgr/video/e_video_hwc.c +++ b/src/bin/displaymgr/video/e_video_hwc.c @@ -14,6 +14,7 @@ #include "e_compositor_intern.h" #include "e_view_client_intern.h" #include "e_hwc_windows_intern.h" +#include "e_hwc_intern.h" #include diff --git a/src/bin/server/e_comp_wl_tizen_hwc.c b/src/bin/server/e_comp_wl_tizen_hwc.c index eecf008665..29248bc1c2 100644 --- a/src/bin/server/e_comp_wl_tizen_hwc.c +++ b/src/bin/server/e_comp_wl_tizen_hwc.c @@ -3,9 +3,11 @@ #include "e_client_intern.h" #include "e_utils_intern.h" #include "e_error_intern.h" +#include "e_hwc_intern.h" #include "e_hwc_window_intern.h" #include "e_hwc_window_queue_intern.h" #include "e_compositor_intern.h" +#include "e_output_intern.h" #include diff --git a/src/bin/server/e_explicit_sync.c b/src/bin/server/e_explicit_sync.c index 21765ca6ad..68d16fa653 100644 --- a/src/bin/server/e_explicit_sync.c +++ b/src/bin/server/e_explicit_sync.c @@ -5,6 +5,7 @@ #include "e_egl_sync_intern.h" #include "e_client_intern.h" #include "e_display_intern.h" +#include "e_hwc_intern.h" #include #include diff --git a/src/bin/server/e_presentation_time.c b/src/bin/server/e_presentation_time.c index fdff2af19a..cbd0fb3b72 100644 --- a/src/bin/server/e_presentation_time.c +++ b/src/bin/server/e_presentation_time.c @@ -3,6 +3,7 @@ #include "e_client_intern.h" #include "e_comp_wl_intern.h" #include "e_utils_intern.h" +#include "e_output_intern.h" #include #include diff --git a/src/bin/windowmgr/e_pointer.c b/src/bin/windowmgr/e_pointer.c index 4579517299..14d724c154 100644 --- a/src/bin/windowmgr/e_pointer.c +++ b/src/bin/windowmgr/e_pointer.c @@ -6,6 +6,7 @@ #include "e_comp_wl_intern.h" #include "e_view_intern.h" #include "e_view_client_intern.h" +#include "e_output_intern.h" /* local variables */ static Eina_List *_ptrs = NULL; diff --git a/src/include/e_hwc.h b/src/include/e_hwc.h index 1c341f07d6..1a0227fc58 100644 --- a/src/include/e_hwc.h +++ b/src/include/e_hwc.h @@ -2,13 +2,14 @@ #define E_HWC_H #include -#include #include #include #define HWC_NAME_LEN 64 +typedef struct _E_Hwc E_Hwc; + typedef struct _E_Hwc_Sync_Callback E_Hwc_Sync_Callback; typedef struct _E_Hwc_Presentation_Callback E_Hwc_Presentation_Callback; typedef struct _E_Hwc_Presentation_Callback_List E_Hwc_Presentation_Callback_List; @@ -70,105 +71,6 @@ struct _E_Hwc_Presentation_Callback_List Eina_List *callbacks; }; -struct _E_Hwc -{ - E_Output *output; - - E_Hwc_Policy hwc_policy; - E_Hwc_Mode hwc_mode; - Eina_Bool hwc_deactive : 1; // deactive hwc policy - - Ecore_Evas *ee; - Evas *evas; - - Eina_Bool primary_output; - - /* variables for hwc_windows policy */ - tdm_hwc *thwc; - Eina_Bool hwc_wins; - Eina_List *hwc_windows; - E_Hwc_Window_Target *target_hwc_window; - tbm_surface_queue_h target_buffer_queue; - E_Hwc_Window_Target *root_target_hwc_window; - Eina_Bool wait_commit; - Eina_List *visible_windows; - int num_visible_windows; - Eina_Bool re_evaluate; - Eina_Bool property_changed; - - void *gsurface; - int gsurface_width; - int gsurface_height; - int gsurface_format; - - /* capabilities */ - Eina_Bool tdm_hwc_video_stream; - Eina_Bool tdm_hwc_video_scale; - Eina_Bool tdm_hwc_video_transform; - Eina_Bool tdm_hwc_video_scanout; - - Eina_Bool intercept_pol; - - /* variables for pp at hwc_windows policy */ - tdm_pp *tpp; - tbm_surface_queue_h pp_tqueue; - E_Hwc_Window_Queue *pp_queue; - Eina_Bool pp_set; - Eina_Bool pp_commit; - Eina_Rectangle pp_src_rect, pp_dst_rect; - int pp_minw, pp_minh, pp_maxw, pp_maxh; - int pp_align; - int pp_align_vertical; - E_Hwc_Window *pp_hwc_window; - E_Hwc_Window_Update_Data pp_update; - - /* external output */ - Eina_Rectangle mirror_rect; - E_Hwc *mirror_src_hwc; - Eina_List *mirror_dst_hwc; - - Eina_Rectangle zoom_rect; - Eina_Bool zoom_enabled; - - int norender; - - /* for fps */ - double fps; - double old_fps; - double frametimes[122]; - double time; - double lapse; - int cframes; - int flapse; - - Eina_Bool present_sync; - - Eina_Bool tdm_hwc_fence; - int commit_fence_fd; - - Eina_List *wins_commit_data_list; - - Eina_List *sync_callback_list; - - int gbm_format; - - E_Hwc_Window *below_transparent_window; - - struct - { - int min_w; - int min_h; - int max_w; - int max_h; - } output_available; - - Eina_Bool comp_override; - - unsigned int restriction; - unsigned int changed; - Eina_List *changed_windows; -}; - E_API extern int E_EVENT_HWC_ACTIVE; E_API extern int E_EVENT_HWC_DEACTIVE; @@ -196,7 +98,6 @@ E_API void e_hwc_mode_set(E_Hwc *hwc, E_Hwc_Mode mode); E_API E_Hwc_Mode e_hwc_mode_get(E_Hwc *hwc); E_API void e_hwc_deactive_set(E_Hwc *hwc, Eina_Bool set); E_API Eina_Bool e_hwc_deactive_get(E_Hwc *hwc); -E_API E_Output *e_hwc_output_get(E_Hwc *hwc); E_API E_Hwc_Policy e_hwc_hwc_policy_get(E_Hwc *hwc); #endif diff --git a/src/include/e_hwc_window.h b/src/include/e_hwc_window.h index c98b38898b..acc0780c32 100644 --- a/src/include/e_hwc_window.h +++ b/src/include/e_hwc_window.h @@ -1,174 +1,6 @@ #ifndef E_HWC_WINDOW_H #define E_HWC_WINDOW_H -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include -#include -#include - -typedef enum _E_Hwc_Window_State -{ - E_HWC_WINDOW_STATE_NONE, - E_HWC_WINDOW_STATE_CLIENT, - E_HWC_WINDOW_STATE_DEVICE, - E_HWC_WINDOW_STATE_VIDEO, - E_HWC_WINDOW_STATE_CURSOR, -} E_Hwc_Window_State; - -typedef enum _E_Hwc_Window_Activation_State -{ - E_HWC_WINDOW_ACTIVATION_STATE_DEACTIVATED = 0, - E_HWC_WINDOW_ACTIVATION_STATE_ACTIVATED, -} E_Hwc_Window_Activation_State; - -struct _E_Hwc_Window -{ - E_Object e_obj_inherit; - - E_Client *ec; - E_Object_Delfn *ec_delfn; - E_Hwc *hwc; - tdm_hwc_window *thwc_window; - int zpos; - Eina_Bool is_target; - Eina_Bool is_root_target; - Eina_Bool is_video; - Eina_Bool is_cursor; - Eina_Bool is_deleted; - Eina_Bool set_name; - - E_Hwc_Window_Activation_State activation_state; /* hwc_window has occupied the hw layer or not */ - - E_Hwc_Window_State state; - E_Hwc_Window_State accepted_state; - - E_Hwc_Window_Update_Data current; - Eina_List *pending_update_list; - - Eina_List *prop_list; - - E_Hwc_Window_Update_Data commit; - Eina_List *commit_data_list; - - /* current display information */ - E_Hwc_Window_Update_Data display; - - struct - { - int rotation; - E_Comp_Wl_Buffer *buffer; - void *img_ptr; - int img_w; - int img_h; - int img_stride; - } cursor; - struct wl_listener cursor_buffer_destroy_listener; - - struct - { - /* for fps */ - double fps; - double old_fps; - double frametimes[122]; - double time; - double lapse; - int cframes; - int flapse; - } fps; - - int constraints; - - E_Hwc_Window_Queue *queue; - struct wl_listener queue_destroy_listener; - - Eina_Bool render_target; - Eina_Bool on_rendered_target; - - unsigned int restriction; - - E_Presentation_Time_Container presentation_container; - - Eina_Bool present_sync; - - E_Hwc_Presentation_Callback_List pending_presentation_callbacks; - E_Hwc_Presentation_Callback_List presentation_callbacks; - - struct wayland_tbm_client_queue *cqueue; - - E_Zone *zone; - E_Object_Delfn *zone_delfn; - - E_View_Rect *below_transparent_view; - - Eina_Bool comp_override; - Eina_Bool never_hwc; - Eina_Bool visible_skip; - - struct wl_listener image_filter_set_listener; - struct wl_listener render_op_set_listener; - struct wl_listener content_type_set_listener; - struct wl_listener color_set_listener; - struct wl_listener color_visible_set_listener; - - Eina_Bool evas_visible; - Eina_Bool hwc_visible; - - Eina_Bool changed; - - // view listener - struct wl_listener show_listener; - struct wl_listener hide_listener; - struct wl_listener move_listener; - struct wl_listener resize_listener; - struct wl_listener restack_listener; - - struct wl_listener transparent_show_listener; - struct wl_listener transparent_hide_listener; - struct wl_listener transparent_move_listener; - struct wl_listener transparent_resize_listener; - struct wl_listener transparent_restack_listener; -}; - -struct _E_Hwc_Window_Target -{ - E_Hwc_Window hwc_window; /* don't move this field */ - E_Hwc *hwc; - - Ecore_Evas *ee; - Evas *evas; - int event_fd; - Ecore_Fd_Handler *event_hdlr; - - /* a surface the rendering is currently performing at */ - tbm_surface_h dequeued_tsurface; - Eina_List *rendering_tsurfaces; - Eina_List *rendered_windows; - Eina_Bool is_rendering; - - E_Hwc_Window_Queue *pp_queue; - struct wl_listener pp_queue_destroy_listener; - - E_Egl_Sync *end_render_sync; - - Eina_List *present_sync_windows; - Eina_List *pending_presentation_cb_wins; -}; - -struct _E_Hwc_Window_Commit_Data { - E_Hwc_Window *hwc_window; - E_Comp_Wl_Buffer_Ref buffer_ref; - E_Hwc_Window_Queue_Buffer_Ref queue_buffer_ref; - E_Hwc_Window_Buffer buffer; - tdm_hwc_window_info info; -}; +typedef struct _E_Hwc_Window E_Hwc_Window; #endif // E_HWC_WINDOW_H diff --git a/src/include/e_types.h b/src/include/e_types.h index eb5c7d18e7..8b9775b9ed 100644 --- a/src/include/e_types.h +++ b/src/include/e_types.h @@ -65,14 +65,6 @@ typedef struct _E_Client E_Client; // typedef struct _E_Desk E_Desk; // type of e_desk.h typedef struct _E_Zone E_Zone; // type of e_zone.h typedef struct _E_Output E_Output; // type of e_output.h -typedef struct _E_Hwc E_Hwc; // type of e_hwc.h -typedef struct _E_Hwc_Window E_Hwc_Window; // type of e_hwc_window.h -typedef struct _E_Hwc_Window_Buffer E_Hwc_Window_Buffer; // type of e_hwc_window.h -typedef struct _E_Hwc_Window_Target E_Hwc_Window_Target; // type of e_hwc_window.h -typedef struct _E_Hwc_Window_Update_Data E_Hwc_Window_Update_Data; // type of e_hwc_window.h -typedef struct _E_Hwc_Window_Queue E_Hwc_Window_Queue; // type of e_hwc_window_queue_intern.h -typedef struct _E_Hwc_Window_Queue_Buffer E_Hwc_Window_Queue_Buffer; // type of e_hwc_window_queue_intern.h -typedef struct _E_Hwc_Window_Queue_Buffer_Ref E_Hwc_Window_Queue_Buffer_Ref; // type of e_hwc_window_queue_intern.h typedef struct _E_Comp_Wl_Buffer E_Comp_Wl_Buffer; // type of e_comp_wl.h typedef struct _E_Comp_Wl_Buffer_Ref E_Comp_Wl_Buffer_Ref; // type of e_comp_wl.h typedef struct _E_Object E_Object; // type of e_object.h @@ -176,33 +168,6 @@ struct _E_Comp_Wl_Buffer_Ref struct wl_listener destroy_listener; }; -// struct of e_hwc_window_queue_intern.h -struct _E_Hwc_Window_Queue_Buffer_Ref -{ - E_Hwc_Window_Queue_Buffer *buffer; - struct wl_listener destroy_listener; -}; - -// struct of e_hwc_window.h -struct _E_Hwc_Window_Buffer -{ - tbm_surface_h tsurface; - E_Hwc_Window_Queue *queue; - struct wl_listener queue_destroy_listener; - Eina_Bool from_queue; - int transform; -}; - -// struct of e_hwc_window.h -struct _E_Hwc_Window_Update_Data -{ - E_Comp_Wl_Buffer_Ref buffer_ref; - E_Hwc_Window_Queue_Buffer_Ref queue_buffer_ref; - E_Hwc_Window_Buffer buffer; - tdm_hwc_window_info info; - E_Hwc_Window *hwc_window; -}; - struct _E_Object { int magic; -- 2.34.1