evas glengine: fix map rendering issue.

there was a code diff - 36f9f7a3b233807c5c50d0e3e3b92104c4ccbbbb
that occured wrong upstream code merge.

Fix it by resolving code merge based on diff properly.

Change-Id: Ic6ee79dd4f8daf68108922761d46ebd54de074f2

diff --git a/src/modules/evas/engines/gl_common/evas_gl_context.c b/src/modules/evas/engines/gl_common/evas_gl_context.c
index 1b85224..4b31c69 100644 (file)
--- a/src/modules/evas/engines/gl_common/evas_gl_context.c
+++ b/src/modules/evas/engines/gl_common/evas_gl_context.c
@@ -3320,15 +3320,27 @@ evas_gl_common_context_image_map_push(Evas_Engine_GL_Context *gc,
           }
      }
 
-   pn = _evas_gl_common_context_push(SHD_MAP,
-                                     gc, tex, mtex,
-                                     prog,
+   if (!flat)
+     pn = _evas_gl_common_context_push(SHD_MAP,
+                                       gc, tex, mtex,
+                                       prog,
                                        p[0].foc >> FP, p[0].z0 >> FP, p[0].px >> FP, p[0].py >> FP,
-                                     x, y, w, h,
-                                     blend,
-                                     smooth,
-                                     clip, cx, cy, cw, ch,
-                                     mask_smooth);
+                                       x, y, w, h,
+                                       blend,
+                                       smooth,
+                                       clip, cx, cy, cw, ch,
+                                       mask_smooth);
+   else
+     pn = _evas_gl_common_context_push(SHD_MAP,
+                                       gc, tex, mtex,
+                                       prog,
+                                       0, 0, 0, 0,
+                                       x, y, w, h,
+                                       blend,
+                                       smooth,
+                                       clip, cx, cy, cw, ch,
+                                       mask_smooth);
+
    if (gc->pipe[pn].array.num == 0)
      {
         gc->pipe[pn].region.type = SHD_MAP;