mirror of https://github.com/mpv-player/mpv
HAVE_3DNOW --> HAVE_AMD3DNOW
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28370 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
parent
418ce8eb05
commit
eb4a4604c0
20
Makefile
20
Makefile
|
@ -387,10 +387,10 @@ SRCS_COMMON-$(MACOSX_FINDER) += osdep/macosx_finder_args.c
|
|||
SRCS_COMMON-$(MNG) += libmpdemux/demux_mng.c
|
||||
SRCS_COMMON-$(MP3LIB) += libmpcodecs/ad_mp3lib.c mp3lib/sr1.c
|
||||
SRCS_COMMON-$(MP3LIB)-$(ARCH_X86_32) += mp3lib/decode_i586.c
|
||||
SRCS_COMMON-$(MP3LIB)-$(ARCH_X86_32)-$(HAVE_3DNOW) += mp3lib/dct36_3dnow.c \
|
||||
mp3lib/dct64_3dnow.c
|
||||
SRCS_COMMON-$(MP3LIB)-$(ARCH_X86_32)-$(HAVE_3DNOWEXT) += mp3lib/dct36_k7.c \
|
||||
mp3lib/dct64_k7.c
|
||||
SRCS_COMMON-$(MP3LIB)-$(ARCH_X86_32)-$(HAVE_AMD3DNOW) += mp3lib/dct36_3dnow.c \
|
||||
mp3lib/dct64_3dnow.c
|
||||
SRCS_COMMON-$(MP3LIB)-$(ARCH_X86_32)-$(HAVE_AMD3DNOWEXT) += mp3lib/dct36_k7.c \
|
||||
mp3lib/dct64_k7.c
|
||||
SRCS_COMMON-$(MP3LIB)-$(ARCH_X86_32)-$(HAVE_MMX) += mp3lib/dct64_mmx.c
|
||||
SRCS_COMMON-$(MP3LIB)-$(HAVE_ALTIVEC) += mp3lib/dct64_altivec.c
|
||||
SRCS_COMMON-$(MP3LIB)-$(HAVE_MMX) += mp3lib/decode_mmx.c
|
||||
|
@ -1026,13 +1026,13 @@ TOOLS/netstream$(EXESUF) TOOLS/vivodump$(EXESUF): $(subst mplayer.o,mplayer-noma
|
|||
|
||||
fastmemcpybench: TOOLS/fastmemcpybench.c
|
||||
$(CC) $(CFLAGS) $< -o TOOLS/fastmem-mmx$(EXESUF) -DNAME=\"mmx\" -DHAVE_MMX
|
||||
$(CC) $(CFLAGS) $< -o TOOLS/fastmem-k6$(EXESUF) -DNAME=\"k6\ \" -DHAVE_MMX -DHAVE_3DNOW
|
||||
$(CC) $(CFLAGS) $< -o TOOLS/fastmem-k7$(EXESUF) -DNAME=\"k7\ \" -DHAVE_MMX -DHAVE_3DNOW -DHAVE_MMX2
|
||||
$(CC) $(CFLAGS) $< -o TOOLS/fastmem-sse$(EXESUF) -DNAME=\"sse\" -DHAVE_MMX -DHAVE_SSE -DHAVE_MMX2
|
||||
$(CC) $(CFLAGS) $< -o TOOLS/fastmem-k6$(EXESUF) -DNAME=\"k6\ \" -DHAVE_MMX -DHAVE_AMD3DNOW
|
||||
$(CC) $(CFLAGS) $< -o TOOLS/fastmem-k7$(EXESUF) -DNAME=\"k7\ \" -DHAVE_MMX -DHAVE_AMD3DNOW -DHAVE_MMX2
|
||||
$(CC) $(CFLAGS) $< -o TOOLS/fastmem-sse$(EXESUF) -DNAME=\"sse\" -DHAVE_MMX -DHAVE_SSE -DHAVE_MMX2
|
||||
$(CC) $(CFLAGS) $< -o TOOLS/fastmem2-mmx$(EXESUF) -DNAME=\"mga-mmx\" -DCONFIG_MGA -DHAVE_MMX
|
||||
$(CC) $(CFLAGS) $< -o TOOLS/fastmem2-k6$(EXESUF) -DNAME=\"mga-k6\ \" -DCONFIG_MGA -DHAVE_MMX -DHAVE_3DNOW
|
||||
$(CC) $(CFLAGS) $< -o TOOLS/fastmem2-k7$(EXESUF) -DNAME=\"mga-k7\ \" -DCONFIG_MGA -DHAVE_MMX -DHAVE_3DNOW -DHAVE_MMX2
|
||||
$(CC) $(CFLAGS) $< -o TOOLS/fastmem2-sse$(EXESUF) -DNAME=\"mga-sse\" -DCONFIG_MGA -DHAVE_MMX -DHAVE_SSE -DHAVE_MMX2
|
||||
$(CC) $(CFLAGS) $< -o TOOLS/fastmem2-k6$(EXESUF) -DNAME=\"mga-k6\ \" -DCONFIG_MGA -DHAVE_MMX -DHAVE_AMD3DNOW
|
||||
$(CC) $(CFLAGS) $< -o TOOLS/fastmem2-k7$(EXESUF) -DNAME=\"mga-k7\ \" -DCONFIG_MGA -DHAVE_MMX -DHAVE_AMD3DNOW -DHAVE_MMX2
|
||||
$(CC) $(CFLAGS) $< -o TOOLS/fastmem2-sse$(EXESUF) -DNAME=\"mga-sse\" -DCONFIG_MGA -DHAVE_MMX -DHAVE_SSE -DHAVE_MMX2
|
||||
|
||||
REAL_SRCS = $(wildcard TOOLS/realcodecs/*.c)
|
||||
REAL_TARGETS = $(REAL_SRCS:.c=.so.6.0)
|
||||
|
|
|
@ -2611,12 +2611,12 @@ EOF
|
|||
echores "$_iwmmxt"
|
||||
fi
|
||||
|
||||
_cpuexts_all='ALTIVEC MMX MMX2 3DNOW 3DNOWEXT SSE SSE2 SSSE3 FAST_CMOV CMOV PLD ARMV5TE ARMV6 ARMV6T2 ARMVFP IWMMXT MMI VIS MVI'
|
||||
_cpuexts_all='ALTIVEC MMX MMX2 AMD3DNOW AMD3DNOWEXT SSE SSE2 SSSE3 FAST_CMOV CMOV PLD ARMV5TE ARMV6 ARMV6T2 ARMVFP IWMMXT MMI VIS MVI'
|
||||
test "$_altivec" = yes && _cpuexts="ALTIVEC $_cpuexts"
|
||||
test "$_mmx" = yes && _cpuexts="MMX $_cpuexts"
|
||||
test "$_mmxext" = yes && _cpuexts="MMX2 $_cpuexts"
|
||||
test "$_3dnow" = yes && _cpuexts="3DNOW $_cpuexts"
|
||||
test "$_3dnowext" = yes && _cpuexts="3DNOWEXT $_cpuexts"
|
||||
test "$_3dnow" = yes && _cpuexts="AMD3DNOW $_cpuexts"
|
||||
test "$_3dnowext" = yes && _cpuexts="AMD3DNOWEXT $_cpuexts"
|
||||
test "$_sse" = yes && _cpuexts="SSE $_cpuexts"
|
||||
test "$_sse2" = yes && _cpuexts="SSE2 $_cpuexts"
|
||||
test "$_ssse3" = yes && _cpuexts="SSSE3 $_cpuexts"
|
||||
|
|
|
@ -228,11 +228,11 @@ void GetCpuCaps( CpuCaps *caps)
|
|||
if(caps->hasSSE2) mp_msg(MSGT_CPUDETECT,MSGL_WARN,"SSE2 supported but disabled\n");
|
||||
caps->hasSSE2=0;
|
||||
#endif
|
||||
#if !HAVE_3DNOW
|
||||
#if !HAVE_AMD3DNOW
|
||||
if(caps->has3DNow) mp_msg(MSGT_CPUDETECT,MSGL_WARN,"3DNow supported but disabled\n");
|
||||
caps->has3DNow=0;
|
||||
#endif
|
||||
#if !HAVE_3DNOWEXT
|
||||
#if !HAVE_AMD3DNOWEXT
|
||||
if(caps->has3DNowExt) mp_msg(MSGT_CPUDETECT,MSGL_WARN,"3DNowExt supported but disabled\n");
|
||||
caps->has3DNowExt=0;
|
||||
#endif
|
||||
|
|
|
@ -53,8 +53,8 @@
|
|||
void (*a52_imdct_512) (sample_t * data, sample_t * delay, sample_t bias);
|
||||
|
||||
#ifdef RUNTIME_CPUDETECT
|
||||
#undef HAVE_3DNOWEXT
|
||||
#define HAVE_3DNOWEXT 0
|
||||
#undef HAVE_AMD3DNOWEXT
|
||||
#define HAVE_AMD3DNOWEXT 0
|
||||
#endif
|
||||
|
||||
typedef struct complex_s {
|
||||
|
@ -712,19 +712,19 @@ imdct_do_512_altivec(sample_t data[],sample_t delay[], sample_t bias)
|
|||
// Stuff below this line is borrowed from libac3
|
||||
#include "srfftp.h"
|
||||
#if ARCH_X86 || ARCH_X86_64
|
||||
#undef HAVE_3DNOW
|
||||
#define HAVE_3DNOW 1
|
||||
#undef HAVE_AMD3DNOW
|
||||
#define HAVE_AMD3DNOW 1
|
||||
#include "srfftp_3dnow.h"
|
||||
|
||||
const i_cmplx_t x_plus_minus_3dnow __attribute__ ((aligned (8))) = {{ 0x00000000UL, 0x80000000UL }};
|
||||
const i_cmplx_t x_minus_plus_3dnow __attribute__ ((aligned (8))) = {{ 0x80000000UL, 0x00000000UL }};
|
||||
const complex_t HSQRT2_3DNOW __attribute__ ((aligned (8))) = { 0.707106781188, 0.707106781188 };
|
||||
|
||||
#undef HAVE_3DNOWEXT
|
||||
#define HAVE_3DNOWEXT 0
|
||||
#undef HAVE_AMD3DNOWEXT
|
||||
#define HAVE_AMD3DNOWEXT 0
|
||||
#include "imdct_3dnow.h"
|
||||
#undef HAVE_3DNOWEXT
|
||||
#define HAVE_3DNOWEXT 1
|
||||
#undef HAVE_AMD3DNOWEXT
|
||||
#define HAVE_AMD3DNOWEXT 1
|
||||
#include "imdct_3dnow.h"
|
||||
|
||||
void
|
||||
|
|
|
@ -26,7 +26,7 @@
|
|||
#undef FFT_ASMB16_3DNOW
|
||||
#undef FFT_128P_3DNOW
|
||||
|
||||
#if HAVE_3DNOWEXT
|
||||
#if HAVE_AMD3DNOWEXT
|
||||
#define FFT_4_3DNOW fft_4_3dnowex
|
||||
#define FFT_8_3DNOW fft_8_3dnowex
|
||||
#define FFT_ASMB_3DNOW fft_asmb_3dnowex
|
||||
|
@ -52,7 +52,7 @@ static void FFT_4_3DNOW(complex_t *x)
|
|||
"pxor %3, %%mm1\n\t" /* -mm1.re | mm1.im */
|
||||
"pfadd %%mm1, %%mm3\n\t" /* vi.im = x[3].re - x[1].re; */
|
||||
"movq %%mm3, %%mm4\n\t" /* vi.re =-x[3].im + x[1].im; mm4 = vi */
|
||||
#if HAVE_3DNOWEXT
|
||||
#if HAVE_AMD3DNOWEXT
|
||||
"pswapd %%mm4, %%mm4\n\t"
|
||||
#else
|
||||
"punpckldq %%mm4, %%mm5\n\t"
|
||||
|
@ -129,7 +129,7 @@ static void FFT_8_3DNOW(complex_t *x)
|
|||
"movq (%1), %%mm1\n\t"
|
||||
"movq 16(%1), %%mm4\n\t"
|
||||
"movq %%mm1, %%mm2\n\t"
|
||||
#if HAVE_3DNOWEXT
|
||||
#if HAVE_AMD3DNOWEXT
|
||||
"pswapd %%mm3, %%mm3\n\t"
|
||||
#else
|
||||
"punpckldq %%mm3, %%mm6\n\t"
|
||||
|
@ -160,7 +160,7 @@ static void FFT_8_3DNOW(complex_t *x)
|
|||
"movq %2, %%mm1\n\t"
|
||||
"movq 56(%3), %%mm3\n\t"
|
||||
"pfsub 40(%3), %%mm0\n\t"
|
||||
#if HAVE_3DNOWEXT
|
||||
#if HAVE_AMD3DNOWEXT
|
||||
"pswapd %%mm1, %%mm1\n\t"
|
||||
#else
|
||||
"punpckldq %%mm1, %%mm2\n\t"
|
||||
|
@ -168,7 +168,7 @@ static void FFT_8_3DNOW(complex_t *x)
|
|||
#endif
|
||||
"pxor %%mm7, %%mm1\n\t"
|
||||
"pfadd %%mm1, %%mm0\n\t"
|
||||
#if HAVE_3DNOWEXT
|
||||
#if HAVE_AMD3DNOWEXT
|
||||
"pswapd %%mm3, %%mm3\n\t"
|
||||
#else
|
||||
"punpckldq %%mm3, %%mm2\n\t"
|
||||
|
@ -182,7 +182,7 @@ static void FFT_8_3DNOW(complex_t *x)
|
|||
"pfmul %4, %%mm0\n\t"
|
||||
|
||||
"movq 40(%3), %%mm5\n\t"
|
||||
#if HAVE_3DNOWEXT
|
||||
#if HAVE_AMD3DNOWEXT
|
||||
"pswapd %%mm5, %%mm5\n\t"
|
||||
#else
|
||||
"punpckldq %%mm5, %%mm1\n\t"
|
||||
|
@ -205,7 +205,7 @@ static void FFT_8_3DNOW(complex_t *x)
|
|||
/* x[3] x[7] */
|
||||
__asm__ volatile(
|
||||
"movq %1, %%mm0\n\t"
|
||||
#if HAVE_3DNOWEXT
|
||||
#if HAVE_AMD3DNOWEXT
|
||||
"pswapd %3, %%mm1\n\t"
|
||||
#else
|
||||
"movq %3, %%mm1\n\t"
|
||||
|
@ -218,7 +218,7 @@ static void FFT_8_3DNOW(complex_t *x)
|
|||
"movq 56(%4), %%mm3\n\t"
|
||||
"pxor %%mm7, %%mm3\n\t"
|
||||
"pfadd %%mm3, %%mm2\n\t"
|
||||
#if HAVE_3DNOWEXT
|
||||
#if HAVE_AMD3DNOWEXT
|
||||
"pswapd %%mm2, %%mm2\n\t"
|
||||
#else
|
||||
"punpckldq %%mm2, %%mm5\n\t"
|
||||
|
@ -331,7 +331,7 @@ static void FFT_128P_3DNOW(complex_t *a)
|
|||
}
|
||||
|
||||
static void
|
||||
#if HAVE_3DNOWEXT
|
||||
#if HAVE_AMD3DNOWEXT
|
||||
imdct_do_512_3dnowex
|
||||
#else
|
||||
imdct_do_512_3dnow
|
||||
|
@ -371,14 +371,14 @@ imdct_do_512_3dnow
|
|||
"punpckldq %4, %%mm1\n\t" /* mm1 = xcos[j] | xsin[j] */
|
||||
"movq %%mm0, %%mm2\n\t"
|
||||
"pfmul %%mm1, %%mm0\n\t"
|
||||
#if HAVE_3DNOWEXT
|
||||
#if HAVE_AMD3DNOWEXT
|
||||
"pswapd %%mm1, %%mm1\n\t"
|
||||
#else
|
||||
"punpckldq %%mm1, %%mm5\n\t"
|
||||
"punpckhdq %%mm5, %%mm1\n\t"
|
||||
#endif
|
||||
"pfmul %%mm1, %%mm2\n\t"
|
||||
#if HAVE_3DNOWEXT
|
||||
#if HAVE_AMD3DNOWEXT
|
||||
"pfpnacc %%mm2, %%mm0\n\t"
|
||||
#else
|
||||
"pxor %%mm7, %%mm0\n\t"
|
||||
|
@ -445,7 +445,7 @@ imdct_do_512_3dnow
|
|||
__asm__ volatile (
|
||||
"movq %1, %%mm0\n\t" /* ac3_buf[i].re | ac3_buf[i].im */
|
||||
"movq %%mm0, %%mm1\n\t" /* ac3_buf[i].re | ac3_buf[i].im */
|
||||
#if !HAVE_3DNOWEXT
|
||||
#if !HAVE_AMD3DNOWEXT
|
||||
"punpckldq %%mm1, %%mm2\n\t"
|
||||
"punpckhdq %%mm2, %%mm1\n\t"
|
||||
#else
|
||||
|
@ -455,7 +455,7 @@ imdct_do_512_3dnow
|
|||
"punpckldq %2, %%mm3\n\t" /* ac3_xsin[i] | ac3_xcos[i] */
|
||||
"pfmul %%mm3, %%mm0\n\t"
|
||||
"pfmul %%mm3, %%mm1\n\t"
|
||||
#if !HAVE_3DNOWEXT
|
||||
#if !HAVE_AMD3DNOWEXT
|
||||
"pxor %%mm7, %%mm0\n\t"
|
||||
"pfacc %%mm1, %%mm0\n\t"
|
||||
"punpckldq %%mm0, %%mm1\n\t"
|
||||
|
@ -543,7 +543,7 @@ imdct_do_512_3dnow
|
|||
"movd (%1), %%mm1\n\t"
|
||||
"punpckldq (%2), %%mm0\n\t"
|
||||
"punpckldq 508(%2), %%mm1\n\t"
|
||||
#if HAVE_3DNOWEXT
|
||||
#if HAVE_AMD3DNOWEXT
|
||||
"pswapd (%3), %%mm3\n\t"
|
||||
"pswapd -512(%3), %%mm4\n\t"
|
||||
#else
|
||||
|
|
|
@ -1412,7 +1412,7 @@
|
|||
+void (*a52_imdct_512) (sample_t * data, sample_t * delay, sample_t bias);
|
||||
+
|
||||
+#ifdef RUNTIME_CPUDETECT
|
||||
+#undef HAVE_3DNOWEXT
|
||||
+#undef HAVE_AMD3DNOWEXT
|
||||
+#endif
|
||||
|
||||
typedef struct complex_s {
|
||||
|
@ -1853,8 +1853,8 @@
|
|||
+// Stuff below this line is borrowed from libac3
|
||||
+#include "srfftp.h"
|
||||
+#if defined(ARCH_X86) || defined(ARCH_X86_64)
|
||||
+#ifndef HAVE_3DNOW
|
||||
+#define HAVE_3DNOW 1
|
||||
+#ifndef HAVE_AMD3DNOW
|
||||
+#define HAVE_AMD3DNOW 1
|
||||
+#endif
|
||||
+#include "srfftp_3dnow.h"
|
||||
+
|
||||
|
@ -1862,9 +1862,9 @@
|
|||
+const i_cmplx_t x_minus_plus_3dnow __attribute__ ((aligned (8))) = {{ 0x80000000UL, 0x00000000UL }};
|
||||
+const complex_t HSQRT2_3DNOW __attribute__ ((aligned (8))) = { 0.707106781188, 0.707106781188 };
|
||||
+
|
||||
+#undef HAVE_3DNOWEXT
|
||||
+#undef HAVE_AMD3DNOWEXT
|
||||
+#include "imdct_3dnow.h"
|
||||
+#define HAVE_3DNOWEXT
|
||||
+#define HAVE_AMD3DNOWEXT
|
||||
+#include "imdct_3dnow.h"
|
||||
+
|
||||
+void
|
||||
|
|
|
@ -46,7 +46,7 @@ typedef struct
|
|||
"m"(x_minus_plus_3dnow)\
|
||||
:"memory");
|
||||
|
||||
#if HAVE_3DNOWEXT
|
||||
#if HAVE_AMD3DNOWEXT
|
||||
#define PSWAP_MM(mm_base,mm_hlp) "pswapd "mm_base","mm_base"\n\t"
|
||||
#else
|
||||
#define PSWAP_MM(mm_base,mm_hlp)\
|
||||
|
@ -54,7 +54,7 @@ typedef struct
|
|||
"psrlq $32, "mm_base"\n\t"\
|
||||
"punpckldq "mm_hlp","mm_base"\n\t"
|
||||
#endif
|
||||
#if HAVE_3DNOWEXT
|
||||
#if HAVE_AMD3DNOWEXT
|
||||
#define PFNACC_MM(mm_base,mm_hlp) "pfnacc "mm_base","mm_base"\n\t"
|
||||
#else
|
||||
#define PFNACC_MM(mm_base,mm_hlp)\
|
||||
|
|
|
@ -93,7 +93,7 @@ extern int* af_cpu_speed;
|
|||
|
||||
// Default init type
|
||||
#ifndef AF_INIT_TYPE
|
||||
#if HAVE_SSE || HAVE_3DNOW
|
||||
#if HAVE_SSE || HAVE_AMD3DNOW
|
||||
#define AF_INIT_TYPE (af_cpu_speed?*af_cpu_speed:AF_INIT_FAST)
|
||||
#else
|
||||
#define AF_INIT_TYPE (af_cpu_speed?*af_cpu_speed:AF_INIT_SLOW)
|
||||
|
|
|
@ -433,7 +433,7 @@ block_metrics_3dnow(unsigned char *a, unsigned char *b, int as, int bs,
|
|||
int lines, struct vf_priv_s *p, struct frame_stats *s)
|
||||
{
|
||||
struct metrics tm;
|
||||
#if !HAVE_3DNOW
|
||||
#if !HAVE_AMD3DNOW
|
||||
mp_msg(MSGT_VFILTER, MSGL_FATAL, "block_metrics_3dnow: internal error\n");
|
||||
#else
|
||||
static const unsigned long long ones = 0x0101010101010101ull;
|
||||
|
@ -1425,7 +1425,7 @@ static int open(vf_instance_t *vf, char* args)
|
|||
#if !HAVE_MMX
|
||||
p->mmx2 = 0;
|
||||
#endif
|
||||
#if !HAVE_3DNOW
|
||||
#if !HAVE_AMD3DNOW
|
||||
p->mmx2 &= 1;
|
||||
#endif
|
||||
p->thres.odd = p->thres.even;
|
||||
|
|
|
@ -46,7 +46,7 @@ static void deint(unsigned char *dest, int ds, unsigned char *src, int ss, int w
|
|||
}
|
||||
}
|
||||
|
||||
#if HAVE_3DNOW
|
||||
#if HAVE_AMD3DNOW
|
||||
static void qpel_li_3DNOW(unsigned char *d, unsigned char *s, int w, int h, int ds, int ss, int up)
|
||||
{
|
||||
int i, j, ssd=ss;
|
||||
|
@ -485,7 +485,7 @@ static int open(vf_instance_t *vf, char* args)
|
|||
#if HAVE_MMX2
|
||||
if(gCpuCaps.hasMMX2) qpel_li = qpel_li_MMX2;
|
||||
#endif
|
||||
#if HAVE_3DNOW
|
||||
#if HAVE_AMD3DNOW
|
||||
if(gCpuCaps.has3DNow) qpel_li = qpel_li_3DNOW;
|
||||
#endif
|
||||
return 1;
|
||||
|
|
|
@ -136,7 +136,7 @@
|
|||
- else if (accel & MPEG2_ACCEL_X86_3DNOW)
|
||||
+ else
|
||||
+#endif
|
||||
+#ifdef HAVE_3DNOW
|
||||
+#ifdef HAVE_AMD3DNOW
|
||||
+ if (accel & MPEG2_ACCEL_X86_3DNOW)
|
||||
mpeg2_mc = mpeg2_mc_3dnow;
|
||||
- else if (accel & MPEG2_ACCEL_X86_MMX)
|
||||
|
|
|
@ -42,7 +42,7 @@ void mpeg2_mc_init (uint32_t accel)
|
|||
mpeg2_mc = mpeg2_mc_mmxext;
|
||||
else
|
||||
#endif
|
||||
#if HAVE_3DNOW
|
||||
#if HAVE_AMD3DNOW
|
||||
if (accel & MPEG2_ACCEL_X86_3DNOW)
|
||||
mpeg2_mc = mpeg2_mc_3dnow;
|
||||
else
|
||||
|
|
|
@ -30,7 +30,7 @@
|
|||
|
||||
#ifdef CAN_COMPILE_X86_ASM
|
||||
|
||||
#if (HAVE_MMX && !HAVE_3DNOW && !HAVE_MMX2) || defined (RUNTIME_CPUDETECT)
|
||||
#if (HAVE_MMX && !HAVE_AMD3DNOW && !HAVE_MMX2) || defined (RUNTIME_CPUDETECT)
|
||||
#define COMPILE_MMX
|
||||
#endif
|
||||
|
||||
|
@ -38,7 +38,7 @@
|
|||
#define COMPILE_MMX2
|
||||
#endif
|
||||
|
||||
#if (HAVE_3DNOW && !HAVE_MMX2) || defined (RUNTIME_CPUDETECT)
|
||||
#if (HAVE_AMD3DNOW && !HAVE_MMX2) || defined (RUNTIME_CPUDETECT)
|
||||
#define COMPILE_3DNOW
|
||||
#endif
|
||||
|
||||
|
@ -48,24 +48,24 @@
|
|||
|
||||
#undef HAVE_MMX
|
||||
#undef HAVE_MMX2
|
||||
#undef HAVE_3DNOW
|
||||
#undef HAVE_AMD3DNOW
|
||||
#undef HAVE_SSE
|
||||
#undef HAVE_SSE2
|
||||
#define HAVE_MMX 0
|
||||
#define HAVE_MMX2 0
|
||||
#define HAVE_3DNOW 0
|
||||
#define HAVE_AMD3DNOW 0
|
||||
#define HAVE_SSE 0
|
||||
#define HAVE_SSE2 0
|
||||
/*
|
||||
#ifdef COMPILE_C
|
||||
#undef HAVE_MMX
|
||||
#undef HAVE_MMX2
|
||||
#undef HAVE_3DNOW
|
||||
#undef HAVE_AMD3DNOW
|
||||
#undef HAVE_SSE
|
||||
#undef HAVE_SSE2
|
||||
#define HAVE_MMX 0
|
||||
#define HAVE_MMX2 0
|
||||
#define HAVE_3DNOW 0
|
||||
#define HAVE_AMD3DNOW 0
|
||||
#define HAVE_SSE 0
|
||||
#define HAVE_SSE2 0
|
||||
#define RENAME(a) a ## _C
|
||||
|
@ -77,12 +77,12 @@
|
|||
#undef RENAME
|
||||
#undef HAVE_MMX
|
||||
#undef HAVE_MMX2
|
||||
#undef HAVE_3DNOW
|
||||
#undef HAVE_AMD3DNOW
|
||||
#undef HAVE_SSE
|
||||
#undef HAVE_SSE2
|
||||
#define HAVE_MMX 1
|
||||
#define HAVE_MMX2 0
|
||||
#define HAVE_3DNOW 0
|
||||
#define HAVE_AMD3DNOW 0
|
||||
#define HAVE_SSE 0
|
||||
#define HAVE_SSE2 0
|
||||
#define RENAME(a) a ## _MMX
|
||||
|
@ -94,12 +94,12 @@
|
|||
#undef RENAME
|
||||
#undef HAVE_MMX
|
||||
#undef HAVE_MMX2
|
||||
#undef HAVE_3DNOW
|
||||
#undef HAVE_AMD3DNOW
|
||||
#undef HAVE_SSE
|
||||
#undef HAVE_SSE2
|
||||
#define HAVE_MMX 1
|
||||
#define HAVE_MMX2 1
|
||||
#define HAVE_3DNOW 0
|
||||
#define HAVE_AMD3DNOW 0
|
||||
#define HAVE_SSE 0
|
||||
#define HAVE_SSE2 0
|
||||
#define RENAME(a) a ## _MMX2
|
||||
|
@ -111,12 +111,12 @@
|
|||
#undef RENAME
|
||||
#undef HAVE_MMX
|
||||
#undef HAVE_MMX2
|
||||
#undef HAVE_3DNOW
|
||||
#undef HAVE_AMD3DNOW
|
||||
#undef HAVE_SSE
|
||||
#undef HAVE_SSE2
|
||||
#define HAVE_MMX 1
|
||||
#define HAVE_MMX2 0
|
||||
#define HAVE_3DNOW 1
|
||||
#define HAVE_AMD3DNOW 1
|
||||
#define HAVE_SSE 0
|
||||
#define HAVE_SSE2 0
|
||||
#define RENAME(a) a ## _3DNow
|
||||
|
@ -128,12 +128,12 @@
|
|||
#undef RENAME
|
||||
#undef HAVE_MMX
|
||||
#undef HAVE_MMX2
|
||||
#undef HAVE_3DNOW
|
||||
#undef HAVE_AMD3DNOW
|
||||
#undef HAVE_SSE
|
||||
#undef HAVE_SSE2
|
||||
#define HAVE_MMX 1
|
||||
#define HAVE_MMX2 1
|
||||
#define HAVE_3DNOW 0
|
||||
#define HAVE_AMD3DNOW 0
|
||||
#define HAVE_SSE 1
|
||||
#define HAVE_SSE2 1
|
||||
#define RENAME(a) a ## _SSE
|
||||
|
@ -165,7 +165,7 @@ void * fast_memcpy(void * to, const void * from, size_t len)
|
|||
fast_memcpy_SSE(to, from, len);
|
||||
#elif HAVE_MMX2
|
||||
fast_memcpy_MMX2(to, from, len);
|
||||
#elif HAVE_3DNOW
|
||||
#elif HAVE_AMD3DNOW
|
||||
fast_memcpy_3DNow(to, from, len);
|
||||
#elif HAVE_MMX
|
||||
fast_memcpy_MMX(to, from, len);
|
||||
|
@ -199,7 +199,7 @@ void * mem2agpcpy(void * to, const void * from, size_t len)
|
|||
mem2agpcpy_SSE(to, from, len);
|
||||
#elif HAVE_MMX2
|
||||
mem2agpcpy_MMX2(to, from, len);
|
||||
#elif HAVE_3DNOW
|
||||
#elif HAVE_AMD3DNOW
|
||||
mem2agpcpy_3DNow(to, from, len);
|
||||
#elif HAVE_MMX
|
||||
mem2agpcpy_MMX(to, from, len);
|
||||
|
|
|
@ -66,7 +66,7 @@ If you have questions please contact with me: Nick Kurshev: nickols_k@mail.ru.
|
|||
|
||||
|
||||
#undef HAVE_ONLY_MMX1
|
||||
#if HAVE_MMX && !HAVE_MMX2 && !HAVE_3DNOW && !HAVE_SSE
|
||||
#if HAVE_MMX && !HAVE_MMX2 && !HAVE_AMD3DNOW && !HAVE_SSE
|
||||
/* means: mmx v.1. Note: Since we added alignment of destinition it speedups
|
||||
of memory copying on PentMMX, Celeron-1 and P2 upto 12% versus
|
||||
standard (non MMX-optimized) version.
|
||||
|
@ -77,7 +77,7 @@ If you have questions please contact with me: Nick Kurshev: nickols_k@mail.ru.
|
|||
|
||||
|
||||
#undef HAVE_K6_2PLUS
|
||||
#if !HAVE_MMX2 && HAVE_3DNOW
|
||||
#if !HAVE_MMX2 && HAVE_AMD3DNOW
|
||||
#define HAVE_K6_2PLUS
|
||||
#endif
|
||||
|
||||
|
@ -107,14 +107,14 @@ __asm__ volatile(\
|
|||
|
||||
#if HAVE_MMX2
|
||||
#define PREFETCH "prefetchnta"
|
||||
#elif HAVE_3DNOW
|
||||
#elif HAVE_AMD3DNOW
|
||||
#define PREFETCH "prefetch"
|
||||
#else
|
||||
#define PREFETCH " # nop"
|
||||
#endif
|
||||
|
||||
/* On K6 femms is faster of emms. On K7 femms is directly mapped on emms. */
|
||||
#if HAVE_3DNOW
|
||||
#if HAVE_AMD3DNOW
|
||||
#define EMMS "femms"
|
||||
#else
|
||||
#define EMMS "emms"
|
||||
|
|
|
@ -24,7 +24,7 @@
|
|||
#include <string.h>
|
||||
|
||||
#ifdef CONFIG_FASTMEMCPY
|
||||
#if HAVE_MMX || HAVE_MMX2 || HAVE_3DNOW \
|
||||
#if HAVE_MMX || HAVE_MMX2 || HAVE_AMD3DNOW \
|
||||
/* || HAVE_SSE || HAVE_SSE2 */
|
||||
#include <stddef.h>
|
||||
|
||||
|
|
40
libvo/osd.c
40
libvo/osd.c
|
@ -29,7 +29,7 @@ static const unsigned long long mask24hl __attribute__((aligned(8))) = 0x0000FF
|
|||
|
||||
#ifdef CAN_COMPILE_X86_ASM
|
||||
|
||||
#if (HAVE_MMX && !HAVE_3DNOW && !HAVE_MMX2) || defined (RUNTIME_CPUDETECT)
|
||||
#if (HAVE_MMX && !HAVE_AMD3DNOW && !HAVE_MMX2) || defined (RUNTIME_CPUDETECT)
|
||||
#define COMPILE_MMX
|
||||
#endif
|
||||
|
||||
|
@ -37,27 +37,27 @@ static const unsigned long long mask24hl __attribute__((aligned(8))) = 0x0000FF
|
|||
#define COMPILE_MMX2
|
||||
#endif
|
||||
|
||||
#if (HAVE_3DNOW && !HAVE_MMX2) || defined (RUNTIME_CPUDETECT)
|
||||
#if (HAVE_AMD3DNOW && !HAVE_MMX2) || defined (RUNTIME_CPUDETECT)
|
||||
#define COMPILE_3DNOW
|
||||
#endif
|
||||
#endif //CAN_COMPILE_X86_ASM
|
||||
|
||||
#undef HAVE_MMX
|
||||
#undef HAVE_MMX2
|
||||
#undef HAVE_3DNOW
|
||||
#undef HAVE_AMD3DNOW
|
||||
#define HAVE_MMX 0
|
||||
#define HAVE_MMX2 0
|
||||
#define HAVE_3DNOW 0
|
||||
#define HAVE_AMD3DNOW 0
|
||||
|
||||
#ifndef CAN_COMPILE_X86_ASM
|
||||
|
||||
#ifdef COMPILE_C
|
||||
#undef HAVE_MMX
|
||||
#undef HAVE_MMX2
|
||||
#undef HAVE_3DNOW
|
||||
#undef HAVE_AMD3DNOW
|
||||
#define HAVE_MMX 0
|
||||
#define HAVE_MMX2 0
|
||||
#define HAVE_3DNOW 0
|
||||
#define HAVE_AMD3DNOW 0
|
||||
#define RENAME(a) a ## _C
|
||||
#include "osd_template.c"
|
||||
#endif
|
||||
|
@ -69,10 +69,10 @@ static const unsigned long long mask24hl __attribute__((aligned(8))) = 0x0000FF
|
|||
#undef RENAME
|
||||
#undef HAVE_MMX
|
||||
#undef HAVE_MMX2
|
||||
#undef HAVE_3DNOW
|
||||
#undef HAVE_AMD3DNOW
|
||||
#define HAVE_MMX 0
|
||||
#define HAVE_MMX2 0
|
||||
#define HAVE_3DNOW 0
|
||||
#define HAVE_AMD3DNOW 0
|
||||
#define RENAME(a) a ## _X86
|
||||
#include "osd_template.c"
|
||||
#endif
|
||||
|
@ -82,10 +82,10 @@ static const unsigned long long mask24hl __attribute__((aligned(8))) = 0x0000FF
|
|||
#undef RENAME
|
||||
#undef HAVE_MMX
|
||||
#undef HAVE_MMX2
|
||||
#undef HAVE_3DNOW
|
||||
#undef HAVE_AMD3DNOW
|
||||
#define HAVE_MMX 1
|
||||
#define HAVE_MMX2 0
|
||||
#define HAVE_3DNOW 0
|
||||
#define HAVE_AMD3DNOW 0
|
||||
#define RENAME(a) a ## _MMX
|
||||
#include "osd_template.c"
|
||||
#endif
|
||||
|
@ -95,10 +95,10 @@ static const unsigned long long mask24hl __attribute__((aligned(8))) = 0x0000FF
|
|||
#undef RENAME
|
||||
#undef HAVE_MMX
|
||||
#undef HAVE_MMX2
|
||||
#undef HAVE_3DNOW
|
||||
#undef HAVE_AMD3DNOW
|
||||
#define HAVE_MMX 1
|
||||
#define HAVE_MMX2 1
|
||||
#define HAVE_3DNOW 0
|
||||
#define HAVE_AMD3DNOW 0
|
||||
#define RENAME(a) a ## _MMX2
|
||||
#include "osd_template.c"
|
||||
#endif
|
||||
|
@ -108,10 +108,10 @@ static const unsigned long long mask24hl __attribute__((aligned(8))) = 0x0000FF
|
|||
#undef RENAME
|
||||
#undef HAVE_MMX
|
||||
#undef HAVE_MMX2
|
||||
#undef HAVE_3DNOW
|
||||
#undef HAVE_AMD3DNOW
|
||||
#define HAVE_MMX 1
|
||||
#define HAVE_MMX2 0
|
||||
#define HAVE_3DNOW 1
|
||||
#define HAVE_AMD3DNOW 1
|
||||
#define RENAME(a) a ## _3DNow
|
||||
#include "osd_template.c"
|
||||
#endif
|
||||
|
@ -136,7 +136,7 @@ void vo_draw_alpha_yv12(int w,int h, unsigned char* src, unsigned char *srca, in
|
|||
#else //RUNTIME_CPUDETECT
|
||||
#if HAVE_MMX2
|
||||
vo_draw_alpha_yv12_MMX2(w, h, src, srca, srcstride, dstbase, dststride);
|
||||
#elif HAVE_3DNOW
|
||||
#elif HAVE_AMD3DNOW
|
||||
vo_draw_alpha_yv12_3DNow(w, h, src, srca, srcstride, dstbase, dststride);
|
||||
#elif HAVE_MMX
|
||||
vo_draw_alpha_yv12_MMX(w, h, src, srca, srcstride, dstbase, dststride);
|
||||
|
@ -166,7 +166,7 @@ void vo_draw_alpha_yuy2(int w,int h, unsigned char* src, unsigned char *srca, in
|
|||
#else //RUNTIME_CPUDETECT
|
||||
#if HAVE_MMX2
|
||||
vo_draw_alpha_yuy2_MMX2(w, h, src, srca, srcstride, dstbase, dststride);
|
||||
#elif HAVE_3DNOW
|
||||
#elif HAVE_AMD3DNOW
|
||||
vo_draw_alpha_yuy2_3DNow(w, h, src, srca, srcstride, dstbase, dststride);
|
||||
#elif HAVE_MMX
|
||||
vo_draw_alpha_yuy2_MMX(w, h, src, srca, srcstride, dstbase, dststride);
|
||||
|
@ -196,7 +196,7 @@ void vo_draw_alpha_uyvy(int w,int h, unsigned char* src, unsigned char *srca, in
|
|||
#else //RUNTIME_CPUDETECT
|
||||
#if HAVE_MMX2
|
||||
vo_draw_alpha_uyvy_MMX2(w, h, src, srca, srcstride, dstbase, dststride);
|
||||
#elif HAVE_3DNOW
|
||||
#elif HAVE_AMD3DNOW
|
||||
vo_draw_alpha_uyvy_3DNow(w, h, src, srca, srcstride, dstbase, dststride);
|
||||
#elif HAVE_MMX
|
||||
vo_draw_alpha_uyvy_MMX(w, h, src, srca, srcstride, dstbase, dststride);
|
||||
|
@ -226,7 +226,7 @@ void vo_draw_alpha_rgb24(int w,int h, unsigned char* src, unsigned char *srca, i
|
|||
#else //RUNTIME_CPUDETECT
|
||||
#if HAVE_MMX2
|
||||
vo_draw_alpha_rgb24_MMX2(w, h, src, srca, srcstride, dstbase, dststride);
|
||||
#elif HAVE_3DNOW
|
||||
#elif HAVE_AMD3DNOW
|
||||
vo_draw_alpha_rgb24_3DNow(w, h, src, srca, srcstride, dstbase, dststride);
|
||||
#elif HAVE_MMX
|
||||
vo_draw_alpha_rgb24_MMX(w, h, src, srca, srcstride, dstbase, dststride);
|
||||
|
@ -256,7 +256,7 @@ void vo_draw_alpha_rgb32(int w,int h, unsigned char* src, unsigned char *srca, i
|
|||
#else //RUNTIME_CPUDETECT
|
||||
#if HAVE_MMX2
|
||||
vo_draw_alpha_rgb32_MMX2(w, h, src, srca, srcstride, dstbase, dststride);
|
||||
#elif HAVE_3DNOW
|
||||
#elif HAVE_AMD3DNOW
|
||||
vo_draw_alpha_rgb32_3DNow(w, h, src, srca, srcstride, dstbase, dststride);
|
||||
#elif HAVE_MMX
|
||||
vo_draw_alpha_rgb32_MMX(w, h, src, srca, srcstride, dstbase, dststride);
|
||||
|
@ -301,7 +301,7 @@ void vo_draw_alpha_init(void){
|
|||
#else //RUNTIME_CPUDETECT
|
||||
#if HAVE_MMX2
|
||||
mp_msg(MSGT_OSD,MSGL_INFO,"Using MMX (with tiny bit MMX2) Optimized OnScreenDisplay\n");
|
||||
#elif HAVE_3DNOW
|
||||
#elif HAVE_AMD3DNOW
|
||||
mp_msg(MSGT_OSD,MSGL_INFO,"Using MMX (with tiny bit 3DNow) Optimized OnScreenDisplay\n");
|
||||
#elif HAVE_MMX
|
||||
mp_msg(MSGT_OSD,MSGL_INFO,"Using MMX Optimized OnScreenDisplay\n");
|
||||
|
|
|
@ -7,7 +7,7 @@
|
|||
#undef PREFETCHW
|
||||
#undef PAVGB
|
||||
|
||||
#if HAVE_3DNOW
|
||||
#if HAVE_AMD3DNOW
|
||||
#define PREFETCH "prefetch"
|
||||
#define PREFETCHW "prefetchw"
|
||||
#define PAVGB "pavgusb"
|
||||
|
@ -20,7 +20,7 @@
|
|||
#define PREFETCHW " # nop"
|
||||
#endif
|
||||
|
||||
#if HAVE_3DNOW
|
||||
#if HAVE_AMD3DNOW
|
||||
/* On K6 femms is faster of emms. On K7 femms is directly mapped on emms. */
|
||||
#define EMMS "femms"
|
||||
#else
|
||||
|
@ -307,12 +307,12 @@ static inline void RENAME(vo_draw_alpha_rgb32)(int w,int h, unsigned char* src,
|
|||
dstbase++;
|
||||
#endif
|
||||
#if HAVE_MMX
|
||||
#if HAVE_3DNOW
|
||||
#if HAVE_AMD3DNOW
|
||||
__asm__ volatile(
|
||||
"pxor %%mm7, %%mm7\n\t"
|
||||
"pcmpeqb %%mm6, %%mm6\n\t" // F..F
|
||||
::);
|
||||
#else /* HAVE_3DNOW */
|
||||
#else /* HAVE_AMD3DNOW */
|
||||
__asm__ volatile(
|
||||
"pxor %%mm7, %%mm7\n\t"
|
||||
"pcmpeqb %%mm5, %%mm5\n\t" // F..F
|
||||
|
@ -320,13 +320,13 @@ static inline void RENAME(vo_draw_alpha_rgb32)(int w,int h, unsigned char* src,
|
|||
"psllw $8, %%mm5\n\t" //FF00FF00FF00
|
||||
"psrlw $8, %%mm4\n\t" //00FF00FF00FF
|
||||
::);
|
||||
#endif /* HAVE_3DNOW */
|
||||
#endif /* HAVE_AMD3DNOW */
|
||||
#endif /* HAVE_MMX */
|
||||
for(y=0;y<h;y++){
|
||||
register int x;
|
||||
#if ARCH_X86 && (!ARCH_X86_64 || HAVE_MMX)
|
||||
#if HAVE_MMX
|
||||
#if HAVE_3DNOW
|
||||
#if HAVE_AMD3DNOW
|
||||
__asm__ volatile(
|
||||
PREFETCHW" %0\n\t"
|
||||
PREFETCH" %1\n\t"
|
||||
|
|
|
@ -51,10 +51,10 @@ void print_version(const char* name)
|
|||
#if HAVE_MMX2
|
||||
mp_msg(MSGT_CPLAYER,MSGL_V," MMX2");
|
||||
#endif
|
||||
#if HAVE_3DNOW
|
||||
#if HAVE_AMD3DNOW
|
||||
mp_msg(MSGT_CPLAYER,MSGL_V," 3DNow");
|
||||
#endif
|
||||
#if HAVE_3DNOWEXT
|
||||
#if HAVE_AMD3DNOWEXT
|
||||
mp_msg(MSGT_CPLAYER,MSGL_V," 3DNowExt");
|
||||
#endif
|
||||
#if HAVE_SSE
|
||||
|
|
Loading…
Reference in New Issue