e_comp: removing nocomp_override use hwc_override instead

Change-Id: Icbb619a3f403e1198caf35e816082e8b17bcaded

diff --git a/src/bin/e_comp.c b/src/bin/e_comp.c
index 17f595f49e5e6084da13fc760f3568feff0f6b04..794a107bc984db21e91a7ea6025874e5f4e6c6c4 100644 (file)
--- a/src/bin/e_comp.c
+++ b/src/bin/e_comp.c
@@ -289,9 +289,8 @@ _e_comp_fps_update(void)
 static Eina_Bool
 _e_comp_hwc_is_on(void)
 {
-   if ((e_comp->hwc_override <= 0) &&
-       (e_comp->hwc_mode))
-     return EINA_TRUE;
+   if (e_comp->hwc_mode)
+      return EINA_TRUE;
 
    return EINA_FALSE;
 }
@@ -360,7 +359,7 @@ _e_comp_cb_nocomp_begin_timeout(void *data EINA_UNUSED)
 {
    e_comp->nocomp_delay_timer = NULL;
 
-   if (e_comp->nocomp_override == 0)
+   if (e_comp->hwc_override == 0)
      {
         if (_e_comp_fullscreen_check()) e_comp->nocomp_want = 1;
         _e_comp_cb_nocomp_begin();
@@ -717,10 +716,10 @@ _e_comp_hwc_begin(void)
    E_Zone *zone;
    Eina_Bool mode_set = EINA_FALSE;
 
-   if (!e_comp->hwc) return;
    E_FREE_FUNC(e_comp->selcomp_delay_timer, ecore_timer_del);
 
-   e_comp->selcomp_want = 1;
+   if (!e_comp->hwc) return;
+   if (e_comp->hwc_override > 0) return;
 
    EINA_LIST_FOREACH(e_comp->zones, l, zone)
      {
@@ -745,6 +744,7 @@ _e_comp_hwc_cb_begin_timeout(void *data EINA_UNUSED)
 
    if (e_comp->hwc_override == 0 && _e_comp_hwc_usable())
      {
+        e_comp->selcomp_want = 1;
         _e_comp_hwc_begin();
      }
    return EINA_FALSE;
@@ -759,13 +759,12 @@ e_comp_hwc_end(const char *location)
    E_Zone *zone;
    Eina_List *l;
 
-   if (!e_comp->hwc) return;
-   if (!_e_comp_hwc_is_on()) return;
-
    e_comp->selcomp_want = 0;
    E_FREE_FUNC(e_comp->selcomp_delay_timer, ecore_timer_del);
 
-   // e_comp->canvases will be replace e_comp->zones
+   if (!e_comp->hwc) return;
+   if (!_e_comp_hwc_is_on()) return;
+
    EINA_LIST_FOREACH(e_comp->zones, l, zone)
      {
         E_Output * eout;
@@ -903,6 +902,7 @@ setup_hwcompose:
                }
              else
                {
+                  e_comp->selcomp_want = 1;
                   _e_comp_hwc_begin();
                }
           }
@@ -922,7 +922,7 @@ setup_hwcompose:
                   if (!e_comp_is_on_overlay(ec))
                     e_comp_nocomp_end("_e_comp_cb_update : nocomp_ec != ec");
                }
-             else if ((!e_comp->nocomp) && (!e_comp->nocomp_override))
+             else if ((!e_comp->nocomp) && (!e_comp->hwc_override))
                {
                   if (conf->nocomp_use_timer)
                     {
@@ -1289,11 +1289,11 @@ static Eina_Bool
 _e_comp_override_expire(void *data EINA_UNUSED)
 {
    e_comp->nocomp_override_timer = NULL;
-   e_comp->nocomp_override--;
+   e_comp->hwc_override--;
 
-   if (e_comp->nocomp_override <= 0)
+   if (e_comp->hwc_override <= 0)
      {
-        e_comp->nocomp_override = 0;
+        e_comp->hwc_override = 0;
         if (e_comp->nocomp_want) _e_comp_cb_nocomp_begin();
      }
    return EINA_FALSE;
@@ -1665,19 +1665,28 @@ e_comp_ignore_win_find(Ecore_Window win)
 E_API void
 e_comp_override_del()
 {
-   e_comp->nocomp_override--;
-   if (e_comp->nocomp_override <= 0)
+   e_comp->hwc_override--;
+   if (e_comp->hwc_override <= 0)
      {
-        e_comp->nocomp_override = 0;
+        e_comp->hwc_override = 0;
+#ifdef ENABLE_HWC_MULTI
+        if (e_comp->selcomp_want) _e_comp_hwc_begin();
+#else
         if (e_comp->nocomp_want) _e_comp_cb_nocomp_begin();
+#endif
      }
 }
 
 E_API void
 e_comp_override_add()
 {
-   e_comp->nocomp_override++;
-   if ((e_comp->nocomp_override > 0) && (e_comp->nocomp))
+   e_comp->hwc_override++;
+   if ((e_comp->hwc_override > 0) &&
+#ifdef ENABLE_HWC_MULTI
+       (_e_comp_hwc_is_on())
+#else
+       (e_comp->nocomp))
+#endif
      {
         e_comp_hwc_end(__FUNCTION__);
      }
@@ -1693,9 +1702,9 @@ e_comp_find_by_window(Ecore_Window win)
 E_API void
 e_comp_override_timed_pop(void)
 {
-   if (e_comp->nocomp_override <= 0) return;
+   if (e_comp->hwc_override <= 0) return;
    if (e_comp->nocomp_override_timer)
-     e_comp->nocomp_override--;
+     e_comp->hwc_override--;
    else
      e_comp->nocomp_override_timer = ecore_timer_add(1.0, _e_comp_override_expire, NULL);
 }

diff --git a/src/bin/e_comp.h b/src/bin/e_comp.h
index 0c4c4b09622453320ed10852c9ac7e5ce804d2f7..9f1c53f8ecfeed46fa25d4aa33e9b9f45425beb7 100644 (file)
--- a/src/bin/e_comp.h
+++ b/src/bin/e_comp.h
@@ -129,7 +129,6 @@ struct _E_Comp
    int             frameskip;
    double          fps;
 
-   int             nocomp_override; //number of times nocomp override has been requested
    Ecore_Window    block_win;
    int             block_count; //number of times block window has been requested