aboutsummaryrefslogtreecommitdiffstats
path: root/src/modules/evas
diff options
context:
space:
mode:
authorFelipe Magno de Almeida <felipe@expertisesolutions.com.br>2015-11-01 21:57:43 -0200
committerFelipe Magno de Almeida <felipe@expertisesolutions.com.br>2015-11-01 21:57:43 -0200
commitfa88a2337f4c1ed74dbe5f8e9b8ab9e80aa94215 (patch)
tree289d1f0e30abe7aeb9100ab9ed3e3a755d1c18b7 /src/modules/evas
parentEo do: use the __thread directive when available to manage call stack. (diff)
downloadefl-fa88a2337f4c1ed74dbe5f8e9b8ab9e80aa94215.tar.gz
Eo: Partial implementation to remove eo_dodevs/felipealmeida/eo_optimisations
Diffstat (limited to 'src/modules/evas')
-rw-r--r--src/modules/evas/engines/gl_common/evas_gl_preload.c6
-rw-r--r--src/modules/evas/engines/gl_generic/ector_surface.c6
-rw-r--r--src/modules/evas/engines/gl_generic/evas_engine.c18
-rw-r--r--src/modules/evas/engines/software_generic/ector_surface.c6
-rw-r--r--src/modules/evas/engines/software_generic/evas_engine.c26
-rw-r--r--src/modules/evas/model_loaders/eet/evas_model_load_eet.c50
-rw-r--r--src/modules/evas/model_loaders/md2/evas_model_load_md2.c30
-rw-r--r--src/modules/evas/model_loaders/obj/evas_model_load_obj.c30
-rw-r--r--src/modules/evas/model_loaders/ply/evas_model_load_ply.c42
9 files changed, 107 insertions, 107 deletions
diff --git a/src/modules/evas/engines/gl_common/evas_gl_preload.c b/src/modules/evas/engines/gl_common/evas_gl_preload.c
index 5344473c1d..83d54a48bb 100644
--- a/src/modules/evas/engines/gl_common/evas_gl_preload.c
+++ b/src/modules/evas/engines/gl_common/evas_gl_preload.c
@@ -105,7 +105,7 @@ _evas_gl_preload_main_loop_wakeup(void)
if (async->tex)
{
EINA_LIST_FREE(async->tex->targets, target)
- eo_do(target, evas_obj_image_pixels_dirty_set(EINA_TRUE));
+ eo_do(target, evas_obj_image_pixels_dirty_set(target, EINA_TRUE));
}
async->im->cache_entry.flags.preload_done = 0;
if (async->tex)
@@ -316,7 +316,7 @@ evas_gl_preload_target_register(Evas_GL_Texture *tex, Eo *target)
EINA_SAFETY_ON_NULL_RETURN(tex);
eo_do(target,
- eo_event_callback_add(EO_EV_DEL, _evas_gl_preload_target_die, tex));
+ eo_event_callback_add(target, EO_EV_DEL, _evas_gl_preload_target_die, tex));
tex->targets = eina_list_append(tex->targets, target);
tex->references++;
}
@@ -330,7 +330,7 @@ evas_gl_preload_target_unregister(Evas_GL_Texture *tex, Eo *target)
EINA_SAFETY_ON_NULL_RETURN(tex);
eo_do(target,
- eo_event_callback_del(EO_EV_DEL, _evas_gl_preload_target_die, tex));
+ eo_event_callback_del(target, EO_EV_DEL, _evas_gl_preload_target_die, tex));
EINA_LIST_FOREACH(tex->targets, l, o)
if (o == target)
diff --git a/src/modules/evas/engines/gl_generic/ector_surface.c b/src/modules/evas/engines/gl_generic/ector_surface.c
index 01e3c5de0d..32805b95f2 100644
--- a/src/modules/evas/engines/gl_generic/ector_surface.c
+++ b/src/modules/evas/engines/gl_generic/ector_surface.c
@@ -21,7 +21,7 @@ _ector_cairo_symbol_get(Eo *ector_surface, const char *name)
void *sym;
eo_do(ector_surface,
- sym = ector_cairo_surface_symbol_get(name));
+ sym = ector_cairo_surface_symbol_get(ector_surface, name));
return sym;
}
@@ -88,8 +88,8 @@ _ector_cairo_software_surface_surface_set(Eo *obj, Ector_Cairo_Software_Surface_
end:
eo_do(obj,
- ector_cairo_surface_context_set(pd->ctx),
- ector_surface_size_set(pd->width, pd->height));
+ ector_cairo_surface_context_set(obj, pd->ctx),
+ ector_surface_size_set(obj, pd->width, pd->height));
}
static void
diff --git a/src/modules/evas/engines/gl_generic/evas_engine.c b/src/modules/evas/engines/gl_generic/evas_engine.c
index 2cf26ab235..dc67e6f3c3 100644
--- a/src/modules/evas/engines/gl_generic/evas_engine.c
+++ b/src/modules/evas/engines/gl_generic/evas_engine.c
@@ -2383,12 +2383,12 @@ eng_ector_create(void *data EINA_UNUSED)
ector_backend = getenv("ECTOR_BACKEND");
if (ector_backend && !strcasecmp(ector_backend, "default"))
{
- ector = eo_add(ECTOR_SOFTWARE_SURFACE_CLASS, NULL);
+ eo_add(ector, ECTOR_SOFTWARE_SURFACE_CLASS, NULL);
use_cairo = EINA_FALSE;
}
else
{
- ector = eo_add(ECTOR_CAIRO_SOFTWARE_SURFACE_CLASS, NULL);
+ eo_add(ector, ECTOR_CAIRO_SOFTWARE_SURFACE_CLASS, NULL);
use_cairo = EINA_TRUE;
}
return ector;
@@ -2471,7 +2471,7 @@ eng_ector_renderer_draw(void *data, void *context, void *surface, Ector_Renderer
eina_array_push(c, eina_rectangle_new(clip.x, clip.y, clip.w, clip.h));
eo_do(renderer,
- ector_renderer_draw(_evas_render_op_to_ector_rop(gc->dc->render_op),
+ ector_renderer_draw(renderer, _evas_render_op_to_ector_rop(gc->dc->render_op),
c,
// mul_col will be applied by GL during ector_end
0xffffffff));
@@ -2503,14 +2503,14 @@ eng_ector_begin(void *data EINA_UNUSED, void *context EINA_UNUSED, Ector_Surface
if (use_cairo)
{
eo_do(ector,
- ector_cairo_software_surface_set(software_buffer, w, h),
- ector_surface_reference_point_set(x, y));
+ ector_cairo_software_surface_set(ector, software_buffer, w, h),
+ ector_surface_reference_point_set(ector, x, y));
}
else
{
eo_do(ector,
- ector_software_surface_set(software_buffer, w, h),
- ector_surface_reference_point_set(x, y));
+ ector_software_surface_set(ector, software_buffer, w, h),
+ ector_surface_reference_point_set(ector, x, y));
}
}
@@ -2531,12 +2531,12 @@ eng_ector_end(void *data, void *context EINA_UNUSED, Ector_Surface *ector,
if (use_cairo)
{
eo_do(ector,
- ector_cairo_software_surface_set(NULL, 0, 0));
+ ector_cairo_software_surface_set(ector, NULL, 0, 0));
}
else
{
eo_do(ector,
- ector_software_surface_set(NULL, 0, 0));
+ ector_software_surface_set(ector, NULL, 0, 0));
}
im = evas_gl_common_image_new_from_copied_data(gl_context, w, h, software_buffer, 1, EVAS_COLORSPACE_ARGB8888);
diff --git a/src/modules/evas/engines/software_generic/ector_surface.c b/src/modules/evas/engines/software_generic/ector_surface.c
index ffa32313b6..d202cf6c8f 100644
--- a/src/modules/evas/engines/software_generic/ector_surface.c
+++ b/src/modules/evas/engines/software_generic/ector_surface.c
@@ -21,7 +21,7 @@ _ector_cairo_symbol_get(Eo *ector_surface, const char *name)
void *sym;
eo_do(ector_surface,
- sym = ector_cairo_surface_symbol_get(name));
+ sym = ector_cairo_surface_symbol_get(ector_surface, name));
return sym;
}
@@ -90,8 +90,8 @@ _ector_cairo_software_surface_surface_set(Eo *obj, Ector_Cairo_Software_Surface_
evas_common_cpu_end_opt();
eo_do(obj,
- ector_cairo_surface_context_set(ctx),
- ector_surface_size_set(pd->width, pd->height));
+ ector_cairo_surface_context_set(obj, ctx),
+ ector_surface_size_set(obj, pd->width, pd->height));
}
void
diff --git a/src/modules/evas/engines/software_generic/evas_engine.c b/src/modules/evas/engines/software_generic/evas_engine.c
index d9b8956c99..4ea11f6feb 100644
--- a/src/modules/evas/engines/software_generic/evas_engine.c
+++ b/src/modules/evas/engines/software_generic/evas_engine.c
@@ -3679,12 +3679,12 @@ eng_ector_create(void *data EINA_UNUSED)
ector_backend = getenv("ECTOR_BACKEND");
if (ector_backend && !strcasecmp(ector_backend, "default"))
{
- ector = eo_add(ECTOR_SOFTWARE_SURFACE_CLASS, NULL);
+ eo_add(ector, ECTOR_SOFTWARE_SURFACE_CLASS, NULL);
use_cairo = EINA_FALSE;
}
else
{
- ector = eo_add(ECTOR_CAIRO_SOFTWARE_SURFACE_CLASS, NULL);
+ eo_add(ector, ECTOR_CAIRO_SOFTWARE_SURFACE_CLASS, NULL);
use_cairo = EINA_TRUE;
}
return ector;
@@ -3729,7 +3729,7 @@ _draw_thread_ector_draw(void *data)
Evas_Thread_Command_Ector *ector = data;
eo_do(ector->r,
- ector_renderer_draw(ector->render_op,
+ ector_renderer_draw(ector->r, ector->render_op,
ector->clips,
ector->mul_col));
@@ -3848,14 +3848,14 @@ _draw_thread_ector_surface_set(void *data)
if (use_cairo)
{
eo_do(ector_surface->ector,
- ector_cairo_software_surface_set(pixels, w, h),
- ector_surface_reference_point_set(x, y));
+ ector_cairo_software_surface_set(ector_surface->ector, pixels, w, h),
+ ector_surface_reference_point_set(ector_surface->ector, x, y));
}
else
{
eo_do(ector_surface->ector,
- ector_software_surface_set(pixels, w, h),
- ector_surface_reference_point_set(x, y));
+ ector_software_surface_set(ector_surface->ector, pixels, w, h),
+ ector_surface_reference_point_set(ector_surface->ector, x, y));
}
eina_mempool_free(_mp_command_ector_surface, ector_surface);
@@ -3892,14 +3892,14 @@ eng_ector_begin(void *data EINA_UNUSED, void *context EINA_UNUSED, Ector_Surface
if (use_cairo)
{
eo_do(ector,
- ector_cairo_software_surface_set(pixels, w, h),
- ector_surface_reference_point_set(x, y));
+ ector_cairo_software_surface_set(ector, pixels, w, h),
+ ector_surface_reference_point_set(ector, x, y));
}
else
{
eo_do(ector,
- ector_software_surface_set(pixels, w, h),
- ector_surface_reference_point_set(x, y));
+ ector_software_surface_set(ector, pixels, w, h),
+ ector_surface_reference_point_set(ector, x, y));
}
}
}
@@ -3924,12 +3924,12 @@ eng_ector_end(void *data EINA_UNUSED, void *context EINA_UNUSED, Ector_Surface *
if (use_cairo)
{
eo_do(ector,
- ector_cairo_software_surface_set(NULL, 0, 0));
+ ector_cairo_software_surface_set(ector, NULL, 0, 0));
}
else
{
eo_do(ector,
- ector_software_surface_set(NULL, 0, 0));
+ ector_software_surface_set(ector, NULL, 0, 0));
}
evas_common_cpu_end_opt();
diff --git a/src/modules/evas/model_loaders/eet/evas_model_load_eet.c b/src/modules/evas/model_loaders/eet/evas_model_load_eet.c
index a36dff4f34..3b497615de 100644
--- a/src/modules/evas/model_loaders/eet/evas_model_load_eet.c
+++ b/src/modules/evas/model_loaders/eet/evas_model_load_eet.c
@@ -19,21 +19,21 @@ _set_geometry_to_mesh_from_eet_file(Evas_Canvas3D_Mesh *mesh,
int stride_pos, stride_nor, stride_tex, j;
eo_do(mesh,
- evas_canvas3d_mesh_vertex_count_set(eet_mesh->geometries->vertices_count),
- evas_canvas3d_mesh_vertex_assembly_set(EVAS_CANVAS3D_VERTEX_ASSEMBLY_TRIANGLES),
- evas_canvas3d_mesh_frame_add(0),
+ evas_canvas3d_mesh_vertex_count_set(mesh, eet_mesh->geometries->vertices_count),
+ evas_canvas3d_mesh_vertex_assembly_set(mesh, EVAS_CANVAS3D_VERTEX_ASSEMBLY_TRIANGLES),
+ evas_canvas3d_mesh_frame_add(mesh, 0),
- evas_canvas3d_mesh_frame_vertex_data_copy_set(0, EVAS_CANVAS3D_VERTEX_ATTRIB_POSITION, 0, NULL),
- evas_canvas3d_mesh_frame_vertex_data_copy_set(0, EVAS_CANVAS3D_VERTEX_ATTRIB_NORMAL, 0, NULL),
- evas_canvas3d_mesh_frame_vertex_data_copy_set(0, EVAS_CANVAS3D_VERTEX_ATTRIB_TEXCOORD, 0, NULL),
+ evas_canvas3d_mesh_frame_vertex_data_copy_set(mesh, 0, EVAS_CANVAS3D_VERTEX_ATTRIB_POSITION, 0, NULL),
+ evas_canvas3d_mesh_frame_vertex_data_copy_set(mesh, 0, EVAS_CANVAS3D_VERTEX_ATTRIB_NORMAL, 0, NULL),
+ evas_canvas3d_mesh_frame_vertex_data_copy_set(mesh, 0, EVAS_CANVAS3D_VERTEX_ATTRIB_TEXCOORD, 0, NULL),
- pos = (float *)evas_canvas3d_mesh_frame_vertex_data_map(0, EVAS_CANVAS3D_VERTEX_ATTRIB_POSITION),
- nor = (float *)evas_canvas3d_mesh_frame_vertex_data_map(0, EVAS_CANVAS3D_VERTEX_ATTRIB_NORMAL),
- tex = (float *)evas_canvas3d_mesh_frame_vertex_data_map(0, EVAS_CANVAS3D_VERTEX_ATTRIB_TEXCOORD),
+ pos = (float *)evas_canvas3d_mesh_frame_vertex_data_map(mesh, 0, EVAS_CANVAS3D_VERTEX_ATTRIB_POSITION),
+ nor = (float *)evas_canvas3d_mesh_frame_vertex_data_map(mesh, 0, EVAS_CANVAS3D_VERTEX_ATTRIB_NORMAL),
+ tex = (float *)evas_canvas3d_mesh_frame_vertex_data_map(mesh, 0, EVAS_CANVAS3D_VERTEX_ATTRIB_TEXCOORD),
- stride_pos = evas_canvas3d_mesh_frame_vertex_stride_get(0, EVAS_CANVAS3D_VERTEX_ATTRIB_POSITION),
- stride_nor = evas_canvas3d_mesh_frame_vertex_stride_get(0, EVAS_CANVAS3D_VERTEX_ATTRIB_NORMAL),
- stride_tex = evas_canvas3d_mesh_frame_vertex_stride_get(0, EVAS_CANVAS3D_VERTEX_ATTRIB_TEXCOORD));
+ stride_pos = evas_canvas3d_mesh_frame_vertex_stride_get(mesh, 0, EVAS_CANVAS3D_VERTEX_ATTRIB_POSITION),
+ stride_nor = evas_canvas3d_mesh_frame_vertex_stride_get(mesh, 0, EVAS_CANVAS3D_VERTEX_ATTRIB_NORMAL),
+ stride_tex = evas_canvas3d_mesh_frame_vertex_stride_get(mesh, 0, EVAS_CANVAS3D_VERTEX_ATTRIB_TEXCOORD));
if (stride_pos == 0) stride_pos = sizeof(float) * 3;
if (stride_nor == 0) stride_nor = sizeof(float) * 3;
@@ -62,9 +62,9 @@ _set_geometry_to_mesh_from_eet_file(Evas_Canvas3D_Mesh *mesh,
/* unmap vertex buffer */
eo_do(mesh,
- evas_canvas3d_mesh_frame_vertex_data_unmap(0, EVAS_CANVAS3D_VERTEX_ATTRIB_POSITION),
- evas_canvas3d_mesh_frame_vertex_data_unmap(0, EVAS_CANVAS3D_VERTEX_ATTRIB_NORMAL),
- evas_canvas3d_mesh_frame_vertex_data_unmap(0, EVAS_CANVAS3D_VERTEX_ATTRIB_TEXCOORD));
+ evas_canvas3d_mesh_frame_vertex_data_unmap(mesh, 0, EVAS_CANVAS3D_VERTEX_ATTRIB_POSITION),
+ evas_canvas3d_mesh_frame_vertex_data_unmap(mesh, 0, EVAS_CANVAS3D_VERTEX_ATTRIB_NORMAL),
+ evas_canvas3d_mesh_frame_vertex_data_unmap(mesh, 0, EVAS_CANVAS3D_VERTEX_ATTRIB_TEXCOORD));
}
void
@@ -73,34 +73,34 @@ _set_material_to_mesh_from_eet_file(Evas_Canvas3D_Mesh *mesh,
{
Evas_Canvas3D_Object_Data *pd = eo_data_scope_get(mesh, EVAS_CANVAS3D_OBJECT_CLASS);
Eo *material = NULL;
- material = eo_add(EVAS_CANVAS3D_MATERIAL_CLASS, pd->evas);
+ eo_add(material, EVAS_CANVAS3D_MATERIAL_CLASS, pd->evas);
eo_do(material,
- evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT,
+ evas_canvas3d_material_enable_set(material, EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT,
!!(eet_mesh->materials->colors[0].a > 0)),
- evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE,
+ evas_canvas3d_material_enable_set(material, EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE,
!!(eet_mesh->materials->colors[1].a > 0)),
- evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR,
+ evas_canvas3d_material_enable_set(material, EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR,
!!(eet_mesh->materials->colors[2].a > 0)),
- evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_NORMAL, EINA_TRUE),
- evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT,
+ evas_canvas3d_material_enable_set(material, EVAS_CANVAS3D_MATERIAL_ATTRIB_NORMAL, EINA_TRUE),
+ evas_canvas3d_material_color_set(material, EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT,
eet_mesh->materials->colors[0].r,
eet_mesh->materials->colors[0].g,
eet_mesh->materials->colors[0].b,
eet_mesh->materials->colors[0].a),
- evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE,
+ evas_canvas3d_material_color_set(material, EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE,
eet_mesh->materials->colors[1].r,
eet_mesh->materials->colors[1].g,
eet_mesh->materials->colors[1].b,
eet_mesh->materials->colors[1].a),
- evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR,
+ evas_canvas3d_material_color_set(material, EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR,
eet_mesh->materials->colors[2].r,
eet_mesh->materials->colors[2].g,
eet_mesh->materials->colors[2].b,
eet_mesh->materials->colors[2].a),
- evas_canvas3d_material_shininess_set(eet_mesh->materials->shininess));
+ evas_canvas3d_material_shininess_set(material, eet_mesh->materials->shininess));
- eo_do(mesh, evas_canvas3d_mesh_frame_material_set(0, material));
+ eo_do(mesh, evas_canvas3d_mesh_frame_material_set(mesh, 0, material));
}
void
diff --git a/src/modules/evas/model_loaders/md2/evas_model_load_md2.c b/src/modules/evas/model_loaders/md2/evas_model_load_md2.c
index 530b4d5e01..9408cd7a81 100644
--- a/src/modules/evas/model_loaders/md2/evas_model_load_md2.c
+++ b/src/modules/evas/model_loaders/md2/evas_model_load_md2.c
@@ -338,8 +338,8 @@ evas_model_load_file_md2(Evas_Canvas3D_Mesh *mesh, Eina_File *file)
t_scale = 1.0 / (float)(loader.skin_height - 1);
eo_do(mesh,
- evas_canvas3d_mesh_vertex_count_set(loader.triangle_count * 3),
- evas_canvas3d_mesh_vertex_assembly_set(EVAS_CANVAS3D_VERTEX_ASSEMBLY_TRIANGLES));
+ evas_canvas3d_mesh_vertex_count_set(mesh, loader.triangle_count * 3),
+ evas_canvas3d_mesh_vertex_assembly_set(mesh, EVAS_CANVAS3D_VERTEX_ASSEMBLY_TRIANGLES));
/* Load frames */
for (i = 0; i < loader.frame_count; i++)
@@ -349,21 +349,21 @@ evas_model_load_file_md2(Evas_Canvas3D_Mesh *mesh, Eina_File *file)
eo_do(mesh,
/* Add a mesh frame. */
- evas_canvas3d_mesh_frame_add(f),
+ evas_canvas3d_mesh_frame_add(mesh, f),
/* Allocate vertex buffer for the frame. */
- evas_canvas3d_mesh_frame_vertex_data_copy_set(f, EVAS_CANVAS3D_VERTEX_ATTRIB_POSITION, 0, NULL),
- evas_canvas3d_mesh_frame_vertex_data_copy_set(f, EVAS_CANVAS3D_VERTEX_ATTRIB_NORMAL, 0, NULL),
- evas_canvas3d_mesh_frame_vertex_data_copy_set(f, EVAS_CANVAS3D_VERTEX_ATTRIB_TEXCOORD, 0, NULL),
+ evas_canvas3d_mesh_frame_vertex_data_copy_set(mesh, f, EVAS_CANVAS3D_VERTEX_ATTRIB_POSITION, 0, NULL),
+ evas_canvas3d_mesh_frame_vertex_data_copy_set(mesh, f, EVAS_CANVAS3D_VERTEX_ATTRIB_NORMAL, 0, NULL),
+ evas_canvas3d_mesh_frame_vertex_data_copy_set(mesh, f, EVAS_CANVAS3D_VERTEX_ATTRIB_TEXCOORD, 0, NULL),
/* Map vertex buffer. */
- pos = (float *)evas_canvas3d_mesh_frame_vertex_data_map(f, EVAS_CANVAS3D_VERTEX_ATTRIB_POSITION),
- nor = (float *)evas_canvas3d_mesh_frame_vertex_data_map(f, EVAS_CANVAS3D_VERTEX_ATTRIB_NORMAL),
- tex = (float *)evas_canvas3d_mesh_frame_vertex_data_map(f, EVAS_CANVAS3D_VERTEX_ATTRIB_TEXCOORD),
+ pos = (float *)evas_canvas3d_mesh_frame_vertex_data_map(mesh, f, EVAS_CANVAS3D_VERTEX_ATTRIB_POSITION),
+ nor = (float *)evas_canvas3d_mesh_frame_vertex_data_map(mesh, f, EVAS_CANVAS3D_VERTEX_ATTRIB_NORMAL),
+ tex = (float *)evas_canvas3d_mesh_frame_vertex_data_map(mesh, f, EVAS_CANVAS3D_VERTEX_ATTRIB_TEXCOORD),
- stride_pos = evas_canvas3d_mesh_frame_vertex_stride_get(f, EVAS_CANVAS3D_VERTEX_ATTRIB_POSITION),
- stride_nor = evas_canvas3d_mesh_frame_vertex_stride_get(f, EVAS_CANVAS3D_VERTEX_ATTRIB_NORMAL),
- stride_tex = evas_canvas3d_mesh_frame_vertex_stride_get(f, EVAS_CANVAS3D_VERTEX_ATTRIB_TEXCOORD));
+ stride_pos = evas_canvas3d_mesh_frame_vertex_stride_get(mesh, f, EVAS_CANVAS3D_VERTEX_ATTRIB_POSITION),
+ stride_nor = evas_canvas3d_mesh_frame_vertex_stride_get(mesh, f, EVAS_CANVAS3D_VERTEX_ATTRIB_NORMAL),
+ stride_tex = evas_canvas3d_mesh_frame_vertex_stride_get(mesh, f, EVAS_CANVAS3D_VERTEX_ATTRIB_TEXCOORD));
if (stride_pos == 0)
stride_pos = sizeof(float) * 3;
@@ -405,9 +405,9 @@ evas_model_load_file_md2(Evas_Canvas3D_Mesh *mesh, Eina_File *file)
/* Unmap vertex buffer. */
eo_do(mesh,
- evas_canvas3d_mesh_frame_vertex_data_unmap(f, EVAS_CANVAS3D_VERTEX_ATTRIB_POSITION),
- evas_canvas3d_mesh_frame_vertex_data_unmap(f, EVAS_CANVAS3D_VERTEX_ATTRIB_NORMAL),
- evas_canvas3d_mesh_frame_vertex_data_unmap(f, EVAS_CANVAS3D_VERTEX_ATTRIB_TEXCOORD));
+ evas_canvas3d_mesh_frame_vertex_data_unmap(mesh, f, EVAS_CANVAS3D_VERTEX_ATTRIB_POSITION),
+ evas_canvas3d_mesh_frame_vertex_data_unmap(mesh, f, EVAS_CANVAS3D_VERTEX_ATTRIB_NORMAL),
+ evas_canvas3d_mesh_frame_vertex_data_unmap(mesh, f, EVAS_CANVAS3D_VERTEX_ATTRIB_TEXCOORD));
pd = eo_data_scope_get(mesh, EVAS_CANVAS3D_MESH_CLASS);
diff --git a/src/modules/evas/model_loaders/obj/evas_model_load_obj.c b/src/modules/evas/model_loaders/obj/evas_model_load_obj.c
index bd5777f4d3..dc25c3275c 100644
--- a/src/modules/evas/model_loaders/obj/evas_model_load_obj.c
+++ b/src/modules/evas/model_loaders/obj/evas_model_load_obj.c
@@ -373,24 +373,24 @@ evas_model_load_file_obj(Evas_Canvas3D_Mesh *mesh, Eina_File *file)
/* prepare of mesh and take pointers to data which must be read */
eo_do(mesh,
- evas_canvas3d_mesh_vertex_count_set(counts._triangles_counter * 3),
- evas_canvas3d_mesh_vertex_assembly_set(EVAS_CANVAS3D_VERTEX_ASSEMBLY_TRIANGLES),
- evas_canvas3d_mesh_frame_add(0),
- evas_canvas3d_mesh_frame_vertex_data_copy_set(0, EVAS_CANVAS3D_VERTEX_ATTRIB_POSITION, 0, NULL),
- pos = (float *)evas_canvas3d_mesh_frame_vertex_data_map(0, EVAS_CANVAS3D_VERTEX_ATTRIB_POSITION),
- stride_pos = evas_canvas3d_mesh_frame_vertex_stride_get(0, EVAS_CANVAS3D_VERTEX_ATTRIB_POSITION));
+ evas_canvas3d_mesh_vertex_count_set(mesh, counts._triangles_counter * 3),
+ evas_canvas3d_mesh_vertex_assembly_set(mesh, EVAS_CANVAS3D_VERTEX_ASSEMBLY_TRIANGLES),
+ evas_canvas3d_mesh_frame_add(mesh, 0),
+ evas_canvas3d_mesh_frame_vertex_data_copy_set(mesh, 0, EVAS_CANVAS3D_VERTEX_ATTRIB_POSITION, 0, NULL),
+ pos = (float *)evas_canvas3d_mesh_frame_vertex_data_map(mesh, 0, EVAS_CANVAS3D_VERTEX_ATTRIB_POSITION),
+ stride_pos = evas_canvas3d_mesh_frame_vertex_stride_get(mesh, 0, EVAS_CANVAS3D_VERTEX_ATTRIB_POSITION));
if (counts.existence_of_normal)
eo_do(mesh,
- evas_canvas3d_mesh_frame_vertex_data_copy_set(0, EVAS_CANVAS3D_VERTEX_ATTRIB_NORMAL, 0, NULL),
- nor = (float *)evas_canvas3d_mesh_frame_vertex_data_map(0, EVAS_CANVAS3D_VERTEX_ATTRIB_NORMAL),
- stride_nor = evas_canvas3d_mesh_frame_vertex_stride_get(0, EVAS_CANVAS3D_VERTEX_ATTRIB_NORMAL));
+ evas_canvas3d_mesh_frame_vertex_data_copy_set(mesh, 0, EVAS_CANVAS3D_VERTEX_ATTRIB_NORMAL, 0, NULL),
+ nor = (float *)evas_canvas3d_mesh_frame_vertex_data_map(mesh, 0, EVAS_CANVAS3D_VERTEX_ATTRIB_NORMAL),
+ stride_nor = evas_canvas3d_mesh_frame_vertex_stride_get(mesh, 0, EVAS_CANVAS3D_VERTEX_ATTRIB_NORMAL));
if (counts.existence_of_tex_point)
eo_do(mesh,
- evas_canvas3d_mesh_frame_vertex_data_copy_set(0, EVAS_CANVAS3D_VERTEX_ATTRIB_TEXCOORD, 0, NULL),
- tex = (float *)evas_canvas3d_mesh_frame_vertex_data_map(0, EVAS_CANVAS3D_VERTEX_ATTRIB_TEXCOORD),
- stride_tex = evas_canvas3d_mesh_frame_vertex_stride_get(0, EVAS_CANVAS3D_VERTEX_ATTRIB_TEXCOORD));
+ evas_canvas3d_mesh_frame_vertex_data_copy_set(mesh, 0, EVAS_CANVAS3D_VERTEX_ATTRIB_TEXCOORD, 0, NULL),
+ tex = (float *)evas_canvas3d_mesh_frame_vertex_data_map(mesh, 0, EVAS_CANVAS3D_VERTEX_ATTRIB_TEXCOORD),
+ stride_tex = evas_canvas3d_mesh_frame_vertex_stride_get(mesh, 0, EVAS_CANVAS3D_VERTEX_ATTRIB_TEXCOORD));
if (stride_pos == 0) stride_pos = sizeof(float) * 3;
if ((counts.existence_of_normal) && (stride_nor == 0))
@@ -437,11 +437,11 @@ evas_model_load_file_obj(Evas_Canvas3D_Mesh *mesh, Eina_File *file)
free(_triangles);
/* Unmap vertex buffer. */
- eo_do(mesh, evas_canvas3d_mesh_frame_vertex_data_unmap(0, EVAS_CANVAS3D_VERTEX_ATTRIB_POSITION));
+ eo_do(mesh, evas_canvas3d_mesh_frame_vertex_data_unmap(mesh, 0, EVAS_CANVAS3D_VERTEX_ATTRIB_POSITION));
if (counts.existence_of_normal)
- eo_do(mesh, evas_canvas3d_mesh_frame_vertex_data_unmap(0, EVAS_CANVAS3D_VERTEX_ATTRIB_NORMAL));
+ eo_do(mesh, evas_canvas3d_mesh_frame_vertex_data_unmap(mesh, 0, EVAS_CANVAS3D_VERTEX_ATTRIB_NORMAL));
if (counts.existence_of_tex_point)
- eo_do(mesh, evas_canvas3d_mesh_frame_vertex_data_unmap(0, EVAS_CANVAS3D_VERTEX_ATTRIB_TEXCOORD));
+ eo_do(mesh, evas_canvas3d_mesh_frame_vertex_data_unmap(mesh, 0, EVAS_CANVAS3D_VERTEX_ATTRIB_TEXCOORD));
Evas_Canvas3D_Mesh_Data *pd = eo_data_scope_get(mesh, EVAS_CANVAS3D_MESH_CLASS);
diff --git a/src/modules/evas/model_loaders/ply/evas_model_load_ply.c b/src/modules/evas/model_loaders/ply/evas_model_load_ply.c
index ad56abcc8a..2f0602352a 100644
--- a/src/modules/evas/model_loaders/ply/evas_model_load_ply.c
+++ b/src/modules/evas/model_loaders/ply/evas_model_load_ply.c
@@ -275,23 +275,23 @@ evas_model_load_file_ply(Evas_Canvas3D_Mesh *mesh, Eina_File *file)
/* prepare of mesh and take pointers to data which must be read */
eo_do(mesh,
- evas_canvas3d_mesh_vertex_count_set(header.triangles_count * 3),
- evas_canvas3d_mesh_vertex_assembly_set(EVAS_CANVAS3D_VERTEX_ASSEMBLY_TRIANGLES),
- evas_canvas3d_mesh_frame_add(0),
- evas_canvas3d_mesh_frame_vertex_data_copy_set(0, EVAS_CANVAS3D_VERTEX_ATTRIB_POSITION, 0, NULL),
- evas_canvas3d_mesh_frame_vertex_data_copy_set(0, EVAS_CANVAS3D_VERTEX_ATTRIB_NORMAL, 0, NULL),
- evas_canvas3d_mesh_frame_vertex_data_copy_set(0, EVAS_CANVAS3D_VERTEX_ATTRIB_TEXCOORD, 0, NULL),
- evas_canvas3d_mesh_frame_vertex_data_copy_set(0, EVAS_CANVAS3D_VERTEX_ATTRIB_COLOR, 0, NULL),
-
- pos = (float *)evas_canvas3d_mesh_frame_vertex_data_map(0, EVAS_CANVAS3D_VERTEX_ATTRIB_POSITION),
- nor = (float *)evas_canvas3d_mesh_frame_vertex_data_map(0, EVAS_CANVAS3D_VERTEX_ATTRIB_NORMAL),
- tex = (float *)evas_canvas3d_mesh_frame_vertex_data_map(0, EVAS_CANVAS3D_VERTEX_ATTRIB_TEXCOORD),
- col = (float *)evas_canvas3d_mesh_frame_vertex_data_map(0, EVAS_CANVAS3D_VERTEX_ATTRIB_COLOR),
-
- stride_pos = evas_canvas3d_mesh_frame_vertex_stride_get(0, EVAS_CANVAS3D_VERTEX_ATTRIB_POSITION),
- stride_nor = evas_canvas3d_mesh_frame_vertex_stride_get(0, EVAS_CANVAS3D_VERTEX_ATTRIB_NORMAL),
- stride_tex = evas_canvas3d_mesh_frame_vertex_stride_get(0, EVAS_CANVAS3D_VERTEX_ATTRIB_TEXCOORD),
- stride_col = evas_canvas3d_mesh_frame_vertex_stride_get(0, EVAS_CANVAS3D_VERTEX_ATTRIB_COLOR));
+ evas_canvas3d_mesh_vertex_count_set(mesh, header.triangles_count * 3),
+ evas_canvas3d_mesh_vertex_assembly_set(mesh, EVAS_CANVAS3D_VERTEX_ASSEMBLY_TRIANGLES),
+ evas_canvas3d_mesh_frame_add(mesh, 0),
+ evas_canvas3d_mesh_frame_vertex_data_copy_set(mesh, 0, EVAS_CANVAS3D_VERTEX_ATTRIB_POSITION, 0, NULL),
+ evas_canvas3d_mesh_frame_vertex_data_copy_set(mesh, 0, EVAS_CANVAS3D_VERTEX_ATTRIB_NORMAL, 0, NULL),
+ evas_canvas3d_mesh_frame_vertex_data_copy_set(mesh, 0, EVAS_CANVAS3D_VERTEX_ATTRIB_TEXCOORD, 0, NULL),
+ evas_canvas3d_mesh_frame_vertex_data_copy_set(mesh, 0, EVAS_CANVAS3D_VERTEX_ATTRIB_COLOR, 0, NULL),
+
+ pos = (float *)evas_canvas3d_mesh_frame_vertex_data_map(mesh, 0, EVAS_CANVAS3D_VERTEX_ATTRIB_POSITION),
+ nor = (float *)evas_canvas3d_mesh_frame_vertex_data_map(mesh, 0, EVAS_CANVAS3D_VERTEX_ATTRIB_NORMAL),
+ tex = (float *)evas_canvas3d_mesh_frame_vertex_data_map(mesh, 0, EVAS_CANVAS3D_VERTEX_ATTRIB_TEXCOORD),
+ col = (float *)evas_canvas3d_mesh_frame_vertex_data_map(mesh, 0, EVAS_CANVAS3D_VERTEX_ATTRIB_COLOR),
+
+ stride_pos = evas_canvas3d_mesh_frame_vertex_stride_get(mesh, 0, EVAS_CANVAS3D_VERTEX_ATTRIB_POSITION),
+ stride_nor = evas_canvas3d_mesh_frame_vertex_stride_get(mesh, 0, EVAS_CANVAS3D_VERTEX_ATTRIB_NORMAL),
+ stride_tex = evas_canvas3d_mesh_frame_vertex_stride_get(mesh, 0, EVAS_CANVAS3D_VERTEX_ATTRIB_TEXCOORD),
+ stride_col = evas_canvas3d_mesh_frame_vertex_stride_get(mesh, 0, EVAS_CANVAS3D_VERTEX_ATTRIB_COLOR));
if (stride_pos == 0) stride_pos = sizeof(float) * 3;
if (stride_nor == 0) stride_nor = sizeof(float) * 3;
@@ -366,10 +366,10 @@ evas_model_load_file_ply(Evas_Canvas3D_Mesh *mesh, Eina_File *file)
/* Unmap vertex buffer. */
eo_do(mesh,
- evas_canvas3d_mesh_frame_vertex_data_unmap(0, EVAS_CANVAS3D_VERTEX_ATTRIB_POSITION),
- evas_canvas3d_mesh_frame_vertex_data_unmap(0, EVAS_CANVAS3D_VERTEX_ATTRIB_NORMAL),
- evas_canvas3d_mesh_frame_vertex_data_unmap(0, EVAS_CANVAS3D_VERTEX_ATTRIB_TEXCOORD),
- evas_canvas3d_mesh_frame_vertex_data_unmap(0, EVAS_CANVAS3D_VERTEX_ATTRIB_COLOR));
+ evas_canvas3d_mesh_frame_vertex_data_unmap(mesh, 0, EVAS_CANVAS3D_VERTEX_ATTRIB_POSITION),
+ evas_canvas3d_mesh_frame_vertex_data_unmap(mesh, 0, EVAS_CANVAS3D_VERTEX_ATTRIB_NORMAL),
+ evas_canvas3d_mesh_frame_vertex_data_unmap(mesh, 0, EVAS_CANVAS3D_VERTEX_ATTRIB_TEXCOORD),
+ evas_canvas3d_mesh_frame_vertex_data_unmap(mesh, 0, EVAS_CANVAS3D_VERTEX_ATTRIB_COLOR));
pd = eo_data_scope_get(mesh, EVAS_CANVAS3D_MESH_CLASS);