e_hwc_windows: Rename Buffer_Comp_Info to Comp_Info

Change-Id: Iaf4f2ec2e00e8a8450e4368db017ffbba2b3e012

diff --git a/src/bin/e_hwc_windows.c b/src/bin/e_hwc_windows.c
index 7512cdf73c35768fb288918aff4acad629021b89..119ac2d529fd0920ed3a35582d2f6c038b3f40ea 100644 (file)
--- a/src/bin/e_hwc_windows.c
+++ b/src/bin/e_hwc_windows.c
@@ -56,9 +56,9 @@
 
 #define ROUNDUP(s,c)        (((s) + (c-1)) & ~(c-1))
 
-typedef struct _E_Hwc_Windows_Buffer_Comp_Info E_Hwc_Windows_Buffer_Comp_Info;
+typedef struct _E_Hwc_Windows_Comp_Info E_Hwc_Windows_Comp_Info;
 
-struct _E_Hwc_Windows_Buffer_Comp_Info
+struct _E_Hwc_Windows_Comp_Info
 {
    E_Presentation_Time_Container presentation_container;
    Eina_Bool skip;
@@ -194,11 +194,11 @@ _e_hwc_windows_aligned_width_get(tbm_surface_h tsurface)
 }
 
 static void
-_e_hwc_windows_buffer_comp_info_free(void *data)
+_e_hwc_windows_comp_info_free(void *data)
 {
-   E_Hwc_Windows_Buffer_Comp_Info *comp_info;
+   E_Hwc_Windows_Comp_Info *comp_info;
 
-   comp_info = (E_Hwc_Windows_Buffer_Comp_Info *)data;
+   comp_info = (E_Hwc_Windows_Comp_Info *)data;
    if (!comp_info) return;
 
    e_presentation_time_container_finish(&comp_info->presentation_container);
@@ -206,23 +206,23 @@ _e_hwc_windows_buffer_comp_info_free(void *data)
    E_FREE(comp_info);
 }
 
-static E_Hwc_Windows_Buffer_Comp_Info *
-_e_hwc_windows_buffer_comp_info_get(tbm_surface_h tbm_surface)
+static E_Hwc_Windows_Comp_Info *
+_e_hwc_windows_comp_info_get(tbm_surface_h tbm_surface)
 {
-   E_Hwc_Windows_Buffer_Comp_Info *comp_info = NULL;
+   E_Hwc_Windows_Comp_Info *comp_info = NULL;
 
    tbm_surface_internal_get_user_data(tbm_surface, EHWS_BUFFER_COMP_INFO_KEY,
                                       (void**)&comp_info);
 
    if (comp_info) return comp_info;
 
-   comp_info = E_NEW(E_Hwc_Windows_Buffer_Comp_Info, 1);
+   comp_info = E_NEW(E_Hwc_Windows_Comp_Info, 1);
    EINA_SAFETY_ON_FALSE_RETURN_VAL(comp_info, NULL);
 
    e_presentation_time_container_init(&comp_info->presentation_container);
 
    tbm_surface_internal_add_user_data(tbm_surface, EHWS_BUFFER_COMP_INFO_KEY,
-                                     _e_hwc_windows_buffer_comp_info_free);
+                                     _e_hwc_windows_comp_info_free);
 
    tbm_surface_internal_set_user_data(tbm_surface, EHWS_BUFFER_COMP_INFO_KEY,
                                       comp_info);
@@ -237,14 +237,14 @@ _e_hwc_windows_presentation_feedback_take(E_Hwc_Window *hwc_window)
 
    if (hwc_window->is_target)
      {
-        E_Hwc_Windows_Buffer_Comp_Info *buffer_comp_info;
+        E_Hwc_Windows_Comp_Info *comp_info;
 
         if (!hwc_window->current.buffer.tsurface) return;
 
-        buffer_comp_info = _e_hwc_windows_buffer_comp_info_get(hwc_window->current.buffer.tsurface);
-        if (!buffer_comp_info) return;
+        comp_info = _e_hwc_windows_comp_info_get(hwc_window->current.buffer.tsurface);
+        if (!comp_info) return;
 
-        container = &buffer_comp_info->presentation_container;
+        container = &comp_info->presentation_container;
      }
    else
      {
@@ -497,7 +497,7 @@ _e_hwc_windows_target_window_buffer_skip(E_Hwc *hwc)
    E_Hwc_Window_Target *target_hwc_window;
    E_Hwc_Window *hwc_window = NULL;
    E_Hwc_Window_Queue_Buffer *queue_buffer;
-   E_Hwc_Windows_Buffer_Comp_Info *buffer_comp_info;
+   E_Hwc_Windows_Comp_Info *comp_info;
    tdm_hwc *thwc = NULL;
    tdm_region fb_damage;
 
@@ -515,10 +515,10 @@ _e_hwc_windows_target_window_buffer_skip(E_Hwc *hwc)
    if (hwc_window->current.buffer.tsurface &&
        hwc_window->current.buffer.tsurface != hwc_window->display.buffer.tsurface)
      {
-        buffer_comp_info = _e_hwc_windows_buffer_comp_info_get(hwc_window->current.buffer.tsurface);
-        if (buffer_comp_info)
+        comp_info = _e_hwc_windows_comp_info_get(hwc_window->current.buffer.tsurface);
+        if (comp_info)
           e_hwc_window_presentation_time_feedback_take(hwc_window,
-                                                       &buffer_comp_info->presentation_container);
+                                                       &comp_info->presentation_container);
 
         if (hwc_window->current.buffer.queue)
           {
@@ -553,7 +553,7 @@ _e_hwc_windows_target_buffer_fetch(E_Hwc *hwc)
    tdm_region fb_damage;
    Eina_List *rendered_windows = NULL;
    E_Hwc_Window_Queue_Buffer *queue_buffer = NULL;
-   E_Hwc_Windows_Buffer_Comp_Info *buffer_comp_info;
+   E_Hwc_Windows_Comp_Info *comp_info;
    E_Hwc_Window_Queue *queue;
    uint32_t n_thw = 0;
    const Eina_List *l;
@@ -592,11 +592,11 @@ _e_hwc_windows_target_buffer_fetch(E_Hwc *hwc)
         tsurface = queue_buffer->tsurface;
         EINA_SAFETY_ON_NULL_RETURN_VAL(tsurface, EINA_FALSE);
 
-        buffer_comp_info = _e_hwc_windows_buffer_comp_info_get(tsurface);
-        if ((buffer_comp_info) && (buffer_comp_info->skip))
+        comp_info = _e_hwc_windows_comp_info_get(tsurface);
+        if ((comp_info) && (comp_info->skip))
           {
              e_hwc_window_presentation_time_feedback_take(hwc_window,
-                                                          &buffer_comp_info->presentation_container);
+                                                          &comp_info->presentation_container);
              e_hwc_window_queue_buffer_release(queue, queue_buffer);
              return EINA_FALSE;
           }
@@ -662,12 +662,12 @@ _e_hwc_windows_target_buffer_fetch(E_Hwc *hwc)
              queue_buffer = e_hwc_window_queue_buffer_find(hwc_window->current.buffer.queue, hwc_window->current.buffer.tsurface);
              if (queue_buffer)
                {
-                  E_Hwc_Windows_Buffer_Comp_Info *buffer_comp_info;
+                  E_Hwc_Windows_Comp_Info *comp_info;
 
-                  buffer_comp_info = _e_hwc_windows_buffer_comp_info_get(hwc_window->current.buffer.tsurface);
-                  if (buffer_comp_info)
+                  comp_info = _e_hwc_windows_comp_info_get(hwc_window->current.buffer.tsurface);
+                  if (comp_info)
                     e_hwc_window_presentation_time_feedback_take(hwc_window,
-                                                                &buffer_comp_info->presentation_container);
+                                                                &comp_info->presentation_container);
 
                   e_hwc_window_queue_buffer_release(hwc_window->current.buffer.queue, queue_buffer);
                }
@@ -1060,30 +1060,30 @@ _e_hwc_windows_rendered_windows_free(void *data)
 }
 
 static Eina_Bool
-_e_hwc_windows_pending_update_data_enqueue(E_Hwc_Windows_Buffer_Comp_Info *buffer_comp_info)
+_e_hwc_windows_pending_update_data_enqueue(E_Hwc_Windows_Comp_Info *comp_info)
 {
    E_Hwc_Window_Update_Data *update;
 
-   EINA_SAFETY_ON_NULL_RETURN_VAL(buffer_comp_info, EINA_FALSE);
+   EINA_SAFETY_ON_NULL_RETURN_VAL(comp_info, EINA_FALSE);
 
-   EINA_LIST_FREE(buffer_comp_info->pending_update_list, update)
+   EINA_LIST_FREE(comp_info->pending_update_list, update)
      e_hwc_window_pending_update_data_enqueue(update->hwc_window, update);
 
-   buffer_comp_info->pending_update_list = NULL;
+   comp_info->pending_update_list = NULL;
 
    return EINA_TRUE;
 }
 
 static Eina_Bool
 _e_hwc_windows_pending_update_data_dequeue(E_Hwc_Window_Target *target_hwc_window,
-                                           E_Hwc_Windows_Buffer_Comp_Info *buffer_comp_info)
+                                           E_Hwc_Windows_Comp_Info *comp_info)
 {
    Eina_List *pending_update_list = NULL;
    E_Hwc_Window_Update_Data *update;
    E_Hwc_Window *hwc_window;
 
    EINA_SAFETY_ON_NULL_RETURN_VAL(target_hwc_window, EINA_FALSE);
-   EINA_SAFETY_ON_NULL_RETURN_VAL(buffer_comp_info, EINA_FALSE);
+   EINA_SAFETY_ON_NULL_RETURN_VAL(comp_info, EINA_FALSE);
 
    EINA_LIST_FREE(target_hwc_window->present_sync_windows, hwc_window)
      {
@@ -1100,10 +1100,10 @@ _e_hwc_windows_pending_update_data_dequeue(E_Hwc_Window_Target *target_hwc_windo
         e_object_unref(E_OBJECT(hwc_window));
      }
 
-   EINA_LIST_FREE(buffer_comp_info->pending_update_list, update)
+   EINA_LIST_FREE(comp_info->pending_update_list, update)
      e_hwc_window_pending_update_data_enqueue(update->hwc_window, update);
 
-   buffer_comp_info->pending_update_list = pending_update_list;
+   comp_info->pending_update_list = pending_update_list;
 
    return EINA_TRUE;
 }
@@ -1114,7 +1114,7 @@ _e_hwc_windows_pending_update_data_clear(E_Hwc_Window_Target *target_hwc_window)
    E_Hwc_Window *hwc_window;
    E_Hwc_Window_Update_Data *update;
    tbm_surface_h tsurface;
-   E_Hwc_Windows_Buffer_Comp_Info *buffer_comp_info;
+   E_Hwc_Windows_Comp_Info *comp_info;
    Eina_List *l, *ll;
 
    EINA_SAFETY_ON_NULL_RETURN_VAL(target_hwc_window, EINA_FALSE);
@@ -1127,10 +1127,10 @@ _e_hwc_windows_pending_update_data_clear(E_Hwc_Window_Target *target_hwc_window)
 
    EINA_LIST_FOREACH_SAFE(target_hwc_window->rendering_tsurfaces, l, ll, tsurface)
      {
-        buffer_comp_info = _e_hwc_windows_buffer_comp_info_get(tsurface);
-        if (!buffer_comp_info) continue;
+        comp_info = _e_hwc_windows_comp_info_get(tsurface);
+        if (!comp_info) continue;
 
-        EINA_LIST_FREE(buffer_comp_info->pending_update_list, update)
+        EINA_LIST_FREE(comp_info->pending_update_list, update)
           e_hwc_window_pending_update_data_dequeue_cancel(update->hwc_window, update);
      }
 
@@ -1143,7 +1143,7 @@ _e_hwc_windows_target_window_surface_queue_trace_cb(tbm_surface_queue_h surface_
         tbm_surface_h tsurface, tbm_surface_queue_trace trace, void *data)
 {
    E_Hwc_Window_Target *target_hwc_window = (E_Hwc_Window_Target *)data;
-   E_Hwc_Windows_Buffer_Comp_Info *buffer_comp_info;
+   E_Hwc_Windows_Comp_Info *comp_info;
 
    /* gets called as evas_renderer dequeues a new buffer from the queue */
    if (trace == TBM_SURFACE_QUEUE_TRACE_DEQUEUE)
@@ -1169,9 +1169,9 @@ _e_hwc_windows_target_window_surface_queue_trace_cb(tbm_surface_queue_h surface_
 
         if (e_hwc_windows_fence_enabled_get(target_hwc_window->hwc))
           {
-             buffer_comp_info = _e_hwc_windows_buffer_comp_info_get(target_hwc_window->dequeued_tsurface);
-             if (buffer_comp_info && buffer_comp_info->release_fence)
-               e_egl_sync_wait(buffer_comp_info->release_fence);
+             comp_info = _e_hwc_windows_comp_info_get(target_hwc_window->dequeued_tsurface);
+             if (comp_info && comp_info->release_fence)
+               e_egl_sync_wait(comp_info->release_fence);
           }
      }
 
@@ -1182,9 +1182,9 @@ _e_hwc_windows_target_window_surface_queue_trace_cb(tbm_surface_queue_h surface_
         target_hwc_window->rendering_tsurfaces =
           eina_list_remove(target_hwc_window->rendering_tsurfaces, tsurface);
 
-        buffer_comp_info = _e_hwc_windows_buffer_comp_info_get(tsurface);
-        if (buffer_comp_info)
-          _e_hwc_windows_pending_update_data_enqueue(buffer_comp_info);
+        comp_info = _e_hwc_windows_comp_info_get(tsurface);
+        if (comp_info)
+          _e_hwc_windows_pending_update_data_enqueue(comp_info);
      }
 
    /* tsurface has been released at the queue */
@@ -1199,9 +1199,9 @@ _e_hwc_windows_target_window_surface_queue_trace_cb(tbm_surface_queue_h surface_
         target_hwc_window->rendering_tsurfaces =
           eina_list_remove(target_hwc_window->rendering_tsurfaces, tsurface);
 
-        buffer_comp_info = _e_hwc_windows_buffer_comp_info_get(tsurface);
-        if (buffer_comp_info)
-          buffer_comp_info->skip = EINA_FALSE;
+        comp_info = _e_hwc_windows_comp_info_get(tsurface);
+        if (comp_info)
+          comp_info->skip = EINA_FALSE;
      }
 }
 
@@ -1403,7 +1403,7 @@ _e_hwc_windows_target_window_render_flush_post_cb(void *data, Evas *e EINA_UNUSE
    E_Hwc_Window *hwc_window = NULL;
    E_Comp_Wl_Buffer_Ref *buffer_ref = NULL;
    E_Comp_Wl_Buffer *buffer = NULL;
-   E_Hwc_Windows_Buffer_Comp_Info *buffer_comp_info;
+   E_Hwc_Windows_Comp_Info *comp_info;
    Eina_List *rendered_buffers = NULL;
    Eina_List *rendered_windows = NULL;
    Eina_List *visible_windows = NULL;
@@ -1440,11 +1440,11 @@ _e_hwc_windows_target_window_render_flush_post_cb(void *data, Evas *e EINA_UNUSE
           e_hwc_windows_rendered_window_add(hwc_window);
      }
 
-   buffer_comp_info = _e_hwc_windows_buffer_comp_info_get(target_hwc_window->dequeued_tsurface);
-   if (buffer_comp_info)
-     _e_hwc_windows_pending_update_data_dequeue(target_hwc_window, buffer_comp_info);
+   comp_info = _e_hwc_windows_comp_info_get(target_hwc_window->dequeued_tsurface);
+   if (comp_info)
+     _e_hwc_windows_pending_update_data_dequeue(target_hwc_window, comp_info);
    else
-     EHWSERR("fail to get buffer_comp_info tsurface:%p", target_hwc_window->hwc, target_hwc_window->dequeued_tsurface);
+     EHWSERR("fail to get comp_info tsurface:%p", target_hwc_window->hwc, target_hwc_window->dequeued_tsurface);
 
    fence_enabled = e_hwc_windows_fence_enabled_get(target_hwc_window->hwc);
 
@@ -1463,8 +1463,8 @@ _e_hwc_windows_target_window_render_flush_post_cb(void *data, Evas *e EINA_UNUSE
         if (!ec) continue;
 
         cdata = e_client_cdata_get(ec);
-        if (buffer_comp_info && cdata)
-          e_presentation_time_container_feedback_merge(&buffer_comp_info->presentation_container,
+        if (comp_info && cdata)
+          e_presentation_time_container_feedback_merge(&comp_info->presentation_container,
                                                        &cdata->presentation_container);
 
         buffer = e_pixmap_ref_resource_get(ec->pixmap);
@@ -3183,7 +3183,7 @@ _e_hwc_windows_release_fence_fd_update(E_Hwc *hwc)
    E_Hwc_Window *hwc_window;
    E_Hwc_Window_Target *target_hwc_window;
    E_Hwc_Window_Queue_Buffer *queue_buffer;
-   E_Hwc_Windows_Buffer_Comp_Info *comp_info;
+   E_Hwc_Windows_Comp_Info *comp_info;
    tdm_hwc_window **thwc_wins = NULL;
    int *release_fences = NULL;
    uint32_t num_thwc_wins = 0;
@@ -3197,7 +3197,7 @@ _e_hwc_windows_release_fence_fd_update(E_Hwc *hwc)
    if ((hwc_window->display.buffer.tsurface) && (hwc_window->display.buffer.queue) &&
        (hwc_window->display.buffer.tsurface != hwc_window->commit.buffer.tsurface))
      {
-        comp_info = _e_hwc_windows_buffer_comp_info_get(hwc_window->display.buffer.tsurface);
+        comp_info = _e_hwc_windows_comp_info_get(hwc_window->display.buffer.tsurface);
         EINA_SAFETY_ON_NULL_RETURN(comp_info);
 
         if (comp_info->release_fence)
@@ -3260,7 +3260,7 @@ _e_hwc_windows_pp_commit(E_Hwc *hwc)
 {
    E_Output *output = NULL;
    E_Hwc_Window_Queue_Buffer *queue_buffer = NULL;
-   E_Hwc_Windows_Buffer_Comp_Info *pp_buffer_comp_info, *buffer_comp_info;
+   E_Hwc_Windows_Comp_Info *pp_comp_info, *comp_info;
    tdm_error terror = TDM_ERROR_NONE;
    E_Client *ec;
    E_Comp_Wl_Client_Data *cdata;
@@ -3306,23 +3306,23 @@ _e_hwc_windows_pp_commit(E_Hwc *hwc)
    terror = tdm_pp_commit(hwc->tpp);
    EINA_SAFETY_ON_FALSE_GOTO(terror == TDM_ERROR_NONE, commit_fail);
 
-   pp_buffer_comp_info = _e_hwc_windows_buffer_comp_info_get(queue_buffer->tsurface);
-   if (pp_buffer_comp_info)
+   pp_comp_info = _e_hwc_windows_comp_info_get(queue_buffer->tsurface);
+   if (pp_comp_info)
      {
         if (hwc->pp_hwc_window)
           {
              ec = hwc->pp_hwc_window->ec;
              cdata = e_client_cdata_get(ec);
              if (ec && cdata)
-               e_presentation_time_container_feedback_merge(&pp_buffer_comp_info->presentation_container,
+               e_presentation_time_container_feedback_merge(&pp_comp_info->presentation_container,
                                                             &cdata->presentation_container);
           }
         else
           {
-             buffer_comp_info = _e_hwc_windows_buffer_comp_info_get(hwc->pp_buffer.tsurface);
-             if (buffer_comp_info)
-               e_presentation_time_container_feedback_merge(&pp_buffer_comp_info->presentation_container,
-                                                            &buffer_comp_info->presentation_container);
+             comp_info = _e_hwc_windows_comp_info_get(hwc->pp_buffer.tsurface);
+             if (comp_info)
+               e_presentation_time_container_feedback_merge(&pp_comp_info->presentation_container,
+                                                            &comp_info->presentation_container);
           }
      }
 
@@ -4247,7 +4247,7 @@ EINTERN Eina_Bool
 e_hwc_windows_present_sync(E_Hwc *hwc)
 {
    E_Hwc_Window_Target *target_hwc_window;
-   E_Hwc_Windows_Buffer_Comp_Info *buffer_comp_info;
+   E_Hwc_Windows_Comp_Info *comp_info;
    tbm_surface_h tsurface;
    Eina_List *l;
 
@@ -4261,10 +4261,10 @@ e_hwc_windows_present_sync(E_Hwc *hwc)
 
    EINA_LIST_FOREACH(target_hwc_window->rendering_tsurfaces, l, tsurface)
      {
-        buffer_comp_info = _e_hwc_windows_buffer_comp_info_get(tsurface);
-        if (!buffer_comp_info) continue;
+        comp_info = _e_hwc_windows_comp_info_get(tsurface);
+        if (!comp_info) continue;
 
-        buffer_comp_info->skip = EINA_TRUE;
+        comp_info->skip = EINA_TRUE;
      }
 
    e_hwc_window_queue_clear(((E_Hwc_Window *)target_hwc_window)->queue);