3 files changed, 30 insertions, 0 deletions
diff --git a/core/context.cpp b/core/context.cpp
index 39fd8522..111802d9 100644
--- a/core/context.cpp
+++ b/core/context.cpp
@@ -136,3 +136,24 @@ void ContextBase::allocVoices(size_t addcount)
         delete oldvoices;
     }
 }
+
+
+EffectSlot *ContextBase::getEffectSlot()
+{
+    for(auto& cluster : mEffectSlotClusters)
+    {
+        for(size_t i{0};i < EffectSlotClusterSize;++i)
+        {
+            if(!cluster[i].InUse)
+                return &cluster[i];
+        }
+    }
+
+    if(1 >= std::numeric_limits<int>::max()/EffectSlotClusterSize - mEffectSlotClusters.size())
+        throw std::runtime_error{"Allocating too many effect slots"};
+    const size_t totalcount{(mEffectSlotClusters.size()+1) * EffectSlotClusterSize};
+    TRACE("Increasing allocated effect slots to %zu\n", totalcount);
+
+    mEffectSlotClusters.emplace_back(std::make_unique<EffectSlot[]>(EffectSlotClusterSize));
+    return getEffectSlot();
+}
diff --git a/core/context.h b/core/context.h
index f5768629..d2e6b546 100644
--- a/core/context.h
+++ b/core/context.h
@@ -163,6 +163,13 @@ struct ContextBase {
     al::vector<VoicePropsCluster> mVoicePropClusters;
 
 
+    static constexpr size_t EffectSlotClusterSize{4};
+    EffectSlot *getEffectSlot();
+
+    using EffectSlotCluster = std::unique_ptr<EffectSlot[]>;
+    al::vector<EffectSlotCluster> mEffectSlotClusters;
+
+
     ContextBase(DeviceBase *device);
     ContextBase(const ContextBase&) = delete;
     ContextBase& operator=(const ContextBase&) = delete;
diff --git a/core/effectslot.h b/core/effectslot.h
index 92fd1961..2470326d 100644
--- a/core/effectslot.h
+++ b/core/effectslot.h
@@ -51,6 +51,8 @@ struct EffectSlotProps {
 
 
 struct EffectSlot {
+    bool InUse{false};
+
     std::atomic<EffectSlotProps*> Update{nullptr};
 
     /* Wet buffer configuration is ACN channel order with N3D scaling.