Create and use screen w/h props in PostProcessRenderContext

There is a difference between the logical w/h of a screen and the texture size being allocated.  So I started to formalize the difference with the addition of the screen size tracking.

Author: robbiesri

PostProcessing/Runtime/Effects/Bloom.cs

@@ -104,7 +104,7 @@ public override void Render(PostProcessRenderContext context)
             int th = context.height / 2;
 
             // Determine the iteration count
-            int s = Mathf.Max((Mathf.FloorToInt(context.xrSingleEyeWidth / (2f - rw))), (Mathf.FloorToInt(context.height / (2f - rh))));
+            int s = Mathf.Max((Mathf.FloorToInt(context.screenWidth / (2f - rw))), (Mathf.FloorToInt(context.screenHeight / (2f - rh))));
             float logs = Mathf.Log(s, 2f) + Mathf.Min(settings.diffusion.value, 10f) - 10f;
             int logs_i = Mathf.FloorToInt(logs);
             int iterations = Mathf.Clamp(logs_i, 1, k_MaxPyramidSize);
@@ -173,7 +173,7 @@ public override void Render(PostProcessRenderContext context)
                 : settings.dirtTexture.value;
 
             var dirtRatio = (float)dirtTexture.width / (float)dirtTexture.height;
-            var screenRatio = (float)context.xrSingleEyeWidth / (float)context.height;
+            var screenRatio = (float)context.screenWidth / (float)context.screenHeight;
             var dirtTileOffset = new Vector4(1f, 1f, 0f, 0f);
 
             if (dirtRatio > screenRatio)

PostProcessing/Runtime/Effects/DepthOfField.cs

@@ -128,9 +128,9 @@ public override void Render(PostProcessRenderContext context)
             // Material setup
             var f = settings.focalLength.value / 1000f;
             var s1 = Mathf.Max(settings.focusDistance.value, f);
-            var aspect = (float)context.xrSingleEyeWidth / (float)context.height; // TODO: this might change if we get rid of singleEyeWidth
+            var aspect = (float)context.screenWidth / (float)context.screenHeight;
             var coeff = f * f / (settings.aperture.value * (s1 - f) * k_FilmHeight * 2);
-            var maxCoC = CalculateMaxCoCRadius(context.height);
+            var maxCoC = CalculateMaxCoCRadius(context.screenHeight);
 
             var sheet = context.propertySheets.Get(context.resources.shaders.depthOfField);
             sheet.properties.Clear();

PostProcessing/Runtime/Effects/Dithering.cs

@@ -30,8 +30,8 @@ internal void Render(PostProcessRenderContext context)
 
             uberSheet.properties.SetTexture(ShaderIDs.DitheringTex, noiseTex);
             uberSheet.properties.SetVector(ShaderIDs.Dithering_Coords, new Vector4(
-                (float)context.xrSingleEyeWidth / (float)noiseTex.width,
-                (float)context.height / (float)noiseTex.height,
+                (float)context.screenWidth / (float)noiseTex.width,
+                (float)context.screenHeight / (float)noiseTex.height,
                 rndOffsetX,
                 rndOffsetY
             ));

PostProcessing/Runtime/Effects/TemporalAntialiasing.cs

@@ -130,7 +130,7 @@ public void ConfigureStereoJitteredProjectionMatrices(PostProcessRenderContext c
 
             // jitter has to be scaled for the actual eye texture size, not just the intermediate texture size
             // which could be double-wide in certain stereo rendering scenarios
-            jitter = new Vector2(jitter.x / context.xrSingleEyeWidth, jitter.y / context.height);
+            jitter = new Vector2(jitter.x / context.screenWidth, jitter.y / context.screenHeight);
             camera.useJitteredProjectionMatrixForTransparentRendering = false;
 #endif
         }

PostProcessing/Runtime/PostProcessRenderContext.cs

@@ -43,8 +43,8 @@ public Camera camera
                     if (camera.stereoActiveEye == Camera.MonoOrStereoscopicEye.Right)
                         xrActiveEye = (int)Camera.StereoscopicEye.Right;
 
-                    xrSingleEyeWidth = XRSettings.eyeTextureWidth;
-                    xrSingleEyeHeight = XRSettings.eyeTextureHeight;
+                    screenWidth = XRSettings.eyeTextureWidth;
+                    screenHeight = XRSettings.eyeTextureHeight;
                 }
                 else
                 {
@@ -55,8 +55,8 @@ public Camera camera
                     m_sourceDescriptor.width = width;
                     m_sourceDescriptor.height = height;
 #endif
-                    xrSingleEyeWidth = width;
-                    xrSingleEyeHeight = height;
+                    screenWidth = width;
+                    screenHeight = height;
                 }
             }
         }
@@ -102,6 +102,9 @@ public Camera camera
         // Current camera height in pixels
         public int height { get; private set; }
 
+        // TODO: Change w/h name to texture w/h in order to make
+        // size usages explicit
+
 #if UNITY_2017_2_OR_NEWER
         private RenderTextureDescriptor m_sourceDescriptor;
         private RenderTextureDescriptor GetDescriptor(int depthBufferBits = 0, RenderTextureFormat colorFormat = RenderTextureFormat.Default, RenderTextureReadWrite readWrite = RenderTextureReadWrite.Default)
@@ -179,11 +182,10 @@ public RenderTexture GetScreenSpaceTemporaryRT(int depthBufferBits = 0, RenderTe
         // Current active rendering eye (for XR)
         public int xrActiveEye { get; private set; }
 
-        // Current single eye width in pixels (for XR)
-        public int xrSingleEyeWidth { get; private set; }
+        // Pixel dimensions of logical screen size
+        public int screenWidth { get; private set; }
 
-        // Current single eye height in pixels (for XR)
-        public int xrSingleEyeHeight { get; private set; }
+        public int screenHeight { get; private set; }
 
         // Are we currently rendering in the scene view?
         public bool isSceneView { get; internal set; }
@@ -206,8 +208,8 @@ public void Reset()
 #endif
 
             xrActiveEye = (int)Camera.StereoscopicEye.Left;
-            xrSingleEyeWidth = 0;
-            xrSingleEyeHeight = 0;
+            screenWidth = 0;
+            screenHeight = 0;
 
             command = null;
             source = 0;

PostProcessing/Runtime/Utils/RuntimeUtilities.cs

@@ -425,8 +425,8 @@ public static Matrix4x4 GenerateJitteredProjectionMatrixFromOriginal(PostProcess
             float vertFov = Math.Abs(planes.top) + Math.Abs(planes.bottom);
             float horizFov = Math.Abs(planes.left) + Math.Abs(planes.right);
 
-            var planeJitter = new Vector2(jitter.x * horizFov / context.xrSingleEyeWidth,
-                                          jitter.y * vertFov / context.height);
+            var planeJitter = new Vector2(jitter.x * horizFov / context.screenWidth,
+                                          jitter.y * vertFov / context.screenHeight);
 
             planes.left += planeJitter.x;
             planes.right += planeJitter.x;