Skip to content

Commit 05f60d9

Browse files
[10.x.x] Merge Hdrp/staging [Skip CI] (#1135)
Merged HDRP/staging
1 parent 85fe8b8 commit 05f60d9

File tree

150 files changed

+34249
-50268
lines changed

Some content is hidden

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

150 files changed

+34249
-50268
lines changed

TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1802_Depth_Pre_Post.unity

Lines changed: 0 additions & 26819 deletions
This file was deleted.

TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1802_Depth_Pre_Post/SG Eye/Post.mat

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,16 +21,18 @@ Material:
2121
m_PrefabInstance: {fileID: 0}
2222
m_PrefabAsset: {fileID: 0}
2323
m_Name: Post
24-
m_Shader: {fileID: -6465566751694194690, guid: 22df6d6a7eefbf94a88a3d890967341f,
24+
m_Shader: {fileID: -6465566751694194690, guid: 3d493fa710ae74242b62906cd1061353,
2525
type: 3}
26-
m_ShaderKeywords: _ALPHATEST_ON _BLENDMODE_ALPHA _DISABLE_SSR_TRANSPARENT _ENABLE_FOG_ON_TRANSPARENT
27-
_NORMALMAP_TANGENT_SPACE _SURFACE_TYPE_TRANSPARENT
26+
m_ShaderKeywords: _ALPHATEST_ON _BLENDMODE_ALPHA _BLENDMODE_PRESERVE_SPECULAR_LIGHTING
27+
_DISABLE_SSR_TRANSPARENT _ENABLE_FOG_ON_TRANSPARENT _NORMALMAP_TANGENT_SPACE
28+
_SURFACE_TYPE_TRANSPARENT
2829
m_LightmapFlags: 4
2930
m_EnableInstancingVariants: 0
3031
m_DoubleSidedGI: 0
3132
m_CustomRenderQueue: -1
3233
stringTagMap:
3334
MotionVector: User
35+
RenderType: Transparent
3436
disabledShaderPasses:
3537
- DistortionVectors
3638
- MOTIONVECTORS
@@ -133,6 +135,7 @@ Material:
133135
m_Scale: {x: 1, y: 1}
134136
m_Offset: {x: 0, y: 0}
135137
m_Floats:
138+
- Boolean_a74aa7d30fed4055a2d61137d3a383a1: 0
136139
- _AORemapMax: 1
137140
- _AORemapMin: 0
138141
- _ATDistance: 1

TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1802_Depth_Pre_Post/SG Eye/Pre-Post.mat

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,9 @@ Material:
3030
m_EnableInstancingVariants: 0
3131
m_DoubleSidedGI: 0
3232
m_CustomRenderQueue: -1
33-
stringTagMap: {}
33+
stringTagMap:
34+
MotionVector: User
35+
RenderType: Transparent
3436
disabledShaderPasses:
3537
- DistortionVectors
3638
- MOTIONVECTORS
@@ -136,6 +138,7 @@ Material:
136138
m_Scale: {x: 1, y: 1}
137139
m_Offset: {x: 0, y: 0}
138140
m_Floats:
141+
- Boolean_a74aa7d30fed4055a2d61137d3a383a1: 1
139142
- _AORemapMax: 1
140143
- _AORemapMin: 0
141144
- _ATDistance: 1

TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1802_Depth_Pre_Post/SG Eye/Pre.mat

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,16 +21,17 @@ Material:
2121
m_PrefabInstance: {fileID: 0}
2222
m_PrefabAsset: {fileID: 0}
2323
m_Name: Pre
24-
m_Shader: {fileID: -6465566751694194690, guid: 822db0e1fc84add4892efb880288c541,
24+
m_Shader: {fileID: -6465566751694194690, guid: 3d493fa710ae74242b62906cd1061353,
2525
type: 3}
26-
m_ShaderKeywords: _ALPHATEST_ON _BLENDMODE_ALPHA _DISABLE_SSR_TRANSPARENT _ENABLE_FOG_ON_TRANSPARENT
27-
_SURFACE_TYPE_TRANSPARENT
26+
m_ShaderKeywords: _ALPHATEST_ON _BLENDMODE_ALPHA _BLENDMODE_PRESERVE_SPECULAR_LIGHTING
27+
_DISABLE_SSR_TRANSPARENT _ENABLE_FOG_ON_TRANSPARENT _SURFACE_TYPE_TRANSPARENT
2828
m_LightmapFlags: 4
2929
m_EnableInstancingVariants: 0
3030
m_DoubleSidedGI: 0
3131
m_CustomRenderQueue: -1
3232
stringTagMap:
3333
MotionVector: User
34+
RenderType: Transparent
3435
disabledShaderPasses:
3536
- DistortionVectors
3637
- MOTIONVECTORS
@@ -133,6 +134,7 @@ Material:
133134
m_Scale: {x: 1, y: 1}
134135
m_Offset: {x: 0, y: 0}
135136
m_Floats:
137+
- Boolean_a74aa7d30fed4055a2d61137d3a383a1: 0
136138
- _AORemapMax: 1
137139
- _AORemapMin: 0
138140
- _ATDistance: 1

TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1802_Depth_Pre_Post/SG Eye/Ref.mat

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,16 +21,17 @@ Material:
2121
m_PrefabInstance: {fileID: 0}
2222
m_PrefabAsset: {fileID: 0}
2323
m_Name: Ref
24-
m_Shader: {fileID: -6465566751694194690, guid: 8d46a59534670f44e81f11cea39f6db5,
24+
m_Shader: {fileID: -6465566751694194690, guid: 3d493fa710ae74242b62906cd1061353,
2525
type: 3}
26-
m_ShaderKeywords: _ALPHATEST_ON _BLENDMODE_ALPHA _DISABLE_SSR_TRANSPARENT _ENABLE_FOG_ON_TRANSPARENT
27-
_SURFACE_TYPE_TRANSPARENT
26+
m_ShaderKeywords: _ALPHATEST_ON _BLENDMODE_ALPHA _BLENDMODE_PRESERVE_SPECULAR_LIGHTING
27+
_DISABLE_SSR_TRANSPARENT _ENABLE_FOG_ON_TRANSPARENT _SURFACE_TYPE_TRANSPARENT
2828
m_LightmapFlags: 4
2929
m_EnableInstancingVariants: 0
3030
m_DoubleSidedGI: 0
3131
m_CustomRenderQueue: -1
3232
stringTagMap:
3333
MotionVector: User
34+
RenderType: Transparent
3435
disabledShaderPasses:
3536
- DistortionVectors
3637
- MOTIONVECTORS
@@ -134,6 +135,7 @@ Material:
134135
m_Scale: {x: 1, y: 1}
135136
m_Offset: {x: 0, y: 0}
136137
m_Floats:
138+
- Boolean_a74aa7d30fed4055a2d61137d3a383a1: 0
137139
- _AORemapMax: 1
138140
- _AORemapMin: 0
139141
- _ATDistance: 1

0 commit comments

Comments
 (0)