jpeg pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=260d838d221703ee8478c10bfa373ee1374f65d3
commit 260d838d221703ee8478c10bfa373ee1374f65d3
Author: Jean-Philippe Andre <jp.an...@samsung.com>
Date: Fri Dec 16 10:37:54 2016 +0900
evas: Remove context from polygon internal functions
It's not used
---
src/lib/evas/canvas/evas_main.c | 1 -
src/lib/evas/canvas/evas_object_polygon.c | 3 ---
src/lib/evas/include/evas_private.h | 4 ++--
src/modules/evas/engines/gl_generic/evas_engine.c | 4 ++--
src/modules/evas/engines/software_generic/evas_engine.c | 4 ++--
5 files changed, 6 insertions(+), 10 deletions(-)
diff --git a/src/lib/evas/canvas/evas_main.c b/src/lib/evas/canvas/evas_main.c
index c419631..5f7698f 100644
--- a/src/lib/evas/canvas/evas_main.c
+++ b/src/lib/evas/canvas/evas_main.c
@@ -856,7 +856,6 @@ _image_data_unset(Evas_Object_Protected_Data *obj,
Eina_List **list)
else CHECK(EFL_CANVAS_POLYGON_CLASS, Efl_Canvas_Polygon_Data,
data->engine_data =
obj->layer->evas->engine.func->polygon_points_clear(obj->layer->evas->engine.data.output,
-
obj->layer->evas->engine.data.context,
data->engine_data))
else CHECK(EVAS_CANVAS3D_TEXTURE_CLASS, Evas_Canvas3D_Texture_Data,
if (obj->layer->evas->engine.func->texture_free)
diff --git a/src/lib/evas/canvas/evas_object_polygon.c
b/src/lib/evas/canvas/evas_object_polygon.c
index 29f7ca1..45cb103 100644
--- a/src/lib/evas/canvas/evas_object_polygon.c
+++ b/src/lib/evas/canvas/evas_object_polygon.c
@@ -263,7 +263,6 @@ evas_object_polygon_free(Evas_Object *eo_obj EINA_UNUSED,
free(list_data);
}
o->engine_data =
obj->layer->evas->engine.func->polygon_points_clear(obj->layer->evas->engine.data.output,
-
obj->layer->evas->engine.data.context,
o->engine_data);
}
@@ -291,14 +290,12 @@ evas_object_polygon_render(Evas_Object *eo_obj
EINA_UNUSED,
if (o->changed)
{
o->engine_data =
obj->layer->evas->engine.func->polygon_points_clear(obj->layer->evas->engine.data.output,
-
obj->layer->evas->engine.data.context,
o->engine_data);
EINA_LIST_FOREACH(o->points, l, p)
{
//px = evas_coord_world_x_to_screen(obj->layer->evas, p->x);
//py = evas_coord_world_y_to_screen(obj->layer->evas, p->y);
o->engine_data =
obj->layer->evas->engine.func->polygon_point_add(obj->layer->evas->engine.data.output,
-
obj->layer->evas->engine.data.context,
o->engine_data,
p->x, p->y);
}
diff --git a/src/lib/evas/include/evas_private.h
b/src/lib/evas/include/evas_private.h
index 329c724..356c3c3 100644
--- a/src/lib/evas/include/evas_private.h
+++ b/src/lib/evas/include/evas_private.h
@@ -1390,8 +1390,8 @@ struct _Evas_Func
void (*line_draw) (void *data, void *context, void
*surface, int x1, int y1, int x2, int y2, Eina_Bool do_async);
- void *(*polygon_point_add) (void *data, void *context, void
*polygon, int x, int y);
- void *(*polygon_points_clear) (void *data, void *context, void
*polygon);
+ void *(*polygon_point_add) (void *data, void *polygon, int x,
int y);
+ void *(*polygon_points_clear) (void *data, void *polygon);
void (*polygon_draw) (void *data, void *context, void
*surface, void *polygon, int x, int y, Eina_Bool do_async);
void *(*image_load) (void *data, const char *file,
const char *key, int *error, Evas_Image_Load_Opts *lo);
diff --git a/src/modules/evas/engines/gl_generic/evas_engine.c
b/src/modules/evas/engines/gl_generic/evas_engine.c
index 77372c7..b0f467f 100644
--- a/src/modules/evas/engines/gl_generic/evas_engine.c
+++ b/src/modules/evas/engines/gl_generic/evas_engine.c
@@ -136,13 +136,13 @@ eng_line_draw(void *data, void *context, void *surface,
int p1x, int p1y, int p2
}
static void *
-eng_polygon_point_add(void *data EINA_UNUSED, void *context EINA_UNUSED, void
*polygon, int x, int y)
+eng_polygon_point_add(void *data EINA_UNUSED, void *polygon, int x, int y)
{
return evas_gl_common_poly_point_add(polygon, x, y);
}
static void *
-eng_polygon_points_clear(void *data EINA_UNUSED, void *context EINA_UNUSED,
void *polygon)
+eng_polygon_points_clear(void *data EINA_UNUSED, void *polygon)
{
return evas_gl_common_poly_points_clear(polygon);
}
diff --git a/src/modules/evas/engines/software_generic/evas_engine.c
b/src/modules/evas/engines/software_generic/evas_engine.c
index 840ed77..6ab60d2 100644
--- a/src/modules/evas/engines/software_generic/evas_engine.c
+++ b/src/modules/evas/engines/software_generic/evas_engine.c
@@ -864,13 +864,13 @@ eng_line_draw(void *data EINA_UNUSED, void *context, void
*surface, int x1, int
}
static void *
-eng_polygon_point_add(void *data EINA_UNUSED, void *context EINA_UNUSED, void
*polygon, int x, int y)
+eng_polygon_point_add(void *data EINA_UNUSED, void *polygon, int x, int y)
{
return evas_common_polygon_point_add(polygon, x, y);
}
static void *
-eng_polygon_points_clear(void *data EINA_UNUSED, void *context EINA_UNUSED,
void *polygon)
+eng_polygon_points_clear(void *data EINA_UNUSED, void *polygon)
{
return evas_common_polygon_points_clear(polygon);
}
--
