Henri Verbeet : d3dx9: Avoid LPD3DXPMESH.

Alexandre Julliard julliard at winehq.org
Wed Nov 28 14:14:05 CST 2012


Module: wine
Branch: master
Commit: 35a88f5ea291fa17d69f52c50fb9d32c0fb1e148
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=35a88f5ea291fa17d69f52c50fb9d32c0fb1e148

Author: Henri Verbeet <hverbeet at codeweavers.com>
Date:   Tue Nov 27 22:10:58 2012 +0100

d3dx9: Avoid LPD3DXPMESH.

---

 include/d3dx9anim.h |    2 +-
 include/d3dx9mesh.h |    4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/include/d3dx9anim.h b/include/d3dx9anim.h
index 71a18f0..40bf47d 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 9b68a94..f5bbd7f 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 *);




More information about the wine-cvs mailing list