Skip to content

Commit a9230dd

Browse files
sebastienlagardeChris TchouAntoine LelievrealindmanUnityelizabeth-legros
authored
[10.x.x] SG Master stack + HDRP sub targets refactor [Skip CI] (#797)
* Merging into master: squash merge sg/master-stack into 9.x.x/release Effectively taking the diff between sg/master-stack commit: b6b5b1f 9.x.x/release commit: 808d18e and applying it to master # Conflicts: # com.unity.render-pipelines.universal/Editor/ShaderGraph/Includes/SpriteForwardPass.hlsl # com.unity.render-pipelines.universal/Editor/ShaderGraph/Includes/SpriteLitPass.hlsl # com.unity.render-pipelines.universal/Editor/ShaderGraph/Includes/SpriteUnlitPass.hlsl # com.unity.shadergraph/Editor/Drawing/Views/MaterialNodeView.cs # com.unity.shadergraph/Editor/Drawing/Views/PortInputView.cs * Add protection in migration when rendering pass was set to background (#703) * Add protection in migration when rendering pass was set to background * Fix rendering pass migration for unlit Co-authored-by: sebastienlagarde <[email protected]> * Fix RenderQueue generation for HDRP code (#691) * Fix renderqueu generation * fix renderingPass correctly * clean m_AddPrecomputedVelocity usuage * update edge type converstion test to stacks * change context to take in a tuple of (blockdescriptor descriptor,bool isDefaultValue) * Adding mesh deformation nodes to the BuiltIn node type list * Added VT TextureStack.hlsl include to RT passes, and fixed a shader warning spam * connected slots are not default value * Fix for DOTS hybrid skinning in HDRP * Add settings for Virtual Texture Node back to Graph Inspector, fix a layout issue. * HDRP sub targets refactor (#773) * Moved sub-target upgrade code to migration files and refactored the HD blocks # Conflicts: # TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/9x_Other/9701_CustomPass_DrawRenderers/9701_UnlitRT.mat * Made property row labels flexible * Fixed indent level of propertyRow * Added more control to indent level and clear foldout * Refactored inspector GUI for HD lit and hair master node * Fixed compilation * Moved fabric subtarget GUI to new system * Converted Eye and stacklit settings to new GUI system * Finished decal and unlit inspector settings * Add missing unlit distortion only + remove unlitPass template + fix duplicated alpha to mask option * Testing new pass override system * Revert assets * Started to factorize passes for Unlit & fix distortion only in the inspector UI * Shared all non DXR passes between shaders * Fixed unlit depth prepass * Fix lot of issues with shared render passes * Moved SSS property to target specific and converted all ray tracing passes * Fix missing normal space * Shared more code between passes * Added file dependency and remove unused template path * Added target block context changes * Removed all the commented code * Fix anisotropy indent level * Fixed yamato compilation issue * Fixed stacklit and raytracing prepass shader issues * Invert pass order * Fixed shadow matte * Enable virtual texturing in forward only * Wrong emplacement for virtual texture feedback * Fixed unwanted require field list modification * Update 801_SubSurfaceScatteringDeferred.png * Fix vulkan and metal * Revert "Fix vulkan and metal" This reverts commit 367ad17. * Update HDShaderPasses.cs * Update materials * Update materials part 2 HDRP-test * Update material for DXR projects * update VFX project material Co-authored-by: Chris Tchou <[email protected]> Co-authored-by: Antoine Lelievre <[email protected]> Co-authored-by: Alex Lindman <[email protected]> Co-authored-by: Elizabeth LeGros <[email protected]> Co-authored-by: Marc Templin <[email protected]>
1 parent f472b70 commit a9230dd

File tree

1,678 files changed

+21836
-22228
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,678 files changed

+21836
-22228
lines changed
Lines changed: 2 additions & 2 deletions
Loading

TestProjects/HDRP_DXR_Tests/Assets/Scenes/5001_PathTracing/M_GreyDiffuse.mat

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ MonoBehaviour:
1212
m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
1313
m_Name:
1414
m_EditorClassIdentifier:
15-
version: 3
15+
version: 4
1616
--- !u!21 &2100000
1717
Material:
1818
serializedVersion: 6
@@ -135,6 +135,7 @@ Material:
135135
- _AlphaCutoffShadow: 0.5
136136
- _AlphaDstBlend: 0
137137
- _AlphaSrcBlend: 1
138+
- _AlphaToMask: 0
138139
- _Anisotropy: 0
139140
- _BlendMode: 0
140141
- _CoatMask: 0

TestProjects/HDRP_DXR_Tests/Assets/Scenes/5001_PathTracing/M_RedDiffuse.mat

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ MonoBehaviour:
1212
m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
1313
m_Name:
1414
m_EditorClassIdentifier:
15-
version: 3
15+
version: 4
1616
--- !u!21 &2100000
1717
Material:
1818
serializedVersion: 6
@@ -135,6 +135,7 @@ Material:
135135
- _AlphaCutoffShadow: 0.5
136136
- _AlphaDstBlend: 0
137137
- _AlphaSrcBlend: 1
138+
- _AlphaToMask: 0
138139
- _Anisotropy: 0
139140
- _BlendMode: 0
140141
- _CoatMask: 1

TestProjects/HDRP_DXR_Tests/Assets/Scenes/5001_PathTracing/M_RoughTintedGlass.mat

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ MonoBehaviour:
1212
m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
1313
m_Name:
1414
m_EditorClassIdentifier:
15-
version: 3
15+
version: 4
1616
--- !u!21 &2100000
1717
Material:
1818
serializedVersion: 6
@@ -137,6 +137,7 @@ Material:
137137
- _AlphaCutoffShadow: 0.5
138138
- _AlphaDstBlend: 10
139139
- _AlphaSrcBlend: 1
140+
- _AlphaToMask: 0
140141
- _Anisotropy: 0
141142
- _BlendMode: 0
142143
- _CoatMask: 0

TestProjects/HDRP_DXR_Tests/Assets/Scenes/5001_PathTracing/M_SoapBubble.mat

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,7 @@ Material:
125125
- _AlphaCutoffShadow: 0.5
126126
- _AlphaDstBlend: 10
127127
- _AlphaSrcBlend: 1
128+
- _AlphaToMask: 0
128129
- _Anisotropy: 0
129130
- _BlendMode: 0
130131
- _CoatMask: 0
@@ -264,4 +265,4 @@ MonoBehaviour:
264265
m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
265266
m_Name:
266267
m_EditorClassIdentifier:
267-
version: 3
268+
version: 4

TestProjects/HDRP_DXR_Tests/Assets/Scenes/5001_PathTracing/M_ThinTintedGlass.mat

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ MonoBehaviour:
1212
m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
1313
m_Name:
1414
m_EditorClassIdentifier:
15-
version: 3
15+
version: 4
1616
--- !u!21 &2100000
1717
Material:
1818
serializedVersion: 6
@@ -137,6 +137,7 @@ Material:
137137
- _AlphaCutoffShadow: 0.5
138138
- _AlphaDstBlend: 10
139139
- _AlphaSrcBlend: 1
140+
- _AlphaToMask: 0
140141
- _Anisotropy: 0
141142
- _BlendMode: 0
142143
- _CoatMask: 0

TestProjects/HDRP_DXR_Tests/Assets/Scenes/5001_PathTracing/M_UnlitSG.mat

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,6 +122,7 @@ Material:
122122
- _AlphaCutoffShadow: 0.5
123123
- _AlphaDstBlend: 0
124124
- _AlphaSrcBlend: 1
125+
- _AlphaToMask: 0
125126
- _Anisotropy: 0
126127
- _BlendMode: 0
127128
- _CoatMask: 0
@@ -263,4 +264,4 @@ MonoBehaviour:
263264
m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
264265
m_Name:
265266
m_EditorClassIdentifier:
266-
version: 3
267+
version: 4

TestProjects/HDRP_DXR_Tests/Assets/Scenes/5002_PathTracing_GI/box_gi.mat

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ MonoBehaviour:
1212
m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
1313
m_Name:
1414
m_EditorClassIdentifier:
15-
version: 3
15+
version: 4
1616
--- !u!21 &2100000
1717
Material:
1818
serializedVersion: 6
@@ -135,6 +135,7 @@ Material:
135135
- _AlphaCutoffShadow: 0.5
136136
- _AlphaDstBlend: 0
137137
- _AlphaSrcBlend: 1
138+
- _AlphaToMask: 0
138139
- _Anisotropy: 0
139140
- _BlendMode: 0
140141
- _CoatMask: 0

TestProjects/HDRP_DXR_Tests/Assets/Scenes/5002_PathTracing_GI/sphere_gi.mat

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ MonoBehaviour:
1212
m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
1313
m_Name:
1414
m_EditorClassIdentifier:
15-
version: 3
15+
version: 4
1616
--- !u!21 &2100000
1717
Material:
1818
serializedVersion: 6
@@ -135,6 +135,7 @@ Material:
135135
- _AlphaCutoffShadow: 0.5
136136
- _AlphaDstBlend: 0
137137
- _AlphaSrcBlend: 1
138+
- _AlphaToMask: 0
138139
- _Anisotropy: 0
139140
- _BlendMode: 0
140141
- _CoatMask: 0

TestProjects/HDRP_DXR_Tests/Assets/Scenes/5003_PathTracing_transparency/Ground.mat

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,6 +122,7 @@ Material:
122122
- _AlphaCutoffShadow: 0.5
123123
- _AlphaDstBlend: 0
124124
- _AlphaSrcBlend: 1
125+
- _AlphaToMask: 0
125126
- _Anisotropy: 0
126127
- _BlendMode: 0
127128
- _CoatMask: 0
@@ -261,4 +262,4 @@ MonoBehaviour:
261262
m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
262263
m_Name:
263264
m_EditorClassIdentifier:
264-
version: 3
265+
version: 4

0 commit comments

Comments
 (0)