Module: wine Branch: master Commit: 67cba4878255629680cde25ca5d24a83a757b923 URL: http://source.winehq.org/git/wine.git/?a=commit;h=67cba4878255629680cde25ca5...
Author: Henri Verbeet hverbeet@codeweavers.com Date: Tue Dec 29 17:10:19 2009 +0100
wined3d: The FVF parameter to IWineD3DDeviceImpl_CreateVertexBuffer() is unused now.
---
dlls/d3d8/vertexbuffer.c | 3 +-- dlls/d3d9/vertexbuffer.c | 3 +-- dlls/ddraw/direct3d.c | 3 +-- dlls/wined3d/device.c | 8 +++++--- include/wine/wined3d.idl | 1 - 5 files changed, 8 insertions(+), 10 deletions(-)
diff --git a/dlls/d3d8/vertexbuffer.c b/dlls/d3d8/vertexbuffer.c index 18cc7b3..476fcc4 100644 --- a/dlls/d3d8/vertexbuffer.c +++ b/dlls/d3d8/vertexbuffer.c @@ -272,8 +272,7 @@ HRESULT vertexbuffer_init(IDirect3DVertexBuffer8Impl *buffer, IDirect3DDevice8Im
wined3d_mutex_lock(); hr = IWineD3DDevice_CreateVertexBuffer(device->WineD3DDevice, size, - usage & WINED3DUSAGE_MASK, 0, - (WINED3DPOOL)pool, &buffer->wineD3DVertexBuffer, + usage & WINED3DUSAGE_MASK, (WINED3DPOOL)pool, &buffer->wineD3DVertexBuffer, (IUnknown *)buffer, &d3d8_vertexbuffer_wined3d_parent_ops); wined3d_mutex_unlock(); if (FAILED(hr)) diff --git a/dlls/d3d9/vertexbuffer.c b/dlls/d3d9/vertexbuffer.c index 4eeb5c1..1841bec 100644 --- a/dlls/d3d9/vertexbuffer.c +++ b/dlls/d3d9/vertexbuffer.c @@ -273,8 +273,7 @@ HRESULT vertexbuffer_init(IDirect3DVertexBuffer9Impl *buffer, IDirect3DDevice9Im
wined3d_mutex_lock(); hr = IWineD3DDevice_CreateVertexBuffer(device->WineD3DDevice, size, - usage & WINED3DUSAGE_MASK, 0, - (WINED3DPOOL)pool, &buffer->wineD3DVertexBuffer, + usage & WINED3DUSAGE_MASK, (WINED3DPOOL)pool, &buffer->wineD3DVertexBuffer, (IUnknown *)buffer, &d3d9_vertexbuffer_wined3d_parent_ops); wined3d_mutex_unlock(); if (FAILED(hr)) diff --git a/dlls/ddraw/direct3d.c b/dlls/ddraw/direct3d.c index a89d998..80052ad 100644 --- a/dlls/ddraw/direct3d.c +++ b/dlls/ddraw/direct3d.c @@ -1016,8 +1016,7 @@ IDirect3DImpl_7_CreateVertexBuffer(IDirect3D7 *iface, EnterCriticalSection(&ddraw_cs); hr = IWineD3DDevice_CreateVertexBuffer(This->wineD3DDevice, get_flexible_vertex_size(Desc->dwFVF) * Desc->dwNumVertices, - usage, Desc->dwFVF, - Desc->dwCaps & D3DVBCAPS_SYSTEMMEMORY ? WINED3DPOOL_SYSTEMMEM : WINED3DPOOL_DEFAULT, + usage, Desc->dwCaps & D3DVBCAPS_SYSTEMMEMORY ? WINED3DPOOL_SYSTEMMEM : WINED3DPOOL_DEFAULT, &object->wineD3DVertexBuffer, (IUnknown *)object, &ddraw_null_wined3d_parent_ops); if(hr != D3D_OK) { diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 8240f55..e025ccd 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -479,14 +479,17 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateBuffer(IWineD3DDevice *iface, str return WINED3D_OK; }
-static HRESULT WINAPI IWineD3DDeviceImpl_CreateVertexBuffer(IWineD3DDevice *iface, UINT Size, - DWORD Usage, DWORD FVF, WINED3DPOOL Pool, IWineD3DBuffer **ppVertexBuffer, +static HRESULT WINAPI IWineD3DDeviceImpl_CreateVertexBuffer(IWineD3DDevice *iface, + UINT Size, DWORD Usage, WINED3DPOOL Pool, IWineD3DBuffer **ppVertexBuffer, IUnknown *parent, const struct wined3d_parent_ops *parent_ops) { IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; struct wined3d_buffer *object; HRESULT hr;
+ TRACE("iface %p, size %u, usage %#x, pool %#x, buffer %p, parent %p, parent_ops %p.\n", + iface, Size, Usage, Pool, ppVertexBuffer, parent, parent_ops); + if (Pool == WINED3DPOOL_SCRATCH) { /* The d3d9 testsuit shows that this is not allowed. It doesn't make much sense @@ -515,7 +518,6 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateVertexBuffer(IWineD3DDevice *ifac }
TRACE("Created buffer %p.\n", object); - TRACE("FVF %#x, Pool %#x.\n", FVF, Pool); *ppVertexBuffer = (IWineD3DBuffer *)object;
/* Observations show that drawStridedSlow is faster on dynamic VBs than converting + diff --git a/include/wine/wined3d.idl b/include/wine/wined3d.idl index ec69655..7c44b5e 100644 --- a/include/wine/wined3d.idl +++ b/include/wine/wined3d.idl @@ -2867,7 +2867,6 @@ interface IWineD3DDevice : IWineD3DBase HRESULT CreateVertexBuffer( [in] UINT length, [in] DWORD usage, - [in] DWORD fvf, [in] WINED3DPOOL pool, [out] IWineD3DBuffer **vertex_buffer, [in] IUnknown *parent,