summaryrefslogtreecommitdiff
path: root/src/lib/ector/gl
diff options
context:
space:
mode:
authorTom Hacohen <tom@stosb.com>2016-08-15 14:44:41 +0100
committerTom Hacohen <tom@stosb.com>2016-08-15 15:07:42 +0100
commite65aae994e72c1d3f8ac6b5360d3772f177b77ef (patch)
tree7ecaf136e45470635889191aded2b47057720a98 /src/lib/ector/gl
parent35abb3c34d10a4826c98055fb85ecf93915e5ea8 (diff)
Eo: Finish the renaming of Eo to the EFL.
This renames all the rest of the API to the EFL namespace except for Eo_Event that will follow soon. Obviously breaks both API and ABI.
Diffstat (limited to 'src/lib/ector/gl')
-rw-r--r--src/lib/ector/gl/ector_gl_surface.c12
-rw-r--r--src/lib/ector/gl/ector_renderer_gl.c6
-rw-r--r--src/lib/ector/gl/ector_renderer_gl_gradient_linear.c20
-rw-r--r--src/lib/ector/gl/ector_renderer_gl_gradient_radial.c20
-rw-r--r--src/lib/ector/gl/ector_renderer_gl_shape.c20
5 files changed, 39 insertions, 39 deletions
diff --git a/src/lib/ector/gl/ector_gl_surface.c b/src/lib/ector/gl/ector_gl_surface.c
index 7f49aec2e7..54bdb9f41c 100644
--- a/src/lib/ector/gl/ector_gl_surface.c
+++ b/src/lib/ector/gl/ector_gl_surface.c
@@ -45,13 +45,13 @@ _ector_gl_surface_ector_surface_renderer_factory_new(Eo *obj,
45 const Efl_Class *type) 45 const Efl_Class *type)
46{ 46{
47 if (type == ECTOR_RENDERER_SHAPE_MIXIN) 47 if (type == ECTOR_RENDERER_SHAPE_MIXIN)
48 return eo_add(ECTOR_RENDERER_GL_SHAPE_CLASS, NULL, ector_renderer_surface_set(eo_self, obj)); 48 return efl_add(ECTOR_RENDERER_GL_SHAPE_CLASS, NULL, ector_renderer_surface_set(efl_self, obj));
49 else if (type == ECTOR_RENDERER_GRADIENT_LINEAR_MIXIN) 49 else if (type == ECTOR_RENDERER_GRADIENT_LINEAR_MIXIN)
50 return eo_add(ECTOR_RENDERER_GL_GRADIENT_LINEAR_CLASS, NULL, ector_renderer_surface_set(eo_self, obj)); 50 return efl_add(ECTOR_RENDERER_GL_GRADIENT_LINEAR_CLASS, NULL, ector_renderer_surface_set(efl_self, obj));
51 else if (type == ECTOR_RENDERER_GRADIENT_RADIAL_MIXIN) 51 else if (type == ECTOR_RENDERER_GRADIENT_RADIAL_MIXIN)
52 return eo_add(ECTOR_RENDERER_GL_GRADIENT_RADIAL_CLASS, NULL, ector_renderer_surface_set(eo_self, obj)); 52 return efl_add(ECTOR_RENDERER_GL_GRADIENT_RADIAL_CLASS, NULL, ector_renderer_surface_set(efl_self, obj));
53 53
54 ERR("Couldn't find class for type: %s\n", eo_class_name_get(type)); 54 ERR("Couldn't find class for type: %s\n", efl_class_name_get(type));
55 return NULL; 55 return NULL;
56} 56}
57 57
@@ -329,7 +329,7 @@ _ector_gl_surface_shader_get(Eo *obj EINA_UNUSED, Ector_GL_Surface_Data *pd EINA
329static void 329static void
330_ector_gl_surface_efl_object_destructor(Eo *obj, Ector_GL_Surface_Data *pd EINA_UNUSED) 330_ector_gl_surface_efl_object_destructor(Eo *obj, Ector_GL_Surface_Data *pd EINA_UNUSED)
331{ 331{
332 efl_destructor(eo_super(obj, ECTOR_GL_SURFACE_CLASS)); 332 efl_destructor(efl_super(obj, ECTOR_GL_SURFACE_CLASS));
333 333
334 eina_hash_free(shader_cache); 334 eina_hash_free(shader_cache);
335 shader_cache = NULL; 335 shader_cache = NULL;
@@ -342,7 +342,7 @@ _ector_gl_surface_efl_object_constructor(Eo *obj, Ector_GL_Surface_Data *pd EINA
342{ 342{
343 Eina_Strbuf *file_path = NULL; 343 Eina_Strbuf *file_path = NULL;
344 344
345 obj = efl_constructor(eo_super(obj, ECTOR_GL_SURFACE_CLASS)); 345 obj = efl_constructor(efl_super(obj, ECTOR_GL_SURFACE_CLASS));
346 if (!obj) return NULL; 346 if (!obj) return NULL;
347 347
348 if (shader_cache) return obj; 348 if (shader_cache) return obj;
diff --git a/src/lib/ector/gl/ector_renderer_gl.c b/src/lib/ector/gl/ector_renderer_gl.c
index 655f94772b..b06792ac3e 100644
--- a/src/lib/ector/gl/ector_renderer_gl.c
+++ b/src/lib/ector/gl/ector_renderer_gl.c
@@ -39,17 +39,17 @@ _ector_renderer_gl_ector_renderer_draw(Eo *obj EINA_UNUSED,
39static Efl_Object * 39static Efl_Object *
40_ector_renderer_gl_efl_object_constructor(Eo *obj, Ector_Renderer_GL_Data *pd) 40_ector_renderer_gl_efl_object_constructor(Eo *obj, Ector_Renderer_GL_Data *pd)
41{ 41{
42 obj = efl_constructor(eo_super(obj, ECTOR_RENDERER_GL_CLASS)); 42 obj = efl_constructor(efl_super(obj, ECTOR_RENDERER_GL_CLASS));
43 if (!obj) return NULL; 43 if (!obj) return NULL;
44 44
45 pd->base = eo_data_xref(obj, ECTOR_RENDERER_CLASS, obj); 45 pd->base = efl_data_xref(obj, ECTOR_RENDERER_CLASS, obj);
46 return obj; 46 return obj;
47} 47}
48 48
49static void 49static void
50_ector_renderer_gl_efl_object_destructor(Eo *obj, Ector_Renderer_GL_Data *pd) 50_ector_renderer_gl_efl_object_destructor(Eo *obj, Ector_Renderer_GL_Data *pd)
51{ 51{
52 eo_data_xunref(obj, pd->base, obj); 52 efl_data_xunref(obj, pd->base, obj);
53} 53}
54 54
55#include "ector_renderer_gl.eo.c" 55#include "ector_renderer_gl.eo.c"
diff --git a/src/lib/ector/gl/ector_renderer_gl_gradient_linear.c b/src/lib/ector/gl/ector_renderer_gl_gradient_linear.c
index 07a9490abb..69e1c6d378 100644
--- a/src/lib/ector/gl/ector_renderer_gl_gradient_linear.c
+++ b/src/lib/ector/gl/ector_renderer_gl_gradient_linear.c
@@ -31,7 +31,7 @@ _ector_renderer_gl_gradient_linear_ector_renderer_prepare(Eo *obj,
31static Eina_Bool 31static Eina_Bool
32_ector_renderer_gl_gradient_linear_ector_renderer_draw(Eo *obj, Ector_Renderer_GL_Gradient_Linear_Data *pd, Efl_Gfx_Render_Op op, Eina_Array *clips, unsigned int mul_col) 32_ector_renderer_gl_gradient_linear_ector_renderer_draw(Eo *obj, Ector_Renderer_GL_Gradient_Linear_Data *pd, Efl_Gfx_Render_Op op, Eina_Array *clips, unsigned int mul_col)
33{ 33{
34 ector_renderer_draw(eo_super(obj, ECTOR_RENDERER_GL_GRADIENT_LINEAR_CLASS), op, clips, mul_col); 34 ector_renderer_draw(efl_super(obj, ECTOR_RENDERER_GL_GRADIENT_LINEAR_CLASS), op, clips, mul_col);
35 35
36 // FIXME: draw something ! 36 // FIXME: draw something !
37 (void) pd; 37 (void) pd;
@@ -69,13 +69,13 @@ _ector_renderer_gl_gradient_linear_ector_renderer_gl_fill(Eo *obj, Ector_Rendere
69static Efl_Object * 69static Efl_Object *
70_ector_renderer_gl_gradient_linear_efl_object_constructor(Eo *obj, Ector_Renderer_GL_Gradient_Linear_Data *pd) 70_ector_renderer_gl_gradient_linear_efl_object_constructor(Eo *obj, Ector_Renderer_GL_Gradient_Linear_Data *pd)
71{ 71{
72 obj = efl_constructor(eo_super(obj, ECTOR_RENDERER_GL_GRADIENT_LINEAR_CLASS)); 72 obj = efl_constructor(efl_super(obj, ECTOR_RENDERER_GL_GRADIENT_LINEAR_CLASS));
73 73
74 if (!obj) return NULL; 74 if (!obj) return NULL;
75 75
76 pd->base = eo_data_xref(obj, ECTOR_RENDERER_CLASS, obj); 76 pd->base = efl_data_xref(obj, ECTOR_RENDERER_CLASS, obj);
77 pd->linear = eo_data_xref(obj, ECTOR_RENDERER_GRADIENT_LINEAR_MIXIN, obj); 77 pd->linear = efl_data_xref(obj, ECTOR_RENDERER_GRADIENT_LINEAR_MIXIN, obj);
78 pd->gradient = eo_data_xref(obj, ECTOR_RENDERER_GRADIENT_MIXIN, obj); 78 pd->gradient = efl_data_xref(obj, ECTOR_RENDERER_GRADIENT_MIXIN, obj);
79 79
80 return obj; 80 return obj;
81} 81}
@@ -83,15 +83,15 @@ _ector_renderer_gl_gradient_linear_efl_object_constructor(Eo *obj, Ector_Rendere
83static void 83static void
84_ector_renderer_gl_gradient_linear_efl_object_destructor(Eo *obj, Ector_Renderer_GL_Gradient_Linear_Data *pd) 84_ector_renderer_gl_gradient_linear_efl_object_destructor(Eo *obj, Ector_Renderer_GL_Gradient_Linear_Data *pd)
85{ 85{
86 eo_data_xunref(obj, pd->base, obj); 86 efl_data_xunref(obj, pd->base, obj);
87 eo_data_xunref(obj, pd->linear, obj); 87 efl_data_xunref(obj, pd->linear, obj);
88 eo_data_xunref(obj, pd->gradient, obj); 88 efl_data_xunref(obj, pd->gradient, obj);
89} 89}
90 90
91static void 91static void
92_ector_renderer_gl_gradient_linear_efl_gfx_gradient_stop_set(Eo *obj, Ector_Renderer_GL_Gradient_Linear_Data *pd EINA_UNUSED, const Efl_Gfx_Gradient_Stop *colors, unsigned int length) 92_ector_renderer_gl_gradient_linear_efl_gfx_gradient_stop_set(Eo *obj, Ector_Renderer_GL_Gradient_Linear_Data *pd EINA_UNUSED, const Efl_Gfx_Gradient_Stop *colors, unsigned int length)
93{ 93{
94 efl_gfx_gradient_stop_set(eo_super(obj, ECTOR_RENDERER_GL_GRADIENT_LINEAR_CLASS), colors, length); 94 efl_gfx_gradient_stop_set(efl_super(obj, ECTOR_RENDERER_GL_GRADIENT_LINEAR_CLASS), colors, length);
95} 95}
96 96
97static unsigned int 97static unsigned int
@@ -99,7 +99,7 @@ _ector_renderer_gl_gradient_linear_ector_renderer_crc_get(Eo *obj, Ector_Rendere
99{ 99{
100 unsigned int crc; 100 unsigned int crc;
101 101
102 crc = ector_renderer_crc_get(eo_super(obj, ECTOR_RENDERER_GL_GRADIENT_LINEAR_CLASS)); 102 crc = ector_renderer_crc_get(efl_super(obj, ECTOR_RENDERER_GL_GRADIENT_LINEAR_CLASS));
103 103
104 crc = eina_crc((void*) pd->gradient->s, sizeof (Efl_Gfx_Gradient_Spread), crc, EINA_FALSE); 104 crc = eina_crc((void*) pd->gradient->s, sizeof (Efl_Gfx_Gradient_Spread), crc, EINA_FALSE);
105 if (pd->gradient->colors_count) 105 if (pd->gradient->colors_count)
diff --git a/src/lib/ector/gl/ector_renderer_gl_gradient_radial.c b/src/lib/ector/gl/ector_renderer_gl_gradient_radial.c
index 77514f0387..8760bad429 100644
--- a/src/lib/ector/gl/ector_renderer_gl_gradient_radial.c
+++ b/src/lib/ector/gl/ector_renderer_gl_gradient_radial.c
@@ -30,7 +30,7 @@ _ector_renderer_gl_gradient_radial_ector_renderer_prepare(Eo *obj, Ector_Rendere
30static Eina_Bool 30static Eina_Bool
31_ector_renderer_gl_gradient_radial_ector_renderer_draw(Eo *obj, Ector_Renderer_GL_Gradient_Radial_Data *pd, Efl_Gfx_Render_Op op, Eina_Array *clips, unsigned int mul_col) 31_ector_renderer_gl_gradient_radial_ector_renderer_draw(Eo *obj, Ector_Renderer_GL_Gradient_Radial_Data *pd, Efl_Gfx_Render_Op op, Eina_Array *clips, unsigned int mul_col)
32{ 32{
33 ector_renderer_draw(eo_super(obj, ECTOR_RENDERER_GL_GRADIENT_RADIAL_CLASS), op, clips, mul_col); 33 ector_renderer_draw(efl_super(obj, ECTOR_RENDERER_GL_GRADIENT_RADIAL_CLASS), op, clips, mul_col);
34 34
35 // FIXME: draw something ! 35 // FIXME: draw something !
36 (void) pd; 36 (void) pd;
@@ -69,7 +69,7 @@ _ector_renderer_gl_gradient_radial_ector_renderer_crc_get(Eo *obj, Ector_Rendere
69{ 69{
70 unsigned int crc; 70 unsigned int crc;
71 71
72 crc = ector_renderer_crc_get(eo_super(obj, ECTOR_RENDERER_GL_GRADIENT_RADIAL_CLASS)); 72 crc = ector_renderer_crc_get(efl_super(obj, ECTOR_RENDERER_GL_GRADIENT_RADIAL_CLASS));
73 73
74 crc = eina_crc((void*) pd->gradient->s, sizeof (Efl_Gfx_Gradient_Spread), crc, EINA_FALSE); 74 crc = eina_crc((void*) pd->gradient->s, sizeof (Efl_Gfx_Gradient_Spread), crc, EINA_FALSE);
75 if (pd->gradient->colors_count) 75 if (pd->gradient->colors_count)
@@ -82,13 +82,13 @@ _ector_renderer_gl_gradient_radial_ector_renderer_crc_get(Eo *obj, Ector_Rendere
82static Efl_Object * 82static Efl_Object *
83_ector_renderer_gl_gradient_radial_efl_object_constructor(Eo *obj, Ector_Renderer_GL_Gradient_Radial_Data *pd) 83_ector_renderer_gl_gradient_radial_efl_object_constructor(Eo *obj, Ector_Renderer_GL_Gradient_Radial_Data *pd)
84{ 84{
85 obj = efl_constructor(eo_super(obj, ECTOR_RENDERER_GL_GRADIENT_RADIAL_CLASS)); 85 obj = efl_constructor(efl_super(obj, ECTOR_RENDERER_GL_GRADIENT_RADIAL_CLASS));
86 86
87 if (!obj) return NULL; 87 if (!obj) return NULL;
88 88
89 pd->base = eo_data_xref(obj, ECTOR_RENDERER_CLASS, obj); 89 pd->base = efl_data_xref(obj, ECTOR_RENDERER_CLASS, obj);
90 pd->radial = eo_data_xref(obj, ECTOR_RENDERER_GRADIENT_RADIAL_MIXIN, obj); 90 pd->radial = efl_data_xref(obj, ECTOR_RENDERER_GRADIENT_RADIAL_MIXIN, obj);
91 pd->gradient = eo_data_xref(obj, ECTOR_RENDERER_GRADIENT_MIXIN, obj); 91 pd->gradient = efl_data_xref(obj, ECTOR_RENDERER_GRADIENT_MIXIN, obj);
92 92
93 return obj; 93 return obj;
94} 94}
@@ -96,15 +96,15 @@ _ector_renderer_gl_gradient_radial_efl_object_constructor(Eo *obj, Ector_Rendere
96static void 96static void
97_ector_renderer_gl_gradient_radial_efl_object_destructor(Eo *obj, Ector_Renderer_GL_Gradient_Radial_Data *pd) 97_ector_renderer_gl_gradient_radial_efl_object_destructor(Eo *obj, Ector_Renderer_GL_Gradient_Radial_Data *pd)
98{ 98{
99 eo_data_xunref(obj, pd->base, obj); 99 efl_data_xunref(obj, pd->base, obj);
100 eo_data_xunref(obj, pd->radial, obj); 100 efl_data_xunref(obj, pd->radial, obj);
101 eo_data_xunref(obj, pd->gradient, obj); 101 efl_data_xunref(obj, pd->gradient, obj);
102} 102}
103 103
104static void 104static void
105_ector_renderer_gl_gradient_radial_efl_gfx_gradient_stop_set(Eo *obj, Ector_Renderer_GL_Gradient_Radial_Data *pd EINA_UNUSED, const Efl_Gfx_Gradient_Stop *colors, unsigned int length) 105_ector_renderer_gl_gradient_radial_efl_gfx_gradient_stop_set(Eo *obj, Ector_Renderer_GL_Gradient_Radial_Data *pd EINA_UNUSED, const Efl_Gfx_Gradient_Stop *colors, unsigned int length)
106{ 106{
107 efl_gfx_gradient_stop_set(eo_super(obj, ECTOR_RENDERER_GL_GRADIENT_RADIAL_CLASS), colors, length); 107 efl_gfx_gradient_stop_set(efl_super(obj, ECTOR_RENDERER_GL_GRADIENT_RADIAL_CLASS), colors, length);
108} 108}
109 109
110#include "ector_renderer_gl_gradient_radial.eo.c" 110#include "ector_renderer_gl_gradient_radial.eo.c"
diff --git a/src/lib/ector/gl/ector_renderer_gl_shape.c b/src/lib/ector/gl/ector_renderer_gl_shape.c
index 0615ed9bf6..1e9a7277ea 100644
--- a/src/lib/ector/gl/ector_renderer_gl_shape.c
+++ b/src/lib/ector/gl/ector_renderer_gl_shape.c
@@ -37,7 +37,7 @@ _ector_renderer_gl_shape_ector_renderer_prepare(Eo *obj, Ector_Renderer_GL_Shape
37 37
38 if (pd->vertex) return EINA_TRUE; 38 if (pd->vertex) return EINA_TRUE;
39 39
40 r = ector_renderer_prepare(eo_super(obj, ECTOR_RENDERER_GL_SHAPE_CLASS)); 40 r = ector_renderer_prepare(efl_super(obj, ECTOR_RENDERER_GL_SHAPE_CLASS));
41 41
42 ector_renderer_bounds_get(obj, &bounding_box); 42 ector_renderer_bounds_get(obj, &bounding_box);
43 43
@@ -72,7 +72,7 @@ _ector_renderer_gl_shape_ector_renderer_draw(Eo *obj, Ector_Renderer_GL_Shape_Da
72{ 72{
73 uint64_t flags = 0; 73 uint64_t flags = 0;
74 74
75 ector_renderer_draw(eo_super(obj, ECTOR_RENDERER_GL_SHAPE_CLASS), op, clips, mul_col); 75 ector_renderer_draw(efl_super(obj, ECTOR_RENDERER_GL_SHAPE_CLASS), op, clips, mul_col);
76 76
77 // FIXME: adjust flags content correctly 77 // FIXME: adjust flags content correctly
78 // FIXME: should not ignore clips (idea is that the geometry will be cliped here and the 78 // FIXME: should not ignore clips (idea is that the geometry will be cliped here and the
@@ -118,7 +118,7 @@ _ector_renderer_gl_shape_ector_renderer_crc_get(Eo *obj, Ector_Renderer_GL_Shape
118{ 118{
119 unsigned int crc; 119 unsigned int crc;
120 120
121 crc = ector_renderer_crc_get(eo_super(obj, ECTOR_RENDERER_GL_SHAPE_CLASS)); 121 crc = ector_renderer_crc_get(efl_super(obj, ECTOR_RENDERER_GL_SHAPE_CLASS));
122 122
123 // This code should be shared with other implementation 123 // This code should be shared with other implementation
124 crc = eina_crc((void*) &pd->shape->stroke.marker, sizeof (pd->shape->stroke.marker), crc, EINA_FALSE); 124 crc = eina_crc((void*) &pd->shape->stroke.marker, sizeof (pd->shape->stroke.marker), crc, EINA_FALSE);
@@ -141,13 +141,13 @@ _ector_renderer_gl_shape_ector_renderer_crc_get(Eo *obj, Ector_Renderer_GL_Shape
141static Efl_Object * 141static Efl_Object *
142_ector_renderer_gl_shape_efl_object_constructor(Eo *obj, Ector_Renderer_GL_Shape_Data *pd) 142_ector_renderer_gl_shape_efl_object_constructor(Eo *obj, Ector_Renderer_GL_Shape_Data *pd)
143{ 143{
144 obj = efl_constructor(eo_super(obj, ECTOR_RENDERER_GL_SHAPE_CLASS)); 144 obj = efl_constructor(efl_super(obj, ECTOR_RENDERER_GL_SHAPE_CLASS));
145 145
146 if (!obj) return NULL; 146 if (!obj) return NULL;
147 147
148 pd->public_shape = eo_data_xref(obj, EFL_GFX_SHAPE_MIXIN, obj); 148 pd->public_shape = efl_data_xref(obj, EFL_GFX_SHAPE_MIXIN, obj);
149 pd->shape = eo_data_xref(obj, ECTOR_RENDERER_SHAPE_MIXIN, obj); 149 pd->shape = efl_data_xref(obj, ECTOR_RENDERER_SHAPE_MIXIN, obj);
150 pd->base = eo_data_xref(obj, ECTOR_RENDERER_CLASS, obj); 150 pd->base = efl_data_xref(obj, ECTOR_RENDERER_CLASS, obj);
151 151
152 efl_event_callback_add(obj, EFL_GFX_PATH_CHANGED, _ector_renderer_gl_shape_path_changed, pd); 152 efl_event_callback_add(obj, EFL_GFX_PATH_CHANGED, _ector_renderer_gl_shape_path_changed, pd);
153 153
@@ -157,9 +157,9 @@ _ector_renderer_gl_shape_efl_object_constructor(Eo *obj, Ector_Renderer_GL_Shape
157static void 157static void
158_ector_renderer_gl_shape_efl_object_destructor(Eo *obj, Ector_Renderer_GL_Shape_Data *pd) 158_ector_renderer_gl_shape_efl_object_destructor(Eo *obj, Ector_Renderer_GL_Shape_Data *pd)
159{ 159{
160 eo_data_xunref(obj, pd->shape, obj); 160 efl_data_xunref(obj, pd->shape, obj);
161 eo_data_xunref(obj, pd->base, obj); 161 efl_data_xunref(obj, pd->base, obj);
162 eo_data_xunref(obj, pd->public_shape, obj); 162 efl_data_xunref(obj, pd->public_shape, obj);
163} 163}
164 164
165#include "ector_renderer_gl_shape.eo.c" 165#include "ector_renderer_gl_shape.eo.c"