Post-merge cleanups

Author: robbiesri

PostProcessing/Runtime/Effects/Bloom.cs

@@ -105,7 +105,7 @@ public override void Render(PostProcessRenderContext context)
             pyramidDesc.height = Mathf.FloorToInt(pyramidDesc.height / (2f - rh));
 
             // Determine the iteration count
-            int s = Mathf.Max((Mathf.FloorToInt(context.singleEyeWidth / (2f - rw))), (Mathf.FloorToInt(context.height / (2f - rh))));
+            int s = Mathf.Max((Mathf.FloorToInt(context.xrSingleEyeWidth / (2f - rw))), (Mathf.FloorToInt(context.height / (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.singleEyeWidth / (float)context.height;
+            var screenRatio = (float)context.xrSingleEyeWidth / (float)context.height;
             var dirtTileOffset = new Vector4(1f, 1f, 0f, 0f);
 
             if (dirtRatio > screenRatio)

PostProcessing/Runtime/Effects/DepthOfField.cs

@@ -132,7 +132,7 @@ 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.singleEyeWidth / (float)context.height; // TODO: this might change if we get rid of singleEyeWidth
+            var aspect = (float)context.xrSingleEyeWidth / (float)context.height; // TODO: this might change if we get rid of singleEyeWidth
             var coeff = f * f / (settings.aperture.value * (s1 - f) * k_FilmHeight * 2);
             var maxCoC = CalculateMaxCoCRadius(context.height);
 

PostProcessing/Runtime/Effects/Dithering.cs

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

PostProcessing/Runtime/PostProcessRenderContext.cs

@@ -49,7 +49,7 @@ public Camera camera
                     m_sourceDescriptor.height = height;
 
                     xrSingleEyeWidth = width;
-                    // TODO: fill in single eye height
+                    xrSingleEyeHeight = height;
                 }
             }
         }