Skip to content

Commit f7367ce

Browse files
JonathanHUnityJonathanHUnity
committed
Merge branch 'master' into 0.3.0-staging
2 parents bbdc19d + dc89ad5 commit f7367ce

File tree

19 files changed

+126
-88
lines changed

19 files changed

+126
-88
lines changed

‎.yamato/upm-ci-full.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@ test_trigger:
5656
recurring:
5757
- branch: master
5858
frequency: daily # Should run between midnight and 6AM UTC
59+
cancel_old_ci: true
5960
artifacts:
6061
logs:
6162
paths:

‎TestProjects/PerceptionHDRP/Assets/HDRenderPipelineAsset.asset‎

Lines changed: 53 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ MonoBehaviour:
1212
m_Script: {fileID: 11500000, guid: 0cf1dab834d4ec34195b920ea7bbf9ec, type: 3}
1313
m_Name: HDRenderPipelineAsset
1414
m_EditorClassIdentifier:
15-
m_Version: 9
15+
m_Version: 14
1616
m_ObsoleteFrameSettings:
1717
overrides: 0
1818
enableShadow: 0
@@ -152,10 +152,11 @@ MonoBehaviour:
152152
type: 2}
153153
m_RenderPipelineRayTracingResources: {fileID: 0}
154154
m_DefaultVolumeProfile: {fileID: 0}
155+
m_DefaultLookDevProfile: {fileID: 0}
155156
m_RenderingPathDefaultCameraFrameSettings:
156157
bitDatas:
157-
data1: 69730941533981
158-
data2: 4539628424926265344
158+
data1: 70280697347933
159+
data2: 4539628425463136256
159160
lodBias: 1
160161
lodBiasMode: 0
161162
lodBiasQualityLevel: 0
@@ -194,27 +195,37 @@ MonoBehaviour:
194195
supportVolumetrics: 1
195196
increaseResolutionOfVolumetrics: 0
196197
supportLightLayers: 0
198+
lightLayerName0: Light Layer default
199+
lightLayerName1: Light Layer 1
200+
lightLayerName2: Light Layer 2
201+
lightLayerName3: Light Layer 3
202+
lightLayerName4: Light Layer 4
203+
lightLayerName5: Light Layer 5
204+
lightLayerName6: Light Layer 6
205+
lightLayerName7: Light Layer 7
197206
supportDistortion: 1
198207
supportTransparentBackface: 1
199208
supportTransparentDepthPrepass: 1
200209
supportTransparentDepthPostpass: 1
201210
colorBufferFormat: 74
202-
supportedLitShaderMode: 2
211+
supportCustomPass: 1
212+
customBufferFormat: 12
213+
supportedLitShaderMode: 3
203214
supportDecals: 1
204215
msaaSampleCount: 1
205216
supportMotionVectors: 1
206217
supportRuntimeDebugDisplay: 1
207218
supportDitheringCrossFade: 1
208219
supportTerrainHole: 0
209220
supportRayTracing: 0
210-
supportedRaytracingTier: 2
211221
lightLoopSettings:
212-
cookieSize: 128
213-
cookieTexArraySize: 16
222+
cookieAtlasSize: 512
223+
cookieFormat: 74
214224
pointCookieSize: 128
215225
cubeCookieTexArraySize: 16
216-
planarReflectionProbeCacheSize: 2
217-
planarReflectionTextureSize: 1024
226+
cookieAtlasLastValidMip: 0
227+
cookieTexArraySize: 16
228+
planarReflectionAtlasSize: 4096
218229
reflectionProbeCacheSize: 64
219230
reflectionCubemapSize: 256
220231
reflectionCacheCompressed: 0
@@ -229,6 +240,7 @@ MonoBehaviour:
229240
maxAreaLightsOnScreen: 64
230241
maxEnvLightsOnScreen: 64
231242
maxDecalsOnScreen: 512
243+
maxPlanarReflectionOnScreen: 16
232244
hdShadowInitParams:
233245
maxShadowRequests: 128
234246
directionalShadowsDepthBits: 32
@@ -243,15 +255,22 @@ MonoBehaviour:
243255
useDynamicViewportRescale: 1
244256
shadowResolutionDirectional:
245257
m_Values: 00010000000200000004000000080000
258+
m_SchemaId:
259+
m_Id: With4Levels
246260
shadowResolutionPunctual:
247261
m_Values: 00010000000200000004000000080000
262+
m_SchemaId:
263+
m_Id: With4Levels
248264
shadowResolutionArea:
249265
m_Values: 00010000000200000004000000080000
266+
m_SchemaId:
267+
m_Id: With4Levels
250268
maxDirectionalShadowMapResolution: 2048
251269
maxPunctualShadowMapResolution: 2048
252270
maxAreaShadowMapResolution: 2048
253271
supportScreenSpaceShadows: 0
254-
maxScreenSpaceShadows: 2
272+
maxScreenSpaceShadowSlots: 4
273+
screenSpaceShadowBufferFormat: 48
255274
decalSettings:
256275
drawDistance: 1000
257276
atlasWidth: 4096
@@ -260,6 +279,7 @@ MonoBehaviour:
260279
postProcessSettings:
261280
m_LutSize: 32
262281
lutFormat: 48
282+
bufferFormat: 74
263283
dynamicResolutionSettings:
264284
enabled: 0
265285
maxPercentage: 100
@@ -273,6 +293,7 @@ MonoBehaviour:
273293
checkerboardDepthBuffer: 1
274294
upsampleType: 1
275295
xrSettings:
296+
singlePass: 1
276297
occlusionMesh: 1
277298
postProcessQualitySettings:
278299
NearBlurSampleCount: 030000000500000008000000
@@ -293,22 +314,33 @@ MonoBehaviour:
293314
ChromaticAberrationMaxSamples: 03000000060000000c000000
294315
lightSettings:
295316
useContactShadow:
296-
m_Low: 0
297-
m_Medium: 0
298-
m_High: 0
317+
m_Values:
318+
m_SchemaId:
319+
m_Id:
299320
maximumLODLevel:
300-
m_Low: 0
301-
m_Medium: 0
302-
m_High: 0
321+
m_Values: 000000000000000000000000
322+
m_SchemaId:
323+
m_Id: With3Levels
303324
lodBias:
304-
m_Low: 1
305-
m_Medium: 1
306-
m_High: 1
325+
m_Values:
326+
- 1
327+
- 1
328+
- 1
329+
m_SchemaId:
330+
m_Id: With3Levels
331+
lightingQualitySettings:
332+
AOStepCount: 040000000600000010000000
333+
AOFullRes: 000001
334+
AOMaximumRadiusPixels: 200000002800000050000000
335+
AOBilateralUpsample: 000101
336+
AODirectionCount: 010000000200000004000000
337+
ContactShadowSampleCount: 060000000a00000010000000
338+
SSRMaxRaySteps: 100000002000000040000000
307339
allowShaderVariantStripping: 1
308340
enableSRPBatcher: 1
309341
shaderVariantLogLevel: 0
310-
materialQualityLevels: -1
311-
m_CurrentMaterialQualityLevel: 4
342+
availableMaterialQualityLevels: -1
343+
m_DefaultMaterialQualityLevel: 4
312344
diffusionProfileSettings: {fileID: 0}
313345
diffusionProfileSettingsList: []
314346
beforeTransparentCustomPostProcesses: []

‎TestProjects/PerceptionHDRP/Assets/IdLabelConfig.asset‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ MonoBehaviour:
99
m_GameObject: {fileID: 0}
1010
m_Enabled: 1
1111
m_EditorHideFlags: 0
12-
m_Script: {fileID: 0}
12+
m_Script: {fileID: 11500000, guid: 2f09f279848e42cea259348b13bce4c5, type: 3}
1313
m_Name: IdLabelConfig
14-
m_EditorClassIdentifier: Unity.Perception.Runtime:UnityEngine.Perception.GroundTruth:IdLabelConfig
14+
m_EditorClassIdentifier:
1515
m_LabelEntries:
1616
- label: Crate
1717
id: 1

‎TestProjects/PerceptionHDRP/Assets/IdLabelConfig.asset.meta‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎TestProjects/PerceptionHDRP/Assets/Scenes/SampleScene.unity‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -778,42 +778,39 @@ MonoBehaviour:
778778
- id: 1
779779
- id: 2
780780
- id: 3
781+
showVisualizations: 0
781782
references:
782783
version: 1
783784
00000000:
784785
type: {class: BoundingBox2DLabeler, ns: UnityEngine.Perception.GroundTruth,
785786
asm: Unity.Perception.Runtime}
786787
data:
787788
enabled: 1
788-
foldout: 0
789789
annotationId: f9f22e05-443f-4602-a422-ebe4ea9b55cb
790-
idLabelConfig: {fileID: 11400000, guid: 034ffd4e09ffb7348b2fe6634259058a,
790+
idLabelConfig: {fileID: 11400000, guid: 258de5b48703743468d34fc5bbdfa3aa,
791791
type: 2}
792792
00000001:
793793
type: {class: SemanticSegmentationLabeler, ns: UnityEngine.Perception.GroundTruth,
794794
asm: Unity.Perception.Runtime}
795795
data:
796796
enabled: 1
797-
foldout: 0
798797
annotationId: 12f94d8d-5425-4deb-9b21-5e53ad957d66
799798
labelConfig: {fileID: 11400000, guid: c140c5aa05dd09e4fadaa26de31b1f39, type: 2}
800799
m_TargetTextureOverride: {fileID: 0}
801800
00000002:
802801
type: {class: ObjectCountLabeler, ns: UnityEngine.Perception.GroundTruth, asm: Unity.Perception.Runtime}
803802
data:
804803
enabled: 1
805-
foldout: 0
806804
objectCountMetricId: 51da3c27-369d-4929-aea6-d01614635ce2
807-
m_LabelConfig: {fileID: 11400000, guid: 034ffd4e09ffb7348b2fe6634259058a,
805+
m_LabelConfig: {fileID: 11400000, guid: 258de5b48703743468d34fc5bbdfa3aa,
808806
type: 2}
809807
00000003:
810808
type: {class: RenderedObjectInfoLabeler, ns: UnityEngine.Perception.GroundTruth,
811809
asm: Unity.Perception.Runtime}
812810
data:
813811
enabled: 1
814-
foldout: 0
815812
objectInfoMetricId: 5ba92024-b3b7-41a7-9d3f-c03a6a8ddd01
816-
idLabelConfig: {fileID: 11400000, guid: 034ffd4e09ffb7348b2fe6634259058a,
813+
idLabelConfig: {fileID: 11400000, guid: 258de5b48703743468d34fc5bbdfa3aa,
817814
type: 2}
818815
--- !u!1 &1640252278
819816
GameObject:

‎TestProjects/PerceptionHDRP/Packages/manifest.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
"com.unity.perception": "file:../../../com.unity.perception",
99
"com.unity.render-pipelines.core": "7.3.1",
1010
"com.unity.render-pipelines.high-definition": "7.3.1",
11-
"com.unity.simulation.capture": "0.0.10-preview.8",
12-
"com.unity.simulation.core": "0.0.10-preview.14",
11+
"com.unity.simulation.capture": "0.0.10-preview.10",
12+
"com.unity.simulation.core": "0.0.10-preview.17",
1313
"com.unity.test-framework": "1.1.14",
1414
"com.unity.testtools.codecoverage": "0.2.2-preview",
1515
"com.unity.textmeshpro": "2.0.1",

‎TestProjects/PerceptionHDRP/Packages/packages-lock.json‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -107,8 +107,8 @@
107107
"com.unity.nuget.newtonsoft-json": "1.1.2",
108108
"com.unity.render-pipelines.core": "7.1.6",
109109
"com.unity.entities": "0.8.0-preview.8",
110-
"com.unity.simulation.capture": "0.0.10-preview.8",
111-
"com.unity.simulation.core": "0.0.10-preview.14"
110+
"com.unity.simulation.capture": "0.0.10-preview.10",
111+
"com.unity.simulation.core": "0.0.10-preview.17"
112112
}
113113
},
114114
"com.unity.platforms": {
@@ -201,16 +201,16 @@
201201
"url": "https://packages.unity.com"
202202
},
203203
"com.unity.simulation.capture": {
204-
"version": "0.0.10-preview.8",
204+
"version": "0.0.10-preview.10",
205205
"depth": 0,
206206
"source": "registry",
207207
"dependencies": {
208-
"com.unity.simulation.core": "0.0.10-preview.12"
208+
"com.unity.simulation.core": "0.0.10-preview.17"
209209
},
210210
"url": "https://packages.unity.com"
211211
},
212212
"com.unity.simulation.core": {
213-
"version": "0.0.10-preview.14",
213+
"version": "0.0.10-preview.17",
214214
"depth": 0,
215215
"source": "registry",
216216
"dependencies": {},

‎TestProjects/PerceptionHDRP/ProjectSettings/EditorBuildSettings.asset‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,8 @@
44
EditorBuildSettings:
55
m_ObjectHideFlags: 0
66
serializedVersion: 2
7-
m_Scenes: []
7+
m_Scenes:
8+
- enabled: 1
9+
path: Assets/Scenes/SampleScene.unity
10+
guid: 9fc0d4010bbf28b4594072e72b8655ab
811
m_configObjects: {}

‎TestProjects/PerceptionHDRP/ProjectSettings/ProjectSettings.asset‎

Lines changed: 7 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -111,8 +111,13 @@ PlayerSettings:
111111
switchNVNShaderPoolsGranularity: 33554432
112112
switchNVNDefaultPoolsGranularity: 16777216
113113
switchNVNOtherPoolsGranularity: 16777216
114+
switchNVNMaxPublicTextureIDCount: 0
115+
switchNVNMaxPublicSamplerIDCount: 0
116+
stadiaPresentMode: 0
117+
stadiaTargetFramerate: 0
114118
vulkanNumSwapchainBuffers: 2
115119
vulkanEnableSetSRGBWrite: 0
120+
vulkanEnableLateAcquireNextImage: 0
116121
m_SupportedAspectRatios:
117122
4:3: 1
118123
5:4: 1
@@ -191,22 +196,6 @@ PlayerSettings:
191196
uIStatusBarHidden: 1
192197
uIExitOnSuspend: 0
193198
uIStatusBarStyle: 0
194-
iPhoneSplashScreen: {fileID: 0}
195-
iPhoneHighResSplashScreen: {fileID: 0}
196-
iPhoneTallHighResSplashScreen: {fileID: 0}
197-
iPhone47inSplashScreen: {fileID: 0}
198-
iPhone55inPortraitSplashScreen: {fileID: 0}
199-
iPhone55inLandscapeSplashScreen: {fileID: 0}
200-
iPhone58inPortraitSplashScreen: {fileID: 0}
201-
iPhone58inLandscapeSplashScreen: {fileID: 0}
202-
iPadPortraitSplashScreen: {fileID: 0}
203-
iPadHighResPortraitSplashScreen: {fileID: 0}
204-
iPadLandscapeSplashScreen: {fileID: 0}
205-
iPadHighResLandscapeSplashScreen: {fileID: 0}
206-
iPhone65inPortraitSplashScreen: {fileID: 0}
207-
iPhone65inLandscapeSplashScreen: {fileID: 0}
208-
iPhone61inPortraitSplashScreen: {fileID: 0}
209-
iPhone61inLandscapeSplashScreen: {fileID: 0}
210199
appleTVSplashScreen: {fileID: 0}
211200
appleTVSplashScreen2x: {fileID: 0}
212201
tvOSSmallIconLayers: []
@@ -487,6 +476,7 @@ PlayerSettings:
487476
ps4UseResolutionFallback: 0
488477
ps4ReprojectionSupport: 0
489478
ps4UseAudio3dBackend: 0
479+
ps4UseLowGarlicFragmentationMode: 1
490480
ps4SocialScreenEnabled: 0
491481
ps4ScriptOptimizationLevel: 2
492482
ps4Audio3dVirtualSpeakerCount: 14
@@ -593,6 +583,7 @@ PlayerSettings:
593583
XboxOnePersistentLocalStorageSize: 0
594584
XboxOneXTitleMemory: 8
595585
XboxOneOverrideIdentityName:
586+
XboxOneOverrideIdentityPublisher:
596587
vrEditorSettings:
597588
daydream:
598589
daydreamIconForeground: {fileID: 0}

‎TestProjects/PerceptionHDRP/ProjectSettings/ProjectVersion.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
m_EditorVersion: 2019.4.1f1
2-
m_EditorVersionWithRevision: 2019.4.1f1 (e6c045e14e4e)
1+
m_EditorVersion: 2019.4.7f1
2+
m_EditorVersionWithRevision: 2019.4.7f1 (e992b1a16e65)

0 commit comments

Comments
 (0)