From bfd5c30f7f49cccefb9eebfa8312ea4d787cbb08 Mon Sep 17 00:00:00 2001 From: cdozdil Date: Sat, 14 Nov 2026 01:42:27 +0300 Subject: [PATCH] Don't crop the FSR reactive mask with the bias mask's subrect --- OptiScaler/upscalers/ffx/FFXFeature_Dx12.cpp | 1 - OptiScaler/upscalers/ffx/FFXFeature_Vk.cpp | 5 +++-- OptiScaler/upscalers/fsr2/FSR2Feature_Dx12.cpp | 1 - OptiScaler/upscalers/fsr2/FSR2Feature_Vk.cpp | 5 +++-- OptiScaler/upscalers/fsr2_212/FSR2Feature_Dx12_212.cpp | 1 - OptiScaler/upscalers/fsr2_212/FSR2Feature_Vk_212.cpp | 5 +++-- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/OptiScaler/upscalers/ffx/FFXFeature_Dx12.cpp b/OptiScaler/upscalers/ffx/FFXFeature_Dx12.cpp index 3a526c81..5cb974e9 100644 --- a/OptiScaler/upscalers/ffx/FFXFeature_Dx12.cpp +++ b/OptiScaler/upscalers/ffx/FFXFeature_Dx12.cpp @@ -266,7 +266,6 @@ bool FFXFeatureDx12::EvaluateInternal(ID3D12GraphicsCommandList* InCommandList, ForwardBarrier(InCommandList, paramReactiveMask, (D3D12_RESOURCE_STATES) barrier.value(), D3D12_RESOURCE_STATE_NON_PIXEL_SHADER_RESOURCE); - paramReactiveMask = SubrectInput(InCommandList, paramReactiveMask, SubrectSlot::Mask); params.reactive = ffxApiGetResourceDX12(paramReactiveMask, FFX_API_RESOURCE_STATE_COMPUTE_READ); } else diff --git a/OptiScaler/upscalers/ffx/FFXFeature_Vk.cpp b/OptiScaler/upscalers/ffx/FFXFeature_Vk.cpp index d09a7c47..b3c9afe9 100644 --- a/OptiScaler/upscalers/ffx/FFXFeature_Vk.cpp +++ b/OptiScaler/upscalers/ffx/FFXFeature_Vk.cpp @@ -435,12 +435,13 @@ bool FFXFeatureVk::EvaluateInternal(VkCommandBuffer InCmdBuffer, NVSDK_NGX_Param NVSDK_NGX_Resource_VK* paramReactiveMask = nullptr; InParameters->Get("FSR.reactive", (void**) ¶mReactiveMask); - paramReactiveMask = SubrectInput(InCmdBuffer, MaskInput(paramReactiveMask), SubrectSlot::Mask); + // The DLSS subrect base is for the bias mask, not for the FSR mask + paramReactiveMask = MaskInput(paramReactiveMask); NVSDK_NGX_Resource_VK* paramReactiveMask2 = nullptr; InParameters->Get(NVSDK_NGX_Parameter_DLSS_Input_Bias_Current_Color_Mask, (void**) ¶mReactiveMask2); - // Used only without the FSR mask, they share the copy + // Used only without the FSR mask if (paramReactiveMask == nullptr) paramReactiveMask2 = SubrectInput(InCmdBuffer, MaskInput(paramReactiveMask2), SubrectSlot::Mask); diff --git a/OptiScaler/upscalers/fsr2/FSR2Feature_Dx12.cpp b/OptiScaler/upscalers/fsr2/FSR2Feature_Dx12.cpp index 106c5668..ea53a7bc 100644 --- a/OptiScaler/upscalers/fsr2/FSR2Feature_Dx12.cpp +++ b/OptiScaler/upscalers/fsr2/FSR2Feature_Dx12.cpp @@ -201,7 +201,6 @@ bool FSR2FeatureDx12::EvaluateInternal(ID3D12GraphicsCommandList* InCommandList, ForwardBarrier(InCommandList, paramReactiveMask, (D3D12_RESOURCE_STATES) barrier.value(), D3D12_RESOURCE_STATE_NON_PIXEL_SHADER_RESOURCE); - paramReactiveMask = SubrectInput(InCommandList, paramReactiveMask, SubrectSlot::Mask); params.reactive = ffxGetResourceDX12(&_context, paramReactiveMask, (wchar_t*) L"FSR2_Reactive", FFX_RESOURCE_STATE_COMPUTE_READ); } diff --git a/OptiScaler/upscalers/fsr2/FSR2Feature_Vk.cpp b/OptiScaler/upscalers/fsr2/FSR2Feature_Vk.cpp index bc2a5287..0ca7ec38 100644 --- a/OptiScaler/upscalers/fsr2/FSR2Feature_Vk.cpp +++ b/OptiScaler/upscalers/fsr2/FSR2Feature_Vk.cpp @@ -282,12 +282,13 @@ bool FSR2FeatureVk::EvaluateInternal(VkCommandBuffer InCmdBuffer, NVSDK_NGX_Para NVSDK_NGX_Resource_VK* paramReactiveMask = nullptr; InParameters->Get("FSR.reactive", (void**) ¶mReactiveMask); - paramReactiveMask = SubrectInput(InCmdBuffer, MaskInput(paramReactiveMask), SubrectSlot::Mask); + // The DLSS subrect base is for the bias mask, not for the FSR mask + paramReactiveMask = MaskInput(paramReactiveMask); NVSDK_NGX_Resource_VK* paramReactiveMask2 = nullptr; InParameters->Get(NVSDK_NGX_Parameter_DLSS_Input_Bias_Current_Color_Mask, (void**) ¶mReactiveMask2); - // Used only without the FSR mask, they share the copy + // Used only without the FSR mask if (paramReactiveMask == nullptr) paramReactiveMask2 = SubrectInput(InCmdBuffer, MaskInput(paramReactiveMask2), SubrectSlot::Mask); diff --git a/OptiScaler/upscalers/fsr2_212/FSR2Feature_Dx12_212.cpp b/OptiScaler/upscalers/fsr2_212/FSR2Feature_Dx12_212.cpp index dec1dffa..5b3b83d3 100644 --- a/OptiScaler/upscalers/fsr2_212/FSR2Feature_Dx12_212.cpp +++ b/OptiScaler/upscalers/fsr2_212/FSR2Feature_Dx12_212.cpp @@ -211,7 +211,6 @@ bool FSR2FeatureDx12_212::EvaluateInternal(ID3D12GraphicsCommandList* InCommandL ForwardBarrier(InCommandList, paramReactiveMask, (D3D12_RESOURCE_STATES) barrier.value(), D3D12_RESOURCE_STATE_NON_PIXEL_SHADER_RESOURCE); - paramReactiveMask = SubrectInput(InCommandList, paramReactiveMask, SubrectSlot::Mask); params.reactive = Fsr212::ffxGetResourceDX12_212(&_context, paramReactiveMask, (wchar_t*) L"FSR2_Reactive", Fsr212::FFX_RESOURCE_STATE_COMPUTE_READ); } diff --git a/OptiScaler/upscalers/fsr2_212/FSR2Feature_Vk_212.cpp b/OptiScaler/upscalers/fsr2_212/FSR2Feature_Vk_212.cpp index f9f58222..a37e6b99 100644 --- a/OptiScaler/upscalers/fsr2_212/FSR2Feature_Vk_212.cpp +++ b/OptiScaler/upscalers/fsr2_212/FSR2Feature_Vk_212.cpp @@ -309,12 +309,13 @@ bool FSR2FeatureVk212::EvaluateInternal(VkCommandBuffer InCmdBuffer, NVSDK_NGX_P NVSDK_NGX_Resource_VK* paramReactiveMask = nullptr; InParameters->Get("FSR.reactive", (void**) ¶mReactiveMask); - paramReactiveMask = SubrectInput(InCmdBuffer, MaskInput(paramReactiveMask), SubrectSlot::Mask); + // The DLSS subrect base is for the bias mask, not for the FSR mask + paramReactiveMask = MaskInput(paramReactiveMask); NVSDK_NGX_Resource_VK* paramReactiveMask2 = nullptr; InParameters->Get(NVSDK_NGX_Parameter_DLSS_Input_Bias_Current_Color_Mask, (void**) ¶mReactiveMask2); - // Used only without the FSR mask, they share the copy + // Used only without the FSR mask if (paramReactiveMask == nullptr) paramReactiveMask2 = SubrectInput(InCmdBuffer, MaskInput(paramReactiveMask2), SubrectSlot::Mask);