NorwayFun
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Ector renderer software: Remove the no longer needed .Base hack.

This commit is contained in:
Tom Hacohen 2016-05-11 12:23:57 +01:00
parent e7805d97b6
commit 718033886a
13 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Makefile_Ector.am
View File

@ -26,7 +26,7 @@ ector_eolian_files_software = \
lib/ector/software/ector_software_surface.eo \ lib/ector/software/ector_software_surface.eo \
lib/ector/software/ector_software_buffer.eo \ lib/ector/software/ector_software_buffer.eo \
lib/ector/software/ector_software_buffer_base.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_shape.eo \
lib/ector/software/ector_renderer_software_buffer.eo \ lib/ector/software/ector_renderer_software_buffer.eo \
lib/ector/software/ector_renderer_software_gradient_radial.eo \ lib/ector/software/ector_renderer_software_gradient_radial.eo \

2
src/lib/ector/Makefile.am
View File

@ -29,7 +29,7 @@ ector_eolian_files_software = \
software/ector_software_surface.eo \ software/ector_software_surface.eo \
software/ector_software_buffer.eo \ software/ector_software_buffer.eo \
software/ector_software_buffer_base.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_shape.eo \
software/ector_renderer_software_buffer.eo \ software/ector_renderer_software_buffer.eo \
software/ector_renderer_software_gradient_radial.eo \ software/ector_renderer_software_gradient_radial.eo \

2
src/lib/ector/software/Ector_Software.h
View File

@ -8,7 +8,7 @@
#include "software/ector_software_surface.eo.h" #include "software/ector_software_surface.eo.h"
#include "software/ector_software_buffer.eo.h" #include "software/ector_software_buffer.eo.h"
#include "software/ector_software_buffer_base.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_shape.eo.h"
#include "software/ector_renderer_software_buffer.eo.h" #include "software/ector_renderer_software_buffer.eo.h"
#include "software/ector_renderer_software_gradient_linear.eo.h" #include "software/ector_renderer_software_gradient_linear.eo.h"

2
src/lib/ector/software/ector_renderer_software_base.eo → src/lib/ector/software/ector_renderer_software.eo
View File

@ -1,4 +1,4 @@
class Ector.Renderer.Software.Base (Ector.Renderer.Generic.Base) class Ector.Renderer.Software (Ector.Renderer.Generic.Base)
{ {
legacy_prefix: null; legacy_prefix: null;
data: null; data: null;

2
src/lib/ector/software/ector_renderer_software_buffer.c
View File

@ -32,7 +32,7 @@ _ector_renderer_software_buffer_buffer_get(Eo *obj EINA_UNUSED, Ector_Renderer_S
} }
EOLIAN static Eina_Bool 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_Buffer *buffer = eo_data_scope_get(obj, ECTOR_SOFTWARE_BUFFER_BASE_MIXIN);
ector_software_rasterizer_buffer_set(pd->surface, buffer); ector_software_rasterizer_buffer_set(pd->surface, buffer);

4
src/lib/ector/software/ector_renderer_software_buffer.eo
View File

@ -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; legacy_prefix: null;
methods { methods {
@ -13,7 +13,7 @@ class Ector.Renderer.Software.Buffer (Ector.Renderer.Software.Base, Ector.Render
implements { implements {
Ector.Renderer.Generic.Base.prepare; Ector.Renderer.Generic.Base.prepare;
Ector.Renderer.Generic.Base.crc.get; Ector.Renderer.Generic.Base.crc.get;
Ector.Renderer.Software.Base.fill; Ector.Renderer.Software.fill;
Eo.Base.destructor; Eo.Base.destructor;
} }
} }

2
src/lib/ector/software/ector_renderer_software_gradient_linear.c
View File

@ -54,7 +54,7 @@ _ector_renderer_software_gradient_linear_ector_renderer_generic_base_draw(Eo *ob
} }
static Eina_Bool 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_Renderer_Software_Gradient_Data *pd)
{ {
ector_software_rasterizer_linear_gradient_set(pd->surface->rasterizer, pd); ector_software_rasterizer_linear_gradient_set(pd->surface->rasterizer, pd);

4
src/lib/ector/software/ector_renderer_software_gradient_linear.eo
View File

@ -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; eo_prefix: ector_renderer_software_gradient_linear;
legacy_prefix: null; 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.prepare;
Ector.Renderer.Generic.Base.draw; Ector.Renderer.Generic.Base.draw;
Ector.Renderer.Generic.Base.crc.get; Ector.Renderer.Generic.Base.crc.get;
Ector.Renderer.Software.Base.fill; Ector.Renderer.Software.fill;
Eo.Base.constructor; Eo.Base.constructor;
Eo.Base.destructor; Eo.Base.destructor;
Efl.Gfx.Gradient.stop.set; Efl.Gfx.Gradient.stop.set;

2
src/lib/ector/software/ector_renderer_software_gradient_radial.c
View File

@ -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... // Clearly duplicated and should be in a common place...
static Eina_Bool 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); ector_software_rasterizer_radial_gradient_set(pd->surface->rasterizer, pd);
return EINA_TRUE; return EINA_TRUE;

4
src/lib/ector/software/ector_renderer_software_gradient_radial.eo
View File

@ -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; eo_prefix: ector_renderer_software_gradient_radial;
legacy_prefix: null; 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.prepare;
Ector.Renderer.Generic.Base.draw; Ector.Renderer.Generic.Base.draw;
Ector.Renderer.Generic.Base.crc.get; Ector.Renderer.Generic.Base.crc.get;
Ector.Renderer.Software.Base.fill; Ector.Renderer.Software.fill;
Eo.Base.constructor; Eo.Base.constructor;
Eo.Base.destructor; Eo.Base.destructor;
Efl.Gfx.Gradient.stop.set; Efl.Gfx.Gradient.stop.set;

6
src/lib/ector/software/ector_renderer_software_shape.c
View File

@ -610,7 +610,7 @@ _ector_renderer_software_shape_ector_renderer_generic_base_draw(Eo *obj,
if (pd->shape->fill) 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, ector_software_rasterizer_draw_rle_data(pd->surface->rasterizer,
x, y, mul_col, op, x, y, mul_col, op,
pd->shape_data); pd->shape_data);
@ -632,7 +632,7 @@ _ector_renderer_software_shape_ector_renderer_generic_base_draw(Eo *obj,
if (pd->shape->stroke.fill) 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, ector_software_rasterizer_draw_rle_data(pd->surface->rasterizer,
x, y, mul_col, op, x, y, mul_col, op,
pd->outline_data); pd->outline_data);
@ -656,7 +656,7 @@ _ector_renderer_software_shape_ector_renderer_generic_base_draw(Eo *obj,
} }
static Eina_Bool 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) Ector_Renderer_Software_Shape_Data *pd EINA_UNUSED)
{ {
// FIXME: let's find out how to fill a shape with a shape later. // FIXME: let's find out how to fill a shape with a shape later.

4
src/lib/ector/software/ector_renderer_software_shape.eo
View File

@ -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; eo_prefix: ector_renderer_software_shape;
legacy_prefix: null; legacy_prefix: null;
implements { implements {
Ector.Renderer.Generic.Base.prepare; Ector.Renderer.Generic.Base.prepare;
Ector.Renderer.Generic.Base.draw; Ector.Renderer.Generic.Base.draw;
Ector.Renderer.Software.Base.fill; Ector.Renderer.Software.fill;
Ector.Renderer.Generic.Base.crc.get; Ector.Renderer.Generic.Base.crc.get;
Efl.Gfx.Shape.path.set; Efl.Gfx.Shape.path.set;
Eo.Base.constructor; Eo.Base.constructor;

2
src/lib/ector/software/ector_software_surface.c
View File

@ -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_software_surface.eo.c"
#include "ector_renderer_software_base.eo.c" #include "ector_renderer_software.eo.c"