From d01110259ce9f78afe3ac11f8147f840d85add95 Mon Sep 17 00:00:00 2001 From: Joshua Ashton Date: Wed, 27 Feb 2019 21:13:03 +0000 Subject: [PATCH] [d3d11, d3d10] Init returnptrs for CreateDevice funcs. --- src/d3d10/d3d10_main.cpp | 5 ++--- src/d3d11/d3d11_main.cpp | 9 +++++++++ 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/src/d3d10/d3d10_main.cpp b/src/d3d10/d3d10_main.cpp index e8c9ce46..6bab89a2 100644 --- a/src/d3d10/d3d10_main.cpp +++ b/src/d3d10/d3d10_main.cpp @@ -27,10 +27,9 @@ extern "C" { UINT Flags, D3D_FEATURE_LEVEL FeatureLevel, ID3D10Device** ppDevice) { - Com d3d11Device; + InitReturnPtr(ppDevice); - if (ppDevice != nullptr) - *ppDevice = nullptr; + Com d3d11Device; HRESULT hr = pAdapter->CheckInterfaceSupport( __uuidof(ID3D10Device), nullptr); diff --git a/src/d3d11/d3d11_main.cpp b/src/d3d11/d3d11_main.cpp index 01cb317e..4ab16cac 100644 --- a/src/d3d11/d3d11_main.cpp +++ b/src/d3d11/d3d11_main.cpp @@ -22,6 +22,8 @@ extern "C" { const D3D_FEATURE_LEVEL* pFeatureLevels, UINT FeatureLevels, ID3D11Device** ppDevice) { + InitReturnPtr(ppDevice); + Rc dxvkAdapter; Rc dxvkInstance; @@ -107,6 +109,9 @@ extern "C" { ID3D11Device** ppDevice, D3D_FEATURE_LEVEL* pFeatureLevel, ID3D11DeviceContext** ppImmediateContext) { + InitReturnPtr(ppDevice); + InitReturnPtr(ppImmediateContext); + Com dxgiFactory = nullptr; Com dxgiAdapter = pAdapter; @@ -187,6 +192,10 @@ extern "C" { ID3D11Device** ppDevice, D3D_FEATURE_LEVEL* pFeatureLevel, ID3D11DeviceContext** ppImmediateContext) { + InitReturnPtr(ppDevice); + InitReturnPtr(ppSwapChain); + InitReturnPtr(ppImmediateContext); + Com d3d11Device; Com d3d11Context;