e_comp_canvas: rename the function name

Change-Id: I061c1c9608aee0de4045a914d215282a428ef656

diff --git a/src/bin/compmgr/e_comp_canvas.c b/src/bin/compmgr/e_comp_canvas.c
index be6c610e986a1342568560b61c5a7414c4b82d68..f4eeaba916dd5898a694de9d6387e2c6096f21c0 100644 (file)
--- a/src/bin/compmgr/e_comp_canvas.c
+++ b/src/bin/compmgr/e_comp_canvas.c
@@ -55,7 +55,7 @@ _e_comp_canvas_prerender(Ecore_Evas *ee EINA_UNUSED)
 }
 
 static void
-_e_hwc_tbm_surface_queue_free(void *data, void *tqueue)
+_e_comp_canvas_tbm_surface_queue_free(void *data, void *tqueue)
 {
    E_Comp_Screen *e_comp_screen = (E_Comp_Screen *)data;
 
@@ -66,7 +66,7 @@ _e_hwc_tbm_surface_queue_free(void *data, void *tqueue)
 }
 
 static void *
-_e_hwc_tbm_surface_queue_alloc(void *data, int w, int h)
+_e_comp_canvas_tbm_surface_queue_alloc(void *data, int w, int h)
 {
    E_Comp_Screen *e_comp_screen = (E_Comp_Screen *)data;
 
@@ -81,7 +81,7 @@ _e_hwc_tbm_surface_queue_alloc(void *data, int w, int h)
 }
 
 static Ecore_Evas *
-_e_hwc_ecore_evas_tbm_alloc(E_Comp_Screen *e_comp_screen, int src_w, int src_h)
+_e_comp_canvas_ecore_evas_tbm_alloc(E_Comp_Screen *e_comp_screen, int src_w, int src_h)
 {
    Ecore_Evas *ee;
    E_Comp *comp;
@@ -90,15 +90,15 @@ _e_hwc_ecore_evas_tbm_alloc(E_Comp_Screen *e_comp_screen, int src_w, int src_h)
    if (comp->avoid_afill)
      {
         ee = ecore_evas_tbm_allocfunc_new("gl_tbm_ES", src_w, src_h,
-                                          _e_hwc_tbm_surface_queue_alloc,
-                                          _e_hwc_tbm_surface_queue_free,
+                                          _e_comp_canvas_tbm_surface_queue_alloc,
+                                          _e_comp_canvas_tbm_surface_queue_free,
                                           (void *)e_comp_screen);
      }
    else
      {
         ee = ecore_evas_tbm_allocfunc_new("gl_tbm", src_w, src_h,
-                                          _e_hwc_tbm_surface_queue_alloc,
-                                          _e_hwc_tbm_surface_queue_free,
+                                          _e_comp_canvas_tbm_surface_queue_alloc,
+                                          _e_comp_canvas_tbm_surface_queue_free,
                                           (void *)e_comp_screen);
      }
 
@@ -109,7 +109,7 @@ _e_hwc_ecore_evas_tbm_alloc(E_Comp_Screen *e_comp_screen, int src_w, int src_h)
 }
 
 static void
-_e_hwc_gbm_surface_free(void *data, void *gsurface)
+_e_comp_canvas_gbm_surface_free(void *data, void *gsurface)
 {
    E_Comp_Screen *e_comp_screen = (E_Comp_Screen *)data;
 
@@ -120,7 +120,7 @@ _e_hwc_gbm_surface_free(void *data, void *gsurface)
 }
 
 static void *
-_e_hwc_gbm_surface_alloc(void *data, int w, int h)
+_e_comp_canvas_gbm_surface_alloc(void *data, int w, int h)
 {
    E_Comp_Screen *e_comp_screen = (E_Comp_Screen *)data;
 
@@ -135,7 +135,7 @@ _e_hwc_gbm_surface_alloc(void *data, int w, int h)
 }
 
 static Ecore_Evas *
-_e_hwc_ecore_evas_gbm_alloc(E_Comp_Screen *e_comp_screen, int src_w, int src_h)
+_e_comp_canvas_ecore_evas_gbm_alloc(E_Comp_Screen *e_comp_screen, int src_w, int src_h)
 {
    Ecore_Evas *ee;
    E_Comp *comp;
@@ -156,14 +156,14 @@ _e_hwc_ecore_evas_gbm_alloc(E_Comp_Screen *e_comp_screen, int src_w, int src_h)
           {
              ee = ecore_evas_tbm_native_allocfunc_new("gl_tbm_ES",
                            gdevice, src_w, src_h,
-                           _e_hwc_gbm_surface_alloc, _e_hwc_gbm_surface_free,
+                           _e_comp_canvas_gbm_surface_alloc, _e_comp_canvas_gbm_surface_free,
                            (void *)e_comp_screen);
           }
         else
           {
              ee = ecore_evas_tbm_native_allocfunc_new("gl_tbm",
                            gdevice, src_w, src_h,
-                           _e_hwc_gbm_surface_alloc, _e_hwc_gbm_surface_free,
+                           _e_comp_canvas_gbm_surface_alloc, _e_comp_canvas_gbm_surface_free,
                            (void *)e_comp_screen);
           }
 
@@ -177,7 +177,7 @@ _e_hwc_ecore_evas_gbm_alloc(E_Comp_Screen *e_comp_screen, int src_w, int src_h)
 }
 
 static void
-_e_hwc_ecore_evas_deinit(Ecore_Evas *ee)
+_e_comp_canvas_ecore_evas_deinit(Ecore_Evas *ee)
 {
    if (!ee) return;
 
@@ -185,7 +185,7 @@ _e_hwc_ecore_evas_deinit(Ecore_Evas *ee)
 }
 
 static Ecore_Evas *
-_e_hwc_ecore_evas_init(E_Comp_Screen *e_comp_screen, int w, int y)
+_e_comp_canvas_ecore_evas_init(E_Comp_Screen *e_comp_screen, int w, int y)
 {
    Ecore_Evas *ee;
    int scr_w = 1, scr_h = 1;
@@ -213,15 +213,15 @@ _e_hwc_ecore_evas_init(E_Comp_Screen *e_comp_screen, int w, int y)
         e_main_ts_begin("\tEE_GL_TBM New");
         if (e_comp_screen_prefer_gbm_check())
           {
-             ee = _e_hwc_ecore_evas_gbm_alloc(e_comp_screen, scr_w, scr_h);
+             ee = _e_comp_canvas_ecore_evas_gbm_alloc(e_comp_screen, scr_w, scr_h);
              if (!ee)
-               ee = _e_hwc_ecore_evas_tbm_alloc(e_comp_screen, scr_w, scr_h);
+               ee = _e_comp_canvas_ecore_evas_tbm_alloc(e_comp_screen, scr_w, scr_h);
           }
         else
           {
-             ee = _e_hwc_ecore_evas_tbm_alloc(e_comp_screen, scr_w, scr_h);
+             ee = _e_comp_canvas_ecore_evas_tbm_alloc(e_comp_screen, scr_w, scr_h);
              if (!ee)
-               ee = _e_hwc_ecore_evas_gbm_alloc(e_comp_screen, scr_w, scr_h);
+               ee = _e_comp_canvas_ecore_evas_gbm_alloc(e_comp_screen, scr_w, scr_h);
           }
 
         snprintf(buf, sizeof(buf), "\tEE_GL_TBM New Done %p %dx%d", ee, scr_w, scr_h);
@@ -235,7 +235,7 @@ _e_hwc_ecore_evas_init(E_Comp_Screen *e_comp_screen, int w, int y)
         e_main_ts_begin("\tEE_DRM New");
         ee = ecore_evas_tbm_allocfunc_new("software_tbm",
                      scr_w, scr_h,
-                     _e_hwc_tbm_surface_queue_alloc, _e_hwc_tbm_surface_queue_free,
+                     _e_comp_canvas_tbm_surface_queue_alloc, _e_comp_canvas_tbm_surface_queue_free,
                      (void *)e_comp_screen);
         ELOGF("Comp_Canvas", "ecore_evas engine:software_tbm fallback to software engine.", NULL);
         snprintf(buf, sizeof(buf), "\tEE_DRM New Done %p %dx%d", ee, scr_w, scr_h);
@@ -245,7 +245,7 @@ _e_hwc_ecore_evas_init(E_Comp_Screen *e_comp_screen, int w, int y)
    if (!ee)
      {
         ERR("Enlightenment cannot initialize outputs!");
-        _e_hwc_ecore_evas_deinit(ee);
+        _e_comp_canvas_ecore_evas_deinit(ee);
         return EINA_FALSE;
      }
 
@@ -282,7 +282,7 @@ e_comp_canvas_init(E_Comp_Screen *e_comp_screen)
 
    e_comp_screen_size_get(e_comp_screen, &w, &h);
 
-   ee = _e_hwc_ecore_evas_init(e_comp_screen, w, h);
+   ee = _e_comp_canvas_ecore_evas_init(e_comp_screen, w, h);
    EINA_SAFETY_ON_NULL_RETURN_VAL(ee, EINA_FALSE);
 
    ELOGF("Comp_Canvas", "ee(%p) with the tqueue(%p) is created.", NULL,
@@ -314,7 +314,7 @@ e_comp_canvas_init(E_Comp_Screen *e_comp_screen)
      {
         ERR("fail to e_hwc_windows_canvas_set");
         e_canvas_destroy(comp->canvas);
-        _e_hwc_ecore_evas_deinit(ee);
+        _e_comp_canvas_ecore_evas_deinit(ee);
         return EINA_FALSE;
      }
 
@@ -367,7 +367,7 @@ e_comp_canvas_clear(void)
 
    E_FREE_LIST(handlers, ecore_event_handler_del);
 
-   _e_hwc_ecore_evas_deinit(comp->ee);
+   _e_comp_canvas_ecore_evas_deinit(comp->ee);
    e_view_destroy(comp->bg_blank_view);
    e_canvas_destroy(comp->canvas);
    evas_event_freeze(comp->evas);