diff options
author | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-11-01 18:41:25 +0000 |
---|---|---|
committer | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-11-01 18:41:25 +0000 |
commit | 74a504f25bc71bb7eba97bf9b783c30bcb3218a9 (patch) | |
tree | 46e07287958589035f858098f07e19499ac7b567 | |
parent | 3570f31873a374543b72e2c4d3f22f6dd7323e3d (diff) | |
download | mpv-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
-rw-r--r-- | Gui/win32/gui.c | 2 | ||||
-rw-r--r-- | cpudetect.c | 4 | ||||
-rw-r--r-- | libvo/aclib.c | 2 | ||||
-rw-r--r-- | libvo/osd.c | 14 | ||||
-rw-r--r-- | libvo/osd_template.c | 4 | ||||
-rw-r--r-- | mencoder.c | 2 | ||||
-rw-r--r-- | mplayer.c | 4 |
7 files changed, 16 insertions, 16 deletions
diff --git a/Gui/win32/gui.c b/Gui/win32/gui.c index 76f527550d..fa3c316a82 100644 --- a/Gui/win32/gui.c +++ b/Gui/win32/gui.c @@ -107,7 +107,7 @@ void console_toggle(void) setvbuf(stderr, NULL, _IONBF, 0); mp_msg(MSGT_CPLAYER, MSGL_INFO, "%s\n", MP_TITLE); GetCpuCaps(&gCpuCaps); -#if defined(ARCH_X86) || defined(ARCH_X86_64) +#ifdef ARCH_X86 mp_msg(MSGT_CPLAYER,MSGL_INFO,"CPUflags: MMX: %d MMX2: %d 3DNow: %d 3DNow2: %d SSE: %d SSE2: %d\n", gCpuCaps.hasMMX, gCpuCaps.hasMMX2, gCpuCaps.has3DNow, gCpuCaps.has3DNowExt, diff --git a/cpudetect.c b/cpudetect.c index 7003c572c6..5592a1de28 100644 --- a/cpudetect.c +++ b/cpudetect.c @@ -9,7 +9,7 @@ CpuCaps gCpuCaps; #endif #include <stdlib.h> -#if defined(ARCH_X86) || defined(ARCH_X86_64) +#ifdef ARCH_X86 #include <stdio.h> #include <string.h> @@ -493,7 +493,7 @@ static void check_os_katmai_support( void ) gCpuCaps.hasSSE=0; #endif /* __linux__ */ } -#else /* ARCH_X86 || ARCH_X86_64 */ +#else /* ARCH_X86 */ #ifdef SYS_DARWIN #include <sys/sysctl.h> 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( diff --git a/mencoder.c b/mencoder.c index deb8143e22..350dc02110 100644 --- a/mencoder.c +++ b/mencoder.c @@ -416,7 +416,7 @@ audio_encoder_t *aencoder = NULL; /* Test for cpu capabilities (and corresponding OS support) for optimizing */ GetCpuCaps(&gCpuCaps); -#if defined(ARCH_X86) || defined(ARCH_X86_64) +#ifdef ARCH_X86 mp_msg(MSGT_CPLAYER,MSGL_INFO,"CPUflags: Type: %d MMX: %d MMX2: %d 3DNow: %d 3DNow2: %d SSE: %d SSE2: %d\n", gCpuCaps.cpuType,gCpuCaps.hasMMX,gCpuCaps.hasMMX2, gCpuCaps.has3DNow, gCpuCaps.has3DNowExt, @@ -2838,7 +2838,7 @@ struct {double pts; vo_functions_t *vo;} vf_vo_data; mp_msg(MSGT_CPLAYER,MSGL_INFO, "MPlayer " VERSION " (C) 2000-2006 MPlayer Team\n"); /* Test for CPU capabilities (and corresponding OS support) for optimizing */ GetCpuCaps(&gCpuCaps); -#if defined(ARCH_X86) || defined(ARCH_X86_64) +#ifdef ARCH_X86 mp_msg(MSGT_CPLAYER,MSGL_INFO,"CPUflags: MMX: %d MMX2: %d 3DNow: %d 3DNow2: %d SSE: %d SSE2: %d\n", gCpuCaps.hasMMX,gCpuCaps.hasMMX2, gCpuCaps.has3DNow, gCpuCaps.has3DNowExt, @@ -2867,7 +2867,7 @@ struct {double pts; vo_functions_t *vo;} vf_vo_data; #endif mp_msg(MSGT_CPLAYER,MSGL_INFO,"\n"); #endif /* RUNTIME_CPUDETECT */ -#endif /* defined(ARCH_X86) || defined(ARCH_X86_64) */ +#endif /* ARCH_X86 */ #if defined(WIN32) && defined(USE_WIN32DLL) set_path_env(); |