e_hwc_windows: fix missing present feedback callback when queue is cleared

if queue is cleared when state of target window is none, present feedback
callback of queue buffer is missed until queue buffer is resued.
this patch move present feedback callback to target window when
queue is cleared.

Change-Id: Idfcddad5b01478a3439ad790a1c8dc8af4f93c90

diff --git a/src/bin/e_hwc_window_queue.c b/src/bin/e_hwc_window_queue.c
index a76150f5c51af3c3fdcc9a0eade39ca77bea8307..61d7d91fbb451f36ef80a99b9aa044687674789e 100644 (file)
--- a/src/bin/e_hwc_window_queue.c
+++ b/src/bin/e_hwc_window_queue.c
@@ -2299,19 +2299,6 @@ e_hwc_window_queue_buffer_release(E_Hwc_Window_Queue *queue, E_Hwc_Window_Queue_
    return EINA_TRUE;
 }
 
-EINTERN Eina_Bool
-e_hwc_window_queue_clear(E_Hwc_Window_Queue *queue)
-{
-   E_Hwc_Window_Queue_Buffer *queue_buffer;
-
-   EINA_SAFETY_ON_NULL_RETURN_VAL(queue, EINA_FALSE);
-
-   while ((queue_buffer = e_hwc_window_queue_buffer_acquire(queue)))
-     e_hwc_window_queue_buffer_release(queue, queue_buffer);
-
-   return EINA_TRUE;
-}
-
 EINTERN Eina_List *
 e_hwc_window_queue_acquirable_buffers_get(E_Hwc_Window_Queue *queue)
 {

diff --git a/src/bin/e_hwc_window_queue.h b/src/bin/e_hwc_window_queue.h
index de3a519b22dedcfc5eabb1467677ebc4fa17766c..b3ec7766abcd95fa47a153ce611502ad465cfbc2 100644 (file)
--- a/src/bin/e_hwc_window_queue.h
+++ b/src/bin/e_hwc_window_queue.h
@@ -101,7 +101,6 @@ EINTERN E_Hwc_Window_Queue_Buffer * e_hwc_window_queue_buffer_dequeue(E_Hwc_Wind
 EINTERN Eina_Bool                   e_hwc_window_queue_buffer_enqueue(E_Hwc_Window_Queue *queue, E_Hwc_Window_Queue_Buffer *queue_buffer);
 EINTERN E_Hwc_Window_Queue_Buffer * e_hwc_window_queue_buffer_acquire(E_Hwc_Window_Queue *queue);
 EINTERN Eina_Bool                   e_hwc_window_queue_buffer_release(E_Hwc_Window_Queue *queue, E_Hwc_Window_Queue_Buffer *queue_buffer);
-EINTERN Eina_Bool                   e_hwc_window_queue_clear(E_Hwc_Window_Queue *queue);
 EINTERN void                        e_hwc_window_queue_buffer_reference(E_Hwc_Window_Queue_Buffer_Ref *ref, E_Hwc_Window_Queue_Buffer *buffer);
 
 EINTERN Eina_List *                 e_hwc_window_queue_acquirable_buffers_get(E_Hwc_Window_Queue *queue);

diff --git a/src/bin/e_hwc_windows.c b/src/bin/e_hwc_windows.c
index 6592f10fcd0af104d79419b0d582fb6303bbf29e..7d053c98b2d2eeee4c6da4f870ac08368d396c8f 100644 (file)
--- a/src/bin/e_hwc_windows.c
+++ b/src/bin/e_hwc_windows.c
@@ -661,7 +661,6 @@ _e_hwc_windows_target_window_buffer_skip(E_Hwc *hwc)
 {
    E_Hwc_Window_Target *target_hwc_window;
    E_Hwc_Window *hwc_window;
-   E_Hwc_Windows_Comp_Info *comp_info;
    tdm_hwc *thwc;
    tdm_region fb_damage;
 
@@ -691,16 +690,7 @@ _e_hwc_windows_target_window_buffer_skip(E_Hwc *hwc)
         hwc_window = (E_Hwc_Window *)hwc->root_target_hwc_window;
 
         if (hwc_window->current.buffer.tsurface)
-          {
-             comp_info = _e_hwc_windows_comp_info_get(hwc_window->current.buffer.tsurface);
-             if (comp_info)
-               {
-                  e_hwc_window_presentation_time_feedback_take((E_Hwc_Window *)target_hwc_window,
-                                                               &comp_info->presentation_container);
-                  e_hwc_window_presentation_callback_take((E_Hwc_Window *)target_hwc_window,
-                                                          &comp_info->presentation_callbacks);
-               }
-          }
+          e_hwc_windows_presentation_time_feedback_and_callback_take(hwc, hwc_window->current.buffer.tsurface);
 
         e_hwc_window_queue_buffer_reference(&hwc_window->current.queue_buffer_ref, hwc_window->display.queue_buffer_ref.buffer);
         e_hwc_window_buffer_set(&hwc_window->current.buffer, hwc_window->display.buffer.tsurface,
@@ -710,6 +700,21 @@ _e_hwc_windows_target_window_buffer_skip(E_Hwc *hwc)
    return EINA_TRUE;
 }
 
+static void
+_e_hwc_windows_target_window_queue_clear(E_Hwc_Window_Target *target_hwc_window)
+{
+   E_Hwc_Window *hwc_window;
+   E_Hwc_Window_Queue_Buffer *queue_buffer;
+
+   hwc_window = (E_Hwc_Window *)target_hwc_window;
+
+   while ((queue_buffer = e_hwc_window_queue_buffer_acquire(hwc_window->queue)))
+     {
+        e_hwc_windows_presentation_time_feedback_and_callback_take(target_hwc_window->hwc, queue_buffer->tsurface);
+        e_hwc_window_queue_buffer_release(hwc_window->queue, queue_buffer);
+     }
+}
+
 static Eina_Bool
 _e_hwc_windows_root_target_buffer_fetch(E_Hwc *hwc)
 {
@@ -755,10 +760,7 @@ _e_hwc_windows_root_target_buffer_fetch(E_Hwc *hwc)
         comp_info = _e_hwc_windows_comp_info_get(tsurface);
         if ((comp_info) && (comp_info->skip))
           {
-             e_hwc_window_presentation_time_feedback_take((E_Hwc_Window *)hwc->target_hwc_window,
-                                                          &comp_info->presentation_container);
-             e_hwc_window_presentation_callback_take((E_Hwc_Window *)hwc->target_hwc_window,
-                                                     &comp_info->presentation_callbacks);
+             e_hwc_windows_presentation_time_feedback_and_callback_take(hwc, tsurface);
              e_hwc_window_queue_buffer_release(queue, queue_buffer);
              return EINA_FALSE;
           }
@@ -794,7 +796,7 @@ _e_hwc_windows_root_target_buffer_fetch(E_Hwc *hwc)
      }
    else
      {
-        e_hwc_window_queue_clear(queue);
+        _e_hwc_windows_target_window_queue_clear(target_hwc_window);
 
         if (!hwc_window->current.buffer.tsurface) return EINA_FALSE;
 
@@ -802,18 +804,7 @@ _e_hwc_windows_root_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_Comp_Info *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((E_Hwc_Window *)hwc->target_hwc_window,
-                                                                   &comp_info->presentation_container);
-                       e_hwc_window_presentation_callback_take((E_Hwc_Window *)hwc->target_hwc_window,
-                                                               &comp_info->presentation_callbacks);
-                    }
-               }
+               e_hwc_windows_presentation_time_feedback_and_callback_take(hwc, hwc_window->current.buffer.tsurface);
           }
 
         e_hwc_window_queue_buffer_reference(&hwc_window->current.queue_buffer_ref, NULL);
@@ -4506,7 +4497,7 @@ e_hwc_windows_present_sync(E_Hwc *hwc)
         comp_info->skip = EINA_TRUE;
      }
 
-   e_hwc_window_queue_clear(((E_Hwc_Window *)root_target_hwc_window)->queue);
+   _e_hwc_windows_target_window_queue_clear(root_target_hwc_window);
 
    _e_hwc_windows_target_window_buffer_skip(hwc);
 
@@ -4544,3 +4535,25 @@ e_hwc_windows_fence_enabled_get(E_Hwc *hwc)
 
    return EINA_TRUE;
 }
+
+EINTERN void
+e_hwc_windows_presentation_time_feedback_and_callback_take(E_Hwc *hwc, tbm_surface_h tsurface)
+{
+   E_Hwc_Windows_Comp_Info *comp_info;
+   E_Hwc_Window_Target *target_hwc_window;
+
+   EINA_SAFETY_ON_NULL_RETURN(hwc);
+   EINA_SAFETY_ON_NULL_RETURN(tsurface);
+
+   target_hwc_window = hwc->target_hwc_window;
+   EINA_SAFETY_ON_NULL_RETURN(target_hwc_window);
+
+   comp_info = _e_hwc_windows_comp_info_get(tsurface);
+   if (comp_info)
+     {
+        e_hwc_window_presentation_time_feedback_take((E_Hwc_Window *)target_hwc_window,
+                                                     &comp_info->presentation_container);
+        e_hwc_window_presentation_callback_take((E_Hwc_Window *)target_hwc_window,
+                                                &comp_info->presentation_callbacks);
+     }
+}

diff --git a/src/bin/e_hwc_windows.h b/src/bin/e_hwc_windows.h
index 4e474b4d2290420db387885a49c60fe0f5b4323d..e036223aa204b6791a78c8009730f527a3fce0a7 100644 (file)
--- a/src/bin/e_hwc_windows.h
+++ b/src/bin/e_hwc_windows.h
@@ -67,5 +67,7 @@ EINTERN void                 e_hwc_windows_target_window_force_render(E_Hwc_Wind
 EINTERN Eina_Bool            e_hwc_windows_pp_set(E_Hwc *hwc, Eina_Rectangle *src_rect, Eina_Rectangle *dst_rect);
 EINTERN void                 e_hwc_windows_pp_unset(E_Hwc *hwc);
 
+EINTERN void                 e_hwc_windows_presentation_time_feedback_and_callback_take(E_Hwc *hwc, tbm_surface_h tsurface);
+
 #endif
 #endif