diff options
Diffstat (limited to 'Alc')
| -rw-r--r-- | Alc/alc.cpp | 10 | ||||
| -rw-r--r-- | Alc/alcontext.h | 10 |
2 files changed, 15 insertions, 5 deletions
diff --git a/Alc/alc.cpp b/Alc/alc.cpp index ec7af970..9919d011 100644 --- a/Alc/alc.cpp +++ b/Alc/alc.cpp @@ -2598,11 +2598,11 @@ ALCcontext_struct::~ALCcontext_struct() al_free(ActiveAuxSlots.exchange(nullptr, std::memory_order_relaxed)); DefaultSlot = nullptr; - ReleaseALSources(this); - std::for_each(SourceList.begin(), SourceList.end(), - [](const SourceSubList &entry) noexcept -> void - { al_free(entry.Sources); } - ); + count = 0; + for(auto &sublist : SourceList) + count += POPCNT64(~sublist.FreeMask); + if(count > 0) + WARN(SZFMT " Source%s not deleted\n", count, (count==1)?"":"s"); SourceList.clear(); NumSources = 0; almtx_destroy(&SourceLock); diff --git a/Alc/alcontext.h b/Alc/alcontext.h index b1bbd1af..c6824d78 100644 --- a/Alc/alcontext.h +++ b/Alc/alcontext.h @@ -44,6 +44,16 @@ enum class DistanceModel { struct SourceSubList { uint64_t FreeMask{~uint64_t{}}; ALsource *Sources{nullptr}; /* 64 */ + + SourceSubList() noexcept = default; + SourceSubList(const SourceSubList&) = delete; + SourceSubList(SourceSubList&& rhs) noexcept : FreeMask{rhs.FreeMask}, Sources{rhs.Sources} + { rhs.FreeMask = ~uint64_t{}; rhs.Sources = nullptr; } + ~SourceSubList(); + + SourceSubList& operator=(const SourceSubList&) = delete; + SourceSubList& operator=(SourceSubList&& rhs) noexcept + { std::swap(FreeMask, rhs.FreeMask); std::swap(Sources, rhs.Sources); return *this; } }; /* Effect slots are rather large, and apps aren't likely to have more than one |