d3d8/tests: Handle failure to create a device in the stateblock tests with skip().
This commit is contained in:
parent
ad86da8cd0
commit
b0de8d8891
|
@ -33,13 +33,12 @@ static HWND create_window(void)
|
||||||
return CreateWindowA("d3d8_test_wc", "d3d8_test", 0, 0, 0, 0, 0, 0, 0, 0, 0);
|
return CreateWindowA("d3d8_test_wc", "d3d8_test", 0, 0, 0, 0, 0, 0, 0, 0, 0);
|
||||||
}
|
}
|
||||||
|
|
||||||
static IDirect3DDevice8 *init_d3d8(D3DPRESENT_PARAMETERS *present_parameters)
|
static IDirect3DDevice8 *create_device(D3DPRESENT_PARAMETERS *present_parameters)
|
||||||
{
|
{
|
||||||
IDirect3DDevice8 *device;
|
IDirect3DDevice8 *device;
|
||||||
D3DDISPLAYMODE d3ddm;
|
D3DDISPLAYMODE d3ddm;
|
||||||
IDirect3D8 *d3d8;
|
IDirect3D8 *d3d8;
|
||||||
HWND window;
|
HWND window;
|
||||||
HRESULT hr;
|
|
||||||
|
|
||||||
if (!(d3d8 = Direct3DCreate8(D3D_SDK_VERSION)))
|
if (!(d3d8 = Direct3DCreate8(D3D_SDK_VERSION)))
|
||||||
{
|
{
|
||||||
|
@ -55,11 +54,8 @@ static IDirect3DDevice8 *init_d3d8(D3DPRESENT_PARAMETERS *present_parameters)
|
||||||
present_parameters->SwapEffect = D3DSWAPEFFECT_DISCARD;
|
present_parameters->SwapEffect = D3DSWAPEFFECT_DISCARD;
|
||||||
present_parameters->BackBufferFormat = d3ddm.Format;
|
present_parameters->BackBufferFormat = d3ddm.Format;
|
||||||
|
|
||||||
hr = IDirect3D8_CreateDevice(d3d8, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, window,
|
if (SUCCEEDED(IDirect3D8_CreateDevice(d3d8, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, window,
|
||||||
D3DCREATE_SOFTWARE_VERTEXPROCESSING, present_parameters, &device);
|
D3DCREATE_SOFTWARE_VERTEXPROCESSING, present_parameters, &device)))
|
||||||
ok(SUCCEEDED(hr) || hr == D3DERR_NOTAVAILABLE || broken(hr == D3DERR_INVALIDCALL),
|
|
||||||
"IDirect3D8_CreateDevice failed, hr %#x.\n", hr);
|
|
||||||
if (SUCCEEDED(hr))
|
|
||||||
return device;
|
return device;
|
||||||
|
|
||||||
return NULL;
|
return NULL;
|
||||||
|
@ -2050,8 +2046,11 @@ START_TEST(stateblock)
|
||||||
IDirect3DDevice8 *device;
|
IDirect3DDevice8 *device;
|
||||||
ULONG refcount;
|
ULONG refcount;
|
||||||
|
|
||||||
if (!(device = init_d3d8(&device_pparams)))
|
if (!(device = create_device(&device_pparams)))
|
||||||
|
{
|
||||||
|
skip("Failed to create a 3D device, skipping test.\n");
|
||||||
return;
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
test_begin_end_state_block(device);
|
test_begin_end_state_block(device);
|
||||||
test_state_management(device, &device_pparams);
|
test_state_management(device, &device_pparams);
|
||||||
|
|
Loading…
Reference in New Issue