temp

Change-Id: I5efff34897bd1b045d4fc26b6fdc55bb3d28792a

diff --git a/src/bin/e_hwc_window.c b/src/bin/e_hwc_window.c
index c812c95a1fb264979304a540854e43ac8a0f6082..cd92f5be5c8d4413d1da304244ebaea67e139120 100644 (file)
--- a/src/bin/e_hwc_window.c
+++ b/src/bin/e_hwc_window.c
@@ -1322,6 +1322,12 @@ e_hwc_window_buffer_fetch(E_Hwc_Window *hwc_window)
                    return EINA_FALSE;
                 }
              hwc_window->update_exist = EINA_TRUE;
+
+             ELOGF("HWC-WINS", " ehw:%p sets ts:%10p ------- {%25s}, state:%s, zpos:%d, deleted:%s (Video)",
+                   hwc_window->ec ? hwc_window->ec->pixmap : NULL, hwc_window->ec,
+                   hwc_window, tsurface, hwc_window->ec ? hwc_window->ec->icccm.title : "UNKNOWN",
+                   e_hwc_window_state_string_get(hwc_window->state),
+                   hwc_window->zpos, hwc_window->is_deleted ? "yes" : "no");
           }
         else if (e_hwc_window_is_cursor(hwc_window))
           {
@@ -1340,7 +1346,7 @@ e_hwc_window_buffer_fetch(E_Hwc_Window *hwc_window)
 
                  ELOGF("HWC-WINS", " ehw:%p sets ts:%10p ------- {%25s}, state:%s, zpos:%d, deleted:%s (Cusor)",
                        hwc_window->ec ? hwc_window->ec->pixmap : NULL, hwc_window->ec,
-                       hwc_window, hwc_window->tsurface, hwc_window->ec ? hwc_window->ec->icccm.title : "UNKNOWN",
+                       hwc_window, tsurface, hwc_window->ec ? hwc_window->ec->icccm.title : "UNKNOWN",
                        e_hwc_window_state_string_get(hwc_window->state),
                        hwc_window->zpos, hwc_window->is_deleted ? "yes" : "no");
               }
@@ -1361,7 +1367,7 @@ e_hwc_window_buffer_fetch(E_Hwc_Window *hwc_window)
 
              ELOGF("HWC-WINS", " ehw:%p sets ts:%10p ------- {%25s}, state:%s, zpos:%d, deleted:%s (Window)",
                    hwc_window->ec ? hwc_window->ec->pixmap : NULL, hwc_window->ec,
-                   hwc_window, hwc_window->tsurface, hwc_window->ec ? hwc_window->ec->icccm.title : "UNKNOWN",
+                   hwc_window, tsurface, hwc_window->ec ? hwc_window->ec->icccm.title : "UNKNOWN",
                    e_hwc_window_state_string_get(hwc_window->state),
                    hwc_window->zpos, hwc_window->is_deleted ? "yes" : "no");
           }

diff --git a/src/bin/e_output.c b/src/bin/e_output.c
index 0349c1ca2fd26e8d178b974f74949f7f743446b1..6d778c2bd48579e92ea13d15107ec58c598330c5 100644 (file)
--- a/src/bin/e_output.c
+++ b/src/bin/e_output.c
@@ -2253,8 +2253,6 @@ e_output_setup(E_Output *output)
    E_Output_Hwc *output_hwc = NULL;
    Eina_List *l, *ll;
    E_Plane *plane = NULL;
-   Evas_Object *canvas_bg = NULL;
-   unsigned int r, g, b, a;
 
    EINA_SAFETY_ON_NULL_RETURN_VAL(output, EINA_FALSE);
 
@@ -2280,10 +2278,15 @@ e_output_setup(E_Output *output)
      }
    else
      {
+#if 0
+       Evas_Object *canvas_bg = NULL;
+       unsigned int r, g, b, a;
+
         /* set the color of the canvas_gb object */
         r = 0; g = 0; b = 0; a = 1;
         canvas_bg = e_comp->bg_blank_object;
         evas_object_color_set(canvas_bg, r, g, b, a);
+#endif
         return EINA_TRUE;
      }
 

diff --git a/src/bin/e_output_hwc_windows.c b/src/bin/e_output_hwc_windows.c
index ffcbe4cd9555f1d1f0f82b6804c107278b868156..2b163abe56d046799ba40179430697b52811df42 100644 (file)
--- a/src/bin/e_output_hwc_windows.c
+++ b/src/bin/e_output_hwc_windows.c
@@ -1475,6 +1475,9 @@ _e_output_hwc_windows_commit_evaulate(E_Output_Hwc *output_hwc)
    Eina_Bool can_validate;
    uint32_t num_changes;
 
+   /* update the buffers and the infos */
+   _e_output_hwc_windows_buffers_update(output_hwc);
+
    /* evaluate the transition */
    can_validate = _e_output_hwc_windows_uncomplete_transition_check(output_hwc);
    if (can_validate)
@@ -1507,9 +1510,6 @@ _e_output_hwc_windows_commit_evaulate(E_Output_Hwc *output_hwc)
 
 done:
 
-   /* update the buffers and the infos */
-   _e_output_hwc_windows_buffers_update(output_hwc);
-
    return ret;
 }
 
@@ -1579,7 +1579,10 @@ e_output_hwc_windows_evaluate(E_Output_Hwc *output_hwc)
    if (hwc_mode == E_OUTPUT_HWC_MODE_HYBRID || hwc_mode == E_OUTPUT_HWC_MODE_NONE)
      e_hwc_window_state_set(target_window, E_HWC_WINDOW_STATE_DEVICE);
    else
-     e_hwc_window_state_set(target_window, E_HWC_WINDOW_STATE_NONE);
+     {
+        e_hwc_window_state_set(target_window, E_HWC_WINDOW_STATE_NONE);
+        e_hwc_window_target_buffer_fetch(output_hwc->target_hwc_window);
+     }
 
    if (output_hwc->hwc_mode != hwc_mode)
      {