diff --git a/include/d3dx9anim.h b/include/d3dx9anim.h index 71a18f01ff0..40bf47de325 100644 --- a/include/d3dx9anim.h +++ b/include/d3dx9anim.h @@ -85,7 +85,7 @@ typedef struct _D3DXMESHDATA union { LPD3DXMESH pMesh; - LPD3DXPMESH pPMesh; + ID3DXPMesh *pPMesh; ID3DXPatchMesh *pPatchMesh; } DUMMYUNIONNAME; } D3DXMESHDATA, *LPD3DXMESHDATA; diff --git a/include/d3dx9mesh.h b/include/d3dx9mesh.h index 9b68a94a597..f5bbd7fdd7c 100644 --- a/include/d3dx9mesh.h +++ b/include/d3dx9mesh.h @@ -783,7 +783,9 @@ HRESULT WINAPI D3DXConvertMeshSubsetToStrips(struct ID3DXBaseMesh *mesh_in, DWOR HRESULT WINAPI D3DXDeclaratorFromFVF(DWORD, D3DVERTEXELEMENT9[MAX_FVF_DECL_SIZE]); HRESULT WINAPI D3DXFVFFromDeclarator(const D3DVERTEXELEMENT9 *decl, DWORD *fvf); HRESULT WINAPI D3DXGenerateOutputDecl(D3DVERTEXELEMENT9 *, CONST D3DVERTEXELEMENT9 *); -HRESULT WINAPI D3DXGeneratePMesh(LPD3DXMESH, CONST DWORD *, CONST D3DXATTRIBUTEWEIGHTS *, CONST FLOAT *, DWORD, DWORD, LPD3DXPMESH *); +HRESULT WINAPI D3DXGeneratePMesh(ID3DXMesh *mesh, const DWORD *adjacency, + const D3DXATTRIBUTEWEIGHTS *attribute_weights, const float *vertex_weights, + DWORD min_value, DWORD flags, ID3DXPMesh **pmesh); HRESULT WINAPI D3DXIntersect(LPD3DXBASEMESH, CONST D3DXVECTOR3 *, CONST D3DXVECTOR3 *, BOOL *, DWORD *, FLOAT *, FLOAT *, FLOAT *, LPD3DXBUFFER *, DWORD *); HRESULT WINAPI D3DXIntersectSubset(LPD3DXBASEMESH, DWORD, CONST D3DXVECTOR3 *, CONST D3DXVECTOR3 *, BOOL *, DWORD *, FLOAT *, FLOAT *, FLOAT *, LPD3DXBUFFER *, DWORD *); BOOL WINAPI D3DXIntersectTri(CONST D3DXVECTOR3 *, CONST D3DXVECTOR3 *, CONST D3DXVECTOR3 *, CONST D3DXVECTOR3 *, CONST D3DXVECTOR3*, FLOAT *, FLOAT *, FLOAT *);