Some refactoring after merging #40

Author: adam-sawicki-a

src/D3D12MemAlloc.cpp

@@ -6582,6 +6582,8 @@ AllocatorPimpl::AllocatorPimpl(const ALLOCATION_CALLBACKS& allocationCallbacks,
 
 HRESULT AllocatorPimpl::Init(const ALLOCATOR_DESC& desc)
 {
+    bool notZeroedSupported = false;
+
 #if D3D12MA_DXGI_1_4
     desc.pAdapter->QueryInterface(D3D12MA_IID_PPV_ARGS(&m_Adapter3));
 #endif
@@ -6592,6 +6594,12 @@ HRESULT AllocatorPimpl::Init(const ALLOCATOR_DESC& desc)
 
 #ifdef __ID3D12Device8_INTERFACE_DEFINED__
     m_Device->QueryInterface(D3D12MA_IID_PPV_ARGS(&m_Device8));
+    
+    D3D12_FEATURE_DATA_D3D12_OPTIONS7 options7 = {};
+    if(SUCCEEDED(m_Device->CheckFeatureSupport(D3D12_FEATURE_D3D12_OPTIONS7, &options7, sizeof(options7))))
+    {
+        notZeroedSupported = true;
+    }
 #endif
 
     HRESULT hr = m_Adapter->GetDesc(&m_AdapterDesc);
@@ -6616,14 +6624,6 @@ HRESULT AllocatorPimpl::Init(const ALLOCATOR_DESC& desc)
         m_D3D12Architecture.CacheCoherentUMA = FALSE;
     }
 
-#ifdef __ID3D12Device8_INTERFACE_DEFINED__
-		D3D12_FEATURE_DATA_D3D12_OPTIONS7 o = {};
-		hr = m_Device->CheckFeatureSupport(D3D12_FEATURE_D3D12_OPTIONS7, &o, sizeof(o));
-		D3D12_HEAP_FLAGS additionalFlags = (hr == S_OK) ? D3D12_HEAP_FLAG_CREATE_NOT_ZEROED : D3D12_HEAP_FLAG_NONE;
-#else
-        constexpr D3D12_HEAP_FLAGS additionalFlags = D3D12_HEAP_FLAG_NONE;
-#endif
-
     D3D12_HEAP_PROPERTIES heapProps = {};
     const UINT defaultPoolCount = GetDefaultPoolCount();
     for (UINT i = 0; i < defaultPoolCount; ++i)
@@ -6632,8 +6632,10 @@ HRESULT AllocatorPimpl::Init(const ALLOCATOR_DESC& desc)
         CalcDefaultPoolParams(heapProps.Type, heapFlags, i);
 
 #ifdef __ID3D12Device8_INTERFACE_DEFINED__
-        if (desc.Flags & ALLOCATOR_FLAG_DEFAULT_POOLS_NOT_ZEROED)
-                heapFlags |= additionalFlags;
+        if ((desc.Flags & ALLOCATOR_FLAG_DEFAULT_POOLS_NOT_ZEROED) != 0 && notZeroedSupported)
+        {
+            heapFlags |= D3D12_HEAP_FLAG_CREATE_NOT_ZEROED;
+        }
 #endif
 
         m_BlockVectors[i] = D3D12MA_NEW(GetAllocs(), BlockVector)(