Skip to content

Fixed shader graph not supporting indirectdxr multibounce (case 1294694) #2933

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.

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 17, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
- Fixed white screen when undoing in the editor.
- Fixed display of LOD Bias and maximum level in frame settings when using Quality Levels
- Fixed an issue when trying to open a look dev env library when Look Dev is not supported.
- Fixed shader graph not supporting indirectdxr multibounce (case 1294694).

### Changed
- Removed the material pass probe volumes evaluation mode.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -878,6 +878,11 @@ public static PassDescriptor GenerateLitRaytracingPrepass()

#region Raytracing Indirect

public static KeywordCollection IndirectDiffuseKeywordCollection = new KeywordCollection
{
{ CoreKeywordDescriptors.multiBounceIndirect },
};

public static PassDescriptor GenerateRaytracingIndirect(bool supportLighting)
{
return new PassDescriptor
Expand All @@ -891,6 +896,7 @@ public static PassDescriptor GenerateRaytracingIndirect(bool supportLighting)
// Collections
pragmas = CorePragmas.RaytracingBasic,
defines = supportLighting ? RaytracingIndirectDefines : null,
keywords = supportLighting ? IndirectDiffuseKeywordCollection : null,
includes = GenerateIncludes(),
};

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1324,6 +1324,15 @@ static class CoreKeywordDescriptors
definition = KeywordDefinition.ShaderFeature,
scope = KeywordScope.Local,
};

public static KeywordDescriptor multiBounceIndirect = new KeywordDescriptor
{
displayName = "Multi Bounce Indirect",
referenceName = "MULTI_BOUNCE_INDIRECT",
type = KeywordType.Boolean,
definition = KeywordDefinition.MultiCompile,
scope = KeywordScope.Global,
};
}
#endregion
}