From 32646569d9d46caf401a7bc837e6255119141a18 Mon Sep 17 00:00:00 2001 From: michael Date: Mon, 26 Nov 2001 02:20:51 +0000 Subject: oops git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@3137 b3059339-0415-0410-9bf9-f77b7e298cf2 --- 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 7afb61b2b4..8073552a3c 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 256d933365..3445f92f30 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" -- cgit v1.2.3