From 19222c8bcf45c0caa77ed43f9c24c0bd4a9ceeda Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Richard=20H=C3=A4hne?= Date: Thu, 23 Jun 2022 14:28:48 +0200 Subject: [PATCH] fix missing override keyword --- src/DX12/UpscaleContext_FSR2_API.h | 18 +++++++++--------- src/DX12/UpscaleContext_Spatial.h | 14 +++++++------- src/VK/UpscaleContext_FSR2_API.h | 16 ++++++++-------- src/VK/UpscaleContext_Spatial.h | 12 ++++++------ 4 files changed, 30 insertions(+), 30 deletions(-) diff --git a/src/DX12/UpscaleContext_FSR2_API.h b/src/DX12/UpscaleContext_FSR2_API.h index 64ffcc8..20958e1 100644 --- a/src/DX12/UpscaleContext_FSR2_API.h +++ b/src/DX12/UpscaleContext_FSR2_API.h @@ -38,21 +38,21 @@ class UpscaleContext_FSR2_API : public UpscaleContext public: UpscaleContext_FSR2_API(UpscaleType type, std::string name); - virtual std::string Name() { return "FSR 2.0 API"; } - virtual void OnCreate(const FfxUpscaleInitParams& initParams); - virtual void OnDestroy(); - virtual void OnCreateWindowSizeDependentResources( + std::string Name() override { return "FSR 2.0 API"; } + void OnCreate(const FfxUpscaleInitParams& initParams) override; + void OnDestroy() override; + void OnCreateWindowSizeDependentResources( ID3D12Resource* input, ID3D12Resource* output, uint32_t renderWidth, uint32_t renderHeight, uint32_t displayWidth, uint32_t displayHeight, - bool hdr); - virtual void OnDestroyWindowSizeDependentResources(); - virtual void BuildDevUI(UIState* pState) override; - virtual void GenerateReactiveMask(ID3D12GraphicsCommandList* pCommandList, const FfxUpscaleSetup& cameraSetup, UIState* pState); - virtual void Draw(ID3D12GraphicsCommandList* pCommandList, const FfxUpscaleSetup& cameraSetup, UIState* pState); + bool hdr) override; + void OnDestroyWindowSizeDependentResources() override; + void BuildDevUI(UIState* pState) override; + void GenerateReactiveMask(ID3D12GraphicsCommandList* pCommandList, const FfxUpscaleSetup& cameraSetup, UIState* pState) override; + void Draw(ID3D12GraphicsCommandList* pCommandList, const FfxUpscaleSetup& cameraSetup, UIState* pState) override; private: void ReloadPipelines(); diff --git a/src/DX12/UpscaleContext_Spatial.h b/src/DX12/UpscaleContext_Spatial.h index 3a4875a..545eca8 100644 --- a/src/DX12/UpscaleContext_Spatial.h +++ b/src/DX12/UpscaleContext_Spatial.h @@ -33,14 +33,14 @@ using namespace CAULDRON_DX12; class UpscaleContext_Spatial : public UpscaleContext { public: - UpscaleContext_Spatial(UpscaleType type, std::string name); + UpscaleContext_Spatial(UpscaleType type, std::string name); - virtual std::string Name() { return "Spatial Upscale"; } - virtual void OnCreate(const FfxUpscaleInitParams& initParams); - virtual void OnDestroy(); - virtual void OnCreateWindowSizeDependentResources(ID3D12Resource* input, ID3D12Resource* output, uint32_t renderWidth, uint32_t renderHeight, uint32_t displayWidth, uint32_t displayHeight, bool hdr); - virtual void OnDestroyWindowSizeDependentResources(); - virtual void Draw(ID3D12GraphicsCommandList* pCommandList, const FfxUpscaleSetup& cameraSetup, UIState* pState); + std::string Name() override { return "Spatial Upscale"; } + void OnCreate(const FfxUpscaleInitParams& initParams) override; + void OnDestroy() override; + void OnCreateWindowSizeDependentResources(ID3D12Resource* input, ID3D12Resource* output, uint32_t renderWidth, uint32_t renderHeight, uint32_t displayWidth, uint32_t displayHeight, bool hdr) override; + void OnDestroyWindowSizeDependentResources() override; + void Draw(ID3D12GraphicsCommandList* pCommandList, const FfxUpscaleSetup& cameraSetup, UIState* pState) override; protected: typedef struct _FfxTaaCB_ diff --git a/src/VK/UpscaleContext_FSR2_API.h b/src/VK/UpscaleContext_FSR2_API.h index dc620ec..2dfa46a 100644 --- a/src/VK/UpscaleContext_FSR2_API.h +++ b/src/VK/UpscaleContext_FSR2_API.h @@ -38,14 +38,14 @@ class UpscaleContext_FSR2_API : public UpscaleContext public: UpscaleContext_FSR2_API(UpscaleType type, std::string name); - virtual std::string Name() { return "FSR 2.0 API"; } - virtual void OnCreate(const FfxUpscaleInitParams& initParams); - virtual void OnDestroy(); - virtual void OnCreateWindowSizeDependentResources(VkImageView input, VkImageView output, uint32_t renderWidth, uint32_t renderHeight, uint32_t displayWidth, uint32_t displayHeight, bool hdr); - virtual void OnDestroyWindowSizeDependentResources(); - virtual void BuildDevUI(UIState* pState) override; - virtual void GenerateReactiveMask(VkCommandBuffer pCommandList, const FfxUpscaleSetup& cameraSetup, UIState* pState); - virtual void Draw(VkCommandBuffer commandBuffer, const FfxUpscaleSetup& cameraSetup, UIState* pState); + std::string Name() override { return "FSR 2.0 API"; } + void OnCreate(const FfxUpscaleInitParams& initParams) override; + void OnDestroy() override; + void OnCreateWindowSizeDependentResources(VkImageView input, VkImageView output, uint32_t renderWidth, uint32_t renderHeight, uint32_t displayWidth, uint32_t displayHeight, bool hdr) override; + void OnDestroyWindowSizeDependentResources() override; + void BuildDevUI(UIState* pState) override; + void GenerateReactiveMask(VkCommandBuffer pCommandList, const FfxUpscaleSetup& cameraSetup, UIState* pState) override; + void Draw(VkCommandBuffer commandBuffer, const FfxUpscaleSetup& cameraSetup, UIState* pState) override; private: FfxFsr2ContextDescription initializationParameters = {}; diff --git a/src/VK/UpscaleContext_Spatial.h b/src/VK/UpscaleContext_Spatial.h index 6d3b3bc..0d46903 100644 --- a/src/VK/UpscaleContext_Spatial.h +++ b/src/VK/UpscaleContext_Spatial.h @@ -35,12 +35,12 @@ class UpscaleContext_Spatial : public UpscaleContext public: UpscaleContext_Spatial(UpscaleType type, std::string name); - virtual std::string Name() { return "Spatial Upscale"; } - virtual void OnCreate(const FfxUpscaleInitParams& initParams); - virtual void OnDestroy(); - virtual void OnCreateWindowSizeDependentResources(VkImageView input, VkImageView output, uint32_t renderWidth, uint32_t renderHeight, uint32_t displayWidth, uint32_t displayHeight, bool hdr); - virtual void OnDestroyWindowSizeDependentResources(); - virtual void Draw(VkCommandBuffer commandBuffer, const FfxUpscaleSetup& cameraSetup, UIState* pState); + std::string Name() override { return "Spatial Upscale"; } + void OnCreate(const FfxUpscaleInitParams& initParams) override; + void OnDestroy() override; + void OnCreateWindowSizeDependentResources(VkImageView input, VkImageView output, uint32_t renderWidth, uint32_t renderHeight, uint32_t displayWidth, uint32_t displayHeight, bool hdr) override; + void OnDestroyWindowSizeDependentResources() override; + void Draw(VkCommandBuffer commandBuffer, const FfxUpscaleSetup& cameraSetup, UIState* pState) override; protected: typedef struct _FfxTaaCB_