tasn pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=718033886ac819134a93c049f6225b157921d9b9
commit 718033886ac819134a93c049f6225b157921d9b9 Author: Tom Hacohen <[email protected]> Date: Wed May 11 12:23:57 2016 +0100 Ector renderer software: Remove the no longer needed .Base hack. --- src/Makefile_Ector.am | 2 +- src/lib/ector/Makefile.am | 2 +- src/lib/ector/software/Ector_Software.h | 2 +- .../{ector_renderer_software_base.eo => ector_renderer_software.eo} | 2 +- src/lib/ector/software/ector_renderer_software_buffer.c | 2 +- src/lib/ector/software/ector_renderer_software_buffer.eo | 4 ++-- src/lib/ector/software/ector_renderer_software_gradient_linear.c | 2 +- src/lib/ector/software/ector_renderer_software_gradient_linear.eo | 4 ++-- src/lib/ector/software/ector_renderer_software_gradient_radial.c | 2 +- src/lib/ector/software/ector_renderer_software_gradient_radial.eo | 4 ++-- src/lib/ector/software/ector_renderer_software_shape.c | 6 +++--- src/lib/ector/software/ector_renderer_software_shape.eo | 4 ++-- src/lib/ector/software/ector_software_surface.c | 2 +- 13 files changed, 19 insertions(+), 19 deletions(-) diff --git a/src/Makefile_Ector.am b/src/Makefile_Ector.am index 5de305d..a07a442 100644 --- a/src/Makefile_Ector.am +++ b/src/Makefile_Ector.am @@ -26,7 +26,7 @@ ector_eolian_files_software = \ lib/ector/software/ector_software_surface.eo \ lib/ector/software/ector_software_buffer.eo \ lib/ector/software/ector_software_buffer_base.eo \ - lib/ector/software/ector_renderer_software_base.eo \ + lib/ector/software/ector_renderer_software.eo \ lib/ector/software/ector_renderer_software_shape.eo \ lib/ector/software/ector_renderer_software_buffer.eo \ lib/ector/software/ector_renderer_software_gradient_radial.eo \ diff --git a/src/lib/ector/Makefile.am b/src/lib/ector/Makefile.am index 278f049..d41ac7c 100644 --- a/src/lib/ector/Makefile.am +++ b/src/lib/ector/Makefile.am @@ -29,7 +29,7 @@ ector_eolian_files_software = \ software/ector_software_surface.eo \ software/ector_software_buffer.eo \ software/ector_software_buffer_base.eo \ - software/ector_renderer_software_base.eo \ + software/ector_renderer_software.eo \ software/ector_renderer_software_shape.eo \ software/ector_renderer_software_buffer.eo \ software/ector_renderer_software_gradient_radial.eo \ diff --git a/src/lib/ector/software/Ector_Software.h b/src/lib/ector/software/Ector_Software.h index 66e31de..f53526c 100644 --- a/src/lib/ector/software/Ector_Software.h +++ b/src/lib/ector/software/Ector_Software.h @@ -8,7 +8,7 @@ #include "software/ector_software_surface.eo.h" #include "software/ector_software_buffer.eo.h" #include "software/ector_software_buffer_base.eo.h" -#include "software/ector_renderer_software_base.eo.h" +#include "software/ector_renderer_software.eo.h" #include "software/ector_renderer_software_shape.eo.h" #include "software/ector_renderer_software_buffer.eo.h" #include "software/ector_renderer_software_gradient_linear.eo.h" diff --git a/src/lib/ector/software/ector_renderer_software_base.eo b/src/lib/ector/software/ector_renderer_software.eo similarity index 69% rename from src/lib/ector/software/ector_renderer_software_base.eo rename to src/lib/ector/software/ector_renderer_software.eo index 19061e3..fe8c02c 100644 --- a/src/lib/ector/software/ector_renderer_software_base.eo +++ b/src/lib/ector/software/ector_renderer_software.eo @@ -1,4 +1,4 @@ -class Ector.Renderer.Software.Base (Ector.Renderer.Generic.Base) +class Ector.Renderer.Software (Ector.Renderer.Generic.Base) { legacy_prefix: null; 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 d07c197..f5af5a7 100644 --- a/src/lib/ector/software/ector_renderer_software_buffer.c +++ b/src/lib/ector/software/ector_renderer_software_buffer.c @@ -32,7 +32,7 @@ _ector_renderer_software_buffer_buffer_get(Eo *obj EINA_UNUSED, Ector_Renderer_S } EOLIAN static Eina_Bool -_ector_renderer_software_buffer_ector_renderer_software_base_fill(Eo *obj, Ector_Renderer_Software_Buffer_Data *pd) +_ector_renderer_software_buffer_ector_renderer_software_fill(Eo *obj, Ector_Renderer_Software_Buffer_Data *pd) { Ector_Software_Buffer *buffer = eo_data_scope_get(obj, ECTOR_SOFTWARE_BUFFER_BASE_MIXIN); ector_software_rasterizer_buffer_set(pd->surface, buffer); diff --git a/src/lib/ector/software/ector_renderer_software_buffer.eo b/src/lib/ector/software/ector_renderer_software_buffer.eo index e7f2207..3a17c56 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 @@ -class Ector.Renderer.Software.Buffer (Ector.Renderer.Software.Base, Ector.Renderer.Generic.Buffer) +class Ector.Renderer.Software.Buffer (Ector.Renderer.Software, Ector.Renderer.Generic.Buffer) { legacy_prefix: null; methods { @@ -13,7 +13,7 @@ class Ector.Renderer.Software.Buffer (Ector.Renderer.Software.Base, Ector.Render implements { Ector.Renderer.Generic.Base.prepare; Ector.Renderer.Generic.Base.crc.get; - Ector.Renderer.Software.Base.fill; + Ector.Renderer.Software.fill; Eo.Base.destructor; } } 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 368c56d..9428366 100644 --- a/src/lib/ector/software/ector_renderer_software_gradient_linear.c +++ b/src/lib/ector/software/ector_renderer_software_gradient_linear.c @@ -54,7 +54,7 @@ _ector_renderer_software_gradient_linear_ector_renderer_generic_base_draw(Eo *ob } static Eina_Bool -_ector_renderer_software_gradient_linear_ector_renderer_software_base_fill(Eo *obj EINA_UNUSED, +_ector_renderer_software_gradient_linear_ector_renderer_software_fill(Eo *obj EINA_UNUSED, Ector_Renderer_Software_Gradient_Data *pd) { ector_software_rasterizer_linear_gradient_set(pd->surface->rasterizer, pd); 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 2f4063f..1f52a44 100644 --- a/src/lib/ector/software/ector_renderer_software_gradient_linear.eo +++ b/src/lib/ector/software/ector_renderer_software_gradient_linear.eo @@ -1,4 +1,4 @@ -class Ector.Renderer.Software.Gradient_Linear (Ector.Renderer.Software.Base, Ector.Renderer.Generic.Gradient, Ector.Renderer.Generic.Gradient_Linear) +class Ector.Renderer.Software.Gradient_Linear (Ector.Renderer.Software, Ector.Renderer.Generic.Gradient, Ector.Renderer.Generic.Gradient_Linear) { eo_prefix: ector_renderer_software_gradient_linear; legacy_prefix: null; @@ -7,7 +7,7 @@ class Ector.Renderer.Software.Gradient_Linear (Ector.Renderer.Software.Base, Ect Ector.Renderer.Generic.Base.prepare; Ector.Renderer.Generic.Base.draw; Ector.Renderer.Generic.Base.crc.get; - Ector.Renderer.Software.Base.fill; + Ector.Renderer.Software.fill; Eo.Base.constructor; Eo.Base.destructor; Efl.Gfx.Gradient.stop.set; 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 ee72a5f..1d164e6 100644 --- a/src/lib/ector/software/ector_renderer_software_gradient_radial.c +++ b/src/lib/ector/software/ector_renderer_software_gradient_radial.c @@ -66,7 +66,7 @@ _ector_renderer_software_gradient_radial_ector_renderer_generic_base_draw(Eo *ob // Clearly duplicated and should be in a common place... static Eina_Bool -_ector_renderer_software_gradient_radial_ector_renderer_software_base_fill(Eo *obj EINA_UNUSED, Ector_Renderer_Software_Gradient_Data *pd) +_ector_renderer_software_gradient_radial_ector_renderer_software_fill(Eo *obj EINA_UNUSED, Ector_Renderer_Software_Gradient_Data *pd) { ector_software_rasterizer_radial_gradient_set(pd->surface->rasterizer, pd); return EINA_TRUE; 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 6a3cb64..6590a39 100644 --- a/src/lib/ector/software/ector_renderer_software_gradient_radial.eo +++ b/src/lib/ector/software/ector_renderer_software_gradient_radial.eo @@ -1,4 +1,4 @@ -class Ector.Renderer.Software.Gradient_Radial (Ector.Renderer.Software.Base, Ector.Renderer.Generic.Gradient, Ector.Renderer.Generic.Gradient_Radial) +class Ector.Renderer.Software.Gradient_Radial (Ector.Renderer.Software, Ector.Renderer.Generic.Gradient, Ector.Renderer.Generic.Gradient_Radial) { eo_prefix: ector_renderer_software_gradient_radial; legacy_prefix: null; @@ -7,7 +7,7 @@ class Ector.Renderer.Software.Gradient_Radial (Ector.Renderer.Software.Base, Ect Ector.Renderer.Generic.Base.prepare; Ector.Renderer.Generic.Base.draw; Ector.Renderer.Generic.Base.crc.get; - Ector.Renderer.Software.Base.fill; + Ector.Renderer.Software.fill; Eo.Base.constructor; Eo.Base.destructor; Efl.Gfx.Gradient.stop.set; diff --git a/src/lib/ector/software/ector_renderer_software_shape.c b/src/lib/ector/software/ector_renderer_software_shape.c index 978ccaa..78e9815 100644 --- a/src/lib/ector/software/ector_renderer_software_shape.c +++ b/src/lib/ector/software/ector_renderer_software_shape.c @@ -610,7 +610,7 @@ _ector_renderer_software_shape_ector_renderer_generic_base_draw(Eo *obj, if (pd->shape->fill) { - ector_renderer_software_base_fill(pd->shape->fill); + ector_renderer_software_fill(pd->shape->fill); ector_software_rasterizer_draw_rle_data(pd->surface->rasterizer, x, y, mul_col, op, pd->shape_data); @@ -632,7 +632,7 @@ _ector_renderer_software_shape_ector_renderer_generic_base_draw(Eo *obj, if (pd->shape->stroke.fill) { - ector_renderer_software_base_fill(pd->shape->stroke.fill); + ector_renderer_software_fill(pd->shape->stroke.fill); ector_software_rasterizer_draw_rle_data(pd->surface->rasterizer, x, y, mul_col, op, pd->outline_data); @@ -656,7 +656,7 @@ _ector_renderer_software_shape_ector_renderer_generic_base_draw(Eo *obj, } static Eina_Bool -_ector_renderer_software_shape_ector_renderer_software_base_fill(Eo *obj EINA_UNUSED, +_ector_renderer_software_shape_ector_renderer_software_fill(Eo *obj EINA_UNUSED, Ector_Renderer_Software_Shape_Data *pd EINA_UNUSED) { // FIXME: let's find out how to fill a shape with a shape later. diff --git a/src/lib/ector/software/ector_renderer_software_shape.eo b/src/lib/ector/software/ector_renderer_software_shape.eo index 017a9cc..e7a69aa 100644 --- a/src/lib/ector/software/ector_renderer_software_shape.eo +++ b/src/lib/ector/software/ector_renderer_software_shape.eo @@ -1,11 +1,11 @@ -class Ector.Renderer.Software.Shape (Ector.Renderer.Software.Base, Ector.Renderer.Generic.Shape) +class Ector.Renderer.Software.Shape (Ector.Renderer.Software, Ector.Renderer.Generic.Shape) { eo_prefix: ector_renderer_software_shape; legacy_prefix: null; implements { Ector.Renderer.Generic.Base.prepare; Ector.Renderer.Generic.Base.draw; - Ector.Renderer.Software.Base.fill; + Ector.Renderer.Software.fill; Ector.Renderer.Generic.Base.crc.get; Efl.Gfx.Shape.path.set; Eo.Base.constructor; diff --git a/src/lib/ector/software/ector_software_surface.c b/src/lib/ector/software/ector_software_surface.c index 821f791..f71375a 100644 --- a/src/lib/ector/software/ector_software_surface.c +++ b/src/lib/ector/software/ector_software_surface.c @@ -57,4 +57,4 @@ _ector_software_surface_ector_generic_surface_reference_point_set(Eo *obj EINA_U } #include "ector_software_surface.eo.c" -#include "ector_renderer_software_base.eo.c" +#include "ector_renderer_software.eo.c" --
