Enlightenment CVS committal

Author  : turran
Project : e17
Module  : proto/enesim

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


Modified Files:
        surface.c argb8888.c surface.h argb8888.h 


Log Message:
- Fix unsued autotools definitions
- Make argb8888 premul/unpremul functions part of the surface backend

===================================================================
RCS file: /cvs/e/e17/proto/enesim/src/lib/raster/surface/surface.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- surface.c   17 Oct 2007 21:51:04 -0000      1.3
+++ surface.c   19 Oct 2007 15:30:06 -0000      1.4
@@ -11,16 +11,6 @@
                &argb8888_backend,
                &rgb565_backend,
 };
-#if 0
-static Enesim_Surface_Func *_funcs[ENESIM_SURFACE_FORMATS] = {
-       argb8888_funcs,
-       rgb565_funcs,
-};
-static Conv_Func *_conv_funcs[ENESIM_SURFACE_FORMATS] = {
-       argb8888_conv_funcs,
-       rgb565_conv_funcs,
-};
-#endif
 /*============================================================================*
  *                                 Global                                     
* 
  
*============================================================================*/
@@ -38,13 +28,6 @@
 #endif
        return _backends[s->format]->rops[ENESIM_RENDERER_BLEND].sp_color;
 }
-/**
- * To be documented
- * FIXME: To be fixed
- */
-void enesim_surface_premul(Enesim_Surface *s)
-{
-}
 /*============================================================================*
  *                                   API                                      
* 
  
*============================================================================*/
@@ -65,23 +48,22 @@
        s->flags = flags;
 
        va_start(va, flags);
-       switch (s->format)
-       {
-               case ENESIM_SURFACE_ARGB8888:
+       switch (s->format) {
+       case ENESIM_SURFACE_ARGB8888:
                s->data.argb8888.data = va_arg(va, DATA32 *);
                break;
 
-               case ENESIM_SURFACE_RGB565:
+       case ENESIM_SURFACE_RGB565:
                s->data.rgb565.data = va_arg(va, DATA16 *);
                s->data.rgb565.alpha = va_arg(va, DATA8 *);
                break;
 
-               default:
+       default:
                break;
        }
        va_end(va);
        if (!(s->flags & ENESIM_SURFACE_PREMUL))
-               enesim_surface_premul(s);
+               _backends[s->format]->premul(&s->data, s->w * s->h);
        return s;
 }
 /**
@@ -119,21 +101,20 @@
        
        assert(s);
        va_start(va, s);
-       switch (s->format)
-       {
-               case ENESIM_SURFACE_ARGB8888:
+       switch (s->format) {
+       case ENESIM_SURFACE_ARGB8888:
                d32 = va_arg(va, DATA32 **);
                *d32 = s->data.argb8888.data;
                break;
 
-               case ENESIM_SURFACE_RGB565:
+       case ENESIM_SURFACE_RGB565:
                d16 = va_arg(va, DATA16 **);
                *d16 = s->data.rgb565.data;
                d8 = va_arg(va, DATA8 **);
                *d8 = s->data.rgb565.alpha;
                break;
 
-               default:
+       default:
                break;
        }
        va_end(va);
@@ -180,23 +161,22 @@
        assert(s);
        /* TODO check if we already had data */
        va_start(va, f);
-       switch (s->format)
-       {
-               case ENESIM_SURFACE_ARGB8888:
+       switch (s->format) {
+       case ENESIM_SURFACE_ARGB8888:
                s->data.argb8888.data = va_arg(va, DATA32 *);
                break;
 
-               case ENESIM_SURFACE_RGB565:
+       case ENESIM_SURFACE_RGB565:
                s->data.rgb565.data = va_arg(va, DATA16 *);
                s->data.rgb565.alpha = va_arg(va, DATA8 *);
                break;
 
-               default:
+       default:
                break;
        }
        va_end(va);
        if (!(s->flags & ENESIM_SURFACE_PREMUL))
-                       enesim_surface_premul(s);
+               _backends[s->format]->premul(&s->data, s->w * s->h);
 }
 /**
  * To be documented
@@ -212,30 +192,29 @@
  * FIXME: To be fixed
  */
 EAPI void 
-enesim_surface_unpremul(Enesim_Surface *s)
-{
-       DATA32 *d, *e;
-       int len;
+enesim_surface_unpremul(Enesim_Surface *s, ...)
+{      
+       Enesim_Surface_Data data;
+       va_list va;
        
        assert(s);
-       /* FIXME this is only for 32bpp */
-       len = s->w * s->h;
-#define ARGB_JOIN(a,r,g,b) (((a) << 24) + ((r) << 16) + ((g) << 8) + (b))
-#define A_VAL(p) ((DATA8 *)(p))[3]
-#define R_VAL(p) ((DATA8 *)(p))[2]
-#define G_VAL(p) ((DATA8 *)(p))[1]
-#define B_VAL(p) ((DATA8 *)(p))[0]
-       d = s->data.argb8888.data;
-       e = d + len;
-       while (d < e)
-       {
-               DATA32 a = (*d >> 24);
+       /* TODO check if we already had data */
+       va_start(va, s);
+       switch (s->format) {
+       case ENESIM_SURFACE_ARGB8888:
+               data.argb8888.data = va_arg(va, DATA32 *);
+               break;
+
+       case ENESIM_SURFACE_RGB565:
+               data.rgb565.data = va_arg(va, DATA16 *);
+               data.rgb565.alpha = va_arg(va, DATA8 *);
+               break;
 
-               if ((a > 0) && (a < 255))
-                       *d = ARGB_JOIN(a, (R_VAL(d) * 255) / a, (G_VAL(d) * 255)
-                                       / a, (B_VAL(d) * 255) / a);
-               d++;
+       default:
+               break;
        }
+       _backends[s->format]->unpremul(&s->data, &data, s->w * s->h);
+       va_end(va);
 }
 /**
  * To be documented
===================================================================
RCS file: /cvs/e/e17/proto/enesim/src/lib/raster/surface/argb8888.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- argb8888.c  17 Oct 2007 21:51:04 -0000      1.1
+++ argb8888.c  19 Oct 2007 15:30:06 -0000      1.2
@@ -3,10 +3,47 @@
 #include "surface.h"
 #include "argb8888.h"
 
+static void argb8888_premul(Enesim_Surface_Data *sdata, int len)
+{
+       DATA32  *d, *e;
+       d = sdata->argb8888.data;
+       e = d + len;
+
+       while (d < e) {
+               DATA32 a = 1 + (*d >> 24);
+
+               *d = (*d & 0xff000000) + (((((*d) >> 8) & 0xff) * a) & 0xff00)
+                               + (((((*d) & 0x00ff00ff) * a) >> 8) & 
0x00ff00ff);
+               d++;
+       }
+}
+
+static void argb8888_unpremul(Enesim_Surface_Data *sdata, Enesim_Surface_Data 
*ddata, int len)
+{
+       DATA32 *d, *s, *e;
+
+       s = sdata->argb8888.data;
+       d = ddata->argb8888.data;
+       
+       e = s + len;
+       while (s < e) {
+               DATA32 a = (*s >> 24);
+
+               if ((a > 0) && (a < 255))
+                       *d = ARGB_JOIN(a, (R_VAL(s) * 255) / a, (G_VAL(s) * 
255) / a,
+                                       (B_VAL(s) * 255) / a);
+               s++;
+               d++;
+       }
+}
+
 Surface_Backend argb8888_backend = {
                .rops = {
                                [ENESIM_RENDERER_BLEND] = {
                                                argb8888_c_color,
                                        },
                },
+               .premul = argb8888_premul,
+               .unpremul = argb8888_unpremul,
 };
+
===================================================================
RCS file: /cvs/e/e17/proto/enesim/src/lib/raster/surface/surface.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- surface.h   17 Oct 2007 21:51:04 -0000      1.3
+++ surface.h   19 Oct 2007 15:30:06 -0000      1.4
@@ -36,6 +36,8 @@
 {
        Surface_Rop_Func rops[ENESIM_RENDERER_ROPS];
        Surface_Conv_Func conv[ENESIM_SURFACE_FORMATS - 1];
+       void (*premul)(Enesim_Surface_Data *sdata, int len);
+       void (*unpremul)(Enesim_Surface_Data *sdata, Enesim_Surface_Data 
*ddata, int len);
 } Surface_Backend;
 
 extern Surface_Backend argb8888_backend;
===================================================================
RCS file: /cvs/e/e17/proto/enesim/src/lib/raster/surface/argb8888.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- argb8888.h  17 Oct 2007 21:51:04 -0000      1.1
+++ argb8888.h  19 Oct 2007 15:30:06 -0000      1.2
@@ -1,6 +1,12 @@
 #ifndef _ARGB8888_H
 #define _ARGB8888_H
 
+#define ARGB_JOIN(a,r,g,b) (((a) << 24) + ((r) << 16) + ((g) << 8) + (b))
+#define A_VAL(p) ((DATA8 *)(p))[3]
+#define R_VAL(p) ((DATA8 *)(p))[2]
+#define G_VAL(p) ((DATA8 *)(p))[1]
+#define B_VAL(p) ((DATA8 *)(p))[0]
+
 static inline DATA32 mul_256(DATA32 a, DATA32 c)
 {
        return  ( (((((c) >> 8) & 0x00ff00ff) * (a)) & 0xff00ff00) +



-------------------------------------------------------------------------
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

Reply via email to