Stefan Dösinger : wined3d: Use WINED3DSWAPEFFECT in the wined3d headers and code.
Module: wine Branch: refs/heads/master Commit: 1d47556195ecea5dc1456597be5fb88bb2fbc9b1 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=1d47556195ecea5dc1456597... Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Tue Mar 28 12:47:36 2006 +0200 wined3d: Use WINED3DSWAPEFFECT in the wined3d headers and code. --- dlls/d3d8/device.c | 4 ++-- dlls/d3d8/directx.c | 2 +- dlls/d3d9/device.c | 2 +- dlls/d3d9/directx.c | 2 +- dlls/d3d9/swapchain.c | 4 ++-- dlls/wined3d/swapchain.c | 2 +- include/wine/wined3d_types.h | 2 +- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 5f3ceb4..2173d04 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -197,7 +197,7 @@ HRESULT WINAPI IDirect3DDevice8Impl_Crea localParameters.BackBufferCount = &pPresentationParameters->BackBufferCount; localParameters.MultiSampleType = (WINED3DMULTISAMPLE_TYPE *) &pPresentationParameters->MultiSampleType; localParameters.MultiSampleQuality = NULL; /* d3d9 only */ - localParameters.SwapEffect = &pPresentationParameters->SwapEffect; + localParameters.SwapEffect = (WINED3DSWAPEFFECT *) &pPresentationParameters->SwapEffect; localParameters.hDeviceWindow = &pPresentationParameters->hDeviceWindow; localParameters.Windowed = &pPresentationParameters->Windowed; localParameters.EnableAutoDepthStencil = &pPresentationParameters->EnableAutoDepthStencil; @@ -230,7 +230,7 @@ HRESULT WINAPI IDirect3DDevice8Impl_Rese localParameters.BackBufferCount = &pPresentationParameters->BackBufferCount; localParameters.MultiSampleType = (WINED3DMULTISAMPLE_TYPE *) &pPresentationParameters->MultiSampleType; localParameters.MultiSampleQuality = NULL; /* D3d9 only */ - localParameters.SwapEffect = &pPresentationParameters->SwapEffect; + localParameters.SwapEffect = (WINED3DSWAPEFFECT *) &pPresentationParameters->SwapEffect; localParameters.hDeviceWindow = &pPresentationParameters->hDeviceWindow; localParameters.Windowed = &pPresentationParameters->Windowed; localParameters.EnableAutoDepthStencil = &pPresentationParameters->EnableAutoDepthStencil; diff --git a/dlls/d3d8/directx.c b/dlls/d3d8/directx.c index addfb8b..8241538 100644 --- a/dlls/d3d8/directx.c +++ b/dlls/d3d8/directx.c @@ -314,7 +314,7 @@ HRESULT WINAPI IDirect3D8Impl_CreateDe localParameters.MultiSampleType = (WINED3DMULTISAMPLE_TYPE *) &pPresentationParameters->MultiSampleType; /* d3d9 only */ localParameters.MultiSampleQuality = NULL; - localParameters.SwapEffect = &pPresentationParameters->SwapEffect; + localParameters.SwapEffect = (WINED3DSWAPEFFECT *) &pPresentationParameters->SwapEffect; localParameters.hDeviceWindow = &pPresentationParameters->hDeviceWindow; localParameters.Windowed = &pPresentationParameters->Windowed; localParameters.EnableAutoDepthStencil = &pPresentationParameters->EnableAutoDepthStencil; diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 32880fa..c5eb0ea 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -172,7 +172,7 @@ HRESULT WINAPI IDirect3DDevice9Impl_Re localParameters.BackBufferCount = &pPresentationParameters->BackBufferCount; localParameters.MultiSampleType = (WINED3DMULTISAMPLE_TYPE *) &pPresentationParameters->MultiSampleType; localParameters.MultiSampleQuality = &pPresentationParameters->MultiSampleQuality; - localParameters.SwapEffect = &pPresentationParameters->SwapEffect; + localParameters.SwapEffect = (WINED3DSWAPEFFECT *) &pPresentationParameters->SwapEffect; localParameters.hDeviceWindow = &pPresentationParameters->hDeviceWindow; localParameters.Windowed = &pPresentationParameters->Windowed; localParameters.EnableAutoDepthStencil = &pPresentationParameters->EnableAutoDepthStencil; diff --git a/dlls/d3d9/directx.c b/dlls/d3d9/directx.c index 62246fc..86389a9 100644 --- a/dlls/d3d9/directx.c +++ b/dlls/d3d9/directx.c @@ -298,7 +298,7 @@ HRESULT WINAPI IDirect3D9Impl_CreateDe localParameters.BackBufferCount = &pPresentationParameters->BackBufferCount; localParameters.MultiSampleType = (WINED3DMULTISAMPLE_TYPE *) &pPresentationParameters->MultiSampleType; localParameters.MultiSampleQuality = &pPresentationParameters->MultiSampleQuality; - localParameters.SwapEffect = &pPresentationParameters->SwapEffect; + localParameters.SwapEffect = (WINED3DSWAPEFFECT *) &pPresentationParameters->SwapEffect; localParameters.hDeviceWindow = &pPresentationParameters->hDeviceWindow; localParameters.Windowed = &pPresentationParameters->Windowed; localParameters.EnableAutoDepthStencil = &pPresentationParameters->EnableAutoDepthStencil; diff --git a/dlls/d3d9/swapchain.c b/dlls/d3d9/swapchain.c index 83ea7c2..c058720 100644 --- a/dlls/d3d9/swapchain.c +++ b/dlls/d3d9/swapchain.c @@ -128,7 +128,7 @@ HRESULT WINAPI IDirect3DSwapChain9Impl_G winePresentParameters.BackBufferCount = &pPresentationParameters->BackBufferCount; winePresentParameters.MultiSampleType = (WINED3DMULTISAMPLE_TYPE *) &pPresentationParameters->MultiSampleType; winePresentParameters.MultiSampleQuality = &pPresentationParameters->MultiSampleQuality; - winePresentParameters.SwapEffect = &pPresentationParameters->SwapEffect; + winePresentParameters.SwapEffect = (WINED3DSWAPEFFECT *)&pPresentationParameters->SwapEffect; winePresentParameters.hDeviceWindow = &pPresentationParameters->hDeviceWindow; winePresentParameters.Windowed = &pPresentationParameters->Windowed; winePresentParameters.EnableAutoDepthStencil = &pPresentationParameters->EnableAutoDepthStencil; @@ -178,7 +178,7 @@ HRESULT WINAPI IDirect3DDevice9Impl_Cr localParameters.BackBufferCount = &pPresentationParameters->BackBufferCount; localParameters.MultiSampleType = (WINED3DMULTISAMPLE_TYPE *) &pPresentationParameters->MultiSampleType; localParameters.MultiSampleQuality = &pPresentationParameters->MultiSampleQuality; - localParameters.SwapEffect = &pPresentationParameters->SwapEffect; + localParameters.SwapEffect = (WINED3DSWAPEFFECT *)&pPresentationParameters->SwapEffect; localParameters.hDeviceWindow = &pPresentationParameters->hDeviceWindow; localParameters.Windowed = &pPresentationParameters->Windowed; localParameters.EnableAutoDepthStencil = &pPresentationParameters->EnableAutoDepthStencil; diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 05dee94..e417eba 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -314,7 +314,7 @@ HRESULT WINAPI IWineD3DSwapChainImpl_Pre LEAVE_GL(); /* Although this is not strictly required, a simple demo showed this does occur on (at least non-debug) d3d */ - if (This->presentParms.SwapEffect & D3DSWAPEFFECT_DISCARD) { + if (This->presentParms.SwapEffect & WINED3DSWAPEFFECT_DISCARD) { TRACE("Clearing\n"); diff --git a/include/wine/wined3d_types.h b/include/wine/wined3d_types.h index 08e68ba..5ecc645 100644 --- a/include/wine/wined3d_types.h +++ b/include/wine/wined3d_types.h @@ -479,7 +479,7 @@ typedef struct _WINED3DPRESENT_PARAMETER UINT *BackBufferCount; WINED3DMULTISAMPLE_TYPE *MultiSampleType; DWORD *MultiSampleQuality; - D3DSWAPEFFECT *SwapEffect; + WINED3DSWAPEFFECT *SwapEffect; HWND *hDeviceWindow; BOOL *Windowed; BOOL *EnableAutoDepthStencil;
participants (1)
-
Alexandre Julliard