[PATCH 5/5] d3d8/tests: Use a separate device for lighting_test().
Henri Verbeet
hverbeet at codeweavers.com
Mon Apr 21 01:10:36 CDT 2014
---
dlls/d3d8/tests/visual.c | 31 ++++++++++++++++++++++++-------
1 file changed, 24 insertions(+), 7 deletions(-)
diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c
index 1238398..482e7ec 100644
--- a/dlls/d3d8/tests/visual.c
+++ b/dlls/d3d8/tests/visual.c
@@ -174,12 +174,16 @@ static void test_sanity(IDirect3DDevice8 *device)
ok(SUCCEEDED(hr), "Failed to present, hr %#x.\n", hr);
}
-static void lighting_test(IDirect3DDevice8 *device)
+static void lighting_test(void)
{
- HRESULT hr;
- DWORD fvf = D3DFVF_XYZ | D3DFVF_DIFFUSE;
DWORD nfvf = D3DFVF_XYZ | D3DFVF_DIFFUSE | D3DFVF_NORMAL;
- DWORD color;
+ DWORD fvf = D3DFVF_XYZ | D3DFVF_DIFFUSE;
+ IDirect3DDevice8 *device;
+ IDirect3D8 *d3d;
+ D3DCOLOR color;
+ ULONG refcount;
+ HWND window;
+ HRESULT hr;
static const struct vertex unlitquad[] =
{
@@ -218,6 +222,16 @@ static void lighting_test(IDirect3DDevice8 *device)
0.0f, 0.0f, 0.0f, 1.0f,
}}};
+ window = CreateWindowA("static", "d3d8_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE,
+ 0, 0, 640, 480, NULL, NULL, NULL, NULL);
+ d3d = Direct3DCreate8(D3D_SDK_VERSION);
+ ok(!!d3d, "Failed to create a D3D object.\n");
+ if (!(device = create_device(d3d, window, window, TRUE)))
+ {
+ skip("Failed to create a D3D device, skipping tests.\n");
+ goto done;
+ }
+
hr = IDirect3DDevice8_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xffffffff, 0.0, 0);
ok(hr == D3D_OK, "IDirect3DDevice8_Clear failed with %#08x\n", hr);
@@ -293,8 +307,11 @@ static void lighting_test(IDirect3DDevice8 *device)
IDirect3DDevice8_Present(device, NULL, NULL, NULL, NULL);
- hr = IDirect3DDevice8_SetRenderState(device, D3DRS_LIGHTING, FALSE);
- ok(hr == D3D_OK, "IDirect3DDevice8_SetRenderState returned %#08x\n", hr);
+ refcount = IDirect3DDevice8_Release(device);
+ ok(!refcount, "Device has %u references left.\n", refcount);
+done:
+ IDirect3D8_Release(d3d);
+ DestroyWindow(window);
}
static void clear_test(void)
@@ -4998,7 +5015,6 @@ START_TEST(visual)
test_sanity(device_ptr);
depth_clamp_test(device_ptr);
- lighting_test(device_ptr);
refcount = IDirect3DDevice8_Release(device_ptr);
ok(!refcount, "Device has %u references left.\n", refcount);
@@ -5006,6 +5022,7 @@ cleanup:
IDirect3D8_Release(d3d);
DestroyWindow(window);
+ lighting_test();
clear_test();
fog_test();
z_range_test();
--
1.7.10.4
More information about the wine-patches
mailing list