diff src/audio/SDL_mixer_MMX.c @ 3628:4d46850be3f6

Merged r5070:5071 from branches/SDL-1.2: forcibly disable buggy MMX mixers.
author Ryan C. Gordon <icculus@icculus.org>
date Sun, 10 Jan 2010 07:48:14 +0000
parents 99210400e8b9
children f7b03b6838cb
line wrap: on
line diff
--- a/src/audio/SDL_mixer_MMX.c	Sun Jan 10 07:40:12 2010 +0000
+++ b/src/audio/SDL_mixer_MMX.c	Sun Jan 10 07:48:14 2010 +0000
@@ -35,6 +35,7 @@
 *   Mixing for 16 bit signed buffers
 ***********************************************/
 
+#if defined(SDL_BUGGY_MMX_MIXERS) /* buggy, so we're disabling them. --ryan. */
 #if defined(__GNUC__) && defined(__i386__) && defined(SDL_ASSEMBLY_ROUTINES)
 void
 SDL_MixAudio_MMX_S16(char *dst, char *src, unsigned int size, int volume)
@@ -117,4 +118,7 @@
                          "m"(volume):"eax", "edx", "memory");
 }
 #endif
+
+#endif /* SDL_BUGGY_MMX_MIXERS */
+
 /* vi: set ts=4 sw=4 expandtab: */