Moved unorm and globallycoherent definitions to the common cginc, rather than stuffing them somewhere in between all the types

10 months ago · 884ca84071
2 changed files with 3 additions and 3 deletions
--- 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
@ -39,6 +39,7 @@
 #define InterlockedMax(dest, val)           { (dest) = max((dest), (val)); }
 #endif

+// PSSL uses different semantics and doesn't support certain type qualifiers 
 #if defined(SHADER_API_PSSL)
 #define SV_VERTEXID                 S_VERTEX_ID
 #define SV_POSITION                 S_POSITION
@ -46,4 +47,6 @@
 #define SV_TARGET1                  S_TARGET_OUTPUT1
 #define SV_TARGET2                  S_TARGET_OUTPUT2
 #define SV_TARGET3                  S_TARGET_OUTPUT3
+#define unorm
+#define globallycoherent
 #endif
--- a/Packages/com.unity.postprocessing@3.2.2/PostProcessing/Runtime/Effects/Upscaling/ASR/Shaders/shaders/ffxm_common_types.h
+++ b/Packages/com.unity.postprocessing@3.2.2/PostProcessing/Runtime/Effects/Upscaling/ASR/Shaders/shaders/ffxm_common_types.h
@ -472,9 +472,6 @@ typedef FfxUInt32x4     Prefix##_U4;

 #if defined(SHADER_API_PSSL)

-#define unorm
-#define globallycoherent
-
 #if FFX_HALF

 #define  FFXM_MIN16_F  half