e_hwc_windows: use hwc->ee instead of comp->ee

Change-Id: Ia550a88cd56d6a767bdb6ef90a8836076f87d76a

diff --git a/src/bin/e_hwc_window_queue.c b/src/bin/e_hwc_window_queue.c
index 1b6bda208f456c5d68f0e5e2bb12383542d41464..64f1442ad738676b763a06eea38fb4a6d441b694 100644 (file)
--- a/src/bin/e_hwc_window_queue.c
+++ b/src/bin/e_hwc_window_queue.c
@@ -250,12 +250,6 @@ _comp_wl_backup_buffer_get(tbm_surface_h tsurface)
    return backup_buffer;
 }
 
-static tbm_surface_queue_h
-_get_tbm_surface_queue()
-{
-   return e_comp->e_comp_screen->tqueue;
-}
-
 static tbm_surface_queue_h
 _e_hwc_window_queue_tqueue_acquire(E_Hwc_Window *hwc_window)
 {
@@ -263,7 +257,7 @@ _e_hwc_window_queue_tqueue_acquire(E_Hwc_Window *hwc_window)
    tbm_surface_queue_h tqueue;
 
    if (e_hwc_window_is_target(hwc_window))
-     tqueue = _get_tbm_surface_queue();
+     tqueue = e_hwc_tbm_surface_queue_get(hwc_window->hwc);
    else
      {
         tqueue = tdm_hwc_window_acquire_buffer_queue(hwc_window->thwc_window, &error);

diff --git a/src/bin/e_hwc_windows.c b/src/bin/e_hwc_windows.c
index d44625bcda1efa0df42e585057974e01a0ab3cf9..27bf00cb8e34c83cf52cc79b02916a116bff9a9a 100644 (file)
--- a/src/bin/e_hwc_windows.c
+++ b/src/bin/e_hwc_windows.c
@@ -708,10 +708,10 @@ _e_hwc_windows_target_window_new(E_Hwc *hwc)
    Evas *evas = NULL;
    E_Hwc_Window_Queue *queue = NULL;
 
-   name = ecore_evas_engine_name_get(e_comp->ee);
+   name = ecore_evas_engine_name_get(hwc->ee);
    EINA_SAFETY_ON_NULL_RETURN_VAL(name, NULL);
 
-   evas = ecore_evas_get(e_comp->ee);
+   evas = ecore_evas_get(hwc->ee);
    EINA_SAFETY_ON_NULL_RETURN_VAL(evas, NULL);
 
    if(!strcmp("gl_drm_tbm", name) ||
@@ -720,7 +720,7 @@ _e_hwc_windows_target_window_new(E_Hwc *hwc)
       !strcmp("software_tbm", name) ||
       !strcmp("gl_tbm_ES", name))
      {
-        ecore_evas_manual_render_set(e_comp->ee, 1);
+        ecore_evas_manual_render_set(hwc->ee, 1);
      }
 
    target_hwc_window = E_OBJECT_ALLOC(E_Hwc_Window_Target, E_HWC_WINDOW_TYPE, _e_hwc_windows_target_window_free);
@@ -731,7 +731,7 @@ _e_hwc_windows_target_window_new(E_Hwc *hwc)
    ((E_Hwc_Window *)target_hwc_window)->accepted_state = E_HWC_WINDOW_STATE_DEVICE;
    ((E_Hwc_Window *)target_hwc_window)->hwc = hwc;
 
-   target_hwc_window->ee = e_comp->ee;
+   target_hwc_window->ee = hwc->ee;
    target_hwc_window->evas = ecore_evas_get(target_hwc_window->ee);
    target_hwc_window->event_fd = eventfd(0, EFD_NONBLOCK);
    target_hwc_window->event_hdlr =
@@ -770,7 +770,9 @@ _e_hwc_windows_target_window_new(E_Hwc *hwc)
    return target_hwc_window;
 
 fail:
-   ecore_evas_manual_render_set(e_comp->ee, 0);
+   ecore_evas_manual_render_set(hwc->ee, 0);
+   if (target_hwc_window)
+      e_object_del(E_OBJECT(hwc->target_hwc_window));
 
    return NULL;
 }