diff --git a/.yamato/all-hdrp.yml b/.yamato/all-hdrp.yml index e67bb2df8f3..7a52603a0d1 100644 --- a/.yamato/all-hdrp.yml +++ b/.yamato/all-hdrp.yml @@ -32,6 +32,8 @@ All_HDRP_trunk: rerun: on-new-revision - path: .yamato/hdrp_dxr-win-dx12.yml#HDRP_DXR_Win_DX12_playmode_trunk rerun: on-new-revision + - path: .yamato/hdrp_dxr-win-dx12.yml#HDRP_DXR_Win_DX12_playmode_XR_trunk + rerun: on-new-revision - path: .yamato/all-hdrp_hybrid.yml#All_HDRP_Hybrid_trunk rerun: on-new-revision All_HDRP_fast-trunk: @@ -63,6 +65,8 @@ All_HDRP_fast-trunk: rerun: on-new-revision - path: .yamato/hdrp_dxr-win-dx12.yml#HDRP_DXR_Win_DX12_playmode_fast-trunk rerun: on-new-revision + - path: .yamato/hdrp_dxr-win-dx12.yml#HDRP_DXR_Win_DX12_playmode_XR_fast-trunk + rerun: on-new-revision - path: .yamato/all-hdrp_hybrid.yml#All_HDRP_Hybrid_fast-trunk rerun: on-new-revision All_HDRP_CUSTOM-REVISION: @@ -94,6 +98,8 @@ All_HDRP_CUSTOM-REVISION: rerun: always - path: .yamato/hdrp_dxr-win-dx12.yml#HDRP_DXR_Win_DX12_playmode_CUSTOM-REVISION rerun: always + - path: .yamato/hdrp_dxr-win-dx12.yml#HDRP_DXR_Win_DX12_playmode_XR_CUSTOM-REVISION + rerun: always - path: .yamato/all-hdrp_hybrid.yml#All_HDRP_Hybrid_CUSTOM-REVISION rerun: always variables: diff --git a/.yamato/all-hdrp_dxr.yml b/.yamato/all-hdrp_dxr.yml index c03ad383cb7..3da948c28d9 100644 --- a/.yamato/all-hdrp_dxr.yml +++ b/.yamato/all-hdrp_dxr.yml @@ -10,6 +10,8 @@ All_HDRP_DXR_trunk: rerun: on-new-revision - path: .yamato/hdrp_dxr-win-dx12.yml#HDRP_DXR_Win_DX12_playmode_trunk rerun: on-new-revision + - path: .yamato/hdrp_dxr-win-dx12.yml#HDRP_DXR_Win_DX12_playmode_XR_trunk + rerun: on-new-revision All_HDRP_DXR_fast-trunk: name: All HDRP_DXR CI - fast-trunk dependencies: @@ -17,6 +19,8 @@ All_HDRP_DXR_fast-trunk: rerun: on-new-revision - path: .yamato/hdrp_dxr-win-dx12.yml#HDRP_DXR_Win_DX12_playmode_fast-trunk rerun: on-new-revision + - path: .yamato/hdrp_dxr-win-dx12.yml#HDRP_DXR_Win_DX12_playmode_XR_fast-trunk + rerun: on-new-revision All_HDRP_DXR_CUSTOM-REVISION: name: All HDRP_DXR CI - CUSTOM-REVISION dependencies: @@ -24,5 +28,7 @@ All_HDRP_DXR_CUSTOM-REVISION: rerun: always - path: .yamato/hdrp_dxr-win-dx12.yml#HDRP_DXR_Win_DX12_playmode_CUSTOM-REVISION rerun: always + - path: .yamato/hdrp_dxr-win-dx12.yml#HDRP_DXR_Win_DX12_playmode_XR_CUSTOM-REVISION + rerun: always variables: CUSTOM_REVISION: custom_revision_not_set diff --git a/.yamato/config/hdrp.metafile b/.yamato/config/hdrp.metafile index 7f230682d37..806d9b61610 100644 --- a/.yamato/config/hdrp.metafile +++ b/.yamato/config/hdrp.metafile @@ -1,5 +1,5 @@ project: - name: HDRP + name: HDRP folder: HDRP_Tests folder_standalone: HDRP_RuntimeTests test_platforms: @@ -36,11 +36,11 @@ platforms: components: - editor - il2cpp - - name: OSX + - name: OSX apis: - Metal - name: Linux - apis: + apis: - Vulkan all: dependencies: @@ -72,11 +72,12 @@ all: api: Vulkan test_platforms: - editmode - - playmode + - playmode - project: HDRP_DXR platform: Win api: DX12 test_platforms: - playmode + - playmode_XR - project: HDRP_Hybrid all: true diff --git a/.yamato/config/hdrp_dxr.metafile b/.yamato/config/hdrp_dxr.metafile index 5d2bb715f53..03b6f96a707 100644 --- a/.yamato/config/hdrp_dxr.metafile +++ b/.yamato/config/hdrp_dxr.metafile @@ -4,6 +4,7 @@ project: test_platforms: - Standalone - playmode + - playmode_XR platforms: - name: Win os: windows @@ -24,3 +25,4 @@ all: test_platforms: - Standalone - playmode + - playmode_XR diff --git a/.yamato/hdrp_dxr-win-dx12.yml b/.yamato/hdrp_dxr-win-dx12.yml index 3a53357a74c..3346708c295 100644 --- a/.yamato/hdrp_dxr-win-dx12.yml +++ b/.yamato/hdrp_dxr-win-dx12.yml @@ -72,6 +72,27 @@ HDRP_DXR_Win_DX12_playmode_trunk: logs: paths: - "**/test-results/**" +HDRP_DXR_Win_DX12_playmode_XR_trunk: + name: HDRP_DXR on Win_DX12_playmode_XR on version trunk + agent: + type: Unity::VM::GPU + image: graphics-foundation/win10-dxr:latest + flavor: b1.large + model: rtx2080 + variables: + UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates + dependencies: + - path: .yamato/_editor.yml#editor:priming:trunk:windows + rerun: on-new-revision + commands: + - git clone git@github.cds.internal.unity3d.com:unity/utr.git TestProjects/HDRP_DXR_Tests/utr + - pip install unity-downloader-cli --extra-index-url https://artifactory.internal.unity3d.com/api/pypi/common-python/simple --upgrade + - cd TestProjects/HDRP_DXR_Tests && unity-downloader-cli --source-file ../../unity_revision.txt -c editor -c il2cpp --wait --published-only + - cd TestProjects/HDRP_DXR_Tests && utr\utr --suite=playmode --extra-editor-arg="-xr-tests" --testproject=. --editor-location=.Editor --artifacts_path=test-results --extra-editor-arg="-force-d3d12" + artifacts: + logs: + paths: + - "**/test-results/**" HDRP_DXR_Win_DX12_Standalone_fast-trunk: name: HDRP_DXR on Win_DX12_Standalone on version fast-trunk agent: @@ -141,6 +162,27 @@ HDRP_DXR_Win_DX12_playmode_fast-trunk: logs: paths: - "**/test-results/**" +HDRP_DXR_Win_DX12_playmode_XR_fast-trunk: + name: HDRP_DXR on Win_DX12_playmode_XR on version fast-trunk + agent: + type: Unity::VM::GPU + image: graphics-foundation/win10-dxr:latest + flavor: b1.large + model: rtx2080 + variables: + UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates + dependencies: + - path: .yamato/_editor.yml#editor:priming:fast-trunk:windows + rerun: on-new-revision + commands: + - git clone git@github.cds.internal.unity3d.com:unity/utr.git TestProjects/HDRP_DXR_Tests/utr + - pip install unity-downloader-cli --extra-index-url https://artifactory.internal.unity3d.com/api/pypi/common-python/simple --upgrade + - cd TestProjects/HDRP_DXR_Tests && unity-downloader-cli --source-file ../../unity_revision.txt -c editor -c il2cpp --wait --published-only + - cd TestProjects/HDRP_DXR_Tests && utr\utr --suite=playmode --extra-editor-arg="-xr-tests" --testproject=. --editor-location=.Editor --artifacts_path=test-results --extra-editor-arg="-force-d3d12" + artifacts: + logs: + paths: + - "**/test-results/**" HDRP_DXR_Win_DX12_Standalone_CUSTOM-REVISION: name: HDRP_DXR on Win_DX12_Standalone on version CUSTOM-REVISION agent: @@ -213,3 +255,25 @@ HDRP_DXR_Win_DX12_playmode_CUSTOM-REVISION: logs: paths: - "**/test-results/**" +HDRP_DXR_Win_DX12_playmode_XR_CUSTOM-REVISION: + name: HDRP_DXR on Win_DX12_playmode_XR on version CUSTOM-REVISION + agent: + type: Unity::VM::GPU + image: graphics-foundation/win10-dxr:latest + flavor: b1.large + model: rtx2080 + variables: + UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates + CUSTOM_REVISION: custom_revision_not_set + dependencies: + - path: .yamato/_editor.yml#editor:priming:CUSTOM-REVISION:windows + rerun: always + commands: + - git clone git@github.cds.internal.unity3d.com:unity/utr.git TestProjects/HDRP_DXR_Tests/utr + - pip install unity-downloader-cli --extra-index-url https://artifactory.internal.unity3d.com/api/pypi/common-python/simple --upgrade + - cd TestProjects/HDRP_DXR_Tests && unity-downloader-cli --source-file ../../unity_revision.txt -c editor -c il2cpp --wait --published-only + - cd TestProjects/HDRP_DXR_Tests && utr\utr --suite=playmode --extra-editor-arg="-xr-tests" --testproject=. --editor-location=.Editor --artifacts_path=test-results --extra-editor-arg="-force-d3d12" + artifacts: + logs: + paths: + - "**/test-results/**" diff --git a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/307_GlobalIlluminationFog.unity b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/307_GlobalIlluminationFog.unity index 50ed79d6ae7..07cf6a12084 100644 --- a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/307_GlobalIlluminationFog.unity +++ b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/307_GlobalIlluminationFog.unity @@ -490,6 +490,11 @@ PrefabInstance: propertyPath: waitFrames value: 5 objectReference: {fileID: 0} + - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} + propertyPath: xrCompatible + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} --- !u!1001 &5229108846403476070 diff --git a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/5001_PathTracing.unity b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/5001_PathTracing.unity index d7622e3b31c..97467ad9db1 100644 --- a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/5001_PathTracing.unity +++ b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/5001_PathTracing.unity @@ -1521,7 +1521,7 @@ PrefabInstance: - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} propertyPath: xrCompatible - value: 1 + value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} diff --git a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/5002_PathTracing_GI.unity b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/5002_PathTracing_GI.unity index 8024f2b1fec..c8c79705311 100644 --- a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/5002_PathTracing_GI.unity +++ b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/5002_PathTracing_GI.unity @@ -592,7 +592,7 @@ PrefabInstance: - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} propertyPath: xrCompatible - value: 1 + value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} diff --git a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/5003_PathTracing_transparency.unity b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/5003_PathTracing_transparency.unity index fae58abb3ad..b83fc78db88 100644 --- a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/5003_PathTracing_transparency.unity +++ b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/5003_PathTracing_transparency.unity @@ -693,7 +693,7 @@ PrefabInstance: - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} propertyPath: xrCompatible - value: 1 + value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} diff --git a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/5004_PathTracing_arealight.unity b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/5004_PathTracing_arealight.unity index 0fbe9352ea6..b054b71ac28 100644 --- a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/5004_PathTracing_arealight.unity +++ b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/5004_PathTracing_arealight.unity @@ -277,6 +277,11 @@ PrefabInstance: propertyPath: waitFrames value: 64 objectReference: {fileID: 0} + - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} + propertyPath: xrCompatible + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} --- !u!1 &930401665 diff --git a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/5005_PathTracing_Fog.unity b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/5005_PathTracing_Fog.unity index 1d1c03c22d5..7bde589ee80 100644 --- a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/5005_PathTracing_Fog.unity +++ b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/5005_PathTracing_Fog.unity @@ -1766,7 +1766,7 @@ PrefabInstance: - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} propertyPath: xrCompatible - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} diff --git a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/5006_PathTracing_DoF.unity b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/5006_PathTracing_DoF.unity index 9055a1ebfab..65f4e803d34 100644 --- a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/5006_PathTracing_DoF.unity +++ b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/5006_PathTracing_DoF.unity @@ -2676,7 +2676,7 @@ PrefabInstance: - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} propertyPath: xrCompatible - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} diff --git a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/5007_PathTracing_Materials_SG_Lit.unity b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/5007_PathTracing_Materials_SG_Lit.unity index c397e1352d1..b68492892ab 100644 --- a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/5007_PathTracing_Materials_SG_Lit.unity +++ b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/5007_PathTracing_Materials_SG_Lit.unity @@ -4987,6 +4987,11 @@ PrefabInstance: propertyPath: waitFrames value: 1 objectReference: {fileID: 0} + - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} + propertyPath: xrCompatible + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} --- !u!1 &1441973135 diff --git a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/5007_PathTracing_Materials_SG_Unlit.unity b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/5007_PathTracing_Materials_SG_Unlit.unity index c5c20a097df..922dd9035e0 100644 --- a/TestProjects/HDRP_DXR_Tests/Assets/Scenes/5007_PathTracing_Materials_SG_Unlit.unity +++ b/TestProjects/HDRP_DXR_Tests/Assets/Scenes/5007_PathTracing_Materials_SG_Unlit.unity @@ -1667,6 +1667,11 @@ PrefabInstance: propertyPath: ImageComparisonSettings.AverageCorrectnessThreshold value: 0.00012 objectReference: {fileID: 0} + - target: {fileID: 114995348509370400, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} + propertyPath: xrCompatible + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} --- !u!1 &1441973135