aboutsummaryrefslogtreecommitdiffstats
path: root/alc/mixer/mixer_neon.cpp
diff options
context:
space:
mode:
authorChris Robinson <[email protected]>2019-09-16 07:16:31 -0700
committerChris Robinson <[email protected]>2019-09-16 07:16:31 -0700
commitbf2c865d3953370ccf9d56e7a5dc6d2d4c587be1 (patch)
treebf9dd4ec305dfc61dd5d899d883453e94f0612f3 /alc/mixer/mixer_neon.cpp
parente16e2269b6a18c960a25d58f43ffad5ed408bee9 (diff)
Clean up some more shadowing warnings
Diffstat (limited to 'alc/mixer/mixer_neon.cpp')
-rw-r--r--alc/mixer/mixer_neon.cpp12
1 files changed, 7 insertions, 5 deletions
diff --git a/alc/mixer/mixer_neon.cpp b/alc/mixer/mixer_neon.cpp
index 2f11273a..e7313876 100644
--- a/alc/mixer/mixer_neon.cpp
+++ b/alc/mixer/mixer_neon.cpp
@@ -262,7 +262,7 @@ void MixRow_<NEONTag>(const al::span<float> OutBuffer, const al::span<const floa
{
for(const ALfloat gain : Gains)
{
- const ALfloat *RESTRICT src{InSamples};
+ const ALfloat *RESTRICT intput{InSamples};
InSamples += InStride;
if(!(std::fabs(gain) > GAIN_SILENCE_THRESHOLD))
@@ -273,14 +273,16 @@ void MixRow_<NEONTag>(const al::span<float> OutBuffer, const al::span<const floa
{
const float32x4_t gain4{vdupq_n_f32(gain)};
do {
- const float32x4_t val4 = vld1q_f32(src);
+ const float32x4_t val4 = vld1q_f32(intput);
float32x4_t dry4 = vld1q_f32(out_iter);
dry4 = vmlaq_f32(dry4, val4, gain4);
vst1q_f32(out_iter, dry4);
- out_iter += 4; src += 4;
+ out_iter += 4; intput += 4;
} while(--todo);
}
- std::transform(out_iter, OutBuffer.end(), src, out_iter,
- [gain](const ALfloat cur, const ALfloat src) -> ALfloat { return cur + src*gain; });
+
+ auto do_mix = [gain](const float cur, const float src) noexcept -> float
+ { return cur + src*gain; };
+ std::transform(out_iter, OutBuffer.end(), input, out_iter, do_mix);
}
}