commit 17df03f5ff04ced0dc4163a1333d1ea7c1b3615b
author Adam Sawicki <adam.sawicki@amd.com> Wed May 05 12:30:02 2021 +0200
committer Adam Sawicki <adam.sawicki@amd.com> Wed May 05 12:30:02 2021 +0200
tree 8725333f8d0e6498cfccfd50448a97eacb8aea9b
parent 4dedc35e8f94366a50ed9f9dbf517b5af818268f

Fixed major bug occurring on D3D12_RESOURCE_HEAP_TIER_1

Closes #11

src/D3D12MemAlloc.cpp

diff --git a/src/D3D12MemAlloc.cpp b/src/D3D12MemAlloc.cpp
index b50c193..9706e31 100644
--- a/src/D3D12MemAlloc.cpp
+++ b/src/D3D12MemAlloc.cpp
@@ -4693,7 +4693,7 @@
     CommittedAllocationParameters committedAllocationParams = {};

     bool preferCommitted = false;

     HRESULT hr = CalcAllocationParams<D3D12_RESOURCE_DESC>(*pAllocDesc, resAllocInfo.SizeInBytes,

-        NULL, // pResDesc

+        pResourceDesc,

         blockVector, committedAllocationParams, preferCommitted);

     if(FAILED(hr))

         return hr;

@@ -4763,7 +4763,7 @@
     CommittedAllocationParameters committedAllocationParams = {};

     bool preferCommitted = false;

     HRESULT hr = CalcAllocationParams<D3D12_RESOURCE_DESC>(*pAllocDesc, resAllocInfo.SizeInBytes,

-        NULL, // pResDesc

+        pResourceDesc,

         blockVector, committedAllocationParams, preferCommitted);

     if(FAILED(hr))

         return hr;

@@ -4814,8 +4814,8 @@
     BlockVector* blockVector = NULL;

     CommittedAllocationParameters committedAllocationParams = {};

     bool preferCommitted = false;

-    HRESULT hr = CalcAllocationParams<D3D12_RESOURCE_DESC>(*pAllocDesc, resAllocInfo.SizeInBytes,

-        NULL, // pResDesc

+    HRESULT hr = CalcAllocationParams<D3D12_RESOURCE_DESC1>(*pAllocDesc, resAllocInfo.SizeInBytes,

+        pResourceDesc,

         blockVector, committedAllocationParams, preferCommitted);

     if(FAILED(hr))

         return hr;