Skip to content

Commit 8882d8c

Browse files
committed
Added URP to avoid shader compile errors.
1 parent 63ac612 commit 8882d8c

File tree

8 files changed

+106
-7
lines changed

8 files changed

+106
-7
lines changed

TestProjects/HDRPUTS_GraphicsTest-2020.2/Assets/HDRP/Materials/Emissive_Standard.mat

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ MonoBehaviour:
1212
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
1313
m_Name:
1414
m_EditorClassIdentifier:
15-
version: 2
15+
version: 4
1616
--- !u!21 &2100000
1717
Material:
1818
serializedVersion: 6
@@ -149,6 +149,18 @@ Material:
149149
m_Texture: {fileID: 0}
150150
m_Scale: {x: 1, y: 1}
151151
m_Offset: {x: 0, y: 0}
152+
- unity_Lightmaps:
153+
m_Texture: {fileID: 0}
154+
m_Scale: {x: 1, y: 1}
155+
m_Offset: {x: 0, y: 0}
156+
- unity_LightmapsInd:
157+
m_Texture: {fileID: 0}
158+
m_Scale: {x: 1, y: 1}
159+
m_Offset: {x: 0, y: 0}
160+
- unity_ShadowMasks:
161+
m_Texture: {fileID: 0}
162+
m_Scale: {x: 1, y: 1}
163+
m_Offset: {x: 0, y: 0}
152164
m_Floats:
153165
- _1st2nd_Shades_Feather: 0.0001
154166
- _1st_ShadeColor_Feather: 0.0001
@@ -172,12 +184,15 @@ Material:
172184
- _BumpScale: 1
173185
- _BumpScaleMatcap: 1
174186
- _CameraRolling_Stabilizer: 0
187+
- _ClearCoatMask: 0
188+
- _ClearCoatSmoothness: 0
175189
- _ClippingMode: 0
176190
- _Clipping_Level: 0
177191
- _ColorShift_Speed: 0
178192
- _Cull: 2
179193
- _CullMode: 2
180194
- _Cutoff: 0.5
195+
- _DetailAlbedoMapScale: 1
181196
- _DetailNormalMapScale: 1
182197
- _DstBlend: 0
183198
- _EMISSIVE: 0
@@ -287,11 +302,12 @@ Material:
287302
- _BaseColor: {r: 1, g: 1, b: 1, a: 1}
288303
- _Color: {r: 1, g: 1, b: 1, a: 1}
289304
- _ColorShift: {r: 0, g: 0, b: 0, a: 1}
290-
- _EmissionColor: {r: 1.5, g: 0, b: 0, a: 1}
305+
- _EmissionColor: {r: 2.4400616, g: 0, b: 0, a: 1}
291306
- _Emissive_Color: {r: 0, g: 0, b: 0, a: 1}
292307
- _HighColor: {r: 0, g: 0, b: 0, a: 1}
293308
- _MatCapColor: {r: 1, g: 1, b: 1, a: 1}
294309
- _Outline_Color: {r: 0.5, g: 0.5, b: 0.5, a: 1}
295310
- _RimLightColor: {r: 1, g: 1, b: 1, a: 1}
296311
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
297312
- _ViewShift: {r: 0, g: 0, b: 0, a: 1}
313+
m_BuildTextureStacks: []

TestProjects/HDRPUTS_GraphicsTest-2020.2/Assets/HDRP/ShaderBall/Materials/CalibrationGreyscaleDark.mat

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ MonoBehaviour:
1212
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
1313
m_Name:
1414
m_EditorClassIdentifier:
15-
version: 2
15+
version: 4
1616
--- !u!21 &2100000
1717
Material:
1818
serializedVersion: 6
@@ -81,13 +81,28 @@ Material:
8181
m_Texture: {fileID: 0}
8282
m_Scale: {x: 1, y: 1}
8383
m_Offset: {x: 0, y: 0}
84+
- unity_Lightmaps:
85+
m_Texture: {fileID: 0}
86+
m_Scale: {x: 1, y: 1}
87+
m_Offset: {x: 0, y: 0}
88+
- unity_LightmapsInd:
89+
m_Texture: {fileID: 0}
90+
m_Scale: {x: 1, y: 1}
91+
m_Offset: {x: 0, y: 0}
92+
- unity_ShadowMasks:
93+
m_Texture: {fileID: 0}
94+
m_Scale: {x: 1, y: 1}
95+
m_Offset: {x: 0, y: 0}
8496
m_Floats:
8597
- _AlphaClip: 0
8698
- _AlphaTestRef: 0.5
8799
- _Blend: 0
88100
- _BumpScale: 1
101+
- _ClearCoatMask: 0
102+
- _ClearCoatSmoothness: 0
89103
- _Cull: 2
90104
- _Cutoff: 0.5
105+
- _DetailAlbedoMapScale: 1
91106
- _DetailNormalMapScale: 1
92107
- _DstBlend: 0
93108
- _EmissionScaleUI: 1
@@ -118,3 +133,4 @@ Material:
118133
- _EmissionColorWithMapUI: {r: 1, g: 1, b: 1, a: 1}
119134
- _SpecColor: {r: 0, g: 0, b: 0, a: 1}
120135
- _SpecularColor: {r: 0.2, g: 0.2, b: 0.2, a: 1}
136+
m_BuildTextureStacks: []

TestProjects/HDRPUTS_GraphicsTest-2020.2/Assets/HDRP/ShaderBall/Materials/CalibrationGreyscaleLight.mat

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ MonoBehaviour:
1212
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
1313
m_Name:
1414
m_EditorClassIdentifier:
15-
version: 2
15+
version: 4
1616
--- !u!21 &2100000
1717
Material:
1818
serializedVersion: 6
@@ -81,13 +81,28 @@ Material:
8181
m_Texture: {fileID: 0}
8282
m_Scale: {x: 1, y: 1}
8383
m_Offset: {x: 0, y: 0}
84+
- unity_Lightmaps:
85+
m_Texture: {fileID: 0}
86+
m_Scale: {x: 1, y: 1}
87+
m_Offset: {x: 0, y: 0}
88+
- unity_LightmapsInd:
89+
m_Texture: {fileID: 0}
90+
m_Scale: {x: 1, y: 1}
91+
m_Offset: {x: 0, y: 0}
92+
- unity_ShadowMasks:
93+
m_Texture: {fileID: 0}
94+
m_Scale: {x: 1, y: 1}
95+
m_Offset: {x: 0, y: 0}
8496
m_Floats:
8597
- _AlphaClip: 0
8698
- _AlphaTestRef: 0.5
8799
- _Blend: 0
88100
- _BumpScale: 1
101+
- _ClearCoatMask: 0
102+
- _ClearCoatSmoothness: 0
89103
- _Cull: 2
90104
- _Cutoff: 0.5
105+
- _DetailAlbedoMapScale: 1
91106
- _DetailNormalMapScale: 1
92107
- _DstBlend: 0
93108
- _EmissionScaleUI: 1
@@ -118,3 +133,4 @@ Material:
118133
- _EmissionColorWithMapUI: {r: 1, g: 1, b: 1, a: 1}
119134
- _SpecColor: {r: 0, g: 0, b: 0, a: 1}
120135
- _SpecularColor: {r: 0.2, g: 0.2, b: 0.2, a: 1}
136+
m_BuildTextureStacks: []

TestProjects/HDRPUTS_GraphicsTest-2020.2/Assets/HDRP/ShaderBall/Materials/checkerA.mat

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ MonoBehaviour:
1212
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
1313
m_Name:
1414
m_EditorClassIdentifier:
15-
version: 2
15+
version: 4
1616
--- !u!21 &2100000
1717
Material:
1818
serializedVersion: 6
@@ -77,12 +77,27 @@ Material:
7777
m_Texture: {fileID: 0}
7878
m_Scale: {x: 1, y: 1}
7979
m_Offset: {x: 0, y: 0}
80+
- unity_Lightmaps:
81+
m_Texture: {fileID: 0}
82+
m_Scale: {x: 1, y: 1}
83+
m_Offset: {x: 0, y: 0}
84+
- unity_LightmapsInd:
85+
m_Texture: {fileID: 0}
86+
m_Scale: {x: 1, y: 1}
87+
m_Offset: {x: 0, y: 0}
88+
- unity_ShadowMasks:
89+
m_Texture: {fileID: 0}
90+
m_Scale: {x: 1, y: 1}
91+
m_Offset: {x: 0, y: 0}
8092
m_Floats:
8193
- _AlphaClip: 0
8294
- _Blend: 0
8395
- _BumpScale: 1
96+
- _ClearCoatMask: 0
97+
- _ClearCoatSmoothness: 0
8498
- _Cull: 2
8599
- _Cutoff: 0.5
100+
- _DetailAlbedoMapScale: 1
86101
- _DetailNormalMapScale: 1
87102
- _DstBlend: 0
88103
- _EnvironmentReflections: 1
@@ -108,3 +123,4 @@ Material:
108123
- _Color: {r: 1, g: 1, b: 1, a: 1}
109124
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
110125
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
126+
m_BuildTextureStacks: []

TestProjects/HDRPUTS_GraphicsTest-2020.2/Assets/HDRP/ShaderBall/Materials/white.mat

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ MonoBehaviour:
1212
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
1313
m_Name:
1414
m_EditorClassIdentifier:
15-
version: 2
15+
version: 4
1616
--- !u!21 &2100000
1717
Material:
1818
serializedVersion: 6
@@ -77,12 +77,27 @@ Material:
7777
m_Texture: {fileID: 0}
7878
m_Scale: {x: 1, y: 1}
7979
m_Offset: {x: 0, y: 0}
80+
- unity_Lightmaps:
81+
m_Texture: {fileID: 0}
82+
m_Scale: {x: 1, y: 1}
83+
m_Offset: {x: 0, y: 0}
84+
- unity_LightmapsInd:
85+
m_Texture: {fileID: 0}
86+
m_Scale: {x: 1, y: 1}
87+
m_Offset: {x: 0, y: 0}
88+
- unity_ShadowMasks:
89+
m_Texture: {fileID: 0}
90+
m_Scale: {x: 1, y: 1}
91+
m_Offset: {x: 0, y: 0}
8092
m_Floats:
8193
- _AlphaClip: 0
8294
- _Blend: 0
8395
- _BumpScale: 1
96+
- _ClearCoatMask: 0
97+
- _ClearCoatSmoothness: 0
8498
- _Cull: 2
8599
- _Cutoff: 0.5
100+
- _DetailAlbedoMapScale: 1
86101
- _DetailNormalMapScale: 1
87102
- _DstBlend: 0
88103
- _EnvironmentReflections: 1
@@ -108,3 +123,4 @@ Material:
108123
- _Color: {r: 1, g: 1, b: 1, a: 1}
109124
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
110125
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
126+
m_BuildTextureStacks: []

TestProjects/HDRPUTS_GraphicsTest-2020.2/Packages/manifest.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
"com.unity.package-validation-suite": "0.10.0-preview",
77
"com.unity.raytracedhardshadow": "https://github.com/unity3d-jp/RaytracedHardShadow.git",
88
"com.unity.render-pipelines.high-definition": "10.3.2",
9+
"com.unity.render-pipelines.universal": "10.3.2",
910
"com.unity.test-framework": "1.1.24",
1011
"com.unity.test-framework.build": "0.0.1-preview.12",
1112
"com.unity.test-framework.utp-reporter": "1.1.0-preview",

TestProjects/HDRPUTS_GraphicsTest-2020.2/Packages/packages-lock.json

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,13 @@
5555
"dependencies": {},
5656
"url": "https://packages.unity.com"
5757
},
58+
"com.unity.mathematics": {
59+
"version": "1.1.0",
60+
"depth": 1,
61+
"source": "registry",
62+
"dependencies": {},
63+
"url": "https://packages.unity.com"
64+
},
5865
"com.unity.nuget.newtonsoft-json": {
5966
"version": "2.0.0-preview",
6067
"depth": 1,
@@ -108,6 +115,17 @@
108115
},
109116
"url": "https://packages.unity.com"
110117
},
118+
"com.unity.render-pipelines.universal": {
119+
"version": "10.3.2",
120+
"depth": 0,
121+
"source": "registry",
122+
"dependencies": {
123+
"com.unity.mathematics": "1.1.0",
124+
"com.unity.render-pipelines.core": "10.3.2",
125+
"com.unity.shadergraph": "10.3.2"
126+
},
127+
"url": "https://packages.unity.com"
128+
},
111129
"com.unity.scriptablebuildpipeline": {
112130
"version": "1.17.0",
113131
"depth": 2,

TestProjects/HDRPUTS_GraphicsTest-2020.2/ProjectSettings/URPProjectSettings.asset

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,4 @@ MonoBehaviour:
1212
m_Script: {fileID: 11500000, guid: 247994e1f5a72c2419c26a37e9334c01, type: 3}
1313
m_Name:
1414
m_EditorClassIdentifier:
15-
m_LastMaterialVersion: 2
15+
m_LastMaterialVersion: 4

0 commit comments

Comments
 (0)