AuroraMiddleware/D3D12MemoryAllocator
1
0
Fork 0
mirror of https://github.com/GPUOpen-LibrariesAndSDKs/D3D12MemoryAllocator.git synced 2024-11-21 19:50:05 +00:00
Code Issues Projects Releases Wiki Activity

Fix for not applying debug margin in Generic algorithm.

Browse Source 
Ported test for linear algorithm from VMA.

Code by @medranSolus
This commit is contained in:
Adam Sawicki 2022-02-07 16:35:36 +01:00
parent 80cd0026a1
commit ae519f2521
5 changed files with 1122 additions and 144 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -1 +1,2 @@
build/ build/
bin/

2
src/Common.h
View File

@ -349,6 +349,8 @@ struct MyUniformRandomNumberGenerator
{ {
typedef uint32_t result_type; typedef uint32_t result_type;
MyUniformRandomNumberGenerator(RandomNumberGenerator& gen) : m_Gen(gen) { } MyUniformRandomNumberGenerator(RandomNumberGenerator& gen) : m_Gen(gen) { }
static uint32_t min() { return 0; }
static uint32_t max() { return UINT32_MAX; }
uint32_t operator()() { return m_Gen.Generate(); } uint32_t operator()() { return m_Gen.Generate(); }
private: private:

6
src/D3D12MemAlloc.cpp
View File

@ -4009,8 +4009,8 @@ bool BlockMetadata_Generic::CheckAllocation(
return false; return false;
} }
// Start from offset equal to beginning of this suballocation. // Start from offset equal to beginning of this suballocation and debug margin of previous allocation if present.
UINT64 offset = suballoc.offset; UINT64 offset = suballoc.offset + (suballocItem == m_Suballocations.cbegin() ? 0 : GetDebugMargin());
// Apply alignment. // Apply alignment.
offset = AlignUp(offset, allocAlignment); offset = AlignUp(offset, allocAlignment);
@ -4018,7 +4018,7 @@ bool BlockMetadata_Generic::CheckAllocation(
// Calculate padding at the beginning based on current offset. // Calculate padding at the beginning based on current offset.
const UINT64 paddingBegin = offset - suballoc.offset; const UINT64 paddingBegin = offset - suballoc.offset;
// Fail if requested size plus margin before and after is bigger than size of this suballocation. // Fail if requested size plus margin after is bigger than size of this suballocation.
if(paddingBegin + allocSize + GetDebugMargin() > suballoc.size) if(paddingBegin + allocSize + GetDebugMargin() > suballoc.size)
{ {
return false; return false;

2
src/D3D12Sample.cpp
View File

@ -20,8 +20,8 @@
// THE SOFTWARE. // THE SOFTWARE.
// //
#include "D3D12MemAlloc.h"
#include "Common.h" #include "Common.h"
#include "D3D12MemAlloc.h"
#include "Tests.h" #include "Tests.h"
#include <atomic> #include <atomic>
#include <Shlwapi.h> // For StrStrI #include <Shlwapi.h> // For StrStrI

1255
src/Tests.cpp
View File

File diff suppressed because it is too large Load Diff