diff options
| author | Chris Robinson <[email protected]> | 2015-08-15 01:37:46 -0700 |
|---|---|---|
| committer | Chris Robinson <[email protected]> | 2015-08-15 01:37:46 -0700 |
| commit | d5ab883da21499a14bf86a1aa7f0ad894becb1c5 (patch) | |
| tree | 1a57fd3390d5bdf28d064687fb32d3cf0a51b9bd | |
| parent | f6e52debb5106dcc6ff99fe005da4501fd56522d (diff) | |
Define MixHrtf directly instead of through a SUFFIX macro
| -rw-r--r-- | Alc/mixer_c.c | 4 | ||||
| -rw-r--r-- | Alc/mixer_inc.c | 12 | ||||
| -rw-r--r-- | Alc/mixer_neon.c | 5 | ||||
| -rw-r--r-- | Alc/mixer_sse.c | 4 |
4 files changed, 6 insertions, 19 deletions
diff --git a/Alc/mixer_c.c b/Alc/mixer_c.c index dc7fe838..d06e52b4 100644 --- a/Alc/mixer_c.c +++ b/Alc/mixer_c.c @@ -101,9 +101,9 @@ static inline void ApplyCoeffs(ALuint Offset, ALfloat (*restrict Values)[2], } } -#define SUFFIX C +#define MixHrtf MixHrtf_C #include "mixer_inc.c" -#undef SUFFIX +#undef MixHrtf void Mix_C(const ALfloat *data, ALuint OutChans, ALfloat (*restrict OutBuffer)[BUFFERSIZE], diff --git a/Alc/mixer_inc.c b/Alc/mixer_inc.c index 63003f03..a82930cc 100644 --- a/Alc/mixer_inc.c +++ b/Alc/mixer_inc.c @@ -8,12 +8,6 @@ #include "align.h" -#define REAL_MERGE(a,b) a##b -#define MERGE(a,b) REAL_MERGE(a,b) - -#define MixHrtf MERGE(MixHrtf_,SUFFIX) - - static inline void SetupCoeffs(ALfloat (*restrict OutCoeffs)[2], const HrtfParams *hrtfparams, ALuint IrSize, ALuint Counter); @@ -83,9 +77,3 @@ void MixHrtf(ALfloat (*restrict OutBuffer)[BUFFERSIZE], const ALfloat *data, OutPos++; } } - - -#undef MixHrtf - -#undef MERGE -#undef REAL_MERGE diff --git a/Alc/mixer_neon.c b/Alc/mixer_neon.c index 8f79186d..9ee76850 100644 --- a/Alc/mixer_neon.c +++ b/Alc/mixer_neon.c @@ -88,10 +88,9 @@ static inline void ApplyCoeffs(ALuint Offset, ALfloat (*restrict Values)[2], } } - -#define SUFFIX Neon +#define MixHrtf MixHrtf_Neon #include "mixer_inc.c" -#undef SUFFIX +#undef MixHrtf void Mix_Neon(const ALfloat *data, ALuint OutChans, ALfloat (*restrict OutBuffer)[BUFFERSIZE], diff --git a/Alc/mixer_sse.c b/Alc/mixer_sse.c index 31c57588..208542ff 100644 --- a/Alc/mixer_sse.c +++ b/Alc/mixer_sse.c @@ -143,9 +143,9 @@ static inline void ApplyCoeffs(ALuint Offset, ALfloat (*restrict Values)[2], } } -#define SUFFIX SSE +#define MixHrtf MixHrtf_SSE #include "mixer_inc.c" -#undef SUFFIX +#undef MixHrtf void Mix_SSE(const ALfloat *data, ALuint OutChans, ALfloat (*restrict OutBuffer)[BUFFERSIZE], |