Use different parameters for HRTF mixers

1 files changed, 15 insertions, 9 deletions

diff --git a/Alc/mixer_defs.h b/Alc/mixer_defs.h
index c0a77f0f..c1d90408 100644
--- a/Alc/mixer_defs.h
+++ b/Alc/mixer_defs.h
@@ -8,6 +8,9 @@
 struct DirectParams;
 struct SendParams;
 
+struct HrtfParams;
+struct HrtfState;
+
 /* C resamplers */
 void Resample_copy32_C(const ALfloat *src, ALuint frac, ALuint increment, ALfloat *restrict dst, ALuint dstlen);
 void Resample_point32_C(const ALfloat *src, ALuint frac, ALuint increment, ALfloat *restrict dst, ALuint dstlen);
@@ -16,27 +19,30 @@ void Resample_cubic32_C(const ALfloat *src, ALuint frac, ALuint increment, ALflo
 
 
 /* C mixers */
-void MixDirect_Hrtf_C(struct DirectParams *params,
-                      ALfloat (*restrict OutBuffer)[BUFFERSIZE], const ALfloat *restrict data,
-                      ALuint Counter, ALuint srcchan, ALuint OutPos, ALuint BufferSize);
+void MixDirect_Hrtf_C(ALfloat (*restrict OutBuffer)[BUFFERSIZE], const ALfloat *data,
+                      ALuint Counter, ALuint Offset, const ALuint IrSize,
+                      const struct HrtfParams *hrtfparams, struct HrtfState *hrtfstate,
+                      ALuint OutPos, ALuint BufferSize);
 void MixDirect_C(struct DirectParams *params,
                  ALfloat (*restrict OutBuffer)[BUFFERSIZE], const ALfloat *restrict data,
                  ALuint Counter, ALuint srcchan, ALuint OutPos, ALuint BufferSize);
 void MixSend_C(struct SendParams*,const ALfloat*restrict,ALuint,ALuint);
 
 /* SSE mixers */
-void MixDirect_Hrtf_SSE(struct DirectParams *params,
-                        ALfloat (*restrict OutBuffer)[BUFFERSIZE], const ALfloat *restrict data,
-                        ALuint Counter, ALuint srcchan, ALuint OutPos, ALuint BufferSize);
+void MixDirect_Hrtf_SSE(ALfloat (*restrict OutBuffer)[BUFFERSIZE], const ALfloat *data,
+                        ALuint Counter, ALuint Offset, const ALuint IrSize,
+                        const struct HrtfParams *hrtfparams, struct HrtfState *hrtfstate,
+                        ALuint OutPos, ALuint BufferSize);
 void MixDirect_SSE(struct DirectParams *params,
                    ALfloat (*restrict OutBuffer)[BUFFERSIZE], const ALfloat *restrict data,
                    ALuint Counter, ALuint srcchan, ALuint OutPos, ALuint BufferSize);
 void MixSend_SSE(struct SendParams*,const ALfloat*restrict,ALuint,ALuint);
 
 /* Neon mixers */
-void MixDirect_Hrtf_Neon(struct DirectParams *params,
-                         ALfloat (*restrict OutBuffer)[BUFFERSIZE], const ALfloat *restrict data,
-                         ALuint Counter, ALuint srcchan, ALuint OutPos, ALuint BufferSize);
+void MixDirect_Hrtf_Neon(ALfloat (*restrict OutBuffer)[BUFFERSIZE], const ALfloat *data,
+                         ALuint Counter, ALuint Offset, const ALuint IrSize,
+                         const struct HrtfParams *hrtfparams, struct HrtfState *hrtfstate,
+                         ALuint OutPos, ALuint BufferSize);
 void MixDirect_Neon(struct DirectParams *params,
                     ALfloat (*restrict OutBuffer)[BUFFERSIZE], const ALfloat *restrict data,
                     ALuint Counter, ALuint srcchan, ALuint OutPos, ALuint BufferSize);