aboutsummaryrefslogtreecommitdiffstats
path: root/src/lib/evas/common3d/primitives/primitive_common.h
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/lib/evas/common3d/primitives/primitive_common.h
parentEo do: use the __thread directive when available to manage call stack. (diff)
downloadefl-devs/felipealmeida/eo_optimisations.tar.gz
Eo: Partial implementation to remove eo_dodevs/felipealmeida/eo_optimisations
Diffstat (limited to 'src/lib/evas/common3d/primitives/primitive_common.h')
-rw-r--r--src/lib/evas/common3d/primitives/primitive_common.h16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/lib/evas/common3d/primitives/primitive_common.h b/src/lib/evas/common3d/primitives/primitive_common.h
index 50092d711f..63d2c69416 100644
--- a/src/lib/evas/common3d/primitives/primitive_common.h
+++ b/src/lib/evas/common3d/primitives/primitive_common.h
@@ -19,13 +19,13 @@
#define SET_VERTEX_DATA(frame) \
Eina_Bool frame_exist; \
eo_do(mesh, \
- frame_exist = evas_canvas3d_mesh_frame_exist(frame)); \
+ frame_exist = evas_canvas3d_mesh_frame_exist(mesh, frame)); \
if (!frame_exist) \
eo_do(mesh, \
- evas_canvas3d_mesh_frame_add(frame)); \
+ evas_canvas3d_mesh_frame_add(mesh, frame)); \
eo_do(mesh, \
- evas_canvas3d_mesh_vertex_count_set(vcount), \
- evas_canvas3d_mesh_index_data_copy_set(EVAS_CANVAS3D_INDEX_FORMAT_UNSIGNED_SHORT, \
+ evas_canvas3d_mesh_vertex_count_set(mesh, vcount), \
+ evas_canvas3d_mesh_index_data_copy_set(mesh, EVAS_CANVAS3D_INDEX_FORMAT_UNSIGNED_SHORT, \
icount, &indices[0])); \
_set_vec3_vertex_data(mesh, frame, vcount, vertices, EVAS_CANVAS3D_VERTEX_ATTRIB_POSITION); \
_set_vec3_vertex_data(mesh, frame, vcount, normals, EVAS_CANVAS3D_VERTEX_ATTRIB_NORMAL); \
@@ -36,13 +36,13 @@
#define SET_VERTEX_DATA_FROM_ARRAY(mesh, frame, varray, vcount, indices, icount) \
Eina_Bool frame_exist; \
eo_do(mesh, \
- frame_exist = evas_canvas3d_mesh_frame_exist(frame)); \
+ frame_exist = evas_canvas3d_mesh_frame_exist(mesh, frame)); \
if (!frame_exist) \
eo_do(mesh, \
- evas_canvas3d_mesh_frame_add(frame)); \
+ evas_canvas3d_mesh_frame_add(mesh, frame)); \
eo_do(mesh, \
- evas_canvas3d_mesh_vertex_count_set(vcount), \
- evas_canvas3d_mesh_index_data_copy_set(EVAS_CANVAS3D_INDEX_FORMAT_UNSIGNED_SHORT, \
+ evas_canvas3d_mesh_vertex_count_set(mesh, vcount), \
+ evas_canvas3d_mesh_index_data_copy_set(mesh, EVAS_CANVAS3D_INDEX_FORMAT_UNSIGNED_SHORT, \
icount, &indices[0])); \
_set_vertex_data_from_array(mesh, frame, varray, EVAS_CANVAS3D_VERTEX_ATTRIB_POSITION, \
0, 3, 15, vcount); \