Revert "Apply HRTF coefficient stepping separately"

This reverts commit 25b9c3d0c15e959d544f5d0ac7ea507ea5f6d69f.

Conflicts:
	Alc/mixer_neon.c

Unfortunately this also undoes the Neon-enhanced ApplyCoeffsStep method.

1 files changed, 5 insertions, 4 deletions

diff --git a/Alc/mixer_inc.c b/Alc/mixer_inc.c
index 08a7b264..da8a7b31 100644
--- a/Alc/mixer_inc.c
+++ b/Alc/mixer_inc.c
@@ -19,9 +19,11 @@
 #define MixDirect_Hrtf MERGE2(MixDirect_Hrtf_,SUFFIX)
 
 
-static inline void ApplyCoeffsStep(const ALuint irSize,
+static inline void ApplyCoeffsStep(ALuint Offset, ALfloat (*restrict Values)[2],
+                                   const ALuint irSize,
                                    ALfloat (*restrict Coeffs)[2],
-                                   const ALfloat (*restrict CoeffStep)[2]);
+                                   const ALfloat (*restrict CoeffStep)[2],
+                                   ALfloat left, ALfloat right);
 static inline void ApplyCoeffs(ALuint Offset, ALfloat (*restrict Values)[2],
                                const ALuint irSize,
                                ALfloat (*restrict Coeffs)[2],
@@ -91,10 +93,9 @@ void MixDirect_Hrtf(const DirectParams *params, const ALfloat *restrict data, AL
         Values[(Offset+IrSize)&HRIR_MASK][1] = 0.0f;
         Offset++;
 
-        ApplyCoeffs(Offset, Values, IrSize, Coeffs, left, right);
+        ApplyCoeffsStep(Offset, Values, IrSize, Coeffs, CoeffStep, left, right);
         DryBuffer[FrontLeft][OutPos]  += Values[Offset&HRIR_MASK][0];
         DryBuffer[FrontRight][OutPos] += Values[Offset&HRIR_MASK][1];
-        ApplyCoeffsStep(IrSize, Coeffs, CoeffStep);
 
         OutPos++;
         Counter--;