aboutsummaryrefslogtreecommitdiffstats
path: root/src/lib/evas/common3d/primitives/primitive_common.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib/evas/common3d/primitives/primitive_common.c')
-rw-r--r--src/lib/evas/common3d/primitives/primitive_common.c24
1 files changed, 12 insertions, 12 deletions
diff --git a/src/lib/evas/common3d/primitives/primitive_common.c b/src/lib/evas/common3d/primitives/primitive_common.c
index 882e95216e..29d7cc3816 100644
--- a/src/lib/evas/common3d/primitives/primitive_common.c
+++ b/src/lib/evas/common3d/primitives/primitive_common.c
@@ -12,9 +12,9 @@ void _set_vertex_data_from_array(Evas_Canvas3D_Mesh *mesh,
float *address, *out;
int stride, i, j;
eo_do(mesh,
- evas_canvas3d_mesh_frame_vertex_data_copy_set(frame, attr, 0, NULL),
- address = (float *)evas_canvas3d_mesh_frame_vertex_data_map(frame, attr),
- stride = evas_canvas3d_mesh_frame_vertex_stride_get(frame, attr));
+ evas_canvas3d_mesh_frame_vertex_data_copy_set(mesh, frame, attr, 0, NULL),
+ address = (float *)evas_canvas3d_mesh_frame_vertex_data_map(mesh, frame, attr),
+ stride = evas_canvas3d_mesh_frame_vertex_stride_get(mesh, frame, attr));
if (stride == 0) stride = sizeof(float) * attr_count;
for (i = 0; i < vcount; i++)
{
@@ -23,7 +23,7 @@ void _set_vertex_data_from_array(Evas_Canvas3D_Mesh *mesh,
out[j] = data[start + (line * i) + j];
}
eo_do(mesh,
- evas_canvas3d_mesh_frame_vertex_data_unmap(frame, attr));
+ evas_canvas3d_mesh_frame_vertex_data_unmap(mesh, frame, attr));
}
void
@@ -36,9 +36,9 @@ _set_vec3_vertex_data(Evas_Canvas3D_Mesh *mesh,
float *address, *out;
int stride, i;
eo_do(mesh,
- evas_canvas3d_mesh_frame_vertex_data_copy_set(frame, attr, 0, NULL),
- address = (float *)evas_canvas3d_mesh_frame_vertex_data_map(frame, attr),
- stride = evas_canvas3d_mesh_frame_vertex_stride_get(frame, attr));
+ evas_canvas3d_mesh_frame_vertex_data_copy_set(mesh, frame, attr, 0, NULL),
+ address = (float *)evas_canvas3d_mesh_frame_vertex_data_map(mesh, frame, attr),
+ stride = evas_canvas3d_mesh_frame_vertex_stride_get(mesh, frame, attr));
if (stride == 0) stride = sizeof(float) * 3;
for (i = 0; i < vcount; i++)
{
@@ -49,7 +49,7 @@ _set_vec3_vertex_data(Evas_Canvas3D_Mesh *mesh,
}
free(data);
eo_do(mesh,
- evas_canvas3d_mesh_frame_vertex_data_unmap(frame, attr));
+ evas_canvas3d_mesh_frame_vertex_data_unmap(mesh, frame, attr));
}
void
@@ -62,9 +62,9 @@ _set_vec2_vertex_data(Evas_Canvas3D_Mesh *mesh,
float *address, *out;
int stride, i;
eo_do(mesh,
- evas_canvas3d_mesh_frame_vertex_data_copy_set(frame, attr, 0, NULL),
- address = (float *)evas_canvas3d_mesh_frame_vertex_data_map(frame, attr),
- stride = evas_canvas3d_mesh_frame_vertex_stride_get(frame, attr));
+ evas_canvas3d_mesh_frame_vertex_data_copy_set(mesh, frame, attr, 0, NULL),
+ address = (float *)evas_canvas3d_mesh_frame_vertex_data_map(mesh, frame, attr),
+ stride = evas_canvas3d_mesh_frame_vertex_stride_get(mesh, frame, attr));
if (stride == 0) stride = sizeof(float) * 2;
for (i = 0; i < vcount; i++)
{
@@ -74,7 +74,7 @@ _set_vec2_vertex_data(Evas_Canvas3D_Mesh *mesh,
}
free(data);
eo_do(mesh,
- evas_canvas3d_mesh_frame_vertex_data_unmap(frame, attr));
+ evas_canvas3d_mesh_frame_vertex_data_unmap(mesh, frame, attr));
}
void