From bc70422a4cd00d6a240f3901237d44890a262ccd Mon Sep 17 00:00:00 2001 From: cdozdil Date: Wed, 10 Jul 2024 01:13:10 +0300 Subject: [PATCH] read and use pre exposure value --- OptiScaler/backends/fsr2/FSR2Feature.h | 2 +- OptiScaler/backends/fsr2/FSR2Feature_Dx11.cpp | 1 + OptiScaler/backends/fsr2/FSR2Feature_Dx11On12.cpp | 2 ++ OptiScaler/backends/fsr2/FSR2Feature_Dx12.cpp | 2 ++ OptiScaler/backends/fsr2/FSR2Feature_Vk.cpp | 2 ++ OptiScaler/backends/fsr2_212/FSR2Feature_212.h | 2 +- OptiScaler/backends/fsr2_212/FSR2Feature_Dx11On12_212.cpp | 2 ++ OptiScaler/backends/fsr2_212/FSR2Feature_Dx12_212.cpp | 2 ++ OptiScaler/backends/fsr2_212/FSR2Feature_Vk_212.cpp | 2 ++ 9 files changed, 15 insertions(+), 2 deletions(-) diff --git a/OptiScaler/backends/fsr2/FSR2Feature.h b/OptiScaler/backends/fsr2/FSR2Feature.h index 75966db1..cb9eeb41 100644 --- a/OptiScaler/backends/fsr2/FSR2Feature.h +++ b/OptiScaler/backends/fsr2/FSR2Feature.h @@ -63,7 +63,7 @@ protected: public: bool IsDepthInverted() const; feature_version Version() final { return _version; } - const char* Name() override { return "FSR"; } + const char* Name() override { return "FSR 2.2"; } FSR2Feature(unsigned int InHandleId, NVSDK_NGX_Parameter* InParameters) : IFeature(InHandleId, InParameters) { diff --git a/OptiScaler/backends/fsr2/FSR2Feature_Dx11.cpp b/OptiScaler/backends/fsr2/FSR2Feature_Dx11.cpp index 3e27ca45..c72782b9 100644 --- a/OptiScaler/backends/fsr2/FSR2Feature_Dx11.cpp +++ b/OptiScaler/backends/fsr2/FSR2Feature_Dx11.cpp @@ -445,6 +445,7 @@ bool FSR2FeatureDx11::Evaluate(ID3D11DeviceContext* InContext, NVSDK_NGX_Paramet params.frameTimeDelta = (float)GetDeltaTime(); params.preExposure = 1.0f; + InParameters->Get(NVSDK_NGX_Parameter_DLSS_Pre_Exposure, ¶ms.preExposure); spdlog::debug("FSR2FeatureDx11::Evaluate Dispatch!!"); auto result = ffxFsr2ContextDispatch(&_context, ¶ms); diff --git a/OptiScaler/backends/fsr2/FSR2Feature_Dx11On12.cpp b/OptiScaler/backends/fsr2/FSR2Feature_Dx11On12.cpp index b027a31f..2e28b236 100644 --- a/OptiScaler/backends/fsr2/FSR2Feature_Dx11On12.cpp +++ b/OptiScaler/backends/fsr2/FSR2Feature_Dx11On12.cpp @@ -314,6 +314,8 @@ bool FSR2FeatureDx11on12::Evaluate(ID3D11DeviceContext* InDeviceContext, NVSDK_N params.frameTimeDelta = (float)GetDeltaTime(); params.preExposure = 1.0f; + InParameters->Get(NVSDK_NGX_Parameter_DLSS_Pre_Exposure, ¶ms.preExposure); + spdlog::debug("FSR2FeatureDx11on12::Evaluate Dispatch!!"); auto ffxresult = ffxFsr2ContextDispatch(&_context, ¶ms); diff --git a/OptiScaler/backends/fsr2/FSR2Feature_Dx12.cpp b/OptiScaler/backends/fsr2/FSR2Feature_Dx12.cpp index cfbdac36..231bc4fb 100644 --- a/OptiScaler/backends/fsr2/FSR2Feature_Dx12.cpp +++ b/OptiScaler/backends/fsr2/FSR2Feature_Dx12.cpp @@ -332,6 +332,8 @@ bool FSR2FeatureDx12::Evaluate(ID3D12GraphicsCommandList* InCommandList, NVSDK_N params.frameTimeDelta = (float)GetDeltaTime(); params.preExposure = 1.0f; + InParameters->Get(NVSDK_NGX_Parameter_DLSS_Pre_Exposure, ¶ms.preExposure); + spdlog::debug("FSR2FeatureDx12::Evaluate Dispatch!!"); auto result = ffxFsr2ContextDispatch(&_context, ¶ms); diff --git a/OptiScaler/backends/fsr2/FSR2Feature_Vk.cpp b/OptiScaler/backends/fsr2/FSR2Feature_Vk.cpp index 89672aa8..c88a2767 100644 --- a/OptiScaler/backends/fsr2/FSR2Feature_Vk.cpp +++ b/OptiScaler/backends/fsr2/FSR2Feature_Vk.cpp @@ -354,6 +354,8 @@ bool FSR2FeatureVk::Evaluate(VkCommandBuffer InCmdBuffer, NVSDK_NGX_Parameter* I params.frameTimeDelta = (float)GetDeltaTime(); params.preExposure = 1.0f; + InParameters->Get(NVSDK_NGX_Parameter_DLSS_Pre_Exposure, ¶ms.preExposure); + spdlog::debug("FSR2FeatureVk::Evaluate Dispatch!!"); auto result = ffxFsr2ContextDispatch(&_context, ¶ms); diff --git a/OptiScaler/backends/fsr2_212/FSR2Feature_212.h b/OptiScaler/backends/fsr2_212/FSR2Feature_212.h index 5a9e7e42..e38e90cd 100644 --- a/OptiScaler/backends/fsr2_212/FSR2Feature_212.h +++ b/OptiScaler/backends/fsr2_212/FSR2Feature_212.h @@ -49,7 +49,7 @@ protected: public: bool IsDepthInverted() const; feature_version Version() final { return _version; } - const char* Name() override { return "FSR"; } + const char* Name() override { return "FSR 2.1"; } FSR2Feature212(unsigned int InHandleId, NVSDK_NGX_Parameter* InParameters) : IFeature(InHandleId, InParameters) { diff --git a/OptiScaler/backends/fsr2_212/FSR2Feature_Dx11On12_212.cpp b/OptiScaler/backends/fsr2_212/FSR2Feature_Dx11On12_212.cpp index 663141b0..0873e13e 100644 --- a/OptiScaler/backends/fsr2_212/FSR2Feature_Dx11On12_212.cpp +++ b/OptiScaler/backends/fsr2_212/FSR2Feature_Dx11On12_212.cpp @@ -315,6 +315,8 @@ bool FSR2FeatureDx11on12_212::Evaluate(ID3D11DeviceContext* InDeviceContext, NVS params.frameTimeDelta = (float)GetDeltaTime(); params.preExposure = 1.0f; + InParameters->Get(NVSDK_NGX_Parameter_DLSS_Pre_Exposure, ¶ms.preExposure); + spdlog::debug("FSR2FeatureDx11on12_212::Evaluate Dispatch!!"); auto ffxresult = Fsr212::ffxFsr2ContextDispatch212(&_context, ¶ms); diff --git a/OptiScaler/backends/fsr2_212/FSR2Feature_Dx12_212.cpp b/OptiScaler/backends/fsr2_212/FSR2Feature_Dx12_212.cpp index 0a40080b..e42bba13 100644 --- a/OptiScaler/backends/fsr2_212/FSR2Feature_Dx12_212.cpp +++ b/OptiScaler/backends/fsr2_212/FSR2Feature_Dx12_212.cpp @@ -312,6 +312,8 @@ bool FSR2FeatureDx12_212::Evaluate(ID3D12GraphicsCommandList* InCommandList, NVS spdlog::debug("FSR2FeatureDx12_212::Evaluate FrameTimeDeltaInMsec: {0}", params.frameTimeDelta); params.preExposure = 1.0f; + InParameters->Get(NVSDK_NGX_Parameter_DLSS_Pre_Exposure, ¶ms.preExposure); + spdlog::debug("FSR2FeatureDx12_212::Evaluate Dispatch!!"); auto result = Fsr212::ffxFsr2ContextDispatch212(&_context, ¶ms); diff --git a/OptiScaler/backends/fsr2_212/FSR2Feature_Vk_212.cpp b/OptiScaler/backends/fsr2_212/FSR2Feature_Vk_212.cpp index 18101227..4bada2a1 100644 --- a/OptiScaler/backends/fsr2_212/FSR2Feature_Vk_212.cpp +++ b/OptiScaler/backends/fsr2_212/FSR2Feature_Vk_212.cpp @@ -349,6 +349,8 @@ bool FSR2FeatureVk212::Evaluate(VkCommandBuffer InCmdBuffer, NVSDK_NGX_Parameter params.frameTimeDelta = (float)GetDeltaTime(); params.preExposure = 1.0f; + InParameters->Get(NVSDK_NGX_Parameter_DLSS_Pre_Exposure, ¶ms.preExposure); + spdlog::debug("FSR2FeatureVk212::Evaluate Dispatch!!"); auto result = Fsr212::ffxFsr2ContextDispatch212(&_context, ¶ms);