Skip to content

W
wine-winehq
Commit 76804fa7 authored by Henri Verbeet's avatar Henri Verbeet Committed by Alexandre Julliard
Browse files
Options

d3d9: Add a separate function for swapchain initialization.

parent 2e27ab6b
Hide whitespace changes
Inline Side-by-side
Showing with 83 additions and 68 deletions
dlls/d3d9/d3d9_private.h
View file @ 76804fa7
...@@ -184,8 +184,6 @@ HRESULT device_init(IDirect3DDevice9Impl *device, IWineD3D *wined3d, UINT adapte ...@@ -184,8 +184,6 @@ HRESULT device_init(IDirect3DDevice9Impl *device, IWineD3D *wined3d, UINT adapte
HWND focus_window, DWORD flags, D3DPRESENT_PARAMETERS *parameters) DECLSPEC_HIDDEN; HWND focus_window, DWORD flags, D3DPRESENT_PARAMETERS *parameters) DECLSPEC_HIDDEN;
/* IDirect3DDevice9: */ /* IDirect3DDevice9: */
extern HRESULT WINAPI IDirect3DDevice9Impl_CreateAdditionalSwapChain(IDirect3DDevice9Ex *iface,
D3DPRESENT_PARAMETERS *pPresentationParameters, IDirect3DSwapChain9 **pSwapChain) DECLSPEC_HIDDEN;
extern HRESULT WINAPI IDirect3DDevice9Impl_GetSwapChain(IDirect3DDevice9Ex *iface, extern HRESULT WINAPI IDirect3DDevice9Impl_GetSwapChain(IDirect3DDevice9Ex *iface,
UINT iSwapChain, IDirect3DSwapChain9 **pSwapChain) DECLSPEC_HIDDEN; UINT iSwapChain, IDirect3DSwapChain9 **pSwapChain) DECLSPEC_HIDDEN;
extern UINT WINAPI IDirect3DDevice9Impl_GetNumberOfSwapChains(IDirect3DDevice9Ex *iface) DECLSPEC_HIDDEN; extern UINT WINAPI IDirect3DDevice9Impl_GetNumberOfSwapChains(IDirect3DDevice9Ex *iface) DECLSPEC_HIDDEN;
...@@ -283,6 +281,9 @@ typedef struct IDirect3DSwapChain9Impl ...@@ -283,6 +281,9 @@ typedef struct IDirect3DSwapChain9Impl
BOOL isImplicit; BOOL isImplicit;
} IDirect3DSwapChain9Impl; } IDirect3DSwapChain9Impl;
HRESULT swapchain_init(IDirect3DSwapChain9Impl *swapchain, IDirect3DDevice9Impl *device,
D3DPRESENT_PARAMETERS *present_parameters) DECLSPEC_HIDDEN;
/* ----------------- */ /* ----------------- */
/* IDirect3DSurface9 */ /* IDirect3DSurface9 */
/* ----------------- */ /* ----------------- */
......
dlls/d3d9/device.c
View file @ 76804fa7
...@@ -452,6 +452,37 @@ static BOOL WINAPI IDirect3DDevice9Impl_ShowCursor(LPDIRECT3DDEVICE9EX ifac ...@@ -452,6 +452,37 @@ static BOOL WINAPI IDirect3DDevice9Impl_ShowCursor(LPDIRECT3DDEVICE9EX ifac
return ret; return ret;
} }
static HRESULT WINAPI DECLSPEC_HOTPATCH IDirect3DDevice9Impl_CreateAdditionalSwapChain(IDirect3DDevice9Ex *iface,
D3DPRESENT_PARAMETERS *present_parameters, IDirect3DSwapChain9 **swapchain)
{
IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface;
IDirect3DSwapChain9Impl *object;
HRESULT hr;
TRACE("iface %p, present_parameters %p, swapchain %p.\n",
iface, present_parameters, swapchain);
object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object));
if (!object)
{
ERR("Failed to allocate swapchain memory.\n");
return E_OUTOFMEMORY;
}
hr = swapchain_init(object, This, present_parameters);
if (FAILED(hr))
{
WARN("Failed to initialize swapchain, hr %#x.\n", hr);
HeapFree(GetProcessHeap(), 0, object);
return hr;
}
TRACE("Created swapchain %p.\n", object);
*swapchain = (IDirect3DSwapChain9 *)object;
return D3D_OK;
}
static HRESULT WINAPI reset_enum_callback(IWineD3DResource *resource, void *data) { static HRESULT WINAPI reset_enum_callback(IWineD3DResource *resource, void *data) {
BOOL *resources_ok = data; BOOL *resources_ok = data;
D3DRESOURCETYPE type; D3DRESOURCETYPE type;
......
dlls/d3d9/swapchain.c
View file @ 76804fa7
...@@ -212,78 +212,61 @@ static const IDirect3DSwapChain9Vtbl Direct3DSwapChain9_Vtbl = ...@@ -212,78 +212,61 @@ static const IDirect3DSwapChain9Vtbl Direct3DSwapChain9_Vtbl =
IDirect3DSwapChain9Impl_GetPresentParameters IDirect3DSwapChain9Impl_GetPresentParameters
}; };
HRESULT swapchain_init(IDirect3DSwapChain9Impl *swapchain, IDirect3DDevice9Impl *device,
D3DPRESENT_PARAMETERS *present_parameters)
{
WINED3DPRESENT_PARAMETERS wined3d_parameters;
HRESULT hr;
/* IDirect3DDevice9 IDirect3DSwapChain9 Methods follow: */ swapchain->ref = 1;
HRESULT WINAPI DECLSPEC_HOTPATCH IDirect3DDevice9Impl_CreateAdditionalSwapChain(LPDIRECT3DDEVICE9EX iface, D3DPRESENT_PARAMETERS* pPresentationParameters, IDirect3DSwapChain9** pSwapChain) { swapchain->lpVtbl = &Direct3DSwapChain9_Vtbl;
IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface;
IDirect3DSwapChain9Impl* object; wined3d_parameters.BackBufferWidth = present_parameters->BackBufferWidth;
HRESULT hrc = D3D_OK; wined3d_parameters.BackBufferHeight = present_parameters->BackBufferHeight;
WINED3DPRESENT_PARAMETERS localParameters; wined3d_parameters.BackBufferFormat = wined3dformat_from_d3dformat(present_parameters->BackBufferFormat);
wined3d_parameters.BackBufferCount = max(1, present_parameters->BackBufferCount);
TRACE("iface %p, parameters %p, swapchain %p.\n", wined3d_parameters.MultiSampleType = present_parameters->MultiSampleType;
iface, pPresentationParameters, pSwapChain); wined3d_parameters.MultiSampleQuality = present_parameters->MultiSampleQuality;
wined3d_parameters.SwapEffect = present_parameters->SwapEffect;
object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); wined3d_parameters.hDeviceWindow = present_parameters->hDeviceWindow;
if (NULL == object) { wined3d_parameters.Windowed = present_parameters->Windowed;
FIXME("Allocation of memory failed, returning D3DERR_OUTOFVIDEOMEMORY\n"); wined3d_parameters.EnableAutoDepthStencil = present_parameters->EnableAutoDepthStencil;
return D3DERR_OUTOFVIDEOMEMORY; wined3d_parameters.AutoDepthStencilFormat = wined3dformat_from_d3dformat(present_parameters->AutoDepthStencilFormat);
} wined3d_parameters.Flags = present_parameters->Flags;
object->ref = 1; wined3d_parameters.FullScreen_RefreshRateInHz = present_parameters->FullScreen_RefreshRateInHz;
object->lpVtbl = &Direct3DSwapChain9_Vtbl; wined3d_parameters.PresentationInterval = present_parameters->PresentationInterval;
wined3d_parameters.AutoRestoreDisplayMode = TRUE;
/* The back buffer count is set to one if it's 0 */
if(pPresentationParameters->BackBufferCount == 0) {
pPresentationParameters->BackBufferCount = 1;
}
/* Allocate an associated WineD3DDevice object */
localParameters.BackBufferWidth = pPresentationParameters->BackBufferWidth;
localParameters.BackBufferHeight = pPresentationParameters->BackBufferHeight;
localParameters.BackBufferFormat = wined3dformat_from_d3dformat(pPresentationParameters->BackBufferFormat);
localParameters.BackBufferCount = pPresentationParameters->BackBufferCount;
localParameters.MultiSampleType = pPresentationParameters->MultiSampleType;
localParameters.MultiSampleQuality = pPresentationParameters->MultiSampleQuality;
localParameters.SwapEffect = pPresentationParameters->SwapEffect;
localParameters.hDeviceWindow = pPresentationParameters->hDeviceWindow;
localParameters.Windowed = pPresentationParameters->Windowed;
localParameters.EnableAutoDepthStencil = pPresentationParameters->EnableAutoDepthStencil;
localParameters.AutoDepthStencilFormat = wined3dformat_from_d3dformat(pPresentationParameters->AutoDepthStencilFormat);
localParameters.Flags = pPresentationParameters->Flags;
localParameters.FullScreen_RefreshRateInHz = pPresentationParameters->FullScreen_RefreshRateInHz;
localParameters.PresentationInterval = pPresentationParameters->PresentationInterval;
localParameters.AutoRestoreDisplayMode = TRUE;
wined3d_mutex_lock(); wined3d_mutex_lock();
hrc = IWineD3DDevice_CreateSwapChain(This->WineD3DDevice, &localParameters, hr = IWineD3DDevice_CreateSwapChain(device->WineD3DDevice, &wined3d_parameters,
&object->wineD3DSwapChain, (IUnknown*)object, SURFACE_OPENGL); &swapchain->wineD3DSwapChain, (IUnknown *)swapchain, SURFACE_OPENGL);
wined3d_mutex_unlock(); wined3d_mutex_unlock();
pPresentationParameters->BackBufferWidth = localParameters.BackBufferWidth; present_parameters->BackBufferWidth = wined3d_parameters.BackBufferWidth;
pPresentationParameters->BackBufferHeight = localParameters.BackBufferHeight; present_parameters->BackBufferHeight = wined3d_parameters.BackBufferHeight;
pPresentationParameters->BackBufferFormat = d3dformat_from_wined3dformat(localParameters.BackBufferFormat); present_parameters->BackBufferFormat = d3dformat_from_wined3dformat(wined3d_parameters.BackBufferFormat);
pPresentationParameters->BackBufferCount = localParameters.BackBufferCount; present_parameters->BackBufferCount = wined3d_parameters.BackBufferCount;
pPresentationParameters->MultiSampleType = localParameters.MultiSampleType; present_parameters->MultiSampleType = wined3d_parameters.MultiSampleType;
pPresentationParameters->MultiSampleQuality = localParameters.MultiSampleQuality; present_parameters->MultiSampleQuality = wined3d_parameters.MultiSampleQuality;
pPresentationParameters->SwapEffect = localParameters.SwapEffect; present_parameters->SwapEffect = wined3d_parameters.SwapEffect;
pPresentationParameters->hDeviceWindow = localParameters.hDeviceWindow; present_parameters->hDeviceWindow = wined3d_parameters.hDeviceWindow;
pPresentationParameters->Windowed = localParameters.Windowed; present_parameters->Windowed = wined3d_parameters.Windowed;
pPresentationParameters->EnableAutoDepthStencil = localParameters.EnableAutoDepthStencil; present_parameters->EnableAutoDepthStencil = wined3d_parameters.EnableAutoDepthStencil;
pPresentationParameters->AutoDepthStencilFormat = d3dformat_from_wined3dformat(localParameters.AutoDepthStencilFormat); present_parameters->AutoDepthStencilFormat = d3dformat_from_wined3dformat(wined3d_parameters.AutoDepthStencilFormat);
pPresentationParameters->Flags = localParameters.Flags; present_parameters->Flags = wined3d_parameters.Flags;
pPresentationParameters->FullScreen_RefreshRateInHz = localParameters.FullScreen_RefreshRateInHz; present_parameters->FullScreen_RefreshRateInHz = wined3d_parameters.FullScreen_RefreshRateInHz;
pPresentationParameters->PresentationInterval = localParameters.PresentationInterval; present_parameters->PresentationInterval = wined3d_parameters.PresentationInterval;
if (hrc != D3D_OK) { if (FAILED(hr))
FIXME("(%p) call to IWineD3DDevice_CreateSwapChain failed\n", This); {
HeapFree(GetProcessHeap(), 0 , object); WARN("Failed to create wined3d swapchain, hr %#x.\n", hr);
} else { return hr;
IDirect3DDevice9Ex_AddRef(iface);
object->parentDevice = iface;
*pSwapChain = (IDirect3DSwapChain9 *)object;
TRACE("(%p) : Created swapchain %p\n", This, *pSwapChain);
} }
TRACE("(%p) returning %p\n", This, *pSwapChain);
return hrc; swapchain->parentDevice = (IDirect3DDevice9Ex *)device;
IDirect3DDevice9Ex_AddRef(swapchain->parentDevice);
return D3D_OK;
} }
HRESULT WINAPI DECLSPEC_HOTPATCH IDirect3DDevice9Impl_GetSwapChain(LPDIRECT3DDEVICE9EX iface, UINT iSwapChain, IDirect3DSwapChain9** pSwapChain) { HRESULT WINAPI DECLSPEC_HOTPATCH IDirect3DDevice9Impl_GetSwapChain(LPDIRECT3DDEVICE9EX iface, UINT iSwapChain, IDirect3DSwapChain9** pSwapChain) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment