From 151ff51e7d7b8265cac804f3b754a87924902090 Mon Sep 17 00:00:00 2001 From: Chris Robinson Date: Wed, 31 Jul 2019 10:46:33 -0700 Subject: Don't templatize HrirArray --- alc/mixer/hrtfbase.h | 4 ++-- alc/mixer/mixer_c.cpp | 2 +- alc/mixer/mixer_neon.cpp | 2 +- alc/mixer/mixer_sse.cpp | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) (limited to 'alc/mixer') diff --git a/alc/mixer/hrtfbase.h b/alc/mixer/hrtfbase.h index a76bd62e..3c8208f3 100644 --- a/alc/mixer/hrtfbase.h +++ b/alc/mixer/hrtfbase.h @@ -9,7 +9,7 @@ using ApplyCoeffsT = void(ALsizei Offset, float2 *RESTRICT Values, const ALsizei irSize, - const HrirArray &Coeffs, const ALfloat left, const ALfloat right); + const HrirArray &Coeffs, const ALfloat left, const ALfloat right); template inline void MixHrtfBase(FloatBufferLine &LeftOut, FloatBufferLine &RightOut, @@ -20,7 +20,7 @@ inline void MixHrtfBase(FloatBufferLine &LeftOut, FloatBufferLine &RightOut, ASSUME(IrSize >= 4); ASSUME(BufferSize > 0); - const auto &Coeffs = *hrtfparams->Coeffs; + const HrirArray &Coeffs = *hrtfparams->Coeffs; const ALfloat gainstep{hrtfparams->GainStep}; const ALfloat gain{hrtfparams->Gain}; diff --git a/alc/mixer/mixer_c.cpp b/alc/mixer/mixer_c.cpp index 3513cf2b..765b03fa 100644 --- a/alc/mixer/mixer_c.cpp +++ b/alc/mixer/mixer_c.cpp @@ -104,7 +104,7 @@ const ALfloat *Resample_(const InterpState *state, const ALfloat static inline void ApplyCoeffs(ALsizei /*Offset*/, float2 *RESTRICT Values, const ALsizei IrSize, - const HrirArray &Coeffs, const ALfloat left, const ALfloat right) + const HrirArray &Coeffs, const ALfloat left, const ALfloat right) { ASSUME(IrSize >= 2); for(ALsizei c{0};c < IrSize;++c) diff --git a/alc/mixer/mixer_neon.cpp b/alc/mixer/mixer_neon.cpp index fa487d97..b4ca61d7 100644 --- a/alc/mixer/mixer_neon.cpp +++ b/alc/mixer/mixer_neon.cpp @@ -136,7 +136,7 @@ const ALfloat *Resample_(const InterpState *state, const ALflo static inline void ApplyCoeffs(ALsizei /*Offset*/, float2 *RESTRICT Values, const ALsizei IrSize, - const HrirArray &Coeffs, const ALfloat left, const ALfloat right) + const HrirArray &Coeffs, const ALfloat left, const ALfloat right) { ASSUME(IrSize >= 2); diff --git a/alc/mixer/mixer_sse.cpp b/alc/mixer/mixer_sse.cpp index 516dabac..b52ef256 100644 --- a/alc/mixer/mixer_sse.cpp +++ b/alc/mixer/mixer_sse.cpp @@ -75,7 +75,7 @@ const ALfloat *Resample_(const InterpState *state, const ALfloa static inline void ApplyCoeffs(ALsizei Offset, float2 *RESTRICT Values, const ALsizei IrSize, - const HrirArray &Coeffs, const ALfloat left, const ALfloat right) + const HrirArray &Coeffs, const ALfloat left, const ALfloat right) { const __m128 lrlr{_mm_setr_ps(left, right, left, right)}; -- cgit v1.2.3