Enlightenment CVS committal
Author : turran
Project : e17
Module : proto/enesim
Dir : e17/proto/enesim/src/lib/raster/surface
Modified Files:
surface.h surface.c Makefile.am
Added Files:
argb8888.h rgb565.h argb8888.c rgb565.c
Log Message:
- Make backends for each surface format, better way to handle common functions
=)
===================================================================
RCS file: /cvs/e/e17/proto/enesim/src/lib/raster/surface/surface.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- surface.h 16 Oct 2007 22:09:50 -0000 1.2
+++ surface.h 17 Oct 2007 21:51:04 -0000 1.3
@@ -17,7 +17,7 @@
DATA8 *alpha;
} Rgb565_Data;
-typedef union
+typedef union _Enesim_Surface_Data
{
Rgb565_Data rgb565;
Argb8888_Data argb8888;
@@ -25,13 +25,21 @@
typedef void (*Span_Color_Func) (Enesim_Surface_Data *data, int off, DATA32 c,
int w);
-typedef struct _Enesim_Surface_Func
+typedef struct _Surface_Func
{
Span_Color_Func sp_color;
-} Enesim_Surface_Func;
+} Surface_Rop_Func;
-extern Enesim_Surface_Func rgb565_funcs[ENESIM_RENDERER_ROPS];
-extern Enesim_Surface_Func argb8888_funcs[ENESIM_RENDERER_ROPS];
+typedef void (*Surface_Conv_Func) (Enesim_Surface_Data *sdata,
Enesim_Surface_Data *ddata, int w, int h);
+
+typedef struct _Surface_Backend
+{
+ Surface_Rop_Func rops[ENESIM_RENDERER_ROPS];
+ Surface_Conv_Func conv[ENESIM_SURFACE_FORMATS - 1];
+} Surface_Backend;
+
+extern Surface_Backend argb8888_backend;
+extern Surface_Backend rgb565_backend;
struct _Enesim_Surface
{
@@ -41,10 +49,6 @@
int flags;
Enesim_Surface_Data data;
};
-
-typedef void (*Conv_Func) (Enesim_Surface_Data *sdata, Enesim_Surface_Data
*ddata, int w, int h);
-extern Conv_Func rgb565_conv_funcs[ENESIM_SURFACE_FORMATS];
-extern Conv_Func argb8888_conv_funcs[ENESIM_SURFACE_FORMATS];
Span_Color_Func enesim_surface_span_color_get(Enesim_Surface *s, int rop);
void enesim_surface_premul(Enesim_Surface *s);
===================================================================
RCS file: /cvs/e/e17/proto/enesim/src/lib/raster/surface/surface.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- surface.c 16 Oct 2007 22:09:50 -0000 1.2
+++ surface.c 17 Oct 2007 21:51:04 -0000 1.3
@@ -7,11 +7,15 @@
/*============================================================================*
* Local
*
*============================================================================*/
+static Surface_Backend *_backends[ENESIM_SURFACE_FORMATS] = {
+ &argb8888_backend,
+ &rgb565_backend,
+};
+#if 0
static Enesim_Surface_Func *_funcs[ENESIM_SURFACE_FORMATS] = {
argb8888_funcs,
rgb565_funcs,
};
-#if 0
static Conv_Func *_conv_funcs[ENESIM_SURFACE_FORMATS] = {
argb8888_conv_funcs,
rgb565_conv_funcs,
@@ -32,7 +36,7 @@
}
#endif
- return _funcs[s->format][ENESIM_RENDERER_BLEND].sp_color;
+ return _backends[s->format]->rops[ENESIM_RENDERER_BLEND].sp_color;
}
/**
* To be documented
===================================================================
RCS file: /cvs/e/e17/proto/enesim/src/lib/raster/surface/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:28 -0000 1.2
+++ Makefile.am 17 Oct 2007 21:51:04 -0000 1.3
@@ -10,7 +10,9 @@
noinst_LTLIBRARIES = libenesim_surface.la
libenesim_surface_la_SOURCES = \
-surface.c
+surface.c \
+argb8888.c \
+rgb565.c
libenesim_surface_la_LIBADD = \
rop/libenesim_surface_rop.la
-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
enlightenment-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs