Skip to content

[10.3] [HDRP] [bugfix 1292501] - Ensure all passes request the DiffusionProfile for SRP batcher compatibility #2789

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Dec 2, 2020
Merged

[10.3] [HDRP] [bugfix 1292501] - Ensure all passes request the DiffusionProfile for SRP batcher compatibility #2789

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0104bdd
Fix for 1292501
Nov 28, 2020
710d901
Adding changelog
Nov 30, 2020
7dbbe25
Merge branch '10.x.x/release' into 10.x.x/sg/fix/hdrp-diffusion-batcher
Dec 2, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions com.unity.render-pipelines.high-definition/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ The version number for this package has increased due to a version update of a r
- Fixed NullReference Exception when setting Max Shadows On Screen to 0 in the HDRP asset.
- Fixed path tracing accumulation not being reset when changing to a different frame of an animation.
- Fixed issue with saving some quality settings in volume overrides (case 1293747)
- 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.
Expand Down
3 changes: 3 additions & 0 deletions com.unity.render-pipelines.high-definition/Editor/Material/ShaderGraph/HDShaderPasses.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,6 +170,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
Expand Down Expand Up @@ -547,13 +548,15 @@ 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[]
{
BlockFields.SurfaceDescription.Alpha,
HDBlockFields.SurfaceDescription.AlphaClipThresholdDepthPrepass,
BlockFields.SurfaceDescription.AlphaClipThreshold,
HDBlockFields.SurfaceDescription.DepthOffset,
HDBlockFields.SurfaceDescription.DiffusionProfileHash // not used, but keeps the UnityPerMaterial cbuffer identical
},

// Collections
Expand Down