[PATCH 2/5] d3d9: Add a separate function for swapchain initialization.
Henri Verbeet
hverbeet at codeweavers.com
Sun Dec 20 13:41:36 CST 2009
---
dlls/d3d9/d3d9_private.h | 5 +-
dlls/d3d9/device.c | 31 ++++++++++++
dlls/d3d9/swapchain.c | 115 +++++++++++++++++++--------------------------
3 files changed, 83 insertions(+), 68 deletions(-)
diff --git a/dlls/d3d9/d3d9_private.h b/dlls/d3d9/d3d9_private.h
index cbe5d80..7736bea 100644
--- a/dlls/d3d9/d3d9_private.h
+++ b/dlls/d3d9/d3d9_private.h
@@ -184,8 +184,6 @@ HRESULT device_init(IDirect3DDevice9Impl *device, IWineD3D *wined3d, UINT adapte
HWND focus_window, DWORD flags, D3DPRESENT_PARAMETERS *parameters) DECLSPEC_HIDDEN;
/* IDirect3DDevice9: */
-extern HRESULT WINAPI IDirect3DDevice9Impl_CreateAdditionalSwapChain(IDirect3DDevice9Ex *iface,
- D3DPRESENT_PARAMETERS *pPresentationParameters, IDirect3DSwapChain9 **pSwapChain) DECLSPEC_HIDDEN;
extern HRESULT WINAPI IDirect3DDevice9Impl_GetSwapChain(IDirect3DDevice9Ex *iface,
UINT iSwapChain, IDirect3DSwapChain9 **pSwapChain) DECLSPEC_HIDDEN;
extern UINT WINAPI IDirect3DDevice9Impl_GetNumberOfSwapChains(IDirect3DDevice9Ex *iface) DECLSPEC_HIDDEN;
@@ -283,6 +281,9 @@ typedef struct IDirect3DSwapChain9Impl
BOOL isImplicit;
} IDirect3DSwapChain9Impl;
+HRESULT swapchain_init(IDirect3DSwapChain9Impl *swapchain, IDirect3DDevice9Impl *device,
+ D3DPRESENT_PARAMETERS *present_parameters) DECLSPEC_HIDDEN;
+
/* ----------------- */
/* IDirect3DSurface9 */
/* ----------------- */
diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c
index dfb6b26..4d0d4bd 100644
--- a/dlls/d3d9/device.c
+++ b/dlls/d3d9/device.c
@@ -452,6 +452,37 @@ static BOOL WINAPI IDirect3DDevice9Impl_ShowCursor(LPDIRECT3DDEVICE9EX ifac
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) {
BOOL *resources_ok = data;
D3DRESOURCETYPE type;
diff --git a/dlls/d3d9/swapchain.c b/dlls/d3d9/swapchain.c
index 324f48f..c692371 100644
--- a/dlls/d3d9/swapchain.c
+++ b/dlls/d3d9/swapchain.c
@@ -212,78 +212,61 @@ static const IDirect3DSwapChain9Vtbl Direct3DSwapChain9_Vtbl =
IDirect3DSwapChain9Impl_GetPresentParameters
};
+HRESULT swapchain_init(IDirect3DSwapChain9Impl *swapchain, IDirect3DDevice9Impl *device,
+ D3DPRESENT_PARAMETERS *present_parameters)
+{
+ WINED3DPRESENT_PARAMETERS wined3d_parameters;
+ HRESULT hr;
-/* IDirect3DDevice9 IDirect3DSwapChain9 Methods follow: */
-HRESULT WINAPI DECLSPEC_HOTPATCH IDirect3DDevice9Impl_CreateAdditionalSwapChain(LPDIRECT3DDEVICE9EX iface, D3DPRESENT_PARAMETERS* pPresentationParameters, IDirect3DSwapChain9** pSwapChain) {
- IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface;
- IDirect3DSwapChain9Impl* object;
- HRESULT hrc = D3D_OK;
- WINED3DPRESENT_PARAMETERS localParameters;
-
- TRACE("iface %p, parameters %p, swapchain %p.\n",
- iface, pPresentationParameters, pSwapChain);
-
- object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object));
- if (NULL == object) {
- FIXME("Allocation of memory failed, returning D3DERR_OUTOFVIDEOMEMORY\n");
- return D3DERR_OUTOFVIDEOMEMORY;
- }
- object->ref = 1;
- object->lpVtbl = &Direct3DSwapChain9_Vtbl;
-
- /* 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;
+ swapchain->ref = 1;
+ swapchain->lpVtbl = &Direct3DSwapChain9_Vtbl;
+
+ wined3d_parameters.BackBufferWidth = present_parameters->BackBufferWidth;
+ wined3d_parameters.BackBufferHeight = present_parameters->BackBufferHeight;
+ wined3d_parameters.BackBufferFormat = wined3dformat_from_d3dformat(present_parameters->BackBufferFormat);
+ wined3d_parameters.BackBufferCount = max(1, present_parameters->BackBufferCount);
+ wined3d_parameters.MultiSampleType = present_parameters->MultiSampleType;
+ wined3d_parameters.MultiSampleQuality = present_parameters->MultiSampleQuality;
+ wined3d_parameters.SwapEffect = present_parameters->SwapEffect;
+ wined3d_parameters.hDeviceWindow = present_parameters->hDeviceWindow;
+ wined3d_parameters.Windowed = present_parameters->Windowed;
+ wined3d_parameters.EnableAutoDepthStencil = present_parameters->EnableAutoDepthStencil;
+ wined3d_parameters.AutoDepthStencilFormat = wined3dformat_from_d3dformat(present_parameters->AutoDepthStencilFormat);
+ wined3d_parameters.Flags = present_parameters->Flags;
+ wined3d_parameters.FullScreen_RefreshRateInHz = present_parameters->FullScreen_RefreshRateInHz;
+ wined3d_parameters.PresentationInterval = present_parameters->PresentationInterval;
+ wined3d_parameters.AutoRestoreDisplayMode = TRUE;
wined3d_mutex_lock();
- hrc = IWineD3DDevice_CreateSwapChain(This->WineD3DDevice, &localParameters,
- &object->wineD3DSwapChain, (IUnknown*)object, SURFACE_OPENGL);
+ hr = IWineD3DDevice_CreateSwapChain(device->WineD3DDevice, &wined3d_parameters,
+ &swapchain->wineD3DSwapChain, (IUnknown *)swapchain, SURFACE_OPENGL);
wined3d_mutex_unlock();
- pPresentationParameters->BackBufferWidth = localParameters.BackBufferWidth;
- pPresentationParameters->BackBufferHeight = localParameters.BackBufferHeight;
- pPresentationParameters->BackBufferFormat = d3dformat_from_wined3dformat(localParameters.BackBufferFormat);
- pPresentationParameters->BackBufferCount = localParameters.BackBufferCount;
- pPresentationParameters->MultiSampleType = localParameters.MultiSampleType;
- pPresentationParameters->MultiSampleQuality = localParameters.MultiSampleQuality;
- pPresentationParameters->SwapEffect = localParameters.SwapEffect;
- pPresentationParameters->hDeviceWindow = localParameters.hDeviceWindow;
- pPresentationParameters->Windowed = localParameters.Windowed;
- pPresentationParameters->EnableAutoDepthStencil = localParameters.EnableAutoDepthStencil;
- pPresentationParameters->AutoDepthStencilFormat = d3dformat_from_wined3dformat(localParameters.AutoDepthStencilFormat);
- pPresentationParameters->Flags = localParameters.Flags;
- pPresentationParameters->FullScreen_RefreshRateInHz = localParameters.FullScreen_RefreshRateInHz;
- pPresentationParameters->PresentationInterval = localParameters.PresentationInterval;
-
- if (hrc != D3D_OK) {
- FIXME("(%p) call to IWineD3DDevice_CreateSwapChain failed\n", This);
- HeapFree(GetProcessHeap(), 0 , object);
- } else {
- IDirect3DDevice9Ex_AddRef(iface);
- object->parentDevice = iface;
- *pSwapChain = (IDirect3DSwapChain9 *)object;
- TRACE("(%p) : Created swapchain %p\n", This, *pSwapChain);
+ present_parameters->BackBufferWidth = wined3d_parameters.BackBufferWidth;
+ present_parameters->BackBufferHeight = wined3d_parameters.BackBufferHeight;
+ present_parameters->BackBufferFormat = d3dformat_from_wined3dformat(wined3d_parameters.BackBufferFormat);
+ present_parameters->BackBufferCount = wined3d_parameters.BackBufferCount;
+ present_parameters->MultiSampleType = wined3d_parameters.MultiSampleType;
+ present_parameters->MultiSampleQuality = wined3d_parameters.MultiSampleQuality;
+ present_parameters->SwapEffect = wined3d_parameters.SwapEffect;
+ present_parameters->hDeviceWindow = wined3d_parameters.hDeviceWindow;
+ present_parameters->Windowed = wined3d_parameters.Windowed;
+ present_parameters->EnableAutoDepthStencil = wined3d_parameters.EnableAutoDepthStencil;
+ present_parameters->AutoDepthStencilFormat = d3dformat_from_wined3dformat(wined3d_parameters.AutoDepthStencilFormat);
+ present_parameters->Flags = wined3d_parameters.Flags;
+ present_parameters->FullScreen_RefreshRateInHz = wined3d_parameters.FullScreen_RefreshRateInHz;
+ present_parameters->PresentationInterval = wined3d_parameters.PresentationInterval;
+
+ if (FAILED(hr))
+ {
+ WARN("Failed to create wined3d swapchain, hr %#x.\n", hr);
+ return hr;
}
- 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) {
--
1.6.4.4
More information about the wine-patches
mailing list