devilhorns pushed a commit to branch master.

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

commit bc9b4e536afc62d83d245724c94c2c91b312241d
Author: Chris Michael <cp.mich...@samsung.com>
Date:   Thu Oct 1 08:59:00 2015 -0400

    evas-wayland-egl: Add support for 'smart' merge mode
    
    Summary: This just adds support for 'smart' merge mode in the wayland
    egl engine to keep in line with the gl x11 engine
    
    Signed-off-by: Chris Michael <cp.mich...@samsung.com>
---
 src/modules/evas/engines/wayland_egl/evas_engine.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/modules/evas/engines/wayland_egl/evas_engine.c 
b/src/modules/evas/engines/wayland_egl/evas_engine.c
index 750d443..70ed760 100644
--- a/src/modules/evas/engines/wayland_egl/evas_engine.c
+++ b/src/modules/evas/engines/wayland_egl/evas_engine.c
@@ -594,7 +594,7 @@ eng_setup(Evas *evas, void *info)
 
    if (!(re = epd->engine.data.output))
      {
-        Render_Engine_Merge_Mode merge = MERGE_BOUNDING;
+        Render_Engine_Merge_Mode merge = MERGE_SMART;
 
         /* FIXME: Remove this line as soon as eglGetDisplay() autodetection
          * gets fixed. Currently it is incorrectly detecting wl_display and
@@ -650,6 +650,8 @@ eng_setup(Evas *evas, void *info)
                merge = MERGE_BOUNDING;
              else if ((!strcmp(s, "full")) || (!strcmp(s, "f")))
                merge = MERGE_FULL;
+             else if ((!strcmp(s, "smart")) || (!strcmp(s, "s")))
+               merge = MERGE_SMART;
           }
 
         
evas_render_engine_software_generic_merge_mode_set(&re->generic.software, 
merge);

-- 


Reply via email to