From 9f15b9fbe70e9bd99774a3129843b030f8d1f5d6 Mon Sep 17 00:00:00 2001 From: Tom Hacohen Date: Wed, 11 May 2016 12:33:30 +0100 Subject: [PATCH] Ector renderer gl: Remove the no longer needed .Base hack. --- src/Makefile_Ector.am | 4 ++-- src/lib/ector/Makefile.am | 4 ++-- src/lib/ector/gl/Ector_GL.h | 2 +- ...{ector_renderer_gl_base.c => ector_renderer_gl.c} | 20 ++++++++++---------- ...ctor_renderer_gl_base.eo => ector_renderer_gl.eo} | 2 +- src/lib/ector/gl/ector_renderer_gl_gradient_linear.c | 2 +- .../ector/gl/ector_renderer_gl_gradient_linear.eo | 4 ++-- src/lib/ector/gl/ector_renderer_gl_gradient_radial.c | 2 +- .../ector/gl/ector_renderer_gl_gradient_radial.eo | 4 ++-- src/lib/ector/gl/ector_renderer_gl_shape.c | 4 ++-- src/lib/ector/gl/ector_renderer_gl_shape.eo | 4 ++-- 11 files changed, 26 insertions(+), 26 deletions(-) rename src/lib/ector/gl/{ector_renderer_gl_base.c => ector_renderer_gl.c} (60%) rename src/lib/ector/gl/{ector_renderer_gl_base.eo => ector_renderer_gl.eo} (86%) diff --git a/src/Makefile_Ector.am b/src/Makefile_Ector.am index a07a442..e0652c5 100644 --- a/src/Makefile_Ector.am +++ b/src/Makefile_Ector.am @@ -38,7 +38,7 @@ ector_eolian_files_gl = \ lib/ector/gl/ector_gl_surface.eo \ lib/ector/gl/ector_gl_buffer.eo \ lib/ector/gl/ector_gl_buffer_base.eo \ - lib/ector/gl/ector_renderer_gl_base.eo \ + lib/ector/gl/ector_renderer_gl.eo \ lib/ector/gl/ector_renderer_gl_shape.eo \ lib/ector/gl/ector_renderer_gl_gradient_radial.eo \ lib/ector/gl/ector_renderer_gl_gradient_linear.eo @@ -135,7 +135,7 @@ lib_ector_libector_la_SOURCES += \ lib/ector/gl/ector_renderer_gl_gradient_linear.c \ lib/ector/gl/ector_renderer_gl_gradient_radial.c \ lib/ector/gl/ector_renderer_gl_shape.c \ -lib/ector/gl/ector_renderer_gl_base.c \ +lib/ector/gl/ector_renderer_gl.c \ lib/ector/gl/ector_gl_buffer.c \ lib/ector/gl/ector_gl_buffer_base.c \ lib/ector/gl/ector_gl_surface.c \ diff --git a/src/lib/ector/Makefile.am b/src/lib/ector/Makefile.am index d41ac7c..0aec2f9 100644 --- a/src/lib/ector/Makefile.am +++ b/src/lib/ector/Makefile.am @@ -41,7 +41,7 @@ ector_eolian_files_gl = \ gl/ector_gl_surface.eo \ gl/ector_gl_buffer.eo \ gl/ector_gl_buffer_base.eo \ - gl/ector_renderer_gl_base.eo \ + gl/ector_renderer_gl.eo \ gl/ector_renderer_gl_shape.eo \ gl/ector_renderer_gl_gradient_radial.eo \ gl/ector_renderer_gl_gradient_linear.eo @@ -124,7 +124,7 @@ libector_la_SOURCES += \ gl/ector_renderer_gl_gradient_linear.c \ gl/ector_renderer_gl_gradient_radial.c \ gl/ector_renderer_gl_shape.c \ -gl/ector_renderer_gl_base.c \ +gl/ector_renderer_gl.c \ gl/ector_gl_buffer.c \ gl/ector_gl_buffer_base.c \ gl/ector_gl_surface.c \ diff --git a/src/lib/ector/gl/Ector_GL.h b/src/lib/ector/gl/Ector_GL.h index dc25b2a..04d76c0 100644 --- a/src/lib/ector/gl/Ector_GL.h +++ b/src/lib/ector/gl/Ector_GL.h @@ -18,7 +18,7 @@ typedef short GLshort; #include "gl/ector_gl_buffer_base.eo.h" #include "gl/ector_gl_buffer.eo.h" #include "gl/ector_gl_surface.eo.h" -#include "gl/ector_renderer_gl_base.eo.h" +#include "gl/ector_renderer_gl.eo.h" #include "gl/ector_renderer_gl_shape.eo.h" #include "gl/ector_renderer_gl_gradient_linear.eo.h" #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 similarity index 60% rename from src/lib/ector/gl/ector_renderer_gl_base.c rename to src/lib/ector/gl/ector_renderer_gl.c index 75829cf..0b2f43d 100644 --- a/src/lib/ector/gl/ector_renderer_gl_base.c +++ b/src/lib/ector/gl/ector_renderer_gl.c @@ -9,22 +9,22 @@ #include "ector_private.h" #include "ector_gl_private.h" -typedef struct _Ector_Renderer_GL_Base_Data Ector_Renderer_GL_Base_Data; -struct _Ector_Renderer_GL_Base_Data +typedef struct _Ector_Renderer_GL_Data Ector_Renderer_GL_Data; +struct _Ector_Renderer_GL_Data { Ector_Renderer_Generic_Base_Data *base; }; static Eina_Bool -_ector_renderer_gl_base_ector_renderer_generic_base_prepare(Eo *obj EINA_UNUSED, - Ector_Renderer_GL_Base_Data *pd EINA_UNUSED) +_ector_renderer_gl_ector_renderer_generic_base_prepare(Eo *obj EINA_UNUSED, + Ector_Renderer_GL_Data *pd EINA_UNUSED) { return EINA_TRUE; } static Eina_Bool -_ector_renderer_gl_base_ector_renderer_generic_base_draw(Eo *obj EINA_UNUSED, - Ector_Renderer_GL_Base_Data *pd, +_ector_renderer_gl_ector_renderer_generic_base_draw(Eo *obj EINA_UNUSED, + Ector_Renderer_GL_Data *pd, Efl_Gfx_Render_Op op, Eina_Array *clips, unsigned int mul_col EINA_UNUSED) @@ -37,9 +37,9 @@ _ector_renderer_gl_base_ector_renderer_generic_base_draw(Eo *obj EINA_UNUSED, } static Eo_Base * -_ector_renderer_gl_base_eo_base_constructor(Eo *obj, Ector_Renderer_GL_Base_Data *pd) +_ector_renderer_gl_eo_base_constructor(Eo *obj, Ector_Renderer_GL_Data *pd) { - obj = eo_constructor(eo_super(obj, ECTOR_RENDERER_GL_BASE_CLASS)); + obj = eo_constructor(eo_super(obj, ECTOR_RENDERER_GL_CLASS)); if (!obj) return NULL; 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 } static void -_ector_renderer_gl_base_eo_base_destructor(Eo *obj, Ector_Renderer_GL_Base_Data *pd) +_ector_renderer_gl_eo_base_destructor(Eo *obj, Ector_Renderer_GL_Data *pd) { eo_data_xunref(obj, pd->base, obj); } -#include "ector_renderer_gl_base.eo.c" +#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 similarity index 86% rename from src/lib/ector/gl/ector_renderer_gl_base.eo rename to src/lib/ector/gl/ector_renderer_gl.eo index fa1e426..34d940b 100644 --- a/src/lib/ector/gl/ector_renderer_gl_base.eo +++ b/src/lib/ector/gl/ector_renderer_gl.eo @@ -1,6 +1,6 @@ import ector_types; -abstract Ector.Renderer.GL.Base (Ector.Renderer.Generic.Base) +abstract Ector.Renderer.GL (Ector.Renderer.Generic.Base) { legacy_prefix: null; 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 9cc6922..17510b9 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 } static Eina_Bool -_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) +_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) { // FIXME: The idea here is to select the right shader and push the needed parameter for it // 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 dd8e364..eda0d1a 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 @@ -class Ector.Renderer.GL.Gradient_Linear (Ector.Renderer.GL.Base, Ector.Renderer.Generic.Gradient, Ector.Renderer.Generic.Gradient_Linear) +class Ector.Renderer.GL.Gradient_Linear (Ector.Renderer.GL, Ector.Renderer.Generic.Gradient, Ector.Renderer.Generic.Gradient_Linear) { eo_prefix: ector_renderer_gl_gradient_linear; legacy_prefix: null; @@ -7,7 +7,7 @@ class Ector.Renderer.GL.Gradient_Linear (Ector.Renderer.GL.Base, Ector.Renderer. Ector.Renderer.Generic.Base.draw; Ector.Renderer.Generic.Base.bounds_get; Ector.Renderer.Generic.Base.crc.get; - Ector.Renderer.GL.Base.fill; + Ector.Renderer.GL.fill; Eo.Base.constructor; Eo.Base.destructor; 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 31a9752..3716a84 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 } static Eina_Bool -_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) +_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) { // FIXME: The idea here is to select the right shader and push the needed parameter for it // 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 5ece084..d57a973 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 @@ -class Ector.Renderer.GL.Gradient_Radial (Ector.Renderer.GL.Base, Ector.Renderer.Generic.Gradient, Ector.Renderer.Generic.Gradient_Radial) +class Ector.Renderer.GL.Gradient_Radial (Ector.Renderer.GL, Ector.Renderer.Generic.Gradient, Ector.Renderer.Generic.Gradient_Radial) { eo_prefix: ector_renderer_gl_gradient_radial; legacy_prefix: null; @@ -7,7 +7,7 @@ class Ector.Renderer.GL.Gradient_Radial (Ector.Renderer.GL.Base, Ector.Renderer. Ector.Renderer.Generic.Base.draw; Ector.Renderer.Generic.Base.bounds_get; Ector.Renderer.Generic.Base.crc.get; - Ector.Renderer.GL.Base.fill; + Ector.Renderer.GL.fill; Eo.Base.constructor; Eo.Base.destructor; 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 59aaadf..4fcac48 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 if (pd->shape->fill) { - ector_renderer_gl_base_fill(pd->shape->fill, flags, pd->vertex, 6, mul_col); + ector_renderer_gl_fill(pd->shape->fill, flags, pd->vertex, 6, mul_col); } else { @@ -93,7 +93,7 @@ _ector_renderer_gl_shape_ector_renderer_generic_base_draw(Eo *obj, Ector_Rendere } static Eina_Bool -_ector_renderer_gl_shape_ector_renderer_gl_base_fill(Eo *obj EINA_UNUSED, +_ector_renderer_gl_shape_ector_renderer_gl_fill(Eo *obj EINA_UNUSED, Ector_Renderer_GL_Shape_Data *pd EINA_UNUSED, uint64_t flags EINA_UNUSED, 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 46d6a5e..ba75b51 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 @@ -class Ector.Renderer.GL.Shape (Ector.Renderer.GL.Base, Ector.Renderer.Generic.Shape) +class Ector.Renderer.GL.Shape (Ector.Renderer.GL, Ector.Renderer.Generic.Shape) { eo_prefix: ector_renderer_gl_shape; legacy_prefix: null; @@ -7,7 +7,7 @@ class Ector.Renderer.GL.Shape (Ector.Renderer.GL.Base, Ector.Renderer.Generic.Sh Ector.Renderer.Generic.Base.draw; Ector.Renderer.Generic.Base.bounds_get; Ector.Renderer.Generic.Base.crc.get; - Ector.Renderer.GL.Base.fill; + Ector.Renderer.GL.fill; Eo.Base.constructor; Eo.Base.destructor; } -- 2.7.4