diff options
| author | Chris Robinson <[email protected]> | 2022-04-06 17:41:24 -0700 |
|---|---|---|
| committer | Chris Robinson <[email protected]> | 2022-04-06 17:41:24 -0700 |
| commit | 6a9fe1e2c1c06b6bc04c3b78e2a9f69dd7a5ec6e (patch) | |
| tree | a6ffd2560ab4e6b632b2db5f8e6db6de7823d7dd /core/mixer/mixer_neon.cpp | |
| parent | 707f4cca27e096c167e79619642fbe2e872ee4c8 (diff) | |
Rename lerp to avoid conflicts with C++20's std::lerp
Diffstat (limited to 'core/mixer/mixer_neon.cpp')
| -rw-r--r-- | core/mixer/mixer_neon.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/mixer/mixer_neon.cpp b/core/mixer/mixer_neon.cpp index 7b6e5ebf..a3468926 100644 --- a/core/mixer/mixer_neon.cpp +++ b/core/mixer/mixer_neon.cpp @@ -101,7 +101,7 @@ float *Resample_<LerpTag,NEONTag>(const InterpState*, float *RESTRICT src, uint frac = static_cast<uint>(vgetq_lane_s32(frac4, 0)); do { - *(dst_iter++) = lerp(src[0], src[1], static_cast<float>(frac) * (1.0f/MixerFracOne)); + *(dst_iter++) = lerpf(src[0], src[1], static_cast<float>(frac) * (1.0f/MixerFracOne)); frac += increment; src += frac>>MixerFracBits; |