ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
dlls/wined3d/device.c
View File

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

17
dlls/wined3d/wined3d_private.h
View File

@ -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];
DWORD allFVF;
WINED3DVERTEXELEMENT *pDeclarationWine; WINED3DVERTEXELEMENT *pDeclarationWine;
UINT declarationWNumElements; UINT declarationWNumElements;
} IWineD3DVertexDeclarationImpl; } IWineD3DVertexDeclarationImpl;
extern const IWineD3DVertexDeclarationVtbl IWineD3DVertexDeclaration_Vtbl; extern const IWineD3DVertexDeclarationVtbl IWineD3DVertexDeclaration_Vtbl;