From b4f1e3e5300ee4082544e10da7b049fe3e84abb9 Mon Sep 17 00:00:00 2001 From: Paul Demeulenaere Date: Mon, 18 Jan 2021 10:49:29 +0100 Subject: [PATCH 1/3] HDRP - Fix Debug View Material (#182) * Fix fallback (?) depth state in debug view material Not sure about this : should double check with HDRP team * *Update changelog * *Updare reference image It corresponds to the result in 7.x.x & 8.x.x # Conflicts: # com.unity.render-pipelines.high-definition/CHANGELOG.md --- .../Linear/WindowsEditor/Direct3D11/None/HDRP_DebugAlbedo.png | 4 ++-- .../Linear/WindowsEditor/Direct3D11/None/HDRP_DebugAlpha.png | 4 ++-- .../Linear/WindowsEditor/Direct3D11/None/HDRP_DebugMetal.png | 4 ++-- .../Linear/WindowsEditor/Direct3D11/None/HDRP_DebugNormal.png | 4 ++-- .../WindowsEditor/Direct3D11/None/HDRP_DebugSmoothness.png | 4 ++-- .../Linear/WindowsPlayer/Direct3D11/None/HDRP_DebugAlbedo.png | 4 ++-- .../Linear/WindowsPlayer/Direct3D11/None/HDRP_DebugAlpha.png | 4 ++-- .../Linear/WindowsPlayer/Direct3D11/None/HDRP_DebugMetal.png | 4 ++-- .../Linear/WindowsPlayer/Direct3D11/None/HDRP_DebugNormal.png | 4 ++-- .../WindowsPlayer/Direct3D11/None/HDRP_DebugSmoothness.png | 4 ++-- com.unity.render-pipelines.high-definition/CHANGELOG.md | 1 + .../Runtime/RenderPipeline/HDRenderPipeline.Debug.cs | 2 +- 12 files changed, 22 insertions(+), 21 deletions(-) diff --git a/TestProjects/VisualEffectGraph_HDRP/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/None/HDRP_DebugAlbedo.png b/TestProjects/VisualEffectGraph_HDRP/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/None/HDRP_DebugAlbedo.png index 8aed86760f5..2a49bc8a90b 100644 --- a/TestProjects/VisualEffectGraph_HDRP/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/None/HDRP_DebugAlbedo.png +++ b/TestProjects/VisualEffectGraph_HDRP/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/None/HDRP_DebugAlbedo.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a0e154a51e6ac0e7759ea3618178ae98ef6a01801890578d0a32089177070e99 -size 3753 +oid sha256:738e22dbea4e2351efeb47b04a5a86eaa2155a62bd93bdb7658bca5dac7351cf +size 3861 diff --git a/TestProjects/VisualEffectGraph_HDRP/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/None/HDRP_DebugAlpha.png b/TestProjects/VisualEffectGraph_HDRP/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/None/HDRP_DebugAlpha.png index 9effa82c14a..480925dba66 100644 --- a/TestProjects/VisualEffectGraph_HDRP/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/None/HDRP_DebugAlpha.png +++ b/TestProjects/VisualEffectGraph_HDRP/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/None/HDRP_DebugAlpha.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:63c689a78eb8558197d60ad0ee62bc41c813009b8b971bf592120333d727228c -size 2416 +oid sha256:313faa25fe41edd56e15ffa141a03114da9c5ac048d996ffbe4a2995a29ec175 +size 2421 diff --git a/TestProjects/VisualEffectGraph_HDRP/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/None/HDRP_DebugMetal.png b/TestProjects/VisualEffectGraph_HDRP/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/None/HDRP_DebugMetal.png index 39d09d0e040..66484a4cb03 100644 --- a/TestProjects/VisualEffectGraph_HDRP/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/None/HDRP_DebugMetal.png +++ b/TestProjects/VisualEffectGraph_HDRP/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/None/HDRP_DebugMetal.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9bfc416375a65c59c023656d58183f945b26ad99f4017615de40f4359cfba0a3 -size 965 +oid sha256:197976d7c7d3924a1ea0d59e4c96bbe6e8998c6beadb7b874ed4c6363ccfcd1c +size 1278 diff --git a/TestProjects/VisualEffectGraph_HDRP/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/None/HDRP_DebugNormal.png b/TestProjects/VisualEffectGraph_HDRP/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/None/HDRP_DebugNormal.png index 7a361f04da4..7a8b289407f 100644 --- a/TestProjects/VisualEffectGraph_HDRP/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/None/HDRP_DebugNormal.png +++ b/TestProjects/VisualEffectGraph_HDRP/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/None/HDRP_DebugNormal.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a5edaab66ed9a83a802cb6263e3064515ebd7289d0bcb1232da38b2df5268581 -size 20749 +oid sha256:6a570e61db8142765cd6da525cdc9672f850312d36c3b875b8b51c01719158ea +size 20995 diff --git a/TestProjects/VisualEffectGraph_HDRP/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/None/HDRP_DebugSmoothness.png b/TestProjects/VisualEffectGraph_HDRP/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/None/HDRP_DebugSmoothness.png index 0aa07cf87c0..7c5490d2c0e 100644 --- a/TestProjects/VisualEffectGraph_HDRP/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/None/HDRP_DebugSmoothness.png +++ b/TestProjects/VisualEffectGraph_HDRP/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/None/HDRP_DebugSmoothness.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d45d457ddfa6186781767dbc3a1271da11aff69d5e25fe86fc1d4a6e01eab384 -size 1933 +oid sha256:6ca328c297e32cb8f453f3ce1611729b581ad83bd46f898ae428d265126a3a90 +size 2210 diff --git a/TestProjects/VisualEffectGraph_HDRP/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/None/HDRP_DebugAlbedo.png b/TestProjects/VisualEffectGraph_HDRP/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/None/HDRP_DebugAlbedo.png index 8aed86760f5..2a49bc8a90b 100644 --- a/TestProjects/VisualEffectGraph_HDRP/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/None/HDRP_DebugAlbedo.png +++ b/TestProjects/VisualEffectGraph_HDRP/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/None/HDRP_DebugAlbedo.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a0e154a51e6ac0e7759ea3618178ae98ef6a01801890578d0a32089177070e99 -size 3753 +oid sha256:738e22dbea4e2351efeb47b04a5a86eaa2155a62bd93bdb7658bca5dac7351cf +size 3861 diff --git a/TestProjects/VisualEffectGraph_HDRP/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/None/HDRP_DebugAlpha.png b/TestProjects/VisualEffectGraph_HDRP/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/None/HDRP_DebugAlpha.png index 9effa82c14a..480925dba66 100644 --- a/TestProjects/VisualEffectGraph_HDRP/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/None/HDRP_DebugAlpha.png +++ b/TestProjects/VisualEffectGraph_HDRP/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/None/HDRP_DebugAlpha.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:63c689a78eb8558197d60ad0ee62bc41c813009b8b971bf592120333d727228c -size 2416 +oid sha256:313faa25fe41edd56e15ffa141a03114da9c5ac048d996ffbe4a2995a29ec175 +size 2421 diff --git a/TestProjects/VisualEffectGraph_HDRP/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/None/HDRP_DebugMetal.png b/TestProjects/VisualEffectGraph_HDRP/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/None/HDRP_DebugMetal.png index 39d09d0e040..66484a4cb03 100644 --- a/TestProjects/VisualEffectGraph_HDRP/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/None/HDRP_DebugMetal.png +++ b/TestProjects/VisualEffectGraph_HDRP/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/None/HDRP_DebugMetal.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9bfc416375a65c59c023656d58183f945b26ad99f4017615de40f4359cfba0a3 -size 965 +oid sha256:197976d7c7d3924a1ea0d59e4c96bbe6e8998c6beadb7b874ed4c6363ccfcd1c +size 1278 diff --git a/TestProjects/VisualEffectGraph_HDRP/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/None/HDRP_DebugNormal.png b/TestProjects/VisualEffectGraph_HDRP/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/None/HDRP_DebugNormal.png index 7a361f04da4..7a8b289407f 100644 --- a/TestProjects/VisualEffectGraph_HDRP/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/None/HDRP_DebugNormal.png +++ b/TestProjects/VisualEffectGraph_HDRP/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/None/HDRP_DebugNormal.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a5edaab66ed9a83a802cb6263e3064515ebd7289d0bcb1232da38b2df5268581 -size 20749 +oid sha256:6a570e61db8142765cd6da525cdc9672f850312d36c3b875b8b51c01719158ea +size 20995 diff --git a/TestProjects/VisualEffectGraph_HDRP/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/None/HDRP_DebugSmoothness.png b/TestProjects/VisualEffectGraph_HDRP/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/None/HDRP_DebugSmoothness.png index 0aa07cf87c0..7c5490d2c0e 100644 --- a/TestProjects/VisualEffectGraph_HDRP/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/None/HDRP_DebugSmoothness.png +++ b/TestProjects/VisualEffectGraph_HDRP/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/None/HDRP_DebugSmoothness.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d45d457ddfa6186781767dbc3a1271da11aff69d5e25fe86fc1d4a6e01eab384 -size 1933 +oid sha256:6ca328c297e32cb8f453f3ce1611729b581ad83bd46f898ae428d265126a3a90 +size 2210 diff --git a/com.unity.render-pipelines.high-definition/CHANGELOG.md b/com.unity.render-pipelines.high-definition/CHANGELOG.md index 758841ae7b2..506557b34bb 100644 --- a/com.unity.render-pipelines.high-definition/CHANGELOG.md +++ b/com.unity.render-pipelines.high-definition/CHANGELOG.md @@ -18,6 +18,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. - Fixed issue with faulty shadow transition when view is close to an object under some aspect ratio conditions - Fixed issue where some ShaderGraph generated shaders were not SRP compatible because of UnityPerMaterial cbuffer layout mismatches [1292501] (https://issuetracker.unity3d.com/issues/a2-some-translucent-plus-alphaclipping-shadergraphs-are-not-srp-batcher-compatible) - Fixed issues with path-traced volumetric scattering (cases 1295222, 1295234) +- VFX : Debug material view incorrect depth test. (case 1293291) - Fixed Rendergraph issue with virtual texturing and debug mode while in forward. - Fixed wrong coat normal space in shader graph - Fixed issue with faulty shadow transition when view is close to an object under some aspect ratio conditions diff --git a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.Debug.cs b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.Debug.cs index 5761d0e34e8..29bf1380a8f 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.Debug.cs +++ b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.Debug.cs @@ -560,7 +560,7 @@ TextureHandle RenderDebugViewMaterial(RenderGraph renderGraph, CullingResults cu passData.transparentRendererList = builder.UseRendererList( renderGraph.CreateRendererList(CreateTransparentRendererListDesc(cull, hdCamera.camera, m_AllTransparentPassNames, rendererConfiguration: m_CurrentRendererConfigurationBakedLighting, - stateBlock: m_DepthStateOpaque))); + stateBlock: m_DepthStateNoWrite))); passData.clearColorTexture = Compositor.CompositionManager.GetClearTextureForStackedCamera(hdCamera); // returns null if is not a stacked camera passData.clearDepthTexture = Compositor.CompositionManager.GetClearDepthForStackedCamera(hdCamera); // returns null if is not a stacked camera From 9727e59111593cd1bf9732fda7c951e1d88a6390 Mon Sep 17 00:00:00 2001 From: Paul Demeulenaere Date: Mon, 18 Jan 2021 13:27:01 +0100 Subject: [PATCH 2/3] Synchronize timeout settings from master See : https://github.com/Unity-Technologies/Graphics/blob/master/com.unity.testing.visualeffectgraph/Tests/Runtime/VFXGraphicsTests.cs#L38 (f --- .../Tests/Runtime/VFXGraphicsTests.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/com.unity.testing.visualeffectgraph/Tests/Runtime/VFXGraphicsTests.cs b/com.unity.testing.visualeffectgraph/Tests/Runtime/VFXGraphicsTests.cs index aade17ef8f0..63fe851433b 100644 --- a/com.unity.testing.visualeffectgraph/Tests/Runtime/VFXGraphicsTests.cs +++ b/com.unity.testing.visualeffectgraph/Tests/Runtime/VFXGraphicsTests.cs @@ -35,6 +35,7 @@ public void Init() [UnityTest, Category("VisualEffect")] [PrebuildSetup("SetupGraphicsTestCases")] [UseGraphicsTestCases] + [Timeout(450 * 1000)] // Increase timeout to handle complex scenes with many shaders and XR variants public IEnumerator Run(GraphicsTestCase testCase) { #if UNITY_EDITOR From 57311af61fff86514edbf6818e40c18abebc0620 Mon Sep 17 00:00:00 2001 From: Paul Demeulenaere Date: Mon, 18 Jan 2021 16:26:31 +0100 Subject: [PATCH 3/3] Fix changelog.md Keep new entry last --- com.unity.render-pipelines.high-definition/CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/com.unity.render-pipelines.high-definition/CHANGELOG.md b/com.unity.render-pipelines.high-definition/CHANGELOG.md index 506557b34bb..007dd6331e8 100644 --- a/com.unity.render-pipelines.high-definition/CHANGELOG.md +++ b/com.unity.render-pipelines.high-definition/CHANGELOG.md @@ -18,7 +18,6 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. - Fixed issue with faulty shadow transition when view is close to an object under some aspect ratio conditions - Fixed issue where some ShaderGraph generated shaders were not SRP compatible because of UnityPerMaterial cbuffer layout mismatches [1292501] (https://issuetracker.unity3d.com/issues/a2-some-translucent-plus-alphaclipping-shadergraphs-are-not-srp-batcher-compatible) - Fixed issues with path-traced volumetric scattering (cases 1295222, 1295234) -- VFX : Debug material view incorrect depth test. (case 1293291) - Fixed Rendergraph issue with virtual texturing and debug mode while in forward. - Fixed wrong coat normal space in shader graph - Fixed issue with faulty shadow transition when view is close to an object under some aspect ratio conditions @@ -71,6 +70,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. - Fixed regression in Wizard that not fix runtime ressource anymore (case 1287627) - Fixed error in Depth Of Field near radius blur calculation (case 1306228). - Fixed a reload bug when using objects from the scene in the lookdev (case 1300916). +- VFX : Debug material view incorrect depth test. (case 1293291) ### Changed - Now reflection probes cannot have SSAO, SSGI, SSR, ray tracing effects or volumetric reprojection.