Browse Source

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.

asr-console
Nico de Poel 10 months ago
parent
commit
c0cf3de364
  1. 2
      Packages/com.unity.postprocessing@3.2.2/PostProcessing/Runtime/Effects/Upscaling/ASR/Shaders/ffxm_fsr2_compute_luminance_pyramid_pass.compute
  2. 8
      Packages/com.unity.postprocessing@3.2.2/PostProcessing/Runtime/Effects/Upscaling/ASR/Shaders/ffxm_fsr2_fs.shader
  3. 2
      Packages/com.unity.postprocessing@3.2.2/PostProcessing/Runtime/Effects/Upscaling/ASR/Shaders/ffxm_fsr2_lock_pass.compute

2
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 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_LOW_RESOLUTION_MOTION_VECTORS
#pragma multi_compile __ FFXM_FSR2_OPTION_JITTERED_MOTION_VECTORS #pragma multi_compile __ FFXM_FSR2_OPTION_JITTERED_MOTION_VECTORS
#pragma multi_compile __ FFXM_FSR2_OPTION_INVERTED_DEPTH #pragma multi_compile __ FFXM_FSR2_OPTION_INVERTED_DEPTH

8
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 target 4.5
//#pragma enable_d3d11_debug_symbols //#pragma enable_d3d11_debug_symbols
#pragma multi_compile __ FFXM_HALF
//#pragma multi_compile __ FFXM_HALF
#pragma multi_compile __ UNITY_FFXM_TEXTURE2D_X_ARRAY #pragma multi_compile __ UNITY_FFXM_TEXTURE2D_X_ARRAY
#include "ffxm_fsr2_common.cginc" #include "ffxm_fsr2_common.cginc"
@ -34,7 +34,7 @@ Shader "TND/ASR/ffx_fsr2_fs"
#pragma target 4.5 #pragma target 4.5
//#pragma enable_d3d11_debug_symbols //#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_HDR_COLOR_INPUT
#pragma multi_compile __ FFXM_FSR2_OPTION_LOW_RESOLUTION_MOTION_VECTORS #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_JITTERED_MOTION_VECTORS
@ -58,7 +58,7 @@ Shader "TND/ASR/ffx_fsr2_fs"
#pragma target 4.5 #pragma target 4.5
//#pragma enable_d3d11_debug_symbols //#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_BALANCED
#pragma multi_compile __ FFXM_FSR2_OPTION_SHADER_OPT_PERFORMANCE #pragma multi_compile __ FFXM_FSR2_OPTION_SHADER_OPT_PERFORMANCE
#pragma multi_compile __ FFXM_FSR2_OPTION_LOW_RESOLUTION_MOTION_VECTORS #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 target 4.5
//#pragma enable_d3d11_debug_symbols //#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_BALANCED
#pragma multi_compile __ FFXM_FSR2_OPTION_SHADER_OPT_PERFORMANCE #pragma multi_compile __ FFXM_FSR2_OPTION_SHADER_OPT_PERFORMANCE
#pragma multi_compile __ FFXM_FSR2_OPTION_REPROJECT_USE_LANCZOS_TYPE #pragma multi_compile __ FFXM_FSR2_OPTION_REPROJECT_USE_LANCZOS_TYPE

2
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 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_LOW_RESOLUTION_MOTION_VECTORS
#pragma multi_compile __ FFXM_FSR2_OPTION_JITTERED_MOTION_VECTORS #pragma multi_compile __ FFXM_FSR2_OPTION_JITTERED_MOTION_VECTORS
#pragma multi_compile __ FFXM_FSR2_OPTION_INVERTED_DEPTH #pragma multi_compile __ FFXM_FSR2_OPTION_INVERTED_DEPTH

Loading…
Cancel
Save