Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix missing override keyword #8

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix missing override keyword #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions src/DX12/UpscaleContext_FSR2_API.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
14 changes: 7 additions & 7 deletions src/DX12/UpscaleContext_Spatial.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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_
Expand Down
16 changes: 8 additions & 8 deletions src/VK/UpscaleContext_FSR2_API.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 = {};
Expand Down
12 changes: 6 additions & 6 deletions src/VK/UpscaleContext_Spatial.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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_
Expand Down