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

[Alexandre Julliard]

Module: wine
Branch: master
Commit: ce49a4ae63c6a3f6f9ec790ca19037e54695de49
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=ce49a4ae63c6a3f6f9ec790ca1...

Author: Henri Verbeet <hverbeet(a)codeweavers.com>
Date:   Tue Jan 28 10:09:22 2014 +0100

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

---

 dlls/d3d10/tests/device.c |    5 ++---
 dlls/d3d10/tests/effect.c |    5 ++---
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/dlls/d3d10/tests/device.c b/dlls/d3d10/tests/device.c
index 0d5e0b3..8df4150 100644
--- 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;
 }
 
diff --git a/dlls/d3d10/tests/effect.c b/dlls/d3d10/tests/effect.c
index a07bc6c..c75e59f 100644
--- 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;
 }