d3d11: Allow to pass NULL as "predicate" to d3d10_device_CreatePredicate().

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

d3d11: Allow to pass NULL as "predicate" to d3d10_device_CreatePredicate().
ccfda14c · Józef Kucia · Alexandre Julliard · 82391da9 · ccfda14c
Commit ccfda14c authored Apr 05, 2016 by Józef Kucia Committed by Alexandre Julliard Apr 05, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 2 deletions

device.c dlls/d3d11/device.c +7 -2

No files found.
--- a/dlls/d3d11/device.c
+++ b/dlls/d3d11/device.c
@@ -4627,9 +4627,14 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreatePredicate(ID3D10Device1 *ifa
    if (FAILED(hr = d3d_query_create(device, (const D3D11_QUERY_DESC *)desc, TRUE, &object)))
        return hr;

-    *predicate = (ID3D10Predicate *)&object->ID3D10Query_iface;
+    if (predicate)
+    {
+        *predicate = (ID3D10Predicate *)&object->ID3D10Query_iface;
+        return S_OK;
+    }

-    return S_OK;
+    ID3D10Query_Release(&object->ID3D10Query_iface);
+    return S_FALSE;
 }

 static HRESULT STDMETHODCALLTYPE d3d10_device_CreateCounter(ID3D10Device1 *iface,