[PATCH 01/10] d3d11: Allow to query ID3D11Predicate interface when predicate was created by CreateQuery().
Józef Kucia
jkucia at codeweavers.com
Tue Apr 5 03:22:03 CDT 2016
Signed-off-by: Józef Kucia <jkucia at codeweavers.com>
---
dlls/d3d11/async.c | 19 ++++++++++++-------
1 file changed, 12 insertions(+), 7 deletions(-)
diff --git a/dlls/d3d11/async.c b/dlls/d3d11/async.c
index 66640a2..c100e73 100644
--- a/dlls/d3d11/async.c
+++ b/dlls/d3d11/async.c
@@ -364,23 +364,28 @@ HRESULT d3d_query_create(struct d3d_device *device, const D3D11_QUERY_DESC *desc
struct d3d_query **query)
{
struct d3d_query *object;
+ BOOL is_predicate_type;
HRESULT hr;
if (!desc)
return E_INVALIDARG;
- if (predicate
- && desc->Query != D3D11_QUERY_OCCLUSION_PREDICATE
- && desc->Query != D3D11_QUERY_SO_OVERFLOW_PREDICATE
- && desc->Query != D3D11_QUERY_SO_OVERFLOW_PREDICATE_STREAM0
- && desc->Query != D3D11_QUERY_SO_OVERFLOW_PREDICATE_STREAM1
- && desc->Query != D3D11_QUERY_SO_OVERFLOW_PREDICATE_STREAM2
- && desc->Query != D3D11_QUERY_SO_OVERFLOW_PREDICATE_STREAM3)
+ is_predicate_type = desc->Query == D3D11_QUERY_OCCLUSION_PREDICATE
+ || desc->Query == D3D11_QUERY_SO_OVERFLOW_PREDICATE
+ || desc->Query == D3D11_QUERY_SO_OVERFLOW_PREDICATE_STREAM0
+ || desc->Query == D3D11_QUERY_SO_OVERFLOW_PREDICATE_STREAM1
+ || desc->Query == D3D11_QUERY_SO_OVERFLOW_PREDICATE_STREAM2
+ || desc->Query == D3D11_QUERY_SO_OVERFLOW_PREDICATE_STREAM3;
+
+ if (!is_predicate_type && predicate)
{
WARN("Query type %u is not a predicate.\n", desc->Query);
return E_INVALIDARG;
}
+ if (is_predicate_type)
+ predicate = TRUE;
+
if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object))))
return E_OUTOFMEMORY;
--
2.4.10
More information about the wine-patches
mailing list