diff --git a/extern/Streamline-DX12 b/extern/Streamline-DX12 index 3e78b8f4ce..b998246a3d 160000 --- a/extern/Streamline-DX12 +++ b/extern/Streamline-DX12 @@ -1 +1 @@ -Subproject commit 3e78b8f4cecf4b7d83a58e9398f1edb192c74aae +Subproject commit b998246a3d499c08765c5681b229c9e6b4513348 diff --git a/src/Features/Upscaling/Streamline.cpp b/src/Features/Upscaling/Streamline.cpp index 4cc2184804..5264d7cdab 100644 --- a/src/Features/Upscaling/Streamline.cpp +++ b/src/Features/Upscaling/Streamline.cpp @@ -317,12 +317,10 @@ void Streamline::Upscale(ID3D11Resource* a_upscalingTexture, ID3D11Resource* a_r sl::ResourceTag depthTag = sl::ResourceTag{ &depth, sl::kBufferTypeDepth, sl::ResourceLifecycle::eValidUntilPresent, &lowResExtent }; sl::ResourceTag mvecTag = sl::ResourceTag{ &mvec, sl::kBufferTypeMotionVectors, sl::ResourceLifecycle::eValidUntilPresent, &lowResExtent }; - bool needsMask = a_preset != sl::DLSSPreset::ePresetA && a_preset != sl::DLSSPreset::ePresetB; - - sl::Resource reactiveMask = { sl::ResourceType::eTex2d, needsMask ? a_reactiveMask : nullptr, 0 }; + sl::Resource reactiveMask = { sl::ResourceType::eTex2d, a_reactiveMask, 0 }; sl::ResourceTag reactiveMaskTag = sl::ResourceTag{ &reactiveMask, sl::kBufferTypeBiasCurrentColorHint, sl::ResourceLifecycle::eValidUntilPresent, &lowResExtent }; - sl::Resource transparencyCompositionMask = { sl::ResourceType::eTex2d, needsMask ? a_transparencyCompositionMask : nullptr, 0 }; + sl::Resource transparencyCompositionMask = { sl::ResourceType::eTex2d, a_transparencyCompositionMask, 0 }; sl::ResourceTag transparencyCompositionMaskTag = sl::ResourceTag{ &transparencyCompositionMask, sl::kBufferTypeTransparencyHint, sl::ResourceLifecycle::eValidUntilPresent, &lowResExtent }; sl::ResourceTag resourceTags[] = { colorInTag, colorOutTag, depthTag, mvecTag, reactiveMaskTag, transparencyCompositionMaskTag };