Józef Kucia : d3d10core/tests: Extend test_create_predicate().

[Alexandre Julliard]

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

Author: Józef Kucia <jkucia(a)codeweavers.com>
Date:   Tue Oct 27 03:02:32 2015 +0100

d3d10core/tests: Extend test_create_predicate().

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>

---

 dlls/d3d10core/tests/device.c | 28 ++++++++++++++++++++++++----
 1 file changed, 24 insertions(+), 4 deletions(-)

diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c
index 5606c3b..6c6d8bb 100644
--- a/dlls/d3d10core/tests/device.c
+++ b/dlls/d3d10core/tests/device.c
@@ -1788,25 +1788,41 @@ static void test_create_rasterizer_state(void)
 
 static void test_create_predicate(void)
 {
+    static const D3D10_QUERY other_queries[] =
+    {
+        D3D10_QUERY_EVENT,
+        D3D10_QUERY_OCCLUSION,
+        D3D10_QUERY_TIMESTAMP,
+        D3D10_QUERY_TIMESTAMP_DISJOINT,
+        D3D10_QUERY_PIPELINE_STATISTICS,
+        D3D10_QUERY_SO_STATISTICS,
+    };
+
     ULONG refcount, expected_refcount;
     D3D10_QUERY_DESC query_desc;
     ID3D10Predicate *predicate;
     ID3D10Device *device, *tmp;
+    IUnknown *iface;
+    unsigned int i;
     HRESULT hr;
 
     if (!(device = create_device()))
     {
-        skip("Failed to create device, skipping tests.\n");
+        skip("Failed to create device.\n");
         return;
     }
 
     hr = ID3D10Device_CreatePredicate(device, NULL, &predicate);
     ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr);
 
-    query_desc.Query = D3D10_QUERY_OCCLUSION;
     query_desc.MiscFlags = 0;
-    hr = ID3D10Device_CreatePredicate(device, &query_desc, &predicate);
-    ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr);
+
+    for (i = 0; i < sizeof(other_queries) / sizeof(*other_queries); ++i)
+    {
+        query_desc.Query = other_queries[i];
+        hr = ID3D10Device_CreatePredicate(device, &query_desc, &predicate);
+        ok(hr == E_INVALIDARG, "Got unexpected hr %#x for query type %u.\n", hr, other_queries[i]);
+    }
 
     query_desc.Query = D3D10_QUERY_OCCLUSION_PREDICATE;
     expected_refcount = get_refcount((IUnknown *)device) + 1;
@@ -1821,6 +1837,10 @@ static void test_create_predicate(void)
     refcount = get_refcount((IUnknown *)device);
     ok(refcount == expected_refcount, "Got unexpected refcount %u, expected %u.\n", refcount, expected_refcount);
     ID3D10Device_Release(tmp);
+    hr = ID3D10Predicate_QueryInterface(predicate, &IID_ID3D11Predicate, (void **)&iface);
+    ok(SUCCEEDED(hr) || broken(hr == E_NOINTERFACE) /* Not available on all Windows versions. */,
+            "Predicate should implement ID3D11Predicate.\n");
+    if (SUCCEEDED(hr)) IUnknown_Release(iface);
     ID3D10Predicate_Release(predicate);
 
     query_desc.Query = D3D10_QUERY_SO_OVERFLOW_PREDICATE;