diff options
| author | Chris Robinson <[email protected]> | 2018-09-18 19:08:13 -0700 |
|---|---|---|
| committer | Chris Robinson <[email protected]> | 2018-09-18 19:08:13 -0700 |
| commit | 9ef4dd42474c3ecc266362df47fd5a6cca8dcbb4 (patch) | |
| tree | b78fd1df50c6369cdf7611034fbf97e5afbc2acb | |
| parent | 952ff84b994b72ec39e97e2441a422085884932a (diff) | |
Use ALsizei for the source resample position
| -rw-r--r-- | Alc/mixer/defs.h | 2 | ||||
| -rw-r--r-- | Alc/mixer/mixer_neon.c | 3 | ||||
| -rw-r--r-- | Alc/mixer/mixer_sse2.c | 3 | ||||
| -rw-r--r-- | Alc/mixer/mixer_sse41.c | 3 | ||||
| -rw-r--r-- | Alc/mixvoice.c | 2 |
5 files changed, 5 insertions, 8 deletions
diff --git a/Alc/mixer/defs.h b/Alc/mixer/defs.h index fe19cef4..8f6e3755 100644 --- a/Alc/mixer/defs.h +++ b/Alc/mixer/defs.h @@ -62,7 +62,7 @@ void MixRow_SSE(ALfloat *OutBuffer, const ALfloat *Gains, ALsizei InPos, ALsizei BufferSize); /* SSE resamplers */ -inline void InitiatePositionArrays(ALsizei frac, ALint increment, ALsizei *restrict frac_arr, ALint *restrict pos_arr, ALsizei size) +inline void InitiatePositionArrays(ALsizei frac, ALint increment, ALsizei *restrict frac_arr, ALsizei *restrict pos_arr, ALsizei size) { ALsizei i; diff --git a/Alc/mixer/mixer_neon.c b/Alc/mixer/mixer_neon.c index 0b8996fd..ca274b07 100644 --- a/Alc/mixer/mixer_neon.c +++ b/Alc/mixer/mixer_neon.c @@ -17,8 +17,7 @@ const ALfloat *Resample_lerp_Neon(const InterpState* UNUSED(state), const int32x4_t increment4 = vdupq_n_s32(increment*4); const float32x4_t fracOne4 = vdupq_n_f32(1.0f/FRACTIONONE); const int32x4_t fracMask4 = vdupq_n_s32(FRACTIONMASK); - alignas(16) ALint pos_[4]; - alignas(16) ALsizei frac_[4]; + alignas(16) ALsizei pos_[4], frac_[4]; int32x4_t pos4, frac4; ALsizei todo, pos, i; diff --git a/Alc/mixer/mixer_sse2.c b/Alc/mixer/mixer_sse2.c index 629e0ec7..9cbaeb0a 100644 --- a/Alc/mixer/mixer_sse2.c +++ b/Alc/mixer/mixer_sse2.c @@ -34,8 +34,7 @@ const ALfloat *Resample_lerp_SSE2(const InterpState* UNUSED(state), const __m128i increment4 = _mm_set1_epi32(increment*4); const __m128 fracOne4 = _mm_set1_ps(1.0f/FRACTIONONE); const __m128i fracMask4 = _mm_set1_epi32(FRACTIONMASK); - ALint pos_[4]; - ALsizei frac_[4]; + alignas(16) ALsizei pos_[4], frac_[4]; __m128i frac4, pos4; ALsizei todo, pos, i; diff --git a/Alc/mixer/mixer_sse41.c b/Alc/mixer/mixer_sse41.c index 128acadf..e92a3dd0 100644 --- a/Alc/mixer/mixer_sse41.c +++ b/Alc/mixer/mixer_sse41.c @@ -35,8 +35,7 @@ const ALfloat *Resample_lerp_SSE41(const InterpState* UNUSED(state), const __m128i increment4 = _mm_set1_epi32(increment*4); const __m128 fracOne4 = _mm_set1_ps(1.0f/FRACTIONONE); const __m128i fracMask4 = _mm_set1_epi32(FRACTIONMASK); - ALint pos_[4]; - ALsizei frac_[4]; + alignas(16) ALsizei pos_[4], frac_[4]; __m128i frac4, pos4; ALsizei todo, pos, i; diff --git a/Alc/mixvoice.c b/Alc/mixvoice.c index 276d5bd9..a2365886 100644 --- a/Alc/mixvoice.c +++ b/Alc/mixvoice.c @@ -45,7 +45,7 @@ static_assert((INT_MAX>>FRACTIONBITS)/MAX_PITCH > BUFFERSIZE, "MAX_PITCH and/or BUFFERSIZE are too large for FRACTIONBITS!"); -extern inline void InitiatePositionArrays(ALsizei frac, ALint increment, ALsizei *restrict frac_arr, ALint *restrict pos_arr, ALsizei size); +extern inline void InitiatePositionArrays(ALsizei frac, ALint increment, ALsizei *restrict frac_arr, ALsizei *restrict pos_arr, ALsizei size); /* BSinc24 requires up to 23 extra samples before the current position, and 24 after. */ |