From 094e13588e6029354386f31e49b795a7fada6a58 Mon Sep 17 00:00:00 2001 From: Egor Yusov Date: Thu, 28 Nov 2019 10:00:29 -0800 Subject: Fixed few vector initialization issues --- Graphics/GraphicsEngine/include/RenderDeviceBase.h | 6 +++--- Graphics/GraphicsEngine/include/StateObjectsRegistry.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'Graphics/GraphicsEngine') 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")}, - m_TexFmtInfoInitFlags {TEX_FORMAT_NUM_FORMATS, false, STD_ALLOCATOR_RAW_MEM(bool, RawMemAllocator, "Allocator for vector")}, - m_wpDeferredContexts {NumDeferredContexts, RefCntWeakPtr(), STD_ALLOCATOR_RAW_MEM(RefCntWeakPtr, RawMemAllocator, "Allocator for vector< RefCntWeakPtr >")}, + m_TextureFormatsInfo (TEX_FORMAT_NUM_FORMATS, TextureFormatInfoExt(), STD_ALLOCATOR_RAW_MEM(TextureFormatInfoExt, RawMemAllocator, "Allocator for vector")), + m_TexFmtInfoInitFlags (TEX_FORMAT_NUM_FORMATS, false, STD_ALLOCATOR_RAW_MEM(bool, RawMemAllocator, "Allocator for vector")), + m_wpDeferredContexts (NumDeferredContexts, RefCntWeakPtr(), STD_ALLOCATOR_RAW_MEM(RefCntWeakPtr, RawMemAllocator, "Allocator for vector< RefCntWeakPtr >")), 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 >")}, + m_DescToObjHashMap(STD_ALLOCATOR_RAW_MEM(HashMapElem, RawAllocator, "Allocator for unordered_map >")), m_RegistryName{RegistryName} {} -- cgit v1.2.3