d3d10/tests: Also try a WARP device in create_device().

ce49a4ae · Henri Verbeet · Alexandre Julliard · 5e3cadf8 · ce49a4ae · ce49a4ae
Commit ce49a4ae authored Jan 28, 2014 by Henri Verbeet Committed by Alexandre Julliard Jan 28, 2014
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 6 deletions

device.c dlls/d3d10/tests/device.c +2 -3

effect.c dlls/d3d10/tests/effect.c +2 -3

No files found.
--- a/dlls/d3d10/tests/device.c
+++ b/dlls/d3d10/tests/device.c
@@ -27,12 +27,11 @@ static ID3D10Device *create_device(void)

    if (SUCCEEDED(D3D10CreateDevice(NULL, D3D10_DRIVER_TYPE_HARDWARE, NULL, 0, D3D10_SDK_VERSION, &device)))
        return device;
-
-    trace("Failed to create a HW device, trying REF\n");
+    if (SUCCEEDED(D3D10CreateDevice(NULL, D3D10_DRIVER_TYPE_WARP, NULL, 0, D3D10_SDK_VERSION, &device)))
+        return device;
    if (SUCCEEDED(D3D10CreateDevice(NULL, D3D10_DRIVER_TYPE_REFERENCE, NULL, 0, D3D10_SDK_VERSION, &device)))
        return device;

-    trace("Failed to create a device, returning NULL\n");
    return NULL;
 }


--- a/dlls/d3d10/tests/effect.c
+++ b/dlls/d3d10/tests/effect.c
@@ -29,12 +29,11 @@ static ID3D10Device *create_device(void)

    if (SUCCEEDED(D3D10CreateDevice(NULL, D3D10_DRIVER_TYPE_HARDWARE, NULL, 0, D3D10_SDK_VERSION, &device)))
        return device;
-
-    trace("Failed to create a HW device, trying REF\n");
+    if (SUCCEEDED(D3D10CreateDevice(NULL, D3D10_DRIVER_TYPE_WARP, NULL, 0, D3D10_SDK_VERSION, &device)))
+        return device;
    if (SUCCEEDED(D3D10CreateDevice(NULL, D3D10_DRIVER_TYPE_REFERENCE, NULL, 0, D3D10_SDK_VERSION, &device)))
        return device;

-    trace("Failed to create a device, returning NULL\n");
    return NULL;
 }