From 0cba99ed1bc2712c15c17f0940127e6f84395729 Mon Sep 17 00:00:00 2001
From: Chris Robinson <chris.kcat@gmail.com>
Date: Fri, 25 Oct 2019 01:43:23 -0700
Subject: Avoid static constexpr for arrays iterated over at run-time

---
 alc/hrtf.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'alc/hrtf.cpp')

diff --git a/alc/hrtf.cpp b/alc/hrtf.cpp
index fa0085ff..c22848d6 100644
--- a/alc/hrtf.cpp
+++ b/alc/hrtf.cpp
@@ -300,7 +300,7 @@ void BuildBFormatHrtf(const HrtfEntry *Hrtf, DirectHrtfState *state,
         ALuint ldelay, rdelay;
     };
 
-    static constexpr int OrderFromChan[MAX_AMBI_CHANNELS]{
+    static const int OrderFromChan[MAX_AMBI_CHANNELS]{
         0, 1,1,1, 2,2,2,2,2, 3,3,3,3,3,3,3,
     };
     /* Set this to true for dual-band HRTF processing. May require better
@@ -718,7 +718,7 @@ std::unique_ptr<HrtfEntry> LoadHrtf00(std::istream &data, const char *filename)
         }
     }
 
-    static constexpr ALfloat distance{0.0f};
+    static const ALfloat distance{0.0f};
     return CreateHrtfStore(rate, irSize, 1, &evCount, &distance, azCount.data(), evOffset.data(),
         irCount, &reinterpret_cast<ALfloat(&)[2]>(coeffs[0]),
         &reinterpret_cast<ALubyte(&)[2]>(delays[0]), filename);
@@ -817,7 +817,7 @@ std::unique_ptr<HrtfEntry> LoadHrtf01(std::istream &data, const char *filename)
         }
     }
 
-    static constexpr ALfloat distance{0.0f};
+    static const ALfloat distance{0.0f};
     return CreateHrtfStore(rate, irSize, 1, &evCount, &distance, azCount.data(), evOffset.data(),
         irCount, &reinterpret_cast<ALfloat(&)[2]>(coeffs[0]),
         &reinterpret_cast<ALubyte(&)[2]>(delays[0]), filename);
-- 
cgit v1.2.3