ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

wined3d: The FVF parameter to IWineD3DDeviceImpl_CreateVertexBuffer() is unused now.

This commit is contained in:
Henri Verbeet 2009-12-29 17:10:19 +01:00 committed by Alexandre Julliard
parent 9a81b032c4
commit 67cba48782
5 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
dlls/d3d8/vertexbuffer.c
View File

@ -272,8 +272,7 @@ HRESULT vertexbuffer_init(IDirect3DVertexBuffer8Impl *buffer, IDirect3DDevice8Im
wined3d_mutex_lock(); wined3d_mutex_lock();
hr = IWineD3DDevice_CreateVertexBuffer(device->WineD3DDevice, size, hr = IWineD3DDevice_CreateVertexBuffer(device->WineD3DDevice, size,
usage & WINED3DUSAGE_MASK, 0, usage & WINED3DUSAGE_MASK, (WINED3DPOOL)pool, &buffer->wineD3DVertexBuffer,
(WINED3DPOOL)pool, &buffer->wineD3DVertexBuffer,
(IUnknown *)buffer, &d3d8_vertexbuffer_wined3d_parent_ops); (IUnknown *)buffer, &d3d8_vertexbuffer_wined3d_parent_ops);
wined3d_mutex_unlock(); wined3d_mutex_unlock();
if (FAILED(hr)) if (FAILED(hr))

3
dlls/d3d9/vertexbuffer.c
View File

@ -273,8 +273,7 @@ HRESULT vertexbuffer_init(IDirect3DVertexBuffer9Impl *buffer, IDirect3DDevice9Im
wined3d_mutex_lock(); wined3d_mutex_lock();
hr = IWineD3DDevice_CreateVertexBuffer(device->WineD3DDevice, size, hr = IWineD3DDevice_CreateVertexBuffer(device->WineD3DDevice, size,
usage & WINED3DUSAGE_MASK, 0, usage & WINED3DUSAGE_MASK, (WINED3DPOOL)pool, &buffer->wineD3DVertexBuffer,
(WINED3DPOOL)pool, &buffer->wineD3DVertexBuffer,
(IUnknown *)buffer, &d3d9_vertexbuffer_wined3d_parent_ops); (IUnknown *)buffer, &d3d9_vertexbuffer_wined3d_parent_ops);
wined3d_mutex_unlock(); wined3d_mutex_unlock();
if (FAILED(hr)) if (FAILED(hr))

3
dlls/ddraw/direct3d.c
View File

@ -1016,8 +1016,7 @@ IDirect3DImpl_7_CreateVertexBuffer(IDirect3D7 *iface,
EnterCriticalSection(&ddraw_cs); EnterCriticalSection(&ddraw_cs);
hr = IWineD3DDevice_CreateVertexBuffer(This->wineD3DDevice, hr = IWineD3DDevice_CreateVertexBuffer(This->wineD3DDevice,
get_flexible_vertex_size(Desc->dwFVF) * Desc->dwNumVertices, get_flexible_vertex_size(Desc->dwFVF) * Desc->dwNumVertices,
usage, Desc->dwFVF, usage, Desc->dwCaps & D3DVBCAPS_SYSTEMMEMORY ? WINED3DPOOL_SYSTEMMEM : WINED3DPOOL_DEFAULT,
Desc->dwCaps & D3DVBCAPS_SYSTEMMEMORY ? WINED3DPOOL_SYSTEMMEM : WINED3DPOOL_DEFAULT,
&object->wineD3DVertexBuffer, (IUnknown *)object, &ddraw_null_wined3d_parent_ops); &object->wineD3DVertexBuffer, (IUnknown *)object, &ddraw_null_wined3d_parent_ops);
if(hr != D3D_OK) if(hr != D3D_OK)
{ {

8
dlls/wined3d/device.c
View File

@ -479,14 +479,17 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateBuffer(IWineD3DDevice *iface, str
return WINED3D_OK; return WINED3D_OK;
} }
static HRESULT WINAPI IWineD3DDeviceImpl_CreateVertexBuffer(IWineD3DDevice *iface, UINT Size, static HRESULT WINAPI IWineD3DDeviceImpl_CreateVertexBuffer(IWineD3DDevice *iface,
DWORD Usage, DWORD FVF, WINED3DPOOL Pool, IWineD3DBuffer **ppVertexBuffer, UINT Size, DWORD Usage, WINED3DPOOL Pool, IWineD3DBuffer **ppVertexBuffer,
IUnknown *parent, const struct wined3d_parent_ops *parent_ops) IUnknown *parent, const struct wined3d_parent_ops *parent_ops)
{ {
IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface;
struct wined3d_buffer *object; struct wined3d_buffer *object;
HRESULT hr; 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) if (Pool == WINED3DPOOL_SCRATCH)
{ {
/* The d3d9 testsuit shows that this is not allowed. It doesn't make much sense /* 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("Created buffer %p.\n", object);
TRACE("FVF %#x, Pool %#x.\n", FVF, Pool);
*ppVertexBuffer = (IWineD3DBuffer *)object; *ppVertexBuffer = (IWineD3DBuffer *)object;
/* Observations show that drawStridedSlow is faster on dynamic VBs than converting + /* Observations show that drawStridedSlow is faster on dynamic VBs than converting +

1
include/wine/wined3d.idl
View File

@ -2867,7 +2867,6 @@ interface IWineD3DDevice : IWineD3DBase
HRESULT CreateVertexBuffer( HRESULT CreateVertexBuffer(
[in] UINT length, [in] UINT length,
[in] DWORD usage, [in] DWORD usage,
[in] DWORD fvf,
[in] WINED3DPOOL pool, [in] WINED3DPOOL pool,
[out] IWineD3DBuffer **vertex_buffer, [out] IWineD3DBuffer **vertex_buffer,
[in] IUnknown *parent, [in] IUnknown *parent,