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

[d3d9] Delegate VCACHE check to QuerySupported

Browse Source 
Fixes a failing Wine test
This commit is contained in:
Joshua Ashton 2020-02-28 00:59:44 +00:00
parent 3332bb2844
commit c07f8c941c
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/d3d9/d3d9_device.cpp
View File

@ -3159,7 +3159,7 @@ namespace dxvk {
HRESULT STDMETHODCALLTYPE D3D9DeviceEx::CreateQuery(D3DQUERYTYPE Type, IDirect3DQuery9** ppQuery) { HRESULT STDMETHODCALLTYPE D3D9DeviceEx::CreateQuery(D3DQUERYTYPE Type, IDirect3DQuery9** ppQuery) {
InitReturnPtr(ppQuery); InitReturnPtr(ppQuery);
HRESULT hr = D3D9Query::QuerySupported(Type); HRESULT hr = D3D9Query::QuerySupported(this, Type);
if (ppQuery == nullptr || hr != D3D_OK) if (ppQuery == nullptr || hr != D3D_OK)
return hr; return hr;

8
src/d3d9/d3d9_query.cpp
View File

@ -14,8 +14,6 @@ namespace dxvk {
switch (m_queryType) { switch (m_queryType) {
case D3DQUERYTYPE_VCACHE: case D3DQUERYTYPE_VCACHE:
if (!pDevice->GetOptions()->supportVCache)
throw DxvkError(str::format("D3D9Query: Unsupported query type ", m_queryType, " (from d3d9.supportVCache)"));
break; break;
case D3DQUERYTYPE_EVENT: case D3DQUERYTYPE_EVENT:
@ -293,9 +291,13 @@ namespace dxvk {
} }
HRESULT D3D9Query::QuerySupported(D3DQUERYTYPE QueryType) { HRESULT D3D9Query::QuerySupported(D3D9DeviceEx* pDevice, D3DQUERYTYPE QueryType) {
switch (QueryType) { switch (QueryType) {
case D3DQUERYTYPE_VCACHE: case D3DQUERYTYPE_VCACHE:
if (!pDevice->GetOptions()->supportVCache)
return D3DERR_NOTAVAILABLE;
return D3D_OK;
case D3DQUERYTYPE_EVENT: case D3DQUERYTYPE_EVENT:
case D3DQUERYTYPE_OCCLUSION: case D3DQUERYTYPE_OCCLUSION:
case D3DQUERYTYPE_TIMESTAMP: case D3DQUERYTYPE_TIMESTAMP:

2
src/d3d9/d3d9_query.h
View File

@ -48,7 +48,7 @@ namespace dxvk {
static bool QueryBeginnable(D3DQUERYTYPE QueryType); static bool QueryBeginnable(D3DQUERYTYPE QueryType);
static bool QueryEndable(D3DQUERYTYPE QueryType); static bool QueryEndable(D3DQUERYTYPE QueryType);
static HRESULT QuerySupported(D3DQUERYTYPE QueryType); static HRESULT QuerySupported(D3D9DeviceEx* pDevice, D3DQUERYTYPE QueryType);
bool IsEvent() const { bool IsEvent() const {
return m_queryType == D3DQUERYTYPE_EVENT; return m_queryType == D3DQUERYTYPE_EVENT;