Skip to content

Commit e9cebe9

Browse files
committed
Merge branch 'universal/staging'
2 parents 5347fc3 + 032c36f commit e9cebe9

File tree

95 files changed

+3261
-322
lines changed

Some content is hidden

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

95 files changed

+3261
-322
lines changed

TestProjects/UniversalGraphicsTest_2D/Assets/CommonAssets/UniversalRPAsset.asset

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,12 @@ MonoBehaviour:
3030
- {fileID: 11400000, guid: 01247c41aba2d4bc0ad94a11af8bdb11, type: 2}
3131
- {fileID: 11400000, guid: 04618ff2d33c0432a81d00fdee3fae55, type: 2}
3232
- {fileID: 11400000, guid: eae387d1d2a20a946ae2441e0319f1a0, type: 2}
33+
- {fileID: 11400000, guid: ab4527fe9ad5ef949bffe9447fabcfa2, type: 2}
3334
m_DefaultRendererIndex: 3
3435
m_RequireDepthTexture: 1
3536
m_RequireOpaqueTexture: 1
3637
m_OpaqueDownsampling: 1
3738
m_SupportsTerrainHoles: 1
38-
m_StoreActionsOptimization: 0
3939
m_SupportsHDR: 1
4040
m_MSAA: 4
4141
m_RenderScale: 1
@@ -60,13 +60,16 @@ MonoBehaviour:
6060
m_ShadowDepthBias: 1
6161
m_ShadowNormalBias: 1
6262
m_SoftShadowsSupported: 1
63+
m_ConservativeEnclosingSphere: 0
64+
m_NumIterationsEnclosingSphere: 64
6365
m_AdditionalLightsCookieResolution: 2048
6466
m_AdditionalLightsCookieFormat: 3
6567
m_UseSRPBatcher: 1
6668
m_SupportsDynamicBatching: 0
6769
m_MixedLightingSupported: 1
6870
m_SupportsLightLayers: 0
6971
m_DebugLevel: 0
72+
m_StoreActionsOptimization: 0
7073
m_UseAdaptivePerformance: 1
7174
m_ColorGradingMode: 0
7275
m_ColorGradingLutSize: 32
Lines changed: 3 additions & 0 deletions
Loading

TestProjects/UniversalGraphicsTest_2D/Assets/ReferenceImages/Linear/Android/OpenGLES3/None/014_Layer_Batching_GlobalLightWithShadows.png.meta

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

TestProjects/UniversalGraphicsTest_2D/Assets/ReferenceImages/Linear/Android/Vulkan/None/014_Layer_Batching_GlobalLightWithShadows.png.meta

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

TestProjects/UniversalGraphicsTest_2D/Assets/ReferenceImages/Linear/IPhonePlayer/Metal/None/014_Layer_Batching_GlobalLightWithShadows.png.meta

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

0 commit comments

Comments
 (0)