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


Log Message:


amd64 asm patches

===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/imlib2/src/lib/Makefile.am,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- Makefile.am 2 Nov 2004 06:19:52 -0000       1.3
+++ Makefile.am 9 Apr 2005 00:08:58 -0000       1.4
@@ -74,15 +74,25 @@
 asm_rotate.S \
 asm_scale.S
 
-EXTRA_libImlib2_la_SOURCES = $(MMX_SRCS)
+AMD64_SRCS = \
+amd64_blend.S
 
 MMX_OBJS = $(MMX_SRCS:.S=.lo)
+AMD64_OBJS = $(AMD64_SRCS:.S=.lo)
+
 
 if BUILD_MMX
 libImlib2_la_LIBADD       = $(MMX_OBJS) @my_libs@
 libImlib2_la_DEPENDENCIES = $(top_builddir)/config.h $(MMX_OBJS)
+EXTRA_libImlib2_la_SOURCES = $(MMX_SRCS) 
+else
+if BUILD_AMD64
+libImlib2_la_LIBADD       = $(AMD64_OBJS) @my_libs@
+libImlib2_la_DEPENDENCIES = $(top_builddir)/config.h $(AMD64_OBJS)
+EXTRA_libImlib2_la_SOURCES = $(AMD64_SOURCES)
 else
 libImlib2_la_LIBADD       = @my_libs@
 libImlib2_la_DEPENDENCIES = $(top_builddir)/config.h
 endif
+endif
 libImlib2_la_LDFLAGS      = -version-info 3:0:2
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/imlib2/src/lib/blend.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- blend.c     1 Nov 2004 09:45:30 -0000       1.1
+++ blend.c     9 Apr 2005 00:08:58 -0000       1.2
@@ -1397,6 +1397,9 @@
 #define __imlib_mmx_copy_rgb_to_rgb            __imlib_mmx_copy_rgb_to_rgba
 #define __imlib_mmx_blend_rgb_to_rgb           __imlib_mmx_copy_rgb_to_rgb
 #define __imlib_mmx_blend_rgb_to_rgba          __imlib_mmx_copy_rgb_to_rgba
+#define __imlib_amd64_copy_rgb_to_rgb          __imlib_amd64_copy_rgb_to_rgba
+#define __imlib_amd64_blend_rgb_to_rgb         __imlib_amd64_copy_rgb_to_rgb
+#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
 
@@ -1406,6 +1409,9 @@
 #define __imlib_mmx_add_copy_rgb_to_rgb                
__imlib_mmx_add_copy_rgba_to_rgb
 #define __imlib_mmx_add_blend_rgb_to_rgb       __imlib_mmx_add_copy_rgb_to_rgb
 #define __imlib_mmx_add_blend_rgb_to_rgba      __imlib_mmx_add_copy_rgb_to_rgba
+#define __imlib_amd64_add_copy_rgb_to_rgb              
__imlib_amd64_add_copy_rgba_to_rgb
+#define __imlib_amd64_add_blend_rgb_to_rgb     
__imlib_amd64_add_copy_rgb_to_rgb
+#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
 
@@ -1416,6 +1422,9 @@
 #define __imlib_mmx_subtract_copy_rgb_to_rgb   
__imlib_mmx_subtract_copy_rgba_to_rgb
 #define __imlib_mmx_subtract_blend_rgb_to_rgb  
__imlib_mmx_subtract_copy_rgb_to_rgb
 #define __imlib_mmx_subtract_blend_rgb_to_rgba 
__imlib_mmx_subtract_copy_rgb_to_rgba
+#define __imlib_amd64_subtract_copy_rgb_to_rgb 
__imlib_amd64_subtract_copy_rgba_to_rgb
+#define __imlib_amd64_subtract_blend_rgb_to_rgb        
__imlib_amd64_subtract_copy_rgb_to_rgb
+#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
 
@@ -1426,6 +1435,9 @@
 #define __imlib_mmx_reshade_copy_rgb_to_rgb    
__imlib_mmx_reshade_copy_rgba_to_rgb
 #define __imlib_mmx_reshade_blend_rgb_to_rgb   
__imlib_mmx_reshade_copy_rgb_to_rgb
 #define __imlib_mmx_reshade_blend_rgb_to_rgba  
__imlib_mmx_reshade_copy_rgb_to_rgba
+#define __imlib_amd64_reshade_copy_rgb_to_rgb  
__imlib_amd64_reshade_copy_rgba_to_rgb
+#define __imlib_amd64_reshade_blend_rgb_to_rgb 
__imlib_amd64_reshade_copy_rgb_to_rgb
+#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
 
@@ -1551,6 +1563,59 @@
            /*__imlib_mmx_reshade_blend_rgba_to_rgba_cmod*/ },
           {__imlib_ReCopyRGBToRGBACmod 
/*__imlib_mmx_reshade_copy_rgb_to_rgba_cmod*/,
            __imlib_ReBlendRGBToRGBACmod 
/*__imlib_mmx_reshade_blend_rgb_to_rgba_cmod*/}}}}},
+#elif DO_AMD64_ASM 
+      /*\ OP_COPY \ */
+      {{{{{__imlib_amd64_copy_rgba_to_rgb, __imlib_amd64_blend_rgba_to_rgb},
+          {__imlib_amd64_copy_rgb_to_rgb, __imlib_amd64_blend_rgb_to_rgb}},
+         {{__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}}}},
+       /*\ OP_ADD \ */
+       {{{{__imlib_amd64_add_copy_rgba_to_rgb, 
+          __imlib_amd64_add_blend_rgba_to_rgb},
+          {__imlib_amd64_add_copy_rgb_to_rgb, 
+          __imlib_amd64_add_blend_rgb_to_rgb}},
+         {{__imlib_amd64_add_copy_rgba_to_rgba, 
+          __imlib_amd64_add_blend_rgba_to_rgba},
+          {__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}}}},
+       /*\ OP_SUBTRACT \ */
+       {{{{__imlib_amd64_subtract_copy_rgba_to_rgb,
+           __imlib_amd64_subtract_blend_rgba_to_rgb},
+          {__imlib_amd64_subtract_copy_rgb_to_rgb,
+           __imlib_amd64_subtract_blend_rgb_to_rgb}},
+         {{__imlib_amd64_subtract_copy_rgba_to_rgba,
+           __imlib_amd64_subtract_blend_rgba_to_rgba},
+          {__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}}}},
+       /*\ OP_RESHADE \ */
+       {{{{__imlib_amd64_reshade_copy_rgba_to_rgb,
+           __imlib_amd64_reshade_blend_rgba_to_rgb},
+          {__imlib_amd64_reshade_copy_rgb_to_rgb,
+           __imlib_amd64_reshade_blend_rgb_to_rgb}},
+         {{__imlib_amd64_reshade_copy_rgba_to_rgba,
+           __imlib_amd64_reshade_blend_rgba_to_rgba},
+          {__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}}}}},
 #endif
    };
 
@@ -1564,6 +1629,8 @@
 
 #ifdef DO_MMX_ASM
    do_mmx = !!(__imlib_get_cpuid() & CPUID_MMX);
+#elif DO_AMD64_ASM
+   do_mmx = 1; // instruction set is always present
 #endif
    if (cm && rgb_src && (A_CMOD(cm, 0xff) == 0xff))
       blend = 0;
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/imlib2/src/lib/blend.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- blend.h     1 Nov 2004 09:45:30 -0000       1.1
+++ blend.h     9 Apr 2005 00:08:58 -0000       1.2
@@ -551,6 +551,67 @@
 void
 __imlib_mmx_reshade_copy_rgb_to_rgba_cmod(DATA32 *src, int sw, DATA32 *dst,
                                      int dw, int w, int h, ImlibColorModifier 
*cm);
+#elif DO_AMD64_ASM
+void
+__imlib_amd64_blend_rgba_to_rgb(DATA32 *src, int sw, DATA32 *dst,
+                              int dw, int w, int h, ImlibColorModifier *cm);
+void
+__imlib_amd64_blend_rgba_to_rgba(DATA32 *src, int sw, DATA32 *dst,
+                              int dw, int w, int h, ImlibColorModifier *cm);
+void
+__imlib_amd64_copy_rgba_to_rgb(DATA32 *src, int sw, DATA32 *dst,
+                            int dw, int w, int h, ImlibColorModifier *cm);
+void
+__imlib_amd64_copy_rgba_to_rgba(DATA32 *src, int sw, DATA32 *dst,
+                              int dw, int w, int h, ImlibColorModifier *cm);
+void
+__imlib_amd64_copy_rgb_to_rgba(DATA32 *src, int sw, DATA32 *dst,
+                            int dw, int w, int h, ImlibColorModifier *cm);
+void
+__imlib_amd64_add_blend_rgba_to_rgb(DATA32 *src, int sw, DATA32 *dst,
+                                 int dw, int w, int h, ImlibColorModifier *cm);
+void
+__imlib_amd64_add_blend_rgba_to_rgba(DATA32 *src, int sw, DATA32 *dst,
+                                  int dw, int w, int h, ImlibColorModifier 
*cm);
+void
+__imlib_amd64_add_copy_rgba_to_rgb(DATA32 *src, int sw, DATA32 *dst,
+                                int dw, int w, int h, ImlibColorModifier *cm);
+void
+__imlib_amd64_add_copy_rgba_to_rgba(DATA32 *src, int sw, DATA32 *dst,
+                                 int dw, int w, int h, ImlibColorModifier *cm);
+void
+__imlib_amd64_add_copy_rgb_to_rgba(DATA32 *src, int sw, DATA32 *dst,
+                                 int dw, int w, int h, ImlibColorModifier *cm);
+void
+__imlib_amd64_subtract_blend_rgba_to_rgb(DATA32 *src, int sw, DATA32 *dst,
+                                      int dw, int w, int h, ImlibColorModifier 
*cm);
+void
+__imlib_amd64_subtract_blend_rgba_to_rgba(DATA32 *src, int sw, DATA32 *dst,
+                                       int dw, int w, int h, 
ImlibColorModifier *cm);
+void
+__imlib_amd64_subtract_copy_rgba_to_rgb(DATA32 *src, int sw, DATA32 *dst,
+                                     int dw, int w, int h, ImlibColorModifier 
*cm);
+void
+__imlib_amd64_subtract_copy_rgba_to_rgba(DATA32 *src, int sw, DATA32 *dst,
+                                      int dw, int w, int h, ImlibColorModifier 
*cm);
+void
+__imlib_amd64_subtract_copy_rgb_to_rgba(DATA32 *src, int sw, DATA32 *dst,
+                                      int dw, int w, int h, ImlibColorModifier 
*cm);
+void
+__imlib_amd64_reshade_blend_rgba_to_rgb(DATA32 *src, int sw, DATA32 *dst,
+                                     int dw, int w, int h, ImlibColorModifier 
*cm);
+void
+__imlib_amd64_reshade_blend_rgba_to_rgba(DATA32 *src, int sw, DATA32 *dst,
+                                      int dw, int w, int h, ImlibColorModifier 
*cm);
+void
+__imlib_amd64_reshade_copy_rgba_to_rgb(DATA32 *src, int sw, DATA32 *dst,
+                                    int dw, int w, int h, ImlibColorModifier 
*cm);
+void
+__imlib_amd64_reshade_copy_rgba_to_rgba(DATA32 *src, int sw, DATA32 *dst,
+                                     int dw, int w, int h, ImlibColorModifier 
*cm);
+void
+__imlib_amd64_reshade_copy_rgb_to_rgba(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
[email protected]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

Reply via email to