Moved SetupDeviceDepthToViewSpaceDepthParams to the common FfxUtils class

Runtime/Common/FfxUtils.cs

@@ -58,6 +58,36 @@ namespace FidelityFX
             return lanczos2Weights;
         }
         
+        public static Vector4 SetupDeviceDepthToViewSpaceDepthParams(Vector2Int renderSize, float cameraNear, float cameraFar, float cameraFovAngleVertical, bool inverted, bool infinite)
+        {
+            // make sure it has no impact if near and far plane values are swapped in dispatch params
+            // the flags "inverted" and "infinite" will decide what transform to use
+            float min = Mathf.Min(cameraNear, cameraFar);
+            float max = Mathf.Max(cameraNear, cameraFar);
+
+            if (inverted)
+            {
+                (min, max) = (max, min);
+            }
+
+            float q = max / (min - max);
+            float d = -1.0f;
+
+            Vector4 matrixElemC = new Vector4(q, -1.0f - Mathf.Epsilon, q, 0.0f + Mathf.Epsilon);
+            Vector4 matrixElemE = new Vector4(q * min, -min - Mathf.Epsilon, q * min, max);
+            
+            // Revert x and y coords
+            float aspect = (float)renderSize.x / renderSize.y;
+            float cotHalfFovY = Mathf.Cos(0.5f * cameraFovAngleVertical) / Mathf.Sin(0.5f * cameraFovAngleVertical);
+
+            int matrixIndex = (inverted ? 2 : 0) + (infinite ? 1 : 0);
+            return new Vector4(
+                d * matrixElemC[matrixIndex],
+                matrixElemE[matrixIndex],
+                aspect / cotHalfFovY,
+                1.0f / cotHalfFovY);
+        }
+        
 #if !UNITY_2021_1_OR_NEWER
         internal static void SetBufferData(this CommandBuffer commandBuffer, ComputeBuffer computeBuffer, Array data)
         {

Runtime/FSR2/Fsr2Context.cs

@@ -320,7 +320,10 @@ namespace FidelityFX.FSR2
             constants.viewSpaceToMetersFactor = (dispatchParams.ViewSpaceToMetersFactor > 0.0f) ? dispatchParams.ViewSpaceToMetersFactor : 1.0f;
 
             // Compute params to enable device depth to view space depth computation in shader
-            constants.deviceToViewDepth = SetupDeviceDepthToViewSpaceDepthParams(dispatchParams);
+            bool inverted = (_contextDescription.Flags & Fsr2.InitializationFlags.EnableDepthInverted) != 0;
+            bool infinite = (_contextDescription.Flags & Fsr2.InitializationFlags.EnableDepthInfinite) != 0;
+            constants.deviceToViewDepth = FfxUtils.SetupDeviceDepthToViewSpaceDepthParams(
+                dispatchParams.RenderSize, dispatchParams.CameraNear, dispatchParams.CameraFar, dispatchParams.CameraFovAngleVertical, inverted, infinite);
             
             // To be updated if resource is larger than the actual image size
             constants.downscaleFactor = new Vector2((float)constants.renderSize.x / _contextDescription.DisplaySize.x, (float)constants.renderSize.y / _contextDescription.DisplaySize.y);
@@ -367,39 +370,6 @@ namespace FidelityFX.FSR2
             constants.lumaMipDimensions.x = (int)(constants.maxRenderSize.x / mipDiv);
             constants.lumaMipDimensions.y = (int)(constants.maxRenderSize.y / mipDiv);
         }
-        
-        private Vector4 SetupDeviceDepthToViewSpaceDepthParams(Fsr2.DispatchDescription dispatchParams)
-        {
-            bool inverted = (_contextDescription.Flags & Fsr2.InitializationFlags.EnableDepthInverted) != 0;
-            bool infinite = (_contextDescription.Flags & Fsr2.InitializationFlags.EnableDepthInfinite) != 0;
-
-            // make sure it has no impact if near and far plane values are swapped in dispatch params
-            // the flags "inverted" and "infinite" will decide what transform to use
-            float min = Mathf.Min(dispatchParams.CameraNear, dispatchParams.CameraFar);
-            float max = Mathf.Max(dispatchParams.CameraNear, dispatchParams.CameraFar);
-
-            if (inverted)
-            {
-                (min, max) = (max, min);
-            }
-
-            float q = max / (min - max);
-            float d = -1.0f;
-
-            Vector4 matrixElemC = new Vector4(q, -1.0f - Mathf.Epsilon, q, 0.0f + Mathf.Epsilon);
-            Vector4 matrixElemE = new Vector4(q * min, -min - Mathf.Epsilon, q * min, max);
-            
-            // Revert x and y coords
-            float aspect = (float)dispatchParams.RenderSize.x / dispatchParams.RenderSize.y;
-            float cotHalfFovY = Mathf.Cos(0.5f * dispatchParams.CameraFovAngleVertical) / Mathf.Sin(0.5f * dispatchParams.CameraFovAngleVertical);
-
-            int matrixIndex = (inverted ? 2 : 0) + (infinite ? 1 : 0);
-            return new Vector4(
-                d * matrixElemC[matrixIndex],
-                matrixElemE[matrixIndex],
-                aspect / cotHalfFovY,
-                1.0f / cotHalfFovY);
-        }
 
         private void SetupRcasConstants(Fsr2.DispatchDescription dispatchParams)
         {

Runtime/FSR3/Fsr3UpscalerContext.cs

@@ -346,7 +346,10 @@ namespace FidelityFX.FSR3
             constants.viewSpaceToMetersFactor = (dispatchParams.ViewSpaceToMetersFactor > 0.0f) ? dispatchParams.ViewSpaceToMetersFactor : 1.0f;
 
             // Compute params to enable device depth to view space depth computation in shader
-            constants.deviceToViewDepth = SetupDeviceDepthToViewSpaceDepthParams(dispatchParams);
+            bool inverted = (_contextDescription.Flags & Fsr3Upscaler.InitializationFlags.EnableDepthInverted) != 0;
+            bool infinite = (_contextDescription.Flags & Fsr3Upscaler.InitializationFlags.EnableDepthInfinite) != 0;
+            constants.deviceToViewDepth = FfxUtils.SetupDeviceDepthToViewSpaceDepthParams(
+                dispatchParams.RenderSize, dispatchParams.CameraNear, dispatchParams.CameraFar, dispatchParams.CameraFovAngleVertical, inverted, infinite);
 
             constants.previousFrameUpscaleSize = constants.upscaleSize;
             if (dispatchParams.UpscaleSize.x == 0 && dispatchParams.UpscaleSize.y == 0)
@@ -404,39 +407,6 @@ namespace FidelityFX.FSR3
             else
                 constants.frameIndex += 1.0f;
         }
-        
-        private Vector4 SetupDeviceDepthToViewSpaceDepthParams(Fsr3Upscaler.DispatchDescription dispatchParams)
-        {
-            bool inverted = (_contextDescription.Flags & Fsr3Upscaler.InitializationFlags.EnableDepthInverted) != 0;
-            bool infinite = (_contextDescription.Flags & Fsr3Upscaler.InitializationFlags.EnableDepthInfinite) != 0;
-
-            // make sure it has no impact if near and far plane values are swapped in dispatch params
-            // the flags "inverted" and "infinite" will decide what transform to use
-            float min = Mathf.Min(dispatchParams.CameraNear, dispatchParams.CameraFar);
-            float max = Mathf.Max(dispatchParams.CameraNear, dispatchParams.CameraFar);
-
-            if (inverted)
-            {
-                (min, max) = (max, min);
-            }
-
-            float q = max / (min - max);
-            float d = -1.0f;
-
-            Vector4 matrixElemC = new Vector4(q, -1.0f - Mathf.Epsilon, q, 0.0f + Mathf.Epsilon);
-            Vector4 matrixElemE = new Vector4(q * min, -min - Mathf.Epsilon, q * min, max);
-            
-            // Revert x and y coords
-            float aspect = (float)dispatchParams.RenderSize.x / dispatchParams.RenderSize.y;
-            float cotHalfFovY = Mathf.Cos(0.5f * dispatchParams.CameraFovAngleVertical) / Mathf.Sin(0.5f * dispatchParams.CameraFovAngleVertical);
-
-            int matrixIndex = (inverted ? 2 : 0) + (infinite ? 1 : 0);
-            return new Vector4(
-                d * matrixElemC[matrixIndex],
-                matrixElemE[matrixIndex],
-                aspect / cotHalfFovY,
-                1.0f / cotHalfFovY);
-        }
 
         private void SetupRcasConstants(Fsr3Upscaler.DispatchDescription dispatchParams)
         {