evas: add support for alternate Ector rasterizer based on FreeType.

Conflicts:

	src/modules/evas/engines/software_generic/evas_engine.c

1 files changed, 25 insertions, 5 deletions

diff --git a/src/modules/evas/engines/software_generic/evas_engine.c b/src/modules/evas/engines/software_generic/evas_engine.c
index 1f794eb6bd..b8d9604246 100644
--- a/src/modules/evas/engines/software_generic/evas_engine.c
+++ b/src/modules/evas/engines/software_generic/evas_engine.c
@@ -19,6 +19,7 @@
 #include "Evas_Engine_Software_Generic.h"
 
 #include "cairo/Ector_Cairo.h"
+#include "software/Ector_Software.h"
 
 #include "ector_cairo_software_surface.eo.h"
 
@@ -3110,15 +3111,26 @@ eng_output_idle_flush(void *data)
 }
 
 static Ector_Surface *_software_ector = NULL;
+static Eina_Bool use_cairo;
 
 static Ector_Surface *
 eng_ector_get(void *data EINA_UNUSED)
 {
    if (!_software_ector)
      {
-        //TODO FIX it Properly
-        _software_ector = eo_add(ECTOR_SOFTWARE_SURFACE_CLASS, NULL);
-        //_software_ector = eo_add(ECTOR_CAIRO_SOFTWARE_SURFACE_CLASS, NULL);
+        const char *ector_backend;
+
+        ector_backend = getenv("ECTOR_BACKEND");
+        if (ector_backend && !strcasecmp(ector_backend, "freetype"))
+          {
+             _software_ector = eo_add(ECTOR_SOFTWARE_SURFACE_CLASS, NULL);
+             use_cairo = EINA_FALSE;
+          }
+        else
+          {
+             _software_ector = eo_add(ECTOR_CAIRO_SOFTWARE_SURFACE_CLASS, NULL);
+             use_cairo = EINA_TRUE;
+          }
      }
    return _software_ector;
 }
@@ -3265,8 +3277,16 @@ _draw_thread_ector_surface_set(void *data)
         h = surface->cache_entry.h;
      }
 
-   eo_do(_software_ector,
-         ector_cairo_software_surface_set(pixels, w, h));
+   if (use_cairo)
+     {
+        eo_do(_software_ector,
+              ector_cairo_software_surface_set(pixels, w, h));
+     }
+   else
+     {
+        eo_do(_software_ector,
+              ector_software_surface_set(pixels, w, h));
+     }
 
    evas_common_cpu_end_opt();