summaryrefslogtreecommitdiff
path: root/src/modules/evas
diff options
context:
space:
mode:
authorTom Hacohen <tom@stosb.com>2016-03-01 18:06:28 +0000
committerTom Hacohen <tom@stosb.com>2016-03-03 09:58:08 +0000
commitf21ade6123b9053fca8d1632644c48525a99d6e0 (patch)
treec5eb0445f471d21365a7a5a7b0ec7d279c11b398 /src/modules/evas
parent3faf3f3fc68a839f06b311c35ba020cb25e7c9c4 (diff)
Automatic migration to Eo4.
I just ran my script (email to follow) to migrate all of the EFL automatically. This commit is *only* the automatic conversion, so it can be easily reverted and re-run.
Diffstat (limited to '')
-rw-r--r--src/modules/evas/engines/gl_common/evas_gl_preload.c8
-rw-r--r--src/modules/evas/engines/gl_generic/evas_ector_gl_image_buffer.c14
-rw-r--r--src/modules/evas/engines/gl_generic/evas_ector_gl_rgbaimage_buffer.c13
-rw-r--r--src/modules/evas/engines/gl_generic/evas_engine.c26
-rw-r--r--src/modules/evas/engines/software_generic/evas_ector_software_buffer.c13
-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.c71
-rw-r--r--src/modules/evas/model_loaders/md2/evas_model_load_md2.c42
-rw-r--r--src/modules/evas/model_loaders/obj/evas_model_load_obj.c33
9 files changed, 92 insertions, 154 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 e566cb780b..52a8429092 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)
105 if (async->tex) 105 if (async->tex)
106 { 106 {
107 EINA_LIST_FREE(async->tex->targets, target) 107 EINA_LIST_FREE(async->tex->targets, target)
108 eo_do(target, evas_obj_image_pixels_dirty_set(EINA_TRUE)); 108 evas_obj_image_pixels_dirty_set(target, EINA_TRUE);
109 } 109 }
110 async->im->cache_entry.flags.preload_done = 0; 110 async->im->cache_entry.flags.preload_done = 0;
111 if (async->tex) 111 if (async->tex)
@@ -314,8 +314,7 @@ evas_gl_preload_target_register(Evas_GL_Texture *tex, Eo *target)
314{ 314{
315 EINA_SAFETY_ON_NULL_RETURN(tex); 315 EINA_SAFETY_ON_NULL_RETURN(tex);
316 316
317 eo_do(target, 317 eo_event_callback_add(target, EO_BASE_EVENT_DEL, _evas_gl_preload_target_die, tex);
318 eo_event_callback_add(EO_BASE_EVENT_DEL, _evas_gl_preload_target_die, tex));
319 tex->targets = eina_list_append(tex->targets, target); 318 tex->targets = eina_list_append(tex->targets, target);
320 tex->references++; 319 tex->references++;
321} 320}
@@ -328,8 +327,7 @@ evas_gl_preload_target_unregister(Evas_GL_Texture *tex, Eo *target)
328 327
329 EINA_SAFETY_ON_NULL_RETURN(tex); 328 EINA_SAFETY_ON_NULL_RETURN(tex);
330 329
331 eo_do(target, 330 eo_event_callback_del(target, EO_BASE_EVENT_DEL, _evas_gl_preload_target_die, tex);
332 eo_event_callback_del(EO_BASE_EVENT_DEL, _evas_gl_preload_target_die, tex));
333 331
334 EINA_LIST_FOREACH(tex->targets, l, o) 332 EINA_LIST_FOREACH(tex->targets, l, o)
335 if (o == target) 333 if (o == target)
diff --git a/src/modules/evas/engines/gl_generic/evas_ector_gl_image_buffer.c b/src/modules/evas/engines/gl_generic/evas_ector_gl_image_buffer.c
index dc68f1c52b..09e6a08ef9 100644
--- a/src/modules/evas/engines/gl_generic/evas_ector_gl_image_buffer.c
+++ b/src/modules/evas/engines/gl_generic/evas_ector_gl_image_buffer.c
@@ -88,13 +88,7 @@ _evas_ector_gl_image_buffer_evas_ector_buffer_engine_image_set(Eo *obj, Evas_Ect
88 } 88 }
89 89
90 pd->image = ENFN->image_ref(ENDT, im); 90 pd->image = ENFN->image_ref(ENDT, im);
91 eo_do(obj, ector_gl_buffer_base_attach(im->tex->pt->texture, 91 ector_gl_buffer_base_attach(obj, im->tex->pt->texture, im->tex->pt->fb, (Efl_Gfx_Colorspace) evas_gl_common_gl_format_to_colorspace(im->tex->pt->format), im->tex->w, im->tex->h, im->tex->x, im->tex->y, im->tex->pt->w, im->tex->pt->h, l, r, t, b);
92 im->tex->pt->fb,
93 (Efl_Gfx_Colorspace) evas_gl_common_gl_format_to_colorspace(im->tex->pt->format),
94 im->tex->w, im->tex->h,
95 im->tex->x, im->tex->y,
96 im->tex->pt->w, im->tex->pt->h,
97 l, r, t, b));
98 } 92 }
99 else 93 else
100 { 94 {
@@ -239,7 +233,7 @@ _evas_ector_gl_image_buffer_ector_generic_buffer_span_free(Eo *obj, Evas_Ector_G
239EOLIAN static Eo_Base * 233EOLIAN static Eo_Base *
240_evas_ector_gl_image_buffer_eo_base_constructor(Eo *obj, Evas_Ector_GL_Image_Buffer_Data *pd) 234_evas_ector_gl_image_buffer_eo_base_constructor(Eo *obj, Evas_Ector_GL_Image_Buffer_Data *pd)
241{ 235{
242 eo_do_super(obj, MY_CLASS, obj = eo_constructor()); 236 obj = eo_constructor(eo_super(obj, MY_CLASS));
243 pd->base = eo_data_ref(obj, ECTOR_GL_BUFFER_BASE_MIXIN); 237 pd->base = eo_data_ref(obj, ECTOR_GL_BUFFER_BASE_MIXIN);
244 pd->base->generic = eo_data_ref(obj, ECTOR_GENERIC_BUFFER_MIXIN); 238 pd->base->generic = eo_data_ref(obj, ECTOR_GENERIC_BUFFER_MIXIN);
245 pd->base->generic->eo = obj; 239 pd->base->generic->eo = obj;
@@ -252,7 +246,7 @@ _evas_ector_gl_image_buffer_eo_base_finalize(Eo *obj, Evas_Ector_GL_Image_Buffer
252 EINA_SAFETY_ON_NULL_RETURN_VAL(pd->base, NULL); 246 EINA_SAFETY_ON_NULL_RETURN_VAL(pd->base, NULL);
253 EINA_SAFETY_ON_NULL_RETURN_VAL(pd->image, NULL); 247 EINA_SAFETY_ON_NULL_RETURN_VAL(pd->image, NULL);
254 pd->base->generic->immutable = EINA_TRUE; 248 pd->base->generic->immutable = EINA_TRUE;
255 return eo_do_super_ret(obj, MY_CLASS, obj, eo_finalize()); 249 return eo_finalize(eo_super(obj, MY_CLASS));
256} 250}
257 251
258EOLIAN static void 252EOLIAN static void
@@ -264,7 +258,7 @@ _evas_ector_gl_image_buffer_eo_base_destructor(Eo *obj, Evas_Ector_GL_Image_Buff
264 eo_data_unref(obj, pd->base); 258 eo_data_unref(obj, pd->base);
265 ENFN->image_free(ENDT, pd->image); 259 ENFN->image_free(ENDT, pd->image);
266 eo_xunref(pd->evas, obj); 260 eo_xunref(pd->evas, obj);
267 eo_do_super(obj, MY_CLASS, eo_destructor()); 261 eo_destructor(eo_super(obj, MY_CLASS));
268} 262}
269 263
270#include "evas_ector_gl_image_buffer.eo.c" 264#include "evas_ector_gl_image_buffer.eo.c"
diff --git a/src/modules/evas/engines/gl_generic/evas_ector_gl_rgbaimage_buffer.c b/src/modules/evas/engines/gl_generic/evas_ector_gl_rgbaimage_buffer.c
index 4fb6723bd6..73c66a3d53 100644
--- a/src/modules/evas/engines/gl_generic/evas_ector_gl_rgbaimage_buffer.c
+++ b/src/modules/evas/engines/gl_generic/evas_ector_gl_rgbaimage_buffer.c
@@ -34,7 +34,7 @@ _evas_ector_gl_rgbaimage_buffer_evas_ector_buffer_engine_image_set(Eo *obj, Evas
34 Eina_Bool b; 34 Eina_Bool b;
35 35
36 EINA_SAFETY_ON_NULL_RETURN(image); 36 EINA_SAFETY_ON_NULL_RETURN(image);
37 if (eo_do_ret(obj, b, eo_finalized_get())) 37 if (eo_finalized_get(obj))
38 { 38 {
39 CRI("engine_image must be set at construction time only"); 39 CRI("engine_image must be set at construction time only");
40 return; 40 return;
@@ -51,10 +51,7 @@ _evas_ector_gl_rgbaimage_buffer_evas_ector_buffer_engine_image_set(Eo *obj, Evas
51 pd->image = im; 51 pd->image = im;
52 if (!pd->image) return; 52 if (!pd->image) return;
53 53
54 eo_do(obj, ector_buffer_pixels_set(im->image.data, 54 ector_buffer_pixels_set(obj, im->image.data, im->cache_entry.w, im->cache_entry.h, 0, (Efl_Gfx_Colorspace) im->cache_entry.space, EINA_TRUE, 0, 0, 0, 0);
55 im->cache_entry.w, im->cache_entry.h, 0,
56 (Efl_Gfx_Colorspace) im->cache_entry.space,
57 EINA_TRUE, 0, 0, 0, 0));
58} 55}
59 56
60EOLIAN static void 57EOLIAN static void
@@ -93,7 +90,7 @@ end:
93EOLIAN static Eo * 90EOLIAN static Eo *
94_evas_ector_gl_rgbaimage_buffer_eo_base_constructor(Eo *obj, Evas_Ector_GL_RGBAImage_Buffer_Data *pd) 91_evas_ector_gl_rgbaimage_buffer_eo_base_constructor(Eo *obj, Evas_Ector_GL_RGBAImage_Buffer_Data *pd)
95{ 92{
96 eo_do_super(obj, MY_CLASS, obj = eo_constructor()); 93 obj = eo_constructor(eo_super(obj, MY_CLASS));
97 pd->base = eo_data_xref(obj, ECTOR_SOFTWARE_BUFFER_BASE_MIXIN, obj); 94 pd->base = eo_data_xref(obj, ECTOR_SOFTWARE_BUFFER_BASE_MIXIN, obj);
98 return obj; 95 return obj;
99} 96}
@@ -104,7 +101,7 @@ _evas_ector_gl_rgbaimage_buffer_eo_base_finalize(Eo *obj, Evas_Ector_GL_RGBAImag
104 EINA_SAFETY_ON_NULL_RETURN_VAL(pd->base, NULL); 101 EINA_SAFETY_ON_NULL_RETURN_VAL(pd->base, NULL);
105 EINA_SAFETY_ON_NULL_RETURN_VAL(pd->image, NULL); 102 EINA_SAFETY_ON_NULL_RETURN_VAL(pd->image, NULL);
106 pd->base->generic->immutable = EINA_TRUE; 103 pd->base->generic->immutable = EINA_TRUE;
107 return eo_do_super_ret(obj, MY_CLASS, obj, eo_finalize()); 104 return eo_finalize(eo_super(obj, MY_CLASS));
108} 105}
109 106
110EOLIAN static void 107EOLIAN static void
@@ -116,7 +113,7 @@ _evas_ector_gl_rgbaimage_buffer_eo_base_destructor(Eo *obj, Evas_Ector_GL_RGBAIm
116 ENFN->image_free(ENDT, pd->glim); 113 ENFN->image_free(ENDT, pd->glim);
117 evas_cache_image_drop(&pd->image->cache_entry); 114 evas_cache_image_drop(&pd->image->cache_entry);
118 eo_xunref(pd->evas, obj); 115 eo_xunref(pd->evas, obj);
119 eo_do_super(obj, MY_CLASS, eo_destructor()); 116 eo_destructor(eo_super(obj, MY_CLASS));
120} 117}
121 118
122#include "evas_ector_gl_rgbaimage_buffer.eo.c" 119#include "evas_ector_gl_rgbaimage_buffer.eo.c"
diff --git a/src/modules/evas/engines/gl_generic/evas_engine.c b/src/modules/evas/engines/gl_generic/evas_engine.c
index ddedadd777..d296cf660e 100644
--- a/src/modules/evas/engines/gl_generic/evas_engine.c
+++ b/src/modules/evas/engines/gl_generic/evas_engine.c
@@ -2477,15 +2477,13 @@ eng_ector_buffer_wrap(void *data EINA_UNUSED, Evas *evas, void *engine_image, Ei
2477 { 2477 {
2478 RGBA_Image *im = engine_image; 2478 RGBA_Image *im = engine_image;
2479 2479
2480 buf = eo_add(EVAS_ECTOR_GL_RGBAIMAGE_BUFFER_CLASS, evas, 2480 buf = eo_add(EVAS_ECTOR_GL_RGBAIMAGE_BUFFER_CLASS, evas, evas_ector_buffer_engine_image_set(eoid, evas, im));
2481 evas_ector_buffer_engine_image_set(evas, im));
2482 } 2481 }
2483 else 2482 else
2484 { 2483 {
2485 Evas_GL_Image *im = engine_image; 2484 Evas_GL_Image *im = engine_image;
2486 2485
2487 buf = eo_add(EVAS_ECTOR_GL_IMAGE_BUFFER_CLASS, evas, 2486 buf = eo_add(EVAS_ECTOR_GL_IMAGE_BUFFER_CLASS, evas, evas_ector_buffer_engine_image_set(eoid, evas, im));
2488 evas_ector_buffer_engine_image_set(evas, im));
2489 } 2487 }
2490 return buf; 2488 return buf;
2491} 2489}
@@ -2546,8 +2544,7 @@ eng_ector_buffer_new(void *data, Evas *evas, void *pixels,
2546 2544
2547 gc = re->window_gl_context_get(re->software.ob); 2545 gc = re->window_gl_context_get(re->software.ob);
2548 im = evas_gl_common_image_surface_new(gc, iw, ih, EINA_TRUE); 2546 im = evas_gl_common_image_surface_new(gc, iw, ih, EINA_TRUE);
2549 buf = eo_add(EVAS_ECTOR_GL_IMAGE_BUFFER_CLASS, evas, 2547 buf = eo_add(EVAS_ECTOR_GL_IMAGE_BUFFER_CLASS, evas, evas_ector_buffer_engine_image_set(eoid, evas, im));
2550 evas_ector_buffer_engine_image_set(evas, im));
2551 im->references--; 2548 im->references--;
2552 } 2549 }
2553 return buf; 2550 return buf;
@@ -2623,11 +2620,8 @@ eng_ector_renderer_draw(void *data, void *context, void *surface, void *engine_d
2623 if (eina_array_count(c) == 0) 2620 if (eina_array_count(c) == 0)
2624 eina_array_push(c, eina_rectangle_new(clip.x, clip.y, clip.w, clip.h)); 2621 eina_array_push(c, eina_rectangle_new(clip.x, clip.y, clip.w, clip.h));
2625 2622
2626 eo_do(renderer, 2623 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
2627 ector_renderer_draw(_evas_render_op_to_ector_rop(gc->dc->render_op), 2624 0xffffffff);
2628 c,
2629 // mul_col will be applied by GL during ector_end
2630 0xffffffff));
2631 2625
2632 while ((r = eina_array_pop(c))) 2626 while ((r = eina_array_pop(c)))
2633 eina_rectangle_free(r); 2627 eina_rectangle_free(r);
@@ -2704,16 +2698,14 @@ eng_ector_begin(void *data, void *context EINA_UNUSED, Ector_Surface *ector,
2704 } 2698 }
2705 } 2699 }
2706 memset(buffer->software, 0, sizeof (unsigned int) * w * h); 2700 memset(buffer->software, 0, sizeof (unsigned int) * w * h);
2707 eo_do(ector, 2701 ector_buffer_pixels_set(ector, buffer->software, w, h, 0, EFL_GFX_COLORSPACE_ARGB8888, EINA_TRUE, 0, 0, 0, 0);
2708 ector_buffer_pixels_set(buffer->software, w, h, 0, EFL_GFX_COLORSPACE_ARGB8888, 2702 ector_surface_reference_point_set(ector, x, y);
2709 EINA_TRUE, 0, 0, 0, 0),
2710 ector_surface_reference_point_set(x, y));
2711 } 2703 }
2712 else 2704 else
2713 { 2705 {
2714 evas_gl_common_context_flush(gl_context); 2706 evas_gl_common_context_flush(gl_context);
2715 2707
2716 eo_do(ector, ector_surface_reference_point_set(x, y)); 2708 ector_surface_reference_point_set(ector, x, y);
2717 } 2709 }
2718} 2710}
2719 2711
@@ -2734,7 +2726,7 @@ eng_ector_end(void *data, void *context EINA_UNUSED, Ector_Surface *ector,
2734 w = gl_context->w; h = gl_context->h; 2726 w = gl_context->w; h = gl_context->h;
2735 mul_use = gl_context->dc->mul.use; 2727 mul_use = gl_context->dc->mul.use;
2736 2728
2737 eo_do(ector, ector_buffer_pixels_set(NULL, 0, 0, 0, 0, 0, 0, 0, 0, 0)); 2729 ector_buffer_pixels_set(ector, NULL, 0, 0, 0, 0, 0, 0, 0, 0, 0);
2738 eng_image_data_put(data, buffer->gl, buffer->software); 2730 eng_image_data_put(data, buffer->gl, buffer->software);
2739 2731
2740 if (!mul_use) 2732 if (!mul_use)
diff --git a/src/modules/evas/engines/software_generic/evas_ector_software_buffer.c b/src/modules/evas/engines/software_generic/evas_ector_software_buffer.c
index d46b2c1119..bf00a1b2b3 100644
--- a/src/modules/evas/engines/software_generic/evas_ector_software_buffer.c
+++ b/src/modules/evas/engines/software_generic/evas_ector_software_buffer.c
@@ -28,7 +28,7 @@ _evas_ector_software_buffer_evas_ector_buffer_engine_image_set(Eo *obj, Evas_Ect
28 Eina_Bool b; 28 Eina_Bool b;
29 29
30 EINA_SAFETY_ON_NULL_RETURN(image); 30 EINA_SAFETY_ON_NULL_RETURN(image);
31 if (eo_do_ret(obj, b, eo_finalized_get())) 31 if (eo_finalized_get(obj))
32 { 32 {
33 CRI("engine_image must be set at construction time only"); 33 CRI("engine_image must be set at construction time only");
34 return; 34 return;
@@ -45,10 +45,7 @@ _evas_ector_software_buffer_evas_ector_buffer_engine_image_set(Eo *obj, Evas_Ect
45 pd->image = im; 45 pd->image = im;
46 if (!pd->image) return; 46 if (!pd->image) return;
47 47
48 eo_do(obj, ector_buffer_pixels_set(im->image.data, 48 ector_buffer_pixels_set(obj, im->image.data, im->cache_entry.w, im->cache_entry.h, 0, (Efl_Gfx_Colorspace) im->cache_entry.space, EINA_TRUE, 0, 0, 0, 0);
49 im->cache_entry.w, im->cache_entry.h, 0,
50 (Efl_Gfx_Colorspace) im->cache_entry.space,
51 EINA_TRUE, 0, 0, 0, 0));
52} 49}
53 50
54EOLIAN static void 51EOLIAN static void
@@ -72,7 +69,7 @@ _evas_ector_software_buffer_evas_ector_buffer_engine_image_get(Eo *obj EINA_UNUS
72EOLIAN static Eo * 69EOLIAN static Eo *
73_evas_ector_software_buffer_eo_base_constructor(Eo *obj, Evas_Ector_Software_Buffer_Data *pd) 70_evas_ector_software_buffer_eo_base_constructor(Eo *obj, Evas_Ector_Software_Buffer_Data *pd)
74{ 71{
75 eo_do_super(obj, MY_CLASS, obj = eo_constructor()); 72 obj = eo_constructor(eo_super(obj, MY_CLASS));
76 pd->base = eo_data_xref(obj, ECTOR_SOFTWARE_BUFFER_BASE_MIXIN, obj); 73 pd->base = eo_data_xref(obj, ECTOR_SOFTWARE_BUFFER_BASE_MIXIN, obj);
77 return obj; 74 return obj;
78} 75}
@@ -83,7 +80,7 @@ _evas_ector_software_buffer_eo_base_finalize(Eo *obj, Evas_Ector_Software_Buffer
83 EINA_SAFETY_ON_NULL_RETURN_VAL(pd->base, NULL); 80 EINA_SAFETY_ON_NULL_RETURN_VAL(pd->base, NULL);
84 EINA_SAFETY_ON_NULL_RETURN_VAL(pd->image, NULL); 81 EINA_SAFETY_ON_NULL_RETURN_VAL(pd->image, NULL);
85 pd->base->generic->immutable = EINA_TRUE; 82 pd->base->generic->immutable = EINA_TRUE;
86 return eo_do_super_ret(obj, MY_CLASS, obj, eo_finalize()); 83 return eo_finalize(eo_super(obj, MY_CLASS));
87} 84}
88 85
89EOLIAN static void 86EOLIAN static void
@@ -92,7 +89,7 @@ _evas_ector_software_buffer_eo_base_destructor(Eo *obj, Evas_Ector_Software_Buff
92 eo_data_xunref(obj, pd->base, obj); 89 eo_data_xunref(obj, pd->base, obj);
93 evas_cache_image_drop(&pd->image->cache_entry); 90 evas_cache_image_drop(&pd->image->cache_entry);
94 eo_xunref(pd->evas, obj); 91 eo_xunref(pd->evas, obj);
95 eo_do_super(obj, MY_CLASS, eo_destructor()); 92 eo_destructor(eo_super(obj, MY_CLASS));
96} 93}
97 94
98#include "evas_ector_buffer.eo.c" 95#include "evas_ector_buffer.eo.c"
diff --git a/src/modules/evas/engines/software_generic/evas_engine.c b/src/modules/evas/engines/software_generic/evas_engine.c
index e1478143cf..f2018a626b 100644
--- a/src/modules/evas/engines/software_generic/evas_engine.c
+++ b/src/modules/evas/engines/software_generic/evas_engine.c
@@ -3765,8 +3765,7 @@ eng_ector_buffer_wrap(void *data EINA_UNUSED, Evas *e, void *engine_image, Eina_
3765 3765
3766 if (!ie) return NULL; 3766 if (!ie) return NULL;
3767 3767
3768 buf = eo_add(EVAS_ECTOR_SOFTWARE_BUFFER_CLASS, e, 3768 buf = eo_add(EVAS_ECTOR_SOFTWARE_BUFFER_CLASS, e, evas_ector_buffer_engine_image_set(eoid, e, ie));
3769 evas_ector_buffer_engine_image_set(e, ie));
3770 3769
3771 return buf; 3770 return buf;
3772} 3771}
@@ -3785,9 +3784,7 @@ eng_ector_buffer_new(void *data EINA_UNUSED, Evas *evas, void *pixels,
3785 3784
3786 if ((flags & (ECTOR_BUFFER_FLAG_RENDERABLE | ECTOR_BUFFER_FLAG_DRAWABLE)) == 0) 3785 if ((flags & (ECTOR_BUFFER_FLAG_RENDERABLE | ECTOR_BUFFER_FLAG_DRAWABLE)) == 0)
3787 { 3786 {
3788 buf = eo_add(ECTOR_SOFTWARE_BUFFER_CLASS, evas, 3787 buf = eo_add(ECTOR_SOFTWARE_BUFFER_CLASS, evas, ector_buffer_pixels_set(eoid, pixels, width, height, stride, cspace, writeable, l, r, t, b));
3789 ector_buffer_pixels_set(pixels, width, height, stride, cspace,
3790 writeable, l, r, t, b));
3791 } 3788 }
3792 else 3789 else
3793 { 3790 {
@@ -3854,10 +3851,7 @@ _draw_thread_ector_draw(void *data)
3854{ 3851{
3855 Evas_Thread_Command_Ector *ector = data; 3852 Evas_Thread_Command_Ector *ector = data;
3856 3853
3857 eo_do(ector->r, 3854 ector_renderer_draw(ector->r, ector->render_op, ector->clips, ector->mul_col);
3858 ector_renderer_draw(ector->render_op,
3859 ector->clips,
3860 ector->mul_col));
3861 3855
3862 _draw_thread_ector_cleanup(ector); 3856 _draw_thread_ector_cleanup(ector);
3863} 3857}
@@ -3971,10 +3965,8 @@ _draw_thread_ector_surface_set(void *data)
3971 y = ector_surface->y; 3965 y = ector_surface->y;
3972 } 3966 }
3973 3967
3974 eo_do(ector_surface->ector, 3968 ector_buffer_pixels_set(ector_surface->ector, pixels, w, h, 0, EFL_GFX_COLORSPACE_ARGB8888, EINA_TRUE, 0, 0, 0, 0);
3975 ector_buffer_pixels_set(pixels, w, h, 0, EFL_GFX_COLORSPACE_ARGB8888, 3969 ector_surface_reference_point_set(ector_surface->ector, x, y);
3976 EINA_TRUE, 0, 0, 0, 0),
3977 ector_surface_reference_point_set(x, y));
3978 3970
3979 eina_mempool_free(_mp_command_ector_surface, ector_surface); 3971 eina_mempool_free(_mp_command_ector_surface, ector_surface);
3980} 3972}
@@ -4018,10 +4010,8 @@ eng_ector_begin(void *data EINA_UNUSED, void *context EINA_UNUSED, Ector_Surface
4018 w = sf->cache_entry.w; 4010 w = sf->cache_entry.w;
4019 h = sf->cache_entry.h; 4011 h = sf->cache_entry.h;
4020 4012
4021 eo_do(ector, 4013 ector_buffer_pixels_set(ector, pixels, w, h, 0, EFL_GFX_COLORSPACE_ARGB8888, EINA_TRUE, 0, 0, 0, 0);
4022 ector_buffer_pixels_set(pixels, w, h, 0, EFL_GFX_COLORSPACE_ARGB8888, 4014 ector_surface_reference_point_set(ector, x, y);
4023 EINA_TRUE, 0, 0, 0, 0),
4024 ector_surface_reference_point_set(x, y));
4025 } 4015 }
4026} 4016}
4027 4017
@@ -4042,7 +4032,7 @@ eng_ector_end(void *data EINA_UNUSED, void *context EINA_UNUSED, Ector_Surface *
4042 } 4032 }
4043 else 4033 else
4044 { 4034 {
4045 eo_do(ector, ector_renderer_surface_set(NULL)); 4035 ector_renderer_surface_set(ector, NULL);
4046 evas_common_cpu_end_opt(); 4036 evas_common_cpu_end_opt();
4047 } 4037 }
4048} 4038}
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 e67f3bf2ff..c17e984634 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
@@ -15,22 +15,18 @@ _set_geometry_to_mesh_from_eet_file(Evas_Canvas3D_Mesh *mesh,
15 float *pos, *nor, *tex; 15 float *pos, *nor, *tex;
16 int stride_pos, stride_nor, stride_tex, j; 16 int stride_pos, stride_nor, stride_tex, j;
17 17
18 eo_do(mesh, 18 evas_canvas3d_mesh_vertex_count_set(mesh, eet_mesh->geometries->vertices_count);
19 evas_canvas3d_mesh_vertex_count_set(eet_mesh->geometries->vertices_count), 19 evas_canvas3d_mesh_vertex_assembly_set(mesh, EVAS_CANVAS3D_VERTEX_ASSEMBLY_TRIANGLES);
20 evas_canvas3d_mesh_vertex_assembly_set(EVAS_CANVAS3D_VERTEX_ASSEMBLY_TRIANGLES), 20 evas_canvas3d_mesh_frame_add(mesh, 0);
21 evas_canvas3d_mesh_frame_add(0), 21 evas_canvas3d_mesh_frame_vertex_data_copy_set(mesh, 0, EVAS_CANVAS3D_VERTEX_ATTRIB_POSITION, 0, NULL);
22 22 evas_canvas3d_mesh_frame_vertex_data_copy_set(mesh, 0, EVAS_CANVAS3D_VERTEX_ATTRIB_NORMAL, 0, NULL);
23 evas_canvas3d_mesh_frame_vertex_data_copy_set(0, EVAS_CANVAS3D_VERTEX_ATTRIB_POSITION, 0, NULL), 23 evas_canvas3d_mesh_frame_vertex_data_copy_set(mesh, 0, EVAS_CANVAS3D_VERTEX_ATTRIB_TEXCOORD, 0, NULL);
24 evas_canvas3d_mesh_frame_vertex_data_copy_set(0, EVAS_CANVAS3D_VERTEX_ATTRIB_NORMAL, 0, NULL), 24 pos = (float *)evas_canvas3d_mesh_frame_vertex_data_map(mesh, 0, EVAS_CANVAS3D_VERTEX_ATTRIB_POSITION);
25 evas_canvas3d_mesh_frame_vertex_data_copy_set(0, EVAS_CANVAS3D_VERTEX_ATTRIB_TEXCOORD, 0, NULL), 25 nor = (float *)evas_canvas3d_mesh_frame_vertex_data_map(mesh, 0, EVAS_CANVAS3D_VERTEX_ATTRIB_NORMAL);
26 26 tex = (float *)evas_canvas3d_mesh_frame_vertex_data_map(mesh, 0, EVAS_CANVAS3D_VERTEX_ATTRIB_TEXCOORD);
27 pos = (float *)evas_canvas3d_mesh_frame_vertex_data_map(0, EVAS_CANVAS3D_VERTEX_ATTRIB_POSITION), 27 stride_pos = evas_canvas3d_mesh_frame_vertex_stride_get(mesh, 0, EVAS_CANVAS3D_VERTEX_ATTRIB_POSITION);
28 nor = (float *)evas_canvas3d_mesh_frame_vertex_data_map(0, EVAS_CANVAS3D_VERTEX_ATTRIB_NORMAL), 28 stride_nor = evas_canvas3d_mesh_frame_vertex_stride_get(mesh, 0, EVAS_CANVAS3D_VERTEX_ATTRIB_NORMAL);
29 tex = (float *)evas_canvas3d_mesh_frame_vertex_data_map(0, EVAS_CANVAS3D_VERTEX_ATTRIB_TEXCOORD), 29 stride_tex = evas_canvas3d_mesh_frame_vertex_stride_get(mesh, 0, EVAS_CANVAS3D_VERTEX_ATTRIB_TEXCOORD);
30
31 stride_pos = evas_canvas3d_mesh_frame_vertex_stride_get(0, EVAS_CANVAS3D_VERTEX_ATTRIB_POSITION),
32 stride_nor = evas_canvas3d_mesh_frame_vertex_stride_get(0, EVAS_CANVAS3D_VERTEX_ATTRIB_NORMAL),
33 stride_tex = evas_canvas3d_mesh_frame_vertex_stride_get(0, EVAS_CANVAS3D_VERTEX_ATTRIB_TEXCOORD));
34 30
35 if (stride_pos == 0) stride_pos = sizeof(float) * 3; 31 if (stride_pos == 0) stride_pos = sizeof(float) * 3;
36 if (stride_nor == 0) stride_nor = sizeof(float) * 3; 32 if (stride_nor == 0) stride_nor = sizeof(float) * 3;
@@ -58,10 +54,9 @@ _set_geometry_to_mesh_from_eet_file(Evas_Canvas3D_Mesh *mesh,
58 } 54 }
59 55
60 /* unmap vertex buffer */ 56 /* unmap vertex buffer */
61 eo_do(mesh, 57 evas_canvas3d_mesh_frame_vertex_data_unmap(mesh, 0, EVAS_CANVAS3D_VERTEX_ATTRIB_POSITION);
62 evas_canvas3d_mesh_frame_vertex_data_unmap(0, EVAS_CANVAS3D_VERTEX_ATTRIB_POSITION), 58 evas_canvas3d_mesh_frame_vertex_data_unmap(mesh, 0, EVAS_CANVAS3D_VERTEX_ATTRIB_NORMAL);
63 evas_canvas3d_mesh_frame_vertex_data_unmap(0, EVAS_CANVAS3D_VERTEX_ATTRIB_NORMAL), 59 evas_canvas3d_mesh_frame_vertex_data_unmap(mesh, 0, EVAS_CANVAS3D_VERTEX_ATTRIB_TEXCOORD);
64 evas_canvas3d_mesh_frame_vertex_data_unmap(0, EVAS_CANVAS3D_VERTEX_ATTRIB_TEXCOORD));
65} 60}
66 61
67void 62void
@@ -72,32 +67,16 @@ _set_material_to_mesh_from_eet_file(Evas_Canvas3D_Mesh *mesh,
72 Eo *material = NULL; 67 Eo *material = NULL;
73 material = eo_add(EVAS_CANVAS3D_MATERIAL_CLASS, pd->evas); 68 material = eo_add(EVAS_CANVAS3D_MATERIAL_CLASS, pd->evas);
74 69
75 eo_do(material, 70 evas_canvas3d_material_enable_set(material, EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, !!(eet_mesh->materials->colors[0].a > 0));
76 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, 71 evas_canvas3d_material_enable_set(material, EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, !!(eet_mesh->materials->colors[1].a > 0));
77 !!(eet_mesh->materials->colors[0].a > 0)), 72 evas_canvas3d_material_enable_set(material, EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, !!(eet_mesh->materials->colors[2].a > 0));
78 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, 73 evas_canvas3d_material_enable_set(material, EVAS_CANVAS3D_MATERIAL_ATTRIB_NORMAL, EINA_TRUE);
79 !!(eet_mesh->materials->colors[1].a > 0)), 74 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);
80 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, 75 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);
81 !!(eet_mesh->materials->colors[2].a > 0)), 76 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);
82 evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_NORMAL, EINA_TRUE), 77 evas_canvas3d_material_shininess_set(material, eet_mesh->materials->shininess);
83 evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, 78
84 eet_mesh->materials->colors[0].r, 79 evas_canvas3d_mesh_frame_material_set(mesh, 0, material);
85 eet_mesh->materials->colors[0].g,
86 eet_mesh->materials->colors[0].b,
87 eet_mesh->materials->colors[0].a),
88 evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE,
89 eet_mesh->materials->colors[1].r,
90 eet_mesh->materials->colors[1].g,
91 eet_mesh->materials->colors[1].b,
92 eet_mesh->materials->colors[1].a),
93 evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR,
94 eet_mesh->materials->colors[2].r,
95 eet_mesh->materials->colors[2].g,
96 eet_mesh->materials->colors[2].b,
97 eet_mesh->materials->colors[2].a),
98 evas_canvas3d_material_shininess_set(eet_mesh->materials->shininess));
99
100 eo_do(mesh, evas_canvas3d_mesh_frame_material_set(0, material));
101} 80}
102 81
103void 82void
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..40a2aa6ac1 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
@@ -337,9 +337,8 @@ evas_model_load_file_md2(Evas_Canvas3D_Mesh *mesh, Eina_File *file)
337 s_scale = 1.0 / (float)(loader.skin_width - 1); 337 s_scale = 1.0 / (float)(loader.skin_width - 1);
338 t_scale = 1.0 / (float)(loader.skin_height - 1); 338 t_scale = 1.0 / (float)(loader.skin_height - 1);
339 339
340 eo_do(mesh, 340 evas_canvas3d_mesh_vertex_count_set(mesh, loader.triangle_count * 3);
341 evas_canvas3d_mesh_vertex_count_set(loader.triangle_count * 3), 341 evas_canvas3d_mesh_vertex_assembly_set(mesh, EVAS_CANVAS3D_VERTEX_ASSEMBLY_TRIANGLES);
342 evas_canvas3d_mesh_vertex_assembly_set(EVAS_CANVAS3D_VERTEX_ASSEMBLY_TRIANGLES));
343 342
344 /* Load frames */ 343 /* Load frames */
345 for (i = 0; i < loader.frame_count; i++) 344 for (i = 0; i < loader.frame_count; i++)
@@ -347,23 +346,19 @@ evas_model_load_file_md2(Evas_Canvas3D_Mesh *mesh, Eina_File *file)
347 const MD2_Frame *frame = (const MD2_Frame *)(loader.frames + loader.frame_size * i); 346 const MD2_Frame *frame = (const MD2_Frame *)(loader.frames + loader.frame_size * i);
348 int f = i * MD2_FRAME_SCALE; 347 int f = i * MD2_FRAME_SCALE;
349 348
350 eo_do(mesh, 349 /* Add a mesh frame. */
351 /* Add a mesh frame. */ 350 evas_canvas3d_mesh_frame_add(mesh, f);
352 evas_canvas3d_mesh_frame_add(f), 351 /* Allocate vertex buffer for the frame. */
353 352 evas_canvas3d_mesh_frame_vertex_data_copy_set(mesh, f, EVAS_CANVAS3D_VERTEX_ATTRIB_POSITION, 0, NULL);
354 /* Allocate vertex buffer for the frame. */ 353 evas_canvas3d_mesh_frame_vertex_data_copy_set(mesh, f, EVAS_CANVAS3D_VERTEX_ATTRIB_NORMAL, 0, NULL);
355 evas_canvas3d_mesh_frame_vertex_data_copy_set(f, EVAS_CANVAS3D_VERTEX_ATTRIB_POSITION, 0, NULL), 354 evas_canvas3d_mesh_frame_vertex_data_copy_set(mesh, f, EVAS_CANVAS3D_VERTEX_ATTRIB_TEXCOORD, 0, NULL);
356 evas_canvas3d_mesh_frame_vertex_data_copy_set(f, EVAS_CANVAS3D_VERTEX_ATTRIB_NORMAL, 0, NULL), 355 /* Map vertex buffer. */
357 evas_canvas3d_mesh_frame_vertex_data_copy_set(f, EVAS_CANVAS3D_VERTEX_ATTRIB_TEXCOORD, 0, NULL), 356 pos = (float *)evas_canvas3d_mesh_frame_vertex_data_map(mesh, f, EVAS_CANVAS3D_VERTEX_ATTRIB_POSITION);
358 357 nor = (float *)evas_canvas3d_mesh_frame_vertex_data_map(mesh, f, EVAS_CANVAS3D_VERTEX_ATTRIB_NORMAL);
359 /* Map vertex buffer. */ 358 tex = (float *)evas_canvas3d_mesh_frame_vertex_data_map(mesh, f, EVAS_CANVAS3D_VERTEX_ATTRIB_TEXCOORD);
360 pos = (float *)evas_canvas3d_mesh_frame_vertex_data_map(f, EVAS_CANVAS3D_VERTEX_ATTRIB_POSITION), 359 stride_pos = evas_canvas3d_mesh_frame_vertex_stride_get(mesh, f, EVAS_CANVAS3D_VERTEX_ATTRIB_POSITION);
361 nor = (float *)evas_canvas3d_mesh_frame_vertex_data_map(f, EVAS_CANVAS3D_VERTEX_ATTRIB_NORMAL), 360 stride_nor = evas_canvas3d_mesh_frame_vertex_stride_get(mesh, f, EVAS_CANVAS3D_VERTEX_ATTRIB_NORMAL);
362 tex = (float *)evas_canvas3d_mesh_frame_vertex_data_map(f, EVAS_CANVAS3D_VERTEX_ATTRIB_TEXCOORD), 361 stride_tex = evas_canvas3d_mesh_frame_vertex_stride_get(mesh, f, EVAS_CANVAS3D_VERTEX_ATTRIB_TEXCOORD);
363
364 stride_pos = evas_canvas3d_mesh_frame_vertex_stride_get(f, EVAS_CANVAS3D_VERTEX_ATTRIB_POSITION),
365 stride_nor = evas_canvas3d_mesh_frame_vertex_stride_get(f, EVAS_CANVAS3D_VERTEX_ATTRIB_NORMAL),
366 stride_tex = evas_canvas3d_mesh_frame_vertex_stride_get(f, EVAS_CANVAS3D_VERTEX_ATTRIB_TEXCOORD));
367 362
368 if (stride_pos == 0) 363 if (stride_pos == 0)
369 stride_pos = sizeof(float) * 3; 364 stride_pos = sizeof(float) * 3;
@@ -404,10 +399,9 @@ evas_model_load_file_md2(Evas_Canvas3D_Mesh *mesh, Eina_File *file)
404 } 399 }
405 400
406 /* Unmap vertex buffer. */ 401 /* Unmap vertex buffer. */
407 eo_do(mesh, 402 evas_canvas3d_mesh_frame_vertex_data_unmap(mesh, f, EVAS_CANVAS3D_VERTEX_ATTRIB_POSITION);
408 evas_canvas3d_mesh_frame_vertex_data_unmap(f, EVAS_CANVAS3D_VERTEX_ATTRIB_POSITION), 403 evas_canvas3d_mesh_frame_vertex_data_unmap(mesh, f, EVAS_CANVAS3D_VERTEX_ATTRIB_NORMAL);
409 evas_canvas3d_mesh_frame_vertex_data_unmap(f, EVAS_CANVAS3D_VERTEX_ATTRIB_NORMAL), 404 evas_canvas3d_mesh_frame_vertex_data_unmap(mesh, f, EVAS_CANVAS3D_VERTEX_ATTRIB_TEXCOORD);
410 evas_canvas3d_mesh_frame_vertex_data_unmap(f, EVAS_CANVAS3D_VERTEX_ATTRIB_TEXCOORD));
411 405
412 pd = eo_data_scope_get(mesh, EVAS_CANVAS3D_MESH_CLASS); 406 pd = eo_data_scope_get(mesh, EVAS_CANVAS3D_MESH_CLASS);
413 407
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..718b8c91ef 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
@@ -372,25 +372,22 @@ evas_model_load_file_obj(Evas_Canvas3D_Mesh *mesh, Eina_File *file)
372 } 372 }
373 373
374 /* prepare of mesh and take pointers to data which must be read */ 374 /* prepare of mesh and take pointers to data which must be read */
375 eo_do(mesh, 375 evas_canvas3d_mesh_vertex_count_set(mesh, counts._triangles_counter * 3);
376 evas_canvas3d_mesh_vertex_count_set(counts._triangles_counter * 3), 376 evas_canvas3d_mesh_vertex_assembly_set(mesh, EVAS_CANVAS3D_VERTEX_ASSEMBLY_TRIANGLES);
377 evas_canvas3d_mesh_vertex_assembly_set(EVAS_CANVAS3D_VERTEX_ASSEMBLY_TRIANGLES), 377 evas_canvas3d_mesh_frame_add(mesh, 0);
378 evas_canvas3d_mesh_frame_add(0), 378 evas_canvas3d_mesh_frame_vertex_data_copy_set(mesh, 0, EVAS_CANVAS3D_VERTEX_ATTRIB_POSITION, 0, NULL);
379 evas_canvas3d_mesh_frame_vertex_data_copy_set(0, EVAS_CANVAS3D_VERTEX_ATTRIB_POSITION, 0, NULL), 379 pos = (float *)evas_canvas3d_mesh_frame_vertex_data_map(mesh, 0, EVAS_CANVAS3D_VERTEX_ATTRIB_POSITION);
380 pos = (float *)evas_canvas3d_mesh_frame_vertex_data_map(0, EVAS_CANVAS3D_VERTEX_ATTRIB_POSITION), 380 stride_pos = evas_canvas3d_mesh_frame_vertex_stride_get(mesh, 0, EVAS_CANVAS3D_VERTEX_ATTRIB_POSITION);
381 stride_pos = evas_canvas3d_mesh_frame_vertex_stride_get(0, EVAS_CANVAS3D_VERTEX_ATTRIB_POSITION));
382 381
383 if (counts.existence_of_normal) 382 if (counts.existence_of_normal)
384 eo_do(mesh, 383 evas_canvas3d_mesh_frame_vertex_data_copy_set(mesh, 0, EVAS_CANVAS3D_VERTEX_ATTRIB_NORMAL, 0, NULL);
385 evas_canvas3d_mesh_frame_vertex_data_copy_set(0, EVAS_CANVAS3D_VERTEX_ATTRIB_NORMAL, 0, NULL), 384 nor = (float *)evas_canvas3d_mesh_frame_vertex_data_map(mesh, 0, EVAS_CANVAS3D_VERTEX_ATTRIB_NORMAL);
386 nor = (float *)evas_canvas3d_mesh_frame_vertex_data_map(0, EVAS_CANVAS3D_VERTEX_ATTRIB_NORMAL), 385 stride_nor = evas_canvas3d_mesh_frame_vertex_stride_get(mesh, 0, EVAS_CANVAS3D_VERTEX_ATTRIB_NORMAL);
387 stride_nor = evas_canvas3d_mesh_frame_vertex_stride_get(0, EVAS_CANVAS3D_VERTEX_ATTRIB_NORMAL));
388 386
389 if (counts.existence_of_tex_point) 387 if (counts.existence_of_tex_point)
390 eo_do(mesh, 388 evas_canvas3d_mesh_frame_vertex_data_copy_set(mesh, 0, EVAS_CANVAS3D_VERTEX_ATTRIB_TEXCOORD, 0, NULL);
391 evas_canvas3d_mesh_frame_vertex_data_copy_set(0, EVAS_CANVAS3D_VERTEX_ATTRIB_TEXCOORD, 0, NULL), 389 tex = (float *)evas_canvas3d_mesh_frame_vertex_data_map(mesh, 0, EVAS_CANVAS3D_VERTEX_ATTRIB_TEXCOORD);
392 tex = (float *)evas_canvas3d_mesh_frame_vertex_data_map(0, EVAS_CANVAS3D_VERTEX_ATTRIB_TEXCOORD), 390 stride_tex = evas_canvas3d_mesh_frame_vertex_stride_get(mesh, 0, EVAS_CANVAS3D_VERTEX_ATTRIB_TEXCOORD);
393 stride_tex = evas_canvas3d_mesh_frame_vertex_stride_get(0, EVAS_CANVAS3D_VERTEX_ATTRIB_TEXCOORD));
394 391
395 if (stride_pos == 0) stride_pos = sizeof(float) * 3; 392 if (stride_pos == 0) stride_pos = sizeof(float) * 3;
396 if ((counts.existence_of_normal) && (stride_nor == 0)) 393 if ((counts.existence_of_normal) && (stride_nor == 0))
@@ -437,11 +434,11 @@ evas_model_load_file_obj(Evas_Canvas3D_Mesh *mesh, Eina_File *file)
437 free(_triangles); 434 free(_triangles);
438 435
439 /* Unmap vertex buffer. */ 436 /* Unmap vertex buffer. */
440 eo_do(mesh, evas_canvas3d_mesh_frame_vertex_data_unmap(0, EVAS_CANVAS3D_VERTEX_ATTRIB_POSITION)); 437 evas_canvas3d_mesh_frame_vertex_data_unmap(mesh, 0, EVAS_CANVAS3D_VERTEX_ATTRIB_POSITION);
441 if (counts.existence_of_normal) 438 if (counts.existence_of_normal)
442 eo_do(mesh, evas_canvas3d_mesh_frame_vertex_data_unmap(0, EVAS_CANVAS3D_VERTEX_ATTRIB_NORMAL)); 439 evas_canvas3d_mesh_frame_vertex_data_unmap(mesh, 0, EVAS_CANVAS3D_VERTEX_ATTRIB_NORMAL);
443 if (counts.existence_of_tex_point) 440 if (counts.existence_of_tex_point)
444 eo_do(mesh, evas_canvas3d_mesh_frame_vertex_data_unmap(0, EVAS_CANVAS3D_VERTEX_ATTRIB_TEXCOORD)); 441 evas_canvas3d_mesh_frame_vertex_data_unmap(mesh, 0, EVAS_CANVAS3D_VERTEX_ATTRIB_TEXCOORD);
445 442
446 Evas_Canvas3D_Mesh_Data *pd = eo_data_scope_get(mesh, EVAS_CANVAS3D_MESH_CLASS); 443 Evas_Canvas3D_Mesh_Data *pd = eo_data_scope_get(mesh, EVAS_CANVAS3D_MESH_CLASS);
447 444