summaryrefslogtreecommitdiffstats
path: root/libvo
diff options
context:
space:
mode:
authorreimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-11-01 18:41:25 +0000
committerreimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-11-01 18:41:25 +0000
commit74a504f25bc71bb7eba97bf9b783c30bcb3218a9 (patch)
tree46e07287958589035f858098f07e19499ac7b567 /libvo
parent3570f31873a374543b72e2c4d3f22f6dd7323e3d (diff)
downloadmpv-74a504f25bc71bb7eba97bf9b783c30bcb3218a9.tar.bz2
mpv-74a504f25bc71bb7eba97bf9b783c30bcb3218a9.tar.xz
ARCH_X86 simplifications
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20593 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libvo')
-rw-r--r--libvo/aclib.c2
-rw-r--r--libvo/osd.c14
-rw-r--r--libvo/osd_template.c4
3 files changed, 10 insertions, 10 deletions
diff --git a/libvo/aclib.c b/libvo/aclib.c
index 5f2c1f64df..07f297f41f 100644
--- a/libvo/aclib.c
+++ b/libvo/aclib.c
@@ -17,7 +17,7 @@
//Feel free to fine-tune the above 2, it might be possible to get some speedup with them :)
//#define STATISTICS
-#if defined(ARCH_X86) || defined(ARCH_X86_64)
+#ifdef ARCH_X86
#define CAN_COMPILE_X86_ASM
#endif
diff --git a/libvo/osd.c b/libvo/osd.c
index aa446617f8..a307558f68 100644
--- a/libvo/osd.c
+++ b/libvo/osd.c
@@ -12,7 +12,7 @@
#include "cpudetect.h"
#include "mangle.h"
-#if defined(ARCH_X86) || defined(ARCH_X86_64)
+#ifdef ARCH_X86
#define CAN_COMPILE_X86_ASM
#endif
@@ -123,7 +123,7 @@ void vo_draw_alpha_yv12(int w,int h, unsigned char* src, unsigned char *srca, in
vo_draw_alpha_yv12_3DNow(w, h, src, srca, srcstride, dstbase, dststride);
#elif defined (HAVE_MMX)
vo_draw_alpha_yv12_MMX(w, h, src, srca, srcstride, dstbase, dststride);
-#elif defined(ARCH_X86) || defined(ARCH_X86_64)
+#elif defined(ARCH_X86)
vo_draw_alpha_yv12_X86(w, h, src, srca, srcstride, dstbase, dststride);
#else
vo_draw_alpha_yv12_C(w, h, src, srca, srcstride, dstbase, dststride);
@@ -153,7 +153,7 @@ void vo_draw_alpha_yuy2(int w,int h, unsigned char* src, unsigned char *srca, in
vo_draw_alpha_yuy2_3DNow(w, h, src, srca, srcstride, dstbase, dststride);
#elif defined (HAVE_MMX)
vo_draw_alpha_yuy2_MMX(w, h, src, srca, srcstride, dstbase, dststride);
-#elif defined(ARCH_X86) || defined(ARCH_X86_64)
+#elif defined(ARCH_X86)
vo_draw_alpha_yuy2_X86(w, h, src, srca, srcstride, dstbase, dststride);
#else
vo_draw_alpha_yuy2_C(w, h, src, srca, srcstride, dstbase, dststride);
@@ -183,7 +183,7 @@ void vo_draw_alpha_uyvy(int w,int h, unsigned char* src, unsigned char *srca, in
vo_draw_alpha_uyvy_3DNow(w, h, src, srca, srcstride, dstbase, dststride);
#elif defined (HAVE_MMX)
vo_draw_alpha_uyvy_MMX(w, h, src, srca, srcstride, dstbase, dststride);
-#elif defined(ARCH_X86) || defined(ARCH_X86_64)
+#elif defined(ARCH_X86)
vo_draw_alpha_uyvy_X86(w, h, src, srca, srcstride, dstbase, dststride);
#else
vo_draw_alpha_uyvy_C(w, h, src, srca, srcstride, dstbase, dststride);
@@ -213,7 +213,7 @@ void vo_draw_alpha_rgb24(int w,int h, unsigned char* src, unsigned char *srca, i
vo_draw_alpha_rgb24_3DNow(w, h, src, srca, srcstride, dstbase, dststride);
#elif defined (HAVE_MMX)
vo_draw_alpha_rgb24_MMX(w, h, src, srca, srcstride, dstbase, dststride);
-#elif defined(ARCH_X86) || defined(ARCH_X86_64)
+#elif defined(ARCH_X86)
vo_draw_alpha_rgb24_X86(w, h, src, srca, srcstride, dstbase, dststride);
#else
vo_draw_alpha_rgb24_C(w, h, src, srca, srcstride, dstbase, dststride);
@@ -243,7 +243,7 @@ void vo_draw_alpha_rgb32(int w,int h, unsigned char* src, unsigned char *srca, i
vo_draw_alpha_rgb32_3DNow(w, h, src, srca, srcstride, dstbase, dststride);
#elif defined (HAVE_MMX)
vo_draw_alpha_rgb32_MMX(w, h, src, srca, srcstride, dstbase, dststride);
-#elif defined(ARCH_X86) || defined(ARCH_X86_64)
+#elif defined(ARCH_X86)
vo_draw_alpha_rgb32_X86(w, h, src, srca, srcstride, dstbase, dststride);
#else
vo_draw_alpha_rgb32_C(w, h, src, srca, srcstride, dstbase, dststride);
@@ -288,7 +288,7 @@ void vo_draw_alpha_init(void){
mp_msg(MSGT_OSD,MSGL_INFO,"Using MMX (with tiny bit 3DNow) Optimized OnScreenDisplay\n");
#elif defined (HAVE_MMX)
mp_msg(MSGT_OSD,MSGL_INFO,"Using MMX Optimized OnScreenDisplay\n");
-#elif defined(ARCH_X86) || defined(ARCH_X86_64)
+#elif defined(ARCH_X86)
mp_msg(MSGT_OSD,MSGL_INFO,"Using X86 Optimized OnScreenDisplay\n");
#else
mp_msg(MSGT_OSD,MSGL_INFO,"Using Unoptimized OnScreenDisplay\n");
diff --git a/libvo/osd_template.c b/libvo/osd_template.c
index 9ae0196dbc..4a66aad509 100644
--- a/libvo/osd_template.c
+++ b/libvo/osd_template.c
@@ -204,7 +204,7 @@ static inline void RENAME(vo_draw_alpha_rgb24)(int w,int h, unsigned char* src,
for(y=0;y<h;y++){
register unsigned char *dst = dstbase;
register int x;
-#if defined(ARCH_X86) || defined(ARCH_X86_64)
+#ifdef ARCH_X86
#ifdef HAVE_MMX
asm volatile(
PREFETCHW" %0\n\t"
@@ -324,7 +324,7 @@ static inline void RENAME(vo_draw_alpha_rgb32)(int w,int h, unsigned char* src,
#endif /* HAVE_MMX */
for(y=0;y<h;y++){
register int x;
-#if defined(ARCH_X86) || defined(ARCH_X86_64)
+#ifdef ARCH_X86
#ifdef HAVE_MMX
#ifdef HAVE_3DNOW
asm volatile(