d3d8/tests: Make tests pass on a W2K8 VM.
This commit is contained in:
parent
746948551a
commit
ae79b02ca6
|
@ -815,7 +815,7 @@ static void test_scene(void)
|
||||||
|
|
||||||
hr = IDirect3D8_CreateDevice( pD3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL /* no NULLREF here */, hwnd,
|
hr = IDirect3D8_CreateDevice( pD3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL /* no NULLREF here */, hwnd,
|
||||||
D3DCREATE_SOFTWARE_VERTEXPROCESSING, &d3dpp, &pDevice );
|
D3DCREATE_SOFTWARE_VERTEXPROCESSING, &d3dpp, &pDevice );
|
||||||
ok(hr == D3D_OK || hr == D3DERR_INVALIDCALL, "IDirect3D8_CreateDevice failed with %#08x\n", hr);
|
ok(hr == D3D_OK || hr == D3DERR_INVALIDCALL || broken(hr == D3DERR_NOTAVAILABLE), "IDirect3D8_CreateDevice failed with %#08x\n", hr);
|
||||||
if(!pDevice)
|
if(!pDevice)
|
||||||
{
|
{
|
||||||
skip("could not create device, IDirect3D8_CreateDevice returned %#08x\n", hr);
|
skip("could not create device, IDirect3D8_CreateDevice returned %#08x\n", hr);
|
||||||
|
@ -921,7 +921,7 @@ static void test_shader(void)
|
||||||
|
|
||||||
hr = IDirect3D8_CreateDevice( pD3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL /* no NULLREF here */, hwnd,
|
hr = IDirect3D8_CreateDevice( pD3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL /* no NULLREF here */, hwnd,
|
||||||
D3DCREATE_SOFTWARE_VERTEXPROCESSING, &d3dpp, &pDevice );
|
D3DCREATE_SOFTWARE_VERTEXPROCESSING, &d3dpp, &pDevice );
|
||||||
ok(hr == D3D_OK || hr == D3DERR_INVALIDCALL, "IDirect3D8_CreateDevice failed with %#08x\n", hr);
|
ok(hr == D3D_OK || hr == D3DERR_INVALIDCALL || broken(hr == D3DERR_NOTAVAILABLE), "IDirect3D8_CreateDevice failed with %#08x\n", hr);
|
||||||
if(!pDevice)
|
if(!pDevice)
|
||||||
{
|
{
|
||||||
skip("could not create device, IDirect3D8_CreateDevice returned %#08x\n", hr);
|
skip("could not create device, IDirect3D8_CreateDevice returned %#08x\n", hr);
|
||||||
|
@ -1119,7 +1119,7 @@ static void test_limits(void)
|
||||||
|
|
||||||
hr = IDirect3D8_CreateDevice( pD3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL /* no NULLREF here */, hwnd,
|
hr = IDirect3D8_CreateDevice( pD3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL /* no NULLREF here */, hwnd,
|
||||||
D3DCREATE_SOFTWARE_VERTEXPROCESSING, &d3dpp, &pDevice );
|
D3DCREATE_SOFTWARE_VERTEXPROCESSING, &d3dpp, &pDevice );
|
||||||
ok(hr == D3D_OK || hr == D3DERR_INVALIDCALL, "IDirect3D8_CreateDevice failed with %#08x\n", hr);
|
ok(hr == D3D_OK || hr == D3DERR_INVALIDCALL || broken(hr == D3DERR_NOTAVAILABLE), "IDirect3D8_CreateDevice failed with %#08x\n", hr);
|
||||||
if(!pDevice)
|
if(!pDevice)
|
||||||
{
|
{
|
||||||
skip("could not create device, IDirect3D8_CreateDevice returned %#08x\n", hr);
|
skip("could not create device, IDirect3D8_CreateDevice returned %#08x\n", hr);
|
||||||
|
|
|
@ -134,7 +134,7 @@ static IDirect3DDevice8 *init_d3d8(void)
|
||||||
present_parameters.AutoDepthStencilFormat = D3DFMT_D16;
|
present_parameters.AutoDepthStencilFormat = D3DFMT_D16;
|
||||||
|
|
||||||
hr = IDirect3D8_CreateDevice(d3d8_ptr, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, present_parameters.hDeviceWindow, D3DCREATE_SOFTWARE_VERTEXPROCESSING, &present_parameters, &device_ptr);
|
hr = IDirect3D8_CreateDevice(d3d8_ptr, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, present_parameters.hDeviceWindow, D3DCREATE_SOFTWARE_VERTEXPROCESSING, &present_parameters, &device_ptr);
|
||||||
ok(hr == D3D_OK || hr == D3DERR_INVALIDCALL, "IDirect3D_CreateDevice returned: %#08x\n", hr);
|
ok(hr == D3D_OK || hr == D3DERR_INVALIDCALL || broken(hr == D3DERR_NOTAVAILABLE), "IDirect3D_CreateDevice returned: %#08x\n", hr);
|
||||||
|
|
||||||
return device_ptr;
|
return device_ptr;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue