diff options
| author | assiduous <assiduous@diligentgraphics.com> | 2020-12-10 07:22:09 +0000 |
|---|---|---|
| committer | assiduous <assiduous@diligentgraphics.com> | 2020-12-10 07:22:09 +0000 |
| commit | cc96fcf243bbce2a4a8ae619ae7d8769274945c2 (patch) | |
| tree | d1937430ebaa849668e52f16e577a51b3f616916 /AssetLoader/interface | |
| parent | GLTFLoader: fixed variable type/name conflicts (diff) | |
| download | DiligentTools-cc96fcf243bbce2a4a8ae619ae7d8769274945c2.tar.gz DiligentTools-cc96fcf243bbce2a4a8ae619ae7d8769274945c2.zip | |
Fixed clang build errors
Diffstat (limited to 'AssetLoader/interface')
| -rw-r--r-- | AssetLoader/interface/GLTFResourceManager.hpp | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/AssetLoader/interface/GLTFResourceManager.hpp b/AssetLoader/interface/GLTFResourceManager.hpp index db386f1..bd3ea19 100644 --- a/AssetLoader/interface/GLTFResourceManager.hpp +++ b/AssetLoader/interface/GLTFResourceManager.hpp @@ -113,7 +113,7 @@ public: private: template <typename AllocatorType, typename ObjectType> - friend class MakeNewRCObj; + friend class Diligent::MakeNewRCObj; ResourceManager(IReferenceCounters* pRefCounters, IRenderDevice* pDevice, @@ -124,11 +124,13 @@ private: DynamicTextureAtlasCreateInfo m_DefaultAtlasDesc; const std::string m_DefaultAtlasName; - std::mutex m_AtlasesMtx; - std::unordered_map<TEXTURE_FORMAT, RefCntAutoPtr<IDynamicTextureAtlas>> m_Atlases; + using AtlasesHashMapType = std::unordered_map<TEXTURE_FORMAT, RefCntAutoPtr<IDynamicTextureAtlas>, std::hash<Uint32>>; + std::mutex m_AtlasesMtx; + AtlasesHashMapType m_Atlases; - std::mutex m_TexAllocationsMtx; - std::unordered_map<std::string, RefCntWeakPtr<ITextureAtlasSuballocation>> m_TexAllocations; + using TexAllocationsHashMapType = std::unordered_map<std::string, RefCntWeakPtr<ITextureAtlasSuballocation>>; + std::mutex m_TexAllocationsMtx; + TexAllocationsHashMapType m_TexAllocations; std::atomic_uint32_t m_ResourceVersion = {}; }; |
