Mercurial > sdl-ios-xcode

diff src/audio/SDL_mixer.c @ 4322:a8e5b518e194 SDL-1.2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Forcibly disabled MMX mixers. Hopefully fixes Bugzilla #649.
author Ryan C. Gordon <icculus@icculus.org>
date Mon, 12 Oct 2009 08:58:12 +0000
parents a1b03ba2fcd0
children 124629b76853
line wrap: on
line diff
--- a/src/audio/SDL_mixer.c	Mon Oct 12 08:18:36 2009 +0000
+++ b/src/audio/SDL_mixer.c	Mon Oct 12 08:58:12 2009 +0000
@@ -128,6 +128,7 @@
 		break;
 
 		case AUDIO_S8: {
+#if defined(SDL_BUGGY_MMX_MIXERS) /* buggy, so we're disabling them. --ryan. */
 #if defined(__GNUC__) && defined(__i386__) && defined(SDL_ASSEMBLY_ROUTINES)
 			if (SDL_HasMMX())
 			{
@@ -141,6 +142,8 @@
 			}
 			else
 #endif
+#endif
+
 #if defined(__GNUC__) && defined(__M68000__) && defined(SDL_ASSEMBLY_ROUTINES)
 			SDL_MixAudio_m68k_S8((char*)dst,(char*)src,(unsigned long)len,(long)volume);
 #else
@@ -174,6 +177,7 @@
 		break;
 
 		case AUDIO_S16LSB: {
+#if defined(SDL_BUGGY_MMX_MIXERS) /* buggy, so we're disabling them. --ryan. */
 #if defined(__GNUC__) && defined(__i386__) && defined(SDL_ASSEMBLY_ROUTINES)
 			if (SDL_HasMMX())
 			{
@@ -187,6 +191,8 @@
 			}
 			else
 #endif
+#endif
+
 #if defined(__GNUC__) && defined(__M68000__) && defined(SDL_ASSEMBLY_ROUTINES)
 			SDL_MixAudio_m68k_S16LSB((short*)dst,(short*)src,(unsigned long)len,(long)volume);
 #else