Merge pull request #106 from pollend/feature/device-override-method

feat: mark methods as overriden for Device D3D11/12/Val/Vulkan
NVIDIAGameWorks · Nov 21, 2024 · 205cf05 · 205cf05
2 parents 2a3dfca + b1e423d
commit 205cf05
Show file tree

Hide file tree

Showing 4 changed files with 47 additions and 47 deletions.
diff --git a/Source/D3D11/DeviceD3D11.h b/Source/D3D11/DeviceD3D11.h
@@ -85,18 +85,18 @@ struct DeviceD3D11 final : public DeviceBase {
     // DeviceBase
     //================================================================================================================
 
-    inline const DeviceDesc& GetDesc() const {
+    inline const DeviceDesc& GetDesc() const  override{
         return m_Desc;
     }
 
-    void Destruct();
-    Result FillFunctionTable(CoreInterface& table) const;
-    Result FillFunctionTable(HelperInterface& table) const;
-    Result FillFunctionTable(LowLatencyInterface& table) const;
-    Result FillFunctionTable(StreamerInterface& table) const;
-    Result FillFunctionTable(SwapChainInterface& table) const;
-    Result FillFunctionTable(ResourceAllocatorInterface& table) const;
-    Result FillFunctionTable(WrapperD3D11Interface& table) const;
+    void Destruct() override;
+    Result FillFunctionTable(CoreInterface& table) const override;
+    Result FillFunctionTable(HelperInterface& table) const override;
+    Result FillFunctionTable(LowLatencyInterface& table) const override;
+    Result FillFunctionTable(StreamerInterface& table) const override;
+    Result FillFunctionTable(SwapChainInterface& table) const override;
+    Result FillFunctionTable(ResourceAllocatorInterface& table) const override;
+    Result FillFunctionTable(WrapperD3D11Interface& table) const override;
 
     //================================================================================================================
     // NRI

diff --git a/Source/D3D12/DeviceD3D12.h b/Source/D3D12/DeviceD3D12.h
@@ -93,20 +93,20 @@ struct DeviceD3D12 final : public DeviceBase {
     // DeviceBase
     //================================================================================================================
 
-    inline const DeviceDesc& GetDesc() const {
+    inline const DeviceDesc& GetDesc() const override{
         return m_Desc;
     }
 
-    void Destruct();
-    Result FillFunctionTable(CoreInterface& table) const;
-    Result FillFunctionTable(HelperInterface& table) const;
-    Result FillFunctionTable(LowLatencyInterface& table) const;
-    Result FillFunctionTable(MeshShaderInterface& table) const;
-    Result FillFunctionTable(RayTracingInterface& table) const;
-    Result FillFunctionTable(StreamerInterface& table) const;
-    Result FillFunctionTable(SwapChainInterface& table) const;
-    Result FillFunctionTable(ResourceAllocatorInterface& table) const;
-    Result FillFunctionTable(WrapperD3D12Interface& table) const;
+    void Destruct() override;
+    Result FillFunctionTable(CoreInterface& table) const override;
+    Result FillFunctionTable(HelperInterface& table) const override;
+    Result FillFunctionTable(LowLatencyInterface& table) const override;
+    Result FillFunctionTable(MeshShaderInterface& table) const override;
+    Result FillFunctionTable(RayTracingInterface& table) const override;
+    Result FillFunctionTable(StreamerInterface& table) const override;
+    Result FillFunctionTable(SwapChainInterface& table) const override;
+    Result FillFunctionTable(ResourceAllocatorInterface& table) const override;
+    Result FillFunctionTable(WrapperD3D12Interface& table) const override;
 
     //================================================================================================================
     // NRI

diff --git a/Source/VK/DeviceVK.h b/Source/VK/DeviceVK.h
@@ -91,20 +91,20 @@ struct DeviceVK final : public DeviceBase {
     // DeviceBase
     //================================================================================================================
 
-    inline const DeviceDesc& GetDesc() const {
+    inline const DeviceDesc& GetDesc() const override{
         return m_Desc;
     }
 
-    void Destruct();
-    Result FillFunctionTable(CoreInterface& table) const;
-    Result FillFunctionTable(HelperInterface& table) const;
-    Result FillFunctionTable(LowLatencyInterface& table) const;
-    Result FillFunctionTable(MeshShaderInterface& table) const;
-    Result FillFunctionTable(RayTracingInterface& table) const;
-    Result FillFunctionTable(StreamerInterface& table) const;
-    Result FillFunctionTable(SwapChainInterface& table) const;
-    Result FillFunctionTable(ResourceAllocatorInterface& table) const;
-    Result FillFunctionTable(WrapperVKInterface& table) const;
+    void Destruct() override;
+    Result FillFunctionTable(CoreInterface& table) const override;
+    Result FillFunctionTable(HelperInterface& table) const override;
+    Result FillFunctionTable(LowLatencyInterface& table) const override;
+    Result FillFunctionTable(MeshShaderInterface& table) const override;
+    Result FillFunctionTable(RayTracingInterface& table) const override;
+    Result FillFunctionTable(StreamerInterface& table) const override;
+    Result FillFunctionTable(SwapChainInterface& table) const override;
+    Result FillFunctionTable(ResourceAllocatorInterface& table) const override;
+    Result FillFunctionTable(WrapperVKInterface& table) const override;
 
     //================================================================================================================
     // NRI

diff --git a/Source/Validation/DeviceVal.h b/Source/Validation/DeviceVal.h
@@ -72,29 +72,29 @@ struct DeviceVal final : public DeviceBase {
         return m_Lock;
     }
 
-    const DeviceDesc& GetDesc() const {
-        return ((DeviceBase&)m_Device).GetDesc();
-    }
-
     bool Create();
     void RegisterMemoryType(MemoryType memoryType, MemoryLocation memoryLocation);
 
     //================================================================================================================
     // DeviceBase
     //================================================================================================================
+
+    const DeviceDesc& GetDesc() const override{
+        return ((DeviceBase&)m_Device).GetDesc();
+    }
 
-    void Destruct();
-    Result FillFunctionTable(CoreInterface& table) const;
-    Result FillFunctionTable(HelperInterface& table) const;
-    Result FillFunctionTable(LowLatencyInterface& table) const;
-    Result FillFunctionTable(MeshShaderInterface& table) const;
-    Result FillFunctionTable(ResourceAllocatorInterface& table) const;
-    Result FillFunctionTable(RayTracingInterface& table) const;
-    Result FillFunctionTable(StreamerInterface& table) const;
-    Result FillFunctionTable(SwapChainInterface& table) const;
-    Result FillFunctionTable(WrapperD3D11Interface& table) const;
-    Result FillFunctionTable(WrapperD3D12Interface& table) const;
-    Result FillFunctionTable(WrapperVKInterface& table) const;
+    void Destruct() override;
+    Result FillFunctionTable(CoreInterface& table) const override;
+    Result FillFunctionTable(HelperInterface& table) const override;
+    Result FillFunctionTable(LowLatencyInterface& table) const override;
+    Result FillFunctionTable(MeshShaderInterface& table) const override;
+    Result FillFunctionTable(ResourceAllocatorInterface& table) const override;
+    Result FillFunctionTable(RayTracingInterface& table) const override;
+    Result FillFunctionTable(StreamerInterface& table) const override;
+    Result FillFunctionTable(SwapChainInterface& table) const override;
+    Result FillFunctionTable(WrapperD3D11Interface& table) const override;
+    Result FillFunctionTable(WrapperD3D12Interface& table) const override;
+    Result FillFunctionTable(WrapperVKInterface& table) const override;
 
     //================================================================================================================
     // NRI