Updated TemporalAA and STP to work with CoreCLR

Author: jrs-unity

Packages/com.unity.render-pipelines.universal/Runtime/Passes/PostProcess/StpPostProcessPass.cs

@@ -12,6 +12,7 @@ internal sealed class StpPostProcessPass : PostProcessPass
         public const string k_UpscaledColorTargetName = "CameraColorUpscaledSTP";
         Texture2D[] m_BlueNoise16LTex;
         bool m_IsValid;
+        uint m_WarnCounter;
 
         public StpPostProcessPass(Texture2D[] blueNoise16LTex)
         {
@@ -20,6 +21,8 @@ public StpPostProcessPass(Texture2D[] blueNoise16LTex)
             m_BlueNoise16LTex = blueNoise16LTex;
 
             m_IsValid = m_BlueNoise16LTex != null && m_BlueNoise16LTex.Length > 0;
+
+            m_WarnCounter = 0;
         }
 
         public override void Dispose()
@@ -52,7 +55,7 @@ public override void RecordRenderGraph(RenderGraph renderGraph, ContextContainer
             {
                 // Warn users if TAA and STP are disabled despite being requested
                 if (cameraData.IsTemporalAARequested())
-                    TemporalAA.ValidateAndWarn(cameraData, isSTPRequested);
+                    TemporalAA.ValidateAndWarn(cameraData, ref m_WarnCounter, isSTPRequested);
                 return;
             }
 

Packages/com.unity.render-pipelines.universal/Runtime/Passes/PostProcess/TemporalAntiAliasingPostProcessPass.cs

@@ -10,6 +10,7 @@ internal sealed class TemporalAntiAliasingPostProcessPass : PostProcessPass
 
         Material m_Material;
         bool m_IsValid;
+        uint m_WarnCounter;
 
         public TemporalAntiAliasingPostProcessPass(Shader shader)
         {
@@ -18,6 +19,8 @@ public TemporalAntiAliasingPostProcessPass(Shader shader)
 
             m_Material = PostProcessUtils.LoadShader(shader, passName);
             m_IsValid = m_Material != null;
+
+            m_WarnCounter = 0;
         }
 
         public override void Dispose()
@@ -49,7 +52,7 @@ public override void RecordRenderGraph(RenderGraph renderGraph, ContextContainer
             {
                 // Warn users if TAA is disabled despite being requested
                 if (cameraData.IsTemporalAARequested())
-                    TemporalAA.ValidateAndWarn(cameraData, false);
+                    TemporalAA.ValidateAndWarn(cameraData, ref m_WarnCounter, false);
                 return;
             }
 

Packages/com.unity.render-pipelines.universal/Runtime/StpUtils.cs

@@ -113,7 +113,7 @@ static void PopulateStpConfig(UniversalCameraData cameraData, in TextureHandle i
             config.perViewConfigs = STP.perViewConfigs;
         }
 
-        static internal void Execute(RenderGraph renderGraph, UniversalResourceData resourceData, UniversalCameraData cameraData, in TextureHandle inputColor, in TextureHandle inputDepth, in TextureHandle inputMotion, in TextureHandle destination, Texture2D noiseTexture)
+        internal static void Execute(RenderGraph renderGraph, UniversalResourceData resourceData, UniversalCameraData cameraData, in TextureHandle inputColor, in TextureHandle inputDepth, in TextureHandle inputMotion, in TextureHandle destination, Texture2D noiseTexture)
         {
             var debugView = TextureHandle.nullHandle;
             int debugViewIndex = 0;
@@ -141,5 +141,13 @@ static internal void Execute(RenderGraph renderGraph, UniversalResourceData reso
             PopulateStpConfig(cameraData, inputColor, inputDepth, inputMotion, debugViewIndex, debugView, destination, noiseTexture, out var config);
             STP.Execute(renderGraph, ref config);
         }
+
+#if UNITY_EDITOR
+        [RuntimeInitializeOnLoadMethod(RuntimeInitializeLoadType.SubsystemRegistration)]
+        static void ResetStaticsOnLoad()
+        {
+            s_JitterFunc = CalculateJitter;
+        }
+#endif
     }
 }

Packages/com.unity.render-pipelines.universal/Runtime/TemporalAA.cs

@@ -291,7 +291,7 @@ internal static float[] CalculateFilterWeights(ref Settings settings)
             return taaFilterWeights;
         }
 
-        internal static GraphicsFormat[] AccumulationFormatList = new GraphicsFormat[]
+        internal static readonly GraphicsFormat[] AccumulationFormatList = new GraphicsFormat[]
         {
             GraphicsFormat.R16G16B16A16_SFloat,
             GraphicsFormat.B10G11R11_UFloatPack32,
@@ -335,9 +335,7 @@ internal static RenderTextureDescriptor TemporalAADescFromCameraDesc(ref RenderT
             return taaDesc;
         }
 
-        static uint s_warnCounter = 0;
-
-        internal static string ValidateAndWarn(UniversalCameraData cameraData, bool isSTPRequested = false)
+        internal static string ValidateAndWarn(UniversalCameraData cameraData, ref uint warnCounter, bool isSTPRequested = false)
         {
             string reasonWarning = null;
 
@@ -375,9 +373,13 @@ internal static string ValidateAndWarn(UniversalCameraData cameraData, bool isST
             if (reasonWarning != null)
             {
                 const int warningThrottleFrames = 60 * 1; // 60 FPS * 1 sec
-                if (s_warnCounter % warningThrottleFrames == 0)
+                if (warnCounter % warningThrottleFrames == 0)
                     Debug.LogWarning("Disabling TAA " + (isSTPRequested ? "and STP " : "") + reasonWarning);
-                s_warnCounter++;
+
+                unchecked
+                {
+                    warnCounter++;
+                }
             }
 
             return reasonWarning;
@@ -529,5 +531,13 @@ internal static void Render(RenderGraph renderGraph, Material taaMaterial, Unive
                 cameraData.taaHistory.SetAccumulationVersion(multipassId, Time.frameCount);
             }
         }
+
+#if UNITY_EDITOR
+        [RuntimeInitializeOnLoadMethod(RuntimeInitializeLoadType.SubsystemRegistration)]
+        static void ResetStaticsOnLoad()
+        {
+            s_JitterFunc = CalculateJitter;
+        }
+#endif
     }
 }