From 48a05ceccdc4ea88570c18f3d6b20624b9124083 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Mon, 26 Nov 2001 02:20:51 +0000 Subject: [PATCH] oops Originally committed as revision 3137 to svn://svn.mplayerhq.hu/mplayer/trunk/postproc --- postproc/swscale.c | 1 - postproc/swscale_template.c | 28 ++++++++++++++++++++++++++++ 2 files changed, 28 insertions(+), 1 deletion(-) diff --git a/postproc/swscale.c b/postproc/swscale.c index 7afb61b..8073552 100644 --- a/postproc/swscale.c +++ b/postproc/swscale.c @@ -9,7 +9,6 @@ #include #include "../config.h" #include "swscale.h" -#include "../mmx_defs.h" #include "../cpudetect.h" #undef MOVNTQ #undef PAVGB diff --git a/postproc/swscale_template.c b/postproc/swscale_template.c index 256d933..3445f92 100644 --- a/postproc/swscale_template.c +++ b/postproc/swscale_template.c @@ -7,6 +7,34 @@ #undef MOVNTQ #undef PAVGB +#undef PREFETCH +#undef PREFETCHW +#undef EMMS +#undef SFENCE + +#ifdef HAVE_3DNOW +/* On K6 femms is faster of emms. On K7 femms is directly mapped on emms. */ +#define EMMS "femms" +#else +#define EMMS "emms" +#endif + +#ifdef HAVE_3DNOW +#define PREFETCH "prefetch" +#define PREFETCHW "prefetchw" +#elif defined ( HAVE_MMX2 ) +#define PREFETCH "prefetchnta" +#define PREFETCHW "prefetcht0" +#else +#define PREFETCH "/nop" +#define PREFETCHW "/nop" +#endif + +#ifdef HAVE_MMX2 +#define SFENCE "sfence" +#else +#define SFENCE "/nop" +#endif #ifdef HAVE_MMX2 #define PAVGB(a,b) "pavgb " #a ", " #b " \n\t" -- 2.7.4