Forcibly disabled MMX mixers. SDL-1.2
authorRyan C. Gordon <icculus@icculus.org>
Mon, 12 Oct 2009 08:58:12 +0000
branchSDL-1.2
changeset 4322a8e5b518e194
parent 4321 c9a1de1eda57
child 4323 b3171b7561d8
Forcibly disabled MMX mixers.

Hopefully fixes Bugzilla #649.
src/audio/SDL_mixer.c
src/audio/SDL_mixer_MMX.c
src/audio/SDL_mixer_MMX.h
src/audio/SDL_mixer_MMX_VC.c
src/audio/SDL_mixer_MMX_VC.h
     1.1 --- a/src/audio/SDL_mixer.c	Mon Oct 12 08:18:36 2009 +0000
     1.2 +++ b/src/audio/SDL_mixer.c	Mon Oct 12 08:58:12 2009 +0000
     1.3 @@ -128,6 +128,7 @@
     1.4  		break;
     1.5  
     1.6  		case AUDIO_S8: {
     1.7 +#if defined(SDL_BUGGY_MMX_MIXERS) /* buggy, so we're disabling them. --ryan. */
     1.8  #if defined(__GNUC__) && defined(__i386__) && defined(SDL_ASSEMBLY_ROUTINES)
     1.9  			if (SDL_HasMMX())
    1.10  			{
    1.11 @@ -141,6 +142,8 @@
    1.12  			}
    1.13  			else
    1.14  #endif
    1.15 +#endif
    1.16 +
    1.17  #if defined(__GNUC__) && defined(__M68000__) && defined(SDL_ASSEMBLY_ROUTINES)
    1.18  			SDL_MixAudio_m68k_S8((char*)dst,(char*)src,(unsigned long)len,(long)volume);
    1.19  #else
    1.20 @@ -174,6 +177,7 @@
    1.21  		break;
    1.22  
    1.23  		case AUDIO_S16LSB: {
    1.24 +#if defined(SDL_BUGGY_MMX_MIXERS) /* buggy, so we're disabling them. --ryan. */
    1.25  #if defined(__GNUC__) && defined(__i386__) && defined(SDL_ASSEMBLY_ROUTINES)
    1.26  			if (SDL_HasMMX())
    1.27  			{
    1.28 @@ -187,6 +191,8 @@
    1.29  			}
    1.30  			else
    1.31  #endif
    1.32 +#endif
    1.33 +
    1.34  #if defined(__GNUC__) && defined(__M68000__) && defined(SDL_ASSEMBLY_ROUTINES)
    1.35  			SDL_MixAudio_m68k_S16LSB((short*)dst,(short*)src,(unsigned long)len,(long)volume);
    1.36  #else
     2.1 --- a/src/audio/SDL_mixer_MMX.c	Mon Oct 12 08:18:36 2009 +0000
     2.2 +++ b/src/audio/SDL_mixer_MMX.c	Mon Oct 12 08:58:12 2009 +0000
     2.3 @@ -35,6 +35,7 @@
     2.4  *   Mixing for 16 bit signed buffers
     2.5  ***********************************************/
     2.6  
     2.7 +#if defined(SDL_BUGGY_MMX_MIXERS) /* buggy, so we're disabling them. --ryan. */
     2.8  #if defined(__GNUC__) && defined(__i386__) && defined(SDL_ASSEMBLY_ROUTINES)
     2.9  void SDL_MixAudio_MMX_S16(char* dst,char* src,unsigned int size,int volume)
    2.10  {
    2.11 @@ -203,4 +204,4 @@
    2.12  	 );
    2.13  }
    2.14  #endif
    2.15 -
    2.16 +#endif
     3.1 --- a/src/audio/SDL_mixer_MMX.h	Mon Oct 12 08:18:36 2009 +0000
     3.2 +++ b/src/audio/SDL_mixer_MMX.h	Mon Oct 12 08:58:12 2009 +0000
     3.3 @@ -8,8 +8,10 @@
     3.4  */
     3.5  #include "SDL_config.h"
     3.6  
     3.7 +#if defined(SDL_BUGGY_MMX_MIXERS) /* buggy, so we're disabling them. --ryan. */
     3.8  #if defined(__GNUC__) && defined(__i386__) && defined(SDL_ASSEMBLY_ROUTINES)
     3.9  void SDL_MixAudio_MMX_S16(char* ,char* ,unsigned int ,int );
    3.10  void SDL_MixAudio_MMX_S8(char* ,char* ,unsigned int ,int );
    3.11  #endif
    3.12 +#endif
    3.13  
     4.1 --- a/src/audio/SDL_mixer_MMX_VC.c	Mon Oct 12 08:18:36 2009 +0000
     4.2 +++ b/src/audio/SDL_mixer_MMX_VC.c	Mon Oct 12 08:58:12 2009 +0000
     4.3 @@ -23,6 +23,7 @@
     4.4  
     4.5  #include "SDL_mixer_MMX_VC.h"
     4.6  
     4.7 +#if defined(SDL_BUGGY_MMX_MIXERS) /* buggy, so we're disabling them. --ryan. */
     4.8  #if ((defined(_MSC_VER) && defined(_M_IX86)) || defined(__WATCOMC__)) && defined(SDL_ASSEMBLY_ROUTINES)
     4.9  // MMX assembler version of SDL_MixAudio for signed little endian 16 bit samples and signed 8 bit samples
    4.10  // Copyright 2002 Stephane Marchesin (stephane.marchesin@wanadoo.fr)
    4.11 @@ -179,3 +180,4 @@
    4.12  }
    4.13  
    4.14  #endif /* SDL_ASSEMBLY_ROUTINES */
    4.15 +#endif /* SDL_BUGGY_MMX_MIXERS */
     5.1 --- a/src/audio/SDL_mixer_MMX_VC.h	Mon Oct 12 08:18:36 2009 +0000
     5.2 +++ b/src/audio/SDL_mixer_MMX_VC.h	Mon Oct 12 08:58:12 2009 +0000
     5.3 @@ -22,6 +22,7 @@
     5.4  #include "SDL_config.h"
     5.5  
     5.6  
     5.7 +#if defined(SDL_BUGGY_MMX_MIXERS) /* buggy, so we're disabling them. --ryan. */
     5.8  #if ((defined(_MSC_VER) && defined(_M_IX86)) || defined(__WATCOMC__)) && defined(SDL_ASSEMBLY_ROUTINES)
     5.9  /* headers for MMX assembler version of SDL_MixAudio
    5.10     Copyright 2002 Stephane Marchesin (stephane.marchesin@wanadoo.fr)
    5.11 @@ -34,3 +35,4 @@
    5.12  void SDL_MixAudio_MMX_S16_VC(char* ,char* ,unsigned int ,int );
    5.13  void SDL_MixAudio_MMX_S8_VC(char* ,char* ,unsigned int ,int );
    5.14  #endif
    5.15 +#endif