commit 5d92b05e994c38caff5a437bc7a3fad2ea725830
author Daniel Krupiński <danielkrupinski@outlook.com> Thu Sep 16 19:39:09 2021 +0200
committer Daniel Krupiński <danielkrupinski@outlook.com> Thu Sep 16 19:39:09 2021 +0200
tree 9979c06aab8aed8e46681743b18c73d4ac5bb921
parent f50f65dcdebc2be9c2e9698360500b856c7daa94

Use IID_PPV_ARGS() macro for passing arguments to heap creation methods

src/D3D12MemAlloc.cpp

diff --git a/src/D3D12MemAlloc.cpp b/src/D3D12MemAlloc.cpp
index 15a91f6..9c50a39 100644
--- a/src/D3D12MemAlloc.cpp
+++ b/src/D3D12MemAlloc.cpp
@@ -3750,7 +3750,7 @@
     heapDesc.Alignment = HeapFlagsToAlignment(m_HeapFlags);

     heapDesc.Flags = m_HeapFlags;

 

-    HRESULT hr = m_Allocator->GetDevice()->CreateHeap(&heapDesc, __uuidof(*m_Heap), (void**)&m_Heap);

+    HRESULT hr = m_Allocator->GetDevice()->CreateHeap(&heapDesc, IID_PPV_ARGS(&m_Heap));

     if(SUCCEEDED(hr))

     {

         m_Allocator->m_Budget.m_BlockBytes[HeapTypeToIndex(m_HeapProps.Type)] += m_Size;

@@ -5140,7 +5140,7 @@
     heapDesc.Flags = committedAllocParams.m_HeapFlags;

 

     ID3D12Heap* heap = nullptr;

-    HRESULT hr = m_Device->CreateHeap(&heapDesc, __uuidof(*heap), (void**)&heap);

+    HRESULT hr = m_Device->CreateHeap(&heapDesc, IID_PPV_ARGS(&heap));

     if(SUCCEEDED(hr))

     {

         const BOOL wasZeroInitialized = TRUE;

@@ -5183,7 +5183,7 @@
     heapDesc.Flags = committedAllocParams.m_HeapFlags;

 

     ID3D12Heap* heap = nullptr;

-    HRESULT hr = m_Device4->CreateHeap1(&heapDesc, pProtectedSession, __uuidof(*heap), (void**)&heap);

+    HRESULT hr = m_Device4->CreateHeap1(&heapDesc, pProtectedSession, IID_PPV_ARGS(&heap));

     if(SUCCEEDED(hr))

     {

         const BOOL wasZeroInitialized = TRUE;