From: <enl...@li...> - 2005-04-26 22:56:33
|
Enlightenment CVS committal Author : vapier Project : e17 Module : libs/imlib2 Dir : e17/libs/imlib2 Modified Files: autogen.sh Log Message: allow for setting of env var to prevent running ./configure like the older autogen scripts allowed =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/imlib2/autogen.sh,v retrieving revision 1.27 retrieving revision 1.28 diff -u -3 -r1.27 -r1.28 --- autogen.sh 5 Mar 2005 04:47:20 -0000 1.27 +++ autogen.sh 26 Apr 2005 22:55:56 -0000 1.28 @@ -11,5 +11,6 @@ && echo "Running libtoolize..."; (libtoolize --automake || glibtoolize --automake) \ && echo "Running automake..."; automake --add-missing --copy --gnu -### If you want this, uncomment it. -./configure "$@" +if [ -z "$NOCONFIGURE" ]; then + ./configure "$@" +fi |
From: <enl...@li...> - 2005-04-29 02:10:45
|
Enlightenment CVS committal Author : vapier Project : e17 Module : libs/imlib2 Dir : e17/libs/imlib2 Modified Files: configure.in Log Message: remove AC_CANONICAL_TARGET and use $host* variables instead of $target* variables since thats how it works =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/imlib2/configure.in,v retrieving revision 1.99 retrieving revision 1.100 diff -u -3 -r1.99 -r1.100 --- configure.in 23 Apr 2005 08:39:40 -0000 1.99 +++ configure.in 29 Apr 2005 02:10:36 -0000 1.100 @@ -4,7 +4,6 @@ AC_INIT(configure.in) AC_CANONICAL_BUILD AC_CANONICAL_HOST -AC_CANONICAL_TARGET AC_ISC_POSIX AM_INIT_AUTOMAKE(imlib2, 1.2.0.005) AM_CONFIG_HEADER(config.h) @@ -91,7 +90,7 @@ mmx=no amd64=no -case $target_cpu in +case $host_cpu in i*86) mmx="yes" ;; |
From: <enl...@li...> - 2005-05-20 21:44:45
|
Enlightenment CVS committal Author : vapier Project : e17 Module : libs/imlib2 Dir : e17/libs/imlib2 Modified Files: configure.in Log Message: we want to search for libX11 not libX ( http://bugs.gentoo.org/93300 ) =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/imlib2/configure.in,v retrieving revision 1.102 retrieving revision 1.103 diff -u -3 -r1.102 -r1.103 --- configure.in 7 May 2005 06:01:18 -0000 1.102 +++ configure.in 20 May 2005 21:44:38 -0000 1.103 @@ -153,7 +153,7 @@ freetype_cflags=`$FREETYPE_CONFIG --cflags` freetype_libs=`$FREETYPE_CONFIG --libs` -AC_PATH_X([X], [X11/Xlib.h], [XOpenDisplay(NULL)]) +AC_PATH_X([X11], [X11/Xlib.h], [XOpenDisplay(NULL)]) if test "x$have_x" = "xno"; then # If --without-x was passed, this will be "disabled" instead of "no" -- |
From: <enl...@li...> - 2005-08-03 01:00:59
|
Enlightenment CVS committal Author : vapier Project : e17 Module : libs/imlib2 Dir : e17/libs/imlib2 Modified Files: autogen.sh Log Message: add error checking to all autogen scripts =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/imlib2/autogen.sh,v retrieving revision 1.28 retrieving revision 1.29 diff -u -3 -r1.28 -r1.29 --- autogen.sh 26 Apr 2005 22:55:56 -0000 1.28 +++ autogen.sh 3 Aug 2005 01:00:20 -0000 1.29 @@ -1,15 +1,15 @@ #!/bin/sh rm -rf autom4te.cache -rm -f aclocal.m4 +rm -f aclocal.m4 ltmain.sh touch README -echo "Running aclocal..."; aclocal $ACLOCAL_FLAGS -I m4 \ -&& echo "Running autoheader..."; autoheader \ -&& echo "Running autoconf..."; autoconf \ -&& echo "Running libtoolize..."; (libtoolize --automake || glibtoolize --automake) \ -&& echo "Running automake..."; automake --add-missing --copy --gnu +echo "Running aclocal..." ; aclocal $ACLOCAL_FLAGS -I m4 || exit 1 +echo "Running autoheader..." ; autoheader || exit 1 +echo "Running autoconf..." ; autoconf || exit 1 +echo "Running libtoolize..." ; (libtoolize --copy --automake || glibtoolize --automake) || exit 1 +echo "Running automake..." ; automake --add-missing --copy --gnu || exit 1 if [ -z "$NOCONFIGURE" ]; then ./configure "$@" |
From: <enl...@li...> - 2005-08-05 21:46:03
|
Enlightenment CVS committal Author : vapier Project : e17 Module : libs/imlib2 Dir : e17/libs/imlib2/src/lib Modified Files: amd64_blend.S amd64_blend_cmod.S asm_blend.S asm_blend_cmod.S asm_rgba.S asm_rotate.S asm_scale.S Log Message: fix whitespace =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/imlib2/src/lib/amd64_blend.S,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- amd64_blend.S 9 Apr 2005 00:08:58 -0000 1.1 +++ amd64_blend.S 5 Aug 2005 21:45:56 -0000 1.2 @@ -33,7 +33,7 @@ \*/ .text - .align 16 + .align 16 .globl PR_(imlib_amd64_blend_rgba_to_rgb) .type PT_(imlib_amd64_blend_rgba_to_rgb,@function) .globl PR_(imlib_amd64_blend_rgba_to_rgba) =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/imlib2/src/lib/amd64_blend_cmod.S,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- amd64_blend_cmod.S 15 Apr 2005 07:00:40 -0000 1.1 +++ amd64_blend_cmod.S 5 Aug 2005 21:45:56 -0000 1.2 @@ -33,7 +33,7 @@ \*/ .text - .align 16 + .align 16 .globl PR_(imlib_amd64_blend_rgba_to_rgb_cmod) .type PT_(imlib_amd64_blend_rgba_to_rgb_cmod,@function) .globl PR_(imlib_amd64_blend_rgba_to_rgba_cmod) =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/imlib2/src/lib/asm_blend.S,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- asm_blend.S 1 Nov 2004 09:45:30 -0000 1.1 +++ asm_blend.S 5 Aug 2005 21:45:56 -0000 1.2 @@ -41,7 +41,7 @@ #define cm 32(%ebp) .text - .align 8 + .align 8 .globl PR_(imlib_mmx_blend_rgba_to_rgb) .type PT_(imlib_mmx_blend_rgba_to_rgb,@function) .globl PR_(imlib_mmx_blend_rgba_to_rgba) @@ -348,7 +348,7 @@ subl $4, %edi LOOP_START - incl %ecx + incl %ecx jz 2f 1: /*\ Load source, save destination \*/ @@ -469,7 +469,7 @@ subl $4, %edi LOOP_START - incl %ecx + incl %ecx jz 2f 1: /*\ Load source and destination \*/ @@ -505,7 +505,7 @@ subl $4, %edi LOOP_START - incl %ecx + incl %ecx jz 2f 1: /*\ Load source and destination \*/ @@ -539,7 +539,7 @@ subl $4, %edi LOOP_START - incl %ecx + incl %ecx jz 2f 1: /*\ Load source and destination \*/ @@ -667,7 +667,7 @@ subl $4, %edi LOOP_START - incl %ecx + incl %ecx jz 2f 1: /*\ Load source and destination \*/ @@ -705,7 +705,7 @@ subl $4, %edi LOOP_START - incl %ecx + incl %ecx jz 2f 1: /*\ Load source and destination \*/ @@ -747,7 +747,7 @@ subl $4, %edi LOOP_START - incl %ecx + incl %ecx jz 2f 1: /*\ Load source and destination \*/ @@ -882,7 +882,7 @@ subl $4, %edi LOOP_START - incl %ecx + incl %ecx jz 2f 1: /*\ Load source and destination \*/ @@ -946,7 +946,7 @@ subl $4, %edi LOOP_START - incl %ecx + incl %ecx jz 2f 1: /*\ Load source and destination \*/ @@ -1012,7 +1012,7 @@ subl $4, %edi LOOP_START - incl %ecx + incl %ecx jz 2f 1: /*\ Load source and destination \*/ =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/imlib2/src/lib/asm_blend_cmod.S,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- asm_blend_cmod.S 1 Nov 2004 09:45:30 -0000 1.1 +++ asm_blend_cmod.S 5 Aug 2005 21:45:56 -0000 1.2 @@ -48,7 +48,7 @@ #define amap_ff 0x3ff(%ebx) .text - .align 8 + .align 8 .globl PR_(imlib_mmx_blend_rgba_to_rgb_cmod) .type PT_(imlib_mmx_blend_rgba_to_rgb_cmod,@function) .globl PR_(imlib_mmx_blend_rgba_to_rgba_cmod) @@ -832,8 +832,8 @@ subl $4, %edi LOOP_START - incl %ecx - jz 2f + incl %ecx + jz 2f 1: /*\ Load source and destination \*/ LOAD2_CMOD @@ -868,8 +868,8 @@ subl $4, %edi LOOP_START - incl %ecx - jz 2f + incl %ecx + jz 2f 1: /*\ Load source and destination \*/ LOAD2_CMOD @@ -900,8 +900,8 @@ subl $4, %edi LOOP_START - incl %ecx - jz 2f + incl %ecx + jz 2f 1: /*\ Load source and destination \*/ LOAD2_CMOD_AFF @@ -1114,8 +1114,8 @@ subl $4, %edi LOOP_START - incl %ecx - jz 2f + incl %ecx + jz 2f 1: /*\ Load source and destination \*/ LOAD2_CMOD @@ -1152,8 +1152,8 @@ subl $4, %edi LOOP_START - incl %ecx - jz 2f + incl %ecx + jz 2f 1: /*\ Load source and destination \*/ LOAD2_CMOD @@ -1194,8 +1194,8 @@ subl $4, %edi LOOP_START - incl %ecx - jz 2f + incl %ecx + jz 2f 1: /*\ Load source and destination \*/ LOAD2_CMOD_AFF @@ -1424,8 +1424,8 @@ subl $4, %edi LOOP_START - incl %ecx - jz 2f + incl %ecx + jz 2f 1: /*\ Load source and destination \*/ LOAD2_CMOD @@ -1488,8 +1488,8 @@ subl $4, %edi LOOP_START - incl %ecx - jz 2f + incl %ecx + jz 2f 1: /*\ Load source and destination \*/ LOAD2_CMOD @@ -1553,8 +1553,8 @@ subl $4, %edi LOOP_START - incl %ecx - jz 2f + incl %ecx + jz 2f 1: /*\ Load source and destination \*/ LOAD2_CMOD_AFF =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/imlib2/src/lib/asm_rgba.S,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- asm_rgba.S 1 Nov 2004 09:45:30 -0000 1.1 +++ asm_rgba.S 5 Aug 2005 21:45:56 -0000 1.2 @@ -42,7 +42,7 @@ #define dy 36(%ebp) .text - .align 8 + .align 8 .globl PR_(imlib_mmx_rgb565_fast) .type PT_(imlib_mmx_rgb565_fast,@function) .globl PR_(imlib_mmx_bgr565_fast) =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/imlib2/src/lib/asm_rotate.S,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- asm_rotate.S 1 Nov 2004 09:45:30 -0000 1.1 +++ asm_rotate.S 5 Aug 2005 21:45:56 -0000 1.2 @@ -26,7 +26,7 @@ \*/ .text - .align 8 + .align 8 .globl PR_(imlib_mmx_RotateAA) .type PT_(imlib_mmx_RotateAA,@function) =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/imlib2/src/lib/asm_scale.S,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- asm_scale.S 1 Nov 2004 09:45:30 -0000 1.1 +++ asm_scale.S 5 Aug 2005 21:45:56 -0000 1.2 @@ -26,7 +26,7 @@ \*/ .text - .align 8 + .align 8 .globl PR_(imlib_Scale_mmx_AARGBA) .type PT_(imlib_Scale_mmx_AARGBA,@function) |
From: <enl...@li...> - 2005-08-06 20:30:37
|
Enlightenment CVS committal Author : vapier Project : e17 Module : libs/imlib2 Dir : e17/libs/imlib2/src/lib Modified Files: amd64_blend.S amd64_blend_cmod.S asm_blend.S asm_blend_cmod.S asm_rgba.S asm_rotate.S asm_scale.S Log Message: fixes from the PaX guys to make sure we dont have executable stacks =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/imlib2/src/lib/amd64_blend.S,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- amd64_blend.S 5 Aug 2005 21:45:56 -0000 1.2 +++ amd64_blend.S 6 Aug 2005 20:30:15 -0000 1.3 @@ -5556,5 +5556,5 @@ LEAVE SIZE(imlib_amd64_reshade_copy_rgb_to_rgba) - +.section .note.GNU-stack,"",@progbits #endif =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/imlib2/src/lib/amd64_blend_cmod.S,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- amd64_blend_cmod.S 5 Aug 2005 21:45:56 -0000 1.2 +++ amd64_blend_cmod.S 6 Aug 2005 20:30:26 -0000 1.3 @@ -16821,5 +16821,5 @@ LEAVE SIZE(imlib_amd64_reshade_copy_rgb_to_rgba_cmod) - +.section .note.GNU-stack,"",@progbits #endif =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/imlib2/src/lib/asm_blend.S,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- asm_blend.S 5 Aug 2005 21:45:56 -0000 1.2 +++ asm_blend.S 6 Aug 2005 20:30:27 -0000 1.3 @@ -1056,4 +1056,5 @@ SIZE(imlib_mmx_reshade_copy_rgb_to_rgba) +.section .note.GNU-stack,"",@progbits #endif =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/imlib2/src/lib/asm_blend_cmod.S,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- asm_blend_cmod.S 5 Aug 2005 21:45:56 -0000 1.2 +++ asm_blend_cmod.S 6 Aug 2005 20:30:27 -0000 1.3 @@ -1601,4 +1601,5 @@ SIZE(imlib_mmx_reshade_copy_rgb_to_rgba_cmod) +.section .note.GNU-stack,"",@progbits #endif =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/imlib2/src/lib/asm_rgba.S,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- asm_rgba.S 5 Aug 2005 21:45:56 -0000 1.2 +++ asm_rgba.S 6 Aug 2005 20:30:27 -0000 1.3 @@ -298,4 +298,5 @@ SIZE(imlib_get_cpuid) +.section .note.GNU-stack,"",@progbits #endif =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/imlib2/src/lib/asm_rotate.S,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- asm_rotate.S 5 Aug 2005 21:45:56 -0000 1.2 +++ asm_rotate.S 6 Aug 2005 20:30:27 -0000 1.3 @@ -465,5 +465,5 @@ SIZE(imlib_mmx_RotateAA) +.section .note.GNU-stack,"",@progbits #endif - =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/imlib2/src/lib/asm_scale.S,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- asm_scale.S 5 Aug 2005 21:45:56 -0000 1.2 +++ asm_scale.S 6 Aug 2005 20:30:27 -0000 1.3 @@ -806,4 +806,5 @@ SIZE(imlib_Scale_mmx_AARGBA) +.section .note.GNU-stack,"",@progbits #endif |
From: <enl...@li...> - 2005-08-07 07:07:44
|
Enlightenment CVS committal Author : vapier Project : e17 Module : libs/imlib2 Dir : e17/libs/imlib2/src/lib Modified Files: amd64_blend.S amd64_blend_cmod.S Log Message: make sure the masks are in the .data section like they should be =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/imlib2/src/lib/amd64_blend.S,v retrieving revision 1.3 retrieving revision 1.4 diff -u -3 -r1.3 -r1.4 --- amd64_blend.S 6 Aug 2005 20:30:15 -0000 1.3 +++ amd64_blend.S 7 Aug 2005 07:07:23 -0000 1.4 @@ -26,6 +26,42 @@ |*| Based on MMX routines written by Willem Monsuwe <wi...@st...> \*/ +/*\ Some useful masks \*/ +.data +m0X000000: .byte 0, 0, 0, 0, 0, 0, 255, 0 + .byte 0, 0, 0, 0, 0, 0, 255, 0 +m10000000: .byte 0, 0, 0, 0, 0, 0, 0, 1 + .byte 0, 0, 0, 0, 0, 0, 0, 1 +m00XXXXXX: .byte 255, 255, 255, 255, 255, 255, 0, 0 + .byte 255, 255, 255, 255, 255, 255, 0, 0 +mVX000000: .byte 0, 0, 0, 0, 0, 0, 255, 127 + .byte 0, 0, 0, 0, 0, 0, 255, 127 +mV0000000: .byte 0, 0, 0, 0, 0, 0, 0, 128 + .byte 0, 0, 0, 0, 0, 0, 0, 128 +mX000X000: .byte 0, 0, 0, 0, 0, 0, 255, 255 + .byte 0, 0, 0, 0, 0, 0, 255, 255 +m0XXX0XXX0XXX0XXX: .byte 255, 255, 255, 0, 255, 255, 255, 0 + .byte 255, 255, 255, 0, 255, 255, 255, 0 +m0XXX0XXX00000000: .byte 255, 255, 255, 0, 255, 255, 255, 0 + .byte 0, 0, 0, 0, 0, 0, 0, 0 +m0XXX000000000000: .byte 255, 255, 255, 0, 0, 0, 0, 0 + .byte 0, 0, 0, 0, 0, 0, 0, 0 +mX000X000X000X000: .byte 0, 0, 0, 255, 0, 0, 0, 255 + .byte 0, 0, 0, 255, 0, 0, 0, 255 +mX000X00000000000: .byte 0, 0, 0, 255, 0, 0, 0, 255 + .byte 0, 0, 0, 255, 0, 0, 0, 255 +mX000000000000000: .byte 0, 0, 0, 255, 0, 0, 0, 255 + .byte 0, 0, 0, 255, 0, 0, 0, 255 +m1000100010001000: .byte 0, 0, 0, 1, 0, 0, 0, 1 + .byte 0, 0, 0, 1, 0, 0, 0, 1 +m000V0V0V000V0V0V: .byte 127, 0, 127, 0, 127, 0, 0, 0 + .byte 127, 0, 127, 0, 127, 0, 0, 0 +mI0000000I0000000: .byte 0, 0, 0, 0, 0, 0, 0, 64 + .byte 0, 0, 0, 0, 0, 0, 0, 64 +m0VVV0VVV0VVV0VVV: .byte 127, 127, 127, 0, 127, 127, 127, 0 + .byte 127, 127, 127, 0, 127, 127, 127, 0 +c1: .word 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1 + /*\ All functions have the same calling convention: |*| __imlib_amd64_<op>_rgba_to_rgb[A](void *src, int sw, void *dst, int dw, |*| int w, int h, ImlibColorModifier *cm) @@ -80,41 +116,6 @@ .extern pow_lut -/*\ Some useful masks \*/ -m0X000000: .byte 0, 0, 0, 0, 0, 0, 255, 0 - .byte 0, 0, 0, 0, 0, 0, 255, 0 -m10000000: .byte 0, 0, 0, 0, 0, 0, 0, 1 - .byte 0, 0, 0, 0, 0, 0, 0, 1 -m00XXXXXX: .byte 255, 255, 255, 255, 255, 255, 0, 0 - .byte 255, 255, 255, 255, 255, 255, 0, 0 -mVX000000: .byte 0, 0, 0, 0, 0, 0, 255, 127 - .byte 0, 0, 0, 0, 0, 0, 255, 127 -mV0000000: .byte 0, 0, 0, 0, 0, 0, 0, 128 - .byte 0, 0, 0, 0, 0, 0, 0, 128 -mX000X000: .byte 0, 0, 0, 0, 0, 0, 255, 255 - .byte 0, 0, 0, 0, 0, 0, 255, 255 -m0XXX0XXX0XXX0XXX: .byte 255, 255, 255, 0, 255, 255, 255, 0 - .byte 255, 255, 255, 0, 255, 255, 255, 0 -m0XXX0XXX00000000: .byte 255, 255, 255, 0, 255, 255, 255, 0 - .byte 0, 0, 0, 0, 0, 0, 0, 0 -m0XXX000000000000: .byte 255, 255, 255, 0, 0, 0, 0, 0 - .byte 0, 0, 0, 0, 0, 0, 0, 0 -mX000X000X000X000: .byte 0, 0, 0, 255, 0, 0, 0, 255 - .byte 0, 0, 0, 255, 0, 0, 0, 255 -mX000X00000000000: .byte 0, 0, 0, 255, 0, 0, 0, 255 - .byte 0, 0, 0, 255, 0, 0, 0, 255 -mX000000000000000: .byte 0, 0, 0, 255, 0, 0, 0, 255 - .byte 0, 0, 0, 255, 0, 0, 0, 255 -m1000100010001000: .byte 0, 0, 0, 1, 0, 0, 0, 1 - .byte 0, 0, 0, 1, 0, 0, 0, 1 -m000V0V0V000V0V0V: .byte 127, 0, 127, 0, 127, 0, 0, 0 - .byte 127, 0, 127, 0, 127, 0, 0, 0 -mI0000000I0000000: .byte 0, 0, 0, 0, 0, 0, 0, 64 - .byte 0, 0, 0, 0, 0, 0, 0, 64 -m0VVV0VVV0VVV0VVV: .byte 127, 127, 127, 0, 127, 127, 127, 0 - .byte 127, 127, 127, 0, 127, 127, 127, 0 -c1: .word 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1 - /*\ SSE register use: |*| %xmm1 = Source value |*| %xmm2 = Destination value =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/imlib2/src/lib/amd64_blend_cmod.S,v retrieving revision 1.3 retrieving revision 1.4 diff -u -3 -r1.3 -r1.4 --- amd64_blend_cmod.S 6 Aug 2005 20:30:26 -0000 1.3 +++ amd64_blend_cmod.S 7 Aug 2005 07:07:24 -0000 1.4 @@ -26,6 +26,42 @@ |*| Based on MMX routines written by Willem Monsuwe <wi...@st...> \*/ +/*\ Some useful masks \*/ +.data +m0X000000: .byte 0, 0, 0, 0, 0, 0, 255, 0 + .byte 0, 0, 0, 0, 0, 0, 255, 0 +m10000000: .byte 0, 0, 0, 0, 0, 0, 0, 1 + .byte 0, 0, 0, 0, 0, 0, 0, 1 +m00XXXXXX: .byte 255, 255, 255, 255, 255, 255, 0, 0 + .byte 255, 255, 255, 255, 255, 255, 0, 0 +mVX000000: .byte 0, 0, 0, 0, 0, 0, 255, 127 + .byte 0, 0, 0, 0, 0, 0, 255, 127 +mV0000000: .byte 0, 0, 0, 0, 0, 0, 0, 128 + .byte 0, 0, 0, 0, 0, 0, 0, 128 +mX000X000: .byte 0, 0, 0, 0, 0, 0, 255, 255 + .byte 0, 0, 0, 0, 0, 0, 255, 255 +m0XXX0XXX0XXX0XXX: .byte 255, 255, 255, 0, 255, 255, 255, 0 + .byte 255, 255, 255, 0, 255, 255, 255, 0 +m0XXX0XXX00000000: .byte 255, 255, 255, 0, 255, 255, 255, 0 + .byte 0, 0, 0, 0, 0, 0, 0, 0 +m0XXX000000000000: .byte 255, 255, 255, 0, 0, 0, 0, 0 + .byte 0, 0, 0, 0, 0, 0, 0, 0 +mX000X000X000X000: .byte 0, 0, 0, 255, 0, 0, 0, 255 + .byte 0, 0, 0, 255, 0, 0, 0, 255 +mX000X00000000000: .byte 0, 0, 0, 255, 0, 0, 0, 255 + .byte 0, 0, 0, 255, 0, 0, 0, 255 +mX000000000000000: .byte 0, 0, 0, 255, 0, 0, 0, 255 + .byte 0, 0, 0, 255, 0, 0, 0, 255 +m1000100010001000: .byte 0, 0, 0, 1, 0, 0, 0, 1 + .byte 0, 0, 0, 1, 0, 0, 0, 1 +m000V0V0V000V0V0V: .byte 127, 0, 127, 0, 127, 0, 0, 0 + .byte 127, 0, 127, 0, 127, 0, 0, 0 +mI0000000I0000000: .byte 0, 0, 0, 0, 0, 0, 0, 64 + .byte 0, 0, 0, 0, 0, 0, 0, 64 +m0VVV0VVV0VVV0VVV: .byte 127, 127, 127, 0, 127, 127, 127, 0 + .byte 127, 127, 127, 0, 127, 127, 127, 0 +c1: .word 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1 + /*\ All functions have the same calling convention: |*| __imlib_amd64_<op>_rgba_to_rgb[A](void *src, int sw, void *dst, int dw, |*| int w, int h, ImlibColorModifier *cm) @@ -96,41 +132,6 @@ .extern pow_lut -/*\ Some useful masks \*/ -m0X000000: .byte 0, 0, 0, 0, 0, 0, 255, 0 - .byte 0, 0, 0, 0, 0, 0, 255, 0 -m10000000: .byte 0, 0, 0, 0, 0, 0, 0, 1 - .byte 0, 0, 0, 0, 0, 0, 0, 1 -m00XXXXXX: .byte 255, 255, 255, 255, 255, 255, 0, 0 - .byte 255, 255, 255, 255, 255, 255, 0, 0 -mVX000000: .byte 0, 0, 0, 0, 0, 0, 255, 127 - .byte 0, 0, 0, 0, 0, 0, 255, 127 -mV0000000: .byte 0, 0, 0, 0, 0, 0, 0, 128 - .byte 0, 0, 0, 0, 0, 0, 0, 128 -mX000X000: .byte 0, 0, 0, 0, 0, 0, 255, 255 - .byte 0, 0, 0, 0, 0, 0, 255, 255 -m0XXX0XXX0XXX0XXX: .byte 255, 255, 255, 0, 255, 255, 255, 0 - .byte 255, 255, 255, 0, 255, 255, 255, 0 -m0XXX0XXX00000000: .byte 255, 255, 255, 0, 255, 255, 255, 0 - .byte 0, 0, 0, 0, 0, 0, 0, 0 -m0XXX000000000000: .byte 255, 255, 255, 0, 0, 0, 0, 0 - .byte 0, 0, 0, 0, 0, 0, 0, 0 -mX000X000X000X000: .byte 0, 0, 0, 255, 0, 0, 0, 255 - .byte 0, 0, 0, 255, 0, 0, 0, 255 -mX000X00000000000: .byte 0, 0, 0, 255, 0, 0, 0, 255 - .byte 0, 0, 0, 255, 0, 0, 0, 255 -mX000000000000000: .byte 0, 0, 0, 255, 0, 0, 0, 255 - .byte 0, 0, 0, 255, 0, 0, 0, 255 -m1000100010001000: .byte 0, 0, 0, 1, 0, 0, 0, 1 - .byte 0, 0, 0, 1, 0, 0, 0, 1 -m000V0V0V000V0V0V: .byte 127, 0, 127, 0, 127, 0, 0, 0 - .byte 127, 0, 127, 0, 127, 0, 0, 0 -mI0000000I0000000: .byte 0, 0, 0, 0, 0, 0, 0, 64 - .byte 0, 0, 0, 0, 0, 0, 0, 64 -m0VVV0VVV0VVV0VVV: .byte 127, 127, 127, 0, 127, 127, 127, 0 - .byte 127, 127, 127, 0, 127, 127, 127, 0 -c1: .word 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1 - /*\ SSE register use: |*| %xmm1 = Source value |*| %xmm2 = Destination value |
From: <enl...@li...> - 2005-08-10 05:10:25
|
Enlightenment CVS committal Author : vapier Project : e17 Module : libs/imlib2 Dir : e17/libs/imlib2/src/lib Modified Files: asm_blend.S asm_blend_cmod.S asm_rgba.S Added Files: asm_loadimmq.S Log Message: merge PIC-happy code by PaX/Kevin Quinn/me =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/imlib2/src/lib/asm_blend.S,v retrieving revision 1.3 retrieving revision 1.4 diff -u -3 -r1.3 -r1.4 --- asm_blend.S 6 Aug 2005 20:30:27 -0000 1.3 +++ asm_blend.S 10 Aug 2005 05:10:19 -0000 1.4 @@ -85,21 +85,10 @@ .type PT_(imlib_mmx_reshade_copy_rgba_to_rgba,@function) .globl PR_(imlib_mmx_reshade_copy_rgb_to_rgba) .type PT_(imlib_mmx_reshade_copy_rgb_to_rgba,@function) - -/*\ Some useful masks \*/ -m0X000000: .byte 0, 0, 0, 0, 0, 0, 255, 0 -m10000000: .byte 0, 0, 0, 0, 0, 0, 0, 1 -m00XXXXXX: .byte 255, 255, 255, 255, 255, 255, 0, 0 -mVX000000: .byte 0, 0, 0, 0, 0, 0, 255, 127 -mV0000000: .byte 0, 0, 0, 0, 0, 0, 0, 128 -m0XXX0XXX: .byte 255, 255, 255, 0, 255, 255, 255, 0 -mX000X000: .byte 0, 0, 0, 255, 0, 0, 0, 255 -m10001000: .byte 0, 0, 0, 1, 0, 0, 0, 1 -m000V0V0V: .byte 127, 0, 127, 0, 127, 0, 0, 0 -mI0000000: .byte 0, 0, 0, 0, 0, 0, 0, 64 -m0VVV0VVV: .byte 127, 127, 127, 0, 127, 127, 127, 0 -c1: .word 0x1, 0x1, 0x1, 0x1 +#include "asm_loadimmq.S" + + /*\ MMX register use: |*| %mm1 = Source value |*| %mm2 = Destination value @@ -162,7 +151,8 @@ ENTER pxor %mm4, %mm4 - movq c1, %mm5 + LOAD_IMMQ(c1, %mm5) + CLEANUP_IMMQ_LOADS(1) LOOP_START 1: @@ -218,9 +208,10 @@ ENTER pxor %mm4, %mm4 - movq m0X000000, %mm5 - movq m00XXXXXX, %mm6 - movq c1, %mm7 + LOAD_IMMQ(m0X000000, %mm5) + LOAD_IMMQ(m00XXXXXX, %mm6) + LOAD_IMMQ(c1, %mm7) + CLEANUP_IMMQ_LOADS(3) LOOP_START 1: @@ -272,8 +263,9 @@ PR_(imlib_mmx_copy_rgba_to_rgb): ENTER - movq m0XXX0XXX, %mm5 - movq mX000X000, %mm6 + LOAD_IMMQ(m0XXX0XXX, %mm5) + LOAD_IMMQ(mX000X000, %mm6) + CLEANUP_IMMQ_LOADS(2) /*\ Two at a time: last item is at %ecx = 0 \*/ subl $4, %esi @@ -342,7 +334,8 @@ PR_(imlib_mmx_copy_rgb_to_rgba): ENTER - movq mX000X000, %mm5 + LOAD_IMMQ(mX000X000, %mm5) + CLEANUP_IMMQ_LOADS(1) subl $4, %esi subl $4, %edi @@ -415,8 +408,9 @@ ENTER pxor %mm4, %mm4 - movq mVX000000, %mm5 - movq m00XXXXXX, %mm6 + LOAD_IMMQ(mVX000000, %mm5) + LOAD_IMMQ(m00XXXXXX, %mm6) + CLEANUP_IMMQ_LOADS(2) LOOP_START 1: @@ -463,7 +457,8 @@ PR_(imlib_mmx_add_copy_rgba_to_rgb): ENTER - movq m0XXX0XXX, %mm5 + LOAD_IMMQ(m0XXX0XXX, %mm5) + CLEANUP_IMMQ_LOADS(1) subl $4, %esi subl $4, %edi @@ -533,7 +528,8 @@ PR_(imlib_mmx_add_copy_rgb_to_rgba): ENTER - movq mX000X000, %mm5 + LOAD_IMMQ(mX000X000, %mm5) + CLEANUP_IMMQ_LOADS(1) subl $4, %esi subl $4, %edi @@ -613,8 +609,9 @@ ENTER pxor %mm4, %mm4 - movq mV0000000, %mm5 - movq m00XXXXXX, %mm6 + LOAD_IMMQ(mV0000000, %mm5) + LOAD_IMMQ(m00XXXXXX, %mm6) + CLEANUP_IMMQ_LOADS(2) LOOP_START 1: @@ -661,7 +658,8 @@ PR_(imlib_mmx_subtract_copy_rgba_to_rgb): ENTER - movq m0XXX0XXX, %mm5 + LOAD_IMMQ(m0XXX0XXX, %mm5) + CLEANUP_IMMQ_LOADS(1) subl $4, %esi subl $4, %edi @@ -699,7 +697,8 @@ PR_(imlib_mmx_subtract_copy_rgba_to_rgba): ENTER - movq mX000X000, %mm5 + LOAD_IMMQ(mX000X000, %mm5) + CLEANUP_IMMQ_LOADS(1) subl $4, %esi subl $4, %edi @@ -741,7 +740,8 @@ PR_(imlib_mmx_subtract_copy_rgb_to_rgba): ENTER - movq mX000X000, %mm5 + LOAD_IMMQ(mX000X000, %mm5) + CLEANUP_IMMQ_LOADS(1) subl $4, %esi subl $4, %edi @@ -780,7 +780,8 @@ ENTER pxor %mm4, %mm4 - movq m000V0V0V, %mm6 + LOAD_IMMQ(m000V0V0V, %mm6) + CLEANUP_IMMQ_LOADS(1) LOOP_START 1: @@ -823,9 +824,10 @@ ENTER pxor %mm4, %mm4 - movq mI0000000, %mm5 - movq m000V0V0V, %mm6 - movq m00XXXXXX, %mm7 + LOAD_IMMQ(mI0000000, %mm5) + LOAD_IMMQ(m000V0V0V, %mm6) + LOAD_IMMQ(m00XXXXXX, %mm7) + CLEANUP_IMMQ_LOADS(3) LOOP_START 1: @@ -875,8 +877,9 @@ ENTER pxor %mm4, %mm4 - movq m0XXX0XXX, %mm5 - movq m0VVV0VVV, %mm6 + LOAD_IMMQ(m0XXX0XXX, %mm5) + LOAD_IMMQ(m0VVV0VVV, %mm6) + CLEANUP_IMMQ_LOADS(2) subl $4, %esi subl $4, %edi @@ -939,8 +942,9 @@ ENTER pxor %mm4, %mm4 - movq m0XXX0XXX, %mm5 - movq m0VVV0VVV, %mm6 + LOAD_IMMQ(m0XXX0XXX, %mm5) + LOAD_IMMQ(m0VVV0VVV, %mm6) + CLEANUP_IMMQ_LOADS(2) subl $4, %esi subl $4, %edi @@ -1004,9 +1008,10 @@ ENTER pxor %mm4, %mm4 - movq m0XXX0XXX, %mm5 - movq m0VVV0VVV, %mm6 - movq mX000X000, %mm7 + LOAD_IMMQ(m0XXX0XXX, %mm5) + LOAD_IMMQ(m0VVV0VVV, %mm6) + LOAD_IMMQ(mX000X000, %mm7) + CLEANUP_IMMQ_LOADS(3) subl $4, %esi subl $4, %edi =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/imlib2/src/lib/asm_blend_cmod.S,v retrieving revision 1.3 retrieving revision 1.4 diff -u -3 -r1.3 -r1.4 --- asm_blend_cmod.S 6 Aug 2005 20:30:27 -0000 1.3 +++ asm_blend_cmod.S 10 Aug 2005 05:10:19 -0000 1.4 @@ -112,21 +112,9 @@ .type PT_(imlib_mmx_reshade_copy_rgba_to_rgba_cmod,@function) .globl PR_(imlib_mmx_reshade_copy_rgb_to_rgba_cmod) .type PT_(imlib_mmx_reshade_copy_rgb_to_rgba_cmod,@function) - -/*\ Some useful masks \*/ -m0X000000: .byte 0, 0, 0, 0, 0, 0, 255, 0 -m10000000: .byte 0, 0, 0, 0, 0, 0, 0, 1 -m00XXXXXX: .byte 255, 255, 255, 255, 255, 255, 0, 0 -mVX000000: .byte 0, 0, 0, 0, 0, 0, 255, 127 -mV0000000: .byte 0, 0, 0, 0, 0, 0, 0, 128 -m0XXX0XXX: .byte 255, 255, 255, 0, 255, 255, 255, 0 -mX000X000: .byte 0, 0, 0, 255, 0, 0, 0, 255 -m10001000: .byte 0, 0, 0, 1, 0, 0, 0, 1 -m000V0V0V: .byte 127, 0, 127, 0, 127, 0, 0, 0 -mI0000000: .byte 0, 0, 0, 0, 0, 0, 0, 64 -m0VVV0VVV: .byte 127, 127, 127, 0, 127, 127, 127, 0 -c1: .word 0x1, 0x1, 0x1, 0x1 +#include "asm_loadimmq.S" + /*\ MMX register use: |*| %mm1 = Source value |*| %mm2 = Destination value @@ -364,7 +352,8 @@ ENTER pxor %mm4, %mm4 - movq c1, %mm5 + LOAD_IMMQ(c1, %mm5) + CLEANUP_IMMQ_LOADS(1) LOOP_START 1: @@ -420,9 +409,10 @@ ENTER pxor %mm4, %mm4 - movq m0X000000, %mm5 - movq m00XXXXXX, %mm6 - movq c1, %mm7 + LOAD_IMMQ(m0X000000, %mm5) + LOAD_IMMQ(m00XXXXXX, %mm6) + LOAD_IMMQ(c1, %mm7) + CLEANUP_IMMQ_LOADS(3) LOOP_START 1: @@ -475,7 +465,8 @@ ENTER pxor %mm4, %mm4 - movq c1, %mm5 + LOAD_IMMQ(c1, %mm5) + CLEANUP_IMMQ_LOADS(1) /*\ Load alpha beforehand, as it's always amap(0xff) \*/ movzbl amap_ff, %eax @@ -519,9 +510,10 @@ ENTER pxor %mm4, %mm4 - movq m0X000000, %mm5 - movq m00XXXXXX, %mm6 - movq c1, %mm7 + LOAD_IMMQ(m0X000000, %mm5) + LOAD_IMMQ(m00XXXXXX, %mm6) + LOAD_IMMQ(c1, %mm7) + CLEANUP_IMMQ_LOADS(3) LOOP_START 1: @@ -688,8 +680,9 @@ ENTER pxor %mm4, %mm4 - movq mVX000000, %mm5 - movq m00XXXXXX, %mm6 + LOAD_IMMQ(mVX000000, %mm5) + LOAD_IMMQ(m00XXXXXX, %mm6) + CLEANUP_IMMQ_LOADS(2) LOOP_START 1: @@ -778,8 +771,9 @@ ENTER pxor %mm4, %mm4 - movq mVX000000, %mm5 - movq m00XXXXXX, %mm6 + LOAD_IMMQ(mVX000000, %mm5) + LOAD_IMMQ(m00XXXXXX, %mm6) + CLEANUP_IMMQ_LOADS(2) LOOP_START 1: @@ -826,7 +820,8 @@ PR_(imlib_mmx_add_copy_rgba_to_rgb_cmod): ENTER - movq m0XXX0XXX, %mm5 + LOAD_IMMQ(m0XXX0XXX, %mm5) + CLEANUP_IMMQ_LOADS(1) subl $4, %esi subl $4, %edi @@ -970,8 +965,9 @@ ENTER pxor %mm4, %mm4 - movq mV0000000, %mm5 - movq m00XXXXXX, %mm6 + LOAD_IMMQ(mV0000000, %mm5) + LOAD_IMMQ(m00XXXXXX, %mm6) + CLEANUP_IMMQ_LOADS(2) LOOP_START 1: @@ -1060,8 +1056,9 @@ ENTER pxor %mm4, %mm4 - movq mV0000000, %mm5 - movq m00XXXXXX, %mm6 + LOAD_IMMQ(mV0000000, %mm5) + LOAD_IMMQ(m00XXXXXX, %mm6) + CLEANUP_IMMQ_LOADS(2) LOOP_START 1: @@ -1108,7 +1105,8 @@ PR_(imlib_mmx_subtract_copy_rgba_to_rgb_cmod): ENTER - movq m0XXX0XXX, %mm5 + LOAD_IMMQ(m0XXX0XXX, %mm5) + CLEANUP_IMMQ_LOADS(1) subl $4, %esi subl $4, %edi @@ -1146,7 +1144,8 @@ PR_(imlib_mmx_subtract_copy_rgba_to_rgba_cmod): ENTER - movq mX000X000, %mm5 + LOAD_IMMQ(mX000X000, %mm5) + CLEANUP_IMMQ_LOADS(1) subl $4, %esi subl $4, %edi @@ -1188,7 +1187,8 @@ PR_(imlib_mmx_subtract_copy_rgb_to_rgba_cmod): ENTER - movq mX000X000, %mm5 + LOAD_IMMQ(mX000X000, %mm5) + CLEANUP_IMMQ_LOADS(1) subl $4, %esi subl $4, %edi @@ -1227,7 +1227,8 @@ ENTER pxor %mm4, %mm4 - movq m000V0V0V, %mm6 + LOAD_IMMQ(m000V0V0V, %mm6) + CLEANUP_IMMQ_LOADS(1) LOOP_START 1: @@ -1270,9 +1271,10 @@ ENTER pxor %mm4, %mm4 - movq mI0000000, %mm5 - movq m000V0V0V, %mm6 - movq m00XXXXXX, %mm7 + LOAD_IMMQ(mI0000000, %mm5) + LOAD_IMMQ(m000V0V0V, %mm6) + LOAD_IMMQ(m00XXXXXX, %mm7) + CLEANUP_IMMQ_LOADS(3) LOOP_START 1: @@ -1322,7 +1324,8 @@ ENTER pxor %mm4, %mm4 - movq m000V0V0V, %mm6 + LOAD_IMMQ(m000V0V0V, %mm6) + CLEANUP_IMMQ_LOADS(1) /*\ Load alpha beforehand, as it's always amap(0xff) \*/ movzbl amap_ff, %eax @@ -1365,9 +1368,10 @@ ENTER pxor %mm4, %mm4 - movq mI0000000, %mm5 - movq m000V0V0V, %mm6 - movq m00XXXXXX, %mm7 + LOAD_IMMQ(mI0000000, %mm5) + LOAD_IMMQ(m000V0V0V, %mm6) + LOAD_IMMQ(m00XXXXXX, %mm7) + CLEANUP_IMMQ_LOADS(3) LOOP_START 1: @@ -1417,8 +1421,9 @@ ENTER pxor %mm4, %mm4 - movq m0XXX0XXX, %mm5 - movq m0VVV0VVV, %mm6 + LOAD_IMMQ(m0XXX0XXX, %mm5) + LOAD_IMMQ(m0VVV0VVV, %mm6) + CLEANUP_IMMQ_LOADS(2) subl $4, %esi subl $4, %edi @@ -1481,8 +1486,9 @@ ENTER pxor %mm4, %mm4 - movq m0XXX0XXX, %mm5 - movq m0VVV0VVV, %mm6 + LOAD_IMMQ(m0XXX0XXX, %mm5) + LOAD_IMMQ(m0VVV0VVV, %mm6) + CLEANUP_IMMQ_LOADS(2) subl $4, %esi subl $4, %edi @@ -1546,8 +1552,9 @@ ENTER pxor %mm4, %mm4 - movq m0XXX0XXX, %mm5 - movq m0VVV0VVV, %mm6 + LOAD_IMMQ(m0XXX0XXX, %mm5) + LOAD_IMMQ(m0VVV0VVV, %mm6) + CLEANUP_IMMQ_LOADS(2) subl $4, %esi subl $4, %edi =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/imlib2/src/lib/asm_rgba.S,v retrieving revision 1.3 retrieving revision 1.4 diff -u -3 -r1.3 -r1.4 --- asm_rgba.S 6 Aug 2005 20:30:27 -0000 1.3 +++ asm_rgba.S 10 Aug 2005 05:10:19 -0000 1.4 @@ -55,16 +55,7 @@ .globl PR_(imlib_get_cpuid) .type PT_(imlib_get_cpuid,@function) -/*\ Some useful masks \*/ -m_rb: .long 0x00f800f8, 0x00f800f8 -m_r: .long 0xf800f800, 0xf800f800 -m_g6: .long 0x0000fc00, 0x0000fc00 -m_g5: .long 0x0000f800, 0x0000f800 -/*\ Multiply constants to fake two shifts at once \*/ -mul_rgb565: .long 0x20000004, 0x20000004 -mul_bgr565: .long 0x00042000, 0x00042000 -mul_rgb555: .long 0x20000008, 0x20000008 -mul_bgr555: .long 0x00082000, 0x00082000 +#include "asm_loadimmq.S" /*\ Common code \*/ /*\ Save registers, load common parameters \*/ @@ -114,18 +105,21 @@ PR_(imlib_mmx_bgr565_fast): - movq mul_bgr565, %mm7 /*\ This constant is the only difference \*/ + LOAD_IMMQ(mul_bgr565, %mm7) /*\ This constant is the only difference \*/ + CLEANUP_IMMQ_LOADS(1) jmp .rgb565_fast_entry SIZE(imlib_mmx_bgr565_fast) PR_(imlib_mmx_rgb565_fast): - movq mul_rgb565, %mm7 + LOAD_IMMQ(mul_rgb565, %mm7) + CLEANUP_IMMQ_LOADS(1) .rgb565_fast_entry: ENTER - movq m_rb, %mm5 - movq m_g6, %mm6 + LOAD_IMMQ(m_rb, %mm5) + LOAD_IMMQ(m_g6, %mm6) + CLEANUP_IMMQ_LOADS(1) LOOP_START @@ -193,18 +187,21 @@ PR_(imlib_mmx_bgr555_fast): - movq mul_bgr555, %mm7 /*\ This constant is the only difference \*/ + LOAD_IMMQ(mul_bgr555, %mm7) /*\ This constant is the only difference \*/ + CLEANUP_IMMQ_LOADS(1) jmp .rgb555_fast_entry SIZE(imlib_mmx_bgr555_fast) PR_(imlib_mmx_rgb555_fast): - movq mul_rgb555, %mm7 + LOAD_IMMQ(mul_rgb555, %mm7) + CLEANUP_IMMQ_LOADS(1) .rgb555_fast_entry: ENTER - movq m_rb, %mm5 - movq m_g5, %mm6 + LOAD_IMMQ(m_rb, %mm5) + LOAD_IMMQ(m_g5, %mm6) + CLEANUP_IMMQ_LOADS(2) LOOP_START |
From: <enl...@li...> - 2005-08-10 05:11:09
|
Enlightenment CVS committal Author : vapier Project : e17 Module : libs/imlib2 Dir : e17/libs/imlib2/src/lib Modified Files: .cvsignore Log Message: ignore amd64 objects =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/imlib2/src/lib/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- .cvsignore 29 Jan 2005 18:26:34 -0000 1.2 +++ .cvsignore 10 Aug 2005 05:11:02 -0000 1.3 @@ -3,6 +3,8 @@ Makefile.in .libs api.lo +amd64_blend.lo +amd64_blend_cmod.lo asm_blend.lo asm_blend_cmod.lo asm_rgba.lo |
From: <enl...@li...> - 2005-08-18 22:40:01
|
Enlightenment CVS committal Author : vapier Project : e17 Module : libs/imlib2 Dir : e17/libs/imlib2/src/lib Modified Files: asm_rgba.S Log Message: fix typo in IMMQ cleanup count as pointed out by Peter Beutner in Gentoo Bug 102519 =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/imlib2/src/lib/asm_rgba.S,v retrieving revision 1.4 retrieving revision 1.5 diff -u -3 -r1.4 -r1.5 --- asm_rgba.S 10 Aug 2005 05:10:19 -0000 1.4 +++ asm_rgba.S 17 Aug 2005 22:42:55 -0000 1.5 @@ -119,7 +119,7 @@ LOAD_IMMQ(m_rb, %mm5) LOAD_IMMQ(m_g6, %mm6) - CLEANUP_IMMQ_LOADS(1) + CLEANUP_IMMQ_LOADS(2) LOOP_START |
From: <enl...@li...> - 2005-09-03 20:58:20
|
Enlightenment CVS committal Author : vapier Project : e17 Module : libs/imlib2 Dir : e17/libs/imlib2/src/lib Modified Files: image.h Log Message: fix for cygwin building (and anyone else who doesnt define RTLD_LOCAL) =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/imlib2/src/lib/image.h,v retrieving revision 1.3 retrieving revision 1.4 diff -u -3 -r1.3 -r1.4 --- image.h 23 Feb 2005 03:12:04 -0000 1.3 +++ image.h 3 Sep 2005 20:58:14 -0000 1.4 @@ -11,6 +11,11 @@ # include <dlfcn.h> # include <Imlib2.h> +# ifndef RTLD_LOCAL +# define RTLD_LOCAL 0 +# warning "your crap box doesnt define RTLD_LOCAL !?" +# endif + typedef struct _imlibimage ImlibImage; # ifdef BUILD_X11 typedef struct _imlibimagepixmap ImlibImagePixmap; |
From: <enl...@li...> - 2005-09-07 04:03:08
|
Enlightenment CVS committal Author : vapier Project : e17 Module : libs/imlib2 Dir : e17/libs/imlib2 Modified Files: configure.in Log Message: cleanup x86/amd64 autofoo output =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/imlib2/configure.in,v retrieving revision 1.110 retrieving revision 1.111 diff -u -3 -r1.110 -r1.111 --- configure.in 31 Jul 2005 07:30:06 -0000 1.110 +++ configure.in 7 Sep 2005 04:03:00 -0000 1.111 @@ -99,47 +99,41 @@ ;; esac -AC_ARG_ENABLE(mmx,[ --enable-mmx attempt compiling using mmx assembly [default=auto]], +AC_ARG_ENABLE(mmx,[ --enable-mmx attempt compiling using mmx assembly [default=auto]], [ if test x$enableval = xyes; then mmx=yes # Cannot compile with both options enabled amd64=no - AC_MSG_RESULT(enabling mmx support) else mmx=no - AC_MSG_RESULT(disabling mmx support) fi ] ) -AC_ARG_ENABLE(amd64,[ --enable-amd64 attempt compiling using amd64 assembly [default=auto]], +AC_ARG_ENABLE(amd64,[ --enable-amd64 attempt compiling using amd64 assembly [default=auto]], [ if test x$enableval = xyes; then amd64=yes - # Cannot compile with both options enabled mmx=no - AC_MSG_RESULT(enabling amd64 support) else amd64=no - AC_MSG_RESULT(disabling amd64 support) fi ] ) +AC_MSG_CHECKING(whether to enable x86 mmx support) if test x$mmx = xyes; then AC_DEFINE(DO_MMX_ASM, 1, [enabling MMX Assembly]) - AC_MSG_RESULT(enabled mmx support) -else - AC_MSG_RESULT(disabled mmx support) fi +AC_MSG_RESULT($mmx) AM_CONDITIONAL(BUILD_MMX, test x$mmx = xyes) + +AC_MSG_CHECKING(whether to enable amd64 asm support) if test x$amd64 = xyes; then AC_DEFINE(DO_AMD64_ASM, 1, [enabling AMD64 Assembly]) - AC_MSG_RESULT(enabled amd64 support) -else - AC_MSG_RESULT(disabled amd64 support) fi +AC_MSG_RESULT($amd64) AM_CONDITIONAL(BUILD_AMD64, test x$amd64 = xyes) # check for freetype |
From: <enl...@li...> - 2005-09-07 04:16:55
|
Enlightenment CVS committal Author : vapier Project : e17 Module : libs/imlib2 Dir : e17/libs/imlib2 Modified Files: configure.in Log Message: allow users to control whether jpeg/png support =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/imlib2/configure.in,v retrieving revision 1.111 retrieving revision 1.112 diff -u -3 -r1.111 -r1.112 --- configure.in 7 Sep 2005 04:03:00 -0000 1.111 +++ configure.in 7 Sep 2005 04:16:49 -0000 1.112 @@ -182,50 +182,94 @@ AC_SUBST(my_includes) AC_SUBST(my_libs) -AC_CHECK_LIB(jpeg, jpeg_destroy_decompress, - jpeg_ok=yes, - jpeg_ok=no - AC_MSG_WARN(*** Native JPEG support will not be built (JPEG library not found) ***), - ) -if test "$jpeg_ok" = yes; then - AC_MSG_CHECKING([for jpeglib.h]) - AC_TRY_CPP( - [#include <stdio.h> - #undef PACKAGE - #undef VERSION - #include <jpeglib.h>], - jpeg_ok=yes, - jpeg_ok=no) - AC_MSG_RESULT($jpeg_ok) - if test "$jpeg_ok" = yes; then - JPEGLIBS="-ljpeg" + + +AC_MSG_CHECKING(whether to enable jpeg support) +AC_ARG_WITH(jpeg, +[AC_HELP_STRING([--without-jpeg],[Disable JPEG image loader])], +[ + if test "$withval" = no ; then + jpeg_loader=no else - AC_MSG_WARN(*** Native JPEG support will not be built (JPEG header file not found) ***) + jpeg_loader=yes + fi +],[ jpeg_loader=auto ] +) +AC_MSG_RESULT($jpeg_loader) + +if test "$jpeg_loader" != no ; then + AC_CHECK_LIB(jpeg, jpeg_destroy_decompress, + jpeg_ok=yes, + jpeg_ok=no + AC_MSG_WARN(*** Native JPEG support will not be built (JPEG library not found) ***), + ) + if test "$jpeg_ok" = yes; then + AC_MSG_CHECKING([for jpeglib.h]) + AC_TRY_CPP( + [#include <stdio.h> + #undef PACKAGE + #undef VERSION + #include <jpeglib.h>], + jpeg_ok=yes, + jpeg_ok=no) + AC_MSG_RESULT($jpeg_ok) + if test "$jpeg_ok" = yes; then + JPEGLIBS="-ljpeg" + else + AC_MSG_WARN(*** Native JPEG support will not be built (JPEG header file not found) ***) + fi + fi + if test "$jpeg_loader" = yes -a "$jpeg_ok" = no; then + AC_MSG_ERROR(JPEG support was requested but system does not support it) fi +else + jpeg_ok=no fi AM_CONDITIONAL(BUILD_JPEG_LOADER, test "$jpeg_ok" = yes) AC_SUBST(JPEGLIBS) -AC_CHECK_LIB(png, png_read_info, - png_ok=yes, - png_ok=no - AC_MSG_WARN(*** Native PNG support will not be built (PNG library not found) ***), - -lz -lm) -if test "$png_ok" = yes; then - AC_MSG_CHECKING([for png.h]) - AC_TRY_CPP( - [#include <stdio.h> - #undef PACKAGE - #undef VERSION - #include <png.h>], - png_ok=yes, - png_ok=no) - AC_MSG_RESULT($png_ok) - if test "$png_ok" = yes; then - PNGLIBS="-lpng -lz -lm" + + +AC_MSG_CHECKING(whether to enable png support) +AC_ARG_WITH(png, +[AC_HELP_STRING([--without-png],[Disable PNG image loader])], +[ + if test "$withval" = no ; then + png_loader=no else - AC_MSG_WARN(*** Native PNG support will not be built (PNG header file not found) ***) + png_loader=yes fi +],[ png_loader=auto ] +) +AC_MSG_RESULT($png_loader) + +if test "$png_loader" != no ; then + AC_CHECK_LIB(png, png_read_info, + png_ok=yes, + png_ok=no + AC_MSG_WARN(*** Native PNG support will not be built (PNG library not found) ***), + -lz -lm) + if test "$png_ok" = yes; then + AC_MSG_CHECKING([for png.h]) + AC_TRY_CPP( + [#include <stdio.h> + #undef PACKAGE + #undef VERSION + #include <png.h>], + png_ok=yes, + png_ok=no) + AC_MSG_RESULT($png_ok) + if test "$png_ok" = yes; then + PNGLIBS="-lpng -lz -lm" + else + AC_MSG_WARN(*** Native PNG support will not be built (PNG header file not found) ***) + fi + fi + if test "$png_loader" = yes -a "$png_ok" = no; then + AC_MSG_ERROR(PNG support was requested but system does not support it) + fi +else + png_ok=no fi AM_CONDITIONAL(BUILD_PNG_LOADER, test "$png_ok" = yes) AC_SUBST(PNGLIBS) |
From: <enl...@li...> - 2005-09-07 04:17:26
|
Enlightenment CVS committal Author : vapier Project : e17 Module : libs/imlib2 Dir : e17/libs/imlib2 Modified Files: configure.in Log Message: sneak in a hack to remove CXX/F77 checks to improved configure speed =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/imlib2/configure.in,v retrieving revision 1.112 retrieving revision 1.113 diff -u -3 -r1.112 -r1.113 --- configure.in 7 Sep 2005 04:16:49 -0000 1.112 +++ configure.in 7 Sep 2005 04:17:18 -0000 1.113 @@ -14,6 +14,13 @@ AC_HEADER_STDC AC_C_CONST AM_ENABLE_SHARED + +dnl Next four lines is a hack to prevent libtool checking for CXX/F77 +m4_undefine([AC_PROG_CXX]) +m4_defun([AC_PROG_CXX],[]) +m4_undefine([AC_PROG_F77]) +m4_defun([AC_PROG_F77],[]) + AM_PROG_LIBTOOL if test "x${bindir}" = 'x${exec_prefix}/bin'; then |
From: <enl...@li...> - 2005-09-07 04:28:10
|
Enlightenment CVS committal Author : vapier Project : e17 Module : libs/imlib2 Dir : e17/libs/imlib2 Modified Files: configure.in Log Message: allow user to control tiff/zlib/bzip2/id3 support =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/imlib2/configure.in,v retrieving revision 1.113 retrieving revision 1.114 diff -u -3 -r1.113 -r1.114 --- configure.in 7 Sep 2005 04:17:18 -0000 1.113 +++ configure.in 7 Sep 2005 04:28:02 -0000 1.114 @@ -281,39 +281,63 @@ AM_CONDITIONAL(BUILD_PNG_LOADER, test "$png_ok" = yes) AC_SUBST(PNGLIBS) -AC_CHECK_LIB(tiff, TIFFReadScanline, - tiff_libs="-ltiff" - tiff_ok=yes, -AC_CHECK_LIB(tiff, TIFFReadScanline, - tiff_libs="-ltiff -ljpeg -lz -lm" - tiff_ok=yes, -AC_CHECK_LIB(tiff34, TIFFReadScanline, - tiff_libs="-ltiff34 -ljpeg -lz -lm" - tiff_ok=yes, - tiff_ok=no - AC_MSG_WARN(*** Native TIFF support will not be built (TIFF library not found) ***), - -ljpeg -lz -lm), - -ljpeg -lz -lm), - ) -if test "$tiff_ok" = yes; then - AC_MSG_CHECKING([for tiffio.h]) - AC_TRY_CPP( - [#include <stdio.h> - #undef PACKAGE - #undef VERSION - #include <tiffio.h>], - tiff_ok=yes, - tiff_ok=no) - AC_MSG_RESULT($tiff_ok) - if test "$tiff_ok" = yes; then - TIFFLIBS=$tiff_libs + + +AC_MSG_CHECKING(whether to enable tiff support) +AC_ARG_WITH(tiff, +[AC_HELP_STRING([--without-tiff],[Disable TIFF image loader])], +[ + if test "$withval" = no ; then + tiff_loader=no else - AC_MSG_WARN(*** Native TIFF support will not be built (TIFF header file not found) ***) + tiff_loader=yes + fi +],[ tiff_loader=auto ] +) +AC_MSG_RESULT($tiff_loader) + +if test "$tiff_loader" != no ; then + AC_CHECK_LIB(tiff, TIFFReadScanline, + tiff_libs="-ltiff" + tiff_ok=yes, + AC_CHECK_LIB(tiff, TIFFReadScanline, + tiff_libs="-ltiff -ljpeg -lz -lm" + tiff_ok=yes, + AC_CHECK_LIB(tiff34, TIFFReadScanline, + tiff_libs="-ltiff34 -ljpeg -lz -lm" + tiff_ok=yes, + tiff_ok=no + AC_MSG_WARN(*** Native TIFF support will not be built (TIFF library not found) ***), + -ljpeg -lz -lm), + -ljpeg -lz -lm), + ) + if test "$tiff_ok" = yes; then + AC_MSG_CHECKING([for tiffio.h]) + AC_TRY_CPP( + [#include <stdio.h> + #undef PACKAGE + #undef VERSION + #include <tiffio.h>], + tiff_ok=yes, + tiff_ok=no) + AC_MSG_RESULT($tiff_ok) + if test "$tiff_ok" = yes; then + TIFFLIBS=$tiff_libs + else + AC_MSG_WARN(*** Native TIFF support will not be built (TIFF header file not found) ***) + fi + fi + if test "$tiff_loader" = yes -a "$tiff_ok" = no; then + AC_MSG_ERROR(TIFF support was requested but system does not support it) fi +else + tiff_ok=no fi AM_CONDITIONAL(BUILD_TIFF_LOADER, test "$tiff_ok" = yes) AC_SUBST(TIFFLIBS) + + AC_CHECK_LIB(ungif, DGifOpenFileName, gif_libs="-lungif" gif_ok=yes, @@ -361,79 +385,147 @@ AM_CONDITIONAL(BUILD_GIF_LOADER, test "$gif_ok" = yes) AC_SUBST(GIFLIBS) -AC_CHECK_LIB(z, uncompress, - zlib_ok=yes, - zlib_ok=no - AC_MSG_WARN(*** Native zlib support will not be built (zlib not found) ***), - ) -if test "$zlib_ok" = yes; then - AC_MSG_CHECKING([for zlib.h]) - AC_TRY_CPP( - [#include <stdio.h> - #undef PACKAGE - #undef VERSION - #include <zlib.h>], - zlib_ok=yes, - zlib_ok=no) - AC_MSG_RESULT($zlib_ok) - if test "$zlib_ok" = yes; then - ZLIBLIBS="-lz" + + +AC_MSG_CHECKING(whether to enable zlib support) +AC_ARG_WITH(zlib, +[AC_HELP_STRING([--without-zlib],[Disable ZLIB loader])], +[ + if test "$withval" = no ; then + zlib_loader=no else - AC_MSG_WARN(*** Native zlib support will not be built (zlib header file not found) ***) + zlib_loader=yes + fi +],[ zlib_loader=auto ] +) +AC_MSG_RESULT($zlib_loader) + +if test "$zlib_loader" != no ; then + AC_CHECK_LIB(z, uncompress, + zlib_ok=yes, + zlib_ok=no + AC_MSG_WARN(*** Native zlib support will not be built (zlib not found) ***), + ) + if test "$zlib_ok" = yes; then + AC_MSG_CHECKING([for zlib.h]) + AC_TRY_CPP( + [#include <stdio.h> + #undef PACKAGE + #undef VERSION + #include <zlib.h>], + zlib_ok=yes, + zlib_ok=no) + AC_MSG_RESULT($zlib_ok) + if test "$zlib_ok" = yes; then + ZLIBLIBS="-lz" + else + AC_MSG_WARN(*** Native zlib support will not be built (zlib header file not found) ***) + fi + fi + if test "$zlib_loader" = yes -a "$zlib_ok" = no; then + AC_MSG_ERROR(ZLIB support was requested but system does not support it) fi +else + zlib_ok=no fi AM_CONDITIONAL(BUILD_ZLIB_LOADER, test "$zlib_ok" = yes) AC_SUBST(ZLIBLIBS) -AC_CHECK_LIB(bz2, BZ2_bzRead, - bz2_ok=yes, - bz2_ok=no - AC_MSG_WARN(*** Native bz2 support will not be built (bzip2 library not found) ***), - ) -if test "$bz2_ok" = yes; then - AC_MSG_CHECKING([for bzlib.h]) - AC_TRY_CPP( - [#include <stdio.h> - #undef PACKAGE - #undef VERSION - #include <bzlib.h>], - bz2_ok=yes, - bz2_ok=no) - AC_MSG_RESULT($bz2_ok) - if test "$bz2_ok" = yes; then - BZ2LIBS="-lbz2" + + +AC_MSG_CHECKING(whether to enable bzip2 support) +AC_ARG_WITH(bzip2, +[AC_HELP_STRING([--without-bzip2],[Disable BZIP2 loader])], +[ + if test "$withval" = no ; then + bz2_loader=no else - AC_MSG_WARN(*** Native bz2 support will not be built (bzip2 header file not found) ***) + bz2_loader=yes + fi +],[ bz2_loader=auto ] +) +AC_MSG_RESULT($bz2_loader) + +if test "$bz2_loader" != no ; then + AC_CHECK_LIB(bz2, BZ2_bzRead, + bz2_ok=yes, + bz2_ok=no + AC_MSG_WARN(*** Native bz2 support will not be built (bzip2 library not found) ***), + ) + if test "$bz2_ok" = yes; then + AC_MSG_CHECKING([for bzlib.h]) + AC_TRY_CPP( + [#include <stdio.h> + #undef PACKAGE + #undef VERSION + #include <bzlib.h>], + bz2_ok=yes, + bz2_ok=no) + AC_MSG_RESULT($bz2_ok) + if test "$bz2_ok" = yes; then + BZ2LIBS="-lbz2" + else + AC_MSG_WARN(*** Native bz2 support will not be built (bzip2 header file not found) ***) + fi fi + if test "$bz2_loader" = yes -a "$bz2_ok" = no; then + AC_MSG_ERROR(BZIP2 support was requested but system does not support it) + fi +else + bz2_ok=no fi AM_CONDITIONAL(BUILD_BZ2_LOADER, test "$bz2_ok" = yes) AC_SUBST(BZ2LIBS) -AC_CHECK_LIB(id3tag, id3_file_open, - id3_libs="-lz -lid3tag" - id3_ok=yes, - id3_ok=no - AC_MSG_WARN(*** Native mp3 support will not be built (id3tag library not found) ***), - -lz) -if test "$id3_ok" = yes; then - AC_MSG_CHECKING([for id3tag.h]) - AC_TRY_CPP( - [#include <stdio.h> - #undef PACKAGE - #undef VERSION - #include <id3tag.h>], - id3_ok=yes, - id3_ok=no) - AC_MSG_RESULT($id3_ok) - if test "$id3_ok" = yes; then - ID3LIBS=$id3_libs + + +AC_MSG_CHECKING(whether to enable id3 support) +AC_ARG_WITH(id3, +[AC_HELP_STRING([--without-id3],[Disable ID3 loader])], +[ + if test "$withval" = no ; then + id3_loader=no else - AC_MSG_WARN(*** Native id3 mp3 tag support will not be built (id3tag header file not found) ***) + id3_loader=yes fi +],[ id3_loader=auto ] +) +AC_MSG_RESULT($id3_loader) + +if test "$id3_loader" != no ; then + AC_CHECK_LIB(id3tag, id3_file_open, + id3_libs="-lz -lid3tag" + id3_ok=yes, + id3_ok=no + AC_MSG_WARN(*** Native mp3 support will not be built (id3tag library not found) ***), + -lz) + if test "$id3_ok" = yes; then + AC_MSG_CHECKING([for id3tag.h]) + AC_TRY_CPP( + [#include <stdio.h> + #undef PACKAGE + #undef VERSION + #include <id3tag.h>], + id3_ok=yes, + id3_ok=no) + AC_MSG_RESULT($id3_ok) + if test "$id3_ok" = yes; then + ID3LIBS=$id3_libs + else + AC_MSG_WARN(*** Native id3 mp3 tag support will not be built (id3tag header file not found) ***) + fi + fi + if test "$id3_loader" = yes -a "$id3_ok" = no; then + AC_MSG_ERROR(ID3 support was requested but system does not support it) + fi +else + id3_ok=no fi AM_CONDITIONAL(BUILD_ID3_LOADER, test "$id3_ok" = yes) AC_SUBST(ID3LIBS) + + AC_SUBST(requirements) AC_OUTPUT([ |
From: <enl...@li...> - 2005-09-07 22:55:04
|
Enlightenment CVS committal Author : vapier Project : e17 Module : libs/imlib2 Dir : e17/libs/imlib2 Modified Files: configure.in Log Message: touchup amd64/x86 asm handling, unify all the autodetection warnings, make gif support configurable, and default to giflib instead of old libungif =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/imlib2/configure.in,v retrieving revision 1.114 retrieving revision 1.115 diff -u -3 -r1.114 -r1.115 --- configure.in 7 Sep 2005 04:28:02 -0000 1.114 +++ configure.in 7 Sep 2005 22:54:52 -0000 1.115 @@ -92,21 +92,18 @@ packagesrcdir=`cd $srcdir && pwd` AC_DEFINE_UNQUOTED(PACKAGE_SOURCE_DIR, "${packagesrcdir}", [Source code directory]) -# FIXME: fill in requirements for pc.in - but only ft2 has a pc file! -requirements="freetype2" + mmx=no amd64=no case $host_cpu in - i*86) - mmx="yes" - ;; - x86_64) - amd64="yes" - ;; + i*86) mmx="yes";; + x86_64) amd64="yes";; esac -AC_ARG_ENABLE(mmx,[ --enable-mmx attempt compiling using mmx assembly [default=auto]], +dnl +AC_ARG_ENABLE(mmx, +[ --enable-mmx attempt compiling using mmx assembly @<:@default=auto@:>@], [ if test x$enableval = xyes; then mmx=yes @@ -118,7 +115,8 @@ ] ) -AC_ARG_ENABLE(amd64,[ --enable-amd64 attempt compiling using amd64 assembly [default=auto]], +AC_ARG_ENABLE(amd64, +[ --enable-amd64 attempt compiling using amd64 assembly @<:@default=auto@:>@], [ if test x$enableval = xyes; then amd64=yes @@ -143,6 +141,11 @@ AC_MSG_RESULT($amd64) AM_CONDITIONAL(BUILD_AMD64, test x$amd64 = xyes) + + +# FIXME: fill in requirements for pc.in - but only ft2 has a pc file! +requirements="freetype2" + # check for freetype AC_ARG_WITH(freetype-config, [ --with-freetype-config=FREETYPE_CONFIG use freetype-config specified ], [ FREETYPE_CONFIG=$withval; @@ -207,8 +210,7 @@ if test "$jpeg_loader" != no ; then AC_CHECK_LIB(jpeg, jpeg_destroy_decompress, jpeg_ok=yes, - jpeg_ok=no - AC_MSG_WARN(*** Native JPEG support will not be built (JPEG library not found) ***), + jpeg_ok=no, ) if test "$jpeg_ok" = yes; then AC_MSG_CHECKING([for jpeglib.h]) @@ -222,12 +224,14 @@ AC_MSG_RESULT($jpeg_ok) if test "$jpeg_ok" = yes; then JPEGLIBS="-ljpeg" - else - AC_MSG_WARN(*** Native JPEG support will not be built (JPEG header file not found) ***) fi fi - if test "$jpeg_loader" = yes -a "$jpeg_ok" = no; then - AC_MSG_ERROR(JPEG support was requested but system does not support it) + if test "$jpeg_ok" = no ; then + if test "$jpeg_loader" = yes ; then + AC_MSG_ERROR(JPEG support was requested but system does not support it) + else + AC_MSG_WARN(*** Native JPEG support will not be built (JPEG not found) ***) + fi fi else jpeg_ok=no @@ -253,8 +257,7 @@ if test "$png_loader" != no ; then AC_CHECK_LIB(png, png_read_info, png_ok=yes, - png_ok=no - AC_MSG_WARN(*** Native PNG support will not be built (PNG library not found) ***), + png_ok=no, -lz -lm) if test "$png_ok" = yes; then AC_MSG_CHECKING([for png.h]) @@ -268,12 +271,14 @@ AC_MSG_RESULT($png_ok) if test "$png_ok" = yes; then PNGLIBS="-lpng -lz -lm" - else - AC_MSG_WARN(*** Native PNG support will not be built (PNG header file not found) ***) fi fi - if test "$png_loader" = yes -a "$png_ok" = no; then - AC_MSG_ERROR(PNG support was requested but system does not support it) + if test "$png_ok" = no ; then + if test "$png_loader" = yes ; then + AC_MSG_ERROR(PNG support was requested but system does not support it) + else + AC_MSG_WARN(*** Native PNG support will not be built (PNG not found) ***) + fi fi else png_ok=no @@ -306,8 +311,7 @@ AC_CHECK_LIB(tiff34, TIFFReadScanline, tiff_libs="-ltiff34 -ljpeg -lz -lm" tiff_ok=yes, - tiff_ok=no - AC_MSG_WARN(*** Native TIFF support will not be built (TIFF library not found) ***), + tiff_ok=no, -ljpeg -lz -lm), -ljpeg -lz -lm), ) @@ -323,12 +327,14 @@ AC_MSG_RESULT($tiff_ok) if test "$tiff_ok" = yes; then TIFFLIBS=$tiff_libs - else - AC_MSG_WARN(*** Native TIFF support will not be built (TIFF header file not found) ***) fi fi - if test "$tiff_loader" = yes -a "$tiff_ok" = no; then - AC_MSG_ERROR(TIFF support was requested but system does not support it) + if test "$tiff_ok" = no ; then + if test "$tiff_loader" = yes ; then + AC_MSG_ERROR(TIFF support was requested but system does not support it) + else + AC_MSG_WARN(*** Native TIFF support will not be built (TIFF not found) ***) + fi fi else tiff_ok=no @@ -338,49 +344,83 @@ -AC_CHECK_LIB(ungif, DGifOpenFileName, - gif_libs="-lungif" - gif_ok=yes, - gif_ok=no, - ) -if test "$gif_ok" = yes; then - AC_MSG_CHECKING([for gif_lib.h]) - AC_TRY_CPP( - [#include <stdio.h> - #undef PACKAGE - #undef VERSION - #include <gif_lib.h>], - gif_ok=yes, - gif_ok=no) - AC_MSG_RESULT($gif_ok) - if test "$gif_ok" = yes; then - GIFLIBS=$gif_libs +AC_MSG_CHECKING(whether to enable gif support) +gif_lib=any +AC_ARG_WITH(gif, +[AC_HELP_STRING([--without-gif],[Disable GIF image loader])], +[ + if test "$withval" = no ; then + gif_loader=no + else + gif_loader=yes + case "$withval" in + giflib) gif_lib=giflib;; + libungif) gif_lib=libungif;; + esac fi -fi +],[ gif_loader=auto ] +) +AC_MSG_RESULT($gif_loader) -if test "$gif_ok" = no; then - AC_CHECK_LIB(gif, DGifOpenFileName, - gif_libs="-lgif" - gif_ok=yes, - gif_ok=no - AC_MSG_WARN(*** Native GIF support will not be built (GIF library not found) ***), - ) - if test "$gif_ok" = yes; then - AC_MSG_CHECKING([for gif_lib.h]) - AC_TRY_CPP( - [#include <stdio.h> - #undef PACKAGE - #undef VERSION - #include <gif_lib.h>], - gif_ok=yes, - gif_ok=no) - AC_MSG_RESULT($gif_ok) +if test "$gif_loader" != no ; then + AC_MSG_CHECKING(for preferred gif provider) + AC_MSG_RESULT($gif_lib) + + if test "$gif_lib" != libungif ; then + AC_CHECK_LIB(gif, DGifOpenFileName, + gif_libs="-lgif" + gif_ok=yes, + gif_ok=no, + ) if test "$gif_ok" = yes; then - GIFLIBS=$gif_libs + AC_MSG_CHECKING([for gif_lib.h]) + AC_TRY_CPP( + [#include <stdio.h> + #undef PACKAGE + #undef VERSION + #include <gif_lib.h>], + gif_ok=yes, + gif_ok=no) + AC_MSG_RESULT($gif_ok) + if test "$gif_ok" = yes; then + GIFLIBS=$gif_libs + gif_lib=giflib + fi + fi + fi + + if test "$gif_lib" != giflib ; then + AC_CHECK_LIB(ungif, DGifOpenFileName, + gif_libs="-lungif" + gif_ok=yes, + gif_ok=no, + ) + if test "$gif_ok" = yes; then + AC_MSG_CHECKING([for gif_lib.h]) + AC_TRY_CPP( + [#include <stdio.h> + #undef PACKAGE + #undef VERSION + #include <gif_lib.h>], + gif_ok=yes, + gif_ok=no) + AC_MSG_RESULT($gif_ok) + if test "$gif_ok" = yes; then + GIFLIBS=$gif_libs + gif_lib=libungif + fi + fi + fi + + if test "$gif_ok" = no ; then + if test "$gif_loader" = yes ; then + AC_MSG_ERROR(GIF support was requested but system does not support it) else - AC_MSG_WARN(*** Native GIF support will not be built (GIF header file not found) ***) + AC_MSG_WARN(*** Native GIF support will not be built (GIF not found) ***) fi fi +else + gif_ok=no fi AM_CONDITIONAL(BUILD_GIF_LOADER, test "$gif_ok" = yes) AC_SUBST(GIFLIBS) @@ -403,8 +443,7 @@ if test "$zlib_loader" != no ; then AC_CHECK_LIB(z, uncompress, zlib_ok=yes, - zlib_ok=no - AC_MSG_WARN(*** Native zlib support will not be built (zlib not found) ***), + zlib_ok=no, ) if test "$zlib_ok" = yes; then AC_MSG_CHECKING([for zlib.h]) @@ -418,12 +457,14 @@ AC_MSG_RESULT($zlib_ok) if test "$zlib_ok" = yes; then ZLIBLIBS="-lz" - else - AC_MSG_WARN(*** Native zlib support will not be built (zlib header file not found) ***) fi fi - if test "$zlib_loader" = yes -a "$zlib_ok" = no; then - AC_MSG_ERROR(ZLIB support was requested but system does not support it) + if test "$zlib_ok" = no ; then + if test "$zlib_loader" = yes ; then + AC_MSG_ERROR(ZLIB support was requested but system does not support it) + else + AC_MSG_WARN(*** Native zlib support will not be built (zlib not found) ***) + fi fi else zlib_ok=no @@ -449,8 +490,7 @@ if test "$bz2_loader" != no ; then AC_CHECK_LIB(bz2, BZ2_bzRead, bz2_ok=yes, - bz2_ok=no - AC_MSG_WARN(*** Native bz2 support will not be built (bzip2 library not found) ***), + bz2_ok=no, ) if test "$bz2_ok" = yes; then AC_MSG_CHECKING([for bzlib.h]) @@ -464,12 +504,14 @@ AC_MSG_RESULT($bz2_ok) if test "$bz2_ok" = yes; then BZ2LIBS="-lbz2" - else - AC_MSG_WARN(*** Native bz2 support will not be built (bzip2 header file not found) ***) fi fi - if test "$bz2_loader" = yes -a "$bz2_ok" = no; then - AC_MSG_ERROR(BZIP2 support was requested but system does not support it) + if test "$bz2_ok" = no ; then + if test "$bz2_loader" = yes ; then + AC_MSG_ERROR(BZIP2 support was requested but system does not support it) + else + AC_MSG_WARN(*** Native bz2 support will not be built (bzip2 not found) ***) + fi fi else bz2_ok=no @@ -496,8 +538,7 @@ AC_CHECK_LIB(id3tag, id3_file_open, id3_libs="-lz -lid3tag" id3_ok=yes, - id3_ok=no - AC_MSG_WARN(*** Native mp3 support will not be built (id3tag library not found) ***), + id3_ok=no, -lz) if test "$id3_ok" = yes; then AC_MSG_CHECKING([for id3tag.h]) @@ -511,12 +552,14 @@ AC_MSG_RESULT($id3_ok) if test "$id3_ok" = yes; then ID3LIBS=$id3_libs - else - AC_MSG_WARN(*** Native id3 mp3 tag support will not be built (id3tag header file not found) ***) fi fi - if test "$id3_loader" = yes -a "$id3_ok" = no; then - AC_MSG_ERROR(ID3 support was requested but system does not support it) + if test "$id3_ok" = no ; then + if test "$id3_loader" = yes ; then + AC_MSG_ERROR(ID3 support was requested but system does not support it) + else + AC_MSG_WARN(*** Native mp3 support will not be built (id3tag not found) ***) + fi fi else id3_ok=no |
From: <enl...@li...> - 2005-09-29 07:47:40
|
Enlightenment CVS committal Author : vapier Project : e17 Module : libs/imlib2 Dir : e17/libs/imlib2/src/lib Modified Files: rgba.c Log Message: fix by Tres Melton to address 64bit errors: dont cast pointers as ints, cast them as longs =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/imlib2/src/lib/rgba.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- rgba.c 1 Nov 2004 09:45:31 -0000 1.1 +++ rgba.c 29 Sep 2005 07:47:29 -0000 1.2 @@ -2854,7 +2854,7 @@ w = width; h = height; - if (IS_ALIGNED_32((int)dest)) + if (IS_ALIGNED_32((unsigned long)dest)) { if (IS_MULTIPLE_2(width)) { @@ -2924,7 +2924,7 @@ w = width + dx; h = height + dy; - if (IS_ALIGNED_32((int)dest)) + if (IS_ALIGNED_32((unsigned long)dest)) { if (IS_MULTIPLE_2(width)) { @@ -2996,7 +2996,7 @@ w = width; h = height; - if (IS_ALIGNED_32((int)dest)) + if (IS_ALIGNED_32((unsigned long)dest)) { if (IS_MULTIPLE_2(width)) { @@ -3066,7 +3066,7 @@ w = width + dx; h = height + dy; - if (IS_ALIGNED_32((int)dest)) + if (IS_ALIGNED_32((unsigned long)dest)) { if (IS_MULTIPLE_2(width)) { @@ -3138,7 +3138,7 @@ w = width; h = height; - if (IS_ALIGNED_32((int)dest)) + if (IS_ALIGNED_32((unsigned long)dest)) { if (IS_MULTIPLE_2(width)) { @@ -3208,7 +3208,7 @@ w = width + dx; h = height + dy; - if (IS_ALIGNED_32((int)dest)) + if (IS_ALIGNED_32((unsigned long)dest)) { if (IS_MULTIPLE_2(width)) { @@ -3280,7 +3280,7 @@ w = width; h = height; - if (IS_ALIGNED_32((int)dest)) + if (IS_ALIGNED_32((unsigned long)dest)) { if (IS_MULTIPLE_2(width)) { @@ -3350,7 +3350,7 @@ w = width + dx; h = height + dy; - if (IS_ALIGNED_32((int)dest)) + if (IS_ALIGNED_32((unsigned long)dest)) { if (IS_MULTIPLE_2(width)) { @@ -3421,7 +3421,7 @@ w = width; h = height; - if (IS_ALIGNED_32((int)dest)) + if (IS_ALIGNED_32((unsigned long)dest)) { if (IS_MULTIPLE_4(width)) { @@ -3465,7 +3465,7 @@ { for (y = 0; y < h; y++) { - for (x = 0; ((x < w) && (!(IS_ALIGNED_32((int)dest)))); x++) + for (x = 0; ((x < w) && (!(IS_ALIGNED_32((unsigned long)dest)))); x++) { WRITE1_RGBA_RGB332(src, dest); } @@ -3518,7 +3518,7 @@ w = width + dx; h = height + dy; - if (IS_ALIGNED_32((int)dest)) + if (IS_ALIGNED_32((unsigned long)dest)) { if (IS_MULTIPLE_4(width)) { @@ -3563,7 +3563,7 @@ for (y = dy; y < h; y++) { w = width + dx; - for (x = dx; ((x < w) && (!(IS_ALIGNED_32((int)dest)))); x++) + for (x = dx; ((x < w) && (!(IS_ALIGNED_32((unsigned long)dest)))); x++) { WRITE1_RGBA_RGB332_DITHER(src, dest); } @@ -3597,7 +3597,7 @@ w = width; h = height; - if (IS_ALIGNED_32((int)dest)) + if (IS_ALIGNED_32((unsigned long)dest)) { if (IS_MULTIPLE_4(width)) { @@ -3641,7 +3641,7 @@ { for (y = 0; y < h; y++) { - for (x = 0; ((x < w) && (!(IS_ALIGNED_32((int)dest)))); x++) + for (x = 0; ((x < w) && (!(IS_ALIGNED_32((unsigned long)dest)))); x++) { WRITE1_RGBA_RGB666(src, dest); } @@ -3694,7 +3694,7 @@ w = width + dx; h = height + dy; - if (IS_ALIGNED_32((int)dest)) + if (IS_ALIGNED_32((unsigned long)dest)) { if (IS_MULTIPLE_4(width)) { @@ -3739,7 +3739,7 @@ for (y = dy; y < h; y++) { w = width + dx; - for (x = dx; ((x < w) && (!(IS_ALIGNED_32((int)dest)))); x++) + for (x = dx; ((x < w) && (!(IS_ALIGNED_32((unsigned long)dest)))); x++) { WRITE1_RGBA_RGB666_DITHER(src, dest); } @@ -3773,7 +3773,7 @@ w = width; h = height; - if (IS_ALIGNED_32((int)dest)) + if (IS_ALIGNED_32((unsigned long)dest)) { if (IS_MULTIPLE_4(width)) { @@ -3817,7 +3817,7 @@ { for (y = 0; y < h; y++) { - for (x = 0; ((x < w) && (!(IS_ALIGNED_32((int)dest)))); x++) + for (x = 0; ((x < w) && (!(IS_ALIGNED_32((unsigned long)dest)))); x++) { WRITE1_RGBA_RGB232(src, dest); } @@ -3870,7 +3870,7 @@ w = width + dx; h = height + dy; - if (IS_ALIGNED_32((int)dest)) + if (IS_ALIGNED_32((unsigned long)dest)) { if (IS_MULTIPLE_4(width)) { @@ -3915,7 +3915,7 @@ for (y = dy; y < h; y++) { w = width + dx; - for (x = dx; ((x < w) && (!(IS_ALIGNED_32((int)dest)))); x++) + for (x = dx; ((x < w) && (!(IS_ALIGNED_32((unsigned long)dest)))); x++) { WRITE1_RGBA_RGB232_DITHER(src, dest); } @@ -3949,7 +3949,7 @@ w = width; h = height; - if (IS_ALIGNED_32((int)dest)) + if (IS_ALIGNED_32((unsigned long)dest)) { if (IS_MULTIPLE_4(width)) { @@ -3993,7 +3993,7 @@ { for (y = 0; y < h; y++) { - for (x = 0; ((x < w) && (!(IS_ALIGNED_32((int)dest)))); x++) + for (x = 0; ((x < w) && (!(IS_ALIGNED_32((unsigned long)dest)))); x++) { WRITE1_RGBA_RGB222(src, dest); } @@ -4046,7 +4046,7 @@ w = width + dx; h = height + dy; - if (IS_ALIGNED_32((int)dest)) + if (IS_ALIGNED_32((unsigned long)dest)) { if (IS_MULTIPLE_4(width)) { @@ -4091,7 +4091,7 @@ for (y = dy; y < h; y++) { w = width + dx; - for (x = dx; ((x < w) && (!(IS_ALIGNED_32((int)dest)))); x++) + for (x = dx; ((x < w) && (!(IS_ALIGNED_32((unsigned long)dest)))); x++) { WRITE1_RGBA_RGB222_DITHER(src, dest); } @@ -4125,7 +4125,7 @@ w = width; h = height; - if (IS_ALIGNED_32((int)dest)) + if (IS_ALIGNED_32((unsigned long)dest)) { if (IS_MULTIPLE_4(width)) { @@ -4169,7 +4169,7 @@ { for (y = 0; y < h; y++) { - for (x = 0; ((x < w) && (!(IS_ALIGNED_32((int)dest)))); x++) + for (x = 0; ((x < w) && (!(IS_ALIGNED_32((unsigned long)dest)))); x++) { WRITE1_RGBA_RGB221(src, dest); } @@ -4222,7 +4222,7 @@ w = width + dx; h = height + dy; - if (IS_ALIGNED_32((int)dest)) + if (IS_ALIGNED_32((unsigned long)dest)) { if (IS_MULTIPLE_4(width)) { @@ -4267,7 +4267,7 @@ for (y = dy; y < h; y++) { w = width + dx; - for (x = dx; ((x < w) && (!(IS_ALIGNED_32((int)dest)))); x++) + for (x = dx; ((x < w) && (!(IS_ALIGNED_32((unsigned long)dest)))); x++) { WRITE1_RGBA_RGB221_DITHER(src, dest); } @@ -4301,7 +4301,7 @@ w = width; h = height; - if (IS_ALIGNED_32((int)dest)) + if (IS_ALIGNED_32((unsigned long)dest)) { if (IS_MULTIPLE_4(width)) { @@ -4345,7 +4345,7 @@ { for (y = 0; y < h; y++) { - for (x = 0; ((x < w) && (!(IS_ALIGNED_32((int)dest)))); x++) + for (x = 0; ((x < w) && (!(IS_ALIGNED_32((unsigned long)dest)))); x++) { WRITE1_RGBA_RGB121(src, dest); } @@ -4398,7 +4398,7 @@ w = width + dx; h = height + dy; - if (IS_ALIGNED_32((int)dest)) + if (IS_ALIGNED_32((unsigned long)dest)) { if (IS_MULTIPLE_4(width)) { @@ -4443,7 +4443,7 @@ for (y = dy; y < h; y++) { w = width + dx; - for (x = dx; ((x < w) && (!(IS_ALIGNED_32((int)dest)))); x++) + for (x = dx; ((x < w) && (!(IS_ALIGNED_32((unsigned long)dest)))); x++) { WRITE1_RGBA_RGB121_DITHER(src, dest); } @@ -4477,7 +4477,7 @@ w = width; h = height; - if (IS_ALIGNED_32((int)dest)) + if (IS_ALIGNED_32((unsigned long)dest)) { if (IS_MULTIPLE_4(width)) { @@ -4521,7 +4521,7 @@ { for (y = 0; y < h; y++) { - for (x = 0; ((x < w) && (!(IS_ALIGNED_32((int)dest)))); x++) + for (x = 0; ((x < w) && (!(IS_ALIGNED_32((unsigned long)dest)))); x++) { WRITE1_RGBA_RGB111(src, dest); } @@ -4574,7 +4574,7 @@ w = width + dx; h = height + dy; - if (IS_ALIGNED_32((int)dest)) + if (IS_ALIGNED_32((unsigned long)dest)) { if (IS_MULTIPLE_4(width)) { @@ -4619,7 +4619,7 @@ for (y = dy; y < h; y++) { w = width + dx; - for (x = dx; ((x < w) && (!(IS_ALIGNED_32((int)dest)))); x++) + for (x = dx; ((x < w) && (!(IS_ALIGNED_32((unsigned long)dest)))); x++) { WRITE1_RGBA_RGB111_DITHER(src, dest); } |
From: <enl...@li...> - 2005-09-29 07:50:34
|
Enlightenment CVS committal Author : vapier Project : e17 Module : libs/imlib2 Dir : e17/libs/imlib2/src/lib Modified Files: rgba.c Log Message: add a new helper macro by Tres Melton: IS_ALIGNED_128 =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/imlib2/src/lib/rgba.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- rgba.c 29 Sep 2005 07:47:29 -0000 1.2 +++ rgba.c 29 Sep 2005 07:50:29 -0000 1.3 @@ -7,12 +7,13 @@ #ifdef BUILD_X11 -#define IS_ALIGNED_64(val) (!((val) & 0x7)) -#define IS_ALIGNED_32(val) (!((val) & 0x3)) -#define IS_ALIGNED_16(val) (!((val) & 0x1)) +#define IS_ALIGNED_128(val) (!((val) & 0x15)) +#define IS_ALIGNED_64(val) (!((val) & 0x7)) +#define IS_ALIGNED_32(val) (!((val) & 0x3)) +#define IS_ALIGNED_16(val) (!((val) & 0x1)) -#define IS_MULTIPLE_2(val) (!((val) & 0x1)) -#define IS_MULTIPLE_4(val) (!((val) & 0x3)) +#define IS_MULTIPLE_2(val) (!((val) & 0x1)) +#define IS_MULTIPLE_4(val) (!((val) & 0x3)) /* for PPC / Motorola / SPARC, not x86, ALPHA */ /* dont uncomment this - i have this here for my own testing */ |
From: <enl...@li...> - 2005-10-04 22:53:45
|
Enlightenment CVS committal Author : vapier Project : e17 Module : libs/imlib2 Dir : e17/libs/imlib2/src/lib Modified Files: Makefile.am Log Message: asm_loadimmq.S is included by other files, it isnt supposed to be compiled by itself =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/imlib2/src/lib/Makefile.am,v retrieving revision 1.8 retrieving revision 1.9 diff -u -3 -r1.8 -r1.9 --- Makefile.am 23 Aug 2005 16:20:42 -0000 1.8 +++ Makefile.am 4 Oct 2005 22:53:39 -0000 1.9 @@ -72,8 +72,7 @@ asm_blend_cmod.S \ asm_rgba.S \ asm_rotate.S \ -asm_scale.S \ -asm_loadimmq.S +asm_scale.S AMD64_SRCS = \ amd64_blend.S \ |
From: <enl...@li...> - 2005-10-04 22:54:49
|
Enlightenment CVS committal Author : vapier Project : e17 Module : libs/imlib2 Dir : e17/libs/imlib2/src/lib Modified Files: amd64_blend.S amd64_blend_cmod.S asm_blend.S asm_blend_cmod.S asm_rgba.S asm_rotate.S asm_scale.S Log Message: only use GNU stack markings when generating ELF objects =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/imlib2/src/lib/amd64_blend.S,v retrieving revision 1.5 retrieving revision 1.6 diff -u -3 -r1.5 -r1.6 --- amd64_blend.S 22 Aug 2005 11:06:35 -0000 1.5 +++ amd64_blend.S 4 Oct 2005 22:54:43 -0000 1.6 @@ -5557,5 +5557,8 @@ LEAVE SIZE(imlib_amd64_reshade_copy_rgb_to_rgba) +#endif + +#ifdef __ELF__ .section .note.GNU-stack,"",@progbits #endif =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/imlib2/src/lib/amd64_blend_cmod.S,v retrieving revision 1.4 retrieving revision 1.5 diff -u -3 -r1.4 -r1.5 --- amd64_blend_cmod.S 7 Aug 2005 07:07:24 -0000 1.4 +++ amd64_blend_cmod.S 4 Oct 2005 22:54:43 -0000 1.5 @@ -16822,5 +16822,8 @@ LEAVE SIZE(imlib_amd64_reshade_copy_rgb_to_rgba_cmod) +#endif + +#ifdef __ELF__ .section .note.GNU-stack,"",@progbits #endif =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/imlib2/src/lib/asm_blend.S,v retrieving revision 1.4 retrieving revision 1.5 diff -u -3 -r1.4 -r1.5 --- asm_blend.S 10 Aug 2005 05:10:19 -0000 1.4 +++ asm_blend.S 4 Oct 2005 22:54:43 -0000 1.5 @@ -1061,5 +1061,8 @@ SIZE(imlib_mmx_reshade_copy_rgb_to_rgba) +#endif + +#ifdef __ELF__ .section .note.GNU-stack,"",@progbits #endif =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/imlib2/src/lib/asm_blend_cmod.S,v retrieving revision 1.4 retrieving revision 1.5 diff -u -3 -r1.4 -r1.5 --- asm_blend_cmod.S 10 Aug 2005 05:10:19 -0000 1.4 +++ asm_blend_cmod.S 4 Oct 2005 22:54:43 -0000 1.5 @@ -1608,5 +1608,8 @@ SIZE(imlib_mmx_reshade_copy_rgb_to_rgba_cmod) +#endif + +#ifdef __ELF__ .section .note.GNU-stack,"",@progbits #endif =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/imlib2/src/lib/asm_rgba.S,v retrieving revision 1.5 retrieving revision 1.6 diff -u -3 -r1.5 -r1.6 --- asm_rgba.S 17 Aug 2005 22:42:55 -0000 1.5 +++ asm_rgba.S 4 Oct 2005 22:54:43 -0000 1.6 @@ -295,5 +295,8 @@ SIZE(imlib_get_cpuid) +#endif + +#ifdef __ELF__ .section .note.GNU-stack,"",@progbits #endif =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/imlib2/src/lib/asm_rotate.S,v retrieving revision 1.3 retrieving revision 1.4 diff -u -3 -r1.3 -r1.4 --- asm_rotate.S 6 Aug 2005 20:30:27 -0000 1.3 +++ asm_rotate.S 4 Oct 2005 22:54:43 -0000 1.4 @@ -465,5 +465,8 @@ SIZE(imlib_mmx_RotateAA) +#endif + +#ifdef __ELF__ .section .note.GNU-stack,"",@progbits #endif =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/imlib2/src/lib/asm_scale.S,v retrieving revision 1.3 retrieving revision 1.4 diff -u -3 -r1.3 -r1.4 --- asm_scale.S 6 Aug 2005 20:30:27 -0000 1.3 +++ asm_scale.S 4 Oct 2005 22:54:43 -0000 1.4 @@ -806,5 +806,8 @@ SIZE(imlib_Scale_mmx_AARGBA) +#endif + +#ifdef __ELF__ .section .note.GNU-stack,"",@progbits #endif |
From: <enl...@li...> - 2005-10-06 02:17:38
|
Enlightenment CVS committal Author : vapier Project : e17 Module : libs/imlib2 Dir : e17/libs/imlib2/src/lib Modified Files: Makefile.am Log Message: as pointed out by Quan, we need asm_loadimmq.S in EXTRA_DIST =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/imlib2/src/lib/Makefile.am,v retrieving revision 1.9 retrieving revision 1.10 diff -u -3 -r1.9 -r1.10 --- Makefile.am 4 Oct 2005 22:53:39 -0000 1.9 +++ Makefile.am 6 Oct 2005 02:17:32 -0000 1.10 @@ -81,7 +81,7 @@ MMX_OBJS = $(MMX_SRCS:.S=.lo) AMD64_OBJS = $(AMD64_SRCS:.S=.lo) -EXTRA_DIST = $(MMX_SRCS) $(AMD64_SRCS) +EXTRA_DIST = $(MMX_SRCS) $(AMD64_SRCS) asm_loadimmq.S if BUILD_MMX libImlib2_la_LIBADD = $(MMX_OBJS) @my_libs@ |
From: <enl...@li...> - 2005-10-13 00:09:54
|
Enlightenment CVS committal Author : vapier Project : e17 Module : libs/imlib2 Dir : e17/libs/imlib2 Modified Files: configure.in Log Message: make sure people know the mmx support is 32bit only so it isnt for amd64 =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/imlib2/configure.in,v retrieving revision 1.120 retrieving revision 1.121 diff -u -3 -r1.120 -r1.121 --- configure.in 9 Oct 2005 04:22:19 -0000 1.120 +++ configure.in 13 Oct 2005 00:09:47 -0000 1.121 @@ -103,7 +103,7 @@ dnl AC_ARG_ENABLE(mmx, -[ --enable-mmx attempt compiling using mmx assembly @<:@default=auto@:>@], +[ --enable-mmx attempt compiling using x86 mmx assembly @<:@default=auto@:>@], [ if test x$enableval = xyes; then mmx=yes @@ -619,8 +619,8 @@ echo " ID3.....................: $id3_ok" echo echo -echo "Use MMX for extra speed...: $mmx" -echo "Use AMD64 for extra speed.: $amd64" +echo "Use X86 MMX for speed.....: $mmx" +echo "Use AMD64 for speed.......: $amd64" echo echo echo "Installation Path.........: $prefix" |
From: <enl...@li...> - 2005-10-29 02:40:41
|
Enlightenment CVS committal Author : vapier Project : e17 Module : libs/imlib2 Dir : e17/libs/imlib2/m4 Modified Files: ac_path_generic.m4 Log Message: touchup help output =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/imlib2/m4/ac_path_generic.m4,v retrieving revision 1.4 retrieving revision 1.5 diff -u -3 -r1.4 -r1.5 --- ac_path_generic.m4 3 Sep 2005 03:54:27 -0000 1.4 +++ ac_path_generic.m4 29 Oct 2005 02:40:05 -0000 1.5 @@ -35,9 +35,11 @@ dnl dnl Get the cflags and libraries from the LIBRARY-config script dnl -AC_ARG_WITH(DOWN-prefix,[ --with-]DOWN[-prefix=PFX Prefix where $1 is installed (optional)], +AC_ARG_WITH(DOWN-prefix, + [ --with-]DOWN[-prefix=PFX Prefix where $1 is installed (optional)], DOWN[]_config_prefix="$withval", DOWN[]_config_prefix="") -AC_ARG_WITH(DOWN-exec-prefix,[ --with-]DOWN[-exec-prefix=PFX Exec prefix where $1 is installed (optional)], +AC_ARG_WITH(DOWN-exec-prefix, + [ --with-]DOWN[-exec-prefix=PFX Exec prefix where $1 is installed (optional)], DOWN[]_config_exec_prefix="$withval", DOWN[]_config_exec_prefix="") if test x$DOWN[]_config_exec_prefix != x ; then |
From: <enl...@li...> - 2005-12-30 02:50:14
|
Enlightenment CVS committal Author : vapier Project : e17 Module : libs/imlib2 Dir : e17/libs/imlib2/src/modules/loaders Modified Files: Makefile.am Log Message: fix whitespace =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/imlib2/src/modules/loaders/Makefile.am,v retrieving revision 1.4 retrieving revision 1.5 diff -u -3 -r1.4 -r1.5 --- Makefile.am 22 Jul 2005 10:28:11 -0000 1.4 +++ Makefile.am 30 Dec 2005 02:50:09 -0000 1.5 @@ -3,10 +3,10 @@ INCLUDES = -I. \ -I$(top_srcdir) \ - -I$(top_srcdir)/src/lib \ - -I$(top_srcdir)/src/modules/loaders \ - @my_includes@ - + -I$(top_srcdir)/src/lib \ + -I$(top_srcdir)/src/modules/loaders \ + @my_includes@ + pkgdir = $(libdir)/imlib2/loaders if BUILD_JPEG_LOADER |
From: <enl...@li...> - 2006-02-10 00:01:11
|
Enlightenment CVS committal Author : vapier Project : e17 Module : libs/imlib2 Dir : e17/libs/imlib2/src/lib Modified Files: blend.c Log Message: only declare do_mmx when it is needed =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/imlib2/src/lib/blend.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -3 -r1.4 -r1.5 --- blend.c 20 Sep 2005 17:22:48 -0000 1.4 +++ blend.c 10 Feb 2006 00:01:05 -0000 1.5 @@ -1772,7 +1772,9 @@ int sx, sy, sw, sh, dx, dy, dw, dh, dxx, dyy, y2, x2; int psx, psy, psw, psh; int y, h, hh; +#ifdef DO_MMX_ASM int do_mmx; +#endif sx = ssx; sy = ssy; |