wined3d: Remove FVF related fields from IWineD3DVertexDeclaration.

This commit is contained in:
H. Verbeet 2007-03-12 23:21:54 +01:00 committed by Alexandre Julliard
parent b22ca33a85
commit ee09e8bfd6
2 changed files with 7 additions and 11 deletions

View File

@ -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);

View File

@ -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 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;