evas: no need to call eo_data_scope_get in many case after this change.

Reduce CPU usage by 5% in some case (especially when the CPU is not the
limiting factor like with the GL backend).

2 files changed, 19 insertions, 14 deletions

diff --git a/src/lib/evas/include/evas_inline.x b/src/lib/evas/include/evas_inline.x
index 1ce86b847e..31de720c2b 100644
--- a/src/lib/evas/include/evas_inline.x
+++ b/src/lib/evas/include/evas_inline.x
@@ -69,7 +69,7 @@ evas_object_is_opaque(Evas_Object *eo_obj, Evas_Object_Protected_Data *obj)
    if (obj->cur->cache.clip.a == 255)
      {
         if (obj->func->is_opaque)
-          return obj->func->is_opaque(eo_obj, obj);
+          return obj->func->is_opaque(eo_obj, obj, obj->private_data);
         return 1;
      }
    if (obj->cur->render_op == EVAS_RENDER_COPY)
@@ -214,7 +214,7 @@ evas_object_coords_recalc(Evas_Object *eo_obj, Evas_Object_Protected_Data *obj)
 ////   obj->cur->cache.geometry.h =
 ////     evas_coord_world_y_to_screen(obj->layer->evas, obj->cur->geometry.h) -
 ////     evas_coord_world_y_to_screen(obj->layer->evas, 0);
-   if (obj->func->coords_recalc) obj->func->coords_recalc(eo_obj, obj);
+   if (obj->func->coords_recalc) obj->func->coords_recalc(eo_obj, obj, obj->private_data);
 ////   obj->cur->cache.geometry.validity = obj->layer->evas->output_validity;
 }
 
diff --git a/src/lib/evas/include/evas_private.h b/src/lib/evas/include/evas_private.h
index 76c557a837..8af4b27ce0 100644
--- a/src/lib/evas/include/evas_private.h
+++ b/src/lib/evas/include/evas_private.h
@@ -577,6 +577,7 @@ struct _Evas_Object_Protected_Data
    } clip;
 
    const Evas_Object_Func     *func;
+   void                       *private_data;
 
    struct {
       Evas_Smart              *smart;
@@ -716,10 +717,11 @@ struct _Evas_Device
 
 struct _Evas_Object_Func
 {
-   void (*free) (Evas_Object *obj, Evas_Object_Protected_Data *pd);
-   void (*render) (Evas_Object *obj, Evas_Object_Protected_Data *pd, void *output, void *context, void *surface, int x, int y, Eina_Bool do_async);
-   void (*render_pre) (Evas_Object *obj, Evas_Object_Protected_Data *pd);
-   void (*render_post) (Evas_Object *obj, Evas_Object_Protected_Data *pd);
+   void (*free) (Evas_Object *obj, Evas_Object_Protected_Data *pd, void *type_private_data);
+   void (*render) (Evas_Object *obj, Evas_Object_Protected_Data *pd, void *type_private_data,
+                   void *output, void *context, void *surface, int x, int y, Eina_Bool do_async);
+   void (*render_pre) (Evas_Object *obj, Evas_Object_Protected_Data *pd, void *type_private_data);
+   void (*render_post) (Evas_Object *obj, Evas_Object_Protected_Data *pd, void *type_private_data);
 
    unsigned int  (*type_id_get) (Evas_Object *obj);
    unsigned int  (*visual_id_get) (Evas_Object *obj);
@@ -731,18 +733,21 @@ struct _Evas_Object_Func
    int  (*is_visible) (Evas_Object *obj);
    int  (*was_visible) (Evas_Object *obj);
 
-   int  (*is_opaque) (Evas_Object *obj, Evas_Object_Protected_Data *pd);
-   int  (*was_opaque) (Evas_Object *obj, Evas_Object_Protected_Data *pd);
+   int  (*is_opaque) (Evas_Object *obj, Evas_Object_Protected_Data *pd, void *type_private_data);
+   int  (*was_opaque) (Evas_Object *obj, Evas_Object_Protected_Data *pd, void *type_private_data);
 
-   int  (*is_inside) (Evas_Object *obj, Evas_Object_Protected_Data *pd, Evas_Coord x, Evas_Coord y);
-   int  (*was_inside) (Evas_Object *obj, Evas_Object_Protected_Data *pd, Evas_Coord x, Evas_Coord y);
+   int  (*is_inside) (Evas_Object *obj, Evas_Object_Protected_Data *pd, void *type_private_data,
+                      Evas_Coord x, Evas_Coord y);
+   int  (*was_inside) (Evas_Object *obj, Evas_Object_Protected_Data *pd, void *type_private_data,
+                       Evas_Coord x, Evas_Coord y);
 
-   void (*coords_recalc) (Evas_Object *obj, Evas_Object_Protected_Data *pd);
+   void (*coords_recalc) (Evas_Object *obj, Evas_Object_Protected_Data *pd, void *type_private_data);
 
-   void (*scale_update) (Evas_Object *obj);
+   void (*scale_update) (Evas_Object *obj, Evas_Object_Protected_Data *pd, void *type_private_data);
 
-   int (*has_opaque_rect) (Evas_Object *obj, Evas_Object_Protected_Data *pd);
-   int (*get_opaque_rect) (Evas_Object *obj, Evas_Object_Protected_Data *pd, Evas_Coord *x, Evas_Coord *y, Evas_Coord *w, Evas_Coord *h);
+   int (*has_opaque_rect) (Evas_Object *obj, Evas_Object_Protected_Data *pd, void *type_private_data);
+   int (*get_opaque_rect) (Evas_Object *obj, Evas_Object_Protected_Data *pd, void *type_private_data,
+                           Evas_Coord *x, Evas_Coord *y, Evas_Coord *w, Evas_Coord *h);
 
    int (*can_map) (Evas_Object *obj);
 };