[HDRP] Disable DoF for orthographic cameras #6124

pmavridis · sebastienlagarde · commit 3e73de6fb990 · 2021-11-07T18:06:21.000+01:00
diff --git a/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/LinuxEditor/Vulkan/None/4070_PhysicalCamera-iso-aperture-shutter.png b/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/LinuxEditor/Vulkan/None/4070_PhysicalCamera-iso-aperture-shutter.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:15e1a7e24080a9b240ff34f5c499e96f936ff26861f398dd03cfe2a30d3aa1eb
-size 750675
+oid sha256:6985ef1b65bd74aed42a01cb229fe4c68b21d97cddb9235006bd9c811932651b
+size 710994
diff --git a/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/LinuxEditor/Vulkan/None/4071_PhysicalCamera-Aperture-bladeCount.png b/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/LinuxEditor/Vulkan/None/4071_PhysicalCamera-Aperture-bladeCount.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:17f635d7127bffab8f5c3fd9bf0b4ff7a59236eb53c690dd564fe76d3f94cbf4
-size 230953
+oid sha256:e9d10e9bd3794b6f52d704f69264d406390b60d1c231c05ad7f97c52f83b717e
+size 214734
diff --git a/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/LinuxEditor/Vulkan/None/4072_PhysicalCamera-Aperture-curvature.png b/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/LinuxEditor/Vulkan/None/4072_PhysicalCamera-Aperture-curvature.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d146404962711bb96e8317e2e9fee266f79eebf15ab5c1ed87e431b3c01717b9
-size 231751
+oid sha256:bca9d5c19458a487f3efbc1b68c903e81b60d88089fc1cb2af78a2cfccf49a00
+size 214339
diff --git a/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/LinuxEditor/Vulkan/None/4073_PhysicalCamera-Aperture-barrelClipping.png b/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/LinuxEditor/Vulkan/None/4073_PhysicalCamera-Aperture-barrelClipping.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:be445a97dfc8cbe69061739871664c6134e759cc894fed467e0a5d515271ebea
-size 262852
+oid sha256:3ba4bd56163595c3b45fdaeefbbc537435bf7f6cdae0dd6a762856ea5b312774
+size 247072
diff --git a/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/LinuxEditor/Vulkan/None/4074_PhysicalCamera-Aperture-anamorphism.png b/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/LinuxEditor/Vulkan/None/4074_PhysicalCamera-Aperture-anamorphism.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:91a45391838307be8a812dfcd8d41e924585d501ed8339c387d40b9d0dd96c84
-size 404896
+oid sha256:8c5d6bb570db0989d4ccfae4b9339017454c0e447ff4223a586a839380c934b1
+size 336026
diff --git a/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/OSXEditor/Metal/None/4070_PhysicalCamera-iso-aperture-shutter.png b/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/OSXEditor/Metal/None/4070_PhysicalCamera-iso-aperture-shutter.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9939be65dd6fdac2e73a471e5ac303ea438f877d0bc85d8db216da83af4a6377
-size 739595
+oid sha256:3b1cc7e90a8b703b33e8148506882566d8e95dc2a44e43b37e639f2279119be5
+size 715466
diff --git a/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/OSXEditor/Metal/None/4071_PhysicalCamera-Aperture-bladeCount.png b/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/OSXEditor/Metal/None/4071_PhysicalCamera-Aperture-bladeCount.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:498d2a0b6962421506e67ed6bdf8d0ed08b37cf66809f55bb605a7120950a911
-size 174621
+oid sha256:f9984776d0d8da40452dc876a4b0c8491ef433ccae02ea038d2fac0651f76f1d
+size 144620
diff --git a/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/OSXEditor/Metal/None/4072_PhysicalCamera-Aperture-curvature.png b/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/OSXEditor/Metal/None/4072_PhysicalCamera-Aperture-curvature.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:bbfb4541dfd0451685cf73bb4cc819c6886fd576e5a1df874d4fe1dc7c4cdb4b
-size 176121
+oid sha256:34c5105363171d8376ed5cc8bdb62a62fe2a8b9fe278c026ba5ed941451d7481
+size 146913
diff --git a/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/OSXEditor/Metal/None/4073_PhysicalCamera-Aperture-barrelClipping.png b/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/OSXEditor/Metal/None/4073_PhysicalCamera-Aperture-barrelClipping.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:cfa22e61ad81e581e8fb89b0b49ff9f6c837eec48f8ebeaac685edd2aa3b181c
-size 203535
+oid sha256:59871e8dac18abedc75c3a7253e691ad2f1e0ef352175f0316f90c52d690812c
+size 180967
diff --git a/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/OSXEditor/Metal/None/4074_PhysicalCamera-Aperture-anamorphism.png b/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/OSXEditor/Metal/None/4074_PhysicalCamera-Aperture-anamorphism.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:40701d62a0dc9a835dd57305609ab5bb5ee2a205beb1357737ac7362b784f0af
-size 284952
+oid sha256:5732dc0b7eb0d803d743a69bb2c8cda0d39498b2b686a09b4d7696744c6adb5d
+size 245720
diff --git a/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/None/4070_PhysicalCamera-iso-aperture-shutter.png b/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/None/4070_PhysicalCamera-iso-aperture-shutter.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f261b5c4c0d8be5d742a161360416d3f4d60eda4785c983a595e7fb184a36e82
-size 754339
+oid sha256:2053a8f5a10106e7ab6130906c33f0082ae84fd1060ed48a3e08eab71874e13c
+size 718145
diff --git a/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/None/4071_PhysicalCamera-Aperture-bladeCount.png b/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/None/4071_PhysicalCamera-Aperture-bladeCount.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e258f4a8a483fe6ce99e851870d2728bcbededc76354f88f8c43b01229cf91ff
-size 230669
+oid sha256:7b54ce6204f28c48a8dc2681ac92ca188fe01922aeba901a0717335019b36566
+size 214140
diff --git a/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/None/4072_PhysicalCamera-Aperture-curvature.png b/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/None/4072_PhysicalCamera-Aperture-curvature.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:bc88c664a7ca7f6309ffec0d12c1c28f755acf5c90d59c8314ba4f587f43c292
-size 231579
+oid sha256:502b36f90b317402bfbbb9d6f36917187a52952e5cf139642605f4c1a15284fe
+size 214108
diff --git a/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/None/4073_PhysicalCamera-Aperture-barrelClipping.png b/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/None/4073_PhysicalCamera-Aperture-barrelClipping.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c95778e9c8498a534abdbfb518c7e464170697ac907e04bffb7e718dbf2d2da5
-size 262837
+oid sha256:cdf65b67221b24a82590327cf4161bc95008a8635131e2382c9b6f51d3bbcd1f
+size 247190
diff --git a/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/None/4074_PhysicalCamera-Aperture-anamorphism.png b/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/None/4074_PhysicalCamera-Aperture-anamorphism.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:966865534015b55285a1422edc35a22b514cbc797eb71f194224776f9f4323d8
-size 357977
+oid sha256:2a17a655a6116a99a2e8ceb094e9ed36e32e46909e13be997588f4c4fb953986
+size 336139
diff --git a/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D12/None/4070_PhysicalCamera-iso-aperture-shutter.png b/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D12/None/4070_PhysicalCamera-iso-aperture-shutter.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c29bb5e8467725b8c0318459f6aca65dafe7f1dc71e9ec42e3789071041cebfc
-size 754260
+oid sha256:2053a8f5a10106e7ab6130906c33f0082ae84fd1060ed48a3e08eab71874e13c
+size 718145
diff --git a/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D12/None/4071_PhysicalCamera-Aperture-bladeCount.png b/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D12/None/4071_PhysicalCamera-Aperture-bladeCount.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e258f4a8a483fe6ce99e851870d2728bcbededc76354f88f8c43b01229cf91ff
-size 230669
+oid sha256:7b54ce6204f28c48a8dc2681ac92ca188fe01922aeba901a0717335019b36566
+size 214140
diff --git a/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D12/None/4072_PhysicalCamera-Aperture-curvature.png b/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D12/None/4072_PhysicalCamera-Aperture-curvature.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:bc88c664a7ca7f6309ffec0d12c1c28f755acf5c90d59c8314ba4f587f43c292
-size 231579
+oid sha256:502b36f90b317402bfbbb9d6f36917187a52952e5cf139642605f4c1a15284fe
+size 214108
diff --git a/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D12/None/4073_PhysicalCamera-Aperture-barrelClipping.png b/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D12/None/4073_PhysicalCamera-Aperture-barrelClipping.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c95778e9c8498a534abdbfb518c7e464170697ac907e04bffb7e718dbf2d2da5
-size 262837
+oid sha256:cdf65b67221b24a82590327cf4161bc95008a8635131e2382c9b6f51d3bbcd1f
+size 247190
diff --git a/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D12/None/4074_PhysicalCamera-Aperture-anamorphism.png b/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D12/None/4074_PhysicalCamera-Aperture-anamorphism.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d32bc64408c58ee18b85d1365f87d9c441a9568d831ca5299be8c7765e923d94
-size 404781
+oid sha256:2a17a655a6116a99a2e8ceb094e9ed36e32e46909e13be997588f4c4fb953986
+size 336139
diff --git a/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/None/4070_PhysicalCamera-iso-aperture-shutter.png b/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/None/4070_PhysicalCamera-iso-aperture-shutter.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d25a58bf9282343644603feb39c5cebbe65d7ab2a65503773772f0e7ad9a79b6
-size 750451
+oid sha256:927617925791880c3b1104afb714d70d9c147c4999a6ed7cd0430334b0e34171
+size 711092
diff --git a/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/None/4071_PhysicalCamera-Aperture-bladeCount.png b/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/None/4071_PhysicalCamera-Aperture-bladeCount.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c423d712cf05e7a1113efd47923f2577d1ecaf1301119da74903dd3840450bb8
-size 230696
+oid sha256:96f37aa9b3338febb578355ba63cd3bcd893f1aafa106e1b247f6791557e9cca
+size 214236
diff --git a/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/None/4072_PhysicalCamera-Aperture-curvature.png b/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/None/4072_PhysicalCamera-Aperture-curvature.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:615f925d752ab9c1d52d19021eb8310ea2dbca563fd347deefe9169a89dc8337
-size 231847
+oid sha256:90e75eaf7d4d10362dd077284cc3b39c322f2b7662db40d3106124c430a7eb96
+size 214188
diff --git a/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/None/4073_PhysicalCamera-Aperture-barrelClipping.png b/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/None/4073_PhysicalCamera-Aperture-barrelClipping.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c8a68a06d35985c936024c969ace573e39d7025a9f10d14a9bd9ce1bbbabbb50
-size 262934
+oid sha256:c39d66d03043baa67ed650240be0a6cb839e54446696842f48bc67d0d70cf218
+size 247241
diff --git a/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/None/4074_PhysicalCamera-Aperture-anamorphism.png b/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/None/4074_PhysicalCamera-Aperture-anamorphism.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:489f8e58f8f7e594c6da56aac5784482a2f25807d37eb1c5e79ba7ad93aee07e
-size 357908
+oid sha256:f8d410bfc68a8917c203116df1df8cb57fbf709d8fd0523ca48851c2c5b9f636
+size 336161
diff --git a/com.unity.render-pipelines.high-definition/CHANGELOG.md b/com.unity.render-pipelines.high-definition/CHANGELOG.md
@@ -15,6 +15,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ### Changed
 - Maximum light count per fine prunned tile (opaque deferred) is now 63 instead of 23.
+- Depth of Field is now disabled in orthographic cameras - it was using the hidden perspective settings (case 1372582).
 
 ## [12.1.1] - 2021-10-04
 
diff --git a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.PostProcess.cs b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.PostProcess.cs
@@ -2864,6 +2864,7 @@ TextureHandle DepthOfFieldPass(RenderGraph renderGraph, HDCamera hdCamera, Textu
             bool postDoFTAAEnabled = false;
             bool isSceneView = hdCamera.camera.cameraType == CameraType.SceneView;
             bool taaEnabled = m_AntialiasingFS && hdCamera.antialiasing == HDAdditionalCameraData.AntialiasingMode.TemporalAntialiasing;
+            bool isOrtho = hdCamera.camera.orthographic;
 
             // If Path tracing is enabled, then DoF is computed in the path tracer by sampling the lens aperure (when using the physical camera mode)
             bool isDoFPathTraced = (hdCamera.frameSettings.IsEnabled(FrameSettingsField.RayTracing) &&
@@ -2873,7 +2874,7 @@ TextureHandle DepthOfFieldPass(RenderGraph renderGraph, HDCamera hdCamera, Textu
 
             // Depth of Field is done right after TAA as it's easier to just re-project the CoC
             // map rather than having to deal with all the implications of doing it before TAA
-            if (m_DepthOfField.IsActive() && !isSceneView && m_DepthOfFieldFS && !isDoFPathTraced)
+            if (m_DepthOfField.IsActive() && !isSceneView && m_DepthOfFieldFS && !isDoFPathTraced && !isOrtho)
             {
                 // If we switch DoF modes and the old one was not using TAA, make sure we invalidate the history
                 // Note: for Rendergraph the m_IsDoFHisotoryValid perhaps should be moved to the "pass data" struct
