Skip to content

Fixed error thrown when layered lit material has an invalid material type #6447

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 2 commits into from
Dec 3, 2021
Merged

Fixed error thrown when layered lit material has an invalid material type #6447

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
259db97
Fixed error thrown when layered lit material has an invalid material …
adrien-de-tocqueville Dec 1, 2021
7c43225
Merge branch 'master' into hd/fix-shader-change
sebastienlagarde Dec 3, 2021
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 @@ -55,6 +55,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
- Fixed layer lit shader UI.
- Fixed a warning because of a null texture in the lens flare pass.
- Fixed a nullref when enabling raycount without ray tracing.
- Fixed error thrown when layered lit material has an invalid material type.

## [13.1.2] - 2021-11-05

Expand Down
13 changes: 11 additions & 2 deletions com.unity.render-pipelines.high-definition/Runtime/Material/LayeredLit/LayeredLitAPI.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,12 +97,22 @@ static public void SetupLayersMappingKeywords(Material material)
// All Validate functions must be static. It allows to automatically update the shaders with a script if code changes
internal static void ValidateMaterial(Material material)
{
MaterialId materialId = material.GetMaterialId();
if (material.HasProperty(kMaterialID))
{
if (materialId != MaterialId.LitStandard && materialId != MaterialId.LitSSS && materialId != MaterialId.LitTranslucent)
{
materialId = MaterialId.LitStandard;
material.SetFloat(kMaterialID, (float)materialId);
}
}

BaseLitAPI.SetupBaseLitKeywords(material);
BaseLitAPI.SetupBaseLitMaterialPass(material);
SetupLayersMappingKeywords(material);
bool receiveSSR = material.GetSurfaceType() == SurfaceType.Opaque ? (material.HasProperty(kReceivesSSR) ? material.GetInt(kReceivesSSR) != 0 : false)
: (material.HasProperty(kReceivesSSRTransparent) ? material.GetInt(kReceivesSSRTransparent) != 0 : false);
BaseLitAPI.SetupStencil(material, receiveSSR, material.GetMaterialId() == MaterialId.LitSSS);
BaseLitAPI.SetupStencil(material, receiveSSR, materialId == MaterialId.LitSSS);

for (int i = 0; i < kMaxLayerCount; ++i)
{
Expand Down Expand Up @@ -177,7 +187,6 @@ internal static void ValidateMaterial(Material material)
}
CoreUtils.SetKeyword(material, "_DENSITY_MODE", useDensityModeEnable);

MaterialId materialId = material.GetMaterialId();
CoreUtils.SetKeyword(material, "_MATERIAL_FEATURE_SUBSURFACE_SCATTERING", materialId == MaterialId.LitSSS);
CoreUtils.SetKeyword(material, "_MATERIAL_FEATURE_TRANSMISSION", materialId == MaterialId.LitTranslucent || (materialId == MaterialId.LitSSS && material.GetFloat(kTransmissionEnable) > 0.0f));

Expand Down