Module: wine Branch: master Commit: bb6ae095d4cd2abb15191d2b06654bc187bfb3b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb6ae095d4cd2abb15191d2b06...
Author: Michael Stefaniuc mstefani@redhat.de Date: Wed Jan 26 00:31:13 2011 +0100
d3d8: Pass an object instead of an iface to an internal function.
---
dlls/d3d8/device.c | 48 ++++++++++++++++++++++++++++++------------------ 1 files changed, 30 insertions(+), 18 deletions(-)
diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 67edb06..dcbeb9f 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -808,17 +808,17 @@ static HRESULT WINAPI IDirect3DDevice8Impl_CreateIndexBuffer(IDirect3DDevice8 *i return D3D_OK; }
-static HRESULT IDirect3DDevice8Impl_CreateSurface(LPDIRECT3DDEVICE8 iface, UINT Width, UINT Height, - D3DFORMAT Format, BOOL Lockable, BOOL Discard, UINT Level, IDirect3DSurface8 **ppSurface, - UINT Usage, D3DPOOL Pool, D3DMULTISAMPLE_TYPE MultiSample, DWORD MultisampleQuality) +static HRESULT IDirect3DDevice8Impl_CreateSurface(IDirect3DDevice8Impl *device, UINT Width, + UINT Height, D3DFORMAT Format, BOOL Lockable, BOOL Discard, UINT Level, + IDirect3DSurface8 **ppSurface, UINT Usage, D3DPOOL Pool, D3DMULTISAMPLE_TYPE MultiSample, + DWORD MultisampleQuality) { - IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface; IDirect3DSurface8Impl *object; HRESULT hr;
- TRACE("iface %p, width %u, height %u, format %#x, lockable %#x, discard %#x, level %u, surface %p,\n" + TRACE("device %p, width %u, height %u, format %#x, lockable %#x, discard %#x, level %u, surface %p,\n" "\tusage %#x, pool %#x, multisample_type %#x, multisample_quality %u.\n", - iface, Width, Height, Format, Lockable, Discard, Level, ppSurface, + device, Width, Height, Format, Lockable, Discard, Level, ppSurface, Usage, Pool, MultiSample, MultisampleQuality);
object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirect3DSurface8Impl)); @@ -828,8 +828,8 @@ static HRESULT IDirect3DDevice8Impl_CreateSurface(LPDIRECT3DDEVICE8 iface, UINT return D3DERR_OUTOFVIDEOMEMORY; }
- hr = surface_init(object, This, Width, Height, Format, Lockable, Discard, - Level, Usage, Pool, MultiSample, MultisampleQuality); + hr = surface_init(object, device, Width, Height, Format, Lockable, Discard, Level, Usage, + Pool, MultiSample, MultisampleQuality); if (FAILED(hr)) { WARN("Failed to initialize surface, hr %#x.\n", hr); @@ -843,41 +843,53 @@ static HRESULT IDirect3DDevice8Impl_CreateSurface(LPDIRECT3DDEVICE8 iface, UINT return D3D_OK; }
-static HRESULT WINAPI IDirect3DDevice8Impl_CreateRenderTarget(LPDIRECT3DDEVICE8 iface, UINT Width, UINT Height, D3DFORMAT Format, D3DMULTISAMPLE_TYPE MultiSample, BOOL Lockable, IDirect3DSurface8** ppSurface) { +static HRESULT WINAPI IDirect3DDevice8Impl_CreateRenderTarget(IDirect3DDevice8 *iface, UINT Width, + UINT Height, D3DFORMAT Format, D3DMULTISAMPLE_TYPE MultiSample, BOOL Lockable, + IDirect3DSurface8** ppSurface) +{ + IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface; HRESULT hr;
TRACE("iface %p, width %u, height %u, format %#x, multisample_type %#x, lockable %#x, surface %p.\n", iface, Width, Height, Format, MultiSample, Lockable, ppSurface);
- hr = IDirect3DDevice8Impl_CreateSurface(iface, Width, Height, Format, Lockable, FALSE /* Discard */, - 0 /* Level */, ppSurface, D3DUSAGE_RENDERTARGET, D3DPOOL_DEFAULT, MultiSample, 0); + hr = IDirect3DDevice8Impl_CreateSurface(This, Width, Height, Format, Lockable, + FALSE /* Discard */, 0 /* Level */, ppSurface, D3DUSAGE_RENDERTARGET, D3DPOOL_DEFAULT, + MultiSample, 0);
return hr; }
-static HRESULT WINAPI IDirect3DDevice8Impl_CreateDepthStencilSurface(LPDIRECT3DDEVICE8 iface, UINT Width, UINT Height, D3DFORMAT Format, D3DMULTISAMPLE_TYPE MultiSample, IDirect3DSurface8** ppSurface) { +static HRESULT WINAPI IDirect3DDevice8Impl_CreateDepthStencilSurface(IDirect3DDevice8 *iface, + UINT Width, UINT Height, D3DFORMAT Format, D3DMULTISAMPLE_TYPE MultiSample, + IDirect3DSurface8** ppSurface) +{ + IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface; HRESULT hr;
TRACE("iface %p, width %u, height %u, format %#x, multisample_type %#x, surface %p.\n", iface, Width, Height, Format, MultiSample, ppSurface);
/* TODO: Verify that Discard is false */ - hr = IDirect3DDevice8Impl_CreateSurface(iface, Width, Height, Format, TRUE /* Lockable */, FALSE, + hr = IDirect3DDevice8Impl_CreateSurface(This, Width, Height, Format, TRUE /* Lockable */, FALSE, 0 /* Level */, ppSurface, D3DUSAGE_DEPTHSTENCIL, D3DPOOL_DEFAULT, MultiSample, 0);
return hr; }
/* IDirect3DDevice8Impl::CreateImageSurface returns surface with pool type SYSTEMMEM */ -static HRESULT WINAPI IDirect3DDevice8Impl_CreateImageSurface(LPDIRECT3DDEVICE8 iface, UINT Width, UINT Height, D3DFORMAT Format, IDirect3DSurface8** ppSurface) { +static HRESULT WINAPI IDirect3DDevice8Impl_CreateImageSurface(IDirect3DDevice8 *iface, UINT Width, + UINT Height, D3DFORMAT Format, IDirect3DSurface8** ppSurface) +{ + IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface; HRESULT hr;
TRACE("iface %p, width %u, height %u, format %#x, surface %p.\n", iface, Width, Height, Format, ppSurface);
- hr = IDirect3DDevice8Impl_CreateSurface(iface, Width, Height, Format, TRUE /* Lockable */, FALSE /* Discard */, - 0 /* Level */, ppSurface, 0 /* Usage (undefined/none) */, D3DPOOL_SYSTEMMEM, D3DMULTISAMPLE_NONE, - 0 /* MultisampleQuality */); + hr = IDirect3DDevice8Impl_CreateSurface(This, Width, Height, Format, TRUE /* Lockable */, + FALSE /* Discard */, 0 /* Level */, ppSurface, 0 /* Usage (undefined/none) */, + D3DPOOL_SYSTEMMEM, D3DMULTISAMPLE_NONE, 0 /* MultisampleQuality */);
return hr; } @@ -2621,7 +2633,7 @@ static HRESULT STDMETHODCALLTYPE device_parent_CreateSurface(IWineD3DDeviceParen
if (pool == WINED3DPOOL_DEFAULT && !(usage & WINED3DUSAGE_DYNAMIC)) lockable = FALSE;
- hr = IDirect3DDevice8Impl_CreateSurface((IDirect3DDevice8 *)This, width, height, + hr = IDirect3DDevice8Impl_CreateSurface(This, width, height, d3dformat_from_wined3dformat(format), lockable, FALSE /* Discard */, level, (IDirect3DSurface8 **)&d3d_surface, usage, pool, D3DMULTISAMPLE_NONE, 0 /* MultisampleQuality */); if (FAILED(hr))
-
Alexandre Julliard