summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Hacohen <tom@stosb.com>2016-05-11 12:57:06 +0100
committerTom Hacohen <tom@stosb.com>2016-05-11 12:57:55 +0100
commit28a2d34ae20885d229accd1c2e482e284be79afc (patch)
tree9a2a2b59eec6734ffd605d0ba495f867d56c05fc
parent1c0ec6788f8f14cb1fea2dd0b85868462243e395 (diff)
Ector generic: Remove .Generic and .Base (hack no longer needed).
-rw-r--r--src/Makefile_Ector.am30
-rw-r--r--src/lib/ector/Makefile.am30
-rw-r--r--src/lib/ector/cairo/ector_cairo_private.h6
-rw-r--r--src/lib/ector/cairo/ector_cairo_software_surface.c4
-rw-r--r--src/lib/ector/cairo/ector_cairo_software_surface.eo2
-rw-r--r--src/lib/ector/cairo/ector_cairo_surface.c10
-rw-r--r--src/lib/ector/cairo/ector_cairo_surface.eo6
-rw-r--r--src/lib/ector/cairo/ector_renderer_cairo.c14
-rw-r--r--src/lib/ector/cairo/ector_renderer_cairo.eo10
-rw-r--r--src/lib/ector/cairo/ector_renderer_cairo_gradient_linear.c54
-rw-r--r--src/lib/ector/cairo/ector_renderer_cairo_gradient_linear.eo10
-rw-r--r--src/lib/ector/cairo/ector_renderer_cairo_gradient_radial.c54
-rw-r--r--src/lib/ector/cairo/ector_renderer_cairo_gradient_radial.eo10
-rw-r--r--src/lib/ector/cairo/ector_renderer_cairo_shape.c24
-rw-r--r--src/lib/ector/cairo/ector_renderer_cairo_shape.eo10
-rw-r--r--src/lib/ector/ector_buffer.c40
-rw-r--r--src/lib/ector/ector_buffer.eo (renamed from src/lib/ector/ector_generic_buffer.eo)2
-rw-r--r--src/lib/ector/ector_buffer.h12
-rw-r--r--src/lib/ector/ector_generic_buffer.c40
-rw-r--r--src/lib/ector/ector_private.h28
-rw-r--r--src/lib/ector/ector_renderer.c (renamed from src/lib/ector/ector_renderer_generic_base.c)70
-rw-r--r--src/lib/ector/ector_renderer.eo (renamed from src/lib/ector/ector_renderer_generic_base.eo)6
-rw-r--r--src/lib/ector/ector_renderer.h12
-rw-r--r--src/lib/ector/ector_renderer_buffer.c55
-rw-r--r--src/lib/ector/ector_renderer_buffer.eo (renamed from src/lib/ector/ector_renderer_generic_buffer.eo)4
-rw-r--r--src/lib/ector/ector_renderer_generic_buffer.c55
-rw-r--r--src/lib/ector/ector_renderer_generic_shape.c55
-rw-r--r--src/lib/ector/ector_renderer_gradient.c (renamed from src/lib/ector/ector_renderer_generic_gradient.c)18
-rw-r--r--src/lib/ector/ector_renderer_gradient.eo (renamed from src/lib/ector/ector_renderer_generic_gradient.eo)2
-rw-r--r--src/lib/ector/ector_renderer_gradient_linear.c (renamed from src/lib/ector/ector_renderer_generic_gradient_linear.c)18
-rw-r--r--src/lib/ector/ector_renderer_gradient_linear.eo (renamed from src/lib/ector/ector_renderer_generic_gradient_linear.eo)2
-rw-r--r--src/lib/ector/ector_renderer_gradient_radial.c (renamed from src/lib/ector/ector_renderer_generic_gradient_radial.c)26
-rw-r--r--src/lib/ector/ector_renderer_gradient_radial.eo (renamed from src/lib/ector/ector_renderer_generic_gradient_radial.eo)2
-rw-r--r--src/lib/ector/ector_renderer_shape.c55
-rw-r--r--src/lib/ector/ector_renderer_shape.eo (renamed from src/lib/ector/ector_renderer_generic_shape.eo)10
-rw-r--r--src/lib/ector/ector_surface.eo (renamed from src/lib/ector/ector_generic_surface.eo)2
-rw-r--r--src/lib/ector/ector_surface.h2
-rw-r--r--src/lib/ector/gl/ector_gl_buffer_base.eo2
-rw-r--r--src/lib/ector/gl/ector_gl_surface.c10
-rw-r--r--src/lib/ector/gl/ector_gl_surface.eo6
-rw-r--r--src/lib/ector/gl/ector_renderer_gl.c8
-rw-r--r--src/lib/ector/gl/ector_renderer_gl.eo6
-rw-r--r--src/lib/ector/gl/ector_renderer_gl_gradient_linear.c22
-rw-r--r--src/lib/ector/gl/ector_renderer_gl_gradient_linear.eo10
-rw-r--r--src/lib/ector/gl/ector_renderer_gl_gradient_radial.c22
-rw-r--r--src/lib/ector/gl/ector_renderer_gl_gradient_radial.eo10
-rw-r--r--src/lib/ector/gl/ector_renderer_gl_shape.c16
-rw-r--r--src/lib/ector/gl/ector_renderer_gl_shape.eo10
-rw-r--r--src/lib/ector/software/ector_renderer_software.eo2
-rw-r--r--src/lib/ector/software/ector_renderer_software_buffer.c10
-rw-r--r--src/lib/ector/software/ector_renderer_software_buffer.eo8
-rw-r--r--src/lib/ector/software/ector_renderer_software_gradient_linear.c20
-rw-r--r--src/lib/ector/software/ector_renderer_software_gradient_linear.eo8
-rw-r--r--src/lib/ector/software/ector_renderer_software_gradient_radial.c20
-rw-r--r--src/lib/ector/software/ector_renderer_software_gradient_radial.eo8
-rw-r--r--src/lib/ector/software/ector_renderer_software_shape.c14
-rw-r--r--src/lib/ector/software/ector_renderer_software_shape.eo8
-rw-r--r--src/lib/ector/software/ector_software_buffer.c20
-rw-r--r--src/lib/ector/software/ector_software_buffer_base.eo14
-rw-r--r--src/lib/ector/software/ector_software_private.h6
-rw-r--r--src/lib/ector/software/ector_software_surface.c12
-rw-r--r--src/lib/ector/software/ector_software_surface.eo6
-rw-r--r--src/lib/evas/canvas/evas_vg_gradient_linear.c2
-rw-r--r--src/lib/evas/canvas/evas_vg_gradient_radial.c2
-rw-r--r--src/lib/evas/canvas/evas_vg_shape.c2
-rw-r--r--src/lib/evas/filters/evas_filter_private.h2
-rw-r--r--src/modules/evas/engines/gl_generic/evas_ector_gl_image_buffer.c16
-rw-r--r--src/modules/evas/engines/gl_generic/evas_ector_gl_image_buffer.eo10
68 files changed, 551 insertions, 551 deletions
diff --git a/src/Makefile_Ector.am b/src/Makefile_Ector.am
index 63c8473bb9..ab0a404c6a 100644
--- a/src/Makefile_Ector.am
+++ b/src/Makefile_Ector.am
@@ -1,14 +1,14 @@
1 1
2### Library 2### Library
3ector_eolian_files_generic = \ 3ector_eolian_files_generic = \
4 lib/ector/ector_generic_surface.eo \ 4 lib/ector/ector_surface.eo \
5 lib/ector/ector_generic_buffer.eo \ 5 lib/ector/ector_buffer.eo \
6 lib/ector/ector_renderer_generic_base.eo \ 6 lib/ector/ector_renderer.eo \
7 lib/ector/ector_renderer_generic_shape.eo \ 7 lib/ector/ector_renderer_shape.eo \
8 lib/ector/ector_renderer_generic_buffer.eo \ 8 lib/ector/ector_renderer_buffer.eo \
9 lib/ector/ector_renderer_generic_gradient.eo \ 9 lib/ector/ector_renderer_gradient.eo \
10 lib/ector/ector_renderer_generic_gradient_radial.eo \ 10 lib/ector/ector_renderer_gradient_radial.eo \
11 lib/ector/ector_renderer_generic_gradient_linear.eo 11 lib/ector/ector_renderer_gradient_linear.eo
12ector_eolian_generic_h = $(ector_eolian_files_generic:%.eo=%.eo.h) 12ector_eolian_generic_h = $(ector_eolian_files_generic:%.eo=%.eo.h)
13 13
14# Handle cairo backend 14# Handle cairo backend
@@ -87,13 +87,13 @@ lib_LTLIBRARIES += lib/ector/libector.la
87lib_ector_libector_la_SOURCES = \ 87lib_ector_libector_la_SOURCES = \
88lib/ector/ector_main.c \ 88lib/ector/ector_main.c \
89lib/ector/ector_gl_internal.h \ 89lib/ector/ector_gl_internal.h \
90lib/ector/ector_generic_buffer.c \ 90lib/ector/ector_buffer.c \
91lib/ector/ector_renderer_generic_shape.c \ 91lib/ector/ector_renderer_shape.c \
92lib/ector/ector_renderer_generic_base.c \ 92lib/ector/ector_renderer.c \
93lib/ector/ector_renderer_generic_buffer.c \ 93lib/ector/ector_renderer_buffer.c \
94lib/ector/ector_renderer_generic_gradient.c \ 94lib/ector/ector_renderer_gradient.c \
95lib/ector/ector_renderer_generic_gradient_radial.c \ 95lib/ector/ector_renderer_gradient_radial.c \
96lib/ector/ector_renderer_generic_gradient_linear.c 96lib/ector/ector_renderer_gradient_linear.c
97 97
98# And now the cairo backend 98# And now the cairo backend
99lib_ector_libector_la_SOURCES += \ 99lib_ector_libector_la_SOURCES += \
diff --git a/src/lib/ector/Makefile.am b/src/lib/ector/Makefile.am
index 2456f0dc2c..516170bea5 100644
--- a/src/lib/ector/Makefile.am
+++ b/src/lib/ector/Makefile.am
@@ -4,14 +4,14 @@ include ../../Makefile_Eolian_Subbuild_Helper.am
4 4
5### Library 5### Library
6ector_eolian_files_generic = \ 6ector_eolian_files_generic = \
7 ector_generic_surface.eo \ 7 ector_surface.eo \
8 ector_generic_buffer.eo \ 8 ector_buffer.eo \
9 ector_renderer_generic_base.eo \ 9 ector_renderer.eo \
10 ector_renderer_generic_shape.eo \ 10 ector_renderer_shape.eo \
11 ector_renderer_generic_buffer.eo \ 11 ector_renderer_buffer.eo \
12 ector_renderer_generic_gradient.eo \ 12 ector_renderer_gradient.eo \
13 ector_renderer_generic_gradient_radial.eo \ 13 ector_renderer_gradient_radial.eo \
14 ector_renderer_generic_gradient_linear.eo 14 ector_renderer_gradient_linear.eo
15ector_eolian_generic_h = $(ector_eolian_files_generic:%.eo=%.eo.h) 15ector_eolian_generic_h = $(ector_eolian_files_generic:%.eo=%.eo.h)
16 16
17# Handle cairo backend 17# Handle cairo backend
@@ -76,13 +76,13 @@ lib_LTLIBRARIES = libector.la
76libector_la_SOURCES = \ 76libector_la_SOURCES = \
77ector_main.c \ 77ector_main.c \
78ector_gl_internal.h \ 78ector_gl_internal.h \
79ector_generic_buffer.c \ 79ector_buffer.c \
80ector_renderer_generic_shape.c \ 80ector_renderer_shape.c \
81ector_renderer_generic_base.c \ 81ector_renderer.c \
82ector_renderer_generic_buffer.c \ 82ector_renderer_buffer.c \
83ector_renderer_generic_gradient.c \ 83ector_renderer_gradient.c \
84ector_renderer_generic_gradient_radial.c \ 84ector_renderer_gradient_radial.c \
85ector_renderer_generic_gradient_linear.c 85ector_renderer_gradient_linear.c
86 86
87# And now the cairo backend 87# And now the cairo backend
88libector_la_SOURCES += \ 88libector_la_SOURCES += \
diff --git a/src/lib/ector/cairo/ector_cairo_private.h b/src/lib/ector/cairo/ector_cairo_private.h
index d8754351fd..a7a6d7661f 100644
--- a/src/lib/ector/cairo/ector_cairo_private.h
+++ b/src/lib/ector/cairo/ector_cairo_private.h
@@ -25,7 +25,7 @@ struct _Ector_Cairo_Surface_Data
25struct _Ector_Renderer_Cairo_Data 25struct _Ector_Renderer_Cairo_Data
26{ 26{
27 Ector_Cairo_Surface_Data *parent; 27 Ector_Cairo_Surface_Data *parent;
28 Ector_Renderer_Generic_Base_Data *generic; 28 Ector_Renderer_Data *generic;
29 29
30 cairo_matrix_t *m; 30 cairo_matrix_t *m;
31}; 31};
@@ -60,7 +60,7 @@ _ector_cairo_extent_get(Efl_Gfx_Gradient_Spread s)
60 if (!Sym) return Error; 60 if (!Sym) return Error;
61 61
62static inline void * 62static inline void *
63_ector_cairo_symbol_get(Ector_Renderer_Generic_Base_Data *base, 63_ector_cairo_symbol_get(Ector_Renderer_Data *base,
64 const char *name) 64 const char *name)
65{ 65{
66 void *sym; 66 void *sym;
@@ -74,7 +74,7 @@ extern void (*cairo_pattern_add_color_stop_rgba)(cairo_pattern_t *pattern, doubl
74 74
75static inline void 75static inline void
76_ector_renderer_cairo_gradient_prepare(cairo_pattern_t *pat, 76_ector_renderer_cairo_gradient_prepare(cairo_pattern_t *pat,
77 Ector_Renderer_Generic_Gradient_Data *src, 77 Ector_Renderer_Gradient_Data *src,
78 unsigned int mul_col) 78 unsigned int mul_col)
79{ 79{
80 unsigned int i; 80 unsigned int i;
diff --git a/src/lib/ector/cairo/ector_cairo_software_surface.c b/src/lib/ector/cairo/ector_cairo_software_surface.c
index 2ce001e9f4..25bf3f86e6 100644
--- a/src/lib/ector/cairo/ector_cairo_software_surface.c
+++ b/src/lib/ector/cairo/ector_cairo_software_surface.c
@@ -50,7 +50,7 @@ struct _Ector_Cairo_Software_Surface_Data
50}; 50};
51 51
52EOLIAN static Eina_Bool 52EOLIAN static Eina_Bool
53_ector_cairo_software_surface_ector_generic_buffer_pixels_set(Eo *obj, Ector_Cairo_Software_Surface_Data *pd, 53_ector_cairo_software_surface_ector_buffer_pixels_set(Eo *obj, Ector_Cairo_Software_Surface_Data *pd,
54 void *pixels, int width, int height, int stride, 54 void *pixels, int width, int height, int stride,
55 Efl_Gfx_Colorspace cspace, Eina_Bool writable, 55 Efl_Gfx_Colorspace cspace, Eina_Bool writable,
56 unsigned char l, unsigned char r, unsigned char t, unsigned char b) 56 unsigned char l, unsigned char r, unsigned char t, unsigned char b)
@@ -106,7 +106,7 @@ _ector_cairo_software_surface_eo_base_constructor(Eo *obj, Ector_Cairo_Software_
106 106
107 if (!obj) return NULL; 107 if (!obj) return NULL;
108 pd->base = eo_data_ref(obj, ECTOR_SOFTWARE_BUFFER_BASE_MIXIN); 108 pd->base = eo_data_ref(obj, ECTOR_SOFTWARE_BUFFER_BASE_MIXIN);
109 pd->base->generic = eo_data_ref(obj, ECTOR_GENERIC_BUFFER_MIXIN); 109 pd->base->generic = eo_data_ref(obj, ECTOR_BUFFER_MIXIN);
110 pd->base->generic->eo = obj; 110 pd->base->generic->eo = obj;
111 return obj; 111 return obj;
112} 112}
diff --git a/src/lib/ector/cairo/ector_cairo_software_surface.eo b/src/lib/ector/cairo/ector_cairo_software_surface.eo
index 28df974d48..f835aa26d7 100644
--- a/src/lib/ector/cairo/ector_cairo_software_surface.eo
+++ b/src/lib/ector/cairo/ector_cairo_software_surface.eo
@@ -8,7 +8,7 @@ class Ector.Cairo_Software.Surface (Ector.Cairo.Surface, Ector.Software.Buffer.B
8 legacy_prefix: null; 8 legacy_prefix: null;
9 methods {} 9 methods {}
10 implements { 10 implements {
11 Ector.Generic.Buffer.pixels_set; 11 Ector.Buffer.pixels_set;
12 Eo.Base.constructor; 12 Eo.Base.constructor;
13 Eo.Base.destructor; 13 Eo.Base.destructor;
14 } 14 }
diff --git a/src/lib/ector/cairo/ector_cairo_surface.c b/src/lib/ector/cairo/ector_cairo_surface.c
index ae737e6d5a..540ce4e825 100644
--- a/src/lib/ector/cairo/ector_cairo_surface.c
+++ b/src/lib/ector/cairo/ector_cairo_surface.c
@@ -58,15 +58,15 @@ _ector_cairo_surface_symbol_get(Eo *obj EINA_UNUSED,
58 if (!Sym) return Error; 58 if (!Sym) return Error;
59 59
60static Ector_Renderer * 60static Ector_Renderer *
61_ector_cairo_surface_ector_generic_surface_renderer_factory_new(Eo *obj, 61_ector_cairo_surface_ector_surface_renderer_factory_new(Eo *obj,
62 Ector_Cairo_Surface_Data *pd EINA_UNUSED, 62 Ector_Cairo_Surface_Data *pd EINA_UNUSED,
63 const Eo_Class *type) 63 const Eo_Class *type)
64{ 64{
65 if (type == ECTOR_RENDERER_GENERIC_SHAPE_MIXIN) 65 if (type == ECTOR_RENDERER_SHAPE_MIXIN)
66 return eo_add(ECTOR_RENDERER_CAIRO_SHAPE_CLASS, NULL, ector_renderer_surface_set(eo_self, obj)); 66 return eo_add(ECTOR_RENDERER_CAIRO_SHAPE_CLASS, NULL, ector_renderer_surface_set(eo_self, obj));
67 else if (type == ECTOR_RENDERER_GENERIC_GRADIENT_LINEAR_MIXIN) 67 else if (type == ECTOR_RENDERER_GRADIENT_LINEAR_MIXIN)
68 return eo_add(ECTOR_RENDERER_CAIRO_GRADIENT_LINEAR_CLASS, NULL, ector_renderer_surface_set(eo_self, obj)); 68 return eo_add(ECTOR_RENDERER_CAIRO_GRADIENT_LINEAR_CLASS, NULL, ector_renderer_surface_set(eo_self, obj));
69 else if (type == ECTOR_RENDERER_GENERIC_GRADIENT_RADIAL_MIXIN) 69 else if (type == ECTOR_RENDERER_GRADIENT_RADIAL_MIXIN)
70 return eo_add(ECTOR_RENDERER_CAIRO_GRADIENT_RADIAL_CLASS, NULL, ector_renderer_surface_set(eo_self, obj)); 70 return eo_add(ECTOR_RENDERER_CAIRO_GRADIENT_RADIAL_CLASS, NULL, ector_renderer_surface_set(eo_self, obj));
71 71
72 ERR("Couldn't find class for type: %s\n", eo_class_name_get(type)); 72 ERR("Couldn't find class for type: %s\n", eo_class_name_get(type));
@@ -106,7 +106,7 @@ _ector_cairo_surface_context_get(Eo *obj EINA_UNUSED,
106} 106}
107 107
108static void 108static void
109_ector_cairo_surface_ector_generic_surface_reference_point_set(Eo *obj EINA_UNUSED, 109_ector_cairo_surface_ector_surface_reference_point_set(Eo *obj EINA_UNUSED,
110 Ector_Cairo_Surface_Data *pd, 110 Ector_Cairo_Surface_Data *pd,
111 int x, int y) 111 int x, int y)
112{ 112{
diff --git a/src/lib/ector/cairo/ector_cairo_surface.eo b/src/lib/ector/cairo/ector_cairo_surface.eo
index 95ca60b585..452db34b92 100644
--- a/src/lib/ector/cairo/ector_cairo_surface.eo
+++ b/src/lib/ector/cairo/ector_cairo_surface.eo
@@ -1,6 +1,6 @@
1type @extern cairo_t: void *; 1type @extern cairo_t: void *;
2 2
3class Ector.Cairo.Surface (Eo.Base, Ector.Generic.Surface) 3class Ector.Cairo.Surface (Eo.Base, Ector.Surface)
4{ 4{
5 [[Ector surface on a cairo backend 5 [[Ector surface on a cairo backend
6 6
@@ -27,8 +27,8 @@ class Ector.Cairo.Surface (Eo.Base, Ector.Generic.Surface)
27 } 27 }
28 } 28 }
29 implements { 29 implements {
30 Ector.Generic.Surface.renderer_factory_new; 30 Ector.Surface.renderer_factory_new;
31 Ector.Generic.Surface.reference_point.set; 31 Ector.Surface.reference_point.set;
32 Eo.Base.destructor; 32 Eo.Base.destructor;
33 Eo.Base.constructor; 33 Eo.Base.constructor;
34 } 34 }
diff --git a/src/lib/ector/cairo/ector_renderer_cairo.c b/src/lib/ector/cairo/ector_renderer_cairo.c
index ee6e64b5a6..eca5d0cc4b 100644
--- a/src/lib/ector/cairo/ector_renderer_cairo.c
+++ b/src/lib/ector/cairo/ector_renderer_cairo.c
@@ -73,7 +73,7 @@ static cairo_matrix_t identity;
73 73
74// Cairo need unpremul color, so force unpremul here 74// Cairo need unpremul color, so force unpremul here
75void 75void
76_ector_renderer_cairo_ector_renderer_generic_base_color_set(Eo *obj EINA_UNUSED, 76_ector_renderer_cairo_ector_renderer_color_set(Eo *obj EINA_UNUSED,
77 Ector_Renderer_Cairo_Data *pd, 77 Ector_Renderer_Cairo_Data *pd,
78 int r, int g, int b, int a) 78 int r, int g, int b, int a)
79{ 79{
@@ -84,7 +84,7 @@ _ector_renderer_cairo_ector_renderer_generic_base_color_set(Eo *obj EINA_UNUSED,
84} 84}
85 85
86void 86void
87_ector_renderer_cairo_ector_renderer_generic_base_color_get(Eo *obj EINA_UNUSED, 87_ector_renderer_cairo_ector_renderer_color_get(Eo *obj EINA_UNUSED,
88 Ector_Renderer_Cairo_Data *pd, 88 Ector_Renderer_Cairo_Data *pd,
89 int *r, int *g, int *b, int *a) 89 int *r, int *g, int *b, int *a)
90{ 90{
@@ -95,7 +95,7 @@ _ector_renderer_cairo_ector_renderer_generic_base_color_get(Eo *obj EINA_UNUSED,
95} 95}
96 96
97static Eina_Bool 97static Eina_Bool
98_ector_renderer_cairo_ector_renderer_generic_base_prepare(Eo *obj, Ector_Renderer_Cairo_Data *pd) 98_ector_renderer_cairo_ector_renderer_prepare(Eo *obj, Ector_Renderer_Cairo_Data *pd)
99{ 99{
100 if (!pd->parent) 100 if (!pd->parent)
101 { 101 {
@@ -119,7 +119,7 @@ _ector_renderer_cairo_ector_renderer_generic_base_prepare(Eo *obj, Ector_Rendere
119} 119}
120 120
121static Eina_Bool 121static Eina_Bool
122_ector_renderer_cairo_ector_renderer_generic_base_draw(Eo *obj EINA_UNUSED, 122_ector_renderer_cairo_ector_renderer_draw(Eo *obj EINA_UNUSED,
123 Ector_Renderer_Cairo_Data *pd, 123 Ector_Renderer_Cairo_Data *pd,
124 Efl_Gfx_Render_Op op, 124 Efl_Gfx_Render_Op op,
125 Eina_Array *clips EINA_UNUSED, 125 Eina_Array *clips EINA_UNUSED,
@@ -185,7 +185,7 @@ _ector_renderer_cairo_eo_base_constructor(Eo *obj, Ector_Renderer_Cairo_Data *pd
185 obj = eo_constructor(eo_super(obj, ECTOR_RENDERER_CAIRO_CLASS)); 185 obj = eo_constructor(eo_super(obj, ECTOR_RENDERER_CAIRO_CLASS));
186 if (!obj) return NULL; 186 if (!obj) return NULL;
187 187
188 pd->generic = eo_data_xref(obj, ECTOR_RENDERER_GENERIC_BASE_CLASS, obj); 188 pd->generic = eo_data_xref(obj, ECTOR_RENDERER_CLASS, obj);
189 189
190 return obj; 190 return obj;
191} 191}
@@ -215,9 +215,9 @@ _ector_renderer_cairo_eo_base_finalize(Eo *obj, Ector_Renderer_Cairo_Data *pd)
215static void 215static void
216_ector_renderer_cairo_eo_base_destructor(Eo *obj, Ector_Renderer_Cairo_Data *pd) 216_ector_renderer_cairo_eo_base_destructor(Eo *obj, Ector_Renderer_Cairo_Data *pd)
217{ 217{
218 Ector_Renderer_Generic_Base_Data *base; 218 Ector_Renderer_Data *base;
219 219
220 base = eo_data_scope_get(obj, ECTOR_RENDERER_GENERIC_BASE_CLASS); 220 base = eo_data_scope_get(obj, ECTOR_RENDERER_CLASS);
221 eo_data_xunref(base->surface, pd->parent, obj); 221 eo_data_xunref(base->surface, pd->parent, obj);
222 eo_data_xunref(obj, pd->generic, obj); 222 eo_data_xunref(obj, pd->generic, obj);
223 223
diff --git a/src/lib/ector/cairo/ector_renderer_cairo.eo b/src/lib/ector/cairo/ector_renderer_cairo.eo
index 9da20ecbe3..56e3632c8e 100644
--- a/src/lib/ector/cairo/ector_renderer_cairo.eo
+++ b/src/lib/ector/cairo/ector_renderer_cairo.eo
@@ -1,4 +1,4 @@
1abstract Ector.Renderer.Cairo (Ector.Renderer.Generic.Base) 1abstract Ector.Renderer.Cairo (Ector.Renderer)
2{ 2{
3 legacy_prefix: null; 3 legacy_prefix: null;
4 methods { 4 methods {
@@ -11,10 +11,10 @@ abstract Ector.Renderer.Cairo (Ector.Renderer.Generic.Base)
11 } 11 }
12 implements { 12 implements {
13 @virtual .fill; 13 @virtual .fill;
14 Ector.Renderer.Generic.Base.prepare; 14 Ector.Renderer.prepare;
15 Ector.Renderer.Generic.Base.draw; 15 Ector.Renderer.draw;
16 Ector.Renderer.Generic.Base.color.set; 16 Ector.Renderer.color.set;
17 Ector.Renderer.Generic.Base.color.get; 17 Ector.Renderer.color.get;
18 Eo.Base.constructor; 18 Eo.Base.constructor;
19 Eo.Base.finalize; 19 Eo.Base.finalize;
20 Eo.Base.destructor; 20 Eo.Base.destructor;
diff --git a/src/lib/ector/cairo/ector_renderer_cairo_gradient_linear.c b/src/lib/ector/cairo/ector_renderer_cairo_gradient_linear.c
index 130c4b76bf..757d5c8af4 100644
--- a/src/lib/ector/cairo/ector_renderer_cairo_gradient_linear.c
+++ b/src/lib/ector/cairo/ector_renderer_cairo_gradient_linear.c
@@ -28,8 +28,8 @@ struct _Ector_Renderer_Cairo_Gradient_Linear_Data
28 28
29static cairo_pattern_t * 29static cairo_pattern_t *
30_ector_renderer_cairo_gradient_linear_prepare(Eo *obj EINA_UNUSED, 30_ector_renderer_cairo_gradient_linear_prepare(Eo *obj EINA_UNUSED,
31 Ector_Renderer_Generic_Gradient_Linear_Data *gld, 31 Ector_Renderer_Gradient_Linear_Data *gld,
32 Ector_Renderer_Generic_Gradient_Data *gd, 32 Ector_Renderer_Gradient_Data *gd,
33 unsigned int mul_col) 33 unsigned int mul_col)
34{ 34{
35 cairo_pattern_t *pat; 35 cairo_pattern_t *pat;
@@ -45,16 +45,16 @@ _ector_renderer_cairo_gradient_linear_prepare(Eo *obj EINA_UNUSED,
45} 45}
46 46
47static Eina_Bool 47static Eina_Bool
48_ector_renderer_cairo_gradient_linear_ector_renderer_generic_base_prepare(Eo *obj, 48_ector_renderer_cairo_gradient_linear_ector_renderer_prepare(Eo *obj,
49 Ector_Renderer_Cairo_Gradient_Linear_Data *pd) 49 Ector_Renderer_Cairo_Gradient_Linear_Data *pd)
50{ 50{
51 ector_renderer_prepare(eo_super(obj, ECTOR_RENDERER_CAIRO_GRADIENT_LINEAR_CLASS)); 51 ector_renderer_prepare(eo_super(obj, ECTOR_RENDERER_CAIRO_GRADIENT_LINEAR_CLASS));
52 52
53 if (!pd->parent) 53 if (!pd->parent)
54 { 54 {
55 Ector_Renderer_Generic_Base_Data *base; 55 Ector_Renderer_Data *base;
56 56
57 base = eo_data_scope_get(obj, ECTOR_RENDERER_GENERIC_BASE_CLASS); 57 base = eo_data_scope_get(obj, ECTOR_RENDERER_CLASS);
58 pd->parent = eo_data_xref(base->surface, ECTOR_CAIRO_SURFACE_CLASS, obj); 58 pd->parent = eo_data_xref(base->surface, ECTOR_CAIRO_SURFACE_CLASS, obj);
59 } 59 }
60 60
@@ -62,17 +62,17 @@ _ector_renderer_cairo_gradient_linear_ector_renderer_generic_base_prepare(Eo *ob
62} 62}
63 63
64static Eina_Bool 64static Eina_Bool
65_ector_renderer_cairo_gradient_linear_ector_renderer_generic_base_draw(Eo *obj, 65_ector_renderer_cairo_gradient_linear_ector_renderer_draw(Eo *obj,
66 Ector_Renderer_Cairo_Gradient_Linear_Data *pd, 66 Ector_Renderer_Cairo_Gradient_Linear_Data *pd,
67 Efl_Gfx_Render_Op op, Eina_Array *clips, unsigned int mul_col) 67 Efl_Gfx_Render_Op op, Eina_Array *clips, unsigned int mul_col)
68{ 68{
69 Ector_Renderer_Generic_Gradient_Linear_Data *gld; 69 Ector_Renderer_Gradient_Linear_Data *gld;
70 Ector_Renderer_Generic_Gradient_Data *gd; 70 Ector_Renderer_Gradient_Data *gd;
71 cairo_pattern_t *pat; 71 cairo_pattern_t *pat;
72 72
73 // FIXME: don't ignore clipping ! 73 // FIXME: don't ignore clipping !
74 gld = eo_data_scope_get(obj, ECTOR_RENDERER_GENERIC_GRADIENT_LINEAR_MIXIN); 74 gld = eo_data_scope_get(obj, ECTOR_RENDERER_GRADIENT_LINEAR_MIXIN);
75 gd = eo_data_scope_get(obj, ECTOR_RENDERER_GENERIC_GRADIENT_MIXIN); 75 gd = eo_data_scope_get(obj, ECTOR_RENDERER_GRADIENT_MIXIN);
76 if (!gd || !gld) return EINA_FALSE; 76 if (!gd || !gld) return EINA_FALSE;
77 77
78 pat = _ector_renderer_cairo_gradient_linear_prepare(obj, gld, gd, mul_col); 78 pat = _ector_renderer_cairo_gradient_linear_prepare(obj, gld, gd, mul_col);
@@ -95,12 +95,12 @@ _ector_renderer_cairo_gradient_linear_ector_renderer_cairo_fill(Eo *obj,
95 Ector_Renderer_Cairo_Gradient_Linear_Data *pd, 95 Ector_Renderer_Cairo_Gradient_Linear_Data *pd,
96 unsigned int mul_col) 96 unsigned int mul_col)
97{ 97{
98 Ector_Renderer_Generic_Gradient_Linear_Data *gld; 98 Ector_Renderer_Gradient_Linear_Data *gld;
99 Ector_Renderer_Generic_Gradient_Data *gd; 99 Ector_Renderer_Gradient_Data *gd;
100 cairo_pattern_t *pat; 100 cairo_pattern_t *pat;
101 101
102 gld = eo_data_scope_get(obj, ECTOR_RENDERER_GENERIC_GRADIENT_LINEAR_MIXIN); 102 gld = eo_data_scope_get(obj, ECTOR_RENDERER_GRADIENT_LINEAR_MIXIN);
103 gd = eo_data_scope_get(obj, ECTOR_RENDERER_GENERIC_GRADIENT_MIXIN); 103 gd = eo_data_scope_get(obj, ECTOR_RENDERER_GRADIENT_MIXIN);
104 if (!gd || !gld) return EINA_FALSE; 104 if (!gd || !gld) return EINA_FALSE;
105 105
106 pat = _ector_renderer_cairo_gradient_linear_prepare(obj, gld, gd, mul_col); 106 pat = _ector_renderer_cairo_gradient_linear_prepare(obj, gld, gd, mul_col);
@@ -113,14 +113,14 @@ _ector_renderer_cairo_gradient_linear_ector_renderer_cairo_fill(Eo *obj,
113} 113}
114 114
115static void 115static void
116_ector_renderer_cairo_gradient_linear_ector_renderer_generic_base_bounds_get(Eo *obj, 116_ector_renderer_cairo_gradient_linear_ector_renderer_bounds_get(Eo *obj,
117 Ector_Renderer_Cairo_Gradient_Linear_Data *pd EINA_UNUSED, 117 Ector_Renderer_Cairo_Gradient_Linear_Data *pd EINA_UNUSED,
118 Eina_Rectangle *r) 118 Eina_Rectangle *r)
119{ 119{
120 Ector_Renderer_Generic_Gradient_Linear_Data *gld; 120 Ector_Renderer_Gradient_Linear_Data *gld;
121 Ector_Renderer_Cairo_Data *bd; 121 Ector_Renderer_Cairo_Data *bd;
122 122
123 gld = eo_data_scope_get(obj, ECTOR_RENDERER_GENERIC_GRADIENT_RADIAL_MIXIN); 123 gld = eo_data_scope_get(obj, ECTOR_RENDERER_GRADIENT_RADIAL_MIXIN);
124 bd = eo_data_scope_get(obj, ECTOR_RENDERER_CAIRO_CLASS); 124 bd = eo_data_scope_get(obj, ECTOR_RENDERER_CAIRO_CLASS);
125 EINA_RECTANGLE_SET(r, 125 EINA_RECTANGLE_SET(r,
126 bd->generic->origin.x + gld->start.x, 126 bd->generic->origin.x + gld->start.x,
@@ -132,12 +132,12 @@ _ector_renderer_cairo_gradient_linear_ector_renderer_generic_base_bounds_get(Eo
132static Eo_Base * 132static Eo_Base *
133_ector_renderer_cairo_gradient_linear_eo_base_finalize(Eo *obj, Ector_Renderer_Cairo_Gradient_Linear_Data *pd EINA_UNUSED) 133_ector_renderer_cairo_gradient_linear_eo_base_finalize(Eo *obj, Ector_Renderer_Cairo_Gradient_Linear_Data *pd EINA_UNUSED)
134{ 134{
135 Ector_Renderer_Generic_Base_Data *base; 135 Ector_Renderer_Data *base;
136 136
137 obj = eo_finalize(eo_super(obj, ECTOR_RENDERER_CAIRO_GRADIENT_LINEAR_CLASS)); 137 obj = eo_finalize(eo_super(obj, ECTOR_RENDERER_CAIRO_GRADIENT_LINEAR_CLASS));
138 if (!obj) return NULL; 138 if (!obj) return NULL;
139 139
140 base = eo_data_scope_get(obj, ECTOR_RENDERER_GENERIC_BASE_CLASS); 140 base = eo_data_scope_get(obj, ECTOR_RENDERER_CLASS);
141 141
142 USE(base, cairo_set_source, NULL); 142 USE(base, cairo_set_source, NULL);
143 USE(base, cairo_pattern_destroy, NULL); 143 USE(base, cairo_pattern_destroy, NULL);
@@ -156,9 +156,9 @@ static void
156_ector_renderer_cairo_gradient_linear_eo_base_destructor(Eo *obj, 156_ector_renderer_cairo_gradient_linear_eo_base_destructor(Eo *obj,
157 Ector_Renderer_Cairo_Gradient_Linear_Data *pd) 157 Ector_Renderer_Cairo_Gradient_Linear_Data *pd)
158{ 158{
159 Ector_Renderer_Generic_Base_Data *base; 159 Ector_Renderer_Data *base;
160 160
161 base = eo_data_scope_get(obj, ECTOR_RENDERER_GENERIC_BASE_CLASS); 161 base = eo_data_scope_get(obj, ECTOR_RENDERER_CLASS);
162 eo_data_xunref(base->surface, pd->parent, obj); 162 eo_data_xunref(base->surface, pd->parent, obj);
163 163
164 eo_destructor(eo_super(obj, ECTOR_RENDERER_CAIRO_GRADIENT_LINEAR_CLASS)); 164 eo_destructor(eo_super(obj, ECTOR_RENDERER_CAIRO_GRADIENT_LINEAR_CLASS));
@@ -174,22 +174,22 @@ _ector_renderer_cairo_gradient_linear_efl_gfx_gradient_stop_set(Eo *obj,
174} 174}
175 175
176static unsigned int 176static unsigned int
177_ector_renderer_cairo_gradient_linear_ector_renderer_generic_base_crc_get(Eo *obj, Ector_Renderer_Cairo_Gradient_Linear_Data *pd EINA_UNUSED) 177_ector_renderer_cairo_gradient_linear_ector_renderer_crc_get(Eo *obj, Ector_Renderer_Cairo_Gradient_Linear_Data *pd EINA_UNUSED)
178{ 178{
179 Ector_Renderer_Generic_Gradient_Linear_Data *gld; 179 Ector_Renderer_Gradient_Linear_Data *gld;
180 Ector_Renderer_Generic_Gradient_Data *gd; 180 Ector_Renderer_Gradient_Data *gd;
181 unsigned int crc; 181 unsigned int crc;
182 182
183 crc = ector_renderer_crc_get(eo_super(obj, ECTOR_RENDERER_CAIRO_GRADIENT_LINEAR_CLASS)); 183 crc = ector_renderer_crc_get(eo_super(obj, ECTOR_RENDERER_CAIRO_GRADIENT_LINEAR_CLASS));
184 184
185 gld = eo_data_scope_get(obj, ECTOR_RENDERER_GENERIC_GRADIENT_LINEAR_MIXIN); 185 gld = eo_data_scope_get(obj, ECTOR_RENDERER_GRADIENT_LINEAR_MIXIN);
186 gd = eo_data_scope_get(obj, ECTOR_RENDERER_GENERIC_GRADIENT_MIXIN); 186 gd = eo_data_scope_get(obj, ECTOR_RENDERER_GRADIENT_MIXIN);
187 if (!gd || !gld) return crc; 187 if (!gd || !gld) return crc;
188 188
189 crc = eina_crc((void*) gd->s, sizeof (Efl_Gfx_Gradient_Spread), crc, EINA_FALSE); 189 crc = eina_crc((void*) gd->s, sizeof (Efl_Gfx_Gradient_Spread), crc, EINA_FALSE);
190 if (gd->colors_count) 190 if (gd->colors_count)
191 crc = eina_crc((void*) gd->colors, sizeof (Efl_Gfx_Gradient_Stop) * gd->colors_count, crc, EINA_FALSE); 191 crc = eina_crc((void*) gd->colors, sizeof (Efl_Gfx_Gradient_Stop) * gd->colors_count, crc, EINA_FALSE);
192 crc = eina_crc((void*) gld, sizeof (Ector_Renderer_Generic_Gradient_Linear_Data), crc, EINA_FALSE); 192 crc = eina_crc((void*) gld, sizeof (Ector_Renderer_Gradient_Linear_Data), crc, EINA_FALSE);
193 193
194 return crc; 194 return crc;
195} 195}
diff --git a/src/lib/ector/cairo/ector_renderer_cairo_gradient_linear.eo b/src/lib/ector/cairo/ector_renderer_cairo_gradient_linear.eo
index 8111ebed1c..3ecbd30c7c 100644
--- a/src/lib/ector/cairo/ector_renderer_cairo_gradient_linear.eo
+++ b/src/lib/ector/cairo/ector_renderer_cairo_gradient_linear.eo
@@ -1,12 +1,12 @@
1class Ector.Renderer.Cairo.Gradient_Linear (Ector.Renderer.Cairo, Ector.Renderer.Generic.Gradient, Ector.Renderer.Generic.Gradient_Linear) 1class Ector.Renderer.Cairo.Gradient_Linear (Ector.Renderer.Cairo, Ector.Renderer.Gradient, Ector.Renderer.Gradient_Linear)
2{ 2{
3 eo_prefix: ector_renderer_cairo_gradient_linear; 3 eo_prefix: ector_renderer_cairo_gradient_linear;
4 legacy_prefix: null; 4 legacy_prefix: null;
5 implements { 5 implements {
6 Ector.Renderer.Generic.Base.prepare; 6 Ector.Renderer.prepare;
7 Ector.Renderer.Generic.Base.draw; 7 Ector.Renderer.draw;
8 Ector.Renderer.Generic.Base.bounds_get; 8 Ector.Renderer.bounds_get;
9 Ector.Renderer.Generic.Base.crc.get; 9 Ector.Renderer.crc.get;
10 Ector.Renderer.Cairo.fill; 10 Ector.Renderer.Cairo.fill;
11 Eo.Base.finalize; 11 Eo.Base.finalize;
12 Eo.Base.destructor; 12 Eo.Base.destructor;
diff --git a/src/lib/ector/cairo/ector_renderer_cairo_gradient_radial.c b/src/lib/ector/cairo/ector_renderer_cairo_gradient_radial.c
index 209630cd4e..97d0417fbd 100644
--- a/src/lib/ector/cairo/ector_renderer_cairo_gradient_radial.c
+++ b/src/lib/ector/cairo/ector_renderer_cairo_gradient_radial.c
@@ -32,15 +32,15 @@ struct _Ector_Renderer_Cairo_Gradient_Radial_Data
32}; 32};
33 33
34static Eina_Bool 34static Eina_Bool
35_ector_renderer_cairo_gradient_radial_ector_renderer_generic_base_prepare(Eo *obj, Ector_Renderer_Cairo_Gradient_Radial_Data *pd) 35_ector_renderer_cairo_gradient_radial_ector_renderer_prepare(Eo *obj, Ector_Renderer_Cairo_Gradient_Radial_Data *pd)
36{ 36{
37 ector_renderer_prepare(eo_super(obj, ECTOR_RENDERER_CAIRO_GRADIENT_RADIAL_CLASS)); 37 ector_renderer_prepare(eo_super(obj, ECTOR_RENDERER_CAIRO_GRADIENT_RADIAL_CLASS));
38 38
39 if (!pd->parent) 39 if (!pd->parent)
40 { 40 {
41 Ector_Renderer_Generic_Base_Data *base; 41 Ector_Renderer_Data *base;
42 42
43 base = eo_data_scope_get(obj, ECTOR_RENDERER_GENERIC_BASE_CLASS); 43 base = eo_data_scope_get(obj, ECTOR_RENDERER_CLASS);
44 pd->parent = eo_data_xref(base->surface, ECTOR_CAIRO_SURFACE_CLASS, obj); 44 pd->parent = eo_data_xref(base->surface, ECTOR_CAIRO_SURFACE_CLASS, obj);
45 } 45 }
46 46
@@ -49,8 +49,8 @@ _ector_renderer_cairo_gradient_radial_ector_renderer_generic_base_prepare(Eo *ob
49 49
50static cairo_pattern_t * 50static cairo_pattern_t *
51_ector_renderer_cairo_gradient_radial_prepare(Eo *obj EINA_UNUSED, 51_ector_renderer_cairo_gradient_radial_prepare(Eo *obj EINA_UNUSED,
52 Ector_Renderer_Generic_Gradient_Radial_Data *grd, 52 Ector_Renderer_Gradient_Radial_Data *grd,
53 Ector_Renderer_Generic_Gradient_Data *gd, 53 Ector_Renderer_Gradient_Data *gd,
54 unsigned int mul_col) 54 unsigned int mul_col)
55{ 55{
56 cairo_pattern_t *pat; 56 cairo_pattern_t *pat;
@@ -68,15 +68,15 @@ _ector_renderer_cairo_gradient_radial_prepare(Eo *obj EINA_UNUSED,
68 68
69// Clearly duplicated and should be in a common place... 69// Clearly duplicated and should be in a common place...
70static Eina_Bool 70static Eina_Bool
71_ector_renderer_cairo_gradient_radial_ector_renderer_generic_base_draw(Eo *obj, Ector_Renderer_Cairo_Gradient_Radial_Data *pd, Efl_Gfx_Render_Op op, Eina_Array *clips, unsigned int mul_col) 71_ector_renderer_cairo_gradient_radial_ector_renderer_draw(Eo *obj, Ector_Renderer_Cairo_Gradient_Radial_Data *pd, Efl_Gfx_Render_Op op, Eina_Array *clips, unsigned int mul_col)
72{ 72{
73 Ector_Renderer_Generic_Gradient_Radial_Data *grd; 73 Ector_Renderer_Gradient_Radial_Data *grd;
74 Ector_Renderer_Generic_Gradient_Data *gd; 74 Ector_Renderer_Gradient_Data *gd;
75 cairo_pattern_t *pat; 75 cairo_pattern_t *pat;
76 76
77 // FIXME: Handle clipping and generally make it work :-) 77 // FIXME: Handle clipping and generally make it work :-)
78 grd = eo_data_scope_get(obj, ECTOR_RENDERER_GENERIC_GRADIENT_RADIAL_MIXIN); 78 grd = eo_data_scope_get(obj, ECTOR_RENDERER_GRADIENT_RADIAL_MIXIN);
79 gd = eo_data_scope_get(obj, ECTOR_RENDERER_GENERIC_GRADIENT_MIXIN); 79 gd = eo_data_scope_get(obj, ECTOR_RENDERER_GRADIENT_MIXIN);
80 if (!grd || !gd) return EINA_FALSE; 80 if (!grd || !gd) return EINA_FALSE;
81 81
82 pat = _ector_renderer_cairo_gradient_radial_prepare(obj, grd, gd, mul_col); 82 pat = _ector_renderer_cairo_gradient_radial_prepare(obj, grd, gd, mul_col);
@@ -101,12 +101,12 @@ _ector_renderer_cairo_gradient_radial_ector_renderer_cairo_fill(Eo *obj,
101 Ector_Renderer_Cairo_Gradient_Radial_Data *pd, 101 Ector_Renderer_Cairo_Gradient_Radial_Data *pd,
102 unsigned int mul_col) 102 unsigned int mul_col)
103{ 103{
104 Ector_Renderer_Generic_Gradient_Radial_Data *grd; 104 Ector_Renderer_Gradient_Radial_Data *grd;
105 Ector_Renderer_Generic_Gradient_Data *gd; 105 Ector_Renderer_Gradient_Data *gd;
106 cairo_pattern_t *pat; 106 cairo_pattern_t *pat;
107 107
108 grd = eo_data_scope_get(obj, ECTOR_RENDERER_GENERIC_GRADIENT_RADIAL_MIXIN); 108 grd = eo_data_scope_get(obj, ECTOR_RENDERER_GRADIENT_RADIAL_MIXIN);
109 gd = eo_data_scope_get(obj, ECTOR_RENDERER_GENERIC_GRADIENT_MIXIN); 109 gd = eo_data_scope_get(obj, ECTOR_RENDERER_GRADIENT_MIXIN);
110 if (!grd || !gd) return EINA_FALSE; 110 if (!grd || !gd) return EINA_FALSE;
111 111
112 pat = _ector_renderer_cairo_gradient_radial_prepare(obj, grd, gd, mul_col); 112 pat = _ector_renderer_cairo_gradient_radial_prepare(obj, grd, gd, mul_col);
@@ -119,14 +119,14 @@ _ector_renderer_cairo_gradient_radial_ector_renderer_cairo_fill(Eo *obj,
119} 119}
120 120
121static void 121static void
122_ector_renderer_cairo_gradient_radial_ector_renderer_generic_base_bounds_get(Eo *obj EINA_UNUSED, 122_ector_renderer_cairo_gradient_radial_ector_renderer_bounds_get(Eo *obj EINA_UNUSED,
123 Ector_Renderer_Cairo_Gradient_Radial_Data *pd EINA_UNUSED, 123 Ector_Renderer_Cairo_Gradient_Radial_Data *pd EINA_UNUSED,
124 Eina_Rectangle *r) 124 Eina_Rectangle *r)
125{ 125{
126 Ector_Renderer_Generic_Gradient_Radial_Data *gld; 126 Ector_Renderer_Gradient_Radial_Data *gld;
127 Ector_Renderer_Cairo_Data *bd; 127 Ector_Renderer_Cairo_Data *bd;
128 128
129 gld = eo_data_scope_get(obj, ECTOR_RENDERER_GENERIC_GRADIENT_RADIAL_MIXIN); 129 gld = eo_data_scope_get(obj, ECTOR_RENDERER_GRADIENT_RADIAL_MIXIN);
130 bd = eo_data_scope_get(obj, ECTOR_RENDERER_CAIRO_CLASS); 130 bd = eo_data_scope_get(obj, ECTOR_RENDERER_CAIRO_CLASS);
131 EINA_RECTANGLE_SET(r, 131 EINA_RECTANGLE_SET(r,
132 bd->generic->origin.x + gld->radial.x - gld->radius, 132 bd->generic->origin.x + gld->radial.x - gld->radius,
@@ -137,12 +137,12 @@ _ector_renderer_cairo_gradient_radial_ector_renderer_generic_base_bounds_get(Eo
137static Eo_Base * 137static Eo_Base *
138_ector_renderer_cairo_gradient_radial_eo_base_finalize(Eo *obj, Ector_Renderer_Cairo_Gradient_Radial_Data *pd EINA_UNUSED) 138_ector_renderer_cairo_gradient_radial_eo_base_finalize(Eo *obj, Ector_Renderer_Cairo_Gradient_Radial_Data *pd EINA_UNUSED)
139{ 139{
140 Ector_Renderer_Generic_Base_Data *base; 140 Ector_Renderer_Data *base;
141 141
142 obj = eo_finalize(eo_super(obj, ECTOR_RENDERER_CAIRO_GRADIENT_RADIAL_CLASS)); 142 obj = eo_finalize(eo_super(obj, ECTOR_RENDERER_CAIRO_GRADIENT_RADIAL_CLASS));
143 if (!obj) return NULL; 143 if (!obj) return NULL;
144 144
145 base = eo_data_scope_get(obj, ECTOR_RENDERER_GENERIC_BASE_CLASS); 145 base = eo_data_scope_get(obj, ECTOR_RENDERER_CLASS);
146 146
147 USE(base, cairo_set_source, NULL); 147 USE(base, cairo_set_source, NULL);
148 USE(base, cairo_pattern_destroy, NULL); 148 USE(base, cairo_pattern_destroy, NULL);
@@ -160,9 +160,9 @@ static void
160_ector_renderer_cairo_gradient_radial_eo_base_destructor(Eo *obj, 160_ector_renderer_cairo_gradient_radial_eo_base_destructor(Eo *obj,
161 Ector_Renderer_Cairo_Gradient_Radial_Data *pd) 161 Ector_Renderer_Cairo_Gradient_Radial_Data *pd)
162{ 162{
163 Ector_Renderer_Generic_Base_Data *base; 163 Ector_Renderer_Data *base;
164 164
165 base = eo_data_scope_get(obj, ECTOR_RENDERER_GENERIC_BASE_CLASS); 165 base = eo_data_scope_get(obj, ECTOR_RENDERER_CLASS);
166 eo_data_xunref(base->surface, pd->parent, obj); 166 eo_data_xunref(base->surface, pd->parent, obj);
167 167
168 eo_destructor(eo_super(obj, ECTOR_RENDERER_CAIRO_GRADIENT_RADIAL_CLASS)); 168 eo_destructor(eo_super(obj, ECTOR_RENDERER_CAIRO_GRADIENT_RADIAL_CLASS));
@@ -178,22 +178,22 @@ _ector_renderer_cairo_gradient_radial_efl_gfx_gradient_stop_set(Eo *obj,
178} 178}
179 179
180static unsigned int 180static unsigned int
181_ector_renderer_cairo_gradient_radial_ector_renderer_generic_base_crc_get(Eo *obj, Ector_Renderer_Cairo_Gradient_Radial_Data *pd EINA_UNUSED) 181_ector_renderer_cairo_gradient_radial_ector_renderer_crc_get(Eo *obj, Ector_Renderer_Cairo_Gradient_Radial_Data *pd EINA_UNUSED)
182{ 182{
183 Ector_Renderer_Generic_Gradient_Radial_Data *grd; 183 Ector_Renderer_Gradient_Radial_Data *grd;
184 Ector_Renderer_Generic_Gradient_Data *gd; 184 Ector_Renderer_Gradient_Data *gd;
185 unsigned int crc; 185 unsigned int crc;
186 186
187 crc = ector_renderer_crc_get(eo_super(obj, ECTOR_RENDERER_CAIRO_GRADIENT_RADIAL_CLASS)); 187 crc = ector_renderer_crc_get(eo_super(obj, ECTOR_RENDERER_CAIRO_GRADIENT_RADIAL_CLASS));
188 188
189 grd = eo_data_scope_get(obj, ECTOR_RENDERER_GENERIC_GRADIENT_RADIAL_MIXIN); 189 grd = eo_data_scope_get(obj, ECTOR_RENDERER_GRADIENT_RADIAL_MIXIN);
190 gd = eo_data_scope_get(obj, ECTOR_RENDERER_GENERIC_GRADIENT_MIXIN); 190 gd = eo_data_scope_get(obj, ECTOR_RENDERER_GRADIENT_MIXIN);
191 if (!grd || !gd) return crc; 191 if (!grd || !gd) return crc;
192 192
193 crc = eina_crc((void*) gd->s, sizeof (Efl_Gfx_Gradient_Spread), crc, EINA_FALSE); 193 crc = eina_crc((void*) gd->s, sizeof (Efl_Gfx_Gradient_Spread), crc, EINA_FALSE);
194 if (gd->colors_count) 194 if (gd->colors_count)
195 crc = eina_crc((void*) gd->colors, sizeof (Efl_Gfx_Gradient_Stop) * gd->colors_count, crc, EINA_FALSE); 195 crc = eina_crc((void*) gd->colors, sizeof (Efl_Gfx_Gradient_Stop) * gd->colors_count, crc, EINA_FALSE);
196 crc = eina_crc((void*) grd, sizeof (Ector_Renderer_Generic_Gradient_Radial_Data), crc, EINA_FALSE); 196 crc = eina_crc((void*) grd, sizeof (Ector_Renderer_Gradient_Radial_Data), crc, EINA_FALSE);
197 197
198 return crc; 198 return crc;
199} 199}
diff --git a/src/lib/ector/cairo/ector_renderer_cairo_gradient_radial.eo b/src/lib/ector/cairo/ector_renderer_cairo_gradient_radial.eo
index a4f2de3acb..a0d6f5e792 100644
--- a/src/lib/ector/cairo/ector_renderer_cairo_gradient_radial.eo
+++ b/src/lib/ector/cairo/ector_renderer_cairo_gradient_radial.eo
@@ -1,12 +1,12 @@
1class Ector.Renderer.Cairo.Gradient_Radial (Ector.Renderer.Cairo, Ector.Renderer.Generic.Gradient, Ector.Renderer.Generic.Gradient_Radial) 1class Ector.Renderer.Cairo.Gradient_Radial (Ector.Renderer.Cairo, Ector.Renderer.Gradient, Ector.Renderer.Gradient_Radial)
2{ 2{
3 eo_prefix: ector_renderer_cairo_gradient_radial; 3 eo_prefix: ector_renderer_cairo_gradient_radial;
4 legacy_prefix: null; 4 legacy_prefix: null;
5 implements { 5 implements {
6 Ector.Renderer.Generic.Base.prepare; 6 Ector.Renderer.prepare;
7 Ector.Renderer.Generic.Base.draw; 7 Ector.Renderer.draw;
8 Ector.Renderer.Generic.Base.bounds_get; 8 Ector.Renderer.bounds_get;
9 Ector.Renderer.Generic.Base.crc.get; 9 Ector.Renderer.crc.get;
10 Ector.Renderer.Cairo.fill; 10 Ector.Renderer.Cairo.fill;
11 Eo.Base.destructor; 11 Eo.Base.destructor;
12 Eo.Base.finalize; 12 Eo.Base.finalize;
diff --git a/src/lib/ector/cairo/ector_renderer_cairo_shape.c b/src/lib/ector/cairo/ector_renderer_cairo_shape.c
index 66d2cca9f6..ba423a29fa 100644
--- a/src/lib/ector/cairo/ector_renderer_cairo_shape.c
+++ b/src/lib/ector/cairo/ector_renderer_cairo_shape.c
@@ -69,8 +69,8 @@ struct _Ector_Renderer_Cairo_Shape_Data
69 Efl_Gfx_Shape_Public *public_shape; 69 Efl_Gfx_Shape_Public *public_shape;
70 70
71 Ector_Cairo_Surface_Data *parent; 71 Ector_Cairo_Surface_Data *parent;
72 Ector_Renderer_Generic_Shape_Data *shape; 72 Ector_Renderer_Shape_Data *shape;
73 Ector_Renderer_Generic_Base_Data *base; 73 Ector_Renderer_Data *base;
74 74
75 cairo_path_t *path; 75 cairo_path_t *path;
76}; 76};
@@ -87,7 +87,7 @@ _ector_renderer_cairo_shape_path_changed(void *data, const Eo_Event *event EINA_
87} 87}
88 88
89static Eina_Bool 89static Eina_Bool
90_ector_renderer_cairo_shape_ector_renderer_generic_base_prepare(Eo *obj, Ector_Renderer_Cairo_Shape_Data *pd) 90_ector_renderer_cairo_shape_ector_renderer_prepare(Eo *obj, Ector_Renderer_Cairo_Shape_Data *pd)
91{ 91{
92 const Efl_Gfx_Path_Command *cmds = NULL; 92 const Efl_Gfx_Path_Command *cmds = NULL;
93 const double *pts = NULL; 93 const double *pts = NULL;
@@ -104,9 +104,9 @@ _ector_renderer_cairo_shape_ector_renderer_generic_base_prepare(Eo *obj, Ector_R
104 // shouldn't that be moved to the cairo base object 104 // shouldn't that be moved to the cairo base object
105 if (!pd->parent) 105 if (!pd->parent)
106 { 106 {
107 Ector_Renderer_Generic_Base_Data *base; 107 Ector_Renderer_Data *base;
108 108
109 base = eo_data_scope_get(obj, ECTOR_RENDERER_GENERIC_BASE_CLASS); 109 base = eo_data_scope_get(obj, ECTOR_RENDERER_CLASS);
110 pd->parent = eo_data_xref(base->surface, ECTOR_CAIRO_SURFACE_CLASS, obj); 110 pd->parent = eo_data_xref(base->surface, ECTOR_CAIRO_SURFACE_CLASS, obj);
111 } 111 }
112 112
@@ -153,7 +153,7 @@ _ector_renderer_cairo_shape_ector_renderer_generic_base_prepare(Eo *obj, Ector_R
153} 153}
154 154
155static Eina_Bool 155static Eina_Bool
156_ector_renderer_cairo_shape_ector_renderer_generic_base_draw(Eo *obj, Ector_Renderer_Cairo_Shape_Data *pd, Efl_Gfx_Render_Op op, Eina_Array *clips, unsigned int mul_col) 156_ector_renderer_cairo_shape_ector_renderer_draw(Eo *obj, Ector_Renderer_Cairo_Shape_Data *pd, Efl_Gfx_Render_Op op, Eina_Array *clips, unsigned int mul_col)
157{ 157{
158 int r, g, b, a; 158 int r, g, b, a;
159 unsigned i; 159 unsigned i;
@@ -233,7 +233,7 @@ _ector_renderer_cairo_shape_ector_renderer_cairo_fill(Eo *obj EINA_UNUSED,
233} 233}
234 234
235static void 235static void
236_ector_renderer_cairo_shape_ector_renderer_generic_base_bounds_get(Eo *obj, 236_ector_renderer_cairo_shape_ector_renderer_bounds_get(Eo *obj,
237 Ector_Renderer_Cairo_Shape_Data *pd EINA_UNUSED, 237 Ector_Renderer_Cairo_Shape_Data *pd EINA_UNUSED,
238 Eina_Rectangle *r) 238 Eina_Rectangle *r)
239{ 239{
@@ -255,8 +255,8 @@ _ector_renderer_cairo_shape_eo_base_constructor(Eo *obj, Ector_Renderer_Cairo_Sh
255 if (!obj) return NULL; 255 if (!obj) return NULL;
256 256
257 pd->public_shape = eo_data_xref(obj, EFL_GFX_SHAPE_MIXIN, obj); 257 pd->public_shape = eo_data_xref(obj, EFL_GFX_SHAPE_MIXIN, obj);
258 pd->shape = eo_data_xref(obj, ECTOR_RENDERER_GENERIC_SHAPE_MIXIN, obj); 258 pd->shape = eo_data_xref(obj, ECTOR_RENDERER_SHAPE_MIXIN, obj);
259 pd->base = eo_data_xref(obj, ECTOR_RENDERER_GENERIC_BASE_CLASS, obj); 259 pd->base = eo_data_xref(obj, ECTOR_RENDERER_CLASS, obj);
260 260
261 eo_event_callback_add(obj, EFL_GFX_PATH_CHANGED, _ector_renderer_cairo_shape_path_changed, pd); 261 eo_event_callback_add(obj, EFL_GFX_PATH_CHANGED, _ector_renderer_cairo_shape_path_changed, pd);
262 262
@@ -295,13 +295,13 @@ _ector_renderer_cairo_shape_eo_base_finalize(Eo *obj, Ector_Renderer_Cairo_Shape
295void 295void
296_ector_renderer_cairo_shape_eo_base_destructor(Eo *obj, Ector_Renderer_Cairo_Shape_Data *pd) 296_ector_renderer_cairo_shape_eo_base_destructor(Eo *obj, Ector_Renderer_Cairo_Shape_Data *pd)
297{ 297{
298 Ector_Renderer_Generic_Base_Data *base; 298 Ector_Renderer_Data *base;
299 299
300 //FIXME, As base class destructor can't call destructor of mixin class. 300 //FIXME, As base class destructor can't call destructor of mixin class.
301 // call explicit API to free shape data. 301 // call explicit API to free shape data.
302 efl_gfx_shape_reset(obj); 302 efl_gfx_shape_reset(obj);
303 303
304 base = eo_data_scope_get(obj, ECTOR_RENDERER_GENERIC_BASE_CLASS); 304 base = eo_data_scope_get(obj, ECTOR_RENDERER_CLASS);
305 eo_data_xunref(base->surface, pd->parent, obj); 305 eo_data_xunref(base->surface, pd->parent, obj);
306 306
307 eo_data_xunref(obj, pd->shape, obj); 307 eo_data_xunref(obj, pd->shape, obj);
@@ -313,7 +313,7 @@ _ector_renderer_cairo_shape_eo_base_destructor(Eo *obj, Ector_Renderer_Cairo_Sha
313} 313}
314 314
315unsigned int 315unsigned int
316_ector_renderer_cairo_shape_ector_renderer_generic_base_crc_get(Eo *obj, 316_ector_renderer_cairo_shape_ector_renderer_crc_get(Eo *obj,
317 Ector_Renderer_Cairo_Shape_Data *pd) 317 Ector_Renderer_Cairo_Shape_Data *pd)
318{ 318{
319 unsigned int crc; 319 unsigned int crc;
diff --git a/src/lib/ector/cairo/ector_renderer_cairo_shape.eo b/src/lib/ector/cairo/ector_renderer_cairo_shape.eo
index aeeb03007d..9d19fbf557 100644
--- a/src/lib/ector/cairo/ector_renderer_cairo_shape.eo
+++ b/src/lib/ector/cairo/ector_renderer_cairo_shape.eo
@@ -1,12 +1,12 @@
1class Ector.Renderer.Cairo.Shape (Ector.Renderer.Cairo, Ector.Renderer.Generic.Shape) 1class Ector.Renderer.Cairo.Shape (Ector.Renderer.Cairo, Ector.Renderer.Shape)
2{ 2{
3 eo_prefix: ector_renderer_cairo_shape; 3 eo_prefix: ector_renderer_cairo_shape;
4 legacy_prefix: null; 4 legacy_prefix: null;
5 implements { 5 implements {
6 Ector.Renderer.Generic.Base.prepare; 6 Ector.Renderer.prepare;
7 Ector.Renderer.Generic.Base.draw; 7 Ector.Renderer.draw;
8 Ector.Renderer.Generic.Base.bounds_get; 8 Ector.Renderer.bounds_get;
9 Ector.Renderer.Generic.Base.crc.get; 9 Ector.Renderer.crc.get;
10 Ector.Renderer.Cairo.fill; 10 Ector.Renderer.Cairo.fill;
11 Eo.Base.constructor; 11 Eo.Base.constructor;
12 Eo.Base.finalize; 12 Eo.Base.finalize;
diff --git a/src/lib/ector/ector_buffer.c b/src/lib/ector/ector_buffer.c
new file mode 100644
index 0000000000..9fe9ed6930
--- /dev/null
+++ b/src/lib/ector/ector_buffer.c
@@ -0,0 +1,40 @@
1#ifdef HAVE_CONFIG_H
2# include "config.h"
3#else
4# define EFL_BETA_API_SUPPORT
5#endif
6
7#include <Eo.h>
8#include "ector_private.h"
9#include "ector_buffer.eo.h"
10
11EOLIAN static Efl_Gfx_Colorspace
12_ector_buffer_cspace_get(Eo *obj EINA_UNUSED, Ector_Buffer_Data *pd)
13{
14 return pd->cspace;
15}
16
17EOLIAN static void
18_ector_buffer_border_get(Eo *obj EINA_UNUSED, Ector_Buffer_Data *pd EINA_UNUSED, int *l, int *r, int *t, int *b)
19{
20 if (l) *l = pd->l;
21 if (r) *r = pd->r;
22 if (t) *t = pd->t;
23 if (b) *b = pd->b;
24}
25
26EOLIAN static void
27_ector_buffer_size_get(Eo *obj EINA_UNUSED, Ector_Buffer_Data *pd, int *w, int *h)
28{
29 if (w) *w = pd->w;
30 if (h) *h = pd->h;
31}
32
33EOLIAN static Ector_Buffer_Flag
34_ector_buffer_flags_get(Eo *obj EINA_UNUSED, Ector_Buffer_Data *pd EINA_UNUSED)
35{
36 return ECTOR_BUFFER_FLAG_NONE;
37}
38
39#include "ector_buffer.eo.c"
40#include "ector_surface.eo.c"
diff --git a/src/lib/ector/ector_generic_buffer.eo b/src/lib/ector/ector_buffer.eo
index a1377a0d9a..13b14bde3a 100644
--- a/src/lib/ector/ector_generic_buffer.eo
+++ b/src/lib/ector/ector_buffer.eo
@@ -21,7 +21,7 @@ enum Ector.Buffer.Access_Flag {
21 cow = 0x4, [[Forces copy-on-write if already mapped as read-only. Requires write.]] 21 cow = 0x4, [[Forces copy-on-write if already mapped as read-only. Requires write.]]
22} 22}
23 23
24mixin Ector.Generic.Buffer 24mixin Ector.Buffer
25{ 25{
26 [[2D pixel buffer interface for Ector 26 [[2D pixel buffer interface for Ector
27 @since 1.17 27 @since 1.17
diff --git a/src/lib/ector/ector_buffer.h b/src/lib/ector/ector_buffer.h
index 0db6cc7d69..8a893f00c8 100644
--- a/src/lib/ector/ector_buffer.h
+++ b/src/lib/ector/ector_buffer.h
@@ -3,20 +3,20 @@
3 3
4#include <Ector.h> 4#include <Ector.h>
5 5
6#include "ector_generic_buffer.eo.h" 6#include "ector_buffer.eo.h"
7#include "software/ector_software_buffer_base.eo.h" 7#include "software/ector_software_buffer_base.eo.h"
8 8
9/** 9/**
10 * @typedef Ector_Buffer 10 * @typedef Ector_Buffer
11 * A generic pixel buffer type (2D). May be readable or writeable or both. 11 * A generic pixel buffer type (2D). May be readable or writeable or both.
12 */ 12 */
13typedef Ector_Generic_Buffer Ector_Buffer; 13typedef Ector_Buffer Ector_Buffer;
14 14
15typedef struct _Ector_Generic_Buffer_Data Ector_Generic_Buffer_Data; 15typedef struct _Ector_Buffer_Data Ector_Buffer_Data;
16typedef struct _Ector_Software_Buffer_Base_Data Ector_Software_Buffer_Base_Data; 16typedef struct _Ector_Software_Buffer_Base_Data Ector_Software_Buffer_Base_Data;
17typedef struct _Ector_GL_Buffer_Base_Data Ector_GL_Buffer_Base_Data; 17typedef struct _Ector_GL_Buffer_Base_Data Ector_GL_Buffer_Base_Data;
18 18
19struct _Ector_Generic_Buffer_Data 19struct _Ector_Buffer_Data
20{ 20{
21 Ector_Buffer *eo; 21 Ector_Buffer *eo;
22 unsigned int w, h; 22 unsigned int w, h;
@@ -27,7 +27,7 @@ struct _Ector_Generic_Buffer_Data
27 27
28struct _Ector_Software_Buffer_Base_Data 28struct _Ector_Software_Buffer_Base_Data
29{ 29{
30 Ector_Generic_Buffer_Data *generic; 30 Ector_Buffer_Data *generic;
31 union { 31 union {
32 unsigned int *u32; 32 unsigned int *u32;
33 unsigned char *u8; 33 unsigned char *u8;
@@ -43,7 +43,7 @@ struct _Ector_Software_Buffer_Base_Data
43 43
44struct _Ector_GL_Buffer_Base_Data 44struct _Ector_GL_Buffer_Base_Data
45{ 45{
46 Ector_Generic_Buffer_Data *generic; 46 Ector_Buffer_Data *generic;
47 int texid; 47 int texid;
48 int fboid; 48 int fboid;
49 struct { 49 struct {
diff --git a/src/lib/ector/ector_generic_buffer.c b/src/lib/ector/ector_generic_buffer.c
deleted file mode 100644
index 9c97ff8e91..0000000000
--- a/src/lib/ector/ector_generic_buffer.c
+++ /dev/null
@@ -1,40 +0,0 @@
1#ifdef HAVE_CONFIG_H
2# include "config.h"
3#else
4# define EFL_BETA_API_SUPPORT
5#endif
6
7#include <Eo.h>
8#include "ector_private.h"
9#include "ector_generic_buffer.eo.h"
10
11EOLIAN static Efl_Gfx_Colorspace
12_ector_generic_buffer_cspace_get(Eo *obj EINA_UNUSED, Ector_Generic_Buffer_Data *pd)
13{
14 return pd->cspace;
15}
16
17EOLIAN static void
18_ector_generic_buffer_border_get(Eo *obj EINA_UNUSED, Ector_Generic_Buffer_Data *pd EINA_UNUSED, int *l, int *r, int *t, int *b)
19{
20 if (l) *l = pd->l;
21 if (r) *r = pd->r;
22 if (t) *t = pd->t;
23 if (b) *b = pd->b;
24}
25
26EOLIAN static void
27_ector_generic_buffer_size_get(Eo *obj EINA_UNUSED, Ector_Generic_Buffer_Data *pd, int *w, int *h)
28{
29 if (w) *w = pd->w;
30 if (h) *h = pd->h;
31}
32
33EOLIAN static Ector_Buffer_Flag
34_ector_generic_buffer_flags_get(Eo *obj EINA_UNUSED, Ector_Generic_Buffer_Data *pd EINA_UNUSED)
35{
36 return ECTOR_BUFFER_FLAG_NONE;
37}
38
39#include "ector_generic_buffer.eo.c"
40#include "ector_generic_surface.eo.c"
diff --git a/src/lib/ector/ector_private.h b/src/lib/ector/ector_private.h
index 450a4ba941..6bda277326 100644
--- a/src/lib/ector/ector_private.h
+++ b/src/lib/ector/ector_private.h
@@ -60,16 +60,16 @@ _eo_xrefplace(Eo **d, Eo *s, const Eo *ref_obj)
60 return *d; 60 return *d;
61} 61}
62 62
63typedef struct _Ector_Renderer_Generic_Base_Data Ector_Renderer_Generic_Base_Data; 63typedef struct _Ector_Renderer_Data Ector_Renderer_Data;
64typedef struct _Ector_Renderer_Generic_Gradient_Data Ector_Renderer_Generic_Gradient_Data; 64typedef struct _Ector_Renderer_Gradient_Data Ector_Renderer_Gradient_Data;
65typedef struct _Ector_Renderer_Generic_Gradient_Linear_Data Ector_Renderer_Generic_Gradient_Linear_Data; 65typedef struct _Ector_Renderer_Gradient_Linear_Data Ector_Renderer_Gradient_Linear_Data;
66typedef struct _Ector_Renderer_Generic_Gradient_Radial_Data Ector_Renderer_Generic_Gradient_Radial_Data; 66typedef struct _Ector_Renderer_Gradient_Radial_Data Ector_Renderer_Gradient_Radial_Data;
67typedef struct _Ector_Renderer_Generic_Shape_Data Ector_Renderer_Generic_Shape_Data; 67typedef struct _Ector_Renderer_Shape_Data Ector_Renderer_Shape_Data;
68typedef struct _Ector_Renderer_Generic_Buffer_Data Ector_Renderer_Generic_Buffer_Data; 68typedef struct _Ector_Renderer_Buffer_Data Ector_Renderer_Buffer_Data;
69 69
70struct _Ector_Renderer_Generic_Base_Data 70struct _Ector_Renderer_Data
71{ 71{
72 Ector_Generic_Surface *surface; 72 Ector_Surface *surface;
73 Eina_Matrix3 *m; 73 Eina_Matrix3 *m;
74 74
75 struct { 75 struct {
@@ -88,7 +88,7 @@ struct _Ector_Renderer_Generic_Base_Data
88 Eina_Bool finalized : 1; 88 Eina_Bool finalized : 1;
89}; 89};
90 90
91struct _Ector_Renderer_Generic_Gradient_Data 91struct _Ector_Renderer_Gradient_Data
92{ 92{
93 Efl_Gfx_Gradient_Stop *colors; 93 Efl_Gfx_Gradient_Stop *colors;
94 unsigned int colors_count; 94 unsigned int colors_count;
@@ -96,14 +96,14 @@ struct _Ector_Renderer_Generic_Gradient_Data
96 Efl_Gfx_Gradient_Spread s; 96 Efl_Gfx_Gradient_Spread s;
97}; 97};
98 98
99struct _Ector_Renderer_Generic_Gradient_Linear_Data 99struct _Ector_Renderer_Gradient_Linear_Data
100{ 100{
101 struct { 101 struct {
102 double x, y; 102 double x, y;
103 } start, end; 103 } start, end;
104}; 104};
105 105
106struct _Ector_Renderer_Generic_Gradient_Radial_Data 106struct _Ector_Renderer_Gradient_Radial_Data
107{ 107{
108 struct { 108 struct {
109 double x, y; 109 double x, y;
@@ -111,7 +111,7 @@ struct _Ector_Renderer_Generic_Gradient_Radial_Data
111 double radius; 111 double radius;
112}; 112};
113 113
114struct _Ector_Renderer_Generic_Shape_Data 114struct _Ector_Renderer_Shape_Data
115{ 115{
116 Ector_Renderer *fill; 116 Ector_Renderer *fill;
117 struct { 117 struct {
@@ -120,7 +120,7 @@ struct _Ector_Renderer_Generic_Shape_Data
120 } stroke; 120 } stroke;
121}; 121};
122 122
123struct _Ector_Renderer_Generic_Buffer_Data 123struct _Ector_Renderer_Buffer_Data
124{ 124{
125 Ector_Buffer *eo_buffer; 125 Ector_Buffer *eo_buffer;
126 struct { 126 struct {
diff --git a/src/lib/ector/ector_renderer_generic_base.c b/src/lib/ector/ector_renderer.c
index 085d945677..c3df0ff419 100644
--- a/src/lib/ector/ector_renderer_generic_base.c
+++ b/src/lib/ector/ector_renderer.c
@@ -7,10 +7,10 @@
7 7
8#include "ector_private.h" 8#include "ector_private.h"
9 9
10#define MY_CLASS ECTOR_RENDERER_GENERIC_BASE_CLASS 10#define MY_CLASS ECTOR_RENDERER_CLASS
11 11
12static void 12static void
13_ector_renderer_generic_base_eo_base_destructor(Eo *obj, Ector_Renderer_Generic_Base_Data *pd) 13_ector_renderer_eo_base_destructor(Eo *obj, Ector_Renderer_Data *pd)
14{ 14{
15 if (pd->m) free(pd->m); 15 if (pd->m) free(pd->m);
16 eo_unref(pd->surface); 16 eo_unref(pd->surface);
@@ -19,7 +19,7 @@ _ector_renderer_generic_base_eo_base_destructor(Eo *obj, Ector_Renderer_Generic_
19} 19}
20 20
21static Eo_Base * 21static Eo_Base *
22_ector_renderer_generic_base_eo_base_finalize(Eo *obj, Ector_Renderer_Generic_Base_Data *pd) 22_ector_renderer_eo_base_finalize(Eo *obj, Ector_Renderer_Data *pd)
23{ 23{
24 if (!pd->surface) 24 if (!pd->surface)
25 { 25 {
@@ -30,14 +30,14 @@ _ector_renderer_generic_base_eo_base_finalize(Eo *obj, Ector_Renderer_Generic_Ba
30 return eo_finalize(eo_super(obj, MY_CLASS)); 30 return eo_finalize(eo_super(obj, MY_CLASS));
31} 31}
32 32
33static Ector_Generic_Surface * 33static Ector_Surface *
34_ector_renderer_generic_base_surface_get(Eo *obj EINA_UNUSED, Ector_Renderer_Generic_Base_Data *pd) 34_ector_renderer_surface_get(Eo *obj EINA_UNUSED, Ector_Renderer_Data *pd)
35{ 35{
36 return pd->surface; 36 return pd->surface;
37} 37}
38 38
39static void 39static void
40_ector_renderer_generic_base_surface_set(Eo *obj EINA_UNUSED, Ector_Renderer_Generic_Base_Data *pd, Ector_Generic_Surface *s) 40_ector_renderer_surface_set(Eo *obj EINA_UNUSED, Ector_Renderer_Data *pd, Ector_Surface *s)
41{ 41{
42 if (pd->finalized) 42 if (pd->finalized)
43 { 43 {
@@ -48,8 +48,8 @@ _ector_renderer_generic_base_surface_set(Eo *obj EINA_UNUSED, Ector_Renderer_Gen
48} 48}
49 49
50static void 50static void
51_ector_renderer_generic_base_transformation_set(Eo *obj EINA_UNUSED, 51_ector_renderer_transformation_set(Eo *obj EINA_UNUSED,
52 Ector_Renderer_Generic_Base_Data *pd, 52 Ector_Renderer_Data *pd,
53 const Eina_Matrix3 *m) 53 const Eina_Matrix3 *m)
54{ 54{
55 if (!m) 55 if (!m)
@@ -67,15 +67,15 @@ _ector_renderer_generic_base_transformation_set(Eo *obj EINA_UNUSED,
67} 67}
68 68
69static const Eina_Matrix3 * 69static const Eina_Matrix3 *
70_ector_renderer_generic_base_transformation_get(Eo *obj EINA_UNUSED, 70_ector_renderer_transformation_get(Eo *obj EINA_UNUSED,
71 Ector_Renderer_Generic_Base_Data *pd) 71 Ector_Renderer_Data *pd)
72{ 72{
73 return pd->m; 73 return pd->m;
74} 74}
75 75
76static void 76static void
77_ector_renderer_generic_base_origin_set(Eo *obj EINA_UNUSED, 77_ector_renderer_origin_set(Eo *obj EINA_UNUSED,
78 Ector_Renderer_Generic_Base_Data *pd, 78 Ector_Renderer_Data *pd,
79 double x, double y) 79 double x, double y)
80{ 80{
81 pd->origin.x = x; 81 pd->origin.x = x;
@@ -83,8 +83,8 @@ _ector_renderer_generic_base_origin_set(Eo *obj EINA_UNUSED,
83} 83}
84 84
85static void 85static void
86_ector_renderer_generic_base_origin_get(Eo *obj EINA_UNUSED, 86_ector_renderer_origin_get(Eo *obj EINA_UNUSED,
87 Ector_Renderer_Generic_Base_Data *pd, 87 Ector_Renderer_Data *pd,
88 double *x, double *y) 88 double *x, double *y)
89{ 89{
90 if (x) *x = pd->origin.x; 90 if (x) *x = pd->origin.x;
@@ -92,23 +92,23 @@ _ector_renderer_generic_base_origin_get(Eo *obj EINA_UNUSED,
92} 92}
93 93
94static void 94static void
95_ector_renderer_generic_base_visibility_set(Eo *obj EINA_UNUSED, 95_ector_renderer_visibility_set(Eo *obj EINA_UNUSED,
96 Ector_Renderer_Generic_Base_Data *pd, 96 Ector_Renderer_Data *pd,
97 Eina_Bool v) 97 Eina_Bool v)
98{ 98{
99 pd->visibility = v; 99 pd->visibility = v;
100} 100}
101 101
102static Eina_Bool 102static Eina_Bool
103_ector_renderer_generic_base_visibility_get(Eo *obj EINA_UNUSED, 103_ector_renderer_visibility_get(Eo *obj EINA_UNUSED,
104 Ector_Renderer_Generic_Base_Data *pd) 104 Ector_Renderer_Data *pd)
105{ 105{
106 return pd->visibility; 106 return pd->visibility;
107} 107}
108 108
109static void 109static void
110_ector_renderer_generic_base_color_set(Eo *obj EINA_UNUSED, 110_ector_renderer_color_set(Eo *obj EINA_UNUSED,
111 Ector_Renderer_Generic_Base_Data *pd, 111 Ector_Renderer_Data *pd,
112 int r, int g, int b, int a) 112 int r, int g, int b, int a)
113{ 113{
114 pd->color.r = r; 114 pd->color.r = r;
@@ -118,8 +118,8 @@ _ector_renderer_generic_base_color_set(Eo *obj EINA_UNUSED,
118} 118}
119 119
120static void 120static void
121_ector_renderer_generic_base_color_get(Eo *obj EINA_UNUSED, 121_ector_renderer_color_get(Eo *obj EINA_UNUSED,
122 Ector_Renderer_Generic_Base_Data *pd, 122 Ector_Renderer_Data *pd,
123 int *r, int *g, int *b, int *a) 123 int *r, int *g, int *b, int *a)
124{ 124{
125 if (r) *r = pd->color.r; 125 if (r) *r = pd->color.r;
@@ -129,38 +129,38 @@ _ector_renderer_generic_base_color_get(Eo *obj EINA_UNUSED,
129} 129}
130 130
131static void 131static void
132_ector_renderer_generic_base_mask_set(Eo *obj EINA_UNUSED, 132_ector_renderer_mask_set(Eo *obj EINA_UNUSED,
133 Ector_Renderer_Generic_Base_Data *pd, 133 Ector_Renderer_Data *pd,
134 Ector_Renderer *r) 134 Ector_Renderer *r)
135{ 135{
136 _eo_refplace(&pd->mask, r); 136 _eo_refplace(&pd->mask, r);
137} 137}
138 138
139static Ector_Renderer * 139static Ector_Renderer *
140_ector_renderer_generic_base_mask_get(Eo *obj EINA_UNUSED, 140_ector_renderer_mask_get(Eo *obj EINA_UNUSED,
141 Ector_Renderer_Generic_Base_Data *pd) 141 Ector_Renderer_Data *pd)
142{ 142{
143 return pd->mask; 143 return pd->mask;
144} 144}
145 145
146static void 146static void
147_ector_renderer_generic_base_quality_set(Eo *obj EINA_UNUSED, 147_ector_renderer_quality_set(Eo *obj EINA_UNUSED,
148 Ector_Renderer_Generic_Base_Data *pd, 148 Ector_Renderer_Data *pd,
149 Ector_Quality q) 149 Ector_Quality q)
150{ 150{
151 pd->q = q; 151 pd->q = q;
152} 152}
153 153
154static Ector_Quality 154static Ector_Quality
155_ector_renderer_generic_base_quality_get(Eo *obj EINA_UNUSED, 155_ector_renderer_quality_get(Eo *obj EINA_UNUSED,
156 Ector_Renderer_Generic_Base_Data *pd) 156 Ector_Renderer_Data *pd)
157{ 157{
158 return pd->q; 158 return pd->q;
159} 159}
160 160
161static Eina_Bool 161static Eina_Bool
162_ector_renderer_generic_base_prepare(Eo *obj EINA_UNUSED, 162_ector_renderer_prepare(Eo *obj EINA_UNUSED,
163 Ector_Renderer_Generic_Base_Data *pd) 163 Ector_Renderer_Data *pd)
164{ 164{
165 if (pd->mask) 165 if (pd->mask)
166 ector_renderer_prepare(pd->mask); 166 ector_renderer_prepare(pd->mask);
@@ -169,8 +169,8 @@ _ector_renderer_generic_base_prepare(Eo *obj EINA_UNUSED,
169} 169}
170 170
171static unsigned int 171static unsigned int
172_ector_renderer_generic_base_crc_get(Eo *obj EINA_UNUSED, 172_ector_renderer_crc_get(Eo *obj EINA_UNUSED,
173 Ector_Renderer_Generic_Base_Data *pd) 173 Ector_Renderer_Data *pd)
174{ 174{
175 unsigned int crc; 175 unsigned int crc;
176 176
@@ -184,4 +184,4 @@ _ector_renderer_generic_base_crc_get(Eo *obj EINA_UNUSED,
184 return crc; 184 return crc;
185} 185}
186 186
187#include "ector_renderer_generic_base.eo.c" 187#include "ector_renderer.eo.c"
diff --git a/src/lib/ector/ector_renderer_generic_base.eo b/src/lib/ector/ector_renderer.eo
index cdfa4a7961..9287e43e78 100644
--- a/src/lib/ector/ector_renderer_generic_base.eo
+++ b/src/lib/ector/ector_renderer.eo
@@ -9,7 +9,7 @@ enum Ector.Quality
9 last, [[Sentinel]] 9 last, [[Sentinel]]
10} 10}
11 11
12abstract Ector.Renderer.Generic.Base (Eo.Base) 12abstract Ector.Renderer (Eo.Base)
13{ 13{
14 [[Ector renderer abstract interface]] 14 [[Ector renderer abstract interface]]
15 15
@@ -25,7 +25,7 @@ abstract Ector.Renderer.Generic.Base (Eo.Base)
25 [[Get the surface associated to this renderer. Can not be set.]] 25 [[Get the surface associated to this renderer. Can not be set.]]
26 } 26 }
27 values { 27 values {
28 s: Ector.Generic.Surface *; [[Associated surface]] 28 s: Ector.Surface *; [[Associated surface]]
29 } 29 }
30 } 30 }
31 @property transformation { 31 @property transformation {
@@ -86,7 +86,7 @@ abstract Ector.Renderer.Generic.Base (Eo.Base)
86 get { 86 get {
87 } 87 }
88 values { 88 values {
89 r: Ector.Renderer.Generic.Base *; 89 r: Ector.Renderer *;
90 } 90 }
91 } 91 }
92 @property quality { 92 @property quality {
diff --git a/src/lib/ector/ector_renderer.h b/src/lib/ector/ector_renderer.h
index 30b9bd2c2c..e2e2e65f58 100644
--- a/src/lib/ector/ector_renderer.h
+++ b/src/lib/ector/ector_renderer.h
@@ -1,11 +1,11 @@
1#ifndef ECTOR_RENDERER_H 1#ifndef ECTOR_RENDERER_H
2#define ECTOR_RENDERER_H 2#define ECTOR_RENDERER_H
3 3
4#include "ector_renderer_generic_base.eo.h" 4#include "ector_renderer.eo.h"
5#include "ector_renderer_generic_shape.eo.h" 5#include "ector_renderer_shape.eo.h"
6#include "ector_renderer_generic_buffer.eo.h" 6#include "ector_renderer_buffer.eo.h"
7#include "ector_renderer_generic_gradient.eo.h" 7#include "ector_renderer_gradient.eo.h"
8#include "ector_renderer_generic_gradient_linear.eo.h" 8#include "ector_renderer_gradient_linear.eo.h"
9#include "ector_renderer_generic_gradient_radial.eo.h" 9#include "ector_renderer_gradient_radial.eo.h"
10 10
11#endif 11#endif
diff --git a/src/lib/ector/ector_renderer_buffer.c b/src/lib/ector/ector_renderer_buffer.c
new file mode 100644
index 0000000000..4ba7287ee4
--- /dev/null
+++ b/src/lib/ector/ector_renderer_buffer.c
@@ -0,0 +1,55 @@
1#ifdef HAVE_CONFIG_H
2# include "config.h"
3#else
4# define EFL_BETA_API_SUPPORT
5#endif
6
7#include <Eo.h>
8#include "ector_private.h"
9#include "ector_renderer_buffer.eo.h"
10
11#define MY_CLASS ECTOR_RENDERER_BUFFER_MIXIN
12
13EOLIAN static void
14_ector_renderer_buffer_efl_gfx_fill_fill_get(Eo *obj EINA_UNUSED, Ector_Renderer_Buffer_Data *pd, int *x, int *y, int *w, int *h)
15{
16 if (x) *x = pd->fill.x;
17 if (y) *y = pd->fill.y;
18 if (w) *w = pd->fill.w;
19 if (h) *h = pd->fill.h;
20}
21
22EOLIAN static void
23_ector_renderer_buffer_efl_gfx_fill_fill_set(Eo *obj EINA_UNUSED, Ector_Renderer_Buffer_Data *pd, int x, int y, int w, int h)
24{
25 if (w < 0) w = 0;
26 if (h < 0) h = 0;
27 pd->fill.x = x;
28 pd->fill.y = y;
29 pd->fill.w = w;
30 pd->fill.h = h;
31}
32
33EOLIAN static void
34_ector_renderer_buffer_buffer_set(Eo *obj EINA_UNUSED, Ector_Renderer_Buffer_Data *pd, Ector_Buffer *buf)
35{
36 _eo_xrefplace(&pd->eo_buffer, buf, obj);
37}
38
39EOLIAN static Ector_Buffer *
40_ector_renderer_buffer_buffer_get(Eo *obj EINA_UNUSED, Ector_Renderer_Buffer_Data *pd)
41{
42 return pd->eo_buffer;
43}
44
45EOLIAN static Eo_Base *
46_ector_renderer_buffer_eo_base_constructor(Eo *obj, Ector_Renderer_Buffer_Data *pd EINA_UNUSED)
47{
48 Eo_Base *ret;
49
50 ret = eo_constructor(eo_super(obj, MY_CLASS));
51
52 return ret;
53}
54
55#include "ector_renderer_buffer.eo.c"
diff --git a/src/lib/ector/ector_renderer_generic_buffer.eo b/src/lib/ector/ector_renderer_buffer.eo
index 85d361e41c..d11d42163d 100644
--- a/src/lib/ector/ector_renderer_generic_buffer.eo
+++ b/src/lib/ector/ector_renderer_buffer.eo
@@ -1,4 +1,4 @@
1mixin Ector.Renderer.Generic.Buffer (Ector.Renderer.Generic.Base, Efl.Gfx.Fill) 1mixin Ector.Renderer.Buffer (Ector.Renderer, Efl.Gfx.Fill)
2{ 2{
3 [[Ector buffers have a default fill set to repeat]] 3 [[Ector buffers have a default fill set to repeat]]
4 eo_prefix: ector_renderer_buffer; 4 eo_prefix: ector_renderer_buffer;
@@ -8,7 +8,7 @@ mixin Ector.Renderer.Generic.Buffer (Ector.Renderer.Generic.Base, Efl.Gfx.Fill)
8 set { [[Sets the source buffer for this renderer, adds a ref]] } 8 set { [[Sets the source buffer for this renderer, adds a ref]] }
9 get { [[Return the current source, no ref change]] } 9 get { [[Return the current source, no ref change]] }
10 values { 10 values {
11 buf: Ector.Generic.Buffer*; 11 buf: Ector.Buffer*;
12 } 12 }
13 } 13 }
14 } 14 }
diff --git a/src/lib/ector/ector_renderer_generic_buffer.c b/src/lib/ector/ector_renderer_generic_buffer.c
deleted file mode 100644
index d5755682b1..0000000000
--- a/src/lib/ector/ector_renderer_generic_buffer.c
+++ /dev/null
@@ -1,55 +0,0 @@
1#ifdef HAVE_CONFIG_H
2# include "config.h"
3#else
4# define EFL_BETA_API_SUPPORT
5#endif
6
7#include <Eo.h>
8#include "ector_private.h"
9#include "ector_renderer_generic_buffer.eo.h"
10
11#define MY_CLASS ECTOR_RENDERER_GENERIC_BUFFER_MIXIN
12
13EOLIAN static void
14_ector_renderer_generic_buffer_efl_gfx_fill_fill_get(Eo *obj EINA_UNUSED, Ector_Renderer_Generic_Buffer_Data *pd, int *x, int *y, int *w, int *h)
15{
16 if (x) *x = pd->fill.x;
17 if (y) *y = pd->fill.y;
18 if (w) *w = pd->fill.w;
19 if (h) *h = pd->fill.h;
20}
21
22EOLIAN static void
23_ector_renderer_generic_buffer_efl_gfx_fill_fill_set(Eo *obj EINA_UNUSED, Ector_Renderer_Generic_Buffer_Data *pd, int x, int y, int w, int h)
24{
25 if (w < 0) w = 0;
26 if (h < 0) h = 0;
27 pd->fill.x = x;
28 pd->fill.y = y;
29 pd->fill.w = w;
30 pd->fill.h = h;
31}
32
33EOLIAN static void
34_ector_renderer_generic_buffer_buffer_set(Eo *obj EINA_UNUSED, Ector_Renderer_Generic_Buffer_Data *pd, Ector_Generic_Buffer *buf)
35{
36 _eo_xrefplace(&pd->eo_buffer, buf, obj);
37}
38
39EOLIAN static Ector_Generic_Buffer *
40_ector_renderer_generic_buffer_buffer_get(Eo *obj EINA_UNUSED, Ector_Renderer_Generic_Buffer_Data *pd)
41{
42 return pd->eo_buffer;
43}
44
45EOLIAN static Eo_Base *
46_ector_renderer_generic_buffer_eo_base_constructor(Eo *obj, Ector_Renderer_Generic_Buffer_Data *pd EINA_UNUSED)
47{
48 Eo_Base *ret;
49
50 ret = eo_constructor(eo_super(obj, MY_CLASS));
51
52 return ret;
53}
54
55#include "ector_renderer_generic_buffer.eo.c"
diff --git a/src/lib/ector/ector_renderer_generic_shape.c b/src/lib/ector/ector_renderer_generic_shape.c
deleted file mode 100644
index 76e67bbebe..0000000000
--- a/src/lib/ector/ector_renderer_generic_shape.c
+++ /dev/null
@@ -1,55 +0,0 @@
1#ifdef HAVE_CONFIG_H
2# include "config.h"
3#endif
4
5#include <Eina.h>
6#include <Ector.h>
7
8#include "ector_private.h"
9
10static void
11_ector_renderer_generic_shape_fill_set(Eo *obj EINA_UNUSED,
12 Ector_Renderer_Generic_Shape_Data *pd,
13 const Ector_Renderer *r)
14{
15 _eo_refplace(&pd->fill, r);
16}
17
18static const Ector_Renderer *
19_ector_renderer_generic_shape_fill_get(Eo *obj EINA_UNUSED,
20 Ector_Renderer_Generic_Shape_Data *pd)
21{
22 return pd->fill;
23}
24
25static void
26_ector_renderer_generic_shape_stroke_fill_set(Eo *obj EINA_UNUSED,
27 Ector_Renderer_Generic_Shape_Data *pd,
28 const Ector_Renderer *r)
29{
30 _eo_refplace(&pd->stroke.fill, r);
31}
32
33static const Ector_Renderer *
34_ector_renderer_generic_shape_stroke_fill_get(Eo *obj EINA_UNUSED,
35 Ector_Renderer_Generic_Shape_Data *pd)
36{
37 return pd->stroke.fill;
38}
39
40static void
41_ector_renderer_generic_shape_stroke_marker_set(Eo *obj EINA_UNUSED,
42 Ector_Renderer_Generic_Shape_Data *pd,
43 const Ector_Renderer *r)
44{
45 _eo_refplace(&pd->stroke.marker, r);
46}
47
48static const Ector_Renderer *
49_ector_renderer_generic_shape_stroke_marker_get(Eo *obj EINA_UNUSED,
50 Ector_Renderer_Generic_Shape_Data *pd)
51{
52 return pd->stroke.marker;
53}
54
55#include "ector_renderer_generic_shape.eo.c"
diff --git a/src/lib/ector/ector_renderer_generic_gradient.c b/src/lib/ector/ector_renderer_gradient.c
index e6e277e55f..aa1101be9d 100644
--- a/src/lib/ector/ector_renderer_generic_gradient.c
+++ b/src/lib/ector/ector_renderer_gradient.c
@@ -8,8 +8,8 @@
8#include "ector_private.h" 8#include "ector_private.h"
9 9
10static void 10static void
11_ector_renderer_generic_gradient_efl_gfx_gradient_stop_set(Eo *obj EINA_UNUSED, 11_ector_renderer_gradient_efl_gfx_gradient_stop_set(Eo *obj EINA_UNUSED,
12 Ector_Renderer_Generic_Gradient_Data *pd, 12 Ector_Renderer_Gradient_Data *pd,
13 const Efl_Gfx_Gradient_Stop *colors, 13 const Efl_Gfx_Gradient_Stop *colors,
14 unsigned int length) 14 unsigned int length)
15{ 15{
@@ -25,8 +25,8 @@ _ector_renderer_generic_gradient_efl_gfx_gradient_stop_set(Eo *obj EINA_UNUSED,
25} 25}
26 26
27static void 27static void
28_ector_renderer_generic_gradient_efl_gfx_gradient_stop_get(Eo *obj EINA_UNUSED, 28_ector_renderer_gradient_efl_gfx_gradient_stop_get(Eo *obj EINA_UNUSED,
29 Ector_Renderer_Generic_Gradient_Data *pd, 29 Ector_Renderer_Gradient_Data *pd,
30 const Efl_Gfx_Gradient_Stop **colors, 30 const Efl_Gfx_Gradient_Stop **colors,
31 unsigned int *length) 31 unsigned int *length)
32{ 32{
@@ -35,19 +35,19 @@ _ector_renderer_generic_gradient_efl_gfx_gradient_stop_get(Eo *obj EINA_UNUSED,
35} 35}
36 36
37static void 37static void
38_ector_renderer_generic_gradient_efl_gfx_gradient_spread_set(Eo *obj EINA_UNUSED, 38_ector_renderer_gradient_efl_gfx_gradient_spread_set(Eo *obj EINA_UNUSED,
39 Ector_Renderer_Generic_Gradient_Data *pd, 39 Ector_Renderer_Gradient_Data *pd,
40 Efl_Gfx_Gradient_Spread s) 40 Efl_Gfx_Gradient_Spread s)
41{ 41{
42 pd->s = s; 42 pd->s = s;
43} 43}
44 44
45static Efl_Gfx_Gradient_Spread 45static Efl_Gfx_Gradient_Spread
46_ector_renderer_generic_gradient_efl_gfx_gradient_spread_get(Eo *obj EINA_UNUSED, 46_ector_renderer_gradient_efl_gfx_gradient_spread_get(Eo *obj EINA_UNUSED,
47 Ector_Renderer_Generic_Gradient_Data *pd) 47 Ector_Renderer_Gradient_Data *pd)
48{ 48{
49 return pd->s; 49 return pd->s;
50} 50}
51 51
52 52
53#include "ector_renderer_generic_gradient.eo.c" 53#include "ector_renderer_gradient.eo.c"
diff --git a/src/lib/ector/ector_renderer_generic_gradient.eo b/src/lib/ector/ector_renderer_gradient.eo
index 1ce3c8a8c2..a8688203c2 100644
--- a/src/lib/ector/ector_renderer_generic_gradient.eo
+++ b/src/lib/ector/ector_renderer_gradient.eo
@@ -1,4 +1,4 @@
1mixin Ector.Renderer.Generic.Gradient (Efl.Gfx.Gradient) 1mixin Ector.Renderer.Gradient (Efl.Gfx.Gradient)
2{ 2{
3 eo_prefix: ector_renderer_gradient; 3 eo_prefix: ector_renderer_gradient;
4 legacy_prefix: null; 4 legacy_prefix: null;
diff --git a/src/lib/ector/ector_renderer_generic_gradient_linear.c b/src/lib/ector/ector_renderer_gradient_linear.c
index 925fb53951..05c46d6a5a 100644
--- a/src/lib/ector/ector_renderer_generic_gradient_linear.c
+++ b/src/lib/ector/ector_renderer_gradient_linear.c
@@ -8,8 +8,8 @@
8#include "ector_private.h" 8#include "ector_private.h"
9 9
10static void 10static void
11_ector_renderer_generic_gradient_linear_efl_gfx_gradient_linear_start_set(Eo *obj EINA_UNUSED, 11_ector_renderer_gradient_linear_efl_gfx_gradient_linear_start_set(Eo *obj EINA_UNUSED,
12 Ector_Renderer_Generic_Gradient_Linear_Data *pd, 12 Ector_Renderer_Gradient_Linear_Data *pd,
13 double x, double y) 13 double x, double y)
14{ 14{
15 pd->start.x = x; 15 pd->start.x = x;
@@ -17,8 +17,8 @@ _ector_renderer_generic_gradient_linear_efl_gfx_gradient_linear_start_set(Eo *ob
17} 17}
18 18
19static void 19static void
20_ector_renderer_generic_gradient_linear_efl_gfx_gradient_linear_start_get(Eo *obj EINA_UNUSED, 20_ector_renderer_gradient_linear_efl_gfx_gradient_linear_start_get(Eo *obj EINA_UNUSED,
21 Ector_Renderer_Generic_Gradient_Linear_Data *pd, 21 Ector_Renderer_Gradient_Linear_Data *pd,
22 double *x, double *y) 22 double *x, double *y)
23{ 23{
24 if (x) *x = pd->start.x; 24 if (x) *x = pd->start.x;
@@ -26,8 +26,8 @@ _ector_renderer_generic_gradient_linear_efl_gfx_gradient_linear_start_get(Eo *ob
26} 26}
27 27
28static void 28static void
29_ector_renderer_generic_gradient_linear_efl_gfx_gradient_linear_end_set(Eo *obj EINA_UNUSED, 29_ector_renderer_gradient_linear_efl_gfx_gradient_linear_end_set(Eo *obj EINA_UNUSED,
30 Ector_Renderer_Generic_Gradient_Linear_Data *pd, 30 Ector_Renderer_Gradient_Linear_Data *pd,
31 double x, double y) 31 double x, double y)
32{ 32{
33 pd->end.x = x; 33 pd->end.x = x;
@@ -35,12 +35,12 @@ _ector_renderer_generic_gradient_linear_efl_gfx_gradient_linear_end_set(Eo *obj
35} 35}
36 36
37static void 37static void
38_ector_renderer_generic_gradient_linear_efl_gfx_gradient_linear_end_get(Eo *obj EINA_UNUSED, 38_ector_renderer_gradient_linear_efl_gfx_gradient_linear_end_get(Eo *obj EINA_UNUSED,
39 Ector_Renderer_Generic_Gradient_Linear_Data *pd, 39 Ector_Renderer_Gradient_Linear_Data *pd,
40 double *x, double *y) 40 double *x, double *y)
41{ 41{
42 if (x) *x = pd->end.x; 42 if (x) *x = pd->end.x;
43 if (y) *y = pd->end.y; 43 if (y) *y = pd->end.y;
44} 44}
45 45
46#include "ector_renderer_generic_gradient_linear.eo.c" 46#include "ector_renderer_gradient_linear.eo.c"
diff --git a/src/lib/ector/ector_renderer_generic_gradient_linear.eo b/src/lib/ector/ector_renderer_gradient_linear.eo
index 13ab2e6bfc..7778715765 100644
--- a/src/lib/ector/ector_renderer_generic_gradient_linear.eo
+++ b/src/lib/ector/ector_renderer_gradient_linear.eo
@@ -1,4 +1,4 @@
1mixin Ector.Renderer.Generic.Gradient_Linear (Efl.Gfx.Gradient.Linear) 1mixin Ector.Renderer.Gradient_Linear (Efl.Gfx.Gradient.Linear)
2{ 2{
3 eo_prefix: ector_renderer_gradient_linear; 3 eo_prefix: ector_renderer_gradient_linear;
4 legacy_prefix: null; 4 legacy_prefix: null;
diff --git a/src/lib/ector/ector_renderer_generic_gradient_radial.c b/src/lib/ector/ector_renderer_gradient_radial.c
index 3c1782cf73..83d4aea624 100644
--- a/src/lib/ector/ector_renderer_generic_gradient_radial.c
+++ b/src/lib/ector/ector_renderer_gradient_radial.c
@@ -8,8 +8,8 @@
8#include "ector_private.h" 8#include "ector_private.h"
9 9
10static void 10static void
11_ector_renderer_generic_gradient_radial_efl_gfx_gradient_radial_center_set(Eo *obj EINA_UNUSED, 11_ector_renderer_gradient_radial_efl_gfx_gradient_radial_center_set(Eo *obj EINA_UNUSED,
12 Ector_Renderer_Generic_Gradient_Radial_Data *pd, 12 Ector_Renderer_Gradient_Radial_Data *pd,
13 double x, double y) 13 double x, double y)
14{ 14{
15 pd->radial.x = x; 15 pd->radial.x = x;
@@ -17,8 +17,8 @@ _ector_renderer_generic_gradient_radial_efl_gfx_gradient_radial_center_set(Eo *o
17} 17}
18 18
19static void 19static void
20_ector_renderer_generic_gradient_radial_efl_gfx_gradient_radial_center_get(Eo *obj EINA_UNUSED, 20_ector_renderer_gradient_radial_efl_gfx_gradient_radial_center_get(Eo *obj EINA_UNUSED,
21 Ector_Renderer_Generic_Gradient_Radial_Data *pd, 21 Ector_Renderer_Gradient_Radial_Data *pd,
22 double *x, double *y) 22 double *x, double *y)
23{ 23{
24 if (x) *x = pd->radial.x; 24 if (x) *x = pd->radial.x;
@@ -26,24 +26,24 @@ _ector_renderer_generic_gradient_radial_efl_gfx_gradient_radial_center_get(Eo *o
26} 26}
27 27
28static void 28static void
29_ector_renderer_generic_gradient_radial_efl_gfx_gradient_radial_radius_set(Eo *obj EINA_UNUSED, 29_ector_renderer_gradient_radial_efl_gfx_gradient_radial_radius_set(Eo *obj EINA_UNUSED,
30 Ector_Renderer_Generic_Gradient_Radial_Data *pd, 30 Ector_Renderer_Gradient_Radial_Data *pd,
31 double r) 31 double r)
32{ 32{
33 pd->radius = r; 33 pd->radius = r;
34} 34}
35 35
36static double 36static double
37_ector_renderer_generic_gradient_radial_efl_gfx_gradient_radial_radius_get(Eo *obj EINA_UNUSED, 37_ector_renderer_gradient_radial_efl_gfx_gradient_radial_radius_get(Eo *obj EINA_UNUSED,
38 Ector_Renderer_Generic_Gradient_Radial_Data *pd) 38 Ector_Renderer_Gradient_Radial_Data *pd)
39{ 39{
40 return pd->radius; 40 return pd->radius;
41} 41}
42 42
43 43
44static void 44static void
45_ector_renderer_generic_gradient_radial_efl_gfx_gradient_radial_focal_set(Eo *obj EINA_UNUSED, 45_ector_renderer_gradient_radial_efl_gfx_gradient_radial_focal_set(Eo *obj EINA_UNUSED,
46 Ector_Renderer_Generic_Gradient_Radial_Data *pd, 46 Ector_Renderer_Gradient_Radial_Data *pd,
47 double x, double y) 47 double x, double y)
48{ 48{
49 pd->focal.x = x; 49 pd->focal.x = x;
@@ -51,12 +51,12 @@ _ector_renderer_generic_gradient_radial_efl_gfx_gradient_radial_focal_set(Eo *ob
51} 51}
52 52
53static void 53static void
54_ector_renderer_generic_gradient_radial_efl_gfx_gradient_radial_focal_get(Eo *obj EINA_UNUSED, 54_ector_renderer_gradient_radial_efl_gfx_gradient_radial_focal_get(Eo *obj EINA_UNUSED,
55 Ector_Renderer_Generic_Gradient_Radial_Data *pd, 55 Ector_Renderer_Gradient_Radial_Data *pd,
56 double *x, double *y) 56 double *x, double *y)
57{ 57{
58 if (x) *x = pd->focal.x; 58 if (x) *x = pd->focal.x;
59 if (y) *y = pd->focal.y; 59 if (y) *y = pd->focal.y;
60} 60}
61 61
62#include "ector_renderer_generic_gradient_radial.eo.c" 62#include "ector_renderer_gradient_radial.eo.c"
diff --git a/src/lib/ector/ector_renderer_generic_gradient_radial.eo b/src/lib/ector/ector_renderer_gradient_radial.eo
index cef25eb953..8fae6fe6ab 100644
--- a/src/lib/ector/ector_renderer_generic_gradient_radial.eo
+++ b/src/lib/ector/ector_renderer_gradient_radial.eo
@@ -1,4 +1,4 @@
1mixin Ector.Renderer.Generic.Gradient_Radial (Efl.Gfx.Gradient.Radial) 1mixin Ector.Renderer.Gradient_Radial (Efl.Gfx.Gradient.Radial)
2{ 2{
3 eo_prefix: ector_renderer_gradient_radial; 3 eo_prefix: ector_renderer_gradient_radial;
4 legacy_prefix: null; 4 legacy_prefix: null;
diff --git a/src/lib/ector/ector_renderer_shape.c b/src/lib/ector/ector_renderer_shape.c
new file mode 100644
index 0000000000..ffdd0158a4
--- /dev/null
+++ b/src/lib/ector/ector_renderer_shape.c
@@ -0,0 +1,55 @@
1#ifdef HAVE_CONFIG_H
2# include "config.h"
3#endif
4
5#include <Eina.h>
6#include <Ector.h>
7
8#include "ector_private.h"
9
10static void
11_ector_renderer_shape_fill_set(Eo *obj EINA_UNUSED,
12 Ector_Renderer_Shape_Data *pd,
13 const Ector_Renderer *r)
14{
15 _eo_refplace(&pd->fill, r);
16}
17
18static const Ector_Renderer *
19_ector_renderer_shape_fill_get(Eo *obj EINA_UNUSED,
20 Ector_Renderer_Shape_Data *pd)
21{
22 return pd->fill;
23}
24
25static void
26_ector_renderer_shape_stroke_fill_set(Eo *obj EINA_UNUSED,
27 Ector_Renderer_Shape_Data *pd,
28 const Ector_Renderer *r)
29{
30 _eo_refplace(&pd->stroke.fill, r);
31}
32
33static const Ector_Renderer *
34_ector_renderer_shape_stroke_fill_get(Eo *obj EINA_UNUSED,
35 Ector_Renderer_Shape_Data *pd)
36{
37 return pd->stroke.fill;
38}
39
40static void
41_ector_renderer_shape_stroke_marker_set(Eo *obj EINA_UNUSED,
42 Ector_Renderer_Shape_Data *pd,
43 const Ector_Renderer *r)
44{
45 _eo_refplace(&pd->stroke.marker, r);
46}
47
48static const Ector_Renderer *
49_ector_renderer_shape_stroke_marker_get(Eo *obj EINA_UNUSED,
50 Ector_Renderer_Shape_Data *pd)
51{
52 return pd->stroke.marker;
53}
54
55#include "ector_renderer_shape.eo.c"
diff --git a/src/lib/ector/ector_renderer_generic_shape.eo b/src/lib/ector/ector_renderer_shape.eo
index 4362a88e09..62f6960821 100644
--- a/src/lib/ector/ector_renderer_generic_shape.eo
+++ b/src/lib/ector/ector_renderer_shape.eo
@@ -1,6 +1,6 @@
1import ector_renderer_generic_base; 1import ector_renderer;
2 2
3mixin Ector.Renderer.Generic.Shape (Efl.Gfx.Shape) 3mixin Ector.Renderer.Shape (Efl.Gfx.Shape)
4{ 4{
5 eo_prefix: ector_renderer_shape; 5 eo_prefix: ector_renderer_shape;
6 legacy_prefix: null; 6 legacy_prefix: null;
@@ -11,7 +11,7 @@ mixin Ector.Renderer.Generic.Shape (Efl.Gfx.Shape)
11 get { 11 get {
12 } 12 }
13 values { 13 values {
14 r: const(Ector.Renderer.Generic.Base) *; 14 r: const(Ector.Renderer) *;
15 } 15 }
16 } 16 }
17 @property stroke_fill { 17 @property stroke_fill {
@@ -20,7 +20,7 @@ mixin Ector.Renderer.Generic.Shape (Efl.Gfx.Shape)
20 get { 20 get {
21 } 21 }
22 values { 22 values {
23 r: const(Ector.Renderer.Generic.Base) *; 23 r: const(Ector.Renderer) *;
24 } 24 }
25 } 25 }
26 @property stroke_marker { 26 @property stroke_marker {
@@ -29,7 +29,7 @@ mixin Ector.Renderer.Generic.Shape (Efl.Gfx.Shape)
29 get { 29 get {
30 } 30 }
31 values { 31 values {
32 r: const(Ector.Renderer.Generic.Base) *; 32 r: const(Ector.Renderer) *;
33 } 33 }
34 } 34 }
35 } 35 }
diff --git a/src/lib/ector/ector_generic_surface.eo b/src/lib/ector/ector_surface.eo
index db778b9c30..92eb68db73 100644
--- a/src/lib/ector/ector_generic_surface.eo
+++ b/src/lib/ector/ector_surface.eo
@@ -1,4 +1,4 @@
1mixin Ector.Generic.Surface (Ector.Generic.Buffer) 1mixin Ector.Surface (Ector.Buffer)
2{ 2{
3 [[Surface interface for Ector]] 3 [[Surface interface for Ector]]
4 4
diff --git a/src/lib/ector/ector_surface.h b/src/lib/ector/ector_surface.h
index 98e4bf0b9c..4bb0c375f4 100644
--- a/src/lib/ector/ector_surface.h
+++ b/src/lib/ector/ector_surface.h
@@ -2,6 +2,6 @@
2#define ECTOR_SURFACE_H 2#define ECTOR_SURFACE_H
3 3
4#include "ector_buffer.h" 4#include "ector_buffer.h"
5#include "ector_generic_surface.eo.h" 5#include "ector_surface.eo.h"
6 6
7#endif 7#endif
diff --git a/src/lib/ector/gl/ector_gl_buffer_base.eo b/src/lib/ector/gl/ector_gl_buffer_base.eo
index 7016359cee..32882a4404 100644
--- a/src/lib/ector/gl/ector_gl_buffer_base.eo
+++ b/src/lib/ector/gl/ector_gl_buffer_base.eo
@@ -1,4 +1,4 @@
1mixin Ector.GL.Buffer.Base (Ector.Generic.Buffer) 1mixin Ector.GL.Buffer.Base (Ector.Buffer)
2{ 2{
3 legacy_prefix: null; 3 legacy_prefix: null;
4 methods { 4 methods {
diff --git a/src/lib/ector/gl/ector_gl_surface.c b/src/lib/ector/gl/ector_gl_surface.c
index 9e8d73681d..a44f73916b 100644
--- a/src/lib/ector/gl/ector_gl_surface.c
+++ b/src/lib/ector/gl/ector_gl_surface.c
@@ -40,15 +40,15 @@ _shader_free(void *s)
40} 40}
41 41
42static Ector_Renderer * 42static Ector_Renderer *
43_ector_gl_surface_ector_generic_surface_renderer_factory_new(Eo *obj, 43_ector_gl_surface_ector_surface_renderer_factory_new(Eo *obj,
44 Ector_GL_Surface_Data *pd EINA_UNUSED, 44 Ector_GL_Surface_Data *pd EINA_UNUSED,
45 const Eo_Class *type) 45 const Eo_Class *type)
46{ 46{
47 if (type == ECTOR_RENDERER_GENERIC_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 eo_add(ECTOR_RENDERER_GL_SHAPE_CLASS, NULL, ector_renderer_surface_set(eo_self, obj));
49 else if (type == ECTOR_RENDERER_GENERIC_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 eo_add(ECTOR_RENDERER_GL_GRADIENT_LINEAR_CLASS, NULL, ector_renderer_surface_set(eo_self, obj));
51 else if (type == ECTOR_RENDERER_GENERIC_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 eo_add(ECTOR_RENDERER_GL_GRADIENT_RADIAL_CLASS, NULL, ector_renderer_surface_set(eo_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", eo_class_name_get(type));
@@ -56,7 +56,7 @@ _ector_gl_surface_ector_generic_surface_renderer_factory_new(Eo *obj,
56} 56}
57 57
58static void 58static void
59_ector_gl_surface_ector_generic_surface_reference_point_set(Eo *obj EINA_UNUSED, 59_ector_gl_surface_ector_surface_reference_point_set(Eo *obj EINA_UNUSED,
60 Ector_GL_Surface_Data *pd, 60 Ector_GL_Surface_Data *pd,
61 int x, int y) 61 int x, int y)
62{ 62{
diff --git a/src/lib/ector/gl/ector_gl_surface.eo b/src/lib/ector/gl/ector_gl_surface.eo
index e3585cd64a..770f550e31 100644
--- a/src/lib/ector/gl/ector_gl_surface.eo
+++ b/src/lib/ector/gl/ector_gl_surface.eo
@@ -1,6 +1,6 @@
1import ector_types; 1import ector_types;
2 2
3class Ector.GL.Surface (Ector.GL.Buffer, Ector.Generic.Surface) 3class Ector.GL.Surface (Ector.GL.Buffer, Ector.Surface)
4{ 4{
5 eo_prefix: ector_gl_surface; 5 eo_prefix: ector_gl_surface;
6 legacy_prefix: null; 6 legacy_prefix: null;
@@ -29,8 +29,8 @@ class Ector.GL.Surface (Ector.GL.Buffer, Ector.Generic.Surface)
29 } 29 }
30 } 30 }
31 implements { 31 implements {
32 Ector.Generic.Surface.renderer_factory_new; 32 Ector.Surface.renderer_factory_new;
33 Ector.Generic.Surface.reference_point.set; 33 Ector.Surface.reference_point.set;
34 Eo.Base.destructor; 34 Eo.Base.destructor;
35 Eo.Base.constructor; 35 Eo.Base.constructor;
36 } 36 }
diff --git a/src/lib/ector/gl/ector_renderer_gl.c b/src/lib/ector/gl/ector_renderer_gl.c
index 0b2f43d181..b3b251ca7a 100644
--- a/src/lib/ector/gl/ector_renderer_gl.c
+++ b/src/lib/ector/gl/ector_renderer_gl.c
@@ -12,18 +12,18 @@
12typedef struct _Ector_Renderer_GL_Data Ector_Renderer_GL_Data; 12typedef struct _Ector_Renderer_GL_Data Ector_Renderer_GL_Data;
13struct _Ector_Renderer_GL_Data 13struct _Ector_Renderer_GL_Data
14{ 14{
15 Ector_Renderer_Generic_Base_Data *base; 15 Ector_Renderer_Data *base;
16}; 16};
17 17
18static Eina_Bool 18static Eina_Bool
19_ector_renderer_gl_ector_renderer_generic_base_prepare(Eo *obj EINA_UNUSED, 19_ector_renderer_gl_ector_renderer_prepare(Eo *obj EINA_UNUSED,
20 Ector_Renderer_GL_Data *pd EINA_UNUSED) 20 Ector_Renderer_GL_Data *pd EINA_UNUSED)
21{ 21{
22 return EINA_TRUE; 22 return EINA_TRUE;
23} 23}
24 24
25static Eina_Bool 25static Eina_Bool
26_ector_renderer_gl_ector_renderer_generic_base_draw(Eo *obj EINA_UNUSED, 26_ector_renderer_gl_ector_renderer_draw(Eo *obj EINA_UNUSED,
27 Ector_Renderer_GL_Data *pd, 27 Ector_Renderer_GL_Data *pd,
28 Efl_Gfx_Render_Op op, 28 Efl_Gfx_Render_Op op,
29 Eina_Array *clips, 29 Eina_Array *clips,
@@ -42,7 +42,7 @@ _ector_renderer_gl_eo_base_constructor(Eo *obj, Ector_Renderer_GL_Data *pd)
42 obj = eo_constructor(eo_super(obj, ECTOR_RENDERER_GL_CLASS)); 42 obj = eo_constructor(eo_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_GENERIC_BASE_CLASS, obj); 45 pd->base = eo_data_xref(obj, ECTOR_RENDERER_CLASS, obj);
46 return obj; 46 return obj;
47} 47}
48 48
diff --git a/src/lib/ector/gl/ector_renderer_gl.eo b/src/lib/ector/gl/ector_renderer_gl.eo
index 34d940b49f..f3ba2329b2 100644
--- a/src/lib/ector/gl/ector_renderer_gl.eo
+++ b/src/lib/ector/gl/ector_renderer_gl.eo
@@ -1,6 +1,6 @@
1import ector_types; 1import ector_types;
2 2
3abstract Ector.Renderer.GL (Ector.Renderer.Generic.Base) 3abstract Ector.Renderer.GL (Ector.Renderer)
4{ 4{
5 legacy_prefix: null; 5 legacy_prefix: null;
6 methods { 6 methods {
@@ -16,8 +16,8 @@ abstract Ector.Renderer.GL (Ector.Renderer.Generic.Base)
16 } 16 }
17 implements { 17 implements {
18 @virtual .fill; 18 @virtual .fill;
19 Ector.Renderer.Generic.Base.prepare; 19 Ector.Renderer.prepare;
20 Ector.Renderer.Generic.Base.draw; 20 Ector.Renderer.draw;
21 Eo.Base.constructor; 21 Eo.Base.constructor;
22 Eo.Base.destructor; 22 Eo.Base.destructor;
23 } 23 }
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 17510b9f95..7aa2eeb90f 100644
--- a/src/lib/ector/gl/ector_renderer_gl_gradient_linear.c
+++ b/src/lib/ector/gl/ector_renderer_gl_gradient_linear.c
@@ -12,13 +12,13 @@
12typedef struct _Ector_Renderer_GL_Gradient_Linear_Data Ector_Renderer_GL_Gradient_Linear_Data; 12typedef struct _Ector_Renderer_GL_Gradient_Linear_Data Ector_Renderer_GL_Gradient_Linear_Data;
13struct _Ector_Renderer_GL_Gradient_Linear_Data 13struct _Ector_Renderer_GL_Gradient_Linear_Data
14{ 14{
15 Ector_Renderer_Generic_Gradient_Linear_Data *linear; 15 Ector_Renderer_Gradient_Linear_Data *linear;
16 Ector_Renderer_Generic_Gradient_Data *gradient; 16 Ector_Renderer_Gradient_Data *gradient;
17 Ector_Renderer_Generic_Base_Data *base; 17 Ector_Renderer_Data *base;
18}; 18};
19 19
20static Eina_Bool 20static Eina_Bool
21_ector_renderer_gl_gradient_linear_ector_renderer_generic_base_prepare(Eo *obj, 21_ector_renderer_gl_gradient_linear_ector_renderer_prepare(Eo *obj,
22 Ector_Renderer_GL_Gradient_Linear_Data *pd) 22 Ector_Renderer_GL_Gradient_Linear_Data *pd)
23{ 23{
24 // FIXME: prepare something 24 // FIXME: prepare something
@@ -29,7 +29,7 @@ _ector_renderer_gl_gradient_linear_ector_renderer_generic_base_prepare(Eo *obj,
29} 29}
30 30
31static Eina_Bool 31static Eina_Bool
32_ector_renderer_gl_gradient_linear_ector_renderer_generic_base_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(eo_super(obj, ECTOR_RENDERER_GL_GRADIENT_LINEAR_CLASS), op, clips, mul_col);
35 35
@@ -40,7 +40,7 @@ _ector_renderer_gl_gradient_linear_ector_renderer_generic_base_draw(Eo *obj, Ect
40} 40}
41 41
42static void 42static void
43_ector_renderer_gl_gradient_linear_ector_renderer_generic_base_bounds_get(Eo *obj EINA_UNUSED, 43_ector_renderer_gl_gradient_linear_ector_renderer_bounds_get(Eo *obj EINA_UNUSED,
44 Ector_Renderer_GL_Gradient_Linear_Data *pd, 44 Ector_Renderer_GL_Gradient_Linear_Data *pd,
45 Eina_Rectangle *r) 45 Eina_Rectangle *r)
46{ 46{
@@ -73,9 +73,9 @@ _ector_renderer_gl_gradient_linear_eo_base_constructor(Eo *obj, Ector_Renderer_G
73 73
74 if (!obj) return NULL; 74 if (!obj) return NULL;
75 75
76 pd->base = eo_data_xref(obj, ECTOR_RENDERER_GENERIC_BASE_CLASS, obj); 76 pd->base = eo_data_xref(obj, ECTOR_RENDERER_CLASS, obj);
77 pd->linear = eo_data_xref(obj, ECTOR_RENDERER_GENERIC_GRADIENT_LINEAR_MIXIN, obj); 77 pd->linear = eo_data_xref(obj, ECTOR_RENDERER_GRADIENT_LINEAR_MIXIN, obj);
78 pd->gradient = eo_data_xref(obj, ECTOR_RENDERER_GENERIC_GRADIENT_MIXIN, obj); 78 pd->gradient = eo_data_xref(obj, ECTOR_RENDERER_GRADIENT_MIXIN, obj);
79 79
80 return obj; 80 return obj;
81} 81}
@@ -95,7 +95,7 @@ _ector_renderer_gl_gradient_linear_efl_gfx_gradient_stop_set(Eo *obj, Ector_Rend
95} 95}
96 96
97static unsigned int 97static unsigned int
98_ector_renderer_gl_gradient_linear_ector_renderer_generic_base_crc_get(Eo *obj, Ector_Renderer_GL_Gradient_Linear_Data *pd) 98_ector_renderer_gl_gradient_linear_ector_renderer_crc_get(Eo *obj, Ector_Renderer_GL_Gradient_Linear_Data *pd)
99{ 99{
100 unsigned int crc; 100 unsigned int crc;
101 101
@@ -104,7 +104,7 @@ _ector_renderer_gl_gradient_linear_ector_renderer_generic_base_crc_get(Eo *obj,
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)
106 crc = eina_crc((void*) pd->gradient->colors, sizeof (Efl_Gfx_Gradient_Stop) * pd->gradient->colors_count, crc, EINA_FALSE); 106 crc = eina_crc((void*) pd->gradient->colors, sizeof (Efl_Gfx_Gradient_Stop) * pd->gradient->colors_count, crc, EINA_FALSE);
107 crc = eina_crc((void*) pd->linear, sizeof (Ector_Renderer_Generic_Gradient_Linear_Data), crc, EINA_FALSE); 107 crc = eina_crc((void*) pd->linear, sizeof (Ector_Renderer_Gradient_Linear_Data), crc, EINA_FALSE);
108 108
109 return crc; 109 return crc;
110} 110}
diff --git a/src/lib/ector/gl/ector_renderer_gl_gradient_linear.eo b/src/lib/ector/gl/ector_renderer_gl_gradient_linear.eo
index eda0d1a795..d7b9f71179 100644
--- a/src/lib/ector/gl/ector_renderer_gl_gradient_linear.eo
+++ b/src/lib/ector/gl/ector_renderer_gl_gradient_linear.eo
@@ -1,12 +1,12 @@
1class Ector.Renderer.GL.Gradient_Linear (Ector.Renderer.GL, Ector.Renderer.Generic.Gradient, Ector.Renderer.Generic.Gradient_Linear) 1class Ector.Renderer.GL.Gradient_Linear (Ector.Renderer.GL, Ector.Renderer.Gradient, Ector.Renderer.Gradient_Linear)
2{ 2{
3 eo_prefix: ector_renderer_gl_gradient_linear; 3 eo_prefix: ector_renderer_gl_gradient_linear;
4 legacy_prefix: null; 4 legacy_prefix: null;
5 implements { 5 implements {
6 Ector.Renderer.Generic.Base.prepare; 6 Ector.Renderer.prepare;
7 Ector.Renderer.Generic.Base.draw; 7 Ector.Renderer.draw;
8 Ector.Renderer.Generic.Base.bounds_get; 8 Ector.Renderer.bounds_get;
9 Ector.Renderer.Generic.Base.crc.get; 9 Ector.Renderer.crc.get;
10 Ector.Renderer.GL.fill; 10 Ector.Renderer.GL.fill;
11 Eo.Base.constructor; 11 Eo.Base.constructor;
12 Eo.Base.destructor; 12 Eo.Base.destructor;
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 3716a84a8d..a16619c8a3 100644
--- a/src/lib/ector/gl/ector_renderer_gl_gradient_radial.c
+++ b/src/lib/ector/gl/ector_renderer_gl_gradient_radial.c
@@ -12,13 +12,13 @@
12typedef struct _Ector_Renderer_GL_Gradient_Radial_Data Ector_Renderer_GL_Gradient_Radial_Data; 12typedef struct _Ector_Renderer_GL_Gradient_Radial_Data Ector_Renderer_GL_Gradient_Radial_Data;
13struct _Ector_Renderer_GL_Gradient_Radial_Data 13struct _Ector_Renderer_GL_Gradient_Radial_Data
14{ 14{
15 Ector_Renderer_Generic_Gradient_Radial_Data *radial; 15 Ector_Renderer_Gradient_Radial_Data *radial;
16 Ector_Renderer_Generic_Gradient_Data *gradient; 16 Ector_Renderer_Gradient_Data *gradient;
17 Ector_Renderer_Generic_Base_Data *base; 17 Ector_Renderer_Data *base;
18}; 18};
19 19
20static Eina_Bool 20static Eina_Bool
21_ector_renderer_gl_gradient_radial_ector_renderer_generic_base_prepare(Eo *obj, Ector_Renderer_GL_Gradient_Radial_Data *pd) 21_ector_renderer_gl_gradient_radial_ector_renderer_prepare(Eo *obj, Ector_Renderer_GL_Gradient_Radial_Data *pd)
22{ 22{
23 // FIXME: prepare something 23 // FIXME: prepare something
24 (void) obj; 24 (void) obj;
@@ -28,7 +28,7 @@ _ector_renderer_gl_gradient_radial_ector_renderer_generic_base_prepare(Eo *obj,
28} 28}
29 29
30static Eina_Bool 30static Eina_Bool
31_ector_renderer_gl_gradient_radial_ector_renderer_generic_base_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(eo_super(obj, ECTOR_RENDERER_GL_GRADIENT_RADIAL_CLASS), op, clips, mul_col);
34 34
@@ -54,7 +54,7 @@ _ector_renderer_gl_gradient_radial_ector_renderer_gl_fill(Eo *obj, Ector_Rendere
54} 54}
55 55
56static void 56static void
57_ector_renderer_gl_gradient_radial_ector_renderer_generic_base_bounds_get(Eo *obj EINA_UNUSED, 57_ector_renderer_gl_gradient_radial_ector_renderer_bounds_get(Eo *obj EINA_UNUSED,
58 Ector_Renderer_GL_Gradient_Radial_Data *pd, 58 Ector_Renderer_GL_Gradient_Radial_Data *pd,
59 Eina_Rectangle *r) 59 Eina_Rectangle *r)
60{ 60{
@@ -65,7 +65,7 @@ _ector_renderer_gl_gradient_radial_ector_renderer_generic_base_bounds_get(Eo *ob
65} 65}
66 66
67static unsigned int 67static unsigned int
68_ector_renderer_gl_gradient_radial_ector_renderer_generic_base_crc_get(Eo *obj, Ector_Renderer_GL_Gradient_Radial_Data *pd) 68_ector_renderer_gl_gradient_radial_ector_renderer_crc_get(Eo *obj, Ector_Renderer_GL_Gradient_Radial_Data *pd)
69{ 69{
70 unsigned int crc; 70 unsigned int crc;
71 71
@@ -74,7 +74,7 @@ _ector_renderer_gl_gradient_radial_ector_renderer_generic_base_crc_get(Eo *obj,
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)
76 crc = eina_crc((void*) pd->gradient->colors, sizeof (Efl_Gfx_Gradient_Stop) * pd->gradient->colors_count, crc, EINA_FALSE); 76 crc = eina_crc((void*) pd->gradient->colors, sizeof (Efl_Gfx_Gradient_Stop) * pd->gradient->colors_count, crc, EINA_FALSE);
77 crc = eina_crc((void*) pd->radial, sizeof (Ector_Renderer_Generic_Gradient_Radial_Data), crc, EINA_FALSE); 77 crc = eina_crc((void*) pd->radial, sizeof (Ector_Renderer_Gradient_Radial_Data), crc, EINA_FALSE);
78 78
79 return crc; 79 return crc;
80} 80}
@@ -86,9 +86,9 @@ _ector_renderer_gl_gradient_radial_eo_base_constructor(Eo *obj, Ector_Renderer_G
86 86
87 if (!obj) return NULL; 87 if (!obj) return NULL;
88 88
89 pd->base = eo_data_xref(obj, ECTOR_RENDERER_GENERIC_BASE_CLASS, obj); 89 pd->base = eo_data_xref(obj, ECTOR_RENDERER_CLASS, obj);
90 pd->radial = eo_data_xref(obj, ECTOR_RENDERER_GENERIC_GRADIENT_RADIAL_MIXIN, obj); 90 pd->radial = eo_data_xref(obj, ECTOR_RENDERER_GRADIENT_RADIAL_MIXIN, obj);
91 pd->gradient = eo_data_xref(obj, ECTOR_RENDERER_GENERIC_GRADIENT_MIXIN, obj); 91 pd->gradient = eo_data_xref(obj, ECTOR_RENDERER_GRADIENT_MIXIN, obj);
92 92
93 return obj; 93 return obj;
94} 94}
diff --git a/src/lib/ector/gl/ector_renderer_gl_gradient_radial.eo b/src/lib/ector/gl/ector_renderer_gl_gradient_radial.eo
index d57a973807..be1f0f0ec2 100644
--- a/src/lib/ector/gl/ector_renderer_gl_gradient_radial.eo
+++ b/src/lib/ector/gl/ector_renderer_gl_gradient_radial.eo
@@ -1,12 +1,12 @@
1class Ector.Renderer.GL.Gradient_Radial (Ector.Renderer.GL, Ector.Renderer.Generic.Gradient, Ector.Renderer.Generic.Gradient_Radial) 1class Ector.Renderer.GL.Gradient_Radial (Ector.Renderer.GL, Ector.Renderer.Gradient, Ector.Renderer.Gradient_Radial)
2{ 2{
3 eo_prefix: ector_renderer_gl_gradient_radial; 3 eo_prefix: ector_renderer_gl_gradient_radial;
4 legacy_prefix: null; 4 legacy_prefix: null;
5 implements { 5 implements {
6 Ector.Renderer.Generic.Base.prepare; 6 Ector.Renderer.prepare;
7 Ector.Renderer.Generic.Base.draw; 7 Ector.Renderer.draw;
8 Ector.Renderer.Generic.Base.bounds_get; 8 Ector.Renderer.bounds_get;
9 Ector.Renderer.Generic.Base.crc.get; 9 Ector.Renderer.crc.get;
10 Ector.Renderer.GL.fill; 10 Ector.Renderer.GL.fill;
11 Eo.Base.constructor; 11 Eo.Base.constructor;
12 Eo.Base.destructor; 12 Eo.Base.destructor;
diff --git a/src/lib/ector/gl/ector_renderer_gl_shape.c b/src/lib/ector/gl/ector_renderer_gl_shape.c
index 4fcac48dd6..b6bd8efc26 100644
--- a/src/lib/ector/gl/ector_renderer_gl_shape.c
+++ b/src/lib/ector/gl/ector_renderer_gl_shape.c
@@ -14,8 +14,8 @@ struct _Ector_Renderer_GL_Shape_Data
14{ 14{
15 Efl_Gfx_Shape_Public *public_shape; 15 Efl_Gfx_Shape_Public *public_shape;
16 16
17 Ector_Renderer_Generic_Shape_Data *shape; 17 Ector_Renderer_Shape_Data *shape;
18 Ector_Renderer_Generic_Base_Data *base; 18 Ector_Renderer_Data *base;
19 19
20 GLshort *vertex; 20 GLshort *vertex;
21}; 21};
@@ -32,7 +32,7 @@ _ector_renderer_gl_shape_path_changed(void *data, const Eo_Event *event EINA_UNU
32} 32}
33 33
34static Eina_Bool 34static Eina_Bool
35_ector_renderer_gl_shape_ector_renderer_generic_base_prepare(Eo *obj, Ector_Renderer_GL_Shape_Data *pd) 35_ector_renderer_gl_shape_ector_renderer_prepare(Eo *obj, Ector_Renderer_GL_Shape_Data *pd)
36{ 36{
37 Eina_Rectangle bounding_box; 37 Eina_Rectangle bounding_box;
38 Eina_Bool r; 38 Eina_Bool r;
@@ -70,7 +70,7 @@ _ector_renderer_gl_shape_ector_renderer_generic_base_prepare(Eo *obj, Ector_Rend
70} 70}
71 71
72static Eina_Bool 72static Eina_Bool
73_ector_renderer_gl_shape_ector_renderer_generic_base_draw(Eo *obj, Ector_Renderer_GL_Shape_Data *pd, Efl_Gfx_Render_Op op, Eina_Array *clips, unsigned int mul_col) 73_ector_renderer_gl_shape_ector_renderer_draw(Eo *obj, Ector_Renderer_GL_Shape_Data *pd, Efl_Gfx_Render_Op op, Eina_Array *clips, unsigned int mul_col)
74{ 74{
75 uint64_t flags = 0; 75 uint64_t flags = 0;
76 76
@@ -107,7 +107,7 @@ _ector_renderer_gl_shape_ector_renderer_gl_fill(Eo *obj EINA_UNUSED,
107} 107}
108 108
109static void 109static void
110_ector_renderer_gl_shape_ector_renderer_generic_base_bounds_get(Eo *obj, Ector_Renderer_GL_Shape_Data *pd, Eina_Rectangle *r) 110_ector_renderer_gl_shape_ector_renderer_bounds_get(Eo *obj, Ector_Renderer_GL_Shape_Data *pd, Eina_Rectangle *r)
111{ 111{
112 efl_gfx_shape_bounds_get(obj, r); 112 efl_gfx_shape_bounds_get(obj, r);
113 113
@@ -116,7 +116,7 @@ _ector_renderer_gl_shape_ector_renderer_generic_base_bounds_get(Eo *obj, Ector_R
116} 116}
117 117
118static unsigned int 118static unsigned int
119_ector_renderer_gl_shape_ector_renderer_generic_base_crc_get(Eo *obj, Ector_Renderer_GL_Shape_Data *pd) 119_ector_renderer_gl_shape_ector_renderer_crc_get(Eo *obj, Ector_Renderer_GL_Shape_Data *pd)
120{ 120{
121 unsigned int crc; 121 unsigned int crc;
122 122
@@ -148,8 +148,8 @@ _ector_renderer_gl_shape_eo_base_constructor(Eo *obj, Ector_Renderer_GL_Shape_Da
148 if (!obj) return NULL; 148 if (!obj) return NULL;
149 149
150 pd->public_shape = eo_data_xref(obj, EFL_GFX_SHAPE_MIXIN, obj); 150 pd->public_shape = eo_data_xref(obj, EFL_GFX_SHAPE_MIXIN, obj);
151 pd->shape = eo_data_xref(obj, ECTOR_RENDERER_GENERIC_SHAPE_MIXIN, obj); 151 pd->shape = eo_data_xref(obj, ECTOR_RENDERER_SHAPE_MIXIN, obj);
152 pd->base = eo_data_xref(obj, ECTOR_RENDERER_GENERIC_BASE_CLASS, obj); 152 pd->base = eo_data_xref(obj, ECTOR_RENDERER_CLASS, obj);
153 153
154 eo_event_callback_add(obj, EFL_GFX_PATH_CHANGED, _ector_renderer_gl_shape_path_changed, pd); 154 eo_event_callback_add(obj, EFL_GFX_PATH_CHANGED, _ector_renderer_gl_shape_path_changed, pd);
155 155
diff --git a/src/lib/ector/gl/ector_renderer_gl_shape.eo b/src/lib/ector/gl/ector_renderer_gl_shape.eo
index ba75b51aa9..1c93022c3e 100644
--- a/src/lib/ector/gl/ector_renderer_gl_shape.eo
+++ b/src/lib/ector/gl/ector_renderer_gl_shape.eo
@@ -1,12 +1,12 @@
1class Ector.Renderer.GL.Shape (Ector.Renderer.GL, Ector.Renderer.Generic.Shape) 1class Ector.Renderer.GL.Shape (Ector.Renderer.GL, Ector.Renderer.Shape)
2{ 2{
3 eo_prefix: ector_renderer_gl_shape; 3 eo_prefix: ector_renderer_gl_shape;
4 legacy_prefix: null; 4 legacy_prefix: null;
5 implements { 5 implements {
6 Ector.Renderer.Generic.Base.prepare; 6 Ector.Renderer.prepare;
7 Ector.Renderer.Generic.Base.draw; 7 Ector.Renderer.draw;
8 Ector.Renderer.Generic.Base.bounds_get; 8 Ector.Renderer.bounds_get;
9 Ector.Renderer.Generic.Base.crc.get; 9 Ector.Renderer.crc.get;
10 Ector.Renderer.GL.fill; 10 Ector.Renderer.GL.fill;
11 Eo.Base.constructor; 11 Eo.Base.constructor;
12 Eo.Base.destructor; 12 Eo.Base.destructor;
diff --git a/src/lib/ector/software/ector_renderer_software.eo b/src/lib/ector/software/ector_renderer_software.eo
index fe8c02c712..aa9e46e993 100644
--- a/src/lib/ector/software/ector_renderer_software.eo
+++ b/src/lib/ector/software/ector_renderer_software.eo
@@ -1,4 +1,4 @@
1class Ector.Renderer.Software (Ector.Renderer.Generic.Base) 1class Ector.Renderer.Software (Ector.Renderer)
2{ 2{
3 legacy_prefix: null; 3 legacy_prefix: null;
4 data: null; 4 data: null;
diff --git a/src/lib/ector/software/ector_renderer_software_buffer.c b/src/lib/ector/software/ector_renderer_software_buffer.c
index f5af5a7cb3..e16ec6ee46 100644
--- a/src/lib/ector/software/ector_renderer_software_buffer.c
+++ b/src/lib/ector/software/ector_renderer_software_buffer.c
@@ -13,19 +13,19 @@
13 13
14typedef struct 14typedef struct
15{ 15{
16 Ector_Renderer_Generic_Base_Data *base; 16 Ector_Renderer_Data *base;
17 Software_Rasterizer *surface; 17 Software_Rasterizer *surface;
18 Ector_Buffer *eo_buffer; 18 Ector_Buffer *eo_buffer;
19} Ector_Renderer_Software_Buffer_Data; 19} Ector_Renderer_Software_Buffer_Data;
20 20
21 21
22EOLIAN static void 22EOLIAN static void
23_ector_renderer_software_buffer_buffer_set(Eo *obj, Ector_Renderer_Software_Buffer_Data *pd, Ector_Generic_Buffer *buf) 23_ector_renderer_software_buffer_buffer_set(Eo *obj, Ector_Renderer_Software_Buffer_Data *pd, Ector_Buffer *buf)
24{ 24{
25 _eo_xrefplace(&pd->eo_buffer, buf, obj); 25 _eo_xrefplace(&pd->eo_buffer, buf, obj);
26} 26}
27 27
28EOLIAN static Ector_Generic_Buffer * 28EOLIAN static Ector_Buffer *
29_ector_renderer_software_buffer_buffer_get(Eo *obj EINA_UNUSED, Ector_Renderer_Software_Buffer_Data *pd) 29_ector_renderer_software_buffer_buffer_get(Eo *obj EINA_UNUSED, Ector_Renderer_Software_Buffer_Data *pd)
30{ 30{
31 return pd->eo_buffer; 31 return pd->eo_buffer;
@@ -40,7 +40,7 @@ _ector_renderer_software_buffer_ector_renderer_software_fill(Eo *obj, Ector_Rend
40} 40}
41 41
42EOLIAN static Eina_Bool 42EOLIAN static Eina_Bool
43_ector_renderer_software_buffer_ector_renderer_generic_base_prepare(Eo *obj, Ector_Renderer_Software_Buffer_Data *pd) 43_ector_renderer_software_buffer_ector_renderer_prepare(Eo *obj, Ector_Renderer_Software_Buffer_Data *pd)
44{ 44{
45 if (!pd->surface) 45 if (!pd->surface)
46 pd->surface = eo_data_xref(pd->base->surface, ECTOR_SOFTWARE_SURFACE_CLASS, obj); 46 pd->surface = eo_data_xref(pd->base->surface, ECTOR_SOFTWARE_SURFACE_CLASS, obj);
@@ -49,7 +49,7 @@ _ector_renderer_software_buffer_ector_renderer_generic_base_prepare(Eo *obj, Ect
49} 49}
50 50
51EOLIAN static unsigned int 51EOLIAN static unsigned int
52_ector_renderer_software_buffer_ector_renderer_generic_base_crc_get(Eo *obj, Ector_Renderer_Software_Buffer_Data *pd) 52_ector_renderer_software_buffer_ector_renderer_crc_get(Eo *obj, Ector_Renderer_Software_Buffer_Data *pd)
53{ 53{
54 Ector_Software_Buffer_Base_Data *buffer = eo_data_scope_get(pd->eo_buffer, ECTOR_SOFTWARE_BUFFER_BASE_MIXIN); 54 Ector_Software_Buffer_Base_Data *buffer = eo_data_scope_get(pd->eo_buffer, ECTOR_SOFTWARE_BUFFER_BASE_MIXIN);
55 unsigned int crc; 55 unsigned int crc;
diff --git a/src/lib/ector/software/ector_renderer_software_buffer.eo b/src/lib/ector/software/ector_renderer_software_buffer.eo
index 3a17c56df7..3595a3cb45 100644
--- a/src/lib/ector/software/ector_renderer_software_buffer.eo
+++ b/src/lib/ector/software/ector_renderer_software_buffer.eo
@@ -1,4 +1,4 @@
1class Ector.Renderer.Software.Buffer (Ector.Renderer.Software, Ector.Renderer.Generic.Buffer) 1class Ector.Renderer.Software.Buffer (Ector.Renderer.Software, Ector.Renderer.Buffer)
2{ 2{
3 legacy_prefix: null; 3 legacy_prefix: null;
4 methods { 4 methods {
@@ -6,13 +6,13 @@ class Ector.Renderer.Software.Buffer (Ector.Renderer.Software, Ector.Renderer.Ge
6 set {} 6 set {}
7 get {} 7 get {}
8 values { 8 values {
9 buf: Ector.Generic.Buffer *; 9 buf: Ector.Buffer *;
10 } 10 }
11 } 11 }
12 } 12 }
13 implements { 13 implements {
14 Ector.Renderer.Generic.Base.prepare; 14 Ector.Renderer.prepare;
15 Ector.Renderer.Generic.Base.crc.get; 15 Ector.Renderer.crc.get;
16 Ector.Renderer.Software.fill; 16 Ector.Renderer.Software.fill;
17 Eo.Base.destructor; 17 Eo.Base.destructor;
18 } 18 }
diff --git a/src/lib/ector/software/ector_renderer_software_gradient_linear.c b/src/lib/ector/software/ector_renderer_software_gradient_linear.c
index 9428366352..d5d5effc5e 100644
--- a/src/lib/ector/software/ector_renderer_software_gradient_linear.c
+++ b/src/lib/ector/software/ector_renderer_software_gradient_linear.c
@@ -10,14 +10,14 @@
10#include "ector_software_private.h" 10#include "ector_software_private.h"
11 11
12static Eina_Bool 12static Eina_Bool
13_ector_renderer_software_gradient_linear_ector_renderer_generic_base_prepare(Eo *obj, 13_ector_renderer_software_gradient_linear_ector_renderer_prepare(Eo *obj,
14 Ector_Renderer_Software_Gradient_Data *pd) 14 Ector_Renderer_Software_Gradient_Data *pd)
15{ 15{
16 if (!pd->surface) 16 if (!pd->surface)
17 { 17 {
18 Ector_Renderer_Generic_Base_Data *base; 18 Ector_Renderer_Data *base;
19 19
20 base = eo_data_scope_get(obj, ECTOR_RENDERER_GENERIC_BASE_CLASS); 20 base = eo_data_scope_get(obj, ECTOR_RENDERER_CLASS);
21 pd->surface = eo_data_xref(base->surface, ECTOR_SOFTWARE_SURFACE_CLASS, obj); 21 pd->surface = eo_data_xref(base->surface, ECTOR_SOFTWARE_SURFACE_CLASS, obj);
22 } 22 }
23 23
@@ -45,7 +45,7 @@ _ector_renderer_software_gradient_linear_ector_renderer_generic_base_prepare(Eo
45} 45}
46 46
47static Eina_Bool 47static Eina_Bool
48_ector_renderer_software_gradient_linear_ector_renderer_generic_base_draw(Eo *obj EINA_UNUSED, 48_ector_renderer_software_gradient_linear_ector_renderer_draw(Eo *obj EINA_UNUSED,
49 Ector_Renderer_Software_Gradient_Data *pd EINA_UNUSED, 49 Ector_Renderer_Software_Gradient_Data *pd EINA_UNUSED,
50 Efl_Gfx_Render_Op op EINA_UNUSED, Eina_Array *clips EINA_UNUSED, 50 Efl_Gfx_Render_Op op EINA_UNUSED, Eina_Array *clips EINA_UNUSED,
51 unsigned int mul_col EINA_UNUSED) 51 unsigned int mul_col EINA_UNUSED)
@@ -69,8 +69,8 @@ _ector_renderer_software_gradient_linear_eo_base_constructor(Eo *obj,
69 obj = eo_constructor(eo_super(obj, ECTOR_RENDERER_SOFTWARE_GRADIENT_LINEAR_CLASS)); 69 obj = eo_constructor(eo_super(obj, ECTOR_RENDERER_SOFTWARE_GRADIENT_LINEAR_CLASS));
70 if (!obj) return NULL; 70 if (!obj) return NULL;
71 71
72 pd->gd = eo_data_xref(obj, ECTOR_RENDERER_GENERIC_GRADIENT_MIXIN, obj); 72 pd->gd = eo_data_xref(obj, ECTOR_RENDERER_GRADIENT_MIXIN, obj);
73 pd->gld = eo_data_xref(obj, ECTOR_RENDERER_GENERIC_GRADIENT_LINEAR_MIXIN, obj); 73 pd->gld = eo_data_xref(obj, ECTOR_RENDERER_GRADIENT_LINEAR_MIXIN, obj);
74 74
75 return obj; 75 return obj;
76} 76}
@@ -79,11 +79,11 @@ static void
79_ector_renderer_software_gradient_linear_eo_base_destructor(Eo *obj, 79_ector_renderer_software_gradient_linear_eo_base_destructor(Eo *obj,
80 Ector_Renderer_Software_Gradient_Data *pd) 80 Ector_Renderer_Software_Gradient_Data *pd)
81{ 81{
82 Ector_Renderer_Generic_Base_Data *base; 82 Ector_Renderer_Data *base;
83 83
84 destroy_color_table(pd); 84 destroy_color_table(pd);
85 85
86 base = eo_data_scope_get(obj, ECTOR_RENDERER_GENERIC_BASE_CLASS); 86 base = eo_data_scope_get(obj, ECTOR_RENDERER_CLASS);
87 eo_data_xunref(base->surface, pd->surface, obj); 87 eo_data_xunref(base->surface, pd->surface, obj);
88 88
89 eo_data_xunref(obj, pd->gd, obj); 89 eo_data_xunref(obj, pd->gd, obj);
@@ -101,7 +101,7 @@ _ector_renderer_software_gradient_linear_efl_gfx_gradient_stop_set(Eo *obj, Ecto
101} 101}
102 102
103static unsigned int 103static unsigned int
104_ector_renderer_software_gradient_linear_ector_renderer_generic_base_crc_get(Eo *obj, Ector_Renderer_Software_Gradient_Data *pd) 104_ector_renderer_software_gradient_linear_ector_renderer_crc_get(Eo *obj, Ector_Renderer_Software_Gradient_Data *pd)
105{ 105{
106 unsigned int crc; 106 unsigned int crc;
107 107
@@ -110,7 +110,7 @@ _ector_renderer_software_gradient_linear_ector_renderer_generic_base_crc_get(Eo
110 crc = eina_crc((void*) pd->gd->s, sizeof (Efl_Gfx_Gradient_Spread), crc, EINA_FALSE); 110 crc = eina_crc((void*) pd->gd->s, sizeof (Efl_Gfx_Gradient_Spread), crc, EINA_FALSE);
111 if (pd->gd->colors_count) 111 if (pd->gd->colors_count)
112 crc = eina_crc((void*) pd->gd->colors, sizeof (Efl_Gfx_Gradient_Stop) * pd->gd->colors_count, crc, EINA_FALSE); 112 crc = eina_crc((void*) pd->gd->colors, sizeof (Efl_Gfx_Gradient_Stop) * pd->gd->colors_count, crc, EINA_FALSE);
113 crc = eina_crc((void*) pd->gld, sizeof (Ector_Renderer_Generic_Gradient_Linear_Data), crc, EINA_FALSE); 113 crc = eina_crc((void*) pd->gld, sizeof (Ector_Renderer_Gradient_Linear_Data), crc, EINA_FALSE);
114 114
115 return crc; 115 return crc;
116} 116}
diff --git a/src/lib/ector/software/ector_renderer_software_gradient_linear.eo b/src/lib/ector/software/ector_renderer_software_gradient_linear.eo
index 1f52a4427f..799119d6d3 100644
--- a/src/lib/ector/software/ector_renderer_software_gradient_linear.eo
+++ b/src/lib/ector/software/ector_renderer_software_gradient_linear.eo
@@ -1,12 +1,12 @@
1class Ector.Renderer.Software.Gradient_Linear (Ector.Renderer.Software, Ector.Renderer.Generic.Gradient, Ector.Renderer.Generic.Gradient_Linear) 1class Ector.Renderer.Software.Gradient_Linear (Ector.Renderer.Software, Ector.Renderer.Gradient, Ector.Renderer.Gradient_Linear)
2{ 2{
3 eo_prefix: ector_renderer_software_gradient_linear; 3 eo_prefix: ector_renderer_software_gradient_linear;
4 legacy_prefix: null; 4 legacy_prefix: null;
5 data: Ector_Renderer_Software_Gradient_Data; 5 data: Ector_Renderer_Software_Gradient_Data;
6 implements { 6 implements {
7 Ector.Renderer.Generic.Base.prepare; 7 Ector.Renderer.prepare;
8 Ector.Renderer.Generic.Base.draw; 8 Ector.Renderer.draw;
9 Ector.Renderer.Generic.Base.crc.get; 9 Ector.Renderer.crc.get;
10 Ector.Renderer.Software.fill; 10 Ector.Renderer.Software.fill;
11 Eo.Base.constructor; 11 Eo.Base.constructor;
12 Eo.Base.destructor; 12 Eo.Base.destructor;
diff --git a/src/lib/ector/software/ector_renderer_software_gradient_radial.c b/src/lib/ector/software/ector_renderer_software_gradient_radial.c
index 1d164e6b22..1154fea263 100644
--- a/src/lib/ector/software/ector_renderer_software_gradient_radial.c
+++ b/src/lib/ector/software/ector_renderer_software_gradient_radial.c
@@ -10,13 +10,13 @@
10#include "ector_software_private.h" 10#include "ector_software_private.h"
11 11
12static Eina_Bool 12static Eina_Bool
13_ector_renderer_software_gradient_radial_ector_renderer_generic_base_prepare(Eo *obj, Ector_Renderer_Software_Gradient_Data *pd) 13_ector_renderer_software_gradient_radial_ector_renderer_prepare(Eo *obj, Ector_Renderer_Software_Gradient_Data *pd)
14{ 14{
15 if (!pd->surface) 15 if (!pd->surface)
16 { 16 {
17 Ector_Renderer_Generic_Base_Data *base; 17 Ector_Renderer_Data *base;
18 18
19 base = eo_data_scope_get(obj, ECTOR_RENDERER_GENERIC_BASE_CLASS); 19 base = eo_data_scope_get(obj, ECTOR_RENDERER_CLASS);
20 pd->surface = eo_data_xref(base->surface, ECTOR_SOFTWARE_SURFACE_CLASS, obj); 20 pd->surface = eo_data_xref(base->surface, ECTOR_SOFTWARE_SURFACE_CLASS, obj);
21 } 21 }
22 22
@@ -56,7 +56,7 @@ _ector_renderer_software_gradient_radial_ector_renderer_generic_base_prepare(Eo
56 56
57// Clearly duplicated and should be in a common place... 57// Clearly duplicated and should be in a common place...
58static Eina_Bool 58static Eina_Bool
59_ector_renderer_software_gradient_radial_ector_renderer_generic_base_draw(Eo *obj EINA_UNUSED, 59_ector_renderer_software_gradient_radial_ector_renderer_draw(Eo *obj EINA_UNUSED,
60 Ector_Renderer_Software_Gradient_Data *pd EINA_UNUSED, 60 Ector_Renderer_Software_Gradient_Data *pd EINA_UNUSED,
61 Efl_Gfx_Render_Op op EINA_UNUSED, Eina_Array *clips EINA_UNUSED, 61 Efl_Gfx_Render_Op op EINA_UNUSED, Eina_Array *clips EINA_UNUSED,
62 unsigned int mul_col EINA_UNUSED) 62 unsigned int mul_col EINA_UNUSED)
@@ -77,8 +77,8 @@ _ector_renderer_software_gradient_radial_eo_base_constructor(Eo *obj,
77 Ector_Renderer_Software_Gradient_Data *pd) 77 Ector_Renderer_Software_Gradient_Data *pd)
78{ 78{
79 obj = eo_constructor(eo_super(obj, ECTOR_RENDERER_SOFTWARE_GRADIENT_RADIAL_CLASS)); 79 obj = eo_constructor(eo_super(obj, ECTOR_RENDERER_SOFTWARE_GRADIENT_RADIAL_CLASS));
80 pd->gd = eo_data_xref(obj, ECTOR_RENDERER_GENERIC_GRADIENT_MIXIN, obj); 80 pd->gd = eo_data_xref(obj, ECTOR_RENDERER_GRADIENT_MIXIN, obj);
81 pd->gld = eo_data_xref(obj, ECTOR_RENDERER_GENERIC_GRADIENT_RADIAL_MIXIN, obj); 81 pd->gld = eo_data_xref(obj, ECTOR_RENDERER_GRADIENT_RADIAL_MIXIN, obj);
82 82
83 return obj; 83 return obj;
84} 84}
@@ -87,11 +87,11 @@ void
87_ector_renderer_software_gradient_radial_eo_base_destructor(Eo *obj, 87_ector_renderer_software_gradient_radial_eo_base_destructor(Eo *obj,
88 Ector_Renderer_Software_Gradient_Data *pd) 88 Ector_Renderer_Software_Gradient_Data *pd)
89{ 89{
90 Ector_Renderer_Generic_Base_Data *base; 90 Ector_Renderer_Data *base;
91 91
92 destroy_color_table(pd); 92 destroy_color_table(pd);
93 93
94 base = eo_data_scope_get(obj, ECTOR_RENDERER_GENERIC_BASE_CLASS); 94 base = eo_data_scope_get(obj, ECTOR_RENDERER_CLASS);
95 eo_data_xunref(base->surface, pd->surface, obj); 95 eo_data_xunref(base->surface, pd->surface, obj);
96 96
97 eo_data_xunref(obj, pd->gd, obj); 97 eo_data_xunref(obj, pd->gd, obj);
@@ -109,7 +109,7 @@ _ector_renderer_software_gradient_radial_efl_gfx_gradient_stop_set(Eo *obj, Ecto
109} 109}
110 110
111static unsigned int 111static unsigned int
112_ector_renderer_software_gradient_radial_ector_renderer_generic_base_crc_get(Eo *obj, Ector_Renderer_Software_Gradient_Data *pd) 112_ector_renderer_software_gradient_radial_ector_renderer_crc_get(Eo *obj, Ector_Renderer_Software_Gradient_Data *pd)
113{ 113{
114 unsigned int crc; 114 unsigned int crc;
115 115
@@ -118,7 +118,7 @@ _ector_renderer_software_gradient_radial_ector_renderer_generic_base_crc_get(Eo
118 crc = eina_crc((void*) pd->gd->s, sizeof (Efl_Gfx_Gradient_Spread), crc, EINA_FALSE); 118 crc = eina_crc((void*) pd->gd->s, sizeof (Efl_Gfx_Gradient_Spread), crc, EINA_FALSE);
119 if (pd->gd->colors_count) 119 if (pd->gd->colors_count)
120 crc = eina_crc((void*) pd->gd->colors, sizeof (Efl_Gfx_Gradient_Stop) * pd->gd->colors_count, crc, EINA_FALSE); 120 crc = eina_crc((void*) pd->gd->colors, sizeof (Efl_Gfx_Gradient_Stop) * pd->gd->colors_count, crc, EINA_FALSE);
121 crc = eina_crc((void*) pd->gld, sizeof (Ector_Renderer_Generic_Gradient_Radial_Data), crc, EINA_FALSE); 121 crc = eina_crc((void*) pd->gld, sizeof (Ector_Renderer_Gradient_Radial_Data), crc, EINA_FALSE);
122 122
123 return crc; 123 return crc;
124} 124}
diff --git a/src/lib/ector/software/ector_renderer_software_gradient_radial.eo b/src/lib/ector/software/ector_renderer_software_gradient_radial.eo
index 6590a399cb..b3dc7730fd 100644
--- a/src/lib/ector/software/ector_renderer_software_gradient_radial.eo
+++ b/src/lib/ector/software/ector_renderer_software_gradient_radial.eo
@@ -1,12 +1,12 @@
1class Ector.Renderer.Software.Gradient_Radial (Ector.Renderer.Software, Ector.Renderer.Generic.Gradient, Ector.Renderer.Generic.Gradient_Radial) 1class Ector.Renderer.Software.Gradient_Radial (Ector.Renderer.Software, Ector.Renderer.Gradient, Ector.Renderer.Gradient_Radial)
2{ 2{
3 eo_prefix: ector_renderer_software_gradient_radial; 3 eo_prefix: ector_renderer_software_gradient_radial;
4 legacy_prefix: null; 4 legacy_prefix: null;
5 data: Ector_Renderer_Software_Gradient_Data; 5 data: Ector_Renderer_Software_Gradient_Data;
6 implements { 6 implements {
7 Ector.Renderer.Generic.Base.prepare; 7 Ector.Renderer.prepare;
8 Ector.Renderer.Generic.Base.draw; 8 Ector.Renderer.draw;
9 Ector.Renderer.Generic.Base.crc.get; 9 Ector.Renderer.crc.get;
10 Ector.Renderer.Software.fill; 10 Ector.Renderer.Software.fill;
11 Eo.Base.constructor; 11 Eo.Base.constructor;
12 Eo.Base.destructor; 12 Eo.Base.destructor;
diff --git a/src/lib/ector/software/ector_renderer_software_shape.c b/src/lib/ector/software/ector_renderer_software_shape.c
index 78e98151e4..835e0ac4b8 100644
--- a/src/lib/ector/software/ector_renderer_software_shape.c
+++ b/src/lib/ector/software/ector_renderer_software_shape.c
@@ -18,8 +18,8 @@ struct _Ector_Renderer_Software_Shape_Data
18 Efl_Gfx_Shape_Public *public_shape; 18 Efl_Gfx_Shape_Public *public_shape;
19 19
20 Ector_Software_Surface_Data *surface; 20 Ector_Software_Surface_Data *surface;
21 Ector_Renderer_Generic_Shape_Data *shape; 21 Ector_Renderer_Shape_Data *shape;
22 Ector_Renderer_Generic_Base_Data *base; 22 Ector_Renderer_Data *base;
23 23
24 Shape_Rle_Data *shape_data; 24 Shape_Rle_Data *shape_data;
25 Shape_Rle_Data *outline_data; 25 Shape_Rle_Data *outline_data;
@@ -571,7 +571,7 @@ _update_rle(Eo *obj, Ector_Renderer_Software_Shape_Data *pd)
571} 571}
572 572
573static Eina_Bool 573static Eina_Bool
574_ector_renderer_software_shape_ector_renderer_generic_base_prepare(Eo *obj, 574_ector_renderer_software_shape_ector_renderer_prepare(Eo *obj,
575 Ector_Renderer_Software_Shape_Data *pd) 575 Ector_Renderer_Software_Shape_Data *pd)
576{ 576{
577 // FIXME: shouldn't that be part of the shape generic implementation ? 577 // FIXME: shouldn't that be part of the shape generic implementation ?
@@ -590,7 +590,7 @@ _ector_renderer_software_shape_ector_renderer_generic_base_prepare(Eo *obj,
590} 590}
591 591
592static Eina_Bool 592static Eina_Bool
593_ector_renderer_software_shape_ector_renderer_generic_base_draw(Eo *obj, 593_ector_renderer_software_shape_ector_renderer_draw(Eo *obj,
594 Ector_Renderer_Software_Shape_Data *pd, 594 Ector_Renderer_Software_Shape_Data *pd,
595 Efl_Gfx_Render_Op op, Eina_Array *clips, 595 Efl_Gfx_Render_Op op, Eina_Array *clips,
596 unsigned int mul_col) 596 unsigned int mul_col)
@@ -700,8 +700,8 @@ _ector_renderer_software_shape_eo_base_constructor(Eo *obj, Ector_Renderer_Softw
700 if (!obj) return NULL; 700 if (!obj) return NULL;
701 701
702 pd->public_shape = eo_data_xref(obj, EFL_GFX_SHAPE_MIXIN, obj); 702 pd->public_shape = eo_data_xref(obj, EFL_GFX_SHAPE_MIXIN, obj);
703 pd->shape = eo_data_xref(obj, ECTOR_RENDERER_GENERIC_SHAPE_MIXIN, obj); 703 pd->shape = eo_data_xref(obj, ECTOR_RENDERER_SHAPE_MIXIN, obj);
704 pd->base = eo_data_xref(obj, ECTOR_RENDERER_GENERIC_BASE_CLASS, obj); 704 pd->base = eo_data_xref(obj, ECTOR_RENDERER_CLASS, obj);
705 eo_event_callback_add(obj, EFL_GFX_PATH_CHANGED, _ector_renderer_software_shape_path_changed, pd); 705 eo_event_callback_add(obj, EFL_GFX_PATH_CHANGED, _ector_renderer_software_shape_path_changed, pd);
706 706
707 return obj; 707 return obj;
@@ -725,7 +725,7 @@ _ector_renderer_software_shape_eo_base_destructor(Eo *obj, Ector_Renderer_Softwa
725 725
726 726
727unsigned int 727unsigned int
728_ector_renderer_software_shape_ector_renderer_generic_base_crc_get(Eo *obj, 728_ector_renderer_software_shape_ector_renderer_crc_get(Eo *obj,
729 Ector_Renderer_Software_Shape_Data *pd) 729 Ector_Renderer_Software_Shape_Data *pd)
730{ 730{
731 unsigned int crc; 731 unsigned int crc;
diff --git a/src/lib/ector/software/ector_renderer_software_shape.eo b/src/lib/ector/software/ector_renderer_software_shape.eo
index e7a69aad82..bb0374b07b 100644
--- a/src/lib/ector/software/ector_renderer_software_shape.eo
+++ b/src/lib/ector/software/ector_renderer_software_shape.eo
@@ -1,12 +1,12 @@
1class Ector.Renderer.Software.Shape (Ector.Renderer.Software, Ector.Renderer.Generic.Shape) 1class Ector.Renderer.Software.Shape (Ector.Renderer.Software, Ector.Renderer.Shape)
2{ 2{
3 eo_prefix: ector_renderer_software_shape; 3 eo_prefix: ector_renderer_software_shape;
4 legacy_prefix: null; 4 legacy_prefix: null;
5 implements { 5 implements {
6 Ector.Renderer.Generic.Base.prepare; 6 Ector.Renderer.prepare;
7 Ector.Renderer.Generic.Base.draw; 7 Ector.Renderer.draw;
8 Ector.Renderer.Software.fill; 8 Ector.Renderer.Software.fill;
9 Ector.Renderer.Generic.Base.crc.get; 9 Ector.Renderer.crc.get;
10 Efl.Gfx.Shape.path.set; 10 Efl.Gfx.Shape.path.set;
11 Eo.Base.constructor; 11 Eo.Base.constructor;
12 Eo.Base.destructor; 12 Eo.Base.destructor;
diff --git a/src/lib/ector/software/ector_software_buffer.c b/src/lib/ector/software/ector_software_buffer.c
index ecbac54373..65c21c993c 100644
--- a/src/lib/ector/software/ector_software_buffer.c
+++ b/src/lib/ector/software/ector_software_buffer.c
@@ -69,7 +69,7 @@ _ector_software_buffer_base_pixels_clear(Eo *obj, Ector_Software_Buffer_Base_Dat
69 return; 69 return;
70 } 70 }
71 71
72 eo_event_callback_call(obj, ECTOR_GENERIC_BUFFER_EVENT_DETACHED, pd->pixels.u8); 72 eo_event_callback_call(obj, ECTOR_BUFFER_EVENT_DETACHED, pd->pixels.u8);
73 if (!pd->nofree) 73 if (!pd->nofree)
74 { 74 {
75 free(pd->pixels.u8); 75 free(pd->pixels.u8);
@@ -79,7 +79,7 @@ _ector_software_buffer_base_pixels_clear(Eo *obj, Ector_Software_Buffer_Base_Dat
79} 79}
80 80
81EOLIAN static Eina_Bool 81EOLIAN static Eina_Bool
82_ector_software_buffer_base_ector_generic_buffer_pixels_set(Eo *obj, Ector_Software_Buffer_Base_Data *pd, 82_ector_software_buffer_base_ector_buffer_pixels_set(Eo *obj, Ector_Software_Buffer_Base_Data *pd,
83 void *pixels, int width, int height, int stride, 83 void *pixels, int width, int height, int stride,
84 Efl_Gfx_Colorspace cspace, Eina_Bool writable, 84 Efl_Gfx_Colorspace cspace, Eina_Bool writable,
85 unsigned char l, unsigned char r, 85 unsigned char l, unsigned char r,
@@ -152,7 +152,7 @@ _ector_software_buffer_base_ector_generic_buffer_pixels_set(Eo *obj, Ector_Softw
152} 152}
153 153
154EOLIAN static void * 154EOLIAN static void *
155_ector_software_buffer_base_ector_generic_buffer_map(Eo *obj EINA_UNUSED, Ector_Software_Buffer_Base_Data *pd, 155_ector_software_buffer_base_ector_buffer_map(Eo *obj EINA_UNUSED, Ector_Software_Buffer_Base_Data *pd,
156 unsigned int *length, Ector_Buffer_Access_Flag mode, 156 unsigned int *length, Ector_Buffer_Access_Flag mode,
157 unsigned int x, unsigned int y, unsigned int w, unsigned int h, 157 unsigned int x, unsigned int y, unsigned int w, unsigned int h,
158 Efl_Gfx_Colorspace cspace EINA_UNUSED, unsigned int *stride) 158 Efl_Gfx_Colorspace cspace EINA_UNUSED, unsigned int *stride)
@@ -246,7 +246,7 @@ on_fail:
246} 246}
247 247
248EOLIAN static void 248EOLIAN static void
249_ector_software_buffer_base_ector_generic_buffer_unmap(Eo *obj EINA_UNUSED, Ector_Software_Buffer_Base_Data *pd, 249_ector_software_buffer_base_ector_buffer_unmap(Eo *obj EINA_UNUSED, Ector_Software_Buffer_Base_Data *pd,
250 void *data, unsigned int length) 250 void *data, unsigned int length)
251{ 251{
252 Ector_Software_Buffer_Map *map; 252 Ector_Software_Buffer_Map *map;
@@ -302,26 +302,26 @@ _ector_software_buffer_base_ector_generic_buffer_unmap(Eo *obj EINA_UNUSED, Ecto
302} 302}
303 303
304EOLIAN static uint8_t * 304EOLIAN static uint8_t *
305_ector_software_buffer_base_ector_generic_buffer_span_get(Eo *obj, Ector_Software_Buffer_Base_Data *pd, 305_ector_software_buffer_base_ector_buffer_span_get(Eo *obj, Ector_Software_Buffer_Base_Data *pd,
306 int x, int y, unsigned int w, Efl_Gfx_Colorspace cspace, 306 int x, int y, unsigned int w, Efl_Gfx_Colorspace cspace,
307 unsigned int *length) 307 unsigned int *length)
308{ 308{
309 // ector_buffer_map 309 // ector_buffer_map
310 return _ector_software_buffer_base_ector_generic_buffer_map 310 return _ector_software_buffer_base_ector_buffer_map
311 (obj, pd, length, ECTOR_BUFFER_ACCESS_FLAG_READ, x, y, w, 1, cspace, NULL); 311 (obj, pd, length, ECTOR_BUFFER_ACCESS_FLAG_READ, x, y, w, 1, cspace, NULL);
312} 312}
313 313
314EOLIAN static void 314EOLIAN static void
315_ector_software_buffer_base_ector_generic_buffer_span_free(Eo *obj, Ector_Software_Buffer_Base_Data *pd, 315_ector_software_buffer_base_ector_buffer_span_free(Eo *obj, Ector_Software_Buffer_Base_Data *pd,
316 uint8_t *data) 316 uint8_t *data)
317{ 317{
318 // ector_buffer_unmap 318 // ector_buffer_unmap
319 return _ector_software_buffer_base_ector_generic_buffer_unmap 319 return _ector_software_buffer_base_ector_buffer_unmap
320 (obj, pd, data, (unsigned int) -1); 320 (obj, pd, data, (unsigned int) -1);
321} 321}
322 322
323EOLIAN static Ector_Buffer_Flag 323EOLIAN static Ector_Buffer_Flag
324_ector_software_buffer_base_ector_generic_buffer_flags_get(Eo *obj EINA_UNUSED, Ector_Software_Buffer_Base_Data *pd) 324_ector_software_buffer_base_ector_buffer_flags_get(Eo *obj EINA_UNUSED, Ector_Software_Buffer_Base_Data *pd)
325{ 325{
326 return ECTOR_BUFFER_FLAG_CPU_READABLE | 326 return ECTOR_BUFFER_FLAG_CPU_READABLE |
327 ECTOR_BUFFER_FLAG_DRAWABLE | 327 ECTOR_BUFFER_FLAG_DRAWABLE |
@@ -338,7 +338,7 @@ _ector_software_buffer_eo_base_constructor(Eo *obj, void *data EINA_UNUSED)
338 Ector_Software_Buffer_Base_Data *pd; 338 Ector_Software_Buffer_Base_Data *pd;
339 obj = eo_constructor(eo_super(obj, MY_CLASS)); 339 obj = eo_constructor(eo_super(obj, MY_CLASS));
340 pd = eo_data_scope_get(obj, ECTOR_SOFTWARE_BUFFER_BASE_MIXIN); 340 pd = eo_data_scope_get(obj, ECTOR_SOFTWARE_BUFFER_BASE_MIXIN);
341 pd->generic = eo_data_ref(obj, ECTOR_GENERIC_BUFFER_MIXIN); 341 pd->generic = eo_data_ref(obj, ECTOR_BUFFER_MIXIN);
342 pd->generic->eo = obj; 342 pd->generic->eo = obj;
343 return obj; 343 return obj;
344} 344}
diff --git a/src/lib/ector/software/ector_software_buffer_base.eo b/src/lib/ector/software/ector_software_buffer_base.eo
index 2ada74dc83..aa38738e84 100644
--- a/src/lib/ector/software/ector_software_buffer_base.eo
+++ b/src/lib/ector/software/ector_software_buffer_base.eo
@@ -1,4 +1,4 @@
1mixin Ector.Software.Buffer.Base (Ector.Generic.Buffer) 1mixin Ector.Software.Buffer.Base (Ector.Buffer)
2{ 2{
3 [[A buffer in Ector Software is a readable & optionally writable image]] 3 [[A buffer in Ector Software is a readable & optionally writable image]]
4 eo_prefix: ector_software_buffer; 4 eo_prefix: ector_software_buffer;
@@ -9,11 +9,11 @@ mixin Ector.Software.Buffer.Base (Ector.Generic.Buffer)
9 } 9 }
10 } 10 }
11 implements { 11 implements {
12 Ector.Generic.Buffer.flags.get; 12 Ector.Buffer.flags.get;
13 Ector.Generic.Buffer.pixels_set; 13 Ector.Buffer.pixels_set;
14 Ector.Generic.Buffer.span_get; 14 Ector.Buffer.span_get;
15 Ector.Generic.Buffer.span_free; 15 Ector.Buffer.span_free;
16 Ector.Generic.Buffer.map; 16 Ector.Buffer.map;
17 Ector.Generic.Buffer.unmap; 17 Ector.Buffer.unmap;
18 } 18 }
19} 19}
diff --git a/src/lib/ector/software/ector_software_private.h b/src/lib/ector/software/ector_software_private.h
index e13342d02d..1aa151146e 100644
--- a/src/lib/ector/software/ector_software_private.h
+++ b/src/lib/ector/software/ector_software_private.h
@@ -25,10 +25,10 @@ typedef struct _Software_Gradient_Radial_Data
25typedef struct _Ector_Renderer_Software_Gradient_Data 25typedef struct _Ector_Renderer_Software_Gradient_Data
26{ 26{
27 Ector_Software_Surface_Data *surface; 27 Ector_Software_Surface_Data *surface;
28 Ector_Renderer_Generic_Gradient_Data *gd; 28 Ector_Renderer_Gradient_Data *gd;
29 union { 29 union {
30 Ector_Renderer_Generic_Gradient_Linear_Data *gld; 30 Ector_Renderer_Gradient_Linear_Data *gld;
31 Ector_Renderer_Generic_Gradient_Radial_Data *grd; 31 Ector_Renderer_Gradient_Radial_Data *grd;
32 }; 32 };
33 union { 33 union {
34 Software_Gradient_Linear_Data linear; 34 Software_Gradient_Linear_Data linear;
diff --git a/src/lib/ector/software/ector_software_surface.c b/src/lib/ector/software/ector_software_surface.c
index f71375a72e..ab5fe90b7a 100644
--- a/src/lib/ector/software/ector_software_surface.c
+++ b/src/lib/ector/software/ector_software_surface.c
@@ -11,17 +11,17 @@
11#define MY_CLASS ECTOR_SOFTWARE_SURFACE_CLASS 11#define MY_CLASS ECTOR_SOFTWARE_SURFACE_CLASS
12 12
13static Ector_Renderer * 13static Ector_Renderer *
14_ector_software_surface_ector_generic_surface_renderer_factory_new(Eo *obj, 14_ector_software_surface_ector_surface_renderer_factory_new(Eo *obj,
15 Ector_Software_Surface_Data *pd EINA_UNUSED, 15 Ector_Software_Surface_Data *pd EINA_UNUSED,
16 const Eo_Class *type) 16 const Eo_Class *type)
17{ 17{
18 if (type == ECTOR_RENDERER_GENERIC_SHAPE_MIXIN) 18 if (type == ECTOR_RENDERER_SHAPE_MIXIN)
19 return eo_add(ECTOR_RENDERER_SOFTWARE_SHAPE_CLASS, NULL, ector_renderer_surface_set(eo_self, obj)); 19 return eo_add(ECTOR_RENDERER_SOFTWARE_SHAPE_CLASS, NULL, ector_renderer_surface_set(eo_self, obj));
20 else if (type == ECTOR_RENDERER_GENERIC_GRADIENT_LINEAR_MIXIN) 20 else if (type == ECTOR_RENDERER_GRADIENT_LINEAR_MIXIN)
21 return eo_add(ECTOR_RENDERER_SOFTWARE_GRADIENT_LINEAR_CLASS, NULL, ector_renderer_surface_set(eo_self, obj)); 21 return eo_add(ECTOR_RENDERER_SOFTWARE_GRADIENT_LINEAR_CLASS, NULL, ector_renderer_surface_set(eo_self, obj));
22 else if (type == ECTOR_RENDERER_GENERIC_GRADIENT_RADIAL_MIXIN) 22 else if (type == ECTOR_RENDERER_GRADIENT_RADIAL_MIXIN)
23 return eo_add(ECTOR_RENDERER_SOFTWARE_GRADIENT_RADIAL_CLASS, NULL, ector_renderer_surface_set(eo_self, obj)); 23 return eo_add(ECTOR_RENDERER_SOFTWARE_GRADIENT_RADIAL_CLASS, NULL, ector_renderer_surface_set(eo_self, obj));
24 else if (type == ECTOR_RENDERER_GENERIC_BUFFER_MIXIN) 24 else if (type == ECTOR_RENDERER_BUFFER_MIXIN)
25 return eo_add(ECTOR_RENDERER_SOFTWARE_BUFFER_CLASS, NULL, ector_renderer_surface_set(eo_self, obj)); 25 return eo_add(ECTOR_RENDERER_SOFTWARE_BUFFER_CLASS, NULL, ector_renderer_surface_set(eo_self, obj));
26 ERR("Couldn't find class for type: %s\n", eo_class_name_get(type)); 26 ERR("Couldn't find class for type: %s\n", eo_class_name_get(type));
27 return NULL; 27 return NULL;
@@ -48,7 +48,7 @@ _ector_software_surface_eo_base_destructor(Eo *obj, Ector_Software_Surface_Data
48} 48}
49 49
50static void 50static void
51_ector_software_surface_ector_generic_surface_reference_point_set(Eo *obj EINA_UNUSED, 51_ector_software_surface_ector_surface_reference_point_set(Eo *obj EINA_UNUSED,
52 Ector_Software_Surface_Data *pd, 52 Ector_Software_Surface_Data *pd,
53 int x, int y) 53 int x, int y)
54{ 54{
diff --git a/src/lib/ector/software/ector_software_surface.eo b/src/lib/ector/software/ector_software_surface.eo
index 34507e6549..c01adca6bd 100644
--- a/src/lib/ector/software/ector_software_surface.eo
+++ b/src/lib/ector/software/ector_software_surface.eo
@@ -1,11 +1,11 @@
1class Ector.Software.Surface (Ector.Software.Buffer, Ector.Generic.Surface) 1class Ector.Software.Surface (Ector.Software.Buffer, Ector.Surface)
2{ 2{
3 eo_prefix: ector_software_surface; 3 eo_prefix: ector_software_surface;
4 legacy_prefix: null; 4 legacy_prefix: null;
5 methods {} 5 methods {}
6 implements { 6 implements {
7 Ector.Generic.Surface.renderer_factory_new; 7 Ector.Surface.renderer_factory_new;
8 Ector.Generic.Surface.reference_point.set; 8 Ector.Surface.reference_point.set;
9 Eo.Base.destructor; 9 Eo.Base.destructor;
10 Eo.Base.constructor; 10 Eo.Base.constructor;
11 } 11 }
diff --git a/src/lib/evas/canvas/evas_vg_gradient_linear.c b/src/lib/evas/canvas/evas_vg_gradient_linear.c
index 471556f351..6fd12b2b6b 100644
--- a/src/lib/evas/canvas/evas_vg_gradient_linear.c
+++ b/src/lib/evas/canvas/evas_vg_gradient_linear.c
@@ -73,7 +73,7 @@ _efl_vg_gradient_linear_render_pre(Eo *obj,
73 73
74 if (!nd->renderer) 74 if (!nd->renderer)
75 { 75 {
76 nd->renderer = ector_surface_renderer_factory_new(s, ECTOR_RENDERER_GENERIC_GRADIENT_LINEAR_MIXIN); 76 nd->renderer = ector_surface_renderer_factory_new(s, ECTOR_RENDERER_GRADIENT_LINEAR_MIXIN);
77 } 77 }
78 78
79 ector_renderer_transformation_set(nd->renderer, current); 79 ector_renderer_transformation_set(nd->renderer, current);
diff --git a/src/lib/evas/canvas/evas_vg_gradient_radial.c b/src/lib/evas/canvas/evas_vg_gradient_radial.c
index 91e5c6509d..21cd70308f 100644
--- a/src/lib/evas/canvas/evas_vg_gradient_radial.c
+++ b/src/lib/evas/canvas/evas_vg_gradient_radial.c
@@ -89,7 +89,7 @@ _efl_vg_gradient_radial_render_pre(Eo *obj,
89 89
90 if (!nd->renderer) 90 if (!nd->renderer)
91 { 91 {
92 nd->renderer = ector_surface_renderer_factory_new(s, ECTOR_RENDERER_GENERIC_GRADIENT_RADIAL_MIXIN); 92 nd->renderer = ector_surface_renderer_factory_new(s, ECTOR_RENDERER_GRADIENT_RADIAL_MIXIN);
93 } 93 }
94 94
95 ector_renderer_transformation_set(nd->renderer, current); 95 ector_renderer_transformation_set(nd->renderer, current);
diff --git a/src/lib/evas/canvas/evas_vg_shape.c b/src/lib/evas/canvas/evas_vg_shape.c
index 0651c8ced4..527006a3b1 100644
--- a/src/lib/evas/canvas/evas_vg_shape.c
+++ b/src/lib/evas/canvas/evas_vg_shape.c
@@ -145,7 +145,7 @@ _efl_vg_shape_render_pre(Eo *obj EINA_UNUSED,
145 145
146 if (!nd->renderer) 146 if (!nd->renderer)
147 { 147 {
148 nd->renderer = ector_surface_renderer_factory_new(s, ECTOR_RENDERER_GENERIC_SHAPE_MIXIN); 148 nd->renderer = ector_surface_renderer_factory_new(s, ECTOR_RENDERER_SHAPE_MIXIN);
149 } 149 }
150 150
151 ector_renderer_transformation_set(nd->renderer, current); 151 ector_renderer_transformation_set(nd->renderer, current);
diff --git a/src/lib/evas/filters/evas_filter_private.h b/src/lib/evas/filters/evas_filter_private.h
index c4aee71fc9..5ebc981a57 100644
--- a/src/lib/evas/filters/evas_filter_private.h
+++ b/src/lib/evas/filters/evas_filter_private.h
@@ -227,7 +227,7 @@ struct _Evas_Filter_Buffer
227 227
228 Evas_Object *source; 228 Evas_Object *source;
229 Eina_Stringshare *source_name; 229 Eina_Stringshare *source_name;
230 Ector_Generic_Buffer *buffer; 230 Ector_Buffer *buffer;
231 int w, h; 231 int w, h;
232 232
233 Eina_Bool alpha_only : 1; // 1 channel (A) instead of 4 (RGBA) 233 Eina_Bool alpha_only : 1; // 1 channel (A) instead of 4 (RGBA)
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 09e6a08ef9..0c4271eef1 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
@@ -108,7 +108,7 @@ _evas_ector_gl_image_buffer_evas_ector_buffer_engine_image_get(Eo *obj EINA_UNUS
108} 108}
109 109
110EOLIAN static Ector_Buffer_Flag 110EOLIAN static Ector_Buffer_Flag
111_evas_ector_gl_image_buffer_ector_generic_buffer_flags_get(Eo *obj EINA_UNUSED, 111_evas_ector_gl_image_buffer_ector_buffer_flags_get(Eo *obj EINA_UNUSED,
112 Evas_Ector_GL_Image_Buffer_Data *pd) 112 Evas_Ector_GL_Image_Buffer_Data *pd)
113{ 113{
114 Ector_Buffer_Flag flags; 114 Ector_Buffer_Flag flags;
@@ -129,7 +129,7 @@ _evas_ector_gl_image_buffer_ector_generic_buffer_flags_get(Eo *obj EINA_UNUSED,
129} 129}
130 130
131EOLIAN static void * 131EOLIAN static void *
132_evas_ector_gl_image_buffer_ector_generic_buffer_map(Eo *obj EINA_UNUSED, Evas_Ector_GL_Image_Buffer_Data *pd, unsigned int *length, 132_evas_ector_gl_image_buffer_ector_buffer_map(Eo *obj EINA_UNUSED, Evas_Ector_GL_Image_Buffer_Data *pd, unsigned int *length,
133 Ector_Buffer_Access_Flag mode, 133 Ector_Buffer_Access_Flag mode,
134 unsigned int x, unsigned int y, unsigned int w, unsigned int h, 134 unsigned int x, unsigned int y, unsigned int w, unsigned int h,
135 Efl_Gfx_Colorspace cspace, unsigned int *stride) 135 Efl_Gfx_Colorspace cspace, unsigned int *stride)
@@ -185,7 +185,7 @@ _evas_ector_gl_image_buffer_ector_generic_buffer_map(Eo *obj EINA_UNUSED, Evas_E
185} 185}
186 186
187EOLIAN static void 187EOLIAN static void
188_evas_ector_gl_image_buffer_ector_generic_buffer_unmap(Eo *obj EINA_UNUSED, Evas_Ector_GL_Image_Buffer_Data *pd, 188_evas_ector_gl_image_buffer_ector_buffer_unmap(Eo *obj EINA_UNUSED, Evas_Ector_GL_Image_Buffer_Data *pd,
189 void *data, unsigned int length) 189 void *data, unsigned int length)
190{ 190{
191 Evas_Public_Data *e = eo_data_scope_get(pd->evas, EVAS_CANVAS_CLASS); 191 Evas_Public_Data *e = eo_data_scope_get(pd->evas, EVAS_CANVAS_CLASS);
@@ -213,19 +213,19 @@ _evas_ector_gl_image_buffer_ector_generic_buffer_unmap(Eo *obj EINA_UNUSED, Evas
213} 213}
214 214
215EOLIAN static uint8_t * 215EOLIAN static uint8_t *
216_evas_ector_gl_image_buffer_ector_generic_buffer_span_get(Eo *obj, Evas_Ector_GL_Image_Buffer_Data *pd, int x, int y, unsigned int w, 216_evas_ector_gl_image_buffer_ector_buffer_span_get(Eo *obj, Evas_Ector_GL_Image_Buffer_Data *pd, int x, int y, unsigned int w,
217 Efl_Gfx_Colorspace cspace, unsigned int *length) 217 Efl_Gfx_Colorspace cspace, unsigned int *length)
218{ 218{
219 // ector_buffer_map 219 // ector_buffer_map
220 return _evas_ector_gl_image_buffer_ector_generic_buffer_map 220 return _evas_ector_gl_image_buffer_ector_buffer_map
221 (obj, pd, length, ECTOR_BUFFER_ACCESS_FLAG_READ, x, y, w, 1, cspace, NULL); 221 (obj, pd, length, ECTOR_BUFFER_ACCESS_FLAG_READ, x, y, w, 1, cspace, NULL);
222} 222}
223 223
224EOLIAN static void 224EOLIAN static void
225_evas_ector_gl_image_buffer_ector_generic_buffer_span_free(Eo *obj, Evas_Ector_GL_Image_Buffer_Data *pd, uint8_t *data) 225_evas_ector_gl_image_buffer_ector_buffer_span_free(Eo *obj, Evas_Ector_GL_Image_Buffer_Data *pd, uint8_t *data)
226{ 226{
227 // ector_buffer_unmap 227 // ector_buffer_unmap
228 return _evas_ector_gl_image_buffer_ector_generic_buffer_unmap 228 return _evas_ector_gl_image_buffer_ector_buffer_unmap
229 (obj, pd, data, (unsigned int) -1); 229 (obj, pd, data, (unsigned int) -1);
230} 230}
231 231
@@ -235,7 +235,7 @@ _evas_ector_gl_image_buffer_eo_base_constructor(Eo *obj, Evas_Ector_GL_Image_Buf
235{ 235{
236 obj = eo_constructor(eo_super(obj, MY_CLASS)); 236 obj = eo_constructor(eo_super(obj, MY_CLASS));
237 pd->base = eo_data_ref(obj, ECTOR_GL_BUFFER_BASE_MIXIN); 237 pd->base = eo_data_ref(obj, ECTOR_GL_BUFFER_BASE_MIXIN);
238 pd->base->generic = eo_data_ref(obj, ECTOR_GENERIC_BUFFER_MIXIN); 238 pd->base->generic = eo_data_ref(obj, ECTOR_BUFFER_MIXIN);
239 pd->base->generic->eo = obj; 239 pd->base->generic->eo = obj;
240 return obj; 240 return obj;
241} 241}
diff --git a/src/modules/evas/engines/gl_generic/evas_ector_gl_image_buffer.eo b/src/modules/evas/engines/gl_generic/evas_ector_gl_image_buffer.eo
index 2eede45d15..3ea2c65a31 100644
--- a/src/modules/evas/engines/gl_generic/evas_ector_gl_image_buffer.eo
+++ b/src/modules/evas/engines/gl_generic/evas_ector_gl_image_buffer.eo
@@ -8,10 +8,10 @@ class Evas.Ector.GL.Image.Buffer (Evas.Ector.GL.Buffer, Evas.Ector.Buffer)
8 Eo.Base.destructor; 8 Eo.Base.destructor;
9 Evas.Ector.Buffer.engine_image.set; 9 Evas.Ector.Buffer.engine_image.set;
10 Evas.Ector.Buffer.engine_image.get; 10 Evas.Ector.Buffer.engine_image.get;
11 Ector.Generic.Buffer.flags.get; 11 Ector.Buffer.flags.get;
12 Ector.Generic.Buffer.span_get; 12 Ector.Buffer.span_get;
13 Ector.Generic.Buffer.span_free; 13 Ector.Buffer.span_free;
14 Ector.Generic.Buffer.map; 14 Ector.Buffer.map;
15 Ector.Generic.Buffer.unmap; 15 Ector.Buffer.unmap;
16 } 16 }
17} 17}