summaryrefslogtreecommitdiff
path: root/src/lib/ector/gl
diff options
context:
space:
mode:
authorMike Blumenkrantz <zmike@osg.samsung.com>2018-02-12 13:23:25 -0500
committerMike Blumenkrantz <zmike@osg.samsung.com>2018-02-12 13:47:15 -0500
commit11d5bac1d3d9cf9655eb0b7c086e80d77a487563 (patch)
tree33d2eeb8b438dcc64e667449da223a639be23a22 /src/lib/ector/gl
parentadc2be188c2c40e4f3faa72e36e599e249aa9dce (diff)
ector: fix property/method name conflict for "fill"
Shape implements a property, sw/gl/cairo implements a method rename method to op_fill
Diffstat (limited to 'src/lib/ector/gl')
-rw-r--r--src/lib/ector/gl/ector_renderer_gl.eo2
-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.eo2
-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.eo2
-rw-r--r--src/lib/ector/gl/ector_renderer_gl_shape.c4
-rw-r--r--src/lib/ector/gl/ector_renderer_gl_shape.eo2
7 files changed, 8 insertions, 8 deletions
diff --git a/src/lib/ector/gl/ector_renderer_gl.eo b/src/lib/ector/gl/ector_renderer_gl.eo
index 18b305b8ab..97941d28c2 100644
--- a/src/lib/ector/gl/ector_renderer_gl.eo
+++ b/src/lib/ector/gl/ector_renderer_gl.eo
@@ -4,7 +4,7 @@ abstract Ector.Renderer.GL (Ector.Renderer)
4{ 4{
5 [[Ector GL renderer abstract class]] 5 [[Ector GL renderer abstract class]]
6 methods { 6 methods {
7 fill @pure_virtual { 7 op_fill @pure_virtual {
8 [[Fill operation]] 8 [[Fill operation]]
9 return: bool; [[$true on success, $false otherwise]] 9 return: bool; [[$true on success, $false otherwise]]
10 params { 10 params {
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 87c5594b88..8856e7a84d 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_bounds_get(Eo *obj EINA_UNUSED
52} 52}
53 53
54static Eina_Bool 54static Eina_Bool
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) 55_ector_renderer_gl_gradient_linear_ector_renderer_gl_op_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 33b1389b40..053c8c1af9 100644
--- a/src/lib/ector/gl/ector_renderer_gl_gradient_linear.eo
+++ b/src/lib/ector/gl/ector_renderer_gl_gradient_linear.eo
@@ -7,7 +7,7 @@ class Ector.Renderer.GL.Gradient.Linear (Ector.Renderer.GL, Ector.Renderer.Gradi
7 Ector.Renderer.draw; 7 Ector.Renderer.draw;
8 Ector.Renderer.bounds_get; 8 Ector.Renderer.bounds_get;
9 Ector.Renderer.crc { get; } 9 Ector.Renderer.crc { get; }
10 Ector.Renderer.GL.fill; 10 Ector.Renderer.GL.op_fill;
11 Efl.Object.constructor; 11 Efl.Object.constructor;
12 Efl.Object.destructor; 12 Efl.Object.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 827b120600..8d00558e21 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_draw(Eo *obj, Ector_Renderer_G
39} 39}
40 40
41static Eina_Bool 41static Eina_Bool
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) 42_ector_renderer_gl_gradient_radial_ector_renderer_gl_op_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 47bfb400eb..240d73628f 100644
--- a/src/lib/ector/gl/ector_renderer_gl_gradient_radial.eo
+++ b/src/lib/ector/gl/ector_renderer_gl_gradient_radial.eo
@@ -7,7 +7,7 @@ class Ector.Renderer.GL.Gradient.Radial (Ector.Renderer.GL, Ector.Renderer.Gradi
7 Ector.Renderer.draw; 7 Ector.Renderer.draw;
8 Ector.Renderer.bounds_get; 8 Ector.Renderer.bounds_get;
9 Ector.Renderer.crc { get; } 9 Ector.Renderer.crc { get; }
10 Ector.Renderer.GL.fill; 10 Ector.Renderer.GL.op_fill;
11 Efl.Object.constructor; 11 Efl.Object.constructor;
12 Efl.Object.destructor; 12 Efl.Object.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 ecf78faec1..7e595687d5 100644
--- a/src/lib/ector/gl/ector_renderer_gl_shape.c
+++ b/src/lib/ector/gl/ector_renderer_gl_shape.c
@@ -85,7 +85,7 @@ _ector_renderer_gl_shape_ector_renderer_draw(Eo *obj, Ector_Renderer_GL_Shape_Da
85 85
86 if (pd->shape->fill) 86 if (pd->shape->fill)
87 { 87 {
88 ector_renderer_gl_fill(pd->shape->fill, flags, pd->vertex, 6, mul_col); 88 ector_renderer_gl_op_fill(pd->shape->fill, flags, pd->vertex, 6, mul_col);
89 } 89 }
90 else 90 else
91 { 91 {
@@ -96,7 +96,7 @@ _ector_renderer_gl_shape_ector_renderer_draw(Eo *obj, Ector_Renderer_GL_Shape_Da
96} 96}
97 97
98static Eina_Bool 98static Eina_Bool
99_ector_renderer_gl_shape_ector_renderer_gl_fill(Eo *obj EINA_UNUSED, 99_ector_renderer_gl_shape_ector_renderer_gl_op_fill(Eo *obj EINA_UNUSED,
100 Ector_Renderer_GL_Shape_Data *pd EINA_UNUSED, 100 Ector_Renderer_GL_Shape_Data *pd EINA_UNUSED,
101 uint64_t flags EINA_UNUSED, 101 uint64_t flags EINA_UNUSED,
102 GLshort *vertex EINA_UNUSED, 102 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 f3882e1315..7b99724dcf 100644
--- a/src/lib/ector/gl/ector_renderer_gl_shape.eo
+++ b/src/lib/ector/gl/ector_renderer_gl_shape.eo
@@ -7,7 +7,7 @@ class Ector.Renderer.GL.Shape (Ector.Renderer.GL, Ector.Renderer.Shape)
7 Ector.Renderer.draw; 7 Ector.Renderer.draw;
8 Ector.Renderer.bounds_get; 8 Ector.Renderer.bounds_get;
9 Ector.Renderer.crc { get; } 9 Ector.Renderer.crc { get; }
10 Ector.Renderer.GL.fill; 10 Ector.Renderer.GL.op_fill;
11 Efl.Object.constructor; 11 Efl.Object.constructor;
12 Efl.Object.destructor; 12 Efl.Object.destructor;
13 } 13 }