[EGIT] [core/enlightenment] master 05/05: move comp fake layer init into canvas init for non-X compositors

[Mike Blumenkrantz]

discomfitor pushed a commit to branch master.

http://git.enlightenment.org/core/enlightenment.git/commit/?id=24887ddcccf88fb465616a7c91582164bad9e01b

commit 24887ddcccf88fb465616a7c91582164bad9e01b
Author: Mike Blumenkrantz <zm...@osg.samsung.com>
Date:   Fri Mar 20 15:12:59 2015 -0400

    move comp fake layer init into canvas init for non-X compositors
---
 src/bin/e_comp_canvas.c         | 3 +++
 src/modules/wl_drm/e_mod_main.c | 1 -
 src/modules/wl_fb/e_mod_main.c  | 1 -
 src/modules/wl_x11/e_mod_main.c | 1 -
 4 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/bin/e_comp_canvas.c b/src/bin/e_comp_canvas.c
index a84a3a3..18ced73 100644
--- a/src/bin/e_comp_canvas.c
+++ b/src/bin/e_comp_canvas.c
@@ -233,6 +233,9 @@ e_comp_canvas_init(int w, int h)
    E_LIST_HANDLER_APPEND(handlers, E_EVENT_SCREENSAVER_ON, 
_e_comp_cb_screensaver_on, NULL);
    E_LIST_HANDLER_APPEND(handlers, E_EVENT_SCREENSAVER_OFF, 
_e_comp_cb_screensaver_off, NULL);
 
+   if (e_comp->comp_type == E_PIXMAP_TYPE_WL)
+     e_comp_canvas_fake_layers_init();
+
    return EINA_TRUE;
 }
 
diff --git a/src/modules/wl_drm/e_mod_main.c b/src/modules/wl_drm/e_mod_main.c
index d124f87..dbc6fa5 100644
--- a/src/modules/wl_drm/e_mod_main.c
+++ b/src/modules/wl_drm/e_mod_main.c
@@ -134,7 +134,6 @@ e_modapi_init(E_Module *m)
      }
 
    if (!e_comp_canvas_init(w, h)) return NULL;
-   e_comp_canvas_fake_layers_init();
 
    /* NB: This needs to be called AFTER the comp canvas has been setup */
    if (!e_comp_wl_init()) return NULL;
diff --git a/src/modules/wl_fb/e_mod_main.c b/src/modules/wl_fb/e_mod_main.c
index 610487d..3a1c596 100644
--- a/src/modules/wl_fb/e_mod_main.c
+++ b/src/modules/wl_fb/e_mod_main.c
@@ -44,7 +44,6 @@ e_modapi_init(E_Module *m)
      }
    e_comp_canvas_init(w, h);
    e_comp_wl_init();
-   e_comp_canvas_fake_layers_init();
    comp->pointer = e_pointer_canvas_new(comp->ee, EINA_TRUE);
 
    ecore_wl_init(NULL);
diff --git a/src/modules/wl_x11/e_mod_main.c b/src/modules/wl_x11/e_mod_main.c
index ada596d..7263893 100644
--- a/src/modules/wl_x11/e_mod_main.c
+++ b/src/modules/wl_x11/e_mod_main.c
@@ -102,7 +102,6 @@ e_modapi_init(E_Module *m)
      }
 
    if (!e_comp_canvas_init(w, h)) return NULL;
-   e_comp_canvas_fake_layers_init();
 
    /* NB: This needs to be called AFTER comp_canvas has been setup as it 
     * makes reference to the comp->evas */

--