Enlightenment CVS committal

Author  : turran
Project : e17
Module  : proto/enesim

Dir     : e17/proto/enesim/src/lib/raster/renderer


Modified Files:
        fill_color.c renderer.c fill_surface.c Makefile.am renderer.h 


Log Message:
+ Anti Alias Polygon rasterizer (kiia8, 16 and 32)
+ Move scanline definitions to the API (first step for a new scanline approach)
+ Blending with a relative alpha
+ New data types (extender, etc)

===================================================================
RCS file: /cvs/e/e17/proto/enesim/src/lib/raster/renderer/fill_color.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- fill_color.c        14 Oct 2007 17:49:29 -0000      1.2
+++ fill_color.c        2 Dec 2007 23:28:42 -0000       1.3
@@ -15,20 +15,27 @@
        DATA32  color;
 } Fill_Color;
 
-static void _draw_alias(Enesim_Renderer *r, Scanline_Alias *sl, Enesim_Surface 
*dst)
+static void _draw_alias(Enesim_Renderer *r, Enesim_Scanline_Alias *sl, 
Enesim_Surface *dst)
 {
        Fill_Color *f;
+#if 0
        Scanline_Alias_Sl *s;
+#endif
        Span_Color_Func cfnc;
        int nsl;
        int offset;
        int i;
 
        f = r->data;
+#if 0
        nsl = sl->num_sls;
        s = sl->sls;
-
+#endif
        cfnc = enesim_surface_span_color_get(dst, r->rop);
+       offset = (dst->w * sl->y) + sl->x;
+       //printf("%d %d %d\n", s->y, s->x, s->w);
+       cfnc(&dst->data, offset, f->color, sl->w);
+#if 0
        for (i = 0; i < nsl; i++)
        {
                offset = (dst->w * s->y) + s->x;
@@ -36,11 +43,30 @@
                cfnc(&dst->data, offset, f->color, s->w);
                s++;
        }
+#endif
+}
+
+static void _draw_mask(Enesim_Renderer *r, Enesim_Scanline_Mask *sl, 
Enesim_Surface *dst)
+{
+       Fill_Color *f;
+       Span_Color_Mask_Func cfnc;
+       int nsl;
+       int offset;
+       int i;
+
+       f = r->data;
+               
+       cfnc = enesim_surface_span_color_mask_get(dst, r->rop);
+       offset = (dst->w * sl->y) + sl->x;
+       cfnc(&dst->data, offset, f->color, sl->w, sl->coverages);
 }
 
-static void _draw(Enesim_Renderer *r, Enesim_Scanline *sl, Enesim_Surface *dst)
+static void _draw(Enesim_Renderer *r, int type, void *sl, Enesim_Surface *dst)
 {
-       _draw_alias(r, sl->data, dst);
+       if (type == ENESIM_SCANLINE_ALIAS)
+               _draw_alias(r, sl, dst);
+       if (type == ENESIM_SCANLINE_MASK)
+               _draw_mask(r, sl, dst);
 }
 
 static void _free(Enesim_Renderer *r)
===================================================================
RCS file: /cvs/e/e17/proto/enesim/src/lib/raster/renderer/renderer.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- renderer.c  14 Oct 2007 17:49:29 -0000      1.2
+++ renderer.c  2 Dec 2007 23:28:42 -0000       1.3
@@ -29,10 +29,10 @@
        free(r);
 }
 
-EAPI void enesim_renderer_draw(Enesim_Renderer *r, Enesim_Scanline *sl, 
Enesim_Surface *dst)
+EAPI void enesim_renderer_draw(Enesim_Renderer *r, int type, void *sl, 
Enesim_Surface *dst)
 {
        assert(r);
        assert(sl);
        assert(dst);
-       r->funcs->draw(r, sl, dst);
+       r->funcs->draw(r, type, sl, dst);
 }
===================================================================
RCS file: /cvs/e/e17/proto/enesim/src/lib/raster/renderer/fill_surface.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- fill_surface.c      21 Oct 2007 22:39:28 -0000      1.4
+++ fill_surface.c      2 Dec 2007 23:28:42 -0000       1.5
@@ -21,7 +21,7 @@
 #define DRECT f->darea
 #define SRECT f->sarea
 
-static inline void _draw_alias_sl(Fill_Surface *f, Scanline_Alias_Sl *sl, 
Enesim_Surface *dst)
+static inline void _draw_alias_sl(Fill_Surface *f, Enesim_Scanline_Alias *sl, 
Enesim_Surface *dst)
 {
        int offset;
        int w = DRECT.w;
===================================================================
RCS file: /cvs/e/e17/proto/enesim/src/lib/raster/renderer/Makefile.am,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- Makefile.am 14 Oct 2007 17:49:29 -0000      1.2
+++ Makefile.am 2 Dec 2007 23:28:42 -0000       1.3
@@ -11,8 +11,8 @@
 
 libenesim_renderer_la_SOURCES = \
 renderer.c \
-fill_color.c \
-fill_surface.c
+fill_color.c
+# fill_surface.c
 
 libenesim_renderer_la_LIBADD = 
 
===================================================================
RCS file: /cvs/e/e17/proto/enesim/src/lib/raster/renderer/renderer.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- renderer.h  12 Oct 2007 11:04:52 -0000      1.1
+++ renderer.h  2 Dec 2007 23:28:42 -0000       1.2
@@ -1,9 +1,16 @@
 #ifndef _RENDERER_H
 #define _RENDERER_H
 
+/**
+ *
+ * @todo
+ * - move this interface to a new one, remove the scanline ptr and use
+ *   the type instead
+ */
+
 typedef struct _Enesim_Renderer_Func
 {
-       void (*draw)(Enesim_Renderer *r, Enesim_Scanline *sl, Enesim_Surface 
*dst);
+       void (*draw)(Enesim_Renderer *r, int type, void *sl, Enesim_Surface 
*dst);
        void (*free)(Enesim_Renderer *r);
 } Enesim_Renderer_Func;
 



-------------------------------------------------------------------------
SF.Net email is sponsored by: The Future of Linux Business White Paper
from Novell.  From the desktop to the data center, Linux is going
mainstream.  Let it simplify your IT future.
http://altfarm.mediaplex.com/ad/ck/8857-50307-18918-4
_______________________________________________
enlightenment-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

Reply via email to