backup/OpenDX
1
0
Fork 0
mirror of https://github.com/EduApps-CDG/OpenDX synced 2024-12-30 09:45:37 +01:00
Code Issues Projects Releases Activity

[d3d11, d3d10] Init returnptrs for CreateDevice funcs.

Browse Source
This commit is contained in:
Joshua Ashton 2019-02-27 21:13:03 +00:00 committed by Philip Rebohle
parent 995949a9f9
commit d01110259c
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/d3d10/d3d10_main.cpp
View File

@ -27,10 +27,9 @@ extern "C" {
UINT Flags, UINT Flags,
D3D_FEATURE_LEVEL FeatureLevel, D3D_FEATURE_LEVEL FeatureLevel,
ID3D10Device** ppDevice) { ID3D10Device** ppDevice) {
Com<ID3D11Device> d3d11Device; InitReturnPtr(ppDevice);
if (ppDevice != nullptr) Com<ID3D11Device> d3d11Device;
*ppDevice = nullptr;
HRESULT hr = pAdapter->CheckInterfaceSupport( HRESULT hr = pAdapter->CheckInterfaceSupport(
__uuidof(ID3D10Device), nullptr); __uuidof(ID3D10Device), nullptr);

9
src/d3d11/d3d11_main.cpp
View File

@ -22,6 +22,8 @@ extern "C" {
const D3D_FEATURE_LEVEL* pFeatureLevels, const D3D_FEATURE_LEVEL* pFeatureLevels,
UINT FeatureLevels, UINT FeatureLevels,
ID3D11Device** ppDevice) { ID3D11Device** ppDevice) {
InitReturnPtr(ppDevice);
Rc<DxvkAdapter> dxvkAdapter; Rc<DxvkAdapter> dxvkAdapter;
Rc<DxvkInstance> dxvkInstance; Rc<DxvkInstance> dxvkInstance;
@ -107,6 +109,9 @@ extern "C" {
ID3D11Device** ppDevice, ID3D11Device** ppDevice,
D3D_FEATURE_LEVEL* pFeatureLevel, D3D_FEATURE_LEVEL* pFeatureLevel,
ID3D11DeviceContext** ppImmediateContext) { ID3D11DeviceContext** ppImmediateContext) {
InitReturnPtr(ppDevice);
InitReturnPtr(ppImmediateContext);
Com<IDXGIFactory> dxgiFactory = nullptr; Com<IDXGIFactory> dxgiFactory = nullptr;
Com<IDXGIAdapter> dxgiAdapter = pAdapter; Com<IDXGIAdapter> dxgiAdapter = pAdapter;
@ -187,6 +192,10 @@ extern "C" {
ID3D11Device** ppDevice, ID3D11Device** ppDevice,
D3D_FEATURE_LEVEL* pFeatureLevel, D3D_FEATURE_LEVEL* pFeatureLevel,
ID3D11DeviceContext** ppImmediateContext) { ID3D11DeviceContext** ppImmediateContext) {
InitReturnPtr(ppDevice);
InitReturnPtr(ppSwapChain);
InitReturnPtr(ppImmediateContext);
Com<ID3D11Device> d3d11Device; Com<ID3D11Device> d3d11Device;
Com<ID3D11DeviceContext> d3d11Context; Com<ID3D11DeviceContext> d3d11Context;