[EGIT] [core/efl] master 03/04: evas software x11 - set merge mode explicitly to smart or env var

[Carsten Haitzler]

raster pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=966b3c8f2335b04145061b0dbba9689a4d5eabae

commit 966b3c8f2335b04145061b0dbba9689a4d5eabae
Author: Carsten Haitzler (Rasterman) <ras...@rasterman.com>
Date:   Mon Oct 5 18:36:18 2015 +0900

    evas software x11 - set merge mode explicitly to smart or env var
    
    this allows merge mode for software-x11 to be set too like for gl.
    
    @feature
---
 src/modules/evas/engines/software_x11/evas_engine.c | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/src/modules/evas/engines/software_x11/evas_engine.c 
b/src/modules/evas/engines/software_x11/evas_engine.c
index 91cf336..02e6630 100644
--- a/src/modules/evas/engines/software_x11/evas_engine.c
+++ b/src/modules/evas/engines/software_x11/evas_engine.c
@@ -140,6 +140,8 @@ _output_xlib_setup(int w, int h, int rot, Display *disp, 
Drawable draw,
 {
    Render_Engine *re;
    Outbuf *ob;
+   Render_Engine_Merge_Mode merge_mode = MERGE_SMART;
+   const char *s;
 
    if (!(re = calloc(1, sizeof(Render_Engine)))) return NULL;
 
@@ -178,6 +180,21 @@ _output_xlib_setup(int w, int h, int rot, Display *disp, 
Drawable draw,
                                                  w, h))
      goto on_error;
 
+   if ((s = getenv("EVAS_SOFTWARE_PARTIAL_MERGE")))
+     {
+        if ((!strcmp(s, "bounding")) ||
+            (!strcmp(s, "b")))
+          merge_mode = MERGE_BOUNDING;
+        else if ((!strcmp(s, "full")) ||
+                 (!strcmp(s, "f")))
+          merge_mode = MERGE_FULL;
+        else if ((!strcmp(s, "smart")) ||
+                 (!strcmp(s, "s")))
+          merge_mode = MERGE_SMART;
+     }
+
+   evas_render_engine_software_generic_merge_mode_set(&re->generic, 
merge_mode);
+
    return re;
 
  on_error:

--