From 1551a3ccf803b8505a21cd133e60e5218b87fcc9 Mon Sep 17 00:00:00 2001 From: Nico de Poel Date: Wed, 19 Mar 2025 20:04:23 +0100 Subject: [PATCH] Added the remaining vertex/fragment shader passes and made the same modifications to get them to compile --- .../ASR/Shaders/ffxm_fsr2_common.cginc | 1 + .../ASR/Shaders/ffxm_fsr2_common.cginc.meta | 3 + .../Upscaling/ASR/Shaders/ffxm_fsr2_fs.shader | 73 ++++++++++++++++++- .../ffxm_fsr2_autogen_reactive_pass_fs.hlsl | 5 -- .../shaders/ffxm_fsr2_depth_clip_pass_fs.hlsl | 6 -- .../shaders/ffxm_fsr2_rcas_pass_fs.hlsl | 5 -- ...r2_reconstruct_previous_depth_pass_fs.hlsl | 5 -- .../ASR/Shaders/shaders/fsr2/ffxm_fsr2_rcas.h | 4 +- 8 files changed, 77 insertions(+), 25 deletions(-) create mode 100644 Packages/com.unity.postprocessing@3.2.2/PostProcessing/Runtime/Effects/Upscaling/ASR/Shaders/ffxm_fsr2_common.cginc create mode 100644 Packages/com.unity.postprocessing@3.2.2/PostProcessing/Runtime/Effects/Upscaling/ASR/Shaders/ffxm_fsr2_common.cginc.meta diff --git a/Packages/com.unity.postprocessing@3.2.2/PostProcessing/Runtime/Effects/Upscaling/ASR/Shaders/ffxm_fsr2_common.cginc b/Packages/com.unity.postprocessing@3.2.2/PostProcessing/Runtime/Effects/Upscaling/ASR/Shaders/ffxm_fsr2_common.cginc new file mode 100644 index 0000000..5f28270 --- /dev/null +++ b/Packages/com.unity.postprocessing@3.2.2/PostProcessing/Runtime/Effects/Upscaling/ASR/Shaders/ffxm_fsr2_common.cginc @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/Packages/com.unity.postprocessing@3.2.2/PostProcessing/Runtime/Effects/Upscaling/ASR/Shaders/ffxm_fsr2_common.cginc.meta b/Packages/com.unity.postprocessing@3.2.2/PostProcessing/Runtime/Effects/Upscaling/ASR/Shaders/ffxm_fsr2_common.cginc.meta new file mode 100644 index 0000000..2bfbafa --- /dev/null +++ b/Packages/com.unity.postprocessing@3.2.2/PostProcessing/Runtime/Effects/Upscaling/ASR/Shaders/ffxm_fsr2_common.cginc.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 6836bc2e151d44e0bd1991fd7bfaee30 +timeCreated: 1742410813 \ No newline at end of file diff --git a/Packages/com.unity.postprocessing@3.2.2/PostProcessing/Runtime/Effects/Upscaling/ASR/Shaders/ffxm_fsr2_fs.shader b/Packages/com.unity.postprocessing@3.2.2/PostProcessing/Runtime/Effects/Upscaling/ASR/Shaders/ffxm_fsr2_fs.shader index 615bdae..4e1e847 100644 --- a/Packages/com.unity.postprocessing@3.2.2/PostProcessing/Runtime/Effects/Upscaling/ASR/Shaders/ffxm_fsr2_fs.shader +++ b/Packages/com.unity.postprocessing@3.2.2/PostProcessing/Runtime/Effects/Upscaling/ASR/Shaders/ffxm_fsr2_fs.shader @@ -4,7 +4,58 @@ Shader "TND/ASR/ffx_fsr2_fs" { Cull Off ZWrite Off ZTest Always - Pass + Pass // 0 + { + Name "Auto-Generate Reactive Mask" + + HLSLPROGRAM + #pragma vertex VertMain + #pragma fragment main + #pragma target 4.5 + //#pragma enable_d3d11_debug_symbols + + #include "ffxm_fsr2_common.cginc" + #include "shaders/ffxm_fsr2_vs.hlsl" + #include "shaders/ffxm_fsr2_autogen_reactive_pass_fs.hlsl" + + ENDHLSL + } + + Pass // 1 + { + Name "Reconstruct Previous Depth" + + HLSLPROGRAM + #pragma vertex VertMain + #pragma fragment main + #pragma target 4.5 + //#pragma enable_d3d11_debug_symbols + + #include "ffxm_fsr2_common.cginc" + #include "shaders/ffxm_fsr2_vs.hlsl" + #include "shaders/ffxm_fsr2_reconstruct_previous_depth_pass_fs.hlsl" + + ENDHLSL + } + + Pass // 2 + { + Name "Depth Clip" + + HLSLPROGRAM + #pragma vertex VertMain + #pragma fragment main + #pragma target 4.5 + //#pragma enable_d3d11_debug_symbols + + #include "ffxm_fsr2_common.cginc" + #include "shaders/ffxm_fsr2_vs.hlsl" + #include "shaders/ffxm_fsr2_depth_clip_pass_fs.hlsl" + + ENDHLSL + } + + Pass // 3 { Name "Accumulate" @@ -12,12 +63,30 @@ Shader "TND/ASR/ffx_fsr2_fs" #pragma vertex VertMain #pragma fragment main #pragma target 4.5 - #pragma enable_d3d11_debug_symbols + //#pragma enable_d3d11_debug_symbols + #include "ffxm_fsr2_common.cginc" #include "shaders/ffxm_fsr2_vs.hlsl" #include "shaders/ffxm_fsr2_accumulate_pass_fs.hlsl" ENDHLSL } + + Pass // 4 + { + Name "Sharpen" + + HLSLPROGRAM + #pragma vertex VertMain + #pragma fragment main + #pragma target 4.5 + //#pragma enable_d3d11_debug_symbols + + #include "ffxm_fsr2_common.cginc" + #include "shaders/ffxm_fsr2_vs.hlsl" + #include "shaders/ffxm_fsr2_rcas_pass_fs.hlsl" + + ENDHLSL + } } } diff --git a/Packages/com.unity.postprocessing@3.2.2/PostProcessing/Runtime/Effects/Upscaling/ASR/Shaders/shaders/ffxm_fsr2_autogen_reactive_pass_fs.hlsl b/Packages/com.unity.postprocessing@3.2.2/PostProcessing/Runtime/Effects/Upscaling/ASR/Shaders/shaders/ffxm_fsr2_autogen_reactive_pass_fs.hlsl index 1f1472f..124c73c 100644 --- a/Packages/com.unity.postprocessing@3.2.2/PostProcessing/Runtime/Effects/Upscaling/ASR/Shaders/shaders/ffxm_fsr2_autogen_reactive_pass_fs.hlsl +++ b/Packages/com.unity.postprocessing@3.2.2/PostProcessing/Runtime/Effects/Upscaling/ASR/Shaders/shaders/ffxm_fsr2_autogen_reactive_pass_fs.hlsl @@ -44,11 +44,6 @@ struct GenReactiveMaskOutputs FfxFloat32 fReactiveMask : SV_TARGET0; }; -struct VertexOut -{ - float4 position : SV_POSITION; -}; - GenReactiveMaskOutputs main(float4 SvPosition : SV_POSITION) { uint2 uPixelCoord = uint2(SvPosition.xy); diff --git a/Packages/com.unity.postprocessing@3.2.2/PostProcessing/Runtime/Effects/Upscaling/ASR/Shaders/shaders/ffxm_fsr2_depth_clip_pass_fs.hlsl b/Packages/com.unity.postprocessing@3.2.2/PostProcessing/Runtime/Effects/Upscaling/ASR/Shaders/shaders/ffxm_fsr2_depth_clip_pass_fs.hlsl index bd3723a..de93855 100644 --- a/Packages/com.unity.postprocessing@3.2.2/PostProcessing/Runtime/Effects/Upscaling/ASR/Shaders/shaders/ffxm_fsr2_depth_clip_pass_fs.hlsl +++ b/Packages/com.unity.postprocessing@3.2.2/PostProcessing/Runtime/Effects/Upscaling/ASR/Shaders/shaders/ffxm_fsr2_depth_clip_pass_fs.hlsl @@ -48,12 +48,6 @@ #include "fsr2/ffxm_fsr2_sample.h" #include "fsr2/ffxm_fsr2_depth_clip.h" -struct VertexOut -{ - float4 position : SV_POSITION; -}; - - struct DepthClipOutputsFS { FfxFloat32x2 fDilatedReactiveMasks : SV_TARGET0; diff --git a/Packages/com.unity.postprocessing@3.2.2/PostProcessing/Runtime/Effects/Upscaling/ASR/Shaders/shaders/ffxm_fsr2_rcas_pass_fs.hlsl b/Packages/com.unity.postprocessing@3.2.2/PostProcessing/Runtime/Effects/Upscaling/ASR/Shaders/shaders/ffxm_fsr2_rcas_pass_fs.hlsl index ad49951..95d6c61 100644 --- a/Packages/com.unity.postprocessing@3.2.2/PostProcessing/Runtime/Effects/Upscaling/ASR/Shaders/shaders/ffxm_fsr2_rcas_pass_fs.hlsl +++ b/Packages/com.unity.postprocessing@3.2.2/PostProcessing/Runtime/Effects/Upscaling/ASR/Shaders/shaders/ffxm_fsr2_rcas_pass_fs.hlsl @@ -40,11 +40,6 @@ #include "fsr2/ffxm_fsr2_common.h" #include "fsr2/ffxm_fsr2_rcas.h" -struct VertexOut -{ - float4 position : SV_POSITION; -}; - struct RCASOutputsFS { FfxFloat32x3 fUpscaledColor : SV_TARGET0; diff --git a/Packages/com.unity.postprocessing@3.2.2/PostProcessing/Runtime/Effects/Upscaling/ASR/Shaders/shaders/ffxm_fsr2_reconstruct_previous_depth_pass_fs.hlsl b/Packages/com.unity.postprocessing@3.2.2/PostProcessing/Runtime/Effects/Upscaling/ASR/Shaders/shaders/ffxm_fsr2_reconstruct_previous_depth_pass_fs.hlsl index ef0a1b8..5a71c68 100644 --- a/Packages/com.unity.postprocessing@3.2.2/PostProcessing/Runtime/Effects/Upscaling/ASR/Shaders/shaders/ffxm_fsr2_reconstruct_previous_depth_pass_fs.hlsl +++ b/Packages/com.unity.postprocessing@3.2.2/PostProcessing/Runtime/Effects/Upscaling/ASR/Shaders/shaders/ffxm_fsr2_reconstruct_previous_depth_pass_fs.hlsl @@ -44,11 +44,6 @@ #include "fsr2/ffxm_fsr2_sample.h" #include "fsr2/ffxm_fsr2_reconstruct_dilated_velocity_and_previous_depth.h" -struct VertexOut -{ - float4 position : SV_POSITION; -}; - struct ReconstructPrevDepthOutputsFS { FfxFloat32 fDepth : SV_TARGET0; diff --git a/Packages/com.unity.postprocessing@3.2.2/PostProcessing/Runtime/Effects/Upscaling/ASR/Shaders/shaders/fsr2/ffxm_fsr2_rcas.h b/Packages/com.unity.postprocessing@3.2.2/PostProcessing/Runtime/Effects/Upscaling/ASR/Shaders/shaders/fsr2/ffxm_fsr2_rcas.h index d60784b..a0c5e5f 100644 --- a/Packages/com.unity.postprocessing@3.2.2/PostProcessing/Runtime/Effects/Upscaling/ASR/Shaders/shaders/fsr2/ffxm_fsr2_rcas.h +++ b/Packages/com.unity.postprocessing@3.2.2/PostProcessing/Runtime/Effects/Upscaling/ASR/Shaders/shaders/fsr2/ffxm_fsr2_rcas.h @@ -22,7 +22,7 @@ #define GROUP_SIZE 8 #define FSR_RCAS_DENOISE 1 -#include "./ffxm_core.h" +#include "../ffxm_core.h" struct RCASOutputs { @@ -61,7 +61,7 @@ FfxFloat32x4 FsrRcasLoadF(FfxInt32x2 p) void FsrRcasInputF(inout FfxFloat32 r, inout FfxFloat32 g, inout FfxFloat32 b) {} #endif -#include "./fsr1/ffxm_fsr1.h" +#include "../fsr1/ffxm_fsr1.h" void CurrFilter(FFXM_MIN16_U2 pos, FFXM_PARAMETER_INOUT RCASOutputs results) {