From: Stefan Dösinger Subject: [PATCH 5/5] d3d9/tests: Use create_device for test_swvp_buffer. Message-Id: <1413472043-13114-5-git-send-email-stefan@codeweavers.com> Date: Thu, 16 Oct 2014 17:07:23 +0200 --- dlls/d3d9/tests/device.c | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index d9b44d3..ee1f539 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -7241,7 +7241,7 @@ static void test_swvp_buffer(void) IDirect3DVertexBuffer9 *buffer; static const unsigned int bufsize = 1024; D3DVERTEXBUFFER_DESC desc; - D3DPRESENT_PARAMETERS present_parameters = {0}; + struct device_desc device_desc; struct { float x, y, z; @@ -7252,15 +7252,12 @@ static void test_swvp_buffer(void) d3d9 = Direct3DCreate9(D3D_SDK_VERSION); ok(!!d3d9, "Failed to create a D3D object.\n"); - present_parameters.Windowed = TRUE; - present_parameters.hDeviceWindow = window; - present_parameters.SwapEffect = D3DSWAPEFFECT_DISCARD; - present_parameters.BackBufferWidth = screen_width; - present_parameters.BackBufferHeight = screen_height; - present_parameters.BackBufferFormat = D3DFMT_A8R8G8B8; - present_parameters.EnableAutoDepthStencil = FALSE; - if (FAILED(IDirect3D9_CreateDevice(d3d9, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, window, - D3DCREATE_SOFTWARE_VERTEXPROCESSING, &present_parameters, &device))) + device_desc.device_window = window; + device_desc.width = 640; + device_desc.height = 480; + device_desc.windowed = TRUE; + device_desc.behavior_flags = D3DCREATE_SOFTWARE_VERTEXPROCESSING; + if (!(device = create_device(d3d9, window, &device_desc))) { skip("Failed to create a D3D device, skipping tests.\n"); DestroyWindow(window); -- 2.0.4