[d3d9] Only log QueryInterface errors once

YHD233 · Mar 1, 2023 · 4c78964 · 4c78964
1 parent cc78276
commit 4c78964
Show file tree

Hide file tree

Showing 12 changed files with 73 additions and 29 deletions.
diff --git a/src/d3d11/d3d11_shader.h b/src/d3d11/d3d11_shader.h
@@ -136,8 +136,10 @@ namespace dxvk {
 
       if (logQueryInterfaceError(__uuidof(D3D11Interface), riid)) {
         Logger::warn("D3D11Shader::QueryInterface: Unknown interface query");
-        return E_NOINTERFACE;
+        Logger::warn(str::format(riid));
       }
+
+      return E_NOINTERFACE;
     }
 
     const D3D11CommonShader* GetCommonShader() const {

diff --git a/src/d3d9/d3d9_buffer.cpp b/src/d3d9/d3d9_buffer.cpp
@@ -29,8 +29,11 @@ namespace dxvk {
       return S_OK;
     }
 
-    Logger::warn("D3D9VertexBuffer::QueryInterface: Unknown interface query");
-    Logger::warn(str::format(riid));
+    if (logQueryInterfaceError(__uuidof(IDirect3DVertexBuffer9), riid)) {
+      Logger::warn("D3D9VertexBuffer::QueryInterface: Unknown interface query");
+      Logger::warn(str::format(riid));
+    }
+
     return E_NOINTERFACE;
   }
 
@@ -86,8 +89,11 @@ namespace dxvk {
       return S_OK;
     }
 
-    Logger::warn("D3D9IndexBuffer::QueryInterface: Unknown interface query");
-    Logger::warn(str::format(riid));
+    if (logQueryInterfaceError(__uuidof(IDirect3DIndexBuffer9), riid)) {
+      Logger::warn("D3D9IndexBuffer::QueryInterface: Unknown interface query");
+      Logger::warn(str::format(riid));
+    }
+
     return E_NOINTERFACE;
   }
 

diff --git a/src/d3d9/d3d9_device.cpp b/src/d3d9/d3d9_device.cpp
@@ -201,8 +201,11 @@ namespace dxvk {
     if (riid == __uuidof(IDirect3DDevice9Ex))
       return E_NOINTERFACE;
 
-    Logger::warn("D3D9DeviceEx::QueryInterface: Unknown interface query");
-    Logger::warn(str::format(riid));
+    if (logQueryInterfaceError(__uuidof(IDirect3DDevice9), riid)) {
+      Logger::warn("D3D9DeviceEx::QueryInterface: Unknown interface query");
+      Logger::warn(str::format(riid));
+    }
+
     return E_NOINTERFACE;
   }
 

diff --git a/src/d3d9/d3d9_interface.cpp b/src/d3d9/d3d9_interface.cpp
@@ -91,8 +91,11 @@ namespace dxvk {
       return S_OK;
     }
 
-    Logger::warn("D3D9InterfaceEx::QueryInterface: Unknown interface query");
-    Logger::warn(str::format(riid));
+    if (logQueryInterfaceError(__uuidof(IDirect3D9), riid)) {
+      Logger::warn("D3D9InterfaceEx::QueryInterface: Unknown interface query");
+      Logger::warn(str::format(riid));
+    }
+
     return E_NOINTERFACE;
   }
 

diff --git a/src/d3d9/d3d9_query.cpp b/src/d3d9/d3d9_query.cpp
@@ -64,8 +64,11 @@ namespace dxvk {
       return S_OK;
     }
 
-    Logger::warn("D3D9Query::QueryInterface: Unknown interface query");
-    Logger::warn(str::format(riid));
+    if (logQueryInterfaceError(__uuidof(IDirect3DQuery9), riid)) {
+      Logger::warn("D3D9Query::QueryInterface: Unknown interface query");
+      Logger::warn(str::format(riid));
+    }
+
     return E_NOINTERFACE;
   }
 

diff --git a/src/d3d9/d3d9_shader.h b/src/d3d9/d3d9_shader.h
@@ -109,8 +109,11 @@ namespace dxvk {
         return S_OK;
       }
 
-      Logger::warn("D3D9Shader::QueryInterface: Unknown interface query");
-      Logger::warn(str::format(riid));
+      if (logQueryInterfaceError(__uuidof(Base), riid)) {
+        Logger::warn("D3D9Shader::QueryInterface: Unknown interface query");
+        Logger::warn(str::format(riid));
+      }
+
       return E_NOINTERFACE;
     }
 

diff --git a/src/d3d9/d3d9_stateblock.cpp b/src/d3d9/d3d9_stateblock.cpp
@@ -32,8 +32,11 @@ namespace dxvk {
       return S_OK;
     }
 
-    Logger::warn("D3D9StateBlock::QueryInterface: Unknown interface query");
-    Logger::warn(str::format(riid));
+    if (logQueryInterfaceError(__uuidof(IDirect3DStateBlock9), riid)) {
+      Logger::warn("D3D9StateBlock::QueryInterface: Unknown interface query");
+      Logger::warn(str::format(riid));
+    }
+
     return E_NOINTERFACE;
   }
 

diff --git a/src/d3d9/d3d9_surface.cpp b/src/d3d9/d3d9_surface.cpp
@@ -74,8 +74,11 @@ namespace dxvk {
       return S_OK;
     }
 
-    Logger::warn("D3D9Surface::QueryInterface: Unknown interface query");
-    Logger::warn(str::format(riid));
+    if (logQueryInterfaceError(__uuidof(IDirect3DSurface9), riid)) {
+      Logger::warn("D3D9Surface::QueryInterface: Unknown interface query");
+      Logger::warn(str::format(riid));
+    }
+
     return E_NOINTERFACE;
   }
 

diff --git a/src/d3d9/d3d9_swapchain.cpp b/src/d3d9/d3d9_swapchain.cpp
@@ -84,8 +84,11 @@ namespace dxvk {
       return S_OK;
     }
 
-    Logger::warn("D3D9SwapChainEx::QueryInterface: Unknown interface query");
-    Logger::warn(str::format(riid));
+    if (logQueryInterfaceError(__uuidof(IDirect3DSwapChain9), riid)) {
+      Logger::warn("D3D9SwapChainEx::QueryInterface: Unknown interface query");
+      Logger::warn(str::format(riid));
+    }
+
     return E_NOINTERFACE;
   }
 

diff --git a/src/d3d9/d3d9_texture.cpp b/src/d3d9/d3d9_texture.cpp
@@ -32,8 +32,11 @@ namespace dxvk {
       return S_OK;
     }
 
-    Logger::warn("D3D9Texture2D::QueryInterface: Unknown interface query");
-    Logger::warn(str::format(riid));
+    if (logQueryInterfaceError(__uuidof(IDirect3DTexture9), riid)) {
+      Logger::warn("D3D9Texture2D::QueryInterface: Unknown interface query");
+      Logger::warn(str::format(riid));
+    }
+
     return E_NOINTERFACE;
   }
 
@@ -128,8 +131,11 @@ namespace dxvk {
       return S_OK;
     }
 
-    Logger::warn("D3D9Texture3D::QueryInterface: Unknown interface query");
-    Logger::warn(str::format(riid));
+    if (logQueryInterfaceError(__uuidof(IDirect3DVolumeTexture9), riid)) {
+      Logger::warn("D3D9Texture3D::QueryInterface: Unknown interface query");
+      Logger::warn(str::format(riid));
+    }
+
     return E_NOINTERFACE;
   }
 
@@ -218,8 +224,11 @@ namespace dxvk {
       return S_OK;
     }
 
-    Logger::warn("D3D9TextureCube::QueryInterface: Unknown interface query");
-    Logger::warn(str::format(riid));
+    if (logQueryInterfaceError(__uuidof(IDirect3DCubeTexture9), riid)) {
+      Logger::warn("D3D9TextureCube::QueryInterface: Unknown interface query");
+      Logger::warn(str::format(riid));
+    }
+
     return E_NOINTERFACE;
   }
 

diff --git a/src/d3d9/d3d9_vertex_declaration.cpp b/src/d3d9/d3d9_vertex_declaration.cpp
@@ -40,8 +40,11 @@ namespace dxvk {
       return S_OK;
     }
 
-    Logger::warn("D3D9VertexDecl::QueryInterface: Unknown interface query");
-    Logger::warn(str::format(riid));
+    if (logQueryInterfaceError(__uuidof(IDirect3DVertexDeclaration9), riid)) {
+      Logger::warn("D3D9VertexDecl::QueryInterface: Unknown interface query");
+      Logger::warn(str::format(riid));
+    }
+
     return E_NOINTERFACE;
   }
 

diff --git a/src/d3d9/d3d9_volume.cpp b/src/d3d9/d3d9_volume.cpp
@@ -65,8 +65,11 @@ namespace dxvk {
       return S_OK;
     }
 
-    Logger::warn("D3D9Volume::QueryInterface: Unknown interface query");
-    Logger::warn(str::format(riid));
+    if (logQueryInterfaceError(__uuidof(IDirect3DVolume9), riid)) {
+      Logger::warn("D3D9Volume::QueryInterface: Unknown interface query");
+      Logger::warn(str::format(riid));
+    }
+
     return E_NOINTERFACE;
   }