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/GraphicsEngineVulkan/include/DescriptorPoolManager.h | 2 +- Graphics/GraphicsEngineVulkan/include/PipelineLayout.h | 4 ++-- Graphics/GraphicsEngineVulkan/include/VulkanDynamicHeap.h | 2 +- Graphics/GraphicsEngineVulkan/src/BufferVkImpl.cpp | 4 ++-- Graphics/GraphicsEngineVulkan/src/CommandPoolManager.cpp | 2 +- Graphics/GraphicsEngineVulkan/src/PipelineLayout.cpp | 2 +- Graphics/GraphicsEngineVulkan/src/SwapChainVkImpl.cpp | 6 +++--- 7 files changed, 11 insertions(+), 11 deletions(-) (limited to 'Graphics/GraphicsEngineVulkan') diff --git a/Graphics/GraphicsEngineVulkan/include/DescriptorPoolManager.h b/Graphics/GraphicsEngineVulkan/include/DescriptorPoolManager.h index 00b4e62c..3152ff5b 100644 --- a/Graphics/GraphicsEngineVulkan/include/DescriptorPoolManager.h +++ b/Graphics/GraphicsEngineVulkan/include/DescriptorPoolManager.h @@ -136,7 +136,7 @@ public: bool AllowFreeing) noexcept: m_DeviceVkImpl{DeviceVkImpl }, m_PoolName {std::move(PoolName) }, - m_PoolSizes {std::move(PoolSizes)}, + m_PoolSizes (std::move(PoolSizes)), m_MaxSets {MaxSets }, m_AllowFreeing{AllowFreeing } { diff --git a/Graphics/GraphicsEngineVulkan/include/PipelineLayout.h b/Graphics/GraphicsEngineVulkan/include/PipelineLayout.h index 93210f5b..467f9658 100644 --- a/Graphics/GraphicsEngineVulkan/include/PipelineLayout.h +++ b/Graphics/GraphicsEngineVulkan/include/PipelineLayout.h @@ -103,8 +103,8 @@ public: #endif DescriptorSetBindInfo() : // clang-format off - vkSets {2}, - DynamicOffsets{64} + vkSets (2), + DynamicOffsets(64) // clang-format on { } diff --git a/Graphics/GraphicsEngineVulkan/include/VulkanDynamicHeap.h b/Graphics/GraphicsEngineVulkan/include/VulkanDynamicHeap.h index 4008da54..f08d8968 100644 --- a/Graphics/GraphicsEngineVulkan/include/VulkanDynamicHeap.h +++ b/Graphics/GraphicsEngineVulkan/include/VulkanDynamicHeap.h @@ -182,7 +182,7 @@ public: VulkanDynamicHeap(VulkanDynamicMemoryManager& DynamicMemMgr, std::string HeapName, Uint32 PageSize) : m_GlobalDynamicMemMgr{DynamicMemMgr}, m_HeapName {std::move(HeapName)}, - m_MasterBlockSize {PageSize} + m_MasterBlockSize (PageSize) {} VulkanDynamicHeap (const VulkanDynamicHeap&) = delete; diff --git a/Graphics/GraphicsEngineVulkan/src/BufferVkImpl.cpp b/Graphics/GraphicsEngineVulkan/src/BufferVkImpl.cpp index 3a878440..4b34ca5f 100644 --- a/Graphics/GraphicsEngineVulkan/src/BufferVkImpl.cpp +++ b/Graphics/GraphicsEngineVulkan/src/BufferVkImpl.cpp @@ -50,7 +50,7 @@ BufferVkImpl::BufferVkImpl(IReferenceCounters* pRefCounters, BuffDesc, false }, - m_DynamicAllocations{STD_ALLOCATOR_RAW_MEM(VulkanDynamicAllocation, GetRawAllocator(), "Allocator for vector")} + m_DynamicAllocations(STD_ALLOCATOR_RAW_MEM(VulkanDynamicAllocation, GetRawAllocator(), "Allocator for vector")) // clang-format on { #define LOG_BUFFER_ERROR_AND_THROW(...) LOG_ERROR_AND_THROW("Buffer \"", BuffDesc.Name ? BuffDesc.Name : "", "\": ", ##__VA_ARGS__) @@ -299,7 +299,7 @@ BufferVkImpl::BufferVkImpl(IReferenceCounters* pRefCounters, BuffDesc, false }, - m_DynamicAllocations{STD_ALLOCATOR_RAW_MEM(VulkanDynamicAllocation, GetRawAllocator(), "Allocator for vector")}, + m_DynamicAllocations(STD_ALLOCATOR_RAW_MEM(VulkanDynamicAllocation, GetRawAllocator(), "Allocator for vector")), m_VulkanBuffer{vkBuffer} // clang-format on { diff --git a/Graphics/GraphicsEngineVulkan/src/CommandPoolManager.cpp b/Graphics/GraphicsEngineVulkan/src/CommandPoolManager.cpp index fbe0caab..19d16c66 100644 --- a/Graphics/GraphicsEngineVulkan/src/CommandPoolManager.cpp +++ b/Graphics/GraphicsEngineVulkan/src/CommandPoolManager.cpp @@ -37,7 +37,7 @@ CommandPoolManager::CommandPoolManager(RenderDeviceVkImpl& DeviceVkImpl, m_Name {std::move(Name) }, m_QueueFamilyIndex{queueFamilyIndex }, m_CmdPoolFlags {flags }, - m_CmdPools {STD_ALLOCATOR_RAW_MEM(VulkanUtilities::CommandPoolWrapper, GetRawAllocator(), "Allocator for deque")} + m_CmdPools (STD_ALLOCATOR_RAW_MEM(VulkanUtilities::CommandPoolWrapper, GetRawAllocator(), "Allocator for deque")) // clang-format on { #ifdef DEVELOPMENT diff --git a/Graphics/GraphicsEngineVulkan/src/PipelineLayout.cpp b/Graphics/GraphicsEngineVulkan/src/PipelineLayout.cpp index cda19a9a..9651718e 100644 --- a/Graphics/GraphicsEngineVulkan/src/PipelineLayout.cpp +++ b/Graphics/GraphicsEngineVulkan/src/PipelineLayout.cpp @@ -90,7 +90,7 @@ VkDescriptorType PipelineLayout::GetVkDescriptorType(const SPIRVShaderResourceAt PipelineLayout::DescriptorSetLayoutManager::DescriptorSetLayoutManager(IMemoryAllocator& MemAllocator) : m_MemAllocator{MemAllocator}, - m_LayoutBindings{STD_ALLOCATOR_RAW_MEM(VkDescriptorSetLayoutBinding, MemAllocator, "Allocator for Layout Bindings")} + m_LayoutBindings(STD_ALLOCATOR_RAW_MEM(VkDescriptorSetLayoutBinding, MemAllocator, "Allocator for Layout Bindings")) {} diff --git a/Graphics/GraphicsEngineVulkan/src/SwapChainVkImpl.cpp b/Graphics/GraphicsEngineVulkan/src/SwapChainVkImpl.cpp index f63504ca..09905e5f 100644 --- a/Graphics/GraphicsEngineVulkan/src/SwapChainVkImpl.cpp +++ b/Graphics/GraphicsEngineVulkan/src/SwapChainVkImpl.cpp @@ -40,9 +40,9 @@ SwapChainVkImpl::SwapChainVkImpl(IReferenceCounters* pRefCounters, // clang-format off TSwapChainBase {pRefCounters, pRenderDeviceVk, pDeviceContextVk, SCDesc}, m_VulkanInstance {pRenderDeviceVk->GetVulkanInstance()}, - m_pBackBufferRTV {STD_ALLOCATOR_RAW_MEM(RefCntAutoPtr, GetRawAllocator(), "Allocator for vector>")}, - m_SwapChainImagesInitialized {STD_ALLOCATOR_RAW_MEM(bool, GetRawAllocator(), "Allocator for vector")}, - m_ImageAcquiredFenceSubmitted{STD_ALLOCATOR_RAW_MEM(bool, GetRawAllocator(), "Allocator for vector")} + m_pBackBufferRTV (STD_ALLOCATOR_RAW_MEM(RefCntAutoPtr, GetRawAllocator(), "Allocator for vector>")), + m_SwapChainImagesInitialized (STD_ALLOCATOR_RAW_MEM(bool, GetRawAllocator(), "Allocator for vector")), + m_ImageAcquiredFenceSubmitted(STD_ALLOCATOR_RAW_MEM(bool, GetRawAllocator(), "Allocator for vector")) // clang-format on { // Create OS-specific surface -- cgit v1.2.3