ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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>
This commit is contained in:
Józef Kucia 2016-04-05 10:22:06 +02:00 committed by Alexandre Julliard
parent 82391da960
commit ccfda14c69
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
dlls/d3d11/device.c
View File

@ -4627,11 +4627,16 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreatePredicate(ID3D10Device1 *ifa
if (FAILED(hr = d3d_query_create(device, (const D3D11_QUERY_DESC *)desc, TRUE, &object))) if (FAILED(hr = d3d_query_create(device, (const D3D11_QUERY_DESC *)desc, TRUE, &object)))
return hr; return hr;
if (predicate)
{
*predicate = (ID3D10Predicate *)&object->ID3D10Query_iface; *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, static HRESULT STDMETHODCALLTYPE d3d10_device_CreateCounter(ID3D10Device1 *iface,
const D3D10_COUNTER_DESC *desc, ID3D10Counter **counter) const D3D10_COUNTER_DESC *desc, ID3D10Counter **counter)
{ {