Skip to content

Commit eca4b9b

Browse files
sebastienlagarderemi-chapelainJordanL8FrancescoC-unityVic-Cooper
authored
Backport HDRP PRs for 10.4.0 (#3492)
* [Hdrp] Add 3DS max shader material test (#3239) * Arnold + Physical material * auto desk interactive * Reference image from yamato * linux vulkan test ref image * Update HDRP-Asset.md (#3302) * Merge Hd/bugfix #3313 * Added master stack documentation for HDRP #3388 * Fix compilation issue in MaterialUIBlockLists * Reset ambient probe upon switching to very different skies bis #3423 * Some leftover caused by master merge (#3456) * Custom Pass error message fix #3424 * Colored Shadows update (#3486) * Colored Shadows update Included new information in the Color Shadow property description to tell the user that the Material's Refraction Model has to be set to Thin, Box or Sphere for it to work. * Fixed typo Removed the "the" :D Co-authored-by: Rémi Chapelain <[email protected]> Co-authored-by: Lewis Jordan <[email protected]> Co-authored-by: FrancescoC-unity <[email protected]> Co-authored-by: Vic Cooper <[email protected]>
1 parent 74d7b1b commit eca4b9b

File tree

214 files changed

+9069
-737
lines changed

Some content is hidden

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

214 files changed

+9069
-737
lines changed

‎TestProjects/HDRP_RuntimeTests/Assets/Scenes/002-HDMaterials.unity‎

Lines changed: 669 additions & 570 deletions
Large diffs are not rendered by default.

‎TestProjects/HDRP_RuntimeTests/Assets/Scenes/002-HDMaterials/AnimatedDecal 1.mat‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,10 @@ Material:
3737
m_Texture: {fileID: 2800000, guid: fcecce6d2c9be8d418a27f0658a2210d, type: 3}
3838
m_Scale: {x: 1, y: 1}
3939
m_Offset: {x: 0, y: 0}
40+
- _SampleTexture2D_52555058f421518fa1159536b0ef5770_Texture_1:
41+
m_Texture: {fileID: 2800000, guid: fcecce6d2c9be8d418a27f0658a2210d, type: 3}
42+
m_Scale: {x: 1, y: 1}
43+
m_Offset: {x: 0, y: 0}
4044
- _SampleTexture2D_5837ea117a574c30b83a120690f269a8_Texture_1:
4145
m_Texture: {fileID: 2800000, guid: fcecce6d2c9be8d418a27f0658a2210d, type: 3}
4246
m_Scale: {x: 1, y: 1}
@@ -57,6 +61,19 @@ Material:
5761
m_Texture: {fileID: 2800000, guid: fcecce6d2c9be8d418a27f0658a2210d, type: 3}
5862
m_Scale: {x: 1, y: 1}
5963
m_Offset: {x: 0, y: 0}
64+
- unity_Lightmaps:
65+
m_Texture: {fileID: 0}
66+
m_Scale: {x: 1, y: 1}
67+
m_Offset: {x: 0, y: 0}
68+
- unity_LightmapsInd:
69+
m_Texture: {fileID: 0}
70+
m_Scale: {x: 1, y: 1}
71+
m_Offset: {x: 0, y: 0}
72+
- unity_ShadowMasks:
73+
m_Texture: {fileID: 0}
74+
m_Scale: {x: 1, y: 1}
75+
m_Offset: {x: 0, y: 0}
76+
m_Ints: []
6077
m_Floats:
6178
- _AffectAO: 1
6279
- _AffectAlbedo: 1
@@ -69,7 +86,9 @@ Material:
6986
- _DecalColorMask1: 15
7087
- _DecalColorMask2: 15
7188
- _DecalColorMask3: 12
89+
- _DecalMeshBiasType: 0
7290
- _DecalMeshDepthBias: 0
91+
- _DecalMeshViewBias: 0
7392
- _DecalStencilRef: 16
7493
- _DecalStencilWriteMask: 16
7594
- _DrawOrder: -2

‎TestProjects/HDRP_RuntimeTests/Assets/Scenes/002-HDMaterials/AnimatedDecal 2.mat‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,10 @@ Material:
3737
m_Texture: {fileID: 2800000, guid: fcecce6d2c9be8d418a27f0658a2210d, type: 3}
3838
m_Scale: {x: 1, y: 1}
3939
m_Offset: {x: 0, y: 0}
40+
- _SampleTexture2D_52555058f421518fa1159536b0ef5770_Texture_1:
41+
m_Texture: {fileID: 2800000, guid: fcecce6d2c9be8d418a27f0658a2210d, type: 3}
42+
m_Scale: {x: 1, y: 1}
43+
m_Offset: {x: 0, y: 0}
4044
- _SampleTexture2D_5837ea117a574c30b83a120690f269a8_Texture_1:
4145
m_Texture: {fileID: 2800000, guid: fcecce6d2c9be8d418a27f0658a2210d, type: 3}
4246
m_Scale: {x: 1, y: 1}
@@ -57,6 +61,19 @@ Material:
5761
m_Texture: {fileID: 2800000, guid: fcecce6d2c9be8d418a27f0658a2210d, type: 3}
5862
m_Scale: {x: 1, y: 1}
5963
m_Offset: {x: 0, y: 0}
64+
- unity_Lightmaps:
65+
m_Texture: {fileID: 0}
66+
m_Scale: {x: 1, y: 1}
67+
m_Offset: {x: 0, y: 0}
68+
- unity_LightmapsInd:
69+
m_Texture: {fileID: 0}
70+
m_Scale: {x: 1, y: 1}
71+
m_Offset: {x: 0, y: 0}
72+
- unity_ShadowMasks:
73+
m_Texture: {fileID: 0}
74+
m_Scale: {x: 1, y: 1}
75+
m_Offset: {x: 0, y: 0}
76+
m_Ints: []
6077
m_Floats:
6178
- _AffectAO: 1
6279
- _AffectAlbedo: 1
@@ -69,7 +86,9 @@ Material:
6986
- _DecalColorMask1: 15
7087
- _DecalColorMask2: 15
7188
- _DecalColorMask3: 12
89+
- _DecalMeshBiasType: 0
7290
- _DecalMeshDepthBias: 0
91+
- _DecalMeshViewBias: 0
7392
- _DecalStencilRef: 16
7493
- _DecalStencilWriteMask: 16
7594
- _DrawOrder: 3

‎TestProjects/HDRP_RuntimeTests/Assets/Scenes/002-HDMaterials/AnimatedDecal 3.mat‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,10 @@ Material:
3737
m_Texture: {fileID: 2800000, guid: fcecce6d2c9be8d418a27f0658a2210d, type: 3}
3838
m_Scale: {x: 1, y: 1}
3939
m_Offset: {x: 0, y: 0}
40+
- _SampleTexture2D_52555058f421518fa1159536b0ef5770_Texture_1:
41+
m_Texture: {fileID: 2800000, guid: fcecce6d2c9be8d418a27f0658a2210d, type: 3}
42+
m_Scale: {x: 1, y: 1}
43+
m_Offset: {x: 0, y: 0}
4044
- _SampleTexture2D_5837ea117a574c30b83a120690f269a8_Texture_1:
4145
m_Texture: {fileID: 2800000, guid: fcecce6d2c9be8d418a27f0658a2210d, type: 3}
4246
m_Scale: {x: 1, y: 1}
@@ -57,6 +61,19 @@ Material:
5761
m_Texture: {fileID: 2800000, guid: fcecce6d2c9be8d418a27f0658a2210d, type: 3}
5862
m_Scale: {x: 1, y: 1}
5963
m_Offset: {x: 0, y: 0}
64+
- unity_Lightmaps:
65+
m_Texture: {fileID: 0}
66+
m_Scale: {x: 1, y: 1}
67+
m_Offset: {x: 0, y: 0}
68+
- unity_LightmapsInd:
69+
m_Texture: {fileID: 0}
70+
m_Scale: {x: 1, y: 1}
71+
m_Offset: {x: 0, y: 0}
72+
- unity_ShadowMasks:
73+
m_Texture: {fileID: 0}
74+
m_Scale: {x: 1, y: 1}
75+
m_Offset: {x: 0, y: 0}
76+
m_Ints: []
6077
m_Floats:
6178
- _AffectAO: 1
6279
- _AffectAlbedo: 1
@@ -69,7 +86,9 @@ Material:
6986
- _DecalColorMask1: 15
7087
- _DecalColorMask2: 15
7188
- _DecalColorMask3: 12
89+
- _DecalMeshBiasType: 0
7290
- _DecalMeshDepthBias: 0
91+
- _DecalMeshViewBias: 0
7392
- _DecalStencilRef: 16
7493
- _DecalStencilWriteMask: 16
7594
- _DrawOrder: 2

‎TestProjects/HDRP_RuntimeTests/Assets/Scenes/002-HDMaterials/AnimatedDecal 4.mat‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,10 @@ Material:
3737
m_Texture: {fileID: 2800000, guid: fcecce6d2c9be8d418a27f0658a2210d, type: 3}
3838
m_Scale: {x: 1, y: 1}
3939
m_Offset: {x: 0, y: 0}
40+
- _SampleTexture2D_52555058f421518fa1159536b0ef5770_Texture_1:
41+
m_Texture: {fileID: 2800000, guid: fcecce6d2c9be8d418a27f0658a2210d, type: 3}
42+
m_Scale: {x: 1, y: 1}
43+
m_Offset: {x: 0, y: 0}
4044
- _SampleTexture2D_5837ea117a574c30b83a120690f269a8_Texture_1:
4145
m_Texture: {fileID: 2800000, guid: fcecce6d2c9be8d418a27f0658a2210d, type: 3}
4246
m_Scale: {x: 1, y: 1}
@@ -57,6 +61,19 @@ Material:
5761
m_Texture: {fileID: 2800000, guid: fcecce6d2c9be8d418a27f0658a2210d, type: 3}
5862
m_Scale: {x: 1, y: 1}
5963
m_Offset: {x: 0, y: 0}
64+
- unity_Lightmaps:
65+
m_Texture: {fileID: 0}
66+
m_Scale: {x: 1, y: 1}
67+
m_Offset: {x: 0, y: 0}
68+
- unity_LightmapsInd:
69+
m_Texture: {fileID: 0}
70+
m_Scale: {x: 1, y: 1}
71+
m_Offset: {x: 0, y: 0}
72+
- unity_ShadowMasks:
73+
m_Texture: {fileID: 0}
74+
m_Scale: {x: 1, y: 1}
75+
m_Offset: {x: 0, y: 0}
76+
m_Ints: []
6077
m_Floats:
6178
- _AffectAO: 1
6279
- _AffectAlbedo: 1
@@ -69,7 +86,9 @@ Material:
6986
- _DecalColorMask1: 15
7087
- _DecalColorMask2: 15
7188
- _DecalColorMask3: 12
89+
- _DecalMeshBiasType: 0
7290
- _DecalMeshDepthBias: 0
91+
- _DecalMeshViewBias: 0
7392
- _DecalStencilRef: 16
7493
- _DecalStencilWriteMask: 16
7594
- _DrawOrder: -2

‎TestProjects/HDRP_RuntimeTests/Assets/Scenes/002-HDMaterials/AnimatedDecal.mat‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,10 @@ Material:
3737
m_Texture: {fileID: 2800000, guid: fcecce6d2c9be8d418a27f0658a2210d, type: 3}
3838
m_Scale: {x: 1, y: 1}
3939
m_Offset: {x: 0, y: 0}
40+
- _SampleTexture2D_52555058f421518fa1159536b0ef5770_Texture_1:
41+
m_Texture: {fileID: 2800000, guid: fcecce6d2c9be8d418a27f0658a2210d, type: 3}
42+
m_Scale: {x: 1, y: 1}
43+
m_Offset: {x: 0, y: 0}
4044
- _SampleTexture2D_5837ea117a574c30b83a120690f269a8_Texture_1:
4145
m_Texture: {fileID: 2800000, guid: fcecce6d2c9be8d418a27f0658a2210d, type: 3}
4246
m_Scale: {x: 1, y: 1}
@@ -57,6 +61,19 @@ Material:
5761
m_Texture: {fileID: 2800000, guid: fcecce6d2c9be8d418a27f0658a2210d, type: 3}
5862
m_Scale: {x: 1, y: 1}
5963
m_Offset: {x: 0, y: 0}
64+
- unity_Lightmaps:
65+
m_Texture: {fileID: 0}
66+
m_Scale: {x: 1, y: 1}
67+
m_Offset: {x: 0, y: 0}
68+
- unity_LightmapsInd:
69+
m_Texture: {fileID: 0}
70+
m_Scale: {x: 1, y: 1}
71+
m_Offset: {x: 0, y: 0}
72+
- unity_ShadowMasks:
73+
m_Texture: {fileID: 0}
74+
m_Scale: {x: 1, y: 1}
75+
m_Offset: {x: 0, y: 0}
76+
m_Ints: []
6077
m_Floats:
6178
- _AffectAO: 1
6279
- _AffectAlbedo: 1
@@ -69,7 +86,9 @@ Material:
6986
- _DecalColorMask1: 15
7087
- _DecalColorMask2: 15
7188
- _DecalColorMask3: 12
89+
- _DecalMeshBiasType: 0
7290
- _DecalMeshDepthBias: 0
91+
- _DecalMeshViewBias: 0
7392
- _DecalStencilRef: 16
7493
- _DecalStencilWriteMask: 16
7594
- _DrawOrder: -1

‎TestProjects/HDRP_RuntimeTests/Assets/Scenes/002-HDMaterials/AnimatedMeshDecal.mat‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,10 @@ Material:
4141
m_Texture: {fileID: 2800000, guid: 9f19737ffbb4a694caf1778274c346ab, type: 3}
4242
m_Scale: {x: 1, y: 1}
4343
m_Offset: {x: 0, y: 0}
44+
- _SampleTexture2D_22ab0c98da19fa8cb25fd19a0aeeb31b_Texture_1:
45+
m_Texture: {fileID: 2800000, guid: 9afbfdeb6447dc74089f286f49995089, type: 3}
46+
m_Scale: {x: 1, y: 1}
47+
m_Offset: {x: 0, y: 0}
4448
- _SampleTexture2D_234b653769274d599f16c88325d2e6ae_Texture_1:
4549
m_Texture: {fileID: 2800000, guid: 9f19737ffbb4a694caf1778274c346ab, type: 3}
4650
m_Scale: {x: 1, y: 1}
@@ -69,6 +73,10 @@ Material:
6973
m_Texture: {fileID: 2800000, guid: f23830c1beb532d4a8bf9a720ef56e25, type: 3}
7074
m_Scale: {x: 1, y: 1}
7175
m_Offset: {x: 0, y: 0}
76+
- _SampleTexture2D_922ed2f15209728c934f7ad08e8df067_Texture_1:
77+
m_Texture: {fileID: 2800000, guid: 9f19737ffbb4a694caf1778274c346ab, type: 3}
78+
m_Scale: {x: 1, y: 1}
79+
m_Offset: {x: 0, y: 0}
7280
- _SampleTexture2D_998a067d9ebe483eaf2b10434380d263_Texture_1:
7381
m_Texture: {fileID: 2800000, guid: 9f19737ffbb4a694caf1778274c346ab, type: 3}
7482
m_Scale: {x: 1, y: 1}
@@ -77,6 +85,10 @@ Material:
7785
m_Texture: {fileID: 2800000, guid: 9f19737ffbb4a694caf1778274c346ab, type: 3}
7886
m_Scale: {x: 1, y: 1}
7987
m_Offset: {x: 0, y: 0}
88+
- _SampleTexture2D_b38e27eec0c6198ab3dec7c4cf4437e3_Texture_1:
89+
m_Texture: {fileID: 2800000, guid: f23830c1beb532d4a8bf9a720ef56e25, type: 3}
90+
m_Scale: {x: 1, y: 1}
91+
m_Offset: {x: 0, y: 0}
8092
- _SampleTexture2D_b4b43955db0f4c4b8749459e55a590f4_Texture_1:
8193
m_Texture: {fileID: 2800000, guid: 9afbfdeb6447dc74089f286f49995089, type: 3}
8294
m_Scale: {x: 1, y: 1}
@@ -105,6 +117,19 @@ Material:
105117
m_Texture: {fileID: 2800000, guid: 9f19737ffbb4a694caf1778274c346ab, type: 3}
106118
m_Scale: {x: 1, y: 1}
107119
m_Offset: {x: 0, y: 0}
120+
- unity_Lightmaps:
121+
m_Texture: {fileID: 0}
122+
m_Scale: {x: 1, y: 1}
123+
m_Offset: {x: 0, y: 0}
124+
- unity_LightmapsInd:
125+
m_Texture: {fileID: 0}
126+
m_Scale: {x: 1, y: 1}
127+
m_Offset: {x: 0, y: 0}
128+
- unity_ShadowMasks:
129+
m_Texture: {fileID: 0}
130+
m_Scale: {x: 1, y: 1}
131+
m_Offset: {x: 0, y: 0}
132+
m_Ints: []
108133
m_Floats:
109134
- _AffectAO: 1
110135
- _AffectAlbedo: 1
@@ -117,7 +142,9 @@ Material:
117142
- _DecalColorMask1: 15
118143
- _DecalColorMask2: 15
119144
- _DecalColorMask3: 12
145+
- _DecalMeshBiasType: 0
120146
- _DecalMeshDepthBias: 0
147+
- _DecalMeshViewBias: 0
121148
- _DecalStencilRef: 16
122149
- _DecalStencilWriteMask: 16
123150
- _DrawOrder: 0

‎TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1550_3dsMax.meta‎

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)