Enlightenment CVS committal
Author : raster
Project : e17
Module : libs/imlib2
Dir : e17/libs/imlib2/src/lib
Modified Files:
Makefile.am blend.c blend.h
Added Files:
amd64_blend_cmod.S
Log Message:
John Slaten's amd64 mmx patch
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/imlib2/src/lib/Makefile.am,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- Makefile.am 9 Apr 2005 00:08:58 -0000 1.4
+++ Makefile.am 15 Apr 2005 07:00:39 -0000 1.5
@@ -75,7 +75,8 @@
asm_scale.S
AMD64_SRCS = \
-amd64_blend.S
+amd64_blend.S \
+amd64_blend_cmod.S
MMX_OBJS = $(MMX_SRCS:.S=.lo)
AMD64_OBJS = $(AMD64_SRCS:.S=.lo)
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/imlib2/src/lib/blend.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- blend.c 9 Apr 2005 00:08:58 -0000 1.2
+++ blend.c 15 Apr 2005 07:00:40 -0000 1.3
@@ -1402,6 +1402,7 @@
#define __imlib_amd64_blend_rgb_to_rgba
__imlib_amd64_copy_rgb_to_rgba
#define __imlib_CopyRGBToRGBCmod __imlib_CopyRGBAToRGBCmod
#define __imlib_mmx_copy_rgb_to_rgb_cmod
__imlib_mmx_copy_rgba_to_rgb_cmod
+#define __imlib_amd64_copy_rgb_to_rgb_cmod
__imlib_amd64_copy_rgba_to_rgb_cmod
#define __imlib_AddCopyRGBToRGB __imlib_AddCopyRGBAToRGB
#define __imlib_AddBlendRGBToRGB __imlib_AddCopyRGBToRGB
@@ -1414,6 +1415,7 @@
#define __imlib_amd64_add_blend_rgb_to_rgba
__imlib_amd64_add_copy_rgb_to_rgba
#define __imlib_AddCopyRGBToRGBCmod __imlib_AddCopyRGBAToRGBCmod
#define __imlib_mmx_add_copy_rgb_to_rgb_cmod
__imlib_mmx_add_copy_rgb_to_rgba_cmod
+#define __imlib_amd64_add_copy_rgb_to_rgb_cmod
__imlib_amd64_add_copy_rgb_to_rgba_cmod
#define __imlib_SubCopyRGBToRGB __imlib_SubCopyRGBAToRGB
#define __imlib_SubBlendRGBToRGB __imlib_SubCopyRGBToRGB
@@ -1427,6 +1429,7 @@
#define __imlib_amd64_subtract_blend_rgb_to_rgba
__imlib_amd64_subtract_copy_rgb_to_rgba
#define __imlib_SubCopyRGBToRGBCmod __imlib_SubCopyRGBAToRGBCmod
#define __imlib_mmx_subtract_copy_rgb_to_rgb_cmod
__imlib_mmx_subtract_copy_rgb_to_rgba_cmod
+#define __imlib_amd64_subtract_copy_rgb_to_rgb_cmod
__imlib_amd64_subtract_copy_rgb_to_rgba_cmod
#define __imlib_ReCopyRGBToRGB __imlib_ReCopyRGBAToRGB
#define __imlib_ReBlendRGBToRGB __imlib_ReCopyRGBToRGB
@@ -1440,6 +1443,7 @@
#define __imlib_amd64_reshade_blend_rgb_to_rgba
__imlib_amd64_reshade_copy_rgb_to_rgba
#define __imlib_ReCopyRGBToRGBCmod __imlib_ReCopyRGBAToRGBCmod
#define __imlib_mmx_reshade_copy_rgb_to_rgb_cmod
__imlib_mmx_reshade_copy_rgb_to_rgba_cmod
+#define __imlib_amd64_reshade_copy_rgb_to_rgb_cmod
__imlib_amd64_reshade_copy_rgb_to_rgba_cmod
ImlibBlendFunction
@@ -1570,10 +1574,14 @@
{{__imlib_amd64_copy_rgba_to_rgba, __imlib_amd64_blend_rgba_to_rgba },
{__imlib_amd64_copy_rgb_to_rgba, __imlib_amd64_blend_rgb_to_rgba}}},
- {{{__imlib_CopyRGBAToRGBCmod, __imlib_BlendRGBAToRGBCmod},
- {__imlib_CopyRGBToRGBCmod, __imlib_BlendRGBToRGBCmod}},
- {{__imlib_CopyRGBAToRGBACmod, __imlib_BlendRGBAToRGBACmod},
- {__imlib_CopyRGBToRGBACmod, __imlib_BlendRGBToRGBACmod}}}},
+ {{{__imlib_amd64_copy_rgba_to_rgb_cmod,
+ __imlib_amd64_blend_rgba_to_rgb_cmod},
+ {__imlib_amd64_copy_rgb_to_rgb_cmod,
+ __imlib_amd64_blend_rgb_to_rgb_cmod}},
+ {{__imlib_amd64_copy_rgba_to_rgba_cmod,
+ __imlib_amd64_blend_rgba_to_rgba_cmod},
+ {__imlib_amd64_copy_rgb_to_rgba_cmod,
+ __imlib_amd64_blend_rgb_to_rgba_cmod}}}},
/*\ OP_ADD \ */
{{{{__imlib_amd64_add_copy_rgba_to_rgb,
__imlib_amd64_add_blend_rgba_to_rgb},
@@ -1584,10 +1592,14 @@
{__imlib_amd64_add_copy_rgb_to_rgba,
__imlib_amd64_add_blend_rgb_to_rgba}}},
- {{{__imlib_AddCopyRGBAToRGBCmod, __imlib_AddBlendRGBAToRGBCmod},
- {__imlib_AddCopyRGBToRGBCmod, __imlib_AddBlendRGBToRGBCmod}},
- {{__imlib_AddCopyRGBAToRGBACmod, __imlib_AddBlendRGBAToRGBACmod},
- {__imlib_AddCopyRGBToRGBACmod, __imlib_AddBlendRGBToRGBACmod}}}},
+ {{{__imlib_amd64_add_copy_rgba_to_rgb_cmod,
+ __imlib_amd64_add_blend_rgba_to_rgb_cmod},
+ {__imlib_amd64_add_copy_rgb_to_rgb_cmod,
+ __imlib_amd64_add_blend_rgb_to_rgb_cmod}},
+ {{__imlib_amd64_add_copy_rgba_to_rgba_cmod,
+ __imlib_amd64_add_blend_rgba_to_rgba_cmod},
+ {__imlib_amd64_add_copy_rgb_to_rgba_cmod,
+ __imlib_amd64_add_blend_rgb_to_rgba_cmod}}}},
/*\ OP_SUBTRACT \ */
{{{{__imlib_amd64_subtract_copy_rgba_to_rgb,
__imlib_amd64_subtract_blend_rgba_to_rgb},
@@ -1598,10 +1610,14 @@
{__imlib_amd64_subtract_copy_rgb_to_rgba,
__imlib_amd64_subtract_blend_rgb_to_rgba}}},
- {{{__imlib_SubCopyRGBAToRGBCmod, __imlib_SubBlendRGBAToRGBCmod},
- {__imlib_SubCopyRGBToRGBCmod, __imlib_SubBlendRGBToRGBCmod}},
- {{__imlib_SubCopyRGBAToRGBACmod, __imlib_SubBlendRGBAToRGBACmod},
- {__imlib_SubCopyRGBToRGBACmod, __imlib_SubBlendRGBToRGBACmod}}}},
+ {{{__imlib_amd64_subtract_copy_rgba_to_rgb_cmod,
+ __imlib_amd64_subtract_blend_rgba_to_rgb_cmod},
+ {__imlib_amd64_subtract_copy_rgb_to_rgb_cmod,
+ __imlib_amd64_subtract_blend_rgb_to_rgb_cmod}},
+ {{__imlib_amd64_subtract_copy_rgba_to_rgba_cmod,
+ __imlib_amd64_subtract_blend_rgba_to_rgba_cmod},
+ {__imlib_amd64_subtract_copy_rgb_to_rgba_cmod,
+ __imlib_amd64_subtract_blend_rgb_to_rgba_cmod}}}},
/*\ OP_RESHADE \ */
{{{{__imlib_amd64_reshade_copy_rgba_to_rgb,
__imlib_amd64_reshade_blend_rgba_to_rgb},
@@ -1612,10 +1628,14 @@
{__imlib_amd64_reshade_copy_rgb_to_rgba,
__imlib_amd64_reshade_blend_rgb_to_rgba}}},
- {{{__imlib_ReCopyRGBAToRGBCmod, __imlib_ReBlendRGBAToRGBCmod},
- {__imlib_ReCopyRGBToRGBCmod, __imlib_ReBlendRGBToRGBCmod}},
- {{__imlib_ReCopyRGBAToRGBACmod, __imlib_ReBlendRGBAToRGBACmod},
- {__imlib_ReCopyRGBToRGBACmod, __imlib_ReBlendRGBToRGBACmod}}}}},
+ {{{__imlib_amd64_reshade_copy_rgba_to_rgb_cmod,
+ __imlib_amd64_reshade_blend_rgba_to_rgb_cmod},
+ {__imlib_amd64_reshade_copy_rgb_to_rgb_cmod,
+ __imlib_amd64_reshade_blend_rgb_to_rgb_cmod}},
+ {{__imlib_amd64_reshade_copy_rgba_to_rgba_cmod,
+ __imlib_amd64_reshade_blend_rgba_to_rgba_cmod},
+ {__imlib_amd64_reshade_copy_rgb_to_rgba_cmod,
+ __imlib_amd64_reshade_blend_rgb_to_rgba_cmod}}}}},
#endif
};
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/imlib2/src/lib/blend.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- blend.h 9 Apr 2005 00:08:58 -0000 1.2
+++ blend.h 15 Apr 2005 07:00:40 -0000 1.3
@@ -613,5 +613,90 @@
__imlib_amd64_reshade_copy_rgb_to_rgba(DATA32 *src, int sw, DATA32 *dst,
int dw, int w, int h, ImlibColorModifier
*cm);
+
+void
+__imlib_amd64_blend_rgba_to_rgb_cmod(DATA32 *src, int sw, DATA32 *dst,
+ int dw, int w, int h, ImlibColorModifier *cm);
+void
+__imlib_amd64_blend_rgba_to_rgba_cmod(DATA32 *src, int sw, DATA32 *dst,
+ int dw, int w, int h, ImlibColorModifier *cm);
+void
+__imlib_amd64_blend_rgb_to_rgb_cmod(DATA32 *src, int sw, DATA32 *dst,
+ int dw, int w, int h, ImlibColorModifier *cm);
+void
+__imlib_amd64_blend_rgb_to_rgba_cmod(DATA32 *src, int sw, DATA32 *dst,
+ int dw, int w, int h, ImlibColorModifier *cm);
+void
+__imlib_amd64_copy_rgba_to_rgb_cmod(DATA32 *src, int sw, DATA32 *dst,
+ int dw, int w, int h, ImlibColorModifier *cm);
+void
+__imlib_amd64_copy_rgba_to_rgba_cmod(DATA32 *src, int sw, DATA32 *dst,
+ int dw, int w, int h, ImlibColorModifier *cm);
+void
+__imlib_amd64_copy_rgb_to_rgba_cmod(DATA32 *src, int sw, DATA32 *dst,
+ int dw, int w, int h, ImlibColorModifier *cm);
+void
+__imlib_amd64_add_blend_rgba_to_rgb_cmod(DATA32 *src, int sw, DATA32 *dst,
+ int dw, int w, int h, ImlibColorModifier *cm);
+void
+__imlib_amd64_add_blend_rgba_to_rgba_cmod(DATA32 *src, int sw, DATA32 *dst,
+ int dw, int w, int h, ImlibColorModifier
*cm);
+void
+__imlib_amd64_add_blend_rgb_to_rgb_cmod(DATA32 *src, int sw, DATA32 *dst,
+ int dw, int w, int h, ImlibColorModifier *cm);
+void
+__imlib_amd64_add_blend_rgb_to_rgba_cmod(DATA32 *src, int sw, DATA32 *dst,
+ int dw, int w, int h, ImlibColorModifier
*cm);
+void
+__imlib_amd64_add_copy_rgba_to_rgb_cmod(DATA32 *src, int sw, DATA32 *dst,
+ int dw, int w, int h, ImlibColorModifier *cm);
+void
+__imlib_amd64_add_copy_rgba_to_rgba_cmod(DATA32 *src, int sw, DATA32 *dst,
+ int dw, int w, int h, ImlibColorModifier *cm);
+void
+__imlib_amd64_add_copy_rgb_to_rgba_cmod(DATA32 *src, int sw, DATA32 *dst,
+ int dw, int w, int h, ImlibColorModifier *cm);
+void
+__imlib_amd64_subtract_blend_rgba_to_rgb_cmod(DATA32 *src, int sw, DATA32 *dst,
+ int dw, int w, int h, ImlibColorModifier
*cm);
+void
+__imlib_amd64_subtract_blend_rgba_to_rgba_cmod(DATA32 *src, int sw, DATA32
*dst,
+ int dw, int w, int h,
ImlibColorModifier *cm);
+void
+__imlib_amd64_subtract_blend_rgb_to_rgb_cmod(DATA32 *src, int sw, DATA32 *dst,
+ int dw, int w, int h, ImlibColorModifier
*cm);
+void
+__imlib_amd64_subtract_blend_rgb_to_rgba_cmod(DATA32 *src, int sw, DATA32 *dst,
+ int dw, int w, int h,
ImlibColorModifier *cm);
+void
+__imlib_amd64_subtract_copy_rgba_to_rgb_cmod(DATA32 *src, int sw, DATA32 *dst,
+ int dw, int w, int h, ImlibColorModifier
*cm);
+void
+__imlib_amd64_subtract_copy_rgba_to_rgba_cmod(DATA32 *src, int sw, DATA32 *dst,
+ int dw, int w, int h, ImlibColorModifier
*cm);
+void
+__imlib_amd64_subtract_copy_rgb_to_rgba_cmod(DATA32 *src, int sw, DATA32 *dst,
+ int dw, int w, int h, ImlibColorModifier
*cm);
+void
+__imlib_amd64_reshade_blend_rgba_to_rgb_cmod(DATA32 *src, int sw, DATA32 *dst,
+ int dw, int w, int h, ImlibColorModifier
*cm);
+void
+__imlib_amd64_reshade_blend_rgba_to_rgba_cmod(DATA32 *src, int sw, DATA32 *dst,
+ int dw, int w, int h, ImlibColorModifier
*cm);
+void
+__imlib_amd64_reshade_blend_rgb_to_rgb_cmod(DATA32 *src, int sw, DATA32 *dst,
+ int dw, int w, int h, ImlibColorModifier
*cm);
+void
+__imlib_amd64_reshade_blend_rgb_to_rgba_cmod(DATA32 *src, int sw, DATA32 *dst,
+ int dw, int w, int h, ImlibColorModifier
*cm);
+void
+__imlib_amd64_reshade_copy_rgba_to_rgb_cmod(DATA32 *src, int sw, DATA32 *dst,
+ int dw, int w, int h, ImlibColorModifier
*cm);
+void
+__imlib_amd64_reshade_copy_rgba_to_rgba_cmod(DATA32 *src, int sw, DATA32 *dst,
+ int dw, int w, int h, ImlibColorModifier
*cm);
+void
+__imlib_amd64_reshade_copy_rgb_to_rgba_cmod(DATA32 *src, int sw, DATA32 *dst,
+ int dw, int w, int h, ImlibColorModifier
*cm);
#endif
#endif
-------------------------------------------------------
SF email is sponsored by - The IT Product Guide
Read honest & candid reviews on hundreds of IT Products from real users.
Discover which products truly live up to the hype. Start reading now.
http://ads.osdn.com/?ad_id=6595&alloc_id=14396&op=click
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
