e_comp: use hwc_use_multi_plane at e_comp

use hwc_use_multi_plane at e_comp
instead of using hwc_use_multi_plane at conf

Change-Id: I9751c055ce8949498091c68de48a26398d41447e

diff --git a/src/bin/e_comp.c b/src/bin/e_comp.c
index 2606055ea626324cf8f1c4b82c1e4c9df22ed4dd..e0eb31515ee854de27e1c6478e68aa3bb03ca229 100644 (file)
--- a/src/bin/e_comp.c
+++ b/src/bin/e_comp.c
@@ -236,7 +236,7 @@ _hwc_set(E_Output *eout)
 
    EINA_LIST_FOREACH(eout->planes, l, ep)
      {
-        if (!conf->hwc_use_multi_plane &&
+        if (!e_comp->hwc_use_multi_plane &&
             !e_plane_is_cursor(ep) &&
             !e_plane_is_fb_target(ep))
           continue;
@@ -339,7 +339,7 @@ _hwc_prepare_init(E_Output *eout)
    ep_l = e_output_planes_get(eout);
    EINA_LIST_FOREACH(ep_l, l, ep)
      {
-        if (!conf->hwc_use_multi_plane &&
+        if (!e_comp->hwc_use_multi_plane &&
             !e_plane_is_cursor(ep) &&
             !e_plane_is_fb_target(ep))
           continue;
@@ -431,7 +431,7 @@ _hwc_prepare(E_Output *eout, int n_vis, int n_skip, Eina_List *hwc_clist)
    if (n_ec <= 0) return EINA_FALSE;
 
    // list up available_hw layers E_Client can be set
-   // if conf->hwc_use_multi_plane FALSE, than use only fb target plane
+   // if e_comp->hwc_use_multi_plane FALSE, than use only fb target plane
    ep_l = e_output_planes_get(eout);
    EINA_LIST_FOREACH(ep_l, l, ep)
      {
@@ -444,7 +444,7 @@ _hwc_prepare(E_Output *eout, int n_vis, int n_skip, Eina_List *hwc_clist)
                }
              continue;
           }
-        if (!conf->hwc_use_multi_plane) continue;
+        if (!e_comp->hwc_use_multi_plane) continue;
         if (e_plane_is_cursor(ep)) continue;
         if (ep->zpos > ep_fb->zpos)
           hwc_ly = eina_list_append(hwc_ly, ep);
@@ -506,7 +506,7 @@ _hwc_cancel(E_Output *eout)
 
    EINA_LIST_FOREACH(eout->planes, l, ep)
      {
-        if (!conf->hwc_use_multi_plane &&
+        if (!e_comp->hwc_use_multi_plane &&
             !e_plane_is_cursor(ep) &&
             !e_plane_is_fb_target(ep))
           {
@@ -536,7 +536,7 @@ _hwc_reserved_clean()
         eout = e_output_find(zone->output_id);
         EINA_LIST_FOREACH(eout->planes, ll, ep)
           {
-             if (!conf->hwc_use_multi_plane &&
+             if (!e_comp->hwc_use_multi_plane &&
                  !e_plane_is_cursor(ep) &&
                  !e_plane_is_fb_target(ep))
                continue;
@@ -1507,6 +1507,9 @@ e_comp_init(void)
    if (conf->hwc_deactive) e_comp->hwc_deactive = EINA_TRUE; // deactive hwc policy
    if (conf->hwc_reuse_cursor_buffer) e_comp->hwc_reuse_cursor_buffer = EINA_TRUE;
    if (conf->hwc_sync_mode_change) e_comp->hwc_sync_mode_change = EINA_TRUE;
+#ifdef ENABLE_HWC_MULTI
+   if (conf->hwc_use_multi_plane) e_comp->hwc_use_multi_plane = EINA_TRUE;
+#endif
 
    E_LIST_HANDLER_APPEND(handlers, E_EVENT_SCREENSAVER_ON,  _e_comp_screensaver_on,  NULL);
    E_LIST_HANDLER_APPEND(handlers, E_EVENT_SCREENSAVER_OFF, _e_comp_screensaver_off, NULL);

diff --git a/src/bin/e_comp.h b/src/bin/e_comp.h
index 82fe056ff460330ab49600e0982871623a546ae3..e8a968401cfe14deaf198cf50c115b74354866eb 100644 (file)
--- a/src/bin/e_comp.h
+++ b/src/bin/e_comp.h
@@ -144,6 +144,7 @@ struct _E_Comp
    Eina_Bool       hwc_deactive : 1; // deactive hwc policy
    Eina_Bool       hwc_reuse_cursor_buffer;
    Eina_Bool       hwc_sync_mode_change;
+   Eina_Bool       hwc_use_multi_plane;
 
    int depth;
    unsigned int    input_key_grabs;