From 592052eb4fafdebf424a62f1a66650ff3d776fc6 Mon Sep 17 00:00:00 2001 From: cdozdil Date: Thu, 9 Jan 2025 00:22:56 +0300 Subject: [PATCH] changed camera near value to 0.1 --- OptiScaler/NVNGX_DLSS_Dx12.cpp | 4 ++-- OptiScaler/backends/fsr2/FSR2Feature_Dx11.cpp | 4 ++-- OptiScaler/backends/fsr2/FSR2Feature_Dx11On12.cpp | 4 ++-- OptiScaler/backends/fsr2/FSR2Feature_Dx12.cpp | 4 ++-- OptiScaler/backends/fsr2/FSR2Feature_Vk.cpp | 4 ++-- OptiScaler/backends/fsr2_212/FSR2Feature_Dx11On12_212.cpp | 4 ++-- OptiScaler/backends/fsr2_212/FSR2Feature_Dx12_212.cpp | 4 ++-- OptiScaler/backends/fsr2_212/FSR2Feature_Vk_212.cpp | 4 ++-- OptiScaler/backends/fsr31/FSR31Feature_Dx11.cpp | 4 ++-- OptiScaler/backends/fsr31/FSR31Feature_Dx11On12.cpp | 4 ++-- OptiScaler/backends/fsr31/FSR31Feature_Dx12.cpp | 4 ++-- OptiScaler/backends/fsr31/FSR31Feature_Vk.cpp | 4 ++-- OptiScaler/imgui/imgui_common.cpp | 2 +- 13 files changed, 25 insertions(+), 25 deletions(-) diff --git a/OptiScaler/NVNGX_DLSS_Dx12.cpp b/OptiScaler/NVNGX_DLSS_Dx12.cpp index d84d057d..a0294f12 100644 --- a/OptiScaler/NVNGX_DLSS_Dx12.cpp +++ b/OptiScaler/NVNGX_DLSS_Dx12.cpp @@ -1278,9 +1278,9 @@ NVSDK_NGX_API NVSDK_NGX_Result NVSDK_NGX_D3D12_EvaluateFeature(ID3D12GraphicsCom if (!Config::Instance()->FsrUseFsrInputValues.value_or(true) || InParameters->Get("FSR.cameraNear", &cameraNear) != NVSDK_NGX_Result_Success) { if (deviceContext->GetFeatureFlags() & NVSDK_NGX_DLSS_Feature_Flags_DepthInverted) - cameraFar = Config::Instance()->FsrCameraNear.value_or(10.0f); + cameraFar = Config::Instance()->FsrCameraNear.value_or(0.1f); else - cameraNear = Config::Instance()->FsrCameraNear.value_or(10.0f); + cameraNear = Config::Instance()->FsrCameraNear.value_or(0.1f); } if (!Config::Instance()->FsrUseFsrInputValues.value_or(true) || InParameters->Get("FSR.cameraFar", &cameraFar) != NVSDK_NGX_Result_Success) diff --git a/OptiScaler/backends/fsr2/FSR2Feature_Dx11.cpp b/OptiScaler/backends/fsr2/FSR2Feature_Dx11.cpp index 989cc276..3e608282 100644 --- a/OptiScaler/backends/fsr2/FSR2Feature_Dx11.cpp +++ b/OptiScaler/backends/fsr2/FSR2Feature_Dx11.cpp @@ -542,13 +542,13 @@ bool FSR2FeatureDx11::Evaluate(ID3D11DeviceContext* InContext, NVSDK_NGX_Paramet if (IsDepthInverted()) { - params.cameraFar = Config::Instance()->FsrCameraNear.value_or(10.0f); + params.cameraFar = Config::Instance()->FsrCameraNear.value_or(0.1f); params.cameraNear = Config::Instance()->FsrCameraFar.value_or(100000.0f); } else { params.cameraFar = Config::Instance()->FsrCameraFar.value_or(100000.0f); - params.cameraNear = Config::Instance()->FsrCameraNear.value_or(10.0f); + params.cameraNear = Config::Instance()->FsrCameraNear.value_or(0.1f); } if (Config::Instance()->FsrVerticalFov.has_value()) diff --git a/OptiScaler/backends/fsr2/FSR2Feature_Dx11On12.cpp b/OptiScaler/backends/fsr2/FSR2Feature_Dx11On12.cpp index c636c654..a0d9291b 100644 --- a/OptiScaler/backends/fsr2/FSR2Feature_Dx11On12.cpp +++ b/OptiScaler/backends/fsr2/FSR2Feature_Dx11On12.cpp @@ -276,13 +276,13 @@ bool FSR2FeatureDx11on12::Evaluate(ID3D11DeviceContext* InDeviceContext, NVSDK_N if (IsDepthInverted()) { - params.cameraFar = Config::Instance()->FsrCameraNear.value_or(10.0f); + params.cameraFar = Config::Instance()->FsrCameraNear.value_or(0.1f); params.cameraNear = Config::Instance()->FsrCameraFar.value_or(100000.0f); } else { params.cameraFar = Config::Instance()->FsrCameraFar.value_or(100000.0f); - params.cameraNear = Config::Instance()->FsrCameraNear.value_or(10.0f); + params.cameraNear = Config::Instance()->FsrCameraNear.value_or(0.1f); } if (Config::Instance()->FsrVerticalFov.has_value()) diff --git a/OptiScaler/backends/fsr2/FSR2Feature_Dx12.cpp b/OptiScaler/backends/fsr2/FSR2Feature_Dx12.cpp index 496c46f8..9ec09cc4 100644 --- a/OptiScaler/backends/fsr2/FSR2Feature_Dx12.cpp +++ b/OptiScaler/backends/fsr2/FSR2Feature_Dx12.cpp @@ -316,9 +316,9 @@ bool FSR2FeatureDx12::Evaluate(ID3D12GraphicsCommandList* InCommandList, NVSDK_N if (!Config::Instance()->FsrUseFsrInputValues.value_or(true) || InParameters->Get("FSR.cameraNear", ¶ms.cameraNear) != NVSDK_NGX_Result_Success) { if (IsDepthInverted()) - params.cameraFar = Config::Instance()->FsrCameraNear.value_or(10.0f); + params.cameraFar = Config::Instance()->FsrCameraNear.value_or(0.1f); else - params.cameraNear = Config::Instance()->FsrCameraNear.value_or(10.0f); + params.cameraNear = Config::Instance()->FsrCameraNear.value_or(0.1f); } if (!Config::Instance()->FsrUseFsrInputValues.value_or(true) || InParameters->Get("FSR.cameraFar", ¶ms.cameraFar) != NVSDK_NGX_Result_Success) diff --git a/OptiScaler/backends/fsr2/FSR2Feature_Vk.cpp b/OptiScaler/backends/fsr2/FSR2Feature_Vk.cpp index 503185ec..ab3ef353 100644 --- a/OptiScaler/backends/fsr2/FSR2Feature_Vk.cpp +++ b/OptiScaler/backends/fsr2/FSR2Feature_Vk.cpp @@ -355,13 +355,13 @@ bool FSR2FeatureVk::Evaluate(VkCommandBuffer InCmdBuffer, NVSDK_NGX_Parameter* I if (IsDepthInverted()) { - params.cameraFar = Config::Instance()->FsrCameraNear.value_or(10.0f); + params.cameraFar = Config::Instance()->FsrCameraNear.value_or(0.1f); params.cameraNear = Config::Instance()->FsrCameraFar.value_or(100000.0f); } else { params.cameraFar = Config::Instance()->FsrCameraFar.value_or(100000.0f); - params.cameraNear = Config::Instance()->FsrCameraNear.value_or(10.0f); + params.cameraNear = Config::Instance()->FsrCameraNear.value_or(0.1f); } if (Config::Instance()->FsrVerticalFov.has_value()) diff --git a/OptiScaler/backends/fsr2_212/FSR2Feature_Dx11On12_212.cpp b/OptiScaler/backends/fsr2_212/FSR2Feature_Dx11On12_212.cpp index cf9a39f8..e0379aef 100644 --- a/OptiScaler/backends/fsr2_212/FSR2Feature_Dx11On12_212.cpp +++ b/OptiScaler/backends/fsr2_212/FSR2Feature_Dx11On12_212.cpp @@ -281,13 +281,13 @@ bool FSR2FeatureDx11on12_212::Evaluate(ID3D11DeviceContext* InDeviceContext, NVS if (IsDepthInverted()) { - params.cameraFar = Config::Instance()->FsrCameraNear.value_or(10.0f); + params.cameraFar = Config::Instance()->FsrCameraNear.value_or(0.1f); params.cameraNear = Config::Instance()->FsrCameraFar.value_or(100000.0f); } else { params.cameraFar = Config::Instance()->FsrCameraFar.value_or(100000.0f); - params.cameraNear = Config::Instance()->FsrCameraNear.value_or(10.0f); + params.cameraNear = Config::Instance()->FsrCameraNear.value_or(0.1f); } if (Config::Instance()->FsrVerticalFov.has_value()) diff --git a/OptiScaler/backends/fsr2_212/FSR2Feature_Dx12_212.cpp b/OptiScaler/backends/fsr2_212/FSR2Feature_Dx12_212.cpp index 76952703..cbc5b7e1 100644 --- a/OptiScaler/backends/fsr2_212/FSR2Feature_Dx12_212.cpp +++ b/OptiScaler/backends/fsr2_212/FSR2Feature_Dx12_212.cpp @@ -319,9 +319,9 @@ bool FSR2FeatureDx12_212::Evaluate(ID3D12GraphicsCommandList* InCommandList, NVS if (Config::Instance()->FsrCameraNear.has_value() || !Config::Instance()->FsrUseFsrInputValues.value_or(true) || InParameters->Get("FSR.cameraNear", ¶ms.cameraNear) != NVSDK_NGX_Result_Success) { if (IsDepthInverted()) - params.cameraFar = Config::Instance()->FsrCameraNear.value_or(10.0f); + params.cameraFar = Config::Instance()->FsrCameraNear.value_or(0.1f); else - params.cameraNear = Config::Instance()->FsrCameraNear.value_or(10.0f); + params.cameraNear = Config::Instance()->FsrCameraNear.value_or(0.1f); } if (!Config::Instance()->FsrUseFsrInputValues.value_or(true) || InParameters->Get("FSR.cameraFar", ¶ms.cameraFar) != NVSDK_NGX_Result_Success) diff --git a/OptiScaler/backends/fsr2_212/FSR2Feature_Vk_212.cpp b/OptiScaler/backends/fsr2_212/FSR2Feature_Vk_212.cpp index d9663764..e5c756f6 100644 --- a/OptiScaler/backends/fsr2_212/FSR2Feature_Vk_212.cpp +++ b/OptiScaler/backends/fsr2_212/FSR2Feature_Vk_212.cpp @@ -397,13 +397,13 @@ bool FSR2FeatureVk212::Evaluate(VkCommandBuffer InCmdBuffer, NVSDK_NGX_Parameter if (IsDepthInverted()) { - params.cameraFar = Config::Instance()->FsrCameraNear.value_or(10.0f); + params.cameraFar = Config::Instance()->FsrCameraNear.value_or(0.1f); params.cameraNear = Config::Instance()->FsrCameraFar.value_or(100000.0f); } else { params.cameraFar = Config::Instance()->FsrCameraFar.value_or(100000.0f); - params.cameraNear = Config::Instance()->FsrCameraNear.value_or(10.0f); + params.cameraNear = Config::Instance()->FsrCameraNear.value_or(0.1f); } if (Config::Instance()->FsrVerticalFov.has_value()) diff --git a/OptiScaler/backends/fsr31/FSR31Feature_Dx11.cpp b/OptiScaler/backends/fsr31/FSR31Feature_Dx11.cpp index 076e1c70..763591bd 100644 --- a/OptiScaler/backends/fsr31/FSR31Feature_Dx11.cpp +++ b/OptiScaler/backends/fsr31/FSR31Feature_Dx11.cpp @@ -407,13 +407,13 @@ bool FSR31FeatureDx11::Evaluate(ID3D11DeviceContext* DeviceContext, NVSDK_NGX_Pa if (IsDepthInverted()) { - params.cameraFar = Config::Instance()->FsrCameraNear.value_or(10.0f); + params.cameraFar = Config::Instance()->FsrCameraNear.value_or(0.1f); params.cameraNear = Config::Instance()->FsrCameraFar.value_or(100000.0f); } else { params.cameraFar = Config::Instance()->FsrCameraFar.value_or(100000.0f); - params.cameraNear = Config::Instance()->FsrCameraNear.value_or(10.0f); + params.cameraNear = Config::Instance()->FsrCameraNear.value_or(0.1f); } if (Config::Instance()->FsrVerticalFov.has_value()) diff --git a/OptiScaler/backends/fsr31/FSR31Feature_Dx11On12.cpp b/OptiScaler/backends/fsr31/FSR31Feature_Dx11On12.cpp index 9027d172..985e27a2 100644 --- a/OptiScaler/backends/fsr31/FSR31Feature_Dx11On12.cpp +++ b/OptiScaler/backends/fsr31/FSR31Feature_Dx11On12.cpp @@ -296,13 +296,13 @@ bool FSR31FeatureDx11on12::Evaluate(ID3D11DeviceContext* InDeviceContext, NVSDK_ if (IsDepthInverted()) { - params.cameraFar = Config::Instance()->FsrCameraNear.value_or(10.0f); + params.cameraFar = Config::Instance()->FsrCameraNear.value_or(0.1f); params.cameraNear = Config::Instance()->FsrCameraFar.value_or(100000.0f); } else { params.cameraFar = Config::Instance()->FsrCameraFar.value_or(100000.0f); - params.cameraNear = Config::Instance()->FsrCameraNear.value_or(10.0f); + params.cameraNear = Config::Instance()->FsrCameraNear.value_or(0.1f); } if (Config::Instance()->FsrVerticalFov.has_value()) diff --git a/OptiScaler/backends/fsr31/FSR31Feature_Dx12.cpp b/OptiScaler/backends/fsr31/FSR31Feature_Dx12.cpp index 3f49c211..e469bebc 100644 --- a/OptiScaler/backends/fsr31/FSR31Feature_Dx12.cpp +++ b/OptiScaler/backends/fsr31/FSR31Feature_Dx12.cpp @@ -336,9 +336,9 @@ bool FSR31FeatureDx12::Evaluate(ID3D12GraphicsCommandList* InCommandList, NVSDK_ if (!Config::Instance()->FsrUseFsrInputValues.value_or(true) || InParameters->Get("FSR.cameraNear", ¶ms.cameraNear) != NVSDK_NGX_Result_Success) { if (IsDepthInverted()) - params.cameraFar = Config::Instance()->FsrCameraNear.value_or(10.0f); + params.cameraFar = Config::Instance()->FsrCameraNear.value_or(0.1f); else - params.cameraNear = Config::Instance()->FsrCameraNear.value_or(10.0f); + params.cameraNear = Config::Instance()->FsrCameraNear.value_or(0.1f); } if (!Config::Instance()->FsrUseFsrInputValues.value_or(true) || InParameters->Get("FSR.cameraFar", ¶ms.cameraFar) != NVSDK_NGX_Result_Success) diff --git a/OptiScaler/backends/fsr31/FSR31Feature_Vk.cpp b/OptiScaler/backends/fsr31/FSR31Feature_Vk.cpp index d68dac19..9480d9bf 100644 --- a/OptiScaler/backends/fsr31/FSR31Feature_Vk.cpp +++ b/OptiScaler/backends/fsr31/FSR31Feature_Vk.cpp @@ -427,13 +427,13 @@ bool FSR31FeatureVk::Evaluate(VkCommandBuffer InCmdBuffer, NVSDK_NGX_Parameter* if (IsDepthInverted()) { - params.cameraFar = Config::Instance()->FsrCameraNear.value_or(10.0f); + params.cameraFar = Config::Instance()->FsrCameraNear.value_or(0.1f); params.cameraNear = Config::Instance()->FsrCameraFar.value_or(100000.0f); } else { params.cameraFar = Config::Instance()->FsrCameraFar.value_or(100000.0f); - params.cameraNear = Config::Instance()->FsrCameraNear.value_or(10.0f); + params.cameraNear = Config::Instance()->FsrCameraNear.value_or(0.1f); } if (Config::Instance()->FsrVerticalFov.has_value()) diff --git a/OptiScaler/imgui/imgui_common.cpp b/OptiScaler/imgui/imgui_common.cpp index 95a44ec8..575d55a3 100644 --- a/OptiScaler/imgui/imgui_common.cpp +++ b/OptiScaler/imgui/imgui_common.cpp @@ -1350,7 +1350,7 @@ void ImGuiCommon::RenderMenu() float cameraNear; float cameraFar; - cameraNear = Config::Instance()->FsrCameraNear.value_or(10.0f); + cameraNear = Config::Instance()->FsrCameraNear.value_or(0.1f); cameraFar = Config::Instance()->FsrCameraFar.value_or(100000.0f); if (ImGui::SliderFloat("Camera Near", &cameraNear, 0.1f, 500000.0f, "%.1f", ImGuiSliderFlags_NoRoundToFormat))