d3d8: Fix a few test failures in win2k3.
This commit is contained in:
parent
76dfff11a3
commit
537c4babed
|
@ -1174,7 +1174,8 @@ static void test_lights(void)
|
||||||
|
|
||||||
hr = IDirect3D8_CreateDevice( d3d8, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL /* no NULLREF here */, hwnd,
|
hr = IDirect3D8_CreateDevice( d3d8, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL /* no NULLREF here */, hwnd,
|
||||||
D3DCREATE_HARDWARE_VERTEXPROCESSING | D3DCREATE_PUREDEVICE, &d3dpp, &device );
|
D3DCREATE_HARDWARE_VERTEXPROCESSING | D3DCREATE_PUREDEVICE, &d3dpp, &device );
|
||||||
ok(hr == D3D_OK || hr == D3DERR_NOTAVAILABLE, "IDirect3D8_CreateDevice failed with %s\n", DXGetErrorString8(hr));
|
ok(hr == D3D_OK || hr == D3DERR_NOTAVAILABLE || hr == D3DERR_INVALIDCALL,
|
||||||
|
"IDirect3D8_CreateDevice failed with %s\n", DXGetErrorString8(hr));
|
||||||
if(!device)
|
if(!device)
|
||||||
{
|
{
|
||||||
skip("Failed to create a d3d device\n");
|
skip("Failed to create a d3d device\n");
|
||||||
|
@ -1252,7 +1253,8 @@ static void test_render_zero_triangles(void)
|
||||||
|
|
||||||
hr = IDirect3D8_CreateDevice( d3d8, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL /* no NULLREF here */, hwnd,
|
hr = IDirect3D8_CreateDevice( d3d8, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL /* no NULLREF here */, hwnd,
|
||||||
D3DCREATE_HARDWARE_VERTEXPROCESSING | D3DCREATE_PUREDEVICE, &d3dpp, &device );
|
D3DCREATE_HARDWARE_VERTEXPROCESSING | D3DCREATE_PUREDEVICE, &d3dpp, &device );
|
||||||
ok(hr == D3D_OK || hr == D3DERR_NOTAVAILABLE, "IDirect3D8_CreateDevice failed with %s\n", DXGetErrorString8(hr));
|
ok(hr == D3D_OK || hr == D3DERR_NOTAVAILABLE || hr == D3DERR_INVALIDCALL,
|
||||||
|
"IDirect3D8_CreateDevice failed with %s\n", DXGetErrorString8(hr));
|
||||||
if(!device)
|
if(!device)
|
||||||
{
|
{
|
||||||
skip("Failed to create a d3d device\n");
|
skip("Failed to create a d3d device\n");
|
||||||
|
@ -1302,7 +1304,8 @@ static void test_set_material(void)
|
||||||
|
|
||||||
hr = IDirect3D8_CreateDevice( d3d8, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, hwnd,
|
hr = IDirect3D8_CreateDevice( d3d8, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, hwnd,
|
||||||
D3DCREATE_HARDWARE_VERTEXPROCESSING | D3DCREATE_PUREDEVICE, &present_parameters, &device );
|
D3DCREATE_HARDWARE_VERTEXPROCESSING | D3DCREATE_PUREDEVICE, &present_parameters, &device );
|
||||||
ok(hr == D3D_OK || hr == D3DERR_NOTAVAILABLE, "IDirect3D8_CreateDevice failed with %s\n", DXGetErrorString8(hr));
|
ok(hr == D3D_OK || hr == D3DERR_NOTAVAILABLE || hr == D3DERR_INVALIDCALL,
|
||||||
|
"IDirect3D8_CreateDevice failed with %s\n", DXGetErrorString8(hr));
|
||||||
if(!device)
|
if(!device)
|
||||||
{
|
{
|
||||||
skip("Failed to create a d3d device\n");
|
skip("Failed to create a d3d device\n");
|
||||||
|
|
Loading…
Reference in New Issue