e_hwc_windows: add wayland_tbm_client_queue to debug info of hwc_window

Change-Id: I5df1244baa54365e246f582655d5e647b2f4c4fd

diff --git a/src/bin/e_hwc_window.c b/src/bin/e_hwc_window.c
index f0e7d3162e6220da57c8ba607d2dd0c93d9a6ff7..8f09d48f51b12076b5f70f076099586ce1c2fac5 100644 (file)
--- a/src/bin/e_hwc_window.c
+++ b/src/bin/e_hwc_window.c
@@ -160,15 +160,18 @@ _e_hwc_window_comp_wl_buffer_get(E_Hwc_Window *hwc_window)
 }
 
 struct wayland_tbm_client_queue *
-_get_wayland_tbm_client_queue(E_Client *ec)
+e_hwc_window_wayland_tbm_client_queue_get(E_Hwc_Window *hwc_window)
 {
    struct wayland_tbm_client_queue * cqueue = NULL;
    struct wl_resource *wl_surface = NULL;
    E_Comp_Wl_Data *wl_cdata = (E_Comp_Wl_Data *)e_comp->wl_comp_data;
    E_Comp_Wl_Client_Data *cdata;
+   E_Client *ec;
 
    EINA_SAFETY_ON_NULL_RETURN_VAL(wl_cdata, NULL);
+   EINA_SAFETY_ON_NULL_RETURN_VAL(hwc_window, NULL);
 
+   ec = hwc_window->ec;
    if (!ec) return NULL;
 
    cdata = e_pixmap_cdata_get(ec->pixmap);
@@ -303,7 +306,7 @@ _e_hwc_window_buffer_queue_set(E_Hwc_Window *hwc_window)
    E_Hwc_Window_Queue *queue = NULL;
    struct wayland_tbm_client_queue *cqueue = NULL;
 
-   cqueue = _get_wayland_tbm_client_queue(hwc_window->ec);
+   cqueue = e_hwc_window_wayland_tbm_client_queue_get(hwc_window);
    EINA_SAFETY_ON_NULL_RETURN_VAL(cqueue, EINA_FALSE);
 
    queue = e_hwc_window_queue_user_set(hwc_window);
@@ -1872,7 +1875,7 @@ e_hwc_window_activate(E_Hwc_Window *hwc_window, E_Hwc_Window_Queue *queue)
         queue_height = tbm_surface_queue_get_height(queue->tqueue);
      }
 
-   cqueue = _get_wayland_tbm_client_queue(hwc_window->ec);
+   cqueue = e_hwc_window_wayland_tbm_client_queue_get(hwc_window);
    if (cqueue)
      {
         wayland_tbm_server_client_queue_activate(cqueue, 0, queue_size,

diff --git a/src/bin/e_hwc_window.h b/src/bin/e_hwc_window.h
index 0859b626f1fb5a36da2a8f3ab544b9d21d44d960..dac53d2a75937ff80349be1c80b51cddbfb28bde 100644 (file)
--- a/src/bin/e_hwc_window.h
+++ b/src/bin/e_hwc_window.h
@@ -267,5 +267,7 @@ EINTERN Eina_Bool                 e_hwc_window_presentation_callback_pending_set
 EINTERN Eina_Bool                 e_hwc_window_presentation_callback_take(E_Hwc_Window *hwc_window, E_Hwc_Presentation_Callback_List *list);
 EINTERN Eina_Bool                 e_hwc_window_presentation_callback_call(E_Hwc_Window *hwc_window);
 
+struct wayland_tbm_client_queue  *e_hwc_window_wayland_tbm_client_queue_get(E_Hwc_Window *hwc_window);
+
 #endif // E_HWC_WINDOW_H
 #endif

diff --git a/src/bin/e_hwc_windows.c b/src/bin/e_hwc_windows.c
index 1b97bd367332f3690e84042c5078e44930353813..e9db90bc4a00f067f27469733549916b5918c775 100644 (file)
--- a/src/bin/e_hwc_windows.c
+++ b/src/bin/e_hwc_windows.c
@@ -4060,13 +4060,13 @@ _e_hwc_windows_window_debug_info_get(Eldbus_Message_Iter *iter, E_Hwc_Wins_Debug
 
         eldbus_message_iter_basic_append(line_array, 's',
         "==========================================================================================="
-        "===================================================================================");
+        "===============================================================================================");
         eldbus_message_iter_basic_append(line_array, 's',
         " No   Win_ID    Hwc_win    zpos  ST   AC_ST  ACTI TRANSI  tsurface  src_size        src_pos"
-        "       FMT       dst_pos        TRANSF DP_tsurface   Queue    vis_skip restriction");
+        "       FMT       dst_pos        TRANSF DP_tsurface   Queue    wl_tbm_queue vis_skip restriction");
         eldbus_message_iter_basic_append(line_array, 's',
         "==========================================================================================="
-        "===================================================================================");
+        "===============================================================================================");
 
         hwc->hwc_windows = eina_list_sort(hwc->hwc_windows, eina_list_count(hwc->hwc_windows), _e_hwc_windows_window_debug_cb_sort);
 
@@ -4105,7 +4105,7 @@ _e_hwc_windows_window_debug_info_get(Eldbus_Message_Iter *iter, E_Hwc_Wins_Debug
 
              snprintf(info_str, sizeof(info_str),
                       "%3d 0x%08zx 0x%08zx %4d   %s    %s     %s   %s 0x%08zx %04dx%04d %04dx%04d+%04d+%04d"
-                      " %4s %04dx%04d+%04d+%04d  %c%3d  0x%08zx  0x%08zx %6s   %s",
+                      " %4s %04dx%04d+%04d+%04d  %c%3d  0x%08zx  0x%08zx 0x%08zx   %6s   %s",
                       ++idx,
                       e_client_util_win_get(hwc_window->ec),
                       (uintptr_t)hwc_window,
@@ -4130,6 +4130,7 @@ _e_hwc_windows_window_debug_info_get(Eldbus_Message_Iter *iter, E_Hwc_Wins_Debug
                       (hwc_window->current.buffer.transform < 4) ? hwc_window->current.buffer.transform * 90 : (hwc_window->current.buffer.transform - 4) * 90,
                       (uintptr_t)hwc_window->display.buffer.tsurface,
                       (uintptr_t)hwc_window->queue,
+                      (uintptr_t)e_hwc_window_wayland_tbm_client_queue_get(hwc_window),
                       vis_skip ? "TRUE" : "FALSE",
                       e_hwc_window_restriction_string_get(hwc_window));
              eldbus_message_iter_basic_append(line_array, 's', info_str);