From 00219a5bdbe63aee3957de193fe640f499f01eb4 Mon Sep 17 00:00:00 2001 From: assiduous Date: Sat, 13 Mar 2021 18:11:59 -0800 Subject: Renamed Align to AlignUp --- Graphics/GraphicsTools/src/BufferSuballocator.cpp | 4 ++-- Graphics/GraphicsTools/src/TextureUploaderGL.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'Graphics/GraphicsTools') diff --git a/Graphics/GraphicsTools/src/BufferSuballocator.cpp b/Graphics/GraphicsTools/src/BufferSuballocator.cpp index 2c5d60cd..2913e4ed 100644 --- a/Graphics/GraphicsTools/src/BufferSuballocator.cpp +++ b/Graphics/GraphicsTools/src/BufferSuballocator.cpp @@ -176,7 +176,7 @@ public: while (!Subregion.IsValid()) { auto ExtraSize = m_ExpansionSize != 0 ? - std::max(m_ExpansionSize, Align(Size, Alignment)) : + std::max(m_ExpansionSize, AlignUp(Size, Alignment)) : m_Mgr.GetMaxSize(); m_Mgr.Extend(ExtraSize); @@ -189,7 +189,7 @@ public: NEW_RC_OBJ(m_SuballocationsAllocator, "BufferSuballocationImpl instance", BufferSuballocationImpl) ( this, - Align(static_cast(Subregion.UnalignedOffset), Alignment), + AlignUp(static_cast(Subregion.UnalignedOffset), Alignment), Size, std::move(Subregion) ) diff --git a/Graphics/GraphicsTools/src/TextureUploaderGL.cpp b/Graphics/GraphicsTools/src/TextureUploaderGL.cpp index 0fabd561..de9df6db 100644 --- a/Graphics/GraphicsTools/src/TextureUploaderGL.cpp +++ b/Graphics/GraphicsTools/src/TextureUploaderGL.cpp @@ -66,7 +66,7 @@ public: { auto MipProps = GetMipLevelProperties(TexDesc, Mip); // Stride must be 32-bit aligned in OpenGL - auto RowStride = Align(MipProps.RowSize, Uint32{4}); + auto RowStride = AlignUp(MipProps.RowSize, Uint32{4}); m_SubresourceStrides[SubRes] = RowStride; auto MipSize = MipProps.StorageHeight * RowStride; -- cgit v1.2.3