[PATCH 4/5] d3d9/tests: Extend test_checkdevicemultisampletype().
Matteo Bruni
mbruni at codeweavers.com
Mon Dec 14 16:37:56 CST 2015
Signed-off-by: Matteo Bruni <mbruni at codeweavers.com>
---
dlls/d3d9/tests/device.c | 54 +++++++++++++++++++++++++++++++++---------------
1 file changed, 37 insertions(+), 17 deletions(-)
diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c
index 6cdb225..f1046e1 100644
--- a/dlls/d3d9/tests/device.c
+++ b/dlls/d3d9/tests/device.c
@@ -1003,10 +1003,8 @@ cleanup:
static void test_checkdevicemultisampletype(void)
{
- IDirect3DDevice9 *device;
DWORD quality_levels;
IDirect3D9 *d3d;
- ULONG refcount;
HWND window;
HRESULT hr;
@@ -1015,34 +1013,56 @@ static void test_checkdevicemultisampletype(void)
ok(!!window, "Failed to create a window.\n");
d3d = Direct3DCreate9(D3D_SDK_VERSION);
ok(!!d3d, "Failed to create a D3D object.\n");
- if (!(device = create_device(d3d, window, NULL)))
+
+ if (IDirect3D9_CheckDeviceMultiSampleType(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL,
+ D3DFMT_X8R8G8B8, TRUE, D3DMULTISAMPLE_2_SAMPLES, NULL) == D3DERR_NOTAVAILABLE)
{
- skip("Failed to create a 3D device, skipping test.\n");
+ skip("Multisampling not supported for D3DFMT_X8R8G8B8, skipping test.\n");
goto cleanup;
}
+ hr = IDirect3D9_CheckDeviceMultiSampleType(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL,
+ D3DFMT_UNKNOWN, TRUE, D3DMULTISAMPLE_NONE, NULL);
+ ok(hr == D3DERR_INVALIDCALL, "CheckDeviceMultiSampleType returned %#x.\n", hr);
+ hr = IDirect3D9_CheckDeviceMultiSampleType(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL,
+ 65536, TRUE, D3DMULTISAMPLE_NONE, NULL);
+ todo_wine ok(SUCCEEDED(hr), "CheckDeviceMultiSampleType failed, hr %#x.\n", hr);
+
+ hr = IDirect3D9_CheckDeviceMultiSampleType(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL,
+ D3DFMT_X8R8G8B8, TRUE, D3DMULTISAMPLE_NONE, NULL);
+ ok(SUCCEEDED(hr), "CheckDeviceMultiSampleType failed, hr %#x.\n", hr);
+
quality_levels = 0;
hr = IDirect3D9_CheckDeviceMultiSampleType(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL,
D3DFMT_X8R8G8B8, TRUE, D3DMULTISAMPLE_NONE, &quality_levels);
- ok(SUCCEEDED(hr) || hr == D3DERR_NOTAVAILABLE, "CheckDeviceMultiSampleType failed with (%08x)\n", hr);
- if (hr == D3DERR_NOTAVAILABLE)
- {
- skip("IDirect3D9_CheckDeviceMultiSampleType not available\n");
- goto cleanup;
- }
+ ok(SUCCEEDED(hr), "CheckDeviceMultiSampleType failed, hr %#x.\n", hr);
ok(quality_levels == 1, "Got unexpected quality_levels %u.\n", quality_levels);
-
hr = IDirect3D9_CheckDeviceMultiSampleType(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL,
D3DFMT_X8R8G8B8, FALSE, D3DMULTISAMPLE_NONE, &quality_levels);
- ok(SUCCEEDED(hr), "CheckDeviceMultiSampleType failed with (%08x)\n", hr);
+ ok(SUCCEEDED(hr), "CheckDeviceMultiSampleType failed, hr %#x.\n", hr);
ok(quality_levels == 1, "Got unexpected quality_levels %u.\n", quality_levels);
+ hr = IDirect3D9_CheckDeviceMultiSampleType(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL,
+ D3DFMT_X8R8G8B8, TRUE, D3DMULTISAMPLE_NONMASKABLE, NULL);
+ ok(SUCCEEDED(hr), "CheckDeviceMultiSampleType failed, hr %#x.\n", hr);
+ hr = IDirect3D9_CheckDeviceMultiSampleType(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL,
+ D3DFMT_X8R8G8B8, TRUE, D3DMULTISAMPLE_NONMASKABLE, &quality_levels);
+ ok(SUCCEEDED(hr), "CheckDeviceMultiSampleType failed, hr %#x.\n", hr);
+ ok(quality_levels, "Got unexpected quality_levels %u.\n", quality_levels);
+
+ hr = IDirect3D9_CheckDeviceMultiSampleType(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL,
+ D3DFMT_X8R8G8B8, TRUE, D3DMULTISAMPLE_2_SAMPLES, NULL);
+ ok(SUCCEEDED(hr), "CheckDeviceMultiSampleType failed, hr %#x.\n", hr);
+ hr = IDirect3D9_CheckDeviceMultiSampleType(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL,
+ D3DFMT_X8R8G8B8, TRUE, D3DMULTISAMPLE_2_SAMPLES, &quality_levels);
+ ok(SUCCEEDED(hr), "CheckDeviceMultiSampleType failed, hr %#x.\n", hr);
+ ok(quality_levels, "Got unexpected quality_levels %u.\n", quality_levels);
+
+ hr = IDirect3D9_CheckDeviceMultiSampleType(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL,
+ D3DFMT_X8R8G8B8, TRUE, 65536, NULL);
+ ok(hr == D3DERR_INVALIDCALL, "CheckDeviceMultiSampleType returned %#x.\n", hr);
+
cleanup:
- if (device)
- {
- refcount = IDirect3DDevice9_Release(device);
- ok(!refcount, "Device has %u references left.\n", refcount);
- }
IDirect3D9_Release(d3d);
DestroyWindow(window);
}
--
2.4.10
More information about the wine-patches
mailing list