AuroraMiddleware/D3D12MemoryAllocator
1
0
Fork 0
mirror of https://github.com/GPUOpen-LibrariesAndSDKs/D3D12MemoryAllocator.git synced 2024-11-24 21:10:11 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #43 from PixelCatalyst/fix_atomic_initialization

Browse Source 
Use list initialization for atomics
This commit is contained in:
Adam Sawicki 2022-07-18 12:13:15 +02:00 committed by GitHub
commit f0458801c4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/D3D12MemAlloc.h
View File

@ -145,7 +145,7 @@ public:
protected: protected:
virtual void ReleaseThis() { delete this; } virtual void ReleaseThis() { delete this; }
private: private:
D3D12MA_ATOMIC_UINT32 m_RefCount = 1; D3D12MA_ATOMIC_UINT32 m_RefCount = {1};
}; };
} // namespace D3D12MA } // namespace D3D12MA

4
src/D3D12MemAlloc.cpp
View File

@ -6120,7 +6120,7 @@ private:
D3D12MA_ATOMIC_UINT64 m_BlockBytes[DXGI_MEMORY_SEGMENT_GROUP_COUNT] = {}; D3D12MA_ATOMIC_UINT64 m_BlockBytes[DXGI_MEMORY_SEGMENT_GROUP_COUNT] = {};
D3D12MA_ATOMIC_UINT64 m_AllocationBytes[DXGI_MEMORY_SEGMENT_GROUP_COUNT] = {}; D3D12MA_ATOMIC_UINT64 m_AllocationBytes[DXGI_MEMORY_SEGMENT_GROUP_COUNT] = {};
D3D12MA_ATOMIC_UINT32 m_OperationsSinceBudgetFetch = 0; D3D12MA_ATOMIC_UINT32 m_OperationsSinceBudgetFetch = {0};
D3D12MA_RW_MUTEX m_BudgetMutex; D3D12MA_RW_MUTEX m_BudgetMutex;
UINT64 m_D3D12Usage[DXGI_MEMORY_SEGMENT_GROUP_COUNT] = {}; UINT64 m_D3D12Usage[DXGI_MEMORY_SEGMENT_GROUP_COUNT] = {};
UINT64 m_D3D12Budget[DXGI_MEMORY_SEGMENT_GROUP_COUNT] = {}; UINT64 m_D3D12Budget[DXGI_MEMORY_SEGMENT_GROUP_COUNT] = {};
@ -6355,7 +6355,7 @@ class AllocatorPimpl
friend class Allocator; friend class Allocator;
friend class Pool; friend class Pool;
public: public:
std::atomic_uint32_t m_RefCount = 1; std::atomic_uint32_t m_RefCount = {1};
CurrentBudgetData m_Budget; CurrentBudgetData m_Budget;
AllocatorPimpl(const ALLOCATION_CALLBACKS& allocationCallbacks, const ALLOCATOR_DESC& desc); AllocatorPimpl(const ALLOCATION_CALLBACKS& allocationCallbacks, const ALLOCATOR_DESC& desc);