Fixes in BlockMetadata_Linear::Validate

adam-sawicki-a · adam-sawicki-a · commit 62b61790debd · 2022-03-24T15:19:09.000+01:00
diff --git a/src/D3D12MemAlloc.cpp b/src/D3D12MemAlloc.cpp
@@ -3815,7 +3815,7 @@ bool BlockMetadata_Linear::Validate() const
             {
                 if (!IsVirtual())
                 {
-                    D3D12MA_VALIDATE((UINT64)alloc->GetAllocHandle() == suballoc.offset);
+                    D3D12MA_VALIDATE(GetAllocationOffset(alloc->GetAllocHandle()) == suballoc.offset);
                     D3D12MA_VALIDATE(alloc->GetSize() == suballoc.size);
                 }
                 sumUsedSize += suballoc.size;
@@ -3857,7 +3857,7 @@ bool BlockMetadata_Linear::Validate() const
         {
             if (!IsVirtual())
             {
-                D3D12MA_VALIDATE((UINT64)alloc->GetAllocHandle() == suballoc.offset);
+                D3D12MA_VALIDATE(GetAllocationOffset(alloc->GetAllocHandle()) == suballoc.offset);
                 D3D12MA_VALIDATE(alloc->GetSize() == suballoc.size);
             }
             sumUsedSize += suballoc.size;
@@ -3891,7 +3891,7 @@ bool BlockMetadata_Linear::Validate() const
             {
                 if (!IsVirtual())
                 {
-                    D3D12MA_VALIDATE((UINT64)alloc->GetAllocHandle() == suballoc.offset);
+                    D3D12MA_VALIDATE(GetAllocationOffset(alloc->GetAllocHandle()) == suballoc.offset);
                     D3D12MA_VALIDATE(alloc->GetSize() == suballoc.size);
                 }
                 sumUsedSize += suballoc.size;

Original file line number	Diff line number	Diff line change
`@@ -3815,7 +3815,7 @@ bool BlockMetadata_Linear::Validate() const`
`3815`	`3815`	`{`
`3816`	`3816`	`if (!IsVirtual())`
`3817`	`3817`	`{`
`3818`		`- D3D12MA_VALIDATE((UINT64)alloc->GetAllocHandle() == suballoc.offset);`
	`3818`	`+ D3D12MA_VALIDATE(GetAllocationOffset(alloc->GetAllocHandle()) == suballoc.offset);`
`3819`	`3819`	`D3D12MA_VALIDATE(alloc->GetSize() == suballoc.size);`
`3820`	`3820`	`}`
`3821`	`3821`	`sumUsedSize += suballoc.size;`
`@@ -3857,7 +3857,7 @@ bool BlockMetadata_Linear::Validate() const`
`3857`	`3857`	`{`
`3858`	`3858`	`if (!IsVirtual())`
`3859`	`3859`	`{`
`3860`		`- D3D12MA_VALIDATE((UINT64)alloc->GetAllocHandle() == suballoc.offset);`
	`3860`	`+ D3D12MA_VALIDATE(GetAllocationOffset(alloc->GetAllocHandle()) == suballoc.offset);`
`3861`	`3861`	`D3D12MA_VALIDATE(alloc->GetSize() == suballoc.size);`
`3862`	`3862`	`}`
`3863`	`3863`	`sumUsedSize += suballoc.size;`
`@@ -3891,7 +3891,7 @@ bool BlockMetadata_Linear::Validate() const`
`3891`	`3891`	`{`
`3892`	`3892`	`if (!IsVirtual())`
`3893`	`3893`	`{`
`3894`		`- D3D12MA_VALIDATE((UINT64)alloc->GetAllocHandle() == suballoc.offset);`
	`3894`	`+ D3D12MA_VALIDATE(GetAllocationOffset(alloc->GetAllocHandle()) == suballoc.offset);`
`3895`	`3895`	`D3D12MA_VALIDATE(alloc->GetSize() == suballoc.size);`
`3896`	`3896`	`}`
`3897`	`3897`	`sumUsedSize += suballoc.size;`