summaryrefslogtreecommitdiffstats
path: root/Graphics/GraphicsEngineVulkan
diff options
context:
space:
mode:
authorEgor Yusov <egor.yusov@gmail.com>2019-11-28 18:00:29 +0000
committerEgor Yusov <egor.yusov@gmail.com>2019-11-28 18:00:29 +0000
commit094e13588e6029354386f31e49b795a7fada6a58 (patch)
treef0dd43f74731c1f5ff37699de6d5456026a2fefc /Graphics/GraphicsEngineVulkan
parentFixed leftover issues from clang-formatting (diff)
downloadDiligentCore-094e13588e6029354386f31e49b795a7fada6a58.tar.gz
DiligentCore-094e13588e6029354386f31e49b795a7fada6a58.zip
Fixed few vector initialization issues
Diffstat (limited to 'Graphics/GraphicsEngineVulkan')
-rw-r--r--Graphics/GraphicsEngineVulkan/include/DescriptorPoolManager.h2
-rw-r--r--Graphics/GraphicsEngineVulkan/include/PipelineLayout.h4
-rw-r--r--Graphics/GraphicsEngineVulkan/include/VulkanDynamicHeap.h2
-rw-r--r--Graphics/GraphicsEngineVulkan/src/BufferVkImpl.cpp4
-rw-r--r--Graphics/GraphicsEngineVulkan/src/CommandPoolManager.cpp2
-rw-r--r--Graphics/GraphicsEngineVulkan/src/PipelineLayout.cpp2
-rw-r--r--Graphics/GraphicsEngineVulkan/src/SwapChainVkImpl.cpp6
7 files changed, 11 insertions, 11 deletions
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<VulkanDynamicAllocation>")}
+ m_DynamicAllocations(STD_ALLOCATOR_RAW_MEM(VulkanDynamicAllocation, GetRawAllocator(), "Allocator for vector<VulkanDynamicAllocation>"))
// 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<VulkanDynamicAllocation>")},
+ m_DynamicAllocations(STD_ALLOCATOR_RAW_MEM(VulkanDynamicAllocation, GetRawAllocator(), "Allocator for vector<VulkanDynamicAllocation>")),
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<VulkanUtilities::CommandPoolWrapper>")}
+ m_CmdPools (STD_ALLOCATOR_RAW_MEM(VulkanUtilities::CommandPoolWrapper, GetRawAllocator(), "Allocator for deque<VulkanUtilities::CommandPoolWrapper>"))
// 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<ITextureView>, GetRawAllocator(), "Allocator for vector<RefCntAutoPtr<ITextureView>>")},
- m_SwapChainImagesInitialized {STD_ALLOCATOR_RAW_MEM(bool, GetRawAllocator(), "Allocator for vector<bool>")},
- m_ImageAcquiredFenceSubmitted{STD_ALLOCATOR_RAW_MEM(bool, GetRawAllocator(), "Allocator for vector<bool>")}
+ m_pBackBufferRTV (STD_ALLOCATOR_RAW_MEM(RefCntAutoPtr<ITextureView>, GetRawAllocator(), "Allocator for vector<RefCntAutoPtr<ITextureView>>")),
+ m_SwapChainImagesInitialized (STD_ALLOCATOR_RAW_MEM(bool, GetRawAllocator(), "Allocator for vector<bool>")),
+ m_ImageAcquiredFenceSubmitted(STD_ALLOCATOR_RAW_MEM(bool, GetRawAllocator(), "Allocator for vector<bool>"))
// clang-format on
{
// Create OS-specific surface