From 9f46792ba297f64ce72fc5d0ef11a52b1e045efa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stefan=20D=C3=B6singer?= Date: Sat, 11 Mar 2006 00:15:38 +0100 Subject: [PATCH] wined3d: Add WINED3DVERTEXBUFFER_DESC to wined3d_types.h. --- dlls/d3d8/vertexbuffer.c | 2 +- dlls/d3d9/vertexbuffer.c | 2 +- dlls/wined3d/vertexbuffer.c | 2 +- include/wine/wined3d_interface.h | 2 +- include/wine/wined3d_types.h | 9 +++++++++ 5 files changed, 13 insertions(+), 4 deletions(-) diff --git a/dlls/d3d8/vertexbuffer.c b/dlls/d3d8/vertexbuffer.c index 375a550ce73..5ca8318cb25 100644 --- a/dlls/d3d8/vertexbuffer.c +++ b/dlls/d3d8/vertexbuffer.c @@ -140,7 +140,7 @@ HRESULT WINAPI IDirect3DVertexBuffer8Impl_GetDesc(LPDIRECT3DVERTEXBUFFER8 iface, IDirect3DVertexBuffer8Impl *This = (IDirect3DVertexBuffer8Impl *)iface; TRACE("(%p) Relay\n", This); - return IWineD3DVertexBuffer_GetDesc(This->wineD3DVertexBuffer, pDesc); + return IWineD3DVertexBuffer_GetDesc(This->wineD3DVertexBuffer, (WINED3DVERTEXBUFFER_DESC *) pDesc); } const IDirect3DVertexBuffer8Vtbl Direct3DVertexBuffer8_Vtbl = diff --git a/dlls/d3d9/vertexbuffer.c b/dlls/d3d9/vertexbuffer.c index d10ab3d8bc8..9c46783decd 100644 --- a/dlls/d3d9/vertexbuffer.c +++ b/dlls/d3d9/vertexbuffer.c @@ -129,7 +129,7 @@ HRESULT WINAPI IDirect3DVertexBuffer9Impl_Unlock(LPDIRECT3DVERTEXBUFFER9 iface) HRESULT WINAPI IDirect3DVertexBuffer9Impl_GetDesc(LPDIRECT3DVERTEXBUFFER9 iface, D3DVERTEXBUFFER_DESC* pDesc) { IDirect3DVertexBuffer9Impl *This = (IDirect3DVertexBuffer9Impl *)iface; TRACE("(%p) Relay\n", This); - return IWineD3DVertexBuffer_GetDesc(This->wineD3DVertexBuffer, pDesc); + return IWineD3DVertexBuffer_GetDesc(This->wineD3DVertexBuffer, (WINED3DVERTEXBUFFER_DESC *) pDesc); } const IDirect3DVertexBuffer9Vtbl Direct3DVertexBuffer9_Vtbl = diff --git a/dlls/wined3d/vertexbuffer.c b/dlls/wined3d/vertexbuffer.c index 2a6719c1752..607338ab508 100644 --- a/dlls/wined3d/vertexbuffer.c +++ b/dlls/wined3d/vertexbuffer.c @@ -116,7 +116,7 @@ HRESULT WINAPI IWineD3DVertexBufferImpl_Unlock(IWineD3DVertexBuffer *ifa TRACE("(%p) : stub\n", This); return D3D_OK; } -HRESULT WINAPI IWineD3DVertexBufferImpl_GetDesc(IWineD3DVertexBuffer *iface, D3DVERTEXBUFFER_DESC *pDesc) { +HRESULT WINAPI IWineD3DVertexBufferImpl_GetDesc(IWineD3DVertexBuffer *iface, WINED3DVERTEXBUFFER_DESC *pDesc) { IWineD3DVertexBufferImpl *This = (IWineD3DVertexBufferImpl *)iface; TRACE("(%p)\n", This); diff --git a/include/wine/wined3d_interface.h b/include/wine/wined3d_interface.h index d15dfce5ac0..77392258168 100644 --- a/include/wine/wined3d_interface.h +++ b/include/wine/wined3d_interface.h @@ -634,7 +634,7 @@ DECLARE_INTERFACE_(IWineD3DVertexBuffer,IWineD3DResource) /*** IWineD3DVertexBuffer methods ***/ STDMETHOD(Lock)(THIS_ UINT OffsetToLock, UINT SizeToLock, BYTE ** ppbData, DWORD Flags) PURE; STDMETHOD(Unlock)(THIS) PURE; - STDMETHOD(GetDesc)(THIS_ D3DVERTEXBUFFER_DESC * pDesc) PURE; + STDMETHOD(GetDesc)(THIS_ WINED3DVERTEXBUFFER_DESC * pDesc) PURE; }; #undef INTERFACE diff --git a/include/wine/wined3d_types.h b/include/wine/wined3d_types.h index a764a0dd0f9..6b8a55864b0 100644 --- a/include/wine/wined3d_types.h +++ b/include/wine/wined3d_types.h @@ -601,6 +601,15 @@ typedef struct WINED3DDEVINFO_VCACHE { DWORD MagicNumber; } WINED3DDEVINFO_VCACHE; +typedef struct _WINED3DVERTEXBUFFER_DESC { + WINED3DFORMAT Format; + WINED3DRESOURCETYPE Type; + DWORD Usage; + D3DPOOL Pool; + UINT Size; + DWORD FVF; +} WINED3DVERTEXBUFFER_DESC; + /* * The wined3dcaps structure */