diff options
author | Tom Hacohen <tom@stosb.com> | 2016-05-11 12:23:57 +0100 |
---|---|---|
committer | Tom Hacohen <tom@stosb.com> | 2016-05-11 12:57:55 +0100 |
commit | 718033886ac819134a93c049f6225b157921d9b9 (patch) | |
tree | 383f438e2735376981c63acfe63131e9253833e9 | |
parent | e7805d97b68c67d1aabf0521fa510e3848ce98ce (diff) |
Ector renderer software: Remove the no longer needed .Base hack.
-rw-r--r-- | src/Makefile_Ector.am | 2 | ||||
-rw-r--r-- | src/lib/ector/Makefile.am | 2 | ||||
-rw-r--r-- | src/lib/ector/software/Ector_Software.h | 2 | ||||
-rw-r--r-- | src/lib/ector/software/ector_renderer_software.eo (renamed from src/lib/ector/software/ector_renderer_software_base.eo) | 2 | ||||
-rw-r--r-- | src/lib/ector/software/ector_renderer_software_buffer.c | 2 | ||||
-rw-r--r-- | src/lib/ector/software/ector_renderer_software_buffer.eo | 4 | ||||
-rw-r--r-- | src/lib/ector/software/ector_renderer_software_gradient_linear.c | 2 | ||||
-rw-r--r-- | src/lib/ector/software/ector_renderer_software_gradient_linear.eo | 4 | ||||
-rw-r--r-- | src/lib/ector/software/ector_renderer_software_gradient_radial.c | 2 | ||||
-rw-r--r-- | src/lib/ector/software/ector_renderer_software_gradient_radial.eo | 4 | ||||
-rw-r--r-- | src/lib/ector/software/ector_renderer_software_shape.c | 6 | ||||
-rw-r--r-- | src/lib/ector/software/ector_renderer_software_shape.eo | 4 | ||||
-rw-r--r-- | 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 5de305dd9f..a07a442e55 100644 --- a/src/Makefile_Ector.am +++ b/src/Makefile_Ector.am | |||
@@ -26,7 +26,7 @@ ector_eolian_files_software = \ | |||
26 | lib/ector/software/ector_software_surface.eo \ | 26 | lib/ector/software/ector_software_surface.eo \ |
27 | lib/ector/software/ector_software_buffer.eo \ | 27 | lib/ector/software/ector_software_buffer.eo \ |
28 | lib/ector/software/ector_software_buffer_base.eo \ | 28 | lib/ector/software/ector_software_buffer_base.eo \ |
29 | lib/ector/software/ector_renderer_software_base.eo \ | 29 | lib/ector/software/ector_renderer_software.eo \ |
30 | lib/ector/software/ector_renderer_software_shape.eo \ | 30 | lib/ector/software/ector_renderer_software_shape.eo \ |
31 | lib/ector/software/ector_renderer_software_buffer.eo \ | 31 | lib/ector/software/ector_renderer_software_buffer.eo \ |
32 | lib/ector/software/ector_renderer_software_gradient_radial.eo \ | 32 | lib/ector/software/ector_renderer_software_gradient_radial.eo \ |
diff --git a/src/lib/ector/Makefile.am b/src/lib/ector/Makefile.am index 278f0499c9..d41ac7cfa4 100644 --- a/src/lib/ector/Makefile.am +++ b/src/lib/ector/Makefile.am | |||
@@ -29,7 +29,7 @@ ector_eolian_files_software = \ | |||
29 | software/ector_software_surface.eo \ | 29 | software/ector_software_surface.eo \ |
30 | software/ector_software_buffer.eo \ | 30 | software/ector_software_buffer.eo \ |
31 | software/ector_software_buffer_base.eo \ | 31 | software/ector_software_buffer_base.eo \ |
32 | software/ector_renderer_software_base.eo \ | 32 | software/ector_renderer_software.eo \ |
33 | software/ector_renderer_software_shape.eo \ | 33 | software/ector_renderer_software_shape.eo \ |
34 | software/ector_renderer_software_buffer.eo \ | 34 | software/ector_renderer_software_buffer.eo \ |
35 | software/ector_renderer_software_gradient_radial.eo \ | 35 | 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 66e31de010..f53526c5b2 100644 --- a/src/lib/ector/software/Ector_Software.h +++ b/src/lib/ector/software/Ector_Software.h | |||
@@ -8,7 +8,7 @@ | |||
8 | #include "software/ector_software_surface.eo.h" | 8 | #include "software/ector_software_surface.eo.h" |
9 | #include "software/ector_software_buffer.eo.h" | 9 | #include "software/ector_software_buffer.eo.h" |
10 | #include "software/ector_software_buffer_base.eo.h" | 10 | #include "software/ector_software_buffer_base.eo.h" |
11 | #include "software/ector_renderer_software_base.eo.h" | 11 | #include "software/ector_renderer_software.eo.h" |
12 | #include "software/ector_renderer_software_shape.eo.h" | 12 | #include "software/ector_renderer_software_shape.eo.h" |
13 | #include "software/ector_renderer_software_buffer.eo.h" | 13 | #include "software/ector_renderer_software_buffer.eo.h" |
14 | #include "software/ector_renderer_software_gradient_linear.eo.h" | 14 | #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 index 19061e3fa7..fe8c02c712 100644 --- a/src/lib/ector/software/ector_renderer_software_base.eo +++ b/src/lib/ector/software/ector_renderer_software.eo | |||
@@ -1,4 +1,4 @@ | |||
1 | class Ector.Renderer.Software.Base (Ector.Renderer.Generic.Base) | 1 | class Ector.Renderer.Software (Ector.Renderer.Generic.Base) |
2 | { | 2 | { |
3 | legacy_prefix: null; | 3 | legacy_prefix: null; |
4 | data: null; | 4 | 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 d07c1971b1..f5af5a7cb3 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 | |||
32 | } | 32 | } |
33 | 33 | ||
34 | EOLIAN static Eina_Bool | 34 | EOLIAN static Eina_Bool |
35 | _ector_renderer_software_buffer_ector_renderer_software_base_fill(Eo *obj, Ector_Renderer_Software_Buffer_Data *pd) | 35 | _ector_renderer_software_buffer_ector_renderer_software_fill(Eo *obj, Ector_Renderer_Software_Buffer_Data *pd) |
36 | { | 36 | { |
37 | Ector_Software_Buffer *buffer = eo_data_scope_get(obj, ECTOR_SOFTWARE_BUFFER_BASE_MIXIN); | 37 | Ector_Software_Buffer *buffer = eo_data_scope_get(obj, ECTOR_SOFTWARE_BUFFER_BASE_MIXIN); |
38 | ector_software_rasterizer_buffer_set(pd->surface, buffer); | 38 | 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 e7f2207765..3a17c56df7 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 @@ | |||
1 | class Ector.Renderer.Software.Buffer (Ector.Renderer.Software.Base, Ector.Renderer.Generic.Buffer) | 1 | class Ector.Renderer.Software.Buffer (Ector.Renderer.Software, Ector.Renderer.Generic.Buffer) |
2 | { | 2 | { |
3 | legacy_prefix: null; | 3 | legacy_prefix: null; |
4 | methods { | 4 | methods { |
@@ -13,7 +13,7 @@ class Ector.Renderer.Software.Buffer (Ector.Renderer.Software.Base, Ector.Render | |||
13 | implements { | 13 | implements { |
14 | Ector.Renderer.Generic.Base.prepare; | 14 | Ector.Renderer.Generic.Base.prepare; |
15 | Ector.Renderer.Generic.Base.crc.get; | 15 | Ector.Renderer.Generic.Base.crc.get; |
16 | Ector.Renderer.Software.Base.fill; | 16 | Ector.Renderer.Software.fill; |
17 | Eo.Base.destructor; | 17 | Eo.Base.destructor; |
18 | } | 18 | } |
19 | } | 19 | } |
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 368c56d884..9428366352 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 | |||
54 | } | 54 | } |
55 | 55 | ||
56 | static Eina_Bool | 56 | static Eina_Bool |
57 | _ector_renderer_software_gradient_linear_ector_renderer_software_base_fill(Eo *obj EINA_UNUSED, | 57 | _ector_renderer_software_gradient_linear_ector_renderer_software_fill(Eo *obj EINA_UNUSED, |
58 | Ector_Renderer_Software_Gradient_Data *pd) | 58 | Ector_Renderer_Software_Gradient_Data *pd) |
59 | { | 59 | { |
60 | ector_software_rasterizer_linear_gradient_set(pd->surface->rasterizer, pd); | 60 | 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 2f4063fb8f..1f52a4427f 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 @@ | |||
1 | class Ector.Renderer.Software.Gradient_Linear (Ector.Renderer.Software.Base, Ector.Renderer.Generic.Gradient, Ector.Renderer.Generic.Gradient_Linear) | 1 | class Ector.Renderer.Software.Gradient_Linear (Ector.Renderer.Software, Ector.Renderer.Generic.Gradient, Ector.Renderer.Generic.Gradient_Linear) |
2 | { | 2 | { |
3 | eo_prefix: ector_renderer_software_gradient_linear; | 3 | eo_prefix: ector_renderer_software_gradient_linear; |
4 | legacy_prefix: null; | 4 | legacy_prefix: null; |
@@ -7,7 +7,7 @@ class Ector.Renderer.Software.Gradient_Linear (Ector.Renderer.Software.Base, Ect | |||
7 | Ector.Renderer.Generic.Base.prepare; | 7 | Ector.Renderer.Generic.Base.prepare; |
8 | Ector.Renderer.Generic.Base.draw; | 8 | Ector.Renderer.Generic.Base.draw; |
9 | Ector.Renderer.Generic.Base.crc.get; | 9 | Ector.Renderer.Generic.Base.crc.get; |
10 | Ector.Renderer.Software.Base.fill; | 10 | Ector.Renderer.Software.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/software/ector_renderer_software_gradient_radial.c b/src/lib/ector/software/ector_renderer_software_gradient_radial.c index ee72a5f726..1d164e6b22 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 | |||
66 | 66 | ||
67 | // Clearly duplicated and should be in a common place... | 67 | // Clearly duplicated and should be in a common place... |
68 | static Eina_Bool | 68 | static Eina_Bool |
69 | _ector_renderer_software_gradient_radial_ector_renderer_software_base_fill(Eo *obj EINA_UNUSED, Ector_Renderer_Software_Gradient_Data *pd) | 69 | _ector_renderer_software_gradient_radial_ector_renderer_software_fill(Eo *obj EINA_UNUSED, Ector_Renderer_Software_Gradient_Data *pd) |
70 | { | 70 | { |
71 | ector_software_rasterizer_radial_gradient_set(pd->surface->rasterizer, pd); | 71 | ector_software_rasterizer_radial_gradient_set(pd->surface->rasterizer, pd); |
72 | return EINA_TRUE; | 72 | 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 6a3cb6497f..6590a399cb 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 @@ | |||
1 | class Ector.Renderer.Software.Gradient_Radial (Ector.Renderer.Software.Base, Ector.Renderer.Generic.Gradient, Ector.Renderer.Generic.Gradient_Radial) | 1 | class Ector.Renderer.Software.Gradient_Radial (Ector.Renderer.Software, Ector.Renderer.Generic.Gradient, Ector.Renderer.Generic.Gradient_Radial) |
2 | { | 2 | { |
3 | eo_prefix: ector_renderer_software_gradient_radial; | 3 | eo_prefix: ector_renderer_software_gradient_radial; |
4 | legacy_prefix: null; | 4 | legacy_prefix: null; |
@@ -7,7 +7,7 @@ class Ector.Renderer.Software.Gradient_Radial (Ector.Renderer.Software.Base, Ect | |||
7 | Ector.Renderer.Generic.Base.prepare; | 7 | Ector.Renderer.Generic.Base.prepare; |
8 | Ector.Renderer.Generic.Base.draw; | 8 | Ector.Renderer.Generic.Base.draw; |
9 | Ector.Renderer.Generic.Base.crc.get; | 9 | Ector.Renderer.Generic.Base.crc.get; |
10 | Ector.Renderer.Software.Base.fill; | 10 | Ector.Renderer.Software.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/software/ector_renderer_software_shape.c b/src/lib/ector/software/ector_renderer_software_shape.c index 978ccaae5d..78e98151e4 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, | |||
610 | 610 | ||
611 | if (pd->shape->fill) | 611 | if (pd->shape->fill) |
612 | { | 612 | { |
613 | ector_renderer_software_base_fill(pd->shape->fill); | 613 | ector_renderer_software_fill(pd->shape->fill); |
614 | ector_software_rasterizer_draw_rle_data(pd->surface->rasterizer, | 614 | ector_software_rasterizer_draw_rle_data(pd->surface->rasterizer, |
615 | x, y, mul_col, op, | 615 | x, y, mul_col, op, |
616 | pd->shape_data); | 616 | pd->shape_data); |
@@ -632,7 +632,7 @@ _ector_renderer_software_shape_ector_renderer_generic_base_draw(Eo *obj, | |||
632 | 632 | ||
633 | if (pd->shape->stroke.fill) | 633 | if (pd->shape->stroke.fill) |
634 | { | 634 | { |
635 | ector_renderer_software_base_fill(pd->shape->stroke.fill); | 635 | ector_renderer_software_fill(pd->shape->stroke.fill); |
636 | ector_software_rasterizer_draw_rle_data(pd->surface->rasterizer, | 636 | ector_software_rasterizer_draw_rle_data(pd->surface->rasterizer, |
637 | x, y, mul_col, op, | 637 | x, y, mul_col, op, |
638 | pd->outline_data); | 638 | pd->outline_data); |
@@ -656,7 +656,7 @@ _ector_renderer_software_shape_ector_renderer_generic_base_draw(Eo *obj, | |||
656 | } | 656 | } |
657 | 657 | ||
658 | static Eina_Bool | 658 | static Eina_Bool |
659 | _ector_renderer_software_shape_ector_renderer_software_base_fill(Eo *obj EINA_UNUSED, | 659 | _ector_renderer_software_shape_ector_renderer_software_fill(Eo *obj EINA_UNUSED, |
660 | Ector_Renderer_Software_Shape_Data *pd EINA_UNUSED) | 660 | Ector_Renderer_Software_Shape_Data *pd EINA_UNUSED) |
661 | { | 661 | { |
662 | // FIXME: let's find out how to fill a shape with a shape later. | 662 | // 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 017a9ccb4e..e7a69aad82 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 @@ | |||
1 | class Ector.Renderer.Software.Shape (Ector.Renderer.Software.Base, Ector.Renderer.Generic.Shape) | 1 | class Ector.Renderer.Software.Shape (Ector.Renderer.Software, Ector.Renderer.Generic.Shape) |
2 | { | 2 | { |
3 | eo_prefix: ector_renderer_software_shape; | 3 | eo_prefix: ector_renderer_software_shape; |
4 | legacy_prefix: null; | 4 | legacy_prefix: null; |
5 | implements { | 5 | implements { |
6 | Ector.Renderer.Generic.Base.prepare; | 6 | Ector.Renderer.Generic.Base.prepare; |
7 | Ector.Renderer.Generic.Base.draw; | 7 | Ector.Renderer.Generic.Base.draw; |
8 | Ector.Renderer.Software.Base.fill; | 8 | Ector.Renderer.Software.fill; |
9 | Ector.Renderer.Generic.Base.crc.get; | 9 | Ector.Renderer.Generic.Base.crc.get; |
10 | Efl.Gfx.Shape.path.set; | 10 | Efl.Gfx.Shape.path.set; |
11 | Eo.Base.constructor; | 11 | Eo.Base.constructor; |
diff --git a/src/lib/ector/software/ector_software_surface.c b/src/lib/ector/software/ector_software_surface.c index 821f7911f7..f71375a72e 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 | |||
57 | } | 57 | } |
58 | 58 | ||
59 | #include "ector_software_surface.eo.c" | 59 | #include "ector_software_surface.eo.c" |
60 | #include "ector_renderer_software_base.eo.c" | 60 | #include "ector_renderer_software.eo.c" |