From cbbd3c65cc6f9a9850b945bc3d56c1860836e26c Mon Sep 17 00:00:00 2001 From: Axel Davy Date: Wed, 11 Nov 2015 10:13:58 +0100 Subject: [PATCH] st/nine: Fix crash NineDevice9_CreateAdditionalSwapChain When no window is specified, we should revert to the focus window. This deserves more tests however (what if the device swapchain is already using the focus window ?) Fixes crash for FFXIV Signed-off-by: Axel Davy Reviewed-by: Patrick Rudolph --- src/gallium/state_trackers/nine/device9.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/gallium/state_trackers/nine/device9.c b/src/gallium/state_trackers/nine/device9.c index e4ac61a5a43..3752c63f444 100644 --- a/src/gallium/state_trackers/nine/device9.c +++ b/src/gallium/state_trackers/nine/device9.c @@ -711,6 +711,10 @@ NineDevice9_CreateAdditionalSwapChain( struct NineDevice9 *This, user_assert(pPresentationParameters, D3DERR_INVALIDCALL); + /* TODO: this deserves more tests */ + if (!pPresentationParameters->hDeviceWindow) + pPresentationParameters->hDeviceWindow = This->params.hFocusWindow; + hr = ID3DPresentGroup_CreateAdditionalPresent(This->present, pPresentationParameters, &present); if (FAILED(hr)) -- 2.30.2