Mercurial > mplayer.hg

comparison libvo/osd.c @ 28335:31287e75b5d8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
HAVE_3DNOW --> HAVE_AMD3DNOW
author diego
date Mon, 26 Jan 2009 09:29:53 +0000
parents 25337a2147e7
children 7681eab10aea
comparison
equal deleted inserted replaced
28334:9e4c389f670f 28335:31287e75b5d8
27 #define COMPILE_C 27 #define COMPILE_C
28 #endif 28 #endif
29 29
30 #ifdef CAN_COMPILE_X86_ASM 30 #ifdef CAN_COMPILE_X86_ASM
31 31
32 #if (HAVE_MMX && !HAVE_3DNOW && !HAVE_MMX2) || defined (RUNTIME_CPUDETECT) 32 #if (HAVE_MMX && !HAVE_AMD3DNOW && !HAVE_MMX2) || defined (RUNTIME_CPUDETECT)
33 #define COMPILE_MMX 33 #define COMPILE_MMX
34 #endif 34 #endif
35 35
36 #if HAVE_MMX2 || defined (RUNTIME_CPUDETECT) 36 #if HAVE_MMX2 || defined (RUNTIME_CPUDETECT)
37 #define COMPILE_MMX2 37 #define COMPILE_MMX2
38 #endif 38 #endif
39 39
40 #if (HAVE_3DNOW && !HAVE_MMX2) || defined (RUNTIME_CPUDETECT) 40 #if (HAVE_AMD3DNOW && !HAVE_MMX2) || defined (RUNTIME_CPUDETECT)
41 #define COMPILE_3DNOW 41 #define COMPILE_3DNOW
42 #endif 42 #endif
43 #endif //CAN_COMPILE_X86_ASM 43 #endif //CAN_COMPILE_X86_ASM
44 44
45 #undef HAVE_MMX 45 #undef HAVE_MMX
46 #undef HAVE_MMX2 46 #undef HAVE_MMX2
47 #undef HAVE_3DNOW 47 #undef HAVE_AMD3DNOW
48 #define HAVE_MMX 0 48 #define HAVE_MMX 0
49 #define HAVE_MMX2 0 49 #define HAVE_MMX2 0
50 #define HAVE_3DNOW 0 50 #define HAVE_AMD3DNOW 0
51 51
52 #ifndef CAN_COMPILE_X86_ASM 52 #ifndef CAN_COMPILE_X86_ASM
53 53
54 #ifdef COMPILE_C 54 #ifdef COMPILE_C
55 #undef HAVE_MMX 55 #undef HAVE_MMX
56 #undef HAVE_MMX2 56 #undef HAVE_MMX2
57 #undef HAVE_3DNOW 57 #undef HAVE_AMD3DNOW
58 #define HAVE_MMX 0 58 #define HAVE_MMX 0
59 #define HAVE_MMX2 0 59 #define HAVE_MMX2 0
60 #define HAVE_3DNOW 0 60 #define HAVE_AMD3DNOW 0
61 #define RENAME(a) a ## _C 61 #define RENAME(a) a ## _C
62 #include "osd_template.c" 62 #include "osd_template.c"
63 #endif 63 #endif
64 64
65 #else 65 #else
67 //X86 noMMX versions 67 //X86 noMMX versions
68 #ifdef COMPILE_C 68 #ifdef COMPILE_C
69 #undef RENAME 69 #undef RENAME
70 #undef HAVE_MMX 70 #undef HAVE_MMX
71 #undef HAVE_MMX2 71 #undef HAVE_MMX2
72 #undef HAVE_3DNOW 72 #undef HAVE_AMD3DNOW
73 #define HAVE_MMX 0 73 #define HAVE_MMX 0
74 #define HAVE_MMX2 0 74 #define HAVE_MMX2 0
75 #define HAVE_3DNOW 0 75 #define HAVE_AMD3DNOW 0
76 #define RENAME(a) a ## _X86 76 #define RENAME(a) a ## _X86
77 #include "osd_template.c" 77 #include "osd_template.c"
78 #endif 78 #endif
79 79
80 //MMX versions 80 //MMX versions
81 #ifdef COMPILE_MMX 81 #ifdef COMPILE_MMX
82 #undef RENAME 82 #undef RENAME
83 #undef HAVE_MMX 83 #undef HAVE_MMX
84 #undef HAVE_MMX2 84 #undef HAVE_MMX2
85 #undef HAVE_3DNOW 85 #undef HAVE_AMD3DNOW
86 #define HAVE_MMX 1 86 #define HAVE_MMX 1
87 #define HAVE_MMX2 0 87 #define HAVE_MMX2 0
88 #define HAVE_3DNOW 0 88 #define HAVE_AMD3DNOW 0
89 #define RENAME(a) a ## _MMX 89 #define RENAME(a) a ## _MMX
90 #include "osd_template.c" 90 #include "osd_template.c"
91 #endif 91 #endif
92 92
93 //MMX2 versions 93 //MMX2 versions
94 #ifdef COMPILE_MMX2 94 #ifdef COMPILE_MMX2
95 #undef RENAME 95 #undef RENAME
96 #undef HAVE_MMX 96 #undef HAVE_MMX
97 #undef HAVE_MMX2 97 #undef HAVE_MMX2
98 #undef HAVE_3DNOW 98 #undef HAVE_AMD3DNOW
99 #define HAVE_MMX 1 99 #define HAVE_MMX 1
100 #define HAVE_MMX2 1 100 #define HAVE_MMX2 1
101 #define HAVE_3DNOW 0 101 #define HAVE_AMD3DNOW 0
102 #define RENAME(a) a ## _MMX2 102 #define RENAME(a) a ## _MMX2
103 #include "osd_template.c" 103 #include "osd_template.c"
104 #endif 104 #endif
105 105
106 //3DNOW versions 106 //3DNOW versions
107 #ifdef COMPILE_3DNOW 107 #ifdef COMPILE_3DNOW
108 #undef RENAME 108 #undef RENAME
109 #undef HAVE_MMX 109 #undef HAVE_MMX
110 #undef HAVE_MMX2 110 #undef HAVE_MMX2
111 #undef HAVE_3DNOW 111 #undef HAVE_AMD3DNOW
112 #define HAVE_MMX 1 112 #define HAVE_MMX 1
113 #define HAVE_MMX2 0 113 #define HAVE_MMX2 0
114 #define HAVE_3DNOW 1 114 #define HAVE_AMD3DNOW 1
115 #define RENAME(a) a ## _3DNow 115 #define RENAME(a) a ## _3DNow
116 #include "osd_template.c" 116 #include "osd_template.c"
117 #endif 117 #endif
118 118
119 #endif //CAN_COMPILE_X86_ASM 119 #endif //CAN_COMPILE_X86_ASM
134 vo_draw_alpha_yv12_C(w, h, src, srca, srcstride, dstbase, dststride); 134 vo_draw_alpha_yv12_C(w, h, src, srca, srcstride, dstbase, dststride);
135 #endif 135 #endif
136 #else //RUNTIME_CPUDETECT 136 #else //RUNTIME_CPUDETECT
137 #if HAVE_MMX2 137 #if HAVE_MMX2
138 vo_draw_alpha_yv12_MMX2(w, h, src, srca, srcstride, dstbase, dststride); 138 vo_draw_alpha_yv12_MMX2(w, h, src, srca, srcstride, dstbase, dststride);
139 #elif HAVE_3DNOW 139 #elif HAVE_AMD3DNOW
140 vo_draw_alpha_yv12_3DNow(w, h, src, srca, srcstride, dstbase, dststride); 140 vo_draw_alpha_yv12_3DNow(w, h, src, srca, srcstride, dstbase, dststride);
141 #elif HAVE_MMX 141 #elif HAVE_MMX
142 vo_draw_alpha_yv12_MMX(w, h, src, srca, srcstride, dstbase, dststride); 142 vo_draw_alpha_yv12_MMX(w, h, src, srca, srcstride, dstbase, dststride);
143 #elif ARCH_X86 143 #elif ARCH_X86
144 vo_draw_alpha_yv12_X86(w, h, src, srca, srcstride, dstbase, dststride); 144 vo_draw_alpha_yv12_X86(w, h, src, srca, srcstride, dstbase, dststride);
164 vo_draw_alpha_yuy2_C(w, h, src, srca, srcstride, dstbase, dststride); 164 vo_draw_alpha_yuy2_C(w, h, src, srca, srcstride, dstbase, dststride);
165 #endif 165 #endif
166 #else //RUNTIME_CPUDETECT 166 #else //RUNTIME_CPUDETECT
167 #if HAVE_MMX2 167 #if HAVE_MMX2
168 vo_draw_alpha_yuy2_MMX2(w, h, src, srca, srcstride, dstbase, dststride); 168 vo_draw_alpha_yuy2_MMX2(w, h, src, srca, srcstride, dstbase, dststride);
169 #elif HAVE_3DNOW 169 #elif HAVE_AMD3DNOW
170 vo_draw_alpha_yuy2_3DNow(w, h, src, srca, srcstride, dstbase, dststride); 170 vo_draw_alpha_yuy2_3DNow(w, h, src, srca, srcstride, dstbase, dststride);
171 #elif HAVE_MMX 171 #elif HAVE_MMX
172 vo_draw_alpha_yuy2_MMX(w, h, src, srca, srcstride, dstbase, dststride); 172 vo_draw_alpha_yuy2_MMX(w, h, src, srca, srcstride, dstbase, dststride);
173 #elif ARCH_X86 173 #elif ARCH_X86
174 vo_draw_alpha_yuy2_X86(w, h, src, srca, srcstride, dstbase, dststride); 174 vo_draw_alpha_yuy2_X86(w, h, src, srca, srcstride, dstbase, dststride);
194 vo_draw_alpha_uyvy_C(w, h, src, srca, srcstride, dstbase, dststride); 194 vo_draw_alpha_uyvy_C(w, h, src, srca, srcstride, dstbase, dststride);
195 #endif 195 #endif
196 #else //RUNTIME_CPUDETECT 196 #else //RUNTIME_CPUDETECT
197 #if HAVE_MMX2 197 #if HAVE_MMX2
198 vo_draw_alpha_uyvy_MMX2(w, h, src, srca, srcstride, dstbase, dststride); 198 vo_draw_alpha_uyvy_MMX2(w, h, src, srca, srcstride, dstbase, dststride);
199 #elif HAVE_3DNOW 199 #elif HAVE_AMD3DNOW
200 vo_draw_alpha_uyvy_3DNow(w, h, src, srca, srcstride, dstbase, dststride); 200 vo_draw_alpha_uyvy_3DNow(w, h, src, srca, srcstride, dstbase, dststride);
201 #elif HAVE_MMX 201 #elif HAVE_MMX
202 vo_draw_alpha_uyvy_MMX(w, h, src, srca, srcstride, dstbase, dststride); 202 vo_draw_alpha_uyvy_MMX(w, h, src, srca, srcstride, dstbase, dststride);
203 #elif ARCH_X86 203 #elif ARCH_X86
204 vo_draw_alpha_uyvy_X86(w, h, src, srca, srcstride, dstbase, dststride); 204 vo_draw_alpha_uyvy_X86(w, h, src, srca, srcstride, dstbase, dststride);
224 vo_draw_alpha_rgb24_C(w, h, src, srca, srcstride, dstbase, dststride); 224 vo_draw_alpha_rgb24_C(w, h, src, srca, srcstride, dstbase, dststride);
225 #endif 225 #endif
226 #else //RUNTIME_CPUDETECT 226 #else //RUNTIME_CPUDETECT
227 #if HAVE_MMX2 227 #if HAVE_MMX2
228 vo_draw_alpha_rgb24_MMX2(w, h, src, srca, srcstride, dstbase, dststride); 228 vo_draw_alpha_rgb24_MMX2(w, h, src, srca, srcstride, dstbase, dststride);
229 #elif HAVE_3DNOW 229 #elif HAVE_AMD3DNOW
230 vo_draw_alpha_rgb24_3DNow(w, h, src, srca, srcstride, dstbase, dststride); 230 vo_draw_alpha_rgb24_3DNow(w, h, src, srca, srcstride, dstbase, dststride);
231 #elif HAVE_MMX 231 #elif HAVE_MMX
232 vo_draw_alpha_rgb24_MMX(w, h, src, srca, srcstride, dstbase, dststride); 232 vo_draw_alpha_rgb24_MMX(w, h, src, srca, srcstride, dstbase, dststride);
233 #elif ARCH_X86 233 #elif ARCH_X86
234 vo_draw_alpha_rgb24_X86(w, h, src, srca, srcstride, dstbase, dststride); 234 vo_draw_alpha_rgb24_X86(w, h, src, srca, srcstride, dstbase, dststride);
254 vo_draw_alpha_rgb32_C(w, h, src, srca, srcstride, dstbase, dststride); 254 vo_draw_alpha_rgb32_C(w, h, src, srca, srcstride, dstbase, dststride);
255 #endif 255 #endif
256 #else //RUNTIME_CPUDETECT 256 #else //RUNTIME_CPUDETECT
257 #if HAVE_MMX2 257 #if HAVE_MMX2
258 vo_draw_alpha_rgb32_MMX2(w, h, src, srca, srcstride, dstbase, dststride); 258 vo_draw_alpha_rgb32_MMX2(w, h, src, srca, srcstride, dstbase, dststride);
259 #elif HAVE_3DNOW 259 #elif HAVE_AMD3DNOW
260 vo_draw_alpha_rgb32_3DNow(w, h, src, srca, srcstride, dstbase, dststride); 260 vo_draw_alpha_rgb32_3DNow(w, h, src, srca, srcstride, dstbase, dststride);
261 #elif HAVE_MMX 261 #elif HAVE_MMX
262 vo_draw_alpha_rgb32_MMX(w, h, src, srca, srcstride, dstbase, dststride); 262 vo_draw_alpha_rgb32_MMX(w, h, src, srca, srcstride, dstbase, dststride);
263 #elif ARCH_X86 263 #elif ARCH_X86
264 vo_draw_alpha_rgb32_X86(w, h, src, srca, srcstride, dstbase, dststride); 264 vo_draw_alpha_rgb32_X86(w, h, src, srca, srcstride, dstbase, dststride);
299 mp_msg(MSGT_OSD,MSGL_INFO,"Using Unoptimized OnScreenDisplay\n"); 299 mp_msg(MSGT_OSD,MSGL_INFO,"Using Unoptimized OnScreenDisplay\n");
300 #endif 300 #endif
301 #else //RUNTIME_CPUDETECT 301 #else //RUNTIME_CPUDETECT
302 #if HAVE_MMX2 302 #if HAVE_MMX2
303 mp_msg(MSGT_OSD,MSGL_INFO,"Using MMX (with tiny bit MMX2) Optimized OnScreenDisplay\n"); 303 mp_msg(MSGT_OSD,MSGL_INFO,"Using MMX (with tiny bit MMX2) Optimized OnScreenDisplay\n");
304 #elif HAVE_3DNOW 304 #elif HAVE_AMD3DNOW
305 mp_msg(MSGT_OSD,MSGL_INFO,"Using MMX (with tiny bit 3DNow) Optimized OnScreenDisplay\n"); 305 mp_msg(MSGT_OSD,MSGL_INFO,"Using MMX (with tiny bit 3DNow) Optimized OnScreenDisplay\n");
306 #elif HAVE_MMX 306 #elif HAVE_MMX
307 mp_msg(MSGT_OSD,MSGL_INFO,"Using MMX Optimized OnScreenDisplay\n"); 307 mp_msg(MSGT_OSD,MSGL_INFO,"Using MMX Optimized OnScreenDisplay\n");
308 #elif ARCH_X86 308 #elif ARCH_X86
309 mp_msg(MSGT_OSD,MSGL_INFO,"Using X86 Optimized OnScreenDisplay\n"); 309 mp_msg(MSGT_OSD,MSGL_INFO,"Using X86 Optimized OnScreenDisplay\n");