Commit ee09e8bf authored by H. Verbeet's avatar H. Verbeet Committed by Alexandre Julliard

wined3d: Remove FVF related fields from IWineD3DVertexDeclaration.

parent b22ca33a
...@@ -1548,7 +1548,6 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateVertexDeclaration(IWineD3DDevice* ...@@ -1548,7 +1548,6 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateVertexDeclaration(IWineD3DDevice*
This, ((IWineD3DImpl *)This->wineD3D)->dxVersion, elements, element_count, ppVertexDeclaration); This, ((IWineD3DImpl *)This->wineD3D)->dxVersion, elements, element_count, ppVertexDeclaration);
D3DCREATEOBJECTINSTANCE(object, VertexDeclaration) D3DCREATEOBJECTINSTANCE(object, VertexDeclaration)
object->allFVF = 0;
hr = IWineD3DVertexDeclaration_SetDeclaration((IWineD3DVertexDeclaration *)object, elements, element_count); hr = IWineD3DVertexDeclaration_SetDeclaration((IWineD3DVertexDeclaration *)object, elements, element_count);
......
...@@ -1145,18 +1145,15 @@ BOOL CalculateTexRect(IWineD3DSurfaceImpl *This, RECT *Rect, float glTexCoord[4] ...@@ -1145,18 +1145,15 @@ BOOL CalculateTexRect(IWineD3DSurfaceImpl *This, RECT *Rect, float glTexCoord[4]
* IWineD3DVertexDeclaration implementation structure * IWineD3DVertexDeclaration implementation structure
*/ */
typedef struct IWineD3DVertexDeclarationImpl { typedef struct IWineD3DVertexDeclarationImpl {
/* IUnknown Information */ /* IUnknown Information */
const IWineD3DVertexDeclarationVtbl *lpVtbl; const IWineD3DVertexDeclarationVtbl *lpVtbl;
LONG ref; /* Note: Ref counting not required */ LONG ref;
IUnknown *parent; IUnknown *parent;
/** precomputed fvf if simple declaration */ IWineD3DDeviceImpl *wineD3DDevice;
IWineD3DDeviceImpl *wineD3DDevice;
DWORD fvf[MAX_STREAMS]; WINED3DVERTEXELEMENT *pDeclarationWine;
DWORD allFVF; UINT declarationWNumElements;
WINED3DVERTEXELEMENT *pDeclarationWine;
UINT declarationWNumElements;
} IWineD3DVertexDeclarationImpl; } IWineD3DVertexDeclarationImpl;
extern const IWineD3DVertexDeclarationVtbl IWineD3DVertexDeclaration_Vtbl; extern const IWineD3DVertexDeclarationVtbl IWineD3DVertexDeclaration_Vtbl;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment