rooty/dxvk
1
0
Fork 0
mirror of https://github.com/doitsujin/dxvk.git synced 2025-03-02 04:29:14 +01:00
Code Issues Projects Releases Wiki Activity

[d3d11] Fixed crash with timestamp disjoint queries

Browse Source
This commit is contained in:
Philip Rebohle 2018-02-18 23:39:55 +01:00
parent 18c723fe8b
commit 675a629ae5
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/d3d11/d3d11_query.cpp
View File

@ -169,7 +169,8 @@ namespace dxvk {
} else { } else {
DxvkQueryData queryData = {}; DxvkQueryData queryData = {};
if (m_query->getData(queryData) != DxvkQueryStatus::Available) if (m_query != nullptr
&& m_query->getData(queryData) != DxvkQueryStatus::Available)
return S_FALSE; return S_FALSE;
if (pData == nullptr) if (pData == nullptr)
@ -189,6 +190,7 @@ namespace dxvk {
return S_OK; return S_OK;
case D3D11_QUERY_TIMESTAMP_DISJOINT: { case D3D11_QUERY_TIMESTAMP_DISJOINT: {
// FIXME return correct frequency
auto data = static_cast<D3D11_QUERY_DATA_TIMESTAMP_DISJOINT*>(pData); auto data = static_cast<D3D11_QUERY_DATA_TIMESTAMP_DISJOINT*>(pData);
data->Frequency = 1000; data->Frequency = 1000;
data->Disjoint = FALSE; data->Disjoint = FALSE;