Skip to content

Commit

Permalink
[d3d8] Return S_FALSE if VCache queries are unsupported
Browse files Browse the repository at this point in the history
  • Loading branch information
WinterSnowfall authored and AlpyneDreams committed Jul 7, 2024
1 parent 050b479 commit 8a18e13
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 2 deletions.
16 changes: 14 additions & 2 deletions src/d3d8/d3d8_device.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -88,9 +88,21 @@ namespace dxvk {
return E_FAIL;

case D3DDEVINFOID_VCACHE:
// Docs say response should be S_FALSE, but we'll let D9VK
// decide based on the value of supportVCache. D3DX8 calls this.
// The query will return D3D_OK on Nvidia and D3DERR_NOTAVAILABLE on AMD/Intel
// in D3D9, however in the case of the latter we'll need to return a
// zeroed out query result and S_FALSE. This behavior has been observed both
// on modern native AMD drivers and D3D8-era native ATI drivers.
res = GetD3D9()->CreateQuery(d3d9::D3DQUERYTYPE_VCACHE, &pQuery);

if(FAILED(res)) {
if (DevInfoStructSize != sizeof(D3DDEVINFO_VCACHE))
return D3DERR_INVALIDCALL;

D3DDEVINFO_VCACHE vCacheDevInfo = {0};
memcpy(pDevInfoStruct, &vCacheDevInfo, DevInfoStructSize);
return S_FALSE;
}

break;
case D3DDEVINFOID_RESOURCEMANAGER:
// May not be implemented by D9VK.
Expand Down
7 changes: 7 additions & 0 deletions src/d3d8/d3d8_include.h
Original file line number Diff line number Diff line change
Expand Up @@ -179,6 +179,13 @@ namespace d3d9 {
#define D3DDEVINFOID_VCACHE 4
#endif

typedef struct D3DDEVINFO_VCACHE {
DWORD Pattern;
DWORD OptMethod;
DWORD CacheSize;
DWORD MagicNumber;
} D3DDEVINFO_VCACHE;

// MinGW headers are broken. Who'dve guessed?
#ifndef _MSC_VER

Expand Down

0 comments on commit 8a18e13

Please sign in to comment.