From c0cf3de36435b9da744652fdd78f2057dcc89ed2 Mon Sep 17 00:00:00 2001 From: Nico de Poel Date: Mon, 24 Mar 2025 11:22:26 +0100 Subject: [PATCH] Temporarily disable FP16 altogether, which makes PSSL shader compilation a lot happier. Need to figure out how to make the FP16 utility function definitions work without the shader compiler complaining about duplicate declarations. --- .../ffxm_fsr2_compute_luminance_pyramid_pass.compute | 2 +- .../Effects/Upscaling/ASR/Shaders/ffxm_fsr2_fs.shader | 8 ++++---- .../Upscaling/ASR/Shaders/ffxm_fsr2_lock_pass.compute | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Packages/com.unity.postprocessing@3.2.2/PostProcessing/Runtime/Effects/Upscaling/ASR/Shaders/ffxm_fsr2_compute_luminance_pyramid_pass.compute b/Packages/com.unity.postprocessing@3.2.2/PostProcessing/Runtime/Effects/Upscaling/ASR/Shaders/ffxm_fsr2_compute_luminance_pyramid_pass.compute index 5d4044b..34e0436 100644 --- a/Packages/com.unity.postprocessing@3.2.2/PostProcessing/Runtime/Effects/Upscaling/ASR/Shaders/ffxm_fsr2_compute_luminance_pyramid_pass.compute +++ b/Packages/com.unity.postprocessing@3.2.2/PostProcessing/Runtime/Effects/Upscaling/ASR/Shaders/ffxm_fsr2_compute_luminance_pyramid_pass.compute @@ -1,6 +1,6 @@ #pragma kernel main -#pragma multi_compile __ FFXM_HALF +//#pragma multi_compile __ FFXM_HALF #pragma multi_compile __ FFXM_FSR2_OPTION_LOW_RESOLUTION_MOTION_VECTORS #pragma multi_compile __ FFXM_FSR2_OPTION_JITTERED_MOTION_VECTORS #pragma multi_compile __ FFXM_FSR2_OPTION_INVERTED_DEPTH 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 5be5aae..ce41e15 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 @@ -14,7 +14,7 @@ Shader "TND/ASR/ffx_fsr2_fs" #pragma target 4.5 //#pragma enable_d3d11_debug_symbols - #pragma multi_compile __ FFXM_HALF + //#pragma multi_compile __ FFXM_HALF #pragma multi_compile __ UNITY_FFXM_TEXTURE2D_X_ARRAY #include "ffxm_fsr2_common.cginc" @@ -34,7 +34,7 @@ Shader "TND/ASR/ffx_fsr2_fs" #pragma target 4.5 //#pragma enable_d3d11_debug_symbols - #pragma multi_compile __ FFXM_HALF + //#pragma multi_compile __ FFXM_HALF #pragma multi_compile __ FFXM_FSR2_OPTION_HDR_COLOR_INPUT #pragma multi_compile __ FFXM_FSR2_OPTION_LOW_RESOLUTION_MOTION_VECTORS #pragma multi_compile __ FFXM_FSR2_OPTION_JITTERED_MOTION_VECTORS @@ -58,7 +58,7 @@ Shader "TND/ASR/ffx_fsr2_fs" #pragma target 4.5 //#pragma enable_d3d11_debug_symbols - #pragma multi_compile __ FFXM_HALF + //#pragma multi_compile __ FFXM_HALF #pragma multi_compile __ FFXM_FSR2_OPTION_SHADER_OPT_BALANCED #pragma multi_compile __ FFXM_FSR2_OPTION_SHADER_OPT_PERFORMANCE #pragma multi_compile __ FFXM_FSR2_OPTION_LOW_RESOLUTION_MOTION_VECTORS @@ -83,7 +83,7 @@ Shader "TND/ASR/ffx_fsr2_fs" #pragma target 4.5 //#pragma enable_d3d11_debug_symbols - #pragma multi_compile __ FFXM_HALF + //#pragma multi_compile __ FFXM_HALF #pragma multi_compile __ FFXM_FSR2_OPTION_SHADER_OPT_BALANCED #pragma multi_compile __ FFXM_FSR2_OPTION_SHADER_OPT_PERFORMANCE #pragma multi_compile __ FFXM_FSR2_OPTION_REPROJECT_USE_LANCZOS_TYPE diff --git a/Packages/com.unity.postprocessing@3.2.2/PostProcessing/Runtime/Effects/Upscaling/ASR/Shaders/ffxm_fsr2_lock_pass.compute b/Packages/com.unity.postprocessing@3.2.2/PostProcessing/Runtime/Effects/Upscaling/ASR/Shaders/ffxm_fsr2_lock_pass.compute index 660b922..c4c47e5 100644 --- a/Packages/com.unity.postprocessing@3.2.2/PostProcessing/Runtime/Effects/Upscaling/ASR/Shaders/ffxm_fsr2_lock_pass.compute +++ b/Packages/com.unity.postprocessing@3.2.2/PostProcessing/Runtime/Effects/Upscaling/ASR/Shaders/ffxm_fsr2_lock_pass.compute @@ -1,6 +1,6 @@ #pragma kernel main -#pragma multi_compile __ FFXM_HALF +//#pragma multi_compile __ FFXM_HALF #pragma multi_compile __ FFXM_FSR2_OPTION_LOW_RESOLUTION_MOTION_VECTORS #pragma multi_compile __ FFXM_FSR2_OPTION_JITTERED_MOTION_VECTORS #pragma multi_compile __ FFXM_FSR2_OPTION_INVERTED_DEPTH