From 8ba075a0592e776b3f4502fce09af207651e8c47 Mon Sep 17 00:00:00 2001 From: Henri Verbeet Date: Tue, 4 Dec 2018 17:52:00 +0330 Subject: [PATCH] dxgi: Introduce the IWineDXGISwapChainFactory interface. The basic idea is that a project like vkd3d could provide its own implementation of the IWineDXGISwapChainFactory interface, and so wouldn't need specific handling in dxgi_factory_CreateSwapChainForHwnd(). Signed-off-by: Henri Verbeet Signed-off-by: Alexandre Julliard --- dlls/dxgi/device.c | 118 ++++++++++++++++++++++++++++++++++++++ dlls/dxgi/dxgi_private.h | 3 +- dlls/dxgi/factory.c | 9 +-- dlls/dxgi/swapchain.c | 63 -------------------- include/wine/winedxgi.idl | 17 ++++++ 5 files changed, 141 insertions(+), 69 deletions(-) diff --git a/dlls/dxgi/device.c b/dlls/dxgi/device.c index c7481c6b6ef..c7d663f953b 100644 --- a/dlls/dxgi/device.c +++ b/dlls/dxgi/device.c @@ -49,6 +49,13 @@ static HRESULT STDMETHODCALLTYPE dxgi_device_QueryInterface(IWineDXGIDevice *ifa return S_OK; } + if (IsEqualGUID(riid, &IID_IWineDXGISwapChainFactory)) + { + IUnknown_AddRef(iface); + *object = &device->IWineDXGISwapChainFactory_iface; + return S_OK; + } + if (device->child_layer) { TRACE("Forwarding to child layer %p.\n", device->child_layer); @@ -403,6 +410,116 @@ static const struct IWineDXGIDeviceVtbl dxgi_device_vtbl = dxgi_device_create_swapchain, }; +static inline struct dxgi_device *impl_from_IWineDXGISwapChainFactory(IWineDXGISwapChainFactory *iface) +{ + return CONTAINING_RECORD(iface, struct dxgi_device, IWineDXGISwapChainFactory_iface); +} + +static HRESULT STDMETHODCALLTYPE dxgi_swapchain_factory_QueryInterface(IWineDXGISwapChainFactory *iface, + REFIID iid, void **out) +{ + struct dxgi_device *device = impl_from_IWineDXGISwapChainFactory(iface); + + TRACE("iface %p, iid %s, out %p.\n", iface, debugstr_guid(iid), out); + + return dxgi_device_QueryInterface(&device->IWineDXGIDevice_iface, iid, out); +} + +static ULONG STDMETHODCALLTYPE dxgi_swapchain_factory_AddRef(IWineDXGISwapChainFactory *iface) +{ + struct dxgi_device *device = impl_from_IWineDXGISwapChainFactory(iface); + + TRACE("iface %p.\n", iface); + + return dxgi_device_AddRef(&device->IWineDXGIDevice_iface); +} + +static ULONG STDMETHODCALLTYPE dxgi_swapchain_factory_Release(IWineDXGISwapChainFactory *iface) +{ + struct dxgi_device *device = impl_from_IWineDXGISwapChainFactory(iface); + + TRACE("iface %p.\n", iface); + + return dxgi_device_Release(&device->IWineDXGIDevice_iface); +} + +static HRESULT STDMETHODCALLTYPE dxgi_swapchain_factory_create_swapchain(IWineDXGISwapChainFactory *iface, + IDXGIFactory *factory, HWND window, const DXGI_SWAP_CHAIN_DESC1 *desc, + const DXGI_SWAP_CHAIN_FULLSCREEN_DESC *fullscreen_desc, IDXGIOutput *output, IDXGISwapChain1 **swapchain) +{ + struct dxgi_device *device = impl_from_IWineDXGISwapChainFactory(iface); + struct wined3d_swapchain *wined3d_swapchain; + struct wined3d_swapchain_desc wined3d_desc; + HRESULT hr; + + TRACE("iface %p, factory %p, window %p, desc %p, fullscreen_desc %p, output %p, swapchain %p.\n", + iface, factory, window, desc, fullscreen_desc, output, swapchain); + + if (desc->Scaling != DXGI_SCALING_STRETCH) + FIXME("Ignoring scaling %#x.\n", desc->Scaling); + if (desc->AlphaMode != DXGI_ALPHA_MODE_IGNORE) + FIXME("Ignoring alpha mode %#x.\n", desc->AlphaMode); + if (fullscreen_desc && fullscreen_desc->ScanlineOrdering) + FIXME("Unhandled scanline ordering %#x.\n", fullscreen_desc->ScanlineOrdering); + if (fullscreen_desc && fullscreen_desc->Scaling) + FIXME("Unhandled mode scaling %#x.\n", fullscreen_desc->Scaling); + + switch (desc->SwapEffect) + { + case DXGI_SWAP_EFFECT_DISCARD: + wined3d_desc.swap_effect = WINED3D_SWAP_EFFECT_DISCARD; + break; + case DXGI_SWAP_EFFECT_SEQUENTIAL: + wined3d_desc.swap_effect = WINED3D_SWAP_EFFECT_SEQUENTIAL; + break; + case DXGI_SWAP_EFFECT_FLIP_DISCARD: + wined3d_desc.swap_effect = WINED3D_SWAP_EFFECT_FLIP_DISCARD; + break; + case DXGI_SWAP_EFFECT_FLIP_SEQUENTIAL: + wined3d_desc.swap_effect = WINED3D_SWAP_EFFECT_FLIP_SEQUENTIAL; + break; + default: + WARN("Invalid swap effect %#x.\n", desc->SwapEffect); + return DXGI_ERROR_INVALID_CALL; + } + + wined3d_desc.backbuffer_width = desc->Width; + wined3d_desc.backbuffer_height = desc->Height; + wined3d_desc.backbuffer_format = wined3dformat_from_dxgi_format(desc->Format); + wined3d_desc.backbuffer_count = desc->BufferCount; + wined3d_desc.backbuffer_bind_flags = wined3d_bind_flags_from_dxgi_usage(desc->BufferUsage); + wined3d_sample_desc_from_dxgi(&wined3d_desc.multisample_type, + &wined3d_desc.multisample_quality, &desc->SampleDesc); + wined3d_desc.device_window = window; + wined3d_desc.windowed = fullscreen_desc ? fullscreen_desc->Windowed : TRUE; + wined3d_desc.enable_auto_depth_stencil = FALSE; + wined3d_desc.auto_depth_stencil_format = 0; + wined3d_desc.flags = wined3d_swapchain_flags_from_dxgi(desc->Flags); + wined3d_desc.refresh_rate = fullscreen_desc ? dxgi_rational_to_uint(&fullscreen_desc->RefreshRate) : 0; + wined3d_desc.auto_restore_display_mode = TRUE; + + if (FAILED(hr = dxgi_device_create_swapchain(&device->IWineDXGIDevice_iface, + &wined3d_desc, FALSE, &wined3d_swapchain))) + { + WARN("Failed to create swapchain, hr %#x.\n", hr); + return hr; + } + + wined3d_mutex_lock(); + *swapchain = wined3d_swapchain_get_parent(wined3d_swapchain); + wined3d_mutex_unlock(); + + return S_OK; +} + +static const struct IWineDXGISwapChainFactoryVtbl dxgi_swapchain_factory_vtbl = +{ + dxgi_swapchain_factory_QueryInterface, + dxgi_swapchain_factory_AddRef, + dxgi_swapchain_factory_Release, + dxgi_swapchain_factory_create_swapchain, +}; + HRESULT dxgi_device_init(struct dxgi_device *device, struct dxgi_device_layer *layer, IDXGIFactory *factory, IDXGIAdapter *adapter, const D3D_FEATURE_LEVEL *feature_levels, unsigned int level_count) @@ -428,6 +545,7 @@ HRESULT dxgi_device_init(struct dxgi_device *device, struct dxgi_device_layer *l } device->IWineDXGIDevice_iface.lpVtbl = &dxgi_device_vtbl; + device->IWineDXGISwapChainFactory_iface.lpVtbl = &dxgi_swapchain_factory_vtbl; device->refcount = 1; wined3d_mutex_lock(); wined3d_private_store_init(&device->private_store); diff --git a/dlls/dxgi/dxgi_private.h b/dlls/dxgi/dxgi_private.h index 1268a9ca648..320a347dde5 100644 --- a/dlls/dxgi/dxgi_private.h +++ b/dlls/dxgi/dxgi_private.h @@ -122,6 +122,7 @@ struct dxgi_factory *unsafe_impl_from_IDXGIFactory(IDXGIFactory *iface) DECLSPEC struct dxgi_device { IWineDXGIDevice IWineDXGIDevice_iface; + IWineDXGISwapChainFactory IWineDXGISwapChainFactory_iface; IUnknown *child_layer; LONG refcount; struct wined3d_private_store private_store; @@ -172,8 +173,6 @@ struct d3d11_swapchain IDXGIOutput *target; }; -HRESULT d3d11_swapchain_create(IWineDXGIDevice *device, HWND window, const DXGI_SWAP_CHAIN_DESC1 *swapchain_desc, - const DXGI_SWAP_CHAIN_FULLSCREEN_DESC *fullscreen_desc, IDXGISwapChain1 **swapchain) DECLSPEC_HIDDEN; HRESULT d3d11_swapchain_init(struct d3d11_swapchain *swapchain, struct dxgi_device *device, struct wined3d_swapchain_desc *desc, BOOL implicit) DECLSPEC_HIDDEN; diff --git a/dlls/dxgi/factory.c b/dlls/dxgi/factory.c index a4577ae278f..52c145bc6a8 100644 --- a/dlls/dxgi/factory.c +++ b/dlls/dxgi/factory.c @@ -250,8 +250,8 @@ static HRESULT STDMETHODCALLTYPE dxgi_factory_CreateSwapChainForHwnd(IWineDXGIFa const DXGI_SWAP_CHAIN_FULLSCREEN_DESC *fullscreen_desc, IDXGIOutput *output, IDXGISwapChain1 **swapchain) { + IWineDXGISwapChainFactory *swapchain_factory; ID3D12CommandQueue *command_queue; - IWineDXGIDevice *dxgi_device; HRESULT hr; TRACE("iface %p, device %p, window %p, desc %p, fullscreen_desc %p, output %p, swapchain %p.\n", @@ -275,10 +275,11 @@ static HRESULT STDMETHODCALLTYPE dxgi_factory_CreateSwapChainForHwnd(IWineDXGIFa if (output) FIXME("Ignoring output %p.\n", output); - if (SUCCEEDED(IUnknown_QueryInterface(device, &IID_IWineDXGIDevice, (void **)&dxgi_device))) + if (SUCCEEDED(IUnknown_QueryInterface(device, &IID_IWineDXGISwapChainFactory, (void **)&swapchain_factory))) { - hr = d3d11_swapchain_create(dxgi_device, window, desc, fullscreen_desc, swapchain); - IWineDXGIDevice_Release(dxgi_device); + hr = IWineDXGISwapChainFactory_create_swapchain(swapchain_factory, + (IDXGIFactory *)iface, window, desc, fullscreen_desc, output, swapchain); + IWineDXGISwapChainFactory_Release(swapchain_factory); return hr; } diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index 5aa2525c06e..07438f3e037 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -803,69 +803,6 @@ cleanup: return hr; } -HRESULT d3d11_swapchain_create(IWineDXGIDevice *device, HWND window, const DXGI_SWAP_CHAIN_DESC1 *swapchain_desc, - const DXGI_SWAP_CHAIN_FULLSCREEN_DESC *fullscreen_desc, IDXGISwapChain1 **swapchain) -{ - struct wined3d_swapchain *wined3d_swapchain; - struct wined3d_swapchain_desc wined3d_desc; - HRESULT hr; - - if (swapchain_desc->Scaling != DXGI_SCALING_STRETCH) - FIXME("Ignoring scaling %#x.\n", swapchain_desc->Scaling); - if (swapchain_desc->AlphaMode != DXGI_ALPHA_MODE_IGNORE) - FIXME("Ignoring alpha mode %#x.\n", swapchain_desc->AlphaMode); - if (fullscreen_desc && fullscreen_desc->ScanlineOrdering) - FIXME("Unhandled scanline ordering %#x.\n", fullscreen_desc->ScanlineOrdering); - if (fullscreen_desc && fullscreen_desc->Scaling) - FIXME("Unhandled mode scaling %#x.\n", fullscreen_desc->Scaling); - - switch (swapchain_desc->SwapEffect) - { - case DXGI_SWAP_EFFECT_DISCARD: - wined3d_desc.swap_effect = WINED3D_SWAP_EFFECT_DISCARD; - break; - case DXGI_SWAP_EFFECT_SEQUENTIAL: - wined3d_desc.swap_effect = WINED3D_SWAP_EFFECT_SEQUENTIAL; - break; - case DXGI_SWAP_EFFECT_FLIP_DISCARD: - wined3d_desc.swap_effect = WINED3D_SWAP_EFFECT_FLIP_DISCARD; - break; - case DXGI_SWAP_EFFECT_FLIP_SEQUENTIAL: - wined3d_desc.swap_effect = WINED3D_SWAP_EFFECT_FLIP_SEQUENTIAL; - break; - default: - WARN("Invalid swap effect %#x.\n", swapchain_desc->SwapEffect); - return DXGI_ERROR_INVALID_CALL; - } - - wined3d_desc.backbuffer_width = swapchain_desc->Width; - wined3d_desc.backbuffer_height = swapchain_desc->Height; - wined3d_desc.backbuffer_format = wined3dformat_from_dxgi_format(swapchain_desc->Format); - wined3d_desc.backbuffer_count = swapchain_desc->BufferCount; - wined3d_desc.backbuffer_bind_flags = wined3d_bind_flags_from_dxgi_usage(swapchain_desc->BufferUsage); - wined3d_sample_desc_from_dxgi(&wined3d_desc.multisample_type, - &wined3d_desc.multisample_quality, &swapchain_desc->SampleDesc); - wined3d_desc.device_window = window; - wined3d_desc.windowed = fullscreen_desc ? fullscreen_desc->Windowed : TRUE; - wined3d_desc.enable_auto_depth_stencil = FALSE; - wined3d_desc.auto_depth_stencil_format = 0; - wined3d_desc.flags = wined3d_swapchain_flags_from_dxgi(swapchain_desc->Flags); - wined3d_desc.refresh_rate = fullscreen_desc ? dxgi_rational_to_uint(&fullscreen_desc->RefreshRate) : 0; - wined3d_desc.auto_restore_display_mode = TRUE; - - if (FAILED(hr = IWineDXGIDevice_create_swapchain(device, &wined3d_desc, FALSE, &wined3d_swapchain))) - { - WARN("Failed to create swapchain, hr %#x.\n", hr); - return hr; - } - - wined3d_mutex_lock(); - *swapchain = wined3d_swapchain_get_parent(wined3d_swapchain); - wined3d_mutex_unlock(); - - return S_OK; -} - #ifdef SONAME_LIBVKD3D static PFN_vkd3d_acquire_vk_queue vkd3d_acquire_vk_queue; diff --git a/include/wine/winedxgi.idl b/include/wine/winedxgi.idl index fccf45d7921..f300eb928b6 100644 --- a/include/wine/winedxgi.idl +++ b/include/wine/winedxgi.idl @@ -20,6 +20,23 @@ import "dxgi1_6.idl"; +[ + object, + local, + uuid(53cb4ff0-c25a-4164-a891-0e83db0a7aac) +] +interface IWineDXGISwapChainFactory : IUnknown +{ + HRESULT create_swapchain( + [in] IDXGIFactory *factory, + [in] HWND window, + [in] const DXGI_SWAP_CHAIN_DESC1 *desc, + [in] const DXGI_SWAP_CHAIN_FULLSCREEN_DESC *fullscreen_desc, + [in] IDXGIOutput *output, + [out] IDXGISwapChain1 **swapchain + ); +} + [ object, local,