Skip to content

Commit 7b17ee0

Browse files
svc-reach-platform-supportEvergreen
svc-reach-platform-support
authored and
Evergreen
committed
[Port] [6000.0][URP] Fixing an issue where ScreenSpaceShadows weren't working with Decals (UUM-81517)
Fixes UUM-81517.
1 parent 1ae844e commit 7b17ee0

15 files changed

Lines changed: 1288 additions & 217 deletions

‎Packages/com.unity.render-pipelines.universal/Editor/ShaderGraph/Targets/UniversalDecalSubTarget.cs‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -651,8 +651,7 @@ static class DecalRequiredFields
651651
UniversalStructFields.Varyings.sh,
652652
UniversalStructFields.Varyings.probeOcclusion,
653653
UniversalStructFields.Varyings.fogFactorAndVertexLight, // fog and vertex lighting, vert input is dependency
654-
// todo
655-
//UniversalStructFields.Varyings.shadowCoord, // shadow coord, vert input is dependency
654+
UniversalStructFields.Varyings.shadowCoord, // shadow coord, vert input is dependency
656655
};
657656

658657
public static FieldCollection GBufferProjector = new FieldCollection()
@@ -662,8 +661,7 @@ static class DecalRequiredFields
662661
UniversalStructFields.Varyings.dynamicLightmapUV,
663662
UniversalStructFields.Varyings.sh,
664663
UniversalStructFields.Varyings.probeOcclusion,
665-
// todo
666-
//UniversalStructFields.Varyings.shadowCoord, // shadow coord, vert input is dependency
664+
UniversalStructFields.Varyings.shadowCoord, // shadow coord, vert input is dependency
667665
};
668666

669667
public static FieldCollection ScreenSpaceMesh = new FieldCollection()
@@ -681,8 +679,7 @@ static class DecalRequiredFields
681679
UniversalStructFields.Varyings.sh,
682680
UniversalStructFields.Varyings.probeOcclusion,
683681
UniversalStructFields.Varyings.fogFactorAndVertexLight, // fog and vertex lighting, vert input is dependency
684-
// todo
685-
//UniversalStructFields.Varyings.shadowCoord, // shadow coord, vert input is dependency
682+
UniversalStructFields.Varyings.shadowCoord, // shadow coord, vert input is dependency
686683
};
687684
}
688685
#endregion

‎Tests/SRPTests/Packages/com.unity.testing.urp/Scripts/Runtime/SetShadowSettings.cs‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ public struct ShadowSettings
2121
public Vector2 cascade3Split;
2222
public Vector3 cascade4Split;
2323
public float cascadeBorder;
24+
public float shadowDistance;
2425
}
2526

2627
public void OnValidate()
@@ -77,6 +78,7 @@ private void GetShadowSettingsFromAsset(int qualityLevel, ref ShadowSettings set
7778
settings.cascade3Split = urpAsset.cascade3Split;
7879
settings.cascade4Split = urpAsset.cascade4Split;
7980
settings.cascadeBorder = urpAsset.cascadeBorder;
81+
settings.shadowDistance = urpAsset.shadowDistance;
8082
}
8183

8284
private void UpdateShadowSettingsInURPAsset(int qualityLevel, ref ShadowSettings settings)
@@ -91,5 +93,6 @@ private void UpdateShadowSettingsInURPAsset(int qualityLevel, ref ShadowSettings
9193
urpAsset.cascade3Split = settings.cascade3Split;
9294
urpAsset.cascade4Split = settings.cascade4Split;
9395
urpAsset.cascadeBorder = settings.cascadeBorder;
96+
urpAsset.shadowDistance = settings.shadowDistance;
9497
}
9598
}

‎Tests/SRPTests/Projects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/URPAssets/ScreenSpaceShadowsURPAsset.asset‎

Lines changed: 16 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ MonoBehaviour:
1919
m_RendererDataList:
2020
- {fileID: 11400000, guid: 3f63a62897927184393f03bfcc44365a, type: 2}
2121
- {fileID: 11400000, guid: dbd02dcdb14e40d4ab5ea07210293f4a, type: 2}
22+
- {fileID: 11400000, guid: b9a8b90dc6bdd1744872b3d23248fc79, type: 2}
2223
m_DefaultRendererIndex: 0
2324
m_RequireDepthTexture: 1
2425
m_RequireOpaqueTexture: 1
@@ -37,7 +38,10 @@ MonoBehaviour:
3738
m_LightProbeSystem: 0
3839
m_ProbeVolumeMemoryBudget: 1024
3940
m_ProbeVolumeBlendingMemoryBudget: 128
40-
m_SupportProbeVolumeStreaming: 0
41+
m_SupportProbeVolumeGPUStreaming: 0
42+
m_SupportProbeVolumeDiskStreaming: 0
43+
m_SupportProbeVolumeScenarios: 0
44+
m_SupportProbeVolumeScenarioBlending: 0
4145
m_ProbeVolumeSHBands: 1
4246
m_MainLightRenderingMode: 1
4347
m_MainLightShadowsSupported: 1
@@ -73,33 +77,28 @@ MonoBehaviour:
7377
m_SupportsLightLayers: 0
7478
m_DebugLevel: 0
7579
m_StoreActionsOptimization: 0
76-
m_EnableRenderGraph: 0
7780
m_UseAdaptivePerformance: 1
7881
m_ColorGradingMode: 0
7982
m_ColorGradingLutSize: 32
83+
m_AllowPostProcessAlphaOutput: 0
8084
m_UseFastSRGBLinearConversion: 0
8185
m_SupportDataDrivenLensFlare: 0
8286
m_SupportScreenSpaceLensFlare: 0
87+
m_GPUResidentDrawerMode: 0
88+
m_SmallMeshScreenPercentage: 0
89+
m_GPUResidentDrawerEnableOcclusionCullingInCameras: 0
8390
m_ShadowType: 0
8491
m_LocalShadowsSupported: 1
8592
m_LocalShadowsAtlasResolution: 512
8693
m_MaxPixelLights: 4
8794
m_ShadowAtlasResolution: 2048
8895
m_VolumeFrameworkUpdateMode: 0
8996
m_VolumeProfile: {fileID: 0}
90-
m_Textures:
91-
blueNoise64LTex: {fileID: 2800000, guid: e3d24661c1e055f45a7560c033dbb837, type: 3}
92-
bayerMatrixTex: {fileID: 2800000, guid: f9ee4ed84c1d10c49aabb9b210b0fc44, type: 3}
9397
apvScenesData:
94-
m_ObsoleteSerializedBakingSets: []
95-
sceneToBakingSet:
96-
m_Keys: []
97-
m_Values: []
98-
bakingSets: []
99-
sceneBounds:
98+
obsoleteSceneBounds:
10099
m_Keys: []
101100
m_Values: []
102-
hasProbeVolumes:
101+
obsoleteHasProbeVolumes:
103102
m_Keys: []
104103
m_Values:
105104
m_PrefilteringModeMainLightShadows: 3
@@ -112,6 +111,7 @@ MonoBehaviour:
112111
m_PrefilterDebugKeywords: 1
113112
m_PrefilterWriteRenderingLayers: 1
114113
m_PrefilterHDROutput: 1
114+
m_PrefilterAlphaOutput: 0
115115
m_PrefilterSSAODepthNormals: 1
116116
m_PrefilterSSAOSourceDepthLow: 1
117117
m_PrefilterSSAOSourceDepthMedium: 1
@@ -130,5 +130,9 @@ MonoBehaviour:
130130
m_PrefilterSoftShadows: 0
131131
m_PrefilterScreenCoord: 1
132132
m_PrefilterNativeRenderPass: 1
133+
m_PrefilterUseLegacyLightmaps: 0
133134
m_ShaderVariantLogLevel: 0
134135
m_ShadowCascades: 3
136+
m_Textures:
137+
blueNoise64LTex: {fileID: 2800000, guid: e3d24661c1e055f45a7560c033dbb837, type: 3}
138+
bayerMatrixTex: {fileID: 2800000, guid: f9ee4ed84c1d10c49aabb9b210b0fc44, type: 3}

‎Tests/SRPTests/Projects/UniversalGraphicsTest_Foundation/Assets/Scenes/010_AdditionalLightsSorted.unity‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,12 +38,12 @@ RenderSettings:
3838
m_ReflectionIntensity: 0
3939
m_CustomReflection: {fileID: 0}
4040
m_Sun: {fileID: 0}
41-
m_IndirectSpecularColor: {r: 0, g: 0, b: 0, a: 0}
4241
m_UseRadianceAmbientProbe: 0
4342
--- !u!157 &3
4443
LightmapSettings:
4544
m_ObjectHideFlags: 0
46-
serializedVersion: 12
45+
serializedVersion: 13
46+
m_BakeOnSceneLoad: 0
4747
m_GISettings:
4848
serializedVersion: 2
4949
m_BounceScale: 1
@@ -461,6 +461,7 @@ MonoBehaviour:
461461
m_Script: {fileID: 11500000, guid: f088dd7e06b462f44a660d1599df72b9, type: 3}
462462
m_Name:
463463
m_EditorClassIdentifier:
464+
getActiveSettings: 0
464465
shadowSettings:
465466
mainLightShadowmapResolution: 8192
466467
additionalLightShadowmapResolution: 8192
@@ -469,6 +470,7 @@ MonoBehaviour:
469470
cascade3Split: {x: 0, y: 0}
470471
cascade4Split: {x: 0.067, y: 0.2, z: 0.467}
471472
cascadeBorder: 0.1
473+
shadowDistance: 56
472474
--- !u!114 &638156712
473475
MonoBehaviour:
474476
m_ObjectHideFlags: 0

‎Tests/SRPTests/Projects/UniversalGraphicsTest_Foundation/Assets/Scenes/010_AdditionalLightsSorted_Deferred.unity‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,12 +38,12 @@ RenderSettings:
3838
m_ReflectionIntensity: 0
3939
m_CustomReflection: {fileID: 0}
4040
m_Sun: {fileID: 0}
41-
m_IndirectSpecularColor: {r: 0, g: 0, b: 0, a: 0}
4241
m_UseRadianceAmbientProbe: 0
4342
--- !u!157 &3
4443
LightmapSettings:
4544
m_ObjectHideFlags: 0
46-
serializedVersion: 12
45+
serializedVersion: 13
46+
m_BakeOnSceneLoad: 0
4747
m_GISettings:
4848
serializedVersion: 2
4949
m_BounceScale: 1
@@ -391,6 +391,7 @@ MonoBehaviour:
391391
m_Script: {fileID: 11500000, guid: f088dd7e06b462f44a660d1599df72b9, type: 3}
392392
m_Name:
393393
m_EditorClassIdentifier:
394+
getActiveSettings: 0
394395
shadowSettings:
395396
mainLightShadowmapResolution: 8192
396397
additionalLightShadowmapResolution: 8192
@@ -399,6 +400,7 @@ MonoBehaviour:
399400
cascade3Split: {x: 0, y: 0}
400401
cascade4Split: {x: 0.067, y: 0.2, z: 0.467}
401402
cascadeBorder: 0.1
403+
shadowDistance: 56
402404
--- !u!114 &318619274
403405
MonoBehaviour:
404406
m_ObjectHideFlags: 0

‎Tests/SRPTests/Projects/UniversalGraphicsTest_Foundation/Assets/Scenes/056_SoftShadowQuality_Custom_8K_4Cascades.unity‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,8 @@ RenderSettings:
4242
--- !u!157 &3
4343
LightmapSettings:
4444
m_ObjectHideFlags: 0
45-
serializedVersion: 12
45+
serializedVersion: 13
46+
m_BakeOnSceneLoad: 0
4647
m_GISettings:
4748
serializedVersion: 2
4849
m_BounceScale: 1
@@ -1403,6 +1404,7 @@ MonoBehaviour:
14031404
m_Script: {fileID: 11500000, guid: f088dd7e06b462f44a660d1599df72b9, type: 3}
14041405
m_Name:
14051406
m_EditorClassIdentifier:
1407+
getActiveSettings: 0
14061408
shadowSettings:
14071409
mainLightShadowmapResolution: 8192
14081410
additionalLightShadowmapResolution: 8192
@@ -1411,6 +1413,7 @@ MonoBehaviour:
14111413
cascade3Split: {x: 0.15, y: 0.48}
14121414
cascade4Split: {x: 0.067, y: 0.2, z: 0.467}
14131415
cascadeBorder: 0.1
1416+
shadowDistance: 56
14141417
--- !u!4 &1761815841
14151418
Transform:
14161419
m_ObjectHideFlags: 0

‎Tests/SRPTests/Projects/UniversalGraphicsTest_Foundation/Assets/Scenes/057_ShadowsNearPlane_MultipleLights.unity‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,8 @@ RenderSettings:
4242
--- !u!157 &3
4343
LightmapSettings:
4444
m_ObjectHideFlags: 0
45-
serializedVersion: 12
45+
serializedVersion: 13
46+
m_BakeOnSceneLoad: 0
4647
m_GISettings:
4748
serializedVersion: 2
4849
m_BounceScale: 1
@@ -1333,6 +1334,7 @@ MonoBehaviour:
13331334
cascade3Split: {x: 0.154, y: 0.478}
13341335
cascade4Split: {x: 0.067, y: 0.2, z: 0.467}
13351336
cascadeBorder: 0.10000001
1337+
shadowDistance: 56
13361338
--- !u!1 &1581992793
13371339
GameObject:
13381340
m_ObjectHideFlags: 0

‎Tests/SRPTests/Projects/UniversalGraphicsTest_Foundation/Assets/Scenes/057_ShadowsNearPlane_MultipleLights_ShaderGraph.unity‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,8 @@ RenderSettings:
4242
--- !u!157 &3
4343
LightmapSettings:
4444
m_ObjectHideFlags: 0
45-
serializedVersion: 12
45+
serializedVersion: 13
46+
m_BakeOnSceneLoad: 0
4647
m_GISettings:
4748
serializedVersion: 2
4849
m_BounceScale: 1
@@ -1333,6 +1334,7 @@ MonoBehaviour:
13331334
cascade3Split: {x: 0.154, y: 0.478}
13341335
cascade4Split: {x: 0.067, y: 0.2, z: 0.467}
13351336
cascadeBorder: 0.10000001
1337+
shadowDistance: 56
13361338
--- !u!1 &1581992793
13371339
GameObject:
13381340
m_ObjectHideFlags: 0

‎Tests/SRPTests/Projects/UniversalGraphicsTest_Foundation/Assets/Scenes/058_LightLeak_PointLight.unity‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,8 @@ RenderSettings:
4242
--- !u!157 &3
4343
LightmapSettings:
4444
m_ObjectHideFlags: 0
45-
serializedVersion: 12
45+
serializedVersion: 13
46+
m_BakeOnSceneLoad: 0
4647
m_GISettings:
4748
serializedVersion: 2
4849
m_BounceScale: 1
@@ -707,6 +708,7 @@ MonoBehaviour:
707708
m_Script: {fileID: 11500000, guid: f088dd7e06b462f44a660d1599df72b9, type: 3}
708709
m_Name:
709710
m_EditorClassIdentifier:
711+
getActiveSettings: 0
710712
shadowSettings:
711713
mainLightShadowmapResolution: 2048
712714
additionalLightShadowmapResolution: 2048
@@ -715,6 +717,7 @@ MonoBehaviour:
715717
cascade3Split: {x: 0.15, y: 0.48}
716718
cascade4Split: {x: 0.067, y: 0.2, z: 0.467}
717719
cascadeBorder: 0.1
720+
shadowDistance: 56
718721
--- !u!4 &2060885264
719722
Transform:
720723
m_ObjectHideFlags: 0

0 commit comments

Comments
 (0)