change preexposure check

This commit is contained in:
cdozdil
2025-01-19 00:27:32 +03:00
parent 30a7aa9e5f
commit 20eab030b3
11 changed files with 26 additions and 25 deletions
@@ -561,8 +561,8 @@ bool FSR2FeatureDx11::Evaluate(ID3D11DeviceContext* InContext, NVSDK_NGX_Paramet
if (InParameters->Get(NVSDK_NGX_Parameter_FrameTimeDeltaInMsec, &params.frameTimeDelta) != NVSDK_NGX_Result_Success || params.frameTimeDelta < 1.0f)
params.frameTimeDelta = (float)GetDeltaTime();
params.preExposure = 1.0f;
InParameters->Get(NVSDK_NGX_Parameter_DLSS_Pre_Exposure, &params.preExposure);
if (InParameters->Get(NVSDK_NGX_Parameter_DLSS_Pre_Exposure, &params.preExposure) != NVSDK_NGX_Result_Success)
params.preExposure = 1.0f;
LOG_DEBUG("Dispatch!!");
auto result = ffxFsr2ContextDispatch(&_context, &params);
@@ -295,8 +295,8 @@ bool FSR2FeatureDx11on12::Evaluate(ID3D11DeviceContext* InDeviceContext, NVSDK_N
if (InParameters->Get(NVSDK_NGX_Parameter_FrameTimeDeltaInMsec, &params.frameTimeDelta) != NVSDK_NGX_Result_Success || params.frameTimeDelta < 1.0f)
params.frameTimeDelta = (float)GetDeltaTime();
params.preExposure = 1.0f;
InParameters->Get(NVSDK_NGX_Parameter_DLSS_Pre_Exposure, &params.preExposure);
if (InParameters->Get(NVSDK_NGX_Parameter_DLSS_Pre_Exposure, &params.preExposure) != NVSDK_NGX_Result_Success)
params.preExposure = 1.0f;
LOG_DEBUG("Dispatch!!");
auto ffxresult = ffxFsr2ContextDispatch(&_context, &params);
@@ -345,8 +345,8 @@ bool FSR2FeatureDx12::Evaluate(ID3D12GraphicsCommandList* InCommandList, NVSDK_N
params.frameTimeDelta = (float)GetDeltaTime();
}
params.preExposure = 1.0f;
InParameters->Get(NVSDK_NGX_Parameter_DLSS_Pre_Exposure, &params.preExposure);
if (InParameters->Get(NVSDK_NGX_Parameter_DLSS_Pre_Exposure, &params.preExposure) != NVSDK_NGX_Result_Success)
params.preExposure = 1.0f;
LOG_DEBUG("Dispatch!!");
auto result = ffxFsr2ContextDispatch(&_context, &params);
+2 -3
View File
@@ -374,9 +374,8 @@ bool FSR2FeatureVk::Evaluate(VkCommandBuffer InCmdBuffer, NVSDK_NGX_Parameter* I
if (InParameters->Get(NVSDK_NGX_Parameter_FrameTimeDeltaInMsec, &params.frameTimeDelta) != NVSDK_NGX_Result_Success || params.frameTimeDelta < 1.0f)
params.frameTimeDelta = (float)GetDeltaTime();
params.preExposure = 1.0f;
InParameters->Get(NVSDK_NGX_Parameter_DLSS_Pre_Exposure, &params.preExposure);
if (InParameters->Get(NVSDK_NGX_Parameter_DLSS_Pre_Exposure, &params.preExposure) != NVSDK_NGX_Result_Success)
params.preExposure = 1.0f;
LOG_DEBUG("Dispatch!!");
auto result = ffxFsr2ContextDispatch(&_context, &params);
@@ -300,8 +300,8 @@ bool FSR2FeatureDx11on12_212::Evaluate(ID3D11DeviceContext* InDeviceContext, NVS
if (InParameters->Get(NVSDK_NGX_Parameter_FrameTimeDeltaInMsec, &params.frameTimeDelta) != NVSDK_NGX_Result_Success || params.frameTimeDelta < 1.0f)
params.frameTimeDelta = (float)GetDeltaTime();
params.preExposure = 1.0f;
InParameters->Get(NVSDK_NGX_Parameter_DLSS_Pre_Exposure, &params.preExposure);
if (InParameters->Get(NVSDK_NGX_Parameter_DLSS_Pre_Exposure, &params.preExposure) != NVSDK_NGX_Result_Success)
params.preExposure = 1.0f;
LOG_DEBUG("Dispatch!!");
auto ffxresult = Fsr212::ffxFsr2ContextDispatch212(&_context, &params);
@@ -350,9 +350,8 @@ bool FSR2FeatureDx12_212::Evaluate(ID3D12GraphicsCommandList* InCommandList, NVS
LOG_DEBUG("FrameTimeDeltaInMsec: {0}", params.frameTimeDelta);
params.preExposure = 1.0f;
InParameters->Get(NVSDK_NGX_Parameter_DLSS_Pre_Exposure, &params.preExposure);
if (InParameters->Get(NVSDK_NGX_Parameter_DLSS_Pre_Exposure, &params.preExposure) != NVSDK_NGX_Result_Success)
params.preExposure = 1.0f;
LOG_DEBUG("Dispatch!!");
auto result = Fsr212::ffxFsr2ContextDispatch212(&_context, &params);
@@ -416,9 +416,8 @@ bool FSR2FeatureVk212::Evaluate(VkCommandBuffer InCmdBuffer, NVSDK_NGX_Parameter
if (InParameters->Get(NVSDK_NGX_Parameter_FrameTimeDeltaInMsec, &params.frameTimeDelta) != NVSDK_NGX_Result_Success || params.frameTimeDelta < 1.0f)
params.frameTimeDelta = (float)GetDeltaTime();
params.preExposure = 1.0f;
InParameters->Get(NVSDK_NGX_Parameter_DLSS_Pre_Exposure, &params.preExposure);
if (InParameters->Get(NVSDK_NGX_Parameter_DLSS_Pre_Exposure, &params.preExposure) != NVSDK_NGX_Result_Success)
params.preExposure = 1.0f;
LOG_DEBUG("Dispatch!!");
auto result = Fsr212::ffxFsr2ContextDispatch212(&_context, &params);
@@ -431,13 +431,13 @@ bool FSR31FeatureDx11::Evaluate(ID3D11DeviceContext* DeviceContext, NVSDK_NGX_Pa
LOG_DEBUG("FrameTimeDeltaInMsec: {0}", params.frameTimeDelta);
params.preExposure = 1.0f;
InParameters->Get(NVSDK_NGX_Parameter_DLSS_Pre_Exposure, &params.preExposure);
if (InParameters->Get(NVSDK_NGX_Parameter_DLSS_Pre_Exposure, &params.preExposure) != NVSDK_NGX_Result_Success)
params.preExposure = 1.0f;
params.upscaleSize.width = TargetWidth();
params.upscaleSize.height = TargetHeight();
if (_velocity != Config::Instance()->FsrVelocity.value_or(1.0f))
if (Version().major >= 1 && Version().minor >= 1 && Version().patch >= 1 && _velocity != Config::Instance()->FsrVelocity.value_or(1.0f))
{
_velocity = Config::Instance()->FsrVelocity.value_or(1.0f);
auto result = ffxFsr3SetUpscalerConstant(&_upscalerContext, Fsr31::FfxFsr3UpscalerConfigureKey::FFX_FSR3UPSCALER_CONFIGURE_UPSCALE_KEY_FVELOCITYFACTOR, &_velocity);
@@ -315,10 +315,13 @@ bool FSR31FeatureDx11on12::Evaluate(ID3D11DeviceContext* InDeviceContext, NVSDK_
if (InParameters->Get(NVSDK_NGX_Parameter_FrameTimeDeltaInMsec, &params.frameTimeDelta) != NVSDK_NGX_Result_Success || params.frameTimeDelta < 1.0f)
params.frameTimeDelta = (float)GetDeltaTime();
params.preExposure = 1.0f;
if (InParameters->Get(NVSDK_NGX_Parameter_DLSS_Pre_Exposure, &params.preExposure) != NVSDK_NGX_Result_Success)
params.preExposure = 1.0f;
params.viewSpaceToMetersFactor = 1.0f;
if (_velocity != Config::Instance()->FsrVelocity.value_or(1.0f))
// Version 1.1.1 check
if (Version().major >= 1 && Version().minor >= 1 && Version().patch >= 1 && _velocity != Config::Instance()->FsrVelocity.value_or(1.0f))
{
_velocity = Config::Instance()->FsrVelocity.value_or(1.0f);
ffxConfigureDescUpscaleKeyValue m_upscalerKeyValueConfig{};
@@ -376,7 +376,7 @@ bool FSR31FeatureDx12::Evaluate(ID3D12GraphicsCommandList* InCommandList, NVSDK_
if (InParameters->Get(NVSDK_NGX_Parameter_DLSS_Pre_Exposure, &params.preExposure) != NVSDK_NGX_Result_Success)
params.preExposure = 1.0f;
if (_velocity != Config::Instance()->FsrVelocity.value_or(1.0f))
if (Version().major >= 1 && Version().minor >= 1 && Version().patch >= 1 && _velocity != Config::Instance()->FsrVelocity.value_or(1.0f))
{
_velocity = Config::Instance()->FsrVelocity.value_or(1.0f);
ffxConfigureDescUpscaleKeyValue m_upscalerKeyValueConfig{};
@@ -446,9 +446,10 @@ bool FSR31FeatureVk::Evaluate(VkCommandBuffer InCmdBuffer, NVSDK_NGX_Parameter*
if (InParameters->Get(NVSDK_NGX_Parameter_FrameTimeDeltaInMsec, &params.frameTimeDelta) != NVSDK_NGX_Result_Success || params.frameTimeDelta < 1.0f)
params.frameTimeDelta = (float)GetDeltaTime();
params.preExposure = 1.0f; InParameters->Get(NVSDK_NGX_Parameter_DLSS_Pre_Exposure, &params.preExposure);
if (InParameters->Get(NVSDK_NGX_Parameter_DLSS_Pre_Exposure, &params.preExposure) != NVSDK_NGX_Result_Success)
params.preExposure = 1.0f;
if (_velocity != Config::Instance()->FsrVelocity.value_or(1.0f))
if (Version().major >= 1 && Version().minor >= 1 && Version().patch >= 1 && _velocity != Config::Instance()->FsrVelocity.value_or(1.0f))
{
_velocity = Config::Instance()->FsrVelocity.value_or(1.0f);
ffxConfigureDescUpscaleKeyValue m_upscalerKeyValueConfig{};