summaryrefslogtreecommitdiff
path: root/src/lib/evas/canvas/evas_canvas3d_texture.c
diff options
context:
space:
mode:
authorJean-Philippe Andre <jp.andre@samsung.com>2016-06-21 15:45:31 +0900
committerJean-Philippe Andre <jp.andre@samsung.com>2016-06-21 16:13:04 +0900
commit269fc4f7a643358ac943b5454bafc14b5d14836c (patch)
treef9de7a7420359da4b589d5ec3e72d9706225efa9 /src/lib/evas/canvas/evas_canvas3d_texture.c
parentdfe7e8892a547220979076832cd61fa613443e40 (diff)
evas: Remove common interface and use provider_find
Evas.Common_Interface not only had a bad name, it also wasn't in line with how we can get a loop object, for instance. Use eo_provider_find in each implementing class.
Diffstat (limited to 'src/lib/evas/canvas/evas_canvas3d_texture.c')
-rw-r--r--src/lib/evas/canvas/evas_canvas3d_texture.c24
1 files changed, 12 insertions, 12 deletions
diff --git a/src/lib/evas/canvas/evas_canvas3d_texture.c b/src/lib/evas/canvas/evas_canvas3d_texture.c
index dd9e737141..abfc79b3cf 100644
--- a/src/lib/evas/canvas/evas_canvas3d_texture.c
+++ b/src/lib/evas/canvas/evas_canvas3d_texture.c
@@ -54,7 +54,7 @@ _texture_proxy_subrender(Evas_Canvas3D_Texture *obj)
54{ 54{
55 /* Code taken from _proxy_subrender() in file evas_object_image.c */ 55 /* Code taken from _proxy_subrender() in file evas_object_image.c */
56 Eo *evas = NULL; 56 Eo *evas = NULL;
57 evas = evas_common_evas_get(obj); 57 evas = evas_object_evas_get(obj);
58 Evas_Public_Data *e = eo_data_scope_get(evas, EVAS_CANVAS_CLASS); 58 Evas_Public_Data *e = eo_data_scope_get(evas, EVAS_CANVAS_CLASS);
59 Evas_Canvas3D_Texture_Data *pd = eo_data_scope_get(obj, MY_CLASS); 59 Evas_Canvas3D_Texture_Data *pd = eo_data_scope_get(obj, MY_CLASS);
60 Evas_Object_Protected_Data *source; 60 Evas_Object_Protected_Data *source;
@@ -165,7 +165,7 @@ _texture_fini(Evas_Canvas3D_Texture *obj)
165 void *data = NULL; 165 void *data = NULL;
166 Evas_Canvas3D_Material_Data *material = NULL; 166 Evas_Canvas3D_Material_Data *material = NULL;
167 167
168 evas = evas_common_evas_get(obj); 168 evas = evas_object_evas_get(obj);
169 Evas_Canvas3D_Texture_Data *pd = eo_data_scope_get(obj, MY_CLASS); 169 Evas_Canvas3D_Texture_Data *pd = eo_data_scope_get(obj, MY_CLASS);
170 170
171 if (pd->engine_data) 171 if (pd->engine_data)
@@ -224,7 +224,7 @@ _evas_canvas3d_texture_evas_canvas3d_object_update_notify(Eo *obj, Evas_Canvas3D
224 if (pd->source) 224 if (pd->source)
225 { 225 {
226 Eo *evas = NULL; 226 Eo *evas = NULL;
227 evas = evas_common_evas_get(obj); 227 evas = evas_object_evas_get(obj);
228 Evas_Public_Data *e = eo_data_scope_get(evas, EVAS_CANVAS_CLASS); 228 Evas_Public_Data *e = eo_data_scope_get(evas, EVAS_CANVAS_CLASS);
229 Evas_Object_Protected_Data *src = eo_data_scope_get(pd->source, EFL_CANVAS_OBJECT_CLASS); 229 Evas_Object_Protected_Data *src = eo_data_scope_get(pd->source, EFL_CANVAS_OBJECT_CLASS);
230 230
@@ -343,7 +343,7 @@ _evas_canvas3d_texture_data_set(Eo *obj, Evas_Canvas3D_Texture_Data *pd,
343{ 343{
344 Eo *evas = NULL; 344 Eo *evas = NULL;
345 void *image = NULL; 345 void *image = NULL;
346 evas = evas_common_evas_get(obj); 346 evas = evas_object_evas_get(obj);
347 Evas_Public_Data *e = eo_data_scope_get(evas, EVAS_CANVAS_CLASS); 347 Evas_Public_Data *e = eo_data_scope_get(evas, EVAS_CANVAS_CLASS);
348 348
349 if (!pd->engine_data && e->engine.func->texture_new) 349 if (!pd->engine_data && e->engine.func->texture_new)
@@ -378,7 +378,7 @@ _evas_canvas3d_texture_file_set(Eo *obj, Evas_Canvas3D_Texture_Data *pd, const c
378 Eo *evas = NULL; 378 Eo *evas = NULL;
379 void *image; 379 void *image;
380 380
381 evas = evas_common_evas_get(obj); 381 evas = evas_object_evas_get(obj);
382 Evas_Public_Data *e = eo_data_scope_get(evas, EVAS_CANVAS_CLASS); 382 Evas_Public_Data *e = eo_data_scope_get(evas, EVAS_CANVAS_CLASS);
383 383
384 if (!pd->engine_data && e->engine.func->texture_new) 384 if (!pd->engine_data && e->engine.func->texture_new)
@@ -406,7 +406,7 @@ EAPI void
406_evas_canvas3d_texture_source_set(Eo *obj , Evas_Canvas3D_Texture_Data *pd, Evas_Object *source) 406_evas_canvas3d_texture_source_set(Eo *obj , Evas_Canvas3D_Texture_Data *pd, Evas_Object *source)
407{ 407{
408 Eo *evas = NULL; 408 Eo *evas = NULL;
409 evas = evas_common_evas_get(obj); 409 evas = evas_object_evas_get(obj);
410 Evas_Public_Data *e = eo_data_scope_get(evas, EVAS_CANVAS_CLASS); 410 Evas_Public_Data *e = eo_data_scope_get(evas, EVAS_CANVAS_CLASS);
411 Evas_Object_Protected_Data *src; 411 Evas_Object_Protected_Data *src;
412 412
@@ -483,7 +483,7 @@ _evas_canvas3d_texture_color_format_get(const Eo *obj EINA_UNUSED, Evas_Canvas3D
483{ 483{
484 Evas_Colorspace format = -1; 484 Evas_Colorspace format = -1;
485 Eo *evas = NULL; 485 Eo *evas = NULL;
486 evas = evas_common_evas_get(obj); 486 evas = evas_object_evas_get(obj);
487 Evas_Public_Data *e = eo_data_scope_get(evas, EVAS_CANVAS_CLASS); 487 Evas_Public_Data *e = eo_data_scope_get(evas, EVAS_CANVAS_CLASS);
488 488
489 if (e->engine.func->image_colorspace_get && 489 if (e->engine.func->image_colorspace_get &&
@@ -502,7 +502,7 @@ EOLIAN static void
502_evas_canvas3d_texture_size_get(const Eo *obj, Evas_Canvas3D_Texture_Data *pd, int *w, int *h) 502_evas_canvas3d_texture_size_get(const Eo *obj, Evas_Canvas3D_Texture_Data *pd, int *w, int *h)
503{ 503{
504 Eo *evas = NULL; 504 Eo *evas = NULL;
505 evas = evas_common_evas_get(obj); 505 evas = evas_object_evas_get(obj);
506 Evas_Public_Data *e = eo_data_scope_get(evas, EVAS_CANVAS_CLASS); 506 Evas_Public_Data *e = eo_data_scope_get(evas, EVAS_CANVAS_CLASS);
507 if (e->engine.func->texture_size_get) 507 if (e->engine.func->texture_size_get)
508 { 508 {
@@ -515,7 +515,7 @@ EOLIAN static void
515_evas_canvas3d_texture_wrap_set(Eo *obj, Evas_Canvas3D_Texture_Data *pd, Evas_Canvas3D_Wrap_Mode s, Evas_Canvas3D_Wrap_Mode t) 515_evas_canvas3d_texture_wrap_set(Eo *obj, Evas_Canvas3D_Texture_Data *pd, Evas_Canvas3D_Wrap_Mode s, Evas_Canvas3D_Wrap_Mode t)
516{ 516{
517 Eo *evas = NULL; 517 Eo *evas = NULL;
518 evas = evas_common_evas_get(obj); 518 evas = evas_object_evas_get(obj);
519 Evas_Public_Data *e = eo_data_scope_get(evas, EVAS_CANVAS_CLASS); 519 Evas_Public_Data *e = eo_data_scope_get(evas, EVAS_CANVAS_CLASS);
520 if (e->engine.func->texture_wrap_set) 520 if (e->engine.func->texture_wrap_set)
521 { 521 {
@@ -529,7 +529,7 @@ EOLIAN static void
529_evas_canvas3d_texture_wrap_get(Eo *obj, Evas_Canvas3D_Texture_Data *pd, Evas_Canvas3D_Wrap_Mode *s, Evas_Canvas3D_Wrap_Mode *t) 529_evas_canvas3d_texture_wrap_get(Eo *obj, Evas_Canvas3D_Texture_Data *pd, Evas_Canvas3D_Wrap_Mode *s, Evas_Canvas3D_Wrap_Mode *t)
530{ 530{
531 Eo *evas = NULL; 531 Eo *evas = NULL;
532 evas = evas_common_evas_get(obj); 532 evas = evas_object_evas_get(obj);
533 Evas_Public_Data *e = eo_data_scope_get(evas, EVAS_CANVAS_CLASS); 533 Evas_Public_Data *e = eo_data_scope_get(evas, EVAS_CANVAS_CLASS);
534 if (e->engine.func->texture_wrap_set) 534 if (e->engine.func->texture_wrap_set)
535 { 535 {
@@ -542,7 +542,7 @@ EOLIAN static void
542_evas_canvas3d_texture_filter_set(Eo *obj, Evas_Canvas3D_Texture_Data *pd, Evas_Canvas3D_Texture_Filter min, Evas_Canvas3D_Texture_Filter mag) 542_evas_canvas3d_texture_filter_set(Eo *obj, Evas_Canvas3D_Texture_Data *pd, Evas_Canvas3D_Texture_Filter min, Evas_Canvas3D_Texture_Filter mag)
543{ 543{
544 Eo *evas = NULL; 544 Eo *evas = NULL;
545 evas = evas_common_evas_get(obj); 545 evas = evas_object_evas_get(obj);
546 Evas_Public_Data *e = eo_data_scope_get(evas, EVAS_CANVAS_CLASS); 546 Evas_Public_Data *e = eo_data_scope_get(evas, EVAS_CANVAS_CLASS);
547 if (e->engine.func->texture_filter_set) 547 if (e->engine.func->texture_filter_set)
548 { 548 {
@@ -556,7 +556,7 @@ EOLIAN static void
556_evas_canvas3d_texture_filter_get(const Eo *obj EINA_UNUSED, Evas_Canvas3D_Texture_Data *pd, Evas_Canvas3D_Texture_Filter *min, Evas_Canvas3D_Texture_Filter *mag) 556_evas_canvas3d_texture_filter_get(const Eo *obj EINA_UNUSED, Evas_Canvas3D_Texture_Data *pd, Evas_Canvas3D_Texture_Filter *min, Evas_Canvas3D_Texture_Filter *mag)
557{ 557{
558 Eo *evas = NULL; 558 Eo *evas = NULL;
559 evas = evas_common_evas_get(obj); 559 evas = evas_object_evas_get(obj);
560 Evas_Public_Data *e = eo_data_scope_get(evas, EVAS_CANVAS_CLASS); 560 Evas_Public_Data *e = eo_data_scope_get(evas, EVAS_CANVAS_CLASS);
561 if (e->engine.func->texture_filter_get) 561 if (e->engine.func->texture_filter_get)
562 { 562 {