diff options
| author | Chris Robinson <[email protected]> | 2019-08-18 03:55:09 -0700 |
|---|---|---|
| committer | Chris Robinson <[email protected]> | 2019-08-18 15:15:56 -0700 |
| commit | 4f4ef3a41015cfc499afc1d3101f2e99d29ebb9e (patch) | |
| tree | e89de9b09cb3afc9a6d3eee427b57873259502a5 /alc/mixer | |
| parent | 6750907bddc96e8552f16c6ba88ddcc18d4d9236 (diff) | |
Don't require MixRow's output to be a FloatBufferLine
Diffstat (limited to 'alc/mixer')
| -rw-r--r-- | alc/mixer/defs.h | 2 | ||||
| -rw-r--r-- | alc/mixer/mixer_c.cpp | 2 | ||||
| -rw-r--r-- | alc/mixer/mixer_neon.cpp | 2 | ||||
| -rw-r--r-- | alc/mixer/mixer_sse.cpp | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/alc/mixer/defs.h b/alc/mixer/defs.h index 0cd4162a..55de2e67 100644 --- a/alc/mixer/defs.h +++ b/alc/mixer/defs.h @@ -32,7 +32,7 @@ const ALfloat *Resample_(const InterpState *state, const ALfloat *RESTRICT src, template<InstSetType InstTag> void Mix_(const ALfloat *data, const al::span<FloatBufferLine> OutBuffer, ALfloat *CurrentGains, const ALfloat *TargetGains, const ALsizei Counter, const ALsizei OutPos, const ALsizei BufferSize); template<InstSetType InstTag> -void MixRow_(FloatBufferLine &OutBuffer, const ALfloat *Gains, const al::span<const FloatBufferLine> InSamples, const ALsizei InPos, const ALsizei BufferSize); +void MixRow_(ALfloat *OutBuffer, const ALfloat *Gains, const al::span<const FloatBufferLine> InSamples, const ALsizei InPos, const ALsizei BufferSize); template<InstSetType InstTag> void MixHrtf_(FloatBufferLine &LeftOut, FloatBufferLine &RightOut, const ALfloat *InSamples, float2 *AccumSamples, const ALsizei OutPos, const ALsizei IrSize, MixHrtfFilter *hrtfparams, const ALsizei BufferSize); diff --git a/alc/mixer/mixer_c.cpp b/alc/mixer/mixer_c.cpp index 765b03fa..ff20bb2b 100644 --- a/alc/mixer/mixer_c.cpp +++ b/alc/mixer/mixer_c.cpp @@ -189,7 +189,7 @@ void Mix_<CTag>(const ALfloat *data, const al::span<FloatBufferLine> OutBuffer, * stepping is necessary. */ template<> -void MixRow_<CTag>(FloatBufferLine &OutBuffer, const ALfloat *Gains, +void MixRow_<CTag>(ALfloat *OutBuffer, const ALfloat *Gains, const al::span<const FloatBufferLine> InSamples, const ALsizei InPos, const ALsizei BufferSize) { ASSUME(BufferSize > 0); diff --git a/alc/mixer/mixer_neon.cpp b/alc/mixer/mixer_neon.cpp index f43063ce..40cbdb23 100644 --- a/alc/mixer/mixer_neon.cpp +++ b/alc/mixer/mixer_neon.cpp @@ -276,7 +276,7 @@ void Mix_<NEONTag>(const ALfloat *data, const al::span<FloatBufferLine> OutBuffe } template<> -void MixRow_<NEONTag>(FloatBufferLine &OutBuffer, const ALfloat *Gains, +void MixRow_<NEONTag>(ALfloat *OutBuffer, const ALfloat *Gains, const al::span<const FloatBufferLine> InSamples, const ALsizei InPos, const ALsizei BufferSize) { ASSUME(BufferSize > 0); diff --git a/alc/mixer/mixer_sse.cpp b/alc/mixer/mixer_sse.cpp index cff37d2b..6c7715fc 100644 --- a/alc/mixer/mixer_sse.cpp +++ b/alc/mixer/mixer_sse.cpp @@ -229,7 +229,7 @@ void Mix_<SSETag>(const ALfloat *data, const al::span<FloatBufferLine> OutBuffer } template<> -void MixRow_<SSETag>(FloatBufferLine &OutBuffer, const ALfloat *Gains, +void MixRow_<SSETag>(ALfloat *OutBuffer, const ALfloat *Gains, const al::span<const FloatBufferLine> InSamples, const ALsizei InPos, const ALsizei BufferSize) { ASSUME(BufferSize > 0); |