replace MULTI_PLANE_HWC to ENABLE_HWC_MULTI

Change-Id: Ifb3c6a1400527ddc8dcaddcdc798233779831677

diff --git a/src/bin/e_comp.c b/src/bin/e_comp.c
index 88056b10125bc5fef26020ee4dba5737ab02b27b..74be03b65096946f56f81be0039cae54143c9ade 100644 (file)
--- a/src/bin/e_comp.c
+++ b/src/bin/e_comp.c
@@ -1668,11 +1668,11 @@ e_comp_override_add()
    e_comp->hwc_override++;
    if ((e_comp->hwc_override > 0) && (e_comp->nocomp))
      {
-#ifdef MULTI_PLANE_HWC
+#ifdef ENABLE_HWC_MULTI
         _e_comp_hwc_end(__FUNCTION__);
 #else
         e_comp_nocomp_end(__FUNCTION__);
-#endif // end of MULTI_PLANE_HWC
+#endif // end of ENABLE_HWC_MULTI
      }
 }
 

diff --git a/src/bin/e_comp_wl.c b/src/bin/e_comp_wl.c
index 0f017ec140b68fd72e365fefa901613fd97ce5e8..ff86a82ba3fdfe805624116d504f531c01ac1eda 100644 (file)
--- a/src/bin/e_comp_wl.c
+++ b/src/bin/e_comp_wl.c
@@ -2443,9 +2443,7 @@ _e_comp_wl_surface_state_commit(E_Client *ec, E_Comp_Wl_Surface_State *state)
    _e_comp_wl_subsurface_check_below_bg_rectangle(ec);
 
 #ifdef HAVE_HWC
-#ifdef ENABLE_HWC_MULTI
-#else
-#ifndef MULTI_PLANE_HWC
+#ifndef ENABLE_HWC_MULTI
    /* HWC: if the compositor fall into the nocomposite mode,
           the compositor display e_client on the hw layer directly */
    if (e_comp->hwc && buffer)
@@ -2454,8 +2452,7 @@ _e_comp_wl_surface_state_commit(E_Client *ec, E_Comp_Wl_Surface_State *state)
      }
    if (e_comp->hwc)
      e_comp_hwc_client_commit(ec);
-#endif // end of MULTI_PLANE_HWC
-#endif
+#endif // end of ENABLE_HWC_MULTI
 #endif
 
    if ((buffer && buffer->type == E_COMP_WL_BUFFER_TYPE_VIDEO) &&

diff --git a/src/bin/e_pointer.c b/src/bin/e_pointer.c
index 0876291c9350b2f562c6b13299127a6f176bdfc6..6c2bd2b7b051c2f0a494fa04398af45e34211a4a 100644 (file)
--- a/src/bin/e_pointer.c
+++ b/src/bin/e_pointer.c
@@ -718,11 +718,11 @@ e_pointer_object_set(E_Pointer *ptr, Evas_Object *obj, int x, int y)
              ecore_evas_object_cursor_set(ptr->ee, obj, E_LAYER_MAX - 1, x, y);
              if (e_pointer_is_hidden(ptr))
                {
-#ifdef MULTI_PLANE_HWC
+#ifdef ENABLE_HWC_MULTI
                   _e_comp_hwc_end("re_cursor_set");
 #else
                   e_comp_nocomp_end("re_cursor_set");
-#endif // end of MULTI_PLANE_HWC
+#endif // end of ENABLE_HWC_MULTI
                }
              return;
           }
@@ -744,11 +744,11 @@ e_pointer_object_set(E_Pointer *ptr, Evas_Object *obj, int x, int y)
 
    if (e_pointer_is_hidden(ptr))
      {
-#ifdef MULTI_PLANE_HWC
+#ifdef ENABLE_HWC_MULTI
        _e_comp_hwc_end("cursor_set");
 #else
        e_comp_nocomp_end("cursor_set");
-#endif // end of MULTI_PLANE_HWC
+#endif // end of ENABLE_HWC_MULTI
      }
 }