H. Verbeet : wined3d:
Remove FVF related fields from IWineD3DVertexDeclaration.
Alexandre Julliard
julliard at wine.codeweavers.com
Tue Mar 13 07:56:00 CDT 2007
Module: wine
Branch: master
Commit: ee09e8bfd6e7f5e84d0a37eeb221497cf682da8c
URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee09e8bfd6e7f5e84d0a37eeb221497cf682da8c
Author: H. Verbeet <hverbeet at gmail.com>
Date: Mon Mar 12 23:21:54 2007 +0100
wined3d: Remove FVF related fields from IWineD3DVertexDeclaration.
---
dlls/wined3d/device.c | 1 -
dlls/wined3d/wined3d_private.h | 21 +++++++++------------
2 files changed, 9 insertions(+), 13 deletions(-)
diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c
index 10b03bf..c20779c 100644
--- a/dlls/wined3d/device.c
+++ b/dlls/wined3d/device.c
@@ -1548,7 +1548,6 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateVertexDeclaration(IWineD3DDevice*
This, ((IWineD3DImpl *)This->wineD3D)->dxVersion, elements, element_count, ppVertexDeclaration);
D3DCREATEOBJECTINSTANCE(object, VertexDeclaration)
- object->allFVF = 0;
hr = IWineD3DVertexDeclaration_SetDeclaration((IWineD3DVertexDeclaration *)object, elements, element_count);
diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
index 9d80d83..dab9f35 100644
--- a/dlls/wined3d/wined3d_private.h
+++ b/dlls/wined3d/wined3d_private.h
@@ -1145,18 +1145,15 @@ BOOL CalculateTexRect(IWineD3DSurfaceImpl *This, RECT *Rect, float glTexCoord[4]
* IWineD3DVertexDeclaration implementation structure
*/
typedef struct IWineD3DVertexDeclarationImpl {
- /* IUnknown Information */
- const IWineD3DVertexDeclarationVtbl *lpVtbl;
- LONG ref; /* Note: Ref counting not required */
-
- IUnknown *parent;
- /** precomputed fvf if simple declaration */
- IWineD3DDeviceImpl *wineD3DDevice;
- DWORD fvf[MAX_STREAMS];
- DWORD allFVF;
-
- WINED3DVERTEXELEMENT *pDeclarationWine;
- UINT declarationWNumElements;
+ /* IUnknown Information */
+ const IWineD3DVertexDeclarationVtbl *lpVtbl;
+ LONG ref;
+
+ IUnknown *parent;
+ IWineD3DDeviceImpl *wineD3DDevice;
+
+ WINED3DVERTEXELEMENT *pDeclarationWine;
+ UINT declarationWNumElements;
} IWineD3DVertexDeclarationImpl;
extern const IWineD3DVertexDeclarationVtbl IWineD3DVertexDeclaration_Vtbl;
More information about the wine-cvs
mailing list