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

d3d10: Use the factory that created the adapter to create a swapchain.

This commit is contained in:
Henri Verbeet 2008-11-14 13:57:07 +01:00 committed by Alexandre Julliard
parent 81e92fc81c
commit 70088c4ef3
1 changed files with 23 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
dlls/d3d10/d3d10_main.c
View File

@ -141,6 +141,7 @@ HRESULT WINAPI D3D10CreateDeviceAndSwapChain(IDXGIAdapter *adapter, D3D10_DRIVER
HMODULE swrast, UINT flags, UINT sdk_version, DXGI_SWAP_CHAIN_DESC *swapchain_desc, HMODULE swrast, UINT flags, UINT sdk_version, DXGI_SWAP_CHAIN_DESC *swapchain_desc,
IDXGISwapChain **swapchain, ID3D10Device **device) IDXGISwapChain **swapchain, ID3D10Device **device)
{ {
IDXGIDevice *dxgi_device;
IDXGIFactory *factory; IDXGIFactory *factory;
HRESULT hr; HRESULT hr;
@ -153,22 +154,40 @@ HRESULT WINAPI D3D10CreateDeviceAndSwapChain(IDXGIAdapter *adapter, D3D10_DRIVER
if (FAILED(hr)) if (FAILED(hr))
{ {
WARN("Failed to create a device, returning %#x\n", hr); WARN("Failed to create a device, returning %#x\n", hr);
*device = NULL;
return hr; return hr;
} }
TRACE("Created ID3D10Device %p\n", *device); TRACE("Created ID3D10Device %p\n", *device);
hr = CreateDXGIFactory(&IID_IDXGIFactory, (void **)&factory); hr = ID3D10Device_QueryInterface(*device, &IID_IDXGIDevice, (void **)&dxgi_device);
if (FAILED(hr)) if (FAILED(hr))
{ {
ERR("Failed to get a dxgi device from the d3d10 device, returning %#x\n", hr);
ID3D10Device_Release(*device); ID3D10Device_Release(*device);
*device = NULL; *device = NULL;
WARN("Failed to create a DXGI factory, returning %#x\n", hr);
return hr; return hr;
} }
TRACE("Created IDXGIFactory %p\n", factory); hr = IDXGIDevice_GetAdapter(dxgi_device, &adapter);
IDXGIDevice_Release(dxgi_device);
if (FAILED(hr))
{
ERR("Failed to get the device adapter, returning %#x\n", hr);
ID3D10Device_Release(*device);
*device = NULL;
return hr;
}
hr = IDXGIAdapter_GetParent(adapter, &IID_IDXGIFactory, (void **)&factory);
IDXGIAdapter_Release(adapter);
if (FAILED(hr))
{
ERR("Failed to get the adapter factory, returning %#x\n", hr);
ID3D10Device_Release(*device);
*device = NULL;
return hr;
}
hr = IDXGIFactory_CreateSwapChain(factory, (IUnknown *)*device, swapchain_desc, swapchain); hr = IDXGIFactory_CreateSwapChain(factory, (IUnknown *)*device, swapchain_desc, swapchain);
IDXGIFactory_Release(factory); IDXGIFactory_Release(factory);