From 6a9fe1e2c1c06b6bc04c3b78e2a9f69dd7a5ec6e Mon Sep 17 00:00:00 2001 From: Chris Robinson Date: Wed, 6 Apr 2022 17:41:24 -0700 Subject: Rename lerp to avoid conflicts with C++20's std::lerp --- core/mixer/mixer_sse41.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'core/mixer/mixer_sse41.cpp') diff --git a/core/mixer/mixer_sse41.cpp b/core/mixer/mixer_sse41.cpp index 032e5d54..cfedfd65 100644 --- a/core/mixer/mixer_sse41.cpp +++ b/core/mixer/mixer_sse41.cpp @@ -83,7 +83,7 @@ float *Resample_(const InterpState*, float *RESTRICT src, uint frac = static_cast(_mm_cvtsi128_si32(frac4)); do { - *(dst_iter++) = lerp(src[0], src[1], static_cast(frac) * (1.0f/MixerFracOne)); + *(dst_iter++) = lerpf(src[0], src[1], static_cast(frac) * (1.0f/MixerFracOne)); frac += increment; src += frac>>MixerFracBits; -- cgit v1.2.3