Henri Verbeet : wined3d: Implicit depth/stencil surfaces don' t have a container.
Module: wine Branch: master Commit: c568916f9e372ea7191aa55413723bdb0bb6947e URL: http://source.winehq.org/git/wine.git/?a=commit;h=c568916f9e372ea7191aa55413... Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Aug 30 20:29:48 2010 +0200 wined3d: Implicit depth/stencil surfaces don't have a container. They're owned by the device instead of the swapchain. --- dlls/d3d10core/device.c | 9 ++++----- dlls/d3d8/device.c | 9 ++++----- dlls/d3d9/device.c | 9 ++++----- dlls/ddraw/ddraw.c | 9 ++++----- dlls/wined3d/device.c | 1 - dlls/wined3d/swapchain.c | 2 +- include/wine/wined3d.idl | 1 - 7 files changed, 17 insertions(+), 23 deletions(-) diff --git a/dlls/d3d10core/device.c b/dlls/d3d10core/device.c index 32b8bb0..f5c4e82 100644 --- a/dlls/d3d10core/device.c +++ b/dlls/d3d10core/device.c @@ -1374,18 +1374,17 @@ static HRESULT STDMETHODCALLTYPE device_parent_CreateRenderTarget(IWineD3DDevice } static HRESULT STDMETHODCALLTYPE device_parent_CreateDepthStencilSurface(IWineD3DDeviceParent *iface, - IUnknown *superior, UINT width, UINT height, enum wined3d_format_id format, - WINED3DMULTISAMPLE_TYPE multisample_type, DWORD multisample_quality, BOOL discard, - IWineD3DSurface **surface) + UINT width, UINT height, enum wined3d_format_id format, WINED3DMULTISAMPLE_TYPE multisample_type, + DWORD multisample_quality, BOOL discard, IWineD3DSurface **surface) { struct d3d10_device *This = device_from_device_parent(iface); struct d3d10_texture2d *texture; D3D10_TEXTURE2D_DESC desc; HRESULT hr; - FIXME("iface %p, superior %p, width %u, height %u, format %#x, multisample_type %#x,\n" + FIXME("iface %p, width %u, height %u, format %#x, multisample_type %#x,\n" "\tmultisample_quality %u, discard %u, surface %p partial stub!\n", - iface, superior, width, height, format, multisample_type, multisample_quality, discard, surface); + iface, width, height, format, multisample_type, multisample_quality, discard, surface); FIXME("Implement DXGI<->wined3d usage conversion\n"); diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index cafe27d..6d89a48 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -2623,17 +2623,16 @@ static HRESULT STDMETHODCALLTYPE device_parent_CreateRenderTarget(IWineD3DDevice } static HRESULT STDMETHODCALLTYPE device_parent_CreateDepthStencilSurface(IWineD3DDeviceParent *iface, - IUnknown *superior, UINT width, UINT height, enum wined3d_format_id format, - WINED3DMULTISAMPLE_TYPE multisample_type, DWORD multisample_quality, BOOL discard, - IWineD3DSurface **surface) + UINT width, UINT height, enum wined3d_format_id format, WINED3DMULTISAMPLE_TYPE multisample_type, + DWORD multisample_quality, BOOL discard, IWineD3DSurface **surface) { struct IDirect3DDevice8Impl *This = device_from_device_parent(iface); IDirect3DSurface8Impl *d3d_surface; HRESULT hr; - TRACE("iface %p, superior %p, width %u, height %u, format %#x, multisample_type %#x,\n" + TRACE("iface %p, width %u, height %u, format %#x, multisample_type %#x,\n" "\tmultisample_quality %u, discard %u, surface %p\n", - iface, superior, width, height, format, multisample_type, multisample_quality, discard, surface); + iface, width, height, format, multisample_type, multisample_quality, discard, surface); hr = IDirect3DDevice8_CreateDepthStencilSurface((IDirect3DDevice8 *)This, width, height, d3dformat_from_wined3dformat(format), multisample_type, (IDirect3DSurface8 **)&d3d_surface); diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 6b66bb2..7fab981 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -2688,17 +2688,16 @@ static HRESULT STDMETHODCALLTYPE device_parent_CreateRenderTarget(IWineD3DDevice } static HRESULT STDMETHODCALLTYPE device_parent_CreateDepthStencilSurface(IWineD3DDeviceParent *iface, - IUnknown *superior, UINT width, UINT height, enum wined3d_format_id format, - WINED3DMULTISAMPLE_TYPE multisample_type, DWORD multisample_quality, BOOL discard, - IWineD3DSurface **surface) + UINT width, UINT height, enum wined3d_format_id format, WINED3DMULTISAMPLE_TYPE multisample_type, + DWORD multisample_quality, BOOL discard, IWineD3DSurface **surface) { struct IDirect3DDevice9Impl *This = device_from_device_parent(iface); IDirect3DSurface9Impl *d3d_surface; HRESULT hr; - TRACE("iface %p, superior %p, width %u, height %u, format %#x, multisample_type %#x,\n" + TRACE("iface %p, width %u, height %u, format %#x, multisample_type %#x,\n" "\tmultisample_quality %u, discard %u, surface %p\n", - iface, superior, width, height, format, multisample_type, multisample_quality, discard, surface); + iface, width, height, format, multisample_type, multisample_quality, discard, surface); hr = IDirect3DDevice9Impl_CreateDepthStencilSurface((IDirect3DDevice9Ex *)This, width, height, d3dformat_from_wined3dformat(format), multisample_type, multisample_quality, discard, diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index af5eb37..d250fb5 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -5564,18 +5564,17 @@ static HRESULT STDMETHODCALLTYPE device_parent_CreateRenderTarget(IWineD3DDevice } static HRESULT STDMETHODCALLTYPE device_parent_CreateDepthStencilSurface(IWineD3DDeviceParent *iface, - IUnknown *superior, UINT width, UINT height, enum wined3d_format_id format, - WINED3DMULTISAMPLE_TYPE multisample_type, DWORD multisample_quality, BOOL discard, - IWineD3DSurface **surface) + UINT width, UINT height, enum wined3d_format_id format, WINED3DMULTISAMPLE_TYPE multisample_type, + DWORD multisample_quality, BOOL discard, IWineD3DSurface **surface) { struct IDirectDrawImpl *This = ddraw_from_device_parent(iface); IDirectDrawSurfaceImpl *ddraw_surface; DDSURFACEDESC2 ddsd; HRESULT hr; - TRACE("iface %p, superior %p, width %u, height %u, format %#x, multisample_type %#x,\n" + TRACE("iface %p, width %u, height %u, format %#x, multisample_type %#x,\n" "\tmultisample_quality %u, discard %u, surface %p\n", - iface, superior, width, height, format, multisample_type, multisample_quality, discard, surface); + iface, width, height, format, multisample_type, multisample_quality, discard, surface); *surface = NULL; diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 9b4965d..bf28b9c 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -6265,7 +6265,6 @@ static HRESULT WINAPI IWineD3DDeviceImpl_Reset(IWineD3DDevice* iface, WINED3DPRE TRACE("Creating the depth stencil buffer\n"); hrc = IWineD3DDeviceParent_CreateDepthStencilSurface(This->device_parent, - This->parent, pPresentationParameters->BackBufferWidth, pPresentationParameters->BackBufferHeight, pPresentationParameters->AutoDepthStencilFormat, diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 538899e..4fa7e64 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -856,7 +856,7 @@ HRESULT swapchain_init(IWineD3DSwapChainImpl *swapchain, WINED3DSURFTYPE surface TRACE("Creating depth/stencil buffer.\n"); if (!device->auto_depth_stencil) { - hr = IWineD3DDeviceParent_CreateDepthStencilSurface(device->device_parent, parent, + hr = IWineD3DDeviceParent_CreateDepthStencilSurface(device->device_parent, swapchain->presentParms.BackBufferWidth, swapchain->presentParms.BackBufferHeight, swapchain->presentParms.AutoDepthStencilFormat, swapchain->presentParms.MultiSampleType, swapchain->presentParms.MultiSampleQuality, FALSE /* FIXME: Discard */, diff --git a/include/wine/wined3d.idl b/include/wine/wined3d.idl index 7f88b3a..bff4012 100644 --- a/include/wine/wined3d.idl +++ b/include/wine/wined3d.idl @@ -2143,7 +2143,6 @@ interface IWineD3DDeviceParent : IUnknown ); HRESULT CreateDepthStencilSurface( - [in] IUnknown *superior, [in] UINT width, [in] UINT height, [in] enum wined3d_format_id format_id,
participants (1)
-
Alexandre Julliard