Commit 46050fb3 authored by Misha Koshelev's avatar Misha Koshelev Committed by Alexandre Julliard

d3dx9: Add tests for FVF <-> declaration conversion.

parent e474eb81
...@@ -139,7 +139,7 @@ ...@@ -139,7 +139,7 @@
@ stub D3DXFrameNumNamedMatrices @ stub D3DXFrameNumNamedMatrices
@ stub D3DXFrameRegisterNamedMatrices @ stub D3DXFrameRegisterNamedMatrices
@ stdcall D3DXFresnelTerm(long long) @ stdcall D3DXFresnelTerm(long long)
@ stub D3DXFVFFromDeclarator @ stdcall D3DXFVFFromDeclarator(ptr ptr)
@ stub D3DXGatherFragments @ stub D3DXGatherFragments
@ stub D3DXGatherFragmentsFromFileA @ stub D3DXGatherFragmentsFromFileA
@ stub D3DXGatherFragmentsFromFileW @ stub D3DXGatherFragmentsFromFileW
......
/* /*
* Mesh operations specific to D3DX9. * Mesh operations specific to D3DX9.
* *
* Copyright (C) 2005 Henri Verbeet
* Copyright (C) 2006 Ivan Gyurdiev
* Copyright (C) 2009 David Adam * Copyright (C) 2009 David Adam
* Copyright (C) 2010 Tony Wasserka * Copyright (C) 2010 Tony Wasserka
* *
...@@ -178,6 +180,16 @@ HRESULT WINAPI D3DXDeclaratorFromFVF(DWORD fvf, D3DVERTEXELEMENT9 Declaration[MA ...@@ -178,6 +180,16 @@ HRESULT WINAPI D3DXDeclaratorFromFVF(DWORD fvf, D3DVERTEXELEMENT9 Declaration[MA
} }
/************************************************************************* /*************************************************************************
* D3DXFVFFromDeclarator
*/
HRESULT WINAPI D3DXFVFFromDeclarator(const LPD3DVERTEXELEMENT9 *declaration, DWORD *fvf)
{
FIXME("(%p, %p): stub\n", declaration, fvf);
return E_NOTIMPL;
}
/*************************************************************************
* D3DXGetFVFVertexSize * D3DXGetFVFVertexSize
*/ */
static UINT Get_TexCoord_Size_From_FVF(DWORD FVF, int tex_num) static UINT Get_TexCoord_Size_From_FVF(DWORD FVF, int tex_num)
......
...@@ -159,6 +159,7 @@ BOOL WINAPI D3DXSphereBoundProbe(CONST D3DXVECTOR3 *,FLOAT,CONST D3DXVECTOR3 ...@@ -159,6 +159,7 @@ BOOL WINAPI D3DXSphereBoundProbe(CONST D3DXVECTOR3 *,FLOAT,CONST D3DXVECTOR3
HRESULT WINAPI D3DXComputeBoundingBox(CONST D3DXVECTOR3 *, DWORD, DWORD, D3DXVECTOR3 *, D3DXVECTOR3 *); HRESULT WINAPI D3DXComputeBoundingBox(CONST D3DXVECTOR3 *, DWORD, DWORD, D3DXVECTOR3 *, D3DXVECTOR3 *);
HRESULT WINAPI D3DXComputeBoundingSphere(CONST D3DXVECTOR3 *, DWORD, DWORD, D3DXVECTOR3 *, FLOAT *); HRESULT WINAPI D3DXComputeBoundingSphere(CONST D3DXVECTOR3 *, DWORD, DWORD, D3DXVECTOR3 *, FLOAT *);
HRESULT WINAPI D3DXDeclaratorFromFVF(DWORD, D3DVERTEXELEMENT9[MAX_FVF_DECL_SIZE]); HRESULT WINAPI D3DXDeclaratorFromFVF(DWORD, D3DVERTEXELEMENT9[MAX_FVF_DECL_SIZE]);
HRESULT WINAPI D3DXFVFFromDeclarator(const LPD3DVERTEXELEMENT9 *, DWORD *);
BOOL WINAPI D3DXIntersectTri(CONST D3DXVECTOR3 *, CONST D3DXVECTOR3 *, CONST D3DXVECTOR3 *, CONST D3DXVECTOR3 *, CONST D3DXVECTOR3*, FLOAT *, FLOAT *, FLOAT *); BOOL WINAPI D3DXIntersectTri(CONST D3DXVECTOR3 *, CONST D3DXVECTOR3 *, CONST D3DXVECTOR3 *, CONST D3DXVECTOR3 *, CONST D3DXVECTOR3*, FLOAT *, FLOAT *, FLOAT *);
#ifdef __cplusplus #ifdef __cplusplus
......
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