May 2020 - Wine-Devel - list.winehq.org

[PATCH 3/5] wined3d: Specify a wined3d output for swapchain creation.
by Zhiyi Zhang May 13, 2020

May 13, 2020

As tests showed, DirectDraw, Direct3D 8 and 9 always use the adapter specified in the device creation parameters regardless of the device window position when creating a swapchain. Whereas DXGI uses the device window position to determine which DXGI output to use. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/d3d8/device.c | 21 +++++++++++++------ dlls/d3d9/device.c | 21 ++++++++++++------- dlls/ddraw/ddraw.c | 1 + dlls/dxgi/device.c | 45 ++++++++++++++++++++++++++++++++++++++-- dlls/dxgi/dxgi_private.h | 4 +++- dlls/dxgi/swapchain.c | 33 +++++++++++++++++++++++++---- dlls/dxgi/utils.c | 8 +++++-- dlls/wined3d/device.c | 1 + dlls/wined3d/swapchain.c | 14 +++---------- include/wine/wined3d.h | 1 + 10 files changed, 116 insertions(+), 33 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index d3a88acc35d..f4bdb748275 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -262,8 +262,8 @@ static enum wined3d_multisample_type wined3d_multisample_type_from_d3d(D3DMULTIS return (enum wined3d_multisample_type)type; } -static BOOL wined3d_swapchain_desc_from_present_parameters(struct wined3d_swapchain_desc *swapchain_desc, - const D3DPRESENT_PARAMETERS *present_parameters) +static BOOL wined3d_swapchain_desc_from_d3d8(struct wined3d_swapchain_desc *swapchain_desc, + struct wined3d_output *output, const D3DPRESENT_PARAMETERS *present_parameters) { if (!present_parameters->SwapEffect || present_parameters->SwapEffect > D3DSWAPEFFECT_COPY_VSYNC) { @@ -293,6 +293,7 @@ static BOOL wined3d_swapchain_desc_from_present_parameters(struct wined3d_swapch return FALSE; } + swapchain_desc->output = output; swapchain_desc->backbuffer_width = present_parameters->BackBufferWidth; swapchain_desc->backbuffer_height = present_parameters->BackBufferHeight; swapchain_desc->backbuffer_format = wined3dformat_from_d3dformat(present_parameters->BackBufferFormat); @@ -846,6 +847,7 @@ static HRESULT WINAPI d3d8_device_CreateAdditionalSwapChain(IDirect3DDevice8 *if struct wined3d_swapchain_desc desc; struct d3d8_swapchain *object; unsigned int swap_interval; + unsigned int output_idx; unsigned int i, count; HRESULT hr; @@ -876,7 +878,9 @@ static HRESULT WINAPI d3d8_device_CreateAdditionalSwapChain(IDirect3DDevice8 *if } wined3d_mutex_unlock(); - if (!wined3d_swapchain_desc_from_present_parameters(&desc, present_parameters)) + output_idx = device->adapter_ordinal; + if (!wined3d_swapchain_desc_from_d3d8(&desc, device->d3d_parent->wined3d_outputs[output_idx], + present_parameters)) return D3DERR_INVALIDCALL; swap_interval = wined3dswapinterval_from_d3d(present_parameters->FullScreen_PresentationInterval); if (SUCCEEDED(hr = d3d8_swapchain_create(device, &desc, swap_interval, &object))) @@ -941,6 +945,7 @@ static HRESULT WINAPI d3d8_device_Reset(IDirect3DDevice8 *iface, struct d3d8_device *device = impl_from_IDirect3DDevice8(iface); struct wined3d_swapchain_desc swapchain_desc; struct d3d8_swapchain *implicit_swapchain; + unsigned int output_idx; HRESULT hr; TRACE("iface %p, present_parameters %p.\n", iface, present_parameters); @@ -950,7 +955,9 @@ static HRESULT WINAPI d3d8_device_Reset(IDirect3DDevice8 *iface, WARN("App not active, returning D3DERR_DEVICELOST.\n"); return D3DERR_DEVICELOST; } - if (!wined3d_swapchain_desc_from_present_parameters(&swapchain_desc, present_parameters)) + output_idx = device->adapter_ordinal; + if (!wined3d_swapchain_desc_from_d3d8(&swapchain_desc, + device->d3d_parent->wined3d_outputs[output_idx], present_parameters)) return D3DERR_INVALIDCALL; swapchain_desc.flags |= WINED3D_SWAPCHAIN_IMPLICIT; @@ -3718,6 +3725,7 @@ HRESULT device_init(struct d3d8_device *device, struct d3d8 *parent, struct wine struct wined3d_swapchain_desc swapchain_desc; struct wined3d_swapchain *wined3d_swapchain; struct wined3d_adapter *wined3d_adapter; + struct wined3d_output *wined3d_output; struct d3d8_swapchain *d3d_swapchain; struct wined3d_caps caps; unsigned int output_idx; @@ -3750,7 +3758,8 @@ HRESULT device_init(struct d3d8_device *device, struct d3d8 *parent, struct wine if (!(flags & D3DCREATE_FPU_PRESERVE)) setup_fpu(); wined3d_mutex_lock(); - wined3d_adapter = wined3d_output_get_adapter(parent->wined3d_outputs[output_idx]); + wined3d_output = parent->wined3d_outputs[output_idx]; + wined3d_adapter = wined3d_output_get_adapter(wined3d_output); if (FAILED(hr = wined3d_device_create(wined3d, wined3d_adapter, wined3d_device_type_from_d3d(device_type), focus_window, flags, 4, feature_levels, ARRAY_SIZE(feature_levels), &device->device_parent, &device->wined3d_device))) @@ -3792,7 +3801,7 @@ HRESULT device_init(struct d3d8_device *device, struct d3d8 *parent, struct wine if (flags & D3DCREATE_MULTITHREADED) wined3d_device_set_multithreaded(device->wined3d_device); - if (!wined3d_swapchain_desc_from_present_parameters(&swapchain_desc, parameters)) + if (!wined3d_swapchain_desc_from_d3d8(&swapchain_desc, wined3d_output, parameters)) { wined3d_device_release_focus_window(device->wined3d_device); wined3d_device_decref(device->wined3d_device); diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 61aee971a1d..2ee582b4c54 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -300,8 +300,9 @@ static enum wined3d_swap_interval wined3dswapinterval_from_d3d(DWORD interval) } } -static BOOL wined3d_swapchain_desc_from_present_parameters(struct wined3d_swapchain_desc *swapchain_desc, - const D3DPRESENT_PARAMETERS *present_parameters, BOOL extended) +static BOOL wined3d_swapchain_desc_from_d3d9(struct wined3d_swapchain_desc *swapchain_desc, + struct wined3d_output *output, const D3DPRESENT_PARAMETERS *present_parameters, + BOOL extended) { D3DSWAPEFFECT highest_swapeffect = extended ? D3DSWAPEFFECT_FLIPEX : D3DSWAPEFFECT_COPY; UINT highest_bb_count = extended ? 30 : 3; @@ -332,6 +333,7 @@ static BOOL wined3d_swapchain_desc_from_present_parameters(struct wined3d_swapch return FALSE; } + swapchain_desc->output = output; swapchain_desc->backbuffer_width = present_parameters->BackBufferWidth; swapchain_desc->backbuffer_height = present_parameters->BackBufferHeight; swapchain_desc->backbuffer_format = wined3dformat_from_d3dformat(present_parameters->BackBufferFormat); @@ -887,6 +889,7 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH d3d9_device_CreateAdditionalSwapChain(ID struct wined3d_swapchain_desc desc; struct d3d9_swapchain *object; unsigned int swap_interval; + unsigned int output_idx; unsigned int i, count; HRESULT hr; @@ -917,8 +920,9 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH d3d9_device_CreateAdditionalSwapChain(ID } wined3d_mutex_unlock(); - if (!wined3d_swapchain_desc_from_present_parameters(&desc, present_parameters, - device->d3d_parent->extended)) + output_idx = device->adapter_ordinal; + if (!wined3d_swapchain_desc_from_d3d9(&desc, device->d3d_parent->wined3d_outputs[output_idx], + present_parameters, device->d3d_parent->extended)) return D3DERR_INVALIDCALL; swap_interval = wined3dswapinterval_from_d3d(present_parameters->PresentationInterval); if (SUCCEEDED(hr = d3d9_swapchain_create(device, &desc, swap_interval, &object))) @@ -1042,6 +1046,7 @@ static HRESULT d3d9_device_reset(struct d3d9_device *device, struct wined3d_display_mode wined3d_mode; struct wined3d_rendertarget_view *rtv; struct d3d9_swapchain *d3d9_swapchain; + unsigned int output_idx; unsigned int i; HRESULT hr; @@ -1060,7 +1065,9 @@ static HRESULT d3d9_device_reset(struct d3d9_device *device, wined3d_mode.scanline_ordering = wined3d_scanline_ordering_from_d3d(mode->ScanLineOrdering); } - if (!wined3d_swapchain_desc_from_present_parameters(&swapchain_desc, present_parameters, extended)) + output_idx = device->adapter_ordinal; + if (!wined3d_swapchain_desc_from_d3d9(&swapchain_desc, + device->d3d_parent->wined3d_outputs[output_idx], present_parameters, extended)) return D3DERR_INVALIDCALL; swapchain_desc.flags |= WINED3D_SWAPCHAIN_IMPLICIT; @@ -4763,8 +4770,8 @@ HRESULT device_init(struct d3d9_device *device, struct d3d9 *parent, struct wine for (i = 0; i < count; ++i) { - if (!wined3d_swapchain_desc_from_present_parameters(&swapchain_desc[i], &parameters[i], - parent->extended)) + if (!wined3d_swapchain_desc_from_d3d9(&swapchain_desc[i], + parent->wined3d_outputs[output_idx + i], &parameters[i], parent->extended)) { wined3d_device_release_focus_window(device->wined3d_device); wined3d_device_decref(device->wined3d_device); diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 866b7089080..6f640ef422a 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -563,6 +563,7 @@ static HRESULT ddraw_attach_d3d_device(struct ddraw *ddraw, HWND window, } memset(&swapchain_desc, 0, sizeof(swapchain_desc)); + swapchain_desc.output = ddraw->wined3d_output; swapchain_desc.backbuffer_width = mode.width; swapchain_desc.backbuffer_height = mode.height; swapchain_desc.backbuffer_format = mode.format_id; diff --git a/dlls/dxgi/device.c b/dlls/dxgi/device.c index 5edd431199a..5f0c40f2e47 100644 --- a/dlls/dxgi/device.c +++ b/dlls/dxgi/device.c @@ -427,13 +427,37 @@ static HRESULT STDMETHODCALLTYPE dxgi_swapchain_factory_create_swapchain(IWineDX { struct dxgi_device *device = impl_from_IWineDXGISwapChainFactory(iface); struct wined3d_swapchain_desc wined3d_desc; + struct IDXGIOutput *containing_output; struct d3d11_swapchain *object; + struct IDXGIAdapter *adapter; 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 (FAILED(hr = wined3d_swapchain_desc_from_dxgi(&wined3d_desc, window, desc, fullscreen_desc))) + if (FAILED(hr = dxgi_get_output_from_window(factory, window, &containing_output))) + { + WARN("Failed to get output from window %p, hr %#x.\n", window, hr); + + /* FIXME: As wined3d only supports one output currently, even if a window is on a + * non-primary output, the swapchain will use the primary output. Keep this behaviour + * until all outputs are correctly enumerated. Otherwise it will create a regression + * for applications that specify a device window on a non-primary output */ + if (FAILED(hr = IDXGIFactory_EnumAdapters(factory, 0, &adapter))) + return hr; + + hr = IDXGIAdapter_EnumOutputs(adapter, 0, &containing_output); + IDXGIAdapter_Release(adapter); + if (FAILED(hr)) + return hr; + + FIXME("Using the primary output for the device window that is on a non-primary output.\n"); + } + + hr = wined3d_swapchain_desc_from_dxgi(&wined3d_desc, containing_output, window, desc, + fullscreen_desc); + IDXGIOutput_Release(containing_output); + if (FAILED(hr)) return hr; if (!(object = heap_alloc_zero(sizeof(*object)))) @@ -474,7 +498,10 @@ HRESULT dxgi_device_init(struct dxgi_device *device, struct dxgi_device_layer *l struct d3d11_swapchain *swapchain; struct dxgi_adapter *dxgi_adapter; struct dxgi_factory *dxgi_factory; + struct dxgi_output *dxgi_output; + struct IDXGIOutput *output; void *layer_base; + HWND window; HRESULT hr; if (!(dxgi_factory = unsafe_impl_from_IDXGIFactory(factory))) @@ -530,11 +557,25 @@ HRESULT dxgi_device_init(struct dxgi_device *device, struct dxgi_device_layer *l return hr; } + window = dxgi_factory_get_device_window(dxgi_factory); + if (FAILED(hr = dxgi_get_output_from_window(factory, window, &output))) + { + ERR("Failed to get output from window %p.\n", window); + wined3d_device_decref(device->wined3d_device); + IUnknown_Release(device->child_layer); + wined3d_private_store_cleanup(&device->private_store); + wined3d_mutex_unlock(); + return hr; + } + dxgi_output = unsafe_impl_from_IDXGIOutput(output); + memset(&swapchain_desc, 0, sizeof(swapchain_desc)); swapchain_desc.swap_effect = WINED3D_SWAP_EFFECT_DISCARD; - swapchain_desc.device_window = dxgi_factory_get_device_window(dxgi_factory); + swapchain_desc.device_window = window; swapchain_desc.windowed = TRUE; swapchain_desc.flags = WINED3D_SWAPCHAIN_IMPLICIT; + swapchain_desc.output = dxgi_output->wined3d_output; + IDXGIOutput_Release(output); if (!(swapchain = heap_alloc_zero(sizeof(*swapchain)))) { diff --git a/dlls/dxgi/dxgi_private.h b/dlls/dxgi/dxgi_private.h index 117fe5e692c..a125a7667d9 100644 --- a/dlls/dxgi/dxgi_private.h +++ b/dlls/dxgi/dxgi_private.h @@ -96,8 +96,10 @@ void wined3d_display_mode_from_dxgi1(struct wined3d_display_mode *wined3d_mode, DXGI_USAGE dxgi_usage_from_wined3d_bind_flags(unsigned int wined3d_bind_flags) DECLSPEC_HIDDEN; unsigned int wined3d_bind_flags_from_dxgi_usage(DXGI_USAGE usage) DECLSPEC_HIDDEN; unsigned int dxgi_swapchain_flags_from_wined3d(unsigned int wined3d_flags) DECLSPEC_HIDDEN; +HRESULT dxgi_get_output_from_window(IDXGIFactory *factory, HWND window, IDXGIOutput **dxgi_output) + DECLSPEC_HIDDEN; HRESULT wined3d_swapchain_desc_from_dxgi(struct wined3d_swapchain_desc *wined3d_desc, - HWND window, const DXGI_SWAP_CHAIN_DESC1 *dxgi_desc, + IDXGIOutput *dxgi_containing_output, HWND window, const DXGI_SWAP_CHAIN_DESC1 *dxgi_desc, const DXGI_SWAP_CHAIN_FULLSCREEN_DESC *dxgi_fullscreen_desc) DECLSPEC_HIDDEN; HRESULT dxgi_get_private_data(struct wined3d_private_store *store, diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index 81ba50942ad..5351c69cdd0 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -111,8 +111,7 @@ BOOL dxgi_validate_swapchain_desc(const DXGI_SWAP_CHAIN_DESC1 *desc) return TRUE; } -static HRESULT dxgi_get_output_from_window(IDXGIFactory *factory, HWND window, - IDXGIOutput **dxgi_output) +HRESULT dxgi_get_output_from_window(IDXGIFactory *factory, HWND window, IDXGIOutput **dxgi_output) { unsigned int adapter_idx, output_idx; DXGI_OUTPUT_DESC desc; @@ -415,6 +414,7 @@ static HRESULT STDMETHODCALLTYPE DECLSPEC_HOTPATCH d3d11_swapchain_SetFullscreen struct d3d11_swapchain *swapchain = d3d11_swapchain_from_IDXGISwapChain1(iface); struct wined3d_swapchain_desc swapchain_desc; struct wined3d_swapchain_state *state; + struct dxgi_output *dxgi_output; HRESULT hr; TRACE("iface %p, fullscreen %#x, target %p.\n", iface, fullscreen, target); @@ -434,10 +434,12 @@ static HRESULT STDMETHODCALLTYPE DECLSPEC_HOTPATCH d3d11_swapchain_SetFullscreen WARN("Failed to get target output for swapchain, hr %#x.\n", hr); return hr; } + dxgi_output = unsafe_impl_from_IDXGIOutput(target); wined3d_mutex_lock(); state = wined3d_swapchain_get_state(swapchain->wined3d_swapchain); wined3d_swapchain_get_desc(swapchain->wined3d_swapchain, &swapchain_desc); + swapchain_desc.output = dxgi_output->wined3d_output; swapchain_desc.windowed = !fullscreen; hr = dxgi_swapchain_set_fullscreen_state(state, &swapchain_desc, target); wined3d_mutex_unlock(); @@ -2261,7 +2263,8 @@ static HRESULT STDMETHODCALLTYPE DECLSPEC_HOTPATCH d3d12_swapchain_SetFullscreen return hr; } - if (FAILED(hr = wined3d_swapchain_desc_from_dxgi(&wined3d_desc, window, swapchain_desc, fullscreen_desc))) + if (FAILED(hr = wined3d_swapchain_desc_from_dxgi(&wined3d_desc, target, window, swapchain_desc, + fullscreen_desc))) goto fail; wined3d_mutex_lock(); wined3d_desc.windowed = !fullscreen; @@ -2928,6 +2931,7 @@ static HRESULT d3d12_swapchain_init(struct d3d12_swapchain *swapchain, IWineDXGI IUnknown *device_parent; VkInstance vk_instance; IDXGIAdapter *adapter; + IDXGIOutput *output; VkBool32 supported; VkDevice vk_device; VkFence vk_fence; @@ -2970,8 +2974,29 @@ static HRESULT d3d12_swapchain_init(struct d3d12_swapchain *swapchain, IWineDXGI if (FAILED(hr = IUnknown_QueryInterface(device_parent, &IID_IDXGIAdapter, (void **)&adapter))) return hr; dxgi_adapter = unsafe_impl_from_IDXGIAdapter(adapter); + + if (FAILED(hr = dxgi_get_output_from_window((IDXGIFactory *)factory, window, &output))) + { + WARN("Failed to get output from window %p, hr %#x.\n", window, hr); + + /* FIXME: As wined3d only supports one output currently, even if a window is on a + * non-primary output, the swapchain will use the primary output. Keep this behaviour + * until all outputs are correctly enumerated. Otherwise it will create a regression + * for applications that specify a device window on a non-primary output */ + if (FAILED(hr = IDXGIAdapter_EnumOutputs(adapter, 0, &output))) + { + IDXGIAdapter_Release(adapter); + return hr; + } + + FIXME("Using the primary output for the device window that is on a non-primary output.\n"); + } IDXGIAdapter_Release(adapter); - if (FAILED(hr = wined3d_swapchain_desc_from_dxgi(&wined3d_desc, window, swapchain_desc, fullscreen_desc))) + + hr = wined3d_swapchain_desc_from_dxgi(&wined3d_desc, output, window, swapchain_desc, + fullscreen_desc); + IDXGIOutput_Release(output); + if (FAILED(hr)) return hr; if (FAILED(hr = wined3d_swapchain_state_create(&wined3d_desc, window, dxgi_adapter->factory->wined3d, &swapchain->state))) diff --git a/dlls/dxgi/utils.c b/dlls/dxgi/utils.c index a32c7ee1294..ca87e3c1942 100644 --- a/dlls/dxgi/utils.c +++ b/dlls/dxgi/utils.c @@ -561,9 +561,12 @@ static unsigned int wined3d_swapchain_flags_from_dxgi(unsigned int flags) return wined3d_flags; } -HRESULT wined3d_swapchain_desc_from_dxgi(struct wined3d_swapchain_desc *wined3d_desc, HWND window, - const DXGI_SWAP_CHAIN_DESC1 *dxgi_desc, const DXGI_SWAP_CHAIN_FULLSCREEN_DESC *dxgi_fullscreen_desc) +HRESULT wined3d_swapchain_desc_from_dxgi(struct wined3d_swapchain_desc *wined3d_desc, + IDXGIOutput *dxgi_containing_output, HWND window, const DXGI_SWAP_CHAIN_DESC1 *dxgi_desc, + const DXGI_SWAP_CHAIN_FULLSCREEN_DESC *dxgi_fullscreen_desc) { + struct dxgi_output *dxgi_output = unsafe_impl_from_IDXGIOutput(dxgi_containing_output); + if (dxgi_desc->Scaling != DXGI_SCALING_STRETCH) FIXME("Ignoring scaling %#x.\n", dxgi_desc->Scaling); if (dxgi_desc->AlphaMode != DXGI_ALPHA_MODE_IGNORE) @@ -592,6 +595,7 @@ HRESULT wined3d_swapchain_desc_from_dxgi(struct wined3d_swapchain_desc *wined3d_ return DXGI_ERROR_INVALID_CALL; } + wined3d_desc->output = dxgi_output->wined3d_output; wined3d_desc->backbuffer_width = dxgi_desc->Width; wined3d_desc->backbuffer_height = dxgi_desc->Height; wined3d_desc->backbuffer_format = wined3dformat_from_dxgi_format(dxgi_desc->Format); diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 1711014c8d2..cc13ab4863e 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4910,6 +4910,7 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, } TRACE("New params:\n"); + TRACE("output %p\n", swapchain_desc->output); TRACE("backbuffer_width %u\n", swapchain_desc->backbuffer_width); TRACE("backbuffer_height %u\n", swapchain_desc->backbuffer_height); TRACE("backbuffer_format %s\n", debug_d3dformat(swapchain_desc->backbuffer_format)); diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 466bcd95cae..3e303789f6e 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -873,7 +873,6 @@ static HRESULT wined3d_swapchain_init(struct wined3d_swapchain *swapchain, struc { struct wined3d_resource_desc texture_desc; struct wined3d_output_desc output_desc; - struct wined3d_output *output; BOOL displaymode_set = FALSE; DWORD texture_flags = 0; HRESULT hr = E_FAIL; @@ -934,13 +933,7 @@ static HRESULT wined3d_swapchain_init(struct wined3d_swapchain *swapchain, struc } else { - if (!(output = wined3d_swapchain_get_output(swapchain))) - { - ERR("Failed to get output from swapchain %p.\n", swapchain); - goto err; - } - - if (FAILED(hr = wined3d_output_get_desc(output, &output_desc))) + if (FAILED(hr = wined3d_output_get_desc(desc->output, &output_desc))) { ERR("Failed to get output description, hr %#x.\n", hr); goto err; @@ -996,8 +989,7 @@ static HRESULT wined3d_swapchain_init(struct wined3d_swapchain *swapchain, struc if (!desc->windowed && desc->flags & WINED3D_SWAPCHAIN_ALLOW_MODE_SWITCH) { /* Change the display settings */ - output = wined3d_swapchain_get_output(swapchain); - if (!output || FAILED(hr = wined3d_output_set_display_mode(output, + if (FAILED(hr = wined3d_output_set_display_mode(desc->output, &swapchain->state.d3d_mode))) { WARN("Failed to set display mode, hr %#x.\n", hr); @@ -1081,7 +1073,7 @@ static HRESULT wined3d_swapchain_init(struct wined3d_swapchain *swapchain, struc err: if (displaymode_set) { - if (!output || FAILED(wined3d_output_set_display_mode(output, + if (FAILED(wined3d_output_set_display_mode(desc->output, &swapchain->state.original_mode))) ERR("Failed to restore display mode.\n"); } diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index d3eb8100cd8..cfec8f10c8c 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -1756,6 +1756,7 @@ struct wined3d_adapter_identifier struct wined3d_swapchain_desc { + struct wined3d_output *output; unsigned int backbuffer_width; unsigned int backbuffer_height; enum wined3d_format_id backbuffer_format; -- 2.25.1

2 1

[PATCH 2/5] d3d8: Store a struct d3d8 in struct d3d8_device.
by Zhiyi Zhang May 13, 2020

May 13, 2020

So that d3d_parent->wined3d_outputs can be directly accessed in device. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/d3d8/d3d8_private.h | 2 +- dlls/d3d8/device.c | 13 +++++++------ 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/dlls/d3d8/d3d8_private.h b/dlls/d3d8/d3d8_private.h index 04bca7ddfa0..e98746a13bd 100644 --- a/dlls/d3d8/d3d8_private.h +++ b/dlls/d3d8/d3d8_private.h @@ -115,7 +115,7 @@ struct d3d8_device LONG ref; struct wined3d_device *wined3d_device; unsigned int adapter_ordinal; - IDirect3D8 *d3d_parent; + struct d3d8 *d3d_parent; struct d3d8_handle_table handle_table; /* FVF management */ diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index e123502dab6..d3a88acc35d 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -609,7 +609,7 @@ static ULONG WINAPI d3d8_device_Release(IDirect3DDevice8 *iface) if (!ref) { - IDirect3D8 *parent = device->d3d_parent; + IDirect3D8 *parent = &device->d3d_parent->IDirect3D8_iface; unsigned i; TRACE("Releasing wined3d device %p.\n", device->wined3d_device); @@ -705,7 +705,8 @@ static HRESULT WINAPI d3d8_device_GetDirect3D(IDirect3DDevice8 *iface, IDirect3D if (!d3d8) return D3DERR_INVALIDCALL; - return IDirect3D8_QueryInterface(device->d3d_parent, &IID_IDirect3D8, (void **)d3d8); + return IDirect3D8_QueryInterface(&device->d3d_parent->IDirect3D8_iface, &IID_IDirect3D8, + (void **)d3d8); } static HRESULT WINAPI d3d8_device_GetDeviceCaps(IDirect3DDevice8 *iface, D3DCAPS8 *caps) @@ -791,8 +792,8 @@ static HRESULT WINAPI d3d8_device_SetCursorProperties(IDirect3DDevice8 *iface, return hr; } - if (FAILED(hr = IDirect3D8_GetAdapterDisplayMode(device->d3d_parent, device->adapter_ordinal, - &mode))) + if (FAILED(hr = IDirect3D8_GetAdapterDisplayMode(&device->d3d_parent->IDirect3D8_iface, + device->adapter_ordinal, &mode))) { WARN("Failed to get device display mode, hr %#x.\n", hr); return hr; @@ -3835,8 +3836,8 @@ HRESULT device_init(struct d3d8_device *device, struct d3d8 *parent, struct wine device->implicit_swapchain = wined3d_swapchain; - device->d3d_parent = &parent->IDirect3D8_iface; - IDirect3D8_AddRef(device->d3d_parent); + device->d3d_parent = parent; + IDirect3D8_AddRef(&parent->IDirect3D8_iface); return D3D_OK; -- 2.25.1

2 1

[PATCH 1/5] dxgi/tests: Test IDXGISwapChain_GetContainingOutput() after Alt+Enter.
by Zhiyi Zhang May 13, 2020

May 13, 2020

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/dxgi/tests/dxgi.c | 89 +++++++++++++++++++++++++++++++++++++++++- 1 file changed, 88 insertions(+), 1 deletion(-) diff --git a/dlls/dxgi/tests/dxgi.c b/dlls/dxgi/tests/dxgi.c index dd00be1e8cf..e8dfa036e08 100644 --- a/dlls/dxgi/tests/dxgi.c +++ b/dlls/dxgi/tests/dxgi.c @@ -2095,9 +2095,9 @@ static HMONITOR get_primary_if_right_side_secondary(const DXGI_OUTPUT_DESC *outp static void test_get_containing_output(void) { unsigned int adapter_idx, output_idx, output_count; + DXGI_OUTPUT_DESC output_desc, output_desc2; DXGI_SWAP_CHAIN_DESC swapchain_desc; IDXGIOutput *output, *output2; - DXGI_OUTPUT_DESC output_desc; MONITORINFOEXW monitor_info; IDXGISwapChain *swapchain; IDXGIFactory *factory; @@ -2369,6 +2369,93 @@ static void test_get_containing_output(void) hr = IDXGISwapChain_SetFullscreenState(swapchain, FALSE, NULL); ok(hr == S_OK, "SetFullscreenState failed, hr %#x.\n", hr); + /* Test GetContainingOutput after a full screen swapchain is made windowed by pressing + * Alt+Enter, then move it to another output and use Alt+Enter to enter full screen */ + output = NULL; + output2 = NULL; + for (adapter_idx = 0; SUCCEEDED(IDXGIFactory_EnumAdapters(factory, adapter_idx, &adapter)); + ++adapter_idx) + { + for (output_idx = 0; SUCCEEDED(IDXGIAdapter_EnumOutputs(adapter, output_idx, + output ? &output2 : &output)); ++output_idx) + { + if (output2) + break; + } + + IDXGIAdapter_Release(adapter); + if (output2) + break; + } + + if (output && output2) + { + hr = IDXGISwapChain_SetFullscreenState(swapchain, TRUE, output); + IDXGIOutput_Release(output); + if (FAILED(hr)) + { + skip("SetFullscreenState failed, hr %#x.\n", hr); + IDXGIOutput_Release(output2); + goto done; + } + + /* Post an Alt + VK_RETURN WM_SYSKEYDOWN to leave full screen on the first output */ + PostMessageA(swapchain_desc.OutputWindow, WM_SYSKEYDOWN, VK_RETURN, + (MapVirtualKeyA(VK_RETURN, MAPVK_VK_TO_VSC) << 16) | 0x20000001); + flush_events(); + hr = IDXGISwapChain_GetFullscreenState(swapchain, &fullscreen, NULL); + ok(hr == S_OK, "GetFullscreenState failed, hr %#x.\n", hr); + ok(!fullscreen, "Expect swapchain not full screen.\n"); + + /* Move the swapchain output window to the second output */ + hr = IDXGIOutput_GetDesc(output2, &output_desc2); + ok(hr == S_OK, "GetDesc failed, hr %#x.\n", hr); + ret = SetWindowPos(swapchain_desc.OutputWindow, 0, output_desc2.DesktopCoordinates.left, + output_desc2.DesktopCoordinates.top, 0, 0, SWP_NOSIZE | SWP_NOZORDER); + ok(ret, "SetWindowPos failed.\n"); + + /* Post an Alt + VK_RETURN WM_SYSKEYDOWN to enter full screen on the second output */ + PostMessageA(swapchain_desc.OutputWindow, WM_SYSKEYDOWN, VK_RETURN, + (MapVirtualKeyA(VK_RETURN, MAPVK_VK_TO_VSC) << 16) | 0x20000001); + flush_events(); + output = NULL; + hr = IDXGISwapChain_GetFullscreenState(swapchain, &fullscreen, &output); + ok(hr == S_OK, "GetFullscreenState failed, hr %#x.\n", hr); + ok(fullscreen, "Expect swapchain full screen.\n"); + ok(!!output, "Expect output not NULL.\n"); + hr = IDXGIOutput_GetDesc(output, &output_desc); + ok(hr == S_OK, "GetDesc failed, hr %#x.\n", hr); + hr = IDXGIOutput_GetDesc(output2, &output_desc2); + ok(hr == S_OK, "GetDesc failed, hr %#x.\n", hr); + todo_wine ok(!lstrcmpW(output_desc.DeviceName, output_desc2.DeviceName), + "Expect device name %s, got %s.\n", wine_dbgstr_w(output_desc2.DeviceName), + wine_dbgstr_w(output_desc.DeviceName)); + IDXGIOutput_Release(output); + + output = NULL; + hr = IDXGISwapChain_GetContainingOutput(swapchain, &output); + ok(hr == S_OK, "GetContainingOutput failed, hr %#x.\n", hr); + hr = IDXGIOutput_GetDesc(output, &output_desc); + ok(hr == S_OK, "GetDesc failed, hr %#x.\n", hr); + hr = IDXGIOutput_GetDesc(output2, &output_desc2); + ok(hr == S_OK, "GetDesc failed, hr %#x.\n", hr); + todo_wine ok(!lstrcmpW(output_desc.DeviceName, output_desc2.DeviceName), + "Expect device name %s, got %s.\n", wine_dbgstr_w(output_desc2.DeviceName), + wine_dbgstr_w(output_desc.DeviceName)); + + hr = IDXGISwapChain_SetFullscreenState(swapchain, FALSE, NULL); + ok(hr == S_OK, "SetFullscreenState failed, hr %#x.\n", hr); + } + else + { + skip("This test requires two outputs.\n"); + } + + if (output) + IDXGIOutput_Release(output); + if (output2) + IDXGIOutput_Release(output2); + done: refcount = IDXGISwapChain_Release(swapchain); ok(!refcount, "IDXGISwapChain has %u references left.\n", refcount); -- 2.25.1

3 2

[PATCH 9/9] dxgi: Add stubs for IDXGIFactory7.
by Henri Verbeet May 13, 2020

May 13, 2020

From: Philip Rebohle <philip.rebohle(a)tu-dortmund.de> Signed-off-by: Philip Rebohle <philip.rebohle(a)tu-dortmund.de> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- This supersedes patch 185154. Unmodified resend. dlls/dxgi/factory.c | 20 ++++++++++++++++++++ include/wine/winedxgi.idl | 2 +- 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/dlls/dxgi/factory.c b/dlls/dxgi/factory.c index c6acbaaf671..6acce516de9 100644 --- a/dlls/dxgi/factory.c +++ b/dlls/dxgi/factory.c @@ -36,6 +36,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_factory_QueryInterface(IWineDXGIFactory *i TRACE("iface %p, iid %s, out %p.\n", iface, debugstr_guid(iid), out); if (IsEqualGUID(iid, &IID_IWineDXGIFactory) + || IsEqualGUID(iid, &IID_IDXGIFactory7) || IsEqualGUID(iid, &IID_IDXGIFactory6) || IsEqualGUID(iid, &IID_IDXGIFactory5) || IsEqualGUID(iid, &IID_IDXGIFactory4) @@ -483,6 +484,22 @@ static HRESULT STDMETHODCALLTYPE dxgi_factory_EnumAdapterByGpuPreference(IWineDX return hr; } +static HRESULT STDMETHODCALLTYPE dxgi_factory_RegisterAdaptersChangedEvent(IWineDXGIFactory *iface, + HANDLE event, DWORD *cookie) +{ + FIXME("iface %p, event %p, cookie %p stub!\n", iface, event, cookie); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE dxgi_factory_UnregisterAdaptersChangedEvent(IWineDXGIFactory *iface, + DWORD cookie) +{ + FIXME("iface %p, cookie %#x stub!\n", iface, cookie); + + return E_NOTIMPL; +} + static const struct IWineDXGIFactoryVtbl dxgi_factory_vtbl = { dxgi_factory_QueryInterface, @@ -521,6 +538,9 @@ static const struct IWineDXGIFactoryVtbl dxgi_factory_vtbl = dxgi_factory_CheckFeatureSupport, /* IDXGIFactory6 methods */ dxgi_factory_EnumAdapterByGpuPreference, + /* IDXGIFactory7 methods */ + dxgi_factory_RegisterAdaptersChangedEvent, + dxgi_factory_UnregisterAdaptersChangedEvent, }; struct dxgi_factory *unsafe_impl_from_IDXGIFactory(IDXGIFactory *iface) diff --git a/include/wine/winedxgi.idl b/include/wine/winedxgi.idl index 95c99b25355..83012047ea7 100644 --- a/include/wine/winedxgi.idl +++ b/include/wine/winedxgi.idl @@ -89,6 +89,6 @@ interface IWineDXGIAdapter : IDXGIAdapter4 local, uuid(ea02a0d1-4c95-488a-a82c-6034621e8c4f) ] -interface IWineDXGIFactory : IDXGIFactory6 +interface IWineDXGIFactory : IDXGIFactory7 { } -- 2.20.1

1 0

[PATCH 8/9] include: Add IDXGIFactory7.
by Henri Verbeet May 13, 2020

May 13, 2020

From: Philip Rebohle <philip.rebohle(a)tu-dortmund.de> Signed-off-by: Philip Rebohle <philip.rebohle(a)tu-dortmund.de> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- This supersedes patch 185153. Unmodified resend. include/dxgi1_6.idl | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/include/dxgi1_6.idl b/include/dxgi1_6.idl index fba72d57604..e24dd4b367a 100644 --- a/include/dxgi1_6.idl +++ b/include/dxgi1_6.idl @@ -119,3 +119,20 @@ interface IDXGIFactory6 : IDXGIFactory5 [out] void **adapter ); } + +[ + object, + uuid(a4966eed-76db-44da-84c1-ee9a7afb20a8), + local, + pointer_default(unique) +] +interface IDXGIFactory7 : IDXGIFactory6 +{ + HRESULT RegisterAdaptersChangedEvent( + [in] HANDLE event, + [out] DWORD *cookie + ); + HRESULT UnregisterAdaptersChangedEvent( + [in] DWORD cookie + ); +} -- 2.20.1

1 0

[PATCH 7/9] dxgi: Implement IDXGIFactory6.
by Henri Verbeet May 13, 2020

May 13, 2020

From: Philip Rebohle <philip.rebohle(a)tu-dortmund.de> Required by the d3d12 game "Delores: A Thimbleweed Park Mini-Adventure". Signed-off-by: Philip Rebohle <philip.rebohle(a)tu-dortmund.de> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- This supersedes patch 185152. Add the TRACE requested by Zhiyi. dlls/dxgi/factory.c | 23 +++++++++++++++++++++++ include/wine/winedxgi.idl | 2 +- 2 files changed, 24 insertions(+), 1 deletion(-) diff --git a/dlls/dxgi/factory.c b/dlls/dxgi/factory.c index 39c9e10f7a4..c6acbaaf671 100644 --- a/dlls/dxgi/factory.c +++ b/dlls/dxgi/factory.c @@ -36,6 +36,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_factory_QueryInterface(IWineDXGIFactory *i TRACE("iface %p, iid %s, out %p.\n", iface, debugstr_guid(iid), out); if (IsEqualGUID(iid, &IID_IWineDXGIFactory) + || IsEqualGUID(iid, &IID_IDXGIFactory6) || IsEqualGUID(iid, &IID_IDXGIFactory5) || IsEqualGUID(iid, &IID_IDXGIFactory4) || IsEqualGUID(iid, &IID_IDXGIFactory3) @@ -462,6 +463,26 @@ static HRESULT STDMETHODCALLTYPE dxgi_factory_CheckFeatureSupport(IWineDXGIFacto } } +static HRESULT STDMETHODCALLTYPE dxgi_factory_EnumAdapterByGpuPreference(IWineDXGIFactory *iface, + UINT adapter_idx, DXGI_GPU_PREFERENCE gpu_preference, REFIID iid, void **adapter) +{ + IDXGIAdapter1 *adapter_object; + HRESULT hr; + + TRACE("iface %p, adapter_idx %u, gpu_preference %#x, iid %s, adapter %p.\n", + iface, adapter_idx, gpu_preference, debugstr_guid(iid), adapter); + + if (gpu_preference != DXGI_GPU_PREFERENCE_UNSPECIFIED) + FIXME("Ignoring GPU preference %#x.\n", gpu_preference); + + if (FAILED(hr = dxgi_factory_EnumAdapters1(iface, adapter_idx, &adapter_object))) + return hr; + + hr = IDXGIAdapter1_QueryInterface(adapter_object, iid, adapter); + IDXGIAdapter1_Release(adapter_object); + return hr; +} + static const struct IWineDXGIFactoryVtbl dxgi_factory_vtbl = { dxgi_factory_QueryInterface, @@ -498,6 +519,8 @@ static const struct IWineDXGIFactoryVtbl dxgi_factory_vtbl = dxgi_factory_EnumWarpAdapter, /* IDXIGFactory5 methods */ dxgi_factory_CheckFeatureSupport, + /* IDXGIFactory6 methods */ + dxgi_factory_EnumAdapterByGpuPreference, }; struct dxgi_factory *unsafe_impl_from_IDXGIFactory(IDXGIFactory *iface) diff --git a/include/wine/winedxgi.idl b/include/wine/winedxgi.idl index 070ac2fddaa..95c99b25355 100644 --- a/include/wine/winedxgi.idl +++ b/include/wine/winedxgi.idl @@ -89,6 +89,6 @@ interface IWineDXGIAdapter : IDXGIAdapter4 local, uuid(ea02a0d1-4c95-488a-a82c-6034621e8c4f) ] -interface IWineDXGIFactory : IDXGIFactory5 +interface IWineDXGIFactory : IDXGIFactory6 { } -- 2.20.1

1 0

[PATCH 6/9] include: Add IDXGIFactory6.
by Henri Verbeet May 13, 2020

May 13, 2020

From: Philip Rebohle <philip.rebohle(a)tu-dortmund.de> Signed-off-by: Philip Rebohle <philip.rebohle(a)tu-dortmund.de> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- This supersedes patch 185151. Fix the "adapter" parameter name, as pointed out by Zhiyi. include/dxgi1_6.idl | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/include/dxgi1_6.idl b/include/dxgi1_6.idl index 9dcf9f26b46..fba72d57604 100644 --- a/include/dxgi1_6.idl +++ b/include/dxgi1_6.idl @@ -34,6 +34,13 @@ typedef enum DXGI_HARDWARE_COMPOSITION_SUPPORT_FLAGS DXGI_HARDWARE_COMPOSITION_SUPPORT_FLAG_CURSOR_STRETCHED = 0x4, } DXGI_HARDWARE_COMPOSITION_SUPPORT_FLAGS; +typedef enum DXGI_GPU_PREFERENCE +{ + DXGI_GPU_PREFERENCE_UNSPECIFIED = 0x0, + DXGI_GPU_PREFERENCE_MINIMUM_POWER = 0x1, + DXGI_GPU_PREFERENCE_HIGH_PERFORMANCE = 0x2, +} DXGI_GPU_PREFERENCE; + typedef struct DXGI_ADAPTER_DESC3 { WCHAR Description[128]; @@ -96,3 +103,19 @@ interface IDXGIOutput6 : IDXGIOutput5 [out] UINT *flags ); } + +[ + object, + uuid(c1b6694f-ff09-44a9-b03c-77900a0a1d17), + local, + pointer_default(unique) +] +interface IDXGIFactory6 : IDXGIFactory5 +{ + HRESULT EnumAdapterByGpuPreference( + [in] UINT adapter_idx, + [in] DXGI_GPU_PREFERENCE gpu_preference, + [in] REFIID iid, + [out] void **adapter + ); +} -- 2.20.1

1 0

[PATCH 5/9] wined3d: Implement Vulkan image unordered access view descriptors.
by Henri Verbeet May 13, 2020

May 13, 2020

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/context_vk.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/context_vk.c b/dlls/wined3d/context_vk.c index e31527f8be6..e37cbc787fc 100644 --- a/dlls/wined3d/context_vk.c +++ b/dlls/wined3d/context_vk.c @@ -1419,8 +1419,14 @@ static bool wined3d_context_vk_update_descriptors(struct wined3d_context_vk *con } else { - FIXME("Image UAVs not implemented.\n"); - return false; + struct wined3d_texture_vk *texture_vk = wined3d_texture_vk(texture_from_resource(resource)); + + if (view_vk->u.vk_image_info.imageView) + image_info = &view_vk->u.vk_image_info; + else + image_info = wined3d_texture_vk_get_default_image_info(texture_vk, context_vk); + buffer_view = NULL; + type = VK_DESCRIPTOR_TYPE_STORAGE_IMAGE; } if (!wined3d_shader_descriptor_writes_vk_add_write(writes, vk_descriptor_set, @@ -1602,6 +1608,11 @@ static void wined3d_context_vk_load_shader_resources(struct wined3d_context_vk * wined3d_buffer_load(buffer_from_resource(uav->resource), &context_vk->c, state); wined3d_unordered_access_view_invalidate_location(uav, ~WINED3D_LOCATION_BUFFER); } + else + { + wined3d_texture_load(texture_from_resource(uav->resource), &context_vk->c, FALSE); + wined3d_unordered_access_view_invalidate_location(uav, ~WINED3D_LOCATION_TEXTURE_RGB); + } wined3d_context_vk_reference_unordered_access_view(context_vk, uav_vk); break; -- 2.20.1

1 0

[PATCH 4/9] wined3d: Implement Vulkan buffer unordered access view descriptors.
by Henri Verbeet May 13, 2020

May 13, 2020

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/adapter_vk.c | 1 + dlls/wined3d/context_vk.c | 49 +++++++++++++++++++++++++++++++++- dlls/wined3d/view.c | 28 +++++++++++++++++-- dlls/wined3d/wined3d_private.h | 14 ++++++++++ 4 files changed, 89 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index 8758627cb19..4dbbb0b80ef 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -1438,6 +1438,7 @@ static void adapter_vk_destroy_unordered_access_view(struct wined3d_unordered_ac vk_buffer_view = &view_vk->u.vk_buffer_view; else vk_image_view = &view_vk->u.vk_image_info.imageView; + list_remove(&view_vk->bo_user.entry); wined3d_unordered_access_view_cleanup(&uav_vk->v); wined3d_view_vk_destroy(device, vk_buffer_view, vk_image_view, &uav_vk->counter_bo, &uav_vk->vk_counter_view, &view_vk->command_buffer_id, uav_vk); diff --git a/dlls/wined3d/context_vk.c b/dlls/wined3d/context_vk.c index ba1f6bb9261..e31527f8be6 100644 --- a/dlls/wined3d/context_vk.c +++ b/dlls/wined3d/context_vk.c @@ -1329,6 +1329,7 @@ static bool wined3d_context_vk_update_descriptors(struct wined3d_context_vk *con const struct wined3d_vk_info *vk_info = context_vk->vk_info; const struct wined3d_shader_resource_binding *binding; struct wined3d_shader_resource_bindings *bindings; + struct wined3d_unordered_access_view *uav; const VkDescriptorBufferInfo *buffer_info; struct wined3d_shader_resource_view *srv; const VkDescriptorImageInfo *image_info; @@ -1401,6 +1402,32 @@ static bool wined3d_context_vk_update_descriptors(struct wined3d_context_vk *con return false; break; + case WINED3D_SHADER_DESCRIPTOR_TYPE_UAV: + if (!(uav = state->unordered_access_view[WINED3D_PIPELINE_COMPUTE][binding->resource_idx])) + { + FIXME("NULL unordered access views not implemented.\n"); + return false; + } + resource = uav->resource; + + view_vk = &wined3d_unordered_access_view_vk(uav)->view_vk; + if (resource->type == WINED3D_RTYPE_BUFFER) + { + image_info = NULL; + buffer_view = &view_vk->u.vk_buffer_view; + type = VK_DESCRIPTOR_TYPE_STORAGE_TEXEL_BUFFER; + } + else + { + FIXME("Image UAVs not implemented.\n"); + return false; + } + + if (!wined3d_shader_descriptor_writes_vk_add_write(writes, vk_descriptor_set, + binding->binding_idx, type, NULL, image_info, buffer_view)) + return false; + break; + case WINED3D_SHADER_DESCRIPTOR_TYPE_SAMPLER: if (!(sampler = state->sampler[binding->shader_type][binding->resource_idx])) sampler = context_vk->c.device->null_sampler; @@ -1512,7 +1539,9 @@ static void wined3d_context_vk_load_shader_resources(struct wined3d_context_vk * const struct wined3d_shader_resource_bindings *bindings = &context_vk->compute.bindings; struct wined3d_shader_descriptor_writes_vk *writes = &context_vk->descriptor_writes; const struct wined3d_shader_resource_binding *binding; + struct wined3d_unordered_access_view_vk *uav_vk; struct wined3d_shader_resource_view_vk *srv_vk; + struct wined3d_unordered_access_view *uav; struct wined3d_shader_resource_view *srv; struct wined3d_buffer_vk *buffer_vk; struct wined3d_sampler *sampler; @@ -1558,6 +1587,24 @@ static void wined3d_context_vk_load_shader_resources(struct wined3d_context_vk * wined3d_context_vk_reference_shader_resource_view(context_vk, srv_vk); break; + case WINED3D_SHADER_DESCRIPTOR_TYPE_UAV: + if (!(uav = state->unordered_access_view[WINED3D_PIPELINE_COMPUTE][binding->resource_idx])) + break; + + uav_vk = wined3d_unordered_access_view_vk(uav); + if (uav->resource->type == WINED3D_RTYPE_BUFFER) + { + if (!uav_vk->view_vk.bo_user.valid) + { + wined3d_unordered_access_view_vk_update(uav_vk, context_vk); + context_invalidate_compute_state(&context_vk->c, STATE_COMPUTE_UNORDERED_ACCESS_VIEW_BINDING); + } + wined3d_buffer_load(buffer_from_resource(uav->resource), &context_vk->c, state); + wined3d_unordered_access_view_invalidate_location(uav, ~WINED3D_LOCATION_BUFFER); + } + wined3d_context_vk_reference_unordered_access_view(context_vk, uav_vk); + break; + case WINED3D_SHADER_DESCRIPTOR_TYPE_UAV_COUNTER: break; @@ -1568,7 +1615,7 @@ static void wined3d_context_vk_load_shader_resources(struct wined3d_context_vk * break; default: - FIXME("Unhandled descriptor type %#x.\n", binding->shader_descriptor_type); + ERR("Invalid descriptor type %#x.\n", binding->shader_descriptor_type); break; } } diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index 4a75c696578..10fcd695135 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -1478,6 +1478,25 @@ HRESULT wined3d_unordered_access_view_gl_init(struct wined3d_unordered_access_vi return hr; } +void wined3d_unordered_access_view_vk_update(struct wined3d_unordered_access_view_vk *uav_vk, + struct wined3d_context_vk *context_vk) +{ + const struct wined3d_format_vk *view_format_vk = wined3d_format_vk(uav_vk->v.format); + const struct wined3d_view_desc *desc = &uav_vk->v.desc; + struct wined3d_resource *resource = uav_vk->v.resource; + struct wined3d_view_vk *view_vk = &uav_vk->view_vk; + struct wined3d_buffer_vk *buffer_vk; + VkBufferView vk_buffer_view; + + buffer_vk = wined3d_buffer_vk(buffer_from_resource(resource)); + wined3d_context_vk_destroy_buffer_view(context_vk, view_vk->u.vk_buffer_view, view_vk->command_buffer_id); + if ((vk_buffer_view = wined3d_view_vk_create_buffer_view(context_vk, desc, buffer_vk, view_format_vk))) + { + view_vk->u.vk_buffer_view = vk_buffer_view; + view_vk->bo_user.valid = true; + } +} + static void wined3d_unordered_access_view_vk_cs_init(void *object) { struct wined3d_unordered_access_view_vk *uav_vk = object; @@ -1488,6 +1507,7 @@ static void wined3d_unordered_access_view_vk_cs_init(void *object) struct wined3d_texture_vk *texture_vk; struct wined3d_context_vk *context_vk; struct wined3d_device_vk *device_vk; + struct wined3d_buffer_vk *buffer_vk; VkBufferViewCreateInfo create_info; struct wined3d_resource *resource; VkBufferView vk_buffer_view; @@ -1501,15 +1521,18 @@ static void wined3d_unordered_access_view_vk_cs_init(void *object) if (resource->type == WINED3D_RTYPE_BUFFER) { + buffer_vk = wined3d_buffer_vk(buffer_from_resource(resource)); + context_vk = wined3d_context_vk(context_acquire(&device_vk->d, NULL, 0)); vk_info = context_vk->vk_info; - if ((vk_buffer_view = wined3d_view_vk_create_buffer_view(context_vk, - desc, wined3d_buffer_vk(buffer_from_resource(resource)), format_vk))) + if ((vk_buffer_view = wined3d_view_vk_create_buffer_view(context_vk, desc, buffer_vk, format_vk))) { TRACE("Created buffer view 0x%s.\n", wine_dbgstr_longlong(vk_buffer_view)); uav_vk->view_vk.u.vk_buffer_view = vk_buffer_view; + uav_vk->view_vk.bo_user.valid = true; + list_add_head(&buffer_vk->bo.users, &view_vk->bo_user.entry); } if (desc->flags & (WINED3D_VIEW_BUFFER_COUNTER | WINED3D_VIEW_BUFFER_APPEND)) @@ -1597,6 +1620,7 @@ HRESULT wined3d_unordered_access_view_vk_init(struct wined3d_unordered_access_vi if (FAILED(hr = wined3d_unordered_access_view_init(&view_vk->v, desc, resource, parent, parent_ops))) return hr; + list_init(&view_vk->view_vk.bo_user.entry); wined3d_cs_init_object(resource->device->cs, wined3d_unordered_access_view_vk_cs_init, view_vk); return hr; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 93852e0de79..d9e8ffa816f 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4784,6 +4784,8 @@ static inline struct wined3d_unordered_access_view_vk *wined3d_unordered_access_ HRESULT wined3d_unordered_access_view_vk_init(struct wined3d_unordered_access_view_vk *view_vk, const struct wined3d_view_desc *desc, struct wined3d_resource *resource, void *parent, const struct wined3d_parent_ops *parent_ops) DECLSPEC_HIDDEN; +void wined3d_unordered_access_view_vk_update(struct wined3d_unordered_access_view_vk *view_vk, + struct wined3d_context_vk *context_vk) DECLSPEC_HIDDEN; struct wined3d_swapchain_state { @@ -5692,6 +5694,18 @@ static inline void wined3d_context_vk_reference_shader_resource_view(const struc srv_vk->view_vk.command_buffer_id = context_vk->current_command_buffer.id; } +static inline void wined3d_context_vk_reference_unordered_access_view(const struct wined3d_context_vk *context_vk, + struct wined3d_unordered_access_view_vk *uav_vk) +{ + struct wined3d_resource *resource = uav_vk->v.resource; + + if (resource->type == WINED3D_RTYPE_BUFFER) + wined3d_context_vk_reference_bo(context_vk, &wined3d_buffer_vk(buffer_from_resource(resource))->bo); + else + wined3d_context_vk_reference_texture(context_vk, wined3d_texture_vk(texture_from_resource(resource))); + uav_vk->view_vk.command_buffer_id = context_vk->current_command_buffer.id; +} + static inline BOOL wined3d_dsv_srv_conflict(const struct wined3d_rendertarget_view *dsv, const struct wined3d_format *srv_format) { -- 2.20.1

1 0

[PATCH 3/9] wined3d: Implement Vulkan sampler descriptors.
by Henri Verbeet May 13, 2020

May 13, 2020

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/context_vk.c | 16 ++++++++++++++++ dlls/wined3d/wined3d_private.h | 6 ++++++ 2 files changed, 22 insertions(+) diff --git a/dlls/wined3d/context_vk.c b/dlls/wined3d/context_vk.c index 4e4e0642505..ba1f6bb9261 100644 --- a/dlls/wined3d/context_vk.c +++ b/dlls/wined3d/context_vk.c @@ -1335,6 +1335,7 @@ static bool wined3d_context_vk_update_descriptors(struct wined3d_context_vk *con struct wined3d_resource *resource; VkDescriptorSet vk_descriptor_set; struct wined3d_view_vk *view_vk; + struct wined3d_sampler *sampler; struct wined3d_buffer *buffer; VkBufferView *buffer_view; VkDescriptorType type; @@ -1400,6 +1401,14 @@ static bool wined3d_context_vk_update_descriptors(struct wined3d_context_vk *con return false; break; + case WINED3D_SHADER_DESCRIPTOR_TYPE_SAMPLER: + if (!(sampler = state->sampler[binding->shader_type][binding->resource_idx])) + sampler = context_vk->c.device->null_sampler; + if (!wined3d_shader_descriptor_writes_vk_add_write(writes, vk_descriptor_set, binding->binding_idx, + VK_DESCRIPTOR_TYPE_SAMPLER, NULL, &wined3d_sampler_vk(sampler)->vk_image_info, NULL)) + return false; + break; + default: FIXME("Unhandled descriptor type %#x.\n", binding->shader_descriptor_type); return false; @@ -1506,6 +1515,7 @@ static void wined3d_context_vk_load_shader_resources(struct wined3d_context_vk * struct wined3d_shader_resource_view_vk *srv_vk; struct wined3d_shader_resource_view *srv; struct wined3d_buffer_vk *buffer_vk; + struct wined3d_sampler *sampler; struct wined3d_buffer *buffer; size_t i; @@ -1551,6 +1561,12 @@ static void wined3d_context_vk_load_shader_resources(struct wined3d_context_vk * case WINED3D_SHADER_DESCRIPTOR_TYPE_UAV_COUNTER: break; + case WINED3D_SHADER_DESCRIPTOR_TYPE_SAMPLER: + if (!(sampler = state->sampler[binding->shader_type][binding->resource_idx])) + sampler = context_vk->c.device->null_sampler; + wined3d_context_vk_reference_sampler(context_vk, wined3d_sampler_vk(sampler)); + break; + default: FIXME("Unhandled descriptor type %#x.\n", binding->shader_descriptor_type); break; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 35b0815d959..93852e0de79 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -5662,6 +5662,12 @@ static inline void wined3d_context_vk_reference_texture(const struct wined3d_con texture_vk->command_buffer_id = context_vk->current_command_buffer.id; } +static inline void wined3d_context_vk_reference_sampler(const struct wined3d_context_vk *context_vk, + struct wined3d_sampler_vk *sampler_vk) +{ + sampler_vk->command_buffer_id = context_vk->current_command_buffer.id; +} + static inline void wined3d_context_vk_reference_rendertarget_view(const struct wined3d_context_vk *context_vk, struct wined3d_rendertarget_view_vk *rtv_vk) { -- 2.20.1

1 0