From 4406d7098cb37dc8597589c1254adf8f3b3197a4 Mon Sep 17 00:00:00 2001
From: Cedric Bail <cedric@osg.samsung.com>
Date: Wed, 30 Aug 2017 10:01:17 -0700
Subject: [PATCH] evas: we always do use the common backend, so always init.

---
 src/lib/evas/canvas/evas_main.c     | 10 ++++------
 src/lib/evas/canvas/evas_out.c      |  6 ------
 src/lib/evas/include/evas_private.h |  1 -
 3 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/src/lib/evas/canvas/evas_main.c b/src/lib/evas/canvas/evas_main.c
index cb01eff..2b07d3e 100644
--- a/src/lib/evas/canvas/evas_main.c
+++ b/src/lib/evas/canvas/evas_main.c
@@ -88,6 +88,8 @@ evas_init(void)
    if (!evas_thread_init())
      goto shutdown_filter;
 
+   evas_common_init();
+
    eina_log_timing(_evas_log_dom_global,
 		   EINA_LOG_STATE_STOP,
 		   EINA_LOG_STATE_INIT);
@@ -138,6 +140,8 @@ evas_shutdown(void)
                    EINA_LOG_STATE_START,
                    EINA_LOG_STATE_SHUTDOWN);
 
+   evas_common_shutdown();
+
 #ifdef EVAS_CSERVE2
    if (evas_cserve2_use_get())
      evas_cserve2_shutdown();
@@ -405,12 +409,6 @@ next_zombie:
    EINA_LIST_FREE(e->outputs, evo) efl_canvas_output_del(evo);
    e->engine.func->engine_free(e->backend);
 
-   if (e->common_init)
-     {
-        e->common_init = 0;
-        evas_common_shutdown();
-     }
-
    for (i = 0; i < e->modifiers.mod.count; i++)
      free(e->modifiers.mod.list[i]);
    if (e->modifiers.mod.list) free(e->modifiers.mod.list);
diff --git a/src/lib/evas/canvas/evas_out.c b/src/lib/evas/canvas/evas_out.c
index c5687de..cd7fbaf 100644
--- a/src/lib/evas/canvas/evas_out.c
+++ b/src/lib/evas/canvas/evas_out.c
@@ -152,12 +152,6 @@ efl_canvas_output_engine_info_set(Efl_Canvas_Output *output,
      }
    else
      {
-        if (!e->common_init)
-          {
-             e->common_init = 1;
-             evas_common_init();
-          }
-
      setup:
         output->output = e->engine.func->output_setup(_evas_engine_context(e), info,
                                                       output->geometry.w, output->geometry.h);
diff --git a/src/lib/evas/include/evas_private.h b/src/lib/evas/include/evas_private.h
index 862e950..4364cd6 100644
--- a/src/lib/evas/include/evas_private.h
+++ b/src/lib/evas/include/evas_private.h
@@ -976,7 +976,6 @@ struct _Evas_Public_Data
    Eina_Bool      is_frozen : 1;
    Eina_Bool      rendering : 1;
    Eina_Bool      render2 : 1;
-   Eina_Bool      common_init : 1;
    Eina_Bool      inside_post_render : 1;
    Eina_Bool      devices_modified : 1;
 };
-- 
2.7.4