diff options
| author | assiduous <assiduous@diligentgraphics.com> | 2021-03-14 02:11:59 +0000 |
|---|---|---|
| committer | assiduous <assiduous@diligentgraphics.com> | 2021-03-19 00:38:22 +0000 |
| commit | 00219a5bdbe63aee3957de193fe640f499f01eb4 (patch) | |
| tree | 5bb5cddda4b76861fe5f0e8d2120f9b085bd2173 /Graphics/GraphicsEngineD3D12 | |
| parent | Direct3D11: added BindPointsD3D11 instead of TBindPoints and TBindPointsAndAc... (diff) | |
| download | DiligentCore-00219a5bdbe63aee3957de193fe640f499f01eb4.tar.gz DiligentCore-00219a5bdbe63aee3957de193fe640f499f01eb4.zip | |
Renamed Align to AlignUp
Diffstat (limited to 'Graphics/GraphicsEngineD3D12')
| -rw-r--r-- | Graphics/GraphicsEngineD3D12/src/D3D12DynamicHeap.cpp | 6 | ||||
| -rw-r--r-- | Graphics/GraphicsEngineD3D12/src/QueryManagerD3D12.cpp | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/Graphics/GraphicsEngineD3D12/src/D3D12DynamicHeap.cpp b/Graphics/GraphicsEngineD3D12/src/D3D12DynamicHeap.cpp index aac0bf87..c6454098 100644 --- a/Graphics/GraphicsEngineD3D12/src/D3D12DynamicHeap.cpp +++ b/Graphics/GraphicsEngineD3D12/src/D3D12DynamicHeap.cpp @@ -197,7 +197,7 @@ D3D12DynamicAllocation D3D12DynamicHeap::Allocate(Uint64 SizeInBytes, Uint64 Ali VERIFY_EXPR(Alignment > 0); VERIFY(IsPowerOfTwo(Alignment), "Alignment (", Alignment, ") must be power of 2"); - if (m_CurrOffset == InvalidOffset || SizeInBytes + (Align(m_CurrOffset, Alignment) - m_CurrOffset) > m_AvailableSize) + if (m_CurrOffset == InvalidOffset || SizeInBytes + (AlignUp(m_CurrOffset, Alignment) - m_CurrOffset) > m_AvailableSize) { auto NewPageSize = m_PageSize; while (NewPageSize < SizeInBytes) @@ -216,9 +216,9 @@ D3D12DynamicAllocation D3D12DynamicHeap::Allocate(Uint64 SizeInBytes, Uint64 Ali } } - if (m_CurrOffset != InvalidOffset && SizeInBytes + (Align(m_CurrOffset, Alignment) - m_CurrOffset) <= m_AvailableSize) + if (m_CurrOffset != InvalidOffset && SizeInBytes + (AlignUp(m_CurrOffset, Alignment) - m_CurrOffset) <= m_AvailableSize) { - auto AlignedOffset = Align(m_CurrOffset, Alignment); + auto AlignedOffset = AlignUp(m_CurrOffset, Alignment); auto AdjustedSize = SizeInBytes + (AlignedOffset - m_CurrOffset); VERIFY_EXPR(AdjustedSize <= m_AvailableSize); m_AvailableSize -= AdjustedSize; diff --git a/Graphics/GraphicsEngineD3D12/src/QueryManagerD3D12.cpp b/Graphics/GraphicsEngineD3D12/src/QueryManagerD3D12.cpp index 8495287f..13a695da 100644 --- a/Graphics/GraphicsEngineD3D12/src/QueryManagerD3D12.cpp +++ b/Graphics/GraphicsEngineD3D12/src/QueryManagerD3D12.cpp @@ -93,7 +93,7 @@ QueryManagerD3D12::QueryManagerD3D12(ID3D12Device* pd3d12Device, // AlignedDestinationBufferOffset must be a multiple of 8 bytes. // https://microsoft.github.io/DirectX-Specs/d3d/CountersAndQueries.html#resolvequerydata - Uint32 AlignedQueryDataSize = Align(GetQueryDataSize(static_cast<QUERY_TYPE>(QueryType)), Uint32{8}); + Uint32 AlignedQueryDataSize = AlignUp(GetQueryDataSize(static_cast<QUERY_TYPE>(QueryType)), Uint32{8}); HeapInfo.AvailableQueries.resize(HeapInfo.HeapSize); HeapInfo.ResolveBufferOffsets.resize(HeapInfo.HeapSize); for (Uint32 i = 0; i < HeapInfo.HeapSize; ++i) |