aboutsummaryrefslogtreecommitdiffstats
path: root/src/examples/elementary/performance/graphical.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/examples/elementary/performance/graphical.c')
-rw-r--r--src/examples/elementary/performance/graphical.c20
1 files changed, 12 insertions, 8 deletions
diff --git a/src/examples/elementary/performance/graphical.c b/src/examples/elementary/performance/graphical.c
index 06959ea2e7..3c7caa20fc 100644
--- a/src/examples/elementary/performance/graphical.c
+++ b/src/examples/elementary/performance/graphical.c
@@ -1,5 +1,9 @@
-#define EFL_EO_API_SUPPORT
-#define EFL_BETA_API_SUPPORT
+#ifndef EFL_EO_API_SUPPORT
+# define EFL_EO_API_SUPPORT
+#endif
+#ifndef EFL_BETA_API_SUPPORT
+# define EFL_BETA_API_SUPPORT
+#endif
#include <math.h>
#include <stdlib.h>
@@ -323,7 +327,7 @@ _change_scene_setup()
}
else
{
- efl_file_set(globalGraphical.mesh, globalGraphical.model_path, NULL);
+ efl_file_simple_load(globalGraphical.mesh, globalGraphical.model_path, NULL);
evas_canvas3d_mesh_frame_material_set(globalGraphical.mesh, 0, globalGraphical.material);
evas_canvas3d_mesh_shader_mode_set(globalGraphical.mesh, EVAS_CANVAS3D_SHADER_MODE_PHONG);
}
@@ -427,7 +431,7 @@ _init_scene(Evas_Object *img)
globalGraphical.material = efl_add(EVAS_CANVAS3D_MATERIAL_CLASS, globalGraphical.evas);
globalGraphical.texture = efl_add(EVAS_CANVAS3D_TEXTURE_CLASS, globalGraphical.evas);
- efl_file_set(globalGraphical.texture, "target_texture.png", NULL);
+ efl_file_simple_load(globalGraphical.texture, "target_texture.png", NULL);
evas_canvas3d_texture_filter_set(globalGraphical.texture, EVAS_CANVAS3D_TEXTURE_FILTER_LINEAR, EVAS_CANVAS3D_TEXTURE_FILTER_LINEAR);
evas_canvas3d_texture_wrap_set(globalGraphical.texture, EVAS_CANVAS3D_WRAP_MODE_REPEAT, EVAS_CANVAS3D_WRAP_MODE_REPEAT);
evas_canvas3d_material_texture_set(globalGraphical.material, EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, globalGraphical.texture);
@@ -460,7 +464,7 @@ _init_scene(Evas_Object *img)
}
else
{
- efl_file_set(globalGraphical.mesh, globalGraphical.model_path, NULL);
+ efl_file_simple_load(globalGraphical.mesh, globalGraphical.model_path, NULL);
evas_canvas3d_mesh_frame_material_set(globalGraphical.mesh, 0, globalGraphical.material);
evas_canvas3d_mesh_shader_mode_set(globalGraphical.mesh, EVAS_CANVAS3D_SHADER_MODE_PHONG);
}
@@ -492,7 +496,7 @@ _init_scene(Evas_Object *img)
}
static Eina_Bool
-_xml_attr_data(void *data, const char *key, const char *value)
+_xml_attr_data(void *data EINA_UNUSED, const char *key, const char *value)
{
char *format = NULL, *tmp = NULL, *a = NULL;
int i;
@@ -533,8 +537,8 @@ _xml_attr_data(void *data, const char *key, const char *value)
}
static Eina_Bool
-_xml_get_data(void *data, Eina_Simple_XML_Type type, const char *content,
- unsigned offset, unsigned length)
+_xml_get_data(void *data EINA_UNUSED, Eina_Simple_XML_Type type, const char *content,
+ unsigned offset EINA_UNUSED, unsigned length)
{
char str[512];
switch (type)