Matteo Bruni : d3d8/tests: Skip test_lost_device() on WARP.
Alexandre Julliard
julliard at winehq.org
Wed Mar 13 18:10:51 CDT 2019
Module: wine
Branch: master
Commit: 7912a19ad35a8ca3040858651e7e7c1bd808587a
URL: https://source.winehq.org/git/wine.git/?a=commit;h=7912a19ad35a8ca3040858651e7e7c1bd808587a
Author: Matteo Bruni <mbruni at codeweavers.com>
Date: Tue Mar 12 21:25:08 2019 +0100
d3d8/tests: Skip test_lost_device() on WARP.
Signed-off-by: Matteo Bruni <mbruni at codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/d3d8/tests/device.c | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c
index 1a5a040..0564154 100644
--- a/dlls/d3d8/tests/device.c
+++ b/dlls/d3d8/tests/device.c
@@ -7739,6 +7739,7 @@ static void test_writeonly_resource(void)
static void test_lost_device(void)
{
+ D3DADAPTER_IDENTIFIER8 identifier;
struct device_desc device_desc;
IDirect3DDevice8 *device;
IDirect3D8 *d3d;
@@ -7750,6 +7751,8 @@ static void test_lost_device(void)
window = create_window();
d3d = Direct3DCreate8(D3D_SDK_VERSION);
ok(!!d3d, "Failed to create a D3D object.\n");
+ hr = IDirect3D8_GetAdapterIdentifier(d3d, D3DADAPTER_DEFAULT, 0, &identifier);
+ ok(SUCCEEDED(hr), "Failed to get adapter identifier, hr %#x.\n", hr);
device_desc.device_window = window;
device_desc.width = registry_mode.dmPelsWidth;
device_desc.height = registry_mode.dmPelsHeight;
@@ -7767,6 +7770,13 @@ static void test_lost_device(void)
IDirect3DDevice8_Release(device);
goto done;
}
+ if (adapter_is_warp(&identifier))
+ {
+ win_skip("Windows 10 WARP crashes during this test.\n");
+ IDirect3DDevice8_Release(device);
+ goto done;
+ }
+
ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr);
hr = IDirect3DDevice8_Present(device, NULL, NULL, NULL, NULL);
ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr);
More information about the wine-cvs
mailing list