summaryrefslogtreecommitdiff
path: root/src/modules/evas
diff options
context:
space:
mode:
authorTom Hacohen <tom@stosb.com>2016-03-11 12:24:08 +0000
committerTom Hacohen <tom@stosb.com>2016-03-11 12:29:03 +0000
commitf24210caac8d50940ddef858994571be59179c10 (patch)
treecfc8b264e77abbab9827517d1827f9a4fb4dcd50 /src/modules/evas
parent9fdac37187e35f45570c3808011d0283c658652d (diff)
Revert "Automatic migration to the new eo_add syntax."
This reverts commit 4f949a2757b6332306264d7f126b15ba7bfd37d4.
Diffstat (limited to 'src/modules/evas')
-rw-r--r--src/modules/evas/engines/gl_generic/evas_engine.c12
-rw-r--r--src/modules/evas/engines/software_generic/evas_engine.c8
-rw-r--r--src/modules/evas/model_loaders/eet/evas_model_load_eet.c2
3 files changed, 11 insertions, 11 deletions
diff --git a/src/modules/evas/engines/gl_generic/evas_engine.c b/src/modules/evas/engines/gl_generic/evas_engine.c
index 617ae340e4..d296cf660e 100644
--- a/src/modules/evas/engines/gl_generic/evas_engine.c
+++ b/src/modules/evas/engines/gl_generic/evas_engine.c
@@ -2447,16 +2447,16 @@ eng_ector_create(void *data EINA_UNUSED)
2447 ector_backend = getenv("ECTOR_BACKEND"); 2447 ector_backend = getenv("ECTOR_BACKEND");
2448 if (ector_backend && !strcasecmp(ector_backend, "default")) 2448 if (ector_backend && !strcasecmp(ector_backend, "default"))
2449 { 2449 {
2450 eo_add(&ector, ECTOR_SOFTWARE_SURFACE_CLASS, NULL); 2450 ector = eo_add(ECTOR_SOFTWARE_SURFACE_CLASS, NULL);
2451 } 2451 }
2452 else if (ector_backend && !strcasecmp(ector_backend, "experimental")) 2452 else if (ector_backend && !strcasecmp(ector_backend, "experimental"))
2453 { 2453 {
2454 eo_add(&ector, ECTOR_GL_SURFACE_CLASS, NULL); 2454 ector = eo_add(ECTOR_GL_SURFACE_CLASS, NULL);
2455 use_gl = EINA_TRUE; 2455 use_gl = EINA_TRUE;
2456 } 2456 }
2457 else 2457 else
2458 { 2458 {
2459 eo_add(&ector, ECTOR_CAIRO_SOFTWARE_SURFACE_CLASS, NULL); 2459 ector = eo_add(ECTOR_CAIRO_SOFTWARE_SURFACE_CLASS, NULL);
2460 use_cairo = EINA_TRUE; 2460 use_cairo = EINA_TRUE;
2461 } 2461 }
2462 return ector; 2462 return ector;
@@ -2477,13 +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 eo_add(&buf, EVAS_ECTOR_GL_RGBAIMAGE_BUFFER_CLASS, evas, evas_ector_buffer_engine_image_set(buf, evas, im)); 2480 buf = eo_add(EVAS_ECTOR_GL_RGBAIMAGE_BUFFER_CLASS, evas, evas_ector_buffer_engine_image_set(eoid, evas, im));
2481 } 2481 }
2482 else 2482 else
2483 { 2483 {
2484 Evas_GL_Image *im = engine_image; 2484 Evas_GL_Image *im = engine_image;
2485 2485
2486 eo_add(&buf, EVAS_ECTOR_GL_IMAGE_BUFFER_CLASS, evas, evas_ector_buffer_engine_image_set(buf, evas, im)); 2486 buf = eo_add(EVAS_ECTOR_GL_IMAGE_BUFFER_CLASS, evas, evas_ector_buffer_engine_image_set(eoid, evas, im));
2487 } 2487 }
2488 return buf; 2488 return buf;
2489} 2489}
@@ -2544,7 +2544,7 @@ eng_ector_buffer_new(void *data, Evas *evas, void *pixels,
2544 2544
2545 gc = re->window_gl_context_get(re->software.ob); 2545 gc = re->window_gl_context_get(re->software.ob);
2546 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);
2547 eo_add(&buf, EVAS_ECTOR_GL_IMAGE_BUFFER_CLASS, evas, evas_ector_buffer_engine_image_set(buf, evas, im)); 2547 buf = eo_add(EVAS_ECTOR_GL_IMAGE_BUFFER_CLASS, evas, evas_ector_buffer_engine_image_set(eoid, evas, im));
2548 im->references--; 2548 im->references--;
2549 } 2549 }
2550 return buf; 2550 return buf;
diff --git a/src/modules/evas/engines/software_generic/evas_engine.c b/src/modules/evas/engines/software_generic/evas_engine.c
index 060d2e12b9..f2018a626b 100644
--- a/src/modules/evas/engines/software_generic/evas_engine.c
+++ b/src/modules/evas/engines/software_generic/evas_engine.c
@@ -3740,12 +3740,12 @@ eng_ector_create(void *data EINA_UNUSED)
3740 ector_backend = getenv("ECTOR_BACKEND"); 3740 ector_backend = getenv("ECTOR_BACKEND");
3741 if (ector_backend && !strcasecmp(ector_backend, "default")) 3741 if (ector_backend && !strcasecmp(ector_backend, "default"))
3742 { 3742 {
3743 eo_add(&ector, ECTOR_SOFTWARE_SURFACE_CLASS, NULL); 3743 ector = eo_add(ECTOR_SOFTWARE_SURFACE_CLASS, NULL);
3744 use_cairo = EINA_FALSE; 3744 use_cairo = EINA_FALSE;
3745 } 3745 }
3746 else 3746 else
3747 { 3747 {
3748 eo_add(&ector, ECTOR_CAIRO_SOFTWARE_SURFACE_CLASS, NULL); 3748 ector = eo_add(ECTOR_CAIRO_SOFTWARE_SURFACE_CLASS, NULL);
3749 use_cairo = EINA_TRUE; 3749 use_cairo = EINA_TRUE;
3750 } 3750 }
3751 return ector; 3751 return ector;
@@ -3765,7 +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 eo_add(&buf, EVAS_ECTOR_SOFTWARE_BUFFER_CLASS, e, evas_ector_buffer_engine_image_set(buf, e, ie)); 3768 buf = eo_add(EVAS_ECTOR_SOFTWARE_BUFFER_CLASS, e, evas_ector_buffer_engine_image_set(eoid, e, ie));
3769 3769
3770 return buf; 3770 return buf;
3771} 3771}
@@ -3784,7 +3784,7 @@ eng_ector_buffer_new(void *data EINA_UNUSED, Evas *evas, void *pixels,
3784 3784
3785 if ((flags & (ECTOR_BUFFER_FLAG_RENDERABLE | ECTOR_BUFFER_FLAG_DRAWABLE)) == 0) 3785 if ((flags & (ECTOR_BUFFER_FLAG_RENDERABLE | ECTOR_BUFFER_FLAG_DRAWABLE)) == 0)
3786 { 3786 {
3787 eo_add(&buf, ECTOR_SOFTWARE_BUFFER_CLASS, evas, ector_buffer_pixels_set(buf, pixels, width, height, stride, cspace, writeable, l, r, t, b)); 3787 buf = eo_add(ECTOR_SOFTWARE_BUFFER_CLASS, evas, ector_buffer_pixels_set(eoid, pixels, width, height, stride, cspace, writeable, l, r, t, b));
3788 } 3788 }
3789 else 3789 else
3790 { 3790 {
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 96e70fee90..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
@@ -65,7 +65,7 @@ _set_material_to_mesh_from_eet_file(Evas_Canvas3D_Mesh *mesh,
65{ 65{
66 Evas_Canvas3D_Object_Data *pd = eo_data_scope_get(mesh, EVAS_CANVAS3D_OBJECT_CLASS); 66 Evas_Canvas3D_Object_Data *pd = eo_data_scope_get(mesh, EVAS_CANVAS3D_OBJECT_CLASS);
67 Eo *material = NULL; 67 Eo *material = NULL;
68 eo_add(&material, EVAS_CANVAS3D_MATERIAL_CLASS, pd->evas); 68 material = eo_add(EVAS_CANVAS3D_MATERIAL_CLASS, pd->evas);
69 69
70 evas_canvas3d_material_enable_set(material, EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, !!(eet_mesh->materials->colors[0].a > 0)); 70 evas_canvas3d_material_enable_set(material, EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, !!(eet_mesh->materials->colors[0].a > 0));
71 evas_canvas3d_material_enable_set(material, EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, !!(eet_mesh->materials->colors[1].a > 0)); 71 evas_canvas3d_material_enable_set(material, EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, !!(eet_mesh->materials->colors[1].a > 0));