Commit c12f7b2d authored by Ramiro Polla's avatar Ramiro Polla

rgb2rgb: don't misuse HAVE_* defines

Introduce and use COMPILE_TEMPLATE_* instead.

Originally committed as revision 32241 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
parent c157fe63
...@@ -149,14 +149,10 @@ DECLARE_ASM_CONST(8, uint64_t, blue_15mask) = 0x0000001f0000001fULL; ...@@ -149,14 +149,10 @@ DECLARE_ASM_CONST(8, uint64_t, blue_15mask) = 0x0000001f0000001fULL;
//Note: We have C, MMX, MMX2, 3DNOW versions, there is no 3DNOW + MMX2 one. //Note: We have C, MMX, MMX2, 3DNOW versions, there is no 3DNOW + MMX2 one.
//plain C versions //plain C versions
#undef HAVE_MMX #define COMPILE_TEMPLATE_MMX 0
#undef HAVE_MMX2 #define COMPILE_TEMPLATE_MMX2 0
#undef HAVE_AMD3DNOW #define COMPILE_TEMPLATE_AMD3DNOW 0
#undef HAVE_SSE2 #define COMPILE_TEMPLATE_SSE2 0
#define HAVE_MMX 0
#define HAVE_MMX2 0
#define HAVE_AMD3DNOW 0
#define HAVE_SSE2 0
#define RENAME(a) a ## _C #define RENAME(a) a ## _C
#include "rgb2rgb_template.c" #include "rgb2rgb_template.c"
...@@ -164,33 +160,33 @@ DECLARE_ASM_CONST(8, uint64_t, blue_15mask) = 0x0000001f0000001fULL; ...@@ -164,33 +160,33 @@ DECLARE_ASM_CONST(8, uint64_t, blue_15mask) = 0x0000001f0000001fULL;
//MMX versions //MMX versions
#undef RENAME #undef RENAME
#undef HAVE_MMX #undef COMPILE_TEMPLATE_MMX
#define HAVE_MMX 1 #define COMPILE_TEMPLATE_MMX 1
#define RENAME(a) a ## _MMX #define RENAME(a) a ## _MMX
#include "rgb2rgb_template.c" #include "rgb2rgb_template.c"
//MMX2 versions //MMX2 versions
#undef RENAME #undef RENAME
#undef HAVE_MMX2 #undef COMPILE_TEMPLATE_MMX2
#define HAVE_MMX2 1 #define COMPILE_TEMPLATE_MMX2 1
#define RENAME(a) a ## _MMX2 #define RENAME(a) a ## _MMX2
#include "rgb2rgb_template.c" #include "rgb2rgb_template.c"
//SSE2 versions //SSE2 versions
#undef RENAME #undef RENAME
#undef HAVE_SSE2 #undef COMPILE_TEMPLATE_SSE2
#define HAVE_SSE2 1 #define COMPILE_TEMPLATE_SSE2 1
#define RENAME(a) a ## _SSE2 #define RENAME(a) a ## _SSE2
#include "rgb2rgb_template.c" #include "rgb2rgb_template.c"
//3DNOW versions //3DNOW versions
#undef RENAME #undef RENAME
#undef HAVE_MMX2 #undef COMPILE_TEMPLATE_MMX2
#undef HAVE_SSE2 #undef COMPILE_TEMPLATE_SSE2
#undef HAVE_AMD3DNOW #undef COMPILE_TEMPLATE_AMD3DNOW
#define HAVE_MMX2 0 #define COMPILE_TEMPLATE_MMX2 0
#define HAVE_SSE2 0 #define COMPILE_TEMPLATE_SSE2 1
#define HAVE_AMD3DNOW 1 #define COMPILE_TEMPLATE_AMD3DNOW 1
#define RENAME(a) a ## _3DNOW #define RENAME(a) a ## _3DNOW
#include "rgb2rgb_template.c" #include "rgb2rgb_template.c"
......
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment