Dima353/openal-soft
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Be more consistent with size_t

Browse Source
This commit is contained in:
Chris Robinson
2020-12-12 20:21:56 -08:00
parent bb597546e1
commit 225d42538d
4 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/mixer/hrtfbase.h
+3 -3
View File
@@ -11,11 +11,11 @@
using uint = unsigned int; using uint = unsigned int;
using ApplyCoeffsT = void(&)(float2 *RESTRICT Values, const uint_fast32_t irSize, using ApplyCoeffsT = void(&)(float2 *RESTRICT Values, const size_t irSize,
const HrirArray &Coeffs, const float left, const float right); const HrirArray &Coeffs, const float left, const float right);
template<ApplyCoeffsT ApplyCoeffs> template<ApplyCoeffsT ApplyCoeffs>
inline void MixHrtfBase(const float *InSamples, float2 *RESTRICT AccumSamples, const uint IrSize, inline void MixHrtfBase(const float *InSamples, float2 *RESTRICT AccumSamples, const size_t IrSize,
const MixHrtfFilter *hrtfparams, const size_t BufferSize) const MixHrtfFilter *hrtfparams, const size_t BufferSize)
{ {
ASSUME(BufferSize > 0); ASSUME(BufferSize > 0);
@@ -40,7 +40,7 @@ inline void MixHrtfBase(const float *InSamples, float2 *RESTRICT AccumSamples, c
template<ApplyCoeffsT ApplyCoeffs> template<ApplyCoeffsT ApplyCoeffs>
inline void MixHrtfBlendBase(const float *InSamples, float2 *RESTRICT AccumSamples, inline void MixHrtfBlendBase(const float *InSamples, float2 *RESTRICT AccumSamples,
const uint IrSize, const HrtfFilter *oldparams, const MixHrtfFilter *newparams, const size_t IrSize, const HrtfFilter *oldparams, const MixHrtfFilter *newparams,
const size_t BufferSize) const size_t BufferSize)
{ {
ASSUME(BufferSize > 0); ASSUME(BufferSize > 0);
core/mixer/mixer_c.cpp
+2 -2
View File
@@ -83,8 +83,8 @@ const float *DoResample(const InterpState *state, const float *RESTRICT src, uin
return dst.data(); return dst.data();
} }
inline void ApplyCoeffs(float2 *RESTRICT Values, const uint_fast32_t IrSize, inline void ApplyCoeffs(float2 *RESTRICT Values, const size_t IrSize, const HrirArray &Coeffs,
const HrirArray &Coeffs, const float left, const float right) const float left, const float right)
{ {
ASSUME(IrSize >= MIN_IR_LENGTH); ASSUME(IrSize >= MIN_IR_LENGTH);
for(size_t c{0};c < IrSize;++c) for(size_t c{0};c < IrSize;++c)
core/mixer/mixer_neon.cpp
+2 -2
View File
@@ -31,8 +31,8 @@ inline float32x4_t set_f4(float l0, float l1, float l2, float l3)
constexpr uint FracPhaseBitDiff{MixerFracBits - BSincPhaseBits}; constexpr uint FracPhaseBitDiff{MixerFracBits - BSincPhaseBits};
constexpr uint FracPhaseDiffOne{1 << FracPhaseBitDiff}; constexpr uint FracPhaseDiffOne{1 << FracPhaseBitDiff};
inline void ApplyCoeffs(float2 *RESTRICT Values, const uint_fast32_t IrSize, inline void ApplyCoeffs(float2 *RESTRICT Values, const size_t IrSize, const HrirArray &Coeffs,
const HrirArray &Coeffs, const float left, const float right) const float left, const float right)
{ {
float32x4_t leftright4; float32x4_t leftright4;
{ {
core/mixer/mixer_sse.cpp
+3 -3
View File
@@ -22,8 +22,8 @@ constexpr uint FracPhaseDiffOne{1 << FracPhaseBitDiff};
#define MLA4(x, y, z) _mm_add_ps(x, _mm_mul_ps(y, z)) #define MLA4(x, y, z) _mm_add_ps(x, _mm_mul_ps(y, z))
inline void ApplyCoeffs(float2 *RESTRICT Values, const uint_fast32_t IrSize, inline void ApplyCoeffs(float2 *RESTRICT Values, const size_t IrSize, const HrirArray &Coeffs,
const HrirArray &Coeffs, const float left, const float right) const float left, const float right)
{ {
const __m128 lrlr{_mm_setr_ps(left, right, left, right)}; const __m128 lrlr{_mm_setr_ps(left, right, left, right)};
@@ -40,7 +40,7 @@ inline void ApplyCoeffs(float2 *RESTRICT Values, const uint_fast32_t IrSize,
imp0 = _mm_mul_ps(lrlr, coeffs); imp0 = _mm_mul_ps(lrlr, coeffs);
vals = _mm_add_ps(imp0, vals); vals = _mm_add_ps(imp0, vals);
_mm_storel_pi(reinterpret_cast<__m64*>(&Values[0][0]), vals); _mm_storel_pi(reinterpret_cast<__m64*>(&Values[0][0]), vals);
uint_fast32_t td{((IrSize+1)>>1) - 1}; size_t td{((IrSize+1)>>1) - 1};
size_t i{1}; size_t i{1};
do { do {
coeffs = _mm_load_ps(&Coeffs[i+1][0]); coeffs = _mm_load_ps(&Coeffs[i+1][0]);