Skip to content

Enable DXR automated tests for XR #915

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jun 16, 2020
Merged

Enable DXR automated tests for XR #915

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b71209a
disable unsupported dxr tests in xr
fabien-unity Jun 15, 2020
0e279e8
enable dxr tests in xr on Yamato
fabien-unity Jun 15, 2020
8389bc9
add HDRP_DXR playmode_XR to ABV
fabien-unity Jun 15, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions .yamato/all-hdrp.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down
6 changes: 6 additions & 0 deletions .yamato/all-hdrp_dxr.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,19 +10,25 @@ 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:
- path: .yamato/hdrp_dxr-win-dx12.yml#HDRP_DXR_Win_DX12_Standalone_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:
- path: .yamato/hdrp_dxr-win-dx12.yml#HDRP_DXR_Win_DX12_Standalone_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
9 changes: 5 additions & 4 deletions .yamato/config/hdrp.metafile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
project:
name: HDRP
name: HDRP
folder: HDRP_Tests
folder_standalone: HDRP_RuntimeTests
test_platforms:
Expand Down Expand Up @@ -36,11 +36,11 @@ platforms:
components:
- editor
- il2cpp
- name: OSX
- name: OSX
apis:
- Metal
- name: Linux
apis:
apis:
- Vulkan
all:
dependencies:
Expand Down Expand Up @@ -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
2 changes: 2 additions & 0 deletions .yamato/config/hdrp_dxr.metafile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ project:
test_platforms:
- Standalone
- playmode
- playmode_XR
platforms:
- name: Win
os: windows
Expand All @@ -24,3 +25,4 @@ all:
test_platforms:
- Standalone
- playmode
- playmode_XR
64 changes: 64 additions & 0 deletions .yamato/hdrp_dxr-win-dx12.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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/**"
5 changes: 5 additions & 0 deletions TestProjects/HDRP_DXR_Tests/Assets/Scenes/307_GlobalIlluminationFog.unity
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion TestProjects/HDRP_DXR_Tests/Assets/Scenes/5001_PathTracing.unity
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down
2 changes: 1 addition & 1 deletion TestProjects/HDRP_DXR_Tests/Assets/Scenes/5002_PathTracing_GI.unity
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down
2 changes: 1 addition & 1 deletion TestProjects/HDRP_DXR_Tests/Assets/Scenes/5003_PathTracing_transparency.unity
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down
5 changes: 5 additions & 0 deletions TestProjects/HDRP_DXR_Tests/Assets/Scenes/5004_PathTracing_arealight.unity
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion TestProjects/HDRP_DXR_Tests/Assets/Scenes/5005_PathTracing_Fog.unity
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down
2 changes: 1 addition & 1 deletion TestProjects/HDRP_DXR_Tests/Assets/Scenes/5006_PathTracing_DoF.unity
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down
5 changes: 5 additions & 0 deletions TestProjects/HDRP_DXR_Tests/Assets/Scenes/5007_PathTracing_Materials_SG_Lit.unity
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 5 additions & 0 deletions TestProjects/HDRP_DXR_Tests/Assets/Scenes/5007_PathTracing_Materials_SG_Unlit.unity
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down