Skip to content

W
wine-cw
Commit 537c4bab authored by James Hawkins's avatar James Hawkins Committed by Alexandre Julliard
Browse files
Options

d3d8: Fix a few test failures in win2k3.

parent 76dfff11
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 3 deletions
dlls/d3d8/tests/device.c
View file @ 537c4bab
...@@ -1174,7 +1174,8 @@ static void test_lights(void) ...@@ -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) ...@@ -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) ...@@ -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");
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment