Skip to content

Commit 526909f

Browse files
Matteo Brunijulliard
Matteo Bruni
authored and
julliard
committed
d3dx9/tests: Get rid of unnecessary branches in D3DXLoadMeshTest().
1 parent e4cdcb1 commit 526909f

File tree

1 file changed

+60
-66
lines changed

1 file changed

+60
-66
lines changed

‎dlls/d3dx9_36/tests/mesh.c

+60-66
Original file line numberDiff line numberDiff line change
@@ -2383,6 +2383,8 @@ static void D3DXLoadMeshTest(void)
23832383
D3DXMATRIX transform;
23842384
struct test_context *test_context;
23852385
ID3DXAnimationController *controller;
2386+
D3DXMESHCONTAINER *container;
2387+
unsigned int i;
23862388

23872389
if (!(test_context = new_test_context()))
23882390
{
@@ -2418,26 +2420,24 @@ static void D3DXLoadMeshTest(void)
24182420
hr = D3DXLoadMeshHierarchyFromXInMemory(simple_xfile, sizeof(simple_xfile) - 1,
24192421
D3DXMESH_MANAGED, device, &alloc_hier, NULL, &frame_hier, NULL);
24202422
ok(hr == D3D_OK, "Expected D3D_OK, got %#lx\n", hr);
2421-
if (SUCCEEDED(hr)) {
2422-
D3DXMESHCONTAINER *container = frame_hier->pMeshContainer;
2423-
2424-
ok(frame_hier->Name == NULL, "Expected NULL, got '%s'\n", frame_hier->Name);
2425-
D3DXMatrixIdentity(&transform);
2426-
check_matrix(&frame_hier->TransformationMatrix, &transform);
2427-
2428-
ok(!strcmp(container->Name, ""), "Expected '', got '%s'\n", container->Name);
2429-
ok(container->MeshData.Type == D3DXMESHTYPE_MESH, "Expected %d, got %d\n",
2430-
D3DXMESHTYPE_MESH, container->MeshData.Type);
2431-
mesh = container->MeshData.pMesh;
2432-
check_vertex_buffer(mesh, simple_vertex_buffer, ARRAY_SIZE(simple_vertex_buffer), simple_fvf);
2433-
check_index_buffer(mesh, simple_index_buffer, ARRAY_SIZE(simple_index_buffer), sizeof(*simple_index_buffer));
2434-
check_materials(container->pMaterials, container->NumMaterials, NULL, 0);
2435-
check_generated_effects(container->pMaterials, container->NumMaterials, container->pEffects);
2436-
check_generated_adjacency(mesh, container->pAdjacency, 0.0f);
2437-
hr = D3DXFrameDestroy(frame_hier, &alloc_hier);
2438-
ok(hr == D3D_OK, "Expected D3D_OK, got %#lx\n", hr);
2439-
frame_hier = NULL;
2440-
}
2423+
container = frame_hier->pMeshContainer;
2424+
2425+
ok(frame_hier->Name == NULL, "Expected NULL, got '%s'\n", frame_hier->Name);
2426+
D3DXMatrixIdentity(&transform);
2427+
check_matrix(&frame_hier->TransformationMatrix, &transform);
2428+
2429+
ok(!strcmp(container->Name, ""), "Expected '', got '%s'\n", container->Name);
2430+
ok(container->MeshData.Type == D3DXMESHTYPE_MESH, "Expected %d, got %d\n",
2431+
D3DXMESHTYPE_MESH, container->MeshData.Type);
2432+
mesh = container->MeshData.pMesh;
2433+
check_vertex_buffer(mesh, simple_vertex_buffer, ARRAY_SIZE(simple_vertex_buffer), simple_fvf);
2434+
check_index_buffer(mesh, simple_index_buffer, ARRAY_SIZE(simple_index_buffer), sizeof(*simple_index_buffer));
2435+
check_materials(container->pMaterials, container->NumMaterials, NULL, 0);
2436+
check_generated_effects(container->pMaterials, container->NumMaterials, container->pEffects);
2437+
check_generated_adjacency(mesh, container->pAdjacency, 0.0f);
2438+
hr = D3DXFrameDestroy(frame_hier, &alloc_hier);
2439+
ok(hr == D3D_OK, "Expected D3D_OK, got %#lx\n", hr);
2440+
frame_hier = NULL;
24412441

24422442
controller = (ID3DXAnimationController *)0xdeadbeef;
24432443
hr = D3DXLoadMeshHierarchyFromXInMemory(box_anim_xfile, sizeof(box_anim_xfile) - 1,
@@ -2459,59 +2459,54 @@ static void D3DXLoadMeshTest(void)
24592459
hr = D3DXLoadMeshHierarchyFromXInMemory(box_xfile, sizeof(box_xfile) - 1,
24602460
D3DXMESH_MANAGED, device, &alloc_hier, NULL, &frame_hier, &controller);
24612461
ok(hr == D3D_OK, "Expected D3D_OK, got %#lx\n", hr);
2462-
if (SUCCEEDED(hr))
2463-
{
2464-
D3DXMESHCONTAINER *container = frame_hier->pMeshContainer;
2462+
container = frame_hier->pMeshContainer;
2463+
2464+
ok(!controller, "Animation Controller returned.\n");
2465+
ok(frame_hier->Name == NULL, "Expected NULL, got '%s'\n", frame_hier->Name);
2466+
D3DXMatrixIdentity(&transform);
2467+
check_matrix(&frame_hier->TransformationMatrix, &transform);
2468+
2469+
ok(!strcmp(container->Name, ""), "Expected '', got '%s'\n", container->Name);
2470+
ok(container->MeshData.Type == D3DXMESHTYPE_MESH, "Expected %d, got %d\n",
2471+
D3DXMESHTYPE_MESH, container->MeshData.Type);
2472+
mesh = container->MeshData.pMesh;
2473+
check_vertex_buffer(mesh, box_vertex_buffer, ARRAY_SIZE(box_vertex_buffer), box_fvf);
2474+
check_index_buffer(mesh, box_index_buffer, ARRAY_SIZE(box_index_buffer), sizeof(*box_index_buffer));
2475+
check_materials(container->pMaterials, container->NumMaterials, box_materials, ARRAY_SIZE(box_materials));
2476+
check_generated_effects(container->pMaterials, container->NumMaterials, container->pEffects);
2477+
check_generated_adjacency(mesh, container->pAdjacency, 0.0f);
2478+
hr = D3DXFrameDestroy(frame_hier, &alloc_hier);
2479+
ok(hr == D3D_OK, "Expected D3D_OK, got %#lx\n", hr);
2480+
frame_hier = NULL;
2481+
2482+
hr = D3DXLoadMeshHierarchyFromXInMemory(framed_xfile, sizeof(framed_xfile) - 1,
2483+
D3DXMESH_MANAGED, device, &alloc_hier, NULL, &frame_hier, NULL);
2484+
ok(hr == D3D_OK, "Expected D3D_OK, got %#lx\n", hr);
2485+
container = frame_hier->pMeshContainer;
24652486

2466-
ok(!controller, "Animation Controller returned.\n");
2467-
ok(frame_hier->Name == NULL, "Expected NULL, got '%s'\n", frame_hier->Name);
2468-
D3DXMatrixIdentity(&transform);
2469-
check_matrix(&frame_hier->TransformationMatrix, &transform);
2487+
ok(!strcmp(frame_hier->Name, ""), "Expected '', got '%s'\n", frame_hier->Name);
2488+
/* last frame transform replaces the first */
2489+
D3DXMatrixIdentity(&transform);
2490+
transform.m[3][2] = 3.0;
2491+
check_matrix(&frame_hier->TransformationMatrix, &transform);
24702492

2493+
for (i = 0; i < 3; ++i)
2494+
{
24712495
ok(!strcmp(container->Name, ""), "Expected '', got '%s'\n", container->Name);
24722496
ok(container->MeshData.Type == D3DXMESHTYPE_MESH, "Expected %d, got %d\n",
2473-
D3DXMESHTYPE_MESH, container->MeshData.Type);
2497+
D3DXMESHTYPE_MESH, container->MeshData.Type);
24742498
mesh = container->MeshData.pMesh;
2475-
check_vertex_buffer(mesh, box_vertex_buffer, ARRAY_SIZE(box_vertex_buffer), box_fvf);
2476-
check_index_buffer(mesh, box_index_buffer, ARRAY_SIZE(box_index_buffer), sizeof(*box_index_buffer));
2477-
check_materials(container->pMaterials, container->NumMaterials, box_materials, ARRAY_SIZE(box_materials));
2499+
check_vertex_buffer(mesh, framed_vertex_buffers[i], ARRAY_SIZE(framed_vertex_buffers[0]), framed_fvf);
2500+
check_index_buffer(mesh, framed_index_buffer, ARRAY_SIZE(framed_index_buffer), sizeof(*framed_index_buffer));
2501+
check_materials(container->pMaterials, container->NumMaterials, NULL, 0);
24782502
check_generated_effects(container->pMaterials, container->NumMaterials, container->pEffects);
24792503
check_generated_adjacency(mesh, container->pAdjacency, 0.0f);
2480-
hr = D3DXFrameDestroy(frame_hier, &alloc_hier);
2481-
ok(hr == D3D_OK, "Expected D3D_OK, got %#lx\n", hr);
2482-
frame_hier = NULL;
2504+
container = container->pNextMeshContainer;
24832505
}
2484-
2485-
hr = D3DXLoadMeshHierarchyFromXInMemory(framed_xfile, sizeof(framed_xfile) - 1,
2486-
D3DXMESH_MANAGED, device, &alloc_hier, NULL, &frame_hier, NULL);
2506+
ok(container == NULL, "Expected NULL, got %p\n", container);
2507+
hr = D3DXFrameDestroy(frame_hier, &alloc_hier);
24872508
ok(hr == D3D_OK, "Expected D3D_OK, got %#lx\n", hr);
2488-
if (SUCCEEDED(hr)) {
2489-
D3DXMESHCONTAINER *container = frame_hier->pMeshContainer;
2490-
int i;
2491-
2492-
ok(!strcmp(frame_hier->Name, ""), "Expected '', got '%s'\n", frame_hier->Name);
2493-
/* last frame transform replaces the first */
2494-
D3DXMatrixIdentity(&transform);
2495-
transform.m[3][2] = 3.0;
2496-
check_matrix(&frame_hier->TransformationMatrix, &transform);
2497-
2498-
for (i = 0; i < 3; i++) {
2499-
ok(!strcmp(container->Name, ""), "Expected '', got '%s'\n", container->Name);
2500-
ok(container->MeshData.Type == D3DXMESHTYPE_MESH, "Expected %d, got %d\n",
2501-
D3DXMESHTYPE_MESH, container->MeshData.Type);
2502-
mesh = container->MeshData.pMesh;
2503-
check_vertex_buffer(mesh, framed_vertex_buffers[i], ARRAY_SIZE(framed_vertex_buffers[0]), framed_fvf);
2504-
check_index_buffer(mesh, framed_index_buffer, ARRAY_SIZE(framed_index_buffer), sizeof(*framed_index_buffer));
2505-
check_materials(container->pMaterials, container->NumMaterials, NULL, 0);
2506-
check_generated_effects(container->pMaterials, container->NumMaterials, container->pEffects);
2507-
check_generated_adjacency(mesh, container->pAdjacency, 0.0f);
2508-
container = container->pNextMeshContainer;
2509-
}
2510-
ok(container == NULL, "Expected NULL, got %p\n", container);
2511-
hr = D3DXFrameDestroy(frame_hier, &alloc_hier);
2512-
ok(hr == D3D_OK, "Expected D3D_OK, got %#lx\n", hr);
2513-
frame_hier = NULL;
2514-
}
2509+
frame_hier = NULL;
25152510

25162511

25172512
hr = D3DXLoadMeshFromXInMemory(NULL, 0, D3DXMESH_MANAGED,
@@ -2541,8 +2536,7 @@ static void D3DXLoadMeshTest(void)
25412536
hr = D3DXLoadMeshFromXInMemory(simple_xfile, sizeof(simple_xfile) - 1, D3DXMESH_MANAGED,
25422537
device, NULL, NULL, NULL, NULL, &mesh);
25432538
ok(hr == D3D_OK, "Expected D3D_OK, got %#lx\n", hr);
2544-
if (SUCCEEDED(hr))
2545-
IUnknown_Release(mesh);
2539+
IUnknown_Release(mesh);
25462540

25472541
test_LoadMeshFromX(device, simple_xfile, simple_vertex_buffer, simple_fvf, simple_index_buffer, default_materials, TRUE);
25482542
test_LoadMeshFromX(device, box_xfile, box_vertex_buffer, box_fvf, box_index_buffer, box_materials, TRUE);

0 commit comments

Comments
 (0)