ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

d3d11: Allow to pass NULL as device to D3D11CreateDevice.

This commit is contained in:
Józef Kucia 2015-08-24 01:04:26 +02:00 committed by Alexandre Julliard
parent 66b2d96a69
commit 4cf1bb929f
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
dlls/d3d11/d3d11_main.c
View File

@ -145,16 +145,17 @@ HRESULT WINAPI D3D11CoreCreateDevice(IDXGIFactory *factory, IDXGIAdapter *adapte
} }
HRESULT WINAPI D3D11CreateDevice(IDXGIAdapter *adapter, D3D_DRIVER_TYPE driver_type, HMODULE swrast, UINT flags, HRESULT WINAPI D3D11CreateDevice(IDXGIAdapter *adapter, D3D_DRIVER_TYPE driver_type, HMODULE swrast, UINT flags,
const D3D_FEATURE_LEVEL *feature_levels, UINT levels, UINT sdk_version, ID3D11Device **device, const D3D_FEATURE_LEVEL *feature_levels, UINT levels, UINT sdk_version, ID3D11Device **device_out,
D3D_FEATURE_LEVEL *obtained_feature_level, ID3D11DeviceContext **immediate_context) D3D_FEATURE_LEVEL *obtained_feature_level, ID3D11DeviceContext **immediate_context)
{ {
IDXGIFactory *factory; IDXGIFactory *factory;
ID3D11Device *device;
HRESULT hr; HRESULT hr;
TRACE("adapter %p, driver_type %s, swrast %p, flags %#x, feature_levels %p, levels %u, sdk_version %u, " TRACE("adapter %p, driver_type %s, swrast %p, flags %#x, feature_levels %p, levels %u, sdk_version %u, "
"device %p, obtained_feature_level %p, immediate_context %p.\n", "device %p, obtained_feature_level %p, immediate_context %p.\n",
adapter, debug_d3d_driver_type(driver_type), swrast, flags, feature_levels, levels, sdk_version, adapter, debug_d3d_driver_type(driver_type), swrast, flags, feature_levels, levels, sdk_version,
device, obtained_feature_level, immediate_context); device_out, obtained_feature_level, immediate_context);
if (adapter) if (adapter)
{ {
@ -237,7 +238,7 @@ HRESULT WINAPI D3D11CreateDevice(IDXGIAdapter *adapter, D3D_DRIVER_TYPE driver_t
} }
} }
hr = D3D11CoreCreateDevice(factory, adapter, flags, feature_levels, levels, device); hr = D3D11CoreCreateDevice(factory, adapter, flags, feature_levels, levels, &device);
IDXGIAdapter_Release(adapter); IDXGIAdapter_Release(adapter);
IDXGIFactory_Release(factory); IDXGIFactory_Release(factory);
if (FAILED(hr)) if (FAILED(hr))
@ -246,15 +247,20 @@ HRESULT WINAPI D3D11CreateDevice(IDXGIAdapter *adapter, D3D_DRIVER_TYPE driver_t
return hr; return hr;
} }
TRACE("Created ID3D11Device %p.\n", *device); TRACE("Created ID3D11Device %p.\n", device);
if (obtained_feature_level) if (obtained_feature_level)
*obtained_feature_level = ID3D11Device_GetFeatureLevel(*device); *obtained_feature_level = ID3D11Device_GetFeatureLevel(device);
if (immediate_context) if (immediate_context)
ID3D11Device_GetImmediateContext(*device, immediate_context); ID3D11Device_GetImmediateContext(device, immediate_context);
return hr; if (device_out)
*device_out = device;
else
ID3D11Device_Release(device);
return S_OK;
} }
HRESULT WINAPI D3D11CreateDeviceAndSwapChain(IDXGIAdapter *adapter, D3D_DRIVER_TYPE driver_type, HRESULT WINAPI D3D11CreateDeviceAndSwapChain(IDXGIAdapter *adapter, D3D_DRIVER_TYPE driver_type,