From d6c0aec92d553790f008eaab7e6403395fbc4d45 Mon Sep 17 00:00:00 2001 From: FakeMichau <49685661+FakeMichau@users.noreply.github.com> Date: Wed, 22 Apr 2026 18:01:15 +0200 Subject: [PATCH] Rename FSR31 files to FFX --- OptiScaler/OptiScaler.vcxproj | 24 +++++++++---------- OptiScaler/upscalers/FeatureProvider_Dx11.cpp | 8 +++---- OptiScaler/upscalers/FeatureProvider_Dx12.cpp | 4 ++-- OptiScaler/upscalers/FeatureProvider_Vk.cpp | 8 +++---- .../FSR31Feature.cpp => ffx/FFXFeature.cpp} | 9 ++++--- .../FSR31Feature.h => ffx/FFXFeature.h} | 6 ++--- .../FFXFeature_Dx11.cpp} | 23 +++++++++--------- .../FFXFeature_Dx11.h} | 10 ++++---- .../FFXFeature_Dx11On12.cpp} | 15 ++++++------ .../FFXFeature_Dx11On12.h} | 10 ++++---- .../FFXFeature_Dx12.cpp} | 16 ++++++------- .../FFXFeature_Dx12.h} | 12 +++++----- .../FFXFeature_Vk.cpp} | 18 +++++++------- .../FSR31Feature_Vk.h => ffx/FFXFeature_Vk.h} | 12 +++++----- .../FFXFeature_VkOn12.cpp} | 18 +++++++------- .../FFXFeature_VkOn12.h} | 10 ++++---- 16 files changed, 100 insertions(+), 103 deletions(-) rename OptiScaler/upscalers/{fsr31/FSR31Feature.cpp => ffx/FFXFeature.cpp} (62%) rename OptiScaler/upscalers/{fsr31/FSR31Feature.h => ffx/FFXFeature.h} (94%) rename OptiScaler/upscalers/{fsr31/FSR31Feature_Dx11.cpp => ffx/FFXFeature_Dx11.cpp} (96%) rename OptiScaler/upscalers/{fsr31/FSR31Feature_Dx11.h => ffx/FFXFeature_Dx11.h} (93%) rename OptiScaler/upscalers/{fsr31/FSR31Feature_Dx11On12.cpp => ffx/FFXFeature_Dx11On12.cpp} (97%) rename OptiScaler/upscalers/{fsr31/FSR31Feature_Dx11On12.h => ffx/FFXFeature_Dx11On12.h} (73%) rename OptiScaler/upscalers/{fsr31/FSR31Feature_Dx12.cpp => ffx/FFXFeature_Dx12.cpp} (97%) rename OptiScaler/upscalers/{fsr31/FSR31Feature_Dx12.h => ffx/FFXFeature_Dx12.h} (71%) rename OptiScaler/upscalers/{fsr31/FSR31Feature_Vk.cpp => ffx/FFXFeature_Vk.cpp} (97%) rename OptiScaler/upscalers/{fsr31/FSR31Feature_Vk.h => ffx/FFXFeature_Vk.h} (69%) rename OptiScaler/upscalers/{fsr31/FSR31Feature_VkOn12.cpp => ffx/FFXFeature_VkOn12.cpp} (97%) rename OptiScaler/upscalers/{fsr31/FSR31Feature_VkOn12.h => ffx/FFXFeature_VkOn12.h} (78%) diff --git a/OptiScaler/OptiScaler.vcxproj b/OptiScaler/OptiScaler.vcxproj index 97345013..d5d60dd7 100644 --- a/OptiScaler/OptiScaler.vcxproj +++ b/OptiScaler/OptiScaler.vcxproj @@ -394,7 +394,7 @@ copy NUL "$(SolutionDir)x64\Release\a\!! EXTRACT ALL FILES TO GAME FOLDER !!" /Y - + @@ -469,11 +469,11 @@ copy NUL "$(SolutionDir)x64\Release\a\!! EXTRACT ALL FILES TO GAME FOLDER !!" /Y - - - - - + + + + + @@ -614,7 +614,7 @@ copy NUL "$(SolutionDir)x64\Release\a\!! EXTRACT ALL FILES TO GAME FOLDER !!" /Y - + @@ -688,11 +688,11 @@ copy NUL "$(SolutionDir)x64\Release\a\!! EXTRACT ALL FILES TO GAME FOLDER !!" /Y - - - - - + + + + + diff --git a/OptiScaler/upscalers/FeatureProvider_Dx11.cpp b/OptiScaler/upscalers/FeatureProvider_Dx11.cpp index 0d078986..a67b9bfd 100644 --- a/OptiScaler/upscalers/FeatureProvider_Dx11.cpp +++ b/OptiScaler/upscalers/FeatureProvider_Dx11.cpp @@ -11,8 +11,8 @@ #include "upscalers/fsr2/FSR2Feature_Dx11.h" #include "upscalers/fsr2/FSR2Feature_Dx11On12.h" #include "upscalers/fsr2_212/FSR2Feature_Dx11On12_212.h" -#include "upscalers/fsr31/FSR31Feature_Dx11.h" -#include "upscalers/fsr31/FSR31Feature_Dx11On12.h" +#include "upscalers/ffx/FFXFeature_Dx11.h" +#include "upscalers/ffx/FFXFeature_Dx11On12.h" #include "upscalers/xess/XeSSFeature_Dx11.h" #include "upscalers/xess/XeSSFeature_Dx11on12.h" #include @@ -47,11 +47,11 @@ bool FeatureProvider_Dx11::GetFeature(Upscaler upscaler, UINT handleId, NVSDK_NG break; case Upscaler::FSR31: - *feature = std::make_unique(handleId, parameters); + *feature = std::make_unique(handleId, parameters); break; case Upscaler::FFX_on12: - *feature = std::make_unique(handleId, parameters); + *feature = std::make_unique(handleId, parameters); break; case Upscaler::DLSS: diff --git a/OptiScaler/upscalers/FeatureProvider_Dx12.cpp b/OptiScaler/upscalers/FeatureProvider_Dx12.cpp index 8c435e6d..98e0e134 100644 --- a/OptiScaler/upscalers/FeatureProvider_Dx12.cpp +++ b/OptiScaler/upscalers/FeatureProvider_Dx12.cpp @@ -10,7 +10,7 @@ #include "upscalers/dlssd/DLSSDFeature_Dx12.h" #include "upscalers/fsr2/FSR2Feature_Dx12.h" #include "upscalers/fsr2_212/FSR2Feature_Dx12_212.h" -#include "upscalers/fsr31/FSR31Feature_Dx12.h" +#include "upscalers/ffx/FFXFeature_Dx12.h" #include "upscalers/xess/XeSSFeature_Dx12.h" #include "FeatureProvider_Dx11.h" #include @@ -38,7 +38,7 @@ bool FeatureProvider_Dx12::GetFeature(Upscaler upscaler, UINT handleId, NVSDK_NG break; case Upscaler::FFX: - *feature = std::make_unique(handleId, parameters); + *feature = std::make_unique(handleId, parameters); break; case Upscaler::DLSS: diff --git a/OptiScaler/upscalers/FeatureProvider_Vk.cpp b/OptiScaler/upscalers/FeatureProvider_Vk.cpp index eb04855d..279108ec 100644 --- a/OptiScaler/upscalers/FeatureProvider_Vk.cpp +++ b/OptiScaler/upscalers/FeatureProvider_Vk.cpp @@ -11,9 +11,9 @@ #include "upscalers/dlssd/DLSSDFeature_Vk.h" #include "upscalers/fsr2_212/FSR2Feature_Vk_212.h" #include "upscalers/fsr2_212/FSR2Feature_VkOnDx12_212.h" -#include "upscalers/fsr31/FSR31Feature_Vk.h" +#include "upscalers/ffx/FFXFeature_Vk.h" #include "upscalers/xess/XeSSFeature_Vk.h" -#include "upscalers/fsr31/FSR31Feature_VkOn12.h" +#include "upscalers/ffx/FFXFeature_VkOn12.h" #include bool FeatureProvider_Vk::GetFeature(Upscaler upscaler, UINT handleId, NVSDK_NGX_Parameter* parameters, @@ -42,11 +42,11 @@ bool FeatureProvider_Vk::GetFeature(Upscaler upscaler, UINT handleId, NVSDK_NGX_ break; case Upscaler::FFX: - *feature = std::make_unique(handleId, parameters); + *feature = std::make_unique(handleId, parameters); break; case Upscaler::FFX_on12: - *feature = std::make_unique(handleId, parameters); + *feature = std::make_unique(handleId, parameters); break; case Upscaler::DLSS: diff --git a/OptiScaler/upscalers/fsr31/FSR31Feature.cpp b/OptiScaler/upscalers/ffx/FFXFeature.cpp similarity index 62% rename from OptiScaler/upscalers/fsr31/FSR31Feature.cpp rename to OptiScaler/upscalers/ffx/FFXFeature.cpp index 84e436af..c383fc08 100644 --- a/OptiScaler/upscalers/fsr31/FSR31Feature.cpp +++ b/OptiScaler/upscalers/ffx/FFXFeature.cpp @@ -1,8 +1,8 @@ #include #include -#include "FSR31Feature.h" +#include "FFXFeature.h" -double FSR31Feature::GetDeltaTime() +double FFXFeature::GetDeltaTime() { double currentTime = Util::MillisecondsNow(); double deltaTime = (currentTime - _lastFrameTime); @@ -10,14 +10,13 @@ double FSR31Feature::GetDeltaTime() return deltaTime; } -FSR31Feature::FSR31Feature(unsigned int InHandleId, NVSDK_NGX_Parameter* InParameters) - : IFeature(InHandleId, InParameters) +FFXFeature::FFXFeature(unsigned int InHandleId, NVSDK_NGX_Parameter* InParameters) : IFeature(InHandleId, InParameters) { _initParameters = SetInitParameters(InParameters); _lastFrameTime = Util::MillisecondsNow(); } -FSR31Feature::~FSR31Feature() +FFXFeature::~FFXFeature() { if (!IsInited()) return; diff --git a/OptiScaler/upscalers/fsr31/FSR31Feature.h b/OptiScaler/upscalers/ffx/FFXFeature.h similarity index 94% rename from OptiScaler/upscalers/fsr31/FSR31Feature.h rename to OptiScaler/upscalers/ffx/FFXFeature.h index 168f1ff1..7bf13ace 100644 --- a/OptiScaler/upscalers/fsr31/FSR31Feature.h +++ b/OptiScaler/upscalers/ffx/FFXFeature.h @@ -10,7 +10,7 @@ inline static void FfxLogCallback(uint32_t type, const wchar_t* message) LOG_DEBUG("FSR Runtime: {0}", wstring_to_string(string)); } -class FSR31Feature : public virtual IFeature +class FFXFeature : public virtual IFeature { private: double _lastFrameTime; @@ -93,7 +93,7 @@ class FSR31Feature : public virtual IFeature feature_version Version() override { return _version; } std::string Name() const override { return _name.c_str(); } - FSR31Feature(unsigned int InHandleId, NVSDK_NGX_Parameter* InParameters); + FFXFeature(unsigned int InHandleId, NVSDK_NGX_Parameter* InParameters); - ~FSR31Feature(); + ~FFXFeature(); }; diff --git a/OptiScaler/upscalers/fsr31/FSR31Feature_Dx11.cpp b/OptiScaler/upscalers/ffx/FFXFeature_Dx11.cpp similarity index 96% rename from OptiScaler/upscalers/fsr31/FSR31Feature_Dx11.cpp rename to OptiScaler/upscalers/ffx/FFXFeature_Dx11.cpp index ee2500b6..aa037834 100644 --- a/OptiScaler/upscalers/fsr31/FSR31Feature_Dx11.cpp +++ b/OptiScaler/upscalers/ffx/FFXFeature_Dx11.cpp @@ -1,7 +1,7 @@ #include #include #include -#include "FSR31Feature_Dx11.h" +#include "FFXFeature_Dx11.h" #include "MathUtils.h" using namespace OptiMath; @@ -22,14 +22,13 @@ using namespace OptiMath; } \ } while ((void) 0, 0); -FSR31FeatureDx11::FSR31FeatureDx11(unsigned int InHandleId, NVSDK_NGX_Parameter* InParameters) - : FSR31Feature(InHandleId, InParameters), IFeature_Dx11(InHandleId, InParameters), - IFeature(InHandleId, InParameters) +FFXFeatureDx11::FFXFeatureDx11(unsigned int InHandleId, NVSDK_NGX_Parameter* InParameters) + : FFXFeature(InHandleId, InParameters), IFeature_Dx11(InHandleId, InParameters), IFeature(InHandleId, InParameters) { _moduleLoaded = true; } -bool FSR31FeatureDx11::Init(ID3D11Device* InDevice, ID3D11DeviceContext* InContext, NVSDK_NGX_Parameter* InParameters) +bool FFXFeatureDx11::Init(ID3D11Device* InDevice, ID3D11DeviceContext* InContext, NVSDK_NGX_Parameter* InParameters) { LOG_FUNC(); @@ -73,8 +72,8 @@ Fsr31::FfxResource ffxGetResource(ID3D11Resource* dx11Resource, wchar_t const* f return resource; } -bool FSR31FeatureDx11::CopyTexture(ID3D11Resource* InResource, D3D11_TEXTURE2D_RESOURCE_C* OutTextureRes, - UINT bindFlags, bool InCopy) +bool FFXFeatureDx11::CopyTexture(ID3D11Resource* InResource, D3D11_TEXTURE2D_RESOURCE_C* OutTextureRes, UINT bindFlags, + bool InCopy) { ID3D11Texture2D* originalTexture = nullptr; D3D11_TEXTURE2D_DESC desc {}; @@ -127,7 +126,7 @@ bool FSR31FeatureDx11::CopyTexture(ID3D11Resource* InResource, D3D11_TEXTURE2D_R return true; } -void FSR31FeatureDx11::ReleaseResources() +void FFXFeatureDx11::ReleaseResources() { LOG_FUNC(); @@ -137,7 +136,7 @@ void FSR31FeatureDx11::ReleaseResources() } } -bool FSR31FeatureDx11::Evaluate(ID3D11DeviceContext* DeviceContext, NVSDK_NGX_Parameter* InParameters) +bool FFXFeatureDx11::Evaluate(ID3D11DeviceContext* DeviceContext, NVSDK_NGX_Parameter* InParameters) { LOG_FUNC(); @@ -607,7 +606,7 @@ bool FSR31FeatureDx11::Evaluate(ID3D11DeviceContext* DeviceContext, NVSDK_NGX_Pa return true; } -FSR31FeatureDx11::~FSR31FeatureDx11() +FFXFeatureDx11::~FFXFeatureDx11() { if (!IsInited()) return; @@ -617,7 +616,7 @@ FSR31FeatureDx11::~FSR31FeatureDx11() auto errorCode = Fsr31::ffxFsr3ContextDestroy(&_upscalerContext); if (errorCode != Fsr31::FFX_OK) - spdlog::error("FSR31FeatureDx11::~FSR31FeatureDx11 ffxFsr3ContextDestroy error: {0:x}", errorCode); + spdlog::error("FFXFeatureDx11::~FFXFeatureDx11 ffxFsr3ContextDestroy error: {0:x}", errorCode); free(_upscalerContextDesc.backendInterfaceUpscaling.scratchBuffer); } @@ -625,7 +624,7 @@ FSR31FeatureDx11::~FSR31FeatureDx11() SetInit(false); } -bool FSR31FeatureDx11::InitFSR3(const NVSDK_NGX_Parameter* InParameters) +bool FFXFeatureDx11::InitFSR3(const NVSDK_NGX_Parameter* InParameters) { LOG_FUNC(); diff --git a/OptiScaler/upscalers/fsr31/FSR31Feature_Dx11.h b/OptiScaler/upscalers/ffx/FFXFeature_Dx11.h similarity index 93% rename from OptiScaler/upscalers/fsr31/FSR31Feature_Dx11.h rename to OptiScaler/upscalers/ffx/FFXFeature_Dx11.h index be6ded9b..aaf6e2b0 100644 --- a/OptiScaler/upscalers/fsr31/FSR31Feature_Dx11.h +++ b/OptiScaler/upscalers/ffx/FFXFeature_Dx11.h @@ -1,5 +1,5 @@ #pragma once -#include "FSR31Feature.h" +#include "FFXFeature.h" #include #include @@ -7,7 +7,7 @@ #include #include -class FSR31FeatureDx11 : public FSR31Feature, public IFeature_Dx11 +class FFXFeatureDx11 : public FFXFeature, public IFeature_Dx11 { private: @@ -93,15 +93,15 @@ class FSR31FeatureDx11 : public FSR31Feature, public IFeature_Dx11 bool InitFSR3(const NVSDK_NGX_Parameter* InParameters); public: - FSR31FeatureDx11(unsigned int InHandleId, NVSDK_NGX_Parameter* InParameters); + FFXFeatureDx11(unsigned int InHandleId, NVSDK_NGX_Parameter* InParameters); bool Init(ID3D11Device* InDevice, ID3D11DeviceContext* InContext, NVSDK_NGX_Parameter* InParameters) override; bool Evaluate(ID3D11DeviceContext* DeviceContext, NVSDK_NGX_Parameter* InParameters) override; feature_version Version() override { return feature_version { 3, 1, 2 }; } - std::string Name() const override { return FSR31Feature::Name(); } + std::string Name() const override { return FFXFeature::Name(); } bool IsWithDx12() final { return false; } - ~FSR31FeatureDx11(); + ~FFXFeatureDx11(); }; diff --git a/OptiScaler/upscalers/fsr31/FSR31Feature_Dx11On12.cpp b/OptiScaler/upscalers/ffx/FFXFeature_Dx11On12.cpp similarity index 97% rename from OptiScaler/upscalers/fsr31/FSR31Feature_Dx11On12.cpp rename to OptiScaler/upscalers/ffx/FFXFeature_Dx11On12.cpp index 97790633..84b2b644 100644 --- a/OptiScaler/upscalers/fsr31/FSR31Feature_Dx11On12.cpp +++ b/OptiScaler/upscalers/ffx/FFXFeature_Dx11On12.cpp @@ -2,19 +2,19 @@ #include #include #include -#include "FSR31Feature_Dx11On12.h" +#include "FFXFeature_Dx11On12.h" #include "MathUtils.h" using namespace OptiMath; -NVSDK_NGX_Parameter* FSR31FeatureDx11on12::SetParameters(NVSDK_NGX_Parameter* InParameters) +NVSDK_NGX_Parameter* FFXFeatureDx11on12::SetParameters(NVSDK_NGX_Parameter* InParameters) { InParameters->Set("OptiScaler.SupportsUpscaleSize", true); return InParameters; } -FSR31FeatureDx11on12::FSR31FeatureDx11on12(unsigned int InHandleId, NVSDK_NGX_Parameter* InParameters) - : FSR31Feature(InHandleId, InParameters), IFeature_Dx11wDx12(InHandleId, InParameters), +FFXFeatureDx11on12::FFXFeatureDx11on12(unsigned int InHandleId, NVSDK_NGX_Parameter* InParameters) + : FFXFeature(InHandleId, InParameters), IFeature_Dx11wDx12(InHandleId, InParameters), IFeature_Dx11(InHandleId, InParameters), IFeature(InHandleId, SetParameters(InParameters)) { FfxApiProxy::InitFfxDx12(); @@ -27,8 +27,7 @@ FSR31FeatureDx11on12::FSR31FeatureDx11on12(unsigned int InHandleId, NVSDK_NGX_Pa LOG_ERROR("can't load amd_fidelityfx_dx12.dll methods!"); } -bool FSR31FeatureDx11on12::Init(ID3D11Device* InDevice, ID3D11DeviceContext* InContext, - NVSDK_NGX_Parameter* InParameters) +bool FFXFeatureDx11on12::Init(ID3D11Device* InDevice, ID3D11DeviceContext* InContext, NVSDK_NGX_Parameter* InParameters) { LOG_FUNC(); @@ -42,7 +41,7 @@ bool FSR31FeatureDx11on12::Init(ID3D11Device* InDevice, ID3D11DeviceContext* InC return _moduleLoaded; } -bool FSR31FeatureDx11on12::Evaluate(ID3D11DeviceContext* InDeviceContext, NVSDK_NGX_Parameter* InParameters) +bool FFXFeatureDx11on12::Evaluate(ID3D11DeviceContext* InDeviceContext, NVSDK_NGX_Parameter* InParameters) { LOG_FUNC(); @@ -587,7 +586,7 @@ bool FSR31FeatureDx11on12::Evaluate(ID3D11DeviceContext* InDeviceContext, NVSDK_ return evalResult; } -bool FSR31FeatureDx11on12::InitFSR3(const NVSDK_NGX_Parameter* InParameters) +bool FFXFeatureDx11on12::InitFSR3(const NVSDK_NGX_Parameter* InParameters) { LOG_FUNC(); diff --git a/OptiScaler/upscalers/fsr31/FSR31Feature_Dx11On12.h b/OptiScaler/upscalers/ffx/FFXFeature_Dx11On12.h similarity index 73% rename from OptiScaler/upscalers/fsr31/FSR31Feature_Dx11On12.h rename to OptiScaler/upscalers/ffx/FFXFeature_Dx11On12.h index 9679abd5..5e6cc5f7 100644 --- a/OptiScaler/upscalers/fsr31/FSR31Feature_Dx11On12.h +++ b/OptiScaler/upscalers/ffx/FFXFeature_Dx11On12.h @@ -1,11 +1,11 @@ #pragma once -#include "FSR31Feature.h" +#include "FFXFeature.h" #include #include "dx12/ffx_api_dx12.h" #include "proxies/FfxApi_Proxy.h" -class FSR31FeatureDx11on12 : public FSR31Feature, public IFeature_Dx11wDx12 +class FFXFeatureDx11on12 : public FFXFeature, public IFeature_Dx11wDx12 { private: bool _baseInit = false; @@ -16,16 +16,16 @@ class FSR31FeatureDx11on12 : public FSR31Feature, public IFeature_Dx11wDx12 public: std::string Name() const { return "FSR3 w/Dx12"; } - feature_version Version() override { return FSR31Feature::Version(); } + feature_version Version() override { return FFXFeature::Version(); } - FSR31FeatureDx11on12(unsigned int InHandleId, NVSDK_NGX_Parameter* InParameters); + FFXFeatureDx11on12(unsigned int InHandleId, NVSDK_NGX_Parameter* InParameters); bool Init(ID3D11Device* InDevice, ID3D11DeviceContext* InContext, NVSDK_NGX_Parameter* InParameters) override; bool Evaluate(ID3D11DeviceContext* InDeviceContext, NVSDK_NGX_Parameter* InParameters) override; bool IsWithDx12() final { return true; } - ~FSR31FeatureDx11on12() + ~FFXFeatureDx11on12() { if (State::Instance().isShuttingDown) return; diff --git a/OptiScaler/upscalers/fsr31/FSR31Feature_Dx12.cpp b/OptiScaler/upscalers/ffx/FFXFeature_Dx12.cpp similarity index 97% rename from OptiScaler/upscalers/fsr31/FSR31Feature_Dx12.cpp rename to OptiScaler/upscalers/ffx/FFXFeature_Dx12.cpp index b46a86e8..81b222ba 100644 --- a/OptiScaler/upscalers/fsr31/FSR31Feature_Dx12.cpp +++ b/OptiScaler/upscalers/ffx/FFXFeature_Dx12.cpp @@ -2,19 +2,19 @@ #include #include #include -#include "FSR31Feature_Dx12.h" +#include "FFXFeature_Dx12.h" #include "MathUtils.h" using namespace OptiMath; -NVSDK_NGX_Parameter* FSR31FeatureDx12::SetParameters(NVSDK_NGX_Parameter* InParameters) +NVSDK_NGX_Parameter* FFXFeatureDx12::SetParameters(NVSDK_NGX_Parameter* InParameters) { InParameters->Set("OptiScaler.SupportsUpscaleSize", true); return InParameters; } -FSR31FeatureDx12::FSR31FeatureDx12(unsigned int InHandleId, NVSDK_NGX_Parameter* InParameters) - : FSR31Feature(InHandleId, InParameters), IFeature_Dx12(InHandleId, InParameters), +FFXFeatureDx12::FFXFeatureDx12(unsigned int InHandleId, NVSDK_NGX_Parameter* InParameters) + : FFXFeature(InHandleId, InParameters), IFeature_Dx12(InHandleId, InParameters), IFeature(InHandleId, SetParameters(InParameters)) { FfxApiProxy::InitFfxDx12(); @@ -27,9 +27,9 @@ FSR31FeatureDx12::FSR31FeatureDx12(unsigned int InHandleId, NVSDK_NGX_Parameter* LOG_ERROR("can't load amd_fidelityfx_dx12.dll methods!"); } -bool FSR31FeatureDx12::InitInternal(ID3D12GraphicsCommandList* InCommandList, NVSDK_NGX_Parameter* InParameters) +bool FFXFeatureDx12::InitInternal(ID3D12GraphicsCommandList* InCommandList, NVSDK_NGX_Parameter* InParameters) { - LOG_DEBUG("FSR31FeatureDx12::Init"); + LOG_DEBUG("FFXFeatureDx12::Init"); if (IsInited()) return true; @@ -37,7 +37,7 @@ bool FSR31FeatureDx12::InitInternal(ID3D12GraphicsCommandList* InCommandList, NV return InitFSR3(InParameters); } -bool FSR31FeatureDx12::EvaluateInternal(ID3D12GraphicsCommandList* InCommandList, NVSDK_NGX_Parameter* InParameters) +bool FFXFeatureDx12::EvaluateInternal(ID3D12GraphicsCommandList* InCommandList, NVSDK_NGX_Parameter* InParameters) { LOG_FUNC(); @@ -511,7 +511,7 @@ bool FSR31FeatureDx12::EvaluateInternal(ID3D12GraphicsCommandList* InCommandList return true; } -bool FSR31FeatureDx12::InitFSR3(const NVSDK_NGX_Parameter* InParameters) +bool FFXFeatureDx12::InitFSR3(const NVSDK_NGX_Parameter* InParameters) { LOG_FUNC(); diff --git a/OptiScaler/upscalers/fsr31/FSR31Feature_Dx12.h b/OptiScaler/upscalers/ffx/FFXFeature_Dx12.h similarity index 71% rename from OptiScaler/upscalers/fsr31/FSR31Feature_Dx12.h rename to OptiScaler/upscalers/ffx/FFXFeature_Dx12.h index 9e5bd504..68ea30f4 100644 --- a/OptiScaler/upscalers/fsr31/FSR31Feature_Dx12.h +++ b/OptiScaler/upscalers/ffx/FFXFeature_Dx12.h @@ -1,11 +1,11 @@ #pragma once -#include "FSR31Feature.h" +#include "FFXFeature.h" #include #include "dx12/ffx_api_dx12.h" #include "proxies/FfxApi_Proxy.h" -class FSR31FeatureDx12 : public FSR31Feature, public IFeature_Dx12 +class FFXFeatureDx12 : public FFXFeature, public IFeature_Dx12 { private: NVSDK_NGX_Parameter* SetParameters(NVSDK_NGX_Parameter* InParameters); @@ -14,19 +14,19 @@ class FSR31FeatureDx12 : public FSR31Feature, public IFeature_Dx12 bool InitFSR3(const NVSDK_NGX_Parameter* InParameters); public: - FSR31FeatureDx12(unsigned int InHandleId, NVSDK_NGX_Parameter* InParameters); + FFXFeatureDx12(unsigned int InHandleId, NVSDK_NGX_Parameter* InParameters); bool InitInternal(ID3D12GraphicsCommandList* InCommandList, NVSDK_NGX_Parameter* InParameters) override; bool EvaluateInternal(ID3D12GraphicsCommandList* InCommandList, NVSDK_NGX_Parameter* InParameters) override; bool QueryProviders(ID3D12Device* device); Upscaler GetUpscalerType() final { return Upscaler::FFX; } - feature_version Version() override { return FSR31Feature::Version(); } - std::string Name() const override { return FSR31Feature::Name(); } + feature_version Version() override { return FFXFeature::Version(); } + std::string Name() const override { return FFXFeature::Name(); } bool IsWithDx12() final { return false; } - ~FSR31FeatureDx12() + ~FFXFeatureDx12() { if (State::Instance().isShuttingDown) return; diff --git a/OptiScaler/upscalers/fsr31/FSR31Feature_Vk.cpp b/OptiScaler/upscalers/ffx/FFXFeature_Vk.cpp similarity index 97% rename from OptiScaler/upscalers/fsr31/FSR31Feature_Vk.cpp rename to OptiScaler/upscalers/ffx/FFXFeature_Vk.cpp index 1e75473f..dfb2706e 100644 --- a/OptiScaler/upscalers/fsr31/FSR31Feature_Vk.cpp +++ b/OptiScaler/upscalers/ffx/FFXFeature_Vk.cpp @@ -2,7 +2,7 @@ #include #include #include -#include "FSR31Feature_Vk.h" +#include "FFXFeature_Vk.h" #include "nvsdk_ngx_vk.h" #include "MathUtils.h" @@ -120,8 +120,8 @@ static inline FfxApiResourceDescription ffxApiGetImageResourceDescriptionVKLocal return resourceDescription; } -FSR31FeatureVk::FSR31FeatureVk(unsigned int InHandleId, NVSDK_NGX_Parameter* InParameters) - : FSR31Feature(InHandleId, InParameters), IFeature_Vk(InHandleId, InParameters), IFeature(InHandleId, InParameters) +FFXFeatureVk::FFXFeatureVk(unsigned int InHandleId, NVSDK_NGX_Parameter* InParameters) + : FFXFeature(InHandleId, InParameters), IFeature_Vk(InHandleId, InParameters), IFeature(InHandleId, InParameters) { _moduleLoaded = FfxApiProxy::InitFfxVk(); @@ -131,9 +131,9 @@ FSR31FeatureVk::FSR31FeatureVk(unsigned int InHandleId, NVSDK_NGX_Parameter* InP LOG_ERROR("Can't load amd_fidelityfx_vk.dll methods!"); } -bool FSR31FeatureVk::InitFSR3(const NVSDK_NGX_Parameter* InParameters) +bool FFXFeatureVk::InitFSR3(const NVSDK_NGX_Parameter* InParameters) { - LOG_DEBUG("FSR31FeatureVk::InitFSR3"); + LOG_DEBUG("FFXFeatureVk::InitFSR3"); if (!ModuleLoaded()) return false; @@ -293,9 +293,9 @@ bool FSR31FeatureVk::InitFSR3(const NVSDK_NGX_Parameter* InParameters) return true; } -bool FSR31FeatureVk::Init(VkInstance InInstance, VkPhysicalDevice InPD, VkDevice InDevice, VkCommandBuffer InCmdList, - PFN_vkGetInstanceProcAddr InGIPA, PFN_vkGetDeviceProcAddr InGDPA, - NVSDK_NGX_Parameter* InParameters) +bool FFXFeatureVk::Init(VkInstance InInstance, VkPhysicalDevice InPD, VkDevice InDevice, VkCommandBuffer InCmdList, + PFN_vkGetInstanceProcAddr InGIPA, PFN_vkGetDeviceProcAddr InGDPA, + NVSDK_NGX_Parameter* InParameters) { LOG_FUNC(); @@ -317,7 +317,7 @@ bool FSR31FeatureVk::Init(VkInstance InInstance, VkPhysicalDevice InPD, VkDevice return InitFSR3(InParameters); } -bool FSR31FeatureVk::Evaluate(VkCommandBuffer InCmdBuffer, NVSDK_NGX_Parameter* InParameters) +bool FFXFeatureVk::Evaluate(VkCommandBuffer InCmdBuffer, NVSDK_NGX_Parameter* InParameters) { LOG_FUNC(); diff --git a/OptiScaler/upscalers/fsr31/FSR31Feature_Vk.h b/OptiScaler/upscalers/ffx/FFXFeature_Vk.h similarity index 69% rename from OptiScaler/upscalers/fsr31/FSR31Feature_Vk.h rename to OptiScaler/upscalers/ffx/FFXFeature_Vk.h index 16f78361..bb0e4245 100644 --- a/OptiScaler/upscalers/fsr31/FSR31Feature_Vk.h +++ b/OptiScaler/upscalers/ffx/FFXFeature_Vk.h @@ -1,30 +1,30 @@ #pragma once -#include "FSR31Feature.h" +#include "FFXFeature.h" #include #include "vk/ffx_api_vk.h" #include -class FSR31FeatureVk : public FSR31Feature, public IFeature_Vk +class FFXFeatureVk : public FFXFeature, public IFeature_Vk { private: protected: bool InitFSR3(const NVSDK_NGX_Parameter* InParameters); public: - FSR31FeatureVk(unsigned int InHandleId, NVSDK_NGX_Parameter* InParameters); + FFXFeatureVk(unsigned int InHandleId, NVSDK_NGX_Parameter* InParameters); bool Init(VkInstance InInstance, VkPhysicalDevice InPD, VkDevice InDevice, VkCommandBuffer InCmdList, PFN_vkGetInstanceProcAddr InGIPA, PFN_vkGetDeviceProcAddr InGDPA, NVSDK_NGX_Parameter* InParameters) override; bool Evaluate(VkCommandBuffer InCmdBuffer, NVSDK_NGX_Parameter* InParameters) override; - feature_version Version() override { return FSR31Feature::Version(); } - std::string Name() const override { return FSR31Feature::Name(); } + feature_version Version() override { return FFXFeature::Version(); } + std::string Name() const override { return FFXFeature::Name(); } bool IsWithDx12() final { return false; } - ~FSR31FeatureVk() + ~FFXFeatureVk() { if (State::Instance().isShuttingDown) return; diff --git a/OptiScaler/upscalers/fsr31/FSR31Feature_VkOn12.cpp b/OptiScaler/upscalers/ffx/FFXFeature_VkOn12.cpp similarity index 97% rename from OptiScaler/upscalers/fsr31/FSR31Feature_VkOn12.cpp rename to OptiScaler/upscalers/ffx/FFXFeature_VkOn12.cpp index d60bec9b..a2006afb 100644 --- a/OptiScaler/upscalers/fsr31/FSR31Feature_VkOn12.cpp +++ b/OptiScaler/upscalers/ffx/FFXFeature_VkOn12.cpp @@ -1,20 +1,20 @@ #include -#include "FSR31Feature_VkOn12.h" +#include "FFXFeature_VkOn12.h" #include #include #include -NVSDK_NGX_Parameter* FSR31FeatureVkOn12::SetParameters(NVSDK_NGX_Parameter* InParameters) +NVSDK_NGX_Parameter* FFXFeatureVkOn12::SetParameters(NVSDK_NGX_Parameter* InParameters) { InParameters->Set("OptiScaler.SupportsUpscaleSize", true); return InParameters; } -FSR31FeatureVkOn12::FSR31FeatureVkOn12(unsigned int InHandleId, NVSDK_NGX_Parameter* InParameters) - : FSR31Feature(InHandleId, InParameters), IFeature_VkwDx12(InHandleId, InParameters), +FFXFeatureVkOn12::FFXFeatureVkOn12(unsigned int InHandleId, NVSDK_NGX_Parameter* InParameters) + : FFXFeature(InHandleId, InParameters), IFeature_VkwDx12(InHandleId, InParameters), IFeature_Vk(InHandleId, InParameters), IFeature(InHandleId, SetParameters(InParameters)) { FfxApiProxy::InitFfxDx12(); @@ -27,9 +27,9 @@ FSR31FeatureVkOn12::FSR31FeatureVkOn12(unsigned int InHandleId, NVSDK_NGX_Parame LOG_ERROR("can't load amd_fidelityfx_dx12.dll methods!"); } -bool FSR31FeatureVkOn12::Init(VkInstance InInstance, VkPhysicalDevice InPD, VkDevice InDevice, - VkCommandBuffer InCmdList, PFN_vkGetInstanceProcAddr InGIPA, - PFN_vkGetDeviceProcAddr InGDPA, NVSDK_NGX_Parameter* InParameters) +bool FFXFeatureVkOn12::Init(VkInstance InInstance, VkPhysicalDevice InPD, VkDevice InDevice, VkCommandBuffer InCmdList, + PFN_vkGetInstanceProcAddr InGIPA, PFN_vkGetDeviceProcAddr InGDPA, + NVSDK_NGX_Parameter* InParameters) { LOG_FUNC(); @@ -47,7 +47,7 @@ bool FSR31FeatureVkOn12::Init(VkInstance InInstance, VkPhysicalDevice InPD, VkDe return _moduleLoaded; } -bool FSR31FeatureVkOn12::Evaluate(VkCommandBuffer InCmdBuffer, NVSDK_NGX_Parameter* InParameters) +bool FFXFeatureVkOn12::Evaluate(VkCommandBuffer InCmdBuffer, NVSDK_NGX_Parameter* InParameters) { LOG_FUNC(); @@ -543,7 +543,7 @@ bool FSR31FeatureVkOn12::Evaluate(VkCommandBuffer InCmdBuffer, NVSDK_NGX_Paramet return evalResult; } -bool FSR31FeatureVkOn12::InitFSR3(const NVSDK_NGX_Parameter* InParameters) +bool FFXFeatureVkOn12::InitFSR3(const NVSDK_NGX_Parameter* InParameters) { LOG_FUNC(); diff --git a/OptiScaler/upscalers/fsr31/FSR31Feature_VkOn12.h b/OptiScaler/upscalers/ffx/FFXFeature_VkOn12.h similarity index 78% rename from OptiScaler/upscalers/fsr31/FSR31Feature_VkOn12.h rename to OptiScaler/upscalers/ffx/FFXFeature_VkOn12.h index 55200df6..99e1cc69 100644 --- a/OptiScaler/upscalers/fsr31/FSR31Feature_VkOn12.h +++ b/OptiScaler/upscalers/ffx/FFXFeature_VkOn12.h @@ -1,11 +1,11 @@ #pragma once -#include "FSR31Feature.h" +#include "FFXFeature.h" #include #include "dx12/ffx_api_dx12.h" #include "proxies/FfxApi_Proxy.h" -class FSR31FeatureVkOn12 : public FSR31Feature, public IFeature_VkwDx12 +class FFXFeatureVkOn12 : public FFXFeature, public IFeature_VkwDx12 { private: bool _baseInit = false; @@ -16,9 +16,9 @@ class FSR31FeatureVkOn12 : public FSR31Feature, public IFeature_VkwDx12 public: std::string Name() const { return "FSR3 w/Dx12"; } - feature_version Version() override { return FSR31Feature::Version(); } + feature_version Version() override { return FFXFeature::Version(); } - FSR31FeatureVkOn12(unsigned int InHandleId, NVSDK_NGX_Parameter* InParameters); + FFXFeatureVkOn12(unsigned int InHandleId, NVSDK_NGX_Parameter* InParameters); bool Init(VkInstance InInstance, VkPhysicalDevice InPD, VkDevice InDevice, VkCommandBuffer InCmdList, PFN_vkGetInstanceProcAddr InGIPA, PFN_vkGetDeviceProcAddr InGDPA, @@ -28,7 +28,7 @@ class FSR31FeatureVkOn12 : public FSR31Feature, public IFeature_VkwDx12 bool IsWithDx12() final { return true; } - ~FSR31FeatureVkOn12() + ~FFXFeatureVkOn12() { if (State::Instance().isShuttingDown) return;