Fixed coding style
diff --git a/src/D3D12MemAlloc.cpp b/src/D3D12MemAlloc.cpp
index 7da729a..d0d9c83 100644
--- a/src/D3D12MemAlloc.cpp
+++ b/src/D3D12MemAlloc.cpp
@@ -5631,7 +5631,7 @@
HRESULT VirtualBlock::Allocate(const VIRTUAL_ALLOCATION_DESC* pDesc, UINT64* pOffset)
{
- if(!pDesc || !pOffset || pDesc->size == 0 || !IsPow2(pDesc->alignment))
+ if(!pDesc || !pOffset || pDesc->Size == 0 || !IsPow2(pDesc->Alignment))
{
D3D12MA_ASSERT(0 && "Invalid arguments passed to VirtualBlock::Allocate.");
return E_INVALIDARG;
@@ -5641,11 +5641,11 @@
D3D12MA_DEBUG_GLOBAL_MUTEX_LOCK
- const UINT64 alignment = pDesc->alignment != 0 ? pDesc->alignment : 1;
+ const UINT64 alignment = pDesc->Alignment != 0 ? pDesc->Alignment : 1;
AllocationRequest allocRequest = {};
- if(m_Pimpl->m_Metadata.CreateAllocationRequest(pDesc->size, alignment, &allocRequest))
+ if(m_Pimpl->m_Metadata.CreateAllocationRequest(pDesc->Size, alignment, &allocRequest))
{
- m_Pimpl->m_Metadata.Alloc(allocRequest, pDesc->size, pDesc->pUserData);
+ m_Pimpl->m_Metadata.Alloc(allocRequest, pDesc->Size, pDesc->pUserData);
D3D12MA_HEAVY_ASSERT(m_Pimpl->m_Metadata.Validate());
*pOffset = allocRequest.offset;
return S_OK;
diff --git a/src/D3D12MemAlloc.h b/src/D3D12MemAlloc.h
index 151eb54..f01a5b2 100644
--- a/src/D3D12MemAlloc.h
+++ b/src/D3D12MemAlloc.h
@@ -1116,12 +1116,12 @@
Cannot be zero.
*/
- UINT64 size;
+ UINT64 Size;
/** \brief Required alignment of the allocation.
Must be power of two. Special value 0 has the same meaning as 1 - means no special alignment is required, so allocation can start at any offset.
*/
- UINT64 alignment;
+ UINT64 Alignment;
/** \brief Custom pointer to be associated with the allocation.
It can be fetched or changed later.
diff --git a/src/Tests.cpp b/src/Tests.cpp
index 3606fea..4f5a3fc 100644
--- a/src/Tests.cpp
+++ b/src/Tests.cpp
@@ -142,9 +142,9 @@
// # Allocate 8 MB
VIRTUAL_ALLOCATION_DESC allocDesc = {};
- allocDesc.alignment = alignment;
+ allocDesc.Alignment = alignment;
allocDesc.pUserData = (void*)(uintptr_t)1;
- allocDesc.size = 8 * MEGABYTE;
+ allocDesc.Size = 8 * MEGABYTE;
UINT64 alloc0Offset;
CHECK_HR( block->Allocate(&allocDesc, &alloc0Offset) );
CHECK_BOOL( alloc0Offset < blockSize );
@@ -153,7 +153,7 @@
VIRTUAL_ALLOCATION_INFO allocInfo = {};
block->GetAllocationInfo(alloc0Offset, &allocInfo);
- CHECK_BOOL( allocInfo.size == allocDesc.size );
+ CHECK_BOOL( allocInfo.size == allocDesc.Size );
CHECK_BOOL( allocInfo.pUserData == allocDesc.pUserData );
// # Check SetUserData
@@ -164,8 +164,8 @@
// # Allocate 4 MB
- allocDesc.size = 4 * MEGABYTE;
- allocDesc.alignment = alignment;
+ allocDesc.Size = 4 * MEGABYTE;
+ allocDesc.Alignment = alignment;
UINT64 alloc1Offset;
CHECK_HR( block->Allocate(&allocDesc, &alloc1Offset) );
CHECK_BOOL( alloc1Offset < blockSize );
@@ -173,8 +173,8 @@
// # Allocate another 8 MB - it should fail
- allocDesc.size = 8 * MEGABYTE;
- allocDesc.alignment = alignment;
+ allocDesc.Size = 8 * MEGABYTE;
+ allocDesc.Alignment = alignment;
UINT64 alloc2Offset;
CHECK_BOOL( FAILED(block->Allocate(&allocDesc, &alloc2Offset)) );
CHECK_BOOL( alloc2Offset == UINT64_MAX );
@@ -218,12 +218,12 @@
for(size_t i = 0; i < allocCount; ++i)
{
const bool alignment0 = i == allocCount - 1;
- allocDesc.size = i * 3 + 15;
- allocDesc.alignment = alignment0 ? 0 : 8;
+ allocDesc.Size = i * 3 + 15;
+ allocDesc.Alignment = alignment0 ? 0 : 8;
CHECK_HR(block->Allocate(&allocDesc, &allocOffset[i]));
if(!alignment0)
{
- CHECK_BOOL(allocOffset[i] % allocDesc.alignment == 0);
+ CHECK_BOOL(allocOffset[i] % allocDesc.Alignment == 0);
}
}
