Skip to content

[Fogbugz 1358506] Fixing shader graph codegen of preview shader hybrid v2, using hybrid… #5370

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
Aug 24, 2021
Merged

[Fogbugz 1358506] Fixing shader graph codegen of preview shader hybrid v2, using hybrid… #5370

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
4ec9a14
Fixing shader graph codegen of preview shader hybrid v2, using hybrid…
kecho Aug 17, 2021
779f210
Merge branch 'master' into HDRP/FixShaderPreviewGraphHybridInstancing
sebastienlagarde Aug 24, 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.shadergraph/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
- Fixed the BuiltIn Target to perform shader variant stripping [1345580] (https://issuetracker.unity3d.com/product/unity/issues/guid/1345580/)
- Fixed incorrect warning while using VFXTarget
- Fixed a bug with Sprite Targets in ShaderGraph not rendering correctly in game view [1352225]
- Fixed compilation problems on preview shader when using hybrid renderer v2 and property desc override Hybrid Per Instance

## [11.0.0] - 2020-10-21

Expand Down
1 change: 1 addition & 0 deletions com.unity.shadergraph/Editor/Generation/Processors/PropertyCollector.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,6 +180,7 @@ public void GetPropertiesDeclaration(ShaderStringBuilder builder, GenerationMode
builder.AppendLine("#endif");
}
builder.AppendLine("CBUFFER_END");
builder.AppendLine("#define UNITY_ACCESS_HYBRID_INSTANCED_PROP(var, type) var");
return;
}

Expand Down