aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Robinson <[email protected]>2022-04-24 22:32:59 -0700
committerChris Robinson <[email protected]>2022-04-25 17:32:20 -0700
commit5038ba4d6ba42a777a2bec8780a53e39db028474 (patch)
treee459262d320ffb0d2482b6e423c4b46eae717854
parent2ea5bb91686ee1a7350672bf15b7b63649dbf111 (diff)
Clean up some case spaghetti
-rw-r--r--alc/alu.cpp23
1 files changed, 10 insertions, 13 deletions
diff --git a/alc/alu.cpp b/alc/alu.cpp
index ef885152..50603589 100644
--- a/alc/alu.cpp
+++ b/alc/alu.cpp
@@ -135,9 +135,6 @@ float XScale{1.0f};
float YScale{1.0f};
float ZScale{1.0f};
-} // namespace
-
-namespace {
struct ChanMap {
Channel channel;
@@ -213,30 +210,30 @@ inline ResamplerFunc SelectResampler(Resampler resampler, uint increment)
return Resample_<CubicTag,CTag>;
case Resampler::BSinc12:
case Resampler::BSinc24:
- if(increment <= MixerFracOne)
+ if(increment > MixerFracOne)
{
- /* fall-through */
- case Resampler::FastBSinc12:
- case Resampler::FastBSinc24:
#ifdef HAVE_NEON
if((CPUCapFlags&CPU_CAP_NEON))
- return Resample_<FastBSincTag,NEONTag>;
+ return Resample_<BSincTag,NEONTag>;
#endif
#ifdef HAVE_SSE
if((CPUCapFlags&CPU_CAP_SSE))
- return Resample_<FastBSincTag,SSETag>;
+ return Resample_<BSincTag,SSETag>;
#endif
- return Resample_<FastBSincTag,CTag>;
+ return Resample_<BSincTag,CTag>;
}
+ /* fall-through */
+ case Resampler::FastBSinc12:
+ case Resampler::FastBSinc24:
#ifdef HAVE_NEON
if((CPUCapFlags&CPU_CAP_NEON))
- return Resample_<BSincTag,NEONTag>;
+ return Resample_<FastBSincTag,NEONTag>;
#endif
#ifdef HAVE_SSE
if((CPUCapFlags&CPU_CAP_SSE))
- return Resample_<BSincTag,SSETag>;
+ return Resample_<FastBSincTag,SSETag>;
#endif
- return Resample_<BSincTag,CTag>;
+ return Resample_<FastBSincTag,CTag>;
}
return Resample_<PointTag,CTag>;