From 8d289fdfa729690b9e2207e410ae4abaee8d5085 Mon Sep 17 00:00:00 2001 From: Nico de Poel Date: Mon, 5 Aug 2024 17:44:40 +0200 Subject: [PATCH] Renamed ffx_fsr_unity_common include file to ffx_unity_common, so it can be more generally used for all sorts of FidelityFX shaders. --- Shaders/ffx_fsr2_accumulate_pass.compute | 2 +- Shaders/ffx_fsr2_autogen_reactive_pass.compute | 2 +- Shaders/ffx_fsr2_compute_luminance_pyramid_pass.compute | 2 +- Shaders/ffx_fsr2_depth_clip_pass.compute | 2 +- Shaders/ffx_fsr2_lock_pass.compute | 2 +- Shaders/ffx_fsr2_rcas_pass.compute | 2 +- Shaders/ffx_fsr2_reconstruct_previous_depth_pass.compute | 2 +- Shaders/ffx_fsr2_tcr_autogen_pass.compute | 2 +- Shaders/ffx_fsr3upscaler_accumulate_pass.compute | 2 +- Shaders/ffx_fsr3upscaler_autogen_reactive_pass.compute | 2 +- Shaders/ffx_fsr3upscaler_debug_view_pass.compute | 2 +- Shaders/ffx_fsr3upscaler_luma_instability_pass.compute | 2 +- Shaders/ffx_fsr3upscaler_luma_pyramid_pass.compute | 2 +- Shaders/ffx_fsr3upscaler_prepare_inputs_pass.compute | 2 +- Shaders/ffx_fsr3upscaler_prepare_reactivity_pass.compute | 2 +- Shaders/ffx_fsr3upscaler_rcas_pass.compute | 2 +- Shaders/ffx_fsr3upscaler_shading_change_pass.compute | 2 +- Shaders/ffx_fsr3upscaler_shading_change_pyramid_pass.compute | 2 +- Shaders/ffx_fsr3upscaler_tcr_autogen_pass.compute | 2 +- Shaders/{ffx_fsr_unity_common.cginc => ffx_unity_common.cginc} | 0 ..._fsr_unity_common.cginc.meta => ffx_unity_common.cginc.meta} | 0 21 files changed, 19 insertions(+), 19 deletions(-) rename Shaders/{ffx_fsr_unity_common.cginc => ffx_unity_common.cginc} (100%) rename Shaders/{ffx_fsr_unity_common.cginc.meta => ffx_unity_common.cginc.meta} (100%) diff --git a/Shaders/ffx_fsr2_accumulate_pass.compute b/Shaders/ffx_fsr2_accumulate_pass.compute index 63532d7..34a29c4 100644 --- a/Shaders/ffx_fsr2_accumulate_pass.compute +++ b/Shaders/ffx_fsr2_accumulate_pass.compute @@ -30,7 +30,7 @@ #pragma multi_compile __ UNITY_FSR_TEXTURE2D_X_ARRAY -#include "ffx_fsr_unity_common.cginc" +#include "ffx_unity_common.cginc" // Ensure the correct value is defined for this keyword, as it is used to select one of multiple sampler functions #ifdef FFX_FSR2_OPTION_REPROJECT_USE_LANCZOS_TYPE diff --git a/Shaders/ffx_fsr2_autogen_reactive_pass.compute b/Shaders/ffx_fsr2_autogen_reactive_pass.compute index 6bc2301..9ec77c5 100644 --- a/Shaders/ffx_fsr2_autogen_reactive_pass.compute +++ b/Shaders/ffx_fsr2_autogen_reactive_pass.compute @@ -27,6 +27,6 @@ #pragma multi_compile __ UNITY_FSR_TEXTURE2D_X_ARRAY -#include "ffx_fsr_unity_common.cginc" +#include "ffx_unity_common.cginc" #include "shaders/ffx_fsr2_autogen_reactive_pass.hlsl" diff --git a/Shaders/ffx_fsr2_compute_luminance_pyramid_pass.compute b/Shaders/ffx_fsr2_compute_luminance_pyramid_pass.compute index 7058cc5..b3559e1 100644 --- a/Shaders/ffx_fsr2_compute_luminance_pyramid_pass.compute +++ b/Shaders/ffx_fsr2_compute_luminance_pyramid_pass.compute @@ -27,7 +27,7 @@ #pragma multi_compile __ UNITY_FSR_TEXTURE2D_X_ARRAY -#include "ffx_fsr_unity_common.cginc" +#include "ffx_unity_common.cginc" // Wave operations require shader model 6.0; this can only be enabled when using DXC on D3D12 // These pragmas are commented out by default as Unity will sometimes ignore the #if's and try to enable these features anyway. diff --git a/Shaders/ffx_fsr2_depth_clip_pass.compute b/Shaders/ffx_fsr2_depth_clip_pass.compute index 582ca6b..d5ce2bf 100644 --- a/Shaders/ffx_fsr2_depth_clip_pass.compute +++ b/Shaders/ffx_fsr2_depth_clip_pass.compute @@ -27,6 +27,6 @@ #pragma multi_compile __ UNITY_FSR_TEXTURE2D_X_ARRAY -#include "ffx_fsr_unity_common.cginc" +#include "ffx_unity_common.cginc" #include "shaders/ffx_fsr2_depth_clip_pass.hlsl" diff --git a/Shaders/ffx_fsr2_lock_pass.compute b/Shaders/ffx_fsr2_lock_pass.compute index fb12d2c..eb584fb 100644 --- a/Shaders/ffx_fsr2_lock_pass.compute +++ b/Shaders/ffx_fsr2_lock_pass.compute @@ -27,6 +27,6 @@ #pragma multi_compile __ UNITY_FSR_TEXTURE2D_X_ARRAY -#include "ffx_fsr_unity_common.cginc" +#include "ffx_unity_common.cginc" #include "shaders/ffx_fsr2_lock_pass.hlsl" diff --git a/Shaders/ffx_fsr2_rcas_pass.compute b/Shaders/ffx_fsr2_rcas_pass.compute index e6ac7df..36f827d 100644 --- a/Shaders/ffx_fsr2_rcas_pass.compute +++ b/Shaders/ffx_fsr2_rcas_pass.compute @@ -26,6 +26,6 @@ #pragma multi_compile __ UNITY_FSR_TEXTURE2D_X_ARRAY -#include "ffx_fsr_unity_common.cginc" +#include "ffx_unity_common.cginc" #include "shaders/ffx_fsr2_rcas_pass.hlsl" diff --git a/Shaders/ffx_fsr2_reconstruct_previous_depth_pass.compute b/Shaders/ffx_fsr2_reconstruct_previous_depth_pass.compute index 12f2ec3..644adc8 100644 --- a/Shaders/ffx_fsr2_reconstruct_previous_depth_pass.compute +++ b/Shaders/ffx_fsr2_reconstruct_previous_depth_pass.compute @@ -28,6 +28,6 @@ #pragma multi_compile __ UNITY_FSR_TEXTURE2D_X_ARRAY -#include "ffx_fsr_unity_common.cginc" +#include "ffx_unity_common.cginc" #include "shaders/ffx_fsr2_reconstruct_previous_depth_pass.hlsl" diff --git a/Shaders/ffx_fsr2_tcr_autogen_pass.compute b/Shaders/ffx_fsr2_tcr_autogen_pass.compute index 5d2668a..53a0833 100644 --- a/Shaders/ffx_fsr2_tcr_autogen_pass.compute +++ b/Shaders/ffx_fsr2_tcr_autogen_pass.compute @@ -27,6 +27,6 @@ #pragma multi_compile __ UNITY_FSR_TEXTURE2D_X_ARRAY -#include "ffx_fsr_unity_common.cginc" +#include "ffx_unity_common.cginc" #include "shaders/ffx_fsr2_tcr_autogen_pass.hlsl" diff --git a/Shaders/ffx_fsr3upscaler_accumulate_pass.compute b/Shaders/ffx_fsr3upscaler_accumulate_pass.compute index a8d6864..c599a5b 100644 --- a/Shaders/ffx_fsr3upscaler_accumulate_pass.compute +++ b/Shaders/ffx_fsr3upscaler_accumulate_pass.compute @@ -28,7 +28,7 @@ #pragma multi_compile __ UNITY_FSR_TEXTURE2D_X_ARRAY -#include "ffx_fsr_unity_common.cginc" +#include "ffx_unity_common.cginc" // Ensure the correct value is defined for this keyword, as it is used to select one of multiple sampler functions #ifdef FFX_FSR3UPSCALER_OPTION_REPROJECT_USE_LANCZOS_TYPE diff --git a/Shaders/ffx_fsr3upscaler_autogen_reactive_pass.compute b/Shaders/ffx_fsr3upscaler_autogen_reactive_pass.compute index 500352a..79c5604 100644 --- a/Shaders/ffx_fsr3upscaler_autogen_reactive_pass.compute +++ b/Shaders/ffx_fsr3upscaler_autogen_reactive_pass.compute @@ -24,6 +24,6 @@ #pragma multi_compile __ UNITY_FSR_TEXTURE2D_X_ARRAY -#include "ffx_fsr_unity_common.cginc" +#include "ffx_unity_common.cginc" #include "shaders/ffx_fsr3upscaler_autogen_reactive_pass.hlsl" diff --git a/Shaders/ffx_fsr3upscaler_debug_view_pass.compute b/Shaders/ffx_fsr3upscaler_debug_view_pass.compute index 027e414..2eecb3b 100644 --- a/Shaders/ffx_fsr3upscaler_debug_view_pass.compute +++ b/Shaders/ffx_fsr3upscaler_debug_view_pass.compute @@ -24,6 +24,6 @@ #pragma multi_compile __ UNITY_FSR_TEXTURE2D_X_ARRAY -#include "ffx_fsr_unity_common.cginc" +#include "ffx_unity_common.cginc" #include "shaders/ffx_fsr3upscaler_debug_view_pass.hlsl" diff --git a/Shaders/ffx_fsr3upscaler_luma_instability_pass.compute b/Shaders/ffx_fsr3upscaler_luma_instability_pass.compute index 5cffc66..450f8ba 100644 --- a/Shaders/ffx_fsr3upscaler_luma_instability_pass.compute +++ b/Shaders/ffx_fsr3upscaler_luma_instability_pass.compute @@ -24,6 +24,6 @@ #pragma multi_compile __ UNITY_FSR_TEXTURE2D_X_ARRAY -#include "ffx_fsr_unity_common.cginc" +#include "ffx_unity_common.cginc" #include "shaders/ffx_fsr3upscaler_luma_instability_pass.hlsl" diff --git a/Shaders/ffx_fsr3upscaler_luma_pyramid_pass.compute b/Shaders/ffx_fsr3upscaler_luma_pyramid_pass.compute index 347b0d6..7f3249c 100644 --- a/Shaders/ffx_fsr3upscaler_luma_pyramid_pass.compute +++ b/Shaders/ffx_fsr3upscaler_luma_pyramid_pass.compute @@ -24,7 +24,7 @@ #pragma multi_compile __ UNITY_FSR_TEXTURE2D_X_ARRAY -#include "ffx_fsr_unity_common.cginc" +#include "ffx_unity_common.cginc" // Wave operations require shader model 6.0; this can only be enabled when using DXC on D3D12 // These pragmas are commented out by default as Unity will sometimes ignore the #if's and try to enable these features anyway. diff --git a/Shaders/ffx_fsr3upscaler_prepare_inputs_pass.compute b/Shaders/ffx_fsr3upscaler_prepare_inputs_pass.compute index b71ea5d..60db3d2 100644 --- a/Shaders/ffx_fsr3upscaler_prepare_inputs_pass.compute +++ b/Shaders/ffx_fsr3upscaler_prepare_inputs_pass.compute @@ -26,6 +26,6 @@ #pragma multi_compile __ UNITY_FSR_TEXTURE2D_X_ARRAY -#include "ffx_fsr_unity_common.cginc" +#include "ffx_unity_common.cginc" #include "shaders/ffx_fsr3upscaler_prepare_inputs_pass.hlsl" diff --git a/Shaders/ffx_fsr3upscaler_prepare_reactivity_pass.compute b/Shaders/ffx_fsr3upscaler_prepare_reactivity_pass.compute index ebf4e91..9388c8d 100644 --- a/Shaders/ffx_fsr3upscaler_prepare_reactivity_pass.compute +++ b/Shaders/ffx_fsr3upscaler_prepare_reactivity_pass.compute @@ -24,6 +24,6 @@ #pragma multi_compile __ UNITY_FSR_TEXTURE2D_X_ARRAY -#include "ffx_fsr_unity_common.cginc" +#include "ffx_unity_common.cginc" #include "shaders/ffx_fsr3upscaler_prepare_reactivity_pass.hlsl" diff --git a/Shaders/ffx_fsr3upscaler_rcas_pass.compute b/Shaders/ffx_fsr3upscaler_rcas_pass.compute index 282a9ae..a34842c 100644 --- a/Shaders/ffx_fsr3upscaler_rcas_pass.compute +++ b/Shaders/ffx_fsr3upscaler_rcas_pass.compute @@ -22,6 +22,6 @@ #pragma multi_compile __ UNITY_FSR_TEXTURE2D_X_ARRAY -#include "ffx_fsr_unity_common.cginc" +#include "ffx_unity_common.cginc" #include "shaders/ffx_fsr3upscaler_rcas_pass.hlsl" diff --git a/Shaders/ffx_fsr3upscaler_shading_change_pass.compute b/Shaders/ffx_fsr3upscaler_shading_change_pass.compute index 34c3ade..bd54e34 100644 --- a/Shaders/ffx_fsr3upscaler_shading_change_pass.compute +++ b/Shaders/ffx_fsr3upscaler_shading_change_pass.compute @@ -24,6 +24,6 @@ #pragma multi_compile __ UNITY_FSR_TEXTURE2D_X_ARRAY -#include "ffx_fsr_unity_common.cginc" +#include "ffx_unity_common.cginc" #include "shaders/ffx_fsr3upscaler_shading_change_pass.hlsl" diff --git a/Shaders/ffx_fsr3upscaler_shading_change_pyramid_pass.compute b/Shaders/ffx_fsr3upscaler_shading_change_pyramid_pass.compute index ffe5bfe..3a8c865 100644 --- a/Shaders/ffx_fsr3upscaler_shading_change_pyramid_pass.compute +++ b/Shaders/ffx_fsr3upscaler_shading_change_pyramid_pass.compute @@ -24,7 +24,7 @@ #pragma multi_compile __ UNITY_FSR_TEXTURE2D_X_ARRAY -#include "ffx_fsr_unity_common.cginc" +#include "ffx_unity_common.cginc" // Wave operations require shader model 6.0; this can only be enabled when using DXC on D3D12 #define FFX_SPD_NO_WAVE_OPERATIONS diff --git a/Shaders/ffx_fsr3upscaler_tcr_autogen_pass.compute b/Shaders/ffx_fsr3upscaler_tcr_autogen_pass.compute index 952c052..e18265e 100644 --- a/Shaders/ffx_fsr3upscaler_tcr_autogen_pass.compute +++ b/Shaders/ffx_fsr3upscaler_tcr_autogen_pass.compute @@ -25,6 +25,6 @@ #pragma multi_compile __ UNITY_FSR_TEXTURE2D_X_ARRAY -#include "ffx_fsr_unity_common.cginc" +#include "ffx_unity_common.cginc" #include "shaders/ffx_fsr3upscaler_tcr_autogen_pass.hlsl" diff --git a/Shaders/ffx_fsr_unity_common.cginc b/Shaders/ffx_unity_common.cginc similarity index 100% rename from Shaders/ffx_fsr_unity_common.cginc rename to Shaders/ffx_unity_common.cginc diff --git a/Shaders/ffx_fsr_unity_common.cginc.meta b/Shaders/ffx_unity_common.cginc.meta similarity index 100% rename from Shaders/ffx_fsr_unity_common.cginc.meta rename to Shaders/ffx_unity_common.cginc.meta