Misha Koshelev : d3dx9: Add stub and tests for D3DXCreateMesh.
Alexandre Julliard
julliard at winehq.org
Wed Aug 4 12:27:23 CDT 2010
Module: wine
Branch: master
Commit: bf46b4fdfc7deb51be27bae14cce794ffb4d068e
URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf46b4fdfc7deb51be27bae14cce794ffb4d068e
Author: Misha Koshelev <misha680 at gmail.com>
Date: Mon Aug 2 13:26:35 2010 -0500
d3dx9: Add stub and tests for D3DXCreateMesh.
---
dlls/d3dx9_36/d3dx9_36.spec | 2 +-
dlls/d3dx9_36/mesh.c | 8 +++
dlls/d3dx9_36/tests/mesh.c | 139 +++++++++++++++++++++++++++++++++++++++++++
include/d3dx9mesh.h | 1 +
4 files changed, 149 insertions(+), 1 deletions(-)
diff --git a/dlls/d3dx9_36/d3dx9_36.spec b/dlls/d3dx9_36/d3dx9_36.spec
index 622a03c..616b8a4 100644
--- a/dlls/d3dx9_36/d3dx9_36.spec
+++ b/dlls/d3dx9_36/d3dx9_36.spec
@@ -71,7 +71,7 @@
@ stub D3DXCreateKeyframedAnimationSet
@ stdcall D3DXCreateLine(ptr ptr)
@ stdcall D3DXCreateMatrixStack(long ptr)
-@ stub D3DXCreateMesh
+@ stdcall D3DXCreateMesh(long long long ptr ptr ptr)
@ stub D3DXCreateMeshFVF
@ stub D3DXCreateNPatchMesh
@ stub D3DXCreatePMeshFromStream
diff --git a/dlls/d3dx9_36/mesh.c b/dlls/d3dx9_36/mesh.c
index bfa1c23..df453f7 100644
--- a/dlls/d3dx9_36/mesh.c
+++ b/dlls/d3dx9_36/mesh.c
@@ -328,6 +328,14 @@ BOOL WINAPI D3DXSphereBoundProbe(CONST D3DXVECTOR3 *pcenter, FLOAT radius, CONST
return TRUE;
}
+HRESULT WINAPI D3DXCreateMesh(DWORD numfaces, DWORD numvertices, DWORD options, CONST LPD3DVERTEXELEMENT9 *declaration,
+ LPDIRECT3DDEVICE9 device, LPD3DXMESH *mesh)
+{
+ FIXME("(%d, %d, %d, %p, %p, %p): stub\n", numfaces, numvertices, options, declaration, device, mesh);
+
+ return E_NOTIMPL;
+}
+
HRESULT WINAPI D3DXCreateBox(LPDIRECT3DDEVICE9 device, FLOAT width, FLOAT height,
FLOAT depth, LPD3DXMESH* mesh, LPD3DXBUFFER* adjacency)
{
diff --git a/dlls/d3dx9_36/tests/mesh.c b/dlls/d3dx9_36/tests/mesh.c
index 87003d1..3920041 100644
--- a/dlls/d3dx9_36/tests/mesh.c
+++ b/dlls/d3dx9_36/tests/mesh.c
@@ -667,6 +667,144 @@ static void D3DXIntersectTriTest(void)
ok( got_res == exp_res, "Expected result = %d, got %d\n",exp_res,got_res);
}
+static void D3DXCreateMeshTest(void)
+{
+ HRESULT hr;
+ HWND wnd;
+ IDirect3D9 *d3d;
+ IDirect3DDevice9 *device, *test_device;
+ D3DPRESENT_PARAMETERS d3dpp;
+ ID3DXMesh *d3dxmesh;
+ int i, size;
+ D3DVERTEXELEMENT9 test_decl[MAX_FVF_DECL_SIZE];
+ DWORD fvf, options;
+ struct mesh mesh;
+
+ static const D3DVERTEXELEMENT9 decl[3] = {
+ {0, 0, D3DDECLTYPE_FLOAT3, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_POSITION, 0},
+ {0, 0xC, D3DDECLTYPE_FLOAT3, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_NORMAL, 0},
+ D3DDECL_END(), };
+
+ hr = D3DXCreateMesh(0, 0, 0, NULL, NULL, NULL);
+ todo_wine ok(hr == D3DERR_INVALIDCALL, "Got result %x, expected %x (D3DERR_INVALIDCALL)\n", hr, D3DERR_INVALIDCALL);
+
+ hr = D3DXCreateMesh(1, 3, D3DXMESH_MANAGED, (LPD3DVERTEXELEMENT9 *)&decl, NULL, &d3dxmesh);
+ todo_wine ok(hr == D3DERR_INVALIDCALL, "Got result %x, expected %x (D3DERR_INVALIDCALL)\n", hr, D3DERR_INVALIDCALL);
+
+ wnd = CreateWindow("static", "d3dx9_test", 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL);
+ if (!wnd)
+ {
+ skip("Couldn't create application window\n");
+ return;
+ }
+ d3d = Direct3DCreate9(D3D_SDK_VERSION);
+ if (!d3d)
+ {
+ skip("Couldn't create IDirect3D9 object\n");
+ DestroyWindow(wnd);
+ return;
+ }
+
+ ZeroMemory(&d3dpp, sizeof(d3dpp));
+ d3dpp.Windowed = TRUE;
+ d3dpp.SwapEffect = D3DSWAPEFFECT_DISCARD;
+ hr = IDirect3D9_CreateDevice(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, wnd, D3DCREATE_MIXED_VERTEXPROCESSING, &d3dpp, &device);
+ if (FAILED(hr))
+ {
+ skip("Failed to create IDirect3DDevice9 object %#x\n", hr);
+ IDirect3D9_Release(d3d);
+ DestroyWindow(wnd);
+ return;
+ }
+
+ hr = D3DXCreateMesh(0, 3, D3DXMESH_MANAGED, (LPD3DVERTEXELEMENT9 *)&decl, device, &d3dxmesh);
+ todo_wine ok(hr == D3DERR_INVALIDCALL, "Got result %x, expected %x (D3DERR_INVALIDCALL)\n", hr, D3DERR_INVALIDCALL);
+
+ hr = D3DXCreateMesh(1, 0, D3DXMESH_MANAGED, (LPD3DVERTEXELEMENT9 *)&decl, device, &d3dxmesh);
+ todo_wine ok(hr == D3DERR_INVALIDCALL, "Got result %x, expected %x (D3DERR_INVALIDCALL)\n", hr, D3DERR_INVALIDCALL);
+
+ hr = D3DXCreateMesh(1, 3, 0, (LPD3DVERTEXELEMENT9 *)&decl, device, &d3dxmesh);
+ todo_wine ok(hr == D3D_OK, "Got result %x, expected %x (D3D_OK)\n", hr, D3D_OK);
+
+ if (hr == D3D_OK)
+ {
+ d3dxmesh->lpVtbl->Release(d3dxmesh);
+ }
+
+ hr = D3DXCreateMesh(1, 3, D3DXMESH_MANAGED, 0, device, &d3dxmesh);
+ todo_wine ok(hr == D3DERR_INVALIDCALL, "Got result %x, expected %x (D3DERR_INVALIDCALL)\n", hr, D3DERR_INVALIDCALL);
+
+ hr = D3DXCreateMesh(1, 3, D3DXMESH_MANAGED, (LPD3DVERTEXELEMENT9 *)&decl, device, NULL);
+ todo_wine ok(hr == D3DERR_INVALIDCALL, "Got result %x, expected %x (D3DERR_INVALIDCALL)\n", hr, D3DERR_INVALIDCALL);
+
+ hr = D3DXCreateMesh(1, 3, D3DXMESH_MANAGED, (LPD3DVERTEXELEMENT9 *)&decl, device, &d3dxmesh);
+ todo_wine ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK)\n", hr);
+
+ if (hr == D3D_OK)
+ {
+ /* device */
+ hr = d3dxmesh->lpVtbl->GetDevice(d3dxmesh, NULL);
+ ok(hr == D3DERR_INVALIDCALL, "Got result %x, expected %x (D3DERR_INVALIDCALL)\n", hr, D3DERR_INVALIDCALL);
+
+ hr = d3dxmesh->lpVtbl->GetDevice(d3dxmesh, &test_device);
+ ok(hr == D3D_OK, "Got result %x, expected %x (D3D_OK)\n", hr, D3D_OK);
+ ok(test_device == device, "Got result %p, expected %p\n", test_device, device);
+
+ if (hr == D3D_OK)
+ {
+ IDirect3DDevice9_Release(device);
+ }
+
+ /* declaration */
+ hr = d3dxmesh->lpVtbl->GetDeclaration(d3dxmesh, test_decl);
+ ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK)\n", hr);
+
+ if (hr == D3D_OK)
+ {
+ size = sizeof(decl) / sizeof(decl[0]);
+ for (i = 0; i < size - 1; i++)
+ {
+ ok(test_decl[i].Stream == decl[i].Stream, "Returned stream %d, expected %d\n", test_decl[i].Stream, decl[i].Stream);
+ ok(test_decl[i].Type == decl[i].Type, "Returned type %d, expected %d\n", test_decl[i].Type, decl[i].Type);
+ ok(test_decl[i].Method == decl[i].Method, "Returned method %d, expected %d\n", test_decl[i].Method, decl[i].Method);
+ ok(test_decl[i].Usage == decl[i].Usage, "Returned usage %d, expected %d\n", test_decl[i].Usage, decl[i].Usage);
+ ok(test_decl[i].UsageIndex == decl[i].UsageIndex, "Returned usage index %d, expected %d\n", test_decl[i].UsageIndex, decl[i].UsageIndex);
+ ok(test_decl[i].Offset == decl[i].Offset, "Returned offset %d, expected %d\n", decl[1].Offset, decl[i].Offset);
+ }
+ ok(decl[size-1].Stream == 0xFF, "Returned too long vertex declaration\n"); /* end element */
+ }
+
+ /* FVF */
+ fvf = d3dxmesh->lpVtbl->GetFVF(d3dxmesh);
+ ok(fvf == (D3DFVF_XYZ | D3DFVF_NORMAL), "Got result %x, expected %x (D3DFVF_XYZ | D3DFVF_NORMAL)\n", fvf, D3DFVF_XYZ | D3DFVF_NORMAL);
+
+ /* options */
+ options = d3dxmesh->lpVtbl->GetOptions(d3dxmesh);
+ ok(options == D3DXMESH_MANAGED, "Got result %x, expected %x (D3DXMESH_MANAGED)\n", options, D3DXMESH_MANAGED);
+
+ /* rest */
+ if (!new_mesh(&mesh, 3, 1))
+ {
+ skip("Couldn't create mesh\n");
+ }
+ else
+ {
+ memset(mesh.vertices, 0, mesh.number_of_vertices * sizeof(*mesh.vertices));
+ memset(mesh.faces, 0, mesh.number_of_faces * sizeof(*mesh.faces));
+
+ compare_mesh("createmeshfvf", d3dxmesh, &mesh);
+
+ free_mesh(&mesh);
+ }
+
+ d3dxmesh->lpVtbl->Release(d3dxmesh);
+ }
+
+ IDirect3DDevice9_Release(device);
+ IDirect3D9_Release(d3d);
+ DestroyWindow(wnd);
+}
+
struct sincos_table
{
float *sin;
@@ -1031,6 +1169,7 @@ START_TEST(mesh)
D3DXDeclaratorFromFVFTest();
D3DXGetFVFVertexSizeTest();
D3DXIntersectTriTest();
+ D3DXCreateMeshTest();
D3DXCreateSphereTest();
test_get_decl_vertex_size();
}
diff --git a/include/d3dx9mesh.h b/include/d3dx9mesh.h
index 20d285c..063a587 100644
--- a/include/d3dx9mesh.h
+++ b/include/d3dx9mesh.h
@@ -150,6 +150,7 @@ DECLARE_INTERFACE_(ID3DXMesh, ID3DXBaseMesh)
extern "C" {
#endif
+HRESULT WINAPI D3DXCreateMesh(DWORD, DWORD, DWORD, CONST LPD3DVERTEXELEMENT9 *, LPDIRECT3DDEVICE9, LPD3DXMESH *);
HRESULT WINAPI D3DXCreateBuffer(DWORD, LPD3DXBUFFER*);
UINT WINAPI D3DXGetDeclVertexSize(const D3DVERTEXELEMENT9 *decl, DWORD stream_idx);
UINT WINAPI D3DXGetFVFVertexSize(DWORD);
More information about the wine-cvs
mailing list