d3d9/tests: Warn that tests were skipped if we could not load d3d9.dll.
But report a failed test if a mandatory function is missing from it. Also warn if the hardware capabilities force us to skip some tests.
This commit is contained in:
parent
d90879f10c
commit
354b9e7aae
|
@ -946,8 +946,14 @@ static void test_display_modes(void)
|
|||
START_TEST(device)
|
||||
{
|
||||
HMODULE d3d9_handle = LoadLibraryA( "d3d9.dll" );
|
||||
if (!d3d9_handle)
|
||||
{
|
||||
skip("Could not load d3d9.dll\n");
|
||||
return;
|
||||
}
|
||||
|
||||
pDirect3DCreate9 = (void *)GetProcAddress( d3d9_handle, "Direct3DCreate9" );
|
||||
ok(pDirect3DCreate9 != NULL, "Failed to get address of Direct3DCreate9\n");
|
||||
if (pDirect3DCreate9)
|
||||
{
|
||||
test_display_modes();
|
||||
|
|
|
@ -154,7 +154,7 @@ START_TEST(shader)
|
|||
d3d9_handle = LoadLibraryA("d3d9.dll");
|
||||
if (!d3d9_handle)
|
||||
{
|
||||
trace("Could not load d3d9.dll, skipping tests\n");
|
||||
skip("Could not load d3d9.dll\n");
|
||||
return;
|
||||
}
|
||||
|
||||
|
@ -167,11 +167,11 @@ START_TEST(shader)
|
|||
{
|
||||
test_get_set_vertex_shader(device_ptr);
|
||||
}
|
||||
else trace("No vertex shader support, skipping test\n");
|
||||
else skip("No vertex shader support\n");
|
||||
|
||||
if (caps.PixelShaderVersion & 0xffff)
|
||||
{
|
||||
test_get_set_pixel_shader(device_ptr);
|
||||
}
|
||||
else trace("No pixel shader support, skipping test\n");
|
||||
else skip("No pixel shader support\n");
|
||||
}
|
||||
|
|
|
@ -1459,7 +1459,7 @@ START_TEST(stateblock)
|
|||
d3d9_handle = LoadLibraryA("d3d9.dll");
|
||||
if (!d3d9_handle)
|
||||
{
|
||||
trace("Could not load d3d9.dll, skipping tests\n");
|
||||
skip("Could not load d3d9.dll\n");
|
||||
return;
|
||||
}
|
||||
|
||||
|
|
|
@ -180,7 +180,7 @@ START_TEST(surface)
|
|||
d3d9_handle = LoadLibraryA("d3d9.dll");
|
||||
if (!d3d9_handle)
|
||||
{
|
||||
trace("Could not load d3d9.dll, skipping tests\n");
|
||||
skip("Could not load d3d9.dll\n");
|
||||
return;
|
||||
}
|
||||
|
||||
|
|
|
@ -109,7 +109,7 @@ START_TEST(texture)
|
|||
d3d9_handle = LoadLibraryA("d3d9.dll");
|
||||
if (!d3d9_handle)
|
||||
{
|
||||
trace("Could not load d3d9.dll, skipping tests\n");
|
||||
skip("Could not load d3d9.dll\n");
|
||||
return;
|
||||
}
|
||||
|
||||
|
|
|
@ -632,21 +632,21 @@ START_TEST(vertexdeclaration)
|
|||
d3d9_handle = LoadLibraryA("d3d9.dll");
|
||||
if (!d3d9_handle)
|
||||
{
|
||||
trace("Could not load d3d9.dll, skipping tests\n");
|
||||
skip("Could not load d3d9.dll\n");
|
||||
return;
|
||||
}
|
||||
|
||||
device_ptr = init_d3d9();
|
||||
if (!device_ptr)
|
||||
{
|
||||
trace("Failed to initialise d3d9, aborting test.\n");
|
||||
skip("Failed to initialise d3d9\n");
|
||||
return;
|
||||
}
|
||||
|
||||
decl_ptr = test_create_vertex_declaration(device_ptr, simple_decl);
|
||||
if (!decl_ptr)
|
||||
{
|
||||
trace("Failed to create a vertex declaration, aborting test.\n");
|
||||
skip("Failed to create a vertex declaration\n");
|
||||
return;
|
||||
}
|
||||
|
||||
|
|
|
@ -126,7 +126,7 @@ START_TEST(volume)
|
|||
d3d9_handle = LoadLibraryA("d3d9.dll");
|
||||
if (!d3d9_handle)
|
||||
{
|
||||
trace("Could not load d3d9.dll, skipping tests\n");
|
||||
skip("Could not load d3d9.dll\n");
|
||||
return;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue