diff --git a/include/LLGL/Container/SmallVector.h b/include/LLGL/Container/SmallVector.h index 7e7d66029a..18128a2bc2 100644 --- a/include/LLGL/Container/SmallVector.h +++ b/include/LLGL/Container/SmallVector.h @@ -373,14 +373,16 @@ class LLGL_EXPORT SmallVector { if (size_ == cap_) realloc(GrowStrategy::Grow(size_ + 1)); - Allocator{}.construct(end(), value); + Allocator alloc; + std::allocator_traits::construct(alloc, end(), value); ++size_; } void push_back(value_type&& value) { reserve(size() + 1); - Allocator{}.construct(end(), std::forward(value)); + Allocator alloc; + std::allocator_traits::construct(alloc, end(), std::forward(value)); ++size_; } @@ -646,7 +648,7 @@ class LLGL_EXPORT SmallVector { Allocator alloc; for (; from != to; ++from) - alloc.destroy(from); + std::allocator_traits::destroy(alloc, from); } template @@ -654,7 +656,7 @@ class LLGL_EXPORT SmallVector { Allocator alloc; for (; from != to; ++from) - alloc.construct(from, std::forward(args)...); + std::allocator_traits::construct(alloc, from, std::forward(args)...); } template @@ -662,7 +664,7 @@ class LLGL_EXPORT SmallVector { Allocator alloc; for (pointer p = pos; from != to; ++from, ++p) - alloc.construct(p, *from); + std::allocator_traits::construct(alloc, p, *from); } template @@ -730,8 +732,8 @@ class LLGL_EXPORT SmallVector for (; from != to; ++from, ++dst) { /* Copy element from current position 'from' to destination 'dst' and destroy the old one */ - alloc.construct(dst, *from); - alloc.destroy(from); + std::allocator_traits::construct(alloc, dst, *from); + std::allocator_traits::destroy(alloc, from); } } @@ -743,8 +745,8 @@ class LLGL_EXPORT SmallVector for (auto rfrom = reverse_iterator{ to }, rto = reverse_iterator{ from }; rfrom != rto; ++rfrom, ++rdst) { /* Copy element from current position 'from' to destination 'dst' and destroy the old one */ - alloc.construct(&(*rdst), *rfrom); - alloc.destroy(&(*rfrom)); + std::allocator_traits::construct(alloc, &(*rdst), *rfrom); + std::allocator_traits::destroy(alloc, &(*rfrom)); } } diff --git a/sources/Renderer/Direct3D11/D3D11CommandBuffer.cpp b/sources/Renderer/Direct3D11/D3D11CommandBuffer.cpp index f8afe6b6c3..703440ad34 100644 --- a/sources/Renderer/Direct3D11/D3D11CommandBuffer.cpp +++ b/sources/Renderer/Direct3D11/D3D11CommandBuffer.cpp @@ -125,6 +125,10 @@ void D3D11CommandBuffer::CopyBuffer( { auto& dstBufferD3D = LLGL_CAST(D3D11Buffer&, dstBuffer); auto& srcBufferD3D = LLGL_CAST(D3D11Buffer&, srcBuffer); + CD3D11_BOX box = CD3D11_BOX( + static_cast(srcOffset), 0, 0, + static_cast(srcOffset + size), 1, 1 + ); context_->CopySubresourceRegion( dstBufferD3D.GetNative(), // pDstResource @@ -134,10 +138,7 @@ void D3D11CommandBuffer::CopyBuffer( 0, // DstZ srcBufferD3D.GetNative(), // pSrcResource 0, // SrcSubresource - &CD3D11_BOX( // pSrcBox - static_cast(srcOffset), 0, 0, - static_cast(srcOffset + size), 1, 1 - ) + &box // pSrcBox ); } diff --git a/sources/Renderer/Direct3D12/Shader/D3D12RootParameter.cpp b/sources/Renderer/Direct3D12/Shader/D3D12RootParameter.cpp index f2d7ee4336..68877c17bc 100644 --- a/sources/Renderer/Direct3D12/Shader/D3D12RootParameter.cpp +++ b/sources/Renderer/Direct3D12/Shader/D3D12RootParameter.cpp @@ -13,7 +13,6 @@ namespace LLGL { - D3D12RootParameter::D3D12RootParameter(D3D12_ROOT_PARAMETER* managedRootParam) : managedRootParam_ { managedRootParam } { diff --git a/sources/Renderer/Direct3D12/Shader/D3D12RootParameter.h b/sources/Renderer/Direct3D12/Shader/D3D12RootParameter.h index b6c757c824..d1ceb365a5 100644 --- a/sources/Renderer/Direct3D12/Shader/D3D12RootParameter.h +++ b/sources/Renderer/Direct3D12/Shader/D3D12RootParameter.h @@ -25,7 +25,7 @@ class D3D12RootParameter { public: - + D3D12RootParameter() = default; D3D12RootParameter(D3D12_ROOT_PARAMETER* managedRootParam); D3D12RootParameter(const D3D12RootParameter&) = default;