EFL migration revision 67705

diff --cc src/lib/Evas_GL.h
Simple merge

diff --cc src/lib/cache/evas_cache_image.c
index ac90448,8f73015..8f73015
mode 100755,100644..100755
--- 1/src/lib/cache/evas_cache_image.c
--- 2/src/lib/cache/evas_cache_image.c
+++ b/src/lib/cache/evas_cache_image.c

diff --cc src/lib/canvas/evas_map.c
index bed8b22,5fe61aa..0949b4f
--- 1/src/lib/canvas/evas_map.c
--- 2/src/lib/canvas/evas_map.c
+++ b/src/lib/canvas/evas_map.c
@@@ -94,21 -92,21 +94,21 @@@ _evas_map_calc_map_geometry(Evas_Objec
          y = lround(p->y);
          if (x < x1) x1 = x;
          if (x > x2) x2 = x;
-         if (y < y1) y1 = y;
-         if (y > y2) y2 = y;
+         if (y < yy1) yy1 = y;
+         if (y > yy2) yy2 = y;
       }
 -// this causes clip-out bugs now mapped objs canbe opaque!!!   
 +// this causes clip-out bugs now mapped objs canbe opaque!!!
  //   // add 1 pixel of fuzz around the map region to ensure updates are correct
- //   x1 -= 1; y1 -= 1;
- //   x2 += 1; y2 += 1;
+ //   x1 -= 1; yy1 -= 1;
+ //   x2 += 1; yy2 += 1;
     if (obj->cur.map->normal_geometry.x != x1) ch = 1;
-    if (obj->cur.map->normal_geometry.y != y1) ch = 1;
+    if (obj->cur.map->normal_geometry.y != yy1) ch = 1;
     if (obj->cur.map->normal_geometry.w != (x2 - x1)) ch = 1;
-    if (obj->cur.map->normal_geometry.h != (y2 - y1)) ch = 1;
+    if (obj->cur.map->normal_geometry.h != (yy2 - yy1)) ch = 1;
     obj->cur.map->normal_geometry.x = x1;
-    obj->cur.map->normal_geometry.y = y1;
+    obj->cur.map->normal_geometry.y = yy1;
     obj->cur.map->normal_geometry.w = (x2 - x1);
-    obj->cur.map->normal_geometry.h = (y2 - y1);
+    obj->cur.map->normal_geometry.h = (yy2 - yy1);
     if (ch) _evas_map_calc_geom_change(obj);
  }
  

diff --cc src/lib/canvas/evas_object_image.c
index 4f61ea6,2553ec4..afb5800
mode 100755,100644..100755
--- 1/src/lib/canvas/evas_object_image.c
--- 2/src/lib/canvas/evas_object_image.c
+++ b/src/lib/canvas/evas_object_image.c

diff --cc src/modules/engines/gl_common/evas_gl_texture.c
Simple merge

diff --cc src/modules/engines/software_generic/evas_engine.c
Simple merge