mirror of
https://github.com/optiscaler/OptiScaler.git
synced 2026-11-22 13:47:11 +00:00
Don't crop the FSR reactive mask with the bias mask's subrect
This commit is contained in:
1 parent
dacfdd1b8e
commit
bfd5c30f7f
6 files changed
+9
-9
No files matched your search
@@ -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
|
||||
|
||||
@@ -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);
|
||||
|
||||
|
||||
@@ -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);
|
||||
}
|
||||
|
||||
@@ -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);
|
||||
|
||||
|
||||
@@ -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);
|
||||
}
|
||||
|
||||
@@ -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);
|
||||
|
||||
|
||||
Reference in new issue
Block a user