summaryrefslogtreecommitdiff
path: root/src/lib
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/ector/Makefile.am4
-rw-r--r--src/lib/ector/gl/Ector_GL.h2
-rw-r--r--src/lib/ector/gl/ector_renderer_gl.c (renamed from src/lib/ector/gl/ector_renderer_gl_base.c)20
-rw-r--r--src/lib/ector/gl/ector_renderer_gl.eo (renamed from src/lib/ector/gl/ector_renderer_gl_base.eo)2
-rw-r--r--src/lib/ector/gl/ector_renderer_gl_gradient_linear.c2
-rw-r--r--src/lib/ector/gl/ector_renderer_gl_gradient_linear.eo4
-rw-r--r--src/lib/ector/gl/ector_renderer_gl_gradient_radial.c2
-rw-r--r--src/lib/ector/gl/ector_renderer_gl_gradient_radial.eo4
-rw-r--r--src/lib/ector/gl/ector_renderer_gl_shape.c4
-rw-r--r--src/lib/ector/gl/ector_renderer_gl_shape.eo4
10 files changed, 24 insertions, 24 deletions
diff --git a/src/lib/ector/Makefile.am b/src/lib/ector/Makefile.am
index d41ac7cfa4..0aec2f9e6c 100644
--- a/src/lib/ector/Makefile.am
+++ b/src/lib/ector/Makefile.am
@@ -41,7 +41,7 @@ ector_eolian_files_gl = \
41 gl/ector_gl_surface.eo \ 41 gl/ector_gl_surface.eo \
42 gl/ector_gl_buffer.eo \ 42 gl/ector_gl_buffer.eo \
43 gl/ector_gl_buffer_base.eo \ 43 gl/ector_gl_buffer_base.eo \
44 gl/ector_renderer_gl_base.eo \ 44 gl/ector_renderer_gl.eo \
45 gl/ector_renderer_gl_shape.eo \ 45 gl/ector_renderer_gl_shape.eo \
46 gl/ector_renderer_gl_gradient_radial.eo \ 46 gl/ector_renderer_gl_gradient_radial.eo \
47 gl/ector_renderer_gl_gradient_linear.eo 47 gl/ector_renderer_gl_gradient_linear.eo
@@ -124,7 +124,7 @@ libector_la_SOURCES += \
124gl/ector_renderer_gl_gradient_linear.c \ 124gl/ector_renderer_gl_gradient_linear.c \
125gl/ector_renderer_gl_gradient_radial.c \ 125gl/ector_renderer_gl_gradient_radial.c \
126gl/ector_renderer_gl_shape.c \ 126gl/ector_renderer_gl_shape.c \
127gl/ector_renderer_gl_base.c \ 127gl/ector_renderer_gl.c \
128gl/ector_gl_buffer.c \ 128gl/ector_gl_buffer.c \
129gl/ector_gl_buffer_base.c \ 129gl/ector_gl_buffer_base.c \
130gl/ector_gl_surface.c \ 130gl/ector_gl_surface.c \
diff --git a/src/lib/ector/gl/Ector_GL.h b/src/lib/ector/gl/Ector_GL.h
index dc25b2a113..04d76c0af1 100644
--- a/src/lib/ector/gl/Ector_GL.h
+++ b/src/lib/ector/gl/Ector_GL.h
@@ -18,7 +18,7 @@ typedef short GLshort;
18#include "gl/ector_gl_buffer_base.eo.h" 18#include "gl/ector_gl_buffer_base.eo.h"
19#include "gl/ector_gl_buffer.eo.h" 19#include "gl/ector_gl_buffer.eo.h"
20#include "gl/ector_gl_surface.eo.h" 20#include "gl/ector_gl_surface.eo.h"
21#include "gl/ector_renderer_gl_base.eo.h" 21#include "gl/ector_renderer_gl.eo.h"
22#include "gl/ector_renderer_gl_shape.eo.h" 22#include "gl/ector_renderer_gl_shape.eo.h"
23#include "gl/ector_renderer_gl_gradient_linear.eo.h" 23#include "gl/ector_renderer_gl_gradient_linear.eo.h"
24#include "gl/ector_renderer_gl_gradient_radial.eo.h" 24#include "gl/ector_renderer_gl_gradient_radial.eo.h"
diff --git a/src/lib/ector/gl/ector_renderer_gl_base.c b/src/lib/ector/gl/ector_renderer_gl.c
index 75829cf576..0b2f43d181 100644
--- a/src/lib/ector/gl/ector_renderer_gl_base.c
+++ b/src/lib/ector/gl/ector_renderer_gl.c
@@ -9,22 +9,22 @@
9#include "ector_private.h" 9#include "ector_private.h"
10#include "ector_gl_private.h" 10#include "ector_gl_private.h"
11 11
12typedef struct _Ector_Renderer_GL_Base_Data Ector_Renderer_GL_Base_Data; 12typedef struct _Ector_Renderer_GL_Data Ector_Renderer_GL_Data;
13struct _Ector_Renderer_GL_Base_Data 13struct _Ector_Renderer_GL_Data
14{ 14{
15 Ector_Renderer_Generic_Base_Data *base; 15 Ector_Renderer_Generic_Base_Data *base;
16}; 16};
17 17
18static Eina_Bool 18static Eina_Bool
19_ector_renderer_gl_base_ector_renderer_generic_base_prepare(Eo *obj EINA_UNUSED, 19_ector_renderer_gl_ector_renderer_generic_base_prepare(Eo *obj EINA_UNUSED,
20 Ector_Renderer_GL_Base_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_base_ector_renderer_generic_base_draw(Eo *obj EINA_UNUSED, 26_ector_renderer_gl_ector_renderer_generic_base_draw(Eo *obj EINA_UNUSED,
27 Ector_Renderer_GL_Base_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,
30 unsigned int mul_col EINA_UNUSED) 30 unsigned int mul_col EINA_UNUSED)
@@ -37,9 +37,9 @@ _ector_renderer_gl_base_ector_renderer_generic_base_draw(Eo *obj EINA_UNUSED,
37} 37}
38 38
39static Eo_Base * 39static Eo_Base *
40_ector_renderer_gl_base_eo_base_constructor(Eo *obj, Ector_Renderer_GL_Base_Data *pd) 40_ector_renderer_gl_eo_base_constructor(Eo *obj, Ector_Renderer_GL_Data *pd)
41{ 41{
42 obj = eo_constructor(eo_super(obj, ECTOR_RENDERER_GL_BASE_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_GENERIC_BASE_CLASS, obj);
@@ -47,9 +47,9 @@ _ector_renderer_gl_base_eo_base_constructor(Eo *obj, Ector_Renderer_GL_Base_Data
47} 47}
48 48
49static void 49static void
50_ector_renderer_gl_base_eo_base_destructor(Eo *obj, Ector_Renderer_GL_Base_Data *pd) 50_ector_renderer_gl_eo_base_destructor(Eo *obj, Ector_Renderer_GL_Data *pd)
51{ 51{
52 eo_data_xunref(obj, pd->base, obj); 52 eo_data_xunref(obj, pd->base, obj);
53} 53}
54 54
55#include "ector_renderer_gl_base.eo.c" 55#include "ector_renderer_gl.eo.c"
diff --git a/src/lib/ector/gl/ector_renderer_gl_base.eo b/src/lib/ector/gl/ector_renderer_gl.eo
index fa1e426fa1..34d940b49f 100644
--- a/src/lib/ector/gl/ector_renderer_gl_base.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.Base (Ector.Renderer.Generic.Base) 3abstract Ector.Renderer.GL (Ector.Renderer.Generic.Base)
4{ 4{
5 legacy_prefix: null; 5 legacy_prefix: null;
6 methods { 6 methods {
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 9cc6922093..17510b9f95 100644
--- a/src/lib/ector/gl/ector_renderer_gl_gradient_linear.c
+++ b/src/lib/ector/gl/ector_renderer_gl_gradient_linear.c
@@ -52,7 +52,7 @@ _ector_renderer_gl_gradient_linear_ector_renderer_generic_base_bounds_get(Eo *ob
52} 52}
53 53
54static Eina_Bool 54static Eina_Bool
55_ector_renderer_gl_gradient_linear_ector_renderer_gl_base_fill(Eo *obj, Ector_Renderer_GL_Gradient_Linear_Data *pd, uint64_t flags, GLshort *vertex, unsigned int vertex_count, unsigned int mul_col) 55_ector_renderer_gl_gradient_linear_ector_renderer_gl_fill(Eo *obj, Ector_Renderer_GL_Gradient_Linear_Data *pd, uint64_t flags, GLshort *vertex, unsigned int vertex_count, unsigned int mul_col)
56{ 56{
57 // FIXME: The idea here is to select the right shader and push the needed parameter for it 57 // FIXME: The idea here is to select the right shader and push the needed parameter for it
58 // along with the other value 58 // along with the other value
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 dd8e364f7c..eda0d1a795 100644
--- a/src/lib/ector/gl/ector_renderer_gl_gradient_linear.eo
+++ b/src/lib/ector/gl/ector_renderer_gl_gradient_linear.eo
@@ -1,4 +1,4 @@
1class Ector.Renderer.GL.Gradient_Linear (Ector.Renderer.GL.Base, Ector.Renderer.Generic.Gradient, Ector.Renderer.Generic.Gradient_Linear) 1class Ector.Renderer.GL.Gradient_Linear (Ector.Renderer.GL, Ector.Renderer.Generic.Gradient, Ector.Renderer.Generic.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;
@@ -7,7 +7,7 @@ class Ector.Renderer.GL.Gradient_Linear (Ector.Renderer.GL.Base, Ector.Renderer.
7 Ector.Renderer.Generic.Base.draw; 7 Ector.Renderer.Generic.Base.draw;
8 Ector.Renderer.Generic.Base.bounds_get; 8 Ector.Renderer.Generic.Base.bounds_get;
9 Ector.Renderer.Generic.Base.crc.get; 9 Ector.Renderer.Generic.Base.crc.get;
10 Ector.Renderer.GL.Base.fill; 10 Ector.Renderer.GL.fill;
11 Eo.Base.constructor; 11 Eo.Base.constructor;
12 Eo.Base.destructor; 12 Eo.Base.destructor;
13 Efl.Gfx.Gradient.stop.set; 13 Efl.Gfx.Gradient.stop.set;
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 31a9752206..3716a84a8d 100644
--- a/src/lib/ector/gl/ector_renderer_gl_gradient_radial.c
+++ b/src/lib/ector/gl/ector_renderer_gl_gradient_radial.c
@@ -39,7 +39,7 @@ _ector_renderer_gl_gradient_radial_ector_renderer_generic_base_draw(Eo *obj, Ect
39} 39}
40 40
41static Eina_Bool 41static Eina_Bool
42_ector_renderer_gl_gradient_radial_ector_renderer_gl_base_fill(Eo *obj, Ector_Renderer_GL_Gradient_Radial_Data *pd, uint64_t flags, GLshort *vertex, unsigned int vertex_count, unsigned int mul_col) 42_ector_renderer_gl_gradient_radial_ector_renderer_gl_fill(Eo *obj, Ector_Renderer_GL_Gradient_Radial_Data *pd, uint64_t flags, GLshort *vertex, unsigned int vertex_count, unsigned int mul_col)
43{ 43{
44 // FIXME: The idea here is to select the right shader and push the needed parameter for it 44 // FIXME: The idea here is to select the right shader and push the needed parameter for it
45 // along with the other value 45 // along with the other value
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 5ece08456f..d57a973807 100644
--- a/src/lib/ector/gl/ector_renderer_gl_gradient_radial.eo
+++ b/src/lib/ector/gl/ector_renderer_gl_gradient_radial.eo
@@ -1,4 +1,4 @@
1class Ector.Renderer.GL.Gradient_Radial (Ector.Renderer.GL.Base, Ector.Renderer.Generic.Gradient, Ector.Renderer.Generic.Gradient_Radial) 1class Ector.Renderer.GL.Gradient_Radial (Ector.Renderer.GL, Ector.Renderer.Generic.Gradient, Ector.Renderer.Generic.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;
@@ -7,7 +7,7 @@ class Ector.Renderer.GL.Gradient_Radial (Ector.Renderer.GL.Base, Ector.Renderer.
7 Ector.Renderer.Generic.Base.draw; 7 Ector.Renderer.Generic.Base.draw;
8 Ector.Renderer.Generic.Base.bounds_get; 8 Ector.Renderer.Generic.Base.bounds_get;
9 Ector.Renderer.Generic.Base.crc.get; 9 Ector.Renderer.Generic.Base.crc.get;
10 Ector.Renderer.GL.Base.fill; 10 Ector.Renderer.GL.fill;
11 Eo.Base.constructor; 11 Eo.Base.constructor;
12 Eo.Base.destructor; 12 Eo.Base.destructor;
13 Efl.Gfx.Gradient.stop.set; 13 Efl.Gfx.Gradient.stop.set;
diff --git a/src/lib/ector/gl/ector_renderer_gl_shape.c b/src/lib/ector/gl/ector_renderer_gl_shape.c
index 59aaadf057..4fcac48dd6 100644
--- a/src/lib/ector/gl/ector_renderer_gl_shape.c
+++ b/src/lib/ector/gl/ector_renderer_gl_shape.c
@@ -82,7 +82,7 @@ _ector_renderer_gl_shape_ector_renderer_generic_base_draw(Eo *obj, Ector_Rendere
82 82
83 if (pd->shape->fill) 83 if (pd->shape->fill)
84 { 84 {
85 ector_renderer_gl_base_fill(pd->shape->fill, flags, pd->vertex, 6, mul_col); 85 ector_renderer_gl_fill(pd->shape->fill, flags, pd->vertex, 6, mul_col);
86 } 86 }
87 else 87 else
88 { 88 {
@@ -93,7 +93,7 @@ _ector_renderer_gl_shape_ector_renderer_generic_base_draw(Eo *obj, Ector_Rendere
93} 93}
94 94
95static Eina_Bool 95static Eina_Bool
96_ector_renderer_gl_shape_ector_renderer_gl_base_fill(Eo *obj EINA_UNUSED, 96_ector_renderer_gl_shape_ector_renderer_gl_fill(Eo *obj EINA_UNUSED,
97 Ector_Renderer_GL_Shape_Data *pd EINA_UNUSED, 97 Ector_Renderer_GL_Shape_Data *pd EINA_UNUSED,
98 uint64_t flags EINA_UNUSED, 98 uint64_t flags EINA_UNUSED,
99 GLshort *vertex EINA_UNUSED, 99 GLshort *vertex EINA_UNUSED,
diff --git a/src/lib/ector/gl/ector_renderer_gl_shape.eo b/src/lib/ector/gl/ector_renderer_gl_shape.eo
index 46d6a5e23b..ba75b51aa9 100644
--- a/src/lib/ector/gl/ector_renderer_gl_shape.eo
+++ b/src/lib/ector/gl/ector_renderer_gl_shape.eo
@@ -1,4 +1,4 @@
1class Ector.Renderer.GL.Shape (Ector.Renderer.GL.Base, Ector.Renderer.Generic.Shape) 1class Ector.Renderer.GL.Shape (Ector.Renderer.GL, Ector.Renderer.Generic.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;
@@ -7,7 +7,7 @@ class Ector.Renderer.GL.Shape (Ector.Renderer.GL.Base, Ector.Renderer.Generic.Sh
7 Ector.Renderer.Generic.Base.draw; 7 Ector.Renderer.Generic.Base.draw;
8 Ector.Renderer.Generic.Base.bounds_get; 8 Ector.Renderer.Generic.Base.bounds_get;
9 Ector.Renderer.Generic.Base.crc.get; 9 Ector.Renderer.Generic.Base.crc.get;
10 Ector.Renderer.GL.Base.fill; 10 Ector.Renderer.GL.fill;
11 Eo.Base.constructor; 11 Eo.Base.constructor;
12 Eo.Base.destructor; 12 Eo.Base.destructor;
13 } 13 }