diff --git a/PerformanceTests/BuiltIn-VR-URP-Perf/Packages/manifest.json b/PerformanceTests/BuiltIn-VR-URP-Perf/Packages/manifest.json index 71ee57a6..c3dc7b1a 100644 --- a/PerformanceTests/BuiltIn-VR-URP-Perf/Packages/manifest.json +++ b/PerformanceTests/BuiltIn-VR-URP-Perf/Packages/manifest.json @@ -7,7 +7,7 @@ "com.unity.test-framework": "1.1.11", "com.unity.ugui": "1.0.0", "com.unity.xr.legacyinputhelpers": "2.0.4", - "com.unity.xr.oculusperformanceutility": "ssh://git@github.cds.internal.unity3d.com/unity/com.unity.xr.oculusperformanceutility.git", + "com.unity.xr.oculusperformanceutility": "https://github.com/Unity-Technologies/com.unity.xr.oculusperformanceutility.git", "com.unity.xr.test-framework.performance": "https://github.com/Unity-Technologies/com.unity.xr.test-framework.performance.git", "com.unity.xr.tests.runtimesettings": "https://github.com/Unity-Technologies/com.unity.xr.test.runtimesettings.git#trunk", "xr.sdk.oculus.performancetests": "https://github.com/Unity-Technologies/xr.sdk.oculus.performancetests.git#urp", diff --git a/PerformanceTests/BuiltIn-VR-URP-Perf/ProjectSettings/ProjectSettings.asset b/PerformanceTests/BuiltIn-VR-URP-Perf/ProjectSettings/ProjectSettings.asset index 3790e0e8..a018bf44 100644 --- a/PerformanceTests/BuiltIn-VR-URP-Perf/ProjectSettings/ProjectSettings.asset +++ b/PerformanceTests/BuiltIn-VR-URP-Perf/ProjectSettings/ProjectSettings.asset @@ -660,9 +660,9 @@ PlayerSettings: webGLThreadsSupport: 0 webGLWasmStreaming: 0 scriptingDefineSymbols: - 1: UNITY_POST_PROCESSING_STACK_V2;PERF_AGGREGATIONS_ONLY + 1: UNITY_POST_PROCESSING_STACK_V2;PERF_AGGREGATIONS_ONLY;URP 4: UNITY_POST_PROCESSING_STACK_V2 - 7: UNITY_POST_PROCESSING_STACK_V2;PERF_AGGREGATIONS_ONLY + 7: UNITY_POST_PROCESSING_STACK_V2;PERF_AGGREGATIONS_ONLY;URP 13: UNITY_POST_PROCESSING_STACK_V2 17: UNITY_POST_PROCESSING_STACK_V2 18: UNITY_POST_PROCESSING_STACK_V2 diff --git a/PerformanceTests/NoXR-Perf/ProjectSettings/EditorBuildSettings.asset b/PerformanceTests/NoXR-Perf/ProjectSettings/EditorBuildSettings.asset index 81f8066f..faf0687c 100644 --- a/PerformanceTests/NoXR-Perf/ProjectSettings/EditorBuildSettings.asset +++ b/PerformanceTests/NoXR-Perf/ProjectSettings/EditorBuildSettings.asset @@ -6,25 +6,25 @@ EditorBuildSettings: serializedVersion: 2 m_Scenes: - enabled: 1 - path: Assets/xr.sdk.oculus.performancetests/cool_down.unity + path: Packages/xr.sdk.oculus.performancetests/cool_down.unity guid: 794febef3d158dd4b9687c8193a1df31 - enabled: 1 - path: Assets/xr.sdk.oculus.performancetests/Scenes/ObjectCountStressTests/LitInstancedSphere.unity + path: Packages/xr.sdk.oculus.performancetests/Scenes/ObjectCountStressTests/LitInstancedSphere.unity guid: 1230546d030b44d4a94cf5b23d4a6120 - enabled: 1 - path: Assets/xr.sdk.oculus.performancetests/Scenes/ObjectCountStressTests/LitNonInstancedSphere.unity + path: Packages/xr.sdk.oculus.performancetests/Scenes/ObjectCountStressTests/LitNonInstancedSphere.unity guid: 11b3a32f1a0ba7846a2a1426d4e81347 - enabled: 1 - path: Assets/xr.sdk.oculus.performancetests/Scenes/ObjectCountStressTests/LitNonInstancedSphereWithFrustumCulling.unity + path: Packages/xr.sdk.oculus.performancetests/Scenes/ObjectCountStressTests/LitNonInstancedSphereWithFrustumCulling.unity guid: 1672207337d674f49a34955fc304a2bd - enabled: 1 - path: Assets/xr.sdk.oculus.performancetests/Scenes/StatsTests/EmptyScene.unity + path: Packages/xr.sdk.oculus.performancetests/Scenes/StatsTests/EmptyScene.unity guid: 1bb11eed44bd0654eab7be626a6c9b04 - enabled: 1 - path: Assets/xr.sdk.oculus.performancetests/Scenes/StatsTests/SimpleSceneWithLitCube.unity + path: Packages/xr.sdk.oculus.performancetests/Scenes/StatsTests/SimpleSceneWithLitCube.unity guid: 914d59e5a50c370489e398b329e9cb34 - enabled: 1 - path: Assets/xr.sdk.oculus.performancetests/Scenes/StatsTests/SimpleSceneWithManyLitCubes.unity + path: Packages/xr.sdk.oculus.performancetests/Scenes/StatsTests/SimpleSceneWithManyLitCubes.unity guid: 323b9d543d569f04a80a4f810da24d6f m_configObjects: Unity.XR.Oculus.Settings: {fileID: -1726787082364259576, guid: 5a9aad67183bd7e4abd72cdb069616a3, diff --git a/PerformanceTests/NoXR-Perf/ProjectSettings/ProjectSettings.asset b/PerformanceTests/NoXR-Perf/ProjectSettings/ProjectSettings.asset index fd0e800b..381ecbe4 100644 --- a/PerformanceTests/NoXR-Perf/ProjectSettings/ProjectSettings.asset +++ b/PerformanceTests/NoXR-Perf/ProjectSettings/ProjectSettings.asset @@ -412,7 +412,7 @@ PlayerSettings: m_GraphicsJobMode: 0 m_BuildTargetGraphicsAPIs: - m_BuildTarget: AndroidPlayer - m_APIs: 0b000000 + m_APIs: 15000000 m_Automatic: 0 m_BuildTargetVRSettings: - m_BuildTarget: Standalone diff --git a/PerformanceTests/Oculus-XRSDK-Perf/Packages/manifest.json b/PerformanceTests/Oculus-XRSDK-Perf/Packages/manifest.json index 89ff82ed..10daf32c 100644 --- a/PerformanceTests/Oculus-XRSDK-Perf/Packages/manifest.json +++ b/PerformanceTests/Oculus-XRSDK-Perf/Packages/manifest.json @@ -48,5 +48,4 @@ "com.unity.xr.oculusperformanceutility" ], "disableProjectUpdate": true - } } diff --git a/PerformanceTests/Oculus-XRSDK-URP-Perf/Assets/Resources/settings.asset b/PerformanceTests/Oculus-XRSDK-URP-Perf/Assets/Resources/settings.asset index 41da13e8..d092446b 100644 --- a/PerformanceTests/Oculus-XRSDK-URP-Perf/Assets/Resources/settings.asset +++ b/PerformanceTests/Oculus-XRSDK-URP-Perf/Assets/Resources/settings.asset @@ -13,7 +13,7 @@ MonoBehaviour: m_Name: settings m_EditorClassIdentifier: EnabledXrTarget: OculusXRSDK - PlayerGraphicsApi: OpenGLES3 + PlayerGraphicsApi: Vulkan StereoRenderingMode: StereoRenderingModeDesktop: MultiPass StereoRenderingModeAndroid: Multiview @@ -22,8 +22,10 @@ MonoBehaviour: SimulationMode: ColorSpace: Linear PluginVersion: OculusPluginVersion|1.41.0 - XrsdkRevision: com.unity.xr.oculus|1.1.5|4c119ef0b1d72f95ddfcc64669372ce5b41893b6|2020-01-08T15:10:09|1.1.x - XrManagementRevision: com.unity.xr.management|3.0.6|a62b2f2d210898ad2b462b1f6e5e753efc4ff0ca - DeviceRuntimeVersion: deviceruntimeversion|oculus/vr_monterey/monterey:7.1.1/NGI77B/456680.26060.0:user/release-keys + XrsdkRevision: XrSdkName|com.unity.xr.oculus|XrSdkVersion|1.1.5|XrSdkRevision|4c119ef0b1d72f95ddfcc64669372ce5b41893b6|XrSdkRevisionDate|2020-01-08T15:10:09|XrSdkBranch|1.1.x + XrManagementRevision: XrManagementPackageName|com.unity.xr.management|XrManagementVersion|3.0.6|XrManagementRevision|a62b2f2d210898ad2b462b1f6e5e753efc4ff0ca + DeviceRuntimeVersion: deviceruntimeversion|oculus/vr_monterey/monterey:7.1.1/NGI77B/507240.20940.0:user/release-keys Username: seans RenderPipeline: renderpipeline|UniversalRenderPipelineAsset + AntiAliasing: 4 + FfrLevel: ffrlevel|0 diff --git a/PerformanceTests/Oculus-XRSDK-URP-Perf/Assets/XR/Settings/Test Settings.asset b/PerformanceTests/Oculus-XRSDK-URP-Perf/Assets/XR/Settings/Test Settings.asset index 64614afb..926a6346 100644 --- a/PerformanceTests/Oculus-XRSDK-URP-Perf/Assets/XR/Settings/Test Settings.asset +++ b/PerformanceTests/Oculus-XRSDK-URP-Perf/Assets/XR/Settings/Test Settings.asset @@ -1,20 +1,6 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!114 &-2388668919711473577 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: d236b7d11115f2143951f1e14045df39, type: 3} - m_Name: - m_EditorClassIdentifier: - m_LoaderManagerInstance: {fileID: 8124812798651341047} - m_InitManagerOnStart: 1 ---- !u!114 &-2346543218978481979 +--- !u!114 &-8062025960732760025 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -26,6 +12,37 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 03bc68f14d65e7747a59d5ff74bd199b, type: 3} m_Name: OculusLoader m_EditorClassIdentifier: +--- !u!114 &-5833895644134632475 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d236b7d11115f2143951f1e14045df39, type: 3} + m_Name: + m_EditorClassIdentifier: + m_LoaderManagerInstance: {fileID: -5366476722327821642} + m_InitManagerOnStart: 1 +--- !u!114 &-5366476722327821642 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4c3631f5e58749a59194e0cf6baf6d5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_RequiresSettingsUpdate: 0 + m_AutomaticLoading: 0 + m_AutomaticRunning: 0 + m_Loaders: + - {fileID: -8062025960732760025} --- !u!114 &11400000 MonoBehaviour: m_ObjectHideFlags: 0 @@ -40,8 +57,8 @@ MonoBehaviour: m_EditorClassIdentifier: Keys: 07000000 Values: - - {fileID: -2388668919711473577} ---- !u!114 &5156282474285759372 + - {fileID: -5833895644134632475} +--- !u!114 &7252830879927170822 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -58,20 +75,3 @@ MonoBehaviour: SharedDepthBuffer: 1 DashSupport: 1 V2Signing: 1 ---- !u!114 &8124812798651341047 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f4c3631f5e58749a59194e0cf6baf6d5, type: 3} - m_Name: - m_EditorClassIdentifier: - m_RequiresSettingsUpdate: 0 - m_AutomaticLoading: 0 - m_AutomaticRunning: 0 - m_Loaders: - - {fileID: -2346543218978481979} diff --git a/PerformanceTests/Oculus-XRSDK-URP-Perf/ProjectSettings/EditorBuildSettings.asset b/PerformanceTests/Oculus-XRSDK-URP-Perf/ProjectSettings/EditorBuildSettings.asset index d1122a62..88411942 100644 --- a/PerformanceTests/Oculus-XRSDK-URP-Perf/ProjectSettings/EditorBuildSettings.asset +++ b/PerformanceTests/Oculus-XRSDK-URP-Perf/ProjectSettings/EditorBuildSettings.asset @@ -27,7 +27,7 @@ EditorBuildSettings: path: Packages/xr.sdk.oculus.performancetests/Scenes/StatsTests/SimpleSceneWithManyLitCubes.unity guid: 323b9d543d569f04a80a4f810da24d6f m_configObjects: - Unity.XR.Oculus.Settings: {fileID: 7554969500914180855, guid: 5a9aad67183bd7e4abd72cdb069616a3, + Unity.XR.Oculus.Settings: {fileID: 7252830879927170822, guid: 5a9aad67183bd7e4abd72cdb069616a3, type: 2} com.unity.xr.management.loader_settings: {fileID: 11400000, guid: 5a9aad67183bd7e4abd72cdb069616a3, type: 2} diff --git a/PerformanceTests/Oculus-XRSDK-URP-Perf/ProjectSettings/ProjectSettings.asset b/PerformanceTests/Oculus-XRSDK-URP-Perf/ProjectSettings/ProjectSettings.asset index 39783f4c..9c8896e5 100644 --- a/PerformanceTests/Oculus-XRSDK-URP-Perf/ProjectSettings/ProjectSettings.asset +++ b/PerformanceTests/Oculus-XRSDK-URP-Perf/ProjectSettings/ProjectSettings.asset @@ -139,6 +139,14 @@ PlayerSettings: - {fileID: 0} - {fileID: 0} - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} metroInputSource: 0 wsaTransparentSwapchain: 0 m_HolographicPauseOnTrackingLoss: 1 @@ -673,9 +681,9 @@ PlayerSettings: webGLThreadsSupport: 0 webGLWasmStreaming: 0 scriptingDefineSymbols: - 1: UNITY_POST_PROCESSING_STACK_V2;OCULUS_SDK;OCULUS_SDK_PERF;PERF_AGGREGATIONS_ONLY + 1: UNITY_POST_PROCESSING_STACK_V2;OCULUS_SDK;OCULUS_SDK_PERF;PERF_AGGREGATIONS_ONLY;URP 4: UNITY_POST_PROCESSING_STACK_V2 - 7: UNITY_POST_PROCESSING_STACK_V2;OCULUS_SDK;OCULUS_SDK_PERF;PERF_AGGREGATIONS_ONLY + 7: UNITY_POST_PROCESSING_STACK_V2;OCULUS_SDK;OCULUS_SDK_PERF;PERF_AGGREGATIONS_ONLY;URP 13: UNITY_POST_PROCESSING_STACK_V2 17: UNITY_POST_PROCESSING_STACK_V2 18: UNITY_POST_PROCESSING_STACK_V2 diff --git a/PerformanceTests/Oculus-XRSDK-URP-Perf/ProjectSettings/QualitySettings.asset b/PerformanceTests/Oculus-XRSDK-URP-Perf/ProjectSettings/QualitySettings.asset index 2875e62b..02060712 100644 --- a/PerformanceTests/Oculus-XRSDK-URP-Perf/ProjectSettings/QualitySettings.asset +++ b/PerformanceTests/Oculus-XRSDK-URP-Perf/ProjectSettings/QualitySettings.asset @@ -21,7 +21,7 @@ QualitySettings: skinWeights: 2 textureQuality: 0 anisotropicTextures: 1 - antiAliasing: 4 + antiAliasing: 0 softParticles: 0 softVegetation: 0 realtimeReflectionProbes: 0 @@ -40,7 +40,8 @@ QualitySettings: asyncUploadBufferSize: 16 asyncUploadPersistentBuffer: 1 resolutionScalingFixedDPIFactor: 1 - customRenderPipeline: {fileID: 0} + customRenderPipeline: {fileID: 11400000, guid: 673bfec63046b504899a99cc03de62fc, + type: 2} excludedTargetPlatforms: [] m_PerPlatformDefaultQuality: Android: 0