[d3d8] Return S_FALSE if VCache queries are unsupported

src/d3d8/d3d8_device.cpp

@@ -80,6 +80,7 @@ namespace dxvk {
 
     HRESULT res;
     d3d9::IDirect3DQuery9* pQuery = nullptr;
+    D3DDEVINFO_VCACHE vCacheDevInfo = {0};
 
     switch (DevInfoID) {
       // pre-D3D8 queries
@@ -90,9 +91,13 @@ 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))
+          goto vcache;
         break;
       case D3DDEVINFOID_RESOURCEMANAGER:
         // May not be implemented by D9VK.
@@ -120,6 +125,16 @@ namespace dxvk {
     // TODO: Will immediately issuing the query without doing any API calls
     // actually yield meaingful results? And should we flush or let it mellow?
     res = pQuery->GetData(pDevInfoStruct, DevInfoStructSize, D3DGETDATA_FLUSH);
+    goto done;
+
+  vcache:
+    if (DevInfoStructSize != sizeof(D3DDEVINFO_VCACHE))
+      return D3DERR_INVALIDCALL;
+
+    // Return a zeroed out query result and S_FALSE
+    // in case of failed VCache queries (AMD/Intel)
+    memcpy(pDevInfoStruct, &vCacheDevInfo, DevInfoStructSize);
+    return S_FALSE;
 
   done:
     if (pQuery != nullptr)

src/d3d8/d3d8_device.h

@@ -18,6 +18,13 @@
 
 namespace dxvk {
 
+  typedef struct D3DDEVINFO_VCACHE {
+    DWORD         Pattern;
+    DWORD         OptMethod;
+    DWORD         CacheSize;
+    DWORD         MagicNumber;
+  } D3DDEVINFO_VCACHE;
+
   class D3D8Interface;
 
   struct D3D8VertexShaderInfo;