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

[d3d9] Cache query data

Browse Source
This commit is contained in:
Robin Kertels 2020-12-14 21:58:34 +01:00 committed by Joshie
parent 5852e318e5
commit 6554ca8f9e
2 changed files with 46 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
src/d3d9/d3d9_query.cpp
View File

@ -127,6 +127,20 @@ namespace dxvk {
HRESULT STDMETHODCALLTYPE D3D9Query::GetData(void* pData, DWORD dwSize, DWORD dwGetDataFlags) { HRESULT STDMETHODCALLTYPE D3D9Query::GetData(void* pData, DWORD dwSize, DWORD dwGetDataFlags) {
if (m_state == D3D9_VK_QUERY_CACHED) {
// Query data was already retrieved once.
// Use cached query data to prevent having to check the VK event
// and having to iterate over the VK queries again
if (likely(pData && dwSize)) {
if (m_queryType != D3DQUERYTYPE_EVENT) {
memcpy(pData, &m_dataCache, dwSize);
} else {
*static_cast<bool*>(pData) = true;
}
}
return D3D_OK;
}
HRESULT hr = this->GetQueryData(pData, dwSize); HRESULT hr = this->GetQueryData(pData, dwSize);
bool flush = dwGetDataFlags & D3DGETDATA_FLUSH; bool flush = dwGetDataFlags & D3DGETDATA_FLUSH;
@ -170,7 +184,12 @@ namespace dxvk {
if (pData != nullptr) if (pData != nullptr)
*static_cast<BOOL*>(pData) = signaled; *static_cast<BOOL*>(pData) = signaled;
return signaled ? D3D_OK : S_FALSE; if (signaled) {
m_state = D3D9_VK_QUERY_CACHED;
return D3D_OK;
} else {
return S_FALSE;
}
} }
else { else {
std::array<DxvkQueryData, MaxGpuQueries> queryData = { }; std::array<DxvkQueryData, MaxGpuQueries> queryData = { };
@ -189,42 +208,44 @@ namespace dxvk {
if (pData == nullptr) if (pData == nullptr)
return D3D_OK; return D3D_OK;
auto* data = static_cast<D3D9_QUERY_DATA*>(pData);
switch (m_queryType) { switch (m_queryType) {
case D3DQUERYTYPE_VCACHE: case D3DQUERYTYPE_VCACHE:
// Don't know what the hell any of this means. // Don't know what the hell any of this means.
// Nor do I care. This just makes games work. // Nor do I care. This just makes games work.
data->VCache.Pattern = MAKEFOURCC('H', 'C', 'A', 'C'); m_dataCache.VCache.Pattern = MAKEFOURCC('H', 'C', 'A', 'C');
data->VCache.OptMethod = 1; m_dataCache.VCache.OptMethod = 1;
data->VCache.CacheSize = 24; m_dataCache.VCache.CacheSize = 24;
data->VCache.MagicNumber = 20; m_dataCache.VCache.MagicNumber = 20;
return D3D_OK; break;
case D3DQUERYTYPE_OCCLUSION: case D3DQUERYTYPE_OCCLUSION:
data->Occlusion = DWORD(queryData[0].occlusion.samplesPassed); m_dataCache.Occlusion = DWORD(queryData[0].occlusion.samplesPassed);
return D3D_OK; break;
case D3DQUERYTYPE_TIMESTAMP: case D3DQUERYTYPE_TIMESTAMP:
data->Timestamp = queryData[0].timestamp.time; m_dataCache.Timestamp = queryData[0].timestamp.time;
return D3D_OK; break;
case D3DQUERYTYPE_TIMESTAMPDISJOINT: case D3DQUERYTYPE_TIMESTAMPDISJOINT:
data->TimestampDisjoint = queryData[0].timestamp.time < queryData[1].timestamp.time; m_dataCache.TimestampDisjoint = queryData[0].timestamp.time < queryData[1].timestamp.time;
return D3D_OK; break;
case D3DQUERYTYPE_TIMESTAMPFREQ: case D3DQUERYTYPE_TIMESTAMPFREQ:
data->TimestampFreq = GetTimestampQueryFrequency(); m_dataCache.TimestampFreq = GetTimestampQueryFrequency();
return D3D_OK; break;
case D3DQUERYTYPE_VERTEXSTATS: case D3DQUERYTYPE_VERTEXSTATS:
data->VertexStats.NumRenderedTriangles = queryData[0].statistic.iaPrimitives; m_dataCache.VertexStats.NumRenderedTriangles = queryData[0].statistic.iaPrimitives;
data->VertexStats.NumExtraClippingTriangles = queryData[0].statistic.clipPrimitives; m_dataCache.VertexStats.NumExtraClippingTriangles = queryData[0].statistic.clipPrimitives;
return D3D_OK; break;
default:
return D3D_OK;
} }
if (likely(pData && dwSize))
memcpy(pData, &m_dataCache, dwSize);
m_state = D3D9_VK_QUERY_CACHED;
return D3D_OK;
} }
} }

3
src/d3d9/d3d9_query.h
View File

@ -10,6 +10,7 @@ namespace dxvk {
D3D9_VK_QUERY_INITIAL, D3D9_VK_QUERY_INITIAL,
D3D9_VK_QUERY_BEGUN, D3D9_VK_QUERY_BEGUN,
D3D9_VK_QUERY_ENDED, D3D9_VK_QUERY_ENDED,
D3D9_VK_QUERY_CACHED
}; };
union D3D9_QUERY_DATA { union D3D9_QUERY_DATA {
@ -81,6 +82,8 @@ namespace dxvk {
std::atomic<uint32_t> m_resetCtr = { 0u }; std::atomic<uint32_t> m_resetCtr = { 0u };
D3D9_QUERY_DATA m_dataCache;
UINT64 GetTimestampQueryFrequency() const; UINT64 GetTimestampQueryFrequency() const;
}; };