[PATCH] d3d10_1: Implement D3D10CreateDeviceAndSwapChain1
Alistair Leslie-Hughes
leslie_alistair at hotmail.com
Tue Oct 20 22:25:12 CDT 2015
Fixes https://bugs.winehq.org/show_bug.cgi?id=39278
Signed-off-by: Alistair Leslie-Hughes <leslie_alistair at hotmail.com>
---
dlls/d3d10_1/d3d10_1.spec | 2 +-
dlls/d3d10_1/d3d10_1_main.c | 68 +++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 69 insertions(+), 1 deletion(-)
diff --git a/dlls/d3d10_1/d3d10_1.spec b/dlls/d3d10_1/d3d10_1.spec
index b3d2da7..5582558 100644
--- a/dlls/d3d10_1/d3d10_1.spec
+++ b/dlls/d3d10_1/d3d10_1.spec
@@ -3,7 +3,7 @@
@ stub D3D10CompileShader
@ stub D3D10CreateBlob
@ stdcall D3D10CreateDevice1(ptr long ptr long long long ptr)
-@ stub D3D10CreateDeviceAndSwapChain1
+@ stdcall D3D10CreateDeviceAndSwapChain1(ptr long ptr long long long ptr ptr ptr)
@ stdcall D3D10CreateEffectFromMemory(ptr long long ptr ptr ptr) d3d10.D3D10CreateEffectFromMemory
@ stub D3D10CreateEffectPoolFromMemory
@ stdcall D3D10CreateStateBlock(ptr ptr ptr) d3d10.D3D10CreateStateBlock
diff --git a/dlls/d3d10_1/d3d10_1_main.c b/dlls/d3d10_1/d3d10_1_main.c
index a619004..549cab8 100644
--- a/dlls/d3d10_1/d3d10_1_main.c
+++ b/dlls/d3d10_1/d3d10_1_main.c
@@ -168,3 +168,71 @@ HRESULT WINAPI D3D10CreateDevice1(IDXGIAdapter *adapter, D3D10_DRIVER_TYPE drive
return hr;
}
+
+HRESULT WINAPI D3D10CreateDeviceAndSwapChain1(IDXGIAdapter *adapter, D3D10_DRIVER_TYPE driver_type,
+ HMODULE swrast, UINT flags, D3D10_FEATURE_LEVEL1 hw_level, UINT sdk_version,
+ DXGI_SWAP_CHAIN_DESC *swapchain_desc, IDXGISwapChain **swapchain, ID3D10Device1 **device)
+{
+ IDXGIDevice *dxgi_device;
+ IDXGIFactory *factory;
+ HRESULT hr;
+
+ TRACE("adapter %p, driver_type %s, swrast %p, flags %#x, hw_level %s, sdk_version %d, "
+ "swapchain_desc %p, swapchain %p, device %p\n",
+ adapter, debug_d3d10_driver_type(driver_type), swrast, flags,
+ debug_d3d10_feature_level(hw_level), sdk_version, swapchain_desc, swapchain, device);
+
+ hr = D3D10CreateDevice1(adapter, driver_type, swrast, flags, hw_level, sdk_version, device);
+ if (FAILED(hr))
+ {
+ WARN("Failed to create a device, returning %#x\n", hr);
+ *device = NULL;
+ return hr;
+ }
+
+ TRACE("Created ID3D10Device1 %p\n", *device);
+
+ hr = ID3D10Device1_QueryInterface(*device, &IID_IDXGIDevice, (void **)&dxgi_device);
+ if (FAILED(hr))
+ {
+ ERR("Failed to get a dxgi device from the d3d10 device, returning %#x\n", hr);
+ ID3D10Device1_Release(*device);
+ *device = NULL;
+ return hr;
+ }
+
+ hr = IDXGIDevice_GetAdapter(dxgi_device, &adapter);
+ IDXGIDevice_Release(dxgi_device);
+ if (FAILED(hr))
+ {
+ ERR("Failed to get the device adapter, returning %#x\n", hr);
+ ID3D10Device1_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);
+ ID3D10Device1_Release(*device);
+ *device = NULL;
+ return hr;
+ }
+
+ hr = IDXGIFactory_CreateSwapChain(factory, (IUnknown *)*device, swapchain_desc, swapchain);
+ IDXGIFactory_Release(factory);
+ if (FAILED(hr))
+ {
+ ID3D10Device1_Release(*device);
+ *device = NULL;
+
+ WARN("Failed to create a swapchain, returning %#x\n", hr);
+ return hr;
+ }
+
+ TRACE("Created IDXGISwapChain %p\n", *swapchain);
+
+ return S_OK;
+}
--
2.6.1
More information about the wine-patches
mailing list