From 884ca840715346a5a5a1117da316b8c022ca5a9d Mon Sep 17 00:00:00 2001 From: Nico de Poel Date: Mon, 24 Mar 2025 16:43:32 +0100 Subject: [PATCH] Moved unorm and globallycoherent definitions to the common cginc, rather than stuffing them somewhere in between all the types --- .../Effects/Upscaling/ASR/Shaders/ffxm_fsr2_common.cginc | 3 +++ .../Effects/Upscaling/ASR/Shaders/shaders/ffxm_common_types.h | 3 --- 2 files changed, 3 insertions(+), 3 deletions(-) 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 index 8b8a686..b7143ef 100644 --- 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 diff --git 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 index be29d6c..bdef206 100644 --- 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