David Adam : d3dx8: Implement D3DXGetFVFVertexSize.

[Alexandre Julliard]

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

Author: David Adam 
Date:   Thu Feb  5 18:56:47 2009 +0100

d3dx8: Implement D3DXGetFVFVertexSize.

---

dlls/d3dx8/mesh.c           |   33 +++++++++++++++++++++++++++++++--
 dlls/d3dx9_36/d3dx9_36.spec |    2 +-
 2 files changed, 32 insertions(+), 3 deletions(-)

diff --git a/dlls/d3dx8/mesh.c b/dlls/d3dx8/mesh.c
index 456bad2..6d6e40f 100644
--- a/dlls/d3dx8/mesh.c
+++ b/dlls/d3dx8/mesh.c
@@ -97,10 +97,39 @@ done we've got an intersection of the ray with the box.
     return TRUE;
 }

+static UINT Get_TexCoord_Size_From_FVF(DWORD FVF, int tex_num)
+{
+    return (((((FVF) >> (16 + (2 * (tex_num)))) + 1) & 0x03) + 1);
+}
+
 UINT WINAPI D3DXGetFVFVertexSize(DWORD FVF)
 {
-  FIXME("(void): stub\n");
-  return 0;
+    DWORD size = 0;
+    UINT i;
+    UINT numTextures = (FVF & D3DFVF_TEXCOUNT_MASK) >> D3DFVF_TEXCOUNT_SHIFT;
+
+    if (FVF & D3DFVF_NORMAL) size +=  sizeof(D3DXVECTOR3);
+    if (FVF & D3DFVF_DIFFUSE) size += sizeof(DWORD);
+    if (FVF & D3DFVF_SPECULAR) size += sizeof(DWORD);
+    if (FVF & D3DFVF_PSIZE) size += sizeof(DWORD);
+
+    switch (FVF & D3DFVF_POSITION_MASK)
+    {
+        case D3DFVF_XYZ:    size += sizeof(D3DXVECTOR3); break;
+        case D3DFVF_XYZRHW: size += 4 * sizeof(FLOAT); break;
+        case D3DFVF_XYZB1:  size += 4 * sizeof(FLOAT); break;
+        case D3DFVF_XYZB2:  size += 5 * sizeof(FLOAT); break;
+        case D3DFVF_XYZB3:  size += 6 * sizeof(FLOAT); break;
+        case D3DFVF_XYZB4:  size += 7 * sizeof(FLOAT); break;
+        case D3DFVF_XYZB5:  size += 8 * sizeof(FLOAT); break;
+    }
+
+    for (i = 0; i < numTextures; i++)
+    {
+        size += Get_TexCoord_Size_From_FVF(FVF, i) * sizeof(FLOAT);
+    }
+
+    return size;
 }

BOOL CDECL D3DXIntersectTri(CONST D3DXVECTOR3 *p0, CONST D3DXVECTOR3 *p1, CONST D3DXVECTOR3 *p2, CONST D3DXVECTOR3 *praypos, CONST D3DXVECTOR3 *praydir, FLOAT *pu, FLOAT *pv, FLOAT *pdist)
diff --git a/dlls/d3dx9_36/d3dx9_36.spec b/dlls/d3dx9_36/d3dx9_36.spec
index 813a5ad..64ebd58 100644
--- a/dlls/d3dx9_36/d3dx9_36.spec
+++ b/dlls/d3dx9_36/d3dx9_36.spec
@@ -150,7 +150,7 @@
 @ stub D3DXGetDeclLength
 @ stub D3DXGetDeclVertexSize
 @ stdcall D3DXGetDriverLevel(ptr)
-@ stdcall D3DXGetFVFVertexSize(long) d3dx8.D3DXGetFVFVertexSize
+@ stub D3DXGetFVFVertexSize
 @ stdcall D3DXGetImageInfoFromFileA(ptr ptr) d3dx8.D3DXGetImageInfoFromFileA
 @ stdcall D3DXGetImageInfoFromFileInMemory(ptr long ptr) d3dx8.D3DXGetImageInfoFromFileInMemory
 @ stdcall D3DXGetImageInfoFromFileW(ptr ptr) d3dx8.D3DXGetImageInfoFromFileW