diff options
| author | Egor Yusov <egor.yusov@gmail.com> | 2019-11-28 08:05:10 +0000 |
|---|---|---|
| committer | Egor Yusov <egor.yusov@gmail.com> | 2019-11-28 08:05:10 +0000 |
| commit | bcfcc981ffd4fdfdf3313e90557b3a4782498caa (patch) | |
| tree | 2c89497460f7e7fbd3adfc6b2d56607bf54ae801 /Graphics | |
| parent | Added format validation script stub on Mac (diff) | |
| download | DiligentCore-bcfcc981ffd4fdfdf3313e90557b3a4782498caa.tar.gz DiligentCore-bcfcc981ffd4fdfdf3313e90557b3a4782498caa.zip | |
Fixed leftover issues from clang-formatting
Diffstat (limited to 'Graphics')
| -rw-r--r-- | Graphics/GraphicsEngineD3D12/src/RootSignature.cpp | 2 | ||||
| -rw-r--r-- | Graphics/GraphicsTools/src/TextureUploaderGL.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/Graphics/GraphicsEngineD3D12/src/RootSignature.cpp b/Graphics/GraphicsEngineD3D12/src/RootSignature.cpp index d96194ce..26134228 100644 --- a/Graphics/GraphicsEngineD3D12/src/RootSignature.cpp +++ b/Graphics/GraphicsEngineD3D12/src/RootSignature.cpp @@ -478,7 +478,7 @@ void RootSignature::Finalize(ID3D12Device* pd3d12Device) auto TotalParams = m_RootParams.GetNumRootTables() + m_RootParams.GetNumRootViews(); - std::vector<D3D12_ROOT_PARAMETER, STDAllocatorRawMem<D3D12_ROOT_PARAMETER>> D3D12Parameters{TotalParams, D3D12_ROOT_PARAMETER(), STD_ALLOCATOR_RAW_MEM(D3D12_ROOT_PARAMETER, GetRawAllocator(), "Allocator for vector<D3D12_ROOT_PARAMETER>")}; + std::vector<D3D12_ROOT_PARAMETER, STDAllocatorRawMem<D3D12_ROOT_PARAMETER>> D3D12Parameters(TotalParams, D3D12_ROOT_PARAMETER(), STD_ALLOCATOR_RAW_MEM(D3D12_ROOT_PARAMETER, GetRawAllocator(), "Allocator for vector<D3D12_ROOT_PARAMETER>")); for (Uint32 rt = 0; rt < m_RootParams.GetNumRootTables(); ++rt) { const auto& RootTable = m_RootParams.GetRootTable(rt); diff --git a/Graphics/GraphicsTools/src/TextureUploaderGL.cpp b/Graphics/GraphicsTools/src/TextureUploaderGL.cpp index 2b5c3a7f..359d1a8e 100644 --- a/Graphics/GraphicsTools/src/TextureUploaderGL.cpp +++ b/Graphics/GraphicsTools/src/TextureUploaderGL.cpp @@ -45,8 +45,8 @@ public: UploadBufferGL(IReferenceCounters* pRefCounters, const UploadBufferDesc& Desc) : // clang-format off UploadBufferBase{pRefCounters, Desc}, - m_SubresourceOffsets{Desc.MipLevels * Desc.ArraySize + 1}, - m_SubresourceStrides{Desc.MipLevels * Desc.ArraySize } + m_SubresourceOffsets(Desc.MipLevels * Desc.ArraySize + 1), + m_SubresourceStrides(Desc.MipLevels * Desc.ArraySize ) // clang-format on { const auto& FmtAttribs = GetTextureFormatAttribs(Desc.Format); |