diff options
| -rw-r--r-- | Alc/bformatdec.c | 4 | ||||
| -rw-r--r-- | Alc/mixer_c.c | 4 | ||||
| -rw-r--r-- | Alc/mixer_defs.h | 6 | ||||
| -rw-r--r-- | Alc/mixer_neon.c | 4 | ||||
| -rw-r--r-- | Alc/mixer_sse.c | 4 | ||||
| -rw-r--r-- | OpenAL32/Include/alu.h | 6 |
6 files changed, 14 insertions, 14 deletions
diff --git a/Alc/bformatdec.c b/Alc/bformatdec.c index 70a6b3fd..180170d9 100644 --- a/Alc/bformatdec.c +++ b/Alc/bformatdec.c @@ -159,7 +159,7 @@ static const ALfloat CubeMatrix[8][FB_Max][MAX_AMBI_COEFFS] = { static ALfloat CubeEncoder[8][MAX_AMBI_COEFFS]; -static inline MatrixMixerFunc SelectMixer(void) +static inline RowMixerFunc SelectMixer(void) { #ifdef HAVE_SSE if((CPUCapFlags&CPU_CAP_SSE)) @@ -172,7 +172,7 @@ static inline MatrixMixerFunc SelectMixer(void) return MixRow_C; } -static MatrixMixerFunc MixMatrixRow = MixRow_C; +static RowMixerFunc MixMatrixRow = MixRow_C; static alonce_flag bformatdec_inited = AL_ONCE_FLAG_INIT; diff --git a/Alc/mixer_c.c b/Alc/mixer_c.c index c79d6061..c74729a8 100644 --- a/Alc/mixer_c.c +++ b/Alc/mixer_c.c @@ -208,13 +208,13 @@ void Mix_C(const ALfloat *data, ALuint OutChans, ALfloat (*restrict OutBuffer)[B * transform. And as the matrices are more or less static once set up, no * stepping is necessary. */ -void MixRow_C(ALfloat *OutBuffer, const ALfloat *Mtx, ALfloat (*restrict data)[BUFFERSIZE], ALuint InChans, ALuint BufferSize) +void MixRow_C(ALfloat *OutBuffer, const ALfloat *Gains, ALfloat (*restrict data)[BUFFERSIZE], ALuint InChans, ALuint BufferSize) { ALuint c, i; for(c = 0;c < InChans;c++) { - ALfloat gain = Mtx[c]; + ALfloat gain = Gains[c]; if(!(fabsf(gain) > GAIN_SILENCE_THRESHOLD)) continue; diff --git a/Alc/mixer_defs.h b/Alc/mixer_defs.h index be88379b..1572ac36 100644 --- a/Alc/mixer_defs.h +++ b/Alc/mixer_defs.h @@ -31,7 +31,7 @@ void MixDirectHrtf_C(ALfloat (*restrict OutBuffer)[BUFFERSIZE], ALuint lidx, ALu ALuint BufferSize); void Mix_C(const ALfloat *data, ALuint OutChans, ALfloat (*restrict OutBuffer)[BUFFERSIZE], struct MixGains *Gains, ALuint Counter, ALuint OutPos, ALuint BufferSize); -void MixRow_C(ALfloat *OutBuffer, const ALfloat *Mtx, ALfloat (*restrict data)[BUFFERSIZE], +void MixRow_C(ALfloat *OutBuffer, const ALfloat *Gains, ALfloat (*restrict data)[BUFFERSIZE], ALuint InChans, ALuint BufferSize); /* SSE mixers */ @@ -45,7 +45,7 @@ void MixDirectHrtf_SSE(ALfloat (*restrict OutBuffer)[BUFFERSIZE], ALuint lidx, A ALuint BufferSize); void Mix_SSE(const ALfloat *data, ALuint OutChans, ALfloat (*restrict OutBuffer)[BUFFERSIZE], struct MixGains *Gains, ALuint Counter, ALuint OutPos, ALuint BufferSize); -void MixRow_SSE(ALfloat *OutBuffer, const ALfloat *Mtx, ALfloat (*restrict data)[BUFFERSIZE], +void MixRow_SSE(ALfloat *OutBuffer, const ALfloat *Gains, ALfloat (*restrict data)[BUFFERSIZE], ALuint InChans, ALuint BufferSize); /* SSE resamplers */ @@ -92,7 +92,7 @@ void MixDirectHrtf_Neon(ALfloat (*restrict OutBuffer)[BUFFERSIZE], ALuint lidx, ALuint BufferSize); void Mix_Neon(const ALfloat *data, ALuint OutChans, ALfloat (*restrict OutBuffer)[BUFFERSIZE], struct MixGains *Gains, ALuint Counter, ALuint OutPos, ALuint BufferSize); -void MixRow_Neon(ALfloat *OutBuffer, const ALfloat *Mtx, ALfloat (*restrict data)[BUFFERSIZE], +void MixRow_Neon(ALfloat *OutBuffer, const ALfloat *Gains, ALfloat (*restrict data)[BUFFERSIZE], ALuint InChans, ALuint BufferSize); #endif /* MIXER_DEFS_H */ diff --git a/Alc/mixer_neon.c b/Alc/mixer_neon.c index fcd0387a..73395aeb 100644 --- a/Alc/mixer_neon.c +++ b/Alc/mixer_neon.c @@ -144,7 +144,7 @@ void Mix_Neon(const ALfloat *data, ALuint OutChans, ALfloat (*restrict OutBuffer } } -void MixRow_Neon(ALfloat *OutBuffer, const ALfloat *Mtx, ALfloat (*restrict data)[BUFFERSIZE], ALuint InChans, ALuint BufferSize) +void MixRow_Neon(ALfloat *OutBuffer, const ALfloat *Gains, ALfloat (*restrict data)[BUFFERSIZE], ALuint InChans, ALuint BufferSize) { float32x4_t gain4; ALuint c; @@ -152,7 +152,7 @@ void MixRow_Neon(ALfloat *OutBuffer, const ALfloat *Mtx, ALfloat (*restrict data for(c = 0;c < InChans;c++) { ALuint pos = 0; - ALfloat gain = Mtx[c]; + ALfloat gain = Gains[c]; if(!(fabsf(gain) > GAIN_SILENCE_THRESHOLD)) continue; diff --git a/Alc/mixer_sse.c b/Alc/mixer_sse.c index 6914e500..1ac78f9c 100644 --- a/Alc/mixer_sse.c +++ b/Alc/mixer_sse.c @@ -262,7 +262,7 @@ void Mix_SSE(const ALfloat *data, ALuint OutChans, ALfloat (*restrict OutBuffer) } } -void MixRow_SSE(ALfloat *OutBuffer, const ALfloat *Mtx, ALfloat (*restrict data)[BUFFERSIZE], ALuint InChans, ALuint BufferSize) +void MixRow_SSE(ALfloat *OutBuffer, const ALfloat *Gains, ALfloat (*restrict data)[BUFFERSIZE], ALuint InChans, ALuint BufferSize) { __m128 gain4; ALuint c; @@ -270,7 +270,7 @@ void MixRow_SSE(ALfloat *OutBuffer, const ALfloat *Mtx, ALfloat (*restrict data) for(c = 0;c < InChans;c++) { ALuint pos = 0; - ALfloat gain = Mtx[c]; + ALfloat gain = Gains[c]; if(!(fabsf(gain) > GAIN_SILENCE_THRESHOLD)) continue; diff --git a/OpenAL32/Include/alu.h b/OpenAL32/Include/alu.h index 70ce7059..9a92dc50 100644 --- a/OpenAL32/Include/alu.h +++ b/OpenAL32/Include/alu.h @@ -160,9 +160,9 @@ typedef const ALfloat* (*ResamplerFunc)(const BsincState *state, typedef void (*MixerFunc)(const ALfloat *data, ALuint OutChans, ALfloat (*restrict OutBuffer)[BUFFERSIZE], struct MixGains *Gains, ALuint Counter, ALuint OutPos, ALuint BufferSize); -typedef void (*MatrixMixerFunc)(ALfloat *OutBuffer, const ALfloat *Mtx, - ALfloat (*restrict data)[BUFFERSIZE], ALuint InChans, - ALuint BufferSize); +typedef void (*RowMixerFunc)(ALfloat *OutBuffer, const ALfloat *gains, + ALfloat (*restrict data)[BUFFERSIZE], ALuint InChans, + ALuint BufferSize); typedef void (*HrtfMixerFunc)(ALfloat (*restrict OutBuffer)[BUFFERSIZE], ALuint lidx, ALuint ridx, const ALfloat *data, ALuint Counter, ALuint Offset, ALuint OutPos, const ALuint IrSize, const MixHrtfParams *hrtfparams, |