devilhorns pushed a commit to branch master.

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

commit ba5d3b048090e7a2a7dea648eb2dd3ea7ab2d3ae
Author: Chris Michael <cp.mich...@samsung.com>
Date:   Thu Oct 1 09:00:44 2015 -0400

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

diff --git a/src/modules/evas/engines/gl_drm/evas_engine.c 
b/src/modules/evas/engines/gl_drm/evas_engine.c
index b424c70..1384bc9 100644
--- a/src/modules/evas/engines/gl_drm/evas_engine.c
+++ b/src/modules/evas/engines/gl_drm/evas_engine.c
@@ -802,7 +802,7 @@ eng_setup(Evas *evas, void *in)
    if (!(re = epd->engine.data.output))
      {
         Outbuf *ob;
-        Render_Engine_Merge_Mode merge_mode = MERGE_BOUNDING;
+        Render_Engine_Merge_Mode merge_mode = MERGE_SMART;
 
         if (!initted)
           {
@@ -864,6 +864,8 @@ eng_setup(Evas *evas, void *in)
                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.software, 
merge_mode);

-- 


Reply via email to