Use ALsizei and ALint for sizes and offsets with resamplers and filters

1 files changed, 24 insertions, 23 deletions

diff --git a/Alc/mixer_defs.h b/Alc/mixer_defs.h
index 318df626..6d2b3c04 100644
--- a/Alc/mixer_defs.h
+++ b/Alc/mixer_defs.h
@@ -12,12 +12,12 @@ struct MixHrtfParams;
 struct HrtfState;
 
 /* C resamplers */
-const ALfloat *Resample_copy32_C(const BsincState *state, const ALfloat *restrict src, ALuint frac, ALuint increment, ALfloat *restrict dst, ALuint dstlen);
-const ALfloat *Resample_point32_C(const BsincState *state, const ALfloat *restrict src, ALuint frac, ALuint increment, ALfloat *restrict dst, ALuint dstlen);
-const ALfloat *Resample_lerp32_C(const BsincState *state, const ALfloat *restrict src, ALuint frac, ALuint increment, ALfloat *restrict dst, ALuint dstlen);
-const ALfloat *Resample_fir4_32_C(const BsincState *state, const ALfloat *restrict src, ALuint frac, ALuint increment, ALfloat *restrict dst, ALuint dstlen);
-const ALfloat *Resample_fir8_32_C(const BsincState *state, const ALfloat *restrict src, ALuint frac, ALuint increment, ALfloat *restrict dst, ALuint dstlen);
-const ALfloat *Resample_bsinc32_C(const BsincState *state, const ALfloat *restrict src, ALuint frac, ALuint increment, ALfloat *restrict dst, ALuint dstlen);
+const ALfloat *Resample_copy32_C(const BsincState *state, const ALfloat *restrict src, ALuint frac, ALint increment, ALfloat *restrict dst, ALsizei dstlen);
+const ALfloat *Resample_point32_C(const BsincState *state, const ALfloat *restrict src, ALuint frac, ALint increment, ALfloat *restrict dst, ALsizei dstlen);
+const ALfloat *Resample_lerp32_C(const BsincState *state, const ALfloat *restrict src, ALuint frac, ALint increment, ALfloat *restrict dst, ALsizei dstlen);
+const ALfloat *Resample_fir4_32_C(const BsincState *state, const ALfloat *restrict src, ALuint frac, ALint increment, ALfloat *restrict dst, ALsizei dstlen);
+const ALfloat *Resample_fir8_32_C(const BsincState *state, const ALfloat *restrict src, ALuint frac, ALint increment, ALfloat *restrict dst, ALsizei dstlen);
+const ALfloat *Resample_bsinc32_C(const BsincState *state, const ALfloat *restrict src, ALuint frac, ALint increment, ALfloat *restrict dst, ALsizei dstlen);
 
 
 /* C mixers */
@@ -53,43 +53,44 @@ void MixRow_SSE(ALfloat *OutBuffer, const ALfloat *Gains,
                 ALsizei InPos, ALsizei BufferSize);
 
 /* SSE resamplers */
-inline void InitiatePositionArrays(ALuint frac, ALuint increment, ALuint *restrict frac_arr, ALuint *restrict pos_arr, ALuint size)
+inline void InitiatePositionArrays(ALuint frac, ALint increment, ALuint *restrict frac_arr, ALint *restrict pos_arr, ALsizei size)
 {
-    ALuint i;
+    ALsizei i;
 
     pos_arr[0] = 0;
     frac_arr[0] = frac;
     for(i = 1;i < size;i++)
     {
-        ALuint frac_tmp = frac_arr[i-1] + increment;
+        ALint frac_tmp = frac_arr[i-1] + increment;
         pos_arr[i] = pos_arr[i-1] + (frac_tmp>>FRACTIONBITS);
         frac_arr[i] = frac_tmp&FRACTIONMASK;
     }
 }
 
-const ALfloat *Resample_bsinc32_SSE(const BsincState *state, const ALfloat *restrict src, ALuint frac,
-                                    ALuint increment, ALfloat *restrict dst, ALuint dstlen);
+const ALfloat *Resample_bsinc32_SSE(const BsincState *state, const ALfloat *restrict src,
+                                    ALuint frac, ALint increment, ALfloat *restrict dst,
+                                    ALsizei dstlen);
 
 const ALfloat *Resample_lerp32_SSE2(const BsincState *state, const ALfloat *restrict src,
-                                    ALuint frac, ALuint increment, ALfloat *restrict dst,
-                                    ALuint numsamples);
+                                    ALuint frac, ALint increment, ALfloat *restrict dst,
+                                    ALsizei numsamples);
 const ALfloat *Resample_lerp32_SSE41(const BsincState *state, const ALfloat *restrict src,
-                                     ALuint frac, ALuint increment, ALfloat *restrict dst,
-                                     ALuint numsamples);
+                                     ALuint frac, ALint increment, ALfloat *restrict dst,
+                                     ALsizei numsamples);
 
 const ALfloat *Resample_fir4_32_SSE3(const BsincState *state, const ALfloat *restrict src,
-                                     ALuint frac, ALuint increment, ALfloat *restrict dst,
-                                     ALuint numsamples);
+                                     ALuint frac, ALint increment, ALfloat *restrict dst,
+                                     ALsizei numsamples);
 const ALfloat *Resample_fir4_32_SSE41(const BsincState *state, const ALfloat *restrict src,
-                                      ALuint frac, ALuint increment, ALfloat *restrict dst,
-                                      ALuint numsamples);
+                                      ALuint frac, ALint increment, ALfloat *restrict dst,
+                                      ALsizei numsamples);
 
 const ALfloat *Resample_fir8_32_SSE3(const BsincState *state, const ALfloat *restrict src,
-                                     ALuint frac, ALuint increment, ALfloat *restrict dst,
-                                     ALuint numsamples);
+                                     ALuint frac, ALint increment, ALfloat *restrict dst,
+                                     ALsizei numsamples);
 const ALfloat *Resample_fir8_32_SSE41(const BsincState *state, const ALfloat *restrict src,
-                                      ALuint frac, ALuint increment, ALfloat *restrict dst,
-                                      ALuint numsamples);
+                                      ALuint frac, ALint increment, ALfloat *restrict dst,
+                                      ALsizei numsamples);
 
 /* Neon mixers */
 void MixHrtf_Neon(ALfloat (*restrict OutBuffer)[BUFFERSIZE], ALsizei lidx, ALsizei ridx,