Merged r5070:5071 from branches/SDL-1.2: forcibly disable buggy MMX mixers.
authorRyan C. Gordon
Sun, 10 Jan 2010 07:48:14 +0000
changeset 36284d46850be3f6
parent 3627 631173ffd68f
child 3629 102be1cdd2bb
Merged r5070:5071 from branches/SDL-1.2: forcibly disable buggy MMX mixers.
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	Sun Jan 10 07:40:12 2010 +0000
     1.2 +++ b/src/audio/SDL_mixer.c	Sun Jan 10 07:48:14 2010 +0000
     1.3 @@ -122,6 +122,7 @@
     1.4  
     1.5      case AUDIO_S8:
     1.6          {
     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                  SDL_MixAudio_MMX_S8((char *) dst, (char *) src,
    1.11 @@ -133,6 +134,7 @@
    1.12                                         (unsigned int) len, (int) volume);
    1.13              } else
    1.14  #endif
    1.15 +#endif
    1.16  #if defined(__GNUC__) && defined(__M68000__) && defined(SDL_ASSEMBLY_ROUTINES)
    1.17                  SDL_MixAudio_m68k_S8((char *) dst, (char *) src,
    1.18                                       (unsigned long) len, (long) volume);
    1.19 @@ -167,6 +169,7 @@
    1.20  
    1.21      case AUDIO_S16LSB:
    1.22          {
    1.23 +#if defined(SDL_BUGGY_MMX_MIXERS) /* buggy, so we're disabling them. --ryan. */
    1.24  #if defined(__GNUC__) && defined(__i386__) && defined(SDL_ASSEMBLY_ROUTINES)
    1.25              if (SDL_HasMMX()) {
    1.26                  SDL_MixAudio_MMX_S16((char *) dst, (char *) src,
    1.27 @@ -178,6 +181,7 @@
    1.28                                          (unsigned int) len, (int) volume);
    1.29              } else
    1.30  #endif
    1.31 +#endif
    1.32  #if defined(__GNUC__) && defined(__M68000__) && defined(SDL_ASSEMBLY_ROUTINES)
    1.33                  SDL_MixAudio_m68k_S16LSB((short *) dst, (short *) src,
    1.34                                           (unsigned long) len, (long) volume);
     2.1 --- a/src/audio/SDL_mixer_MMX.c	Sun Jan 10 07:40:12 2010 +0000
     2.2 +++ b/src/audio/SDL_mixer_MMX.c	Sun Jan 10 07:48:14 2010 +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
    2.10  SDL_MixAudio_MMX_S16(char *dst, char *src, unsigned int size, int volume)
    2.11 @@ -117,4 +118,7 @@
    2.12                           "m"(volume):"eax", "edx", "memory");
    2.13  }
    2.14  #endif
    2.15 +
    2.16 +#endif /* SDL_BUGGY_MMX_MIXERS */
    2.17 +
    2.18  /* vi: set ts=4 sw=4 expandtab: */
     3.1 --- a/src/audio/SDL_mixer_MMX.h	Sun Jan 10 07:40:12 2010 +0000
     3.2 +++ b/src/audio/SDL_mixer_MMX.h	Sun Jan 10 07:48:14 2010 +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 /* SDL_BUGGY_MMX_MIXERS */
    3.13  /* vi: set ts=4 sw=4 expandtab: */
     4.1 --- a/src/audio/SDL_mixer_MMX_VC.c	Sun Jan 10 07:40:12 2010 +0000
     4.2 +++ b/src/audio/SDL_mixer_MMX_VC.c	Sun Jan 10 07:48:14 2010 +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 @@ -184,5 +185,6 @@
    4.12  }
    4.13  
    4.14  #endif /* SDL_ASSEMBLY_ROUTINES */
    4.15 +#endif /* SDL_BUGGY_MMX_MIXERS */
    4.16  
    4.17  /* vi: set ts=4 sw=4 expandtab: */
     5.1 --- a/src/audio/SDL_mixer_MMX_VC.h	Sun Jan 10 07:40:12 2010 +0000
     5.2 +++ b/src/audio/SDL_mixer_MMX_VC.h	Sun Jan 10 07:48:14 2010 +0000
     5.3 @@ -21,7 +21,7 @@
     5.4  */
     5.5  #include "SDL_config.h"
     5.6  
     5.7 -
     5.8 +#if defined(SDL_BUGGY_MMX_MIXERS) /* buggy, so we're disabling them. --ryan. */
     5.9  #if ((defined(_MSC_VER) && defined(_M_IX86)) || defined(__WATCOMC__)) && defined(SDL_ASSEMBLY_ROUTINES)
    5.10  /* headers for MMX assembler version of SDL_MixAudio
    5.11     Copyright 2002 Stephane Marchesin (stephane.marchesin@wanadoo.fr)
    5.12 @@ -34,4 +34,6 @@
    5.13  void SDL_MixAudio_MMX_S16_VC(char *, char *, unsigned int, int);
    5.14  void SDL_MixAudio_MMX_S8_VC(char *, char *, unsigned int, int);
    5.15  #endif
    5.16 +#endif /* SDL_BUGGY_MMX_MIXERS */
    5.17 +
    5.18  /* vi: set ts=4 sw=4 expandtab: */