commit ee09e8bfd6e7f5e84d0a37eeb221497cf682da8c
author H. Verbeet <hverbeet@gmail.com> Mon Mar 12 23:21:54 2007 +0100
committer Alexandre Julliard <julliard@winehq.org> Tue Mar 13 11:54:24 2007 +0100
tree b712167eecd6e4beed6d8c5fa323e5312be009cb
parent b22ca33a856cfb65a24251c0e7324cdfcbafac70

wined3d: Remove FVF related fields from IWineD3DVertexDeclaration.

dlls/wined3d/device.c

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 @@
             This, ((IWineD3DImpl *)This->wineD3D)->dxVersion, elements, element_count, ppVertexDeclaration);
 
     D3DCREATEOBJECTINSTANCE(object, VertexDeclaration)
-    object->allFVF = 0;
 
     hr = IWineD3DVertexDeclaration_SetDeclaration((IWineD3DVertexDeclaration *)object, elements, element_count);
 

dlls/wined3d/wined3d_private.h

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 @@
  * IWineD3DVertexDeclaration implementation structure
  */
 typedef struct IWineD3DVertexDeclarationImpl {
- /* IUnknown  Information     */
-  const IWineD3DVertexDeclarationVtbl *lpVtbl;
-  LONG                    ref;     /* Note: Ref counting not required */
+    /* IUnknown  Information */
+    const IWineD3DVertexDeclarationVtbl *lpVtbl;
+    LONG                    ref;
 
-  IUnknown               *parent;
-  /** precomputed fvf if simple declaration */
-  IWineD3DDeviceImpl     *wineD3DDevice;
-  DWORD   fvf[MAX_STREAMS];
-  DWORD   allFVF;
+    IUnknown                *parent;
+    IWineD3DDeviceImpl      *wineD3DDevice;
 
-  WINED3DVERTEXELEMENT  *pDeclarationWine;
-  UINT                   declarationWNumElements;
+    WINED3DVERTEXELEMENT    *pDeclarationWine;
+    UINT                    declarationWNumElements;
 } IWineD3DVertexDeclarationImpl;
 
 extern const IWineD3DVertexDeclarationVtbl IWineD3DVertexDeclaration_Vtbl;