diff options
| author | Egor Yusov <egor.yusov@gmail.com> | 2019-11-28 18:00:29 +0000 |
|---|---|---|
| committer | Egor Yusov <egor.yusov@gmail.com> | 2019-11-28 18:00:29 +0000 |
| commit | 094e13588e6029354386f31e49b795a7fada6a58 (patch) | |
| tree | f0dd43f74731c1f5ff37699de6d5456026a2fefc /Graphics/GraphicsEngine | |
| parent | Fixed leftover issues from clang-formatting (diff) | |
| download | DiligentCore-094e13588e6029354386f31e49b795a7fada6a58.tar.gz DiligentCore-094e13588e6029354386f31e49b795a7fada6a58.zip | |
Fixed few vector initialization issues
Diffstat (limited to 'Graphics/GraphicsEngine')
| -rw-r--r-- | Graphics/GraphicsEngine/include/RenderDeviceBase.h | 6 | ||||
| -rw-r--r-- | Graphics/GraphicsEngine/include/StateObjectsRegistry.h | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/Graphics/GraphicsEngine/include/RenderDeviceBase.h b/Graphics/GraphicsEngine/include/RenderDeviceBase.h index a9aed5d3..c60af73f 100644 --- a/Graphics/GraphicsEngine/include/RenderDeviceBase.h +++ b/Graphics/GraphicsEngine/include/RenderDeviceBase.h @@ -232,9 +232,9 @@ public: TObjectBase {pRefCounters}, m_pEngineFactory {pEngineFactory}, m_SamplersRegistry {RawMemAllocator, "sampler"}, - m_TextureFormatsInfo {TEX_FORMAT_NUM_FORMATS, TextureFormatInfoExt(), STD_ALLOCATOR_RAW_MEM(TextureFormatInfoExt, RawMemAllocator, "Allocator for vector<TextureFormatInfoExt>")}, - m_TexFmtInfoInitFlags {TEX_FORMAT_NUM_FORMATS, false, STD_ALLOCATOR_RAW_MEM(bool, RawMemAllocator, "Allocator for vector<bool>")}, - m_wpDeferredContexts {NumDeferredContexts, RefCntWeakPtr<IDeviceContext>(), STD_ALLOCATOR_RAW_MEM(RefCntWeakPtr<IDeviceContext>, RawMemAllocator, "Allocator for vector< RefCntWeakPtr<IDeviceContext> >")}, + m_TextureFormatsInfo (TEX_FORMAT_NUM_FORMATS, TextureFormatInfoExt(), STD_ALLOCATOR_RAW_MEM(TextureFormatInfoExt, RawMemAllocator, "Allocator for vector<TextureFormatInfoExt>")), + m_TexFmtInfoInitFlags (TEX_FORMAT_NUM_FORMATS, false, STD_ALLOCATOR_RAW_MEM(bool, RawMemAllocator, "Allocator for vector<bool>")), + m_wpDeferredContexts (NumDeferredContexts, RefCntWeakPtr<IDeviceContext>(), STD_ALLOCATOR_RAW_MEM(RefCntWeakPtr<IDeviceContext>, RawMemAllocator, "Allocator for vector< RefCntWeakPtr<IDeviceContext> >")), m_RawMemAllocator {RawMemAllocator}, m_TexObjAllocator {RawMemAllocator, ObjectSizes.TextureObjSize, 64 }, m_TexViewObjAllocator {RawMemAllocator, ObjectSizes.TexViewObjSize, 64 }, diff --git a/Graphics/GraphicsEngine/include/StateObjectsRegistry.h b/Graphics/GraphicsEngine/include/StateObjectsRegistry.h index f08b95ce..853df9ef 100644 --- a/Graphics/GraphicsEngine/include/StateObjectsRegistry.h +++ b/Graphics/GraphicsEngine/include/StateObjectsRegistry.h @@ -62,7 +62,7 @@ public: static constexpr int DeletedObjectsToPurge = 32; StateObjectsRegistry(IMemoryAllocator& RawAllocator, const Char* RegistryName) : - m_DescToObjHashMap{STD_ALLOCATOR_RAW_MEM(HashMapElem, RawAllocator, "Allocator for unordered_map<ResourceDescType, RefCntWeakPtr<IDeviceObject> >")}, + m_DescToObjHashMap(STD_ALLOCATOR_RAW_MEM(HashMapElem, RawAllocator, "Allocator for unordered_map<ResourceDescType, RefCntWeakPtr<IDeviceObject> >")), m_RegistryName{RegistryName} {} |
