[PATCH 1/5] d3d9/tests: Read the caps from the device.

Stefan Dösinger stefan at codeweavers.com
Thu Sep 19 04:02:53 CDT 2013


This prevents a test failure on testbot.
---
 dlls/d3d9/tests/device.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c
index f71f8be..02b4174 100644
--- a/dlls/d3d9/tests/device.c
+++ b/dlls/d3d9/tests/device.c
@@ -7018,9 +7018,6 @@ static void test_volume_blocks(void)
         skip("Failed to create IDirect3D9 object, skipping tests.\n");
         return;
     }
-    hr = IDirect3D9_GetDeviceCaps(d3d9, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, &caps);
-    ok(SUCCEEDED(hr), "Failed to get caps, hr %#x.\n", hr);
-    pow2 = !!(caps.TextureCaps & D3DPTEXTURECAPS_VOLUMEMAP_POW2);
 
     window = CreateWindowA("static", "d3d9_test", WS_OVERLAPPEDWINDOW,
             0, 0, 640, 480, 0, 0, 0, 0);
@@ -7031,6 +7028,9 @@ static void test_volume_blocks(void)
         DestroyWindow(window);
         return;
     }
+    hr = IDirect3DDevice9_GetDeviceCaps(device, &caps);
+    ok(SUCCEEDED(hr), "Failed to get caps, hr %#x.\n", hr);
+    pow2 = !!(caps.TextureCaps & D3DPTEXTURECAPS_VOLUMEMAP_POW2);
 
     for (i = 0; i < sizeof(formats) / sizeof(*formats); i++)
     {
-- 
1.8.1.5




More information about the wine-patches mailing list