Mercurial > sdl-ios-xcode
comparison src/audio/SDL_mixer_MMX_VC.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 |
comparison
equal
deleted
inserted
replaced
3627:631173ffd68f | 3628:4d46850be3f6 |
---|---|
21 */ | 21 */ |
22 #include "SDL_config.h" | 22 #include "SDL_config.h" |
23 | 23 |
24 #include "SDL_mixer_MMX_VC.h" | 24 #include "SDL_mixer_MMX_VC.h" |
25 | 25 |
26 #if defined(SDL_BUGGY_MMX_MIXERS) /* buggy, so we're disabling them. --ryan. */ | |
26 #if ((defined(_MSC_VER) && defined(_M_IX86)) || defined(__WATCOMC__)) && defined(SDL_ASSEMBLY_ROUTINES) | 27 #if ((defined(_MSC_VER) && defined(_M_IX86)) || defined(__WATCOMC__)) && defined(SDL_ASSEMBLY_ROUTINES) |
27 // MMX assembler version of SDL_MixAudio for signed little endian 16 bit samples and signed 8 bit samples | 28 // MMX assembler version of SDL_MixAudio for signed little endian 16 bit samples and signed 8 bit samples |
28 // Copyright 2002 Stephane Marchesin (stephane.marchesin@wanadoo.fr) | 29 // Copyright 2002 Stephane Marchesin (stephane.marchesin@wanadoo.fr) |
29 // Converted to Intel ASM notation by Cth | 30 // Converted to Intel ASM notation by Cth |
30 // This code is licensed under the LGPL (see COPYING for details) | 31 // This code is licensed under the LGPL (see COPYING for details) |
182 } | 183 } |
183 /* *INDENT-ON* */ | 184 /* *INDENT-ON* */ |
184 } | 185 } |
185 | 186 |
186 #endif /* SDL_ASSEMBLY_ROUTINES */ | 187 #endif /* SDL_ASSEMBLY_ROUTINES */ |
188 #endif /* SDL_BUGGY_MMX_MIXERS */ | |
187 | 189 |
188 /* vi: set ts=4 sw=4 expandtab: */ | 190 /* vi: set ts=4 sw=4 expandtab: */ |