[Mplayer-cvslog] CVS: main/postproc swscale.c,1.44,1.45 swscale_template.c,1.44,1.45

[Michael Niedermayer]

Update of /cvsroot/mplayer/main/postproc
In directory mplayer:/var/tmp.root/cvs-serv20153

Modified Files:
	swscale.c swscale_template.c 
Log Message:
oops


Index: swscale.c
===================================================================
RCS file: /cvsroot/mplayer/main/postproc/swscale.c,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- swscale.c	26 Nov 2001 00:31:43 -0000	1.44
+++ swscale.c	26 Nov 2001 02:20:51 -0000	1.45
@@ -9,7 +9,6 @@
 #include <string.h>
 #include "../config.h"
 #include "swscale.h"
-#include "../mmx_defs.h"
 #include "../cpudetect.h"
 #undef MOVNTQ
 #undef PAVGB

Index: swscale_template.c
===================================================================
RCS file: /cvsroot/mplayer/main/postproc/swscale_template.c,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- swscale_template.c	26 Nov 2001 00:31:43 -0000	1.44
+++ swscale_template.c	26 Nov 2001 02:20:51 -0000	1.45
@@ -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"