Skip to content

Commit 4a03463

Browse files
AndrewSaraevUnitypastasfuture
authored andcommitted
Enforce SRP Batcher and Hybrid renderer compatibility by always using a consolidated property list (#3577) (#2)
* Make all passes in a subshader use the same HLSL proeprty declarations * Adding changelog * Better fix for Targets accessing the current blocks (cherry picked from commit 26a1096)
1 parent 19abafd commit 4a03463

File tree

2 files changed

+2
-0
lines changed

2 files changed

+2
-0
lines changed

com.unity.shadergraph/CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
2525
- Fixed a serialization bug wrt PVT property flags when using subgraphs. This fixes SRP batcher compatibility.
2626

2727
## [10.6.0] - 2021-04-29
28+
2829
## [10.3.1/custom]
2930
Version Updated
3031
### Fixed

com.unity.shadergraph/Editor/Generation/Processors/Generator.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -160,6 +160,7 @@ void BuildShader()
160160
m_Targets[i].Setup(ref context);
161161

162162
var subShaderProperties = GetSubShaderPropertiesForTarget(m_Targets[i], m_GraphData, m_Mode, m_OutputNode, m_TemporaryBlocks);
163+
163164
foreach (var subShader in context.subShaders)
164165
{
165166
GenerateSubShader(i, subShader, subShaderProperties);

0 commit comments

Comments
 (0)