From 42cbca05c16711f48dad37cc4ed4882fe087ecc8 Mon Sep 17 00:00:00 2001 From: Chris Tchou Date: Sat, 28 Nov 2020 11:40:24 -0800 Subject: [PATCH 1/2] Fix for 1292501 (cherry pick of 0104bdded0e339989f5a828ef790e6007a63e887) # Conflicts: # com.unity.render-pipelines.high-definition/Editor/Material/ShaderGraph/HDShaderPasses.cs --- .../Editor/Material/ShaderGraph/HDShaderPasses.cs | 3 +++ 1 file changed, 3 insertions(+) diff --git a/com.unity.render-pipelines.high-definition/Editor/Material/ShaderGraph/HDShaderPasses.cs b/com.unity.render-pipelines.high-definition/Editor/Material/ShaderGraph/HDShaderPasses.cs index 51b3b62d106..918925d1ae3 100644 --- a/com.unity.render-pipelines.high-definition/Editor/Material/ShaderGraph/HDShaderPasses.cs +++ b/com.unity.render-pipelines.high-definition/Editor/Material/ShaderGraph/HDShaderPasses.cs @@ -169,6 +169,7 @@ static public PassDescriptor GenerateShadowCaster(bool supportLighting) BlockFields.SurfaceDescription.AlphaClipThreshold, HDBlockFields.SurfaceDescription.AlphaClipThresholdShadow, HDBlockFields.SurfaceDescription.DepthOffset, + HDBlockFields.SurfaceDescription.DiffusionProfileHash // not used, but keeps the UnityPerMaterial cbuffer identical }, // Collections @@ -545,6 +546,7 @@ public static PassDescriptor GenerateTransparentDepthPrepass(bool supportLightin BlockFields.SurfaceDescription.NormalWS, BlockFields.SurfaceDescription.NormalOS, BlockFields.SurfaceDescription.Smoothness, + HDBlockFields.SurfaceDescription.DiffusionProfileHash // not used, but keeps the UnityPerMaterial cbuffer identical } : new BlockFieldDescriptor[] { @@ -552,6 +554,7 @@ public static PassDescriptor GenerateTransparentDepthPrepass(bool supportLightin HDBlockFields.SurfaceDescription.AlphaClipThresholdDepthPrepass, BlockFields.SurfaceDescription.AlphaClipThreshold, HDBlockFields.SurfaceDescription.DepthOffset, + HDBlockFields.SurfaceDescription.DiffusionProfileHash // not used, but keeps the UnityPerMaterial cbuffer identical }, // Collections From 3e2cb6726611a45392662b4e538f501dd45ccacb Mon Sep 17 00:00:00 2001 From: Chris Tchou Date: Mon, 30 Nov 2020 11:02:56 -0800 Subject: [PATCH 2/2] Adding changelog --- com.unity.render-pipelines.high-definition/CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/com.unity.render-pipelines.high-definition/CHANGELOG.md b/com.unity.render-pipelines.high-definition/CHANGELOG.md index 0bbc69a2ee2..7344d46ed19 100644 --- a/com.unity.render-pipelines.high-definition/CHANGELOG.md +++ b/com.unity.render-pipelines.high-definition/CHANGELOG.md @@ -43,6 +43,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. - Fixed the clear coat not being handled properly for SSR and RTR (case 1291654). - Fixed ghosting in RTGI and RTAO when denoising is enabled and the RTHandle size is not equal to the Viewport size (case 1291654). - Fixed alpha output when atmospheric scattering is enabled. +- 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) ### Changed - Volume Manager now always tests scene culling masks. This was required to fix hybrid workflow.