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

d3d11: Fixup D3D10_QUERY_PIPELINE_STATISTICS data.

Browse Source 
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 2017-06-09 13:00:05 +02:00 committed by Alexandre Julliard
parent a695cc6caa
commit ffb47ee5ec
1 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
dlls/d3d11/async.c
View File

@ -320,6 +320,8 @@ static void STDMETHODCALLTYPE d3d10_query_End(ID3D10Query *iface)
static HRESULT STDMETHODCALLTYPE d3d10_query_GetData(ID3D10Query *iface, void *data, UINT data_size, UINT flags) static HRESULT STDMETHODCALLTYPE d3d10_query_GetData(ID3D10Query *iface, void *data, UINT data_size, UINT flags)
{ {
struct d3d_query *query = impl_from_ID3D10Query(iface); struct d3d_query *query = impl_from_ID3D10Query(iface);
D3D11_QUERY_DATA_PIPELINE_STATISTICS d3d11_data;
void *d3d10_data_pointer = NULL;
unsigned int wined3d_flags; unsigned int wined3d_flags;
HRESULT hr; HRESULT hr;
@ -328,6 +330,17 @@ static HRESULT STDMETHODCALLTYPE d3d10_query_GetData(ID3D10Query *iface, void *d
if (!data && data_size) if (!data && data_size)
return E_INVALIDARG; return E_INVALIDARG;
if (query->desc.Query == D3D11_QUERY_PIPELINE_STATISTICS
&& data_size == sizeof(D3D10_QUERY_DATA_PIPELINE_STATISTICS))
{
data_size = sizeof(D3D11_QUERY_DATA_PIPELINE_STATISTICS);
if (data)
{
d3d10_data_pointer = data;
data = &d3d11_data;
}
}
wined3d_flags = wined3d_getdata_flags_from_d3d11_async_getdata_flags(flags); wined3d_flags = wined3d_getdata_flags_from_d3d11_async_getdata_flags(flags);
wined3d_mutex_lock(); wined3d_mutex_lock();
@ -344,6 +357,9 @@ static HRESULT STDMETHODCALLTYPE d3d10_query_GetData(ID3D10Query *iface, void *d
} }
wined3d_mutex_unlock(); wined3d_mutex_unlock();
if (d3d10_data_pointer && hr == S_OK)
memcpy(d3d10_data_pointer, data, sizeof(D3D10_QUERY_DATA_PIPELINE_STATISTICS));
return hr; return hr;
} }
@ -358,6 +374,9 @@ static UINT STDMETHODCALLTYPE d3d10_query_GetDataSize(ID3D10Query *iface)
data_size = wined3d_query_get_data_size(query->wined3d_query); data_size = wined3d_query_get_data_size(query->wined3d_query);
wined3d_mutex_unlock(); wined3d_mutex_unlock();
if (query->desc.Query == D3D11_QUERY_PIPELINE_STATISTICS)
data_size = sizeof(D3D10_QUERY_DATA_PIPELINE_STATISTICS);
return data_size; return data_size;
} }