diff --git a/.github/pr-commenter.yml b/.github/pr-commenter.yml index eb58856910c..8e46bda3a21 100644 --- a/.github/pr-commenter.yml +++ b/.github/pr-commenter.yml @@ -16,7 +16,7 @@ comment: - TestProjects/HDRP*/**/* body: | **HDRP** - `/.yamato%252Fall-hdrp.yml%2523PR_HDRP_2021.2` + `/.yamato%252Fall-hdrp.yml%2523PR_HDRP_trunk` - id: URP files: - com.unity.render-pipelines.universal/**/* @@ -24,7 +24,7 @@ comment: - TestProjects/Universal*/**/* body: | **URP** - `/.yamato%252Fall-urp.yml%2523PR_URP_2021.2` + `/.yamato%252Fall-urp.yml%2523PR_URP_trunk` - id: ShaderGraph files: - com.unity.shadergraph/**/* @@ -32,10 +32,10 @@ comment: - com.unity.render-pipelines.universal/Editor/ShaderGraph/* body: | **Shader Graph** - `/.yamato%252Fall-shadergraph.yml%2523PR_ShaderGraph_2021.2` + `/.yamato%252Fall-shadergraph.yml%2523PR_ShaderGraph_trunk` Depending on your PR, you may also want - `/.yamato%252Fall-shadergraph_builtin_foundation.yml%2523PR_ShaderGraph_BuiltIn_Foundation_2021.2` - `/.yamato%252Fall-shadergraph_builtin_lighting.yml%2523PR_ShaderGraph_BuiltIn_Lighting_2021.2` + `/.yamato%252Fall-shadergraph_builtin_foundation.yml%2523PR_ShaderGraph_BuiltIn_Foundation_trunk` + `/.yamato%252Fall-shadergraph_builtin_lighting.yml%2523PR_ShaderGraph_BuiltIn_Lighting_trunk` - id: VFX files: - com.unity.visualeffectgraph/**/* @@ -43,12 +43,12 @@ comment: - TestProjects/VisualEffectGraph*/**/* body: | **VFX** - `/.yamato%252Fall-vfx.yml%2523PR_VFX_2021.2` + `/.yamato%252Fall-vfx.yml%2523PR_VFX_trunk` - id: Core files: - com.unity.render-pipelines.core/**/* body: | **SRP Core** You could run ABV on your branch before merging your PR, but it will start A LOT of jobs. Please be responsible about it and run it only when you feel the PR is ready: - `/.yamato%252F_abv.yml%2523all_project_ci_2021.2` + `/.yamato%252F_abv.yml%2523all_project_ci_trunk` Be aware that any modifications to the Core package impacts everyone in the Graphics repo so please discuss the PR with your lead. diff --git a/.yamato/_abv.yml b/.yamato/_abv.yml index a54e995f2bc..265da5780e7 100644 --- a/.yamato/_abv.yml +++ b/.yamato/_abv.yml @@ -4,7 +4,6 @@ # Read more under .yamato/docs/readme.md {% metadata_file .yamato/_cache_config.metafile -%} -{% metadata_file .yamato/_latest_editor_versions_2021.2.metafile -%} {% metadata_file .yamato/_latest_editor_versions_trunk.metafile -%} --- @@ -29,24 +28,6 @@ all_project_ci_trunk: rerun: on_new_revision all_project_ci_nightly_trunk: name: Nightly on trunk - variables: - CUSTOM_REVISION: '{{trunk.changeset.id}}' - UTR_VERSION: "current" - TEST_FILTER: .* - CACHE_ARGS: '{{cache.flags}}' - dependencies: - - path: .yamato/all-hdrp.yml#Nightly_HDRP_trunk - rerun: on_new_revision - - path: .yamato/all-vfx.yml#Nightly_VFX_trunk - rerun: on_new_revision - - path: .yamato/all-urp.yml#Nightly_URP_trunk - rerun: on_new_revision - - path: .yamato/all-shadergraph.yml#Nightly_ShaderGraph_trunk - rerun: on_new_revision - - path: .yamato/_abv.yml#General_Checks_trunk - rerun: on_new_revision -all_project_ci_trunk_weekly_trunk: - name: Trunk Weekly on trunk variables: CUSTOM_REVISION: '{{trunk.changeset.id}}' UTR_VERSION: "current" @@ -55,7 +36,7 @@ all_project_ci_trunk_weekly_trunk: triggers: recurring: - branch: master - frequency: weekly + frequency: 1 * * ? dependencies: - path: .yamato/all-hdrp.yml#Nightly_HDRP_trunk rerun: on_new_revision @@ -123,120 +104,6 @@ Trunk_verification_trunk: rerun: on_new_revision - path: .yamato/vfx_urp-win-dx11.yml#VFX_URP_Win_DX11_playmode_mono_Linear_trunk rerun: on_new_revision -all_project_ci_2021.2: - name: ABV (all PR jobs) on 2021.2 - variables: - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - UTR_VERSION: "current" - TEST_FILTER: .* - CACHE_ARGS: '{{cache.flags}}' - dependencies: - - path: .yamato/all-hdrp.yml#PR_HDRP_2021.2 - rerun: on_new_revision - - path: .yamato/all-vfx.yml#PR_VFX_2021.2 - rerun: on_new_revision - - path: .yamato/all-urp.yml#PR_URP_2021.2 - rerun: on_new_revision - - path: .yamato/all-shadergraph.yml#PR_ShaderGraph_2021.2 - rerun: on_new_revision - - path: .yamato/_abv.yml#General_Checks_2021.2 - rerun: on_new_revision -all_project_ci_nightly_2021.2: - name: Nightly on 2021.2 - variables: - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - UTR_VERSION: "current" - TEST_FILTER: .* - CACHE_ARGS: '{{cache.flags}}' - triggers: - recurring: - - branch: master - frequency: 1 * * ? - dependencies: - - path: .yamato/all-hdrp.yml#Nightly_HDRP_2021.2 - rerun: on_new_revision - - path: .yamato/all-vfx.yml#Nightly_VFX_2021.2 - rerun: on_new_revision - - path: .yamato/all-urp.yml#Nightly_URP_2021.2 - rerun: on_new_revision - - path: .yamato/all-shadergraph.yml#Nightly_ShaderGraph_2021.2 - rerun: on_new_revision - - path: .yamato/_abv.yml#General_Checks_2021.2 - rerun: on_new_revision -all_project_ci_trunk_weekly_2021.2: - name: Trunk Weekly on 2021.2 - variables: - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - UTR_VERSION: "current" - TEST_FILTER: .* - CACHE_ARGS: '{{cache.flags}}' - dependencies: - - path: .yamato/all-hdrp.yml#Nightly_HDRP_2021.2 - rerun: on_new_revision - - path: .yamato/all-vfx.yml#Nightly_VFX_2021.2 - rerun: on_new_revision - - path: .yamato/all-urp.yml#Nightly_URP_2021.2 - rerun: on_new_revision - - path: .yamato/all-shadergraph.yml#Nightly_ShaderGraph_2021.2 - rerun: on_new_revision - - path: .yamato/_abv.yml#General_Checks_2021.2 - rerun: on_new_revision -General_Checks_2021.2: - name: General Checks on 2021.2 - variables: - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - UTR_VERSION: "current" - TEST_FILTER: .* - CACHE_ARGS: '{{cache.flags}}' - dependencies: - - path: .yamato/_projectcontext.yml#all_package_ci_project_2021.2 - rerun: on_new_revision - - path: .yamato/_formatting.yml#formatting - rerun: on_new_revision - - path: .yamato/all-smoke_test.yml#Smoke_Test_2021.2 - rerun: on_new_revision -Trunk_verification_2021.2: - name: Trunk verification on 2021.2 - variables: - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - UTR_VERSION: "current" - TEST_FILTER: .* - CACHE_ARGS: '{{cache.flags}}' - dependencies: - - path: .yamato/urp_2d-win-dx11.yml#URP_2D_Win_DX11_playmode_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/urp_2d-win-dx11.yml#URP_2D_Win_DX11_editmode_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/urp_foundation-win-dx11.yml#URP_Foundation_Win_DX11_playmode_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/urp_foundation-win-dx11.yml#URP_Foundation_Win_DX11_editmode_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/urp_lighting-win-dx11.yml#URP_Lighting_Win_DX11_playmode_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/urp_lighting-win-dx11.yml#URP_Lighting_Win_DX11_editmode_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/urp_postpro-win-dx11.yml#URP_PostPro_Win_DX11_playmode_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/urp_postpro-win-dx11.yml#URP_PostPro_Win_DX11_editmode_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/urp_terrain-win-dx11.yml#URP_Terrain_Win_DX11_playmode_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/urp_terrain-win-dx11.yml#URP_Terrain_Win_DX11_editmode_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/shadergraph-win-dx11.yml#ShaderGraph_Win_DX11_playmode_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/shadergraph-win-dx11.yml#ShaderGraph_Win_DX11_editmode_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/hdrp-win-dx11.yml#HDRP_Win_DX11_playmode_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/hdrp-win-dx11.yml#HDRP_Win_DX11_editmode_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/vfx_hdrp-win-dx11.yml#VFX_HDRP_Win_DX11_playmode_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/vfx_hdrp-win-dx11.yml#VFX_HDRP_Win_DX11_editmode_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/vfx_urp-win-dx11.yml#VFX_URP_Win_DX11_playmode_mono_Linear_2021.2 - rerun: on_new_revision all_project_ci_CUSTOM-REVISION: name: ABV (all PR jobs) on CUSTOM-REVISION variables: @@ -273,24 +140,6 @@ all_project_ci_nightly_CUSTOM-REVISION: rerun: on_new_revision - path: .yamato/_abv.yml#General_Checks_CUSTOM-REVISION rerun: on_new_revision -all_project_ci_trunk_weekly_CUSTOM-REVISION: - name: Trunk Weekly on CUSTOM-REVISION - variables: - CUSTOM_REVISION: custom_revision_not_set - UTR_VERSION: "current" - TEST_FILTER: .* - CACHE_ARGS: '{{cache.flags}}' - dependencies: - - path: .yamato/all-hdrp.yml#Nightly_HDRP_CUSTOM-REVISION - rerun: on_new_revision - - path: .yamato/all-vfx.yml#Nightly_VFX_CUSTOM-REVISION - rerun: on_new_revision - - path: .yamato/all-urp.yml#Nightly_URP_CUSTOM-REVISION - rerun: on_new_revision - - path: .yamato/all-shadergraph.yml#Nightly_ShaderGraph_CUSTOM-REVISION - rerun: on_new_revision - - path: .yamato/_abv.yml#General_Checks_CUSTOM-REVISION - rerun: on_new_revision General_Checks_CUSTOM-REVISION: name: General Checks on CUSTOM-REVISION variables: diff --git a/.yamato/_editor_pinning.yml b/.yamato/_editor_pinning.yml index 49d4db423c1..428c9c97e28 100644 --- a/.yamato/_editor_pinning.yml +++ b/.yamato/_editor_pinning.yml @@ -4,7 +4,6 @@ # Read more under .yamato/docs/readme.md {% metadata_file .yamato/_cache_config.metafile -%} -{% metadata_file .yamato/_latest_editor_versions_2021.2.metafile -%} {% metadata_file .yamato/_latest_editor_versions_trunk.metafile -%} --- @@ -28,8 +27,7 @@ editor-pinning-update: - git config --global user.name "noreply@unity3d.com" - git config --global user.email "noreply@unity3d.com" - git checkout $GIT_BRANCH - - python3 .yamato/script/editor_scripts/update_revisions.py --track trunk --ono-branch $ONO_BRANCH_TRUNK --api-key $ONO_API_KEY --commit-and-push --nr-commits-to-retrieve 1 - - python3 .yamato/script/editor_scripts/update_revisions.py --track 2021.2 --ono-branch $ONO_BRANCH_2021_2 --api-key $ONO_API_KEY --commit-and-push --nr-commits-to-retrieve 100 + - python3 .yamato/script/editor_scripts/update_revisions.py --track trunk --ono-branch $ONO_BRANCH_TRUNK --api-key $ONO_API_KEY --commit-and-push --nr-commits-to-retrieve 100 triggers: recurring: - branch: master diff --git a/.yamato/_editor_priming.yml b/.yamato/_editor_priming.yml index 8373d24a985..70a3e1ae8b2 100644 --- a/.yamato/_editor_priming.yml +++ b/.yamato/_editor_priming.yml @@ -4,7 +4,6 @@ # Read more under .yamato/docs/readme.md {% metadata_file .yamato/_cache_config.metafile -%} -{% metadata_file .yamato/_latest_editor_versions_2021.2.metafile -%} {% metadata_file .yamato/_latest_editor_versions_trunk.metafile -%} --- @@ -32,29 +31,6 @@ editor:priming:trunk:Win: unity_revision.zip: paths: - "unity_revision.txt" -editor:priming:2021.2:Win: - name: '[2021.2,Win] Editor priming' - agent: - type: Unity::VM - image: package-ci/ubuntu:stable - flavor: b1.small - skip_checkout: true - variables: - PATH: /home/bokken/bin:/home/bokken/.local/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin:/sbin:/home/bokken/.npm-global/bin - DISPLAY: ":0" - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - commands: - - sudo rm -f /etc/apt/sources.list /etc/apt/sources.list.d/{nodesource,teamviewer,deadsnakes-ubuntu-ppa-}* - - curl -L https://artifactory.prd.it.unity3d.com/artifactory/api/gpg/key/public | sudo apt-key add - - - sudo sh -c "echo 'deb https://artifactory.prd.it.unity3d.com/artifactory/unity-apt-local bionic main' > /etc/apt/sources.list.d/unity.list" - - sudo apt update - - sudo apt install unity-downloader-cli - - unity-downloader-cli -u $CUSTOM_REVISION -o windows --wait --skip-download -c editor -c il2cpp > unity_revision.txt - artifacts: - unity_revision.zip: - paths: - - "unity_revision.txt" editor:priming:CUSTOM-REVISION:Win: name: '[CUSTOM-REVISION,Win] Editor priming' agent: @@ -124,29 +100,6 @@ editor:priming:trunk:OSX: unity_revision.zip: paths: - "unity_revision.txt" -editor:priming:2021.2:OSX: - name: '[2021.2,OSX] Editor priming' - agent: - type: Unity::VM - image: package-ci/ubuntu:stable - flavor: b1.small - skip_checkout: true - variables: - PATH: /home/bokken/bin:/home/bokken/.local/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin:/sbin:/home/bokken/.npm-global/bin - DISPLAY: ":0" - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - commands: - - sudo rm -f /etc/apt/sources.list /etc/apt/sources.list.d/{nodesource,teamviewer,deadsnakes-ubuntu-ppa-}* - - curl -L https://artifactory.prd.it.unity3d.com/artifactory/api/gpg/key/public | sudo apt-key add - - - sudo sh -c "echo 'deb https://artifactory.prd.it.unity3d.com/artifactory/unity-apt-local bionic main' > /etc/apt/sources.list.d/unity.list" - - sudo apt update - - sudo apt install unity-downloader-cli - - unity-downloader-cli -u $CUSTOM_REVISION -o macos --wait --skip-download -c editor -c il2cpp > unity_revision.txt - artifacts: - unity_revision.zip: - paths: - - "unity_revision.txt" editor:priming:CUSTOM-REVISION:OSX: name: '[CUSTOM-REVISION,OSX] Editor priming' agent: @@ -216,29 +169,6 @@ editor:priming:trunk:Linux: unity_revision.zip: paths: - "unity_revision.txt" -editor:priming:2021.2:Linux: - name: '[2021.2,Linux] Editor priming' - agent: - type: Unity::VM - image: package-ci/ubuntu:stable - flavor: b1.small - skip_checkout: true - variables: - PATH: /home/bokken/bin:/home/bokken/.local/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin:/sbin:/home/bokken/.npm-global/bin - DISPLAY: ":0" - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - commands: - - sudo rm -f /etc/apt/sources.list /etc/apt/sources.list.d/{nodesource,teamviewer,deadsnakes-ubuntu-ppa-}* - - curl -L https://artifactory.prd.it.unity3d.com/artifactory/api/gpg/key/public | sudo apt-key add - - - sudo sh -c "echo 'deb https://artifactory.prd.it.unity3d.com/artifactory/unity-apt-local bionic main' > /etc/apt/sources.list.d/unity.list" - - sudo apt update - - sudo apt install unity-downloader-cli - - unity-downloader-cli -u $CUSTOM_REVISION -o linux --wait --skip-download -c editor -c il2cpp > unity_revision.txt - artifacts: - unity_revision.zip: - paths: - - "unity_revision.txt" editor:priming:CUSTOM-REVISION:Linux: name: '[CUSTOM-REVISION,Linux] Editor priming' agent: @@ -308,29 +238,6 @@ editor:priming:trunk:Android: unity_revision.zip: paths: - "unity_revision.txt" -editor:priming:2021.2:Android: - name: '[2021.2,Android] Editor priming' - agent: - type: Unity::VM - image: package-ci/ubuntu:stable - flavor: b1.small - skip_checkout: true - variables: - PATH: /home/bokken/bin:/home/bokken/.local/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin:/sbin:/home/bokken/.npm-global/bin - DISPLAY: ":0" - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - commands: - - sudo rm -f /etc/apt/sources.list /etc/apt/sources.list.d/{nodesource,teamviewer,deadsnakes-ubuntu-ppa-}* - - curl -L https://artifactory.prd.it.unity3d.com/artifactory/api/gpg/key/public | sudo apt-key add - - - sudo sh -c "echo 'deb https://artifactory.prd.it.unity3d.com/artifactory/unity-apt-local bionic main' > /etc/apt/sources.list.d/unity.list" - - sudo apt update - - sudo apt install unity-downloader-cli - - unity-downloader-cli -u $CUSTOM_REVISION -o windows --wait --skip-download -c editor -c il2cpp -c android > unity_revision.txt - artifacts: - unity_revision.zip: - paths: - - "unity_revision.txt" editor:priming:CUSTOM-REVISION:Android: name: '[CUSTOM-REVISION,Android] Editor priming' agent: @@ -400,29 +307,6 @@ editor:priming:trunk:XRQuest: unity_revision.zip: paths: - "unity_revision.txt" -editor:priming:2021.2:XRQuest: - name: '[2021.2,XRQuest] Editor priming' - agent: - type: Unity::VM - image: package-ci/ubuntu:stable - flavor: b1.small - skip_checkout: true - variables: - PATH: /home/bokken/bin:/home/bokken/.local/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin:/sbin:/home/bokken/.npm-global/bin - DISPLAY: ":0" - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - commands: - - sudo rm -f /etc/apt/sources.list /etc/apt/sources.list.d/{nodesource,teamviewer,deadsnakes-ubuntu-ppa-}* - - curl -L https://artifactory.prd.it.unity3d.com/artifactory/api/gpg/key/public | sudo apt-key add - - - sudo sh -c "echo 'deb https://artifactory.prd.it.unity3d.com/artifactory/unity-apt-local bionic main' > /etc/apt/sources.list.d/unity.list" - - sudo apt update - - sudo apt install unity-downloader-cli - - unity-downloader-cli -u $CUSTOM_REVISION -o windows --wait --skip-download -c editor -c il2cpp -c android > unity_revision.txt - artifacts: - unity_revision.zip: - paths: - - "unity_revision.txt" editor:priming:CUSTOM-REVISION:XRQuest: name: '[CUSTOM-REVISION,XRQuest] Editor priming' agent: @@ -492,29 +376,6 @@ editor:priming:trunk:iPhone: unity_revision.zip: paths: - "unity_revision.txt" -editor:priming:2021.2:iPhone: - name: '[2021.2,iPhone] Editor priming' - agent: - type: Unity::VM - image: package-ci/ubuntu:stable - flavor: b1.small - skip_checkout: true - variables: - PATH: /home/bokken/bin:/home/bokken/.local/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin:/sbin:/home/bokken/.npm-global/bin - DISPLAY: ":0" - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - commands: - - sudo rm -f /etc/apt/sources.list /etc/apt/sources.list.d/{nodesource,teamviewer,deadsnakes-ubuntu-ppa-}* - - curl -L https://artifactory.prd.it.unity3d.com/artifactory/api/gpg/key/public | sudo apt-key add - - - sudo sh -c "echo 'deb https://artifactory.prd.it.unity3d.com/artifactory/unity-apt-local bionic main' > /etc/apt/sources.list.d/unity.list" - - sudo apt update - - sudo apt install unity-downloader-cli - - unity-downloader-cli -u $CUSTOM_REVISION -o macos --wait --skip-download -c editor -c il2cpp -c ios > unity_revision.txt - artifacts: - unity_revision.zip: - paths: - - "unity_revision.txt" editor:priming:CUSTOM-REVISION:iPhone: name: '[CUSTOM-REVISION,iPhone] Editor priming' agent: diff --git a/.yamato/_latest_editor_versions_2021.2.metafile b/.yamato/_latest_editor_versions_2021.2.metafile deleted file mode 100644 index dc987cdcaff..00000000000 --- a/.yamato/_latest_editor_versions_2021.2.metafile +++ /dev/null @@ -1,5 +0,0 @@ -'2021_2': - updated_at_UTC: '2021-09-01 00:01:18.867712' - changeset: - id: fa287a10460c816514a14d21feeadbf2192df9e8 - date: '2021-08-31T13:45:37' diff --git a/.yamato/_latest_editor_versions_trunk.metafile b/.yamato/_latest_editor_versions_trunk.metafile index 736a02b28e2..16d83a53af6 100644 --- a/.yamato/_latest_editor_versions_trunk.metafile +++ b/.yamato/_latest_editor_versions_trunk.metafile @@ -1,5 +1,5 @@ trunk: - updated_at_UTC: '2021-08-31 00:01:09.181316' + updated_at_UTC: '2021-09-07 23:54:44.128519' changeset: - id: c277161121c634a9e605c7161b641c7f935eada5 - date: '2021-08-31T01:52:27' + id: a5808e9d96061997a8217598a1e95310102b6bc5 + date: '2021-09-07T11:14:25' diff --git a/.yamato/_projectcontext.yml b/.yamato/_projectcontext.yml index 627383f8b93..f54ae23ed34 100644 --- a/.yamato/_projectcontext.yml +++ b/.yamato/_projectcontext.yml @@ -4,7 +4,6 @@ # Read more under .yamato/docs/readme.md {% metadata_file .yamato/_cache_config.metafile -%} -{% metadata_file .yamato/_latest_editor_versions_2021.2.metafile -%} {% metadata_file .yamato/_latest_editor_versions_trunk.metafile -%} --- @@ -266,46 +265,6 @@ test_all_project_OSX_trunk: - "**/test-results/**" variables: CUSTOM_REVISION: '{{trunk.changeset.id}}' -test_all_project_Win_2021.2: - name: Test all packages [project context] Win 2021.2 - agent: - type: Unity::VM - image: package-ci/win10:stable - flavor: b1.large - dependencies: - - .yamato/_projectcontext.yml#pack_all_project - - .yamato/_editor_priming.yml#editor:priming:2021.2:Win - commands: - - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm - - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade - - unity-downloader-cli --source-file unity_revision.txt -c editor --wait --published-only - - upm-ci project test -u .\.Editor --project-path TestProjects/SRP_SmokeTest --type vetting-tests --extra-create-project-arg="-upmNoDefaultPackages" - artifacts: - logs: - paths: - - "**/test-results/**" - variables: - CUSTOM_REVISION: '{{2021_2.changeset.id}}' -test_all_project_OSX_2021.2: - name: Test all packages [project context] OSX 2021.2 - agent: - type: Unity::VM::osx - image: package-ci/mac:stable - flavor: m1.mac - dependencies: - - .yamato/_projectcontext.yml#pack_all_project - - .yamato/_editor_priming.yml#editor:priming:2021.2:OSX - commands: - - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm - - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade - - unity-downloader-cli --source-file unity_revision.txt -c editor --wait --published-only - - upm-ci project test -u $(pwd)/.Editor/Unity.app/Contents/MacOS/Unity --project-path TestProjects/SRP_SmokeTest --type vetting-tests --extra-create-project-arg="-upmNoDefaultPackages" - artifacts: - logs: - paths: - - "**/test-results/**" - variables: - CUSTOM_REVISION: '{{2021_2.changeset.id}}' test_all_project_Win_CUSTOM-REVISION: name: Test all packages [project context] Win CUSTOM-REVISION agent: @@ -399,23 +358,6 @@ all_package_ci_project_trunk: - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm - upm-ci package izon -t - upm-ci package izon -d -all_package_ci_project_2021.2: - name: Pack and test all packages - 2021.2 [project context] - agent: - type: Unity::VM - image: package-ci/win10:stable - flavor: b1.large - dependencies: - - .yamato/_projectcontext.yml#test_all_project_Win_2021.2 - - .yamato/_projectcontext.yml#test_all_project_Win_min_editor - - .yamato/_projectcontext.yml#test_all_project_OSX_2021.2 - - .yamato/_projectcontext.yml#test_all_project_OSX_min_editor - variables: - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - commands: - - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm - - upm-ci package izon -t - - upm-ci package izon -d all_package_ci_project_CUSTOM-REVISION: name: Pack and test all packages - CUSTOM-REVISION [project context] agent: diff --git a/.yamato/_templates.yml b/.yamato/_templates.yml index 6b8991f226d..23baca71867 100644 --- a/.yamato/_templates.yml +++ b/.yamato/_templates.yml @@ -4,7 +4,6 @@ # Read more under .yamato/docs/readme.md {% metadata_file .yamato/_cache_config.metafile -%} -{% metadata_file .yamato/_latest_editor_versions_2021.2.metafile -%} {% metadata_file .yamato/_latest_editor_versions_trunk.metafile -%} --- @@ -155,152 +154,6 @@ publish_hdrp_template_trunk_dry_run: paths: - "upm-ci~/packages/**/*" - "upm-ci~/templates/**/*" -pre_pack_hdrp_template_Win_2021.2: - name: Pre-Pack HDRP Template Win 2021.2 - agent: - type: Unity::VM - image: package-ci/win10:stable - flavor: b1.large - commands: - - choco install unity-downloader-cli -y -s https://artifactory.prd.it.unity3d.com/artifactory/api/nuget/unity-choco-local - - unity-downloader-cli --source-file unity_revision.txt -c editor --wait --published-only - - .Editor\Unity.exe -projectPath com.unity.template-hd -batchmode -quit -logFile ./Editor.log - dependencies: - - .yamato/_editor_priming.yml#editor:priming:2021.2:Win - artifacts: - primed: - paths: - - "com.unity.template-hd/Library/Artifacts/**" - - "com.unity.template-hd/Library/ArtifactDB" - - "com.unity.template-hd/Library/SourceAssetDB" - logs: - paths: - - "Editor.log" -pack_hdrp_template_Win_2021.2: - name: Pack HDRP Template Win 2021.2 - agent: - type: Unity::VM - image: package-ci/win10:stable - flavor: b1.large - commands: - - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm - - upm-ci template pack --project-path com.unity.template-hd - dependencies: - - .yamato/_templates.yml#pre_pack_hdrp_template_Win_2021.2 - artifacts: - packages: - paths: - - "upm-ci~/packages/**/*" - - "upm-ci~/templates/**/*" -test_hdrp_template_Win_2021.2: - name: Test HDRP Template Win 2021.2 - agent: - type: Unity::VM - image: package-ci/win10:stable - flavor: b1.large - dependencies: - - .yamato/_templates.yml#pack_hdrp_template_Win_2021.2 - - .yamato/_editor_priming.yml#editor:priming:2021.2:Win - commands: - - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm - - choco install unity-downloader-cli -y -s https://artifactory.prd.it.unity3d.com/artifactory/api/nuget/unity-choco-local - - unity-downloader-cli --source-file unity_revision.txt -c editor --wait --published-only - - upm-ci template test -u .\.Editor --project-path com.unity.template-hd - artifacts: - logs: - paths: - - "**/test-results/**" -pre_pack_hdrp_template_OSX_2021.2: - name: Pre-Pack HDRP Template OSX 2021.2 - agent: - type: Unity::VM::osx - image: package-ci/mac:stable - flavor: m1.mac - commands: - - unity-downloader-cli --source-file unity_revision.txt -c editor --wait --published-only - - .Editor/Unity.app/Contents/MacOS/Unity -projectPath com.unity.template-hd -batchmode -quit -logFile ./Editor.log - dependencies: - - .yamato/_editor_priming.yml#editor:priming:2021.2:OSX - artifacts: - primed: - paths: - - "com.unity.template-hd/Library/Artifacts/**" - - "com.unity.template-hd/Library/ArtifactDB" - - "com.unity.template-hd/Library/SourceAssetDB" - logs: - paths: - - "Editor.log" -pack_hdrp_template_OSX_2021.2: - name: Pack HDRP Template OSX 2021.2 - agent: - type: Unity::VM - image: package-ci/win10:stable - flavor: b1.large - commands: - - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm - - upm-ci template pack --project-path com.unity.template-hd - dependencies: - - .yamato/_templates.yml#pre_pack_hdrp_template_OSX_2021.2 - artifacts: - packages: - paths: - - "upm-ci~/packages/**/*" - - "upm-ci~/templates/**/*" -test_hdrp_template_OSX_2021.2: - name: Test HDRP Template OSX 2021.2 - agent: - type: Unity::VM::osx - image: package-ci/mac:stable - flavor: m1.mac - dependencies: - - .yamato/_templates.yml#pack_hdrp_template_OSX_2021.2 - - .yamato/_editor_priming.yml#editor:priming:2021.2:OSX - commands: - - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm - - unity-downloader-cli --source-file unity_revision.txt -c editor --wait --published-only - - upm-ci template test -u $(pwd)/.Editor/Unity.app/Contents/MacOS/Unity --project-path com.unity.template-hd - artifacts: - logs: - paths: - - "**/test-results/**" -publish_hdrp_template_2021.2: - agent: - type: Unity::VM - image: package-ci/win10:stable - flavor: b1.large - name: Publish HDRP Template 2021.2 - commands: - - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm - - upm-ci template publish --project-path com.unity.template-hd - dependencies: - - .yamato/_templates.yml#test_hdrp_template_Win_2021.2 - - .yamato/_templates.yml#test_hdrp_template_OSX_2021.2 - - .yamato/_templates.yml#pack_hdrp_template_Win_2021.2 - - .yamato/_templates.yml#pack_hdrp_template_OSX_2021.2 - artifacts: - packages: - paths: - - "upm-ci~/packages/**/*" - - "upm-ci~/templates/**/*" -publish_hdrp_template_2021.2_dry_run: - agent: - type: Unity::VM - image: package-ci/win10:stable - flavor: b1.large - name: Publish HDRP Template 2021.2 Dry Run - commands: - - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm - - upm-ci template publish --project-path com.unity.template-hd --dry-run - dependencies: - - .yamato/_templates.yml#test_hdrp_template_Win_2021.2 - - .yamato/_templates.yml#test_hdrp_template_OSX_2021.2 - - .yamato/_templates.yml#pack_hdrp_template_Win_2021.2 - - .yamato/_templates.yml#pack_hdrp_template_OSX_2021.2 - artifacts: - packages: - paths: - - "upm-ci~/packages/**/*" - - "upm-ci~/templates/**/*" pre_pack_hdrp_template_Win_CUSTOM-REVISION: name: Pre-Pack HDRP Template Win CUSTOM-REVISION agent: @@ -593,152 +446,6 @@ publish_universal_template_trunk_dry_run: paths: - "upm-ci~/packages/**/*" - "upm-ci~/templates/**/*" -pre_pack_universal_template_Win_2021.2: - name: Pre-Pack Universal Template Win 2021.2 - agent: - type: Unity::VM - image: package-ci/win10:stable - flavor: b1.large - commands: - - choco install unity-downloader-cli -y -s https://artifactory.prd.it.unity3d.com/artifactory/api/nuget/unity-choco-local - - unity-downloader-cli --source-file unity_revision.txt -c editor --wait --published-only - - .Editor\Unity.exe -projectPath com.unity.template-universal -batchmode -quit -logFile ./Editor.log - dependencies: - - .yamato/_editor_priming.yml#editor:priming:2021.2:Win - artifacts: - primed: - paths: - - "com.unity.template-universal/Library/Artifacts/**" - - "com.unity.template-universal/Library/ArtifactDB" - - "com.unity.template-universal/Library/SourceAssetDB" - logs: - paths: - - "Editor.log" -pack_universal_template_Win_2021.2: - name: Pack Universal Template Win 2021.2 - agent: - type: Unity::VM - image: package-ci/win10:stable - flavor: b1.large - commands: - - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm - - upm-ci template pack --project-path com.unity.template-universal - dependencies: - - .yamato/_templates.yml#pre_pack_universal_template_Win_2021.2 - artifacts: - packages: - paths: - - "upm-ci~/packages/**/*" - - "upm-ci~/templates/**/*" -test_universal_template_Win_2021.2: - name: Test Universal Template Win 2021.2 - agent: - type: Unity::VM - image: package-ci/win10:stable - flavor: b1.large - dependencies: - - .yamato/_templates.yml#pack_universal_template_Win_2021.2 - - .yamato/_editor_priming.yml#editor:priming:2021.2:Win - commands: - - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm - - choco install unity-downloader-cli -y -s https://artifactory.prd.it.unity3d.com/artifactory/api/nuget/unity-choco-local - - unity-downloader-cli --source-file unity_revision.txt -c editor --wait --published-only - - upm-ci template test -u .\.Editor --project-path com.unity.template-universal - artifacts: - logs: - paths: - - "**/test-results/**" -pre_pack_universal_template_OSX_2021.2: - name: Pre-Pack Universal Template OSX 2021.2 - agent: - type: Unity::VM::osx - image: package-ci/mac:stable - flavor: m1.mac - commands: - - unity-downloader-cli --source-file unity_revision.txt -c editor --wait --published-only - - .Editor/Unity.app/Contents/MacOS/Unity -projectPath com.unity.template-universal -batchmode -quit -logFile ./Editor.log - dependencies: - - .yamato/_editor_priming.yml#editor:priming:2021.2:OSX - artifacts: - primed: - paths: - - "com.unity.template-universal/Library/Artifacts/**" - - "com.unity.template-universal/Library/ArtifactDB" - - "com.unity.template-universal/Library/SourceAssetDB" - logs: - paths: - - "Editor.log" -pack_universal_template_OSX_2021.2: - name: Pack Universal Template OSX 2021.2 - agent: - type: Unity::VM - image: package-ci/win10:stable - flavor: b1.large - commands: - - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm - - upm-ci template pack --project-path com.unity.template-universal - dependencies: - - .yamato/_templates.yml#pre_pack_universal_template_OSX_2021.2 - artifacts: - packages: - paths: - - "upm-ci~/packages/**/*" - - "upm-ci~/templates/**/*" -test_universal_template_OSX_2021.2: - name: Test Universal Template OSX 2021.2 - agent: - type: Unity::VM::osx - image: package-ci/mac:stable - flavor: m1.mac - dependencies: - - .yamato/_templates.yml#pack_universal_template_OSX_2021.2 - - .yamato/_editor_priming.yml#editor:priming:2021.2:OSX - commands: - - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm - - unity-downloader-cli --source-file unity_revision.txt -c editor --wait --published-only - - upm-ci template test -u $(pwd)/.Editor/Unity.app/Contents/MacOS/Unity --project-path com.unity.template-universal - artifacts: - logs: - paths: - - "**/test-results/**" -publish_universal_template_2021.2: - agent: - type: Unity::VM - image: package-ci/win10:stable - flavor: b1.large - name: Publish Universal Template 2021.2 - commands: - - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm - - upm-ci template publish --project-path com.unity.template-universal - dependencies: - - .yamato/_templates.yml#test_universal_template_Win_2021.2 - - .yamato/_templates.yml#test_universal_template_OSX_2021.2 - - .yamato/_templates.yml#pack_universal_template_Win_2021.2 - - .yamato/_templates.yml#pack_universal_template_OSX_2021.2 - artifacts: - packages: - paths: - - "upm-ci~/packages/**/*" - - "upm-ci~/templates/**/*" -publish_universal_template_2021.2_dry_run: - agent: - type: Unity::VM - image: package-ci/win10:stable - flavor: b1.large - name: Publish Universal Template 2021.2 Dry Run - commands: - - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm - - upm-ci template publish --project-path com.unity.template-universal --dry-run - dependencies: - - .yamato/_templates.yml#test_universal_template_Win_2021.2 - - .yamato/_templates.yml#test_universal_template_OSX_2021.2 - - .yamato/_templates.yml#pack_universal_template_Win_2021.2 - - .yamato/_templates.yml#pack_universal_template_OSX_2021.2 - artifacts: - packages: - paths: - - "upm-ci~/packages/**/*" - - "upm-ci~/templates/**/*" pre_pack_universal_template_Win_CUSTOM-REVISION: name: Pre-Pack Universal Template Win CUSTOM-REVISION agent: @@ -900,21 +607,6 @@ all_template_ci_trunk: - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm - upm-ci package izon -t - upm-ci package izon -d -all_template_ci_2021.2: - name: Pack and test all templates - 2021.2 - agent: - type: Unity::VM - image: package-ci/win10:stable - flavor: b1.large - dependencies: - - .yamato/_templates.yml#test_hdrp_template_Win_2021.2 - - .yamato/_templates.yml#test_universal_template_Win_2021.2 - - .yamato/_templates.yml#test_hdrp_template_OSX_2021.2 - - .yamato/_templates.yml#test_universal_template_OSX_2021.2 - commands: - - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm - - upm-ci package izon -t - - upm-ci package izon -d all_template_ci_CUSTOM-REVISION: name: Pack and test all templates - CUSTOM-REVISION agent: diff --git a/.yamato/all-hdrp.yml b/.yamato/all-hdrp.yml index 321e4b9167e..45836272539 100644 --- a/.yamato/all-hdrp.yml +++ b/.yamato/all-hdrp.yml @@ -4,7 +4,6 @@ # Read more under .yamato/docs/readme.md {% metadata_file .yamato/_cache_config.metafile -%} -{% metadata_file .yamato/_latest_editor_versions_2021.2.metafile -%} {% metadata_file .yamato/_latest_editor_versions_trunk.metafile -%} --- @@ -91,88 +90,6 @@ Nightly_HDRP_trunk: rerun: on_new_revision - path: .yamato/all-hdrp.yml#HDRP_trunk rerun: on_new_revision -PR_HDRP_2021.2: - name: PR HDRP on 2021.2 - variables: - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - UTR_VERSION: "current" - TEST_FILTER: .* - CACHE_ARGS: '{{cache.flags}}' - dependencies: - - path: .yamato/hdrp-win-dx11.yml#HDRP_Win_DX11_Standalone_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/hdrp-win-dx11.yml#HDRP_Win_DX11_Standalone_XR_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/hdrp-win-dx11.yml#HDRP_Win_DX11_playmode_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/hdrp-win-dx11.yml#HDRP_Win_DX11_playmode_XR_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/hdrp-win-dx11.yml#HDRP_Win_DX11_editmode_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/hdrp-win-dx12.yml#HDRP_Win_DX12_playmode_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/hdrp-win-vulkan.yml#HDRP_Win_Vulkan_playmode_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/hdrp-osx-metal.yml#HDRP_OSX_Metal_playmode_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/hdrp-linux-vulkan.yml#HDRP_Linux_Vulkan_playmode_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/hdrp-linux-vulkan.yml#HDRP_Linux_Vulkan_Standalone_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/all-hdrp_dxr.yml#PR_HDRP_DXR_2021.2 - rerun: on_new_revision - - path: .yamato/all-vfx_hdrp.yml#PR_VFX_HDRP_2021.2 - rerun: on_new_revision - - path: .yamato/_abv.yml#General_Checks_2021.2 - rerun: on_new_revision -Extra_HDRP_2021.2: - name: Extra HDRP on 2021.2 - variables: - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - UTR_VERSION: "current" - TEST_FILTER: .* - CACHE_ARGS: '{{cache.flags}}' - dependencies: - - path: .yamato/hdrp-win-dx11.yml#HDRP_Win_DX11_editmode_XR_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/hdrp-win-dx12.yml#HDRP_Win_DX12_Standalone_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/hdrp-win-dx12.yml#HDRP_Win_DX12_Standalone_XR_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/hdrp-win-dx12.yml#HDRP_Win_DX12_playmode_XR_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/hdrp-win-vulkan.yml#HDRP_Win_Vulkan_Standalone_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/hdrp-linux-vulkan.yml#HDRP_Linux_Vulkan_editmode_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/hdrp-osx-metal.yml#HDRP_OSX_Metal_Standalone_mono_Linear_2021.2 - rerun: on_new_revision -HDRP_2021.2: - name: HDRP on 2021.2 - variables: - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - UTR_VERSION: "current" - TEST_FILTER: .* - CACHE_ARGS: '{{cache.flags}}' - dependencies: - - path: .yamato/all-hdrp.yml#PR_HDRP_2021.2 - rerun: on_new_revision - - path: .yamato/all-hdrp.yml#Extra_HDRP_2021.2 - rerun: on_new_revision -Nightly_HDRP_2021.2: - name: Nightly HDRP on 2021.2 - variables: - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - UTR_VERSION: "current" - TEST_FILTER: .* - CACHE_ARGS: '{{cache.flags}}' - dependencies: - - path: .yamato/all-hdrp_performancetests.yml#HDRP_PerformanceTests_2021.2 - rerun: on_new_revision - - path: .yamato/all-hdrp_dxr.yml#HDRP_DXR_2021.2 - rerun: on_new_revision - - path: .yamato/all-hdrp.yml#HDRP_2021.2 - rerun: on_new_revision PR_HDRP_CUSTOM-REVISION: name: PR HDRP on CUSTOM-REVISION variables: diff --git a/.yamato/all-hdrp_dxr.yml b/.yamato/all-hdrp_dxr.yml index cebed11013c..f89677fc185 100644 --- a/.yamato/all-hdrp_dxr.yml +++ b/.yamato/all-hdrp_dxr.yml @@ -4,7 +4,6 @@ # Read more under .yamato/docs/readme.md {% metadata_file .yamato/_cache_config.metafile -%} -{% metadata_file .yamato/_latest_editor_versions_2021.2.metafile -%} {% metadata_file .yamato/_latest_editor_versions_trunk.metafile -%} --- @@ -41,38 +40,6 @@ HDRP_DXR_trunk: rerun: on_new_revision - path: .yamato/all-hdrp_dxr.yml#Extra_HDRP_DXR_trunk rerun: on_new_revision -PR_HDRP_DXR_2021.2: - name: PR HDRP_DXR on 2021.2 - variables: - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - UTR_VERSION: "current" - TEST_FILTER: .* - CACHE_ARGS: '{{cache.flags}}' - dependencies: - - path: .yamato/hdrp_dxr-win-dx12.yml#HDRP_DXR_Win_DX12_playmode_mono_Linear_2021.2 - rerun: on_new_revision -Extra_HDRP_DXR_2021.2: - name: Extra HDRP_DXR on 2021.2 - variables: - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - UTR_VERSION: "current" - TEST_FILTER: .* - CACHE_ARGS: '{{cache.flags}}' - dependencies: - - path: .yamato/hdrp_dxr-win-dx12.yml#HDRP_DXR_Win_DX12_playmode_XR_mono_Linear_2021.2 - rerun: on_new_revision -HDRP_DXR_2021.2: - name: HDRP_DXR on 2021.2 - variables: - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - UTR_VERSION: "current" - TEST_FILTER: .* - CACHE_ARGS: '{{cache.flags}}' - dependencies: - - path: .yamato/all-hdrp_dxr.yml#PR_HDRP_DXR_2021.2 - rerun: on_new_revision - - path: .yamato/all-hdrp_dxr.yml#Extra_HDRP_DXR_2021.2 - rerun: on_new_revision PR_HDRP_DXR_CUSTOM-REVISION: name: PR HDRP_DXR on CUSTOM-REVISION variables: diff --git a/.yamato/all-hdrp_hybrid.yml b/.yamato/all-hdrp_hybrid.yml index 3c7ac979f19..5a6b9a11da3 100644 --- a/.yamato/all-hdrp_hybrid.yml +++ b/.yamato/all-hdrp_hybrid.yml @@ -4,7 +4,6 @@ # Read more under .yamato/docs/readme.md {% metadata_file .yamato/_cache_config.metafile -%} -{% metadata_file .yamato/_latest_editor_versions_2021.2.metafile -%} {% metadata_file .yamato/_latest_editor_versions_trunk.metafile -%} --- @@ -41,38 +40,6 @@ HDRP_Hybrid_trunk: rerun: on_new_revision - path: .yamato/all-hdrp_hybrid.yml#Extra_HDRP_Hybrid_trunk rerun: on_new_revision -PR_HDRP_Hybrid_2021.2: - name: PR HDRP_Hybrid on 2021.2 - variables: - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - UTR_VERSION: "current" - TEST_FILTER: .* - CACHE_ARGS: '{{cache.flags}}' - dependencies: - - path: .yamato/hdrp_hybrid-win-dx11.yml#HDRP_Hybrid_Win_DX11_playmode_mono_Linear_2021.2 - rerun: on_new_revision -Extra_HDRP_Hybrid_2021.2: - name: Extra HDRP_Hybrid on 2021.2 - variables: - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - UTR_VERSION: "current" - TEST_FILTER: .* - CACHE_ARGS: '{{cache.flags}}' - dependencies: - - path: .yamato/hdrp_hybrid-win-dx11.yml#HDRP_Hybrid_Win_DX11_playmode_XR_mono_Linear_2021.2 - rerun: on_new_revision -HDRP_Hybrid_2021.2: - name: HDRP_Hybrid on 2021.2 - variables: - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - UTR_VERSION: "current" - TEST_FILTER: .* - CACHE_ARGS: '{{cache.flags}}' - dependencies: - - path: .yamato/all-hdrp_hybrid.yml#PR_HDRP_Hybrid_2021.2 - rerun: on_new_revision - - path: .yamato/all-hdrp_hybrid.yml#Extra_HDRP_Hybrid_2021.2 - rerun: on_new_revision PR_HDRP_Hybrid_CUSTOM-REVISION: name: PR HDRP_Hybrid on CUSTOM-REVISION variables: diff --git a/.yamato/all-hdrp_performancetests.yml b/.yamato/all-hdrp_performancetests.yml index 54606caf745..3b15340f14b 100644 --- a/.yamato/all-hdrp_performancetests.yml +++ b/.yamato/all-hdrp_performancetests.yml @@ -4,7 +4,6 @@ # Read more under .yamato/docs/readme.md {% metadata_file .yamato/_cache_config.metafile -%} -{% metadata_file .yamato/_latest_editor_versions_2021.2.metafile -%} {% metadata_file .yamato/_latest_editor_versions_trunk.metafile -%} --- @@ -22,19 +21,6 @@ HDRP_PerformanceTests_trunk: rerun: on_new_revision - path: .yamato/hdrp_performancetests-win-dx11.yml#HDRP_PerformanceTests_Win_DX11_performance_run_build_il2cpp_Linear_trunk rerun: on_new_revision -HDRP_PerformanceTests_2021.2: - name: HDRP_PerformanceTests on 2021.2 - variables: - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - UTR_VERSION: "current" - TEST_FILTER: .* - GIT_BRANCH: master - CACHE_ARGS: '{{cache.flags}}' - dependencies: - - path: .yamato/hdrp_performancetests-win-dx11.yml#HDRP_PerformanceTests_Win_DX11_performance_memory_il2cpp_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/hdrp_performancetests-win-dx11.yml#HDRP_PerformanceTests_Win_DX11_performance_run_build_il2cpp_Linear_2021.2 - rerun: on_new_revision HDRP_PerformanceTests_CUSTOM-REVISION: name: HDRP_PerformanceTests on CUSTOM-REVISION variables: diff --git a/.yamato/all-postprocessing.yml b/.yamato/all-postprocessing.yml index 9fd45348bfa..516c4061bb9 100644 --- a/.yamato/all-postprocessing.yml +++ b/.yamato/all-postprocessing.yml @@ -4,7 +4,6 @@ # Read more under .yamato/docs/readme.md {% metadata_file .yamato/_cache_config.metafile -%} -{% metadata_file .yamato/_latest_editor_versions_2021.2.metafile -%} {% metadata_file .yamato/_latest_editor_versions_trunk.metafile -%} --- @@ -59,56 +58,6 @@ PostProcessing_trunk: rerun: on_new_revision - path: .yamato/all-postprocessing.yml#Extra_PostProcessing_trunk rerun: on_new_revision -PR_PostProcessing_2021.2: - name: PR PostProcessing on 2021.2 - variables: - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - UTR_VERSION: "current" - TEST_FILTER: .* - CACHE_ARGS: '{{cache.flags}}' - dependencies: - - path: .yamato/postprocessing-win-dx11.yml#PostProcessing_Win_DX11_Standalone_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/postprocessing-win-dx11.yml#PostProcessing_Win_DX11_playmode_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/postprocessing-win-dx11.yml#PostProcessing_Win_DX11_editmode_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/postprocessing-win-dx12.yml#PostProcessing_Win_DX12_playmode_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/postprocessing-win-vulkan.yml#PostProcessing_Win_Vulkan_playmode_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/postprocessing-osx-metal.yml#PostProcessing_OSX_Metal_playmode_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/postprocessing-linux-vulkan.yml#PostProcessing_Linux_Vulkan_Standalone_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/postprocessing-linux-vulkan.yml#PostProcessing_Linux_Vulkan_playmode_mono_Linear_2021.2 - rerun: on_new_revision -Extra_PostProcessing_2021.2: - name: Extra PostProcessing on 2021.2 - variables: - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - UTR_VERSION: "current" - TEST_FILTER: .* - CACHE_ARGS: '{{cache.flags}}' - dependencies: - - path: .yamato/postprocessing-win-dx12.yml#PostProcessing_Win_DX12_Standalone_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/postprocessing-win-vulkan.yml#PostProcessing_Win_Vulkan_Standalone_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/postprocessing-linux-vulkan.yml#PostProcessing_Linux_Vulkan_editmode_mono_Linear_2021.2 - rerun: on_new_revision -PostProcessing_2021.2: - name: PostProcessing on 2021.2 - variables: - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - UTR_VERSION: "current" - TEST_FILTER: .* - CACHE_ARGS: '{{cache.flags}}' - dependencies: - - path: .yamato/all-postprocessing.yml#PR_PostProcessing_2021.2 - rerun: on_new_revision - - path: .yamato/all-postprocessing.yml#Extra_PostProcessing_2021.2 - rerun: on_new_revision PR_PostProcessing_CUSTOM-REVISION: name: PR PostProcessing on CUSTOM-REVISION variables: diff --git a/.yamato/all-shadergraph.yml b/.yamato/all-shadergraph.yml index 4be4ab8cbb0..b3a93b101ec 100644 --- a/.yamato/all-shadergraph.yml +++ b/.yamato/all-shadergraph.yml @@ -4,7 +4,6 @@ # Read more under .yamato/docs/readme.md {% metadata_file .yamato/_cache_config.metafile -%} -{% metadata_file .yamato/_latest_editor_versions_2021.2.metafile -%} {% metadata_file .yamato/_latest_editor_versions_trunk.metafile -%} --- @@ -77,74 +76,6 @@ Nightly_ShaderGraph_trunk: rerun: on_new_revision - path: .yamato/all-shadergraph_builtin_lighting.yml#ShaderGraph_BuiltIn_Lighting_trunk rerun: on_new_revision -PR_ShaderGraph_2021.2: - name: PR ShaderGraph on 2021.2 - variables: - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - UTR_VERSION: "current" - TEST_FILTER: .* - CACHE_ARGS: '{{cache.flags}}' - dependencies: - - path: .yamato/shadergraph-win-dx11.yml#ShaderGraph_Win_DX11_Standalone_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/shadergraph-osx-openglcore.yml#ShaderGraph_OSX_OpenGLCore_editmode_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/shadergraph-linux-vulkan.yml#ShaderGraph_Linux_Vulkan_Standalone_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/shadergraph-osx-metal.yml#ShaderGraph_OSX_Metal_playmode_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/shadergraph-iphone-metal.yml#ShaderGraph_iPhone_Metal_Standalone_il2cpp_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/all-shadergraph_stereo.yml#PR_ShaderGraph_Stereo_2021.2 - rerun: on_new_revision - - path: .yamato/_abv.yml#General_Checks_2021.2 - rerun: on_new_revision -Extra_ShaderGraph_2021.2: - name: Extra ShaderGraph on 2021.2 - variables: - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - UTR_VERSION: "current" - TEST_FILTER: .* - CACHE_ARGS: '{{cache.flags}}' - dependencies: - - path: .yamato/shadergraph-win-dx11.yml#ShaderGraph_Win_DX11_editmode_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/shadergraph-win-dx11.yml#ShaderGraph_Win_DX11_playmode_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/shadergraph-linux-vulkan.yml#ShaderGraph_Linux_Vulkan_editmode_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/shadergraph-linux-vulkan.yml#ShaderGraph_Linux_Vulkan_playmode_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/shadergraph-android-vulkan.yml#ShaderGraph_Android_Vulkan_Standalone_il2cpp_Linear_2021.2 - rerun: on_new_revision -ShaderGraph_2021.2: - name: ShaderGraph on 2021.2 - variables: - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - UTR_VERSION: "current" - TEST_FILTER: .* - CACHE_ARGS: '{{cache.flags}}' - dependencies: - - path: .yamato/all-shadergraph.yml#PR_ShaderGraph_2021.2 - rerun: on_new_revision - - path: .yamato/all-shadergraph.yml#Extra_ShaderGraph_2021.2 - rerun: on_new_revision -Nightly_ShaderGraph_2021.2: - name: Nightly ShaderGraph on 2021.2 - variables: - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - UTR_VERSION: "current" - TEST_FILTER: .* - CACHE_ARGS: '{{cache.flags}}' - dependencies: - - path: .yamato/all-shadergraph.yml#ShaderGraph_2021.2 - rerun: on_new_revision - - path: .yamato/all-shadergraph_stereo.yml#ShaderGraph_Stereo_2021.2 - rerun: on_new_revision - - path: .yamato/all-shadergraph_builtin_foundation.yml#ShaderGraph_BuiltIn_Foundation_2021.2 - rerun: on_new_revision - - path: .yamato/all-shadergraph_builtin_lighting.yml#ShaderGraph_BuiltIn_Lighting_2021.2 - rerun: on_new_revision PR_ShaderGraph_CUSTOM-REVISION: name: PR ShaderGraph on CUSTOM-REVISION variables: diff --git a/.yamato/all-shadergraph_builtin_foundation.yml b/.yamato/all-shadergraph_builtin_foundation.yml index 341640582b3..142de1c26b7 100644 --- a/.yamato/all-shadergraph_builtin_foundation.yml +++ b/.yamato/all-shadergraph_builtin_foundation.yml @@ -4,7 +4,6 @@ # Read more under .yamato/docs/readme.md {% metadata_file .yamato/_cache_config.metafile -%} -{% metadata_file .yamato/_latest_editor_versions_2021.2.metafile -%} {% metadata_file .yamato/_latest_editor_versions_trunk.metafile -%} --- @@ -45,42 +44,6 @@ ShaderGraph_BuiltIn_Foundation_trunk: rerun: on_new_revision - path: .yamato/all-shadergraph_builtin_foundation.yml#Extra_ShaderGraph_BuiltIn_Foundation_trunk rerun: on_new_revision -PR_ShaderGraph_BuiltIn_Foundation_2021.2: - name: PR ShaderGraph_BuiltIn_Foundation on 2021.2 - variables: - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - UTR_VERSION: "current" - TEST_FILTER: .* - CACHE_ARGS: '{{cache.flags}}' - dependencies: - - path: .yamato/shadergraph_builtin_foundation-win-dx11.yml#ShaderGraph_BuiltIn_Foundation_Win_DX11_playmode_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/shadergraph_builtin_foundation-osx-openglcore.yml#ShaderGraph_BuiltIn_Foundation_OSX_OpenGLCore_playmode_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/shadergraph_builtin_foundation-linux-vulkan.yml#ShaderGraph_BuiltIn_Foundation_Linux_Vulkan_playmode_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/shadergraph_builtin_foundation-osx-metal.yml#ShaderGraph_BuiltIn_Foundation_OSX_Metal_playmode_mono_Linear_2021.2 - rerun: on_new_revision -Extra_ShaderGraph_BuiltIn_Foundation_2021.2: - name: Extra ShaderGraph_BuiltIn_Foundation on 2021.2 - variables: - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - UTR_VERSION: "current" - TEST_FILTER: .* - CACHE_ARGS: '{{cache.flags}}' - dependencies: [] -ShaderGraph_BuiltIn_Foundation_2021.2: - name: ShaderGraph_BuiltIn_Foundation on 2021.2 - variables: - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - UTR_VERSION: "current" - TEST_FILTER: .* - CACHE_ARGS: '{{cache.flags}}' - dependencies: - - path: .yamato/all-shadergraph_builtin_foundation.yml#PR_ShaderGraph_BuiltIn_Foundation_2021.2 - rerun: on_new_revision - - path: .yamato/all-shadergraph_builtin_foundation.yml#Extra_ShaderGraph_BuiltIn_Foundation_2021.2 - rerun: on_new_revision PR_ShaderGraph_BuiltIn_Foundation_CUSTOM-REVISION: name: PR ShaderGraph_BuiltIn_Foundation on CUSTOM-REVISION variables: diff --git a/.yamato/all-shadergraph_builtin_lighting.yml b/.yamato/all-shadergraph_builtin_lighting.yml index 9c9a936fbd6..dfe56b5b5b3 100644 --- a/.yamato/all-shadergraph_builtin_lighting.yml +++ b/.yamato/all-shadergraph_builtin_lighting.yml @@ -4,7 +4,6 @@ # Read more under .yamato/docs/readme.md {% metadata_file .yamato/_cache_config.metafile -%} -{% metadata_file .yamato/_latest_editor_versions_2021.2.metafile -%} {% metadata_file .yamato/_latest_editor_versions_trunk.metafile -%} --- @@ -45,42 +44,6 @@ ShaderGraph_BuiltIn_Lighting_trunk: rerun: on_new_revision - path: .yamato/all-shadergraph_builtin_lighting.yml#Extra_ShaderGraph_BuiltIn_Lighting_trunk rerun: on_new_revision -PR_ShaderGraph_BuiltIn_Lighting_2021.2: - name: PR ShaderGraph_BuiltIn_Lighting on 2021.2 - variables: - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - UTR_VERSION: "current" - TEST_FILTER: .* - CACHE_ARGS: '{{cache.flags}}' - dependencies: - - path: .yamato/shadergraph_builtin_lighting-win-dx11.yml#ShaderGraph_BuiltIn_Lighting_Win_DX11_playmode_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/shadergraph_builtin_lighting-osx-openglcore.yml#ShaderGraph_BuiltIn_Lighting_OSX_OpenGLCore_playmode_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/shadergraph_builtin_lighting-linux-vulkan.yml#ShaderGraph_BuiltIn_Lighting_Linux_Vulkan_playmode_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/shadergraph_builtin_lighting-osx-metal.yml#ShaderGraph_BuiltIn_Lighting_OSX_Metal_playmode_mono_Linear_2021.2 - rerun: on_new_revision -Extra_ShaderGraph_BuiltIn_Lighting_2021.2: - name: Extra ShaderGraph_BuiltIn_Lighting on 2021.2 - variables: - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - UTR_VERSION: "current" - TEST_FILTER: .* - CACHE_ARGS: '{{cache.flags}}' - dependencies: [] -ShaderGraph_BuiltIn_Lighting_2021.2: - name: ShaderGraph_BuiltIn_Lighting on 2021.2 - variables: - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - UTR_VERSION: "current" - TEST_FILTER: .* - CACHE_ARGS: '{{cache.flags}}' - dependencies: - - path: .yamato/all-shadergraph_builtin_lighting.yml#PR_ShaderGraph_BuiltIn_Lighting_2021.2 - rerun: on_new_revision - - path: .yamato/all-shadergraph_builtin_lighting.yml#Extra_ShaderGraph_BuiltIn_Lighting_2021.2 - rerun: on_new_revision PR_ShaderGraph_BuiltIn_Lighting_CUSTOM-REVISION: name: PR ShaderGraph_BuiltIn_Lighting on CUSTOM-REVISION variables: diff --git a/.yamato/all-shadergraph_stereo.yml b/.yamato/all-shadergraph_stereo.yml index 8d73dec3330..ed1ecb70f1d 100644 --- a/.yamato/all-shadergraph_stereo.yml +++ b/.yamato/all-shadergraph_stereo.yml @@ -4,7 +4,6 @@ # Read more under .yamato/docs/readme.md {% metadata_file .yamato/_cache_config.metafile -%} -{% metadata_file .yamato/_latest_editor_versions_2021.2.metafile -%} {% metadata_file .yamato/_latest_editor_versions_trunk.metafile -%} --- @@ -41,38 +40,6 @@ ShaderGraph_Stereo_trunk: rerun: on_new_revision - path: .yamato/all-shadergraph_stereo.yml#Extra_ShaderGraph_Stereo_trunk rerun: on_new_revision -PR_ShaderGraph_Stereo_2021.2: - name: PR ShaderGraph_Stereo on 2021.2 - variables: - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - UTR_VERSION: "current" - TEST_FILTER: .* - CACHE_ARGS: '{{cache.flags}}' - dependencies: - - path: .yamato/shadergraph_stereo-win.yml#ShaderGraph_Stereo_Win_Standalone_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/shadergraph_stereo-win.yml#ShaderGraph_Stereo_Win_editmode_mono_Linear_2021.2 - rerun: on_new_revision -Extra_ShaderGraph_Stereo_2021.2: - name: Extra ShaderGraph_Stereo on 2021.2 - variables: - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - UTR_VERSION: "current" - TEST_FILTER: .* - CACHE_ARGS: '{{cache.flags}}' - dependencies: [] -ShaderGraph_Stereo_2021.2: - name: ShaderGraph_Stereo on 2021.2 - variables: - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - UTR_VERSION: "current" - TEST_FILTER: .* - CACHE_ARGS: '{{cache.flags}}' - dependencies: - - path: .yamato/all-shadergraph_stereo.yml#PR_ShaderGraph_Stereo_2021.2 - rerun: on_new_revision - - path: .yamato/all-shadergraph_stereo.yml#Extra_ShaderGraph_Stereo_2021.2 - rerun: on_new_revision PR_ShaderGraph_Stereo_CUSTOM-REVISION: name: PR ShaderGraph_Stereo on CUSTOM-REVISION variables: diff --git a/.yamato/all-smoke_test.yml b/.yamato/all-smoke_test.yml index 0894abeda52..8b5e8ea36cf 100644 --- a/.yamato/all-smoke_test.yml +++ b/.yamato/all-smoke_test.yml @@ -4,7 +4,6 @@ # Read more under .yamato/docs/readme.md {% metadata_file .yamato/_cache_config.metafile -%} -{% metadata_file .yamato/_latest_editor_versions_2021.2.metafile -%} {% metadata_file .yamato/_latest_editor_versions_trunk.metafile -%} --- @@ -43,40 +42,6 @@ Smoke_Test_trunk: rerun: on_new_revision - path: .yamato/all-smoke_test.yml#Extra_Smoke_Test_trunk rerun: on_new_revision -PR_Smoke_Test_2021.2: - name: PR Smoke_Test on 2021.2 - variables: - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - UTR_VERSION: "current" - TEST_FILTER: .* - CACHE_ARGS: '{{cache.flags}}' - dependencies: - - path: .yamato/smoke_test-win-dx11.yml#Smoke_Test_Win_DX11_Standalone_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/smoke_test-win-dx11.yml#Smoke_Test_Win_DX11_playmode_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/smoke_test-win-dx11.yml#Smoke_Test_Win_DX11_editmode_mono_Linear_2021.2 - rerun: on_new_revision -Extra_Smoke_Test_2021.2: - name: Extra Smoke_Test on 2021.2 - variables: - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - UTR_VERSION: "current" - TEST_FILTER: .* - CACHE_ARGS: '{{cache.flags}}' - dependencies: [] -Smoke_Test_2021.2: - name: Smoke_Test on 2021.2 - variables: - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - UTR_VERSION: "current" - TEST_FILTER: .* - CACHE_ARGS: '{{cache.flags}}' - dependencies: - - path: .yamato/all-smoke_test.yml#PR_Smoke_Test_2021.2 - rerun: on_new_revision - - path: .yamato/all-smoke_test.yml#Extra_Smoke_Test_2021.2 - rerun: on_new_revision PR_Smoke_Test_CUSTOM-REVISION: name: PR Smoke_Test on CUSTOM-REVISION variables: diff --git a/.yamato/all-universal_hybrid.yml b/.yamato/all-universal_hybrid.yml index 2bbd6056d41..dcf390e2b06 100644 --- a/.yamato/all-universal_hybrid.yml +++ b/.yamato/all-universal_hybrid.yml @@ -4,7 +4,6 @@ # Read more under .yamato/docs/readme.md {% metadata_file .yamato/_cache_config.metafile -%} -{% metadata_file .yamato/_latest_editor_versions_2021.2.metafile -%} {% metadata_file .yamato/_latest_editor_versions_trunk.metafile -%} --- @@ -41,38 +40,6 @@ Universal_Hybrid_trunk: rerun: on_new_revision - path: .yamato/all-universal_hybrid.yml#Extra_Universal_Hybrid_trunk rerun: on_new_revision -PR_Universal_Hybrid_2021.2: - name: PR Universal_Hybrid on 2021.2 - variables: - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - UTR_VERSION: "current" - TEST_FILTER: .* - CACHE_ARGS: '{{cache.flags}}' - dependencies: - - path: .yamato/universal_hybrid-win-dx11.yml#Universal_Hybrid_Win_DX11_playmode_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/universal_hybrid-osx-metal.yml#Universal_Hybrid_OSX_Metal_playmode_mono_Linear_2021.2 - rerun: on_new_revision -Extra_Universal_Hybrid_2021.2: - name: Extra Universal_Hybrid on 2021.2 - variables: - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - UTR_VERSION: "current" - TEST_FILTER: .* - CACHE_ARGS: '{{cache.flags}}' - dependencies: [] -Universal_Hybrid_2021.2: - name: Universal_Hybrid on 2021.2 - variables: - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - UTR_VERSION: "current" - TEST_FILTER: .* - CACHE_ARGS: '{{cache.flags}}' - dependencies: - - path: .yamato/all-universal_hybrid.yml#PR_Universal_Hybrid_2021.2 - rerun: on_new_revision - - path: .yamato/all-universal_hybrid.yml#Extra_Universal_Hybrid_2021.2 - rerun: on_new_revision PR_Universal_Hybrid_CUSTOM-REVISION: name: PR Universal_Hybrid on CUSTOM-REVISION variables: diff --git a/.yamato/all-universal_split.yml b/.yamato/all-universal_split.yml index a712421578f..28cc04c2dc3 100644 --- a/.yamato/all-universal_split.yml +++ b/.yamato/all-universal_split.yml @@ -4,7 +4,6 @@ # Read more under .yamato/docs/readme.md {% metadata_file .yamato/_cache_config.metafile -%} -{% metadata_file .yamato/_latest_editor_versions_2021.2.metafile -%} {% metadata_file .yamato/_latest_editor_versions_trunk.metafile -%} --- @@ -45,42 +44,6 @@ Extra_Universal_Split_trunk: rerun: on_new_revision - path: .yamato/all-urp_postpro.yml#Extra_URP_PostPro_trunk rerun: on_new_revision -PR_Universal_Split_2021.2: - name: PR Universal_Split on 2021.2 - variables: - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - UTR_VERSION: "current" - TEST_FILTER: .* - CACHE_ARGS: '{{cache.flags}}' - dependencies: - - path: .yamato/all-urp_2d.yml#PR_URP_2D_2021.2 - rerun: on_new_revision - - path: .yamato/all-urp_foundation.yml#PR_URP_Foundation_2021.2 - rerun: on_new_revision - - path: .yamato/all-urp_lighting.yml#PR_URP_Lighting_2021.2 - rerun: on_new_revision - - path: .yamato/all-urp_terrain.yml#PR_URP_Terrain_2021.2 - rerun: on_new_revision - - path: .yamato/all-urp_postpro.yml#PR_URP_PostPro_2021.2 - rerun: on_new_revision -Extra_Universal_Split_2021.2: - name: Extra Universal_Split on 2021.2 - variables: - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - UTR_VERSION: "current" - TEST_FILTER: .* - CACHE_ARGS: '{{cache.flags}}' - dependencies: - - path: .yamato/all-urp_2d.yml#Extra_URP_2D_2021.2 - rerun: on_new_revision - - path: .yamato/all-urp_foundation.yml#Extra_URP_Foundation_2021.2 - rerun: on_new_revision - - path: .yamato/all-urp_lighting.yml#Extra_URP_Lighting_2021.2 - rerun: on_new_revision - - path: .yamato/all-urp_terrain.yml#Extra_URP_Terrain_2021.2 - rerun: on_new_revision - - path: .yamato/all-urp_postpro.yml#Extra_URP_PostPro_2021.2 - rerun: on_new_revision PR_Universal_Split_CUSTOM-REVISION: name: PR Universal_Split on CUSTOM-REVISION variables: diff --git a/.yamato/all-universal_stereo.yml b/.yamato/all-universal_stereo.yml index 3d9e79d32ea..7ce3de07dd6 100644 --- a/.yamato/all-universal_stereo.yml +++ b/.yamato/all-universal_stereo.yml @@ -4,7 +4,6 @@ # Read more under .yamato/docs/readme.md {% metadata_file .yamato/_cache_config.metafile -%} -{% metadata_file .yamato/_latest_editor_versions_2021.2.metafile -%} {% metadata_file .yamato/_latest_editor_versions_trunk.metafile -%} --- @@ -41,38 +40,6 @@ Universal_Stereo_trunk: rerun: on_new_revision - path: .yamato/all-universal_stereo.yml#Extra_Universal_Stereo_trunk rerun: on_new_revision -PR_Universal_Stereo_2021.2: - name: PR Universal_Stereo on 2021.2 - variables: - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - UTR_VERSION: "current" - TEST_FILTER: .* - CACHE_ARGS: '{{cache.flags}}' - dependencies: - - path: .yamato/universal_stereo-win.yml#Universal_Stereo_Win_Standalone_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/universal_stereo-win.yml#Universal_Stereo_Win_editmode_mono_Linear_2021.2 - rerun: on_new_revision -Extra_Universal_Stereo_2021.2: - name: Extra Universal_Stereo on 2021.2 - variables: - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - UTR_VERSION: "current" - TEST_FILTER: .* - CACHE_ARGS: '{{cache.flags}}' - dependencies: [] -Universal_Stereo_2021.2: - name: Universal_Stereo on 2021.2 - variables: - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - UTR_VERSION: "current" - TEST_FILTER: .* - CACHE_ARGS: '{{cache.flags}}' - dependencies: - - path: .yamato/all-universal_stereo.yml#PR_Universal_Stereo_2021.2 - rerun: on_new_revision - - path: .yamato/all-universal_stereo.yml#Extra_Universal_Stereo_2021.2 - rerun: on_new_revision PR_Universal_Stereo_CUSTOM-REVISION: name: PR Universal_Stereo on CUSTOM-REVISION variables: diff --git a/.yamato/all-urp.yml b/.yamato/all-urp.yml index 036c122145c..50a831bd22f 100644 --- a/.yamato/all-urp.yml +++ b/.yamato/all-urp.yml @@ -4,7 +4,6 @@ # Read more under .yamato/docs/readme.md {% metadata_file .yamato/_cache_config.metafile -%} -{% metadata_file .yamato/_latest_editor_versions_2021.2.metafile -%} {% metadata_file .yamato/_latest_editor_versions_trunk.metafile -%} --- @@ -71,68 +70,6 @@ Nightly_URP_trunk: rerun: on_new_revision - path: .yamato/urp_upgrade.yml#URP_Upgrade_test_win_trunk rerun: on_new_revision -PR_URP_2021.2: - name: PR URP on 2021.2 - variables: - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - UTR_VERSION: "current" - TEST_FILTER: .* - CACHE_ARGS: '{{cache.flags}}' - dependencies: - - path: .yamato/all-universal_split.yml#PR_Universal_Split_2021.2 - rerun: on_new_revision - - path: .yamato/all-universal_stereo.yml#PR_Universal_Stereo_2021.2 - rerun: on_new_revision - - path: .yamato/all-urpupdate.yml#PR_URPUpdate_2021.2 - rerun: on_new_revision - - path: .yamato/all-shadergraph.yml#PR_ShaderGraph_2021.2 - rerun: on_new_revision - - path: .yamato/all-vfx_urp.yml#PR_VFX_URP_2021.2 - rerun: on_new_revision - - path: .yamato/_abv.yml#General_Checks_2021.2 - rerun: on_new_revision -Extra_URP_2021.2: - name: Extra URP on 2021.2 - variables: - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - UTR_VERSION: "current" - TEST_FILTER: .* - CACHE_ARGS: '{{cache.flags}}' - dependencies: - - path: .yamato/all-universal_split.yml#Extra_Universal_Split_2021.2 - rerun: on_new_revision -URP_2021.2: - name: URP on 2021.2 - variables: - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - UTR_VERSION: "current" - TEST_FILTER: .* - CACHE_ARGS: '{{cache.flags}}' - dependencies: - - path: .yamato/all-urp.yml#PR_URP_2021.2 - rerun: on_new_revision - - path: .yamato/all-urp.yml#Extra_URP_2021.2 - rerun: on_new_revision -Nightly_URP_2021.2: - name: Nightly URP on 2021.2 - variables: - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - UTR_VERSION: "current" - TEST_FILTER: .* - CACHE_ARGS: '{{cache.flags}}' - dependencies: - - path: .yamato/all-urp.yml#URP_2021.2 - rerun: on_new_revision - - path: .yamato/all-universal_stereo.yml#Universal_Stereo_2021.2 - rerun: on_new_revision - - path: .yamato/all-urpupdate.yml#URPUpdate_2021.2 - rerun: on_new_revision - - path: .yamato/all-urp_perf.yml#URP_Perf_2021.2 - rerun: on_new_revision - - path: .yamato/all-urpupdate_top_asset_store.yml#URPUpdate_Top_Asset_Store_2021.2 - rerun: on_new_revision - - path: .yamato/urp_upgrade.yml#URP_Upgrade_test_win_2021.2 - rerun: on_new_revision PR_URP_CUSTOM-REVISION: name: PR URP on CUSTOM-REVISION variables: diff --git a/.yamato/all-urp_2d.yml b/.yamato/all-urp_2d.yml index 83946fa4bd4..310c8eb27db 100644 --- a/.yamato/all-urp_2d.yml +++ b/.yamato/all-urp_2d.yml @@ -4,7 +4,6 @@ # Read more under .yamato/docs/readme.md {% metadata_file .yamato/_cache_config.metafile -%} -{% metadata_file .yamato/_latest_editor_versions_2021.2.metafile -%} {% metadata_file .yamato/_latest_editor_versions_trunk.metafile -%} --- @@ -73,70 +72,6 @@ URP_2D_trunk: rerun: on_new_revision - path: .yamato/all-urp_2d.yml#Extra_URP_2D_trunk rerun: on_new_revision -PR_URP_2D_2021.2: - name: PR URP_2D on 2021.2 - variables: - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - UTR_VERSION: "current" - TEST_FILTER: .* - CACHE_ARGS: '{{cache.flags}}' - dependencies: - - path: .yamato/urp_2d-win-dx11.yml#URP_2D_Win_DX11_Standalone_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/urp_2d-win-dx11.yml#URP_2D_Win_DX11_playmode_XR_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/urp_2d-win-dx11.yml#URP_2D_Win_DX11_editmode_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/urp_2d-win-dx12.yml#URP_2D_Win_DX12_Standalone_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/urp_2d-win-vulkan.yml#URP_2D_Win_Vulkan_Standalone_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/urp_2d-linux-vulkan.yml#URP_2D_Linux_Vulkan_Standalone_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/urp_2d-android-opengles3.yml#URP_2D_Android_OpenGLES3_Standalone_il2cpp_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/urp_2d-android-vulkan.yml#URP_2D_Android_Vulkan_Standalone_il2cpp_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/urp_2d-iphone-metal.yml#URP_2D_iPhone_Metal_Standalone_il2cpp_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/urp_2d-osx-metal.yml#URP_2D_OSX_Metal_playmode_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/urp_2d-osx-openglcore.yml#URP_2D_OSX_OpenGLCore_editmode_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/urp_2d-android-opengles3.yml#URP_2D_Android_OpenGLES3_Standalone_il2cpp_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/urp_2d-android-vulkan.yml#URP_2D_Android_Vulkan_Standalone_il2cpp_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/urp_2d-iphone-metal.yml#URP_2D_iPhone_Metal_Standalone_il2cpp_Linear_2021.2 - rerun: on_new_revision -Extra_URP_2D_2021.2: - name: Extra URP_2D on 2021.2 - variables: - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - UTR_VERSION: "current" - TEST_FILTER: .* - CACHE_ARGS: '{{cache.flags}}' - dependencies: - - path: .yamato/urp_2d-win-dx11.yml#URP_2D_Win_DX11_playmode_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/urp_2d-win-dx12.yml#URP_2D_Win_DX12_playmode_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/urp_2d-win-vulkan.yml#URP_2D_Win_Vulkan_playmode_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/urp_2d-linux-vulkan.yml#URP_2D_Linux_Vulkan_playmode_mono_Linear_2021.2 - rerun: on_new_revision -URP_2D_2021.2: - name: URP_2D on 2021.2 - variables: - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - UTR_VERSION: "current" - TEST_FILTER: .* - CACHE_ARGS: '{{cache.flags}}' - dependencies: - - path: .yamato/all-urp_2d.yml#PR_URP_2D_2021.2 - rerun: on_new_revision - - path: .yamato/all-urp_2d.yml#Extra_URP_2D_2021.2 - rerun: on_new_revision PR_URP_2D_CUSTOM-REVISION: name: PR URP_2D on CUSTOM-REVISION variables: diff --git a/.yamato/all-urp_foundation.yml b/.yamato/all-urp_foundation.yml index 09b549857c8..47cbc8c6832 100644 --- a/.yamato/all-urp_foundation.yml +++ b/.yamato/all-urp_foundation.yml @@ -4,7 +4,6 @@ # Read more under .yamato/docs/readme.md {% metadata_file .yamato/_cache_config.metafile -%} -{% metadata_file .yamato/_latest_editor_versions_2021.2.metafile -%} {% metadata_file .yamato/_latest_editor_versions_trunk.metafile -%} --- @@ -77,74 +76,6 @@ URP_Foundation_trunk: rerun: on_new_revision - path: .yamato/all-urp_foundation.yml#Extra_URP_Foundation_trunk rerun: on_new_revision -PR_URP_Foundation_2021.2: - name: PR URP_Foundation on 2021.2 - variables: - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - UTR_VERSION: "current" - TEST_FILTER: .* - CACHE_ARGS: '{{cache.flags}}' - dependencies: - - path: .yamato/urp_foundation-win-dx11.yml#URP_Foundation_Win_DX11_Standalone_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/urp_foundation-win-dx11.yml#URP_Foundation_Win_DX11_Standalone_XR_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/urp_foundation-win-dx11.yml#URP_Foundation_Win_DX11_playmode_XR_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/urp_foundation-win-dx11.yml#URP_Foundation_Win_DX11_editmode_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/urp_foundation-win-dx12.yml#URP_Foundation_Win_DX12_Standalone_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/urp_foundation-win-dx12.yml#URP_Foundation_Win_DX12_Standalone_XR_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/urp_foundation-win-vulkan.yml#URP_Foundation_Win_Vulkan_Standalone_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/urp_foundation-linux-vulkan.yml#URP_Foundation_Linux_Vulkan_Standalone_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/urp_foundation-android-opengles3.yml#URP_Foundation_Android_OpenGLES3_Standalone_il2cpp_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/urp_foundation-android-vulkan.yml#URP_Foundation_Android_Vulkan_Standalone_il2cpp_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/urp_foundation-iphone-metal.yml#URP_Foundation_iPhone_Metal_Standalone_il2cpp_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/urp_foundation-osx-metal.yml#URP_Foundation_OSX_Metal_playmode_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/urp_foundation-osx-openglcore.yml#URP_Foundation_OSX_OpenGLCore_editmode_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/urp_foundation-android-opengles3.yml#URP_Foundation_Android_OpenGLES3_Standalone_il2cpp_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/urp_foundation-android-vulkan.yml#URP_Foundation_Android_Vulkan_Standalone_il2cpp_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/urp_foundation-iphone-metal.yml#URP_Foundation_iPhone_Metal_Standalone_il2cpp_Linear_2021.2 - rerun: on_new_revision -Extra_URP_Foundation_2021.2: - name: Extra URP_Foundation on 2021.2 - variables: - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - UTR_VERSION: "current" - TEST_FILTER: .* - CACHE_ARGS: '{{cache.flags}}' - dependencies: - - path: .yamato/urp_foundation-win-dx11.yml#URP_Foundation_Win_DX11_playmode_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/urp_foundation-win-dx12.yml#URP_Foundation_Win_DX12_playmode_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/urp_foundation-win-vulkan.yml#URP_Foundation_Win_Vulkan_playmode_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/urp_foundation-linux-vulkan.yml#URP_Foundation_Linux_Vulkan_playmode_mono_Linear_2021.2 - rerun: on_new_revision -URP_Foundation_2021.2: - name: URP_Foundation on 2021.2 - variables: - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - UTR_VERSION: "current" - TEST_FILTER: .* - CACHE_ARGS: '{{cache.flags}}' - dependencies: - - path: .yamato/all-urp_foundation.yml#PR_URP_Foundation_2021.2 - rerun: on_new_revision - - path: .yamato/all-urp_foundation.yml#Extra_URP_Foundation_2021.2 - rerun: on_new_revision PR_URP_Foundation_CUSTOM-REVISION: name: PR URP_Foundation on CUSTOM-REVISION variables: diff --git a/.yamato/all-urp_lighting.yml b/.yamato/all-urp_lighting.yml index 21b5451129b..b32e2e0cbd4 100644 --- a/.yamato/all-urp_lighting.yml +++ b/.yamato/all-urp_lighting.yml @@ -4,7 +4,6 @@ # Read more under .yamato/docs/readme.md {% metadata_file .yamato/_cache_config.metafile -%} -{% metadata_file .yamato/_latest_editor_versions_2021.2.metafile -%} {% metadata_file .yamato/_latest_editor_versions_trunk.metafile -%} --- @@ -77,74 +76,6 @@ URP_Lighting_trunk: rerun: on_new_revision - path: .yamato/all-urp_lighting.yml#Extra_URP_Lighting_trunk rerun: on_new_revision -PR_URP_Lighting_2021.2: - name: PR URP_Lighting on 2021.2 - variables: - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - UTR_VERSION: "current" - TEST_FILTER: .* - CACHE_ARGS: '{{cache.flags}}' - dependencies: - - path: .yamato/urp_lighting-win-dx11.yml#URP_Lighting_Win_DX11_Standalone_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/urp_lighting-win-dx11.yml#URP_Lighting_Win_DX11_Standalone_XR_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/urp_lighting-win-dx11.yml#URP_Lighting_Win_DX11_playmode_XR_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/urp_lighting-win-dx11.yml#URP_Lighting_Win_DX11_editmode_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/urp_lighting-win-dx12.yml#URP_Lighting_Win_DX12_Standalone_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/urp_lighting-win-dx12.yml#URP_Lighting_Win_DX12_Standalone_XR_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/urp_lighting-win-vulkan.yml#URP_Lighting_Win_Vulkan_Standalone_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/urp_lighting-linux-vulkan.yml#URP_Lighting_Linux_Vulkan_Standalone_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/urp_lighting-android-opengles3.yml#URP_Lighting_Android_OpenGLES3_Standalone_il2cpp_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/urp_lighting-android-vulkan.yml#URP_Lighting_Android_Vulkan_Standalone_il2cpp_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/urp_lighting-iphone-metal.yml#URP_Lighting_iPhone_Metal_Standalone_il2cpp_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/urp_lighting-osx-metal.yml#URP_Lighting_OSX_Metal_playmode_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/urp_lighting-osx-openglcore.yml#URP_Lighting_OSX_OpenGLCore_editmode_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/urp_lighting-android-opengles3.yml#URP_Lighting_Android_OpenGLES3_Standalone_il2cpp_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/urp_lighting-android-vulkan.yml#URP_Lighting_Android_Vulkan_Standalone_il2cpp_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/urp_lighting-iphone-metal.yml#URP_Lighting_iPhone_Metal_Standalone_il2cpp_Linear_2021.2 - rerun: on_new_revision -Extra_URP_Lighting_2021.2: - name: Extra URP_Lighting on 2021.2 - variables: - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - UTR_VERSION: "current" - TEST_FILTER: .* - CACHE_ARGS: '{{cache.flags}}' - dependencies: - - path: .yamato/urp_lighting-win-dx11.yml#URP_Lighting_Win_DX11_playmode_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/urp_lighting-win-dx12.yml#URP_Lighting_Win_DX12_playmode_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/urp_lighting-win-vulkan.yml#URP_Lighting_Win_Vulkan_playmode_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/urp_lighting-linux-vulkan.yml#URP_Lighting_Linux_Vulkan_playmode_mono_Linear_2021.2 - rerun: on_new_revision -URP_Lighting_2021.2: - name: URP_Lighting on 2021.2 - variables: - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - UTR_VERSION: "current" - TEST_FILTER: .* - CACHE_ARGS: '{{cache.flags}}' - dependencies: - - path: .yamato/all-urp_lighting.yml#PR_URP_Lighting_2021.2 - rerun: on_new_revision - - path: .yamato/all-urp_lighting.yml#Extra_URP_Lighting_2021.2 - rerun: on_new_revision PR_URP_Lighting_CUSTOM-REVISION: name: PR URP_Lighting on CUSTOM-REVISION variables: diff --git a/.yamato/all-urp_perf.yml b/.yamato/all-urp_perf.yml index 18d2e334be6..702ec8ec453 100644 --- a/.yamato/all-urp_perf.yml +++ b/.yamato/all-urp_perf.yml @@ -4,7 +4,6 @@ # Read more under .yamato/docs/readme.md {% metadata_file .yamato/_cache_config.metafile -%} -{% metadata_file .yamato/_latest_editor_versions_2021.2.metafile -%} {% metadata_file .yamato/_latest_editor_versions_trunk.metafile -%} --- @@ -25,22 +24,6 @@ URP_Perf_trunk: rerun: on_new_revision - path: .yamato/all-vikingvillage_urp.yml#VikingVillage_URP_trunk rerun: on_new_revision -URP_Perf_2021.2: - name: URP_Perf on 2021.2 - variables: - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - UTR_VERSION: "current" - TEST_FILTER: .* - CACHE_ARGS: '{{cache.flags}}' - dependencies: - - path: .yamato/all-urp_performance_boatattack.yml#URP_Performance_BoatAttack_2021.2 - rerun: on_new_revision - - path: .yamato/all-urp_performance_lostcrypt.yml#URP_Performance_LostCrypt_2021.2 - rerun: on_new_revision - - path: .yamato/all-vikingvillage_builtin.yml#VikingVillage_BuiltIn_2021.2 - rerun: on_new_revision - - path: .yamato/all-vikingvillage_urp.yml#VikingVillage_URP_2021.2 - rerun: on_new_revision URP_Perf_CUSTOM-REVISION: name: URP_Perf on CUSTOM-REVISION variables: diff --git a/.yamato/all-urp_performance_boatattack.yml b/.yamato/all-urp_performance_boatattack.yml index 9a40c126936..22cff2315b9 100644 --- a/.yamato/all-urp_performance_boatattack.yml +++ b/.yamato/all-urp_performance_boatattack.yml @@ -4,7 +4,6 @@ # Read more under .yamato/docs/readme.md {% metadata_file .yamato/_cache_config.metafile -%} -{% metadata_file .yamato/_latest_editor_versions_2021.2.metafile -%} {% metadata_file .yamato/_latest_editor_versions_trunk.metafile -%} --- @@ -57,54 +56,6 @@ URP_Performance_BoatAttack_trunk: rerun: on_new_revision - path: .yamato/urp_performance_boatattack-xrquest-vulkan.yml#URP_Performance_BoatAttack_XRQuest_Vulkan_performance_playmode_runtime_il2cpp_Linear_trunk rerun: on_new_revision -URP_Performance_BoatAttack_2021.2: - name: URP_Performance_BoatAttack on 2021.2 - variables: - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - UTR_VERSION: "current" - TEST_FILTER: .* - BOAT_ATTACK_BRANCH: master - BOAT_ATTACK_REVISION: ca18e346b30b365e90d1a9a149d07abfb15ac2a2 - CACHE_ARGS: '{{cache.flags}}' - dependencies: - - path: .yamato/urp_performance_boatattack-win-dx11.yml#URP_Performance_BoatAttack_Win_DX11_performance_playmode_runtime_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/urp_performance_boatattack-win-dx11.yml#URP_Performance_BoatAttack_Win_DX11_performance_playmode_editor_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/urp_performance_boatattack-win-dx11.yml#URP_Performance_BoatAttack_Win_DX11_performance_build_editmode_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/urp_performance_boatattack-win-vulkan.yml#URP_Performance_BoatAttack_Win_Vulkan_performance_playmode_runtime_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/urp_performance_boatattack-win-vulkan.yml#URP_Performance_BoatAttack_Win_Vulkan_performance_build_editmode_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/urp_performance_boatattack-win-dx12.yml#URP_Performance_BoatAttack_Win_DX12_performance_playmode_runtime_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/urp_performance_boatattack-win-dx12.yml#URP_Performance_BoatAttack_Win_DX12_performance_playmode_editor_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/urp_performance_boatattack-win-dx12.yml#URP_Performance_BoatAttack_Win_DX12_performance_build_editmode_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/urp_performance_boatattack-android-opengles3.yml#URP_Performance_BoatAttack_Android_OpenGLES3_performance_playmode_runtime_il2cpp_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/urp_performance_boatattack-android-opengles3.yml#URP_Performance_BoatAttack_Android_OpenGLES3_performance_build_editmode_il2cpp_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/urp_performance_boatattack-android-vulkan.yml#URP_Performance_BoatAttack_Android_Vulkan_performance_playmode_runtime_il2cpp_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/urp_performance_boatattack-android-vulkan.yml#URP_Performance_BoatAttack_Android_Vulkan_performance_build_editmode_il2cpp_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/urp_performance_boatattack-iphone-metal.yml#URP_Performance_BoatAttack_iPhone_Metal_performance_playmode_runtime_il2cpp_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/urp_performance_boatattack-iphone-metal.yml#URP_Performance_BoatAttack_iPhone_Metal_performance_build_editmode_il2cpp_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/urp_performance_boatattack-linux-vulkan.yml#URP_Performance_BoatAttack_Linux_Vulkan_performance_playmode_runtime_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/urp_performance_boatattack-linux-vulkan.yml#URP_Performance_BoatAttack_Linux_Vulkan_performance_playmode_editor_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/urp_performance_boatattack-linux-vulkan.yml#URP_Performance_BoatAttack_Linux_Vulkan_performance_build_editmode_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/urp_performance_boatattack-xrquest-opengles3.yml#URP_Performance_BoatAttack_XRQuest_OpenGLES3_performance_playmode_runtime_il2cpp_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/urp_performance_boatattack-xrquest-vulkan.yml#URP_Performance_BoatAttack_XRQuest_Vulkan_performance_playmode_runtime_il2cpp_Linear_2021.2 - rerun: on_new_revision URP_Performance_BoatAttack_CUSTOM-REVISION: name: URP_Performance_BoatAttack on CUSTOM-REVISION variables: diff --git a/.yamato/all-urp_performance_lostcrypt.yml b/.yamato/all-urp_performance_lostcrypt.yml index 63341cb352a..861db377482 100644 --- a/.yamato/all-urp_performance_lostcrypt.yml +++ b/.yamato/all-urp_performance_lostcrypt.yml @@ -4,7 +4,6 @@ # Read more under .yamato/docs/readme.md {% metadata_file .yamato/_cache_config.metafile -%} -{% metadata_file .yamato/_latest_editor_versions_2021.2.metafile -%} {% metadata_file .yamato/_latest_editor_versions_trunk.metafile -%} --- @@ -47,44 +46,6 @@ URP_Performance_LostCrypt_trunk: rerun: on_new_revision - path: .yamato/urp_performance_lostcrypt-iphone-metal.yml#URP_Performance_LostCrypt_iPhone_Metal_performance_build_editmode_il2cpp_Linear_trunk rerun: on_new_revision -URP_Performance_LostCrypt_2021.2: - name: URP_Performance_LostCrypt on 2021.2 - variables: - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - UTR_VERSION: "current" - TEST_FILTER: .* - LOST_CRYPT_BRANCH: 21.2/urp-perf-test - LOST_CRYPT_REVISION: eb3405aada97fdaf2b033e4f7bc7e47fb4589c3a - CACHE_ARGS: '{{cache.flags}}' - dependencies: - - path: .yamato/urp_performance_lostcrypt-win-dx11.yml#URP_Performance_LostCrypt_Win_DX11_performance_playmode_runtime_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/urp_performance_lostcrypt-win-dx11.yml#URP_Performance_LostCrypt_Win_DX11_performance_playmode_editor_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/urp_performance_lostcrypt-win-dx11.yml#URP_Performance_LostCrypt_Win_DX11_performance_build_editmode_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/urp_performance_lostcrypt-win-vulkan.yml#URP_Performance_LostCrypt_Win_Vulkan_performance_playmode_runtime_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/urp_performance_lostcrypt-win-vulkan.yml#URP_Performance_LostCrypt_Win_Vulkan_performance_build_editmode_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/urp_performance_lostcrypt-win-dx12.yml#URP_Performance_LostCrypt_Win_DX12_performance_playmode_runtime_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/urp_performance_lostcrypt-win-dx12.yml#URP_Performance_LostCrypt_Win_DX12_performance_playmode_editor_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/urp_performance_lostcrypt-win-dx12.yml#URP_Performance_LostCrypt_Win_DX12_performance_build_editmode_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/urp_performance_lostcrypt-android-opengles3.yml#URP_Performance_LostCrypt_Android_OpenGLES3_performance_playmode_runtime_il2cpp_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/urp_performance_lostcrypt-android-opengles3.yml#URP_Performance_LostCrypt_Android_OpenGLES3_performance_build_editmode_il2cpp_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/urp_performance_lostcrypt-android-vulkan.yml#URP_Performance_LostCrypt_Android_Vulkan_performance_playmode_runtime_il2cpp_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/urp_performance_lostcrypt-android-vulkan.yml#URP_Performance_LostCrypt_Android_Vulkan_performance_build_editmode_il2cpp_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/urp_performance_lostcrypt-iphone-metal.yml#URP_Performance_LostCrypt_iPhone_Metal_performance_playmode_runtime_il2cpp_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/urp_performance_lostcrypt-iphone-metal.yml#URP_Performance_LostCrypt_iPhone_Metal_performance_build_editmode_il2cpp_Linear_2021.2 - rerun: on_new_revision URP_Performance_LostCrypt_CUSTOM-REVISION: name: URP_Performance_LostCrypt on CUSTOM-REVISION variables: diff --git a/.yamato/all-urp_postpro.yml b/.yamato/all-urp_postpro.yml index 14414281da6..5d5550998f0 100644 --- a/.yamato/all-urp_postpro.yml +++ b/.yamato/all-urp_postpro.yml @@ -4,7 +4,6 @@ # Read more under .yamato/docs/readme.md {% metadata_file .yamato/_cache_config.metafile -%} -{% metadata_file .yamato/_latest_editor_versions_2021.2.metafile -%} {% metadata_file .yamato/_latest_editor_versions_trunk.metafile -%} --- @@ -77,74 +76,6 @@ URP_PostPro_trunk: rerun: on_new_revision - path: .yamato/all-urp_postpro.yml#Extra_URP_PostPro_trunk rerun: on_new_revision -PR_URP_PostPro_2021.2: - name: PR URP_PostPro on 2021.2 - variables: - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - UTR_VERSION: "current" - TEST_FILTER: .* - CACHE_ARGS: '{{cache.flags}}' - dependencies: - - path: .yamato/urp_postpro-win-dx11.yml#URP_PostPro_Win_DX11_Standalone_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/urp_postpro-win-dx11.yml#URP_PostPro_Win_DX11_Standalone_XR_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/urp_postpro-win-dx11.yml#URP_PostPro_Win_DX11_playmode_XR_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/urp_postpro-win-dx11.yml#URP_PostPro_Win_DX11_editmode_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/urp_postpro-win-dx12.yml#URP_PostPro_Win_DX12_Standalone_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/urp_postpro-win-dx12.yml#URP_PostPro_Win_DX12_Standalone_XR_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/urp_postpro-win-vulkan.yml#URP_PostPro_Win_Vulkan_Standalone_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/urp_postpro-linux-vulkan.yml#URP_PostPro_Linux_Vulkan_Standalone_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/urp_postpro-android-opengles3.yml#URP_PostPro_Android_OpenGLES3_Standalone_il2cpp_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/urp_postpro-android-vulkan.yml#URP_PostPro_Android_Vulkan_Standalone_il2cpp_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/urp_postpro-iphone-metal.yml#URP_PostPro_iPhone_Metal_Standalone_il2cpp_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/urp_postpro-osx-metal.yml#URP_PostPro_OSX_Metal_playmode_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/urp_postpro-osx-openglcore.yml#URP_PostPro_OSX_OpenGLCore_editmode_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/urp_postpro-android-opengles3.yml#URP_PostPro_Android_OpenGLES3_Standalone_il2cpp_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/urp_postpro-android-vulkan.yml#URP_PostPro_Android_Vulkan_Standalone_il2cpp_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/urp_postpro-iphone-metal.yml#URP_PostPro_iPhone_Metal_Standalone_il2cpp_Linear_2021.2 - rerun: on_new_revision -Extra_URP_PostPro_2021.2: - name: Extra URP_PostPro on 2021.2 - variables: - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - UTR_VERSION: "current" - TEST_FILTER: .* - CACHE_ARGS: '{{cache.flags}}' - dependencies: - - path: .yamato/urp_postpro-win-dx11.yml#URP_PostPro_Win_DX11_playmode_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/urp_postpro-win-dx12.yml#URP_PostPro_Win_DX12_playmode_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/urp_postpro-win-vulkan.yml#URP_PostPro_Win_Vulkan_playmode_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/urp_postpro-linux-vulkan.yml#URP_PostPro_Linux_Vulkan_playmode_mono_Linear_2021.2 - rerun: on_new_revision -URP_PostPro_2021.2: - name: URP_PostPro on 2021.2 - variables: - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - UTR_VERSION: "current" - TEST_FILTER: .* - CACHE_ARGS: '{{cache.flags}}' - dependencies: - - path: .yamato/all-urp_postpro.yml#PR_URP_PostPro_2021.2 - rerun: on_new_revision - - path: .yamato/all-urp_postpro.yml#Extra_URP_PostPro_2021.2 - rerun: on_new_revision PR_URP_PostPro_CUSTOM-REVISION: name: PR URP_PostPro on CUSTOM-REVISION variables: diff --git a/.yamato/all-urp_terrain.yml b/.yamato/all-urp_terrain.yml index 4ee9c7a5dbc..b29c750de0c 100644 --- a/.yamato/all-urp_terrain.yml +++ b/.yamato/all-urp_terrain.yml @@ -4,7 +4,6 @@ # Read more under .yamato/docs/readme.md {% metadata_file .yamato/_cache_config.metafile -%} -{% metadata_file .yamato/_latest_editor_versions_2021.2.metafile -%} {% metadata_file .yamato/_latest_editor_versions_trunk.metafile -%} --- @@ -77,74 +76,6 @@ URP_Terrain_trunk: rerun: on_new_revision - path: .yamato/all-urp_terrain.yml#Extra_URP_Terrain_trunk rerun: on_new_revision -PR_URP_Terrain_2021.2: - name: PR URP_Terrain on 2021.2 - variables: - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - UTR_VERSION: "current" - TEST_FILTER: .* - CACHE_ARGS: '{{cache.flags}}' - dependencies: - - path: .yamato/urp_terrain-win-dx11.yml#URP_Terrain_Win_DX11_Standalone_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/urp_terrain-win-dx11.yml#URP_Terrain_Win_DX11_Standalone_XR_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/urp_terrain-win-dx11.yml#URP_Terrain_Win_DX11_playmode_XR_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/urp_terrain-win-dx11.yml#URP_Terrain_Win_DX11_editmode_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/urp_terrain-win-dx12.yml#URP_Terrain_Win_DX12_Standalone_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/urp_terrain-win-dx12.yml#URP_Terrain_Win_DX12_Standalone_XR_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/urp_terrain-win-vulkan.yml#URP_Terrain_Win_Vulkan_Standalone_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/urp_terrain-linux-vulkan.yml#URP_Terrain_Linux_Vulkan_Standalone_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/urp_terrain-android-opengles3.yml#URP_Terrain_Android_OpenGLES3_Standalone_il2cpp_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/urp_terrain-android-vulkan.yml#URP_Terrain_Android_Vulkan_Standalone_il2cpp_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/urp_terrain-iphone-metal.yml#URP_Terrain_iPhone_Metal_Standalone_il2cpp_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/urp_terrain-osx-metal.yml#URP_Terrain_OSX_Metal_playmode_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/urp_terrain-osx-openglcore.yml#URP_Terrain_OSX_OpenGLCore_editmode_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/urp_terrain-android-opengles3.yml#URP_Terrain_Android_OpenGLES3_Standalone_il2cpp_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/urp_terrain-android-vulkan.yml#URP_Terrain_Android_Vulkan_Standalone_il2cpp_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/urp_terrain-iphone-metal.yml#URP_Terrain_iPhone_Metal_Standalone_il2cpp_Linear_2021.2 - rerun: on_new_revision -Extra_URP_Terrain_2021.2: - name: Extra URP_Terrain on 2021.2 - variables: - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - UTR_VERSION: "current" - TEST_FILTER: .* - CACHE_ARGS: '{{cache.flags}}' - dependencies: - - path: .yamato/urp_terrain-win-dx11.yml#URP_Terrain_Win_DX11_playmode_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/urp_terrain-win-dx12.yml#URP_Terrain_Win_DX12_playmode_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/urp_terrain-win-vulkan.yml#URP_Terrain_Win_Vulkan_playmode_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/urp_terrain-linux-vulkan.yml#URP_Terrain_Linux_Vulkan_playmode_mono_Linear_2021.2 - rerun: on_new_revision -URP_Terrain_2021.2: - name: URP_Terrain on 2021.2 - variables: - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - UTR_VERSION: "current" - TEST_FILTER: .* - CACHE_ARGS: '{{cache.flags}}' - dependencies: - - path: .yamato/all-urp_terrain.yml#PR_URP_Terrain_2021.2 - rerun: on_new_revision - - path: .yamato/all-urp_terrain.yml#Extra_URP_Terrain_2021.2 - rerun: on_new_revision PR_URP_Terrain_CUSTOM-REVISION: name: PR URP_Terrain on CUSTOM-REVISION variables: diff --git a/.yamato/all-urpupdate.yml b/.yamato/all-urpupdate.yml index 54d283bc255..a7b7967ccb0 100644 --- a/.yamato/all-urpupdate.yml +++ b/.yamato/all-urpupdate.yml @@ -4,7 +4,6 @@ # Read more under .yamato/docs/readme.md {% metadata_file .yamato/_cache_config.metafile -%} -{% metadata_file .yamato/_latest_editor_versions_2021.2.metafile -%} {% metadata_file .yamato/_latest_editor_versions_trunk.metafile -%} --- @@ -47,44 +46,6 @@ URPUpdate_trunk: rerun: on_new_revision - path: .yamato/all-urpupdate.yml#Extra_URPUpdate_trunk rerun: on_new_revision -PR_URPUpdate_2021.2: - name: PR URPUpdate on 2021.2 - variables: - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - UTR_VERSION: "current" - TEST_FILTER: .* - TEMPLATE_UPDATE_PROJECT_BRANCH: master - TEMPLATE_UPDATE_PROJECT_REVISION: 818b6345d6bf46cf3e5644aceff134e866c6150e - CACHE_ARGS: '{{cache.flags}}' - dependencies: - - path: .yamato/urpupdate-win-dx11.yml#URPUpdate_Win_DX11_editmode_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/urpupdate-win-dx11.yml#URPUpdate_Win_DX11_playmode_mono_Linear_2021.2 - rerun: on_new_revision -Extra_URPUpdate_2021.2: - name: Extra URPUpdate on 2021.2 - variables: - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - UTR_VERSION: "current" - TEST_FILTER: .* - TEMPLATE_UPDATE_PROJECT_BRANCH: master - TEMPLATE_UPDATE_PROJECT_REVISION: 818b6345d6bf46cf3e5644aceff134e866c6150e - CACHE_ARGS: '{{cache.flags}}' - dependencies: [] -URPUpdate_2021.2: - name: URPUpdate on 2021.2 - variables: - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - UTR_VERSION: "current" - TEST_FILTER: .* - TEMPLATE_UPDATE_PROJECT_BRANCH: master - TEMPLATE_UPDATE_PROJECT_REVISION: 818b6345d6bf46cf3e5644aceff134e866c6150e - CACHE_ARGS: '{{cache.flags}}' - dependencies: - - path: .yamato/all-urpupdate.yml#PR_URPUpdate_2021.2 - rerun: on_new_revision - - path: .yamato/all-urpupdate.yml#Extra_URPUpdate_2021.2 - rerun: on_new_revision PR_URPUpdate_CUSTOM-REVISION: name: PR URPUpdate on CUSTOM-REVISION variables: diff --git a/.yamato/all-urpupdate_boatattack.yml b/.yamato/all-urpupdate_boatattack.yml index dc79780ed38..630a9818888 100644 --- a/.yamato/all-urpupdate_boatattack.yml +++ b/.yamato/all-urpupdate_boatattack.yml @@ -4,7 +4,6 @@ # Read more under .yamato/docs/readme.md {% metadata_file .yamato/_cache_config.metafile -%} -{% metadata_file .yamato/_latest_editor_versions_2021.2.metafile -%} {% metadata_file .yamato/_latest_editor_versions_trunk.metafile -%} --- @@ -47,44 +46,6 @@ URPUpdate_BoatAttack_trunk: rerun: on_new_revision - path: .yamato/all-urpupdate_boatattack.yml#Extra_URPUpdate_BoatAttack_trunk rerun: on_new_revision -PR_URPUpdate_BoatAttack_2021.2: - name: PR URPUpdate_BoatAttack on 2021.2 - variables: - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - UTR_VERSION: "current" - TEST_FILTER: .* - BA_UPDATE_PROJECT_BRANCH: master - BA_UPDATE_PROJECT_REVISION: 06c67d682225354dd909728e2511ac17115b18b9 - CACHE_ARGS: '{{cache.flags}}' - dependencies: - - path: .yamato/urpupdate_boatattack-win-dx11.yml#URPUpdate_BoatAttack_Win_DX11_editmode_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/urpupdate_boatattack-win-dx11.yml#URPUpdate_BoatAttack_Win_DX11_playmode_mono_Linear_2021.2 - rerun: on_new_revision -Extra_URPUpdate_BoatAttack_2021.2: - name: Extra URPUpdate_BoatAttack on 2021.2 - variables: - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - UTR_VERSION: "current" - TEST_FILTER: .* - BA_UPDATE_PROJECT_BRANCH: master - BA_UPDATE_PROJECT_REVISION: 06c67d682225354dd909728e2511ac17115b18b9 - CACHE_ARGS: '{{cache.flags}}' - dependencies: [] -URPUpdate_BoatAttack_2021.2: - name: URPUpdate_BoatAttack on 2021.2 - variables: - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - UTR_VERSION: "current" - TEST_FILTER: .* - BA_UPDATE_PROJECT_BRANCH: master - BA_UPDATE_PROJECT_REVISION: 06c67d682225354dd909728e2511ac17115b18b9 - CACHE_ARGS: '{{cache.flags}}' - dependencies: - - path: .yamato/all-urpupdate_boatattack.yml#PR_URPUpdate_BoatAttack_2021.2 - rerun: on_new_revision - - path: .yamato/all-urpupdate_boatattack.yml#Extra_URPUpdate_BoatAttack_2021.2 - rerun: on_new_revision PR_URPUpdate_BoatAttack_CUSTOM-REVISION: name: PR URPUpdate_BoatAttack on CUSTOM-REVISION variables: diff --git a/.yamato/all-urpupdate_top_asset_store.yml b/.yamato/all-urpupdate_top_asset_store.yml index b16d079a260..68f94cab543 100644 --- a/.yamato/all-urpupdate_top_asset_store.yml +++ b/.yamato/all-urpupdate_top_asset_store.yml @@ -4,7 +4,6 @@ # Read more under .yamato/docs/readme.md {% metadata_file .yamato/_cache_config.metafile -%} -{% metadata_file .yamato/_latest_editor_versions_2021.2.metafile -%} {% metadata_file .yamato/_latest_editor_versions_trunk.metafile -%} --- @@ -47,44 +46,6 @@ URPUpdate_Top_Asset_Store_trunk: rerun: on_new_revision - path: .yamato/all-urpupdate_top_asset_store.yml#Extra_URPUpdate_Top_Asset_Store_trunk rerun: on_new_revision -PR_URPUpdate_Top_Asset_Store_2021.2: - name: PR URPUpdate_Top_Asset_Store on 2021.2 - variables: - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - UTR_VERSION: "current" - TEST_FILTER: .* - ASSETSTORE_UPDATE_PROJECT_BRANCH: master - ASSETSTORE_UPDATE_PROJECT_REVISION: 263537e22614f3b98eba4f56cea3fd4519312b2f - CACHE_ARGS: '{{cache.flags}}' - dependencies: - - path: .yamato/urpupdate_top_asset_store-win-dx11.yml#URPUpdate_Top_Asset_Store_Win_DX11_editmode_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/urpupdate_top_asset_store-win-dx11.yml#URPUpdate_Top_Asset_Store_Win_DX11_playmode_mono_Linear_2021.2 - rerun: on_new_revision -Extra_URPUpdate_Top_Asset_Store_2021.2: - name: Extra URPUpdate_Top_Asset_Store on 2021.2 - variables: - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - UTR_VERSION: "current" - TEST_FILTER: .* - ASSETSTORE_UPDATE_PROJECT_BRANCH: master - ASSETSTORE_UPDATE_PROJECT_REVISION: 263537e22614f3b98eba4f56cea3fd4519312b2f - CACHE_ARGS: '{{cache.flags}}' - dependencies: [] -URPUpdate_Top_Asset_Store_2021.2: - name: URPUpdate_Top_Asset_Store on 2021.2 - variables: - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - UTR_VERSION: "current" - TEST_FILTER: .* - ASSETSTORE_UPDATE_PROJECT_BRANCH: master - ASSETSTORE_UPDATE_PROJECT_REVISION: 263537e22614f3b98eba4f56cea3fd4519312b2f - CACHE_ARGS: '{{cache.flags}}' - dependencies: - - path: .yamato/all-urpupdate_top_asset_store.yml#PR_URPUpdate_Top_Asset_Store_2021.2 - rerun: on_new_revision - - path: .yamato/all-urpupdate_top_asset_store.yml#Extra_URPUpdate_Top_Asset_Store_2021.2 - rerun: on_new_revision PR_URPUpdate_Top_Asset_Store_CUSTOM-REVISION: name: PR URPUpdate_Top_Asset_Store on CUSTOM-REVISION variables: diff --git a/.yamato/all-vfx.yml b/.yamato/all-vfx.yml index 2ee128c81d1..3c3ea65658f 100644 --- a/.yamato/all-vfx.yml +++ b/.yamato/all-vfx.yml @@ -4,7 +4,6 @@ # Read more under .yamato/docs/readme.md {% metadata_file .yamato/_cache_config.metafile -%} -{% metadata_file .yamato/_latest_editor_versions_2021.2.metafile -%} {% metadata_file .yamato/_latest_editor_versions_trunk.metafile -%} --- @@ -57,54 +56,6 @@ Nightly_VFX_trunk: dependencies: - path: .yamato/all-vfx.yml#VFX_trunk rerun: on_new_revision -PR_VFX_2021.2: - name: PR VFX on 2021.2 - variables: - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - UTR_VERSION: "current" - TEST_FILTER: .* - CACHE_ARGS: '{{cache.flags}}' - dependencies: - - path: .yamato/all-vfx_hdrp.yml#PR_VFX_HDRP_2021.2 - rerun: on_new_revision - - path: .yamato/all-vfx_urp.yml#PR_VFX_URP_2021.2 - rerun: on_new_revision - - path: .yamato/_abv.yml#General_Checks_2021.2 - rerun: on_new_revision -Extra_VFX_2021.2: - name: Extra VFX on 2021.2 - variables: - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - UTR_VERSION: "current" - TEST_FILTER: .* - CACHE_ARGS: '{{cache.flags}}' - dependencies: - - path: .yamato/all-vfx_hdrp.yml#Extra_VFX_HDRP_2021.2 - rerun: on_new_revision - - path: .yamato/all-vfx_urp.yml#Extra_VFX_URP_2021.2 - rerun: on_new_revision -VFX_2021.2: - name: VFX on 2021.2 - variables: - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - UTR_VERSION: "current" - TEST_FILTER: .* - CACHE_ARGS: '{{cache.flags}}' - dependencies: - - path: .yamato/all-vfx.yml#PR_VFX_2021.2 - rerun: on_new_revision - - path: .yamato/all-vfx.yml#Extra_VFX_2021.2 - rerun: on_new_revision -Nightly_VFX_2021.2: - name: Nightly VFX on 2021.2 - variables: - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - UTR_VERSION: "current" - TEST_FILTER: .* - CACHE_ARGS: '{{cache.flags}}' - dependencies: - - path: .yamato/all-vfx.yml#VFX_2021.2 - rerun: on_new_revision PR_VFX_CUSTOM-REVISION: name: PR VFX on CUSTOM-REVISION variables: diff --git a/.yamato/all-vfx_hdrp.yml b/.yamato/all-vfx_hdrp.yml index b0f47fbda9b..5fb965508e3 100644 --- a/.yamato/all-vfx_hdrp.yml +++ b/.yamato/all-vfx_hdrp.yml @@ -4,7 +4,6 @@ # Read more under .yamato/docs/readme.md {% metadata_file .yamato/_cache_config.metafile -%} -{% metadata_file .yamato/_latest_editor_versions_2021.2.metafile -%} {% metadata_file .yamato/_latest_editor_versions_trunk.metafile -%} --- @@ -57,54 +56,6 @@ VFX_HDRP_trunk: rerun: on_new_revision - path: .yamato/all-vfx_hdrp.yml#Extra_VFX_HDRP_trunk rerun: on_new_revision -PR_VFX_HDRP_2021.2: - name: PR VFX_HDRP on 2021.2 - variables: - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - UTR_VERSION: "current" - TEST_FILTER: .* - CACHE_ARGS: '{{cache.flags}}' - dependencies: - - path: .yamato/vfx_hdrp-win-dx11.yml#VFX_HDRP_Win_DX11_Standalone_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/vfx_hdrp-win-dx11.yml#VFX_HDRP_Win_DX11_playmode_XR_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/vfx_hdrp-win-dx12.yml#VFX_HDRP_Win_DX12_Standalone_mono_Linear_2021.2 - rerun: on_new_revision -Extra_VFX_HDRP_2021.2: - name: Extra VFX_HDRP on 2021.2 - variables: - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - UTR_VERSION: "current" - TEST_FILTER: .* - CACHE_ARGS: '{{cache.flags}}' - dependencies: - - path: .yamato/vfx_hdrp-win-dx11.yml#VFX_HDRP_Win_DX11_editmode_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/vfx_hdrp-win-dx11.yml#VFX_HDRP_Win_DX11_playmode_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/vfx_hdrp-win-dx11.yml#VFX_HDRP_Win_DX11_editmode_PerformanceTests_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/vfx_hdrp-win-dx11.yml#VFX_HDRP_Win_DX11_playmode_PerformanceTests_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/vfx_hdrp-win-dx11.yml#VFX_HDRP_Win_DX11_Standalone_PerformanceTests_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/vfx_hdrp-win-dx12.yml#VFX_HDRP_Win_DX12_playmode_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/vfx_hdrp-osx-metal.yml#VFX_HDRP_OSX_Metal_playmode_mono_Linear_2021.2 - rerun: on_new_revision -VFX_HDRP_2021.2: - name: VFX_HDRP on 2021.2 - variables: - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - UTR_VERSION: "current" - TEST_FILTER: .* - CACHE_ARGS: '{{cache.flags}}' - dependencies: - - path: .yamato/all-vfx_hdrp.yml#PR_VFX_HDRP_2021.2 - rerun: on_new_revision - - path: .yamato/all-vfx_hdrp.yml#Extra_VFX_HDRP_2021.2 - rerun: on_new_revision PR_VFX_HDRP_CUSTOM-REVISION: name: PR VFX_HDRP on CUSTOM-REVISION variables: diff --git a/.yamato/all-vfx_urp.yml b/.yamato/all-vfx_urp.yml index a5688051a2c..2a519dafb27 100644 --- a/.yamato/all-vfx_urp.yml +++ b/.yamato/all-vfx_urp.yml @@ -4,7 +4,6 @@ # Read more under .yamato/docs/readme.md {% metadata_file .yamato/_cache_config.metafile -%} -{% metadata_file .yamato/_latest_editor_versions_2021.2.metafile -%} {% metadata_file .yamato/_latest_editor_versions_trunk.metafile -%} --- @@ -51,48 +50,6 @@ VFX_URP_trunk: rerun: on_new_revision - path: .yamato/all-vfx_urp.yml#Extra_VFX_URP_trunk rerun: on_new_revision -PR_VFX_URP_2021.2: - name: PR VFX_URP on 2021.2 - variables: - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - UTR_VERSION: "current" - TEST_FILTER: .* - CACHE_ARGS: '{{cache.flags}}' - dependencies: - - path: .yamato/vfx_urp-win-dx11.yml#VFX_URP_Win_DX11_Standalone_mono_Linear_2021.2 - rerun: on_new_revision -Extra_VFX_URP_2021.2: - name: Extra VFX_URP on 2021.2 - variables: - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - UTR_VERSION: "current" - TEST_FILTER: .* - CACHE_ARGS: '{{cache.flags}}' - dependencies: - - path: .yamato/vfx_urp-win-dx11.yml#VFX_URP_Win_DX11_playmode_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/vfx_urp-win-dx11.yml#VFX_URP_Win_DX11_editmode_PerformanceTests_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/vfx_urp-win-dx11.yml#VFX_URP_Win_DX11_playmode_PerformanceTests_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/vfx_urp-win-dx11.yml#VFX_URP_Win_DX11_Standalone_PerformanceTests_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/vfx_urp-win-vulkan.yml#VFX_URP_Win_Vulkan_playmode_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/vfx_urp-osx-metal.yml#VFX_URP_OSX_Metal_playmode_mono_Linear_2021.2 - rerun: on_new_revision -VFX_URP_2021.2: - name: VFX_URP on 2021.2 - variables: - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - UTR_VERSION: "current" - TEST_FILTER: .* - CACHE_ARGS: '{{cache.flags}}' - dependencies: - - path: .yamato/all-vfx_urp.yml#PR_VFX_URP_2021.2 - rerun: on_new_revision - - path: .yamato/all-vfx_urp.yml#Extra_VFX_URP_2021.2 - rerun: on_new_revision PR_VFX_URP_CUSTOM-REVISION: name: PR VFX_URP on CUSTOM-REVISION variables: diff --git a/.yamato/all-vikingvillage_builtin.yml b/.yamato/all-vikingvillage_builtin.yml index df0ef416aea..a790f2f35c8 100644 --- a/.yamato/all-vikingvillage_builtin.yml +++ b/.yamato/all-vikingvillage_builtin.yml @@ -4,7 +4,6 @@ # Read more under .yamato/docs/readme.md {% metadata_file .yamato/_cache_config.metafile -%} -{% metadata_file .yamato/_latest_editor_versions_2021.2.metafile -%} {% metadata_file .yamato/_latest_editor_versions_trunk.metafile -%} --- @@ -39,36 +38,6 @@ VikingVillage_BuiltIn_trunk: rerun: on_new_revision - path: .yamato/vikingvillage_builtin-linux-vulkan.yml#VikingVillage_BuiltIn_Linux_Vulkan_performance_build_editmode_mono_Linear_trunk rerun: on_new_revision -VikingVillage_BuiltIn_2021.2: - name: VikingVillage_BuiltIn on 2021.2 - variables: - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - UTR_VERSION: "current" - TEST_FILTER: .* - VV_BUILTIN_BRANCH: built-in - VV_BUILTIN_REVISION: c61a43cd7ad4ef36f38a0219730d53e8f6e281de - CACHE_ARGS: '{{cache.flags}}' - dependencies: - - path: .yamato/vikingvillage_builtin-win-dx11.yml#VikingVillage_BuiltIn_Win_DX11_performance_playmode_runtime_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/vikingvillage_builtin-win-dx11.yml#VikingVillage_BuiltIn_Win_DX11_performance_playmode_editor_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/vikingvillage_builtin-win-dx11.yml#VikingVillage_BuiltIn_Win_DX11_performance_build_editmode_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/vikingvillage_builtin-win-vulkan.yml#VikingVillage_BuiltIn_Win_Vulkan_performance_playmode_runtime_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/vikingvillage_builtin-win-vulkan.yml#VikingVillage_BuiltIn_Win_Vulkan_performance_build_editmode_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/vikingvillage_builtin-android-opengles3.yml#VikingVillage_BuiltIn_Android_OpenGLES3_performance_build_editmode_il2cpp_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/vikingvillage_builtin-android-vulkan.yml#VikingVillage_BuiltIn_Android_Vulkan_performance_build_editmode_il2cpp_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/vikingvillage_builtin-iphone-metal.yml#VikingVillage_BuiltIn_iPhone_Metal_performance_build_editmode_il2cpp_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/vikingvillage_builtin-linux-vulkan.yml#VikingVillage_BuiltIn_Linux_Vulkan_performance_playmode_runtime_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/vikingvillage_builtin-linux-vulkan.yml#VikingVillage_BuiltIn_Linux_Vulkan_performance_build_editmode_mono_Linear_2021.2 - rerun: on_new_revision VikingVillage_BuiltIn_CUSTOM-REVISION: name: VikingVillage_BuiltIn on CUSTOM-REVISION variables: diff --git a/.yamato/all-vikingvillage_urp.yml b/.yamato/all-vikingvillage_urp.yml index 308e75976e7..196ce21bfae 100644 --- a/.yamato/all-vikingvillage_urp.yml +++ b/.yamato/all-vikingvillage_urp.yml @@ -4,7 +4,6 @@ # Read more under .yamato/docs/readme.md {% metadata_file .yamato/_cache_config.metafile -%} -{% metadata_file .yamato/_latest_editor_versions_2021.2.metafile -%} {% metadata_file .yamato/_latest_editor_versions_trunk.metafile -%} --- @@ -39,36 +38,6 @@ VikingVillage_URP_trunk: rerun: on_new_revision - path: .yamato/vikingvillage_urp-linux-vulkan.yml#VikingVillage_URP_Linux_Vulkan_performance_build_editmode_mono_Linear_trunk rerun: on_new_revision -VikingVillage_URP_2021.2: - name: VikingVillage_URP on 2021.2 - variables: - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - UTR_VERSION: "current" - TEST_FILTER: .* - VV_URP_BRANCH: master - VV_URP_REVISION: eebe6db7d9b186603b63095a926d76ded2bf1110 - CACHE_ARGS: '{{cache.flags}}' - dependencies: - - path: .yamato/vikingvillage_urp-win-dx11.yml#VikingVillage_URP_Win_DX11_performance_playmode_runtime_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/vikingvillage_urp-win-dx11.yml#VikingVillage_URP_Win_DX11_performance_playmode_editor_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/vikingvillage_urp-win-dx11.yml#VikingVillage_URP_Win_DX11_performance_build_editmode_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/vikingvillage_urp-win-vulkan.yml#VikingVillage_URP_Win_Vulkan_performance_playmode_runtime_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/vikingvillage_urp-win-vulkan.yml#VikingVillage_URP_Win_Vulkan_performance_build_editmode_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/vikingvillage_urp-android-opengles3.yml#VikingVillage_URP_Android_OpenGLES3_performance_build_editmode_il2cpp_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/vikingvillage_urp-android-vulkan.yml#VikingVillage_URP_Android_Vulkan_performance_build_editmode_il2cpp_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/vikingvillage_urp-iphone-metal.yml#VikingVillage_URP_iPhone_Metal_performance_build_editmode_il2cpp_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/vikingvillage_urp-linux-vulkan.yml#VikingVillage_URP_Linux_Vulkan_performance_playmode_runtime_mono_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/vikingvillage_urp-linux-vulkan.yml#VikingVillage_URP_Linux_Vulkan_performance_build_editmode_mono_Linear_2021.2 - rerun: on_new_revision VikingVillage_URP_CUSTOM-REVISION: name: VikingVillage_URP on CUSTOM-REVISION variables: diff --git a/.yamato/config/__shared.metafile b/.yamato/config/__shared.metafile index 70253b80dce..737a7208dd5 100644 --- a/.yamato/config/__shared.metafile +++ b/.yamato/config/__shared.metafile @@ -10,16 +10,6 @@ editors: # applied for all yml files name: trunk rerun_strategy: on_new_revision ono_branch_var: ONO_BRANCH_TRUNK - editor_pinning: - enabled: True - nr_commits_to_retrieve: 1 - allow_triggers: True - variables: - CACHE_ARGS: '{{cache.flags}}' - - track: 2021.2 - name: 2021.2 - rerun_strategy: on_new_revision - ono_branch_var: ONO_BRANCH_2021_2 editor_pinning: enabled: True nr_commits_to_retrieve: 100 diff --git a/.yamato/config/abv.metafile b/.yamato/config/abv.metafile index c12ed4f029f..d750401ceab 100644 --- a/.yamato/config/abv.metafile +++ b/.yamato/config/abv.metafile @@ -25,21 +25,6 @@ jobs: recurring: - branch: master frequency: 1 * * ? - allow_on: - - 2021.2 - - - name: Trunk Weekly - job_id: all_project_ci_trunk_weekly - dependencies: - - .yamato/all-hdrp.yml#Nightly_HDRP_ - - .yamato/all-vfx.yml#Nightly_VFX_ - - .yamato/all-urp.yml#Nightly_URP_ - - .yamato/all-shadergraph.yml#Nightly_ShaderGraph_ - - #General_Checks_ - triggers: - recurring: - - branch: master - frequency: weekly allow_on: - trunk diff --git a/.yamato/hdrp-linux-vulkan.yml b/.yamato/hdrp-linux-vulkan.yml index f00e37ae65d..4e189df4448 100644 --- a/.yamato/hdrp-linux-vulkan.yml +++ b/.yamato/hdrp-linux-vulkan.yml @@ -4,7 +4,6 @@ # Read more under .yamato/docs/readme.md {% metadata_file .yamato/_cache_config.metafile -%} -{% metadata_file .yamato/_latest_editor_versions_2021.2.metafile -%} {% metadata_file .yamato/_latest_editor_versions_trunk.metafile -%} --- @@ -283,280 +282,6 @@ Build_HDRP_Linux_Vulkan_Standalone_XR_mono_Linear_trunk: dependencies: - path: .yamato/_editor_priming.yml#editor:priming:trunk:Linux rerun: on_new_revision -HDRP_Linux_Vulkan_playmode_mono_Linear_2021.2: - name: HDRP on Linux_Vulkan_playmode_mono_Linear on version 2021.2 - agent: - type: Unity::VM::GPU - image: package-ci/ubuntu:stable - flavor: b1.large - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - command: chmod +x utr - - command: sudo rm -f /etc/apt/sources.list /etc/apt/sources.list.d/{nodesource,teamviewer,deadsnakes-ubuntu-ppa-}* - - command: curl -L https://artifactory.prd.it.unity3d.com/artifactory/api/gpg/key/public | sudo apt-key add - - - command: sudo sh -c "echo 'deb https://artifactory.prd.it.unity3d.com/artifactory/unity-apt-local bionic main' > /etc/apt/sources.list.d/unity.list" - - command: sudo apt update - - command: sudo apt install unity-downloader-cli - retries: 2 - - command: sudo unity-downloader-cli --source-file unity_revision.txt -c editor -c il2cpp --wait --published-only - retries: 2 - - command: DISPLAY=:0.0 ./utr $CACHE_ARGS --artifacts_path=TestProjects/HDRP_Tests/test-results --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-force-vulkan" --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=./TestProjects/HDRP_Tests --zero-tests-are-ok=1 - after: - - command: python .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/HDRP_Tests/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:Linux - rerun: on_new_revision -HDRP_Linux_Vulkan_playmode_XR_mono_Linear_2021.2: - name: HDRP on Linux_Vulkan_playmode_XR_mono_Linear on version 2021.2 - agent: - type: Unity::VM::GPU - image: package-ci/ubuntu:stable - flavor: b1.large - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - command: chmod +x utr - - command: sudo rm -f /etc/apt/sources.list /etc/apt/sources.list.d/{nodesource,teamviewer,deadsnakes-ubuntu-ppa-}* - - command: curl -L https://artifactory.prd.it.unity3d.com/artifactory/api/gpg/key/public | sudo apt-key add - - - command: sudo sh -c "echo 'deb https://artifactory.prd.it.unity3d.com/artifactory/unity-apt-local bionic main' > /etc/apt/sources.list.d/unity.list" - - command: sudo apt update - - command: sudo apt install unity-downloader-cli - retries: 2 - - command: sudo unity-downloader-cli --source-file unity_revision.txt -c editor -c il2cpp --wait --published-only - retries: 2 - - command: DISPLAY=:0.0 ./utr $CACHE_ARGS --artifacts_path=TestProjects/HDRP_Tests/test-results --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-force-vulkan" --extra-editor-arg="-xr-reuse-tests" --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=./TestProjects/HDRP_Tests --zero-tests-are-ok=1 - after: - - command: python .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/HDRP_Tests/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:Linux - rerun: on_new_revision -HDRP_Linux_Vulkan_editmode_mono_Linear_2021.2: - name: HDRP on Linux_Vulkan_editmode_mono_Linear on version 2021.2 - agent: - type: Unity::VM - image: package-ci/ubuntu:stable - flavor: b1.large - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - command: chmod +x utr - - command: sudo rm -f /etc/apt/sources.list /etc/apt/sources.list.d/{nodesource,teamviewer,deadsnakes-ubuntu-ppa-}* - - command: curl -L https://artifactory.prd.it.unity3d.com/artifactory/api/gpg/key/public | sudo apt-key add - - - command: sudo sh -c "echo 'deb https://artifactory.prd.it.unity3d.com/artifactory/unity-apt-local bionic main' > /etc/apt/sources.list.d/unity.list" - - command: sudo apt update - - command: sudo apt install unity-downloader-cli - retries: 2 - - command: sudo unity-downloader-cli --source-file unity_revision.txt -c editor -c il2cpp --wait --published-only - retries: 2 - - command: DISPLAY=:0.0 ./utr --artifacts_path=TestProjects/HDRP_Tests/test-results --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-force-vulkan" --extra-editor-arg="-playergraphicsapi=Vulkan" --platform=editmode --scripting-backend=Mono2x --suite=editor --testfilter=$TEST_FILTER --testproject=./TestProjects/HDRP_Tests --zero-tests-are-ok=1 - after: - - command: python .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/HDRP_Tests/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:Linux - rerun: on_new_revision -HDRP_Linux_Vulkan_editmode_XR_mono_Linear_2021.2: - name: HDRP on Linux_Vulkan_editmode_XR_mono_Linear on version 2021.2 - agent: - type: Unity::VM::GPU - image: package-ci/ubuntu:stable - flavor: b1.large - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - command: chmod +x utr - - command: sudo rm -f /etc/apt/sources.list /etc/apt/sources.list.d/{nodesource,teamviewer,deadsnakes-ubuntu-ppa-}* - - command: curl -L https://artifactory.prd.it.unity3d.com/artifactory/api/gpg/key/public | sudo apt-key add - - - command: sudo sh -c "echo 'deb https://artifactory.prd.it.unity3d.com/artifactory/unity-apt-local bionic main' > /etc/apt/sources.list.d/unity.list" - - command: sudo apt update - - command: sudo apt install unity-downloader-cli - retries: 2 - - command: sudo unity-downloader-cli --source-file unity_revision.txt -c editor -c il2cpp --wait --published-only - retries: 2 - - command: DISPLAY=:0.0 ./utr --artifacts_path=TestProjects/HDRP_Tests/test-results --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-force-vulkan" --extra-editor-arg="-playergraphicsapi=Vulkan" --extra-editor-arg="-xr-reuse-tests" --platform=editmode --scripting-backend=Mono2x --suite=editor --testfilter=$TEST_FILTER --testproject=./TestProjects/HDRP_Tests --zero-tests-are-ok=1 - after: - - command: python .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/HDRP_Tests/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:Linux - rerun: on_new_revision -HDRP_Linux_Vulkan_Standalone_mono_Linear_2021.2: - name: HDRP on Linux_Vulkan_Standalone_mono_Linear on version 2021.2 - agent: - type: Unity::VM::GPU - image: package-ci/ubuntu:stable - flavor: b1.large - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - command: chmod +x utr - - command: DISPLAY=:0.0 ./utr --artifacts_path=TestProjects/HDRP_RuntimeTests/test-results --platform=StandaloneLinux64 --player-connection-ip=auto --player-load-path=players --suite=playmode --timeout=1200 --zero-tests-are-ok=1 - after: - - command: python .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/HDRP_RuntimeTests/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:Linux - rerun: on_new_revision - - path: .yamato/hdrp-linux-vulkan.yml#Build_HDRP_Linux_Vulkan_Standalone_mono_Linear_2021.2 - rerun: on_new_revision -Build_HDRP_Linux_Vulkan_Standalone_mono_Linear_2021.2: - name: Build HDRP on Linux_Vulkan_mono_Linear_Standalone_build_Player on version 2021.2 - agent: - type: Unity::VM - image: package-ci/ubuntu:stable - flavor: b1.xlarge - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - command: chmod +x utr - - command: sudo rm -f /etc/apt/sources.list /etc/apt/sources.list.d/{nodesource,teamviewer,deadsnakes-ubuntu-ppa-}* - - command: curl -L https://artifactory.prd.it.unity3d.com/artifactory/api/gpg/key/public | sudo apt-key add - - - command: sudo sh -c "echo 'deb https://artifactory.prd.it.unity3d.com/artifactory/unity-apt-local bionic main' > /etc/apt/sources.list.d/unity.list" - - command: sudo apt update - - command: sudo apt install unity-downloader-cli - retries: 2 - - command: sudo unity-downloader-cli --source-file unity_revision.txt -c editor -c il2cpp --wait --published-only - retries: 2 - - command: DISPLAY=:0.0 ./utr $CACHE_ARGS --artifacts_path=TestProjects/HDRP_RuntimeTests/test-results --build-only --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-executemethod" --extra-editor-arg="SetupProject.ApplySettings" --extra-editor-arg="vulkan" --extra-editor-arg="Linear" --extra-editor-arg="-playergraphicsapi=Vulkan" --platform=StandaloneLinux64 --player-save-path=players --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=./TestProjects/HDRP_RuntimeTests --timeout=1200 - after: - - command: python .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/HDRP_RuntimeTests/Logs/*.log" - players: - paths: - - "players*/**" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:Linux - rerun: on_new_revision -HDRP_Linux_Vulkan_Standalone_XR_mono_Linear_2021.2: - name: HDRP on Linux_Vulkan_Standalone_XR_mono_Linear on version 2021.2 - agent: - type: Unity::VM::GPU - image: package-ci/ubuntu:stable - flavor: b1.large - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - command: chmod +x utr - - command: DISPLAY=:0.0 ./utr --artifacts_path=TestProjects/HDRP_RuntimeTests/test-results --extra-editor-arg="-xr-reuse-tests" --platform=StandaloneLinux64 --player-connection-ip=auto --player-load-path=players --suite=playmode --timeout=1200 --zero-tests-are-ok=1 - after: - - command: python .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/HDRP_RuntimeTests/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:Linux - rerun: on_new_revision - - path: .yamato/hdrp-linux-vulkan.yml#Build_HDRP_Linux_Vulkan_Standalone_XR_mono_Linear_2021.2 - rerun: on_new_revision -Build_HDRP_Linux_Vulkan_Standalone_XR_mono_Linear_2021.2: - name: Build HDRP on Linux_Vulkan_mono_Linear_Standalone_XR_build_Player on version 2021.2 - agent: - type: Unity::VM - image: package-ci/ubuntu:stable - flavor: b1.xlarge - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - command: chmod +x utr - - command: sudo rm -f /etc/apt/sources.list /etc/apt/sources.list.d/{nodesource,teamviewer,deadsnakes-ubuntu-ppa-}* - - command: curl -L https://artifactory.prd.it.unity3d.com/artifactory/api/gpg/key/public | sudo apt-key add - - - command: sudo sh -c "echo 'deb https://artifactory.prd.it.unity3d.com/artifactory/unity-apt-local bionic main' > /etc/apt/sources.list.d/unity.list" - - command: sudo apt update - - command: sudo apt install unity-downloader-cli - retries: 2 - - command: sudo unity-downloader-cli --source-file unity_revision.txt -c editor -c il2cpp --wait --published-only - retries: 2 - - command: DISPLAY=:0.0 ./utr $CACHE_ARGS --artifacts_path=TestProjects/HDRP_RuntimeTests/test-results --build-only --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-executemethod" --extra-editor-arg="SetupProject.ApplySettings" --extra-editor-arg="vulkan" --extra-editor-arg="Linear" --extra-editor-arg="-playergraphicsapi=Vulkan" --extra-editor-arg="-xr-reuse-tests" --platform=StandaloneLinux64 --player-save-path=players --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=./TestProjects/HDRP_RuntimeTests --timeout=6000 - after: - - command: python .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/HDRP_RuntimeTests/Logs/*.log" - players: - paths: - - "players*/**" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:Linux - rerun: on_new_revision HDRP_Linux_Vulkan_playmode_mono_Linear_CUSTOM-REVISION: name: HDRP on Linux_Vulkan_playmode_mono_Linear on version CUSTOM-REVISION agent: diff --git a/.yamato/hdrp-osx-metal.yml b/.yamato/hdrp-osx-metal.yml index cc57debb539..f10b4d47bc1 100644 --- a/.yamato/hdrp-osx-metal.yml +++ b/.yamato/hdrp-osx-metal.yml @@ -4,7 +4,6 @@ # Read more under .yamato/docs/readme.md {% metadata_file .yamato/_cache_config.metafile -%} -{% metadata_file .yamato/_latest_editor_versions_2021.2.metafile -%} {% metadata_file .yamato/_latest_editor_versions_trunk.metafile -%} --- @@ -91,88 +90,6 @@ HDRP_OSX_Metal_Standalone_mono_Linear_trunk: dependencies: - path: .yamato/_editor_priming.yml#editor:priming:trunk:OSX rerun: on_new_revision -HDRP_OSX_Metal_playmode_mono_Linear_2021.2: - name: HDRP on OSX_Metal_playmode_mono_Linear on version 2021.2 - agent: - type: Unity::metal::macmini - image: slough-ops/macos-10.14-xcode:stable - flavor: m1.mac - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - chmod +x utr - - command: scp -i ~/.ssh/id_rsa_macmini -r $YAMATO_SOURCE_DIR bokken@$BOKKEN_DEVICE_IP:~/Graphics - retries: 2 - - command: scp -i ~/.ssh/id_rsa_macmini ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP:~/.ssh/id_rsa_macmini - retries: 2 - - command: ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP "bash -lc 'pip3 install unity-downloader-cli --user --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade'" - retries: 2 - - command: ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP '$(python3 -m site --user-base)/bin/unity-downloader-cli --source-file ~/Graphics/unity_revision.txt -c editor -c il2cpp --wait --published-only' - retries: 2 - - command: |5- - ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; ~/Graphics/utr $CACHE_ARGS --artifacts_path=/Users/bokken/Graphics/TestProjects/HDRP_Tests/test-results --editor-location=/Users/bokken/.Editor --extra-editor-arg="-colorspace=Linear" --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=/Users/bokken/Graphics/TestProjects/HDRP_Tests --zero-tests-are-ok=1 " - UTR_RESULT=$? - mkdir -p TestProjects/HDRP_Tests/test-results/ - scp -i ~/.ssh/id_rsa_macmini -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/HDRP_Tests/test-results/ TestProjects/HDRP_Tests/test-results/ - exit $UTR_RESULT - after: - - command: pip3 install requests --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade - - command: python3 .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/HDRP_Tests/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:OSX - rerun: on_new_revision -HDRP_OSX_Metal_Standalone_mono_Linear_2021.2: - name: HDRP on OSX_Metal_Standalone_mono_Linear on version 2021.2 - agent: - type: Unity::metal::macmini - image: slough-ops/macos-10.14-xcode:stable - flavor: m1.mac - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - chmod +x utr - - command: scp -i ~/.ssh/id_rsa_macmini -r $YAMATO_SOURCE_DIR bokken@$BOKKEN_DEVICE_IP:~/Graphics - retries: 2 - - command: scp -i ~/.ssh/id_rsa_macmini ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP:~/.ssh/id_rsa_macmini - retries: 2 - - command: ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP "bash -lc 'pip3 install unity-downloader-cli --user --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade'" - retries: 2 - - command: ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP '$(python3 -m site --user-base)/bin/unity-downloader-cli --source-file ~/Graphics/unity_revision.txt -c editor -c il2cpp --wait --published-only' - retries: 2 - - command: |5- - ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; ~/Graphics/utr $CACHE_ARGS --artifacts_path=/Users/bokken/Graphics/TestProjects/HDRP_RuntimeTests/test-results --editor-location=.Editor --platform=StandaloneOSX --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=/Users/bokken/Graphics/TestProjects/HDRP_RuntimeTests --timeout=2400 --zero-tests-are-ok=1 " - UTR_RESULT=$? - mkdir -p TestProjects/HDRP_RuntimeTests/test-results/ - scp -i ~/.ssh/id_rsa_macmini -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/HDRP_RuntimeTests/test-results/ TestProjects/HDRP_RuntimeTests/test-results/ - exit $UTR_RESULT - after: - - command: pip3 install requests --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade - - command: python3 .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/HDRP_RuntimeTests/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:OSX - rerun: on_new_revision HDRP_OSX_Metal_playmode_mono_Linear_CUSTOM-REVISION: name: HDRP on OSX_Metal_playmode_mono_Linear on version CUSTOM-REVISION agent: diff --git a/.yamato/hdrp-win-dx11.yml b/.yamato/hdrp-win-dx11.yml index 3cc63c994c3..b2817f263e0 100644 --- a/.yamato/hdrp-win-dx11.yml +++ b/.yamato/hdrp-win-dx11.yml @@ -4,7 +4,6 @@ # Read more under .yamato/docs/readme.md {% metadata_file .yamato/_cache_config.metafile -%} -{% metadata_file .yamato/_latest_editor_versions_2021.2.metafile -%} {% metadata_file .yamato/_latest_editor_versions_trunk.metafile -%} --- @@ -289,286 +288,6 @@ Build_HDRP_Win_DX11_Standalone_XR_mono_Linear_trunk: dependencies: - path: .yamato/_editor_priming.yml#editor:priming:trunk:Win rerun: on_new_revision -HDRP_Win_DX11_playmode_mono_Linear_2021.2: - name: HDRP on Win_DX11_playmode_mono_Linear on version 2021.2 - agent: - type: Unity::VM::GPU - image: graphics-foundation/win10-dxr:stable - flavor: b1.xlarge - model: rtx2080 - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: NetSh Advfirewall set allprofiles state off - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr.bat --output utr.bat - retries: 2 - - command: choco install unity-downloader-cli -y -s https://artifactory.prd.it.unity3d.com/artifactory/api/nuget/unity-choco-local - retries: 2 - - command: unity-downloader-cli --source-file unity_revision.txt -c editor -c il2cpp --wait --published-only - retries: 2 - - command: |5- - git rev-parse HEAD | git show -s --format=%%cI > revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= /etc/apt/sources.list.d/unity.list" - - command: sudo apt update - - command: sudo apt install unity-downloader-cli - retries: 2 - - command: sudo unity-downloader-cli --source-file unity_revision.txt -c editor -c il2cpp --wait --published-only - retries: 2 - - command: DISPLAY=:0.0 ./utr $CACHE_ARGS --artifacts_path=TestProjects/HDRP_HybridTests/test-results --compilation-errors-as-warnings --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-force-glcore" --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=./TestProjects/HDRP_HybridTests --zero-tests-are-ok=1 - after: - - command: python .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/HDRP_HybridTests/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:Linux - rerun: on_new_revision HDRP_Hybrid_Linux_OpenGLCore_playmode_mono_Linear_CUSTOM-REVISION: name: HDRP_Hybrid on Linux_OpenGLCore_playmode_mono_Linear on version CUSTOM-REVISION agent: diff --git a/.yamato/hdrp_hybrid-linux-vulkan.yml b/.yamato/hdrp_hybrid-linux-vulkan.yml index a43d5a440e0..ba7bba6e27e 100644 --- a/.yamato/hdrp_hybrid-linux-vulkan.yml +++ b/.yamato/hdrp_hybrid-linux-vulkan.yml @@ -4,7 +4,6 @@ # Read more under .yamato/docs/readme.md {% metadata_file .yamato/_cache_config.metafile -%} -{% metadata_file .yamato/_latest_editor_versions_2021.2.metafile -%} {% metadata_file .yamato/_latest_editor_versions_trunk.metafile -%} --- @@ -111,108 +110,6 @@ Build_HDRP_Hybrid_Linux_Vulkan_Standalone_mono_Linear_trunk: dependencies: - path: .yamato/_editor_priming.yml#editor:priming:trunk:Linux rerun: on_new_revision -HDRP_Hybrid_Linux_Vulkan_playmode_mono_Linear_2021.2: - name: HDRP_Hybrid on Linux_Vulkan_playmode_mono_Linear on version 2021.2 - agent: - type: Unity::VM::GPU - image: package-ci/ubuntu:stable - flavor: b1.large - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - command: chmod +x utr - - command: sudo rm -f /etc/apt/sources.list /etc/apt/sources.list.d/{nodesource,teamviewer,deadsnakes-ubuntu-ppa-}* - - command: curl -L https://artifactory.prd.it.unity3d.com/artifactory/api/gpg/key/public | sudo apt-key add - - - command: sudo sh -c "echo 'deb https://artifactory.prd.it.unity3d.com/artifactory/unity-apt-local bionic main' > /etc/apt/sources.list.d/unity.list" - - command: sudo apt update - - command: sudo apt install unity-downloader-cli - retries: 2 - - command: sudo unity-downloader-cli --source-file unity_revision.txt -c editor -c il2cpp --wait --published-only - retries: 2 - - command: DISPLAY=:0.0 ./utr $CACHE_ARGS --artifacts_path=TestProjects/HDRP_HybridTests/test-results --compilation-errors-as-warnings --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-force-vulkan" --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=./TestProjects/HDRP_HybridTests --zero-tests-are-ok=1 - after: - - command: python .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/HDRP_HybridTests/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:Linux - rerun: on_new_revision -HDRP_Hybrid_Linux_Vulkan_Standalone_mono_Linear_2021.2: - name: HDRP_Hybrid on Linux_Vulkan_Standalone_mono_Linear on version 2021.2 - agent: - type: Unity::VM::GPU - image: package-ci/ubuntu:stable - flavor: b1.large - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - command: chmod +x utr - - command: DISPLAY=:0.0 ./utr --artifacts_path=TestProjects/HDRP_HybridTests/test-results --compilation-errors-as-warnings --platform=StandaloneLinux64 --player-connection-ip=auto --player-load-path=players --suite=playmode --timeout=1200 --zero-tests-are-ok=1 - after: - - command: python .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/HDRP_HybridTests/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:Linux - rerun: on_new_revision - - path: .yamato/hdrp_hybrid-linux-vulkan.yml#Build_HDRP_Hybrid_Linux_Vulkan_Standalone_mono_Linear_2021.2 - rerun: on_new_revision -Build_HDRP_Hybrid_Linux_Vulkan_Standalone_mono_Linear_2021.2: - name: Build HDRP_Hybrid on Linux_Vulkan_mono_Linear_Standalone_build_Player on version 2021.2 - agent: - type: Unity::VM - image: package-ci/ubuntu:stable - flavor: b1.xlarge - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - command: chmod +x utr - - command: sudo rm -f /etc/apt/sources.list /etc/apt/sources.list.d/{nodesource,teamviewer,deadsnakes-ubuntu-ppa-}* - - command: curl -L https://artifactory.prd.it.unity3d.com/artifactory/api/gpg/key/public | sudo apt-key add - - - command: sudo sh -c "echo 'deb https://artifactory.prd.it.unity3d.com/artifactory/unity-apt-local bionic main' > /etc/apt/sources.list.d/unity.list" - - command: sudo apt update - - command: sudo apt install unity-downloader-cli - retries: 2 - - command: sudo unity-downloader-cli --source-file unity_revision.txt -c editor -c il2cpp --wait --published-only - retries: 2 - - command: DISPLAY=:0.0 ./utr $CACHE_ARGS --artifacts_path=TestProjects/HDRP_HybridTests/test-results --build-only --compilation-errors-as-warnings --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-executemethod" --extra-editor-arg="SetupProject.ApplySettings" --extra-editor-arg="vulkan" --extra-editor-arg="Linear" --extra-editor-arg="-playergraphicsapi=Vulkan" --platform=StandaloneLinux64 --player-save-path=players --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=./TestProjects/HDRP_HybridTests --timeout=1200 - after: - - command: python .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/HDRP_HybridTests/Logs/*.log" - players: - paths: - - "players*/**" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:Linux - rerun: on_new_revision HDRP_Hybrid_Linux_Vulkan_playmode_mono_Linear_CUSTOM-REVISION: name: HDRP_Hybrid on Linux_Vulkan_playmode_mono_Linear on version CUSTOM-REVISION agent: diff --git a/.yamato/hdrp_hybrid-osx-metal.yml b/.yamato/hdrp_hybrid-osx-metal.yml index 92d7cb4f355..af222def2a2 100644 --- a/.yamato/hdrp_hybrid-osx-metal.yml +++ b/.yamato/hdrp_hybrid-osx-metal.yml @@ -4,7 +4,6 @@ # Read more under .yamato/docs/readme.md {% metadata_file .yamato/_cache_config.metafile -%} -{% metadata_file .yamato/_latest_editor_versions_2021.2.metafile -%} {% metadata_file .yamato/_latest_editor_versions_trunk.metafile -%} --- @@ -132,129 +131,6 @@ HDRP_Hybrid_OSX_Metal_Standalone_mono_Linear_trunk: dependencies: - path: .yamato/_editor_priming.yml#editor:priming:trunk:OSX rerun: on_new_revision -HDRP_Hybrid_OSX_Metal_playmode_mono_Linear_2021.2: - name: HDRP_Hybrid on OSX_Metal_playmode_mono_Linear on version 2021.2 - agent: - type: Unity::metal::macmini - image: slough-ops/macos-10.14-xcode:stable - flavor: m1.mac - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - chmod +x utr - - command: scp -i ~/.ssh/id_rsa_macmini -r $YAMATO_SOURCE_DIR bokken@$BOKKEN_DEVICE_IP:~/Graphics - retries: 2 - - command: scp -i ~/.ssh/id_rsa_macmini ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP:~/.ssh/id_rsa_macmini - retries: 2 - - command: ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP "bash -lc 'pip3 install unity-downloader-cli --user --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade'" - retries: 2 - - command: ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP '$(python3 -m site --user-base)/bin/unity-downloader-cli --source-file ~/Graphics/unity_revision.txt -c editor -c il2cpp --wait --published-only' - retries: 2 - - command: |5- - ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; ~/Graphics/utr $CACHE_ARGS --artifacts_path=/Users/bokken/Graphics/TestProjects/HDRP_HybridTests/test-results --compilation-errors-as-warnings --editor-location=/Users/bokken/.Editor --extra-editor-arg="-colorspace=Linear" --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=/Users/bokken/Graphics/TestProjects/HDRP_HybridTests --zero-tests-are-ok=1 " - UTR_RESULT=$? - mkdir -p TestProjects/HDRP_HybridTests/test-results/ - scp -i ~/.ssh/id_rsa_macmini -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/HDRP_HybridTests/test-results/ TestProjects/HDRP_HybridTests/test-results/ - exit $UTR_RESULT - after: - - command: pip3 install requests --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade - - command: python3 .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/HDRP_HybridTests/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:OSX - rerun: on_new_revision -HDRP_Hybrid_OSX_Metal_playmode_XR_mono_Linear_2021.2: - name: HDRP_Hybrid on OSX_Metal_playmode_XR_mono_Linear on version 2021.2 - agent: - type: Unity::metal::macmini - image: slough-ops/macos-10.14-xcode:stable - flavor: m1.mac - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - chmod +x utr - - command: scp -i ~/.ssh/id_rsa_macmini -r $YAMATO_SOURCE_DIR bokken@$BOKKEN_DEVICE_IP:~/Graphics - retries: 2 - - command: scp -i ~/.ssh/id_rsa_macmini ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP:~/.ssh/id_rsa_macmini - retries: 2 - - command: ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP "bash -lc 'pip3 install unity-downloader-cli --user --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade'" - retries: 2 - - command: ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP '$(python3 -m site --user-base)/bin/unity-downloader-cli --source-file ~/Graphics/unity_revision.txt -c editor -c il2cpp --wait --published-only' - retries: 2 - - command: |5- - ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; ~/Graphics/utr $CACHE_ARGS --artifacts_path=/Users/bokken/Graphics/TestProjects/HDRP_HybridTests/test-results --compilation-errors-as-warnings --editor-location=/Users/bokken/.Editor --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-xr-reuse-tests" --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=/Users/bokken/Graphics/TestProjects/HDRP_HybridTests --zero-tests-are-ok=1 " - UTR_RESULT=$? - mkdir -p TestProjects/HDRP_HybridTests/test-results/ - scp -i ~/.ssh/id_rsa_macmini -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/HDRP_HybridTests/test-results/ TestProjects/HDRP_HybridTests/test-results/ - exit $UTR_RESULT - after: - - command: pip3 install requests --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade - - command: python3 .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/HDRP_HybridTests/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:OSX - rerun: on_new_revision -HDRP_Hybrid_OSX_Metal_Standalone_mono_Linear_2021.2: - name: HDRP_Hybrid on OSX_Metal_Standalone_mono_Linear on version 2021.2 - agent: - type: Unity::metal::macmini - image: slough-ops/macos-10.14-xcode:stable - flavor: m1.mac - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - chmod +x utr - - command: scp -i ~/.ssh/id_rsa_macmini -r $YAMATO_SOURCE_DIR bokken@$BOKKEN_DEVICE_IP:~/Graphics - retries: 2 - - command: scp -i ~/.ssh/id_rsa_macmini ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP:~/.ssh/id_rsa_macmini - retries: 2 - - command: ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP "bash -lc 'pip3 install unity-downloader-cli --user --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade'" - retries: 2 - - command: ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP '$(python3 -m site --user-base)/bin/unity-downloader-cli --source-file ~/Graphics/unity_revision.txt -c editor -c il2cpp --wait --published-only' - retries: 2 - - command: |5- - ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; ~/Graphics/utr $CACHE_ARGS --artifacts_path=/Users/bokken/Graphics/TestProjects/HDRP_HybridTests/test-results --compilation-errors-as-warnings --editor-location=.Editor --platform=StandaloneOSX --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=/Users/bokken/Graphics/TestProjects/HDRP_HybridTests --timeout=2400 --zero-tests-are-ok=1 " - UTR_RESULT=$? - mkdir -p TestProjects/HDRP_HybridTests/test-results/ - scp -i ~/.ssh/id_rsa_macmini -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/HDRP_HybridTests/test-results/ TestProjects/HDRP_HybridTests/test-results/ - exit $UTR_RESULT - after: - - command: pip3 install requests --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade - - command: python3 .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/HDRP_HybridTests/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:OSX - rerun: on_new_revision HDRP_Hybrid_OSX_Metal_playmode_mono_Linear_CUSTOM-REVISION: name: HDRP_Hybrid on OSX_Metal_playmode_mono_Linear on version CUSTOM-REVISION agent: diff --git a/.yamato/hdrp_hybrid-win-dx11.yml b/.yamato/hdrp_hybrid-win-dx11.yml index 0d14ec8a478..c75b2300a7b 100644 --- a/.yamato/hdrp_hybrid-win-dx11.yml +++ b/.yamato/hdrp_hybrid-win-dx11.yml @@ -4,7 +4,6 @@ # Read more under .yamato/docs/readme.md {% metadata_file .yamato/_cache_config.metafile -%} -{% metadata_file .yamato/_latest_editor_versions_2021.2.metafile -%} {% metadata_file .yamato/_latest_editor_versions_trunk.metafile -%} --- @@ -149,146 +148,6 @@ Build_HDRP_Hybrid_Win_DX11_Standalone_mono_Linear_trunk: dependencies: - path: .yamato/_editor_priming.yml#editor:priming:trunk:Win rerun: on_new_revision -HDRP_Hybrid_Win_DX11_playmode_mono_Linear_2021.2: - name: HDRP_Hybrid on Win_DX11_playmode_mono_Linear on version 2021.2 - agent: - type: Unity::VM::GPU - image: graphics-foundation/win10-dxr:stable - flavor: b1.xlarge - model: rtx2080 - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: NetSh Advfirewall set allprofiles state off - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr.bat --output utr.bat - retries: 2 - - command: choco install unity-downloader-cli -y -s https://artifactory.prd.it.unity3d.com/artifactory/api/nuget/unity-choco-local - retries: 2 - - command: unity-downloader-cli --source-file unity_revision.txt -c editor -c il2cpp --wait --published-only - retries: 2 - - command: |5- - git rev-parse HEAD | git show -s --format=%%cI > revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= /etc/apt/sources.list.d/unity.list" - - command: sudo apt update - - command: sudo apt install unity-downloader-cli - retries: 2 - - command: sudo unity-downloader-cli --source-file unity_revision.txt -c editor -c il2cpp --wait --published-only - retries: 2 - - command: DISPLAY=:0.0 ./utr $CACHE_ARGS --artifacts_path=TestProjects/PostProcessing_Tests/test-results --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-force-vulkan" --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=./TestProjects/PostProcessing_Tests --zero-tests-are-ok=1 - after: - - command: python .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/PostProcessing_Tests/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:Linux - rerun: on_new_revision -PostProcessing_Linux_Vulkan_editmode_mono_Linear_2021.2: - name: PostProcessing on Linux_Vulkan_editmode_mono_Linear on version 2021.2 - agent: - type: Unity::VM - image: package-ci/ubuntu:stable - flavor: b1.large - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - command: chmod +x utr - - command: sudo rm -f /etc/apt/sources.list /etc/apt/sources.list.d/{nodesource,teamviewer,deadsnakes-ubuntu-ppa-}* - - command: curl -L https://artifactory.prd.it.unity3d.com/artifactory/api/gpg/key/public | sudo apt-key add - - - command: sudo sh -c "echo 'deb https://artifactory.prd.it.unity3d.com/artifactory/unity-apt-local bionic main' > /etc/apt/sources.list.d/unity.list" - - command: sudo apt update - - command: sudo apt install unity-downloader-cli - retries: 2 - - command: sudo unity-downloader-cli --source-file unity_revision.txt -c editor -c il2cpp --wait --published-only - retries: 2 - - command: DISPLAY=:0.0 ./utr --artifacts_path=TestProjects/PostProcessing_Tests/test-results --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-force-vulkan" --extra-editor-arg="-playergraphicsapi=Vulkan" --platform=editmode --scripting-backend=Mono2x --suite=editor --testfilter=$TEST_FILTER --testproject=./TestProjects/PostProcessing_Tests --zero-tests-are-ok=1 - after: - - command: python .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/PostProcessing_Tests/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:Linux - rerun: on_new_revision -PostProcessing_Linux_Vulkan_Standalone_mono_Linear_2021.2: - name: PostProcessing on Linux_Vulkan_Standalone_mono_Linear on version 2021.2 - agent: - type: Unity::VM::GPU - image: package-ci/ubuntu:stable - flavor: b1.large - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - command: chmod +x utr - - command: DISPLAY=:0.0 ./utr --artifacts_path=TestProjects/PostProcessing_Tests/test-results --platform=StandaloneLinux64 --player-connection-ip=auto --player-load-path=players --suite=playmode --timeout=1200 --zero-tests-are-ok=1 - after: - - command: python .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/PostProcessing_Tests/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:Linux - rerun: on_new_revision - - path: .yamato/postprocessing-linux-vulkan.yml#Build_PostProcessing_Linux_Vulkan_Standalone_mono_Linear_2021.2 - rerun: on_new_revision -Build_PostProcessing_Linux_Vulkan_Standalone_mono_Linear_2021.2: - name: Build PostProcessing on Linux_Vulkan_mono_Linear_Standalone_build_Player on version 2021.2 - agent: - type: Unity::VM - image: package-ci/ubuntu:stable - flavor: b1.xlarge - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - command: chmod +x utr - - command: sudo rm -f /etc/apt/sources.list /etc/apt/sources.list.d/{nodesource,teamviewer,deadsnakes-ubuntu-ppa-}* - - command: curl -L https://artifactory.prd.it.unity3d.com/artifactory/api/gpg/key/public | sudo apt-key add - - - command: sudo sh -c "echo 'deb https://artifactory.prd.it.unity3d.com/artifactory/unity-apt-local bionic main' > /etc/apt/sources.list.d/unity.list" - - command: sudo apt update - - command: sudo apt install unity-downloader-cli - retries: 2 - - command: sudo unity-downloader-cli --source-file unity_revision.txt -c editor -c il2cpp --wait --published-only - retries: 2 - - command: DISPLAY=:0.0 ./utr $CACHE_ARGS --artifacts_path=TestProjects/PostProcessing_Tests/test-results --build-only --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-executemethod" --extra-editor-arg="SetupProject.ApplySettings" --extra-editor-arg="vulkan" --extra-editor-arg="Linear" --extra-editor-arg="-playergraphicsapi=Vulkan" --platform=StandaloneLinux64 --player-save-path=players --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=./TestProjects/PostProcessing_Tests --timeout=1200 - after: - - command: python .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/PostProcessing_Tests/Logs/*.log" - players: - paths: - - "players*/**" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:Linux - rerun: on_new_revision PostProcessing_Linux_Vulkan_playmode_mono_Linear_CUSTOM-REVISION: name: PostProcessing on Linux_Vulkan_playmode_mono_Linear on version CUSTOM-REVISION agent: diff --git a/.yamato/postprocessing-osx-metal.yml b/.yamato/postprocessing-osx-metal.yml index db300b24f3b..3aff779f5d2 100644 --- a/.yamato/postprocessing-osx-metal.yml +++ b/.yamato/postprocessing-osx-metal.yml @@ -4,7 +4,6 @@ # Read more under .yamato/docs/readme.md {% metadata_file .yamato/_cache_config.metafile -%} -{% metadata_file .yamato/_latest_editor_versions_2021.2.metafile -%} {% metadata_file .yamato/_latest_editor_versions_trunk.metafile -%} --- @@ -91,88 +90,6 @@ PostProcessing_OSX_Metal_Standalone_mono_Linear_trunk: dependencies: - path: .yamato/_editor_priming.yml#editor:priming:trunk:OSX rerun: on_new_revision -PostProcessing_OSX_Metal_playmode_mono_Linear_2021.2: - name: PostProcessing on OSX_Metal_playmode_mono_Linear on version 2021.2 - agent: - type: Unity::metal::macmini - image: slough-ops/macos-10.14-xcode:stable - flavor: m1.mac - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - chmod +x utr - - command: scp -i ~/.ssh/id_rsa_macmini -r $YAMATO_SOURCE_DIR bokken@$BOKKEN_DEVICE_IP:~/Graphics - retries: 2 - - command: scp -i ~/.ssh/id_rsa_macmini ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP:~/.ssh/id_rsa_macmini - retries: 2 - - command: ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP "bash -lc 'pip3 install unity-downloader-cli --user --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade'" - retries: 2 - - command: ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP '$(python3 -m site --user-base)/bin/unity-downloader-cli --source-file ~/Graphics/unity_revision.txt -c editor -c il2cpp --wait --published-only' - retries: 2 - - command: |5- - ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; ~/Graphics/utr $CACHE_ARGS --artifacts_path=/Users/bokken/Graphics/TestProjects/PostProcessing_Tests/test-results --editor-location=/Users/bokken/.Editor --extra-editor-arg="-colorspace=Linear" --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=/Users/bokken/Graphics/TestProjects/PostProcessing_Tests --zero-tests-are-ok=1 " - UTR_RESULT=$? - mkdir -p TestProjects/PostProcessing_Tests/test-results/ - scp -i ~/.ssh/id_rsa_macmini -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/PostProcessing_Tests/test-results/ TestProjects/PostProcessing_Tests/test-results/ - exit $UTR_RESULT - after: - - command: pip3 install requests --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade - - command: python3 .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/PostProcessing_Tests/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:OSX - rerun: on_new_revision -PostProcessing_OSX_Metal_Standalone_mono_Linear_2021.2: - name: PostProcessing on OSX_Metal_Standalone_mono_Linear on version 2021.2 - agent: - type: Unity::metal::macmini - image: slough-ops/macos-10.14-xcode:stable - flavor: m1.mac - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - chmod +x utr - - command: scp -i ~/.ssh/id_rsa_macmini -r $YAMATO_SOURCE_DIR bokken@$BOKKEN_DEVICE_IP:~/Graphics - retries: 2 - - command: scp -i ~/.ssh/id_rsa_macmini ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP:~/.ssh/id_rsa_macmini - retries: 2 - - command: ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP "bash -lc 'pip3 install unity-downloader-cli --user --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade'" - retries: 2 - - command: ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP '$(python3 -m site --user-base)/bin/unity-downloader-cli --source-file ~/Graphics/unity_revision.txt -c editor -c il2cpp --wait --published-only' - retries: 2 - - command: |5- - ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; ~/Graphics/utr $CACHE_ARGS --artifacts_path=/Users/bokken/Graphics/TestProjects/PostProcessing_Tests/test-results --editor-location=.Editor --platform=StandaloneOSX --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=/Users/bokken/Graphics/TestProjects/PostProcessing_Tests --timeout=2400 --zero-tests-are-ok=1 " - UTR_RESULT=$? - mkdir -p TestProjects/PostProcessing_Tests/test-results/ - scp -i ~/.ssh/id_rsa_macmini -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/PostProcessing_Tests/test-results/ TestProjects/PostProcessing_Tests/test-results/ - exit $UTR_RESULT - after: - - command: pip3 install requests --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade - - command: python3 .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/PostProcessing_Tests/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:OSX - rerun: on_new_revision PostProcessing_OSX_Metal_playmode_mono_Linear_CUSTOM-REVISION: name: PostProcessing on OSX_Metal_playmode_mono_Linear on version CUSTOM-REVISION agent: diff --git a/.yamato/postprocessing-win-dx11.yml b/.yamato/postprocessing-win-dx11.yml index 459f5df028b..224cb7f57e2 100644 --- a/.yamato/postprocessing-win-dx11.yml +++ b/.yamato/postprocessing-win-dx11.yml @@ -4,7 +4,6 @@ # Read more under .yamato/docs/readme.md {% metadata_file .yamato/_cache_config.metafile -%} -{% metadata_file .yamato/_latest_editor_versions_2021.2.metafile -%} {% metadata_file .yamato/_latest_editor_versions_trunk.metafile -%} --- @@ -148,145 +147,6 @@ Build_PostProcessing_Win_DX11_Standalone_mono_Linear_trunk: dependencies: - path: .yamato/_editor_priming.yml#editor:priming:trunk:Win rerun: on_new_revision -PostProcessing_Win_DX11_playmode_mono_Linear_2021.2: - name: PostProcessing on Win_DX11_playmode_mono_Linear on version 2021.2 - agent: - type: Unity::VM::GPU - image: graphics-foundation/win10-dxr:stable - flavor: b1.xlarge - model: rtx2080 - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: NetSh Advfirewall set allprofiles state off - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr.bat --output utr.bat - retries: 2 - - command: choco install unity-downloader-cli -y -s https://artifactory.prd.it.unity3d.com/artifactory/api/nuget/unity-choco-local - retries: 2 - - command: unity-downloader-cli --source-file unity_revision.txt -c editor -c il2cpp --wait --published-only - retries: 2 - - command: |5- - git rev-parse HEAD | git show -s --format=%%cI > revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= 0 else len(lines) # all log line idx starting/ending a new command cmd_idxs = [i for i,line in enumerate(lines) if COMMAND_START in line] diff --git a/.yamato/script/log_scripts/utils/rules.py b/.yamato/script/log_scripts/utils/rules.py index 134bd3a2365..c246d63cbd0 100644 --- a/.yamato/script/log_scripts/utils/rules.py +++ b/.yamato/script/log_scripts/utils/rules.py @@ -1,13 +1,3 @@ -def add_unknown_pattern_if(matches): - '''Only add unknown pattern if no other pattern has been matched yet, - i.e. skip if no matches are found, or only matches indicate a retry.''' - if len(matches) == 0: - return True - elif len(matches) == 1: - if ('successful-retry' in matches[0][0]['tags'] or 'failed after' in matches[0][0]['pattern'].lower()): - return True - return False - def add_successful_retry_if(matches): '''Add only if failed retry has not matched''' diff --git a/.yamato/script/log_scripts/utils/shared_utils.py b/.yamato/script/log_scripts/utils/shared_utils.py index f447e3b9be9..4fe53888cef 100644 --- a/.yamato/script/log_scripts/utils/shared_utils.py +++ b/.yamato/script/log_scripts/utils/shared_utils.py @@ -1,5 +1,6 @@ import json import re +from .constants import * def load_json(file_path): with open(file_path) as f: @@ -26,13 +27,19 @@ def find_matching_patterns(patterns, failure_string): matches.append((pattern, match)) return matches -def flatten_tags(tags): - '''Tags param: 2d arr of tags gathered from patterns. Returns a 1d arr.''' - return [tag for tag_list in tags for tag in tag_list] +def format_tags(tags): + '''Flattens tags, removes duplicates, removes TAG_INSTABILITY if retry was successful + (latter is because we need to have either one or another, we cannot have both, so that we can distinguish them by tags)''' + tags = sorted(list(set([tag for tag_list in tags for tag in tag_list]))) # flatten and remove duplicates + if TAG_INSTABILITY in tags and TAG_SUCCESFUL_RETRY in tags: + tags.remove(TAG_INSTABILITY) + return tags -def get_ruling_conclusion(conclusions): +def get_ruling_conclusion(conclusions, tags): '''Pick a single conclusion out of several matches in the order of severity''' - if 'failure' in conclusions: + if TAG_SUCCESFUL_RETRY in tags: + return 'success' + elif 'failure' in conclusions: return 'failure' elif 'inconclusive' in conclusions: return 'inconclusive' @@ -42,3 +49,13 @@ def get_ruling_conclusion(conclusions): return 'success' else: return 'failure' + +def add_unknown_pattern_if_appropriate(cmd): + '''Adds an unknown failure pattern if no patterns were matched at all, or only successful retry was matched.''' + + if (len(cmd['tags']) == 0 # no pattern matched at all + or (len(cmd['tags']) == 1 and TAG_SUCCESFUL_RETRY in cmd['tags'])): # only successful retry pattern matched + + cmd['conclusion'].append('failure') + cmd['tags'].append('unknown') + cmd['summary'].append( 'Unknown failure: check logs for more details. ') diff --git a/.yamato/script/log_scripts/utils/unity_log.py b/.yamato/script/log_scripts/utils/unity_log.py index b4dcb89adf1..b05976bd044 100644 --- a/.yamato/script/log_scripts/utils/unity_log.py +++ b/.yamato/script/log_scripts/utils/unity_log.py @@ -2,6 +2,7 @@ import glob from .shared_utils import load_json, find_matching_patterns from .rules import * +from .constants import * class Unity_log(): ''''Handles parsing Unity log (UnityLog.txt) against known error patterns''' @@ -19,21 +20,14 @@ def get_patterns(self): # { # # commented out as this should always come paired with cache instability below # 'pattern': r'TcpProtobufSession::SendMessageAsync', - # 'tags': ['TcpProtobufSession', 'instability', 'infrastructure'], + # 'tags': ['TcpProtobufSession', TAG_INSTABILITY, TAG_INFRASTRUCTURE], # 'conclusion': 'failure', # }, { 'pattern': r'AcceleratorClientConnectionCallback - disconnected - cacheserver-slo', - 'tags': ['cache', 'instability', 'infrastructure'], + 'tags': ['cache', TAG_INSTABILITY, TAG_INFRASTRUCTURE], 'conclusion': 'failure', }, - { - # this matches everything and must therefore be the last item in the list - 'pattern': r'.+', - 'tags': ['unknown'], - 'conclusion': 'failure', - 'add_if': add_unknown_pattern_if - } ] def read_log(self): diff --git a/.yamato/script/log_scripts/utils/utr_log.py b/.yamato/script/log_scripts/utils/utr_log.py index 4ccbb82dd21..2ad95f3ad82 100644 --- a/.yamato/script/log_scripts/utils/utr_log.py +++ b/.yamato/script/log_scripts/utils/utr_log.py @@ -2,6 +2,7 @@ from .shared_utils import load_json, find_matching_patterns from .shared_utils import * from .rules import * +from .constants import * class UTR_log(): ''''Handles parsing UTR logs (TestResults.json) against known error patterns''' @@ -24,15 +25,8 @@ def get_patterns(self): # }, { 'pattern': r'System.AggregateException: One or more errors occurred. \(Detected that ios-deploy is not running when attempting to establish player connection.\)', - 'tags': ['ios-deploy', 'infrastructure'], # instability? + 'tags': ['ios-deploy', TAG_INFRASTRUCTURE], # instability? 'conclusion': 'failure', - }, - { - # this matches everything and must therefore be the last item in the list - 'pattern': r'.+', - 'tags': ['unknown'], - 'conclusion': 'failure', - 'add_if': add_unknown_pattern_if } ] diff --git a/.yamato/shadergraph-android-opengles3.yml b/.yamato/shadergraph-android-opengles3.yml index d04d1bca0be..08a629ecf5b 100644 --- a/.yamato/shadergraph-android-opengles3.yml +++ b/.yamato/shadergraph-android-opengles3.yml @@ -4,7 +4,6 @@ # Read more under .yamato/docs/readme.md {% metadata_file .yamato/_cache_config.metafile -%} -{% metadata_file .yamato/_latest_editor_versions_2021.2.metafile -%} {% metadata_file .yamato/_latest_editor_versions_trunk.metafile -%} --- @@ -89,86 +88,6 @@ Build_ShaderGraph_Android_OpenGLES3_Standalone_il2cpp_Linear_trunk: dependencies: - path: .yamato/_editor_priming.yml#editor:priming:trunk:Android rerun: on_new_revision -ShaderGraph_Android_OpenGLES3_Standalone_il2cpp_Linear_2021.2: - name: ShaderGraph on Android_OpenGLES3_Standalone_il2cpp_Linear on version 2021.2 - agent: - type: Unity::mobile::samsung - model: s10e-eu - image: mobile/android-execution-r19:stable - flavor: b1.large - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: powershell %ANDROID_SDK_ROOT%\platform-tools\adb.exe devices - retries: 2 - - command: NetSh Advfirewall set allprofiles state off - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr.bat --output utr.bat - retries: 2 - - command: |5- - git rev-parse HEAD | git show -s --format=%%cI > revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= /etc/apt/sources.list.d/unity.list" - - command: sudo apt update - - command: sudo apt install unity-downloader-cli - retries: 2 - - command: sudo unity-downloader-cli --source-file unity_revision.txt -c editor -c il2cpp --wait --published-only - retries: 2 - - command: DISPLAY=:0.0 ./utr $CACHE_ARGS --artifacts_path=TestProjects/ShaderGraph/test-results --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-force-glcore" --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=./TestProjects/ShaderGraph --zero-tests-are-ok=1 - after: - - command: python .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/ShaderGraph/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:Linux - rerun: on_new_revision -ShaderGraph_Linux_OpenGLCore_editmode_mono_Linear_2021.2: - name: ShaderGraph on Linux_OpenGLCore_editmode_mono_Linear on version 2021.2 - agent: - type: Unity::VM - image: package-ci/ubuntu:stable - flavor: b1.large - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - command: chmod +x utr - - command: sudo rm -f /etc/apt/sources.list /etc/apt/sources.list.d/{nodesource,teamviewer,deadsnakes-ubuntu-ppa-}* - - command: curl -L https://artifactory.prd.it.unity3d.com/artifactory/api/gpg/key/public | sudo apt-key add - - - command: sudo sh -c "echo 'deb https://artifactory.prd.it.unity3d.com/artifactory/unity-apt-local bionic main' > /etc/apt/sources.list.d/unity.list" - - command: sudo apt update - - command: sudo apt install unity-downloader-cli - retries: 2 - - command: sudo unity-downloader-cli --source-file unity_revision.txt -c editor -c il2cpp --wait --published-only - retries: 2 - - command: DISPLAY=:0.0 ./utr --artifacts_path=TestProjects/ShaderGraph/test-results --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-force-glcore" --platform=editmode --scripting-backend=Mono2x --suite=editor --testfilter=$TEST_FILTER --testproject=./TestProjects/ShaderGraph --zero-tests-are-ok=1 - after: - - command: python .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/ShaderGraph/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:Linux - rerun: on_new_revision ShaderGraph_Linux_OpenGLCore_playmode_mono_Linear_CUSTOM-REVISION: name: ShaderGraph on Linux_OpenGLCore_playmode_mono_Linear on version CUSTOM-REVISION agent: diff --git a/.yamato/shadergraph-linux-vulkan.yml b/.yamato/shadergraph-linux-vulkan.yml index 35441f61a5d..409825d1d97 100644 --- a/.yamato/shadergraph-linux-vulkan.yml +++ b/.yamato/shadergraph-linux-vulkan.yml @@ -4,7 +4,6 @@ # Read more under .yamato/docs/readme.md {% metadata_file .yamato/_cache_config.metafile -%} -{% metadata_file .yamato/_latest_editor_versions_2021.2.metafile -%} {% metadata_file .yamato/_latest_editor_versions_trunk.metafile -%} --- @@ -146,143 +145,6 @@ ShaderGraph_Linux_Vulkan_editmode_mono_Linear_trunk: dependencies: - path: .yamato/_editor_priming.yml#editor:priming:trunk:Linux rerun: on_new_revision -ShaderGraph_Linux_Vulkan_Standalone_mono_Linear_2021.2: - name: ShaderGraph on Linux_Vulkan_Standalone_mono_Linear on version 2021.2 - agent: - type: Unity::VM::GPU - image: package-ci/ubuntu:stable - flavor: b1.large - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - command: chmod +x utr - - command: DISPLAY=:0.0 ./utr --artifacts_path=TestProjects/ShaderGraph/test-results --platform=StandaloneLinux64 --player-connection-ip=auto --player-load-path=players --suite=playmode --timeout=1200 --zero-tests-are-ok=1 - after: - - command: python .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/ShaderGraph/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:Linux - rerun: on_new_revision - - path: .yamato/shadergraph-linux-vulkan.yml#Build_ShaderGraph_Linux_Vulkan_Standalone_mono_Linear_2021.2 - rerun: on_new_revision -Build_ShaderGraph_Linux_Vulkan_Standalone_mono_Linear_2021.2: - name: Build ShaderGraph on Linux_Vulkan_mono_Linear_Standalone_build_Player on version 2021.2 - agent: - type: Unity::VM - image: package-ci/ubuntu:stable - flavor: b1.xlarge - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - command: chmod +x utr - - command: sudo rm -f /etc/apt/sources.list /etc/apt/sources.list.d/{nodesource,teamviewer,deadsnakes-ubuntu-ppa-}* - - command: curl -L https://artifactory.prd.it.unity3d.com/artifactory/api/gpg/key/public | sudo apt-key add - - - command: sudo sh -c "echo 'deb https://artifactory.prd.it.unity3d.com/artifactory/unity-apt-local bionic main' > /etc/apt/sources.list.d/unity.list" - - command: sudo apt update - - command: sudo apt install unity-downloader-cli - retries: 2 - - command: sudo unity-downloader-cli --source-file unity_revision.txt -c editor -c il2cpp --wait --published-only - retries: 2 - - command: DISPLAY=:0.0 ./utr $CACHE_ARGS --artifacts_path=TestProjects/ShaderGraph/test-results --build-only --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-executemethod" --extra-editor-arg="SetupProject.ApplySettings" --extra-editor-arg="vulkan" --extra-editor-arg="Linear" --extra-editor-arg="-playergraphicsapi=Vulkan" --platform=StandaloneLinux64 --player-save-path=players --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=./TestProjects/ShaderGraph --timeout=1200 - after: - - command: python .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/ShaderGraph/Logs/*.log" - players: - paths: - - "players*/**" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:Linux - rerun: on_new_revision -ShaderGraph_Linux_Vulkan_playmode_mono_Linear_2021.2: - name: ShaderGraph on Linux_Vulkan_playmode_mono_Linear on version 2021.2 - agent: - type: Unity::VM::GPU - image: package-ci/ubuntu:stable - flavor: b1.large - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - command: chmod +x utr - - command: sudo rm -f /etc/apt/sources.list /etc/apt/sources.list.d/{nodesource,teamviewer,deadsnakes-ubuntu-ppa-}* - - command: curl -L https://artifactory.prd.it.unity3d.com/artifactory/api/gpg/key/public | sudo apt-key add - - - command: sudo sh -c "echo 'deb https://artifactory.prd.it.unity3d.com/artifactory/unity-apt-local bionic main' > /etc/apt/sources.list.d/unity.list" - - command: sudo apt update - - command: sudo apt install unity-downloader-cli - retries: 2 - - command: sudo unity-downloader-cli --source-file unity_revision.txt -c editor -c il2cpp --wait --published-only - retries: 2 - - command: DISPLAY=:0.0 ./utr $CACHE_ARGS --artifacts_path=TestProjects/ShaderGraph/test-results --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-force-vulkan" --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=./TestProjects/ShaderGraph --zero-tests-are-ok=1 - after: - - command: python .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/ShaderGraph/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:Linux - rerun: on_new_revision -ShaderGraph_Linux_Vulkan_editmode_mono_Linear_2021.2: - name: ShaderGraph on Linux_Vulkan_editmode_mono_Linear on version 2021.2 - agent: - type: Unity::VM - image: package-ci/ubuntu:stable - flavor: b1.large - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - command: chmod +x utr - - command: sudo rm -f /etc/apt/sources.list /etc/apt/sources.list.d/{nodesource,teamviewer,deadsnakes-ubuntu-ppa-}* - - command: curl -L https://artifactory.prd.it.unity3d.com/artifactory/api/gpg/key/public | sudo apt-key add - - - command: sudo sh -c "echo 'deb https://artifactory.prd.it.unity3d.com/artifactory/unity-apt-local bionic main' > /etc/apt/sources.list.d/unity.list" - - command: sudo apt update - - command: sudo apt install unity-downloader-cli - retries: 2 - - command: sudo unity-downloader-cli --source-file unity_revision.txt -c editor -c il2cpp --wait --published-only - retries: 2 - - command: DISPLAY=:0.0 ./utr --artifacts_path=TestProjects/ShaderGraph/test-results --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-force-vulkan" --extra-editor-arg="-playergraphicsapi=Vulkan" --platform=editmode --scripting-backend=Mono2x --suite=editor --testfilter=$TEST_FILTER --testproject=./TestProjects/ShaderGraph --zero-tests-are-ok=1 - after: - - command: python .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/ShaderGraph/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:Linux - rerun: on_new_revision ShaderGraph_Linux_Vulkan_Standalone_mono_Linear_CUSTOM-REVISION: name: ShaderGraph on Linux_Vulkan_Standalone_mono_Linear on version CUSTOM-REVISION agent: diff --git a/.yamato/shadergraph-osx-metal.yml b/.yamato/shadergraph-osx-metal.yml index 70235d0ebdb..2270eed796d 100644 --- a/.yamato/shadergraph-osx-metal.yml +++ b/.yamato/shadergraph-osx-metal.yml @@ -4,7 +4,6 @@ # Read more under .yamato/docs/readme.md {% metadata_file .yamato/_cache_config.metafile -%} -{% metadata_file .yamato/_latest_editor_versions_2021.2.metafile -%} {% metadata_file .yamato/_latest_editor_versions_trunk.metafile -%} --- @@ -91,88 +90,6 @@ ShaderGraph_OSX_Metal_playmode_mono_Linear_trunk: dependencies: - path: .yamato/_editor_priming.yml#editor:priming:trunk:OSX rerun: on_new_revision -ShaderGraph_OSX_Metal_Standalone_mono_Linear_2021.2: - name: ShaderGraph on OSX_Metal_Standalone_mono_Linear on version 2021.2 - agent: - type: Unity::metal::macmini - image: slough-ops/macos-10.14-xcode:stable - flavor: m1.mac - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - chmod +x utr - - command: scp -i ~/.ssh/id_rsa_macmini -r $YAMATO_SOURCE_DIR bokken@$BOKKEN_DEVICE_IP:~/Graphics - retries: 2 - - command: scp -i ~/.ssh/id_rsa_macmini ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP:~/.ssh/id_rsa_macmini - retries: 2 - - command: ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP "bash -lc 'pip3 install unity-downloader-cli --user --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade'" - retries: 2 - - command: ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP '$(python3 -m site --user-base)/bin/unity-downloader-cli --source-file ~/Graphics/unity_revision.txt -c editor -c il2cpp --wait --published-only' - retries: 2 - - command: |5- - ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; ~/Graphics/utr $CACHE_ARGS --artifacts_path=/Users/bokken/Graphics/TestProjects/ShaderGraph/test-results --editor-location=.Editor --platform=StandaloneOSX --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=/Users/bokken/Graphics/TestProjects/ShaderGraph --timeout=2400 --zero-tests-are-ok=1 " - UTR_RESULT=$? - mkdir -p TestProjects/ShaderGraph/test-results/ - scp -i ~/.ssh/id_rsa_macmini -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/ShaderGraph/test-results/ TestProjects/ShaderGraph/test-results/ - exit $UTR_RESULT - after: - - command: pip3 install requests --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade - - command: python3 .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/ShaderGraph/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:OSX - rerun: on_new_revision -ShaderGraph_OSX_Metal_playmode_mono_Linear_2021.2: - name: ShaderGraph on OSX_Metal_playmode_mono_Linear on version 2021.2 - agent: - type: Unity::metal::macmini - image: slough-ops/macos-10.14-xcode:stable - flavor: m1.mac - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - chmod +x utr - - command: scp -i ~/.ssh/id_rsa_macmini -r $YAMATO_SOURCE_DIR bokken@$BOKKEN_DEVICE_IP:~/Graphics - retries: 2 - - command: scp -i ~/.ssh/id_rsa_macmini ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP:~/.ssh/id_rsa_macmini - retries: 2 - - command: ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP "bash -lc 'pip3 install unity-downloader-cli --user --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade'" - retries: 2 - - command: ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP '$(python3 -m site --user-base)/bin/unity-downloader-cli --source-file ~/Graphics/unity_revision.txt -c editor -c il2cpp --wait --published-only' - retries: 2 - - command: |5- - ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; ~/Graphics/utr $CACHE_ARGS --artifacts_path=/Users/bokken/Graphics/TestProjects/ShaderGraph/test-results --editor-location=/Users/bokken/.Editor --extra-editor-arg="-colorspace=Linear" --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=/Users/bokken/Graphics/TestProjects/ShaderGraph --zero-tests-are-ok=1 " - UTR_RESULT=$? - mkdir -p TestProjects/ShaderGraph/test-results/ - scp -i ~/.ssh/id_rsa_macmini -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/ShaderGraph/test-results/ TestProjects/ShaderGraph/test-results/ - exit $UTR_RESULT - after: - - command: pip3 install requests --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade - - command: python3 .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/ShaderGraph/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:OSX - rerun: on_new_revision ShaderGraph_OSX_Metal_Standalone_mono_Linear_CUSTOM-REVISION: name: ShaderGraph on OSX_Metal_Standalone_mono_Linear on version CUSTOM-REVISION agent: diff --git a/.yamato/shadergraph-osx-openglcore.yml b/.yamato/shadergraph-osx-openglcore.yml index f6dd91a57ed..3ebc0661183 100644 --- a/.yamato/shadergraph-osx-openglcore.yml +++ b/.yamato/shadergraph-osx-openglcore.yml @@ -4,7 +4,6 @@ # Read more under .yamato/docs/readme.md {% metadata_file .yamato/_cache_config.metafile -%} -{% metadata_file .yamato/_latest_editor_versions_2021.2.metafile -%} {% metadata_file .yamato/_latest_editor_versions_trunk.metafile -%} --- @@ -75,72 +74,6 @@ ShaderGraph_OSX_OpenGLCore_editmode_mono_Linear_trunk: dependencies: - path: .yamato/_editor_priming.yml#editor:priming:trunk:OSX rerun: on_new_revision -ShaderGraph_OSX_OpenGLCore_playmode_mono_Linear_2021.2: - name: ShaderGraph on OSX_OpenGLCore_playmode_mono_Linear on version 2021.2 - agent: - type: Unity::VM::osx - image: graphics-foundation/mac-10.15:v0.1.0-841394 - flavor: m1.mac - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - chmod +x utr - - command: brew tap --force-auto-update unity/unity git@github.cds.internal.unity3d.com:unity/homebrew-unity.git - - command: brew install unity-downloader-cli - retries: 2 - - command: unity-downloader-cli --source-file unity_revision.txt -c editor -c il2cpp --wait --published-only - retries: 2 - - command: ./utr $CACHE_ARGS --artifacts_path=TestProjects/ShaderGraph/test-results --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=./TestProjects/ShaderGraph --zero-tests-are-ok=1 - retries: 2 - after: - - command: python3 .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/ShaderGraph/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:OSX - rerun: on_new_revision -ShaderGraph_OSX_OpenGLCore_editmode_mono_Linear_2021.2: - name: ShaderGraph on OSX_OpenGLCore_editmode_mono_Linear on version 2021.2 - agent: - type: Unity::VM::osx - image: graphics-foundation/mac-10.15:v0.1.0-841394 - flavor: m1.mac - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - chmod +x utr - - command: brew tap --force-auto-update unity/unity git@github.cds.internal.unity3d.com:unity/homebrew-unity.git - - command: brew install unity-downloader-cli - retries: 2 - - command: unity-downloader-cli --source-file unity_revision.txt -c editor -c il2cpp --wait --published-only - retries: 2 - - command: ./utr --artifacts_path=TestProjects/ShaderGraph/test-results --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --platform=editmode --scripting-backend=Mono2x --suite=editor --testfilter=$TEST_FILTER --testproject=./TestProjects/ShaderGraph --zero-tests-are-ok=1 - retries: 2 - after: - - command: python3 .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/ShaderGraph/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:OSX - rerun: on_new_revision ShaderGraph_OSX_OpenGLCore_playmode_mono_Linear_CUSTOM-REVISION: name: ShaderGraph on OSX_OpenGLCore_playmode_mono_Linear on version CUSTOM-REVISION agent: diff --git a/.yamato/shadergraph-win-dx11.yml b/.yamato/shadergraph-win-dx11.yml index a7c5aded569..5d1ee2ffe83 100644 --- a/.yamato/shadergraph-win-dx11.yml +++ b/.yamato/shadergraph-win-dx11.yml @@ -4,7 +4,6 @@ # Read more under .yamato/docs/readme.md {% metadata_file .yamato/_cache_config.metafile -%} -{% metadata_file .yamato/_latest_editor_versions_2021.2.metafile -%} {% metadata_file .yamato/_latest_editor_versions_trunk.metafile -%} --- @@ -147,144 +146,6 @@ ShaderGraph_Win_DX11_editmode_mono_Linear_trunk: dependencies: - path: .yamato/_editor_priming.yml#editor:priming:trunk:Win rerun: on_new_revision -ShaderGraph_Win_DX11_Standalone_mono_Linear_2021.2: - name: ShaderGraph on Win_DX11_Standalone_mono_Linear on version 2021.2 - agent: - type: Unity::VM::GPU - image: sdet/gamecode_win10:stable - flavor: b1.large - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: NetSh Advfirewall set allprofiles state off - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr.bat --output utr.bat - retries: 2 - - command: |5- - git rev-parse HEAD | git show -s --format=%%cI > revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= /etc/apt/sources.list.d/unity.list" - - command: sudo apt update - - command: sudo apt install unity-downloader-cli - retries: 2 - - command: sudo unity-downloader-cli --source-file unity_revision.txt -c editor -c il2cpp --wait --published-only - retries: 2 - - command: DISPLAY=:0.0 ./utr $CACHE_ARGS --artifacts_path=TestProjects/BuiltInGraphicsTest_Foundation/test-results --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-force-glcore" --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=./TestProjects/BuiltInGraphicsTest_Foundation --zero-tests-are-ok=1 - after: - - command: python .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/BuiltInGraphicsTest_Foundation/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:Linux - rerun: on_new_revision ShaderGraph_BuiltIn_Foundation_Linux_OpenGLCore_playmode_mono_Linear_CUSTOM-REVISION: name: ShaderGraph_BuiltIn_Foundation on Linux_OpenGLCore_playmode_mono_Linear on version CUSTOM-REVISION agent: diff --git a/.yamato/shadergraph_builtin_foundation-linux-vulkan.yml b/.yamato/shadergraph_builtin_foundation-linux-vulkan.yml index a560d1088e0..bc0111c2b94 100644 --- a/.yamato/shadergraph_builtin_foundation-linux-vulkan.yml +++ b/.yamato/shadergraph_builtin_foundation-linux-vulkan.yml @@ -4,7 +4,6 @@ # Read more under .yamato/docs/readme.md {% metadata_file .yamato/_cache_config.metafile -%} -{% metadata_file .yamato/_latest_editor_versions_2021.2.metafile -%} {% metadata_file .yamato/_latest_editor_versions_trunk.metafile -%} --- @@ -44,41 +43,6 @@ ShaderGraph_BuiltIn_Foundation_Linux_Vulkan_playmode_mono_Linear_trunk: dependencies: - path: .yamato/_editor_priming.yml#editor:priming:trunk:Linux rerun: on_new_revision -ShaderGraph_BuiltIn_Foundation_Linux_Vulkan_playmode_mono_Linear_2021.2: - name: ShaderGraph_BuiltIn_Foundation on Linux_Vulkan_playmode_mono_Linear on version 2021.2 - agent: - type: Unity::VM::GPU - image: package-ci/ubuntu:stable - flavor: b1.large - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - command: chmod +x utr - - command: sudo rm -f /etc/apt/sources.list /etc/apt/sources.list.d/{nodesource,teamviewer,deadsnakes-ubuntu-ppa-}* - - command: curl -L https://artifactory.prd.it.unity3d.com/artifactory/api/gpg/key/public | sudo apt-key add - - - command: sudo sh -c "echo 'deb https://artifactory.prd.it.unity3d.com/artifactory/unity-apt-local bionic main' > /etc/apt/sources.list.d/unity.list" - - command: sudo apt update - - command: sudo apt install unity-downloader-cli - retries: 2 - - command: sudo unity-downloader-cli --source-file unity_revision.txt -c editor -c il2cpp --wait --published-only - retries: 2 - - command: DISPLAY=:0.0 ./utr $CACHE_ARGS --artifacts_path=TestProjects/BuiltInGraphicsTest_Foundation/test-results --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-force-vulkan" --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=./TestProjects/BuiltInGraphicsTest_Foundation --zero-tests-are-ok=1 - after: - - command: python .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/BuiltInGraphicsTest_Foundation/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:Linux - rerun: on_new_revision ShaderGraph_BuiltIn_Foundation_Linux_Vulkan_playmode_mono_Linear_CUSTOM-REVISION: name: ShaderGraph_BuiltIn_Foundation on Linux_Vulkan_playmode_mono_Linear on version CUSTOM-REVISION agent: diff --git a/.yamato/shadergraph_builtin_foundation-osx-metal.yml b/.yamato/shadergraph_builtin_foundation-osx-metal.yml index 65dfd0cb216..24554e96bf8 100644 --- a/.yamato/shadergraph_builtin_foundation-osx-metal.yml +++ b/.yamato/shadergraph_builtin_foundation-osx-metal.yml @@ -4,7 +4,6 @@ # Read more under .yamato/docs/readme.md {% metadata_file .yamato/_cache_config.metafile -%} -{% metadata_file .yamato/_latest_editor_versions_2021.2.metafile -%} {% metadata_file .yamato/_latest_editor_versions_trunk.metafile -%} --- @@ -50,47 +49,6 @@ ShaderGraph_BuiltIn_Foundation_OSX_Metal_playmode_mono_Linear_trunk: dependencies: - path: .yamato/_editor_priming.yml#editor:priming:trunk:OSX rerun: on_new_revision -ShaderGraph_BuiltIn_Foundation_OSX_Metal_playmode_mono_Linear_2021.2: - name: ShaderGraph_BuiltIn_Foundation on OSX_Metal_playmode_mono_Linear on version 2021.2 - agent: - type: Unity::metal::macmini - image: slough-ops/macos-10.14-xcode:stable - flavor: m1.mac - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - chmod +x utr - - command: scp -i ~/.ssh/id_rsa_macmini -r $YAMATO_SOURCE_DIR bokken@$BOKKEN_DEVICE_IP:~/Graphics - retries: 2 - - command: scp -i ~/.ssh/id_rsa_macmini ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP:~/.ssh/id_rsa_macmini - retries: 2 - - command: ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP "bash -lc 'pip3 install unity-downloader-cli --user --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade'" - retries: 2 - - command: ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP '$(python3 -m site --user-base)/bin/unity-downloader-cli --source-file ~/Graphics/unity_revision.txt -c editor -c il2cpp --wait --published-only' - retries: 2 - - command: |5- - ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; ~/Graphics/utr $CACHE_ARGS --artifacts_path=/Users/bokken/Graphics/TestProjects/BuiltInGraphicsTest_Foundation/test-results --editor-location=/Users/bokken/.Editor --extra-editor-arg="-colorspace=Linear" --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=/Users/bokken/Graphics/TestProjects/BuiltInGraphicsTest_Foundation --zero-tests-are-ok=1 " - UTR_RESULT=$? - mkdir -p TestProjects/BuiltInGraphicsTest_Foundation/test-results/ - scp -i ~/.ssh/id_rsa_macmini -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/BuiltInGraphicsTest_Foundation/test-results/ TestProjects/BuiltInGraphicsTest_Foundation/test-results/ - exit $UTR_RESULT - after: - - command: pip3 install requests --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade - - command: python3 .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/BuiltInGraphicsTest_Foundation/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:OSX - rerun: on_new_revision ShaderGraph_BuiltIn_Foundation_OSX_Metal_playmode_mono_Linear_CUSTOM-REVISION: name: ShaderGraph_BuiltIn_Foundation on OSX_Metal_playmode_mono_Linear on version CUSTOM-REVISION agent: diff --git a/.yamato/shadergraph_builtin_foundation-osx-openglcore.yml b/.yamato/shadergraph_builtin_foundation-osx-openglcore.yml index a9fd9bbe2b0..b3a750b64ac 100644 --- a/.yamato/shadergraph_builtin_foundation-osx-openglcore.yml +++ b/.yamato/shadergraph_builtin_foundation-osx-openglcore.yml @@ -4,7 +4,6 @@ # Read more under .yamato/docs/readme.md {% metadata_file .yamato/_cache_config.metafile -%} -{% metadata_file .yamato/_latest_editor_versions_2021.2.metafile -%} {% metadata_file .yamato/_latest_editor_versions_trunk.metafile -%} --- @@ -42,39 +41,6 @@ ShaderGraph_BuiltIn_Foundation_OSX_OpenGLCore_playmode_mono_Linear_trunk: dependencies: - path: .yamato/_editor_priming.yml#editor:priming:trunk:OSX rerun: on_new_revision -ShaderGraph_BuiltIn_Foundation_OSX_OpenGLCore_playmode_mono_Linear_2021.2: - name: ShaderGraph_BuiltIn_Foundation on OSX_OpenGLCore_playmode_mono_Linear on version 2021.2 - agent: - type: Unity::VM::osx - image: graphics-foundation/mac-10.15:v0.1.0-841394 - flavor: m1.mac - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - chmod +x utr - - command: brew tap --force-auto-update unity/unity git@github.cds.internal.unity3d.com:unity/homebrew-unity.git - - command: brew install unity-downloader-cli - retries: 2 - - command: unity-downloader-cli --source-file unity_revision.txt -c editor -c il2cpp --wait --published-only - retries: 2 - - command: ./utr $CACHE_ARGS --artifacts_path=TestProjects/BuiltInGraphicsTest_Foundation/test-results --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=./TestProjects/BuiltInGraphicsTest_Foundation --zero-tests-are-ok=1 - retries: 2 - after: - - command: python3 .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/BuiltInGraphicsTest_Foundation/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:OSX - rerun: on_new_revision ShaderGraph_BuiltIn_Foundation_OSX_OpenGLCore_playmode_mono_Linear_CUSTOM-REVISION: name: ShaderGraph_BuiltIn_Foundation on OSX_OpenGLCore_playmode_mono_Linear on version CUSTOM-REVISION agent: diff --git a/.yamato/shadergraph_builtin_foundation-win-dx11.yml b/.yamato/shadergraph_builtin_foundation-win-dx11.yml index 8d2520d3431..ffeae147368 100644 --- a/.yamato/shadergraph_builtin_foundation-win-dx11.yml +++ b/.yamato/shadergraph_builtin_foundation-win-dx11.yml @@ -4,7 +4,6 @@ # Read more under .yamato/docs/readme.md {% metadata_file .yamato/_cache_config.metafile -%} -{% metadata_file .yamato/_latest_editor_versions_2021.2.metafile -%} {% metadata_file .yamato/_latest_editor_versions_trunk.metafile -%} --- @@ -44,41 +43,6 @@ ShaderGraph_BuiltIn_Foundation_Win_DX11_playmode_mono_Linear_trunk: dependencies: - path: .yamato/_editor_priming.yml#editor:priming:trunk:Win rerun: on_new_revision -ShaderGraph_BuiltIn_Foundation_Win_DX11_playmode_mono_Linear_2021.2: - name: ShaderGraph_BuiltIn_Foundation on Win_DX11_playmode_mono_Linear on version 2021.2 - agent: - type: Unity::VM::GPU - image: sdet/gamecode_win10:stable - flavor: b1.xlarge - model: rtx2080 - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: NetSh Advfirewall set allprofiles state off - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr.bat --output utr.bat - retries: 2 - - command: choco install unity-downloader-cli -y -s https://artifactory.prd.it.unity3d.com/artifactory/api/nuget/unity-choco-local - retries: 2 - - command: unity-downloader-cli --source-file unity_revision.txt -c editor -c il2cpp --wait --published-only - retries: 2 - - command: |5- - git rev-parse HEAD | git show -s --format=%%cI > revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= /etc/apt/sources.list.d/unity.list" - - command: sudo apt update - - command: sudo apt install unity-downloader-cli - retries: 2 - - command: sudo unity-downloader-cli --source-file unity_revision.txt -c editor -c il2cpp --wait --published-only - retries: 2 - - command: DISPLAY=:0.0 ./utr $CACHE_ARGS --artifacts_path=TestProjects/BuiltInGraphicsTest_Lighting/test-results --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-force-glcore" --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=./TestProjects/BuiltInGraphicsTest_Lighting --zero-tests-are-ok=1 - after: - - command: python .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/BuiltInGraphicsTest_Lighting/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:Linux - rerun: on_new_revision ShaderGraph_BuiltIn_Lighting_Linux_OpenGLCore_playmode_mono_Linear_CUSTOM-REVISION: name: ShaderGraph_BuiltIn_Lighting on Linux_OpenGLCore_playmode_mono_Linear on version CUSTOM-REVISION agent: diff --git a/.yamato/shadergraph_builtin_lighting-linux-vulkan.yml b/.yamato/shadergraph_builtin_lighting-linux-vulkan.yml index 5e269f254d9..8e446d809f8 100644 --- a/.yamato/shadergraph_builtin_lighting-linux-vulkan.yml +++ b/.yamato/shadergraph_builtin_lighting-linux-vulkan.yml @@ -4,7 +4,6 @@ # Read more under .yamato/docs/readme.md {% metadata_file .yamato/_cache_config.metafile -%} -{% metadata_file .yamato/_latest_editor_versions_2021.2.metafile -%} {% metadata_file .yamato/_latest_editor_versions_trunk.metafile -%} --- @@ -44,41 +43,6 @@ ShaderGraph_BuiltIn_Lighting_Linux_Vulkan_playmode_mono_Linear_trunk: dependencies: - path: .yamato/_editor_priming.yml#editor:priming:trunk:Linux rerun: on_new_revision -ShaderGraph_BuiltIn_Lighting_Linux_Vulkan_playmode_mono_Linear_2021.2: - name: ShaderGraph_BuiltIn_Lighting on Linux_Vulkan_playmode_mono_Linear on version 2021.2 - agent: - type: Unity::VM::GPU - image: package-ci/ubuntu:stable - flavor: b1.large - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - command: chmod +x utr - - command: sudo rm -f /etc/apt/sources.list /etc/apt/sources.list.d/{nodesource,teamviewer,deadsnakes-ubuntu-ppa-}* - - command: curl -L https://artifactory.prd.it.unity3d.com/artifactory/api/gpg/key/public | sudo apt-key add - - - command: sudo sh -c "echo 'deb https://artifactory.prd.it.unity3d.com/artifactory/unity-apt-local bionic main' > /etc/apt/sources.list.d/unity.list" - - command: sudo apt update - - command: sudo apt install unity-downloader-cli - retries: 2 - - command: sudo unity-downloader-cli --source-file unity_revision.txt -c editor -c il2cpp --wait --published-only - retries: 2 - - command: DISPLAY=:0.0 ./utr $CACHE_ARGS --artifacts_path=TestProjects/BuiltInGraphicsTest_Lighting/test-results --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-force-vulkan" --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=./TestProjects/BuiltInGraphicsTest_Lighting --zero-tests-are-ok=1 - after: - - command: python .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/BuiltInGraphicsTest_Lighting/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:Linux - rerun: on_new_revision ShaderGraph_BuiltIn_Lighting_Linux_Vulkan_playmode_mono_Linear_CUSTOM-REVISION: name: ShaderGraph_BuiltIn_Lighting on Linux_Vulkan_playmode_mono_Linear on version CUSTOM-REVISION agent: diff --git a/.yamato/shadergraph_builtin_lighting-osx-metal.yml b/.yamato/shadergraph_builtin_lighting-osx-metal.yml index 25b8dffc9e7..815ef5af428 100644 --- a/.yamato/shadergraph_builtin_lighting-osx-metal.yml +++ b/.yamato/shadergraph_builtin_lighting-osx-metal.yml @@ -4,7 +4,6 @@ # Read more under .yamato/docs/readme.md {% metadata_file .yamato/_cache_config.metafile -%} -{% metadata_file .yamato/_latest_editor_versions_2021.2.metafile -%} {% metadata_file .yamato/_latest_editor_versions_trunk.metafile -%} --- @@ -50,47 +49,6 @@ ShaderGraph_BuiltIn_Lighting_OSX_Metal_playmode_mono_Linear_trunk: dependencies: - path: .yamato/_editor_priming.yml#editor:priming:trunk:OSX rerun: on_new_revision -ShaderGraph_BuiltIn_Lighting_OSX_Metal_playmode_mono_Linear_2021.2: - name: ShaderGraph_BuiltIn_Lighting on OSX_Metal_playmode_mono_Linear on version 2021.2 - agent: - type: Unity::metal::macmini - image: slough-ops/macos-10.14-xcode:stable - flavor: m1.mac - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - chmod +x utr - - command: scp -i ~/.ssh/id_rsa_macmini -r $YAMATO_SOURCE_DIR bokken@$BOKKEN_DEVICE_IP:~/Graphics - retries: 2 - - command: scp -i ~/.ssh/id_rsa_macmini ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP:~/.ssh/id_rsa_macmini - retries: 2 - - command: ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP "bash -lc 'pip3 install unity-downloader-cli --user --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade'" - retries: 2 - - command: ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP '$(python3 -m site --user-base)/bin/unity-downloader-cli --source-file ~/Graphics/unity_revision.txt -c editor -c il2cpp --wait --published-only' - retries: 2 - - command: |5- - ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; ~/Graphics/utr $CACHE_ARGS --artifacts_path=/Users/bokken/Graphics/TestProjects/BuiltInGraphicsTest_Lighting/test-results --editor-location=/Users/bokken/.Editor --extra-editor-arg="-colorspace=Linear" --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=/Users/bokken/Graphics/TestProjects/BuiltInGraphicsTest_Lighting --zero-tests-are-ok=1 " - UTR_RESULT=$? - mkdir -p TestProjects/BuiltInGraphicsTest_Lighting/test-results/ - scp -i ~/.ssh/id_rsa_macmini -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/BuiltInGraphicsTest_Lighting/test-results/ TestProjects/BuiltInGraphicsTest_Lighting/test-results/ - exit $UTR_RESULT - after: - - command: pip3 install requests --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade - - command: python3 .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/BuiltInGraphicsTest_Lighting/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:OSX - rerun: on_new_revision ShaderGraph_BuiltIn_Lighting_OSX_Metal_playmode_mono_Linear_CUSTOM-REVISION: name: ShaderGraph_BuiltIn_Lighting on OSX_Metal_playmode_mono_Linear on version CUSTOM-REVISION agent: diff --git a/.yamato/shadergraph_builtin_lighting-osx-openglcore.yml b/.yamato/shadergraph_builtin_lighting-osx-openglcore.yml index c7d8f26d45e..474e5a3c109 100644 --- a/.yamato/shadergraph_builtin_lighting-osx-openglcore.yml +++ b/.yamato/shadergraph_builtin_lighting-osx-openglcore.yml @@ -4,7 +4,6 @@ # Read more under .yamato/docs/readme.md {% metadata_file .yamato/_cache_config.metafile -%} -{% metadata_file .yamato/_latest_editor_versions_2021.2.metafile -%} {% metadata_file .yamato/_latest_editor_versions_trunk.metafile -%} --- @@ -42,39 +41,6 @@ ShaderGraph_BuiltIn_Lighting_OSX_OpenGLCore_playmode_mono_Linear_trunk: dependencies: - path: .yamato/_editor_priming.yml#editor:priming:trunk:OSX rerun: on_new_revision -ShaderGraph_BuiltIn_Lighting_OSX_OpenGLCore_playmode_mono_Linear_2021.2: - name: ShaderGraph_BuiltIn_Lighting on OSX_OpenGLCore_playmode_mono_Linear on version 2021.2 - agent: - type: Unity::VM::osx - image: graphics-foundation/mac-10.15:v0.1.0-841394 - flavor: m1.mac - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - chmod +x utr - - command: brew tap --force-auto-update unity/unity git@github.cds.internal.unity3d.com:unity/homebrew-unity.git - - command: brew install unity-downloader-cli - retries: 2 - - command: unity-downloader-cli --source-file unity_revision.txt -c editor -c il2cpp --wait --published-only - retries: 2 - - command: ./utr $CACHE_ARGS --artifacts_path=TestProjects/BuiltInGraphicsTest_Lighting/test-results --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=./TestProjects/BuiltInGraphicsTest_Lighting --zero-tests-are-ok=1 - retries: 2 - after: - - command: python3 .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/BuiltInGraphicsTest_Lighting/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:OSX - rerun: on_new_revision ShaderGraph_BuiltIn_Lighting_OSX_OpenGLCore_playmode_mono_Linear_CUSTOM-REVISION: name: ShaderGraph_BuiltIn_Lighting on OSX_OpenGLCore_playmode_mono_Linear on version CUSTOM-REVISION agent: diff --git a/.yamato/shadergraph_builtin_lighting-win-dx11.yml b/.yamato/shadergraph_builtin_lighting-win-dx11.yml index ea25a3af212..1622ea37ca3 100644 --- a/.yamato/shadergraph_builtin_lighting-win-dx11.yml +++ b/.yamato/shadergraph_builtin_lighting-win-dx11.yml @@ -4,7 +4,6 @@ # Read more under .yamato/docs/readme.md {% metadata_file .yamato/_cache_config.metafile -%} -{% metadata_file .yamato/_latest_editor_versions_2021.2.metafile -%} {% metadata_file .yamato/_latest_editor_versions_trunk.metafile -%} --- @@ -44,41 +43,6 @@ ShaderGraph_BuiltIn_Lighting_Win_DX11_playmode_mono_Linear_trunk: dependencies: - path: .yamato/_editor_priming.yml#editor:priming:trunk:Win rerun: on_new_revision -ShaderGraph_BuiltIn_Lighting_Win_DX11_playmode_mono_Linear_2021.2: - name: ShaderGraph_BuiltIn_Lighting on Win_DX11_playmode_mono_Linear on version 2021.2 - agent: - type: Unity::VM::GPU - image: sdet/gamecode_win10:stable - flavor: b1.xlarge - model: rtx2080 - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: NetSh Advfirewall set allprofiles state off - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr.bat --output utr.bat - retries: 2 - - command: choco install unity-downloader-cli -y -s https://artifactory.prd.it.unity3d.com/artifactory/api/nuget/unity-choco-local - retries: 2 - - command: unity-downloader-cli --source-file unity_revision.txt -c editor -c il2cpp --wait --published-only - retries: 2 - - command: |5- - git rev-parse HEAD | git show -s --format=%%cI > revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= /etc/apt/sources.list.d/unity.list" - - command: sudo apt update - - command: sudo apt install unity-downloader-cli - retries: 2 - - command: sudo unity-downloader-cli --source-file unity_revision.txt -c editor -c il2cpp --wait --published-only - retries: 2 - - command: DISPLAY=:0.0 ./utr $CACHE_ARGS --artifacts_path=TestProjects/UniversalHybridTest/test-results --compilation-errors-as-warnings --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-force-glcore" --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=./TestProjects/UniversalHybridTest --zero-tests-are-ok=1 - after: - - command: python .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/UniversalHybridTest/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:Linux - rerun: on_new_revision Universal_Hybrid_Linux_OpenGLCore_playmode_mono_Linear_CUSTOM-REVISION: name: Universal_Hybrid on Linux_OpenGLCore_playmode_mono_Linear on version CUSTOM-REVISION agent: diff --git a/.yamato/universal_hybrid-linux-vulkan.yml b/.yamato/universal_hybrid-linux-vulkan.yml index da9e30c3429..cf4e5ab7a99 100644 --- a/.yamato/universal_hybrid-linux-vulkan.yml +++ b/.yamato/universal_hybrid-linux-vulkan.yml @@ -4,7 +4,6 @@ # Read more under .yamato/docs/readme.md {% metadata_file .yamato/_cache_config.metafile -%} -{% metadata_file .yamato/_latest_editor_versions_2021.2.metafile -%} {% metadata_file .yamato/_latest_editor_versions_trunk.metafile -%} --- @@ -111,108 +110,6 @@ Universal_Hybrid_Linux_Vulkan_playmode_mono_Linear_trunk: dependencies: - path: .yamato/_editor_priming.yml#editor:priming:trunk:Linux rerun: on_new_revision -Universal_Hybrid_Linux_Vulkan_Standalone_mono_Linear_2021.2: - name: Universal_Hybrid on Linux_Vulkan_Standalone_mono_Linear on version 2021.2 - agent: - type: Unity::VM::GPU - image: package-ci/ubuntu:stable - flavor: b1.large - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - command: chmod +x utr - - command: DISPLAY=:0.0 ./utr --artifacts_path=TestProjects/UniversalHybridTest/test-results --compilation-errors-as-warnings --platform=StandaloneLinux64 --player-connection-ip=auto --player-load-path=players --suite=playmode --timeout=1200 --zero-tests-are-ok=1 - after: - - command: python .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/UniversalHybridTest/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:Linux - rerun: on_new_revision - - path: .yamato/universal_hybrid-linux-vulkan.yml#Build_Universal_Hybrid_Linux_Vulkan_Standalone_mono_Linear_2021.2 - rerun: on_new_revision -Build_Universal_Hybrid_Linux_Vulkan_Standalone_mono_Linear_2021.2: - name: Build Universal_Hybrid on Linux_Vulkan_mono_Linear_Standalone_build_Player on version 2021.2 - agent: - type: Unity::VM - image: package-ci/ubuntu:stable - flavor: b1.xlarge - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - command: chmod +x utr - - command: sudo rm -f /etc/apt/sources.list /etc/apt/sources.list.d/{nodesource,teamviewer,deadsnakes-ubuntu-ppa-}* - - command: curl -L https://artifactory.prd.it.unity3d.com/artifactory/api/gpg/key/public | sudo apt-key add - - - command: sudo sh -c "echo 'deb https://artifactory.prd.it.unity3d.com/artifactory/unity-apt-local bionic main' > /etc/apt/sources.list.d/unity.list" - - command: sudo apt update - - command: sudo apt install unity-downloader-cli - retries: 2 - - command: sudo unity-downloader-cli --source-file unity_revision.txt -c editor -c il2cpp --wait --published-only - retries: 2 - - command: DISPLAY=:0.0 ./utr $CACHE_ARGS --artifacts_path=TestProjects/UniversalHybridTest/test-results --build-only --compilation-errors-as-warnings --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-executemethod" --extra-editor-arg="SetupProject.ApplySettings" --extra-editor-arg="vulkan" --extra-editor-arg="Linear" --extra-editor-arg="-playergraphicsapi=Vulkan" --platform=StandaloneLinux64 --player-save-path=players --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=./TestProjects/UniversalHybridTest --timeout=1200 - after: - - command: python .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/UniversalHybridTest/Logs/*.log" - players: - paths: - - "players*/**" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:Linux - rerun: on_new_revision -Universal_Hybrid_Linux_Vulkan_playmode_mono_Linear_2021.2: - name: Universal_Hybrid on Linux_Vulkan_playmode_mono_Linear on version 2021.2 - agent: - type: Unity::VM::GPU - image: package-ci/ubuntu:stable - flavor: b1.large - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - command: chmod +x utr - - command: sudo rm -f /etc/apt/sources.list /etc/apt/sources.list.d/{nodesource,teamviewer,deadsnakes-ubuntu-ppa-}* - - command: curl -L https://artifactory.prd.it.unity3d.com/artifactory/api/gpg/key/public | sudo apt-key add - - - command: sudo sh -c "echo 'deb https://artifactory.prd.it.unity3d.com/artifactory/unity-apt-local bionic main' > /etc/apt/sources.list.d/unity.list" - - command: sudo apt update - - command: sudo apt install unity-downloader-cli - retries: 2 - - command: sudo unity-downloader-cli --source-file unity_revision.txt -c editor -c il2cpp --wait --published-only - retries: 2 - - command: DISPLAY=:0.0 ./utr $CACHE_ARGS --artifacts_path=TestProjects/UniversalHybridTest/test-results --compilation-errors-as-warnings --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-force-vulkan" --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=./TestProjects/UniversalHybridTest --zero-tests-are-ok=1 - after: - - command: python .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/UniversalHybridTest/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:Linux - rerun: on_new_revision Universal_Hybrid_Linux_Vulkan_Standalone_mono_Linear_CUSTOM-REVISION: name: Universal_Hybrid on Linux_Vulkan_Standalone_mono_Linear on version CUSTOM-REVISION agent: diff --git a/.yamato/universal_hybrid-osx-metal.yml b/.yamato/universal_hybrid-osx-metal.yml index a1b50119db0..641af0fb653 100644 --- a/.yamato/universal_hybrid-osx-metal.yml +++ b/.yamato/universal_hybrid-osx-metal.yml @@ -4,7 +4,6 @@ # Read more under .yamato/docs/readme.md {% metadata_file .yamato/_cache_config.metafile -%} -{% metadata_file .yamato/_latest_editor_versions_2021.2.metafile -%} {% metadata_file .yamato/_latest_editor_versions_trunk.metafile -%} --- @@ -91,88 +90,6 @@ Universal_Hybrid_OSX_Metal_playmode_mono_Linear_trunk: dependencies: - path: .yamato/_editor_priming.yml#editor:priming:trunk:OSX rerun: on_new_revision -Universal_Hybrid_OSX_Metal_Standalone_mono_Linear_2021.2: - name: Universal_Hybrid on OSX_Metal_Standalone_mono_Linear on version 2021.2 - agent: - type: Unity::metal::macmini - image: slough-ops/macos-10.14-xcode:stable - flavor: m1.mac - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - chmod +x utr - - command: scp -i ~/.ssh/id_rsa_macmini -r $YAMATO_SOURCE_DIR bokken@$BOKKEN_DEVICE_IP:~/Graphics - retries: 2 - - command: scp -i ~/.ssh/id_rsa_macmini ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP:~/.ssh/id_rsa_macmini - retries: 2 - - command: ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP "bash -lc 'pip3 install unity-downloader-cli --user --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade'" - retries: 2 - - command: ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP '$(python3 -m site --user-base)/bin/unity-downloader-cli --source-file ~/Graphics/unity_revision.txt -c editor -c il2cpp --wait --published-only' - retries: 2 - - command: |5- - ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; ~/Graphics/utr $CACHE_ARGS --artifacts_path=/Users/bokken/Graphics/TestProjects/UniversalHybridTest/test-results --compilation-errors-as-warnings --editor-location=.Editor --platform=StandaloneOSX --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=/Users/bokken/Graphics/TestProjects/UniversalHybridTest --timeout=2400 --zero-tests-are-ok=1 " - UTR_RESULT=$? - mkdir -p TestProjects/UniversalHybridTest/test-results/ - scp -i ~/.ssh/id_rsa_macmini -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/UniversalHybridTest/test-results/ TestProjects/UniversalHybridTest/test-results/ - exit $UTR_RESULT - after: - - command: pip3 install requests --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade - - command: python3 .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/UniversalHybridTest/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:OSX - rerun: on_new_revision -Universal_Hybrid_OSX_Metal_playmode_mono_Linear_2021.2: - name: Universal_Hybrid on OSX_Metal_playmode_mono_Linear on version 2021.2 - agent: - type: Unity::metal::macmini - image: slough-ops/macos-10.14-xcode:stable - flavor: m1.mac - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - chmod +x utr - - command: scp -i ~/.ssh/id_rsa_macmini -r $YAMATO_SOURCE_DIR bokken@$BOKKEN_DEVICE_IP:~/Graphics - retries: 2 - - command: scp -i ~/.ssh/id_rsa_macmini ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP:~/.ssh/id_rsa_macmini - retries: 2 - - command: ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP "bash -lc 'pip3 install unity-downloader-cli --user --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade'" - retries: 2 - - command: ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP '$(python3 -m site --user-base)/bin/unity-downloader-cli --source-file ~/Graphics/unity_revision.txt -c editor -c il2cpp --wait --published-only' - retries: 2 - - command: |5- - ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; ~/Graphics/utr $CACHE_ARGS --artifacts_path=/Users/bokken/Graphics/TestProjects/UniversalHybridTest/test-results --compilation-errors-as-warnings --editor-location=/Users/bokken/.Editor --extra-editor-arg="-colorspace=Linear" --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=/Users/bokken/Graphics/TestProjects/UniversalHybridTest --zero-tests-are-ok=1 " - UTR_RESULT=$? - mkdir -p TestProjects/UniversalHybridTest/test-results/ - scp -i ~/.ssh/id_rsa_macmini -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/UniversalHybridTest/test-results/ TestProjects/UniversalHybridTest/test-results/ - exit $UTR_RESULT - after: - - command: pip3 install requests --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade - - command: python3 .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/UniversalHybridTest/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:OSX - rerun: on_new_revision Universal_Hybrid_OSX_Metal_Standalone_mono_Linear_CUSTOM-REVISION: name: Universal_Hybrid on OSX_Metal_Standalone_mono_Linear on version CUSTOM-REVISION agent: diff --git a/.yamato/universal_hybrid-win-dx11.yml b/.yamato/universal_hybrid-win-dx11.yml index f16e8816361..ac0173b891b 100644 --- a/.yamato/universal_hybrid-win-dx11.yml +++ b/.yamato/universal_hybrid-win-dx11.yml @@ -4,7 +4,6 @@ # Read more under .yamato/docs/readme.md {% metadata_file .yamato/_cache_config.metafile -%} -{% metadata_file .yamato/_latest_editor_versions_2021.2.metafile -%} {% metadata_file .yamato/_latest_editor_versions_trunk.metafile -%} --- @@ -112,109 +111,6 @@ Universal_Hybrid_Win_DX11_playmode_mono_Linear_trunk: dependencies: - path: .yamato/_editor_priming.yml#editor:priming:trunk:Win rerun: on_new_revision -Universal_Hybrid_Win_DX11_Standalone_mono_Linear_2021.2: - name: Universal_Hybrid on Win_DX11_Standalone_mono_Linear on version 2021.2 - agent: - type: Unity::VM::GPU - image: sdet/gamecode_win10:stable - flavor: b1.large - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: NetSh Advfirewall set allprofiles state off - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr.bat --output utr.bat - retries: 2 - - command: |5- - git rev-parse HEAD | git show -s --format=%%cI > revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= /etc/apt/sources.list.d/unity.list" - - command: sudo apt update - - command: sudo apt install unity-downloader-cli - retries: 2 - - command: sudo unity-downloader-cli --source-file unity_revision.txt -c editor -c il2cpp --wait --published-only - retries: 2 - - command: DISPLAY=:0.0 ./utr $CACHE_ARGS --artifacts_path=TestProjects/UniversalGraphicsTest_2D/test-results --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-force-glcore" --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=./TestProjects/UniversalGraphicsTest_2D --zero-tests-are-ok=1 - after: - - command: python .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/UniversalGraphicsTest_2D/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:Linux - rerun: on_new_revision -URP_2D_Linux_OpenGLCore_editmode_mono_Linear_2021.2: - name: URP_2D on Linux_OpenGLCore_editmode_mono_Linear on version 2021.2 - agent: - type: Unity::VM - image: package-ci/ubuntu:stable - flavor: b1.large - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - command: chmod +x utr - - command: sudo rm -f /etc/apt/sources.list /etc/apt/sources.list.d/{nodesource,teamviewer,deadsnakes-ubuntu-ppa-}* - - command: curl -L https://artifactory.prd.it.unity3d.com/artifactory/api/gpg/key/public | sudo apt-key add - - - command: sudo sh -c "echo 'deb https://artifactory.prd.it.unity3d.com/artifactory/unity-apt-local bionic main' > /etc/apt/sources.list.d/unity.list" - - command: sudo apt update - - command: sudo apt install unity-downloader-cli - retries: 2 - - command: sudo unity-downloader-cli --source-file unity_revision.txt -c editor -c il2cpp --wait --published-only - retries: 2 - - command: DISPLAY=:0.0 ./utr --artifacts_path=TestProjects/UniversalGraphicsTest_2D/test-results --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-force-glcore" --platform=editmode --scripting-backend=Mono2x --suite=editor --testfilter=$TEST_FILTER --testproject=./TestProjects/UniversalGraphicsTest_2D --zero-tests-are-ok=1 - after: - - command: python .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/UniversalGraphicsTest_2D/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:Linux - rerun: on_new_revision URP_2D_Linux_OpenGLCore_playmode_mono_Linear_CUSTOM-REVISION: name: URP_2D on Linux_OpenGLCore_playmode_mono_Linear on version CUSTOM-REVISION agent: diff --git a/.yamato/urp_2d-linux-vulkan.yml b/.yamato/urp_2d-linux-vulkan.yml index 226216ef326..11d4c29c447 100644 --- a/.yamato/urp_2d-linux-vulkan.yml +++ b/.yamato/urp_2d-linux-vulkan.yml @@ -4,7 +4,6 @@ # Read more under .yamato/docs/readme.md {% metadata_file .yamato/_cache_config.metafile -%} -{% metadata_file .yamato/_latest_editor_versions_2021.2.metafile -%} {% metadata_file .yamato/_latest_editor_versions_trunk.metafile -%} --- @@ -146,143 +145,6 @@ URP_2D_Linux_Vulkan_editmode_mono_Linear_trunk: dependencies: - path: .yamato/_editor_priming.yml#editor:priming:trunk:Linux rerun: on_new_revision -URP_2D_Linux_Vulkan_Standalone_mono_Linear_2021.2: - name: URP_2D on Linux_Vulkan_Standalone_mono_Linear on version 2021.2 - agent: - type: Unity::VM::GPU - image: package-ci/ubuntu:stable - flavor: b1.large - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - command: chmod +x utr - - command: DISPLAY=:0.0 ./utr --artifacts_path=TestProjects/UniversalGraphicsTest_2D/test-results --platform=StandaloneLinux64 --player-connection-ip=auto --player-load-path=players --suite=playmode --timeout=1200 --zero-tests-are-ok=1 - after: - - command: python .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/UniversalGraphicsTest_2D/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:Linux - rerun: on_new_revision - - path: .yamato/urp_2d-linux-vulkan.yml#Build_URP_2D_Linux_Vulkan_Standalone_mono_Linear_2021.2 - rerun: on_new_revision -Build_URP_2D_Linux_Vulkan_Standalone_mono_Linear_2021.2: - name: Build URP_2D on Linux_Vulkan_mono_Linear_Standalone_build_Player on version 2021.2 - agent: - type: Unity::VM - image: package-ci/ubuntu:stable - flavor: b1.xlarge - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - command: chmod +x utr - - command: sudo rm -f /etc/apt/sources.list /etc/apt/sources.list.d/{nodesource,teamviewer,deadsnakes-ubuntu-ppa-}* - - command: curl -L https://artifactory.prd.it.unity3d.com/artifactory/api/gpg/key/public | sudo apt-key add - - - command: sudo sh -c "echo 'deb https://artifactory.prd.it.unity3d.com/artifactory/unity-apt-local bionic main' > /etc/apt/sources.list.d/unity.list" - - command: sudo apt update - - command: sudo apt install unity-downloader-cli - retries: 2 - - command: sudo unity-downloader-cli --source-file unity_revision.txt -c editor -c il2cpp --wait --published-only - retries: 2 - - command: DISPLAY=:0.0 ./utr $CACHE_ARGS --artifacts_path=TestProjects/UniversalGraphicsTest_2D/test-results --build-only --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-executemethod" --extra-editor-arg="SetupProject.ApplySettings" --extra-editor-arg="vulkan" --extra-editor-arg="Linear" --extra-editor-arg="-playergraphicsapi=Vulkan" --platform=StandaloneLinux64 --player-save-path=players --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=./TestProjects/UniversalGraphicsTest_2D --timeout=3000 - after: - - command: python .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/UniversalGraphicsTest_2D/Logs/*.log" - players: - paths: - - "players*/**" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:Linux - rerun: on_new_revision -URP_2D_Linux_Vulkan_playmode_mono_Linear_2021.2: - name: URP_2D on Linux_Vulkan_playmode_mono_Linear on version 2021.2 - agent: - type: Unity::VM::GPU - image: package-ci/ubuntu:stable - flavor: b1.large - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - command: chmod +x utr - - command: sudo rm -f /etc/apt/sources.list /etc/apt/sources.list.d/{nodesource,teamviewer,deadsnakes-ubuntu-ppa-}* - - command: curl -L https://artifactory.prd.it.unity3d.com/artifactory/api/gpg/key/public | sudo apt-key add - - - command: sudo sh -c "echo 'deb https://artifactory.prd.it.unity3d.com/artifactory/unity-apt-local bionic main' > /etc/apt/sources.list.d/unity.list" - - command: sudo apt update - - command: sudo apt install unity-downloader-cli - retries: 2 - - command: sudo unity-downloader-cli --source-file unity_revision.txt -c editor -c il2cpp --wait --published-only - retries: 2 - - command: DISPLAY=:0.0 ./utr $CACHE_ARGS --artifacts_path=TestProjects/UniversalGraphicsTest_2D/test-results --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-force-vulkan" --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=./TestProjects/UniversalGraphicsTest_2D --zero-tests-are-ok=1 - after: - - command: python .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/UniversalGraphicsTest_2D/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:Linux - rerun: on_new_revision -URP_2D_Linux_Vulkan_editmode_mono_Linear_2021.2: - name: URP_2D on Linux_Vulkan_editmode_mono_Linear on version 2021.2 - agent: - type: Unity::VM - image: package-ci/ubuntu:stable - flavor: b1.large - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - command: chmod +x utr - - command: sudo rm -f /etc/apt/sources.list /etc/apt/sources.list.d/{nodesource,teamviewer,deadsnakes-ubuntu-ppa-}* - - command: curl -L https://artifactory.prd.it.unity3d.com/artifactory/api/gpg/key/public | sudo apt-key add - - - command: sudo sh -c "echo 'deb https://artifactory.prd.it.unity3d.com/artifactory/unity-apt-local bionic main' > /etc/apt/sources.list.d/unity.list" - - command: sudo apt update - - command: sudo apt install unity-downloader-cli - retries: 2 - - command: sudo unity-downloader-cli --source-file unity_revision.txt -c editor -c il2cpp --wait --published-only - retries: 2 - - command: DISPLAY=:0.0 ./utr --artifacts_path=TestProjects/UniversalGraphicsTest_2D/test-results --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-force-vulkan" --extra-editor-arg="-playergraphicsapi=Vulkan" --platform=editmode --scripting-backend=Mono2x --suite=editor --testfilter=$TEST_FILTER --testproject=./TestProjects/UniversalGraphicsTest_2D --zero-tests-are-ok=1 - after: - - command: python .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/UniversalGraphicsTest_2D/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:Linux - rerun: on_new_revision URP_2D_Linux_Vulkan_Standalone_mono_Linear_CUSTOM-REVISION: name: URP_2D on Linux_Vulkan_Standalone_mono_Linear on version CUSTOM-REVISION agent: diff --git a/.yamato/urp_2d-osx-metal.yml b/.yamato/urp_2d-osx-metal.yml index f3d7b040abe..b249c61752c 100644 --- a/.yamato/urp_2d-osx-metal.yml +++ b/.yamato/urp_2d-osx-metal.yml @@ -4,7 +4,6 @@ # Read more under .yamato/docs/readme.md {% metadata_file .yamato/_cache_config.metafile -%} -{% metadata_file .yamato/_latest_editor_versions_2021.2.metafile -%} {% metadata_file .yamato/_latest_editor_versions_trunk.metafile -%} --- @@ -132,129 +131,6 @@ URP_2D_OSX_Metal_playmode_XR_mono_Linear_trunk: dependencies: - path: .yamato/_editor_priming.yml#editor:priming:trunk:OSX rerun: on_new_revision -URP_2D_OSX_Metal_Standalone_mono_Linear_2021.2: - name: URP_2D on OSX_Metal_Standalone_mono_Linear on version 2021.2 - agent: - type: Unity::metal::macmini - image: slough-ops/macos-10.14-xcode:stable - flavor: m1.mac - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - chmod +x utr - - command: scp -i ~/.ssh/id_rsa_macmini -r $YAMATO_SOURCE_DIR bokken@$BOKKEN_DEVICE_IP:~/Graphics - retries: 2 - - command: scp -i ~/.ssh/id_rsa_macmini ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP:~/.ssh/id_rsa_macmini - retries: 2 - - command: ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP "bash -lc 'pip3 install unity-downloader-cli --user --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade'" - retries: 2 - - command: ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP '$(python3 -m site --user-base)/bin/unity-downloader-cli --source-file ~/Graphics/unity_revision.txt -c editor -c il2cpp --wait --published-only' - retries: 2 - - command: |5- - ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; ~/Graphics/utr $CACHE_ARGS --artifacts_path=/Users/bokken/Graphics/TestProjects/UniversalGraphicsTest_2D/test-results --editor-location=.Editor --platform=StandaloneOSX --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=/Users/bokken/Graphics/TestProjects/UniversalGraphicsTest_2D --timeout=2400 --zero-tests-are-ok=1 " - UTR_RESULT=$? - mkdir -p TestProjects/UniversalGraphicsTest_2D/test-results/ - scp -i ~/.ssh/id_rsa_macmini -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/UniversalGraphicsTest_2D/test-results/ TestProjects/UniversalGraphicsTest_2D/test-results/ - exit $UTR_RESULT - after: - - command: pip3 install requests --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade - - command: python3 .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/UniversalGraphicsTest_2D/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:OSX - rerun: on_new_revision -URP_2D_OSX_Metal_playmode_mono_Linear_2021.2: - name: URP_2D on OSX_Metal_playmode_mono_Linear on version 2021.2 - agent: - type: Unity::metal::macmini - image: slough-ops/macos-10.14-xcode:stable - flavor: m1.mac - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - chmod +x utr - - command: scp -i ~/.ssh/id_rsa_macmini -r $YAMATO_SOURCE_DIR bokken@$BOKKEN_DEVICE_IP:~/Graphics - retries: 2 - - command: scp -i ~/.ssh/id_rsa_macmini ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP:~/.ssh/id_rsa_macmini - retries: 2 - - command: ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP "bash -lc 'pip3 install unity-downloader-cli --user --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade'" - retries: 2 - - command: ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP '$(python3 -m site --user-base)/bin/unity-downloader-cli --source-file ~/Graphics/unity_revision.txt -c editor -c il2cpp --wait --published-only' - retries: 2 - - command: |5- - ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; ~/Graphics/utr $CACHE_ARGS --artifacts_path=/Users/bokken/Graphics/TestProjects/UniversalGraphicsTest_2D/test-results --editor-location=/Users/bokken/.Editor --extra-editor-arg="-colorspace=Linear" --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=/Users/bokken/Graphics/TestProjects/UniversalGraphicsTest_2D --zero-tests-are-ok=1 " - UTR_RESULT=$? - mkdir -p TestProjects/UniversalGraphicsTest_2D/test-results/ - scp -i ~/.ssh/id_rsa_macmini -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/UniversalGraphicsTest_2D/test-results/ TestProjects/UniversalGraphicsTest_2D/test-results/ - exit $UTR_RESULT - after: - - command: pip3 install requests --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade - - command: python3 .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/UniversalGraphicsTest_2D/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:OSX - rerun: on_new_revision -URP_2D_OSX_Metal_playmode_XR_mono_Linear_2021.2: - name: URP_2D on OSX_Metal_playmode_XR_mono_Linear on version 2021.2 - agent: - type: Unity::metal::macmini - image: slough-ops/macos-10.14-xcode:stable - flavor: m1.mac - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - chmod +x utr - - command: scp -i ~/.ssh/id_rsa_macmini -r $YAMATO_SOURCE_DIR bokken@$BOKKEN_DEVICE_IP:~/Graphics - retries: 2 - - command: scp -i ~/.ssh/id_rsa_macmini ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP:~/.ssh/id_rsa_macmini - retries: 2 - - command: ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP "bash -lc 'pip3 install unity-downloader-cli --user --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade'" - retries: 2 - - command: ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP '$(python3 -m site --user-base)/bin/unity-downloader-cli --source-file ~/Graphics/unity_revision.txt -c editor -c il2cpp --wait --published-only' - retries: 2 - - command: |5- - ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; ~/Graphics/utr $CACHE_ARGS --artifacts_path=/Users/bokken/Graphics/TestProjects/UniversalGraphicsTest_2D/test-results --editor-location=/Users/bokken/.Editor --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-xr-reuse-tests" --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=/Users/bokken/Graphics/TestProjects/UniversalGraphicsTest_2D --zero-tests-are-ok=1 " - UTR_RESULT=$? - mkdir -p TestProjects/UniversalGraphicsTest_2D/test-results/ - scp -i ~/.ssh/id_rsa_macmini -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/UniversalGraphicsTest_2D/test-results/ TestProjects/UniversalGraphicsTest_2D/test-results/ - exit $UTR_RESULT - after: - - command: pip3 install requests --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade - - command: python3 .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/UniversalGraphicsTest_2D/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:OSX - rerun: on_new_revision URP_2D_OSX_Metal_Standalone_mono_Linear_CUSTOM-REVISION: name: URP_2D on OSX_Metal_Standalone_mono_Linear on version CUSTOM-REVISION agent: diff --git a/.yamato/urp_2d-osx-openglcore.yml b/.yamato/urp_2d-osx-openglcore.yml index 40764cadbdd..fc3f626005d 100644 --- a/.yamato/urp_2d-osx-openglcore.yml +++ b/.yamato/urp_2d-osx-openglcore.yml @@ -4,7 +4,6 @@ # Read more under .yamato/docs/readme.md {% metadata_file .yamato/_cache_config.metafile -%} -{% metadata_file .yamato/_latest_editor_versions_2021.2.metafile -%} {% metadata_file .yamato/_latest_editor_versions_trunk.metafile -%} --- @@ -75,72 +74,6 @@ URP_2D_OSX_OpenGLCore_editmode_mono_Linear_trunk: dependencies: - path: .yamato/_editor_priming.yml#editor:priming:trunk:OSX rerun: on_new_revision -URP_2D_OSX_OpenGLCore_playmode_mono_Linear_2021.2: - name: URP_2D on OSX_OpenGLCore_playmode_mono_Linear on version 2021.2 - agent: - type: Unity::VM::osx - image: graphics-foundation/mac-10.15:v0.1.0-841394 - flavor: m1.mac - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - chmod +x utr - - command: brew tap --force-auto-update unity/unity git@github.cds.internal.unity3d.com:unity/homebrew-unity.git - - command: brew install unity-downloader-cli - retries: 2 - - command: unity-downloader-cli --source-file unity_revision.txt -c editor -c il2cpp --wait --published-only - retries: 2 - - command: ./utr $CACHE_ARGS --artifacts_path=TestProjects/UniversalGraphicsTest_2D/test-results --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=./TestProjects/UniversalGraphicsTest_2D --zero-tests-are-ok=1 - retries: 2 - after: - - command: python3 .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/UniversalGraphicsTest_2D/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:OSX - rerun: on_new_revision -URP_2D_OSX_OpenGLCore_editmode_mono_Linear_2021.2: - name: URP_2D on OSX_OpenGLCore_editmode_mono_Linear on version 2021.2 - agent: - type: Unity::VM::osx - image: graphics-foundation/mac-10.15:v0.1.0-841394 - flavor: m1.mac - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - chmod +x utr - - command: brew tap --force-auto-update unity/unity git@github.cds.internal.unity3d.com:unity/homebrew-unity.git - - command: brew install unity-downloader-cli - retries: 2 - - command: unity-downloader-cli --source-file unity_revision.txt -c editor -c il2cpp --wait --published-only - retries: 2 - - command: ./utr --artifacts_path=TestProjects/UniversalGraphicsTest_2D/test-results --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --platform=editmode --scripting-backend=Mono2x --suite=editor --testfilter=$TEST_FILTER --testproject=./TestProjects/UniversalGraphicsTest_2D --zero-tests-are-ok=1 - retries: 2 - after: - - command: python3 .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/UniversalGraphicsTest_2D/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:OSX - rerun: on_new_revision URP_2D_OSX_OpenGLCore_playmode_mono_Linear_CUSTOM-REVISION: name: URP_2D on OSX_OpenGLCore_playmode_mono_Linear on version CUSTOM-REVISION agent: diff --git a/.yamato/urp_2d-win-dx11.yml b/.yamato/urp_2d-win-dx11.yml index 0f10c85bca2..7327caae9ee 100644 --- a/.yamato/urp_2d-win-dx11.yml +++ b/.yamato/urp_2d-win-dx11.yml @@ -4,7 +4,6 @@ # Read more under .yamato/docs/readme.md {% metadata_file .yamato/_cache_config.metafile -%} -{% metadata_file .yamato/_latest_editor_versions_2021.2.metafile -%} {% metadata_file .yamato/_latest_editor_versions_trunk.metafile -%} --- @@ -187,184 +186,6 @@ URP_2D_Win_DX11_playmode_XR_mono_Linear_trunk: dependencies: - path: .yamato/_editor_priming.yml#editor:priming:trunk:Win rerun: on_new_revision -URP_2D_Win_DX11_Standalone_mono_Linear_2021.2: - name: URP_2D on Win_DX11_Standalone_mono_Linear on version 2021.2 - agent: - type: Unity::VM::GPU - image: sdet/gamecode_win10:stable - flavor: b1.large - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: NetSh Advfirewall set allprofiles state off - - cd Tools && powershell -command ". .\Unity.ps1; Set-ScreenResolution -width 1920 -Height 1080" - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr.bat --output utr.bat - retries: 2 - - command: |5- - git rev-parse HEAD | git show -s --format=%%cI > revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= /etc/apt/sources.list.d/unity.list" - - command: sudo apt update - - command: sudo apt install unity-downloader-cli - retries: 2 - - command: sudo unity-downloader-cli --source-file unity_revision.txt -c editor -c il2cpp --wait --published-only - retries: 2 - - command: DISPLAY=:0.0 ./utr $CACHE_ARGS --artifacts_path=TestProjects/UniversalGraphicsTest_Foundation/test-results --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-force-glcore" --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=./TestProjects/UniversalGraphicsTest_Foundation --zero-tests-are-ok=1 - after: - - command: python .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/UniversalGraphicsTest_Foundation/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:Linux - rerun: on_new_revision -URP_Foundation_Linux_OpenGLCore_editmode_mono_Linear_2021.2: - name: URP_Foundation on Linux_OpenGLCore_editmode_mono_Linear on version 2021.2 - agent: - type: Unity::VM - image: package-ci/ubuntu:stable - flavor: b1.large - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - command: chmod +x utr - - command: sudo rm -f /etc/apt/sources.list /etc/apt/sources.list.d/{nodesource,teamviewer,deadsnakes-ubuntu-ppa-}* - - command: curl -L https://artifactory.prd.it.unity3d.com/artifactory/api/gpg/key/public | sudo apt-key add - - - command: sudo sh -c "echo 'deb https://artifactory.prd.it.unity3d.com/artifactory/unity-apt-local bionic main' > /etc/apt/sources.list.d/unity.list" - - command: sudo apt update - - command: sudo apt install unity-downloader-cli - retries: 2 - - command: sudo unity-downloader-cli --source-file unity_revision.txt -c editor -c il2cpp --wait --published-only - retries: 2 - - command: DISPLAY=:0.0 ./utr --artifacts_path=TestProjects/UniversalGraphicsTest_Foundation/test-results --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-force-glcore" --platform=editmode --scripting-backend=Mono2x --suite=editor --testfilter=$TEST_FILTER --testproject=./TestProjects/UniversalGraphicsTest_Foundation --zero-tests-are-ok=1 - after: - - command: python .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/UniversalGraphicsTest_Foundation/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:Linux - rerun: on_new_revision URP_Foundation_Linux_OpenGLCore_playmode_mono_Linear_CUSTOM-REVISION: name: URP_Foundation on Linux_OpenGLCore_playmode_mono_Linear on version CUSTOM-REVISION agent: diff --git a/.yamato/urp_foundation-linux-vulkan.yml b/.yamato/urp_foundation-linux-vulkan.yml index 57593dfb416..5d3ae0a485c 100644 --- a/.yamato/urp_foundation-linux-vulkan.yml +++ b/.yamato/urp_foundation-linux-vulkan.yml @@ -4,7 +4,6 @@ # Read more under .yamato/docs/readme.md {% metadata_file .yamato/_cache_config.metafile -%} -{% metadata_file .yamato/_latest_editor_versions_2021.2.metafile -%} {% metadata_file .yamato/_latest_editor_versions_trunk.metafile -%} --- @@ -146,143 +145,6 @@ URP_Foundation_Linux_Vulkan_editmode_mono_Linear_trunk: dependencies: - path: .yamato/_editor_priming.yml#editor:priming:trunk:Linux rerun: on_new_revision -URP_Foundation_Linux_Vulkan_Standalone_mono_Linear_2021.2: - name: URP_Foundation on Linux_Vulkan_Standalone_mono_Linear on version 2021.2 - agent: - type: Unity::VM::GPU - image: package-ci/ubuntu:stable - flavor: b1.large - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - command: chmod +x utr - - command: DISPLAY=:0.0 ./utr --artifacts_path=TestProjects/UniversalGraphicsTest_Foundation/test-results --platform=StandaloneLinux64 --player-connection-ip=auto --player-load-path=players --suite=playmode --timeout=1200 --zero-tests-are-ok=1 - after: - - command: python .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/UniversalGraphicsTest_Foundation/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:Linux - rerun: on_new_revision - - path: .yamato/urp_foundation-linux-vulkan.yml#Build_URP_Foundation_Linux_Vulkan_Standalone_mono_Linear_2021.2 - rerun: on_new_revision -Build_URP_Foundation_Linux_Vulkan_Standalone_mono_Linear_2021.2: - name: Build URP_Foundation on Linux_Vulkan_mono_Linear_Standalone_build_Player on version 2021.2 - agent: - type: Unity::VM - image: package-ci/ubuntu:stable - flavor: b1.xlarge - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - command: chmod +x utr - - command: sudo rm -f /etc/apt/sources.list /etc/apt/sources.list.d/{nodesource,teamviewer,deadsnakes-ubuntu-ppa-}* - - command: curl -L https://artifactory.prd.it.unity3d.com/artifactory/api/gpg/key/public | sudo apt-key add - - - command: sudo sh -c "echo 'deb https://artifactory.prd.it.unity3d.com/artifactory/unity-apt-local bionic main' > /etc/apt/sources.list.d/unity.list" - - command: sudo apt update - - command: sudo apt install unity-downloader-cli - retries: 2 - - command: sudo unity-downloader-cli --source-file unity_revision.txt -c editor -c il2cpp --wait --published-only - retries: 2 - - command: DISPLAY=:0.0 ./utr $CACHE_ARGS --artifacts_path=TestProjects/UniversalGraphicsTest_Foundation/test-results --build-only --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-executemethod" --extra-editor-arg="SetupProject.ApplySettings" --extra-editor-arg="vulkan" --extra-editor-arg="Linear" --extra-editor-arg="-playergraphicsapi=Vulkan" --platform=StandaloneLinux64 --player-save-path=players --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=./TestProjects/UniversalGraphicsTest_Foundation --timeout=3000 - after: - - command: python .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/UniversalGraphicsTest_Foundation/Logs/*.log" - players: - paths: - - "players*/**" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:Linux - rerun: on_new_revision -URP_Foundation_Linux_Vulkan_playmode_mono_Linear_2021.2: - name: URP_Foundation on Linux_Vulkan_playmode_mono_Linear on version 2021.2 - agent: - type: Unity::VM::GPU - image: package-ci/ubuntu:stable - flavor: b1.large - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - command: chmod +x utr - - command: sudo rm -f /etc/apt/sources.list /etc/apt/sources.list.d/{nodesource,teamviewer,deadsnakes-ubuntu-ppa-}* - - command: curl -L https://artifactory.prd.it.unity3d.com/artifactory/api/gpg/key/public | sudo apt-key add - - - command: sudo sh -c "echo 'deb https://artifactory.prd.it.unity3d.com/artifactory/unity-apt-local bionic main' > /etc/apt/sources.list.d/unity.list" - - command: sudo apt update - - command: sudo apt install unity-downloader-cli - retries: 2 - - command: sudo unity-downloader-cli --source-file unity_revision.txt -c editor -c il2cpp --wait --published-only - retries: 2 - - command: DISPLAY=:0.0 ./utr $CACHE_ARGS --artifacts_path=TestProjects/UniversalGraphicsTest_Foundation/test-results --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-force-vulkan" --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=./TestProjects/UniversalGraphicsTest_Foundation --zero-tests-are-ok=1 - after: - - command: python .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/UniversalGraphicsTest_Foundation/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:Linux - rerun: on_new_revision -URP_Foundation_Linux_Vulkan_editmode_mono_Linear_2021.2: - name: URP_Foundation on Linux_Vulkan_editmode_mono_Linear on version 2021.2 - agent: - type: Unity::VM - image: package-ci/ubuntu:stable - flavor: b1.large - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - command: chmod +x utr - - command: sudo rm -f /etc/apt/sources.list /etc/apt/sources.list.d/{nodesource,teamviewer,deadsnakes-ubuntu-ppa-}* - - command: curl -L https://artifactory.prd.it.unity3d.com/artifactory/api/gpg/key/public | sudo apt-key add - - - command: sudo sh -c "echo 'deb https://artifactory.prd.it.unity3d.com/artifactory/unity-apt-local bionic main' > /etc/apt/sources.list.d/unity.list" - - command: sudo apt update - - command: sudo apt install unity-downloader-cli - retries: 2 - - command: sudo unity-downloader-cli --source-file unity_revision.txt -c editor -c il2cpp --wait --published-only - retries: 2 - - command: DISPLAY=:0.0 ./utr --artifacts_path=TestProjects/UniversalGraphicsTest_Foundation/test-results --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-force-vulkan" --extra-editor-arg="-playergraphicsapi=Vulkan" --platform=editmode --scripting-backend=Mono2x --suite=editor --testfilter=$TEST_FILTER --testproject=./TestProjects/UniversalGraphicsTest_Foundation --zero-tests-are-ok=1 - after: - - command: python .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/UniversalGraphicsTest_Foundation/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:Linux - rerun: on_new_revision URP_Foundation_Linux_Vulkan_Standalone_mono_Linear_CUSTOM-REVISION: name: URP_Foundation on Linux_Vulkan_Standalone_mono_Linear on version CUSTOM-REVISION agent: diff --git a/.yamato/urp_foundation-osx-metal.yml b/.yamato/urp_foundation-osx-metal.yml index 5aee559bf40..012ba570938 100644 --- a/.yamato/urp_foundation-osx-metal.yml +++ b/.yamato/urp_foundation-osx-metal.yml @@ -4,7 +4,6 @@ # Read more under .yamato/docs/readme.md {% metadata_file .yamato/_cache_config.metafile -%} -{% metadata_file .yamato/_latest_editor_versions_2021.2.metafile -%} {% metadata_file .yamato/_latest_editor_versions_trunk.metafile -%} --- @@ -91,88 +90,6 @@ URP_Foundation_OSX_Metal_playmode_mono_Linear_trunk: dependencies: - path: .yamato/_editor_priming.yml#editor:priming:trunk:OSX rerun: on_new_revision -URP_Foundation_OSX_Metal_Standalone_mono_Linear_2021.2: - name: URP_Foundation on OSX_Metal_Standalone_mono_Linear on version 2021.2 - agent: - type: Unity::metal::macmini - image: slough-ops/macos-10.14-xcode:stable - flavor: m1.mac - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - chmod +x utr - - command: scp -i ~/.ssh/id_rsa_macmini -r $YAMATO_SOURCE_DIR bokken@$BOKKEN_DEVICE_IP:~/Graphics - retries: 2 - - command: scp -i ~/.ssh/id_rsa_macmini ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP:~/.ssh/id_rsa_macmini - retries: 2 - - command: ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP "bash -lc 'pip3 install unity-downloader-cli --user --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade'" - retries: 2 - - command: ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP '$(python3 -m site --user-base)/bin/unity-downloader-cli --source-file ~/Graphics/unity_revision.txt -c editor -c il2cpp --wait --published-only' - retries: 2 - - command: |5- - ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; ~/Graphics/utr $CACHE_ARGS --artifacts_path=/Users/bokken/Graphics/TestProjects/UniversalGraphicsTest_Foundation/test-results --editor-location=.Editor --platform=StandaloneOSX --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=/Users/bokken/Graphics/TestProjects/UniversalGraphicsTest_Foundation --timeout=2400 --zero-tests-are-ok=1 " - UTR_RESULT=$? - mkdir -p TestProjects/UniversalGraphicsTest_Foundation/test-results/ - scp -i ~/.ssh/id_rsa_macmini -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/UniversalGraphicsTest_Foundation/test-results/ TestProjects/UniversalGraphicsTest_Foundation/test-results/ - exit $UTR_RESULT - after: - - command: pip3 install requests --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade - - command: python3 .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/UniversalGraphicsTest_Foundation/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:OSX - rerun: on_new_revision -URP_Foundation_OSX_Metal_playmode_mono_Linear_2021.2: - name: URP_Foundation on OSX_Metal_playmode_mono_Linear on version 2021.2 - agent: - type: Unity::metal::macmini - image: slough-ops/macos-10.14-xcode:stable - flavor: m1.mac - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - chmod +x utr - - command: scp -i ~/.ssh/id_rsa_macmini -r $YAMATO_SOURCE_DIR bokken@$BOKKEN_DEVICE_IP:~/Graphics - retries: 2 - - command: scp -i ~/.ssh/id_rsa_macmini ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP:~/.ssh/id_rsa_macmini - retries: 2 - - command: ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP "bash -lc 'pip3 install unity-downloader-cli --user --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade'" - retries: 2 - - command: ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP '$(python3 -m site --user-base)/bin/unity-downloader-cli --source-file ~/Graphics/unity_revision.txt -c editor -c il2cpp --wait --published-only' - retries: 2 - - command: |5- - ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; ~/Graphics/utr $CACHE_ARGS --artifacts_path=/Users/bokken/Graphics/TestProjects/UniversalGraphicsTest_Foundation/test-results --editor-location=/Users/bokken/.Editor --extra-editor-arg="-colorspace=Linear" --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=/Users/bokken/Graphics/TestProjects/UniversalGraphicsTest_Foundation --zero-tests-are-ok=1 " - UTR_RESULT=$? - mkdir -p TestProjects/UniversalGraphicsTest_Foundation/test-results/ - scp -i ~/.ssh/id_rsa_macmini -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/UniversalGraphicsTest_Foundation/test-results/ TestProjects/UniversalGraphicsTest_Foundation/test-results/ - exit $UTR_RESULT - after: - - command: pip3 install requests --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade - - command: python3 .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/UniversalGraphicsTest_Foundation/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:OSX - rerun: on_new_revision URP_Foundation_OSX_Metal_Standalone_mono_Linear_CUSTOM-REVISION: name: URP_Foundation on OSX_Metal_Standalone_mono_Linear on version CUSTOM-REVISION agent: diff --git a/.yamato/urp_foundation-osx-openglcore.yml b/.yamato/urp_foundation-osx-openglcore.yml index 8337e42df30..76de6ccc3db 100644 --- a/.yamato/urp_foundation-osx-openglcore.yml +++ b/.yamato/urp_foundation-osx-openglcore.yml @@ -4,7 +4,6 @@ # Read more under .yamato/docs/readme.md {% metadata_file .yamato/_cache_config.metafile -%} -{% metadata_file .yamato/_latest_editor_versions_2021.2.metafile -%} {% metadata_file .yamato/_latest_editor_versions_trunk.metafile -%} --- @@ -75,72 +74,6 @@ URP_Foundation_OSX_OpenGLCore_editmode_mono_Linear_trunk: dependencies: - path: .yamato/_editor_priming.yml#editor:priming:trunk:OSX rerun: on_new_revision -URP_Foundation_OSX_OpenGLCore_playmode_mono_Linear_2021.2: - name: URP_Foundation on OSX_OpenGLCore_playmode_mono_Linear on version 2021.2 - agent: - type: Unity::VM::osx - image: graphics-foundation/mac-10.15:v0.1.0-841394 - flavor: m1.mac - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - chmod +x utr - - command: brew tap --force-auto-update unity/unity git@github.cds.internal.unity3d.com:unity/homebrew-unity.git - - command: brew install unity-downloader-cli - retries: 2 - - command: unity-downloader-cli --source-file unity_revision.txt -c editor -c il2cpp --wait --published-only - retries: 2 - - command: ./utr $CACHE_ARGS --artifacts_path=TestProjects/UniversalGraphicsTest_Foundation/test-results --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=./TestProjects/UniversalGraphicsTest_Foundation --zero-tests-are-ok=1 - retries: 2 - after: - - command: python3 .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/UniversalGraphicsTest_Foundation/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:OSX - rerun: on_new_revision -URP_Foundation_OSX_OpenGLCore_editmode_mono_Linear_2021.2: - name: URP_Foundation on OSX_OpenGLCore_editmode_mono_Linear on version 2021.2 - agent: - type: Unity::VM::osx - image: graphics-foundation/mac-10.15:v0.1.0-841394 - flavor: m1.mac - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - chmod +x utr - - command: brew tap --force-auto-update unity/unity git@github.cds.internal.unity3d.com:unity/homebrew-unity.git - - command: brew install unity-downloader-cli - retries: 2 - - command: unity-downloader-cli --source-file unity_revision.txt -c editor -c il2cpp --wait --published-only - retries: 2 - - command: ./utr --artifacts_path=TestProjects/UniversalGraphicsTest_Foundation/test-results --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --platform=editmode --scripting-backend=Mono2x --suite=editor --testfilter=$TEST_FILTER --testproject=./TestProjects/UniversalGraphicsTest_Foundation --zero-tests-are-ok=1 - retries: 2 - after: - - command: python3 .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/UniversalGraphicsTest_Foundation/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:OSX - rerun: on_new_revision URP_Foundation_OSX_OpenGLCore_playmode_mono_Linear_CUSTOM-REVISION: name: URP_Foundation on OSX_OpenGLCore_playmode_mono_Linear on version CUSTOM-REVISION agent: diff --git a/.yamato/urp_foundation-win-dx11.yml b/.yamato/urp_foundation-win-dx11.yml index 15e93c27ae5..430c64a029d 100644 --- a/.yamato/urp_foundation-win-dx11.yml +++ b/.yamato/urp_foundation-win-dx11.yml @@ -4,7 +4,6 @@ # Read more under .yamato/docs/readme.md {% metadata_file .yamato/_cache_config.metafile -%} -{% metadata_file .yamato/_latest_editor_versions_2021.2.metafile -%} {% metadata_file .yamato/_latest_editor_versions_trunk.metafile -%} --- @@ -260,257 +259,6 @@ Build_URP_Foundation_Win_DX11_Standalone_XR_mono_Linear_trunk: dependencies: - path: .yamato/_editor_priming.yml#editor:priming:trunk:Win rerun: on_new_revision -URP_Foundation_Win_DX11_Standalone_mono_Linear_2021.2: - name: URP_Foundation on Win_DX11_Standalone_mono_Linear on version 2021.2 - agent: - type: Unity::VM::GPU - image: sdet/gamecode_win10:stable - flavor: b1.xlarge - model: rtx2080 - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: NetSh Advfirewall set allprofiles state off - - cd Tools && powershell -command ". .\Unity.ps1; Set-ScreenResolution -width 1920 -Height 1080" - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr.bat --output utr.bat - retries: 2 - - command: |5- - git rev-parse HEAD | git show -s --format=%%cI > revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= /etc/apt/sources.list.d/unity.list" - - command: sudo apt update - - command: sudo apt install unity-downloader-cli - retries: 2 - - command: sudo unity-downloader-cli --source-file unity_revision.txt -c editor -c il2cpp --wait --published-only - retries: 2 - - command: DISPLAY=:0.0 ./utr $CACHE_ARGS --artifacts_path=TestProjects/UniversalGraphicsTest_Lighting/test-results --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-force-glcore" --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=./TestProjects/UniversalGraphicsTest_Lighting --zero-tests-are-ok=1 - after: - - command: python .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/UniversalGraphicsTest_Lighting/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:Linux - rerun: on_new_revision -URP_Lighting_Linux_OpenGLCore_editmode_mono_Linear_2021.2: - name: URP_Lighting on Linux_OpenGLCore_editmode_mono_Linear on version 2021.2 - agent: - type: Unity::VM - image: package-ci/ubuntu:stable - flavor: b1.large - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - command: chmod +x utr - - command: sudo rm -f /etc/apt/sources.list /etc/apt/sources.list.d/{nodesource,teamviewer,deadsnakes-ubuntu-ppa-}* - - command: curl -L https://artifactory.prd.it.unity3d.com/artifactory/api/gpg/key/public | sudo apt-key add - - - command: sudo sh -c "echo 'deb https://artifactory.prd.it.unity3d.com/artifactory/unity-apt-local bionic main' > /etc/apt/sources.list.d/unity.list" - - command: sudo apt update - - command: sudo apt install unity-downloader-cli - retries: 2 - - command: sudo unity-downloader-cli --source-file unity_revision.txt -c editor -c il2cpp --wait --published-only - retries: 2 - - command: DISPLAY=:0.0 ./utr --artifacts_path=TestProjects/UniversalGraphicsTest_Lighting/test-results --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-force-glcore" --platform=editmode --scripting-backend=Mono2x --suite=editor --testfilter=$TEST_FILTER --testproject=./TestProjects/UniversalGraphicsTest_Lighting --zero-tests-are-ok=1 - after: - - command: python .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/UniversalGraphicsTest_Lighting/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:Linux - rerun: on_new_revision URP_Lighting_Linux_OpenGLCore_playmode_mono_Linear_CUSTOM-REVISION: name: URP_Lighting on Linux_OpenGLCore_playmode_mono_Linear on version CUSTOM-REVISION agent: diff --git a/.yamato/urp_lighting-linux-vulkan.yml b/.yamato/urp_lighting-linux-vulkan.yml index 88d20638edb..9b6059a77db 100644 --- a/.yamato/urp_lighting-linux-vulkan.yml +++ b/.yamato/urp_lighting-linux-vulkan.yml @@ -4,7 +4,6 @@ # Read more under .yamato/docs/readme.md {% metadata_file .yamato/_cache_config.metafile -%} -{% metadata_file .yamato/_latest_editor_versions_2021.2.metafile -%} {% metadata_file .yamato/_latest_editor_versions_trunk.metafile -%} --- @@ -146,143 +145,6 @@ URP_Lighting_Linux_Vulkan_editmode_mono_Linear_trunk: dependencies: - path: .yamato/_editor_priming.yml#editor:priming:trunk:Linux rerun: on_new_revision -URP_Lighting_Linux_Vulkan_Standalone_mono_Linear_2021.2: - name: URP_Lighting on Linux_Vulkan_Standalone_mono_Linear on version 2021.2 - agent: - type: Unity::VM::GPU - image: package-ci/ubuntu:stable - flavor: b1.large - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - command: chmod +x utr - - command: DISPLAY=:0.0 ./utr --artifacts_path=TestProjects/UniversalGraphicsTest_Lighting/test-results --platform=StandaloneLinux64 --player-connection-ip=auto --player-load-path=players --suite=playmode --timeout=1200 --zero-tests-are-ok=1 - after: - - command: python .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/UniversalGraphicsTest_Lighting/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:Linux - rerun: on_new_revision - - path: .yamato/urp_lighting-linux-vulkan.yml#Build_URP_Lighting_Linux_Vulkan_Standalone_mono_Linear_2021.2 - rerun: on_new_revision -Build_URP_Lighting_Linux_Vulkan_Standalone_mono_Linear_2021.2: - name: Build URP_Lighting on Linux_Vulkan_mono_Linear_Standalone_build_Player on version 2021.2 - agent: - type: Unity::VM - image: package-ci/ubuntu:stable - flavor: b1.xlarge - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - command: chmod +x utr - - command: sudo rm -f /etc/apt/sources.list /etc/apt/sources.list.d/{nodesource,teamviewer,deadsnakes-ubuntu-ppa-}* - - command: curl -L https://artifactory.prd.it.unity3d.com/artifactory/api/gpg/key/public | sudo apt-key add - - - command: sudo sh -c "echo 'deb https://artifactory.prd.it.unity3d.com/artifactory/unity-apt-local bionic main' > /etc/apt/sources.list.d/unity.list" - - command: sudo apt update - - command: sudo apt install unity-downloader-cli - retries: 2 - - command: sudo unity-downloader-cli --source-file unity_revision.txt -c editor -c il2cpp --wait --published-only - retries: 2 - - command: DISPLAY=:0.0 ./utr $CACHE_ARGS --artifacts_path=TestProjects/UniversalGraphicsTest_Lighting/test-results --build-only --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-executemethod" --extra-editor-arg="SetupProject.ApplySettings" --extra-editor-arg="vulkan" --extra-editor-arg="Linear" --extra-editor-arg="-playergraphicsapi=Vulkan" --platform=StandaloneLinux64 --player-save-path=players --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=./TestProjects/UniversalGraphicsTest_Lighting --timeout=3000 - after: - - command: python .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/UniversalGraphicsTest_Lighting/Logs/*.log" - players: - paths: - - "players*/**" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:Linux - rerun: on_new_revision -URP_Lighting_Linux_Vulkan_playmode_mono_Linear_2021.2: - name: URP_Lighting on Linux_Vulkan_playmode_mono_Linear on version 2021.2 - agent: - type: Unity::VM::GPU - image: package-ci/ubuntu:stable - flavor: b1.large - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - command: chmod +x utr - - command: sudo rm -f /etc/apt/sources.list /etc/apt/sources.list.d/{nodesource,teamviewer,deadsnakes-ubuntu-ppa-}* - - command: curl -L https://artifactory.prd.it.unity3d.com/artifactory/api/gpg/key/public | sudo apt-key add - - - command: sudo sh -c "echo 'deb https://artifactory.prd.it.unity3d.com/artifactory/unity-apt-local bionic main' > /etc/apt/sources.list.d/unity.list" - - command: sudo apt update - - command: sudo apt install unity-downloader-cli - retries: 2 - - command: sudo unity-downloader-cli --source-file unity_revision.txt -c editor -c il2cpp --wait --published-only - retries: 2 - - command: DISPLAY=:0.0 ./utr $CACHE_ARGS --artifacts_path=TestProjects/UniversalGraphicsTest_Lighting/test-results --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-force-vulkan" --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=./TestProjects/UniversalGraphicsTest_Lighting --zero-tests-are-ok=1 - after: - - command: python .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/UniversalGraphicsTest_Lighting/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:Linux - rerun: on_new_revision -URP_Lighting_Linux_Vulkan_editmode_mono_Linear_2021.2: - name: URP_Lighting on Linux_Vulkan_editmode_mono_Linear on version 2021.2 - agent: - type: Unity::VM - image: package-ci/ubuntu:stable - flavor: b1.large - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - command: chmod +x utr - - command: sudo rm -f /etc/apt/sources.list /etc/apt/sources.list.d/{nodesource,teamviewer,deadsnakes-ubuntu-ppa-}* - - command: curl -L https://artifactory.prd.it.unity3d.com/artifactory/api/gpg/key/public | sudo apt-key add - - - command: sudo sh -c "echo 'deb https://artifactory.prd.it.unity3d.com/artifactory/unity-apt-local bionic main' > /etc/apt/sources.list.d/unity.list" - - command: sudo apt update - - command: sudo apt install unity-downloader-cli - retries: 2 - - command: sudo unity-downloader-cli --source-file unity_revision.txt -c editor -c il2cpp --wait --published-only - retries: 2 - - command: DISPLAY=:0.0 ./utr --artifacts_path=TestProjects/UniversalGraphicsTest_Lighting/test-results --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-force-vulkan" --extra-editor-arg="-playergraphicsapi=Vulkan" --platform=editmode --scripting-backend=Mono2x --suite=editor --testfilter=$TEST_FILTER --testproject=./TestProjects/UniversalGraphicsTest_Lighting --zero-tests-are-ok=1 - after: - - command: python .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/UniversalGraphicsTest_Lighting/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:Linux - rerun: on_new_revision URP_Lighting_Linux_Vulkan_Standalone_mono_Linear_CUSTOM-REVISION: name: URP_Lighting on Linux_Vulkan_Standalone_mono_Linear on version CUSTOM-REVISION agent: diff --git a/.yamato/urp_lighting-osx-metal.yml b/.yamato/urp_lighting-osx-metal.yml index 94a01b5dedf..723dbba4632 100644 --- a/.yamato/urp_lighting-osx-metal.yml +++ b/.yamato/urp_lighting-osx-metal.yml @@ -4,7 +4,6 @@ # Read more under .yamato/docs/readme.md {% metadata_file .yamato/_cache_config.metafile -%} -{% metadata_file .yamato/_latest_editor_versions_2021.2.metafile -%} {% metadata_file .yamato/_latest_editor_versions_trunk.metafile -%} --- @@ -91,88 +90,6 @@ URP_Lighting_OSX_Metal_playmode_mono_Linear_trunk: dependencies: - path: .yamato/_editor_priming.yml#editor:priming:trunk:OSX rerun: on_new_revision -URP_Lighting_OSX_Metal_Standalone_mono_Linear_2021.2: - name: URP_Lighting on OSX_Metal_Standalone_mono_Linear on version 2021.2 - agent: - type: Unity::metal::macmini - image: slough-ops/macos-10.14-xcode:stable - flavor: m1.mac - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - chmod +x utr - - command: scp -i ~/.ssh/id_rsa_macmini -r $YAMATO_SOURCE_DIR bokken@$BOKKEN_DEVICE_IP:~/Graphics - retries: 2 - - command: scp -i ~/.ssh/id_rsa_macmini ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP:~/.ssh/id_rsa_macmini - retries: 2 - - command: ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP "bash -lc 'pip3 install unity-downloader-cli --user --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade'" - retries: 2 - - command: ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP '$(python3 -m site --user-base)/bin/unity-downloader-cli --source-file ~/Graphics/unity_revision.txt -c editor -c il2cpp --wait --published-only' - retries: 2 - - command: |5- - ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; ~/Graphics/utr $CACHE_ARGS --artifacts_path=/Users/bokken/Graphics/TestProjects/UniversalGraphicsTest_Lighting/test-results --editor-location=.Editor --platform=StandaloneOSX --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=/Users/bokken/Graphics/TestProjects/UniversalGraphicsTest_Lighting --timeout=1200 --zero-tests-are-ok=1 " - UTR_RESULT=$? - mkdir -p TestProjects/UniversalGraphicsTest_Lighting/test-results/ - scp -i ~/.ssh/id_rsa_macmini -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/UniversalGraphicsTest_Lighting/test-results/ TestProjects/UniversalGraphicsTest_Lighting/test-results/ - exit $UTR_RESULT - after: - - command: pip3 install requests --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade - - command: python3 .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/UniversalGraphicsTest_Lighting/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:OSX - rerun: on_new_revision -URP_Lighting_OSX_Metal_playmode_mono_Linear_2021.2: - name: URP_Lighting on OSX_Metal_playmode_mono_Linear on version 2021.2 - agent: - type: Unity::metal::macmini - image: slough-ops/macos-10.14-xcode:stable - flavor: m1.mac - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - chmod +x utr - - command: scp -i ~/.ssh/id_rsa_macmini -r $YAMATO_SOURCE_DIR bokken@$BOKKEN_DEVICE_IP:~/Graphics - retries: 2 - - command: scp -i ~/.ssh/id_rsa_macmini ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP:~/.ssh/id_rsa_macmini - retries: 2 - - command: ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP "bash -lc 'pip3 install unity-downloader-cli --user --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade'" - retries: 2 - - command: ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP '$(python3 -m site --user-base)/bin/unity-downloader-cli --source-file ~/Graphics/unity_revision.txt -c editor -c il2cpp --wait --published-only' - retries: 2 - - command: |5- - ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; ~/Graphics/utr $CACHE_ARGS --artifacts_path=/Users/bokken/Graphics/TestProjects/UniversalGraphicsTest_Lighting/test-results --editor-location=/Users/bokken/.Editor --extra-editor-arg="-colorspace=Linear" --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=/Users/bokken/Graphics/TestProjects/UniversalGraphicsTest_Lighting --zero-tests-are-ok=1 " - UTR_RESULT=$? - mkdir -p TestProjects/UniversalGraphicsTest_Lighting/test-results/ - scp -i ~/.ssh/id_rsa_macmini -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/UniversalGraphicsTest_Lighting/test-results/ TestProjects/UniversalGraphicsTest_Lighting/test-results/ - exit $UTR_RESULT - after: - - command: pip3 install requests --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade - - command: python3 .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/UniversalGraphicsTest_Lighting/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:OSX - rerun: on_new_revision URP_Lighting_OSX_Metal_Standalone_mono_Linear_CUSTOM-REVISION: name: URP_Lighting on OSX_Metal_Standalone_mono_Linear on version CUSTOM-REVISION agent: diff --git a/.yamato/urp_lighting-osx-openglcore.yml b/.yamato/urp_lighting-osx-openglcore.yml index 1a329bb54e4..9c866af953f 100644 --- a/.yamato/urp_lighting-osx-openglcore.yml +++ b/.yamato/urp_lighting-osx-openglcore.yml @@ -4,7 +4,6 @@ # Read more under .yamato/docs/readme.md {% metadata_file .yamato/_cache_config.metafile -%} -{% metadata_file .yamato/_latest_editor_versions_2021.2.metafile -%} {% metadata_file .yamato/_latest_editor_versions_trunk.metafile -%} --- @@ -75,72 +74,6 @@ URP_Lighting_OSX_OpenGLCore_editmode_mono_Linear_trunk: dependencies: - path: .yamato/_editor_priming.yml#editor:priming:trunk:OSX rerun: on_new_revision -URP_Lighting_OSX_OpenGLCore_playmode_mono_Linear_2021.2: - name: URP_Lighting on OSX_OpenGLCore_playmode_mono_Linear on version 2021.2 - agent: - type: Unity::VM::osx - image: graphics-foundation/mac-10.15:v0.1.0-841394 - flavor: m1.mac - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - chmod +x utr - - command: brew tap --force-auto-update unity/unity git@github.cds.internal.unity3d.com:unity/homebrew-unity.git - - command: brew install unity-downloader-cli - retries: 2 - - command: unity-downloader-cli --source-file unity_revision.txt -c editor -c il2cpp --wait --published-only - retries: 2 - - command: ./utr $CACHE_ARGS --artifacts_path=TestProjects/UniversalGraphicsTest_Lighting/test-results --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=./TestProjects/UniversalGraphicsTest_Lighting --zero-tests-are-ok=1 - retries: 2 - after: - - command: python3 .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/UniversalGraphicsTest_Lighting/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:OSX - rerun: on_new_revision -URP_Lighting_OSX_OpenGLCore_editmode_mono_Linear_2021.2: - name: URP_Lighting on OSX_OpenGLCore_editmode_mono_Linear on version 2021.2 - agent: - type: Unity::VM::osx - image: graphics-foundation/mac-10.15:v0.1.0-841394 - flavor: m1.mac - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - chmod +x utr - - command: brew tap --force-auto-update unity/unity git@github.cds.internal.unity3d.com:unity/homebrew-unity.git - - command: brew install unity-downloader-cli - retries: 2 - - command: unity-downloader-cli --source-file unity_revision.txt -c editor -c il2cpp --wait --published-only - retries: 2 - - command: ./utr --artifacts_path=TestProjects/UniversalGraphicsTest_Lighting/test-results --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --platform=editmode --scripting-backend=Mono2x --suite=editor --testfilter=$TEST_FILTER --testproject=./TestProjects/UniversalGraphicsTest_Lighting --zero-tests-are-ok=1 - retries: 2 - after: - - command: python3 .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/UniversalGraphicsTest_Lighting/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:OSX - rerun: on_new_revision URP_Lighting_OSX_OpenGLCore_playmode_mono_Linear_CUSTOM-REVISION: name: URP_Lighting on OSX_OpenGLCore_playmode_mono_Linear on version CUSTOM-REVISION agent: diff --git a/.yamato/urp_lighting-win-dx11.yml b/.yamato/urp_lighting-win-dx11.yml index c1b4e10ed5b..34193e19cc9 100644 --- a/.yamato/urp_lighting-win-dx11.yml +++ b/.yamato/urp_lighting-win-dx11.yml @@ -4,7 +4,6 @@ # Read more under .yamato/docs/readme.md {% metadata_file .yamato/_cache_config.metafile -%} -{% metadata_file .yamato/_latest_editor_versions_2021.2.metafile -%} {% metadata_file .yamato/_latest_editor_versions_trunk.metafile -%} --- @@ -261,258 +260,6 @@ Build_URP_Lighting_Win_DX11_Standalone_XR_mono_Linear_trunk: dependencies: - path: .yamato/_editor_priming.yml#editor:priming:trunk:Win rerun: on_new_revision -URP_Lighting_Win_DX11_Standalone_mono_Linear_2021.2: - name: URP_Lighting on Win_DX11_Standalone_mono_Linear on version 2021.2 - agent: - type: Unity::VM::GPU - image: sdet/gamecode_win10:stable - flavor: b1.xlarge - model: rtx2080 - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: NetSh Advfirewall set allprofiles state off - - cd Tools && powershell -command ". .\Unity.ps1; Set-ScreenResolution -width 1920 -Height 1080" - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr.bat --output utr.bat - retries: 2 - - command: |5- - git rev-parse HEAD | git show -s --format=%%cI > revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= /etc/apt/sources.list.d/unity.list" - - sudo apt update - - sudo apt install -y unity-config - - cd TestProjects/BoatAttack && unity-config project add dependency "com.unity.render-pipelines.core@file:../../../com.unity.render-pipelines.core" --project-path . - - cd TestProjects/BoatAttack && unity-config project add dependency "com.unity.render-pipelines.universal@file:../../../com.unity.render-pipelines.universal" --project-path . - - cd TestProjects/BoatAttack && unity-config project add dependency "com.unity.shadergraph@file:../../../com.unity.shadergraph" --project-path . - - cd TestProjects/BoatAttack && unity-config project add dependency com.unity.addressables@1.16.7 --project-path . - - cd TestProjects/BoatAttack && unity-config project add dependency com.unity.scriptablebuildpipeline@1.11.2 --project-path . - - cd TestProjects/BoatAttack && unity-config project add dependency com.unity.test-framework@1.1.18 --project-path . - - cd TestProjects/BoatAttack && unity-config project add dependency com.unity.test-framework.performance@2.4.0 --project-path . - - cd TestProjects/BoatAttack && unity-config project add dependency com.unity.test-framework.utp-reporter@1.0.2-preview --project-path . - - cd TestProjects/BoatAttack && unity-config project add dependency com.unity.test-framework.build@0.0.1-preview.12 --project-path . - - cd TestProjects/BoatAttack && unity-config project add dependency "com.unity.testing.graphics-performance@ssh://git@github.cds.internal.unity3d.com/unity/com.unity.testing.graphics-performance.git" --project-path . - - cd TestProjects/BoatAttack && unity-config project add dependency "unity.graphictests.performance.universal@ssh://git@github.cds.internal.unity3d.com/unity/unity.graphictests.performance.universal.git" --project-path . - - cd TestProjects/BoatAttack && unity-config project add testable com.unity.cli-project-setup --project-path . - - cd TestProjects/BoatAttack && unity-config project add testable com.unity.test.performance.runtimesettings --project-path . - - cd TestProjects/BoatAttack && unity-config project add testable com.unity.test.metadata-manager --project-path . - - cd TestProjects/BoatAttack && unity-config project add testable com.unity.testing.graphics-performance --project-path . - - cd TestProjects/BoatAttack && unity-config project add testable com.unity.render-pipelines.core --project-path . - - cd TestProjects/BoatAttack && unity-config project add testable unity.graphictests.performance.universal --project-path . - - cd TestProjects/BoatAttack && unity-config project set project-update false --project-path . - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - command: chmod +x utr - - command: sudo rm -f /etc/apt/sources.list /etc/apt/sources.list.d/{nodesource,teamviewer,deadsnakes-ubuntu-ppa-}* - - command: curl -L https://artifactory.prd.it.unity3d.com/artifactory/api/gpg/key/public | sudo apt-key add - - - command: sudo sh -c "echo 'deb https://artifactory.prd.it.unity3d.com/artifactory/unity-apt-local bionic main' > /etc/apt/sources.list.d/unity.list" - - command: sudo apt update - - command: sudo apt install unity-downloader-cli - retries: 2 - - command: sudo unity-downloader-cli --source-file unity_revision.txt -c editor -c il2cpp --wait --published-only - retries: 2 - - command: DISPLAY=:0.0 ./utr --artifacts_path=TestProjects/BoatAttack/test-results --build-only --category=URP --editor-location=.Editor --extra-editor-arg="-addscenetobuild=Assets/scenes/Testing/benchmark_island-static.unity" --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-executemethod" --extra-editor-arg="Editor.Setup" --extra-editor-arg="-packageundertestbranch=$GIT_BRANCH" --extra-editor-arg="-packageundertestname=com.unity.render-pipelines.universal" --extra-editor-arg="-packageundertestrev=$GIT_REVISION" --extra-editor-arg="-packageundertestrevdate=$GIT_REVISIONDATE" --extra-editor-arg="-playergraphicsapi=Vulkan" --extra-editor-arg="-scriptingbackend=Mono2x" --platform=StandaloneLinux64 --player-save-path=playersLow --scripting-backend=Mono2x --suite=playmode --testfilter=Low --testproject=./TestProjects/BoatAttack --timeout=1200 - - command: DISPLAY=:0.0 ./utr --artifacts_path=TestProjects/BoatAttack/test-results --build-only --category=URP --editor-location=.Editor --extra-editor-arg="-addscenetobuild=Assets/scenes/Testing/benchmark_island-static.unity" --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-executemethod" --extra-editor-arg="Editor.Setup" --extra-editor-arg="-packageundertestbranch=$GIT_BRANCH" --extra-editor-arg="-packageundertestname=com.unity.render-pipelines.universal" --extra-editor-arg="-packageundertestrev=$GIT_REVISION" --extra-editor-arg="-packageundertestrevdate=$GIT_REVISIONDATE" --extra-editor-arg="-playergraphicsapi=Vulkan" --extra-editor-arg="-scriptingbackend=Mono2x" --platform=StandaloneLinux64 --player-save-path=playersMedium --scripting-backend=Mono2x --suite=playmode --testfilter=Medium --testproject=./TestProjects/BoatAttack --timeout=1200 - - command: DISPLAY=:0.0 ./utr --artifacts_path=TestProjects/BoatAttack/test-results --build-only --category=URP --editor-location=.Editor --extra-editor-arg="-addscenetobuild=Assets/scenes/Testing/benchmark_island-static.unity" --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-executemethod" --extra-editor-arg="Editor.Setup" --extra-editor-arg="-packageundertestbranch=$GIT_BRANCH" --extra-editor-arg="-packageundertestname=com.unity.render-pipelines.universal" --extra-editor-arg="-packageundertestrev=$GIT_REVISION" --extra-editor-arg="-packageundertestrevdate=$GIT_REVISIONDATE" --extra-editor-arg="-playergraphicsapi=Vulkan" --extra-editor-arg="-scriptingbackend=Mono2x" --platform=StandaloneLinux64 --player-save-path=playersHigh --scripting-backend=Mono2x --suite=playmode --testfilter=High --testproject=./TestProjects/BoatAttack --timeout=1200 - after: - - command: python .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/BoatAttack/Logs/*.log" - players: - paths: - - "players*/**" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:Linux - rerun: on_new_revision -URP_Performance_BoatAttack_Linux_Vulkan_performance_playmode_editor_mono_Linear_2021.2: - name: URP_Performance_BoatAttack on Linux_Vulkan_performance_playmode_editor_mono_Linear on version 2021.2 - agent: - type: Unity::VM::GPU - image: package-ci/ubuntu:stable - flavor: b1.large - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - BOAT_ATTACK_BRANCH: master - BOAT_ATTACK_REVISION: ca18e346b30b365e90d1a9a149d07abfb15ac2a2 - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: git clone https://github.com/Unity-Technologies/BoatAttack.git -b $BOAT_ATTACK_BRANCH TestProjects/BoatAttack - retries: 3 - - cd TestProjects/BoatAttack && git checkout $BOAT_ATTACK_REVISION - - sudo rm -f /etc/apt/sources.list /etc/apt/sources.list.d/{nodesource,teamviewer,deadsnakes-ubuntu-ppa-}* - - curl -L https://artifactory.prd.it.unity3d.com/artifactory/api/gpg/key/public | sudo apt-key add - - - sudo sh -c "echo 'deb https://artifactory.prd.it.unity3d.com/artifactory/unity-apt-local bionic main' > /etc/apt/sources.list.d/unity.list" - - sudo apt update - - sudo apt install -y unity-config - - cd TestProjects/BoatAttack && unity-config project add dependency "com.unity.render-pipelines.core@file:../../../com.unity.render-pipelines.core" --project-path . - - cd TestProjects/BoatAttack && unity-config project add dependency "com.unity.render-pipelines.universal@file:../../../com.unity.render-pipelines.universal" --project-path . - - cd TestProjects/BoatAttack && unity-config project add dependency "com.unity.shadergraph@file:../../../com.unity.shadergraph" --project-path . - - cd TestProjects/BoatAttack && unity-config project add dependency com.unity.addressables@1.16.7 --project-path . - - cd TestProjects/BoatAttack && unity-config project add dependency com.unity.scriptablebuildpipeline@1.11.2 --project-path . - - cd TestProjects/BoatAttack && unity-config project add dependency com.unity.test-framework@1.1.18 --project-path . - - cd TestProjects/BoatAttack && unity-config project add dependency com.unity.test-framework.performance@2.4.0 --project-path . - - cd TestProjects/BoatAttack && unity-config project add dependency com.unity.test-framework.utp-reporter@1.0.2-preview --project-path . - - cd TestProjects/BoatAttack && unity-config project add dependency com.unity.test-framework.build@0.0.1-preview.12 --project-path . - - cd TestProjects/BoatAttack && unity-config project add dependency "com.unity.testing.graphics-performance@ssh://git@github.cds.internal.unity3d.com/unity/com.unity.testing.graphics-performance.git" --project-path . - - cd TestProjects/BoatAttack && unity-config project add dependency "unity.graphictests.performance.universal@ssh://git@github.cds.internal.unity3d.com/unity/unity.graphictests.performance.universal.git" --project-path . - - cd TestProjects/BoatAttack && unity-config project add testable com.unity.cli-project-setup --project-path . - - cd TestProjects/BoatAttack && unity-config project add testable com.unity.test.performance.runtimesettings --project-path . - - cd TestProjects/BoatAttack && unity-config project add testable com.unity.test.metadata-manager --project-path . - - cd TestProjects/BoatAttack && unity-config project add testable com.unity.testing.graphics-performance --project-path . - - cd TestProjects/BoatAttack && unity-config project add testable com.unity.render-pipelines.core --project-path . - - cd TestProjects/BoatAttack && unity-config project add testable unity.graphictests.performance.universal --project-path . - - cd TestProjects/BoatAttack && unity-config project set project-update false --project-path . - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - command: chmod +x utr - - command: sudo rm -f /etc/apt/sources.list /etc/apt/sources.list.d/{nodesource,teamviewer,deadsnakes-ubuntu-ppa-}* - - command: curl -L https://artifactory.prd.it.unity3d.com/artifactory/api/gpg/key/public | sudo apt-key add - - - command: sudo sh -c "echo 'deb https://artifactory.prd.it.unity3d.com/artifactory/unity-apt-local bionic main' > /etc/apt/sources.list.d/unity.list" - - command: sudo apt update - - command: sudo apt install unity-downloader-cli - retries: 2 - - command: sudo unity-downloader-cli --source-file unity_revision.txt -c editor -c il2cpp --wait --published-only - retries: 2 - - command: DISPLAY=:0.0 ./utr --artifacts_path=TestProjects/BoatAttack/test-results --category=URP --editor-location=.Editor --extra-editor-arg="-addscenetobuild=Assets/scenes/Testing/benchmark_island-static.unity" --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-executemethod" --extra-editor-arg="Editor.Setup" --extra-editor-arg="-force-vulkan" --extra-editor-arg="-packageundertestbranch=$GIT_BRANCH" --extra-editor-arg="-packageundertestname=com.unity.render-pipelines.universal" --extra-editor-arg="-packageundertestrev=$GIT_REVISION" --extra-editor-arg="-packageundertestrevdate=$GIT_REVISIONDATE" --extra-editor-arg="-scriptingbackend=Mono2x" --performance-project-id=BoatAttack --report-performance-data --scripting-backend=Mono2x --suite=playmode --testfilter=Low --testproject=./TestProjects/BoatAttack --zero-tests-are-ok=1 - - command: DISPLAY=:0.0 ./utr --artifacts_path=TestProjects/BoatAttack/test-results --category=URP --editor-location=.Editor --extra-editor-arg="-addscenetobuild=Assets/scenes/Testing/benchmark_island-static.unity" --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-executemethod" --extra-editor-arg="Editor.Setup" --extra-editor-arg="-force-vulkan" --extra-editor-arg="-packageundertestbranch=$GIT_BRANCH" --extra-editor-arg="-packageundertestname=com.unity.render-pipelines.universal" --extra-editor-arg="-packageundertestrev=$GIT_REVISION" --extra-editor-arg="-packageundertestrevdate=$GIT_REVISIONDATE" --extra-editor-arg="-scriptingbackend=Mono2x" --performance-project-id=BoatAttack --report-performance-data --scripting-backend=Mono2x --suite=playmode --testfilter=Medium --testproject=./TestProjects/BoatAttack --zero-tests-are-ok=1 - after: - - command: python .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/BoatAttack/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:Linux - rerun: on_new_revision -URP_Performance_BoatAttack_Linux_Vulkan_performance_build_editmode_mono_Linear_2021.2: - name: URP_Performance_BoatAttack on Linux_Vulkan_performance_build_editmode_mono_Linear on version 2021.2 - agent: - type: Unity::VM::GPU - image: package-ci/ubuntu:stable - flavor: b1.large - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - BOAT_ATTACK_BRANCH: master - BOAT_ATTACK_REVISION: ca18e346b30b365e90d1a9a149d07abfb15ac2a2 - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: git clone https://github.com/Unity-Technologies/BoatAttack.git -b $BOAT_ATTACK_BRANCH TestProjects/BoatAttack - retries: 3 - - cd TestProjects/BoatAttack && git checkout $BOAT_ATTACK_REVISION - - sudo rm -f /etc/apt/sources.list /etc/apt/sources.list.d/{nodesource,teamviewer,deadsnakes-ubuntu-ppa-}* - - curl -L https://artifactory.prd.it.unity3d.com/artifactory/api/gpg/key/public | sudo apt-key add - - - sudo sh -c "echo 'deb https://artifactory.prd.it.unity3d.com/artifactory/unity-apt-local bionic main' > /etc/apt/sources.list.d/unity.list" - - sudo apt update - - sudo apt install -y unity-config - - cd TestProjects/BoatAttack && unity-config project add dependency "com.unity.render-pipelines.core@file:../../../com.unity.render-pipelines.core" --project-path . - - cd TestProjects/BoatAttack && unity-config project add dependency "com.unity.render-pipelines.universal@file:../../../com.unity.render-pipelines.universal" --project-path . - - cd TestProjects/BoatAttack && unity-config project add dependency "com.unity.shadergraph@file:../../../com.unity.shadergraph" --project-path . - - cd TestProjects/BoatAttack && unity-config project add dependency com.unity.addressables@1.16.7 --project-path . - - cd TestProjects/BoatAttack && unity-config project add dependency com.unity.scriptablebuildpipeline@1.11.2 --project-path . - - cd TestProjects/BoatAttack && unity-config project add dependency com.unity.test-framework@1.1.18 --project-path . - - cd TestProjects/BoatAttack && unity-config project add dependency com.unity.test-framework.performance@2.4.0 --project-path . - - cd TestProjects/BoatAttack && unity-config project add dependency com.unity.test-framework.utp-reporter@1.0.2-preview --project-path . - - cd TestProjects/BoatAttack && unity-config project add dependency com.unity.test-framework.build@0.0.1-preview.12 --project-path . - - cd TestProjects/BoatAttack && unity-config project add dependency "com.unity.testing.graphics-performance@ssh://git@github.cds.internal.unity3d.com/unity/com.unity.testing.graphics-performance.git" --project-path . - - cd TestProjects/BoatAttack && unity-config project add dependency "unity.graphictests.performance.universal@ssh://git@github.cds.internal.unity3d.com/unity/unity.graphictests.performance.universal.git" --project-path . - - cd TestProjects/BoatAttack && unity-config project add testable com.unity.cli-project-setup --project-path . - - cd TestProjects/BoatAttack && unity-config project add testable com.unity.test.performance.runtimesettings --project-path . - - cd TestProjects/BoatAttack && unity-config project add testable com.unity.test.metadata-manager --project-path . - - cd TestProjects/BoatAttack && unity-config project add testable com.unity.testing.graphics-performance --project-path . - - cd TestProjects/BoatAttack && unity-config project add testable com.unity.render-pipelines.core --project-path . - - cd TestProjects/BoatAttack && unity-config project add testable unity.graphictests.performance.universal --project-path . - - cd TestProjects/BoatAttack && unity-config project set project-update false --project-path . - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - command: chmod +x utr - - command: sudo rm -f /etc/apt/sources.list /etc/apt/sources.list.d/{nodesource,teamviewer,deadsnakes-ubuntu-ppa-}* - - command: curl -L https://artifactory.prd.it.unity3d.com/artifactory/api/gpg/key/public | sudo apt-key add - - - command: sudo sh -c "echo 'deb https://artifactory.prd.it.unity3d.com/artifactory/unity-apt-local bionic main' > /etc/apt/sources.list.d/unity.list" - - command: sudo apt update - - command: sudo apt install unity-downloader-cli - retries: 2 - - command: sudo unity-downloader-cli --source-file unity_revision.txt -c editor -c il2cpp --wait --published-only - retries: 2 - - command: DISPLAY=:0.0 ./utr --artifacts_path=TestProjects/BoatAttack/test-results --category=URP --editor-location=.Editor --extra-editor-arg="-addscenetobuild=Assets/scenes/Testing/benchmark_island-static.unity" --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-executemethod" --extra-editor-arg="Editor.Setup" --extra-editor-arg="-force-vulkan" --extra-editor-arg="-packageundertestbranch=$GIT_BRANCH" --extra-editor-arg="-packageundertestname=com.unity.render-pipelines.universal" --extra-editor-arg="-packageundertestrev=$GIT_REVISION" --extra-editor-arg="-packageundertestrevdate=$GIT_REVISIONDATE" --extra-editor-arg="-playergraphicsapi=Vulkan" --extra-editor-arg="-scriptingbackend=Mono2x" --performance-project-id=BoatAttack --platform=editmode --report-performance-data --scripting-backend=Mono2x --suite=editor --testfilter=Low --testproject=./TestProjects/BoatAttack --zero-tests-are-ok=1 - - command: DISPLAY=:0.0 ./utr --artifacts_path=TestProjects/BoatAttack/test-results --category=URP --editor-location=.Editor --extra-editor-arg="-addscenetobuild=Assets/scenes/Testing/benchmark_island-static.unity" --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-executemethod" --extra-editor-arg="Editor.Setup" --extra-editor-arg="-force-vulkan" --extra-editor-arg="-packageundertestbranch=$GIT_BRANCH" --extra-editor-arg="-packageundertestname=com.unity.render-pipelines.universal" --extra-editor-arg="-packageundertestrev=$GIT_REVISION" --extra-editor-arg="-packageundertestrevdate=$GIT_REVISIONDATE" --extra-editor-arg="-playergraphicsapi=Vulkan" --extra-editor-arg="-scriptingbackend=Mono2x" --performance-project-id=BoatAttack --platform=editmode --report-performance-data --scripting-backend=Mono2x --suite=editor --testfilter=Medium --testproject=./TestProjects/BoatAttack --zero-tests-are-ok=1 - after: - - command: python .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/BoatAttack/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:Linux - rerun: on_new_revision URP_Performance_BoatAttack_Linux_Vulkan_performance_playmode_runtime_mono_Linear_CUSTOM-REVISION: name: URP_Performance_BoatAttack on Linux_Vulkan_performance_playmode_runtime_mono_Linear on version CUSTOM-REVISION agent: diff --git a/.yamato/urp_performance_boatattack-osx-metal.yml b/.yamato/urp_performance_boatattack-osx-metal.yml index 72fadd1b41c..45a249fca72 100644 --- a/.yamato/urp_performance_boatattack-osx-metal.yml +++ b/.yamato/urp_performance_boatattack-osx-metal.yml @@ -4,7 +4,6 @@ # Read more under .yamato/docs/readme.md {% metadata_file .yamato/_cache_config.metafile -%} -{% metadata_file .yamato/_latest_editor_versions_2021.2.metafile -%} {% metadata_file .yamato/_latest_editor_versions_trunk.metafile -%} --- @@ -231,228 +230,6 @@ URP_Performance_BoatAttack_OSX_Metal_performance_build_editmode_mono_Linear_trun dependencies: - path: .yamato/_editor_priming.yml#editor:priming:trunk:OSX rerun: on_new_revision -URP_Performance_BoatAttack_OSX_Metal_performance_playmode_runtime_mono_Linear_2021.2: - name: URP_Performance_BoatAttack on OSX_Metal_performance_playmode_runtime_mono_Linear on version 2021.2 - agent: - type: Unity::metal::macmini - image: slough-ops/macos-10.14-xcode:stable - flavor: m1.mac - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - BOAT_ATTACK_BRANCH: master - BOAT_ATTACK_REVISION: ca18e346b30b365e90d1a9a149d07abfb15ac2a2 - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: git clone https://github.com/Unity-Technologies/BoatAttack.git -b $BOAT_ATTACK_BRANCH TestProjects/BoatAttack - retries: 3 - - cd TestProjects/BoatAttack && git checkout $BOAT_ATTACK_REVISION - - brew tap --force-auto-update unity/unity git@github.cds.internal.unity3d.com:unity/homebrew-unity.git - - brew install unity-config - - cd TestProjects/BoatAttack && unity-config project add dependency "com.unity.render-pipelines.core@file:../../../com.unity.render-pipelines.core" --project-path . - - cd TestProjects/BoatAttack && unity-config project add dependency "com.unity.render-pipelines.universal@file:../../../com.unity.render-pipelines.universal" --project-path . - - cd TestProjects/BoatAttack && unity-config project add dependency "com.unity.shadergraph@file:../../../com.unity.shadergraph" --project-path . - - cd TestProjects/BoatAttack && unity-config project add dependency com.unity.addressables@1.16.7 --project-path . - - cd TestProjects/BoatAttack && unity-config project add dependency com.unity.scriptablebuildpipeline@1.11.2 --project-path . - - cd TestProjects/BoatAttack && unity-config project add dependency com.unity.test-framework@1.1.18 --project-path . - - cd TestProjects/BoatAttack && unity-config project add dependency com.unity.test-framework.performance@2.4.0 --project-path . - - cd TestProjects/BoatAttack && unity-config project add dependency com.unity.test-framework.utp-reporter@1.0.2-preview --project-path . - - cd TestProjects/BoatAttack && unity-config project add dependency com.unity.test-framework.build@0.0.1-preview.12 --project-path . - - cd TestProjects/BoatAttack && unity-config project add dependency "com.unity.testing.graphics-performance@ssh://git@github.cds.internal.unity3d.com/unity/com.unity.testing.graphics-performance.git" --project-path . - - cd TestProjects/BoatAttack && unity-config project add dependency "unity.graphictests.performance.universal@ssh://git@github.cds.internal.unity3d.com/unity/unity.graphictests.performance.universal.git" --project-path . - - cd TestProjects/BoatAttack && unity-config project add testable com.unity.cli-project-setup --project-path . - - cd TestProjects/BoatAttack && unity-config project add testable com.unity.test.performance.runtimesettings --project-path . - - cd TestProjects/BoatAttack && unity-config project add testable com.unity.test.metadata-manager --project-path . - - cd TestProjects/BoatAttack && unity-config project add testable com.unity.testing.graphics-performance --project-path . - - cd TestProjects/BoatAttack && unity-config project add testable com.unity.render-pipelines.core --project-path . - - cd TestProjects/BoatAttack && unity-config project add testable unity.graphictests.performance.universal --project-path . - - cd TestProjects/BoatAttack && unity-config project set project-update false --project-path . - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - chmod +x utr - - command: scp -i ~/.ssh/id_rsa_macmini -r $YAMATO_SOURCE_DIR bokken@$BOKKEN_DEVICE_IP:~/Graphics - retries: 2 - - command: scp -i ~/.ssh/id_rsa_macmini ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP:~/.ssh/id_rsa_macmini - retries: 2 - - command: ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP "bash -lc 'pip3 install unity-downloader-cli --user --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade'" - retries: 2 - - command: ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP '$(python3 -m site --user-base)/bin/unity-downloader-cli --source-file ~/Graphics/unity_revision.txt -c editor -c il2cpp --wait --published-only' - retries: 2 - - command: |5- - ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; ~/Graphics/utr --artifacts_path=/Users/bokken/Graphics/TestProjects/BoatAttack/test-results --category=URP --editor-location=.Editor --extra-editor-arg="-addscenetobuild=Assets/scenes/Testing/benchmark_island-static.unity" --extra-editor-arg="-executemethod" --extra-editor-arg="Editor.Setup" --extra-editor-arg="-packageundertestbranch=$GIT_BRANCH" --extra-editor-arg="-packageundertestname=com.unity.render-pipelines.universal" --extra-editor-arg="-packageundertestrev=$GIT_REVISION" --extra-editor-arg="-packageundertestrevdate=$GIT_REVISIONDATE" --extra-editor-arg="-scriptingbackend=Mono2x" --performance-project-id=BoatAttack --platform=StandaloneOSX --report-performance-data --scripting-backend=Mono2x --suite=playmode --testfilter=Low --testproject=/Users/bokken/Graphics/TestProjects/BoatAttack --timeout=1200 --zero-tests-are-ok=1 " - UTR_RESULT=$? - mkdir -p TestProjects/BoatAttack/test-results/ - scp -i ~/.ssh/id_rsa_macmini -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/BoatAttack/test-results/ TestProjects/BoatAttack/test-results/ - exit $UTR_RESULT - - command: |5- - ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; ~/Graphics/utr --artifacts_path=/Users/bokken/Graphics/TestProjects/BoatAttack/test-results --category=URP --editor-location=.Editor --extra-editor-arg="-addscenetobuild=Assets/scenes/Testing/benchmark_island-static.unity" --extra-editor-arg="-executemethod" --extra-editor-arg="Editor.Setup" --extra-editor-arg="-packageundertestbranch=$GIT_BRANCH" --extra-editor-arg="-packageundertestname=com.unity.render-pipelines.universal" --extra-editor-arg="-packageundertestrev=$GIT_REVISION" --extra-editor-arg="-packageundertestrevdate=$GIT_REVISIONDATE" --extra-editor-arg="-scriptingbackend=Mono2x" --performance-project-id=BoatAttack --platform=StandaloneOSX --report-performance-data --scripting-backend=Mono2x --suite=playmode --testfilter=Medium --testproject=/Users/bokken/Graphics/TestProjects/BoatAttack --timeout=1200 --zero-tests-are-ok=1 " - UTR_RESULT=$? - mkdir -p TestProjects/BoatAttack/test-results/ - scp -i ~/.ssh/id_rsa_macmini -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/BoatAttack/test-results/ TestProjects/BoatAttack/test-results/ - exit $UTR_RESULT - - command: |5- - ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; ~/Graphics/utr --artifacts_path=/Users/bokken/Graphics/TestProjects/BoatAttack/test-results --category=URP --editor-location=.Editor --extra-editor-arg="-addscenetobuild=Assets/scenes/Testing/benchmark_island-static.unity" --extra-editor-arg="-executemethod" --extra-editor-arg="Editor.Setup" --extra-editor-arg="-packageundertestbranch=$GIT_BRANCH" --extra-editor-arg="-packageundertestname=com.unity.render-pipelines.universal" --extra-editor-arg="-packageundertestrev=$GIT_REVISION" --extra-editor-arg="-packageundertestrevdate=$GIT_REVISIONDATE" --extra-editor-arg="-scriptingbackend=Mono2x" --performance-project-id=BoatAttack --platform=StandaloneOSX --report-performance-data --scripting-backend=Mono2x --suite=playmode --testfilter=High --testproject=/Users/bokken/Graphics/TestProjects/BoatAttack --timeout=1200 --zero-tests-are-ok=1 " - UTR_RESULT=$? - mkdir -p TestProjects/BoatAttack/test-results/ - scp -i ~/.ssh/id_rsa_macmini -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/BoatAttack/test-results/ TestProjects/BoatAttack/test-results/ - exit $UTR_RESULT - after: - - command: pip3 install requests --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade - - command: python3 .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/BoatAttack/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:OSX - rerun: on_new_revision -URP_Performance_BoatAttack_OSX_Metal_performance_playmode_editor_mono_Linear_2021.2: - name: URP_Performance_BoatAttack on OSX_Metal_performance_playmode_editor_mono_Linear on version 2021.2 - agent: - type: Unity::metal::macmini - image: slough-ops/macos-10.14-xcode:stable - flavor: m1.mac - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - BOAT_ATTACK_BRANCH: master - BOAT_ATTACK_REVISION: ca18e346b30b365e90d1a9a149d07abfb15ac2a2 - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: git clone https://github.com/Unity-Technologies/BoatAttack.git -b $BOAT_ATTACK_BRANCH TestProjects/BoatAttack - retries: 3 - - cd TestProjects/BoatAttack && git checkout $BOAT_ATTACK_REVISION - - brew tap --force-auto-update unity/unity git@github.cds.internal.unity3d.com:unity/homebrew-unity.git - - brew install unity-config - - cd TestProjects/BoatAttack && unity-config project add dependency "com.unity.render-pipelines.core@file:../../../com.unity.render-pipelines.core" --project-path . - - cd TestProjects/BoatAttack && unity-config project add dependency "com.unity.render-pipelines.universal@file:../../../com.unity.render-pipelines.universal" --project-path . - - cd TestProjects/BoatAttack && unity-config project add dependency "com.unity.shadergraph@file:../../../com.unity.shadergraph" --project-path . - - cd TestProjects/BoatAttack && unity-config project add dependency com.unity.addressables@1.16.7 --project-path . - - cd TestProjects/BoatAttack && unity-config project add dependency com.unity.scriptablebuildpipeline@1.11.2 --project-path . - - cd TestProjects/BoatAttack && unity-config project add dependency com.unity.test-framework@1.1.18 --project-path . - - cd TestProjects/BoatAttack && unity-config project add dependency com.unity.test-framework.performance@2.4.0 --project-path . - - cd TestProjects/BoatAttack && unity-config project add dependency com.unity.test-framework.utp-reporter@1.0.2-preview --project-path . - - cd TestProjects/BoatAttack && unity-config project add dependency com.unity.test-framework.build@0.0.1-preview.12 --project-path . - - cd TestProjects/BoatAttack && unity-config project add dependency "com.unity.testing.graphics-performance@ssh://git@github.cds.internal.unity3d.com/unity/com.unity.testing.graphics-performance.git" --project-path . - - cd TestProjects/BoatAttack && unity-config project add dependency "unity.graphictests.performance.universal@ssh://git@github.cds.internal.unity3d.com/unity/unity.graphictests.performance.universal.git" --project-path . - - cd TestProjects/BoatAttack && unity-config project add testable com.unity.cli-project-setup --project-path . - - cd TestProjects/BoatAttack && unity-config project add testable com.unity.test.performance.runtimesettings --project-path . - - cd TestProjects/BoatAttack && unity-config project add testable com.unity.test.metadata-manager --project-path . - - cd TestProjects/BoatAttack && unity-config project add testable com.unity.testing.graphics-performance --project-path . - - cd TestProjects/BoatAttack && unity-config project add testable com.unity.render-pipelines.core --project-path . - - cd TestProjects/BoatAttack && unity-config project add testable unity.graphictests.performance.universal --project-path . - - cd TestProjects/BoatAttack && unity-config project set project-update false --project-path . - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - chmod +x utr - - command: scp -i ~/.ssh/id_rsa_macmini -r $YAMATO_SOURCE_DIR bokken@$BOKKEN_DEVICE_IP:~/Graphics - retries: 2 - - command: scp -i ~/.ssh/id_rsa_macmini ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP:~/.ssh/id_rsa_macmini - retries: 2 - - command: ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP "bash -lc 'pip3 install unity-downloader-cli --user --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade'" - retries: 2 - - command: ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP '$(python3 -m site --user-base)/bin/unity-downloader-cli --source-file ~/Graphics/unity_revision.txt -c editor -c il2cpp --wait --published-only' - retries: 2 - - command: |5- - ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; ~/Graphics/utr --artifacts_path=/Users/bokken/Graphics/TestProjects/BoatAttack/test-results --category=URP --editor-location=/Users/bokken/.Editor --extra-editor-arg="-addscenetobuild=Assets/scenes/Testing/benchmark_island-static.unity" --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-executemethod" --extra-editor-arg="Editor.Setup" --extra-editor-arg="-packageundertestbranch=$GIT_BRANCH" --extra-editor-arg="-packageundertestname=com.unity.render-pipelines.universal" --extra-editor-arg="-packageundertestrev=$GIT_REVISION" --extra-editor-arg="-packageundertestrevdate=$GIT_REVISIONDATE" --extra-editor-arg="-scriptingbackend=Mono2x" --performance-project-id=BoatAttack --report-performance-data --scripting-backend=Mono2x --suite=playmode --testfilter=Low --testproject=/Users/bokken/Graphics/TestProjects/BoatAttack --zero-tests-are-ok=1 " - UTR_RESULT=$? - mkdir -p TestProjects/BoatAttack/test-results/ - scp -i ~/.ssh/id_rsa_macmini -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/BoatAttack/test-results/ TestProjects/BoatAttack/test-results/ - exit $UTR_RESULT - - command: |5- - ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; ~/Graphics/utr --artifacts_path=/Users/bokken/Graphics/TestProjects/BoatAttack/test-results --category=URP --editor-location=/Users/bokken/.Editor --extra-editor-arg="-addscenetobuild=Assets/scenes/Testing/benchmark_island-static.unity" --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-executemethod" --extra-editor-arg="Editor.Setup" --extra-editor-arg="-packageundertestbranch=$GIT_BRANCH" --extra-editor-arg="-packageundertestname=com.unity.render-pipelines.universal" --extra-editor-arg="-packageundertestrev=$GIT_REVISION" --extra-editor-arg="-packageundertestrevdate=$GIT_REVISIONDATE" --extra-editor-arg="-scriptingbackend=Mono2x" --performance-project-id=BoatAttack --report-performance-data --scripting-backend=Mono2x --suite=playmode --testfilter=Medium --testproject=/Users/bokken/Graphics/TestProjects/BoatAttack --zero-tests-are-ok=1 " - UTR_RESULT=$? - mkdir -p TestProjects/BoatAttack/test-results/ - scp -i ~/.ssh/id_rsa_macmini -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/BoatAttack/test-results/ TestProjects/BoatAttack/test-results/ - exit $UTR_RESULT - after: - - command: pip3 install requests --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade - - command: python3 .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/BoatAttack/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:OSX - rerun: on_new_revision -URP_Performance_BoatAttack_OSX_Metal_performance_build_editmode_mono_Linear_2021.2: - name: URP_Performance_BoatAttack on OSX_Metal_performance_build_editmode_mono_Linear on version 2021.2 - agent: - type: Unity::metal::macmini - image: slough-ops/macos-10.14-xcode:stable - flavor: m1.mac - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - BOAT_ATTACK_BRANCH: master - BOAT_ATTACK_REVISION: ca18e346b30b365e90d1a9a149d07abfb15ac2a2 - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: git clone https://github.com/Unity-Technologies/BoatAttack.git -b $BOAT_ATTACK_BRANCH TestProjects/BoatAttack - retries: 3 - - cd TestProjects/BoatAttack && git checkout $BOAT_ATTACK_REVISION - - brew tap --force-auto-update unity/unity git@github.cds.internal.unity3d.com:unity/homebrew-unity.git - - brew install unity-config - - cd TestProjects/BoatAttack && unity-config project add dependency "com.unity.render-pipelines.core@file:../../../com.unity.render-pipelines.core" --project-path . - - cd TestProjects/BoatAttack && unity-config project add dependency "com.unity.render-pipelines.universal@file:../../../com.unity.render-pipelines.universal" --project-path . - - cd TestProjects/BoatAttack && unity-config project add dependency "com.unity.shadergraph@file:../../../com.unity.shadergraph" --project-path . - - cd TestProjects/BoatAttack && unity-config project add dependency com.unity.addressables@1.16.7 --project-path . - - cd TestProjects/BoatAttack && unity-config project add dependency com.unity.scriptablebuildpipeline@1.11.2 --project-path . - - cd TestProjects/BoatAttack && unity-config project add dependency com.unity.test-framework@1.1.18 --project-path . - - cd TestProjects/BoatAttack && unity-config project add dependency com.unity.test-framework.performance@2.4.0 --project-path . - - cd TestProjects/BoatAttack && unity-config project add dependency com.unity.test-framework.utp-reporter@1.0.2-preview --project-path . - - cd TestProjects/BoatAttack && unity-config project add dependency com.unity.test-framework.build@0.0.1-preview.12 --project-path . - - cd TestProjects/BoatAttack && unity-config project add dependency "com.unity.testing.graphics-performance@ssh://git@github.cds.internal.unity3d.com/unity/com.unity.testing.graphics-performance.git" --project-path . - - cd TestProjects/BoatAttack && unity-config project add dependency "unity.graphictests.performance.universal@ssh://git@github.cds.internal.unity3d.com/unity/unity.graphictests.performance.universal.git" --project-path . - - cd TestProjects/BoatAttack && unity-config project add testable com.unity.cli-project-setup --project-path . - - cd TestProjects/BoatAttack && unity-config project add testable com.unity.test.performance.runtimesettings --project-path . - - cd TestProjects/BoatAttack && unity-config project add testable com.unity.test.metadata-manager --project-path . - - cd TestProjects/BoatAttack && unity-config project add testable com.unity.testing.graphics-performance --project-path . - - cd TestProjects/BoatAttack && unity-config project add testable com.unity.render-pipelines.core --project-path . - - cd TestProjects/BoatAttack && unity-config project add testable unity.graphictests.performance.universal --project-path . - - cd TestProjects/BoatAttack && unity-config project set project-update false --project-path . - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - chmod +x utr - - command: scp -i ~/.ssh/id_rsa_macmini -r $YAMATO_SOURCE_DIR bokken@$BOKKEN_DEVICE_IP:~/Graphics - retries: 2 - - command: scp -i ~/.ssh/id_rsa_macmini ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP:~/.ssh/id_rsa_macmini - retries: 2 - - command: ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP "bash -lc 'pip3 install unity-downloader-cli --user --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade'" - retries: 2 - - command: ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP '$(python3 -m site --user-base)/bin/unity-downloader-cli --source-file ~/Graphics/unity_revision.txt -c editor -c il2cpp --wait --published-only' - retries: 2 - - command: |5- - ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; ~/Graphics/utr --artifacts_path=/Users/bokken/Graphics/TestProjects/BoatAttack/test-results --category=URP --editor-location=/Users/bokken/.Editor --extra-editor-arg="-addscenetobuild=Assets/scenes/Testing/benchmark_island-static.unity" --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-executemethod" --extra-editor-arg="Editor.Setup" --extra-editor-arg="-packageundertestbranch=$GIT_BRANCH" --extra-editor-arg="-packageundertestname=com.unity.render-pipelines.universal" --extra-editor-arg="-packageundertestrev=$GIT_REVISION" --extra-editor-arg="-packageundertestrevdate=$GIT_REVISIONDATE" --extra-editor-arg="-scriptingbackend=Mono2x" --performance-project-id=BoatAttack --platform=editmode --report-performance-data --scripting-backend=Mono2x --suite=editor --testfilter=Low --testproject=/Users/bokken/Graphics/TestProjects/BoatAttack --zero-tests-are-ok=1 " - UTR_RESULT=$? - mkdir -p TestProjects/BoatAttack/test-results/ - scp -i ~/.ssh/id_rsa_macmini -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/BoatAttack/test-results/ TestProjects/BoatAttack/test-results/ - exit $UTR_RESULT - - command: |5- - ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; ~/Graphics/utr --artifacts_path=/Users/bokken/Graphics/TestProjects/BoatAttack/test-results --category=URP --editor-location=/Users/bokken/.Editor --extra-editor-arg="-addscenetobuild=Assets/scenes/Testing/benchmark_island-static.unity" --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-executemethod" --extra-editor-arg="Editor.Setup" --extra-editor-arg="-packageundertestbranch=$GIT_BRANCH" --extra-editor-arg="-packageundertestname=com.unity.render-pipelines.universal" --extra-editor-arg="-packageundertestrev=$GIT_REVISION" --extra-editor-arg="-packageundertestrevdate=$GIT_REVISIONDATE" --extra-editor-arg="-scriptingbackend=Mono2x" --performance-project-id=BoatAttack --platform=editmode --report-performance-data --scripting-backend=Mono2x --suite=editor --testfilter=Medium --testproject=/Users/bokken/Graphics/TestProjects/BoatAttack --zero-tests-are-ok=1 " - UTR_RESULT=$? - mkdir -p TestProjects/BoatAttack/test-results/ - scp -i ~/.ssh/id_rsa_macmini -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/BoatAttack/test-results/ TestProjects/BoatAttack/test-results/ - exit $UTR_RESULT - after: - - command: pip3 install requests --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade - - command: python3 .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/BoatAttack/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:OSX - rerun: on_new_revision URP_Performance_BoatAttack_OSX_Metal_performance_playmode_runtime_mono_Linear_CUSTOM-REVISION: name: URP_Performance_BoatAttack on OSX_Metal_performance_playmode_runtime_mono_Linear on version CUSTOM-REVISION agent: diff --git a/.yamato/urp_performance_boatattack-win-dx11.yml b/.yamato/urp_performance_boatattack-win-dx11.yml index 098a378b3c1..90eb9249a24 100644 --- a/.yamato/urp_performance_boatattack-win-dx11.yml +++ b/.yamato/urp_performance_boatattack-win-dx11.yml @@ -4,7 +4,6 @@ # Read more under .yamato/docs/readme.md {% metadata_file .yamato/_cache_config.metafile -%} -{% metadata_file .yamato/_latest_editor_versions_2021.2.metafile -%} {% metadata_file .yamato/_latest_editor_versions_trunk.metafile -%} --- @@ -273,270 +272,6 @@ URP_Performance_BoatAttack_Win_DX11_performance_build_editmode_mono_Linear_trunk dependencies: - path: .yamato/_editor_priming.yml#editor:priming:trunk:Win rerun: on_new_revision -URP_Performance_BoatAttack_Win_DX11_performance_playmode_runtime_mono_Linear_2021.2: - name: URP_Performance_BoatAttack on Win_DX11_performance_playmode_runtime_mono_Linear on version 2021.2 - agent: - type: Unity::VM::GPU - image: sdet/gamecode_win10:stable - flavor: b1.xlarge - model: rtx2080 - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - BOAT_ATTACK_BRANCH: master - BOAT_ATTACK_REVISION: ca18e346b30b365e90d1a9a149d07abfb15ac2a2 - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: NetSh Advfirewall set allprofiles state off - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr.bat --output utr.bat - retries: 2 - - command: |5- - git rev-parse HEAD | git show -s --format=%%cI > revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= /etc/apt/sources.list.d/unity.list" - - sudo apt update - - sudo apt install -y unity-config - - cd TestProjects/2d-sara && unity-config project add dependency "com.unity.render-pipelines.core@file:../../../com.unity.render-pipelines.core" --project-path . - - cd TestProjects/2d-sara && unity-config project add dependency "com.unity.render-pipelines.universal@file:../../../com.unity.render-pipelines.universal" --project-path . - - cd TestProjects/2d-sara && unity-config project add dependency "com.unity.shadergraph@file:../../../com.unity.shadergraph" --project-path . - - cd TestProjects/2d-sara && unity-config project add dependency com.unity.addressables@1.16.7 --project-path . - - cd TestProjects/2d-sara && unity-config project add dependency com.unity.scriptablebuildpipeline@1.11.2 --project-path . - - cd TestProjects/2d-sara && unity-config project add dependency com.unity.test-framework@1.1.18 --project-path . - - cd TestProjects/2d-sara && unity-config project add dependency com.unity.test-framework.performance@2.4.0 --project-path . - - cd TestProjects/2d-sara && unity-config project add dependency com.unity.test-framework.utp-reporter@1.0.2-preview --project-path . - - cd TestProjects/2d-sara && unity-config project add dependency com.unity.test-framework.build@0.0.1-preview.12 --project-path . - - cd TestProjects/2d-sara && unity-config project add dependency "com.unity.testing.graphics-performance@ssh://git@github.cds.internal.unity3d.com/unity/com.unity.testing.graphics-performance.git" --project-path . - - cd TestProjects/2d-sara && unity-config project add dependency "unity.graphictests.performance.universal@ssh://git@github.cds.internal.unity3d.com/unity/unity.graphictests.performance.universal.git" --project-path . - - cd TestProjects/2d-sara && unity-config project add testable com.unity.cli-project-setup --project-path . - - cd TestProjects/2d-sara && unity-config project add testable com.unity.test.performance.runtimesettings --project-path . - - cd TestProjects/2d-sara && unity-config project add testable com.unity.test.metadata-manager --project-path . - - cd TestProjects/2d-sara && unity-config project add testable com.unity.testing.graphics-performance --project-path . - - cd TestProjects/2d-sara && unity-config project add testable com.unity.render-pipelines.core --project-path . - - cd TestProjects/2d-sara && unity-config project add testable unity.graphictests.performance.universal --project-path . - - cd TestProjects/2d-sara && unity-config project set project-update false --project-path . - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - command: chmod +x utr - - command: sudo rm -f /etc/apt/sources.list /etc/apt/sources.list.d/{nodesource,teamviewer,deadsnakes-ubuntu-ppa-}* - - command: curl -L https://artifactory.prd.it.unity3d.com/artifactory/api/gpg/key/public | sudo apt-key add - - - command: sudo sh -c "echo 'deb https://artifactory.prd.it.unity3d.com/artifactory/unity-apt-local bionic main' > /etc/apt/sources.list.d/unity.list" - - command: sudo apt update - - command: sudo apt install unity-downloader-cli - retries: 2 - - command: sudo unity-downloader-cli --source-file unity_revision.txt -c editor -c il2cpp --wait --published-only - retries: 2 - - command: DISPLAY=:0.0 ./utr --artifacts_path=TestProjects/2d-sara/test-results --build-only --category=URP --editor-location=.Editor --extra-editor-arg="-addscenetobuild=Assets/Scenes/Main.unity" --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-executemethod" --extra-editor-arg="Editor.Setup" --extra-editor-arg="-packageundertestbranch=$GIT_BRANCH" --extra-editor-arg="-packageundertestname=com.unity.render-pipelines.universal" --extra-editor-arg="-packageundertestrev=$GIT_REVISION" --extra-editor-arg="-packageundertestrevdate=$GIT_REVISIONDATE" --extra-editor-arg="-playergraphicsapi=Vulkan" --extra-editor-arg="-scriptingbackend=Mono2x" --platform=StandaloneLinux64 --player-save-path=playersLow --scripting-backend=Mono2x --suite=playmode --testfilter=Low --testproject=./TestProjects/2d-sara --timeout=1200 - - command: DISPLAY=:0.0 ./utr --artifacts_path=TestProjects/2d-sara/test-results --build-only --category=URP --editor-location=.Editor --extra-editor-arg="-addscenetobuild=Assets/Scenes/Main.unity" --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-executemethod" --extra-editor-arg="Editor.Setup" --extra-editor-arg="-packageundertestbranch=$GIT_BRANCH" --extra-editor-arg="-packageundertestname=com.unity.render-pipelines.universal" --extra-editor-arg="-packageundertestrev=$GIT_REVISION" --extra-editor-arg="-packageundertestrevdate=$GIT_REVISIONDATE" --extra-editor-arg="-playergraphicsapi=Vulkan" --extra-editor-arg="-scriptingbackend=Mono2x" --platform=StandaloneLinux64 --player-save-path=playersMedium --scripting-backend=Mono2x --suite=playmode --testfilter=Medium --testproject=./TestProjects/2d-sara --timeout=1200 - - command: DISPLAY=:0.0 ./utr --artifacts_path=TestProjects/2d-sara/test-results --build-only --category=URP --editor-location=.Editor --extra-editor-arg="-addscenetobuild=Assets/Scenes/Main.unity" --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-executemethod" --extra-editor-arg="Editor.Setup" --extra-editor-arg="-packageundertestbranch=$GIT_BRANCH" --extra-editor-arg="-packageundertestname=com.unity.render-pipelines.universal" --extra-editor-arg="-packageundertestrev=$GIT_REVISION" --extra-editor-arg="-packageundertestrevdate=$GIT_REVISIONDATE" --extra-editor-arg="-playergraphicsapi=Vulkan" --extra-editor-arg="-scriptingbackend=Mono2x" --platform=StandaloneLinux64 --player-save-path=playersHigh --scripting-backend=Mono2x --suite=playmode --testfilter=High --testproject=./TestProjects/2d-sara --timeout=1200 - after: - - command: python .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/2d-sara/Logs/*.log" - players: - paths: - - "players*/**" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:Linux - rerun: on_new_revision -URP_Performance_LostCrypt_Linux_Vulkan_performance_playmode_editor_mono_Linear_2021.2: - name: URP_Performance_LostCrypt on Linux_Vulkan_performance_playmode_editor_mono_Linear on version 2021.2 - agent: - type: Unity::VM::GPU - image: package-ci/ubuntu:stable - flavor: b1.large - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - LOST_CRYPT_BRANCH: 21.2/urp-perf-test - LOST_CRYPT_REVISION: eb3405aada97fdaf2b033e4f7bc7e47fb4589c3a - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: git clone https://github.com/Unity-Technologies/2d-sara.git -b $LOST_CRYPT_BRANCH TestProjects/2d-sara - retries: 3 - - cd TestProjects/2d-sara && git checkout $LOST_CRYPT_REVISION - - sudo rm -f /etc/apt/sources.list /etc/apt/sources.list.d/{nodesource,teamviewer,deadsnakes-ubuntu-ppa-}* - - curl -L https://artifactory.prd.it.unity3d.com/artifactory/api/gpg/key/public | sudo apt-key add - - - sudo sh -c "echo 'deb https://artifactory.prd.it.unity3d.com/artifactory/unity-apt-local bionic main' > /etc/apt/sources.list.d/unity.list" - - sudo apt update - - sudo apt install -y unity-config - - cd TestProjects/2d-sara && unity-config project add dependency "com.unity.render-pipelines.core@file:../../../com.unity.render-pipelines.core" --project-path . - - cd TestProjects/2d-sara && unity-config project add dependency "com.unity.render-pipelines.universal@file:../../../com.unity.render-pipelines.universal" --project-path . - - cd TestProjects/2d-sara && unity-config project add dependency "com.unity.shadergraph@file:../../../com.unity.shadergraph" --project-path . - - cd TestProjects/2d-sara && unity-config project add dependency com.unity.addressables@1.16.7 --project-path . - - cd TestProjects/2d-sara && unity-config project add dependency com.unity.scriptablebuildpipeline@1.11.2 --project-path . - - cd TestProjects/2d-sara && unity-config project add dependency com.unity.test-framework@1.1.18 --project-path . - - cd TestProjects/2d-sara && unity-config project add dependency com.unity.test-framework.performance@2.4.0 --project-path . - - cd TestProjects/2d-sara && unity-config project add dependency com.unity.test-framework.utp-reporter@1.0.2-preview --project-path . - - cd TestProjects/2d-sara && unity-config project add dependency com.unity.test-framework.build@0.0.1-preview.12 --project-path . - - cd TestProjects/2d-sara && unity-config project add dependency "com.unity.testing.graphics-performance@ssh://git@github.cds.internal.unity3d.com/unity/com.unity.testing.graphics-performance.git" --project-path . - - cd TestProjects/2d-sara && unity-config project add dependency "unity.graphictests.performance.universal@ssh://git@github.cds.internal.unity3d.com/unity/unity.graphictests.performance.universal.git" --project-path . - - cd TestProjects/2d-sara && unity-config project add testable com.unity.cli-project-setup --project-path . - - cd TestProjects/2d-sara && unity-config project add testable com.unity.test.performance.runtimesettings --project-path . - - cd TestProjects/2d-sara && unity-config project add testable com.unity.test.metadata-manager --project-path . - - cd TestProjects/2d-sara && unity-config project add testable com.unity.testing.graphics-performance --project-path . - - cd TestProjects/2d-sara && unity-config project add testable com.unity.render-pipelines.core --project-path . - - cd TestProjects/2d-sara && unity-config project add testable unity.graphictests.performance.universal --project-path . - - cd TestProjects/2d-sara && unity-config project set project-update false --project-path . - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - command: chmod +x utr - - command: sudo rm -f /etc/apt/sources.list /etc/apt/sources.list.d/{nodesource,teamviewer,deadsnakes-ubuntu-ppa-}* - - command: curl -L https://artifactory.prd.it.unity3d.com/artifactory/api/gpg/key/public | sudo apt-key add - - - command: sudo sh -c "echo 'deb https://artifactory.prd.it.unity3d.com/artifactory/unity-apt-local bionic main' > /etc/apt/sources.list.d/unity.list" - - command: sudo apt update - - command: sudo apt install unity-downloader-cli - retries: 2 - - command: sudo unity-downloader-cli --source-file unity_revision.txt -c editor -c il2cpp --wait --published-only - retries: 2 - - command: DISPLAY=:0.0 ./utr --artifacts_path=TestProjects/2d-sara/test-results --category=URP --editor-location=.Editor --extra-editor-arg="-addscenetobuild=Assets/Scenes/Main.unity" --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-executemethod" --extra-editor-arg="Editor.Setup" --extra-editor-arg="-force-vulkan" --extra-editor-arg="-packageundertestbranch=$GIT_BRANCH" --extra-editor-arg="-packageundertestname=com.unity.render-pipelines.universal" --extra-editor-arg="-packageundertestrev=$GIT_REVISION" --extra-editor-arg="-packageundertestrevdate=$GIT_REVISIONDATE" --extra-editor-arg="-scriptingbackend=Mono2x" --performance-project-id=LostCrypt --report-performance-data --scripting-backend=Mono2x --suite=playmode --testfilter=Low --testproject=./TestProjects/2d-sara --zero-tests-are-ok=1 - - command: DISPLAY=:0.0 ./utr --artifacts_path=TestProjects/2d-sara/test-results --category=URP --editor-location=.Editor --extra-editor-arg="-addscenetobuild=Assets/Scenes/Main.unity" --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-executemethod" --extra-editor-arg="Editor.Setup" --extra-editor-arg="-force-vulkan" --extra-editor-arg="-packageundertestbranch=$GIT_BRANCH" --extra-editor-arg="-packageundertestname=com.unity.render-pipelines.universal" --extra-editor-arg="-packageundertestrev=$GIT_REVISION" --extra-editor-arg="-packageundertestrevdate=$GIT_REVISIONDATE" --extra-editor-arg="-scriptingbackend=Mono2x" --performance-project-id=LostCrypt --report-performance-data --scripting-backend=Mono2x --suite=playmode --testfilter=Medium --testproject=./TestProjects/2d-sara --zero-tests-are-ok=1 - after: - - command: python .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/2d-sara/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:Linux - rerun: on_new_revision -URP_Performance_LostCrypt_Linux_Vulkan_performance_build_editmode_mono_Linear_2021.2: - name: URP_Performance_LostCrypt on Linux_Vulkan_performance_build_editmode_mono_Linear on version 2021.2 - agent: - type: Unity::VM::GPU - image: package-ci/ubuntu:stable - flavor: b1.large - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - LOST_CRYPT_BRANCH: 21.2/urp-perf-test - LOST_CRYPT_REVISION: eb3405aada97fdaf2b033e4f7bc7e47fb4589c3a - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: git clone https://github.com/Unity-Technologies/2d-sara.git -b $LOST_CRYPT_BRANCH TestProjects/2d-sara - retries: 3 - - cd TestProjects/2d-sara && git checkout $LOST_CRYPT_REVISION - - sudo rm -f /etc/apt/sources.list /etc/apt/sources.list.d/{nodesource,teamviewer,deadsnakes-ubuntu-ppa-}* - - curl -L https://artifactory.prd.it.unity3d.com/artifactory/api/gpg/key/public | sudo apt-key add - - - sudo sh -c "echo 'deb https://artifactory.prd.it.unity3d.com/artifactory/unity-apt-local bionic main' > /etc/apt/sources.list.d/unity.list" - - sudo apt update - - sudo apt install -y unity-config - - cd TestProjects/2d-sara && unity-config project add dependency "com.unity.render-pipelines.core@file:../../../com.unity.render-pipelines.core" --project-path . - - cd TestProjects/2d-sara && unity-config project add dependency "com.unity.render-pipelines.universal@file:../../../com.unity.render-pipelines.universal" --project-path . - - cd TestProjects/2d-sara && unity-config project add dependency "com.unity.shadergraph@file:../../../com.unity.shadergraph" --project-path . - - cd TestProjects/2d-sara && unity-config project add dependency com.unity.addressables@1.16.7 --project-path . - - cd TestProjects/2d-sara && unity-config project add dependency com.unity.scriptablebuildpipeline@1.11.2 --project-path . - - cd TestProjects/2d-sara && unity-config project add dependency com.unity.test-framework@1.1.18 --project-path . - - cd TestProjects/2d-sara && unity-config project add dependency com.unity.test-framework.performance@2.4.0 --project-path . - - cd TestProjects/2d-sara && unity-config project add dependency com.unity.test-framework.utp-reporter@1.0.2-preview --project-path . - - cd TestProjects/2d-sara && unity-config project add dependency com.unity.test-framework.build@0.0.1-preview.12 --project-path . - - cd TestProjects/2d-sara && unity-config project add dependency "com.unity.testing.graphics-performance@ssh://git@github.cds.internal.unity3d.com/unity/com.unity.testing.graphics-performance.git" --project-path . - - cd TestProjects/2d-sara && unity-config project add dependency "unity.graphictests.performance.universal@ssh://git@github.cds.internal.unity3d.com/unity/unity.graphictests.performance.universal.git" --project-path . - - cd TestProjects/2d-sara && unity-config project add testable com.unity.cli-project-setup --project-path . - - cd TestProjects/2d-sara && unity-config project add testable com.unity.test.performance.runtimesettings --project-path . - - cd TestProjects/2d-sara && unity-config project add testable com.unity.test.metadata-manager --project-path . - - cd TestProjects/2d-sara && unity-config project add testable com.unity.testing.graphics-performance --project-path . - - cd TestProjects/2d-sara && unity-config project add testable com.unity.render-pipelines.core --project-path . - - cd TestProjects/2d-sara && unity-config project add testable unity.graphictests.performance.universal --project-path . - - cd TestProjects/2d-sara && unity-config project set project-update false --project-path . - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - command: chmod +x utr - - command: sudo rm -f /etc/apt/sources.list /etc/apt/sources.list.d/{nodesource,teamviewer,deadsnakes-ubuntu-ppa-}* - - command: curl -L https://artifactory.prd.it.unity3d.com/artifactory/api/gpg/key/public | sudo apt-key add - - - command: sudo sh -c "echo 'deb https://artifactory.prd.it.unity3d.com/artifactory/unity-apt-local bionic main' > /etc/apt/sources.list.d/unity.list" - - command: sudo apt update - - command: sudo apt install unity-downloader-cli - retries: 2 - - command: sudo unity-downloader-cli --source-file unity_revision.txt -c editor -c il2cpp --wait --published-only - retries: 2 - - command: DISPLAY=:0.0 ./utr --artifacts_path=TestProjects/2d-sara/test-results --category=URP --editor-location=.Editor --extra-editor-arg="-addscenetobuild=Assets/Scenes/Main.unity" --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-executemethod" --extra-editor-arg="Editor.Setup" --extra-editor-arg="-force-vulkan" --extra-editor-arg="-packageundertestbranch=$GIT_BRANCH" --extra-editor-arg="-packageundertestname=com.unity.render-pipelines.universal" --extra-editor-arg="-packageundertestrev=$GIT_REVISION" --extra-editor-arg="-packageundertestrevdate=$GIT_REVISIONDATE" --extra-editor-arg="-playergraphicsapi=Vulkan" --extra-editor-arg="-scriptingbackend=Mono2x" --performance-project-id=LostCrypt --platform=editmode --report-performance-data --scripting-backend=Mono2x --suite=editor --testfilter=Low --testproject=./TestProjects/2d-sara --zero-tests-are-ok=1 - - command: DISPLAY=:0.0 ./utr --artifacts_path=TestProjects/2d-sara/test-results --category=URP --editor-location=.Editor --extra-editor-arg="-addscenetobuild=Assets/Scenes/Main.unity" --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-executemethod" --extra-editor-arg="Editor.Setup" --extra-editor-arg="-force-vulkan" --extra-editor-arg="-packageundertestbranch=$GIT_BRANCH" --extra-editor-arg="-packageundertestname=com.unity.render-pipelines.universal" --extra-editor-arg="-packageundertestrev=$GIT_REVISION" --extra-editor-arg="-packageundertestrevdate=$GIT_REVISIONDATE" --extra-editor-arg="-playergraphicsapi=Vulkan" --extra-editor-arg="-scriptingbackend=Mono2x" --performance-project-id=LostCrypt --platform=editmode --report-performance-data --scripting-backend=Mono2x --suite=editor --testfilter=Medium --testproject=./TestProjects/2d-sara --zero-tests-are-ok=1 - after: - - command: python .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/2d-sara/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:Linux - rerun: on_new_revision URP_Performance_LostCrypt_Linux_Vulkan_performance_playmode_runtime_mono_Linear_CUSTOM-REVISION: name: URP_Performance_LostCrypt on Linux_Vulkan_performance_playmode_runtime_mono_Linear on version CUSTOM-REVISION agent: diff --git a/.yamato/urp_performance_lostcrypt-osx-metal.yml b/.yamato/urp_performance_lostcrypt-osx-metal.yml index 716f4b0e2cf..dfe26aa56d2 100644 --- a/.yamato/urp_performance_lostcrypt-osx-metal.yml +++ b/.yamato/urp_performance_lostcrypt-osx-metal.yml @@ -4,7 +4,6 @@ # Read more under .yamato/docs/readme.md {% metadata_file .yamato/_cache_config.metafile -%} -{% metadata_file .yamato/_latest_editor_versions_2021.2.metafile -%} {% metadata_file .yamato/_latest_editor_versions_trunk.metafile -%} --- @@ -231,228 +230,6 @@ URP_Performance_LostCrypt_OSX_Metal_performance_build_editmode_mono_Linear_trunk dependencies: - path: .yamato/_editor_priming.yml#editor:priming:trunk:OSX rerun: on_new_revision -URP_Performance_LostCrypt_OSX_Metal_performance_playmode_runtime_mono_Linear_2021.2: - name: URP_Performance_LostCrypt on OSX_Metal_performance_playmode_runtime_mono_Linear on version 2021.2 - agent: - type: Unity::metal::macmini - image: slough-ops/macos-10.14-xcode:stable - flavor: m1.mac - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - LOST_CRYPT_BRANCH: 21.2/urp-perf-test - LOST_CRYPT_REVISION: eb3405aada97fdaf2b033e4f7bc7e47fb4589c3a - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: git clone https://github.com/Unity-Technologies/2d-sara.git -b $LOST_CRYPT_BRANCH TestProjects/2d-sara - retries: 3 - - cd TestProjects/2d-sara && git checkout $LOST_CRYPT_REVISION - - brew tap --force-auto-update unity/unity git@github.cds.internal.unity3d.com:unity/homebrew-unity.git - - brew install unity-config - - cd TestProjects/2d-sara && unity-config project add dependency "com.unity.render-pipelines.core@file:../../../com.unity.render-pipelines.core" --project-path . - - cd TestProjects/2d-sara && unity-config project add dependency "com.unity.render-pipelines.universal@file:../../../com.unity.render-pipelines.universal" --project-path . - - cd TestProjects/2d-sara && unity-config project add dependency "com.unity.shadergraph@file:../../../com.unity.shadergraph" --project-path . - - cd TestProjects/2d-sara && unity-config project add dependency com.unity.addressables@1.16.7 --project-path . - - cd TestProjects/2d-sara && unity-config project add dependency com.unity.scriptablebuildpipeline@1.11.2 --project-path . - - cd TestProjects/2d-sara && unity-config project add dependency com.unity.test-framework@1.1.18 --project-path . - - cd TestProjects/2d-sara && unity-config project add dependency com.unity.test-framework.performance@2.4.0 --project-path . - - cd TestProjects/2d-sara && unity-config project add dependency com.unity.test-framework.utp-reporter@1.0.2-preview --project-path . - - cd TestProjects/2d-sara && unity-config project add dependency com.unity.test-framework.build@0.0.1-preview.12 --project-path . - - cd TestProjects/2d-sara && unity-config project add dependency "com.unity.testing.graphics-performance@ssh://git@github.cds.internal.unity3d.com/unity/com.unity.testing.graphics-performance.git" --project-path . - - cd TestProjects/2d-sara && unity-config project add dependency "unity.graphictests.performance.universal@ssh://git@github.cds.internal.unity3d.com/unity/unity.graphictests.performance.universal.git" --project-path . - - cd TestProjects/2d-sara && unity-config project add testable com.unity.cli-project-setup --project-path . - - cd TestProjects/2d-sara && unity-config project add testable com.unity.test.performance.runtimesettings --project-path . - - cd TestProjects/2d-sara && unity-config project add testable com.unity.test.metadata-manager --project-path . - - cd TestProjects/2d-sara && unity-config project add testable com.unity.testing.graphics-performance --project-path . - - cd TestProjects/2d-sara && unity-config project add testable com.unity.render-pipelines.core --project-path . - - cd TestProjects/2d-sara && unity-config project add testable unity.graphictests.performance.universal --project-path . - - cd TestProjects/2d-sara && unity-config project set project-update false --project-path . - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - chmod +x utr - - command: scp -i ~/.ssh/id_rsa_macmini -r $YAMATO_SOURCE_DIR bokken@$BOKKEN_DEVICE_IP:~/Graphics - retries: 2 - - command: scp -i ~/.ssh/id_rsa_macmini ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP:~/.ssh/id_rsa_macmini - retries: 2 - - command: ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP "bash -lc 'pip3 install unity-downloader-cli --user --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade'" - retries: 2 - - command: ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP '$(python3 -m site --user-base)/bin/unity-downloader-cli --source-file ~/Graphics/unity_revision.txt -c editor -c il2cpp --wait --published-only' - retries: 2 - - command: |5- - ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; ~/Graphics/utr --artifacts_path=/Users/bokken/Graphics/TestProjects/2d-sara/test-results --category=URP --editor-location=.Editor --extra-editor-arg="-addscenetobuild=Assets/Scenes/Main.unity" --extra-editor-arg="-executemethod" --extra-editor-arg="Editor.Setup" --extra-editor-arg="-packageundertestbranch=$GIT_BRANCH" --extra-editor-arg="-packageundertestname=com.unity.render-pipelines.universal" --extra-editor-arg="-packageundertestrev=$GIT_REVISION" --extra-editor-arg="-packageundertestrevdate=$GIT_REVISIONDATE" --extra-editor-arg="-scriptingbackend=Mono2x" --performance-project-id=LostCrypt --platform=StandaloneOSX --report-performance-data --scripting-backend=Mono2x --suite=playmode --testfilter=Low --testproject=/Users/bokken/Graphics/TestProjects/2d-sara --timeout=1200 --zero-tests-are-ok=1 " - UTR_RESULT=$? - mkdir -p TestProjects/2d-sara/test-results/ - scp -i ~/.ssh/id_rsa_macmini -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/2d-sara/test-results/ TestProjects/2d-sara/test-results/ - exit $UTR_RESULT - - command: |5- - ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; ~/Graphics/utr --artifacts_path=/Users/bokken/Graphics/TestProjects/2d-sara/test-results --category=URP --editor-location=.Editor --extra-editor-arg="-addscenetobuild=Assets/Scenes/Main.unity" --extra-editor-arg="-executemethod" --extra-editor-arg="Editor.Setup" --extra-editor-arg="-packageundertestbranch=$GIT_BRANCH" --extra-editor-arg="-packageundertestname=com.unity.render-pipelines.universal" --extra-editor-arg="-packageundertestrev=$GIT_REVISION" --extra-editor-arg="-packageundertestrevdate=$GIT_REVISIONDATE" --extra-editor-arg="-scriptingbackend=Mono2x" --performance-project-id=LostCrypt --platform=StandaloneOSX --report-performance-data --scripting-backend=Mono2x --suite=playmode --testfilter=Medium --testproject=/Users/bokken/Graphics/TestProjects/2d-sara --timeout=1200 --zero-tests-are-ok=1 " - UTR_RESULT=$? - mkdir -p TestProjects/2d-sara/test-results/ - scp -i ~/.ssh/id_rsa_macmini -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/2d-sara/test-results/ TestProjects/2d-sara/test-results/ - exit $UTR_RESULT - - command: |5- - ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; ~/Graphics/utr --artifacts_path=/Users/bokken/Graphics/TestProjects/2d-sara/test-results --category=URP --editor-location=.Editor --extra-editor-arg="-addscenetobuild=Assets/Scenes/Main.unity" --extra-editor-arg="-executemethod" --extra-editor-arg="Editor.Setup" --extra-editor-arg="-packageundertestbranch=$GIT_BRANCH" --extra-editor-arg="-packageundertestname=com.unity.render-pipelines.universal" --extra-editor-arg="-packageundertestrev=$GIT_REVISION" --extra-editor-arg="-packageundertestrevdate=$GIT_REVISIONDATE" --extra-editor-arg="-scriptingbackend=Mono2x" --performance-project-id=LostCrypt --platform=StandaloneOSX --report-performance-data --scripting-backend=Mono2x --suite=playmode --testfilter=High --testproject=/Users/bokken/Graphics/TestProjects/2d-sara --timeout=1200 --zero-tests-are-ok=1 " - UTR_RESULT=$? - mkdir -p TestProjects/2d-sara/test-results/ - scp -i ~/.ssh/id_rsa_macmini -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/2d-sara/test-results/ TestProjects/2d-sara/test-results/ - exit $UTR_RESULT - after: - - command: pip3 install requests --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade - - command: python3 .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/2d-sara/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:OSX - rerun: on_new_revision -URP_Performance_LostCrypt_OSX_Metal_performance_playmode_editor_mono_Linear_2021.2: - name: URP_Performance_LostCrypt on OSX_Metal_performance_playmode_editor_mono_Linear on version 2021.2 - agent: - type: Unity::metal::macmini - image: slough-ops/macos-10.14-xcode:stable - flavor: m1.mac - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - LOST_CRYPT_BRANCH: 21.2/urp-perf-test - LOST_CRYPT_REVISION: eb3405aada97fdaf2b033e4f7bc7e47fb4589c3a - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: git clone https://github.com/Unity-Technologies/2d-sara.git -b $LOST_CRYPT_BRANCH TestProjects/2d-sara - retries: 3 - - cd TestProjects/2d-sara && git checkout $LOST_CRYPT_REVISION - - brew tap --force-auto-update unity/unity git@github.cds.internal.unity3d.com:unity/homebrew-unity.git - - brew install unity-config - - cd TestProjects/2d-sara && unity-config project add dependency "com.unity.render-pipelines.core@file:../../../com.unity.render-pipelines.core" --project-path . - - cd TestProjects/2d-sara && unity-config project add dependency "com.unity.render-pipelines.universal@file:../../../com.unity.render-pipelines.universal" --project-path . - - cd TestProjects/2d-sara && unity-config project add dependency "com.unity.shadergraph@file:../../../com.unity.shadergraph" --project-path . - - cd TestProjects/2d-sara && unity-config project add dependency com.unity.addressables@1.16.7 --project-path . - - cd TestProjects/2d-sara && unity-config project add dependency com.unity.scriptablebuildpipeline@1.11.2 --project-path . - - cd TestProjects/2d-sara && unity-config project add dependency com.unity.test-framework@1.1.18 --project-path . - - cd TestProjects/2d-sara && unity-config project add dependency com.unity.test-framework.performance@2.4.0 --project-path . - - cd TestProjects/2d-sara && unity-config project add dependency com.unity.test-framework.utp-reporter@1.0.2-preview --project-path . - - cd TestProjects/2d-sara && unity-config project add dependency com.unity.test-framework.build@0.0.1-preview.12 --project-path . - - cd TestProjects/2d-sara && unity-config project add dependency "com.unity.testing.graphics-performance@ssh://git@github.cds.internal.unity3d.com/unity/com.unity.testing.graphics-performance.git" --project-path . - - cd TestProjects/2d-sara && unity-config project add dependency "unity.graphictests.performance.universal@ssh://git@github.cds.internal.unity3d.com/unity/unity.graphictests.performance.universal.git" --project-path . - - cd TestProjects/2d-sara && unity-config project add testable com.unity.cli-project-setup --project-path . - - cd TestProjects/2d-sara && unity-config project add testable com.unity.test.performance.runtimesettings --project-path . - - cd TestProjects/2d-sara && unity-config project add testable com.unity.test.metadata-manager --project-path . - - cd TestProjects/2d-sara && unity-config project add testable com.unity.testing.graphics-performance --project-path . - - cd TestProjects/2d-sara && unity-config project add testable com.unity.render-pipelines.core --project-path . - - cd TestProjects/2d-sara && unity-config project add testable unity.graphictests.performance.universal --project-path . - - cd TestProjects/2d-sara && unity-config project set project-update false --project-path . - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - chmod +x utr - - command: scp -i ~/.ssh/id_rsa_macmini -r $YAMATO_SOURCE_DIR bokken@$BOKKEN_DEVICE_IP:~/Graphics - retries: 2 - - command: scp -i ~/.ssh/id_rsa_macmini ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP:~/.ssh/id_rsa_macmini - retries: 2 - - command: ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP "bash -lc 'pip3 install unity-downloader-cli --user --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade'" - retries: 2 - - command: ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP '$(python3 -m site --user-base)/bin/unity-downloader-cli --source-file ~/Graphics/unity_revision.txt -c editor -c il2cpp --wait --published-only' - retries: 2 - - command: |5- - ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; ~/Graphics/utr --artifacts_path=/Users/bokken/Graphics/TestProjects/2d-sara/test-results --category=URP --editor-location=/Users/bokken/.Editor --extra-editor-arg="-addscenetobuild=Assets/Scenes/Main.unity" --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-executemethod" --extra-editor-arg="Editor.Setup" --extra-editor-arg="-packageundertestbranch=$GIT_BRANCH" --extra-editor-arg="-packageundertestname=com.unity.render-pipelines.universal" --extra-editor-arg="-packageundertestrev=$GIT_REVISION" --extra-editor-arg="-packageundertestrevdate=$GIT_REVISIONDATE" --extra-editor-arg="-scriptingbackend=Mono2x" --performance-project-id=LostCrypt --report-performance-data --scripting-backend=Mono2x --suite=playmode --testfilter=Low --testproject=/Users/bokken/Graphics/TestProjects/2d-sara --zero-tests-are-ok=1 " - UTR_RESULT=$? - mkdir -p TestProjects/2d-sara/test-results/ - scp -i ~/.ssh/id_rsa_macmini -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/2d-sara/test-results/ TestProjects/2d-sara/test-results/ - exit $UTR_RESULT - - command: |5- - ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; ~/Graphics/utr --artifacts_path=/Users/bokken/Graphics/TestProjects/2d-sara/test-results --category=URP --editor-location=/Users/bokken/.Editor --extra-editor-arg="-addscenetobuild=Assets/Scenes/Main.unity" --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-executemethod" --extra-editor-arg="Editor.Setup" --extra-editor-arg="-packageundertestbranch=$GIT_BRANCH" --extra-editor-arg="-packageundertestname=com.unity.render-pipelines.universal" --extra-editor-arg="-packageundertestrev=$GIT_REVISION" --extra-editor-arg="-packageundertestrevdate=$GIT_REVISIONDATE" --extra-editor-arg="-scriptingbackend=Mono2x" --performance-project-id=LostCrypt --report-performance-data --scripting-backend=Mono2x --suite=playmode --testfilter=Medium --testproject=/Users/bokken/Graphics/TestProjects/2d-sara --zero-tests-are-ok=1 " - UTR_RESULT=$? - mkdir -p TestProjects/2d-sara/test-results/ - scp -i ~/.ssh/id_rsa_macmini -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/2d-sara/test-results/ TestProjects/2d-sara/test-results/ - exit $UTR_RESULT - after: - - command: pip3 install requests --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade - - command: python3 .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/2d-sara/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:OSX - rerun: on_new_revision -URP_Performance_LostCrypt_OSX_Metal_performance_build_editmode_mono_Linear_2021.2: - name: URP_Performance_LostCrypt on OSX_Metal_performance_build_editmode_mono_Linear on version 2021.2 - agent: - type: Unity::metal::macmini - image: slough-ops/macos-10.14-xcode:stable - flavor: m1.mac - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - LOST_CRYPT_BRANCH: 21.2/urp-perf-test - LOST_CRYPT_REVISION: eb3405aada97fdaf2b033e4f7bc7e47fb4589c3a - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: git clone https://github.com/Unity-Technologies/2d-sara.git -b $LOST_CRYPT_BRANCH TestProjects/2d-sara - retries: 3 - - cd TestProjects/2d-sara && git checkout $LOST_CRYPT_REVISION - - brew tap --force-auto-update unity/unity git@github.cds.internal.unity3d.com:unity/homebrew-unity.git - - brew install unity-config - - cd TestProjects/2d-sara && unity-config project add dependency "com.unity.render-pipelines.core@file:../../../com.unity.render-pipelines.core" --project-path . - - cd TestProjects/2d-sara && unity-config project add dependency "com.unity.render-pipelines.universal@file:../../../com.unity.render-pipelines.universal" --project-path . - - cd TestProjects/2d-sara && unity-config project add dependency "com.unity.shadergraph@file:../../../com.unity.shadergraph" --project-path . - - cd TestProjects/2d-sara && unity-config project add dependency com.unity.addressables@1.16.7 --project-path . - - cd TestProjects/2d-sara && unity-config project add dependency com.unity.scriptablebuildpipeline@1.11.2 --project-path . - - cd TestProjects/2d-sara && unity-config project add dependency com.unity.test-framework@1.1.18 --project-path . - - cd TestProjects/2d-sara && unity-config project add dependency com.unity.test-framework.performance@2.4.0 --project-path . - - cd TestProjects/2d-sara && unity-config project add dependency com.unity.test-framework.utp-reporter@1.0.2-preview --project-path . - - cd TestProjects/2d-sara && unity-config project add dependency com.unity.test-framework.build@0.0.1-preview.12 --project-path . - - cd TestProjects/2d-sara && unity-config project add dependency "com.unity.testing.graphics-performance@ssh://git@github.cds.internal.unity3d.com/unity/com.unity.testing.graphics-performance.git" --project-path . - - cd TestProjects/2d-sara && unity-config project add dependency "unity.graphictests.performance.universal@ssh://git@github.cds.internal.unity3d.com/unity/unity.graphictests.performance.universal.git" --project-path . - - cd TestProjects/2d-sara && unity-config project add testable com.unity.cli-project-setup --project-path . - - cd TestProjects/2d-sara && unity-config project add testable com.unity.test.performance.runtimesettings --project-path . - - cd TestProjects/2d-sara && unity-config project add testable com.unity.test.metadata-manager --project-path . - - cd TestProjects/2d-sara && unity-config project add testable com.unity.testing.graphics-performance --project-path . - - cd TestProjects/2d-sara && unity-config project add testable com.unity.render-pipelines.core --project-path . - - cd TestProjects/2d-sara && unity-config project add testable unity.graphictests.performance.universal --project-path . - - cd TestProjects/2d-sara && unity-config project set project-update false --project-path . - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - chmod +x utr - - command: scp -i ~/.ssh/id_rsa_macmini -r $YAMATO_SOURCE_DIR bokken@$BOKKEN_DEVICE_IP:~/Graphics - retries: 2 - - command: scp -i ~/.ssh/id_rsa_macmini ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP:~/.ssh/id_rsa_macmini - retries: 2 - - command: ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP "bash -lc 'pip3 install unity-downloader-cli --user --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade'" - retries: 2 - - command: ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP '$(python3 -m site --user-base)/bin/unity-downloader-cli --source-file ~/Graphics/unity_revision.txt -c editor -c il2cpp --wait --published-only' - retries: 2 - - command: |5- - ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; ~/Graphics/utr --artifacts_path=/Users/bokken/Graphics/TestProjects/2d-sara/test-results --category=URP --editor-location=/Users/bokken/.Editor --extra-editor-arg="-addscenetobuild=Assets/Scenes/Main.unity" --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-executemethod" --extra-editor-arg="Editor.Setup" --extra-editor-arg="-packageundertestbranch=$GIT_BRANCH" --extra-editor-arg="-packageundertestname=com.unity.render-pipelines.universal" --extra-editor-arg="-packageundertestrev=$GIT_REVISION" --extra-editor-arg="-packageundertestrevdate=$GIT_REVISIONDATE" --extra-editor-arg="-scriptingbackend=Mono2x" --performance-project-id=LostCrypt --platform=editmode --report-performance-data --scripting-backend=Mono2x --suite=editor --testfilter=Low --testproject=/Users/bokken/Graphics/TestProjects/2d-sara --zero-tests-are-ok=1 " - UTR_RESULT=$? - mkdir -p TestProjects/2d-sara/test-results/ - scp -i ~/.ssh/id_rsa_macmini -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/2d-sara/test-results/ TestProjects/2d-sara/test-results/ - exit $UTR_RESULT - - command: |5- - ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; ~/Graphics/utr --artifacts_path=/Users/bokken/Graphics/TestProjects/2d-sara/test-results --category=URP --editor-location=/Users/bokken/.Editor --extra-editor-arg="-addscenetobuild=Assets/Scenes/Main.unity" --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-executemethod" --extra-editor-arg="Editor.Setup" --extra-editor-arg="-packageundertestbranch=$GIT_BRANCH" --extra-editor-arg="-packageundertestname=com.unity.render-pipelines.universal" --extra-editor-arg="-packageundertestrev=$GIT_REVISION" --extra-editor-arg="-packageundertestrevdate=$GIT_REVISIONDATE" --extra-editor-arg="-scriptingbackend=Mono2x" --performance-project-id=LostCrypt --platform=editmode --report-performance-data --scripting-backend=Mono2x --suite=editor --testfilter=Medium --testproject=/Users/bokken/Graphics/TestProjects/2d-sara --zero-tests-are-ok=1 " - UTR_RESULT=$? - mkdir -p TestProjects/2d-sara/test-results/ - scp -i ~/.ssh/id_rsa_macmini -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/2d-sara/test-results/ TestProjects/2d-sara/test-results/ - exit $UTR_RESULT - after: - - command: pip3 install requests --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade - - command: python3 .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/2d-sara/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:OSX - rerun: on_new_revision URP_Performance_LostCrypt_OSX_Metal_performance_playmode_runtime_mono_Linear_CUSTOM-REVISION: name: URP_Performance_LostCrypt on OSX_Metal_performance_playmode_runtime_mono_Linear on version CUSTOM-REVISION agent: diff --git a/.yamato/urp_performance_lostcrypt-win-dx11.yml b/.yamato/urp_performance_lostcrypt-win-dx11.yml index 7a438471c93..588cdb387b4 100644 --- a/.yamato/urp_performance_lostcrypt-win-dx11.yml +++ b/.yamato/urp_performance_lostcrypt-win-dx11.yml @@ -4,7 +4,6 @@ # Read more under .yamato/docs/readme.md {% metadata_file .yamato/_cache_config.metafile -%} -{% metadata_file .yamato/_latest_editor_versions_2021.2.metafile -%} {% metadata_file .yamato/_latest_editor_versions_trunk.metafile -%} --- @@ -273,270 +272,6 @@ URP_Performance_LostCrypt_Win_DX11_performance_build_editmode_mono_Linear_trunk: dependencies: - path: .yamato/_editor_priming.yml#editor:priming:trunk:Win rerun: on_new_revision -URP_Performance_LostCrypt_Win_DX11_performance_playmode_runtime_mono_Linear_2021.2: - name: URP_Performance_LostCrypt on Win_DX11_performance_playmode_runtime_mono_Linear on version 2021.2 - agent: - type: Unity::VM::GPU - image: sdet/gamecode_win10:stable - flavor: b1.xlarge - model: rtx2080 - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - LOST_CRYPT_BRANCH: 21.2/urp-perf-test - LOST_CRYPT_REVISION: eb3405aada97fdaf2b033e4f7bc7e47fb4589c3a - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: NetSh Advfirewall set allprofiles state off - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr.bat --output utr.bat - retries: 2 - - command: |5- - git rev-parse HEAD | git show -s --format=%%cI > revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= /etc/apt/sources.list.d/unity.list" - - command: sudo apt update - - command: sudo apt install unity-downloader-cli - retries: 2 - - command: sudo unity-downloader-cli --source-file unity_revision.txt -c editor -c il2cpp --wait --published-only - retries: 2 - - command: DISPLAY=:0.0 ./utr $CACHE_ARGS --artifacts_path=TestProjects/UniversalGraphicsTest_PostPro/test-results --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-force-glcore" --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=./TestProjects/UniversalGraphicsTest_PostPro --zero-tests-are-ok=1 - after: - - command: python .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/UniversalGraphicsTest_PostPro/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:Linux - rerun: on_new_revision -URP_PostPro_Linux_OpenGLCore_editmode_mono_Linear_2021.2: - name: URP_PostPro on Linux_OpenGLCore_editmode_mono_Linear on version 2021.2 - agent: - type: Unity::VM - image: package-ci/ubuntu:stable - flavor: b1.large - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - command: chmod +x utr - - command: sudo rm -f /etc/apt/sources.list /etc/apt/sources.list.d/{nodesource,teamviewer,deadsnakes-ubuntu-ppa-}* - - command: curl -L https://artifactory.prd.it.unity3d.com/artifactory/api/gpg/key/public | sudo apt-key add - - - command: sudo sh -c "echo 'deb https://artifactory.prd.it.unity3d.com/artifactory/unity-apt-local bionic main' > /etc/apt/sources.list.d/unity.list" - - command: sudo apt update - - command: sudo apt install unity-downloader-cli - retries: 2 - - command: sudo unity-downloader-cli --source-file unity_revision.txt -c editor -c il2cpp --wait --published-only - retries: 2 - - command: DISPLAY=:0.0 ./utr --artifacts_path=TestProjects/UniversalGraphicsTest_PostPro/test-results --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-force-glcore" --platform=editmode --scripting-backend=Mono2x --suite=editor --testfilter=$TEST_FILTER --testproject=./TestProjects/UniversalGraphicsTest_PostPro --zero-tests-are-ok=1 - after: - - command: python .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/UniversalGraphicsTest_PostPro/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:Linux - rerun: on_new_revision URP_PostPro_Linux_OpenGLCore_playmode_mono_Linear_CUSTOM-REVISION: name: URP_PostPro on Linux_OpenGLCore_playmode_mono_Linear on version CUSTOM-REVISION agent: diff --git a/.yamato/urp_postpro-linux-vulkan.yml b/.yamato/urp_postpro-linux-vulkan.yml index 2a4f9620d0f..0b724e8a5ad 100644 --- a/.yamato/urp_postpro-linux-vulkan.yml +++ b/.yamato/urp_postpro-linux-vulkan.yml @@ -4,7 +4,6 @@ # Read more under .yamato/docs/readme.md {% metadata_file .yamato/_cache_config.metafile -%} -{% metadata_file .yamato/_latest_editor_versions_2021.2.metafile -%} {% metadata_file .yamato/_latest_editor_versions_trunk.metafile -%} --- @@ -146,143 +145,6 @@ URP_PostPro_Linux_Vulkan_editmode_mono_Linear_trunk: dependencies: - path: .yamato/_editor_priming.yml#editor:priming:trunk:Linux rerun: on_new_revision -URP_PostPro_Linux_Vulkan_Standalone_mono_Linear_2021.2: - name: URP_PostPro on Linux_Vulkan_Standalone_mono_Linear on version 2021.2 - agent: - type: Unity::VM::GPU - image: package-ci/ubuntu:stable - flavor: b1.large - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - command: chmod +x utr - - command: DISPLAY=:0.0 ./utr --artifacts_path=TestProjects/UniversalGraphicsTest_PostPro/test-results --platform=StandaloneLinux64 --player-connection-ip=auto --player-load-path=players --suite=playmode --timeout=1200 --zero-tests-are-ok=1 - after: - - command: python .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/UniversalGraphicsTest_PostPro/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:Linux - rerun: on_new_revision - - path: .yamato/urp_postpro-linux-vulkan.yml#Build_URP_PostPro_Linux_Vulkan_Standalone_mono_Linear_2021.2 - rerun: on_new_revision -Build_URP_PostPro_Linux_Vulkan_Standalone_mono_Linear_2021.2: - name: Build URP_PostPro on Linux_Vulkan_mono_Linear_Standalone_build_Player on version 2021.2 - agent: - type: Unity::VM - image: package-ci/ubuntu:stable - flavor: b1.xlarge - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - command: chmod +x utr - - command: sudo rm -f /etc/apt/sources.list /etc/apt/sources.list.d/{nodesource,teamviewer,deadsnakes-ubuntu-ppa-}* - - command: curl -L https://artifactory.prd.it.unity3d.com/artifactory/api/gpg/key/public | sudo apt-key add - - - command: sudo sh -c "echo 'deb https://artifactory.prd.it.unity3d.com/artifactory/unity-apt-local bionic main' > /etc/apt/sources.list.d/unity.list" - - command: sudo apt update - - command: sudo apt install unity-downloader-cli - retries: 2 - - command: sudo unity-downloader-cli --source-file unity_revision.txt -c editor -c il2cpp --wait --published-only - retries: 2 - - command: DISPLAY=:0.0 ./utr $CACHE_ARGS --artifacts_path=TestProjects/UniversalGraphicsTest_PostPro/test-results --build-only --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-executemethod" --extra-editor-arg="SetupProject.ApplySettings" --extra-editor-arg="vulkan" --extra-editor-arg="Linear" --extra-editor-arg="-playergraphicsapi=Vulkan" --platform=StandaloneLinux64 --player-save-path=players --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=./TestProjects/UniversalGraphicsTest_PostPro --timeout=3000 - after: - - command: python .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/UniversalGraphicsTest_PostPro/Logs/*.log" - players: - paths: - - "players*/**" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:Linux - rerun: on_new_revision -URP_PostPro_Linux_Vulkan_playmode_mono_Linear_2021.2: - name: URP_PostPro on Linux_Vulkan_playmode_mono_Linear on version 2021.2 - agent: - type: Unity::VM::GPU - image: package-ci/ubuntu:stable - flavor: b1.large - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - command: chmod +x utr - - command: sudo rm -f /etc/apt/sources.list /etc/apt/sources.list.d/{nodesource,teamviewer,deadsnakes-ubuntu-ppa-}* - - command: curl -L https://artifactory.prd.it.unity3d.com/artifactory/api/gpg/key/public | sudo apt-key add - - - command: sudo sh -c "echo 'deb https://artifactory.prd.it.unity3d.com/artifactory/unity-apt-local bionic main' > /etc/apt/sources.list.d/unity.list" - - command: sudo apt update - - command: sudo apt install unity-downloader-cli - retries: 2 - - command: sudo unity-downloader-cli --source-file unity_revision.txt -c editor -c il2cpp --wait --published-only - retries: 2 - - command: DISPLAY=:0.0 ./utr $CACHE_ARGS --artifacts_path=TestProjects/UniversalGraphicsTest_PostPro/test-results --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-force-vulkan" --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=./TestProjects/UniversalGraphicsTest_PostPro --zero-tests-are-ok=1 - after: - - command: python .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/UniversalGraphicsTest_PostPro/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:Linux - rerun: on_new_revision -URP_PostPro_Linux_Vulkan_editmode_mono_Linear_2021.2: - name: URP_PostPro on Linux_Vulkan_editmode_mono_Linear on version 2021.2 - agent: - type: Unity::VM - image: package-ci/ubuntu:stable - flavor: b1.large - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - command: chmod +x utr - - command: sudo rm -f /etc/apt/sources.list /etc/apt/sources.list.d/{nodesource,teamviewer,deadsnakes-ubuntu-ppa-}* - - command: curl -L https://artifactory.prd.it.unity3d.com/artifactory/api/gpg/key/public | sudo apt-key add - - - command: sudo sh -c "echo 'deb https://artifactory.prd.it.unity3d.com/artifactory/unity-apt-local bionic main' > /etc/apt/sources.list.d/unity.list" - - command: sudo apt update - - command: sudo apt install unity-downloader-cli - retries: 2 - - command: sudo unity-downloader-cli --source-file unity_revision.txt -c editor -c il2cpp --wait --published-only - retries: 2 - - command: DISPLAY=:0.0 ./utr --artifacts_path=TestProjects/UniversalGraphicsTest_PostPro/test-results --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-force-vulkan" --extra-editor-arg="-playergraphicsapi=Vulkan" --platform=editmode --scripting-backend=Mono2x --suite=editor --testfilter=$TEST_FILTER --testproject=./TestProjects/UniversalGraphicsTest_PostPro --zero-tests-are-ok=1 - after: - - command: python .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/UniversalGraphicsTest_PostPro/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:Linux - rerun: on_new_revision URP_PostPro_Linux_Vulkan_Standalone_mono_Linear_CUSTOM-REVISION: name: URP_PostPro on Linux_Vulkan_Standalone_mono_Linear on version CUSTOM-REVISION agent: diff --git a/.yamato/urp_postpro-osx-metal.yml b/.yamato/urp_postpro-osx-metal.yml index 0b65c3bbd51..3c35603ddc0 100644 --- a/.yamato/urp_postpro-osx-metal.yml +++ b/.yamato/urp_postpro-osx-metal.yml @@ -4,7 +4,6 @@ # Read more under .yamato/docs/readme.md {% metadata_file .yamato/_cache_config.metafile -%} -{% metadata_file .yamato/_latest_editor_versions_2021.2.metafile -%} {% metadata_file .yamato/_latest_editor_versions_trunk.metafile -%} --- @@ -91,88 +90,6 @@ URP_PostPro_OSX_Metal_playmode_mono_Linear_trunk: dependencies: - path: .yamato/_editor_priming.yml#editor:priming:trunk:OSX rerun: on_new_revision -URP_PostPro_OSX_Metal_Standalone_mono_Linear_2021.2: - name: URP_PostPro on OSX_Metal_Standalone_mono_Linear on version 2021.2 - agent: - type: Unity::metal::macmini - image: slough-ops/macos-10.14-xcode:stable - flavor: m1.mac - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - chmod +x utr - - command: scp -i ~/.ssh/id_rsa_macmini -r $YAMATO_SOURCE_DIR bokken@$BOKKEN_DEVICE_IP:~/Graphics - retries: 2 - - command: scp -i ~/.ssh/id_rsa_macmini ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP:~/.ssh/id_rsa_macmini - retries: 2 - - command: ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP "bash -lc 'pip3 install unity-downloader-cli --user --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade'" - retries: 2 - - command: ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP '$(python3 -m site --user-base)/bin/unity-downloader-cli --source-file ~/Graphics/unity_revision.txt -c editor -c il2cpp --wait --published-only' - retries: 2 - - command: |5- - ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; ~/Graphics/utr $CACHE_ARGS --artifacts_path=/Users/bokken/Graphics/TestProjects/UniversalGraphicsTest_PostPro/test-results --editor-location=.Editor --platform=StandaloneOSX --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=/Users/bokken/Graphics/TestProjects/UniversalGraphicsTest_PostPro --timeout=2400 --zero-tests-are-ok=1 " - UTR_RESULT=$? - mkdir -p TestProjects/UniversalGraphicsTest_PostPro/test-results/ - scp -i ~/.ssh/id_rsa_macmini -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/UniversalGraphicsTest_PostPro/test-results/ TestProjects/UniversalGraphicsTest_PostPro/test-results/ - exit $UTR_RESULT - after: - - command: pip3 install requests --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade - - command: python3 .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/UniversalGraphicsTest_PostPro/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:OSX - rerun: on_new_revision -URP_PostPro_OSX_Metal_playmode_mono_Linear_2021.2: - name: URP_PostPro on OSX_Metal_playmode_mono_Linear on version 2021.2 - agent: - type: Unity::metal::macmini - image: slough-ops/macos-10.14-xcode:stable - flavor: m1.mac - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - chmod +x utr - - command: scp -i ~/.ssh/id_rsa_macmini -r $YAMATO_SOURCE_DIR bokken@$BOKKEN_DEVICE_IP:~/Graphics - retries: 2 - - command: scp -i ~/.ssh/id_rsa_macmini ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP:~/.ssh/id_rsa_macmini - retries: 2 - - command: ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP "bash -lc 'pip3 install unity-downloader-cli --user --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade'" - retries: 2 - - command: ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP '$(python3 -m site --user-base)/bin/unity-downloader-cli --source-file ~/Graphics/unity_revision.txt -c editor -c il2cpp --wait --published-only' - retries: 2 - - command: |5- - ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; ~/Graphics/utr $CACHE_ARGS --artifacts_path=/Users/bokken/Graphics/TestProjects/UniversalGraphicsTest_PostPro/test-results --editor-location=/Users/bokken/.Editor --extra-editor-arg="-colorspace=Linear" --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=/Users/bokken/Graphics/TestProjects/UniversalGraphicsTest_PostPro --zero-tests-are-ok=1 " - UTR_RESULT=$? - mkdir -p TestProjects/UniversalGraphicsTest_PostPro/test-results/ - scp -i ~/.ssh/id_rsa_macmini -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/UniversalGraphicsTest_PostPro/test-results/ TestProjects/UniversalGraphicsTest_PostPro/test-results/ - exit $UTR_RESULT - after: - - command: pip3 install requests --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade - - command: python3 .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/UniversalGraphicsTest_PostPro/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:OSX - rerun: on_new_revision URP_PostPro_OSX_Metal_Standalone_mono_Linear_CUSTOM-REVISION: name: URP_PostPro on OSX_Metal_Standalone_mono_Linear on version CUSTOM-REVISION agent: diff --git a/.yamato/urp_postpro-osx-openglcore.yml b/.yamato/urp_postpro-osx-openglcore.yml index b2b4865ab26..e2a73ea8e72 100644 --- a/.yamato/urp_postpro-osx-openglcore.yml +++ b/.yamato/urp_postpro-osx-openglcore.yml @@ -4,7 +4,6 @@ # Read more under .yamato/docs/readme.md {% metadata_file .yamato/_cache_config.metafile -%} -{% metadata_file .yamato/_latest_editor_versions_2021.2.metafile -%} {% metadata_file .yamato/_latest_editor_versions_trunk.metafile -%} --- @@ -75,72 +74,6 @@ URP_PostPro_OSX_OpenGLCore_editmode_mono_Linear_trunk: dependencies: - path: .yamato/_editor_priming.yml#editor:priming:trunk:OSX rerun: on_new_revision -URP_PostPro_OSX_OpenGLCore_playmode_mono_Linear_2021.2: - name: URP_PostPro on OSX_OpenGLCore_playmode_mono_Linear on version 2021.2 - agent: - type: Unity::VM::osx - image: graphics-foundation/mac-10.15:v0.1.0-841394 - flavor: m1.mac - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - chmod +x utr - - command: brew tap --force-auto-update unity/unity git@github.cds.internal.unity3d.com:unity/homebrew-unity.git - - command: brew install unity-downloader-cli - retries: 2 - - command: unity-downloader-cli --source-file unity_revision.txt -c editor -c il2cpp --wait --published-only - retries: 2 - - command: ./utr $CACHE_ARGS --artifacts_path=TestProjects/UniversalGraphicsTest_PostPro/test-results --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=./TestProjects/UniversalGraphicsTest_PostPro --zero-tests-are-ok=1 - retries: 2 - after: - - command: python3 .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/UniversalGraphicsTest_PostPro/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:OSX - rerun: on_new_revision -URP_PostPro_OSX_OpenGLCore_editmode_mono_Linear_2021.2: - name: URP_PostPro on OSX_OpenGLCore_editmode_mono_Linear on version 2021.2 - agent: - type: Unity::VM::osx - image: graphics-foundation/mac-10.15:v0.1.0-841394 - flavor: m1.mac - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - chmod +x utr - - command: brew tap --force-auto-update unity/unity git@github.cds.internal.unity3d.com:unity/homebrew-unity.git - - command: brew install unity-downloader-cli - retries: 2 - - command: unity-downloader-cli --source-file unity_revision.txt -c editor -c il2cpp --wait --published-only - retries: 2 - - command: ./utr --artifacts_path=TestProjects/UniversalGraphicsTest_PostPro/test-results --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --platform=editmode --scripting-backend=Mono2x --suite=editor --testfilter=$TEST_FILTER --testproject=./TestProjects/UniversalGraphicsTest_PostPro --zero-tests-are-ok=1 - retries: 2 - after: - - command: python3 .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/UniversalGraphicsTest_PostPro/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:OSX - rerun: on_new_revision URP_PostPro_OSX_OpenGLCore_playmode_mono_Linear_CUSTOM-REVISION: name: URP_PostPro on OSX_OpenGLCore_playmode_mono_Linear on version CUSTOM-REVISION agent: diff --git a/.yamato/urp_postpro-win-dx11.yml b/.yamato/urp_postpro-win-dx11.yml index 31e26f1ea38..a6bce946a19 100644 --- a/.yamato/urp_postpro-win-dx11.yml +++ b/.yamato/urp_postpro-win-dx11.yml @@ -4,7 +4,6 @@ # Read more under .yamato/docs/readme.md {% metadata_file .yamato/_cache_config.metafile -%} -{% metadata_file .yamato/_latest_editor_versions_2021.2.metafile -%} {% metadata_file .yamato/_latest_editor_versions_trunk.metafile -%} --- @@ -260,257 +259,6 @@ Build_URP_PostPro_Win_DX11_Standalone_XR_mono_Linear_trunk: dependencies: - path: .yamato/_editor_priming.yml#editor:priming:trunk:Win rerun: on_new_revision -URP_PostPro_Win_DX11_Standalone_mono_Linear_2021.2: - name: URP_PostPro on Win_DX11_Standalone_mono_Linear on version 2021.2 - agent: - type: Unity::VM::GPU - image: sdet/gamecode_win10:stable - flavor: b1.xlarge - model: rtx2080 - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: NetSh Advfirewall set allprofiles state off - - cd Tools && powershell -command ". .\Unity.ps1; Set-ScreenResolution -width 1920 -Height 1080" - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr.bat --output utr.bat - retries: 2 - - command: |5- - git rev-parse HEAD | git show -s --format=%%cI > revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= /etc/apt/sources.list.d/unity.list" - - command: sudo apt update - - command: sudo apt install unity-downloader-cli - retries: 2 - - command: sudo unity-downloader-cli --source-file unity_revision.txt -c editor -c il2cpp --wait --published-only - retries: 2 - - command: DISPLAY=:0.0 ./utr $CACHE_ARGS --artifacts_path=TestProjects/UniversalGraphicsTest_Terrain/test-results --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-force-glcore" --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=./TestProjects/UniversalGraphicsTest_Terrain --zero-tests-are-ok=1 - after: - - command: python .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/UniversalGraphicsTest_Terrain/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:Linux - rerun: on_new_revision -URP_Terrain_Linux_OpenGLCore_editmode_mono_Linear_2021.2: - name: URP_Terrain on Linux_OpenGLCore_editmode_mono_Linear on version 2021.2 - agent: - type: Unity::VM - image: package-ci/ubuntu:stable - flavor: b1.large - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - command: chmod +x utr - - command: sudo rm -f /etc/apt/sources.list /etc/apt/sources.list.d/{nodesource,teamviewer,deadsnakes-ubuntu-ppa-}* - - command: curl -L https://artifactory.prd.it.unity3d.com/artifactory/api/gpg/key/public | sudo apt-key add - - - command: sudo sh -c "echo 'deb https://artifactory.prd.it.unity3d.com/artifactory/unity-apt-local bionic main' > /etc/apt/sources.list.d/unity.list" - - command: sudo apt update - - command: sudo apt install unity-downloader-cli - retries: 2 - - command: sudo unity-downloader-cli --source-file unity_revision.txt -c editor -c il2cpp --wait --published-only - retries: 2 - - command: DISPLAY=:0.0 ./utr --artifacts_path=TestProjects/UniversalGraphicsTest_Terrain/test-results --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-force-glcore" --platform=editmode --scripting-backend=Mono2x --suite=editor --testfilter=$TEST_FILTER --testproject=./TestProjects/UniversalGraphicsTest_Terrain --zero-tests-are-ok=1 - after: - - command: python .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/UniversalGraphicsTest_Terrain/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:Linux - rerun: on_new_revision URP_Terrain_Linux_OpenGLCore_playmode_mono_Linear_CUSTOM-REVISION: name: URP_Terrain on Linux_OpenGLCore_playmode_mono_Linear on version CUSTOM-REVISION agent: diff --git a/.yamato/urp_terrain-linux-vulkan.yml b/.yamato/urp_terrain-linux-vulkan.yml index d3237086457..dffd2b9d068 100644 --- a/.yamato/urp_terrain-linux-vulkan.yml +++ b/.yamato/urp_terrain-linux-vulkan.yml @@ -4,7 +4,6 @@ # Read more under .yamato/docs/readme.md {% metadata_file .yamato/_cache_config.metafile -%} -{% metadata_file .yamato/_latest_editor_versions_2021.2.metafile -%} {% metadata_file .yamato/_latest_editor_versions_trunk.metafile -%} --- @@ -146,143 +145,6 @@ URP_Terrain_Linux_Vulkan_editmode_mono_Linear_trunk: dependencies: - path: .yamato/_editor_priming.yml#editor:priming:trunk:Linux rerun: on_new_revision -URP_Terrain_Linux_Vulkan_Standalone_mono_Linear_2021.2: - name: URP_Terrain on Linux_Vulkan_Standalone_mono_Linear on version 2021.2 - agent: - type: Unity::VM::GPU - image: package-ci/ubuntu:stable - flavor: b1.large - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - command: chmod +x utr - - command: DISPLAY=:0.0 ./utr --artifacts_path=TestProjects/UniversalGraphicsTest_Terrain/test-results --platform=StandaloneLinux64 --player-connection-ip=auto --player-load-path=players --suite=playmode --timeout=1200 --zero-tests-are-ok=1 - after: - - command: python .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/UniversalGraphicsTest_Terrain/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:Linux - rerun: on_new_revision - - path: .yamato/urp_terrain-linux-vulkan.yml#Build_URP_Terrain_Linux_Vulkan_Standalone_mono_Linear_2021.2 - rerun: on_new_revision -Build_URP_Terrain_Linux_Vulkan_Standalone_mono_Linear_2021.2: - name: Build URP_Terrain on Linux_Vulkan_mono_Linear_Standalone_build_Player on version 2021.2 - agent: - type: Unity::VM - image: package-ci/ubuntu:stable - flavor: b1.xlarge - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - command: chmod +x utr - - command: sudo rm -f /etc/apt/sources.list /etc/apt/sources.list.d/{nodesource,teamviewer,deadsnakes-ubuntu-ppa-}* - - command: curl -L https://artifactory.prd.it.unity3d.com/artifactory/api/gpg/key/public | sudo apt-key add - - - command: sudo sh -c "echo 'deb https://artifactory.prd.it.unity3d.com/artifactory/unity-apt-local bionic main' > /etc/apt/sources.list.d/unity.list" - - command: sudo apt update - - command: sudo apt install unity-downloader-cli - retries: 2 - - command: sudo unity-downloader-cli --source-file unity_revision.txt -c editor -c il2cpp --wait --published-only - retries: 2 - - command: DISPLAY=:0.0 ./utr $CACHE_ARGS --artifacts_path=TestProjects/UniversalGraphicsTest_Terrain/test-results --build-only --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-executemethod" --extra-editor-arg="SetupProject.ApplySettings" --extra-editor-arg="vulkan" --extra-editor-arg="Linear" --extra-editor-arg="-playergraphicsapi=Vulkan" --platform=StandaloneLinux64 --player-save-path=players --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=./TestProjects/UniversalGraphicsTest_Terrain --timeout=3000 - after: - - command: python .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/UniversalGraphicsTest_Terrain/Logs/*.log" - players: - paths: - - "players*/**" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:Linux - rerun: on_new_revision -URP_Terrain_Linux_Vulkan_playmode_mono_Linear_2021.2: - name: URP_Terrain on Linux_Vulkan_playmode_mono_Linear on version 2021.2 - agent: - type: Unity::VM::GPU - image: package-ci/ubuntu:stable - flavor: b1.large - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - command: chmod +x utr - - command: sudo rm -f /etc/apt/sources.list /etc/apt/sources.list.d/{nodesource,teamviewer,deadsnakes-ubuntu-ppa-}* - - command: curl -L https://artifactory.prd.it.unity3d.com/artifactory/api/gpg/key/public | sudo apt-key add - - - command: sudo sh -c "echo 'deb https://artifactory.prd.it.unity3d.com/artifactory/unity-apt-local bionic main' > /etc/apt/sources.list.d/unity.list" - - command: sudo apt update - - command: sudo apt install unity-downloader-cli - retries: 2 - - command: sudo unity-downloader-cli --source-file unity_revision.txt -c editor -c il2cpp --wait --published-only - retries: 2 - - command: DISPLAY=:0.0 ./utr $CACHE_ARGS --artifacts_path=TestProjects/UniversalGraphicsTest_Terrain/test-results --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-force-vulkan" --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=./TestProjects/UniversalGraphicsTest_Terrain --zero-tests-are-ok=1 - after: - - command: python .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/UniversalGraphicsTest_Terrain/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:Linux - rerun: on_new_revision -URP_Terrain_Linux_Vulkan_editmode_mono_Linear_2021.2: - name: URP_Terrain on Linux_Vulkan_editmode_mono_Linear on version 2021.2 - agent: - type: Unity::VM - image: package-ci/ubuntu:stable - flavor: b1.large - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - command: chmod +x utr - - command: sudo rm -f /etc/apt/sources.list /etc/apt/sources.list.d/{nodesource,teamviewer,deadsnakes-ubuntu-ppa-}* - - command: curl -L https://artifactory.prd.it.unity3d.com/artifactory/api/gpg/key/public | sudo apt-key add - - - command: sudo sh -c "echo 'deb https://artifactory.prd.it.unity3d.com/artifactory/unity-apt-local bionic main' > /etc/apt/sources.list.d/unity.list" - - command: sudo apt update - - command: sudo apt install unity-downloader-cli - retries: 2 - - command: sudo unity-downloader-cli --source-file unity_revision.txt -c editor -c il2cpp --wait --published-only - retries: 2 - - command: DISPLAY=:0.0 ./utr --artifacts_path=TestProjects/UniversalGraphicsTest_Terrain/test-results --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-force-vulkan" --extra-editor-arg="-playergraphicsapi=Vulkan" --platform=editmode --scripting-backend=Mono2x --suite=editor --testfilter=$TEST_FILTER --testproject=./TestProjects/UniversalGraphicsTest_Terrain --zero-tests-are-ok=1 - after: - - command: python .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/UniversalGraphicsTest_Terrain/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:Linux - rerun: on_new_revision URP_Terrain_Linux_Vulkan_Standalone_mono_Linear_CUSTOM-REVISION: name: URP_Terrain on Linux_Vulkan_Standalone_mono_Linear on version CUSTOM-REVISION agent: diff --git a/.yamato/urp_terrain-osx-metal.yml b/.yamato/urp_terrain-osx-metal.yml index 3dc0b028403..23779d25575 100644 --- a/.yamato/urp_terrain-osx-metal.yml +++ b/.yamato/urp_terrain-osx-metal.yml @@ -4,7 +4,6 @@ # Read more under .yamato/docs/readme.md {% metadata_file .yamato/_cache_config.metafile -%} -{% metadata_file .yamato/_latest_editor_versions_2021.2.metafile -%} {% metadata_file .yamato/_latest_editor_versions_trunk.metafile -%} --- @@ -91,88 +90,6 @@ URP_Terrain_OSX_Metal_playmode_mono_Linear_trunk: dependencies: - path: .yamato/_editor_priming.yml#editor:priming:trunk:OSX rerun: on_new_revision -URP_Terrain_OSX_Metal_Standalone_mono_Linear_2021.2: - name: URP_Terrain on OSX_Metal_Standalone_mono_Linear on version 2021.2 - agent: - type: Unity::metal::macmini - image: slough-ops/macos-10.14-xcode:stable - flavor: m1.mac - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - chmod +x utr - - command: scp -i ~/.ssh/id_rsa_macmini -r $YAMATO_SOURCE_DIR bokken@$BOKKEN_DEVICE_IP:~/Graphics - retries: 2 - - command: scp -i ~/.ssh/id_rsa_macmini ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP:~/.ssh/id_rsa_macmini - retries: 2 - - command: ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP "bash -lc 'pip3 install unity-downloader-cli --user --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade'" - retries: 2 - - command: ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP '$(python3 -m site --user-base)/bin/unity-downloader-cli --source-file ~/Graphics/unity_revision.txt -c editor -c il2cpp --wait --published-only' - retries: 2 - - command: |5- - ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; ~/Graphics/utr $CACHE_ARGS --artifacts_path=/Users/bokken/Graphics/TestProjects/UniversalGraphicsTest_Terrain/test-results --editor-location=.Editor --platform=StandaloneOSX --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=/Users/bokken/Graphics/TestProjects/UniversalGraphicsTest_Terrain --timeout=2400 --zero-tests-are-ok=1 " - UTR_RESULT=$? - mkdir -p TestProjects/UniversalGraphicsTest_Terrain/test-results/ - scp -i ~/.ssh/id_rsa_macmini -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/UniversalGraphicsTest_Terrain/test-results/ TestProjects/UniversalGraphicsTest_Terrain/test-results/ - exit $UTR_RESULT - after: - - command: pip3 install requests --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade - - command: python3 .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/UniversalGraphicsTest_Terrain/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:OSX - rerun: on_new_revision -URP_Terrain_OSX_Metal_playmode_mono_Linear_2021.2: - name: URP_Terrain on OSX_Metal_playmode_mono_Linear on version 2021.2 - agent: - type: Unity::metal::macmini - image: slough-ops/macos-10.14-xcode:stable - flavor: m1.mac - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - chmod +x utr - - command: scp -i ~/.ssh/id_rsa_macmini -r $YAMATO_SOURCE_DIR bokken@$BOKKEN_DEVICE_IP:~/Graphics - retries: 2 - - command: scp -i ~/.ssh/id_rsa_macmini ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP:~/.ssh/id_rsa_macmini - retries: 2 - - command: ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP "bash -lc 'pip3 install unity-downloader-cli --user --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade'" - retries: 2 - - command: ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP '$(python3 -m site --user-base)/bin/unity-downloader-cli --source-file ~/Graphics/unity_revision.txt -c editor -c il2cpp --wait --published-only' - retries: 2 - - command: |5- - ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; ~/Graphics/utr $CACHE_ARGS --artifacts_path=/Users/bokken/Graphics/TestProjects/UniversalGraphicsTest_Terrain/test-results --editor-location=/Users/bokken/.Editor --extra-editor-arg="-colorspace=Linear" --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=/Users/bokken/Graphics/TestProjects/UniversalGraphicsTest_Terrain --zero-tests-are-ok=1 " - UTR_RESULT=$? - mkdir -p TestProjects/UniversalGraphicsTest_Terrain/test-results/ - scp -i ~/.ssh/id_rsa_macmini -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/UniversalGraphicsTest_Terrain/test-results/ TestProjects/UniversalGraphicsTest_Terrain/test-results/ - exit $UTR_RESULT - after: - - command: pip3 install requests --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade - - command: python3 .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/UniversalGraphicsTest_Terrain/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:OSX - rerun: on_new_revision URP_Terrain_OSX_Metal_Standalone_mono_Linear_CUSTOM-REVISION: name: URP_Terrain on OSX_Metal_Standalone_mono_Linear on version CUSTOM-REVISION agent: diff --git a/.yamato/urp_terrain-osx-openglcore.yml b/.yamato/urp_terrain-osx-openglcore.yml index 97125818a56..2832175f286 100644 --- a/.yamato/urp_terrain-osx-openglcore.yml +++ b/.yamato/urp_terrain-osx-openglcore.yml @@ -4,7 +4,6 @@ # Read more under .yamato/docs/readme.md {% metadata_file .yamato/_cache_config.metafile -%} -{% metadata_file .yamato/_latest_editor_versions_2021.2.metafile -%} {% metadata_file .yamato/_latest_editor_versions_trunk.metafile -%} --- @@ -75,72 +74,6 @@ URP_Terrain_OSX_OpenGLCore_editmode_mono_Linear_trunk: dependencies: - path: .yamato/_editor_priming.yml#editor:priming:trunk:OSX rerun: on_new_revision -URP_Terrain_OSX_OpenGLCore_playmode_mono_Linear_2021.2: - name: URP_Terrain on OSX_OpenGLCore_playmode_mono_Linear on version 2021.2 - agent: - type: Unity::VM::osx - image: graphics-foundation/mac-10.15:v0.1.0-841394 - flavor: m1.mac - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - chmod +x utr - - command: brew tap --force-auto-update unity/unity git@github.cds.internal.unity3d.com:unity/homebrew-unity.git - - command: brew install unity-downloader-cli - retries: 2 - - command: unity-downloader-cli --source-file unity_revision.txt -c editor -c il2cpp --wait --published-only - retries: 2 - - command: ./utr $CACHE_ARGS --artifacts_path=TestProjects/UniversalGraphicsTest_Terrain/test-results --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=./TestProjects/UniversalGraphicsTest_Terrain --zero-tests-are-ok=1 - retries: 2 - after: - - command: python3 .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/UniversalGraphicsTest_Terrain/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:OSX - rerun: on_new_revision -URP_Terrain_OSX_OpenGLCore_editmode_mono_Linear_2021.2: - name: URP_Terrain on OSX_OpenGLCore_editmode_mono_Linear on version 2021.2 - agent: - type: Unity::VM::osx - image: graphics-foundation/mac-10.15:v0.1.0-841394 - flavor: m1.mac - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - chmod +x utr - - command: brew tap --force-auto-update unity/unity git@github.cds.internal.unity3d.com:unity/homebrew-unity.git - - command: brew install unity-downloader-cli - retries: 2 - - command: unity-downloader-cli --source-file unity_revision.txt -c editor -c il2cpp --wait --published-only - retries: 2 - - command: ./utr --artifacts_path=TestProjects/UniversalGraphicsTest_Terrain/test-results --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --platform=editmode --scripting-backend=Mono2x --suite=editor --testfilter=$TEST_FILTER --testproject=./TestProjects/UniversalGraphicsTest_Terrain --zero-tests-are-ok=1 - retries: 2 - after: - - command: python3 .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/UniversalGraphicsTest_Terrain/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:OSX - rerun: on_new_revision URP_Terrain_OSX_OpenGLCore_playmode_mono_Linear_CUSTOM-REVISION: name: URP_Terrain on OSX_OpenGLCore_playmode_mono_Linear on version CUSTOM-REVISION agent: diff --git a/.yamato/urp_terrain-win-dx11.yml b/.yamato/urp_terrain-win-dx11.yml index 8176114a39b..5464d7645dd 100644 --- a/.yamato/urp_terrain-win-dx11.yml +++ b/.yamato/urp_terrain-win-dx11.yml @@ -4,7 +4,6 @@ # Read more under .yamato/docs/readme.md {% metadata_file .yamato/_cache_config.metafile -%} -{% metadata_file .yamato/_latest_editor_versions_2021.2.metafile -%} {% metadata_file .yamato/_latest_editor_versions_trunk.metafile -%} --- @@ -260,257 +259,6 @@ Build_URP_Terrain_Win_DX11_Standalone_XR_mono_Linear_trunk: dependencies: - path: .yamato/_editor_priming.yml#editor:priming:trunk:Win rerun: on_new_revision -URP_Terrain_Win_DX11_Standalone_mono_Linear_2021.2: - name: URP_Terrain on Win_DX11_Standalone_mono_Linear on version 2021.2 - agent: - type: Unity::VM::GPU - image: sdet/gamecode_win10:stable - flavor: b1.xlarge - model: rtx2080 - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: NetSh Advfirewall set allprofiles state off - - cd Tools && powershell -command ". .\Unity.ps1; Set-ScreenResolution -width 1920 -Height 1080" - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr.bat --output utr.bat - retries: 2 - - command: |5- - git rev-parse HEAD | git show -s --format=%%cI > revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= /etc/apt/sources.list.d/unity.list" - - command: sudo apt update - - command: sudo apt install unity-downloader-cli - retries: 2 - - command: sudo unity-downloader-cli --source-file unity_revision.txt -c editor -c il2cpp --wait --published-only - retries: 2 - - command: DISPLAY=:0.0 ./utr $CACHE_ARGS --artifacts_path=TestProjects/VisualEffectGraph_HDRP/test-results --build-only --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-executemethod" --extra-editor-arg="SetupProject.ApplySettings" --extra-editor-arg="vulkan" --extra-editor-arg="Linear" --extra-editor-arg="-playergraphicsapi=Vulkan" --platform=StandaloneLinux64 --player-save-path=players --scripting-backend=Mono2x --suite=playmode --testfilter="VFX.Test" --testproject=./TestProjects/VisualEffectGraph_HDRP --timeout=1200 - after: - - command: python .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/VisualEffectGraph_HDRP/Logs/*.log" - players: - paths: - - "players*/**" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:Linux - rerun: on_new_revision -VFX_HDRP_Linux_Vulkan_Standalone_PerformanceTests_mono_Linear_2021.2: - name: VFX_HDRP on Linux_Vulkan_Standalone_PerformanceTests_mono_Linear on version 2021.2 - agent: - type: Unity::VM::GPU - image: package-ci/ubuntu:stable - flavor: b1.large - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - command: chmod +x utr - - command: DISPLAY=:0.0 ./utr --artifacts_path=TestProjects/VisualEffectGraph_HDRP/test-results --performance-project-version=. --report-performance-data --performance-project-id=VFX --platform=StandaloneLinux64 --player-connection-ip=auto --player-load-path=players --suite=playmode --timeout=1200 --zero-tests-are-ok=1 - after: - - command: python .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/VisualEffectGraph_HDRP/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:Linux - rerun: on_new_revision - - path: .yamato/vfx_hdrp-linux-vulkan.yml#Build_VFX_HDRP_Linux_Vulkan_Standalone_PerformanceTests_mono_Linear_2021.2 - rerun: on_new_revision -Build_VFX_HDRP_Linux_Vulkan_Standalone_PerformanceTests_mono_Linear_2021.2: - name: Build VFX_HDRP on Linux_Vulkan_mono_Linear_Standalone_PerformanceTests_build_Player on version 2021.2 - agent: - type: Unity::VM - image: package-ci/ubuntu:stable - flavor: b1.xlarge - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - command: chmod +x utr - - command: sudo rm -f /etc/apt/sources.list /etc/apt/sources.list.d/{nodesource,teamviewer,deadsnakes-ubuntu-ppa-}* - - command: curl -L https://artifactory.prd.it.unity3d.com/artifactory/api/gpg/key/public | sudo apt-key add - - - command: sudo sh -c "echo 'deb https://artifactory.prd.it.unity3d.com/artifactory/unity-apt-local bionic main' > /etc/apt/sources.list.d/unity.list" - - command: sudo apt update - - command: sudo apt install unity-downloader-cli - retries: 2 - - command: sudo unity-downloader-cli --source-file unity_revision.txt -c editor -c il2cpp --wait --published-only - retries: 2 - - command: DISPLAY=:0.0 ./utr $CACHE_ARGS --artifacts_path=TestProjects/VisualEffectGraph_HDRP/test-results --build-only --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-executemethod" --extra-editor-arg="SetupProject.ApplySettings" --extra-editor-arg="vulkan" --extra-editor-arg="Linear" --extra-editor-arg="-playergraphicsapi=Vulkan" --platform=StandaloneLinux64 --player-save-path=players --scripting-backend=Mono2x --suite=playmode --testfilter="VFX.PerformanceTest" --testproject=./TestProjects/VisualEffectGraph_HDRP --timeout=1200 - after: - - command: python .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/VisualEffectGraph_HDRP/Logs/*.log" - players: - paths: - - "players*/**" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:Linux - rerun: on_new_revision -VFX_HDRP_Linux_Vulkan_playmode_mono_Linear_2021.2: - name: VFX_HDRP on Linux_Vulkan_playmode_mono_Linear on version 2021.2 - agent: - type: Unity::VM::GPU - image: package-ci/ubuntu:stable - flavor: b1.large - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - command: chmod +x utr - - command: sudo rm -f /etc/apt/sources.list /etc/apt/sources.list.d/{nodesource,teamviewer,deadsnakes-ubuntu-ppa-}* - - command: curl -L https://artifactory.prd.it.unity3d.com/artifactory/api/gpg/key/public | sudo apt-key add - - - command: sudo sh -c "echo 'deb https://artifactory.prd.it.unity3d.com/artifactory/unity-apt-local bionic main' > /etc/apt/sources.list.d/unity.list" - - command: sudo apt update - - command: sudo apt install unity-downloader-cli - retries: 2 - - command: sudo unity-downloader-cli --source-file unity_revision.txt -c editor -c il2cpp --wait --published-only - retries: 2 - - command: DISPLAY=:0.0 ./utr $CACHE_ARGS --artifacts_path=TestProjects/VisualEffectGraph_HDRP/test-results --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-force-vulkan" --scripting-backend=Mono2x --suite=playmode --testfilter="VFX.Test" --testproject=./TestProjects/VisualEffectGraph_HDRP --zero-tests-are-ok=1 - after: - - command: python .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/VisualEffectGraph_HDRP/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:Linux - rerun: on_new_revision -VFX_HDRP_Linux_Vulkan_playmode_PerformanceTests_mono_Linear_2021.2: - name: VFX_HDRP on Linux_Vulkan_playmode_PerformanceTests_mono_Linear on version 2021.2 - agent: - type: Unity::VM::GPU - image: package-ci/ubuntu:stable - flavor: b1.large - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - command: chmod +x utr - - command: sudo rm -f /etc/apt/sources.list /etc/apt/sources.list.d/{nodesource,teamviewer,deadsnakes-ubuntu-ppa-}* - - command: curl -L https://artifactory.prd.it.unity3d.com/artifactory/api/gpg/key/public | sudo apt-key add - - - command: sudo sh -c "echo 'deb https://artifactory.prd.it.unity3d.com/artifactory/unity-apt-local bionic main' > /etc/apt/sources.list.d/unity.list" - - command: sudo apt update - - command: sudo apt install unity-downloader-cli - retries: 2 - - command: sudo unity-downloader-cli --source-file unity_revision.txt -c editor -c il2cpp --wait --published-only - retries: 2 - - command: DISPLAY=:0.0 ./utr $CACHE_ARGS --artifacts_path=TestProjects/VisualEffectGraph_HDRP/test-results --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-force-vulkan" --performance-project-version=. --report-performance-data --performance-project-id=VFX --scripting-backend=Mono2x --suite=playmode --testfilter="VFX.PerformanceTest" --testproject=./TestProjects/VisualEffectGraph_HDRP --zero-tests-are-ok=1 - after: - - command: python .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/VisualEffectGraph_HDRP/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:Linux - rerun: on_new_revision -VFX_HDRP_Linux_Vulkan_editmode_mono_Linear_2021.2: - name: VFX_HDRP on Linux_Vulkan_editmode_mono_Linear on version 2021.2 - agent: - type: Unity::VM - image: package-ci/ubuntu:stable - flavor: b1.large - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - command: chmod +x utr - - command: sudo rm -f /etc/apt/sources.list /etc/apt/sources.list.d/{nodesource,teamviewer,deadsnakes-ubuntu-ppa-}* - - command: curl -L https://artifactory.prd.it.unity3d.com/artifactory/api/gpg/key/public | sudo apt-key add - - - command: sudo sh -c "echo 'deb https://artifactory.prd.it.unity3d.com/artifactory/unity-apt-local bionic main' > /etc/apt/sources.list.d/unity.list" - - command: sudo apt update - - command: sudo apt install unity-downloader-cli - retries: 2 - - command: sudo unity-downloader-cli --source-file unity_revision.txt -c editor -c il2cpp --wait --published-only - retries: 2 - - command: DISPLAY=:0.0 ./utr --artifacts_path=TestProjects/VisualEffectGraph_HDRP/test-results --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-force-vulkan" --extra-editor-arg="-playergraphicsapi=Vulkan" --platform=editmode --scripting-backend=Mono2x --suite=editor --testfilter="VFX.Test" --testproject=./TestProjects/VisualEffectGraph_HDRP --zero-tests-are-ok=1 - after: - - command: python .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/VisualEffectGraph_HDRP/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:Linux - rerun: on_new_revision -VFX_HDRP_Linux_Vulkan_editmode_PerformanceTests_mono_Linear_2021.2: - name: VFX_HDRP on Linux_Vulkan_editmode_PerformanceTests_mono_Linear on version 2021.2 - agent: - type: Unity::VM::GPU - image: package-ci/ubuntu:stable - flavor: b1.large - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - command: chmod +x utr - - command: sudo rm -f /etc/apt/sources.list /etc/apt/sources.list.d/{nodesource,teamviewer,deadsnakes-ubuntu-ppa-}* - - command: curl -L https://artifactory.prd.it.unity3d.com/artifactory/api/gpg/key/public | sudo apt-key add - - - command: sudo sh -c "echo 'deb https://artifactory.prd.it.unity3d.com/artifactory/unity-apt-local bionic main' > /etc/apt/sources.list.d/unity.list" - - command: sudo apt update - - command: sudo apt install unity-downloader-cli - retries: 2 - - command: sudo unity-downloader-cli --source-file unity_revision.txt -c editor -c il2cpp --wait --published-only - retries: 2 - - command: DISPLAY=:0.0 ./utr --artifacts_path=TestProjects/VisualEffectGraph_HDRP/test-results --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-force-vulkan" --extra-editor-arg="-playergraphicsapi=Vulkan" --performance-project-version=. --report-performance-data --performance-project-id=VFX --platform=editmode --scripting-backend=Mono2x --suite=editor --testfilter="VFX.PerformanceTest" --testproject=./TestProjects/VisualEffectGraph_HDRP --zero-tests-are-ok=1 - after: - - command: python .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/VisualEffectGraph_HDRP/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:Linux - rerun: on_new_revision VFX_HDRP_Linux_Vulkan_Standalone_mono_Linear_CUSTOM-REVISION: name: VFX_HDRP on Linux_Vulkan_Standalone_mono_Linear on version CUSTOM-REVISION agent: diff --git a/.yamato/vfx_hdrp-osx-metal.yml b/.yamato/vfx_hdrp-osx-metal.yml index e6451a851d8..2cadf3169b4 100644 --- a/.yamato/vfx_hdrp-osx-metal.yml +++ b/.yamato/vfx_hdrp-osx-metal.yml @@ -4,7 +4,6 @@ # Read more under .yamato/docs/readme.md {% metadata_file .yamato/_cache_config.metafile -%} -{% metadata_file .yamato/_latest_editor_versions_2021.2.metafile -%} {% metadata_file .yamato/_latest_editor_versions_trunk.metafile -%} --- @@ -255,252 +254,6 @@ VFX_HDRP_OSX_Metal_editmode_PerformanceTests_mono_Linear_trunk: dependencies: - path: .yamato/_editor_priming.yml#editor:priming:trunk:OSX rerun: on_new_revision -VFX_HDRP_OSX_Metal_Standalone_mono_Linear_2021.2: - name: VFX_HDRP on OSX_Metal_Standalone_mono_Linear on version 2021.2 - agent: - type: Unity::metal::macmini - image: slough-ops/macos-10.14-xcode:stable - flavor: m1.mac - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - chmod +x utr - - command: scp -i ~/.ssh/id_rsa_macmini -r $YAMATO_SOURCE_DIR bokken@$BOKKEN_DEVICE_IP:~/Graphics - retries: 2 - - command: scp -i ~/.ssh/id_rsa_macmini ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP:~/.ssh/id_rsa_macmini - retries: 2 - - command: ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP "bash -lc 'pip3 install unity-downloader-cli --user --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade'" - retries: 2 - - command: ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP '$(python3 -m site --user-base)/bin/unity-downloader-cli --source-file ~/Graphics/unity_revision.txt -c editor -c il2cpp --wait --published-only' - retries: 2 - - command: |5- - ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; ~/Graphics/utr $CACHE_ARGS --artifacts_path=/Users/bokken/Graphics/TestProjects/VisualEffectGraph_HDRP/test-results --editor-location=.Editor --platform=StandaloneOSX --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=/Users/bokken/Graphics/TestProjects/VisualEffectGraph_HDRP --timeout=2400 --zero-tests-are-ok=1 " - UTR_RESULT=$? - mkdir -p TestProjects/VisualEffectGraph_HDRP/test-results/ - scp -i ~/.ssh/id_rsa_macmini -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/VisualEffectGraph_HDRP/test-results/ TestProjects/VisualEffectGraph_HDRP/test-results/ - exit $UTR_RESULT - after: - - command: pip3 install requests --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade - - command: python3 .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/VisualEffectGraph_HDRP/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:OSX - rerun: on_new_revision -VFX_HDRP_OSX_Metal_Standalone_PerformanceTests_mono_Linear_2021.2: - name: VFX_HDRP on OSX_Metal_Standalone_PerformanceTests_mono_Linear on version 2021.2 - agent: - type: Unity::metal::macmini - image: slough-ops/macos-10.14-xcode:stable - flavor: m1.mac - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - chmod +x utr - - command: scp -i ~/.ssh/id_rsa_macmini -r $YAMATO_SOURCE_DIR bokken@$BOKKEN_DEVICE_IP:~/Graphics - retries: 2 - - command: scp -i ~/.ssh/id_rsa_macmini ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP:~/.ssh/id_rsa_macmini - retries: 2 - - command: ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP "bash -lc 'pip3 install unity-downloader-cli --user --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade'" - retries: 2 - - command: ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP '$(python3 -m site --user-base)/bin/unity-downloader-cli --source-file ~/Graphics/unity_revision.txt -c editor -c il2cpp --wait --published-only' - retries: 2 - - command: |5- - ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; ~/Graphics/utr $CACHE_ARGS --artifacts_path=/Users/bokken/Graphics/TestProjects/VisualEffectGraph_HDRP/test-results --editor-location=.Editor --performance-project-version=. --report-performance-data --performance-project-id=VFX --platform=StandaloneOSX --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=/Users/bokken/Graphics/TestProjects/VisualEffectGraph_HDRP --timeout=1200 --zero-tests-are-ok=1 " - UTR_RESULT=$? - mkdir -p TestProjects/VisualEffectGraph_HDRP/test-results/ - scp -i ~/.ssh/id_rsa_macmini -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/VisualEffectGraph_HDRP/test-results/ TestProjects/VisualEffectGraph_HDRP/test-results/ - exit $UTR_RESULT - after: - - command: pip3 install requests --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade - - command: python3 .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/VisualEffectGraph_HDRP/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:OSX - rerun: on_new_revision -VFX_HDRP_OSX_Metal_playmode_mono_Linear_2021.2: - name: VFX_HDRP on OSX_Metal_playmode_mono_Linear on version 2021.2 - agent: - type: Unity::metal::macmini - image: slough-ops/macos-10.14-xcode:stable - flavor: m1.mac - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - chmod +x utr - - command: scp -i ~/.ssh/id_rsa_macmini -r $YAMATO_SOURCE_DIR bokken@$BOKKEN_DEVICE_IP:~/Graphics - retries: 2 - - command: scp -i ~/.ssh/id_rsa_macmini ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP:~/.ssh/id_rsa_macmini - retries: 2 - - command: ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP "bash -lc 'pip3 install unity-downloader-cli --user --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade'" - retries: 2 - - command: ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP '$(python3 -m site --user-base)/bin/unity-downloader-cli --source-file ~/Graphics/unity_revision.txt -c editor -c il2cpp --wait --published-only' - retries: 2 - - command: |5- - ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; ~/Graphics/utr $CACHE_ARGS --artifacts_path=/Users/bokken/Graphics/TestProjects/VisualEffectGraph_HDRP/test-results --editor-location=/Users/bokken/.Editor --extra-editor-arg="-colorspace=Linear" --scripting-backend=Mono2x --suite=playmode --testfilter="VFX.Test" --testproject=/Users/bokken/Graphics/TestProjects/VisualEffectGraph_HDRP --zero-tests-are-ok=1 " - UTR_RESULT=$? - mkdir -p TestProjects/VisualEffectGraph_HDRP/test-results/ - scp -i ~/.ssh/id_rsa_macmini -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/VisualEffectGraph_HDRP/test-results/ TestProjects/VisualEffectGraph_HDRP/test-results/ - exit $UTR_RESULT - after: - - command: pip3 install requests --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade - - command: python3 .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/VisualEffectGraph_HDRP/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:OSX - rerun: on_new_revision -VFX_HDRP_OSX_Metal_playmode_XR_mono_Linear_2021.2: - name: VFX_HDRP on OSX_Metal_playmode_XR_mono_Linear on version 2021.2 - agent: - type: Unity::metal::macmini - image: slough-ops/macos-10.14-xcode:stable - flavor: m1.mac - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - chmod +x utr - - command: scp -i ~/.ssh/id_rsa_macmini -r $YAMATO_SOURCE_DIR bokken@$BOKKEN_DEVICE_IP:~/Graphics - retries: 2 - - command: scp -i ~/.ssh/id_rsa_macmini ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP:~/.ssh/id_rsa_macmini - retries: 2 - - command: ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP "bash -lc 'pip3 install unity-downloader-cli --user --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade'" - retries: 2 - - command: ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP '$(python3 -m site --user-base)/bin/unity-downloader-cli --source-file ~/Graphics/unity_revision.txt -c editor -c il2cpp --wait --published-only' - retries: 2 - - command: |5- - ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; ~/Graphics/utr $CACHE_ARGS --artifacts_path=/Users/bokken/Graphics/TestProjects/VisualEffectGraph_HDRP/test-results --editor-location=/Users/bokken/.Editor --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-xr-reuse-tests" --scripting-backend=Mono2x --suite=playmode --testfilter="VFX.Test" --testproject=/Users/bokken/Graphics/TestProjects/VisualEffectGraph_HDRP --zero-tests-are-ok=1 " - UTR_RESULT=$? - mkdir -p TestProjects/VisualEffectGraph_HDRP/test-results/ - scp -i ~/.ssh/id_rsa_macmini -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/VisualEffectGraph_HDRP/test-results/ TestProjects/VisualEffectGraph_HDRP/test-results/ - exit $UTR_RESULT - after: - - command: pip3 install requests --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade - - command: python3 .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/VisualEffectGraph_HDRP/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:OSX - rerun: on_new_revision -VFX_HDRP_OSX_Metal_playmode_PerformanceTests_mono_Linear_2021.2: - name: VFX_HDRP on OSX_Metal_playmode_PerformanceTests_mono_Linear on version 2021.2 - agent: - type: Unity::metal::macmini - image: slough-ops/macos-10.14-xcode:stable - flavor: m1.mac - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - chmod +x utr - - command: scp -i ~/.ssh/id_rsa_macmini -r $YAMATO_SOURCE_DIR bokken@$BOKKEN_DEVICE_IP:~/Graphics - retries: 2 - - command: scp -i ~/.ssh/id_rsa_macmini ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP:~/.ssh/id_rsa_macmini - retries: 2 - - command: ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP "bash -lc 'pip3 install unity-downloader-cli --user --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade'" - retries: 2 - - command: ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP '$(python3 -m site --user-base)/bin/unity-downloader-cli --source-file ~/Graphics/unity_revision.txt -c editor -c il2cpp --wait --published-only' - retries: 2 - - command: |5- - ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; ~/Graphics/utr $CACHE_ARGS --artifacts_path=/Users/bokken/Graphics/TestProjects/VisualEffectGraph_HDRP/test-results --editor-location=/Users/bokken/.Editor --extra-editor-arg="-colorspace=Linear" --performance-project-version=. --report-performance-data --performance-project-id=VFX --scripting-backend=Mono2x --suite=playmode --testfilter="VFX.PerformanceTest" --testproject=/Users/bokken/Graphics/TestProjects/VisualEffectGraph_HDRP --zero-tests-are-ok=1 " - UTR_RESULT=$? - mkdir -p TestProjects/VisualEffectGraph_HDRP/test-results/ - scp -i ~/.ssh/id_rsa_macmini -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/VisualEffectGraph_HDRP/test-results/ TestProjects/VisualEffectGraph_HDRP/test-results/ - exit $UTR_RESULT - after: - - command: pip3 install requests --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade - - command: python3 .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/VisualEffectGraph_HDRP/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:OSX - rerun: on_new_revision -VFX_HDRP_OSX_Metal_editmode_PerformanceTests_mono_Linear_2021.2: - name: VFX_HDRP on OSX_Metal_editmode_PerformanceTests_mono_Linear on version 2021.2 - agent: - type: Unity::metal::macmini - image: slough-ops/macos-10.14-xcode:stable - flavor: m1.mac - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - chmod +x utr - - command: scp -i ~/.ssh/id_rsa_macmini -r $YAMATO_SOURCE_DIR bokken@$BOKKEN_DEVICE_IP:~/Graphics - retries: 2 - - command: scp -i ~/.ssh/id_rsa_macmini ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP:~/.ssh/id_rsa_macmini - retries: 2 - - command: ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP "bash -lc 'pip3 install unity-downloader-cli --user --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade'" - retries: 2 - - command: ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP '$(python3 -m site --user-base)/bin/unity-downloader-cli --source-file ~/Graphics/unity_revision.txt -c editor -c il2cpp --wait --published-only' - retries: 2 - - command: |5- - ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; ~/Graphics/utr --artifacts_path=/Users/bokken/Graphics/TestProjects/VisualEffectGraph_HDRP/test-results --editor-location=/Users/bokken/.Editor --extra-editor-arg="-colorspace=Linear" --performance-project-version=. --report-performance-data --performance-project-id=VFX --platform=editmode --scripting-backend=Mono2x --suite=editor --testfilter="VFX.PerformanceTest" --testproject=/Users/bokken/Graphics/TestProjects/VisualEffectGraph_HDRP --zero-tests-are-ok=1 " - UTR_RESULT=$? - mkdir -p TestProjects/VisualEffectGraph_HDRP/test-results/ - scp -i ~/.ssh/id_rsa_macmini -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/VisualEffectGraph_HDRP/test-results/ TestProjects/VisualEffectGraph_HDRP/test-results/ - exit $UTR_RESULT - after: - - command: pip3 install requests --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade - - command: python3 .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/VisualEffectGraph_HDRP/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:OSX - rerun: on_new_revision VFX_HDRP_OSX_Metal_Standalone_mono_Linear_CUSTOM-REVISION: name: VFX_HDRP on OSX_Metal_Standalone_mono_Linear on version CUSTOM-REVISION agent: diff --git a/.yamato/vfx_hdrp-win-dx11.yml b/.yamato/vfx_hdrp-win-dx11.yml index ebcf8199682..a11243018e7 100644 --- a/.yamato/vfx_hdrp-win-dx11.yml +++ b/.yamato/vfx_hdrp-win-dx11.yml @@ -4,7 +4,6 @@ # Read more under .yamato/docs/readme.md {% metadata_file .yamato/_cache_config.metafile -%} -{% metadata_file .yamato/_latest_editor_versions_2021.2.metafile -%} {% metadata_file .yamato/_latest_editor_versions_trunk.metafile -%} --- @@ -323,320 +322,6 @@ VFX_HDRP_Win_DX11_editmode_PerformanceTests_mono_Linear_trunk: dependencies: - path: .yamato/_editor_priming.yml#editor:priming:trunk:Win rerun: on_new_revision -VFX_HDRP_Win_DX11_Standalone_mono_Linear_2021.2: - name: VFX_HDRP on Win_DX11_Standalone_mono_Linear on version 2021.2 - agent: - type: Unity::VM::GPU - image: sdet/gamecode_win10:stable - flavor: b1.xlarge - model: rtx2080 - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: NetSh Advfirewall set allprofiles state off - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr.bat --output utr.bat - retries: 2 - - command: |5- - git rev-parse HEAD | git show -s --format=%%cI > revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= /etc/apt/sources.list.d/unity.list" - - command: sudo apt update - - command: sudo apt install unity-downloader-cli - retries: 2 - - command: sudo unity-downloader-cli --source-file unity_revision.txt -c editor -c il2cpp --wait --published-only - retries: 2 - - command: DISPLAY=:0.0 ./utr $CACHE_ARGS --artifacts_path=TestProjects/VisualEffectGraph_URP/test-results --build-only --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --platform=StandaloneLinux64 --player-save-path=players --scripting-backend=Mono2x --suite=playmode --testfilter="VFX.PerformanceTest" --testproject=./TestProjects/VisualEffectGraph_URP --timeout=1200 - after: - - command: python .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/VisualEffectGraph_URP/Logs/*.log" - players: - paths: - - "players*/**" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:Linux - rerun: on_new_revision -VFX_URP_Linux_OpenGLCore_playmode_mono_Linear_2021.2: - name: VFX_URP on Linux_OpenGLCore_playmode_mono_Linear on version 2021.2 - agent: - type: Unity::VM::GPU - image: package-ci/ubuntu:stable - flavor: b1.large - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - command: chmod +x utr - - command: sudo rm -f /etc/apt/sources.list /etc/apt/sources.list.d/{nodesource,teamviewer,deadsnakes-ubuntu-ppa-}* - - command: curl -L https://artifactory.prd.it.unity3d.com/artifactory/api/gpg/key/public | sudo apt-key add - - - command: sudo sh -c "echo 'deb https://artifactory.prd.it.unity3d.com/artifactory/unity-apt-local bionic main' > /etc/apt/sources.list.d/unity.list" - - command: sudo apt update - - command: sudo apt install unity-downloader-cli - retries: 2 - - command: sudo unity-downloader-cli --source-file unity_revision.txt -c editor -c il2cpp --wait --published-only - retries: 2 - - command: DISPLAY=:0.0 ./utr $CACHE_ARGS --artifacts_path=TestProjects/VisualEffectGraph_URP/test-results --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-force-glcore" --scripting-backend=Mono2x --suite=playmode --testfilter="VFX.Test" --testproject=./TestProjects/VisualEffectGraph_URP --zero-tests-are-ok=1 - after: - - command: python .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/VisualEffectGraph_URP/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:Linux - rerun: on_new_revision -VFX_URP_Linux_OpenGLCore_playmode_PerformanceTests_mono_Linear_2021.2: - name: VFX_URP on Linux_OpenGLCore_playmode_PerformanceTests_mono_Linear on version 2021.2 - agent: - type: Unity::VM::GPU - image: package-ci/ubuntu:stable - flavor: b1.large - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - command: chmod +x utr - - command: sudo rm -f /etc/apt/sources.list /etc/apt/sources.list.d/{nodesource,teamviewer,deadsnakes-ubuntu-ppa-}* - - command: curl -L https://artifactory.prd.it.unity3d.com/artifactory/api/gpg/key/public | sudo apt-key add - - - command: sudo sh -c "echo 'deb https://artifactory.prd.it.unity3d.com/artifactory/unity-apt-local bionic main' > /etc/apt/sources.list.d/unity.list" - - command: sudo apt update - - command: sudo apt install unity-downloader-cli - retries: 2 - - command: sudo unity-downloader-cli --source-file unity_revision.txt -c editor -c il2cpp --wait --published-only - retries: 2 - - command: DISPLAY=:0.0 ./utr $CACHE_ARGS --artifacts_path=TestProjects/VisualEffectGraph_URP/test-results --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-force-glcore" --performance-project-version=. --report-performance-data --performance-project-id=VFX --scripting-backend=Mono2x --suite=playmode --testfilter="VFX.PerformanceTest" --testproject=./TestProjects/VisualEffectGraph_URP --zero-tests-are-ok=1 - after: - - command: python .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/VisualEffectGraph_URP/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:Linux - rerun: on_new_revision -VFX_URP_Linux_OpenGLCore_editmode_mono_Linear_2021.2: - name: VFX_URP on Linux_OpenGLCore_editmode_mono_Linear on version 2021.2 - agent: - type: Unity::VM - image: package-ci/ubuntu:stable - flavor: b1.large - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - command: chmod +x utr - - command: sudo rm -f /etc/apt/sources.list /etc/apt/sources.list.d/{nodesource,teamviewer,deadsnakes-ubuntu-ppa-}* - - command: curl -L https://artifactory.prd.it.unity3d.com/artifactory/api/gpg/key/public | sudo apt-key add - - - command: sudo sh -c "echo 'deb https://artifactory.prd.it.unity3d.com/artifactory/unity-apt-local bionic main' > /etc/apt/sources.list.d/unity.list" - - command: sudo apt update - - command: sudo apt install unity-downloader-cli - retries: 2 - - command: sudo unity-downloader-cli --source-file unity_revision.txt -c editor -c il2cpp --wait --published-only - retries: 2 - - command: DISPLAY=:0.0 ./utr --artifacts_path=TestProjects/VisualEffectGraph_URP/test-results --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-force-glcore" --platform=editmode --scripting-backend=Mono2x --suite=editor --testfilter="VFX.Test" --testproject=./TestProjects/VisualEffectGraph_URP --zero-tests-are-ok=1 - after: - - command: python .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/VisualEffectGraph_URP/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:Linux - rerun: on_new_revision -VFX_URP_Linux_OpenGLCore_editmode_PerformanceTests_mono_Linear_2021.2: - name: VFX_URP on Linux_OpenGLCore_editmode_PerformanceTests_mono_Linear on version 2021.2 - agent: - type: Unity::VM::GPU - image: package-ci/ubuntu:stable - flavor: b1.large - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - command: chmod +x utr - - command: sudo rm -f /etc/apt/sources.list /etc/apt/sources.list.d/{nodesource,teamviewer,deadsnakes-ubuntu-ppa-}* - - command: curl -L https://artifactory.prd.it.unity3d.com/artifactory/api/gpg/key/public | sudo apt-key add - - - command: sudo sh -c "echo 'deb https://artifactory.prd.it.unity3d.com/artifactory/unity-apt-local bionic main' > /etc/apt/sources.list.d/unity.list" - - command: sudo apt update - - command: sudo apt install unity-downloader-cli - retries: 2 - - command: sudo unity-downloader-cli --source-file unity_revision.txt -c editor -c il2cpp --wait --published-only - retries: 2 - - command: DISPLAY=:0.0 ./utr --artifacts_path=TestProjects/VisualEffectGraph_URP/test-results --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-force-glcore" --performance-project-version=. --report-performance-data --performance-project-id=VFX --platform=editmode --scripting-backend=Mono2x --suite=editor --testfilter="VFX.PerformanceTest" --testproject=./TestProjects/VisualEffectGraph_URP --zero-tests-are-ok=1 - after: - - command: python .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/VisualEffectGraph_URP/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:Linux - rerun: on_new_revision VFX_URP_Linux_OpenGLCore_Standalone_PerformanceTests_mono_Linear_CUSTOM-REVISION: name: VFX_URP on Linux_OpenGLCore_Standalone_PerformanceTests_mono_Linear on version CUSTOM-REVISION agent: diff --git a/.yamato/vfx_urp-linux-vulkan.yml b/.yamato/vfx_urp-linux-vulkan.yml index b8292d17f9b..07f016864f9 100644 --- a/.yamato/vfx_urp-linux-vulkan.yml +++ b/.yamato/vfx_urp-linux-vulkan.yml @@ -4,7 +4,6 @@ # Read more under .yamato/docs/readme.md {% metadata_file .yamato/_cache_config.metafile -%} -{% metadata_file .yamato/_latest_editor_versions_2021.2.metafile -%} {% metadata_file .yamato/_latest_editor_versions_trunk.metafile -%} --- @@ -283,280 +282,6 @@ VFX_URP_Linux_Vulkan_editmode_PerformanceTests_mono_Linear_trunk: dependencies: - path: .yamato/_editor_priming.yml#editor:priming:trunk:Linux rerun: on_new_revision -VFX_URP_Linux_Vulkan_Standalone_mono_Linear_2021.2: - name: VFX_URP on Linux_Vulkan_Standalone_mono_Linear on version 2021.2 - agent: - type: Unity::VM::GPU - image: package-ci/ubuntu:stable - flavor: b1.large - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - command: chmod +x utr - - command: DISPLAY=:0.0 ./utr --artifacts_path=TestProjects/VisualEffectGraph_URP/test-results --platform=StandaloneLinux64 --player-connection-ip=auto --player-load-path=players --suite=playmode --timeout=1200 --zero-tests-are-ok=1 - after: - - command: python .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/VisualEffectGraph_URP/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:Linux - rerun: on_new_revision - - path: .yamato/vfx_urp-linux-vulkan.yml#Build_VFX_URP_Linux_Vulkan_Standalone_mono_Linear_2021.2 - rerun: on_new_revision -Build_VFX_URP_Linux_Vulkan_Standalone_mono_Linear_2021.2: - name: Build VFX_URP on Linux_Vulkan_mono_Linear_Standalone_build_Player on version 2021.2 - agent: - type: Unity::VM - image: package-ci/ubuntu:stable - flavor: b1.xlarge - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - command: chmod +x utr - - command: sudo rm -f /etc/apt/sources.list /etc/apt/sources.list.d/{nodesource,teamviewer,deadsnakes-ubuntu-ppa-}* - - command: curl -L https://artifactory.prd.it.unity3d.com/artifactory/api/gpg/key/public | sudo apt-key add - - - command: sudo sh -c "echo 'deb https://artifactory.prd.it.unity3d.com/artifactory/unity-apt-local bionic main' > /etc/apt/sources.list.d/unity.list" - - command: sudo apt update - - command: sudo apt install unity-downloader-cli - retries: 2 - - command: sudo unity-downloader-cli --source-file unity_revision.txt -c editor -c il2cpp --wait --published-only - retries: 2 - - command: DISPLAY=:0.0 ./utr $CACHE_ARGS --artifacts_path=TestProjects/VisualEffectGraph_URP/test-results --build-only --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-executemethod" --extra-editor-arg="SetupProject.ApplySettings" --extra-editor-arg="vulkan" --extra-editor-arg="Linear" --extra-editor-arg="-playergraphicsapi=Vulkan" --platform=StandaloneLinux64 --player-save-path=players --scripting-backend=Mono2x --suite=playmode --testfilter="VFX.Test" --testproject=./TestProjects/VisualEffectGraph_URP --timeout=1200 - after: - - command: python .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/VisualEffectGraph_URP/Logs/*.log" - players: - paths: - - "players*/**" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:Linux - rerun: on_new_revision -VFX_URP_Linux_Vulkan_Standalone_PerformanceTests_mono_Linear_2021.2: - name: VFX_URP on Linux_Vulkan_Standalone_PerformanceTests_mono_Linear on version 2021.2 - agent: - type: Unity::VM::GPU - image: package-ci/ubuntu:stable - flavor: b1.large - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - command: chmod +x utr - - command: DISPLAY=:0.0 ./utr --artifacts_path=TestProjects/VisualEffectGraph_URP/test-results --performance-project-version=. --report-performance-data --performance-project-id=VFX --platform=StandaloneLinux64 --player-connection-ip=auto --player-load-path=players --suite=playmode --timeout=1200 --zero-tests-are-ok=1 - after: - - command: python .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/VisualEffectGraph_URP/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:Linux - rerun: on_new_revision - - path: .yamato/vfx_urp-linux-vulkan.yml#Build_VFX_URP_Linux_Vulkan_Standalone_PerformanceTests_mono_Linear_2021.2 - rerun: on_new_revision -Build_VFX_URP_Linux_Vulkan_Standalone_PerformanceTests_mono_Linear_2021.2: - name: Build VFX_URP on Linux_Vulkan_mono_Linear_Standalone_PerformanceTests_build_Player on version 2021.2 - agent: - type: Unity::VM - image: package-ci/ubuntu:stable - flavor: b1.xlarge - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - command: chmod +x utr - - command: sudo rm -f /etc/apt/sources.list /etc/apt/sources.list.d/{nodesource,teamviewer,deadsnakes-ubuntu-ppa-}* - - command: curl -L https://artifactory.prd.it.unity3d.com/artifactory/api/gpg/key/public | sudo apt-key add - - - command: sudo sh -c "echo 'deb https://artifactory.prd.it.unity3d.com/artifactory/unity-apt-local bionic main' > /etc/apt/sources.list.d/unity.list" - - command: sudo apt update - - command: sudo apt install unity-downloader-cli - retries: 2 - - command: sudo unity-downloader-cli --source-file unity_revision.txt -c editor -c il2cpp --wait --published-only - retries: 2 - - command: DISPLAY=:0.0 ./utr $CACHE_ARGS --artifacts_path=TestProjects/VisualEffectGraph_URP/test-results --build-only --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-executemethod" --extra-editor-arg="SetupProject.ApplySettings" --extra-editor-arg="vulkan" --extra-editor-arg="Linear" --extra-editor-arg="-playergraphicsapi=Vulkan" --platform=StandaloneLinux64 --player-save-path=players --scripting-backend=Mono2x --suite=playmode --testfilter="VFX.PerformanceTest" --testproject=./TestProjects/VisualEffectGraph_URP --timeout=1200 - after: - - command: python .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/VisualEffectGraph_URP/Logs/*.log" - players: - paths: - - "players*/**" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:Linux - rerun: on_new_revision -VFX_URP_Linux_Vulkan_playmode_mono_Linear_2021.2: - name: VFX_URP on Linux_Vulkan_playmode_mono_Linear on version 2021.2 - agent: - type: Unity::VM::GPU - image: package-ci/ubuntu:stable - flavor: b1.large - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - command: chmod +x utr - - command: sudo rm -f /etc/apt/sources.list /etc/apt/sources.list.d/{nodesource,teamviewer,deadsnakes-ubuntu-ppa-}* - - command: curl -L https://artifactory.prd.it.unity3d.com/artifactory/api/gpg/key/public | sudo apt-key add - - - command: sudo sh -c "echo 'deb https://artifactory.prd.it.unity3d.com/artifactory/unity-apt-local bionic main' > /etc/apt/sources.list.d/unity.list" - - command: sudo apt update - - command: sudo apt install unity-downloader-cli - retries: 2 - - command: sudo unity-downloader-cli --source-file unity_revision.txt -c editor -c il2cpp --wait --published-only - retries: 2 - - command: DISPLAY=:0.0 ./utr $CACHE_ARGS --artifacts_path=TestProjects/VisualEffectGraph_URP/test-results --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-force-vulkan" --scripting-backend=Mono2x --suite=playmode --testfilter="VFX.Test" --testproject=./TestProjects/VisualEffectGraph_URP --zero-tests-are-ok=1 - after: - - command: python .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/VisualEffectGraph_URP/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:Linux - rerun: on_new_revision -VFX_URP_Linux_Vulkan_playmode_PerformanceTests_mono_Linear_2021.2: - name: VFX_URP on Linux_Vulkan_playmode_PerformanceTests_mono_Linear on version 2021.2 - agent: - type: Unity::VM::GPU - image: package-ci/ubuntu:stable - flavor: b1.large - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - command: chmod +x utr - - command: sudo rm -f /etc/apt/sources.list /etc/apt/sources.list.d/{nodesource,teamviewer,deadsnakes-ubuntu-ppa-}* - - command: curl -L https://artifactory.prd.it.unity3d.com/artifactory/api/gpg/key/public | sudo apt-key add - - - command: sudo sh -c "echo 'deb https://artifactory.prd.it.unity3d.com/artifactory/unity-apt-local bionic main' > /etc/apt/sources.list.d/unity.list" - - command: sudo apt update - - command: sudo apt install unity-downloader-cli - retries: 2 - - command: sudo unity-downloader-cli --source-file unity_revision.txt -c editor -c il2cpp --wait --published-only - retries: 2 - - command: DISPLAY=:0.0 ./utr $CACHE_ARGS --artifacts_path=TestProjects/VisualEffectGraph_URP/test-results --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-force-vulkan" --performance-project-version=. --report-performance-data --performance-project-id=VFX --scripting-backend=Mono2x --suite=playmode --testfilter="VFX.PerformanceTest" --testproject=./TestProjects/VisualEffectGraph_URP --zero-tests-are-ok=1 - after: - - command: python .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/VisualEffectGraph_URP/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:Linux - rerun: on_new_revision -VFX_URP_Linux_Vulkan_editmode_mono_Linear_2021.2: - name: VFX_URP on Linux_Vulkan_editmode_mono_Linear on version 2021.2 - agent: - type: Unity::VM - image: package-ci/ubuntu:stable - flavor: b1.large - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - command: chmod +x utr - - command: sudo rm -f /etc/apt/sources.list /etc/apt/sources.list.d/{nodesource,teamviewer,deadsnakes-ubuntu-ppa-}* - - command: curl -L https://artifactory.prd.it.unity3d.com/artifactory/api/gpg/key/public | sudo apt-key add - - - command: sudo sh -c "echo 'deb https://artifactory.prd.it.unity3d.com/artifactory/unity-apt-local bionic main' > /etc/apt/sources.list.d/unity.list" - - command: sudo apt update - - command: sudo apt install unity-downloader-cli - retries: 2 - - command: sudo unity-downloader-cli --source-file unity_revision.txt -c editor -c il2cpp --wait --published-only - retries: 2 - - command: DISPLAY=:0.0 ./utr --artifacts_path=TestProjects/VisualEffectGraph_URP/test-results --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-force-vulkan" --extra-editor-arg="-playergraphicsapi=Vulkan" --platform=editmode --scripting-backend=Mono2x --suite=editor --testfilter="VFX.Test" --testproject=./TestProjects/VisualEffectGraph_URP --zero-tests-are-ok=1 - after: - - command: python .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/VisualEffectGraph_URP/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:Linux - rerun: on_new_revision -VFX_URP_Linux_Vulkan_editmode_PerformanceTests_mono_Linear_2021.2: - name: VFX_URP on Linux_Vulkan_editmode_PerformanceTests_mono_Linear on version 2021.2 - agent: - type: Unity::VM::GPU - image: package-ci/ubuntu:stable - flavor: b1.large - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - command: chmod +x utr - - command: sudo rm -f /etc/apt/sources.list /etc/apt/sources.list.d/{nodesource,teamviewer,deadsnakes-ubuntu-ppa-}* - - command: curl -L https://artifactory.prd.it.unity3d.com/artifactory/api/gpg/key/public | sudo apt-key add - - - command: sudo sh -c "echo 'deb https://artifactory.prd.it.unity3d.com/artifactory/unity-apt-local bionic main' > /etc/apt/sources.list.d/unity.list" - - command: sudo apt update - - command: sudo apt install unity-downloader-cli - retries: 2 - - command: sudo unity-downloader-cli --source-file unity_revision.txt -c editor -c il2cpp --wait --published-only - retries: 2 - - command: DISPLAY=:0.0 ./utr --artifacts_path=TestProjects/VisualEffectGraph_URP/test-results --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-force-vulkan" --extra-editor-arg="-playergraphicsapi=Vulkan" --performance-project-version=. --report-performance-data --performance-project-id=VFX --platform=editmode --scripting-backend=Mono2x --suite=editor --testfilter="VFX.PerformanceTest" --testproject=./TestProjects/VisualEffectGraph_URP --zero-tests-are-ok=1 - after: - - command: python .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/VisualEffectGraph_URP/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:Linux - rerun: on_new_revision VFX_URP_Linux_Vulkan_Standalone_mono_Linear_CUSTOM-REVISION: name: VFX_URP on Linux_Vulkan_Standalone_mono_Linear on version CUSTOM-REVISION agent: diff --git a/.yamato/vfx_urp-osx-metal.yml b/.yamato/vfx_urp-osx-metal.yml index d405a6be16c..5af3b9da441 100644 --- a/.yamato/vfx_urp-osx-metal.yml +++ b/.yamato/vfx_urp-osx-metal.yml @@ -4,7 +4,6 @@ # Read more under .yamato/docs/readme.md {% metadata_file .yamato/_cache_config.metafile -%} -{% metadata_file .yamato/_latest_editor_versions_2021.2.metafile -%} {% metadata_file .yamato/_latest_editor_versions_trunk.metafile -%} --- @@ -255,252 +254,6 @@ VFX_URP_OSX_Metal_editmode_PerformanceTests_mono_Linear_trunk: dependencies: - path: .yamato/_editor_priming.yml#editor:priming:trunk:OSX rerun: on_new_revision -VFX_URP_OSX_Metal_Standalone_mono_Linear_2021.2: - name: VFX_URP on OSX_Metal_Standalone_mono_Linear on version 2021.2 - agent: - type: Unity::metal::macmini - image: slough-ops/macos-10.14-xcode:stable - flavor: m1.mac - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - chmod +x utr - - command: scp -i ~/.ssh/id_rsa_macmini -r $YAMATO_SOURCE_DIR bokken@$BOKKEN_DEVICE_IP:~/Graphics - retries: 2 - - command: scp -i ~/.ssh/id_rsa_macmini ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP:~/.ssh/id_rsa_macmini - retries: 2 - - command: ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP "bash -lc 'pip3 install unity-downloader-cli --user --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade'" - retries: 2 - - command: ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP '$(python3 -m site --user-base)/bin/unity-downloader-cli --source-file ~/Graphics/unity_revision.txt -c editor -c il2cpp --wait --published-only' - retries: 2 - - command: |5- - ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; ~/Graphics/utr $CACHE_ARGS --artifacts_path=/Users/bokken/Graphics/TestProjects/VisualEffectGraph_URP/test-results --editor-location=.Editor --platform=StandaloneOSX --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=/Users/bokken/Graphics/TestProjects/VisualEffectGraph_URP --timeout=2400 --zero-tests-are-ok=1 " - UTR_RESULT=$? - mkdir -p TestProjects/VisualEffectGraph_URP/test-results/ - scp -i ~/.ssh/id_rsa_macmini -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/VisualEffectGraph_URP/test-results/ TestProjects/VisualEffectGraph_URP/test-results/ - exit $UTR_RESULT - after: - - command: pip3 install requests --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade - - command: python3 .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/VisualEffectGraph_URP/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:OSX - rerun: on_new_revision -VFX_URP_OSX_Metal_Standalone_PerformanceTests_mono_Linear_2021.2: - name: VFX_URP on OSX_Metal_Standalone_PerformanceTests_mono_Linear on version 2021.2 - agent: - type: Unity::metal::macmini - image: slough-ops/macos-10.14-xcode:stable - flavor: m1.mac - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - chmod +x utr - - command: scp -i ~/.ssh/id_rsa_macmini -r $YAMATO_SOURCE_DIR bokken@$BOKKEN_DEVICE_IP:~/Graphics - retries: 2 - - command: scp -i ~/.ssh/id_rsa_macmini ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP:~/.ssh/id_rsa_macmini - retries: 2 - - command: ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP "bash -lc 'pip3 install unity-downloader-cli --user --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade'" - retries: 2 - - command: ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP '$(python3 -m site --user-base)/bin/unity-downloader-cli --source-file ~/Graphics/unity_revision.txt -c editor -c il2cpp --wait --published-only' - retries: 2 - - command: |5- - ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; ~/Graphics/utr $CACHE_ARGS --artifacts_path=/Users/bokken/Graphics/TestProjects/VisualEffectGraph_URP/test-results --editor-location=.Editor --performance-project-version=. --report-performance-data --performance-project-id=VFX --platform=StandaloneOSX --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=/Users/bokken/Graphics/TestProjects/VisualEffectGraph_URP --timeout=1200 --zero-tests-are-ok=1 " - UTR_RESULT=$? - mkdir -p TestProjects/VisualEffectGraph_URP/test-results/ - scp -i ~/.ssh/id_rsa_macmini -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/VisualEffectGraph_URP/test-results/ TestProjects/VisualEffectGraph_URP/test-results/ - exit $UTR_RESULT - after: - - command: pip3 install requests --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade - - command: python3 .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/VisualEffectGraph_URP/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:OSX - rerun: on_new_revision -VFX_URP_OSX_Metal_playmode_mono_Linear_2021.2: - name: VFX_URP on OSX_Metal_playmode_mono_Linear on version 2021.2 - agent: - type: Unity::metal::macmini - image: slough-ops/macos-10.14-xcode:stable - flavor: m1.mac - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - chmod +x utr - - command: scp -i ~/.ssh/id_rsa_macmini -r $YAMATO_SOURCE_DIR bokken@$BOKKEN_DEVICE_IP:~/Graphics - retries: 2 - - command: scp -i ~/.ssh/id_rsa_macmini ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP:~/.ssh/id_rsa_macmini - retries: 2 - - command: ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP "bash -lc 'pip3 install unity-downloader-cli --user --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade'" - retries: 2 - - command: ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP '$(python3 -m site --user-base)/bin/unity-downloader-cli --source-file ~/Graphics/unity_revision.txt -c editor -c il2cpp --wait --published-only' - retries: 2 - - command: |5- - ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; ~/Graphics/utr $CACHE_ARGS --artifacts_path=/Users/bokken/Graphics/TestProjects/VisualEffectGraph_URP/test-results --editor-location=/Users/bokken/.Editor --extra-editor-arg="-colorspace=Linear" --scripting-backend=Mono2x --suite=playmode --testfilter="VFX.Test" --testproject=/Users/bokken/Graphics/TestProjects/VisualEffectGraph_URP --zero-tests-are-ok=1 " - UTR_RESULT=$? - mkdir -p TestProjects/VisualEffectGraph_URP/test-results/ - scp -i ~/.ssh/id_rsa_macmini -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/VisualEffectGraph_URP/test-results/ TestProjects/VisualEffectGraph_URP/test-results/ - exit $UTR_RESULT - after: - - command: pip3 install requests --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade - - command: python3 .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/VisualEffectGraph_URP/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:OSX - rerun: on_new_revision -VFX_URP_OSX_Metal_playmode_PerformanceTests_mono_Linear_2021.2: - name: VFX_URP on OSX_Metal_playmode_PerformanceTests_mono_Linear on version 2021.2 - agent: - type: Unity::metal::macmini - image: slough-ops/macos-10.14-xcode:stable - flavor: m1.mac - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - chmod +x utr - - command: scp -i ~/.ssh/id_rsa_macmini -r $YAMATO_SOURCE_DIR bokken@$BOKKEN_DEVICE_IP:~/Graphics - retries: 2 - - command: scp -i ~/.ssh/id_rsa_macmini ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP:~/.ssh/id_rsa_macmini - retries: 2 - - command: ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP "bash -lc 'pip3 install unity-downloader-cli --user --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade'" - retries: 2 - - command: ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP '$(python3 -m site --user-base)/bin/unity-downloader-cli --source-file ~/Graphics/unity_revision.txt -c editor -c il2cpp --wait --published-only' - retries: 2 - - command: |5- - ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; ~/Graphics/utr $CACHE_ARGS --artifacts_path=/Users/bokken/Graphics/TestProjects/VisualEffectGraph_URP/test-results --editor-location=/Users/bokken/.Editor --extra-editor-arg="-colorspace=Linear" --performance-project-version=. --report-performance-data --performance-project-id=VFX --scripting-backend=Mono2x --suite=playmode --testfilter="VFX.PerformanceTest" --testproject=/Users/bokken/Graphics/TestProjects/VisualEffectGraph_URP --zero-tests-are-ok=1 " - UTR_RESULT=$? - mkdir -p TestProjects/VisualEffectGraph_URP/test-results/ - scp -i ~/.ssh/id_rsa_macmini -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/VisualEffectGraph_URP/test-results/ TestProjects/VisualEffectGraph_URP/test-results/ - exit $UTR_RESULT - after: - - command: pip3 install requests --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade - - command: python3 .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/VisualEffectGraph_URP/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:OSX - rerun: on_new_revision -VFX_URP_OSX_Metal_editmode_mono_Linear_2021.2: - name: VFX_URP on OSX_Metal_editmode_mono_Linear on version 2021.2 - agent: - type: Unity::metal::macmini - image: slough-ops/macos-10.14-xcode:stable - flavor: m1.mac - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - chmod +x utr - - command: scp -i ~/.ssh/id_rsa_macmini -r $YAMATO_SOURCE_DIR bokken@$BOKKEN_DEVICE_IP:~/Graphics - retries: 2 - - command: scp -i ~/.ssh/id_rsa_macmini ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP:~/.ssh/id_rsa_macmini - retries: 2 - - command: ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP "bash -lc 'pip3 install unity-downloader-cli --user --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade'" - retries: 2 - - command: ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP '$(python3 -m site --user-base)/bin/unity-downloader-cli --source-file ~/Graphics/unity_revision.txt -c editor -c il2cpp --wait --published-only' - retries: 2 - - command: |5- - ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; ~/Graphics/utr --artifacts_path=/Users/bokken/Graphics/TestProjects/VisualEffectGraph_URP/test-results --editor-location=/Users/bokken/.Editor --extra-editor-arg="-colorspace=Linear" --platform=editmode --scripting-backend=Mono2x --suite=editor --testfilter="VFX.Test" --testproject=/Users/bokken/Graphics/TestProjects/VisualEffectGraph_URP --zero-tests-are-ok=1 " - UTR_RESULT=$? - mkdir -p TestProjects/VisualEffectGraph_URP/test-results/ - scp -i ~/.ssh/id_rsa_macmini -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/VisualEffectGraph_URP/test-results/ TestProjects/VisualEffectGraph_URP/test-results/ - exit $UTR_RESULT - after: - - command: pip3 install requests --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade - - command: python3 .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/VisualEffectGraph_URP/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:OSX - rerun: on_new_revision -VFX_URP_OSX_Metal_editmode_PerformanceTests_mono_Linear_2021.2: - name: VFX_URP on OSX_Metal_editmode_PerformanceTests_mono_Linear on version 2021.2 - agent: - type: Unity::metal::macmini - image: slough-ops/macos-10.14-xcode:stable - flavor: m1.mac - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - chmod +x utr - - command: scp -i ~/.ssh/id_rsa_macmini -r $YAMATO_SOURCE_DIR bokken@$BOKKEN_DEVICE_IP:~/Graphics - retries: 2 - - command: scp -i ~/.ssh/id_rsa_macmini ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP:~/.ssh/id_rsa_macmini - retries: 2 - - command: ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP "bash -lc 'pip3 install unity-downloader-cli --user --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade'" - retries: 2 - - command: ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP '$(python3 -m site --user-base)/bin/unity-downloader-cli --source-file ~/Graphics/unity_revision.txt -c editor -c il2cpp --wait --published-only' - retries: 2 - - command: |5- - ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; ~/Graphics/utr --artifacts_path=/Users/bokken/Graphics/TestProjects/VisualEffectGraph_URP/test-results --editor-location=/Users/bokken/.Editor --extra-editor-arg="-colorspace=Linear" --performance-project-version=. --report-performance-data --performance-project-id=VFX --platform=editmode --scripting-backend=Mono2x --suite=editor --testfilter="VFX.PerformanceTest" --testproject=/Users/bokken/Graphics/TestProjects/VisualEffectGraph_URP --zero-tests-are-ok=1 " - UTR_RESULT=$? - mkdir -p TestProjects/VisualEffectGraph_URP/test-results/ - scp -i ~/.ssh/id_rsa_macmini -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/VisualEffectGraph_URP/test-results/ TestProjects/VisualEffectGraph_URP/test-results/ - exit $UTR_RESULT - after: - - command: pip3 install requests --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade - - command: python3 .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/VisualEffectGraph_URP/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:OSX - rerun: on_new_revision VFX_URP_OSX_Metal_Standalone_mono_Linear_CUSTOM-REVISION: name: VFX_URP on OSX_Metal_Standalone_mono_Linear on version CUSTOM-REVISION agent: diff --git a/.yamato/vfx_urp-osx-openglcore.yml b/.yamato/vfx_urp-osx-openglcore.yml index adef2185766..d35dd0c512c 100644 --- a/.yamato/vfx_urp-osx-openglcore.yml +++ b/.yamato/vfx_urp-osx-openglcore.yml @@ -4,7 +4,6 @@ # Read more under .yamato/docs/readme.md {% metadata_file .yamato/_cache_config.metafile -%} -{% metadata_file .yamato/_latest_editor_versions_2021.2.metafile -%} {% metadata_file .yamato/_latest_editor_versions_trunk.metafile -%} --- @@ -207,204 +206,6 @@ VFX_URP_OSX_OpenGLCore_editmode_PerformanceTests_mono_Linear_trunk: dependencies: - path: .yamato/_editor_priming.yml#editor:priming:trunk:OSX rerun: on_new_revision -VFX_URP_OSX_OpenGLCore_Standalone_PerformanceTests_mono_Linear_2021.2: - name: VFX_URP on OSX_OpenGLCore_Standalone_PerformanceTests_mono_Linear on version 2021.2 - agent: - type: Unity::VM::osx - image: graphics-foundation/mac-10.15:v0.1.0-841394 - flavor: m1.mac - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - chmod +x utr - - command: ./utr --artifacts_path=TestProjects/VisualEffectGraph_URP/test-results --performance-project-version=. --report-performance-data --performance-project-id=VFX --platform=StandaloneOSX --player-load-path=players --suite=playmode --timeout=1200 --zero-tests-are-ok=1 - retries: 2 - after: - - command: python3 .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/VisualEffectGraph_URP/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:OSX - rerun: on_new_revision - - path: .yamato/vfx_urp-osx-openglcore.yml#Build_VFX_URP_OSX_OpenGLCore_Standalone_PerformanceTests_mono_Linear_2021.2 - rerun: on_new_revision -Build_VFX_URP_OSX_OpenGLCore_Standalone_PerformanceTests_mono_Linear_2021.2: - name: Build VFX_URP on OSX_OpenGLCore_mono_Linear_Standalone_PerformanceTests_build_Player on version 2021.2 - agent: - type: Unity::VM::osx - image: graphics-foundation/mac-10.15:v0.1.0-841394 - flavor: m1.mac - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - chmod +x utr - - command: brew tap --force-auto-update unity/unity git@github.cds.internal.unity3d.com:unity/homebrew-unity.git - - command: brew install unity-downloader-cli - retries: 2 - - command: unity-downloader-cli --source-file unity_revision.txt -c editor -c il2cpp --wait --published-only - retries: 2 - - command: ./utr $CACHE_ARGS --artifacts_path=TestProjects/VisualEffectGraph_URP/test-results --build-only --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --platform=StandaloneOSX --player-save-path=players --scripting-backend=Mono2x --suite=playmode --testfilter="VFX.PerformanceTest" --testproject=./TestProjects/VisualEffectGraph_URP --timeout=1200 - retries: 2 - after: - - command: python3 .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/VisualEffectGraph_URP/Logs/*.log" - players: - paths: - - "players*/**" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:OSX - rerun: on_new_revision -VFX_URP_OSX_OpenGLCore_playmode_mono_Linear_2021.2: - name: VFX_URP on OSX_OpenGLCore_playmode_mono_Linear on version 2021.2 - agent: - type: Unity::VM::osx - image: graphics-foundation/mac-10.15:v0.1.0-841394 - flavor: m1.mac - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - chmod +x utr - - command: brew tap --force-auto-update unity/unity git@github.cds.internal.unity3d.com:unity/homebrew-unity.git - - command: brew install unity-downloader-cli - retries: 2 - - command: unity-downloader-cli --source-file unity_revision.txt -c editor -c il2cpp --wait --published-only - retries: 2 - - command: ./utr $CACHE_ARGS --artifacts_path=TestProjects/VisualEffectGraph_URP/test-results --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --scripting-backend=Mono2x --suite=playmode --testfilter="VFX.Test" --testproject=./TestProjects/VisualEffectGraph_URP --zero-tests-are-ok=1 - retries: 2 - after: - - command: python3 .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/VisualEffectGraph_URP/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:OSX - rerun: on_new_revision -VFX_URP_OSX_OpenGLCore_playmode_PerformanceTests_mono_Linear_2021.2: - name: VFX_URP on OSX_OpenGLCore_playmode_PerformanceTests_mono_Linear on version 2021.2 - agent: - type: Unity::VM::osx - image: graphics-foundation/mac-10.15:v0.1.0-841394 - flavor: m1.mac - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - chmod +x utr - - command: brew tap --force-auto-update unity/unity git@github.cds.internal.unity3d.com:unity/homebrew-unity.git - - command: brew install unity-downloader-cli - retries: 2 - - command: unity-downloader-cli --source-file unity_revision.txt -c editor -c il2cpp --wait --published-only - retries: 2 - - command: ./utr $CACHE_ARGS --artifacts_path=TestProjects/VisualEffectGraph_URP/test-results --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --performance-project-version=. --report-performance-data --performance-project-id=VFX --scripting-backend=Mono2x --suite=playmode --testfilter="VFX.PerformanceTest" --testproject=./TestProjects/VisualEffectGraph_URP --zero-tests-are-ok=1 - retries: 2 - after: - - command: python3 .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/VisualEffectGraph_URP/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:OSX - rerun: on_new_revision -VFX_URP_OSX_OpenGLCore_editmode_mono_Linear_2021.2: - name: VFX_URP on OSX_OpenGLCore_editmode_mono_Linear on version 2021.2 - agent: - type: Unity::VM::osx - image: graphics-foundation/mac-10.15:v0.1.0-841394 - flavor: m1.mac - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - chmod +x utr - - command: brew tap --force-auto-update unity/unity git@github.cds.internal.unity3d.com:unity/homebrew-unity.git - - command: brew install unity-downloader-cli - retries: 2 - - command: unity-downloader-cli --source-file unity_revision.txt -c editor -c il2cpp --wait --published-only - retries: 2 - - command: ./utr --artifacts_path=TestProjects/VisualEffectGraph_URP/test-results --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --platform=editmode --scripting-backend=Mono2x --suite=editor --testfilter="VFX.Test" --testproject=./TestProjects/VisualEffectGraph_URP --zero-tests-are-ok=1 - retries: 2 - after: - - command: python3 .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/VisualEffectGraph_URP/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:OSX - rerun: on_new_revision -VFX_URP_OSX_OpenGLCore_editmode_PerformanceTests_mono_Linear_2021.2: - name: VFX_URP on OSX_OpenGLCore_editmode_PerformanceTests_mono_Linear on version 2021.2 - agent: - type: Unity::VM::osx - image: graphics-foundation/mac-10.15:v0.1.0-841394 - flavor: m1.mac - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - chmod +x utr - - command: brew tap --force-auto-update unity/unity git@github.cds.internal.unity3d.com:unity/homebrew-unity.git - - command: brew install unity-downloader-cli - retries: 2 - - command: unity-downloader-cli --source-file unity_revision.txt -c editor -c il2cpp --wait --published-only - retries: 2 - - command: ./utr --artifacts_path=TestProjects/VisualEffectGraph_URP/test-results --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --performance-project-version=. --report-performance-data --performance-project-id=VFX --platform=editmode --scripting-backend=Mono2x --suite=editor --testfilter="VFX.PerformanceTest" --testproject=./TestProjects/VisualEffectGraph_URP --zero-tests-are-ok=1 - retries: 2 - after: - - command: python3 .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/VisualEffectGraph_URP/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:OSX - rerun: on_new_revision VFX_URP_OSX_OpenGLCore_Standalone_PerformanceTests_mono_Linear_CUSTOM-REVISION: name: VFX_URP on OSX_OpenGLCore_Standalone_PerformanceTests_mono_Linear on version CUSTOM-REVISION agent: diff --git a/.yamato/vfx_urp-win-dx11.yml b/.yamato/vfx_urp-win-dx11.yml index 1f49f4fd7db..968c4723087 100644 --- a/.yamato/vfx_urp-win-dx11.yml +++ b/.yamato/vfx_urp-win-dx11.yml @@ -4,7 +4,6 @@ # Read more under .yamato/docs/readme.md {% metadata_file .yamato/_cache_config.metafile -%} -{% metadata_file .yamato/_latest_editor_versions_2021.2.metafile -%} {% metadata_file .yamato/_latest_editor_versions_trunk.metafile -%} --- @@ -284,281 +283,6 @@ VFX_URP_Win_DX11_editmode_PerformanceTests_mono_Linear_trunk: dependencies: - path: .yamato/_editor_priming.yml#editor:priming:trunk:Win rerun: on_new_revision -VFX_URP_Win_DX11_Standalone_mono_Linear_2021.2: - name: VFX_URP on Win_DX11_Standalone_mono_Linear on version 2021.2 - agent: - type: Unity::VM::GPU - image: sdet/gamecode_win10:stable - flavor: b1.large - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: NetSh Advfirewall set allprofiles state off - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr.bat --output utr.bat - retries: 2 - - command: |5- - git rev-parse HEAD | git show -s --format=%%cI > revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= /etc/apt/sources.list.d/unity.list" - - sudo apt update - - sudo apt install -y unity-config - - cd TestProjects/Viking-Village-Perf && unity-config project add dependency "com.unity.render-pipelines.core@file:../../../com.unity.render-pipelines.core" --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add dependency "com.unity.render-pipelines.universal@file:../../../com.unity.render-pipelines.universal" --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add dependency "com.unity.shadergraph@file:../../../com.unity.shadergraph" --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add dependency com.unity.test-framework@1.1.23 --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add dependency com.unity.test-framework.performance@2.4.0 --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add dependency com.unity.test-framework.utp-reporter@1.0.2-preview --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add dependency com.unity.test-framework.build@0.0.1-preview.12 --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add dependency "com.unity.testing.graphics-performance@ssh://git@github.cds.internal.unity3d.com/unity/com.unity.testing.graphics-performance.git" --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add dependency "unity.graphictests.performance.universal@ssh://git@github.cds.internal.unity3d.com/unity/unity.graphictests.performance.universal.git" --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add testable com.unity.cli-project-setup --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add testable com.unity.test.performance.runtimesettings --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add testable com.unity.test.metadata-manager --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add testable com.unity.testing.graphics-performance --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add testable com.unity.render-pipelines.core --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add testable unity.graphictests.performance.universal --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project set project-update false --project-path . - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - command: chmod +x utr - - command: sudo rm -f /etc/apt/sources.list /etc/apt/sources.list.d/{nodesource,teamviewer,deadsnakes-ubuntu-ppa-}* - - command: curl -L https://artifactory.prd.it.unity3d.com/artifactory/api/gpg/key/public | sudo apt-key add - - - command: sudo sh -c "echo 'deb https://artifactory.prd.it.unity3d.com/artifactory/unity-apt-local bionic main' > /etc/apt/sources.list.d/unity.list" - - command: sudo apt update - - command: sudo apt install unity-downloader-cli - retries: 2 - - command: sudo unity-downloader-cli --source-file unity_revision.txt -c editor -c il2cpp --wait --published-only - retries: 2 - - command: DISPLAY=:0.0 ./utr --artifacts_path=TestProjects/Viking-Village-Perf/test-results --build-only --category=URP --editor-location=.Editor --extra-editor-arg="-addscenetobuild=Assets/Scenes/The_Viking_Village.unity" --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-executemethod" --extra-editor-arg="Editor.Setup" --extra-editor-arg="-packageundertestbranch=$GIT_BRANCH" --extra-editor-arg="-packageundertestname=com.unity.render-pipelines.universal" --extra-editor-arg="-packageundertestrev=$GIT_REVISION" --extra-editor-arg="-packageundertestrevdate=$GIT_REVISIONDATE" --extra-editor-arg="-playergraphicsapi=Vulkan" --extra-editor-arg="-scriptingbackend=Mono2x" --platform=StandaloneLinux64 --player-save-path=players --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=./TestProjects/Viking-Village-Perf --timeout=1200 - after: - - command: python .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/Viking-Village-Perf/Logs/*.log" - players: - paths: - - "players*/**" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:Linux - rerun: on_new_revision -VikingVillage_BuiltIn_Linux_Vulkan_performance_playmode_editor_mono_Linear_2021.2: - name: VikingVillage_BuiltIn on Linux_Vulkan_performance_playmode_editor_mono_Linear on version 2021.2 - agent: - type: Unity::VM::GPU - image: package-ci/ubuntu:stable - flavor: b1.large - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - VV_BUILTIN_BRANCH: built-in - VV_BUILTIN_REVISION: c61a43cd7ad4ef36f38a0219730d53e8f6e281de - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: git clone https://github.cds.internal.unity3d.com/andrew-theisen/Viking-Village-Perf.git -b $VV_BUILTIN_BRANCH TestProjects/Viking-Village-Perf - retries: 3 - - cd TestProjects/Viking-Village-Perf && git checkout $VV_BUILTIN_REVISION - - sudo rm -f /etc/apt/sources.list /etc/apt/sources.list.d/{nodesource,teamviewer,deadsnakes-ubuntu-ppa-}* - - curl -L https://artifactory.prd.it.unity3d.com/artifactory/api/gpg/key/public | sudo apt-key add - - - sudo sh -c "echo 'deb https://artifactory.prd.it.unity3d.com/artifactory/unity-apt-local bionic main' > /etc/apt/sources.list.d/unity.list" - - sudo apt update - - sudo apt install -y unity-config - - cd TestProjects/Viking-Village-Perf && unity-config project add dependency "com.unity.render-pipelines.core@file:../../../com.unity.render-pipelines.core" --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add dependency "com.unity.render-pipelines.universal@file:../../../com.unity.render-pipelines.universal" --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add dependency "com.unity.shadergraph@file:../../../com.unity.shadergraph" --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add dependency com.unity.test-framework@1.1.23 --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add dependency com.unity.test-framework.performance@2.4.0 --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add dependency com.unity.test-framework.utp-reporter@1.0.2-preview --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add dependency com.unity.test-framework.build@0.0.1-preview.12 --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add dependency "com.unity.testing.graphics-performance@ssh://git@github.cds.internal.unity3d.com/unity/com.unity.testing.graphics-performance.git" --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add dependency "unity.graphictests.performance.universal@ssh://git@github.cds.internal.unity3d.com/unity/unity.graphictests.performance.universal.git" --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add testable com.unity.cli-project-setup --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add testable com.unity.test.performance.runtimesettings --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add testable com.unity.test.metadata-manager --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add testable com.unity.testing.graphics-performance --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add testable com.unity.render-pipelines.core --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add testable unity.graphictests.performance.universal --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project set project-update false --project-path . - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - command: chmod +x utr - - command: sudo rm -f /etc/apt/sources.list /etc/apt/sources.list.d/{nodesource,teamviewer,deadsnakes-ubuntu-ppa-}* - - command: curl -L https://artifactory.prd.it.unity3d.com/artifactory/api/gpg/key/public | sudo apt-key add - - - command: sudo sh -c "echo 'deb https://artifactory.prd.it.unity3d.com/artifactory/unity-apt-local bionic main' > /etc/apt/sources.list.d/unity.list" - - command: sudo apt update - - command: sudo apt install unity-downloader-cli - retries: 2 - - command: sudo unity-downloader-cli --source-file unity_revision.txt -c editor -c il2cpp --wait --published-only - retries: 2 - - command: DISPLAY=:0.0 ./utr --artifacts_path=TestProjects/Viking-Village-Perf/test-results --category=URP --editor-location=.Editor --extra-editor-arg="-addscenetobuild=Assets/Scenes/The_Viking_Village.unity" --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-executemethod" --extra-editor-arg="Editor.Setup" --extra-editor-arg="-force-vulkan" --extra-editor-arg="-packageundertestbranch=$GIT_BRANCH" --extra-editor-arg="-packageundertestname=com.unity.render-pipelines.universal" --extra-editor-arg="-packageundertestrev=$GIT_REVISION" --extra-editor-arg="-packageundertestrevdate=$GIT_REVISIONDATE" --extra-editor-arg="-scriptingbackend=Mono2x" --performance-project-id=VikingVillage_BuiltIn --report-performance-data --scripting-backend=Mono2x --suite=playmode --testfilter="MemoryAllocation;RuntimeProfilerMetrics" --testproject=./TestProjects/Viking-Village-Perf --zero-tests-are-ok=1 - after: - - command: python .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/Viking-Village-Perf/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:Linux - rerun: on_new_revision -VikingVillage_BuiltIn_Linux_Vulkan_performance_build_editmode_mono_Linear_2021.2: - name: VikingVillage_BuiltIn on Linux_Vulkan_performance_build_editmode_mono_Linear on version 2021.2 - agent: - type: Unity::VM::GPU - image: package-ci/ubuntu:stable - flavor: b1.large - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - VV_BUILTIN_BRANCH: built-in - VV_BUILTIN_REVISION: c61a43cd7ad4ef36f38a0219730d53e8f6e281de - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: git clone https://github.cds.internal.unity3d.com/andrew-theisen/Viking-Village-Perf.git -b $VV_BUILTIN_BRANCH TestProjects/Viking-Village-Perf - retries: 3 - - cd TestProjects/Viking-Village-Perf && git checkout $VV_BUILTIN_REVISION - - sudo rm -f /etc/apt/sources.list /etc/apt/sources.list.d/{nodesource,teamviewer,deadsnakes-ubuntu-ppa-}* - - curl -L https://artifactory.prd.it.unity3d.com/artifactory/api/gpg/key/public | sudo apt-key add - - - sudo sh -c "echo 'deb https://artifactory.prd.it.unity3d.com/artifactory/unity-apt-local bionic main' > /etc/apt/sources.list.d/unity.list" - - sudo apt update - - sudo apt install -y unity-config - - cd TestProjects/Viking-Village-Perf && unity-config project add dependency "com.unity.render-pipelines.core@file:../../../com.unity.render-pipelines.core" --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add dependency "com.unity.render-pipelines.universal@file:../../../com.unity.render-pipelines.universal" --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add dependency "com.unity.shadergraph@file:../../../com.unity.shadergraph" --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add dependency com.unity.test-framework@1.1.23 --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add dependency com.unity.test-framework.performance@2.4.0 --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add dependency com.unity.test-framework.utp-reporter@1.0.2-preview --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add dependency com.unity.test-framework.build@0.0.1-preview.12 --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add dependency "com.unity.testing.graphics-performance@ssh://git@github.cds.internal.unity3d.com/unity/com.unity.testing.graphics-performance.git" --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add dependency "unity.graphictests.performance.universal@ssh://git@github.cds.internal.unity3d.com/unity/unity.graphictests.performance.universal.git" --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add testable com.unity.cli-project-setup --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add testable com.unity.test.performance.runtimesettings --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add testable com.unity.test.metadata-manager --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add testable com.unity.testing.graphics-performance --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add testable com.unity.render-pipelines.core --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add testable unity.graphictests.performance.universal --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project set project-update false --project-path . - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - command: chmod +x utr - - command: sudo rm -f /etc/apt/sources.list /etc/apt/sources.list.d/{nodesource,teamviewer,deadsnakes-ubuntu-ppa-}* - - command: curl -L https://artifactory.prd.it.unity3d.com/artifactory/api/gpg/key/public | sudo apt-key add - - - command: sudo sh -c "echo 'deb https://artifactory.prd.it.unity3d.com/artifactory/unity-apt-local bionic main' > /etc/apt/sources.list.d/unity.list" - - command: sudo apt update - - command: sudo apt install unity-downloader-cli - retries: 2 - - command: sudo unity-downloader-cli --source-file unity_revision.txt -c editor -c il2cpp --wait --published-only - retries: 2 - - command: DISPLAY=:0.0 ./utr --artifacts_path=TestProjects/Viking-Village-Perf/test-results --category=URP --editor-location=.Editor --extra-editor-arg="-addscenetobuild=Assets/Scenes/The_Viking_Village.unity" --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-executemethod" --extra-editor-arg="Editor.Setup" --extra-editor-arg="-force-vulkan" --extra-editor-arg="-packageundertestbranch=$GIT_BRANCH" --extra-editor-arg="-packageundertestname=com.unity.render-pipelines.universal" --extra-editor-arg="-packageundertestrev=$GIT_REVISION" --extra-editor-arg="-packageundertestrevdate=$GIT_REVISIONDATE" --extra-editor-arg="-playergraphicsapi=Vulkan" --extra-editor-arg="-scriptingbackend=Mono2x" --performance-project-id=VikingVillage_BuiltIn --platform=editmode --report-performance-data --scripting-backend=Mono2x --suite=editor --testfilter=Build --testproject=./TestProjects/Viking-Village-Perf --zero-tests-are-ok=1 - after: - - command: python .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/Viking-Village-Perf/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:Linux - rerun: on_new_revision VikingVillage_BuiltIn_Linux_Vulkan_performance_playmode_runtime_mono_Linear_CUSTOM-REVISION: name: VikingVillage_BuiltIn on Linux_Vulkan_performance_playmode_runtime_mono_Linear on version CUSTOM-REVISION agent: diff --git a/.yamato/vikingvillage_builtin-osx-metal.yml b/.yamato/vikingvillage_builtin-osx-metal.yml index 4084f3fd49c..20cf2cc53a8 100644 --- a/.yamato/vikingvillage_builtin-osx-metal.yml +++ b/.yamato/vikingvillage_builtin-osx-metal.yml @@ -4,7 +4,6 @@ # Read more under .yamato/docs/readme.md {% metadata_file .yamato/_cache_config.metafile -%} -{% metadata_file .yamato/_latest_editor_versions_2021.2.metafile -%} {% metadata_file .yamato/_latest_editor_versions_trunk.metafile -%} --- @@ -201,198 +200,6 @@ VikingVillage_BuiltIn_OSX_Metal_performance_build_editmode_mono_Linear_trunk: dependencies: - path: .yamato/_editor_priming.yml#editor:priming:trunk:OSX rerun: on_new_revision -VikingVillage_BuiltIn_OSX_Metal_performance_playmode_runtime_mono_Linear_2021.2: - name: VikingVillage_BuiltIn on OSX_Metal_performance_playmode_runtime_mono_Linear on version 2021.2 - agent: - type: Unity::metal::macmini - image: slough-ops/macos-10.14-xcode:stable - flavor: m1.mac - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - VV_BUILTIN_BRANCH: built-in - VV_BUILTIN_REVISION: c61a43cd7ad4ef36f38a0219730d53e8f6e281de - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: git clone https://github.cds.internal.unity3d.com/andrew-theisen/Viking-Village-Perf.git -b $VV_BUILTIN_BRANCH TestProjects/Viking-Village-Perf - retries: 3 - - cd TestProjects/Viking-Village-Perf && git checkout $VV_BUILTIN_REVISION - - brew tap --force-auto-update unity/unity git@github.cds.internal.unity3d.com:unity/homebrew-unity.git - - brew install unity-config - - cd TestProjects/Viking-Village-Perf && unity-config project add dependency "com.unity.render-pipelines.core@file:../../../com.unity.render-pipelines.core" --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add dependency "com.unity.render-pipelines.universal@file:../../../com.unity.render-pipelines.universal" --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add dependency "com.unity.shadergraph@file:../../../com.unity.shadergraph" --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add dependency com.unity.test-framework@1.1.23 --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add dependency com.unity.test-framework.performance@2.4.0 --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add dependency com.unity.test-framework.utp-reporter@1.0.2-preview --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add dependency com.unity.test-framework.build@0.0.1-preview.12 --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add dependency "com.unity.testing.graphics-performance@ssh://git@github.cds.internal.unity3d.com/unity/com.unity.testing.graphics-performance.git" --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add dependency "unity.graphictests.performance.universal@ssh://git@github.cds.internal.unity3d.com/unity/unity.graphictests.performance.universal.git" --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add testable com.unity.cli-project-setup --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add testable com.unity.test.performance.runtimesettings --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add testable com.unity.test.metadata-manager --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add testable com.unity.testing.graphics-performance --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add testable com.unity.render-pipelines.core --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add testable unity.graphictests.performance.universal --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project set project-update false --project-path . - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - chmod +x utr - - command: scp -i ~/.ssh/id_rsa_macmini -r $YAMATO_SOURCE_DIR bokken@$BOKKEN_DEVICE_IP:~/Graphics - retries: 2 - - command: scp -i ~/.ssh/id_rsa_macmini ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP:~/.ssh/id_rsa_macmini - retries: 2 - - command: ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP "bash -lc 'pip3 install unity-downloader-cli --user --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade'" - retries: 2 - - command: ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP '$(python3 -m site --user-base)/bin/unity-downloader-cli --source-file ~/Graphics/unity_revision.txt -c editor -c il2cpp --wait --published-only' - retries: 2 - - command: |5- - ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; ~/Graphics/utr --artifacts_path=/Users/bokken/Graphics/TestProjects/Viking-Village-Perf/test-results --category=URP --editor-location=.Editor --extra-editor-arg="-addscenetobuild=Assets/Scenes/The_Viking_Village.unity" --extra-editor-arg="-executemethod" --extra-editor-arg="Editor.Setup" --extra-editor-arg="-packageundertestbranch=$GIT_BRANCH" --extra-editor-arg="-packageundertestname=com.unity.render-pipelines.universal" --extra-editor-arg="-packageundertestrev=$GIT_REVISION" --extra-editor-arg="-packageundertestrevdate=$GIT_REVISIONDATE" --extra-editor-arg="-scriptingbackend=Mono2x" --performance-project-id=VikingVillage_BuiltIn --platform=StandaloneOSX --report-performance-data --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=/Users/bokken/Graphics/TestProjects/Viking-Village-Perf --timeout=1200 --zero-tests-are-ok=1 " - UTR_RESULT=$? - mkdir -p TestProjects/Viking-Village-Perf/test-results/ - scp -i ~/.ssh/id_rsa_macmini -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/Viking-Village-Perf/test-results/ TestProjects/Viking-Village-Perf/test-results/ - exit $UTR_RESULT - after: - - command: pip3 install requests --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade - - command: python3 .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/Viking-Village-Perf/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:OSX - rerun: on_new_revision -VikingVillage_BuiltIn_OSX_Metal_performance_playmode_editor_mono_Linear_2021.2: - name: VikingVillage_BuiltIn on OSX_Metal_performance_playmode_editor_mono_Linear on version 2021.2 - agent: - type: Unity::metal::macmini - image: slough-ops/macos-10.14-xcode:stable - flavor: m1.mac - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - VV_BUILTIN_BRANCH: built-in - VV_BUILTIN_REVISION: c61a43cd7ad4ef36f38a0219730d53e8f6e281de - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: git clone https://github.cds.internal.unity3d.com/andrew-theisen/Viking-Village-Perf.git -b $VV_BUILTIN_BRANCH TestProjects/Viking-Village-Perf - retries: 3 - - cd TestProjects/Viking-Village-Perf && git checkout $VV_BUILTIN_REVISION - - brew tap --force-auto-update unity/unity git@github.cds.internal.unity3d.com:unity/homebrew-unity.git - - brew install unity-config - - cd TestProjects/Viking-Village-Perf && unity-config project add dependency "com.unity.render-pipelines.core@file:../../../com.unity.render-pipelines.core" --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add dependency "com.unity.render-pipelines.universal@file:../../../com.unity.render-pipelines.universal" --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add dependency "com.unity.shadergraph@file:../../../com.unity.shadergraph" --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add dependency com.unity.test-framework@1.1.23 --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add dependency com.unity.test-framework.performance@2.4.0 --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add dependency com.unity.test-framework.utp-reporter@1.0.2-preview --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add dependency com.unity.test-framework.build@0.0.1-preview.12 --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add dependency "com.unity.testing.graphics-performance@ssh://git@github.cds.internal.unity3d.com/unity/com.unity.testing.graphics-performance.git" --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add dependency "unity.graphictests.performance.universal@ssh://git@github.cds.internal.unity3d.com/unity/unity.graphictests.performance.universal.git" --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add testable com.unity.cli-project-setup --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add testable com.unity.test.performance.runtimesettings --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add testable com.unity.test.metadata-manager --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add testable com.unity.testing.graphics-performance --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add testable com.unity.render-pipelines.core --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add testable unity.graphictests.performance.universal --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project set project-update false --project-path . - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - chmod +x utr - - command: scp -i ~/.ssh/id_rsa_macmini -r $YAMATO_SOURCE_DIR bokken@$BOKKEN_DEVICE_IP:~/Graphics - retries: 2 - - command: scp -i ~/.ssh/id_rsa_macmini ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP:~/.ssh/id_rsa_macmini - retries: 2 - - command: ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP "bash -lc 'pip3 install unity-downloader-cli --user --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade'" - retries: 2 - - command: ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP '$(python3 -m site --user-base)/bin/unity-downloader-cli --source-file ~/Graphics/unity_revision.txt -c editor -c il2cpp --wait --published-only' - retries: 2 - - command: |5- - ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; ~/Graphics/utr --artifacts_path=/Users/bokken/Graphics/TestProjects/Viking-Village-Perf/test-results --category=URP --editor-location=/Users/bokken/.Editor --extra-editor-arg="-addscenetobuild=Assets/Scenes/The_Viking_Village.unity" --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-executemethod" --extra-editor-arg="Editor.Setup" --extra-editor-arg="-packageundertestbranch=$GIT_BRANCH" --extra-editor-arg="-packageundertestname=com.unity.render-pipelines.universal" --extra-editor-arg="-packageundertestrev=$GIT_REVISION" --extra-editor-arg="-packageundertestrevdate=$GIT_REVISIONDATE" --extra-editor-arg="-scriptingbackend=Mono2x" --performance-project-id=VikingVillage_BuiltIn --report-performance-data --scripting-backend=Mono2x --suite=playmode --testfilter="MemoryAllocation;RuntimeProfilerMetrics" --testproject=/Users/bokken/Graphics/TestProjects/Viking-Village-Perf --zero-tests-are-ok=1 " - UTR_RESULT=$? - mkdir -p TestProjects/Viking-Village-Perf/test-results/ - scp -i ~/.ssh/id_rsa_macmini -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/Viking-Village-Perf/test-results/ TestProjects/Viking-Village-Perf/test-results/ - exit $UTR_RESULT - after: - - command: pip3 install requests --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade - - command: python3 .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/Viking-Village-Perf/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:OSX - rerun: on_new_revision -VikingVillage_BuiltIn_OSX_Metal_performance_build_editmode_mono_Linear_2021.2: - name: VikingVillage_BuiltIn on OSX_Metal_performance_build_editmode_mono_Linear on version 2021.2 - agent: - type: Unity::metal::macmini - image: slough-ops/macos-10.14-xcode:stable - flavor: m1.mac - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - VV_BUILTIN_BRANCH: built-in - VV_BUILTIN_REVISION: c61a43cd7ad4ef36f38a0219730d53e8f6e281de - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: git clone https://github.cds.internal.unity3d.com/andrew-theisen/Viking-Village-Perf.git -b $VV_BUILTIN_BRANCH TestProjects/Viking-Village-Perf - retries: 3 - - cd TestProjects/Viking-Village-Perf && git checkout $VV_BUILTIN_REVISION - - brew tap --force-auto-update unity/unity git@github.cds.internal.unity3d.com:unity/homebrew-unity.git - - brew install unity-config - - cd TestProjects/Viking-Village-Perf && unity-config project add dependency "com.unity.render-pipelines.core@file:../../../com.unity.render-pipelines.core" --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add dependency "com.unity.render-pipelines.universal@file:../../../com.unity.render-pipelines.universal" --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add dependency "com.unity.shadergraph@file:../../../com.unity.shadergraph" --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add dependency com.unity.test-framework@1.1.23 --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add dependency com.unity.test-framework.performance@2.4.0 --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add dependency com.unity.test-framework.utp-reporter@1.0.2-preview --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add dependency com.unity.test-framework.build@0.0.1-preview.12 --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add dependency "com.unity.testing.graphics-performance@ssh://git@github.cds.internal.unity3d.com/unity/com.unity.testing.graphics-performance.git" --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add dependency "unity.graphictests.performance.universal@ssh://git@github.cds.internal.unity3d.com/unity/unity.graphictests.performance.universal.git" --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add testable com.unity.cli-project-setup --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add testable com.unity.test.performance.runtimesettings --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add testable com.unity.test.metadata-manager --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add testable com.unity.testing.graphics-performance --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add testable com.unity.render-pipelines.core --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add testable unity.graphictests.performance.universal --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project set project-update false --project-path . - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - chmod +x utr - - command: scp -i ~/.ssh/id_rsa_macmini -r $YAMATO_SOURCE_DIR bokken@$BOKKEN_DEVICE_IP:~/Graphics - retries: 2 - - command: scp -i ~/.ssh/id_rsa_macmini ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP:~/.ssh/id_rsa_macmini - retries: 2 - - command: ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP "bash -lc 'pip3 install unity-downloader-cli --user --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade'" - retries: 2 - - command: ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP '$(python3 -m site --user-base)/bin/unity-downloader-cli --source-file ~/Graphics/unity_revision.txt -c editor -c il2cpp --wait --published-only' - retries: 2 - - command: |5- - ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; ~/Graphics/utr --artifacts_path=/Users/bokken/Graphics/TestProjects/Viking-Village-Perf/test-results --category=URP --editor-location=/Users/bokken/.Editor --extra-editor-arg="-addscenetobuild=Assets/Scenes/The_Viking_Village.unity" --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-executemethod" --extra-editor-arg="Editor.Setup" --extra-editor-arg="-packageundertestbranch=$GIT_BRANCH" --extra-editor-arg="-packageundertestname=com.unity.render-pipelines.universal" --extra-editor-arg="-packageundertestrev=$GIT_REVISION" --extra-editor-arg="-packageundertestrevdate=$GIT_REVISIONDATE" --extra-editor-arg="-scriptingbackend=Mono2x" --performance-project-id=VikingVillage_BuiltIn --platform=editmode --report-performance-data --scripting-backend=Mono2x --suite=editor --testfilter=Build --testproject=/Users/bokken/Graphics/TestProjects/Viking-Village-Perf --zero-tests-are-ok=1 " - UTR_RESULT=$? - mkdir -p TestProjects/Viking-Village-Perf/test-results/ - scp -i ~/.ssh/id_rsa_macmini -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/Viking-Village-Perf/test-results/ TestProjects/Viking-Village-Perf/test-results/ - exit $UTR_RESULT - after: - - command: pip3 install requests --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade - - command: python3 .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/Viking-Village-Perf/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:OSX - rerun: on_new_revision VikingVillage_BuiltIn_OSX_Metal_performance_playmode_runtime_mono_Linear_CUSTOM-REVISION: name: VikingVillage_BuiltIn on OSX_Metal_performance_playmode_runtime_mono_Linear on version CUSTOM-REVISION agent: diff --git a/.yamato/vikingvillage_builtin-win-dx11.yml b/.yamato/vikingvillage_builtin-win-dx11.yml index f63d086284c..7130b8a6310 100644 --- a/.yamato/vikingvillage_builtin-win-dx11.yml +++ b/.yamato/vikingvillage_builtin-win-dx11.yml @@ -4,7 +4,6 @@ # Read more under .yamato/docs/readme.md {% metadata_file .yamato/_cache_config.metafile -%} -{% metadata_file .yamato/_latest_editor_versions_2021.2.metafile -%} {% metadata_file .yamato/_latest_editor_versions_trunk.metafile -%} --- @@ -219,216 +218,6 @@ VikingVillage_BuiltIn_Win_DX11_performance_build_editmode_mono_Linear_trunk: dependencies: - path: .yamato/_editor_priming.yml#editor:priming:trunk:Win rerun: on_new_revision -VikingVillage_BuiltIn_Win_DX11_performance_playmode_runtime_mono_Linear_2021.2: - name: VikingVillage_BuiltIn on Win_DX11_performance_playmode_runtime_mono_Linear on version 2021.2 - agent: - type: Unity::VM::GPU - image: sdet/gamecode_win10:stable - flavor: b1.large - model: rtx2080 - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - VV_BUILTIN_BRANCH: built-in - VV_BUILTIN_REVISION: c61a43cd7ad4ef36f38a0219730d53e8f6e281de - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: NetSh Advfirewall set allprofiles state off - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr.bat --output utr.bat - retries: 2 - - command: |5- - git rev-parse HEAD | git show -s --format=%%cI > revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= /etc/apt/sources.list.d/unity.list" - - sudo apt update - - sudo apt install -y unity-config - - cd TestProjects/Viking-Village-Perf && unity-config project add dependency "com.unity.render-pipelines.core@file:../../../com.unity.render-pipelines.core" --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add dependency "com.unity.render-pipelines.universal@file:../../../com.unity.render-pipelines.universal" --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add dependency "com.unity.shadergraph@file:../../../com.unity.shadergraph" --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add dependency com.unity.test-framework@1.1.23 --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add dependency com.unity.test-framework.performance@2.4.0 --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add dependency com.unity.test-framework.utp-reporter@1.0.2-preview --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add dependency com.unity.test-framework.build@0.0.1-preview.12 --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add dependency "com.unity.testing.graphics-performance@ssh://git@github.cds.internal.unity3d.com/unity/com.unity.testing.graphics-performance.git" --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add dependency "unity.graphictests.performance.universal@ssh://git@github.cds.internal.unity3d.com/unity/unity.graphictests.performance.universal.git" --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add testable com.unity.cli-project-setup --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add testable com.unity.test.performance.runtimesettings --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add testable com.unity.test.metadata-manager --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add testable com.unity.testing.graphics-performance --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add testable com.unity.render-pipelines.core --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add testable unity.graphictests.performance.universal --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project set project-update false --project-path . - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - command: chmod +x utr - - command: sudo rm -f /etc/apt/sources.list /etc/apt/sources.list.d/{nodesource,teamviewer,deadsnakes-ubuntu-ppa-}* - - command: curl -L https://artifactory.prd.it.unity3d.com/artifactory/api/gpg/key/public | sudo apt-key add - - - command: sudo sh -c "echo 'deb https://artifactory.prd.it.unity3d.com/artifactory/unity-apt-local bionic main' > /etc/apt/sources.list.d/unity.list" - - command: sudo apt update - - command: sudo apt install unity-downloader-cli - retries: 2 - - command: sudo unity-downloader-cli --source-file unity_revision.txt -c editor -c il2cpp --wait --published-only - retries: 2 - - command: DISPLAY=:0.0 ./utr --artifacts_path=TestProjects/Viking-Village-Perf/test-results --build-only --category=URP --editor-location=.Editor --extra-editor-arg="-addscenetobuild=Assets/Scenes/The_Viking_Village.unity" --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-executemethod" --extra-editor-arg="Editor.Setup" --extra-editor-arg="-packageundertestbranch=$GIT_BRANCH" --extra-editor-arg="-packageundertestname=com.unity.render-pipelines.universal" --extra-editor-arg="-packageundertestrev=$GIT_REVISION" --extra-editor-arg="-packageundertestrevdate=$GIT_REVISIONDATE" --extra-editor-arg="-playergraphicsapi=Vulkan" --extra-editor-arg="-scriptingbackend=Mono2x" --platform=StandaloneLinux64 --player-save-path=playersMedium --scripting-backend=Mono2x --suite=playmode --testfilter=Medium --testproject=./TestProjects/Viking-Village-Perf --timeout=1200 - after: - - command: python .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/Viking-Village-Perf/Logs/*.log" - players: - paths: - - "players*/**" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:Linux - rerun: on_new_revision -VikingVillage_URP_Linux_Vulkan_performance_playmode_editor_mono_Linear_2021.2: - name: VikingVillage_URP on Linux_Vulkan_performance_playmode_editor_mono_Linear on version 2021.2 - agent: - type: Unity::VM::GPU - image: package-ci/ubuntu:stable - flavor: b1.large - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - VV_URP_BRANCH: master - VV_URP_REVISION: eebe6db7d9b186603b63095a926d76ded2bf1110 - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: git clone https://github.cds.internal.unity3d.com/andrew-theisen/Viking-Village-Perf.git -b $VV_URP_BRANCH TestProjects/Viking-Village-Perf - retries: 3 - - cd TestProjects/Viking-Village-Perf && git checkout $VV_URP_REVISION - - sudo rm -f /etc/apt/sources.list /etc/apt/sources.list.d/{nodesource,teamviewer,deadsnakes-ubuntu-ppa-}* - - curl -L https://artifactory.prd.it.unity3d.com/artifactory/api/gpg/key/public | sudo apt-key add - - - sudo sh -c "echo 'deb https://artifactory.prd.it.unity3d.com/artifactory/unity-apt-local bionic main' > /etc/apt/sources.list.d/unity.list" - - sudo apt update - - sudo apt install -y unity-config - - cd TestProjects/Viking-Village-Perf && unity-config project add dependency "com.unity.render-pipelines.core@file:../../../com.unity.render-pipelines.core" --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add dependency "com.unity.render-pipelines.universal@file:../../../com.unity.render-pipelines.universal" --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add dependency "com.unity.shadergraph@file:../../../com.unity.shadergraph" --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add dependency com.unity.test-framework@1.1.23 --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add dependency com.unity.test-framework.performance@2.4.0 --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add dependency com.unity.test-framework.utp-reporter@1.0.2-preview --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add dependency com.unity.test-framework.build@0.0.1-preview.12 --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add dependency "com.unity.testing.graphics-performance@ssh://git@github.cds.internal.unity3d.com/unity/com.unity.testing.graphics-performance.git" --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add dependency "unity.graphictests.performance.universal@ssh://git@github.cds.internal.unity3d.com/unity/unity.graphictests.performance.universal.git" --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add testable com.unity.cli-project-setup --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add testable com.unity.test.performance.runtimesettings --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add testable com.unity.test.metadata-manager --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add testable com.unity.testing.graphics-performance --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add testable com.unity.render-pipelines.core --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add testable unity.graphictests.performance.universal --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project set project-update false --project-path . - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - command: chmod +x utr - - command: sudo rm -f /etc/apt/sources.list /etc/apt/sources.list.d/{nodesource,teamviewer,deadsnakes-ubuntu-ppa-}* - - command: curl -L https://artifactory.prd.it.unity3d.com/artifactory/api/gpg/key/public | sudo apt-key add - - - command: sudo sh -c "echo 'deb https://artifactory.prd.it.unity3d.com/artifactory/unity-apt-local bionic main' > /etc/apt/sources.list.d/unity.list" - - command: sudo apt update - - command: sudo apt install unity-downloader-cli - retries: 2 - - command: sudo unity-downloader-cli --source-file unity_revision.txt -c editor -c il2cpp --wait --published-only - retries: 2 - - command: DISPLAY=:0.0 ./utr --artifacts_path=TestProjects/Viking-Village-Perf/test-results --category=URP --editor-location=.Editor --extra-editor-arg="-addscenetobuild=Assets/Scenes/The_Viking_Village.unity" --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-executemethod" --extra-editor-arg="Editor.Setup" --extra-editor-arg="-force-vulkan" --extra-editor-arg="-packageundertestbranch=$GIT_BRANCH" --extra-editor-arg="-packageundertestname=com.unity.render-pipelines.universal" --extra-editor-arg="-packageundertestrev=$GIT_REVISION" --extra-editor-arg="-packageundertestrevdate=$GIT_REVISIONDATE" --extra-editor-arg="-scriptingbackend=Mono2x" --performance-project-id=VikingVillage_URP --report-performance-data --scripting-backend=Mono2x --suite=playmode --testfilter=Medium --testproject=./TestProjects/Viking-Village-Perf --zero-tests-are-ok=1 - after: - - command: python .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/Viking-Village-Perf/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:Linux - rerun: on_new_revision -VikingVillage_URP_Linux_Vulkan_performance_build_editmode_mono_Linear_2021.2: - name: VikingVillage_URP on Linux_Vulkan_performance_build_editmode_mono_Linear on version 2021.2 - agent: - type: Unity::VM::GPU - image: package-ci/ubuntu:stable - flavor: b1.large - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - VV_URP_BRANCH: master - VV_URP_REVISION: eebe6db7d9b186603b63095a926d76ded2bf1110 - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: git clone https://github.cds.internal.unity3d.com/andrew-theisen/Viking-Village-Perf.git -b $VV_URP_BRANCH TestProjects/Viking-Village-Perf - retries: 3 - - cd TestProjects/Viking-Village-Perf && git checkout $VV_URP_REVISION - - sudo rm -f /etc/apt/sources.list /etc/apt/sources.list.d/{nodesource,teamviewer,deadsnakes-ubuntu-ppa-}* - - curl -L https://artifactory.prd.it.unity3d.com/artifactory/api/gpg/key/public | sudo apt-key add - - - sudo sh -c "echo 'deb https://artifactory.prd.it.unity3d.com/artifactory/unity-apt-local bionic main' > /etc/apt/sources.list.d/unity.list" - - sudo apt update - - sudo apt install -y unity-config - - cd TestProjects/Viking-Village-Perf && unity-config project add dependency "com.unity.render-pipelines.core@file:../../../com.unity.render-pipelines.core" --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add dependency "com.unity.render-pipelines.universal@file:../../../com.unity.render-pipelines.universal" --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add dependency "com.unity.shadergraph@file:../../../com.unity.shadergraph" --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add dependency com.unity.test-framework@1.1.23 --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add dependency com.unity.test-framework.performance@2.4.0 --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add dependency com.unity.test-framework.utp-reporter@1.0.2-preview --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add dependency com.unity.test-framework.build@0.0.1-preview.12 --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add dependency "com.unity.testing.graphics-performance@ssh://git@github.cds.internal.unity3d.com/unity/com.unity.testing.graphics-performance.git" --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add dependency "unity.graphictests.performance.universal@ssh://git@github.cds.internal.unity3d.com/unity/unity.graphictests.performance.universal.git" --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add testable com.unity.cli-project-setup --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add testable com.unity.test.performance.runtimesettings --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add testable com.unity.test.metadata-manager --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add testable com.unity.testing.graphics-performance --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add testable com.unity.render-pipelines.core --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add testable unity.graphictests.performance.universal --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project set project-update false --project-path . - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - command: chmod +x utr - - command: sudo rm -f /etc/apt/sources.list /etc/apt/sources.list.d/{nodesource,teamviewer,deadsnakes-ubuntu-ppa-}* - - command: curl -L https://artifactory.prd.it.unity3d.com/artifactory/api/gpg/key/public | sudo apt-key add - - - command: sudo sh -c "echo 'deb https://artifactory.prd.it.unity3d.com/artifactory/unity-apt-local bionic main' > /etc/apt/sources.list.d/unity.list" - - command: sudo apt update - - command: sudo apt install unity-downloader-cli - retries: 2 - - command: sudo unity-downloader-cli --source-file unity_revision.txt -c editor -c il2cpp --wait --published-only - retries: 2 - - command: DISPLAY=:0.0 ./utr --artifacts_path=TestProjects/Viking-Village-Perf/test-results --category=URP --editor-location=.Editor --extra-editor-arg="-addscenetobuild=Assets/Scenes/The_Viking_Village.unity" --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-executemethod" --extra-editor-arg="Editor.Setup" --extra-editor-arg="-force-vulkan" --extra-editor-arg="-packageundertestbranch=$GIT_BRANCH" --extra-editor-arg="-packageundertestname=com.unity.render-pipelines.universal" --extra-editor-arg="-packageundertestrev=$GIT_REVISION" --extra-editor-arg="-packageundertestrevdate=$GIT_REVISIONDATE" --extra-editor-arg="-playergraphicsapi=Vulkan" --extra-editor-arg="-scriptingbackend=Mono2x" --performance-project-id=VikingVillage_URP --platform=editmode --report-performance-data --scripting-backend=Mono2x --suite=editor --testfilter=Medium --testproject=./TestProjects/Viking-Village-Perf --zero-tests-are-ok=1 - after: - - command: python .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/Viking-Village-Perf/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:Linux - rerun: on_new_revision VikingVillage_URP_Linux_Vulkan_performance_playmode_runtime_mono_Linear_CUSTOM-REVISION: name: VikingVillage_URP on Linux_Vulkan_performance_playmode_runtime_mono_Linear on version CUSTOM-REVISION agent: diff --git a/.yamato/vikingvillage_urp-osx-metal.yml b/.yamato/vikingvillage_urp-osx-metal.yml index bcf55c51606..a5bb3f05693 100644 --- a/.yamato/vikingvillage_urp-osx-metal.yml +++ b/.yamato/vikingvillage_urp-osx-metal.yml @@ -4,7 +4,6 @@ # Read more under .yamato/docs/readme.md {% metadata_file .yamato/_cache_config.metafile -%} -{% metadata_file .yamato/_latest_editor_versions_2021.2.metafile -%} {% metadata_file .yamato/_latest_editor_versions_trunk.metafile -%} --- @@ -201,198 +200,6 @@ VikingVillage_URP_OSX_Metal_performance_build_editmode_mono_Linear_trunk: dependencies: - path: .yamato/_editor_priming.yml#editor:priming:trunk:OSX rerun: on_new_revision -VikingVillage_URP_OSX_Metal_performance_playmode_runtime_mono_Linear_2021.2: - name: VikingVillage_URP on OSX_Metal_performance_playmode_runtime_mono_Linear on version 2021.2 - agent: - type: Unity::metal::macmini - image: slough-ops/macos-10.14-xcode:stable - flavor: m1.mac - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - VV_URP_BRANCH: master - VV_URP_REVISION: eebe6db7d9b186603b63095a926d76ded2bf1110 - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: git clone https://github.cds.internal.unity3d.com/andrew-theisen/Viking-Village-Perf.git -b $VV_URP_BRANCH TestProjects/Viking-Village-Perf - retries: 3 - - cd TestProjects/Viking-Village-Perf && git checkout $VV_URP_REVISION - - brew tap --force-auto-update unity/unity git@github.cds.internal.unity3d.com:unity/homebrew-unity.git - - brew install unity-config - - cd TestProjects/Viking-Village-Perf && unity-config project add dependency "com.unity.render-pipelines.core@file:../../../com.unity.render-pipelines.core" --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add dependency "com.unity.render-pipelines.universal@file:../../../com.unity.render-pipelines.universal" --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add dependency "com.unity.shadergraph@file:../../../com.unity.shadergraph" --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add dependency com.unity.test-framework@1.1.23 --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add dependency com.unity.test-framework.performance@2.4.0 --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add dependency com.unity.test-framework.utp-reporter@1.0.2-preview --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add dependency com.unity.test-framework.build@0.0.1-preview.12 --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add dependency "com.unity.testing.graphics-performance@ssh://git@github.cds.internal.unity3d.com/unity/com.unity.testing.graphics-performance.git" --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add dependency "unity.graphictests.performance.universal@ssh://git@github.cds.internal.unity3d.com/unity/unity.graphictests.performance.universal.git" --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add testable com.unity.cli-project-setup --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add testable com.unity.test.performance.runtimesettings --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add testable com.unity.test.metadata-manager --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add testable com.unity.testing.graphics-performance --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add testable com.unity.render-pipelines.core --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add testable unity.graphictests.performance.universal --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project set project-update false --project-path . - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - chmod +x utr - - command: scp -i ~/.ssh/id_rsa_macmini -r $YAMATO_SOURCE_DIR bokken@$BOKKEN_DEVICE_IP:~/Graphics - retries: 2 - - command: scp -i ~/.ssh/id_rsa_macmini ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP:~/.ssh/id_rsa_macmini - retries: 2 - - command: ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP "bash -lc 'pip3 install unity-downloader-cli --user --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade'" - retries: 2 - - command: ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP '$(python3 -m site --user-base)/bin/unity-downloader-cli --source-file ~/Graphics/unity_revision.txt -c editor -c il2cpp --wait --published-only' - retries: 2 - - command: |5- - ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; ~/Graphics/utr --artifacts_path=/Users/bokken/Graphics/TestProjects/Viking-Village-Perf/test-results --category=URP --editor-location=.Editor --extra-editor-arg="-addscenetobuild=Assets/Scenes/The_Viking_Village.unity" --extra-editor-arg="-executemethod" --extra-editor-arg="Editor.Setup" --extra-editor-arg="-packageundertestbranch=$GIT_BRANCH" --extra-editor-arg="-packageundertestname=com.unity.render-pipelines.universal" --extra-editor-arg="-packageundertestrev=$GIT_REVISION" --extra-editor-arg="-packageundertestrevdate=$GIT_REVISIONDATE" --extra-editor-arg="-scriptingbackend=Mono2x" --performance-project-id=VikingVillage_URP --platform=StandaloneOSX --report-performance-data --scripting-backend=Mono2x --suite=playmode --testfilter=Medium --testproject=/Users/bokken/Graphics/TestProjects/Viking-Village-Perf --timeout=1200 --zero-tests-are-ok=1 " - UTR_RESULT=$? - mkdir -p TestProjects/Viking-Village-Perf/test-results/ - scp -i ~/.ssh/id_rsa_macmini -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/Viking-Village-Perf/test-results/ TestProjects/Viking-Village-Perf/test-results/ - exit $UTR_RESULT - after: - - command: pip3 install requests --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade - - command: python3 .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/Viking-Village-Perf/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:OSX - rerun: on_new_revision -VikingVillage_URP_OSX_Metal_performance_playmode_editor_mono_Linear_2021.2: - name: VikingVillage_URP on OSX_Metal_performance_playmode_editor_mono_Linear on version 2021.2 - agent: - type: Unity::metal::macmini - image: slough-ops/macos-10.14-xcode:stable - flavor: m1.mac - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - VV_URP_BRANCH: master - VV_URP_REVISION: eebe6db7d9b186603b63095a926d76ded2bf1110 - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: git clone https://github.cds.internal.unity3d.com/andrew-theisen/Viking-Village-Perf.git -b $VV_URP_BRANCH TestProjects/Viking-Village-Perf - retries: 3 - - cd TestProjects/Viking-Village-Perf && git checkout $VV_URP_REVISION - - brew tap --force-auto-update unity/unity git@github.cds.internal.unity3d.com:unity/homebrew-unity.git - - brew install unity-config - - cd TestProjects/Viking-Village-Perf && unity-config project add dependency "com.unity.render-pipelines.core@file:../../../com.unity.render-pipelines.core" --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add dependency "com.unity.render-pipelines.universal@file:../../../com.unity.render-pipelines.universal" --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add dependency "com.unity.shadergraph@file:../../../com.unity.shadergraph" --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add dependency com.unity.test-framework@1.1.23 --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add dependency com.unity.test-framework.performance@2.4.0 --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add dependency com.unity.test-framework.utp-reporter@1.0.2-preview --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add dependency com.unity.test-framework.build@0.0.1-preview.12 --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add dependency "com.unity.testing.graphics-performance@ssh://git@github.cds.internal.unity3d.com/unity/com.unity.testing.graphics-performance.git" --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add dependency "unity.graphictests.performance.universal@ssh://git@github.cds.internal.unity3d.com/unity/unity.graphictests.performance.universal.git" --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add testable com.unity.cli-project-setup --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add testable com.unity.test.performance.runtimesettings --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add testable com.unity.test.metadata-manager --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add testable com.unity.testing.graphics-performance --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add testable com.unity.render-pipelines.core --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add testable unity.graphictests.performance.universal --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project set project-update false --project-path . - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - chmod +x utr - - command: scp -i ~/.ssh/id_rsa_macmini -r $YAMATO_SOURCE_DIR bokken@$BOKKEN_DEVICE_IP:~/Graphics - retries: 2 - - command: scp -i ~/.ssh/id_rsa_macmini ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP:~/.ssh/id_rsa_macmini - retries: 2 - - command: ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP "bash -lc 'pip3 install unity-downloader-cli --user --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade'" - retries: 2 - - command: ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP '$(python3 -m site --user-base)/bin/unity-downloader-cli --source-file ~/Graphics/unity_revision.txt -c editor -c il2cpp --wait --published-only' - retries: 2 - - command: |5- - ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; ~/Graphics/utr --artifacts_path=/Users/bokken/Graphics/TestProjects/Viking-Village-Perf/test-results --category=URP --editor-location=/Users/bokken/.Editor --extra-editor-arg="-addscenetobuild=Assets/Scenes/The_Viking_Village.unity" --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-executemethod" --extra-editor-arg="Editor.Setup" --extra-editor-arg="-packageundertestbranch=$GIT_BRANCH" --extra-editor-arg="-packageundertestname=com.unity.render-pipelines.universal" --extra-editor-arg="-packageundertestrev=$GIT_REVISION" --extra-editor-arg="-packageundertestrevdate=$GIT_REVISIONDATE" --extra-editor-arg="-scriptingbackend=Mono2x" --performance-project-id=VikingVillage_URP --report-performance-data --scripting-backend=Mono2x --suite=playmode --testfilter=Medium --testproject=/Users/bokken/Graphics/TestProjects/Viking-Village-Perf --zero-tests-are-ok=1 " - UTR_RESULT=$? - mkdir -p TestProjects/Viking-Village-Perf/test-results/ - scp -i ~/.ssh/id_rsa_macmini -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/Viking-Village-Perf/test-results/ TestProjects/Viking-Village-Perf/test-results/ - exit $UTR_RESULT - after: - - command: pip3 install requests --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade - - command: python3 .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/Viking-Village-Perf/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:OSX - rerun: on_new_revision -VikingVillage_URP_OSX_Metal_performance_build_editmode_mono_Linear_2021.2: - name: VikingVillage_URP on OSX_Metal_performance_build_editmode_mono_Linear on version 2021.2 - agent: - type: Unity::metal::macmini - image: slough-ops/macos-10.14-xcode:stable - flavor: m1.mac - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - VV_URP_BRANCH: master - VV_URP_REVISION: eebe6db7d9b186603b63095a926d76ded2bf1110 - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: git clone https://github.cds.internal.unity3d.com/andrew-theisen/Viking-Village-Perf.git -b $VV_URP_BRANCH TestProjects/Viking-Village-Perf - retries: 3 - - cd TestProjects/Viking-Village-Perf && git checkout $VV_URP_REVISION - - brew tap --force-auto-update unity/unity git@github.cds.internal.unity3d.com:unity/homebrew-unity.git - - brew install unity-config - - cd TestProjects/Viking-Village-Perf && unity-config project add dependency "com.unity.render-pipelines.core@file:../../../com.unity.render-pipelines.core" --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add dependency "com.unity.render-pipelines.universal@file:../../../com.unity.render-pipelines.universal" --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add dependency "com.unity.shadergraph@file:../../../com.unity.shadergraph" --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add dependency com.unity.test-framework@1.1.23 --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add dependency com.unity.test-framework.performance@2.4.0 --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add dependency com.unity.test-framework.utp-reporter@1.0.2-preview --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add dependency com.unity.test-framework.build@0.0.1-preview.12 --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add dependency "com.unity.testing.graphics-performance@ssh://git@github.cds.internal.unity3d.com/unity/com.unity.testing.graphics-performance.git" --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add dependency "unity.graphictests.performance.universal@ssh://git@github.cds.internal.unity3d.com/unity/unity.graphictests.performance.universal.git" --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add testable com.unity.cli-project-setup --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add testable com.unity.test.performance.runtimesettings --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add testable com.unity.test.metadata-manager --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add testable com.unity.testing.graphics-performance --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add testable com.unity.render-pipelines.core --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project add testable unity.graphictests.performance.universal --project-path . - - cd TestProjects/Viking-Village-Perf && unity-config project set project-update false --project-path . - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - chmod +x utr - - command: scp -i ~/.ssh/id_rsa_macmini -r $YAMATO_SOURCE_DIR bokken@$BOKKEN_DEVICE_IP:~/Graphics - retries: 2 - - command: scp -i ~/.ssh/id_rsa_macmini ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP:~/.ssh/id_rsa_macmini - retries: 2 - - command: ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP "bash -lc 'pip3 install unity-downloader-cli --user --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade'" - retries: 2 - - command: ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP '$(python3 -m site --user-base)/bin/unity-downloader-cli --source-file ~/Graphics/unity_revision.txt -c editor -c il2cpp --wait --published-only' - retries: 2 - - command: |5- - ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; ~/Graphics/utr --artifacts_path=/Users/bokken/Graphics/TestProjects/Viking-Village-Perf/test-results --category=URP --editor-location=/Users/bokken/.Editor --extra-editor-arg="-addscenetobuild=Assets/Scenes/The_Viking_Village.unity" --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-executemethod" --extra-editor-arg="Editor.Setup" --extra-editor-arg="-packageundertestbranch=$GIT_BRANCH" --extra-editor-arg="-packageundertestname=com.unity.render-pipelines.universal" --extra-editor-arg="-packageundertestrev=$GIT_REVISION" --extra-editor-arg="-packageundertestrevdate=$GIT_REVISIONDATE" --extra-editor-arg="-scriptingbackend=Mono2x" --performance-project-id=VikingVillage_URP --platform=editmode --report-performance-data --scripting-backend=Mono2x --suite=editor --testfilter=Medium --testproject=/Users/bokken/Graphics/TestProjects/Viking-Village-Perf --zero-tests-are-ok=1 " - UTR_RESULT=$? - mkdir -p TestProjects/Viking-Village-Perf/test-results/ - scp -i ~/.ssh/id_rsa_macmini -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/Viking-Village-Perf/test-results/ TestProjects/Viking-Village-Perf/test-results/ - exit $UTR_RESULT - after: - - command: pip3 install requests --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade - - command: python3 .yamato/script/log_scripts/log_parser.py - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/Viking-Village-Perf/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:2021.2:OSX - rerun: on_new_revision VikingVillage_URP_OSX_Metal_performance_playmode_runtime_mono_Linear_CUSTOM-REVISION: name: VikingVillage_URP on OSX_Metal_performance_playmode_runtime_mono_Linear on version CUSTOM-REVISION agent: diff --git a/.yamato/vikingvillage_urp-win-dx11.yml b/.yamato/vikingvillage_urp-win-dx11.yml index 05247f1d8a9..d3cb59ffc03 100644 --- a/.yamato/vikingvillage_urp-win-dx11.yml +++ b/.yamato/vikingvillage_urp-win-dx11.yml @@ -4,7 +4,6 @@ # Read more under .yamato/docs/readme.md {% metadata_file .yamato/_cache_config.metafile -%} -{% metadata_file .yamato/_latest_editor_versions_2021.2.metafile -%} {% metadata_file .yamato/_latest_editor_versions_trunk.metafile -%} --- @@ -219,216 +218,6 @@ VikingVillage_URP_Win_DX11_performance_build_editmode_mono_Linear_trunk: dependencies: - path: .yamato/_editor_priming.yml#editor:priming:trunk:Win rerun: on_new_revision -VikingVillage_URP_Win_DX11_performance_playmode_runtime_mono_Linear_2021.2: - name: VikingVillage_URP on Win_DX11_performance_playmode_runtime_mono_Linear on version 2021.2 - agent: - type: Unity::VM::GPU - image: sdet/gamecode_win10:stable - flavor: b1.large - model: rtx2080 - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: '{{2021_2.changeset.id}}' - VV_URP_BRANCH: master - VV_URP_REVISION: eebe6db7d9b186603b63095a926d76ded2bf1110 - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: NetSh Advfirewall set allprofiles state off - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr.bat --output utr.bat - retries: 2 - - command: |5- - git rev-parse HEAD | git show -s --format=%%cI > revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= Core Render Pipeline - Added class for drawing shadow cascades `UnityEditor.Rendering.ShadowCascadeGUI.DrawShadowCascades`. - Added UNITY_PREV_MATRIX_M and UNITY_PREV_MATRIX_I_M shader macros to support instanced motion vector rendering +- Added new API to customize the rtHandleProperties of a particular RTHandle. This is a temporary work around to assist with viewport setup of Custom post process when dealing with DLSS or TAAU +- Added `IAdditionalData` interface to identify the additional datas on the core package. ### Fixed - Help boxes with fix buttons do not crop the label. diff --git a/com.unity.render-pipelines.core/Editor/CoreEditorStyles.cs b/com.unity.render-pipelines.core/Editor/CoreEditorStyles.cs index 0641cc62b3a..044bbf1f2c7 100644 --- a/com.unity.render-pipelines.core/Editor/CoreEditorStyles.cs +++ b/com.unity.render-pipelines.core/Editor/CoreEditorStyles.cs @@ -169,6 +169,11 @@ internal static Texture2D GetMessageTypeIcon(MessageType messageType) /// Reset All content public static readonly GUIContent resetAllButtonLabel = EditorGUIUtility.TrTextContent("Reset All"); + /// + /// Empty space content in case that you want to keep the indentation but have nothing to write + /// + public static readonly GUIContent empty = EditorGUIUtility.TrTextContent(" "); + #endregion static CoreEditorStyles() diff --git a/com.unity.render-pipelines.core/Editor/Lighting/LightAnchorEditor.cs b/com.unity.render-pipelines.core/Editor/Lighting/LightAnchorEditor.cs index 8c40551adc9..9e6660fbde7 100644 --- a/com.unity.render-pipelines.core/Editor/Lighting/LightAnchorEditor.cs +++ b/com.unity.render-pipelines.core/Editor/Lighting/LightAnchorEditor.cs @@ -30,6 +30,10 @@ public class LightAnchorEditor : Editor VisualElement m_GameViewRootElement; VisualElement m_ClickCatcher; + SerializedProperty m_DistanceProperty; + SerializedProperty m_FrameSpaceProperty; + SerializedProperty m_AnchorPositionOverrideProperty; + LightAnchor manipulator { get { return target as LightAnchor; } @@ -62,6 +66,7 @@ public override void OnInspectorGUI() bool pitchChanged = false; bool rollChanged = false; bool distanceChanged = false; + bool positionOverrideChanged = false; bool upChanged = false; using (var change = new EditorGUI.ChangeCheckScope()) @@ -126,14 +131,17 @@ public override void OnInspectorGUI() EditorGUILayout.Space(); EditorGUI.BeginChangeCheck(); - m_Distance = EditorGUILayout.FloatField(LightAnchorStyles.distanceProperty, manipulator.distance); + EditorGUILayout.PropertyField(m_DistanceProperty, LightAnchorStyles.distanceProperty); distanceChanged = EditorGUI.EndChangeCheck(); EditorGUI.BeginChangeCheck(); - var dropRect = EditorGUILayout.GetControlRect(false, EditorGUIUtility.singleLineHeight); - m_FrameSpace = (LightAnchor.UpDirection)EditorGUI.EnumPopup(dropRect, LightAnchorStyles.upDirectionProperty, manipulator.frameSpace); + EditorGUILayout.PropertyField(m_FrameSpaceProperty, LightAnchorStyles.upDirectionProperty); upChanged = EditorGUI.EndChangeCheck(); + EditorGUI.BeginChangeCheck(); + EditorGUILayout.PropertyField(m_AnchorPositionOverrideProperty, LightAnchorStyles.anchorPositionOverrideProperty); + positionOverrideChanged = EditorGUI.EndChangeCheck(); + if (m_FoldoutPreset = EditorGUILayout.Foldout(m_FoldoutPreset, "Common")) { Color cachedColor = GUI.backgroundColor; @@ -266,11 +274,11 @@ public override void OnInspectorGUI() { Undo.RecordObjects(new UnityEngine.Object[] { target, manipulator.transform }, "Light Anchor Change"); - manipulator.frameSpace = m_FrameSpace; + manipulator.frameSpace = (LightAnchor.UpDirection)m_FrameSpaceProperty.intValue; manipulator.SynchronizeOnTransform(camera); UpdateCache(); } - if (yawChanged || pitchChanged || rollChanged || distanceChanged) + if (yawChanged || pitchChanged || rollChanged || distanceChanged || positionOverrideChanged) { Undo.RecordObjects(new UnityEngine.Object[] { target, manipulator.transform }, "Light Anchor Change"); @@ -281,7 +289,32 @@ public override void OnInspectorGUI() if (rollChanged) manipulator.roll = m_Roll; if (distanceChanged) - manipulator.distance = m_Distance; + manipulator.distance = m_DistanceProperty.floatValue; + if (positionOverrideChanged) + { + var newTransform = m_AnchorPositionOverrideProperty.objectReferenceValue as Transform; + + if (newTransform != null) + { + // Check that the assigned transform is not child of the light anchor, otherwise it would cause problems when moving the light position + if (newTransform.IsChildOf(manipulator.transform)) + Debug.LogError($"Can't assign '{newTransform.name}' because it's a child of the Light Anchor component"); + else + { + float newDistance = Vector3.Distance(manipulator.transform.position, newTransform.position); + manipulator.anchorPositionOverride = newTransform; + // Orient the object to face the new override position + manipulator.SynchronizeOnTransform(camera); + // And adjust it's distance to avoid modifying it's position. + manipulator.distance = newDistance; + } + } + else + manipulator.anchorPositionOverride = newTransform; + } + + if (manipulator.anchorPositionOverride != null) + anchor = manipulator.anchorPosition; manipulator.UpdateTransform(camera, anchor); IsCacheInvalid(manipulator); @@ -321,6 +354,10 @@ void OnEnable() EnableClickCatcher(m_EnableClickCatcher); } } + + m_DistanceProperty = serializedObject.FindProperty("m_Distance"); + m_FrameSpaceProperty = serializedObject.FindProperty("m_FrameSpace"); + m_AnchorPositionOverrideProperty = serializedObject.FindProperty("m_AnchorPositionOverride"); } void EditorToolsOnactiveToolChanged() @@ -561,6 +598,7 @@ static class LightAnchorStyles static public GUIContent presetTextureRimRight = EditorGUIUtility.TrTextContent("", "Rim Right", UnityEditor.Rendering.CoreEditorUtils.LoadIcon(LightAnchorStyles.k_IconFolder, "PresetRim_Right", ".png", false)); static public GUIContent distanceProperty = EditorGUIUtility.TrTextContent("Distance", "Controls how far 'back', the light is placed from its anchor"); static public GUIContent upDirectionProperty = EditorGUIUtility.TrTextContent("Up direction", "Specifies the space in which the up direction of the anchor is defined. Local is relative to the camera."); + static public GUIContent anchorPositionOverrideProperty = EditorGUIUtility.TrTextContent("Anchor Position Override", "Specifies the anchor position manually instead of relying on the angles, distance and transform position to compute the anchor position."); static public GUIContent[] angleSubContent = new[] { EditorGUIUtility.TrTextContent("Orbit"), diff --git a/com.unity.render-pipelines.core/Editor/Lighting/LightAnchorEditorTool.cs b/com.unity.render-pipelines.core/Editor/Lighting/LightAnchorEditorTool.cs index 4fc2c47dc20..206956d9e3c 100644 --- a/com.unity.render-pipelines.core/Editor/Lighting/LightAnchorEditorTool.cs +++ b/com.unity.render-pipelines.core/Editor/Lighting/LightAnchorEditorTool.cs @@ -30,7 +30,10 @@ public override GUIContent toolbarIcon /// Always return true public override bool IsAvailable() { - return true; + var lightAnchor = target as LightAnchor; + + // Hide the transform if a position override object is assigned + return (lightAnchor?.anchorPositionOverride == null); } /// @@ -39,7 +42,7 @@ public override bool IsAvailable() /// The window that is displaying the custom editor tool. public override void OnToolGUI(EditorWindow window) { - if (target == null) + if (target is LightAnchor l && l?.anchorPositionOverride == null) return; DoTargetGUI(target); @@ -112,7 +115,7 @@ LightAnchorHandles GetHandles(UnityObject obj) LightAnchorHandles handles; if (!m_LightAnchorHandles.TryGetValue(obj, out handles)) { - handles = new LightAnchorHandles(); + handles = new LightAnchorHandles(obj as LightAnchor); m_LightAnchorHandles.Add(obj, handles); } diff --git a/com.unity.render-pipelines.core/Editor/Lighting/LightAnchorHandles.cs b/com.unity.render-pipelines.core/Editor/Lighting/LightAnchorHandles.cs index 99bc7dd85e6..f01bc2d0394 100644 --- a/com.unity.render-pipelines.core/Editor/Lighting/LightAnchorHandles.cs +++ b/com.unity.render-pipelines.core/Editor/Lighting/LightAnchorHandles.cs @@ -16,11 +16,15 @@ public class LightAnchorHandles /// public Vector3 anchorPosition { get; set; } + LightAnchor target; + /// /// Initializes and returns an instance of LightAnchorHandles /// - public LightAnchorHandles() + /// Target object + public LightAnchorHandles(LightAnchor target) { + this.target = target; } /// @@ -31,7 +35,12 @@ public void OnGUI() Handles.color = Color.yellow; Handles.DrawDottedLine(lightPosition, anchorPosition, 2f); - anchorPosition = Handles.PositionHandle(anchorPosition, Quaternion.identity); + // Orient the handle rotation depending on the editor pivot rotation mode + var handleRotation = Quaternion.identity; + if (Tools.pivotRotation == PivotRotation.Local && target != null) + handleRotation = target.transform.rotation; + + anchorPosition = Handles.PositionHandle(anchorPosition, handleRotation); } } } diff --git a/com.unity.render-pipelines.core/Editor/Lighting/LightUI.Skin.cs b/com.unity.render-pipelines.core/Editor/Lighting/LightUI.Skin.cs new file mode 100644 index 00000000000..688576417c9 --- /dev/null +++ b/com.unity.render-pipelines.core/Editor/Lighting/LightUI.Skin.cs @@ -0,0 +1,41 @@ +using UnityEngine; + +namespace UnityEditor.Rendering +{ + /// + /// Contains a set of methods to help render the inspectors of Lights across SRP's + /// + public partial class LightUI + { + /// + /// Styles + /// + public static class Styles + { + public static readonly GUIContent generalHeader = EditorGUIUtility.TrTextContent("General"); + public static readonly GUIContent shapeHeader = EditorGUIUtility.TrTextContent("Shape"); + public static readonly GUIContent renderingHeader = EditorGUIUtility.TrTextContent("Rendering"); + public static readonly GUIContent emissionHeader = EditorGUIUtility.TrTextContent("Emission"); + public static readonly GUIContent shadowHeader = EditorGUIUtility.TrTextContent("Shadows"); + + public static readonly GUIContent lightLayer = EditorGUIUtility.TrTextContent("Light Layer", "Specifies the current Light Layers that the Light affects. This Light illuminates corresponding Renderers with the same Light Layer flags."); + + // Emission + public static readonly GUIContent color = EditorGUIUtility.TrTextContent("Color", "Specifies the color this Light emits."); + public static readonly GUIContent lightAppearance = EditorGUIUtility.TrTextContent("Light Appearance", "Specifies the mode for this Light's color is calculated."); + public static readonly GUIContent[] lightAppearanceOptions = new[] + { + EditorGUIUtility.TrTextContent("Color"), + EditorGUIUtility.TrTextContent("Filter and Temperature") + }; + public static readonly GUIContent[] lightAppearanceUnits = new[] + { + EditorGUIUtility.TrTextContent("Kelvin") + }; + public static readonly GUIContent colorFilter = EditorGUIUtility.TrTextContent("Filter", "Specifies a color which tints the Light source."); + public static readonly GUIContent colorTemperature = EditorGUIUtility.TrTextContent("Temperature", "Specifies a temperature (in Kelvin) used to correlate a color for the Light. For reference, White is 6500K."); + + public static readonly string unsupportedPresetPropertiesMessage = L10n.Tr("When using Preset of Light Component, only a subset of properties are supported. Unsupported properties are hidden."); + } + } +} diff --git a/com.unity.render-pipelines.high-definition/Tests/Editor/HDGlobalSettingsTests.cs.meta b/com.unity.render-pipelines.core/Editor/Lighting/LightUI.Skin.cs.meta similarity index 83% rename from com.unity.render-pipelines.high-definition/Tests/Editor/HDGlobalSettingsTests.cs.meta rename to com.unity.render-pipelines.core/Editor/Lighting/LightUI.Skin.cs.meta index d31ddbdc735..650481f892f 100644 --- a/com.unity.render-pipelines.high-definition/Tests/Editor/HDGlobalSettingsTests.cs.meta +++ b/com.unity.render-pipelines.core/Editor/Lighting/LightUI.Skin.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: b1180ed5f2a1913498d7741201dd18bb +guid: 57198e360c6d9454b831562cef29b556 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/com.unity.render-pipelines.core/Editor/Lighting/ProbeVolume/ProbeGIBaking.cs b/com.unity.render-pipelines.core/Editor/Lighting/ProbeVolume/ProbeGIBaking.cs index 40be8e48745..b1391b4d6fb 100644 --- a/com.unity.render-pipelines.core/Editor/Lighting/ProbeVolume/ProbeGIBaking.cs +++ b/com.unity.render-pipelines.core/Editor/Lighting/ProbeVolume/ProbeGIBaking.cs @@ -51,7 +51,9 @@ partial class ProbeGIBaking { static bool m_IsInit = false; static BakingBatch m_BakingBatch; - static ProbeReferenceVolumeAuthoring m_BakingReferenceVolumeAuthoring = null; + static ProbeReferenceVolumeProfile m_BakingProfile = null; + static ProbeVolumeBakingProcessSettings m_BakingSettings; + static int m_BakingBatchIndex = 0; static Bounds globalBounds = new Bounds(); @@ -84,19 +86,12 @@ static void ClearBakingBatch() static public void Clear() { - var refVolAuthList = GameObject.FindObjectsOfType(); - - foreach (var refVolAuthoring in refVolAuthList) + var perSceneData = GameObject.FindObjectsOfType(); + foreach (var data in perSceneData) { - if (!refVolAuthoring.enabled || !refVolAuthoring.gameObject.activeSelf) - continue; - - refVolAuthoring.volumeAsset = null; - + data.InvalidateAllAssets(); var refVol = ProbeReferenceVolume.instance; refVol.Clear(); - refVol.SetTRS(Vector3.zero, Quaternion.identity, refVolAuthoring.brickSize); - refVol.SetMaxSubdivision(refVolAuthoring.maxSubdivision); } var probeVolumes = GameObject.FindObjectsOfType(); @@ -111,13 +106,14 @@ public static void FindWorldBounds() ProbeReferenceVolume.instance.clearAssetsOnVolumeClear = true; - var sceneBounds = ProbeReferenceVolume.instance.sceneBounds; + var sceneData = ProbeReferenceVolume.instance.sceneData; HashSet scenesToConsider = new HashSet(); for (int i = 0; i < EditorSceneManager.sceneCount; ++i) { var scene = EditorSceneManager.GetSceneAt(i); - sceneBounds.UpdateSceneBounds(scene); + sceneData.UpdateSceneBounds(scene); + sceneData.EnsurePerSceneData(scene); // !!! IMPORTANT TODO !!! // When we will have the concept of baking set this should be reverted, if a scene is not in the bake set it should not be considered // As of now we include all open scenes as the workflow is not nice or clear. When it'll be we should *NOT* do it. @@ -139,12 +135,12 @@ public static void FindWorldBounds() foreach (var scenePath in scenesToConsider) { bool hasProbeVolumes = false; - if (sceneBounds.hasProbeVolumes.TryGetValue(scenePath, out hasProbeVolumes)) + if (sceneData.hasProbeVolumes.TryGetValue(scenePath, out hasProbeVolumes)) { if (hasProbeVolumes) { Bounds localBound; - if (sceneBounds.sceneBounds.TryGetValue(scenePath, out localBound)) + if (sceneData.sceneBounds.TryGetValue(scenePath, out localBound)) { if (hasFoundBounds) { @@ -165,12 +161,15 @@ public static void FindWorldBounds() { var scene = EditorSceneManager.OpenScene(scenePath, OpenSceneMode.Additive); openedScenes.Add(scene); - sceneBounds.UpdateSceneBounds(scene); - Bounds localBound = sceneBounds.sceneBounds[scene.path]; - if (hasFoundBounds) - globalBounds.Encapsulate(localBound); - else - globalBounds = localBound; + if (sceneData.hasProbeVolumes.TryGetValue(scenePath, out hasProbeVolumes)) + { + sceneData.UpdateSceneBounds(scene); + Bounds localBound = sceneData.sceneBounds[scene.path]; + if (hasFoundBounds) + globalBounds.Encapsulate(localBound); + else + globalBounds = localBound; + } } } } @@ -184,57 +183,44 @@ public static void FindWorldBounds() } } - static ProbeReferenceVolumeAuthoring GetCardinalAuthoringComponent(ProbeReferenceVolumeAuthoring[] refVolAuthList) + static void SetBakingContext(ProbeVolumePerSceneData[] perSceneData) { - List enabledVolumes = new List(); + // We need to make sure all scenes we are baking have the same profile. The same should be done for the baking settings, but we check only profile. + // TODO: This should be ensured by the controlling panel, until we have that we need to assert. - foreach (var refVolAuthoring in refVolAuthList) + // To check what are the scenes that have probe volume enabled we checks the ProbeVolumePerSceneData. We are guaranteed to have only one per scene. + for (int i=0; i(); - if (refVolAuthList.Length == 0) - return; + var pvList = GameObject.FindObjectsOfType(); + if (pvList.Length == 0) return; // We have no probe volumes. FindWorldBounds(); - refVolAuthList = GameObject.FindObjectsOfType(); - - m_BakingReferenceVolumeAuthoring = GetCardinalAuthoringComponent(refVolAuthList); - - if (m_BakingReferenceVolumeAuthoring == null) - { - Debug.Log("Scene(s) have multiple inconsistent ProbeReferenceVolumeAuthoring components. Please ensure they use identical profiles and transforms before baking."); - return; - } + var perSceneDataList = GameObject.FindObjectsOfType(); + if (perSceneDataList.Length == 0) return; - var refVol = ProbeReferenceVolume.instance; + SetBakingContext(perSceneDataList); AddOccluders(); @@ -276,12 +262,14 @@ static void BrickCountInDirections(out Vector3Int cellsInXYZ, float brickSizeInM // It is only a first iteration of the concept that won't be as impactful on memory as other options. internal static void RevertDilation() { - var refVolAuthList = GameObject.FindObjectsOfType(); - m_BakingReferenceVolumeAuthoring = GetCardinalAuthoringComponent(refVolAuthList); - m_BakingReferenceVolumeAuthoring = GetCardinalAuthoringComponent(refVolAuthList); - if (m_BakingReferenceVolumeAuthoring == null) return; + if (m_BakingProfile == null) + { + var perSceneDataList = GameObject.FindObjectsOfType(); + if (perSceneDataList.Length == 0) return; + SetBakingContext(perSceneDataList); + } - var dilationSettings = m_BakingReferenceVolumeAuthoring.GetDilationSettings(); + var dilationSettings = m_BakingSettings.dilationSettings; foreach (var cell in ProbeReferenceVolume.instance.cells.Values) { @@ -305,43 +293,30 @@ internal static void RevertDilation() // proper UX. internal static void PerformDilation() { - HashSet refVols = new HashSet(); Dictionary> cell2Assets = new Dictionary>(); - var refVolAuthList = GameObject.FindObjectsOfType(); + var perSceneDataList = GameObject.FindObjectsOfType(); + if (perSceneDataList.Length == 0) return; - m_BakingReferenceVolumeAuthoring = GetCardinalAuthoringComponent(refVolAuthList); - if (m_BakingReferenceVolumeAuthoring == null) return; + SetBakingContext(perSceneDataList); - foreach (var refVol in refVolAuthList) + foreach (var sceneData in perSceneDataList) { - if (m_BakingReferenceVolumeAuthoring == null) - m_BakingReferenceVolumeAuthoring = refVol; - - if (refVol.enabled) + var asset = sceneData.GetCurrentStateAsset(); + string assetPath = asset.GetSerializedFullPath(); + foreach (var cell in asset.cells) { - refVols.Add(refVol); - } - } - - foreach (var refVol in refVols) - { - if (refVol.volumeAsset != null) - { - string assetPath = refVol.volumeAsset.GetSerializedFullPath(); - foreach (var cell in refVol.volumeAsset.cells) + if (!cell2Assets.ContainsKey(cell.index)) { - if (!cell2Assets.ContainsKey(cell.index)) - { - cell2Assets.Add(cell.index, new List()); - } - - cell2Assets[cell.index].Add(assetPath); + cell2Assets.Add(cell.index, new List()); } + + cell2Assets[cell.index].Add(assetPath); } + //// We need to queue the asset loading to make sure all is fine when calling refresh. + //sceneData.QueueAssetLoading(); } - var dilationSettings = m_BakingReferenceVolumeAuthoring.GetDilationSettings(); - + var dilationSettings = m_BakingSettings.dilationSettings; if (dilationSettings.dilationDistance > 0.0f) { @@ -365,11 +340,13 @@ internal static void PerformDilation() dilatedCells.Add(cell); } - foreach (var refVol in refVols) + foreach (var sceneData in perSceneDataList) { - if (refVol != null && refVol.volumeAsset != null) + var asset = sceneData.GetCurrentStateAsset(); + string assetPath = asset.GetSerializedFullPath(); + if (asset != null) { - ProbeReferenceVolume.instance.AddPendingAssetRemoval(refVol.volumeAsset); + ProbeReferenceVolume.instance.AddPendingAssetRemoval(asset); } } @@ -380,11 +357,12 @@ internal static void PerformDilation() // Put back cells foreach (var cell in dilatedCells) { - foreach (var refVol in refVols) + foreach (var sceneData in perSceneDataList) { - if (refVol.volumeAsset == null) continue; + var asset = sceneData.GetCurrentStateAsset(); + + if (asset == null) continue; - var asset = refVol.volumeAsset; var assetPath = asset.GetSerializedFullPath(); bool valueFound = false; if (!assetCleared.TryGetValue(assetPath, out valueFound)) @@ -403,10 +381,9 @@ internal static void PerformDilation() UnityEditor.AssetDatabase.SaveAssets(); UnityEditor.AssetDatabase.Refresh(); - foreach (var refVol in refVols) + foreach (var sceneData in perSceneDataList) { - if (refVol.enabled && refVol.gameObject.activeSelf) - refVol.QueueAssetLoading(); + sceneData.QueueAssetLoading(); } } @@ -444,7 +421,7 @@ static void OnAdditionalProbesBakeCompleted() onAdditionalProbesBakeCompletedCalled = true; - var dilationSettings = m_BakingReferenceVolumeAuthoring.GetDilationSettings(); + var dilationSettings = m_BakingSettings.dilationSettings; // Fetch results of all cells for (int c = 0; c < numCells; ++c) { @@ -533,16 +510,15 @@ static void OnAdditionalProbesBakeCompleted() UnityEditor.Experimental.Lightmapping.SetAdditionalBakedProbes(m_BakingBatch.index, null); // Map from each scene to an existing reference volume - var scene2RefVol = new Dictionary(); - foreach (var refVol in GameObject.FindObjectsOfType()) - if (refVol.enabled) - scene2RefVol[refVol.gameObject.scene] = refVol; + var scene2Data = new Dictionary(); + foreach (var data in GameObject.FindObjectsOfType()) + scene2Data[data.gameObject.scene] = data; // Map from each reference volume to its asset - var refVol2Asset = new Dictionary(); - foreach (var refVol in scene2RefVol.Values) + var data2Asset = new Dictionary(); + foreach (var data in scene2Data.Values) { - refVol2Asset[refVol] = ProbeVolumeAsset.CreateAsset(refVol.gameObject.scene); + data2Asset[data] = ProbeVolumeAsset.CreateAsset(data.gameObject.scene); } // Put cells into the respective assets @@ -551,29 +527,33 @@ static void OnAdditionalProbesBakeCompleted() foreach (var scene in m_BakingBatch.cellIndex2SceneReferences[cell.index]) { // This scene has a reference volume authoring component in it? - ProbeReferenceVolumeAuthoring refVol = null; - if (scene2RefVol.TryGetValue(scene, out refVol)) + ProbeVolumePerSceneData data = null; + if (scene2Data.TryGetValue(scene, out data)) { - var asset = refVol2Asset[refVol]; + var asset = data2Asset[data]; asset.cells.Add(cell); - CellCountInDirections(out asset.minCellPosition, out asset.maxCellPosition, refVol.profile.cellSizeInMeters); + var profile = ProbeReferenceVolume.instance.sceneData.GetProfileForScene(scene); + asset.StoreProfileData(profile); + Debug.Assert(profile != null); + CellCountInDirections(out asset.minCellPosition, out asset.maxCellPosition, profile.cellSizeInMeters); asset.globalBounds = globalBounds; } } } // Connect the assets to their components - foreach (var pair in refVol2Asset) + foreach (var pair in data2Asset) { - var refVol = pair.Key; + var data = pair.Key; var asset = pair.Value; - refVol.volumeAsset = asset; + // TODO: This will need to use the proper state, not default, when we have them. + data.StoreAssetForState(ProbeVolumeState.Default, asset); if (UnityEditor.Lightmapping.giWorkflowMode != UnityEditor.Lightmapping.GIWorkflowMode.Iterative) { - UnityEditor.EditorUtility.SetDirty(refVol); - UnityEditor.EditorUtility.SetDirty(refVol.volumeAsset); + UnityEditor.EditorUtility.SetDirty(data); + UnityEditor.EditorUtility.SetDirty(asset); } } @@ -587,10 +567,9 @@ static void OnAdditionalProbesBakeCompleted() UnityEditor.AssetDatabase.Refresh(); probeRefVolume.clearAssetsOnVolumeClear = false; - foreach (var refVol in refVol2Asset.Keys) + foreach (var data in data2Asset.Keys) { - if (refVol.enabled && refVol.gameObject.activeSelf) - refVol.QueueAssetLoading(); + data.QueueAssetLoading(); } // ---- Perform dilation --- @@ -651,23 +630,28 @@ public static void RunPlacement() ClearBakingBatch(); // Subdivide the scene and place the bricks - var ctx = PrepareProbeSubdivisionContext(m_BakingReferenceVolumeAuthoring); + var ctx = PrepareProbeSubdivisionContext(); var result = BakeBricks(ctx); // Compute probe positions and send them to the Lightmapper - float brickSize = m_BakingReferenceVolumeAuthoring.brickSize; + float brickSize = m_BakingProfile.minBrickSize; Matrix4x4 newRefToWS = Matrix4x4.TRS(Vector3.zero, Quaternion.identity, new Vector3(brickSize, brickSize, brickSize)); - //m_BakingReferenceVolumeAuthoring; ApplySubdivisionResults(result, newRefToWS); } - public static ProbeSubdivisionContext PrepareProbeSubdivisionContext(ProbeReferenceVolumeAuthoring refVolume) + public static ProbeSubdivisionContext PrepareProbeSubdivisionContext() { ProbeSubdivisionContext ctx = new ProbeSubdivisionContext(); // Prepare all the information in the scene for baking GI. Vector3 refVolOrigin = Vector3.zero; // TODO: This will need to be center of the world bounds. - ctx.Initialize(refVolume, refVolOrigin); + if (m_BakingProfile == null) + { + var perSceneDataList = GameObject.FindObjectsOfType(); + if (perSceneDataList.Length == 0) return ctx; + SetBakingContext(perSceneDataList); + } + ctx.Initialize(m_BakingProfile, refVolOrigin); return ctx; } @@ -679,7 +663,7 @@ public static ProbeSubdivisionResult BakeBricks(ProbeSubdivisionContext ctx) if (ctx.probeVolumes.Count == 0) return result; - using (var gpuResources = ProbePlacement.AllocateGPUResources(ctx.probeVolumes.Count, ctx.refVolume.profile.maxSubdivision)) + using (var gpuResources = ProbePlacement.AllocateGPUResources(ctx.probeVolumes.Count, ctx.profile.maxSubdivision)) { // subdivide all the cells and generate brick positions foreach (var cell in ctx.cells) @@ -824,7 +808,7 @@ public static void ApplySubdivisionResults(ProbeSubdivisionResult results, Matri // Move positions before sending them var positions = m_BakingBatch.uniquePositions.Keys.ToArray(); - VirtualOffsetSettings voSettings = m_BakingReferenceVolumeAuthoring.GetVirtualOffsetSettings(); + VirtualOffsetSettings voSettings = m_BakingSettings.virtualOffsetSettings; if (voSettings.useVirtualOffset) { for (int i = 0; i < positions.Length; ++i) @@ -832,7 +816,7 @@ public static void ApplySubdivisionResults(ProbeSubdivisionResult results, Matri int subdivLevel = 0; m_BakingBatch.uniqueBrickSubdiv.TryGetValue(positions[i], out subdivLevel); float brickSize = ProbeReferenceVolume.CellSize(subdivLevel); - float searchDistance = (brickSize * m_BakingReferenceVolumeAuthoring.brickSize) / ProbeBrickPool.kBrickCellCount; + float searchDistance = (brickSize * m_BakingProfile.minBrickSize) / ProbeBrickPool.kBrickCellCount; float scaleForSearchDist = voSettings.searchMultiplier; positions[i] = PushPositionOutOfGeometry(positions[i], scaleForSearchDist * searchDistance, voSettings.outOfGeoOffset); diff --git a/com.unity.render-pipelines.core/Editor/Lighting/ProbeVolume/ProbePlacement.cs b/com.unity.render-pipelines.core/Editor/Lighting/ProbeVolume/ProbePlacement.cs index 42f3db83972..a2e0dc1f8b6 100644 --- a/com.unity.render-pipelines.core/Editor/Lighting/ProbeVolume/ProbePlacement.cs +++ b/com.unity.render-pipelines.core/Editor/Lighting/ProbeVolume/ProbePlacement.cs @@ -277,7 +277,7 @@ public static List SubdivideCell(ProbeReferenceVolume.Volume cellVolume, // In case there is at least one brick in the sub-cell, we need to spawn the parent brick. if (brickCount != brickSet.Count) { - float minBrickSize = subdivisionCtx.refVolume.profile.minBrickSize; + float minBrickSize = subdivisionCtx.profile.minBrickSize; Vector3 cellID = (cellAABB.center - cellAABB.extents) / minBrickSize; float parentSubdivLevel = 3.0f; for (int i = k_MaxSubdivisionInSubCell; i < ctx.maxSubdivisionLevel; i++) @@ -350,7 +350,7 @@ static void SubdivideSubCell(ProbeReferenceVolume.Volume cellVolume, ProbeSubdiv List<(Terrain terrain, ProbeReferenceVolume.Volume volume)> terrains, HashSet brickSet) { var cellAABB = cellVolume.CalculateAABB(); - float minBrickSize = subdivisionCtx.refVolume.profile.minBrickSize; + float minBrickSize = subdivisionCtx.profile.minBrickSize; cellVolume.CalculateCenterAndSize(out var center, out var _); var cmd = CommandBufferPool.Get($"Subdivide (Sub)Cell {center}"); diff --git a/com.unity.render-pipelines.core/Editor/Lighting/ProbeVolume/ProbeReferenceVolumeAuthoringEditor.cs b/com.unity.render-pipelines.core/Editor/Lighting/ProbeVolume/ProbeReferenceVolumeAuthoringEditor.cs index 132242ae883..c5873116ac1 100644 --- a/com.unity.render-pipelines.core/Editor/Lighting/ProbeVolume/ProbeReferenceVolumeAuthoringEditor.cs +++ b/com.unity.render-pipelines.core/Editor/Lighting/ProbeVolume/ProbeReferenceVolumeAuthoringEditor.cs @@ -12,124 +12,11 @@ namespace UnityEngine.Experimental.Rendering [CustomEditor(typeof(ProbeReferenceVolumeAuthoring))] internal class ProbeReferenceVolumeAuthoringEditor : Editor { - [InitializeOnLoad] - class RealtimeProbeSubdivisionDebug - { - static double s_LastSubdivisionTime; - static double s_LastRefreshTime; - static IEnumerator s_CurrentSubdivision; - - static RealtimeProbeSubdivisionDebug() - { - EditorApplication.update -= UpdateRealtimeSubdivisionDebug; - EditorApplication.update += UpdateRealtimeSubdivisionDebug; - } - - static void UpdateRealtimeSubdivisionDebug() - { - var debugDisplay = ProbeReferenceVolume.instance.debugDisplay; - if (!debugDisplay.realtimeSubdivision) - return; - - // Avoid killing the GPU when Unity is in background and runInBackground is disabled - if (!Application.runInBackground && !UnityEditorInternal.InternalEditorUtility.isApplicationActive) - return; - - // update is called 200 times per second so we bring down the update rate to 60hz to avoid overloading the GPU - if (Time.realtimeSinceStartupAsDouble - s_LastRefreshTime < 1.0f / 60.0f) - return; - s_LastRefreshTime = Time.realtimeSinceStartupAsDouble; - - if (Time.realtimeSinceStartupAsDouble - s_LastSubdivisionTime > debugDisplay.subdivisionDelayInSeconds) - { - var probeVolumeAuthoring = FindObjectOfType(); - if (probeVolumeAuthoring == null || !probeVolumeAuthoring.isActiveAndEnabled) - return; - - if (s_CurrentSubdivision == null) - { - // Start a new Subdivision - s_CurrentSubdivision = Subdivide(); - } - - // Step the subdivision with the amount of cell per frame in debug menu - int updatePerFrame = debugDisplay.subdivisionCellUpdatePerFrame; - // From simplification level 5 and higher, the cost of calculating one cell is very high, so we adjust that number. - if (probeVolumeAuthoring.profile.simplificationLevels > 4) - updatePerFrame = (int)Mathf.Max(1, updatePerFrame / Mathf.Pow(9, probeVolumeAuthoring.profile.simplificationLevels - 4)); - for (int i = 0; i < debugDisplay.subdivisionCellUpdatePerFrame; i++) - { - if (!s_CurrentSubdivision.MoveNext()) - { - s_LastSubdivisionTime = Time.realtimeSinceStartupAsDouble; - s_CurrentSubdivision = null; - break; - } - } - - IEnumerator Subdivide() - { - var ctx = ProbeGIBaking.PrepareProbeSubdivisionContext(probeVolumeAuthoring); - - // Cull all the cells that are not visible (we don't need them for realtime debug) - ctx.cells.RemoveAll(c => - { - return probeVolumeAuthoring.ShouldCullCell(c.position); - }); - - Camera activeCamera = Camera.current ?? SceneView.lastActiveSceneView.camera; - - // Sort cells by camera distance to compute the closest cells first - if (activeCamera != null) - { - var cameraPos = activeCamera.transform.position; - ctx.cells.Sort((c1, c2) => - { - c1.volume.CalculateCenterAndSize(out var c1Center, out var _); - float c1Distance = Vector3.Distance(cameraPos, c1Center); - - c2.volume.CalculateCenterAndSize(out var c2Center, out var _); - float c2Distance = Vector3.Distance(cameraPos, c2Center); - - return c1Distance.CompareTo(c2Distance); - }); - } - - // Progressively update cells: - var cells = ctx.cells.ToList(); - - // Remove all the cells that was not updated to prevent ghosting - foreach (var cellVolume in ctx.refVolume.realtimeSubdivisionInfo.Keys.ToList()) - { - if (!cells.Any(c => c.volume.Equals(cellVolume))) - ctx.refVolume.realtimeSubdivisionInfo.Remove(cellVolume); - } - - // Subdivide visible cells - foreach (var cell in cells) - { - // Override the cell list to only compute one cell - ctx.cells.Clear(); - ctx.cells.Add(cell); - - var result = ProbeGIBaking.BakeBricks(ctx); - ctx.refVolume.realtimeSubdivisionInfo[cell.volume] = result.bricksPerCells[cell.position]; - - yield return null; - } - - yield break; - } - } - } - } - private SerializedProperty m_Dilate; private SerializedProperty m_MaxDilationSampleDistance; private SerializedProperty m_DilationValidityThreshold; private SerializedProperty m_DilationIterations; private SerializedProperty m_DilationInvSquaredWeight; - private SerializedProperty m_VolumeAsset; private SerializedProperty m_EnableVirtualOffset; private SerializedProperty m_VirtualOffsetGeometrySearchMultiplier; @@ -137,7 +24,6 @@ IEnumerator Subdivide() private SerializedProperty m_Profile; - internal static readonly GUIContent s_DataAssetLabel = new GUIContent("Data asset", "The asset which serializes all probe related data in this volume."); internal static readonly GUIContent s_ProfileAssetLabel = new GUIContent("Profile", "The asset which determines the characteristics of the probe reference volume."); private static bool DilationGroupEnabled; @@ -155,7 +41,6 @@ private void OnEnable() m_DilationInvSquaredWeight = serializedObject.FindProperty("m_DilationInvSquaredWeight"); m_MaxDilationSampleDistance = serializedObject.FindProperty("m_MaxDilationSampleDistance"); m_DilationValidityThreshold = serializedObject.FindProperty("m_DilationValidityThreshold"); - m_VolumeAsset = serializedObject.FindProperty("volumeAsset"); m_EnableVirtualOffset = serializedObject.FindProperty("m_EnableVirtualOffset"); m_VirtualOffsetGeometrySearchMultiplier = serializedObject.FindProperty("m_VirtualOffsetGeometrySearchMultiplier"); m_VirtualOffsetBiasOutOfGeometry = serializedObject.FindProperty("m_VirtualOffsetBiasOutOfGeometry"); @@ -231,8 +116,6 @@ public override void OnInspectorGUI() m_Profile.objectReferenceValue = asset; } - m_VolumeAsset.objectReferenceValue = EditorGUILayout.ObjectField(s_DataAssetLabel, m_VolumeAsset.objectReferenceValue, typeof(ProbeVolumeAsset), false); - DilationGroupEnabled = EditorGUILayout.BeginFoldoutHeaderGroup(DilationGroupEnabled, "Dilation"); if (DilationGroupEnabled) { diff --git a/com.unity.render-pipelines.core/Editor/Lighting/ProbeVolume/ProbeSubdivisionContext.cs b/com.unity.render-pipelines.core/Editor/Lighting/ProbeVolume/ProbeSubdivisionContext.cs index 84f260fe9d1..a281f7dd9c8 100644 --- a/com.unity.render-pipelines.core/Editor/Lighting/ProbeVolume/ProbeSubdivisionContext.cs +++ b/com.unity.render-pipelines.core/Editor/Lighting/ProbeVolume/ProbeSubdivisionContext.cs @@ -1,6 +1,7 @@ using System.Collections.Generic; using Unity.Collections; using System; +using System.Collections; using System.Linq; using UnityEditor; @@ -12,16 +13,132 @@ namespace UnityEngine.Experimental.Rendering { class ProbeSubdivisionContext { + [InitializeOnLoad] + class RealtimeProbeSubdivisionDebug + { + static double s_LastSubdivisionTime; + static double s_LastRefreshTime; + static IEnumerator s_CurrentSubdivision; + + static RealtimeProbeSubdivisionDebug() + { + EditorApplication.update -= UpdateRealtimeSubdivisionDebug; + EditorApplication.update += UpdateRealtimeSubdivisionDebug; + } + + static void UpdateRealtimeSubdivisionDebug() + { + var debugDisplay = ProbeReferenceVolume.instance.debugDisplay; + if (!debugDisplay.realtimeSubdivision) + return; + + // Avoid killing the GPU when Unity is in background and runInBackground is disabled + if (!Application.runInBackground && !UnityEditorInternal.InternalEditorUtility.isApplicationActive) + return; + + // update is called 200 times per second so we bring down the update rate to 60hz to avoid overloading the GPU + if (Time.realtimeSinceStartupAsDouble - s_LastRefreshTime < 1.0f / 60.0f) + return; + s_LastRefreshTime = Time.realtimeSinceStartupAsDouble; + + if (Time.realtimeSinceStartupAsDouble - s_LastSubdivisionTime > debugDisplay.subdivisionDelayInSeconds) + { + var probeVolume = GameObject.FindObjectOfType(); + if (probeVolume == null || !probeVolume.isActiveAndEnabled || ProbeReferenceVolume.instance.sceneData == null) + return; + + var profile = ProbeReferenceVolume.instance.sceneData.GetProfileForScene(probeVolume.gameObject.scene); + if (profile == null) + return; + + if (s_CurrentSubdivision == null) + { + // Start a new Subdivision + s_CurrentSubdivision = Subdivide(); + } + + // Step the subdivision with the amount of cell per frame in debug menu + int updatePerFrame = debugDisplay.subdivisionCellUpdatePerFrame; + // From simplification level 5 and higher, the cost of calculating one cell is very high, so we adjust that number. + if (profile.simplificationLevels > 4) + updatePerFrame = (int)Mathf.Max(1, updatePerFrame / Mathf.Pow(9, profile.simplificationLevels - 4)); + for (int i = 0; i < debugDisplay.subdivisionCellUpdatePerFrame; i++) + { + if (!s_CurrentSubdivision.MoveNext()) + { + s_LastSubdivisionTime = Time.realtimeSinceStartupAsDouble; + s_CurrentSubdivision = null; + break; + } + } + + IEnumerator Subdivide() + { + var ctx = ProbeGIBaking.PrepareProbeSubdivisionContext(); + + // Cull all the cells that are not visible (we don't need them for realtime debug) + ctx.cells.RemoveAll(c => + { + return probeVolume.ShouldCullCell(c.position); + }); + + Camera activeCamera = Camera.current ?? SceneView.lastActiveSceneView.camera; + + // Sort cells by camera distance to compute the closest cells first + if (activeCamera != null) + { + var cameraPos = activeCamera.transform.position; + ctx.cells.Sort((c1, c2) => + { + c1.volume.CalculateCenterAndSize(out var c1Center, out var _); + float c1Distance = Vector3.Distance(cameraPos, c1Center); + + c2.volume.CalculateCenterAndSize(out var c2Center, out var _); + float c2Distance = Vector3.Distance(cameraPos, c2Center); + + return c1Distance.CompareTo(c2Distance); + }); + } + + // Progressively update cells: + var cells = ctx.cells.ToList(); + + // Remove all the cells that was not updated to prevent ghosting + foreach (var cellVolume in ProbeReferenceVolume.instance.realtimeSubdivisionInfo.Keys.ToList()) + { + if (!cells.Any(c => c.volume.Equals(cellVolume))) + ProbeReferenceVolume.instance.realtimeSubdivisionInfo.Remove(cellVolume); + } + + // Subdivide visible cells + foreach (var cell in cells) + { + // Override the cell list to only compute one cell + ctx.cells.Clear(); + ctx.cells.Add(cell); + + var result = ProbeGIBaking.BakeBricks(ctx); + ProbeReferenceVolume.instance.realtimeSubdivisionInfo[cell.volume] = result.bricksPerCells[cell.position]; + + yield return null; + } + + yield break; + } + } + } + } + public List<(ProbeVolume component, ProbeReferenceVolume.Volume volume)> probeVolumes = new List<(ProbeVolume, ProbeReferenceVolume.Volume)>(); public List<(Renderer component, ProbeReferenceVolume.Volume volume)> renderers = new List<(Renderer, ProbeReferenceVolume.Volume)>(); public List<(Vector3Int position, ProbeReferenceVolume.Volume volume)> cells = new List<(Vector3Int, ProbeReferenceVolume.Volume)>(); public List<(Terrain, ProbeReferenceVolume.Volume volume)> terrains = new List<(Terrain, ProbeReferenceVolume.Volume)>(); - public ProbeReferenceVolumeAuthoring refVolume; + public ProbeReferenceVolumeProfile profile; - public void Initialize(ProbeReferenceVolumeAuthoring refVolume, Vector3 refVolOrigin) + public void Initialize(ProbeReferenceVolumeProfile profile, Vector3 refVolOrigin) { - this.refVolume = refVolume; - float cellSize = refVolume.cellSizeInMeters; + this.profile = profile; + float cellSize = profile.cellSizeInMeters; foreach (var pv in UnityEngine.Object.FindObjectsOfType()) { diff --git a/com.unity.render-pipelines.core/Editor/MenuManager.cs b/com.unity.render-pipelines.core/Editor/MenuManager.cs new file mode 100644 index 00000000000..709d1fe00c1 --- /dev/null +++ b/com.unity.render-pipelines.core/Editor/MenuManager.cs @@ -0,0 +1,79 @@ +using System; +using System.Linq.Expressions; +using System.Reflection; + +namespace UnityEditor.Rendering +{ + /// + /// Contains a set of method to be able to manage Menu Items for the editor + /// + static class MenuManager + { + #region Add Menu Item + static Action> s_AddMenuItem = GetAddMenuItemMethod(); + static Action> GetAddMenuItemMethod() + { + MethodInfo addMenuItemMethodInfo = typeof(Menu).GetMethod("AddMenuItem", BindingFlags.Static | BindingFlags.NonPublic); + var nameParam = Expression.Parameter(typeof(string), "name"); + var shortcutParam = Expression.Parameter(typeof(string), "shortcut"); + var checkedParam = Expression.Parameter(typeof(bool), "checked"); + var priorityParam = Expression.Parameter(typeof(int), "priority"); + var executeParam = Expression.Parameter(typeof(Action), "execute"); + var validateParam = Expression.Parameter(typeof(Func), "validate"); + + var addMenuItemExpressionCall = Expression.Call(null, addMenuItemMethodInfo, + nameParam, + shortcutParam, + checkedParam, + priorityParam, + executeParam, + validateParam); + + return Expression.Lambda>>( + addMenuItemExpressionCall, + nameParam, + shortcutParam, + checkedParam, + priorityParam, + executeParam, + validateParam).Compile(); + } + + /// + /// Adds a menu Item to the editor + /// + /// The path to the menu item + /// The shortcut of the menu item + /// If the item can have an state, pressed or not + /// The priority of the menu item + /// The action that will be called once the menu item is pressed + /// The action that will be called to know if the menu itme is enabled + public static void AddMenuItem(string path, string shortcut, bool @checked, int priority, System.Action execute, System.Func validate) + { + s_AddMenuItem(path, shortcut, @checked, priority, execute, validate); + } + + #endregion + + #region Remove Menu Item + static Action s_RemoveMenuItem = GetRemoveMenuItemMethod(); + static Action GetRemoveMenuItemMethod() + { + MethodInfo removeMenuItemMethodInfo = typeof(Menu).GetMethod("RemoveMenuItem", BindingFlags.Static | BindingFlags.NonPublic); + var nameParam = Expression.Parameter(typeof(string), "name"); + return Expression.Lambda>( + Expression.Call(null, removeMenuItemMethodInfo, nameParam), + nameParam).Compile(); + } + #endregion + + /// + /// Removes a Menu item from the editor, if the path is not found it does nothing + /// + /// The path of the menu item to be removed + public static void RemoveMenuItem(string path) + { + s_RemoveMenuItem(path); + } + } +} diff --git a/com.unity.render-pipelines.universal/Tests/Editor/UniversalGlobalSettingsTests.cs.meta b/com.unity.render-pipelines.core/Editor/MenuManager.cs.meta similarity index 83% rename from com.unity.render-pipelines.universal/Tests/Editor/UniversalGlobalSettingsTests.cs.meta rename to com.unity.render-pipelines.core/Editor/MenuManager.cs.meta index 27e60d2d3d5..ac7bdfd5ea5 100644 --- a/com.unity.render-pipelines.universal/Tests/Editor/UniversalGlobalSettingsTests.cs.meta +++ b/com.unity.render-pipelines.core/Editor/MenuManager.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 59559b7e05a876a45bd815c6e5e874e3 +guid: 016ffaaf36db9a047ab182ffa07bb8de MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/com.unity.render-pipelines.core/Runtime/Common/IAdditionalData.cs b/com.unity.render-pipelines.core/Runtime/Common/IAdditionalData.cs new file mode 100644 index 00000000000..ccd428ec08a --- /dev/null +++ b/com.unity.render-pipelines.core/Runtime/Common/IAdditionalData.cs @@ -0,0 +1,10 @@ + +namespace UnityEngine.Rendering +{ + /// + /// Interface to identify additional data components + /// + public interface IAdditionalData + { + } +} diff --git a/com.unity.render-pipelines.core/Runtime/Lighting/ProbeVolume/ProbeVolumeSceneBounds.cs.meta b/com.unity.render-pipelines.core/Runtime/Common/IAdditionalData.cs.meta similarity index 83% rename from com.unity.render-pipelines.core/Runtime/Lighting/ProbeVolume/ProbeVolumeSceneBounds.cs.meta rename to com.unity.render-pipelines.core/Runtime/Common/IAdditionalData.cs.meta index 8d499648c46..f12e5691735 100644 --- a/com.unity.render-pipelines.core/Runtime/Lighting/ProbeVolume/ProbeVolumeSceneBounds.cs.meta +++ b/com.unity.render-pipelines.core/Runtime/Common/IAdditionalData.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 2aadc37bd110b7a4895abe8f9fa3d776 +guid: 387193679abe1894fa3e4edf840e8932 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/com.unity.render-pipelines.core/Runtime/Lighting/ProbeVolume/ProbeReferenceVolume.Debug.cs b/com.unity.render-pipelines.core/Runtime/Lighting/ProbeVolume/ProbeReferenceVolume.Debug.cs index 02b5a3c9d0c..7eaa3ea32dd 100644 --- a/com.unity.render-pipelines.core/Runtime/Lighting/ProbeVolume/ProbeReferenceVolume.Debug.cs +++ b/com.unity.render-pipelines.core/Runtime/Lighting/ProbeVolume/ProbeReferenceVolume.Debug.cs @@ -53,6 +53,8 @@ class CellInstancedDebugProbes internal float dilationValidtyThreshold = 0.25f; // We ned to store this here to access it + // Field used for the realtime subdivision preview + internal Dictionary> realtimeSubdivisionInfo = new Dictionary>(); /// /// Render Probe Volume related debug @@ -238,6 +240,7 @@ void DrawProbeDebug(Camera camera) void ClearDebugData() { m_CellDebugData.Clear(); + realtimeSubdivisionInfo.Clear(); } void CreateInstancedProbes() diff --git a/com.unity.render-pipelines.core/Runtime/Lighting/ProbeVolume/ProbeReferenceVolume.cs b/com.unity.render-pipelines.core/Runtime/Lighting/ProbeVolume/ProbeReferenceVolume.cs index 4d9d800e70b..438e8464429 100644 --- a/com.unity.render-pipelines.core/Runtime/Lighting/ProbeVolume/ProbeReferenceVolume.cs +++ b/com.unity.render-pipelines.core/Runtime/Lighting/ProbeVolume/ProbeReferenceVolume.cs @@ -228,7 +228,7 @@ public struct ProbeVolumeSystemParameters /// public Shader probeDebugShader; - public ProbeVolumeSceneBounds sceneBounds; + public ProbeVolumeSceneData sceneData; public ProbeVolumeSHBands shBands; } @@ -515,7 +515,7 @@ public override bool Equals(object obj) internal Dictionary cells = new Dictionary(); Dictionary m_ChunkInfo = new Dictionary(); - internal ProbeVolumeSceneBounds sceneBounds; + internal ProbeVolumeSceneData sceneData; /// @@ -547,6 +547,7 @@ public struct ExtraDataActionInput bool m_NeedLoadAsset = false; bool m_ProbeReferenceVolumeInit = false; + internal bool isInitialized => m_ProbeReferenceVolumeInit; struct InitInfo @@ -620,11 +621,11 @@ public void Initialize(in ProbeVolumeSystemParameters parameters) InitProbeReferenceVolume(kProbeIndexPoolAllocationSize, m_MemoryBudget, m_SHBands); m_IsInitialized = true; m_NeedsIndexRebuild = true; - sceneBounds = parameters.sceneBounds; + sceneData = parameters.sceneData; #if UNITY_EDITOR - if (sceneBounds != null) + if (sceneData != null) { - UnityEditor.SceneManagement.EditorSceneManager.sceneSaved += sceneBounds.UpdateSceneBounds; + UnityEditor.SceneManagement.EditorSceneManager.sceneSaved += sceneData.OnSceneSaved; } #endif } @@ -645,6 +646,8 @@ internal void ForceSHBand(ProbeVolumeSHBands shBands) /// public void Cleanup() { + if (!m_ProbeReferenceVolumeInit) return; + if (!m_IsInitialized) { Debug.LogError("Probe Volume System has not been initialized first before calling cleanup."); @@ -813,6 +816,11 @@ void LoadAsset(ProbeVolumeAsset asset) var path = asset.GetSerializedFullPath(); + // Load info coming originally from profile + SetTRS(Vector3.zero, Quaternion.identity, asset.minBrickSize); + SetMaxSubdivision(asset.maxSubdivision); + + for (int i = 0; i < asset.cells.Count; ++i) { var cell = asset.cells[i]; diff --git a/com.unity.render-pipelines.core/Runtime/Lighting/ProbeVolume/ProbeReferenceVolumeAuthoring.cs b/com.unity.render-pipelines.core/Runtime/Lighting/ProbeVolume/ProbeReferenceVolumeAuthoring.cs index 7b0516011c7..d03d6112b99 100644 --- a/com.unity.render-pipelines.core/Runtime/Lighting/ProbeVolume/ProbeReferenceVolumeAuthoring.cs +++ b/com.unity.render-pipelines.core/Runtime/Lighting/ProbeVolume/ProbeReferenceVolumeAuthoring.cs @@ -75,9 +75,6 @@ internal static ProbeReferenceVolumeProfile CreateReferenceVolumeProfile(Scene s [SerializeField] ProbeReferenceVolumeProfile m_Profile = null; -#if UNITY_EDITOR - ProbeReferenceVolumeProfile m_PrevProfile = null; -#endif internal ProbeReferenceVolumeProfile profile { get { return m_Profile; } } internal float brickSize { get { return m_Profile.minBrickSize; } } @@ -104,230 +101,49 @@ internal static ProbeReferenceVolumeProfile CreateReferenceVolumeProfile(Scene s [SerializeField] float m_VirtualOffsetBiasOutOfGeometry = 0.01f; - // Field used for the realtime subdivision preview [NonSerialized] - internal Dictionary> realtimeSubdivisionInfo = new Dictionary>(); - - MeshGizmo brickGizmos; - MeshGizmo cellGizmo; + bool m_SentDataToSceneData = false; // TODO: This is temp until we don't have a setting panel. - // In some cases Unity will magically popuplate this private field with a correct value even though it should not be serialized. - // The [NonSerialized] attribute allows to force the asset to be null in case a domain reload happens. - [NonSerialized] - ProbeVolumeAsset m_PrevAsset = null; -#endif [SerializeField] float m_DilationValidityThreshold = 0.25f; +#endif public ProbeVolumeAsset volumeAsset = null; - internal void LoadProfileInformation() - { - if (m_Profile == null) - return; - - var refVol = ProbeReferenceVolume.instance; - refVol.SetTRS(Vector3.zero, Quaternion.identity, m_Profile.minBrickSize); - refVol.SetMaxSubdivision(m_Profile.maxSubdivision); - refVol.dilationValidtyThreshold = m_DilationValidityThreshold; - } - - internal void QueueAssetLoading() - { - LoadProfileInformation(); - - if (volumeAsset != null) - ProbeReferenceVolume.instance.AddPendingAssetLoading(volumeAsset); - } - - internal void QueueAssetRemoval() - { - if (volumeAsset == null) - return; - #if UNITY_EDITOR - brickGizmos?.Dispose(); - brickGizmos = null; - cellGizmo?.Dispose(); - cellGizmo = null; - m_PrevAsset = null; -#endif - - ProbeReferenceVolume.instance.AddPendingAssetRemoval(volumeAsset); + // TEMP! THIS NEEDS TO BE REMOVED WHEN WE HAVE THE SETTINGS PANEL. + void SendSceneData(bool force = false) + { + if (ProbeReferenceVolume.instance.sceneData == null) return; + if (!m_SentDataToSceneData || force) + { + ProbeReferenceVolume.instance.sceneData.SetBakeSettingsForScene(gameObject.scene, GetDilationSettings(), GetVirtualOffsetSettings()); + ProbeReferenceVolume.instance.sceneData.SetProfileForScene(gameObject.scene, m_Profile); + m_SentDataToSceneData = true; + } } void OnEnable() { -#if UNITY_EDITOR if (m_Profile == null) m_Profile = CreateReferenceVolumeProfile(gameObject.scene, gameObject.name); -#endif - QueueAssetLoading(); + SendSceneData(force: true); } -#if UNITY_EDITOR - void OnValidate() { if (!enabled || !gameObject.activeSelf) return; - if (m_Profile != null) - { - m_PrevProfile = m_Profile; - } - - if (volumeAsset != m_PrevAsset && m_PrevAsset != null) - { - ProbeReferenceVolume.instance.AddPendingAssetRemoval(m_PrevAsset); - } - - if (volumeAsset != m_PrevAsset) - { - QueueAssetLoading(); - } - - m_PrevAsset = volumeAsset; + SendSceneData(force: true); } - void OnDisable() - { - QueueAssetRemoval(); - } - - void OnDestroy() - { - QueueAssetRemoval(); - } - - internal bool ShouldCullCell(Vector3 cellPosition, Vector3 originWS = default(Vector3)) - { - if (m_Profile == null) - return true; - - var cameraTransform = SceneView.lastActiveSceneView.camera.transform; - - Vector3 cellCenterWS = cellPosition * m_Profile.cellSizeInMeters + originWS + Vector3.one * (m_Profile.cellSizeInMeters / 2.0f); - - // Round down to cell size distance - float roundedDownDist = Mathf.Floor(Vector3.Distance(cameraTransform.position, cellCenterWS) / m_Profile.cellSizeInMeters) * m_Profile.cellSizeInMeters; - - if (roundedDownDist > ProbeReferenceVolume.instance.debugDisplay.subdivisionViewCullingDistance) - return true; - - var frustumPlanes = GeometryUtility.CalculateFrustumPlanes(SceneView.lastActiveSceneView.camera); - var volumeAABB = new Bounds(cellCenterWS, m_Profile.cellSizeInMeters * Vector3.one); - return !GeometryUtility.TestPlanesAABB(frustumPlanes, volumeAABB); - } - - // TODO: We need to get rid of Handles.DrawWireCube to be able to have those at runtime as well. - void OnDrawGizmos() + // IMPORTANT TODO: This is to be deleted when we have the proper setting panel. + private void Update() { - if (!enabled || !gameObject.activeSelf || !ProbeReferenceVolume.instance.isInitialized) - return; - - var debugDisplay = ProbeReferenceVolume.instance.debugDisplay; - - if (debugDisplay.drawBricks) - { - var subdivColors = ProbeReferenceVolume.instance.subdivisionDebugColors; - - IEnumerable GetVisibleBricks() - { - if (debugDisplay.realtimeSubdivision) - { - // realtime subdiv cells are already culled - foreach (var kp in realtimeSubdivisionInfo) - { - var cellVolume = kp.Key; - - foreach (var brick in kp.Value) - { - yield return brick; - } - } - } - else - { - foreach (var cell in ProbeReferenceVolume.instance.cells.Values) - { - if (ShouldCullCell(cell.position, ProbeReferenceVolume.instance.GetTransform().posWS)) - continue; - - if (cell.bricks == null) - continue; - - foreach (var brick in cell.bricks) - yield return brick; - } - } - } - - if (brickGizmos == null) - brickGizmos = new MeshGizmo((int)(Mathf.Pow(3, ProbeBrickIndex.kMaxSubdivisionLevels) * MeshGizmo.vertexCountPerCube)); - - brickGizmos.Clear(); - foreach (var brick in GetVisibleBricks()) - { - if (brick.subdivisionLevel < 0) - continue; - - Vector3 scaledSize = Vector3.one * Mathf.Pow(3, brick.subdivisionLevel); - Vector3 scaledPos = brick.position + scaledSize / 2; - brickGizmos.AddWireCube(scaledPos, scaledSize, subdivColors[brick.subdivisionLevel]); - } - - brickGizmos.RenderWireframe(ProbeReferenceVolume.instance.GetRefSpaceToWS(), gizmoName: "Brick Gizmo Rendering"); - } - - if (debugDisplay.drawCells) - { - IEnumerable GetVisibleCellCenters() - { - if (debugDisplay.realtimeSubdivision) - { - foreach (var kp in realtimeSubdivisionInfo) - { - kp.Key.CalculateCenterAndSize(out var center, out var _); - yield return center; - } - } - else - { - foreach (var cell in ProbeReferenceVolume.instance.cells.Values) - { - if (ShouldCullCell(cell.position, ProbeReferenceVolume.instance.GetTransform().posWS)) - continue; - - var positionF = new Vector3(cell.position.x, cell.position.y, cell.position.z); - var center = positionF * m_Profile.cellSizeInMeters + m_Profile.cellSizeInMeters * 0.5f * Vector3.one; - yield return center; - } - } - } - - Matrix4x4 trs = Matrix4x4.TRS(ProbeReferenceVolume.instance.GetTransform().posWS, ProbeReferenceVolume.instance.GetTransform().rot, Vector3.one); - - // For realtime subdivision, the matrix from ProbeReferenceVolume.instance can be wrong if the profile changed since the last bake - if (debugDisplay.realtimeSubdivision) - trs = Matrix4x4.TRS(transform.position, Quaternion.identity, Vector3.one); - - // Fetching this from components instead of from the reference volume allows the user to - // preview how cells will look before they commit to a bake. - Gizmos.color = new Color(0, 1, 0.5f, 0.2f); - Gizmos.matrix = trs; - if (cellGizmo == null) - cellGizmo = new MeshGizmo(); - cellGizmo.Clear(); - foreach (var center in GetVisibleCellCenters()) - { - Gizmos.DrawCube(center, Vector3.one * m_Profile.cellSizeInMeters); - cellGizmo.AddWireCube(center, Vector3.one * m_Profile.cellSizeInMeters, new Color(0, 1, 0.5f, 1)); - } - cellGizmo.RenderWireframe(Gizmos.matrix, gizmoName: "Brick Gizmo Rendering"); - } + SendSceneData(); } public ProbeDilationSettings GetDilationSettings() diff --git a/com.unity.render-pipelines.core/Runtime/Lighting/ProbeVolume/ProbeVolume.cs b/com.unity.render-pipelines.core/Runtime/Lighting/ProbeVolume/ProbeVolume.cs index ba36ace86a8..74378765a81 100644 --- a/com.unity.render-pipelines.core/Runtime/Lighting/ProbeVolume/ProbeVolume.cs +++ b/com.unity.render-pipelines.core/Runtime/Lighting/ProbeVolume/ProbeVolume.cs @@ -3,8 +3,10 @@ using UnityEditor.Experimental; using Unity.Collections; using System.Collections.Generic; -#if UNITY_EDITOR +using UnityEngine.Rendering; using UnityEngine.SceneManagement; + +#if UNITY_EDITOR using UnityEditor; #endif @@ -120,5 +122,176 @@ public override int GetHashCode() } #endif + + // Momentarily moving the gizmo rendering for bricks and cells to Probe Volume itself, + // only the first probe volume in the scene will render them. The reason is that we dont have any + // other non-hidden component related to APV. + #region APVGizmo + + MeshGizmo brickGizmos; + MeshGizmo cellGizmo; + + void DisposeGizmos() + { + brickGizmos?.Dispose(); + brickGizmos = null; + cellGizmo?.Dispose(); + cellGizmo = null; + } + + void OnDestroy() + { + DisposeGizmos(); + } + + void OnDisable() + { + DisposeGizmos(); + } +#if UNITY_EDITOR + + // Only the first PV of the available ones will draw gizmos. + bool IsResponsibleToDrawGizmo() + { + var pvList = GameObject.FindObjectsOfType(); + return this == pvList[0]; + } + + internal bool ShouldCullCell(Vector3 cellPosition, Vector3 originWS = default(Vector3)) + { + var profile = ProbeReferenceVolume.instance.sceneData.GetProfileForScene(gameObject.scene); + if (profile == null) + return true; + + var cameraTransform = SceneView.lastActiveSceneView.camera.transform; + + Vector3 cellCenterWS = cellPosition * profile.cellSizeInMeters + originWS + Vector3.one * (profile.cellSizeInMeters / 2.0f); + + // Round down to cell size distance + float roundedDownDist = Mathf.Floor(Vector3.Distance(cameraTransform.position, cellCenterWS) / profile.cellSizeInMeters) * profile.cellSizeInMeters; + + if (roundedDownDist > ProbeReferenceVolume.instance.debugDisplay.subdivisionViewCullingDistance) + return true; + + var frustumPlanes = GeometryUtility.CalculateFrustumPlanes(SceneView.lastActiveSceneView.camera); + var volumeAABB = new Bounds(cellCenterWS, profile.cellSizeInMeters * Vector3.one); + + return !GeometryUtility.TestPlanesAABB(frustumPlanes, volumeAABB); + } + + // TODO: We need to get rid of Handles.DrawWireCube to be able to have those at runtime as well. + void OnDrawGizmos() + { + if (!ProbeReferenceVolume.instance.isInitialized || !IsResponsibleToDrawGizmo() || ProbeReferenceVolume.instance.sceneData == null) + return; + + var profile = ProbeReferenceVolume.instance.sceneData.GetProfileForScene(gameObject.scene); + if (profile == null) + return; + + var debugDisplay = ProbeReferenceVolume.instance.debugDisplay; + + if (debugDisplay.drawBricks) + { + var subdivColors = ProbeReferenceVolume.instance.subdivisionDebugColors; + + IEnumerable GetVisibleBricks() + { + if (debugDisplay.realtimeSubdivision) + { + // realtime subdiv cells are already culled + foreach (var kp in ProbeReferenceVolume.instance.realtimeSubdivisionInfo) + { + var cellVolume = kp.Key; + + foreach (var brick in kp.Value) + { + yield return brick; + } + } + } + else + { + foreach (var cell in ProbeReferenceVolume.instance.cells.Values) + { + if (ShouldCullCell(cell.position, ProbeReferenceVolume.instance.GetTransform().posWS)) + continue; + + if (cell.bricks == null) + continue; + + foreach (var brick in cell.bricks) + yield return brick; + } + } + } + + if (brickGizmos == null) + brickGizmos = new MeshGizmo((int)(Mathf.Pow(3, ProbeBrickIndex.kMaxSubdivisionLevels) * MeshGizmo.vertexCountPerCube)); + + brickGizmos.Clear(); + foreach (var brick in GetVisibleBricks()) + { + if (brick.subdivisionLevel < 0) + continue; + + Vector3 scaledSize = Vector3.one * Mathf.Pow(3, brick.subdivisionLevel); + Vector3 scaledPos = brick.position + scaledSize / 2; + brickGizmos.AddWireCube(scaledPos, scaledSize, subdivColors[brick.subdivisionLevel]); + } + + brickGizmos.RenderWireframe(ProbeReferenceVolume.instance.GetRefSpaceToWS(), gizmoName: "Brick Gizmo Rendering"); + } + + if (debugDisplay.drawCells) + { + IEnumerable GetVisibleCellCenters() + { + if (debugDisplay.realtimeSubdivision) + { + foreach (var kp in ProbeReferenceVolume.instance.realtimeSubdivisionInfo) + { + kp.Key.CalculateCenterAndSize(out var center, out var _); + yield return center; + } + } + else + { + foreach (var cell in ProbeReferenceVolume.instance.cells.Values) + { + if (ShouldCullCell(cell.position, ProbeReferenceVolume.instance.GetTransform().posWS)) + continue; + + var positionF = new Vector3(cell.position.x, cell.position.y, cell.position.z); + var center = positionF * profile.cellSizeInMeters + profile.cellSizeInMeters * 0.5f * Vector3.one; + yield return center; + } + } + } + + Matrix4x4 trs = Matrix4x4.TRS(ProbeReferenceVolume.instance.GetTransform().posWS, ProbeReferenceVolume.instance.GetTransform().rot, Vector3.one); + + // For realtime subdivision, the matrix from ProbeReferenceVolume.instance can be wrong if the profile changed since the last bake + if (debugDisplay.realtimeSubdivision) + trs = Matrix4x4.TRS(transform.position, Quaternion.identity, Vector3.one); + + // Fetching this from components instead of from the reference volume allows the user to + // preview how cells will look before they commit to a bake. + Gizmos.color = new Color(0, 1, 0.5f, 0.2f); + Gizmos.matrix = trs; + if (cellGizmo == null) + cellGizmo = new MeshGizmo(); + cellGizmo.Clear(); + foreach (var center in GetVisibleCellCenters()) + { + Gizmos.DrawCube(center, Vector3.one * profile.cellSizeInMeters); + cellGizmo.AddWireCube(center, Vector3.one * profile.cellSizeInMeters, new Color(0, 1, 0.5f, 1)); + } + cellGizmo.RenderWireframe(Gizmos.matrix, gizmoName: "Brick Gizmo Rendering"); + } + } + +#endif + #endregion } } // UnityEngine.Experimental.Rendering.HDPipeline diff --git a/com.unity.render-pipelines.core/Runtime/Lighting/ProbeVolume/ProbeVolumeAsset.cs b/com.unity.render-pipelines.core/Runtime/Lighting/ProbeVolume/ProbeVolumeAsset.cs index 77b75043f5d..c11486336ea 100644 --- a/com.unity.render-pipelines.core/Runtime/Lighting/ProbeVolume/ProbeVolumeAsset.cs +++ b/com.unity.render-pipelines.core/Runtime/Lighting/ProbeVolume/ProbeVolumeAsset.cs @@ -33,6 +33,15 @@ internal enum AssetVersion [SerializeField] string m_AssetFullPath = "UNINITIALIZED!"; + // Profile info + [SerializeField] internal int cellSizeInBricks; + [SerializeField] internal float minDistanceBetweenProbes; + [SerializeField] internal int simplificationLevels; + + internal int maxSubdivision => simplificationLevels + 1; // we add one for the top subdiv level which is the same size as a cell + internal float minBrickSize => Mathf.Max(0.01f, minDistanceBetweenProbes * 3.0f); + + public string GetSerializedFullPath() { return m_AssetFullPath; @@ -71,6 +80,12 @@ public static ProbeVolumeAsset CreateAsset(Scene scene) return asset; } + internal void StoreProfileData(ProbeReferenceVolumeProfile profile) + { + cellSizeInBricks = profile.cellSizeInBricks; + simplificationLevels = profile.simplificationLevels; + minDistanceBetweenProbes = profile.minDistanceBetweenProbes; + } #endif } diff --git a/com.unity.render-pipelines.core/Runtime/Lighting/ProbeVolume/ProbeVolumeBakingProcessSettings.cs b/com.unity.render-pipelines.core/Runtime/Lighting/ProbeVolume/ProbeVolumeBakingProcessSettings.cs new file mode 100644 index 00000000000..9b4c34c3d87 --- /dev/null +++ b/com.unity.render-pipelines.core/Runtime/Lighting/ProbeVolume/ProbeVolumeBakingProcessSettings.cs @@ -0,0 +1,14 @@ +using UnityEngine.Rendering; +#if UNITY_EDITOR +using UnityEditor; +#endif + +namespace UnityEngine.Experimental.Rendering +{ + // TODO: Use this structure in the actual authoring component rather than just a mean to group output parameters. + internal struct ProbeVolumeBakingProcessSettings + { + public ProbeDilationSettings dilationSettings; + public VirtualOffsetSettings virtualOffsetSettings; + } +} diff --git a/com.unity.render-pipelines.core/Runtime/Lighting/ProbeVolume/ProbeVolumeBakingProcessSettings.cs.meta b/com.unity.render-pipelines.core/Runtime/Lighting/ProbeVolume/ProbeVolumeBakingProcessSettings.cs.meta new file mode 100644 index 00000000000..bc63c960f12 --- /dev/null +++ b/com.unity.render-pipelines.core/Runtime/Lighting/ProbeVolume/ProbeVolumeBakingProcessSettings.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 2ca179cc72ecf4f4fa7d4ed3bb83ffd2 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/com.unity.render-pipelines.core/Runtime/Lighting/ProbeVolume/ProbeVolumePerSceneData.cs b/com.unity.render-pipelines.core/Runtime/Lighting/ProbeVolume/ProbeVolumePerSceneData.cs new file mode 100644 index 00000000000..00cd3f02af6 --- /dev/null +++ b/com.unity.render-pipelines.core/Runtime/Lighting/ProbeVolume/ProbeVolumePerSceneData.cs @@ -0,0 +1,144 @@ +using UnityEngine.Rendering; +using UnityEngine.SceneManagement; +using System.IO; +using System; +using System.Collections.Generic; + +#if UNITY_EDITOR +using UnityEditor; +#endif + +namespace UnityEngine.Experimental.Rendering +{ + // TMP to be moved to ProbeReferenceVolume when we define the concept, here it is just to make stuff compile + enum ProbeVolumeState + { + Default = 0, + Invalid = 999 + } + + [ExecuteAlways] + [AddComponentMenu("")] // Hide. + internal class ProbeVolumePerSceneData : MonoBehaviour, ISerializationCallbackReceiver + { + + [System.Serializable] + struct SerializableAssetItem + { + [SerializeField] public ProbeVolumeState state; + [SerializeField] public ProbeVolumeAsset asset; + } + + internal Dictionary assets = new Dictionary(); + + [SerializeField] List serializedAssets; + + ProbeVolumeState m_CurrentState = ProbeVolumeState.Default; + ProbeVolumeState m_PreviousState = ProbeVolumeState.Invalid; + + /// + /// OnAfterDeserialize implementation. + /// + public void OnAfterDeserialize() + { + if (serializedAssets == null) return; + + assets = new Dictionary(); + foreach (var assetItem in serializedAssets) + { + assets.Add(assetItem.state, assetItem.asset); + } + } + + /// + /// OnBeforeSerialize implementation. + /// + public void OnBeforeSerialize() + { + if (assets == null || serializedAssets == null) return; + + serializedAssets.Clear(); + foreach (var k in assets.Keys) + { + SerializableAssetItem item; + item.state = k; + item.asset = assets[k]; + serializedAssets.Add(item); + } + } + + internal void StoreAssetForState(ProbeVolumeState state, ProbeVolumeAsset asset) + { + assets[state] = asset; + } + + internal void InvalidateAllAssets() + { + foreach (var asset in assets.Values) + { + if (asset != null) + ProbeReferenceVolume.instance.AddPendingAssetRemoval(asset); + } + + assets.Clear(); + } + + internal ProbeVolumeAsset GetCurrentStateAsset() + { + if (assets.ContainsKey(m_CurrentState)) return assets[m_CurrentState]; + else return null; + } + + internal void QueueAssetLoading() + { + var refVol = ProbeReferenceVolume.instance; + if (assets.ContainsKey(m_CurrentState) && assets[m_CurrentState] != null) + { + refVol.AddPendingAssetLoading(assets[m_CurrentState]); +#if UNITY_EDITOR + if (refVol.sceneData != null) + { + refVol.dilationValidtyThreshold = refVol.sceneData.GetBakeSettingsForScene(gameObject.scene).dilationSettings.dilationValidityThreshold; + } +#endif + } + } + + internal void QueueAssetRemoval() + { + if (assets.ContainsKey(m_CurrentState) && assets[m_CurrentState] != null) + ProbeReferenceVolume.instance.AddPendingAssetRemoval(assets[m_CurrentState]); + } + + void OnEnable() + { + QueueAssetLoading(); + } + + void OnDisable() + { + QueueAssetRemoval(); + } + + void OnDestroy() + { + QueueAssetRemoval(); + } + + void Update() + { + // Query state from ProbeReferenceVolume.instance. + // This is temporary here until we implement a state system. + m_CurrentState = ProbeVolumeState.Default; + + if (m_PreviousState != m_CurrentState) + { + if (assets.ContainsKey(m_PreviousState) && assets[m_PreviousState] != null) + ProbeReferenceVolume.instance.AddPendingAssetRemoval(assets[m_PreviousState]); + + QueueAssetLoading(); + } + m_PreviousState = m_CurrentState; + } + } +} diff --git a/com.unity.render-pipelines.core/Runtime/Lighting/ProbeVolume/ProbeVolumePerSceneData.cs.meta b/com.unity.render-pipelines.core/Runtime/Lighting/ProbeVolume/ProbeVolumePerSceneData.cs.meta new file mode 100644 index 00000000000..1433c28c021 --- /dev/null +++ b/com.unity.render-pipelines.core/Runtime/Lighting/ProbeVolume/ProbeVolumePerSceneData.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: a83d2f7ae04ab6f4f99b0d85377be998 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/com.unity.render-pipelines.core/Runtime/Lighting/ProbeVolume/ProbeVolumeSceneBounds.cs b/com.unity.render-pipelines.core/Runtime/Lighting/ProbeVolume/ProbeVolumeSceneData.cs similarity index 58% rename from com.unity.render-pipelines.core/Runtime/Lighting/ProbeVolume/ProbeVolumeSceneBounds.cs rename to com.unity.render-pipelines.core/Runtime/Lighting/ProbeVolume/ProbeVolumeSceneData.cs index 65c0d56a8db..05b483511d2 100644 --- a/com.unity.render-pipelines.core/Runtime/Lighting/ProbeVolume/ProbeVolumeSceneBounds.cs +++ b/com.unity.render-pipelines.core/Runtime/Lighting/ProbeVolume/ProbeVolumeSceneData.cs @@ -5,13 +5,23 @@ #endif using UnityEngine; using UnityEngine.SceneManagement; +using System.Reflection; namespace UnityEngine.Experimental.Rendering { + // Add Profile and baking settings. + [System.Serializable] /// A class containing info about the bounds defined by the probe volumes in various scenes. - public class ProbeVolumeSceneBounds : ISerializationCallbackReceiver + public class ProbeVolumeSceneData : ISerializationCallbackReceiver { + static PropertyInfo s_SceneGUID = typeof(Scene).GetProperty("guid", System.Reflection.BindingFlags.NonPublic | BindingFlags.Instance); + string GetSceneGUID(Scene scene) + { + Debug.Assert(s_SceneGUID != null, "Reflection for scene GUID failed"); + return (string)s_SceneGUID.GetValue(scene); + } + [System.Serializable] struct SerializableBoundItem { @@ -26,27 +36,50 @@ struct SerializableHasPVItem [SerializeField] public bool hasProbeVolumes; } + [System.Serializable] + struct SerializablePVProfile + { + [SerializeField] public string sceneGUID; + [SerializeField] public ProbeReferenceVolumeProfile profile; + } + + [System.Serializable] + struct SerializablePVBakeSettings + { + [SerializeField] public string sceneGUID; + [SerializeField] public ProbeVolumeBakingProcessSettings settings; + } + [SerializeField] List serializedBounds; [SerializeField] List serializedHasVolumes; + [SerializeField] List serializedProfiles; + [SerializeField] List serializedBakeSettings; Object m_ParentAsset = null; /// A dictionary containing the Bounds defined by probe volumes for each scene (scene path is the key of the dictionary). public Dictionary sceneBounds; internal Dictionary hasProbeVolumes; + internal Dictionary sceneProfiles; + internal Dictionary sceneBakingSettings; - /// Constructor for ProbeVolumeSceneBounds. - /// The asset holding this ProbeVolumeSceneBounds, it will be dirtied every time scene bounds are updated. - public ProbeVolumeSceneBounds(Object parentAsset) + /// Constructor for ProbeVolumeSceneData. + /// The asset holding this ProbeVolumeSceneData, it will be dirtied every time scene bounds or settings are changed. + public ProbeVolumeSceneData(Object parentAsset) { m_ParentAsset = parentAsset; sceneBounds = new Dictionary(); hasProbeVolumes = new Dictionary(); + sceneProfiles = new Dictionary(); + sceneBakingSettings = new Dictionary(); + serializedBounds = new List(); serializedHasVolumes = new List(); + serializedProfiles = new List(); + serializedBakeSettings = new List(); } - /// Set a reference to the object holding this ProbeVolumeSceneBounds. - /// The object holding this ProbeVolumeSceneBounds, it will be dirtied every time scene bounds are updated. + /// Set a reference to the object holding this ProbeVolumeSceneData. + /// The object holding this ProbeVolumeSceneData, it will be dirtied every time scene bounds or settings are changed. public void SetParentObject(Object parent) { m_ParentAsset = parent; @@ -58,10 +91,14 @@ public void SetParentObject(Object parent) public void OnAfterDeserialize() { // We haven't initialized the bounds, no need to do anything here. - if (serializedBounds == null || serializedHasVolumes == null) return; + if (serializedBounds == null || serializedHasVolumes == null || + serializedProfiles == null || serializedBakeSettings == null) return; sceneBounds = new Dictionary(); hasProbeVolumes = new Dictionary(); + sceneProfiles = new Dictionary(); + sceneBakingSettings = new Dictionary(); + foreach (var boundItem in serializedBounds) { sceneBounds.Add(boundItem.scenePath, boundItem.bounds); @@ -71,6 +108,16 @@ public void OnAfterDeserialize() { hasProbeVolumes.Add(boundItem.scenePath, boundItem.hasProbeVolumes); } + + foreach (var profileItem in serializedProfiles) + { + sceneProfiles.Add(profileItem.sceneGUID, profileItem.profile); + } + + foreach (var settingsItem in serializedBakeSettings) + { + sceneBakingSettings.Add(settingsItem.sceneGUID, settingsItem.settings); + } } /// @@ -79,11 +126,14 @@ public void OnAfterDeserialize() public void OnBeforeSerialize() { // We haven't initialized the bounds, no need to do anything here. - if (sceneBounds == null || hasProbeVolumes == null || - serializedBounds == null || serializedHasVolumes == null) return; + if (sceneBounds == null || hasProbeVolumes == null || sceneBakingSettings == null || sceneProfiles == null || + serializedBounds == null || serializedHasVolumes == null || serializedBakeSettings == null || serializedProfiles == null) return; serializedBounds.Clear(); serializedHasVolumes.Clear(); + serializedProfiles.Clear(); + serializedBakeSettings.Clear(); + foreach (var k in sceneBounds.Keys) { SerializableBoundItem item; @@ -99,6 +149,22 @@ public void OnBeforeSerialize() item.hasProbeVolumes = hasProbeVolumes[k]; serializedHasVolumes.Add(item); } + + foreach (var k in sceneBakingSettings.Keys) + { + SerializablePVBakeSettings item; + item.sceneGUID = k; + item.settings = sceneBakingSettings[k]; + serializedBakeSettings.Add(item); + } + + foreach (var k in sceneProfiles.Keys) + { + SerializablePVProfile item; + item.sceneGUID = k; + item.profile = sceneProfiles[k]; + serializedProfiles.Add(item); + } } #if UNITY_EDITOR @@ -159,6 +225,15 @@ private void InflateBound(ref Bounds bounds) internal void UpdateSceneBounds(Scene scene) { + // If we have not yet loaded any asset, we haven't initialized the probe reference volume with any info from the profile. + // As a result we need to prime with the profile info directly stored here. + { + var profile = GetProfileForScene(scene); + Debug.Assert(profile != null); + ProbeReferenceVolume.instance.SetTRS(Vector3.zero, Quaternion.identity, profile.minBrickSize); + ProbeReferenceVolume.instance.SetMaxSubdivision(profile.maxSubdivision); + } + var volumes = UnityEngine.GameObject.FindObjectsOfType(); bool boundFound = false; Bounds newBound = new Bounds(); @@ -218,6 +293,83 @@ internal void UpdateSceneBounds(Scene scene) } } + // It is important this is called after UpdateSceneBounds is called! + internal void EnsurePerSceneData(Scene scene) + { + if (hasProbeVolumes.ContainsKey(scene.path) && hasProbeVolumes[scene.path]) + { + var perSceneData = UnityEngine.GameObject.FindObjectsOfType(); + var sceneGUID = GetSceneGUID(scene); + + bool foundPerSceneData = false; + foreach (var data in perSceneData) + { + if (GetSceneGUID(data.gameObject.scene) == sceneGUID) + { + foundPerSceneData = true; + } + } + + if (!foundPerSceneData) + { + GameObject go = new GameObject("ProbeVolumePerSceneData"); + go.hideFlags |= HideFlags.HideInHierarchy; + go.AddComponent(); + SceneManager.MoveGameObjectToScene(go, scene); + } + } + } + + internal void OnSceneSaved(Scene scene) + { + UpdateSceneBounds(scene); + EnsurePerSceneData(scene); + } + + + internal void SetProfileForScene(Scene scene, ProbeReferenceVolumeProfile profile) + { + if (sceneProfiles == null) sceneProfiles = new Dictionary(); + + var sceneGUID = GetSceneGUID(scene); + sceneProfiles[sceneGUID] = profile; + } + + internal void SetBakeSettingsForScene(Scene scene, ProbeDilationSettings dilationSettings, VirtualOffsetSettings virtualOffsetSettings) + { + if (sceneBakingSettings == null) sceneBakingSettings = new Dictionary(); + + var sceneGUID = GetSceneGUID(scene); + + ProbeVolumeBakingProcessSettings settings = new ProbeVolumeBakingProcessSettings(); + settings.dilationSettings = dilationSettings; + settings.virtualOffsetSettings = virtualOffsetSettings; + sceneBakingSettings[sceneGUID] = settings; + } + + internal ProbeReferenceVolumeProfile GetProfileForScene(Scene scene) + { + var sceneGUID = GetSceneGUID(scene); + if (sceneProfiles != null && sceneProfiles.ContainsKey(sceneGUID)) + return sceneProfiles[sceneGUID]; + + return null; + } + + internal bool BakeSettingsDefinedForScene(Scene scene) + { + var sceneGUID = GetSceneGUID(scene); + return sceneBakingSettings.ContainsKey(sceneGUID); + } + + internal ProbeVolumeBakingProcessSettings GetBakeSettingsForScene(Scene scene) + { + var sceneGUID = GetSceneGUID(scene); + if (sceneBakingSettings != null && sceneBakingSettings.ContainsKey(sceneGUID)) + return sceneBakingSettings[sceneGUID]; + + return new ProbeVolumeBakingProcessSettings(); + } #endif } } diff --git a/com.unity.render-pipelines.core/Runtime/Lighting/ProbeVolume/ProbeVolumeSceneData.cs.meta b/com.unity.render-pipelines.core/Runtime/Lighting/ProbeVolume/ProbeVolumeSceneData.cs.meta new file mode 100644 index 00000000000..7fcd88fff02 --- /dev/null +++ b/com.unity.render-pipelines.core/Runtime/Lighting/ProbeVolume/ProbeVolumeSceneData.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 04fb4740d8c6dbc469086e13c435cd4b +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/com.unity.render-pipelines.core/Runtime/Lights/LightAnchor.cs b/com.unity.render-pipelines.core/Runtime/Lights/LightAnchor.cs index df00a3ab726..e8a88932005 100644 --- a/com.unity.render-pipelines.core/Runtime/Lights/LightAnchor.cs +++ b/com.unity.render-pipelines.core/Runtime/Lights/LightAnchor.cs @@ -10,7 +10,6 @@ namespace UnityEngine /// Represents camera-space light controls around a virtual pivot point. /// [AddComponentMenu("Rendering/Light Anchor")] - [RequireComponent(typeof(Light))] [ExecuteInEditMode] [DisallowMultipleComponent] [CoreRPHelpURLAttribute("View-Lighting-Tool")] @@ -19,13 +18,18 @@ public class LightAnchor : MonoBehaviour const float k_ArcRadius = 5; const float k_AxisLength = 10; - [SerializeField] + [SerializeField, Min(0)] float m_Distance = 0f; [SerializeField] UpDirection m_FrameSpace = UpDirection.World; + [SerializeField] + Transform m_AnchorPositionOverride; + [SerializeField] float m_Yaw; + [SerializeField] float m_Pitch; + [SerializeField] float m_Roll; /// @@ -69,8 +73,8 @@ public float roll /// public float distance { - get { return m_Distance; } - set { m_Distance = Mathf.Max(value, .01f); } + get => m_Distance; + set => m_Distance = Mathf.Max(0, value); } /// @@ -102,7 +106,13 @@ public UpDirection frameSpace /// public Vector3 anchorPosition { - get { return transform.position + transform.forward * m_Distance; } + get + { + if (anchorPositionOverride != null) + return anchorPositionOverride.position; + else + return transform.position + transform.forward * distance; + } } struct Axes @@ -112,6 +122,16 @@ struct Axes public Vector3 forward; } + /// + /// Overrides the pivot of used to compute the light position. This is useful to track an existing object in the scene. + /// The transform of the light will be automatically updated by the Update() method of the LightAnchor. + /// + public Transform anchorPositionOverride + { + get => m_AnchorPositionOverride; + set => m_AnchorPositionOverride = value; + } + /// /// Normalizes the input angle to be in the range of -180 and 180. /// @@ -136,6 +156,10 @@ public void SynchronizeOnTransform(Camera camera) Vector3 worldAnchorToLight = transform.position - anchorPosition; + // In case the distance is 0 or the anchor override is at the same position than the light anchor + if (worldAnchorToLight.magnitude == 0) + worldAnchorToLight = -transform.forward; + Vector3 projectOnGround = Vector3.ProjectOnPlane(worldAnchorToLight, axes.up); projectOnGround.Normalize(); @@ -162,7 +186,28 @@ public void UpdateTransform(Camera camera, Vector3 anchor) Axes GetWorldSpaceAxes(Camera camera) { + // Fallback when the light anchor object is child of the camera (bad setup) + if (transform.IsChildOf(camera.transform)) + { + return new Axes + { + up = Vector3.up, + right = Vector3.right, + forward = Vector3.forward, + }; + } + Matrix4x4 viewToWorld = camera.cameraToWorldMatrix; + + // Correct view to world for perspective + if (!camera.orthographic && camera.transform.position != anchorPosition) + { + var d = (anchorPosition - camera.transform.position).normalized; + var f = Quaternion.LookRotation(d); + viewToWorld = Matrix4x4.Scale(new Vector3(1, 1, -1)) * Matrix4x4.TRS(camera.transform.position, f, Vector3.one).inverse; + viewToWorld = viewToWorld.inverse; + } + if (m_FrameSpace == UpDirection.World) { Vector3 viewUp = (Vector3)(Camera.main.worldToCameraMatrix * Vector3.up); @@ -182,6 +227,15 @@ Axes GetWorldSpaceAxes(Camera camera) }; } + void Update() + { + if (anchorPositionOverride == null || Camera.main == null) + return; + + if (anchorPositionOverride.hasChanged || Camera.main.transform.hasChanged) + UpdateTransform(Camera.main, anchorPosition); + } + void OnDrawGizmosSelected() { var camera = Camera.main; @@ -191,6 +245,8 @@ void OnDrawGizmosSelected() return; } + // TODO: fix light rotated when camera rotates + Axes axes = GetWorldSpaceAxes(camera); Vector3 anchor = anchorPosition; Vector3 d = transform.position - anchor; @@ -229,10 +285,10 @@ void UpdateTransform(Vector3 up, Vector3 right, Vector3 forward, Vector3 anchor) { Quaternion worldYawRot = Quaternion.AngleAxis(m_Yaw, up); Quaternion worldPitchRot = Quaternion.AngleAxis(m_Pitch, right); - Vector3 worldPosition = anchor + (worldYawRot * worldPitchRot) * forward * m_Distance; + Vector3 worldPosition = anchor + (worldYawRot * worldPitchRot) * forward * distance; transform.position = worldPosition; - Vector3 lookAt = (anchor - worldPosition).normalized; + Vector3 lookAt = -((worldYawRot * worldPitchRot) * forward).normalized; Vector3 angles = Quaternion.LookRotation(lookAt, up).eulerAngles; angles.z = m_Roll; transform.eulerAngles = angles; diff --git a/com.unity.render-pipelines.core/Runtime/Textures/RTHandle.cs b/com.unity.render-pipelines.core/Runtime/Textures/RTHandle.cs index 20c8d1e6a06..d66fa0032d9 100644 --- a/com.unity.render-pipelines.core/Runtime/Textures/RTHandle.cs +++ b/com.unity.render-pipelines.core/Runtime/Textures/RTHandle.cs @@ -19,6 +19,29 @@ public class RTHandle internal bool m_EnableHWDynamicScale = false; internal string m_Name; + internal bool m_UseCustomHandleScales = false; + internal RTHandleProperties m_CustomHandleProperties; + + /// + /// By default, rtHandleProperties gets the global state of scalers against the global reference mode. + /// This method lets the current RTHandle use a local custom RTHandleProperties. This function is being used + /// by scalers such as TAAU and DLSS, which require to have a different resolution for color (independent of the RTHandleSystem). + /// + /// Properties to set. + public void SetCustomHandleProperties(in RTHandleProperties properties) + { + m_UseCustomHandleScales = true; + m_CustomHandleProperties = properties; + } + + /// + /// Method that clears any custom handle property being set. + /// + public void ClearCustomHandleProperties() + { + m_UseCustomHandleScales = false; + } + /// /// Scale factor applied to the RTHandle reference size. /// @@ -34,9 +57,9 @@ public class RTHandle /// public Vector2Int referenceSize { get; internal set; } /// - /// Current properties of the RTHandle System + /// Current properties of the RTHandle System. If a custom property has been set through SetCustomHandleProperties method, it will be used that one instead. /// - public RTHandleProperties rtHandleProperties { get { return m_Owner.rtHandleProperties; } } + public RTHandleProperties rtHandleProperties { get { return m_UseCustomHandleScales ? m_CustomHandleProperties : m_Owner.rtHandleProperties; } } /// /// RenderTexture associated with the RTHandle /// diff --git a/com.unity.render-pipelines.core/ShaderLibrary/CommonLighting.hlsl b/com.unity.render-pipelines.core/ShaderLibrary/CommonLighting.hlsl index 05617ac44f4..c9dbf658d2f 100644 --- a/com.unity.render-pipelines.core/ShaderLibrary/CommonLighting.hlsl +++ b/com.unity.render-pipelines.core/ShaderLibrary/CommonLighting.hlsl @@ -245,7 +245,7 @@ real3 GTAOMultiBounce(real visibility, real3 albedo) return max(x, ((x * a + b) * x + c) * x); } -// Based on Oat and Sander's 2008 technique +// Based on Oat and Sander's 2007 technique // Area/solidAngle of intersection of two cone real SphericalCapIntersectionSolidArea(real cosC1, real cosC2, real cosB) { @@ -279,7 +279,7 @@ real SphericalCapIntersectionSolidArea(real cosC1, real cosC2, real cosB) // ref: Practical Realtime Strategies for Accurate Indirect Occlusion // http://blog.selfshadow.com/publications/s2016-shading-course/#course_content // Original Cone-Cone method with cosine weighted assumption (p129 s2016_pbs_activision_occlusion) -real GetSpecularOcclusionFromBentAO(real3 V, real3 bentNormalWS, real3 normalWS, real ambientOcclusion, real roughness) +real GetSpecularOcclusionFromBentAO_ConeCone(real3 V, real3 bentNormalWS, real3 normalWS, real ambientOcclusion, real roughness) { // Retrieve cone angle // Ambient occlusion is cosine weighted, thus use following equation. See slide 129 @@ -290,6 +290,40 @@ real GetSpecularOcclusionFromBentAO(real3 V, real3 bentNormalWS, real3 normalWS, return SphericalCapIntersectionSolidArea(cosAv, cosAs, cosB) / (TWO_PI * (1.0 - cosAs)); } +real GetSpecularOcclusionFromBentAO(real3 V, real3 bentNormalWS, real3 normalWS, real ambientOcclusion, real roughness) +{ + // Pseudo code: + //SphericalGaussian NDF = WarpedGGXDistribution(normalWS, roughness, V); + //SphericalGaussian Visibility = VisibilityConeSG(bentNormalWS, ambientOcclusion); + //SphericalGaussian UpperHemisphere = UpperHemisphereSG(normalWS); + //return saturate( InnerProduct(NDF, Visibility) / InnerProduct(NDF, UpperHemisphere) ); + + // 1. Approximate visibility cone with a spherical gaussian of amplitude A=1 + // For a cone angle X, we can determine sharpness so that all point inside the cone have a value > Y + // sharpness = (log(Y) - log(A)) / (cos(X) - 1) + // For AO cone, cos(X) = sqrt(1 - ambientOcclusion) + // -> for Y = 0.1, sharpness = -1.0 / (sqrt(1-ao) - 1) + float vs = -1.0f / (sqrt(1.0f - ambientOcclusion) - 1.0f); + + // 2. Approximate upper hemisphere with sharpness = 0.8 and amplitude = 1 + float us = 0.8f; + + // 3. Compute warped SG Axis of GGX distribution + // Ref: All-Frequency Rendering of Dynamic, Spatially-Varying Reflectance + // https://www.microsoft.com/en-us/research/wp-content/uploads/2009/12/sg.pdf + float NoV = dot(V, normalWS); + float3 NDFAxis = (2 * NoV * normalWS - V) * (0.5f / max(roughness * roughness * NoV, 0.001f)); + + float umLength1 = length(NDFAxis + vs * bentNormalWS); + float umLength2 = length(NDFAxis + us * normalWS); + float d1 = 1 - exp(-2 * umLength1); + float d2 = 1 - exp(-2 * umLength2); + + float expFactor1 = exp(umLength1 - umLength2 + us - vs); + + return saturate(expFactor1 * (d1 * umLength2) / (d2 * umLength1)); +} + // Ref: Steve McAuley - Energy-Conserving Wrapped Diffuse real ComputeWrappedDiffuseLighting(real NdotL, real w) { diff --git a/com.unity.render-pipelines.core/ShaderLibrary/Version.hlsl b/com.unity.render-pipelines.core/ShaderLibrary/Version.hlsl index 0178aa7649c..a2dd246db81 100644 --- a/com.unity.render-pipelines.core/ShaderLibrary/Version.hlsl +++ b/com.unity.render-pipelines.core/ShaderLibrary/Version.hlsl @@ -1,7 +1,7 @@ // The old version number system below is deprecated whith Graphic Packages that have move as core package of Unity. // User should rely on the Macro UNITY_VERSION now to detect which version of Unity is coupled to the current set of pipeline shader // Example of usage #if UNITY_VERSION >= 202120 to check if the version is above or equal 2021.2 -#define SHADER_LIBRARY_VERSION_MAJOR 12 +#define SHADER_LIBRARY_VERSION_MAJOR 13 #define SHADER_LIBRARY_VERSION_MINOR 0 #define VERSION_GREATER_EQUAL(major, minor) ((SHADER_LIBRARY_VERSION_MAJOR > major) || ((SHADER_LIBRARY_VERSION_MAJOR == major) && (SHADER_LIBRARY_VERSION_MINOR >= minor))) diff --git a/com.unity.render-pipelines.core/package.json b/com.unity.render-pipelines.core/package.json index bd88ad7f344..47e7ac6431a 100644 --- a/com.unity.render-pipelines.core/package.json +++ b/com.unity.render-pipelines.core/package.json @@ -1,9 +1,9 @@ { "name": "com.unity.render-pipelines.core", "description": "SRP Core makes it easier to create or customize a Scriptable Render Pipeline (SRP). SRP Core contains reusable code, including boilerplate code for working with platform-specific graphics APIs, utility functions for common rendering operations, and shader libraries. The code in SRP Core is use by the High Definition Render Pipeline (HDRP) and Universal Render Pipeline (URP). If you are creating a custom SRP from scratch or customizing a prebuilt SRP, using SRP Core will save you time.", - "version": "12.0.0", - "unity": "2021.2", - "unityRelease": "0b6", + "version": "13.0.0", + "unity": "2022.1", + "unityRelease": "0a8", "displayName": "Core RP Library", "dependencies": { "com.unity.ugui": "1.0.0", diff --git a/com.unity.render-pipelines.high-definition-config/CHANGELOG.md b/com.unity.render-pipelines.high-definition-config/CHANGELOG.md index a3861919b4f..51e98183c06 100644 --- a/com.unity.render-pipelines.high-definition-config/CHANGELOG.md +++ b/com.unity.render-pipelines.high-definition-config/CHANGELOG.md @@ -4,6 +4,11 @@ All notable changes to this package will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html). +## [13.0.0] - 2021-09-01 + +Version Updated +The version number for this package has increased due to a version update of a related graphics package. + ## [12.0.0] - 2021-01-11 Version Updated diff --git a/com.unity.render-pipelines.high-definition-config/package.json b/com.unity.render-pipelines.high-definition-config/package.json index d91a6f73878..87ea4d0e726 100644 --- a/com.unity.render-pipelines.high-definition-config/package.json +++ b/com.unity.render-pipelines.high-definition-config/package.json @@ -1,11 +1,11 @@ { "name": "com.unity.render-pipelines.high-definition-config", "description": "Configuration files for the High Definition Render Pipeline.", - "version": "12.0.0", - "unity": "2021.2", - "unityRelease": "0b6", + "version": "13.0.0", + "unity": "2022.1", + "unityRelease": "0a8", "displayName": "High Definition RP Config", "dependencies": { - "com.unity.render-pipelines.core": "12.0.0" + "com.unity.render-pipelines.core": "13.0.0" } } diff --git a/com.unity.render-pipelines.high-definition/CHANGELOG.md b/com.unity.render-pipelines.high-definition/CHANGELOG.md index 075b572d7d4..826a0431c39 100644 --- a/com.unity.render-pipelines.high-definition/CHANGELOG.md +++ b/com.unity.render-pipelines.high-definition/CHANGELOG.md @@ -4,6 +4,20 @@ All notable changes to this package will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html). +## [13.0.0] - 2021-09-01 + +### Fixed +- Fixed impossibility to release the cursor in the template. +- Fixed assert failure when enabling the probe volume system for the first time. +- Significantly improved performance of APV probe debug. +- Removed DLSS keyword in settings search when NVIDIA package is not installed. (case 1358409) +- Fixed light anchor min distance value + properties not working with prefabs (case 1345509). +- Fixed specular occlusion sharpness and over darkening at grazing angles. +- Fixed edge bleeding when rendering volumetric clouds. + +### changed +- Visual Environment ambient mode is now Dynamic by default. + ## [12.0.0] - 2021-01-11 ### Added @@ -229,6 +243,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. - Fixed missing API documentation for LTC area light code. - Fixed diffusion profile breaking after upgrading HDRP (case 1337892). - Fixed undo on light anchor. +- Fixed invalid cast exception on HDProbe. - Fixed some depth comparison instabilities with volumetric clouds. - Fixed AxF debug output in certain configurations (case 1333780). - Fixed white flash when camera is reset and SSR Accumulation mode is on. @@ -376,6 +391,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. - Fixed lens flare not rendering correctly with TAAU or DLSS. - Fixed case where the SceneView don't refresh when using LightExplorer with a running and Paused game (1354129) - Fixed wrong ordering in FrameSettings (Normalize Reflection Probes) +- Fixed ThreadMapDetail to saturate AO & smoothness strength inputs to prevent out-of-bounds values set by users (1357740) - Allow negative wind speed parameter. ### Changed diff --git a/com.unity.render-pipelines.high-definition/Documentation~/Dynamic-Resolution.md b/com.unity.render-pipelines.high-definition/Documentation~/Dynamic-Resolution.md index 130c70aa362..7c5cbf40c6c 100644 --- a/com.unity.render-pipelines.high-definition/Documentation~/Dynamic-Resolution.md +++ b/com.unity.render-pipelines.high-definition/Documentation~/Dynamic-Resolution.md @@ -95,7 +95,7 @@ HDRP provides the following upscale filter methods: | Catmull-Rom | This upscale filter uses four bilinear samples. This method uses the least resources, but it can cause blurry images after HDRP performs the upscaling step.

This upscale filter has no dependencies and runs at the end of the post-processing pipeline. | | Contrast Adaptive Sharpen (CAS) | This method produces a sharp image with an aggressive sharpening step. Do not use this option when the dynamic resolution screen percentage is less than 50%.
This upscale filter uses **FidelityFX (CAS) AMD™**. For information about FidelityFX and Contrast Adaptive Sharpening, see [AMD FidelityFX](https://www.amd.com/en/technologies/radeon-software-fidelityfx).

This upscale filter has no dependencies and runs at the end of the post-processing pipeline. | | FidelityFX Super Resolution 1.0 | This upscale filter uses a spatial super-resolution method that balances quality and performance. For more information, see [AMD FidelityFX](https://www.amd.com/en/technologies/radeon-software-fidelityfx).

This upscale filter has no dependencies and runs at the end of the post-processing pipeline.
The filter also runs when at 100% resolution as it can have beneficial sharpening effects. | -| Temporal Anti-Aliasing (TAA) Upscale | This upscale filter uses temporal integration to produce a sharp image. This method uses the fewest resources on the GPU.
HDRP executes this upscale filter before post processing and at the same time as the TAA step. This means you can only use the TAA anti-aliasing method. This filter is not compatible with other anti-aliasing methods.

The filter also runs when at 100% resolution when Dynamic Resolution is enabled as it is responsible for anti-aliasing.
More information on [Notes on TAA Upscale](Dynamic-Resolution.md#Notes) section. | +| Temporal Anti-Aliasing (TAA) Upscale | This upscale filter uses temporal integration to produce a sharp image. This method is performance effective as it is performed alongside the normal anti-aliasing.
HDRP executes this upscale filter before post processing and at the same time as the TAA step. This means you can only use the TAA anti-aliasing method. This filter is not compatible with other anti-aliasing methods.

The filter also runs when at 100% resolution when Dynamic Resolution is enabled as it is responsible for anti-aliasing.
More information on [Notes on TAA Upscale](Dynamic-Resolution.md#Notes) section. | You can also override the upscale options in the HDRP asset for each Camera in your scene using code. To do this, call `DynamicResolutionHandler.SetUpscaleFilter(Camera camera, DynamicResUpscaleFilter filter)`, to make HDRP ignore the value in the HDRP Asset for a given camera. diff --git a/com.unity.render-pipelines.high-definition/Documentation~/Feature-Comparison.md b/com.unity.render-pipelines.high-definition/Documentation~/Feature-Comparison.md index 57a078a6290..37f802adbce 100644 --- a/com.unity.render-pipelines.high-definition/Documentation~/Feature-Comparison.md +++ b/com.unity.render-pipelines.high-definition/Documentation~/Feature-Comparison.md @@ -86,8 +86,8 @@ The tables that follow provide an overview of the Features that the High Definit | **Feature** | **Built-in Render Pipeline** | **High Definition Render Pipeline (HDRP)** | | ------------------ | ------------------------ | ------------------------------- | -| **Enlighten** | Yes | Deprecated | -| **Enlighten Realtime** | Yes | Yes | +| **Enlighten Baked Global Illumination** | Yes | Deprecated

(Use the [CPU or GPU Progressive Lightmapper](https://docs.unity3d.com/Manual/progressive-lightmapper.html) instead) | +| **Enlighten Realtime Global Illumination** | Yes | Yes | | **Progressive CPU** | Yes | Yes | | **Progressive GPU** | Yes | Yes | diff --git a/com.unity.render-pipelines.high-definition/Documentation~/Override-Screen-Space-GI.md b/com.unity.render-pipelines.high-definition/Documentation~/Override-Screen-Space-GI.md index a96db2acad0..5f4eaf808ef 100644 --- a/com.unity.render-pipelines.high-definition/Documentation~/Override-Screen-Space-GI.md +++ b/com.unity.render-pipelines.high-definition/Documentation~/Override-Screen-Space-GI.md @@ -74,6 +74,12 @@ HDRP uses the [Volume](Volumes.md) framework to calculate SSGI, so to enable and ## Limitations +In Deferred rendering mode, Screen Space Global Illumination and Ray-Traced Global Illumination share a buffer with emissive, which overwrites emissive data. +There are multiple ways to recover the emissive contribution of the scene materials: +* Disable [Receive SSR/SSGI](snippets/shader-properties/surface-options/receive-ssr.md) flag on the emissive materials. +* Use [Force Forward Emissive](snippets/shader-properties/advanced-options/force-forward-emissive.md) on the emissive materials. +* Use Forward rendering. + ### Screen-space global illumination * When rendering [Reflection Probes](Reflection-Probe.md) screen space global illumination is not supported. diff --git a/com.unity.render-pipelines.high-definition/Documentation~/Override-Volumetric-Clouds.md b/com.unity.render-pipelines.high-definition/Documentation~/Override-Volumetric-Clouds.md index 61dad1fc736..8e9c4be8998 100644 --- a/com.unity.render-pipelines.high-definition/Documentation~/Override-Volumetric-Clouds.md +++ b/com.unity.render-pipelines.high-definition/Documentation~/Override-Volumetric-Clouds.md @@ -2,11 +2,11 @@ The **Volumetric Clouds** [Volume component override](Volume-Components.md) controls settings relevant to rendering volumetric clouds in the High Definition Render Pipeline (HDRP). Volumetric clouds are intractable clouds that can render shadows, and receive fog and volumetric light. -To generate and render volumetric clouds, HDRP uses three things: a cloud lookup table, a cloud volume, and a cloud map: +To generate and render volumetric clouds, HDRP uses: -* The look up table defines properties such as the altitude, density, and lighting. -* The cloud volume describes the area in the Scene that HDRP generates the clouds in. -* The cloud map acts like a top down view of the scene. It defines which areas of the cloud volume have clouds and what kind of cloud they are. +* A cloud lookup table - defines properties such as the altitude, density, and lighting. +* A cloud volume - describes the area in the Scene that HDRP generates the clouds in. +* A cloud map - acts like a top down view of the scene. It defines which areas of the cloud volume have clouds and what kind of cloud they are. Using these three things, HDRP generates volumetric clouds in a two-step process: @@ -17,11 +17,9 @@ Using these three things, HDRP generates volumetric clouds in a two-step process [!include[](snippets/Volume-Override-Enable-Override.md)] -For this feature: +* In your HDRP Asset go to **Lighting > Volumetric Clouds > Volumetric Clouds**. -The property to enable in your HDRP Asset is: **Lighting > Volumetric Clouds > Volumetric Clouds**. - -The property to enable in your Frame Settings is: **Lighting > Volumetric Clouds**. +* In your Frame Settings go to **Lighting > Volumetric Clouds**. ## Using Volumetric Clouds @@ -36,26 +34,26 @@ The property to enable in your Frame Settings is: **Lighting > Volumetric Clouds ## Cloud map and cloud lookup table -The **Cloud Map** and **Clout LUT** textures define the shape and look of volumetric clouds. Both of these textures are [channel-packed](Glossary.md#channel-packing) where each channel contains a separate grayscale texture with a specific purpose. These two maps are not trivial to author, so it is best practice to only set **Cloud Control** to **Manual** if your project requires very specific clouds and you can use tool assistance to generate the maps. +The **Cloud Map** and **Clout LUT** Textures define the shape and look of volumetric clouds. Both of these Textures are [channel-packed](Glossary.md#channel-packing) where each channel contains a separate grayscale Texture with a specific purpose. These two maps are not trivial to author, so it is best to only set **Cloud Control** to **Manual** if your project requires very specific clouds and you can use tool assistance to generate the maps. For the **Cloud Map**, the color channels represent: -* **Red**: Coverage. Specifies the density of the clouds across the texture. +* **Red**: Coverage. Specifies the density of the clouds across the Texture. * Values closer to **0** represent an area of the clouds less affected by noise. * values closer to **1** represent an area of the clouds more affected by noise. * **Green**: Rain. Specifies the areas of the clouds that are lighter/darker. * Values closer to **0** represent an area of the clouds with less rain that are lighter in color. * Values closer to **1** represent an area of the clouds with more rain that are darker in color. -* **Blue**: Type. Maps along the cloud lookup table's horizontal axis to specify cloud properties at the world position the texel texture represents. +* **Blue**: Type. Maps along the cloud lookup table's horizontal axis to specify cloud properties at the world position the texel Texture represents. For the **Cloud LUT**, the color channels represent: * **Red**: Profile Coverage. Determines the density of the cloud based on its height within the cloud volume. -* **Green**: Erosion and shaping. Determines which areas of the cloud volume are more susceptible to erosion and shaping. Values closer to 1 means the cloud is more susceptible to erosion and shaping. +* **Green**: Erosion and shaping. Determines which areas of the cloud volume are more susceptible to erosion and shaping. Values closer to 1 mean the cloud is more susceptible to erosion and shaping. * **Blue**: Ambient Occlusion. A multiplier that HDRP applies to the ambient probe when it calculates lighting for the volumetric clouds. -When importing these two map textures, disable **sRGB**. For best results, do not use any compression. +When importing these two map Textures, disable **sRGB**. For best results, do not use any compression. **Note**: This cloud map is formatted differently to the cloud map that the [Cloud Layer](Override-Cloud-Layer.md) feature uses. @@ -65,30 +63,30 @@ When importing these two map textures, disable **sRGB**. For best results, do no | **Property** | **Description** | | ------------ | ----------------------------------------------------- | -| Enable | Indicates whether to render volumetric clouds or not. | -| Local Clouds | Indicates whether the clouds are part of the scene or rendered into the skybox. When enabled, clouds are part of the scene and you can interact with them. This means for example, you can move around the clouds, clouds can appear between the Camera and other GameObjects, and the Camera's clipping planes affects the clouds. When disabled, the clouds are part of the skybox. This mean the clouds and their shadows appear relative to the Camera and always appear behind geometry. | +| **Enable** | Indicates whether to render volumetric clouds or not. | +| **Local Clouds** | Indicates whether the clouds are part of the scene or rendered into the skybox. When enabled, clouds are part of the scene and you can interact with them. This means, you can move around the clouds, clouds can appear between the Camera and other GameObjects, and the Camera's clipping planes affects the clouds. When disabled, the clouds are part of the skybox. This means the clouds and their shadows appear relative to the Camera and always appear behind geometry. | ### Shape | **Property** | **Description** | | --------------------------------- | ------------------------------------------------------------ | -| **Cloud Control** | Specifies the mode to control volumetric cloud properties. The options are:
• **Simple**: Uses sliders and input fields to customize volumetric cloud shape properties. This mode generates a cloud map from the various properties and uses HDRP's internal cloud lookup table.
• **Advanced**: Uses separate textures to specify each cloud type and their coverage. This mode generates a cloud map from the various textures and uses HDRP's internal cloud lookup table.
• **Manual**: Uses the cloud map and lookup table you supply to render the clouds. For more information on the cloud map and cloud lookup table, see [Cloud map and cloud lookup table](#cloud-map-and-cloud-lookup-table). | +| **Cloud Control** | Specifies the mode to control volumetric cloud properties. The options are:
• **Simple**: Uses sliders and input fields to customize volumetric cloud shape properties. This mode generates a cloud map from the various properties and uses HDRP's internal cloud lookup table.
• **Advanced**: Uses separate Textures to specify each cloud type and their coverage. This mode generates a cloud map from the various Textures and uses HDRP's internal cloud lookup table.
• **Manual**: Uses the cloud map and lookup table you supply to render the clouds. For more information on the cloud map and cloud lookup table, see [Cloud map and cloud lookup table](#cloud-map-and-cloud-lookup-table). | | - **Cloud Preset** | Specifies the preset to apply to the **Simple** mode properties. The options are:
• **Sparse**: Smaller clouds that are spread apart.
• **Cloudy**: Medium-sized clouds that partially cover the sky.
• **Overcast**: A light layer of cloud that covers the entire sky. Some areas are less dense and let more light through, whereas other areas are more dense and appear darker.
• **Storm Clouds**: Large dark clouds that cover most of the sky.
• **Custom**: Exposes properties that control the shape of the clouds.

This property only appears if you set **Cloud Control** to **Simple**. | | - **Custom Density Curve** | Controls the density (Y axis) of the volumetric clouds as a function of the height (X Axis) inside the cloud volume.

This property only appears if you set **Cloud Control** to **Simple** and then set **Cloud Preset** to **Custom**.| | - **Custom Erosion Curve** | Controls the erosion (Y axis) of the volumetric clouds as a function of the height (X Axis) inside the cloud volume.

This property only appears if you set **Cloud Control** to **Simple** and then set **Cloud Preset** to **Custom**.| | - **Custom Ambient Occlusion Curve** | Controls the ambient occlusion (Y axis) of the volumetric clouds as a function of the height (X Axis) inside the cloud volume.

This property only appears if you set **Cloud Control** to **Simple** and then set **Cloud Preset** to **Custom**.| -| - **Cumulus Map** | Specifies a texture that defines the distribution of clouds in the lower layer.

This property only appears if you set **Cloud Control** to **Advanced**. | +| - **Cumulus Map** | Specifies a Texture that defines the distribution of clouds in the lower layer.

This property only appears if you set **Cloud Control** to **Advanced**. | | - **Cumulus Map Multiplier** | The multiplier for the clouds specified in the **Cumulus Map**. A value of **0** completely hides the cumulus clouds.

This property only appears if you set **Cloud Control** to **Advanced**. | -| - **Alto Stratus Map** | Specifies a texture that defines the distribution of clouds in the higher layer.

This property only appears if you set **Cloud Control** to **Advanced**. | +| - **Alto Stratus Map** | Specifies a Texture that defines the distribution of clouds in the higher layer.

This property only appears if you set **Cloud Control** to **Advanced**. | | - **Alto Stratus Map Multiplier** | The multiplier for the clouds specified in the **Alto Stratus Map**. A value of **0** completely hides the alto stratus clouds.

This property only appears if you set **Cloud Control** to **Advanced**. | -| - **Cumulonimbus Map** | Specifies a texture that defines the distribution of anvil shaped cumulonimbus clouds.

This property only appears if you set **Cloud Control** to **Advanced**. | +| - **Cumulonimbus Map** | Specifies a Texture that defines the distribution of anvil shaped cumulonimbus clouds.

This property only appears if you set **Cloud Control** to **Advanced**. | | - **Cumulonimbus Map Multiplier** | The multiplier for the clouds specified in the **Cumulonimbus Map**. A value of **0** completely hides the cumulonimbus clouds.

This property only appears if you set **Cloud Control** to **Advanced**. | -| - **Rain Map** | Specifies a texture that defines the distribution of rain in the clouds.

This property only appears if you set **Cloud Control** to **Advanced**. | -| - **Cloud Map Resolution** | Specifies the resolution for the internal texture HDRP uses for the cloud map. A lower resolution produces better performance, but less precise cloud type transitions.

This property only appears if you set **Cloud Control** to **Advanced**. | -| - **Cloud Map** | Specifies the cloud map to use for the volumetric clouds. For information on the format of this texture, see [Cloud map and cloud lookup table](#cloud-map-and-cloud-lookup-table).

This property only appears if you set **Cloud Control** to **Custom**. | -| - **Cloud LUT** | Specifies the lookup table for the clouds. For information on the format of this texture, see [Cloud map and cloud lookup table](#cloud-map-and-cloud-lookup-table).

This property only appears if you set **Cloud Control** to **Custom**. | -| - **Cloud Map Tiling** | The **X** and **Y** UV tile rate for the cloud map texture/textures. HDRP uses the **X** and **Y** values to tile the clouds across the sky.
If **Cloud Control** is set to **Advanced**, this affects **Cumulus Map**, **Alto Stratus Map**, **Cumulonimbus Map**, and **Rain Map**.
If **Cloud Control** is set to **Custom**, this affects the texture assigned to the **Cloud Map** property.

This property only appears if you set **Cloud Control** to **Advanced** or **Custom**. | -| - **Cloud Map Offset** | The **X** and **Y** UV offset for the cloud map texture/textures. HDRP uses the **X** and **Y** values to offset the clouds across the sky.
If **Cloud Control** is set to **Advanced**, this affects **Cumulus Map**, **Alto Stratus Map**, **Cumulonimbus Map**, and **Rain Map**.
If **Cloud Control** is set to **Custom**, this affects the texture assigned to the **Cloud Map** property.

This property only appears if you set **Cloud Control** to **Advanced** or **Custom**, or if you set it to **Simple** and then set **Cloud Preset** to **Custom**. | +| - **Rain Map** | Specifies a Texture that defines the distribution of rain in the clouds.

This property only appears if you set **Cloud Control** to **Advanced**. | +| - **Cloud Map Resolution** | Specifies the resolution for the internal Texture HDRP uses for the cloud map. A lower resolution produces better performance, but less precise cloud type transitions.

This property only appears if you set **Cloud Control** to **Advanced**. | +| - **Cloud Map** | Specifies the cloud map to use for the volumetric clouds. For information on the format of this Texture, see [Cloud map and cloud lookup table](#cloud-map-and-cloud-lookup-table).

This property only appears if you set **Cloud Control** to **Custom**. | +| - **Cloud LUT** | Specifies the lookup table for the clouds. For information on the format of this Texture, see [Cloud map and cloud lookup table](#cloud-map-and-cloud-lookup-table).

This property only appears if you set **Cloud Control** to **Custom**. | +| - **Cloud Map Tiling** | The **X** and **Y** UV tile rate for one or more cloud map Textures. HDRP uses the **X** and **Y** values to tile the clouds across the sky.
If **Cloud Control** is set to **Advanced**, this affects **Cumulus Map**, **Alto Stratus Map**, **Cumulonimbus Map**, and **Rain Map**.
If **Cloud Control** is set to **Custom**, this affects the Texture assigned to the **Cloud Map** property.

This property only appears if you set **Cloud Control** to **Advanced** or **Custom**. | +| - **Cloud Map Offset** | The **X** and **Y** UV offset for one or more cloud map Textures. HDRP uses the **X** and **Y** values to offset the clouds across the sky.
If **Cloud Control** is set to **Advanced**, this affects **Cumulus Map**, **Alto Stratus Map**, **Cumulonimbus Map**, and **Rain Map**.
If **Cloud Control** is set to **Custom**, this affects the Texture assigned to the **Cloud Map** property.

This property only appears if you set **Cloud Control** to **Advanced** or **Custom**, or if you set it to **Simple** and then set **Cloud Preset** to **Custom**. | | - **Density Multiplier** | The global density of the volumetric clouds.

This property only appears if you set **Cloud Control** to **Advanced** or **Custom**, or if you set it to **Simple** and then set **Cloud Preset** to **Custom**. | | - **Shape Factor** | Controls the amount of shaping to apply to the cloud volume. A higher value produces less cloud coverage and smaller clouds.

This property only appears if you set **Cloud Control** to **Advanced** or **Custom**, or if you set it to **Simple** and then set **Cloud Preset** to **Custom**. | | - **Shape Scale** | Controls the size of the noise HDRP uses in the shaping stage to generate the general cloud shapes.

This property only appears if you set **Cloud Control** to **Advanced** or **Custom**, or if you set it to **Simple** and then set **Cloud Preset** to **Custom**. | @@ -121,7 +119,7 @@ When importing these two map textures, disable **sRGB**. For best results, do no | **Property** | **Description** | | -------------------------------- | ------------------------------------------------------------ | | **Temporal Accumulation Factor** | The amount of temporal accumulation to apply to the clouds. Temporal accumulation increases the visual quality of clouds by decreasing the noise. A higher value produces better quality clouds, but can create [ghosting](Glossary.md#ghosting). | -| **Ghosting Reduction** | When you enable this property, HDRP removes the ghosting caused by temporal accumulation. This effect may cause a flickering effect when the **Temporal Accumulation Factor** value is low. | +| **Ghosting Reduction** | When you enable this property, HDRP removes the ghosting caused by temporal accumulation. This effect might cause a flickering effect when the **Temporal Accumulation Factor** value is low. | | **Num Primary Steps** | The number of steps to use to evaluate the clouds' transmittance. Higher values linearly increase the resource intensity of the effect. | | **Num Light Steps** | The number of steps to use to evaluate the clouds' lighting. Higher values exponent increase the resource intensity of the effect. | @@ -141,16 +139,14 @@ When importing these two map textures, disable **sRGB**. For best results, do no | -------------------------------- | ------------------------------------------------------------ | | **Shadows** | Indicates whether the volumetric clouds cast shadows. To render the shadows, this property overrides the cookie in the shadow casting directional [Light](Light-Component.md). If [Cloud Layer](Override-Cloud-Layer.md) is active and also is set to cast shadows, volumetric cloud shadows take precedent and override the Cloud Layer shadow cookie. | | - **Shadow Resolution** | Specifies the resolution of the volumetric clouds shadow map. | -| - **Shadow Plane Height Offset** | The vertical offset to apply to compute the volumetric clouds shadow. If the Scene geometry is not centered at **0** on the y-axis, set this offset equal to the y-axis center of your Scene geometry. | +| - **Shadow Plane Height Offset** | The vertical offset to apply to compute the volumetric clouds shadow. If the Scene geometry is not centered at **0** on the Y-axis, set this offset equal to the y-axis center of your Scene geometry. | | - **Shadow Distance** | The size of the area to render volumetric cloud shadows around the camera. | | - **Shadow Opacity** | The opacity of the volumetric cloud shadows. | | - **Shadow Opacity Fallback** | Controls the shadow opacity when outside the area covered by the volumetric clouds shadow. | ## Limitations -This section lists any limitations that HDRP's volumetric clouds have: - -- By default volumetric clouds are disabled on [Planar Reflection Probes](Planar-Reflection-Probe.md) and realtime [Reflection Probes](Reflection-Probe.md) because of the performance cost. -- When enabled for [Reflection Probes](Reflection-Probe.md), the volumetric clouds are rendered at low resolution, without any form of temporal accumulation for performance and stability reasons. -- By default volumetric clouds are enabled on the baked [Reflection Probes](Reflection-Probe.md) if the asset allows it. They are rendered at full resolution without any form of temporal accumulation. -- Volumetric clouds do not appear in ray-traced effects. +* By default, volumetric clouds are disabled on [Planar Reflection Probes](Planar-Reflection-Probe.md) and realtime [Reflection Probes](Reflection-Probe.md) because of the performance cost. +* When enabled for [Reflection Probes](Reflection-Probe.md), the volumetric clouds are rendered at low resolution, without any form of temporal accumulation for performance and stability reasons. +* By default volumetric clouds are enabled on the baked [Reflection Probes](Reflection-Probe.md) if the asset allows it. They are rendered at full resolution without any form of temporal accumulation. +* Volumetric clouds do not appear in ray-traced effects. diff --git a/com.unity.render-pipelines.high-definition/Documentation~/Upgrading-from-2021.1-to-2021.2.md b/com.unity.render-pipelines.high-definition/Documentation~/Upgrading-from-2021.1-to-2021.2.md index e40182b802d..0fa05b8584e 100644 --- a/com.unity.render-pipelines.high-definition/Documentation~/Upgrading-from-2021.1-to-2021.2.md +++ b/com.unity.render-pipelines.high-definition/Documentation~/Upgrading-from-2021.1-to-2021.2.md @@ -39,6 +39,11 @@ HDRP 2021.2 has various tessellation shader code to enable tessellation support * HDRP has improved support of motion vectors for tessellation. Only `previousPositionRWS` is part of the varyings. HDRP also added the `MotionVectorTessellation()` function. For more information, see the `MotionVectorVertexShaderCommon.hlsl` file. * HDRP now evaluates the `tessellationFactor` in the vertex shader and passes it to the hull shader as an interpolator. For more information, see the `VaryingMesh.hlsl` and `VertMesh.hlsl` files. +### Specular Occlusion + +The algorithm for computing specular occlusion from bent normals and ambient occlusion has been changed to improve visual results. +To use the old algorithm, function calls to `GetSpecularOcclusionFromBentAO` should be replaced by calls to `GetSpecularOcclusionFromBentAO_ConeCone` + ## Density Volumes Density Volumes are now known as **Local Volumetric Fog**. diff --git a/com.unity.render-pipelines.high-definition/Documentation~/deep-learning-super-sampling-in-hdrp.md b/com.unity.render-pipelines.high-definition/Documentation~/deep-learning-super-sampling-in-hdrp.md index 01fb78b7b3f..56a1fea77ab 100644 --- a/com.unity.render-pipelines.high-definition/Documentation~/deep-learning-super-sampling-in-hdrp.md +++ b/com.unity.render-pipelines.high-definition/Documentation~/deep-learning-super-sampling-in-hdrp.md @@ -8,7 +8,16 @@ This section includes HDRP-specific requirements and compatibility information f ### Platforms -HDRP does not support DLSS for **Windows** using **x86** architecture (Win32). To build your project for **Windows**, use **x86_64** architecture (Win64). +HDRP supports DLSS on the following platforms: + +DirectX 11 on Windows 64 bit +DirectX 12 on Windows 64 bit +Vulkan on Windows 64 bit +HDRP does not support DLSS for Metal, Linux, Windows using x86 architecture (Win32), or any other platform. + +To build your project for Windows, use x86_64 architecture (Win64). + +For information about the hardware requirements of DLSS, see [NVIDIA'S DLSS requirements](https://developer.nvidia.com/nvidia-dlss-access-program). ## Using DLSS diff --git a/com.unity.render-pipelines.high-definition/Editor/Lighting/HDLightUI.Skin.cs b/com.unity.render-pipelines.high-definition/Editor/Lighting/HDLightUI.Skin.cs index 7819af246fb..f7a19f084ca 100644 --- a/com.unity.render-pipelines.high-definition/Editor/Lighting/HDLightUI.Skin.cs +++ b/com.unity.render-pipelines.high-definition/Editor/Lighting/HDLightUI.Skin.cs @@ -9,12 +9,8 @@ partial class HDLightUI sealed class Styles { // Headers - public readonly GUIContent generalHeader = EditorGUIUtility.TrTextContent("General"); - public readonly GUIContent shapeHeader = EditorGUIUtility.TrTextContent("Shape"); public readonly GUIContent celestialBodyHeader = EditorGUIUtility.TrTextContent("Celestial Body"); - public readonly GUIContent emissionHeader = EditorGUIUtility.TrTextContent("Emission"); public readonly GUIContent volumetricHeader = EditorGUIUtility.TrTextContent("Volumetrics"); - public readonly GUIContent shadowHeader = EditorGUIUtility.TrTextContent("Shadows"); public readonly GUIContent shadowMapSubHeader = EditorGUIUtility.TrTextContent("Shadow Map"); public readonly GUIContent contactShadowsSubHeader = EditorGUIUtility.TrTextContent("Contact Shadows"); public readonly GUIContent bakedShadowsSubHeader = EditorGUIUtility.TrTextContent("Baked Shadows"); @@ -32,10 +28,6 @@ sealed class Styles public readonly GUIContent bakedShadowRadius = EditorGUIUtility.TrTextContent("Radius", "Sets the amount of artificial softening the baking process applies to the edges of shadows cast by this Point or Spot Light."); public readonly GUIContent bakedShadowAngle = EditorGUIUtility.TrTextContent("Angle", "Controls the amount of artificial softening the baking process applies to the edges of shadows cast by Directional Lights."); public readonly GUIContent lightBounceIntensity = EditorGUIUtility.TrTextContent("Indirect Multiplier", "Controls the intensity of the indirect light this Light contributes to the Scene. A value of 0 with a Realtime Light causes HDRP to remove it from realtime global illumination. A value of 0 for Baked and Mixed Lights cause them to no longer emit indirect lighting. This has no effect if you disable both Realtime and Baked global illumination."); - public readonly GUIContent color = EditorGUIUtility.TrTextContent("Color", "Specifies the color this Light emits."); - public readonly GUIContent lightAppearance = EditorGUIUtility.TrTextContent("Light Appearance", "Specifies the mode for how HDRP calculates this Light's color."); - public readonly GUIContent colorFilter = EditorGUIUtility.TrTextContent("Filter", "Specifies a color which tints the Light source."); - public readonly GUIContent colorTemperature = EditorGUIUtility.TrTextContent("Temperature", "Specifies a temperature (in Kelvin) HDRP uses to correlate a color for the Light. For reference, White is 6500K."); public readonly GUIContent areaLightCookie = EditorGUIUtility.TrTextContent("Cookie", "Cookie mask currently assigned to the area light."); public readonly GUIContent iesTexture = EditorGUIUtility.TrTextContent("IES Profile", "IES Profile (Support: Point, Spot, Rectangular-Area Lights)."); public readonly GUIContent cookieTextureTypeError = EditorGUIUtility.TrTextContent("HDRP does not support the Cookie Texture type, only Default is supported.", EditorGUIUtility.IconContent("console.warnicon").image); @@ -50,9 +42,6 @@ sealed class Styles public readonly GUIContent areaIntensity = EditorGUIUtility.TrTextContent("Intensity (Lumen)", "Luminous power of the Light in Lumen."); public readonly GUIContent lightIntensity = EditorGUIUtility.TrTextContent("Intensity", "Sets the strength of the Light. Use the drop-down to select the light units to use."); - // in case that you want to keep the indentation but have nothing to write - public readonly GUIContent empty = EditorGUIUtility.TrTextContent(" "); - public readonly GUIContent lightRadius = EditorGUIUtility.TrTextContent("Radius", "Sets the radius of the light source. This affects the falloff of diffuse lighting, the spread of the specular highlight, and the softness of Ray Traced shadows."); public readonly GUIContent affectDiffuse = EditorGUIUtility.TrTextContent("Affect Diffuse", "When disabled, HDRP does not calculate diffuse lighting for this Light. Does not increase performance as HDRP still calculates the diffuse lighting."); public readonly GUIContent affectSpecular = EditorGUIUtility.TrTextContent("Affect Specular", "When disabled, HDRP does not calculate specular lighting for this Light. Does not increase performance as HDRP still calculates the specular lighting."); @@ -83,7 +72,6 @@ sealed class Styles public readonly GUIContent areaLightEmissiveMeshMotionVector = EditorGUIUtility.TrTextContent("Motion Vectors", "Specify wether the generated Mesh renders 'Per Object Motion', 'Camera Motion' or 'No Motion' vectors to the Camera Motion Vector Texture."); public readonly GUIContent areaLightEmissiveMeshSameLayer = EditorGUIUtility.TrTextContent("Same Layer", "If checked, use the same Layer than the Light one."); public readonly GUIContent areaLightEmissiveMeshCustomLayer = EditorGUIUtility.TrTextContent("Custom Layer", "Specify on which layer the generated Mesh live."); - public readonly GUIContent lightLayer = EditorGUIUtility.TrTextContent("Light Layer", "Specifies the current Light Layers that the Light affects. This Light illuminates corresponding Renderers with the same Light Layer flags."); public readonly GUIContent interactsWithSky = EditorGUIUtility.TrTextContent("Affect Physically Based Sky", "Check this option to make the light and the Physically Based sky affect one another."); public readonly GUIContent angularDiameter = EditorGUIUtility.TrTextContent("Angular Diameter", "Angular diameter of the emissive celestial body represented by the light as seen from the camera (in degrees). Used to render the sun/moon disk."); @@ -159,7 +147,6 @@ sealed class Styles // Warnings public readonly string unsupportedLightShapeWarning = L10n.Tr("This light shape is not supported by Realtime Global Illumination."); - public readonly string unsupportedPresetPropertiesMessage = L10n.Tr("When using Preset of Light Component, only a subset of properties are supported. Unsupported properties are hidden."); } static Styles s_Styles = new Styles(); diff --git a/com.unity.render-pipelines.high-definition/Editor/Lighting/HDLightUI.cs b/com.unity.render-pipelines.high-definition/Editor/Lighting/HDLightUI.cs index 211bf2a6876..a44120089c3 100644 --- a/com.unity.render-pipelines.high-definition/Editor/Lighting/HDLightUI.cs +++ b/com.unity.render-pipelines.high-definition/Editor/Lighting/HDLightUI.cs @@ -87,12 +87,12 @@ internal static void SetAdditionalPropertiesVisibility(bool value) static HDLightUI() { Inspector = CED.Group( - CED.AdditionalPropertiesFoldoutGroup(s_Styles.generalHeader, Expandable.General, k_ExpandedState, AdditionalProperties.General, k_AdditionalPropertiesState, + CED.AdditionalPropertiesFoldoutGroup(LightUI.Styles.generalHeader, Expandable.General, k_ExpandedState, AdditionalProperties.General, k_AdditionalPropertiesState, CED.Group((serialized, owner) => DrawGeneralContent(serialized, owner)), DrawGeneralAdditionalContent), - CED.FoldoutGroup(s_Styles.shapeHeader, Expandable.Shape, k_ExpandedState, DrawShapeContent), + CED.FoldoutGroup(LightUI.Styles.shapeHeader, Expandable.Shape, k_ExpandedState, DrawShapeContent), CED.Conditional((serialized, owner) => serialized.type == HDLightType.Directional && !serialized.settings.isCompletelyBaked, CED.FoldoutGroup(s_Styles.celestialBodyHeader, Expandable.CelestialBody, k_ExpandedState, DrawCelestialBodyContent)), - CED.AdditionalPropertiesFoldoutGroup(s_Styles.emissionHeader, Expandable.Emission, k_ExpandedState, AdditionalProperties.Emission, k_AdditionalPropertiesState, + CED.AdditionalPropertiesFoldoutGroup(LightUI.Styles.emissionHeader, Expandable.Emission, k_ExpandedState, AdditionalProperties.Emission, k_AdditionalPropertiesState, CED.Group( DrawColor, DrawLightIntensityGUILayout, @@ -106,7 +106,7 @@ static HDLightUI() return type != HDLightType.Area || type == HDLightType.Area && serialized.areaLightShape != AreaLightShape.Tube; }, CED.TernaryConditional((serialized, owner) => !serialized.settings.isCompletelyBaked, - CED.AdditionalPropertiesFoldoutGroup(s_Styles.shadowHeader, Expandable.Shadows, k_ExpandedState, AdditionalProperties.Shadow, k_AdditionalPropertiesState, + CED.AdditionalPropertiesFoldoutGroup(LightUI.Styles.shadowHeader, Expandable.Shadows, k_ExpandedState, AdditionalProperties.Shadow, k_AdditionalPropertiesState, CED.Group( CED.Group( CED.AdditionalPropertiesFoldoutGroup(s_Styles.shadowMapSubHeader, Expandable.ShadowMap, k_ExpandedState, AdditionalProperties.Shadow, k_AdditionalPropertiesState, @@ -126,7 +126,7 @@ static HDLightUI() ), CED.noop //will only add parameter in first sub header ), - CED.FoldoutGroup(s_Styles.shadowHeader, Expandable.Shadows, k_ExpandedState, + CED.FoldoutGroup(LightUI.Styles.shadowHeader, Expandable.Shadows, k_ExpandedState, CED.FoldoutGroup(s_Styles.bakedShadowsSubHeader, Expandable.BakedShadow, k_ExpandedState, FoldoutOption.SubFoldout | FoldoutOption.Indent | FoldoutOption.NoSpaceAtEnd, DrawBakedShadowsContent)) ) ) @@ -134,11 +134,11 @@ static HDLightUI() PresetInspector = CED.Group( CED.Group((serialized, owner) => - EditorGUILayout.HelpBox(s_Styles.unsupportedPresetPropertiesMessage, MessageType.Info)), + EditorGUILayout.HelpBox(LightUI.Styles.unsupportedPresetPropertiesMessage, MessageType.Info)), CED.Group((serialized, owner) => EditorGUILayout.Space()), - CED.FoldoutGroup(s_Styles.generalHeader, Expandable.General, k_ExpandedStatePreset, CED.Group((serialized, owner) => DrawGeneralContent(serialized, owner, true))), - CED.FoldoutGroup(s_Styles.emissionHeader, Expandable.Emission, k_ExpandedStatePreset, CED.Group(DrawColor, DrawEmissionContent)), - CED.FoldoutGroup(s_Styles.shadowHeader, Expandable.Shadows, k_ExpandedStatePreset, DrawEnableShadowMapInternal) + CED.FoldoutGroup(LightUI.Styles.generalHeader, Expandable.General, k_ExpandedStatePreset, CED.Group((serialized, owner) => DrawGeneralContent(serialized, owner, true))), + CED.FoldoutGroup(LightUI.Styles.emissionHeader, Expandable.Emission, k_ExpandedStatePreset, CED.Group(DrawColor, DrawEmissionContent)), + CED.FoldoutGroup(LightUI.Styles.shadowHeader, Expandable.Shadows, k_ExpandedStatePreset, DrawEnableShadowMapInternal) ); Type lightMappingType = typeof(Lightmapping); @@ -253,7 +253,7 @@ static void DrawGeneralAdditionalContent(SerializedHDLight serialized, Editor ow { using (var change = new EditorGUI.ChangeCheckScope()) { - EditorGUILayout.PropertyField(serialized.lightlayersMask, s_Styles.lightLayer); + EditorGUILayout.PropertyField(serialized.lightlayersMask, LightUI.Styles.lightLayer); if (change.changed && serialized.linkShadowLayers.boolValue) SyncLightAndShadowLayers(serialized, owner); } @@ -657,7 +657,7 @@ static void DrawLightIntensityGUILayout(SerializedHDLight serialized, Editor own // Draw the unit textfield EditorGUI.BeginChangeCheck(); - EditorGUI.PropertyField(valueRect, serialized.intensity, s_Styles.empty); + EditorGUI.PropertyField(valueRect, serialized.intensity, CoreEditorStyles.empty); DrawLightIntensityUnitPopup(unitRect, serialized, owner); if (EditorGUI.EndChangeCheck()) @@ -672,21 +672,20 @@ static void DrawColor(SerializedHDLight serialized, Editor owner) { // Use the color temperature bool to create a popup dropdown to choose between the two modes. var colorTemperaturePopupValue = Convert.ToInt32(serialized.settings.useColorTemperature.boolValue); - var lightAppearanceOptions = new[] { "Color", "Filter and Temperature" }; - colorTemperaturePopupValue = EditorGUILayout.Popup(s_Styles.lightAppearance, colorTemperaturePopupValue, lightAppearanceOptions); + colorTemperaturePopupValue = EditorGUILayout.Popup(LightUI.Styles.lightAppearance, colorTemperaturePopupValue, LightUI.Styles.lightAppearanceOptions); serialized.settings.useColorTemperature.boolValue = Convert.ToBoolean(colorTemperaturePopupValue); if (serialized.settings.useColorTemperature.boolValue) { EditorGUI.indentLevel += 1; - EditorGUILayout.PropertyField(serialized.settings.color, s_Styles.colorFilter); + EditorGUILayout.PropertyField(serialized.settings.color, LightUI.Styles.colorFilter); // Light unit slider const int k_ValueUnitSeparator = 2; var lineRect = EditorGUILayout.GetControlRect(); var labelRect = lineRect; labelRect.width = EditorGUIUtility.labelWidth; - EditorGUI.LabelField(labelRect, s_Styles.colorTemperature); + EditorGUI.LabelField(labelRect, LightUI.Styles.colorTemperature); var temperatureSliderRect = lineRect; temperatureSliderRect.x += EditorGUIUtility.labelWidth + k_ValueUnitSeparator; @@ -704,16 +703,16 @@ static void DrawColor(SerializedHDLight serialized, Editor owner) unitRect.x += valueRect.width - indent + k_ValueUnitSeparator; unitRect.width = k_UnitWidth + .5f; - EditorGUI.PropertyField(valueRect, serialized.settings.colorTemperature, s_Styles.empty); + EditorGUI.PropertyField(valueRect, serialized.settings.colorTemperature, CoreEditorStyles.empty); EditorGUI.Popup(unitRect, 0, new[] { "Kelvin" }); EditorGUI.indentLevel -= 1; } else - EditorGUILayout.PropertyField(serialized.settings.color, s_Styles.color); + EditorGUILayout.PropertyField(serialized.settings.color, LightUI.Styles.color); } else - EditorGUILayout.PropertyField(serialized.settings.color, s_Styles.color); + EditorGUILayout.PropertyField(serialized.settings.color, LightUI.Styles.color); } static void DrawEmissionContent(SerializedHDLight serialized, Editor owner) diff --git a/com.unity.render-pipelines.high-definition/Editor/Lighting/VolumetricLighting/VolumetricCloudsEditor.cs b/com.unity.render-pipelines.high-definition/Editor/Lighting/VolumetricLighting/VolumetricCloudsEditor.cs index f8de3f5cd4d..9c7114e3115 100644 --- a/com.unity.render-pipelines.high-definition/Editor/Lighting/VolumetricLighting/VolumetricCloudsEditor.cs +++ b/com.unity.render-pipelines.high-definition/Editor/Lighting/VolumetricLighting/VolumetricCloudsEditor.cs @@ -46,9 +46,7 @@ class VolumetricCloudsEditor : VolumeComponentEditor SerializedDataParameter m_DensityMultiplier; SerializedDataParameter m_ShapeFactor; SerializedDataParameter m_ShapeScale; - SerializedDataParameter m_ShapeOffsetX; - SerializedDataParameter m_ShapeOffsetY; - SerializedDataParameter m_ShapeOffsetZ; + SerializedDataParameter m_ShapeOffset; SerializedDataParameter m_ErosionFactor; SerializedDataParameter m_ErosionScale; SerializedDataParameter m_ErosionNoiseType; @@ -126,9 +124,7 @@ public override void OnEnable() m_DensityMultiplier = Unpack(o.Find(x => x.densityMultiplier)); m_ShapeFactor = Unpack(o.Find(x => x.shapeFactor)); m_ShapeScale = Unpack(o.Find(x => x.shapeScale)); - m_ShapeOffsetX = Unpack(o.Find(x => x.shapeOffsetX)); - m_ShapeOffsetY = Unpack(o.Find(x => x.shapeOffsetY)); - m_ShapeOffsetZ = Unpack(o.Find(x => x.shapeOffsetZ)); + m_ShapeOffset = Unpack(o.Find(x => x.shapeOffset)); m_ErosionFactor = Unpack(o.Find(x => x.erosionFactor)); m_ErosionScale = Unpack(o.Find(x => x.erosionScale)); m_ErosionNoiseType = Unpack(o.Find(x => x.erosionNoiseType)); @@ -234,9 +230,7 @@ public override void OnInspectorGUI() } PropertyField(m_ShapeFactor); PropertyField(m_ShapeScale); - PropertyField(m_ShapeOffsetX); - PropertyField(m_ShapeOffsetY); - PropertyField(m_ShapeOffsetZ); + PropertyField(m_ShapeOffset); PropertyField(m_ErosionFactor); PropertyField(m_ErosionScale); PropertyField(m_ErosionNoiseType); @@ -248,11 +242,7 @@ public override void OnInspectorGUI() } } else - { - PropertyField(m_ShapeOffsetX); - PropertyField(m_ShapeOffsetY); - PropertyField(m_ShapeOffsetZ); - } + PropertyField(m_ShapeOffset); } PropertyField(m_EarthCurvature); diff --git a/com.unity.render-pipelines.high-definition/Editor/Material/ShaderGraph/TargetData/LightingData.cs b/com.unity.render-pipelines.high-definition/Editor/Material/ShaderGraph/TargetData/LightingData.cs index cd4b56e5a72..0a3878e4caf 100644 --- a/com.unity.render-pipelines.high-definition/Editor/Material/ShaderGraph/TargetData/LightingData.cs +++ b/com.unity.render-pipelines.high-definition/Editor/Material/ShaderGraph/TargetData/LightingData.cs @@ -74,7 +74,7 @@ public bool specularAA // } [SerializeField] - SpecularOcclusionMode m_SpecularOcclusionMode; + SpecularOcclusionMode m_SpecularOcclusionMode = SpecularOcclusionMode.FromAO; public SpecularOcclusionMode specularOcclusionMode { get => m_SpecularOcclusionMode; diff --git a/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/Raytracing/GlobalIlluminationEditor.cs b/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/Raytracing/GlobalIlluminationEditor.cs index b27e5d13731..45d5933e9f1 100644 --- a/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/Raytracing/GlobalIlluminationEditor.cs +++ b/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/Raytracing/GlobalIlluminationEditor.cs @@ -173,6 +173,9 @@ public override void OnInspectorGUI() } PropertyField(m_Enable); + if (m_Enable.value.boolValue) + EditorGUILayout.HelpBox("Real-time Global Illumination overwrites emissive data in deferred rendering mode. To recover the emissive contribution, either use Force Forward Emissive or disable Receive SSR/SSGI flag on the emissive materials.", MessageType.Info); + EditorGUILayout.Space(); // If ray tracing is supported display the content of the volume component if (HDRenderPipeline.buildPipelineSupportsRayTracing) diff --git a/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/Settings/HDGlobalSettingsWindow.cs b/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/Settings/HDGlobalSettingsWindow.cs index 6835576ef2a..1c93bbf4452 100644 --- a/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/Settings/HDGlobalSettingsWindow.cs +++ b/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/Settings/HDGlobalSettingsWindow.cs @@ -21,12 +21,15 @@ class HDGlobalSettingsPanelProvider [SettingsProvider] public static SettingsProvider CreateSettingsProvider() { + var keywords = SettingsProvider.GetSearchKeywordsFromGUIContentProperties() + .Concat(OverridableFrameSettingsArea.frameSettingsKeywords); + + keywords = RenderPipelineSettingsUtilities.RemoveDLSSKeywords(keywords); + return new SettingsProvider("Project/Graphics/HDRP Global Settings", SettingsScope.Project) { activateHandler = s_IMGUIImpl.OnActivate, - keywords = SettingsProvider.GetSearchKeywordsFromGUIContentProperties() - .Concat(OverridableFrameSettingsArea.frameSettingsKeywords) - .ToArray(), + keywords = keywords.ToArray(), guiHandler = s_IMGUIImpl.DoGUI, titleBarGuiHandler = s_IMGUIImpl.OnTitleBarGUI }; diff --git a/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/Settings/QualitySettingsPanel.cs b/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/Settings/QualitySettingsPanel.cs index cd0825e358c..86a6a9f7b88 100644 --- a/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/Settings/QualitySettingsPanel.cs +++ b/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/Settings/QualitySettingsPanel.cs @@ -23,12 +23,15 @@ class QualitySettingsPanel [SettingsProvider] public static SettingsProvider CreateSettingsProvider() { + var keywords = SettingsProvider.GetSearchKeywordsFromGUIContentProperties() + .Concat(SettingsProvider.GetSearchKeywordsFromGUIContentProperties()); + + keywords = RenderPipelineSettingsUtilities.RemoveDLSSKeywords(keywords); + return new SettingsProvider("Project/Quality/HDRP", SettingsScope.Project) { activateHandler = s_IMGUIImpl.OnActivate, - keywords = SettingsProvider.GetSearchKeywordsFromGUIContentProperties() - .Concat(SettingsProvider.GetSearchKeywordsFromGUIContentProperties()) - .ToArray(), + keywords = keywords.ToArray(), guiHandler = s_IMGUIImpl.OnGUI, }; } diff --git a/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/Settings/RenderPipelineSettingsUtilities.cs b/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/Settings/RenderPipelineSettingsUtilities.cs new file mode 100644 index 00000000000..4f3ee51e1cd --- /dev/null +++ b/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/Settings/RenderPipelineSettingsUtilities.cs @@ -0,0 +1,19 @@ +using System.Collections.Generic; +using System.Linq; + +namespace UnityEditor.Rendering.HighDefinition +{ + static class RenderPipelineSettingsUtilities + { + public static IEnumerable RemoveDLSSKeywords(IEnumerable keywords) + { +#if ENABLE_NVIDIA && !ENABLE_NVIDIA_MODULE + // Case 1358409 workaround: + // Remove all DLSS keyword when the NVIDIA package is not installed. + return keywords.Where(keyword => keyword.ToLower().IndexOf("dlss") == -1); +#else + return keywords; +#endif + } + } +} diff --git a/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/Settings/RenderPipelineSettingsUtilities.cs.meta b/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/Settings/RenderPipelineSettingsUtilities.cs.meta new file mode 100644 index 00000000000..a2101600b25 --- /dev/null +++ b/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/Settings/RenderPipelineSettingsUtilities.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 90142127598a3854d825d96865206593 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/Settings/SerializedHDRenderPipelineGlobalSettings.cs b/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/Settings/SerializedHDRenderPipelineGlobalSettings.cs index 4999e4d1fed..92a3a394136 100644 --- a/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/Settings/SerializedHDRenderPipelineGlobalSettings.cs +++ b/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/Settings/SerializedHDRenderPipelineGlobalSettings.cs @@ -52,7 +52,7 @@ class SerializedHDRenderPipelineGlobalSettings public SerializedProperty DLSSProjectId; public SerializedProperty useDLSSCustomProjectId; - public SerializedProperty apvSceneBounds; + public SerializedProperty apvScenesData; internal ReorderableList uiBeforeTransparentCustomPostProcesses; internal ReorderableList uiBeforeTAACustomPostProcesses; @@ -145,7 +145,7 @@ public SerializedHDRenderPipelineGlobalSettings(SerializedObject serializedObjec DLSSProjectId = serializedObject.Find((HDRenderPipelineGlobalSettings s) => s.DLSSProjectId); useDLSSCustomProjectId = serializedObject.Find((HDRenderPipelineGlobalSettings s) => s.useDLSSCustomProjectId); - apvSceneBounds = serializedObject.Find((HDRenderPipelineGlobalSettings s) => s.apvScenesBounds); + apvScenesData = serializedObject.Find((HDRenderPipelineGlobalSettings s) => s.apvScenesData); } void InitializeCustomPostProcessesLists() diff --git a/com.unity.render-pipelines.high-definition/Runtime/Lighting/Light/HDAdditionalLightData.cs b/com.unity.render-pipelines.high-definition/Runtime/Lighting/Light/HDAdditionalLightData.cs index 175c7d92ce4..37bae930a9e 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/Lighting/Light/HDAdditionalLightData.cs +++ b/com.unity.render-pipelines.high-definition/Runtime/Lighting/Light/HDAdditionalLightData.cs @@ -33,7 +33,7 @@ struct TimelineWorkaround [AddComponentMenu("")] // Hide in menu [RequireComponent(typeof(Light))] [ExecuteAlways] - public partial class HDAdditionalLightData : MonoBehaviour, ISerializationCallbackReceiver + public partial class HDAdditionalLightData : MonoBehaviour, ISerializationCallbackReceiver, IAdditionalData { internal const float k_MinLightSize = 0.01f; // Provide a small size of 1cm for line light diff --git a/com.unity.render-pipelines.high-definition/Runtime/Lighting/Reflection/HDAdditionalReflectionData.cs b/com.unity.render-pipelines.high-definition/Runtime/Lighting/Reflection/HDAdditionalReflectionData.cs index ad46bef5a35..3c8bfee527d 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/Lighting/Reflection/HDAdditionalReflectionData.cs +++ b/com.unity.render-pipelines.high-definition/Runtime/Lighting/Reflection/HDAdditionalReflectionData.cs @@ -6,7 +6,7 @@ namespace UnityEngine.Rendering.HighDefinition [HDRPHelpURLAttribute("Reflection-Probe")] [AddComponentMenu("")] // Hide in menu [RequireComponent(typeof(ReflectionProbe))] - public sealed partial class HDAdditionalReflectionData : HDProbe + public sealed partial class HDAdditionalReflectionData : HDProbe, IAdditionalData { void Awake() { diff --git a/com.unity.render-pipelines.high-definition/Runtime/Lighting/Reflection/HDProbe.cs b/com.unity.render-pipelines.high-definition/Runtime/Lighting/Reflection/HDProbe.cs index 8afa36e268f..e0daa581c7e 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/Lighting/Reflection/HDProbe.cs +++ b/com.unity.render-pipelines.high-definition/Runtime/Lighting/Reflection/HDProbe.cs @@ -633,15 +633,11 @@ private Vector3 ComputeCapturePositionWS() private void QueueSHBaking() { - var hdrp = (HDRenderPipeline)RenderPipelineManager.currentPipeline; - if (hdrp != null) - { - if (!hdrp.currentPlatformRenderPipelineSettings.supportProbeVolume) return; - } - else - { + if (!(RenderPipelineManager.currentPipeline is HDRenderPipeline hdrp)) + return; + + if (!hdrp.currentPlatformRenderPipelineSettings.supportProbeVolume) return; - } Vector3 capturePositionWS = ComputeCapturePositionWS(); if (m_SHRequestID < 0) diff --git a/com.unity.render-pipelines.high-definition/Runtime/Lighting/VolumetricLighting/HDRenderPipeline.VolumetricClouds.cs b/com.unity.render-pipelines.high-definition/Runtime/Lighting/VolumetricLighting/HDRenderPipeline.VolumetricClouds.cs index ef1175bb30d..73f366b80f3 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/Lighting/VolumetricLighting/HDRenderPipeline.VolumetricClouds.cs +++ b/com.unity.render-pipelines.high-definition/Runtime/Lighting/VolumetricLighting/HDRenderPipeline.VolumetricClouds.cs @@ -439,8 +439,8 @@ void UpdateShaderVariableslClouds(ref ShaderVariablesClouds cb, HDCamera hdCamer cb._ShapeScale = cloudModelData.shapeScale; cb._ErosionFactor = cloudModelData.erosionFactor; cb._ErosionScale = cloudModelData.erosionScale; - cb._ShapeNoiseOffset = new Vector2(settings.shapeOffsetX.value, settings.shapeOffsetZ.value); - cb._VerticalShapeNoiseOffset = settings.shapeOffsetY.value; + cb._ShapeNoiseOffset = new Vector2(settings.shapeOffset.value.x, settings.shapeOffset.value.z); + cb._VerticalShapeNoiseOffset = settings.shapeOffset.value.y; // If the sun has moved more than 2.0°, reduce significantly the history accumulation float sunAngleDifference = 0.0f; diff --git a/com.unity.render-pipelines.high-definition/Runtime/Lighting/VolumetricLighting/VolumetricClouds.Migration.cs b/com.unity.render-pipelines.high-definition/Runtime/Lighting/VolumetricLighting/VolumetricClouds.Migration.cs index 04ccc55904c..df58db1052f 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/Lighting/VolumetricLighting/VolumetricClouds.Migration.cs +++ b/com.unity.render-pipelines.high-definition/Runtime/Lighting/VolumetricLighting/VolumetricClouds.Migration.cs @@ -23,6 +23,7 @@ enum Version { Initial, GlobalWind, + ShapeOffset, Count } @@ -44,6 +45,13 @@ enum Version mode = WindParameter.WindOverrideMode.Custom, customValue = c.m_ObsoleteOrientation.value }; +#pragma warning restore 618 + }), + MigrationStep.New(Version.ShapeOffset, (VolumetricClouds c) => + { +#pragma warning disable 618 // Type or member is obsolete + c.shapeOffset.overrideState = c.m_ObsoleteShapeOffsetX.overrideState || c.m_ObsoleteShapeOffsetY.overrideState || c.m_ObsoleteShapeOffsetZ.overrideState; + c.shapeOffset.value = new Vector3(c.m_ObsoleteShapeOffsetX.value, c.m_ObsoleteShapeOffsetY.value, c.m_ObsoleteShapeOffsetZ.value); #pragma warning restore 618 }) ); @@ -61,5 +69,13 @@ void Awake() MinFloatParameter m_ObsoleteWindSpeed = new MinFloatParameter(1.0f, 0.0f); [SerializeField, FormerlySerializedAs("orientation"), Obsolete("For Data Migration")] ClampedFloatParameter m_ObsoleteOrientation = new ClampedFloatParameter(0.0f, 0.0f, 360.0f); + + [SerializeField, FormerlySerializedAs("shapeOffsetX"), Obsolete("For Data Migration")] + FloatParameter m_ObsoleteShapeOffsetX = new FloatParameter(0.0f); + [SerializeField, FormerlySerializedAs("shapeOffsetY"), Obsolete("For Data Migration")] + FloatParameter m_ObsoleteShapeOffsetY = new FloatParameter(0.0f); + [SerializeField, FormerlySerializedAs("shapeOffsetZ"), Obsolete("For Data Migration")] + FloatParameter m_ObsoleteShapeOffsetZ = new FloatParameter(0.0f); + } } diff --git a/com.unity.render-pipelines.high-definition/Runtime/Lighting/VolumetricLighting/VolumetricClouds.compute b/com.unity.render-pipelines.high-definition/Runtime/Lighting/VolumetricLighting/VolumetricClouds.compute index 37f652e4c6b..a61d4eeb013 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/Lighting/VolumetricLighting/VolumetricClouds.compute +++ b/com.unity.render-pipelines.high-definition/Runtime/Lighting/VolumetricLighting/VolumetricClouds.compute @@ -850,6 +850,9 @@ void RenderClouds(uint3 traceCoord : SV_DispatchThreadID, uint2 groupThreadId : intermediateCoord = traceCoord.xy * 2; } + // Given that the rendering resolution is not guaranteed to be an even number, we need to clamp to the intermediate resolution in this case + intermediateCoord = min(intermediateCoord, _IntermediateScreenSize.xy - 1); + // Compute the offset that shall be used (if any) float offset = _EnableIntegration ? GetBNDSequenceSample(intermediateCoord, _AccumulationFrameIndex, 0) : 0.0; diff --git a/com.unity.render-pipelines.high-definition/Runtime/Lighting/VolumetricLighting/VolumetricClouds.cs b/com.unity.render-pipelines.high-definition/Runtime/Lighting/VolumetricLighting/VolumetricClouds.cs index 14a00161465..57d1a1acbdd 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/Lighting/VolumetricLighting/VolumetricClouds.cs +++ b/com.unity.render-pipelines.high-definition/Runtime/Lighting/VolumetricLighting/VolumetricClouds.cs @@ -379,22 +379,10 @@ public CloudFadeInModeParameter(CloudFadeInMode value, bool overrideState = fals public MinFloatParameter shapeScale = new MinFloatParameter(2.5f, 0.1f); /// - /// Controls the offset (world X-axis) applied when evaluating the larger noise passing through the cloud coverage. + /// Controls the world space offset applied when evaluating the larger noise passing through the cloud coverage. /// - [Tooltip("Controls the offset (world X-axis) applied when evaluating the larger noise passing through the cloud coverage.")] - public FloatParameter shapeOffsetX = new FloatParameter(0.0f); - - /// - /// Controls the offset (world Y-axis) applied when evaluating the larger noise passing through the cloud coverage. - /// - [Tooltip("Controls the offset (world Y-axis) applied when evaluating the larger noise passing through the cloud coverage.")] - public FloatParameter shapeOffsetY = new FloatParameter(0.0f); - - /// - /// Controls the offset (world Z-axis) applied when evaluating the larger noise passing through the cloud coverage. - /// - [Tooltip("Controls the offset (world Z-axis) applied when evaluating the larger noise passing through the cloud coverage.")] - public FloatParameter shapeOffsetZ = new FloatParameter(0.0f); + [Tooltip("Controls the world space offset applied when evaluating the larger noise passing through the cloud coverage.")] + public Vector3Parameter shapeOffset = new Vector3Parameter(Vector3.zero); /// /// Controls the smaller noise on the edge of the clouds. A higher value will erode clouds more significantly. diff --git a/com.unity.render-pipelines.high-definition/Runtime/Material/LayeredLit/LayeredLit.shader b/com.unity.render-pipelines.high-definition/Runtime/Material/LayeredLit/LayeredLit.shader index e2d674f788f..a28294fda2b 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/Material/LayeredLit/LayeredLit.shader +++ b/com.unity.render-pipelines.high-definition/Runtime/Material/LayeredLit/LayeredLit.shader @@ -244,7 +244,7 @@ Shader "HDRP/LayeredLit" // Following are builtin properties - [Enum(Off, 0, From Ambient Occlusion, 1, From Bent Normals, 2)] _SpecularOcclusionMode("Specular Occlusion Mode", Int) = 1 + [Enum(Off, 0, From Ambient Occlusion, 1, From AO and Bent Normals, 2)] _SpecularOcclusionMode("Specular Occlusion Mode", Int) = 1 [HDR] _EmissiveColor("EmissiveColor", Color) = (0, 0, 0) // Used only to serialize the LDR and HDR emissive color in the material UI, @@ -453,7 +453,7 @@ Shader "HDRP/LayeredLit" #pragma shader_feature_fragment _ENABLESPECULAROCCLUSION // Non-local #pragma shader_feature_fragment _ _SPECULAR_OCCLUSION_NONE _SPECULAR_OCCLUSION_FROM_BENT_NORMAL_MAP // Non-local #pragma shader_feature_raytracing _ENABLESPECULAROCCLUSION // Non-local - #pragma shader_feature_raytracing _ SPECULAR_OCCLUSION_NONE _SPECULAR_OCCLUSION_FROM_BENT_NORMAL_MAP // Non-local + #pragma shader_feature_raytracing _ _SPECULAR_OCCLUSION_NONE _SPECULAR_OCCLUSION_FROM_BENT_NORMAL_MAP // Non-local #ifdef _ENABLESPECULAROCCLUSION #define _SPECULAR_OCCLUSION_FROM_BENT_NORMAL_MAP diff --git a/com.unity.render-pipelines.high-definition/Runtime/Material/LayeredLit/LayeredLitTessellation.shader b/com.unity.render-pipelines.high-definition/Runtime/Material/LayeredLit/LayeredLitTessellation.shader index ae4b4ceb97b..d79b23c3be1 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/Material/LayeredLit/LayeredLitTessellation.shader +++ b/com.unity.render-pipelines.high-definition/Runtime/Material/LayeredLit/LayeredLitTessellation.shader @@ -244,7 +244,7 @@ Shader "HDRP/LayeredLitTessellation" // Following are builtin properties - [Enum(Off, 0, From Ambient Occlusion, 1, From Bent Normals, 2)] _SpecularOcclusionMode("Specular Occlusion Mode", Int) = 1 + [Enum(Off, 0, From Ambient Occlusion, 1, From AO and Bent Normals, 2)] _SpecularOcclusionMode("Specular Occlusion Mode", Int) = 1 [HDR] _EmissiveColor("EmissiveColor", Color) = (0, 0, 0) // Used only to serialize the LDR and HDR emissive color in the material UI, diff --git a/com.unity.render-pipelines.high-definition/Runtime/Material/Lit/Lit.shader b/com.unity.render-pipelines.high-definition/Runtime/Material/Lit/Lit.shader index a44fb3837b6..5501967ffcf 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/Material/Lit/Lit.shader +++ b/com.unity.render-pipelines.high-definition/Runtime/Material/Lit/Lit.shader @@ -77,7 +77,7 @@ Shader "HDRP/Lit" // Following options are for the GUI inspector and different from the input parameters above // These option below will cause different compilation flag. - [Enum(Off, 0, From Ambient Occlusion, 1, From Bent Normals, 2)] _SpecularOcclusionMode("Specular Occlusion Mode", Int) = 1 + [Enum(Off, 0, From Ambient Occlusion, 1, From AO and Bent Normals, 2)] _SpecularOcclusionMode("Specular Occlusion Mode", Int) = 1 [HDR] _EmissiveColor("EmissiveColor", Color) = (0, 0, 0) // Used only to serialize the LDR and HDR emissive color in the material UI, diff --git a/com.unity.render-pipelines.high-definition/Runtime/Material/Lit/LitData.hlsl b/com.unity.render-pipelines.high-definition/Runtime/Material/Lit/LitData.hlsl index 31cef50350c..729fa81e0b2 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/Material/Lit/LitData.hlsl +++ b/com.unity.render-pipelines.high-definition/Runtime/Material/Lit/LitData.hlsl @@ -17,9 +17,6 @@ #include "Packages/com.unity.render-pipelines.high-definition/Runtime/Material/Lit/LitDecalData.hlsl" #endif -//#include "Packages/com.unity.render-pipelines.high-definition/Runtime/Material/SphericalCapPivot/SPTDistribution.hlsl" -//#define SPECULAR_OCCLUSION_USE_SPTD - //#define PROJECTED_SPACE_NDF_FILTERING // Struct that gather UVMapping info of all layers + common calculation @@ -286,11 +283,7 @@ void GetSurfaceAndBuiltinData(FragInputs input, float3 V, inout PositionInputs p // If user provide bent normal then we process a better term #if defined(_BENTNORMALMAP) && defined(_SPECULAR_OCCLUSION_FROM_BENT_NORMAL_MAP) // If we have bent normal and ambient occlusion, process a specular occlusion - #ifdef SPECULAR_OCCLUSION_USE_SPTD - surfaceData.specularOcclusion = GetSpecularOcclusionFromBentAOPivot(V, bentNormalWS, surfaceData.normalWS, surfaceData.ambientOcclusion, PerceptualSmoothnessToPerceptualRoughness(surfaceData.perceptualSmoothness)); - #else surfaceData.specularOcclusion = GetSpecularOcclusionFromBentAO(V, bentNormalWS, surfaceData.normalWS, surfaceData.ambientOcclusion, PerceptualSmoothnessToRoughness(surfaceData.perceptualSmoothness)); -#endif // Don't do spec occ from Ambient if there is no mask mask #elif defined(_MASKMAP) && !defined(_SPECULAR_OCCLUSION_NONE) surfaceData.specularOcclusion = GetSpecularOcclusionFromAmbientOcclusion(ClampNdotV(dot(surfaceData.normalWS, V)), surfaceData.ambientOcclusion, PerceptualSmoothnessToRoughness(surfaceData.perceptualSmoothness)); diff --git a/com.unity.render-pipelines.high-definition/Runtime/Material/Lit/LitProperties.hlsl b/com.unity.render-pipelines.high-definition/Runtime/Material/Lit/LitProperties.hlsl index d20882376c4..9eed7799baf 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/Material/Lit/LitProperties.hlsl +++ b/com.unity.render-pipelines.high-definition/Runtime/Material/Lit/LitProperties.hlsl @@ -22,6 +22,8 @@ TEXTURE2D(_MaskMap); SAMPLER(sampler_MaskMap); TEXTURE2D(_BentNormalMap); // Reuse sampler from normal map SAMPLER(sampler_BentNormalMap); +TEXTURE2D(_BentNormalMapOS); +SAMPLER(sampler_BentNormalMapOS); TEXTURE2D(_NormalMap); SAMPLER(sampler_NormalMap); diff --git a/com.unity.render-pipelines.high-definition/Runtime/Material/Lit/LitTessellation.shader b/com.unity.render-pipelines.high-definition/Runtime/Material/Lit/LitTessellation.shader index 0ceec482239..ce88d3f398f 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/Material/Lit/LitTessellation.shader +++ b/com.unity.render-pipelines.high-definition/Runtime/Material/Lit/LitTessellation.shader @@ -77,7 +77,7 @@ Shader "HDRP/LitTessellation" // Following options are for the GUI inspector and different from the input parameters above // These option below will cause different compilation flag. - [Enum(Off, 0, From Ambient Occlusion, 1, From Bent Normals, 2)] _SpecularOcclusionMode("Specular Occlusion Mode", Int) = 1 + [Enum(Off, 0, From Ambient Occlusion, 1, From AO and Bent Normals, 2)] _SpecularOcclusionMode("Specular Occlusion Mode", Int) = 1 [HDR] _EmissiveColor("EmissiveColor", Color) = (0, 0, 0) // Used only to serialize the LDR and HDR emissive color in the material UI, diff --git a/com.unity.render-pipelines.high-definition/Runtime/PostProcessing/Shaders/TemporalAntiAliasing.shader b/com.unity.render-pipelines.high-definition/Runtime/PostProcessing/Shaders/TemporalAntiAliasing.shader index b2f212ce8e8..853e5843132 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/PostProcessing/Shaders/TemporalAntiAliasing.shader +++ b/com.unity.render-pipelines.high-definition/Runtime/PostProcessing/Shaders/TemporalAntiAliasing.shader @@ -129,7 +129,7 @@ Shader "Hidden/HDRP/TemporalAA" #define _BaseBlendFactor _TaaPostParameters1.x #define _CentralWeight _TaaPostParameters1.y - #define _ExcludeTAABit _TaaPostParameters1.z + #define _ExcludeTAABit (uint)_TaaPostParameters1.z // TAAU specific float4 _TaauParameters; diff --git a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Camera/HDAdditionalCameraData.cs b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Camera/HDAdditionalCameraData.cs index 1e78578ee5d..992d363d210 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Camera/HDAdditionalCameraData.cs +++ b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Camera/HDAdditionalCameraData.cs @@ -158,7 +158,7 @@ public static HDPhysicalCamera GetDefaults() [AddComponentMenu("")] // Hide in menu [DisallowMultipleComponent, ExecuteAlways] [RequireComponent(typeof(Camera))] - public partial class HDAdditionalCameraData : MonoBehaviour, IFrameSettingsHistoryContainer + public partial class HDAdditionalCameraData : MonoBehaviour, IFrameSettingsHistoryContainer, IAdditionalData { /// /// How the camera should handle vertically flipping the frame at the end of rendering. diff --git a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.PostProcess.cs b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.PostProcess.cs index b47ebded31a..253c09549bc 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.PostProcess.cs +++ b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.PostProcess.cs @@ -1364,6 +1364,8 @@ class CustomPostProcessData public TextureHandle motionVecTexture; public HDCamera hdCamera; public CustomPostProcessVolumeComponent customPostProcess; + public Vector4 postProcessScales; + public Vector2Int postProcessViewportSize; } bool DoCustomPostProcess(RenderGraph renderGraph, HDCamera hdCamera, ref TextureHandle source, TextureHandle depthBuffer, TextureHandle normalBuffer, TextureHandle motionVectors, List postProcessList) @@ -1398,19 +1400,39 @@ bool DoCustomPostProcess(RenderGraph renderGraph, HDCamera hdCamera, ref Texture passData.motionVecTexture = builder.ReadTexture(motionVectors); passData.source = builder.ReadTexture(source); - passData.destination = builder.UseColorBuffer(renderGraph.CreateTexture(new TextureDesc(Vector2.one, true, true) + passData.destination = builder.UseColorBuffer(renderGraph.CreateTexture(new TextureDesc(Vector2.one, IsDynamicResUpscaleTargetEnabled(), true) { colorFormat = GetPostprocessTextureFormat(), enableRandomWrite = true, name = "CustomPostProcesDestination" }), 0); passData.hdCamera = hdCamera; passData.customPostProcess = customPP; + passData.postProcessScales = new Vector4(hdCamera.postProcessRTScales.x, hdCamera.postProcessRTScales.y, hdCamera.postProcessRTScalesHistory.x, hdCamera.postProcessRTScalesHistory.y); + passData.postProcessViewportSize = postProcessViewportSize; builder.SetRenderFunc( (CustomPostProcessData data, RenderGraphContext ctx) => { + var srcRt = (RTHandle)data.source; + var dstRt = (RTHandle)data.destination; + + // HACK FIX: for custom post process, we want the user to transparently be able to use color target regardless of the scaling occured. For example, if the user uses any of the HDUtil blit methods + // which require the rtHandleProperties to set the viewport and sample scales. + // In the case of DLSS and TAAU, the post process viewport and size for the color target have changed, thus we override them here. + // When these upscalers arent set, behaviour is still the same (since the post process scale is the same as the global rt handle scale). So for simplicity, we always take this code path for custom post process color. + var newProps = srcRt.rtHandleProperties; + newProps.rtHandleScale = data.postProcessScales; + newProps.currentRenderTargetSize = data.postProcessViewportSize; + newProps.previousRenderTargetSize = data.postProcessViewportSize; + newProps.currentViewportSize = data.postProcessViewportSize; + srcRt.SetCustomHandleProperties(newProps); + dstRt.SetCustomHandleProperties(newProps); + // Temporary: see comment above ctx.cmd.SetGlobalTexture(HDShaderIDs._CameraDepthTexture, data.depthBuffer); ctx.cmd.SetGlobalTexture(HDShaderIDs._NormalBufferTexture, data.normalBuffer); ctx.cmd.SetGlobalTexture(HDShaderIDs._CameraMotionVectorsTexture, data.motionVecTexture); data.customPostProcess.Render(ctx.cmd, data.hdCamera, data.source, data.destination); + + srcRt.ClearCustomHandleProperties(); + dstRt.ClearCustomHandleProperties(); }); customPostProcessExecuted = true; diff --git a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.cs b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.cs index 496a29b671e..740e2b8704c 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.cs +++ b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.cs @@ -378,9 +378,9 @@ public HDRenderPipeline(HDRenderPipelineAsset asset) ProbeReferenceVolume.instance.Initialize(new ProbeVolumeSystemParameters() { memoryBudget = m_Asset.currentPlatformRenderPipelineSettings.probeVolumeMemoryBudget, - probeDebugMesh = defaultResources.assets.sphereMesh, + probeDebugMesh = defaultResources.assets.probeDebugSphere, probeDebugShader = defaultResources.shaders.probeVolumeDebugShader, - sceneBounds = m_GlobalSettings.GetOrCreateAPVSceneBounds(), + sceneData = m_GlobalSettings.GetOrCreateAPVSceneData(), shBands = m_Asset.currentPlatformRenderPipelineSettings.probeVolumeSHBands }); RegisterRetrieveOfProbeVolumeExtraDataAction(); diff --git a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipelineGlobalSettings.cs b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipelineGlobalSettings.cs index d49fc6bc48b..03ccc7d8a31 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipelineGlobalSettings.cs +++ b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipelineGlobalSettings.cs @@ -821,16 +821,16 @@ internal bool AddDiffusionProfile(DiffusionProfileSettings profile) #region APV // This is temporarily here until we have a core place to put it shared between pipelines. [SerializeField] - internal ProbeVolumeSceneBounds apvScenesBounds; + internal ProbeVolumeSceneData apvScenesData; - internal ProbeVolumeSceneBounds GetOrCreateAPVSceneBounds() + internal ProbeVolumeSceneData GetOrCreateAPVSceneData() { - if (apvScenesBounds == null) - apvScenesBounds = new ProbeVolumeSceneBounds((Object)this); + if (apvScenesData == null) + apvScenesData = new ProbeVolumeSceneData((Object)this); - apvScenesBounds.SetParentObject((Object)this); - return apvScenesBounds; + apvScenesData.SetParentObject((Object)this); + return apvScenesData; } #endregion diff --git a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipelineRuntimeResources.cs b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipelineRuntimeResources.cs index c8f9135dc75..dfc76f6b674 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipelineRuntimeResources.cs +++ b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipelineRuntimeResources.cs @@ -473,6 +473,8 @@ public sealed class AssetResources public Mesh emissiveQuadMesh; [Reload("Runtime/RenderPipelineResources/Mesh/Sphere.fbx")] public Mesh sphereMesh; + [Reload("Runtime/RenderPipelineResources/Mesh/ProbeDebugSphere.fbx")] + public Mesh probeDebugSphere; } public ShaderResources shaders; diff --git a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Raytracing/Shaders/RaytracingIntersection.hlsl b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Raytracing/Shaders/RaytracingIntersection.hlsl index efeb11e68f2..16584f22b96 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Raytracing/Shaders/RaytracingIntersection.hlsl +++ b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Raytracing/Shaders/RaytracingIntersection.hlsl @@ -105,11 +105,6 @@ void FetchIntersectionVertex(uint vertexIndex, out IntersectionVertex outVertex) #ifdef ATTRIBUTES_NEED_COLOR outVertex.color = UnityRayTracingFetchVertexAttribute4(vertexIndex, kVertexAttributeColor); - // We want to default to white in case there is no specified color, to match the raster behaviour - // FIXME: This could be addressed in UnityRayTracingFetchVertexAttribute4(), but until then we use this workaround - if (!any(outVertex.color)) - outVertex.color = 1.0; - #else outVertex.color = 0.0; #endif diff --git a/com.unity.render-pipelines.high-definition/Runtime/RenderPipelineResources/HDRenderPipelineRuntimeResources.asset b/com.unity.render-pipelines.high-definition/Runtime/RenderPipelineResources/HDRenderPipelineRuntimeResources.asset index 24542ec74a4..17097924dd3 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/RenderPipelineResources/HDRenderPipelineRuntimeResources.asset +++ b/com.unity.render-pipelines.high-definition/Runtime/RenderPipelineResources/HDRenderPipelineRuntimeResources.asset @@ -77,26 +77,16 @@ MonoBehaviour: physicallyBasedSkyPS: {fileID: 4800000, guid: a06934a4863e778498be65d8f865b7a4, type: 3} planarReflectionFilteringCS: {fileID: 7200000, guid: 9f3f8a01b8caaaa4595591dc96d43dd2, type: 3} cloudLayerPS: {fileID: 4800000, guid: 001a47fa123e95a4bba13ecb0442d944, type: 3} - bakeCloudTextureCS: {fileID: 7200000, guid: 09a7f6850ee9fb4439e5ebd632127da5, - type: 3} - bakeCloudShadowsCS: {fileID: 7200000, guid: 3e7317e0800c066448ee07a3e47f102b, - type: 3} - volumetricCloudsCS: {fileID: 7200000, guid: f911a8577fa9a4546a6b255bcf888baf, - type: 3} - volumetricCloudMapGeneratorCS: {fileID: 7200000, guid: 6b22771f0aa98744cb09f455a5a818cb, - type: 3} - volumetricCloudsCombinePS: {fileID: 4800000, guid: 12f1a69ddf916f042ae6ce8a994506f3, - type: 3} - preIntegratedFGD_GGXDisneyDiffusePS: {fileID: 4800000, guid: 123f13d52852ef547b2962de4bd9eaad, - type: 3} - preIntegratedFGD_CharlieFabricLambertPS: {fileID: 4800000, guid: 3b3bf235775cf8b4baae7f3306787ab0, - type: 3} - preIntegratedFGD_MarschnerPS: {fileID: 4800000, guid: 31f36caf0a5e7f848a1b5328b6ad3eb8, - type: 3} - preIntegratedFGD_WardPS: {fileID: 4800000, guid: d279c46a545b0af4f9f0c4fa82cd489e, - type: 3} - preIntegratedFGD_CookTorrancePS: {fileID: 4800000, guid: a6402c19b020b4a4fb7073aaa2e26aba, - type: 3} + bakeCloudTextureCS: {fileID: 7200000, guid: 09a7f6850ee9fb4439e5ebd632127da5, type: 3} + bakeCloudShadowsCS: {fileID: 7200000, guid: 3e7317e0800c066448ee07a3e47f102b, type: 3} + volumetricCloudsCS: {fileID: 7200000, guid: f911a8577fa9a4546a6b255bcf888baf, type: 3} + volumetricCloudMapGeneratorCS: {fileID: 7200000, guid: 6b22771f0aa98744cb09f455a5a818cb, type: 3} + volumetricCloudsCombinePS: {fileID: 4800000, guid: 12f1a69ddf916f042ae6ce8a994506f3, type: 3} + preIntegratedFGD_GGXDisneyDiffusePS: {fileID: 4800000, guid: 123f13d52852ef547b2962de4bd9eaad, type: 3} + preIntegratedFGD_CharlieFabricLambertPS: {fileID: 4800000, guid: 3b3bf235775cf8b4baae7f3306787ab0, type: 3} + preIntegratedFGD_MarschnerPS: {fileID: 4800000, guid: 31f36caf0a5e7f848a1b5328b6ad3eb8, type: 3} + preIntegratedFGD_WardPS: {fileID: 4800000, guid: d279c46a545b0af4f9f0c4fa82cd489e, type: 3} + preIntegratedFGD_CookTorrancePS: {fileID: 4800000, guid: a6402c19b020b4a4fb7073aaa2e26aba, type: 3} encodeBC6HCS: {fileID: 7200000, guid: aa922d239de60304f964e24488559eeb, type: 3} cubeToPanoPS: {fileID: 4800000, guid: 595434cc3b6405246b6cd3086d0b6f7d, type: 3} blitCubeTextureFacePS: {fileID: 4800000, guid: d850d0a2481878d4bbf17e5126b04163, type: 3} @@ -156,28 +146,21 @@ MonoBehaviour: clearBlackPS: {fileID: 4800000, guid: 3330c1503ea8c6d4d9408df3f64227eb, type: 3} SMAAPS: {fileID: 4800000, guid: 9655f4aa89a469c49aceaceabf9bc77b, type: 3} temporalAntialiasingPS: {fileID: 4800000, guid: 3dd9fd928fdb83743b1f27d15df22179, type: 3} - upsampleSceneCS: {fileID: 7200000, guid: 51e13c18f34ea1d4183edb912e98cbf7, type: 3} lensFlareDataDrivenPS: {fileID: 4800000, guid: 85330b3de0cfebc4ba78b2d61b1a2899, type: 3} DLSSBiasColorMaskPS: {fileID: 4800000, guid: 017a05924c0b0484ca29717ed0c60343, type: 3} dofCircleOfConfusion: {fileID: 7200000, guid: 75332b7b315c80d4babe506820aa0bfd, type: 3} dofGatherCS: {fileID: 7200000, guid: 1e6b16a7970a1494db74b1d3d007d1cc, type: 3} dofCoCMinMaxCS: {fileID: 7200000, guid: c70dd492c3d2fe94589d6ca8d4e37915, type: 3} dofMinMaxDilateCS: {fileID: 7200000, guid: 757a3f81b35177b44b2b178909b49172, type: 3} - contrastAdaptiveSharpenCS: {fileID: 7200000, guid: 560896aec2f412c48995be35551a4ac6, - type: 3} - robustContrastAdaptiveSharpenCS: {fileID: 7200000, guid: d907373e407ff65479c449a66c04443d, - type: 3} - edgeAdaptiveSpatialUpsamplingCS: {fileID: 7200000, guid: f054fa9fe2c85bb42b9489e2f9ffb643, - type: 3} - VTFeedbackDownsample: {fileID: 7200000, guid: 32d963548086c2c439aeb23a93e9a00a, - type: 3} + contrastAdaptiveSharpenCS: {fileID: 7200000, guid: 560896aec2f412c48995be35551a4ac6, type: 3} + robustContrastAdaptiveSharpenCS: {fileID: 7200000, guid: d907373e407ff65479c449a66c04443d, type: 3} + edgeAdaptiveSpatialUpsamplingCS: {fileID: 7200000, guid: f054fa9fe2c85bb42b9489e2f9ffb643, type: 3} + VTFeedbackDownsample: {fileID: 7200000, guid: 32d963548086c2c439aeb23a93e9a00a, type: 3} accumulationCS: {fileID: 7200000, guid: ed80add7a217efa468d137d6f7c668f3, type: 3} alphaInjectionPS: {fileID: 4800000, guid: 4edd96259a5e8b44c90479928f0cd11e, type: 3} chromaKeyingPS: {fileID: 4800000, guid: 49feb6b111e82ec4eb6d3d08e4b6903e, type: 3} customClearPS: {fileID: 4800000, guid: 9cef3686fa32c8840947ed99b561195c, type: 3} - ssGIDenoiserCS: {fileID: 7200000, guid: a435d803bc32d0845ba1a713b7a1c8b1, type: 3} - bilateralUpsampleCS: {fileID: 7200000, guid: 68e831c555284d741b985e05369f0e63, - type: 3} + bilateralUpsampleCS: {fileID: 7200000, guid: 68e831c555284d741b985e05369f0e63, type: 3} temporalFilterCS: {fileID: 7200000, guid: 741979ff70f7bd6489fbcb464280ecff, type: 3} diffuseDenoiserCS: {fileID: 7200000, guid: b4ed2382141619f40af1f743a84ccaea, type: 3} textures: @@ -258,10 +241,8 @@ MonoBehaviour: rankingTile8SPP: {fileID: 2800000, guid: af4bd638a4b3eb14781e6441adcdfbb9, type: 3} scramblingTile8SPP: {fileID: 2800000, guid: 152f8b933250a7b448fc2d4d301b9944, type: 3} rankingTile256SPP: {fileID: 2800000, guid: 1e604a266c415cd46b36d97cd9220aa8, type: 3} - scramblingTile256SPP: {fileID: 2800000, guid: 882fb55d7b3e7c94598a318df9376e32, - type: 3} - preintegratedAzimuthalScattering: {fileID: 2800000, guid: 4f022cc0bdd8db4428a8faae60acb3dc, - type: 3} + scramblingTile256SPP: {fileID: 2800000, guid: 882fb55d7b3e7c94598a318df9376e32, type: 3} + preintegratedAzimuthalScattering: {fileID: 2800000, guid: 4f022cc0bdd8db4428a8faae60acb3dc, type: 3} cloudLutRainAO: {fileID: 2800000, guid: e0bcfddf26ed5584ba3d8b94d3200114, type: 3} worleyNoise128RGBA: {fileID: 11700000, guid: 1fe54a721d0e2504e89f121c723404a8, type: 3} worleyNoise32RGB: {fileID: 11700000, guid: ec156c314a242914dbb706f73ad78cf2, type: 3} @@ -282,11 +263,11 @@ MonoBehaviour: defaultHDRISky: {fileID: 8900000, guid: 8253d41e6e8b11a4cbe77a4f8f82934d, type: 3} defaultCloudMap: {fileID: 2800000, guid: 57a33fc2476a01644865bfde5f06e2f4, type: 3} shaderGraphs: - objectIDPS: {fileID: -6465566751694194690, guid: 89daf81f8e8f6634da726cbca859ca38, - type: 3} + objectIDPS: {fileID: -6465566751694194690, guid: 89daf81f8e8f6634da726cbca859ca38, type: 3} assets: defaultDiffusionProfile: {fileID: 11400000, guid: 2b7005ba3a4d8474b8cdc34141ad766e, type: 2} emissiveCylinderMesh: {fileID: 2534964839176971238, guid: accb6d90f0d50fe4ca0f68159b4323de, type: 3} emissiveQuadMesh: {fileID: 4300000, guid: 1d5a8595286f94f4bb54171d49f473c3, type: 3} sphereMesh: {fileID: 4300000, guid: 9e0af751bc36ea146940ba245193e28c, type: 3} + probeDebugSphere: {fileID: 532591105809680800, guid: b979359990531a2489ebd7a0ef0f9f01, type: 3} m_Version: 4 diff --git a/com.unity.render-pipelines.high-definition/Runtime/RenderPipelineResources/Mesh/ProbeDebugSphere.fbx b/com.unity.render-pipelines.high-definition/Runtime/RenderPipelineResources/Mesh/ProbeDebugSphere.fbx new file mode 100644 index 00000000000..a225668ca63 --- /dev/null +++ b/com.unity.render-pipelines.high-definition/Runtime/RenderPipelineResources/Mesh/ProbeDebugSphere.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:696831e63b190731502326c428323eb77bab6dd8fb9285030f6ec6467d49aab4 +size 24092 diff --git a/com.unity.render-pipelines.high-definition/Runtime/RenderPipelineResources/Mesh/ProbeDebugSphere.fbx.meta b/com.unity.render-pipelines.high-definition/Runtime/RenderPipelineResources/Mesh/ProbeDebugSphere.fbx.meta new file mode 100644 index 00000000000..258ea8fb66a --- /dev/null +++ b/com.unity.render-pipelines.high-definition/Runtime/RenderPipelineResources/Mesh/ProbeDebugSphere.fbx.meta @@ -0,0 +1,105 @@ +fileFormatVersion: 2 +guid: b979359990531a2489ebd7a0ef0f9f01 +ModelImporter: + serializedVersion: 21202 + internalIDToNameTable: [] + externalObjects: {} + materials: + materialImportMode: 2 + materialName: 0 + materialSearch: 1 + materialLocation: 1 + animations: + legacyGenerateAnimations: 4 + bakeSimulation: 0 + resampleCurves: 1 + optimizeGameObjects: 0 + removeConstantScaleCurves: 0 + motionNodeName: + rigImportErrors: + rigImportWarnings: + animationImportErrors: + animationImportWarnings: + animationRetargetingWarnings: + animationDoRetargetingWarnings: 0 + importAnimatedCustomProperties: 0 + importConstraints: 0 + animationCompression: 1 + animationRotationError: 0.5 + animationPositionError: 0.5 + animationScaleError: 0.5 + animationWrapMode: 0 + extraExposedTransformPaths: [] + extraUserProperties: [] + clipAnimations: [] + isReadable: 0 + meshes: + lODScreenPercentages: [] + globalScale: 1 + meshCompression: 0 + addColliders: 0 + useSRGBMaterialColor: 1 + sortHierarchyByName: 1 + importVisibility: 1 + importBlendShapes: 1 + importCameras: 1 + importLights: 1 + nodeNameCollisionStrategy: 1 + fileIdsGeneration: 2 + swapUVChannels: 0 + generateSecondaryUV: 0 + useFileUnits: 1 + keepQuads: 0 + weldVertices: 1 + bakeAxisConversion: 0 + preserveHierarchy: 0 + skinWeightsMode: 0 + maxBonesPerVertex: 4 + minBoneWeight: 0.001 + optimizeBones: 0 + meshOptimizationFlags: -1 + indexFormat: 0 + secondaryUVAngleDistortion: 8 + secondaryUVAreaDistortion: 15.000001 + secondaryUVHardAngle: 88 + secondaryUVMarginMethod: 1 + secondaryUVMinLightmapResolution: 40 + secondaryUVMinObjectScale: 1 + secondaryUVPackMargin: 4 + useFileScale: 1 + tangentSpace: + normalSmoothAngle: 60 + normalImportMode: 0 + tangentImportMode: 3 + normalCalculationMode: 4 + legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0 + blendShapeNormalImportMode: 1 + normalSmoothingSource: 0 + referencedClips: [] + importAnimation: 1 + humanDescription: + serializedVersion: 3 + human: [] + skeleton: [] + armTwist: 0.5 + foreArmTwist: 0.5 + upperLegTwist: 0.5 + legTwist: 0.5 + armStretch: 0.05 + legStretch: 0.05 + feetSpacing: 0 + globalScale: 1 + rootMotionBoneName: + hasTranslationDoF: 0 + hasExtraRoot: 0 + skeletonHasParents: 1 + lastHumanDescriptionAvatarSource: {instanceID: 0} + autoGenerateAvatarMappingIfUnspecified: 1 + animationType: 2 + humanoidOversampling: 1 + avatarSetup: 0 + addHumanoidExtraRootOnlyWhenUsingAvatar: 1 + additionalBone: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/com.unity.render-pipelines.high-definition/Runtime/RenderPipelineResources/ShaderGraph/CottonWool.shadergraph b/com.unity.render-pipelines.high-definition/Runtime/RenderPipelineResources/ShaderGraph/CottonWool.shadergraph index eaef33b6743..a1aee2a67ce 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/RenderPipelineResources/ShaderGraph/CottonWool.shadergraph +++ b/com.unity.render-pipelines.high-definition/Runtime/RenderPipelineResources/ShaderGraph/CottonWool.shadergraph @@ -1,5 +1,5 @@ { - "m_SGVersion": 2, + "m_SGVersion": 3, "m_Type": "UnityEditor.ShaderGraph.GraphData", "m_ObjectId": "ce817203cf2f49deb0e8a0e7906e540a", "m_Properties": [ @@ -65,6 +65,12 @@ } ], "m_Keywords": [], + "m_Dropdowns": [], + "m_CategoryData": [ + { + "m_Id": "194f433c869e4a7c8d18b944bcd377eb" + } + ], "m_Nodes": [ { "m_Id": "a30d806aeb7442ef90a1c55ac396158d" @@ -969,10 +975,12 @@ "serializedMesh": { "m_SerializedMesh": "{\"mesh\":{\"instanceID\":0}}", "m_Guid": "" - } + }, + "preventRotation": false }, "m_Path": "HDRP/Fabric", - "m_ConcretePrecision": 0, + "m_GraphPrecision": 0, + "m_PreviewMode": 2, "m_OutputNode": { "m_Id": "" }, @@ -1002,8 +1010,16 @@ "m_SupportLodCrossFade": false, "m_DoubleSidedMode": 0, "m_DOTSInstancing": false, + "m_CustomVelocity": false, + "m_Tessellation": false, + "m_TessellationMode": 0, + "m_TessellationFactorMinDistance": 20.0, + "m_TessellationFactorMaxDistance": 50.0, + "m_TessellationFactorTriangleSize": 100.0, + "m_TessellationShapeFactor": 0.75, + "m_TessellationBackFaceCullEpsilon": -0.25, + "m_TessellationMaxDisplacement": 0.009999999776482582, "m_Version": 0, - "m_FirstTimeMigrationExecuted": false, "inspectorFoldoutMask": 0 } @@ -1014,10 +1030,10 @@ "m_Id": 0, "m_DisplayName": "Fuzz Map", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", - "m_StageCapability": 3 + "m_StageCapability": 3, + "m_BareResource": false } { @@ -1027,10 +1043,10 @@ "m_Id": 1, "m_DisplayName": "Texture", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Texture", "m_StageCapability": 3, + "m_BareResource": false, "m_Texture": { "m_SerializedTexture": "{\"texture\":{\"instanceID\":0}}", "m_Guid": "" @@ -1045,7 +1061,6 @@ "m_Id": 0, "m_DisplayName": "Normal", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Normal", "m_StageCapability": 1, @@ -1089,6 +1104,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": false, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] }, @@ -1104,7 +1120,6 @@ "m_Id": 0, "m_DisplayName": "Base UV Mask", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3, @@ -1130,7 +1145,6 @@ "m_Id": 0, "m_DisplayName": "A", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "A", "m_StageCapability": 3, @@ -1149,18 +1163,23 @@ } { - "m_SGVersion": 0, + "m_SGVersion": 1, "m_Type": "UnityEditor.ShaderGraph.Internal.Vector1ShaderProperty", "m_ObjectId": "122033f1a8ce4b64818792c11eb12a18", "m_Guid": { "m_GuidSerialized": "20e6cb1b-65c8-48b6-a376-0c8f32173b2b" }, "m_Name": "Smoothness Max", + "m_DefaultRefNameVersion": 0, + "m_RefNameGeneratedByDisplayName": "", "m_DefaultReferenceName": "Vector1_9114DBE7", "m_OverrideReferenceName": "_SmoothnessMax", "m_GeneratePropertyBlock": true, + "m_UseCustomSlotLabel": false, + "m_CustomSlotLabel": "", "m_Precision": 0, - "m_GPUInstanced": false, + "overrideHLSLDeclaration": false, + "hlslDeclarationOverride": 0, "m_Hidden": false, "m_Value": 1.0, "m_FloatType": 1, @@ -1177,7 +1196,6 @@ "m_Id": 0, "m_DisplayName": "A", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "A", "m_StageCapability": 3, @@ -1226,7 +1244,6 @@ "m_Id": 0, "m_DisplayName": "Thread UV Scale Transform", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3, @@ -1277,24 +1294,30 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": false, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] } } { - "m_SGVersion": 0, + "m_SGVersion": 1, "m_Type": "UnityEditor.ShaderGraph.Internal.Vector1ShaderProperty", "m_ObjectId": "161cc5794e934d5394d6ceda9f487e6a", "m_Guid": { "m_GuidSerialized": "f8a95274-456d-419f-82b1-e52bb3f612aa" }, "m_Name": "Fuzz Strength", + "m_DefaultRefNameVersion": 0, + "m_RefNameGeneratedByDisplayName": "", "m_DefaultReferenceName": "Vector1_D620EF89", "m_OverrideReferenceName": "_FuzzStrength", "m_GeneratePropertyBlock": true, + "m_UseCustomSlotLabel": false, + "m_CustomSlotLabel": "", "m_Precision": 0, - "m_GPUInstanced": false, + "overrideHLSLDeclaration": false, + "hlslDeclarationOverride": 0, "m_Hidden": false, "m_Value": 1.0, "m_FloatType": 1, @@ -1311,7 +1334,6 @@ "m_Id": 1, "m_DisplayName": "B", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "B", "m_StageCapability": 3, @@ -1353,6 +1375,75 @@ } } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.CategoryData", + "m_ObjectId": "194f433c869e4a7c8d18b944bcd377eb", + "m_Name": "", + "m_ChildObjectList": [ + { + "m_Id": "53defc4e1cc84dd4aa5821c89a00ebba" + }, + { + "m_Id": "8f36eebfd6044e9ca9b6c3af4cb85d4b" + }, + { + "m_Id": "b913c909284e42c69b25c22a5afeeea7" + }, + { + "m_Id": "de6481523c854147bf8875348269ab9d" + }, + { + "m_Id": "3bc7938d8f7e4a6e96b164434158c6fe" + }, + { + "m_Id": "8b8ec79dc2c84c399cc68e2e9a166d2f" + }, + { + "m_Id": "122033f1a8ce4b64818792c11eb12a18" + }, + { + "m_Id": "eda4287078aa4eeab18123c92af18c38" + }, + { + "m_Id": "ebb8a00747ee4526883203ce0f67e4d2" + }, + { + "m_Id": "f53c87cf9be543ac94bef807bb27d7d9" + }, + { + "m_Id": "e186668b62194e1bb56ca6583f3c6d05" + }, + { + "m_Id": "453f5d72d7964869b1ef2bb166a27f9c" + }, + { + "m_Id": "e8e87a55b75b483bab7dddfb91cb579e" + }, + { + "m_Id": "4eb87c51b5ee4a9bb59be3c5d8a64a63" + }, + { + "m_Id": "1ae40d83102e49a38f87de214fe67251" + }, + { + "m_Id": "d53004b3d1de427892c6b4305ecc5f4e" + }, + { + "m_Id": "438898c6355f45649907d3528df133ab" + }, + { + "m_Id": "c2b02b000d9f49c5a76f119fa54eb852" + }, + { + "m_Id": "25d90b77900a4dcb8587f0c051f3774c" + }, + { + "m_Id": "161cc5794e934d5394d6ceda9f487e6a" + } + ] +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.GroupData", @@ -1365,18 +1456,23 @@ } { - "m_SGVersion": 0, + "m_SGVersion": 1, "m_Type": "UnityEditor.ShaderGraph.Internal.Vector1ShaderProperty", "m_ObjectId": "1ae40d83102e49a38f87de214fe67251", "m_Guid": { "m_GuidSerialized": "82f9de41-76a1-430f-b16c-4a1f51d25ca3" }, "m_Name": "Thread AO Strength", + "m_DefaultRefNameVersion": 0, + "m_RefNameGeneratedByDisplayName": "", "m_DefaultReferenceName": "Vector1_9106E3BE", "m_OverrideReferenceName": "_ThreadAOStrength01", "m_GeneratePropertyBlock": true, + "m_UseCustomSlotLabel": false, + "m_CustomSlotLabel": "", "m_Precision": 0, - "m_GPUInstanced": false, + "overrideHLSLDeclaration": false, + "hlslDeclarationOverride": 0, "m_Hidden": false, "m_Value": 0.5, "m_FloatType": 1, @@ -1393,7 +1489,6 @@ "m_Id": 5, "m_DisplayName": "G", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "G", "m_StageCapability": 2, @@ -1430,6 +1525,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] }, @@ -1443,7 +1539,6 @@ "m_Id": 0, "m_DisplayName": "RGBA", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "RGBA", "m_StageCapability": 2, @@ -1469,7 +1564,6 @@ "m_Id": 3, "m_DisplayName": "Ambient Occlusion", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "AmbientOcclusion", "m_StageCapability": 2, @@ -1485,10 +1579,10 @@ "m_Id": 1, "m_DisplayName": "Texture", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Texture", "m_StageCapability": 3, + "m_BareResource": false, "m_Texture": { "m_SerializedTexture": "{\"texture\":{\"instanceID\":0}}", "m_Guid": "" @@ -1503,7 +1597,6 @@ "m_Id": 5, "m_DisplayName": "G", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "G", "m_StageCapability": 2, @@ -1532,7 +1625,6 @@ "m_Id": 2, "m_DisplayName": "Out", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3, @@ -1581,7 +1673,6 @@ "m_Id": 4, "m_DisplayName": "A", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "A", "m_StageCapability": 3, @@ -1599,7 +1690,6 @@ "m_Id": 7, "m_DisplayName": "A", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "A", "m_StageCapability": 2, @@ -1611,18 +1701,23 @@ } { - "m_SGVersion": 0, + "m_SGVersion": 1, "m_Type": "UnityEditor.ShaderGraph.Internal.Vector1ShaderProperty", "m_ObjectId": "25d90b77900a4dcb8587f0c051f3774c", "m_Guid": { "m_GuidSerialized": "a80c79f0-8441-45c7-b463-153e6543acc0" }, "m_Name": "Fuzz Map UV scale", + "m_DefaultRefNameVersion": 0, + "m_RefNameGeneratedByDisplayName": "", "m_DefaultReferenceName": "Vector1_D2266F29", "m_OverrideReferenceName": "_FuzzMapUVScale", "m_GeneratePropertyBlock": true, + "m_UseCustomSlotLabel": false, + "m_CustomSlotLabel": "", "m_Precision": 0, - "m_GPUInstanced": false, + "overrideHLSLDeclaration": false, + "hlslDeclarationOverride": 0, "m_Hidden": false, "m_Value": 0.10000000149011612, "m_FloatType": 0, @@ -1650,7 +1745,6 @@ "m_Id": 2, "m_DisplayName": "UV", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "UV", "m_StageCapability": 3, @@ -1695,6 +1789,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] }, @@ -1708,7 +1803,6 @@ "m_Id": 211825253, "m_DisplayName": "Alpha", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "_Alpha", "m_StageCapability": 2, @@ -1724,10 +1818,10 @@ "m_Id": 1, "m_DisplayName": "Texture", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Texture", "m_StageCapability": 3, + "m_BareResource": false, "m_Texture": { "m_SerializedTexture": "{\"texture\":{\"instanceID\":0}}", "m_Guid": "" @@ -1742,7 +1836,6 @@ "m_Id": 1, "m_DisplayName": "R", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "R", "m_StageCapability": 3, @@ -1779,6 +1872,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] }, @@ -1794,7 +1888,7 @@ "m_Group": { "m_Id": "2111a9a336ce494eb26c0b79a8a353ea" }, - "m_Name": "UV Combine", + "m_Name": "UVCombine", "m_DrawState": { "m_Expanded": true, "m_Position": { @@ -1807,18 +1901,19 @@ }, "m_Slots": [ { - "m_Id": "4fab0ae0addb48418f9e66f5c2150efe" + "m_Id": "9a2dd6017bd54b7a9b89281506dd3407" }, { - "m_Id": "8d91ae62c6ab48c8adccf050f7f200ca" + "m_Id": "4fab0ae0addb48418f9e66f5c2150efe" }, { - "m_Id": "9a2dd6017bd54b7a9b89281506dd3407" + "m_Id": "8d91ae62c6ab48c8adccf050f7f200ca" } ], "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": false, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] }, @@ -1830,7 +1925,9 @@ "m_PropertyIds": [ -1533382448, -1319696916 - ] + ], + "m_Dropdowns": [], + "m_DropdownSelectedEntries": [] } { @@ -1840,7 +1937,6 @@ "m_Id": 0, "m_DisplayName": "Specular Color", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3, @@ -1877,7 +1973,6 @@ "m_Id": 1, "m_DisplayName": "B", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "B", "m_StageCapability": 3, @@ -1926,7 +2021,6 @@ "m_Id": 7, "m_DisplayName": "A", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "A", "m_StageCapability": 2, @@ -1944,7 +2038,6 @@ "m_Id": 0, "m_DisplayName": "A", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "A", "m_StageCapability": 3, @@ -1988,6 +2081,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] }, @@ -2028,6 +2122,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] } @@ -2080,11 +2175,13 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": false, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] }, "m_TextureType": 0, - "m_NormalMapSpace": 0 + "m_NormalMapSpace": 0, + "m_EnableGlobalMipBias": true } { @@ -2095,16 +2192,23 @@ "m_GuidSerialized": "15bb43f0-03a1-4450-a37c-6842998d4b12" }, "m_Name": "Mask Map _(R) AO(G) _(B) S(A)", + "m_DefaultRefNameVersion": 0, + "m_RefNameGeneratedByDisplayName": "", "m_DefaultReferenceName": "Texture2D_FCEF774B", "m_OverrideReferenceName": "_MaskMap", "m_GeneratePropertyBlock": true, + "m_UseCustomSlotLabel": false, + "m_CustomSlotLabel": "", "m_Precision": 0, - "m_GPUInstanced": false, + "overrideHLSLDeclaration": false, + "hlslDeclarationOverride": 0, "m_Hidden": false, "m_Value": { "m_SerializedTexture": "{\"texture\":{\"instanceID\":0}}", "m_Guid": "" }, + "isMainTexture": false, + "useTilingAndOffset": false, "m_Modifiable": true, "m_DefaultType": 0 } @@ -2116,7 +2220,6 @@ "m_Id": 0, "m_DisplayName": "Use Thread Map", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3, @@ -2131,7 +2234,6 @@ "m_Id": 0, "m_DisplayName": "Fuzz Strength", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3, @@ -2149,7 +2251,7 @@ "m_Group": { "m_Id": "5f4bba1e4db24265aa727f4f17c17d83" }, - "m_Name": "Thread Map Detail", + "m_Name": "ThreadMapDetail", "m_DrawState": { "m_Expanded": true, "m_Position": { @@ -2161,6 +2263,9 @@ } }, "m_Slots": [ + { + "m_Id": "fd23384d62374c0fb426ece108990f2e" + }, { "m_Id": "ada81cdd8704436ab054a79eefe49386" }, @@ -2199,14 +2304,12 @@ }, { "m_Id": "fd2eb988d0974ab3828267bb0c3ce1c8" - }, - { - "m_Id": "fd23384d62374c0fb426ece108990f2e" } ], "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": false, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] }, @@ -2234,7 +2337,9 @@ 1831767174, -2037099335, 42933449 - ] + ], + "m_Dropdowns": [], + "m_DropdownSelectedEntries": [] } { @@ -2263,6 +2368,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] }, @@ -2272,18 +2378,23 @@ } { - "m_SGVersion": 0, + "m_SGVersion": 1, "m_Type": "UnityEditor.ShaderGraph.Internal.Vector1ShaderProperty", "m_ObjectId": "438898c6355f45649907d3528df133ab", "m_Guid": { "m_GuidSerialized": "d0b0dba5-2222-4e57-a4bb-63be15c90197" }, "m_Name": "Thread Smoothness Scale", + "m_DefaultRefNameVersion": 0, + "m_RefNameGeneratedByDisplayName": "", "m_DefaultReferenceName": "", "m_OverrideReferenceName": "_ThreadSmoothnessScale", "m_GeneratePropertyBlock": true, + "m_UseCustomSlotLabel": false, + "m_CustomSlotLabel": "", "m_Precision": 0, - "m_GPUInstanced": false, + "overrideHLSLDeclaration": false, + "hlslDeclarationOverride": 0, "m_Hidden": false, "m_Value": 0.5, "m_FloatType": 1, @@ -2301,16 +2412,23 @@ "m_GuidSerialized": "7ed7227f-2a2c-4d93-9ca4-8f6beb19b4a1" }, "m_Name": "Thread Map", + "m_DefaultRefNameVersion": 0, + "m_RefNameGeneratedByDisplayName": "", "m_DefaultReferenceName": "", "m_OverrideReferenceName": "_ThreadMap", "m_GeneratePropertyBlock": true, + "m_UseCustomSlotLabel": false, + "m_CustomSlotLabel": "", "m_Precision": 0, - "m_GPUInstanced": false, + "overrideHLSLDeclaration": false, + "hlslDeclarationOverride": 0, "m_Hidden": false, "m_Value": { "m_SerializedTexture": "{\"texture\":{\"fileID\":2800000,\"guid\":\"cd19c89d4b2f99f439cb28098be331dc\",\"type\":3}}", "m_Guid": "" }, + "isMainTexture": false, + "useTilingAndOffset": false, "m_Modifiable": true, "m_DefaultType": 2 } @@ -2333,7 +2451,6 @@ "m_Id": 0, "m_DisplayName": "In", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "In", "m_StageCapability": 3, @@ -2358,7 +2475,6 @@ "m_Id": 1, "m_DisplayName": "Out", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3, @@ -2383,7 +2499,6 @@ "m_Id": 1, "m_DisplayName": "B", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "B", "m_StageCapability": 3, @@ -2427,6 +2542,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] }, @@ -2461,6 +2577,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": false, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] }, @@ -2495,6 +2612,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] }, @@ -2502,18 +2620,23 @@ } { - "m_SGVersion": 0, + "m_SGVersion": 1, "m_Type": "UnityEditor.ShaderGraph.Internal.Vector4ShaderProperty", "m_ObjectId": "4eb87c51b5ee4a9bb59be3c5d8a64a63", "m_Guid": { "m_GuidSerialized": "5a824074-5495-4232-8c15-1dc84b351162" }, "m_Name": "Thread UV Scale Transform", + "m_DefaultRefNameVersion": 0, + "m_RefNameGeneratedByDisplayName": "", "m_DefaultReferenceName": "", "m_OverrideReferenceName": "_uvThreadST", "m_GeneratePropertyBlock": true, + "m_UseCustomSlotLabel": false, + "m_CustomSlotLabel": "", "m_Precision": 0, - "m_GPUInstanced": false, + "overrideHLSLDeclaration": false, + "hlslDeclarationOverride": 0, "m_Hidden": false, "m_Value": { "x": 1.0, @@ -2530,7 +2653,6 @@ "m_Id": -1533382448, "m_DisplayName": "UV Channel Mask", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "_uvMask", "m_StageCapability": 3, @@ -2556,7 +2678,6 @@ "m_Id": -1319696916, "m_DisplayName": "UV Tile and Offset", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "_uvST", "m_StageCapability": 3, @@ -2622,11 +2743,13 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": false, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] }, "m_TextureType": 0, - "m_NormalMapSpace": 0 + "m_NormalMapSpace": 0, + "m_EnableGlobalMipBias": true } { @@ -2655,6 +2778,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] }, @@ -2687,6 +2811,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] }, @@ -2706,6 +2831,7 @@ "m_TransparentWritesMotionVec": false, "m_AlphaToMask": false, "m_DepthOffset": false, + "m_ConservativeDepthOffset": false, "m_TransparencyFog": true, "m_AlphaTestShadow": false, "m_BackThenFrontRendering": false, @@ -2761,11 +2887,13 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": false, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] }, "m_TextureType": 0, - "m_NormalMapSpace": 0 + "m_NormalMapSpace": 0, + "m_EnableGlobalMipBias": true } { @@ -2775,7 +2903,6 @@ "m_Id": 0, "m_DisplayName": "Thread Smoothness Scale", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3, @@ -2793,7 +2920,6 @@ "m_Id": 3, "m_DisplayName": "Out", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3, @@ -2812,18 +2938,23 @@ } { - "m_SGVersion": 0, + "m_SGVersion": 1, "m_Type": "UnityEditor.ShaderGraph.Internal.Vector4ShaderProperty", "m_ObjectId": "53defc4e1cc84dd4aa5821c89a00ebba", "m_Guid": { "m_GuidSerialized": "590a33bb-fb27-404c-a77e-8d1efad175ba" }, "m_Name": "Base UV Mask", + "m_DefaultRefNameVersion": 0, + "m_RefNameGeneratedByDisplayName": "", "m_DefaultReferenceName": "", "m_OverrideReferenceName": "_uvBaseMask", "m_GeneratePropertyBlock": true, + "m_UseCustomSlotLabel": false, + "m_CustomSlotLabel": "", "m_Precision": 0, - "m_GPUInstanced": false, + "overrideHLSLDeclaration": false, + "hlslDeclarationOverride": 0, "m_Hidden": false, "m_Value": { "x": 1.0, @@ -2871,6 +3002,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] } @@ -2883,7 +3015,6 @@ "m_Id": 0, "m_DisplayName": "Base Color", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3, @@ -2909,7 +3040,6 @@ "m_Id": -1319696916, "m_DisplayName": "UV Tile and Offset", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "_uvST", "m_StageCapability": 3, @@ -2935,7 +3065,6 @@ "m_Id": 3, "m_DisplayName": "B", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "B", "m_StageCapability": 3, @@ -2953,7 +3082,6 @@ "m_Id": -2037099335, "m_DisplayName": "Thread Normal Strength", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "_ThreadNormalStrength", "m_StageCapability": 2, @@ -2969,7 +3097,6 @@ "m_Id": 2, "m_DisplayName": "UV", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "UV", "m_StageCapability": 3, @@ -3020,6 +3147,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": false, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] } @@ -3032,7 +3160,6 @@ "m_Id": 1, "m_DisplayName": "Normal", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Normal", "m_StageCapability": 2, @@ -3056,7 +3183,6 @@ "m_Id": 0, "m_DisplayName": "Emission", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Emission", "m_StageCapability": 2, @@ -3087,7 +3213,6 @@ "m_Id": 1, "m_DisplayName": "Strength", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Strength", "m_StageCapability": 3, @@ -3116,7 +3241,6 @@ "m_Id": 42933449, "m_DisplayName": "Thread Smoothness Strength", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "_ThreadSmoothnessStrength", "m_StageCapability": 2, @@ -3136,6 +3260,7 @@ "m_TransparentWritesMotionVec": false, "m_AlphaToMask": false, "m_DepthOffset": false, + "m_ConservativeDepthOffset": false, "m_TransparencyFog": true, "m_AlphaTestShadow": false, "m_BackThenFrontRendering": false, @@ -3151,10 +3276,10 @@ "m_Id": 0, "m_DisplayName": "Base Color Map", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", - "m_StageCapability": 3 + "m_StageCapability": 3, + "m_BareResource": false } { @@ -3164,7 +3289,6 @@ "m_Id": 4, "m_DisplayName": "R", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "R", "m_StageCapability": 2, @@ -3201,6 +3325,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] }, @@ -3216,7 +3341,6 @@ "m_Id": 1831767174, "m_DisplayName": "Thread AO Strength", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "_ThreadAOStrength", "m_StageCapability": 2, @@ -3232,7 +3356,6 @@ "m_Id": 0, "m_DisplayName": "Base UV Scale Transform", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3, @@ -3277,6 +3400,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": false, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] }, @@ -3292,7 +3416,6 @@ "m_Id": 0, "m_DisplayName": "Base Color", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "BaseColor", "m_StageCapability": 2, @@ -3342,6 +3465,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] }, @@ -3355,7 +3479,6 @@ "m_Id": 2, "m_DisplayName": "G", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "G", "m_StageCapability": 3, @@ -3373,7 +3496,6 @@ "m_Id": 0, "m_DisplayName": "In", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "In", "m_StageCapability": 3, @@ -3420,6 +3542,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": false, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] }, @@ -3435,7 +3558,6 @@ "m_Id": 0, "m_DisplayName": "Thread UV Mask", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3, @@ -3480,6 +3602,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] }, @@ -3495,7 +3618,6 @@ "m_Id": 4, "m_DisplayName": "R", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "R", "m_StageCapability": 2, @@ -3513,7 +3635,6 @@ "m_Id": 1, "m_DisplayName": "B", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "B", "m_StageCapability": 3, @@ -3576,7 +3697,6 @@ "m_Id": 1211659516, "m_DisplayName": "Normals", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "_Normals", "m_StageCapability": 2, @@ -3600,7 +3720,6 @@ "m_Id": 0, "m_DisplayName": "Out", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3, @@ -3625,7 +3744,6 @@ "m_Id": 0, "m_DisplayName": "Thickness", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Thickness", "m_StageCapability": 2, @@ -3655,7 +3773,6 @@ "m_Id": 0, "m_DisplayName": "RGBA", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "RGBA", "m_StageCapability": 2, @@ -3681,7 +3798,6 @@ "m_Id": 0, "m_DisplayName": "Bent Normal", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "BentNormal", "m_StageCapability": 2, @@ -3725,6 +3841,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] }, @@ -3740,7 +3857,6 @@ "m_Id": 234905224, "m_DisplayName": "Smoothness", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "_Smoothness", "m_StageCapability": 2, @@ -3775,6 +3891,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] }, @@ -3790,7 +3907,6 @@ "m_Id": 0, "m_DisplayName": "Tangent", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Tangent", "m_StageCapability": 1, @@ -3815,10 +3931,10 @@ "m_Id": 0, "m_DisplayName": "Normal Map", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", - "m_StageCapability": 3 + "m_StageCapability": 3, + "m_BareResource": false } { @@ -3851,7 +3967,8 @@ "m_Id": "00e99dd273634ec9b10f23bfa33b0193" } ], - "m_CustomEditorGUI": "" + "m_CustomEditorGUI": "", + "m_SupportVFX": false } { @@ -3861,7 +3978,6 @@ "m_Id": 4, "m_DisplayName": "R", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "R", "m_StageCapability": 2, @@ -3879,7 +3995,6 @@ "m_Id": 1, "m_DisplayName": "X", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "X", "m_StageCapability": 3, @@ -3897,7 +4012,6 @@ "m_Id": 3, "m_DisplayName": "Out", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3, @@ -3916,18 +4030,23 @@ } { - "m_SGVersion": 0, + "m_SGVersion": 1, "m_Type": "UnityEditor.ShaderGraph.Internal.Vector1ShaderProperty", "m_ObjectId": "8b8ec79dc2c84c399cc68e2e9a166d2f", "m_Guid": { "m_GuidSerialized": "6241710c-4975-4571-8fa6-46028d76ae6f" }, "m_Name": "Smoothness Min", + "m_DefaultRefNameVersion": 0, + "m_RefNameGeneratedByDisplayName": "", "m_DefaultReferenceName": "Vector1_137577A6", "m_OverrideReferenceName": "_SmoothnessMin", "m_GeneratePropertyBlock": true, + "m_UseCustomSlotLabel": false, + "m_CustomSlotLabel": "", "m_Precision": 0, - "m_GPUInstanced": false, + "overrideHLSLDeclaration": false, + "hlslDeclarationOverride": 0, "m_Hidden": false, "m_Value": 0.0, "m_FloatType": 1, @@ -3963,6 +4082,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] }, @@ -3976,7 +4096,6 @@ "m_Id": 1, "m_DisplayName": "UV", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "UV", "m_StageCapability": 3, @@ -4020,24 +4139,30 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": false, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] } } { - "m_SGVersion": 0, + "m_SGVersion": 1, "m_Type": "UnityEditor.ShaderGraph.Internal.Vector4ShaderProperty", "m_ObjectId": "8f36eebfd6044e9ca9b6c3af4cb85d4b", "m_Guid": { "m_GuidSerialized": "091eb6ce-7f90-4578-b7dc-656f785f6aa3" }, "m_Name": "Base UV Scale Transform", + "m_DefaultRefNameVersion": 0, + "m_RefNameGeneratedByDisplayName": "", "m_DefaultReferenceName": "", "m_OverrideReferenceName": "_uvBaseST", "m_GeneratePropertyBlock": true, + "m_UseCustomSlotLabel": false, + "m_CustomSlotLabel": "", "m_Precision": 0, - "m_GPUInstanced": false, + "overrideHLSLDeclaration": false, + "hlslDeclarationOverride": 0, "m_Hidden": false, "m_Value": { "x": 1.0, @@ -4054,7 +4179,6 @@ "m_Id": 0, "m_DisplayName": "RGBA", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "RGBA", "m_StageCapability": 2, @@ -4080,7 +4204,6 @@ "m_Id": 6, "m_DisplayName": "B", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "B", "m_StageCapability": 2, @@ -4098,7 +4221,6 @@ "m_Id": 0, "m_DisplayName": "A", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "A", "m_StageCapability": 3, @@ -4147,7 +4269,6 @@ "m_Id": 0, "m_DisplayName": "Normal Map Strength", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3, @@ -4165,7 +4286,6 @@ "m_Id": 2, "m_DisplayName": "UV", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "UV", "m_StageCapability": 3, @@ -4191,7 +4311,6 @@ "m_Id": 1, "m_DisplayName": "Out", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3, @@ -4216,7 +4335,6 @@ "m_Id": 0, "m_DisplayName": "Alpha", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Alpha", "m_StageCapability": 2, @@ -4232,7 +4350,6 @@ "m_Id": 2, "m_DisplayName": "Out", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3, @@ -4257,7 +4374,6 @@ "m_Id": -1533382448, "m_DisplayName": "UV Channel Mask", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "_uvMask", "m_StageCapability": 3, @@ -4283,7 +4399,6 @@ "m_Id": 2, "m_DisplayName": "UV", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "UV", "m_StageCapability": 3, @@ -4309,7 +4424,6 @@ "m_Id": 0, "m_DisplayName": "In", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "In", "m_StageCapability": 3, @@ -4353,6 +4467,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] }, @@ -4368,7 +4483,6 @@ "m_Id": 5, "m_DisplayName": "G", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "G", "m_StageCapability": 2, @@ -4386,7 +4500,6 @@ "m_Id": 2, "m_DisplayName": "T", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "T", "m_StageCapability": 3, @@ -4430,6 +4543,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": false, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] }, @@ -4470,6 +4584,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": false, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] } @@ -4482,7 +4597,6 @@ "m_Id": 0, "m_DisplayName": "Normal (Tangent Space)", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "NormalTS", "m_StageCapability": 2, @@ -4507,10 +4621,10 @@ "m_Id": 3, "m_DisplayName": "Sampler", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Sampler", - "m_StageCapability": 3 + "m_StageCapability": 3, + "m_BareResource": false } { @@ -4520,7 +4634,6 @@ "m_Id": 2, "m_DisplayName": "Out", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3, @@ -4598,6 +4711,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] }, @@ -4611,10 +4725,10 @@ "m_Id": -182820338, "m_DisplayName": "ThreadMap", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "_ThreadMap", "m_StageCapability": 2, + "m_BareResource": false, "m_Texture": { "m_SerializedTexture": "{\"texture\":{\"instanceID\":0}}", "m_Guid": "" @@ -4648,6 +4762,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] }, @@ -4661,7 +4776,6 @@ "m_Id": 0, "m_DisplayName": "Specular Color", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Specular", "m_StageCapability": 2, @@ -4711,6 +4825,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": false, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] }, @@ -4726,10 +4841,10 @@ "m_Id": 3, "m_DisplayName": "Sampler", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Sampler", - "m_StageCapability": 3 + "m_StageCapability": 3, + "m_BareResource": false } { @@ -4767,6 +4882,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": false, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] } @@ -4780,16 +4896,23 @@ "m_GuidSerialized": "59a67fb1-9bc9-44a2-bdf1-3020f0477029" }, "m_Name": "Base Color Map", + "m_DefaultRefNameVersion": 0, + "m_RefNameGeneratedByDisplayName": "", "m_DefaultReferenceName": "", "m_OverrideReferenceName": "_BaseColorMap", "m_GeneratePropertyBlock": true, + "m_UseCustomSlotLabel": false, + "m_CustomSlotLabel": "", "m_Precision": 0, - "m_GPUInstanced": false, + "overrideHLSLDeclaration": false, + "hlslDeclarationOverride": 0, "m_Hidden": false, "m_Value": { "m_SerializedTexture": "{\"texture\":{\"instanceID\":0}}", "m_Guid": "" }, + "isMainTexture": false, + "useTilingAndOffset": false, "m_Modifiable": true, "m_DefaultType": 0 } @@ -4801,7 +4924,6 @@ "m_Id": 1, "m_DisplayName": "B", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "B", "m_StageCapability": 3, @@ -4826,7 +4948,6 @@ "m_Id": 0, "m_DisplayName": "Thread AO Strength", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3, @@ -4844,7 +4965,6 @@ "m_Id": 1, "m_DisplayName": "In Min Max", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "InMinMax", "m_StageCapability": 3, @@ -4888,6 +5008,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": false, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] }, @@ -4903,7 +5024,6 @@ "m_Id": 2, "m_DisplayName": "Smoothness", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Smoothness", "m_StageCapability": 2, @@ -4920,16 +5040,23 @@ "m_GuidSerialized": "e40cc53d-76bf-4c64-b873-35605e3df332" }, "m_Name": "Fuzz Map", + "m_DefaultRefNameVersion": 0, + "m_RefNameGeneratedByDisplayName": "", "m_DefaultReferenceName": "Texture2D_CBF24C60", "m_OverrideReferenceName": "_FuzzMap", "m_GeneratePropertyBlock": true, + "m_UseCustomSlotLabel": false, + "m_CustomSlotLabel": "", "m_Precision": 0, - "m_GPUInstanced": false, + "overrideHLSLDeclaration": false, + "hlslDeclarationOverride": 0, "m_Hidden": false, "m_Value": { "m_SerializedTexture": "{\"texture\":{\"instanceID\":0}}", "m_Guid": "" }, + "isMainTexture": false, + "useTilingAndOffset": false, "m_Modifiable": true, "m_DefaultType": 1 } @@ -4941,7 +5068,6 @@ "m_Id": 0, "m_DisplayName": "Subsurface Mask", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "SubsurfaceMask", "m_StageCapability": 2, @@ -4957,10 +5083,10 @@ "m_Id": 0, "m_DisplayName": "Thread Map", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", - "m_StageCapability": 3 + "m_StageCapability": 3, + "m_BareResource": false } { @@ -4970,7 +5096,6 @@ "m_Id": 0, "m_DisplayName": "Diffusion Profile", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "DiffusionProfileHash", "m_StageCapability": 2, @@ -4992,7 +5117,7 @@ "m_Group": { "m_Id": "d7ca40dc9c4c4decb3aee4622cb88552" }, - "m_Name": "UV Combine", + "m_Name": "UVCombine", "m_DrawState": { "m_Expanded": true, "m_Position": { @@ -5005,18 +5130,19 @@ }, "m_Slots": [ { - "m_Id": "5915f6ae181a4399b797b9e24c3c1ad7" + "m_Id": "4f2560ddd60c46e7bb92072a9d655860" }, { - "m_Id": "e02e1c20f1234df8b72a0cc7137a40bc" + "m_Id": "5915f6ae181a4399b797b9e24c3c1ad7" }, { - "m_Id": "4f2560ddd60c46e7bb92072a9d655860" + "m_Id": "e02e1c20f1234df8b72a0cc7137a40bc" } ], "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": false, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] }, @@ -5028,7 +5154,9 @@ "m_PropertyIds": [ -1533382448, -1319696916 - ] + ], + "m_Dropdowns": [], + "m_DropdownSelectedEntries": [] } { @@ -5038,7 +5166,6 @@ "m_Id": 2, "m_DisplayName": "Out Min Max", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "OutMinMax", "m_StageCapability": 3, @@ -5063,7 +5190,6 @@ "m_Id": 7, "m_DisplayName": "A", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "A", "m_StageCapability": 2, @@ -5081,7 +5207,6 @@ "m_Id": -1709975888, "m_DisplayName": "UV", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "_UV", "m_StageCapability": 2, @@ -5103,7 +5228,6 @@ "m_Id": 0, "m_DisplayName": "Thread Normal Strength", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3, @@ -5140,6 +5264,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": false, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] }, @@ -5155,7 +5280,6 @@ "m_Id": 6, "m_DisplayName": "B", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "B", "m_StageCapability": 2, @@ -5173,7 +5297,6 @@ "m_Id": 1705060832, "m_DisplayName": "AmbientOcclusion", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "_AmbientOcclusion", "m_StageCapability": 2, @@ -5189,7 +5312,6 @@ "m_Id": 2, "m_DisplayName": "Out", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3, @@ -5257,6 +5379,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": false, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] }, @@ -5294,6 +5417,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": false, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] } @@ -5325,6 +5449,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] }, @@ -5338,10 +5463,10 @@ "m_Id": 3, "m_DisplayName": "Sampler", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Sampler", - "m_StageCapability": 3 + "m_StageCapability": 3, + "m_BareResource": false } { @@ -5351,7 +5476,6 @@ "m_Id": 6, "m_DisplayName": "B", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "B", "m_StageCapability": 2, @@ -5394,6 +5518,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] }, @@ -5429,6 +5554,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] }, @@ -5467,6 +5593,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": false, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] } @@ -5479,7 +5606,6 @@ "m_Id": 0, "m_DisplayName": "A", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "A", "m_StageCapability": 3, @@ -5522,18 +5648,23 @@ } { - "m_SGVersion": 0, + "m_SGVersion": 1, "m_Type": "UnityEditor.ShaderGraph.Internal.Vector1ShaderProperty", "m_ObjectId": "d53004b3d1de427892c6b4305ecc5f4e", "m_Guid": { "m_GuidSerialized": "9241d5b7-4111-4f70-984b-60e5019fae48" }, "m_Name": "Thread Normal Strength", + "m_DefaultRefNameVersion": 0, + "m_RefNameGeneratedByDisplayName": "", "m_DefaultReferenceName": "Vector1_F3D27F0A", "m_OverrideReferenceName": "_ThreadNormalStrength", "m_GeneratePropertyBlock": true, + "m_UseCustomSlotLabel": false, + "m_CustomSlotLabel": "", "m_Precision": 0, - "m_GPUInstanced": false, + "overrideHLSLDeclaration": false, + "hlslDeclarationOverride": 0, "m_Hidden": false, "m_Value": 0.5, "m_FloatType": 1, @@ -5550,7 +5681,6 @@ "m_Id": 0, "m_DisplayName": "In", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "In", "m_StageCapability": 3, @@ -5615,11 +5745,13 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": false, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] }, "m_TextureType": 1, - "m_NormalMapSpace": 0 + "m_NormalMapSpace": 0, + "m_EnableGlobalMipBias": true } { @@ -5640,7 +5772,6 @@ "m_Id": 0, "m_DisplayName": "RGBA", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "RGBA", "m_StageCapability": 2, @@ -5660,18 +5791,23 @@ } { - "m_SGVersion": 0, + "m_SGVersion": 2, "m_Type": "UnityEditor.ShaderGraph.Internal.ColorShaderProperty", "m_ObjectId": "de6481523c854147bf8875348269ab9d", "m_Guid": { "m_GuidSerialized": "7b882733-7502-4fe2-aafe-6dc24de49027" }, "m_Name": "Base Color", + "m_DefaultRefNameVersion": 0, + "m_RefNameGeneratedByDisplayName": "", "m_DefaultReferenceName": "", "m_OverrideReferenceName": "_BaseColor", "m_GeneratePropertyBlock": true, + "m_UseCustomSlotLabel": false, + "m_CustomSlotLabel": "", "m_Precision": 0, - "m_GPUInstanced": false, + "overrideHLSLDeclaration": false, + "hlslDeclarationOverride": 0, "m_Hidden": false, "m_Value": { "r": 0.729411780834198, @@ -5679,6 +5815,7 @@ "b": 0.729411780834198, "a": 0.0 }, + "isMainColor": false, "m_ColorMode": 0 } @@ -5708,6 +5845,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] }, @@ -5721,7 +5859,6 @@ "m_Id": 5, "m_DisplayName": "G", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "G", "m_StageCapability": 2, @@ -5739,7 +5876,6 @@ "m_Id": 0, "m_DisplayName": "In", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "In", "m_StageCapability": 3, @@ -5764,7 +5900,6 @@ "m_Id": 2, "m_DisplayName": "Out", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3, @@ -5792,7 +5927,6 @@ "m_Id": 1, "m_DisplayName": "UV", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "UV", "m_StageCapability": 3, @@ -5815,11 +5949,16 @@ "m_GuidSerialized": "dd9abbb7-9633-411e-91d0-5ba041ed0dda" }, "m_Name": "Use Thread Map", + "m_DefaultRefNameVersion": 0, + "m_RefNameGeneratedByDisplayName": "", "m_DefaultReferenceName": "", "m_OverrideReferenceName": "_useThreadMap", "m_GeneratePropertyBlock": true, + "m_UseCustomSlotLabel": false, + "m_CustomSlotLabel": "", "m_Precision": 0, - "m_GPUInstanced": false, + "overrideHLSLDeclaration": false, + "hlslDeclarationOverride": 0, "m_Hidden": false, "m_Value": true } @@ -5843,8 +5982,16 @@ "m_SupportLodCrossFade": false, "m_DoubleSidedMode": 3, "m_DOTSInstancing": false, - "m_Version": 0, - "m_FirstTimeMigrationExecuted": true, + "m_CustomVelocity": false, + "m_Tessellation": false, + "m_TessellationMode": 0, + "m_TessellationFactorMinDistance": 20.0, + "m_TessellationFactorMaxDistance": 50.0, + "m_TessellationFactorTriangleSize": 100.0, + "m_TessellationShapeFactor": 0.75, + "m_TessellationBackFaceCullEpsilon": -0.25, + "m_TessellationMaxDisplacement": 0.009999999776482582, + "m_Version": 1, "inspectorFoldoutMask": 0 } @@ -5855,7 +6002,6 @@ "m_Id": 6, "m_DisplayName": "B", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "B", "m_StageCapability": 2, @@ -5873,7 +6019,6 @@ "m_Id": 7, "m_DisplayName": "A", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "A", "m_StageCapability": 2, @@ -5885,18 +6030,23 @@ } { - "m_SGVersion": 0, + "m_SGVersion": 1, "m_Type": "UnityEditor.ShaderGraph.Internal.Vector4ShaderProperty", "m_ObjectId": "e8e87a55b75b483bab7dddfb91cb579e", "m_Guid": { "m_GuidSerialized": "fa389c8d-1de4-4353-9a23-8b805cacb9c3" }, "m_Name": "Thread UV Mask", + "m_DefaultRefNameVersion": 0, + "m_RefNameGeneratedByDisplayName": "", "m_DefaultReferenceName": "", "m_OverrideReferenceName": "_uvThreadMask", "m_GeneratePropertyBlock": true, + "m_UseCustomSlotLabel": false, + "m_CustomSlotLabel": "", "m_Precision": 0, - "m_GPUInstanced": false, + "overrideHLSLDeclaration": false, + "hlslDeclarationOverride": 0, "m_Hidden": false, "m_Value": { "x": 1.0, @@ -5920,16 +6070,23 @@ "m_GuidSerialized": "eb361664-caaf-41a1-ad6f-fc9ef43c1320" }, "m_Name": "Normal Map", + "m_DefaultRefNameVersion": 0, + "m_RefNameGeneratedByDisplayName": "", "m_DefaultReferenceName": "", "m_OverrideReferenceName": "_NormalMap", "m_GeneratePropertyBlock": true, + "m_UseCustomSlotLabel": false, + "m_CustomSlotLabel": "", "m_Precision": 0, - "m_GPUInstanced": false, + "overrideHLSLDeclaration": false, + "hlslDeclarationOverride": 0, "m_Hidden": false, "m_Value": { "m_SerializedTexture": "{\"texture\":{\"instanceID\":0}}", "m_Guid": "" }, + "isMainTexture": false, + "useTilingAndOffset": false, "m_Modifiable": true, "m_DefaultType": 3 } @@ -5941,7 +6098,6 @@ "m_Id": 0, "m_DisplayName": "Fuzz Map UV scale", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3, @@ -5959,7 +6115,6 @@ "m_Id": 0, "m_DisplayName": "Ambient Occlusion", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Occlusion", "m_StageCapability": 2, @@ -6003,6 +6158,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": false, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] } @@ -6034,6 +6190,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] }, @@ -6041,18 +6198,23 @@ } { - "m_SGVersion": 0, + "m_SGVersion": 2, "m_Type": "UnityEditor.ShaderGraph.Internal.ColorShaderProperty", "m_ObjectId": "eda4287078aa4eeab18123c92af18c38", "m_Guid": { "m_GuidSerialized": "28adbd46-38a3-41f0-bcce-a40e1be0681d" }, "m_Name": "Specular Color", + "m_DefaultRefNameVersion": 0, + "m_RefNameGeneratedByDisplayName": "", "m_DefaultReferenceName": "Color_265C63FA", "m_OverrideReferenceName": "_SpecularColor", "m_GeneratePropertyBlock": true, + "m_UseCustomSlotLabel": false, + "m_CustomSlotLabel": "", "m_Precision": 0, - "m_GPUInstanced": false, + "overrideHLSLDeclaration": false, + "hlslDeclarationOverride": 0, "m_Hidden": false, "m_Value": { "r": 0.20000000298023225, @@ -6060,6 +6222,7 @@ "b": 0.20000000298023225, "a": 0.0 }, + "isMainColor": false, "m_ColorMode": 0 } @@ -6070,10 +6233,10 @@ "m_Id": 0, "m_DisplayName": "Mask Map _(R) AO(G) _(B) S(A)", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", - "m_StageCapability": 3 + "m_StageCapability": 3, + "m_BareResource": false } { @@ -6083,7 +6246,6 @@ "m_Id": 2, "m_DisplayName": "Y", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Y", "m_StageCapability": 3, @@ -6120,6 +6282,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] }, @@ -6133,7 +6296,6 @@ "m_Id": 0, "m_DisplayName": "Position", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Position", "m_StageCapability": 1, @@ -6152,18 +6314,23 @@ } { - "m_SGVersion": 0, + "m_SGVersion": 1, "m_Type": "UnityEditor.ShaderGraph.Internal.Vector1ShaderProperty", "m_ObjectId": "f53c87cf9be543ac94bef807bb27d7d9", "m_Guid": { "m_GuidSerialized": "a4bfd223-86d7-44f5-bf1f-20b3b0471610" }, "m_Name": "Normal Map Strength", + "m_DefaultRefNameVersion": 0, + "m_RefNameGeneratedByDisplayName": "", "m_DefaultReferenceName": "Vector1_B81BC5DC", "m_OverrideReferenceName": "_NormalMapStrength", "m_GeneratePropertyBlock": true, + "m_UseCustomSlotLabel": false, + "m_CustomSlotLabel": "", "m_Precision": 0, - "m_GPUInstanced": false, + "overrideHLSLDeclaration": false, + "hlslDeclarationOverride": 0, "m_Hidden": false, "m_Value": 1.0, "m_FloatType": 1, @@ -6180,10 +6347,10 @@ "m_Id": 3, "m_DisplayName": "Sampler", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Sampler", - "m_StageCapability": 3 + "m_StageCapability": 3, + "m_BareResource": false } { @@ -6193,7 +6360,6 @@ "m_Id": 0, "m_DisplayName": "Smoothness", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Smoothness", "m_StageCapability": 2, @@ -6209,7 +6375,6 @@ "m_Id": 4, "m_DisplayName": "R", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "R", "m_StageCapability": 2, @@ -6227,10 +6392,10 @@ "m_Id": 1, "m_DisplayName": "Texture", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Texture", "m_StageCapability": 3, + "m_BareResource": false, "m_Texture": { "m_SerializedTexture": "{\"texture\":{\"instanceID\":0}}", "m_Guid": "" @@ -6245,7 +6410,6 @@ "m_Id": 235535200, "m_DisplayName": "Use Thread Map", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "_UseThreadMap", "m_StageCapability": 2, @@ -6260,7 +6424,6 @@ "m_Id": 4, "m_DisplayName": "Alpha", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Alpha", "m_StageCapability": 2, @@ -6276,7 +6439,6 @@ "m_Id": 0, "m_DisplayName": "Smoothness Min", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3, @@ -6313,6 +6475,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] }, @@ -6345,6 +6508,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": false, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] }, @@ -6360,7 +6524,6 @@ "m_Id": 0, "m_DisplayName": "Smoothness Max", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3, diff --git a/com.unity.render-pipelines.high-definition/Runtime/RenderPipelineResources/ShaderGraph/Subgraph/ThreadMapDetail.shadersubgraph b/com.unity.render-pipelines.high-definition/Runtime/RenderPipelineResources/ShaderGraph/Subgraph/ThreadMapDetail.shadersubgraph index d93f23d67d7..c4f85bf0570 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/RenderPipelineResources/ShaderGraph/Subgraph/ThreadMapDetail.shadersubgraph +++ b/com.unity.render-pipelines.high-definition/Runtime/RenderPipelineResources/ShaderGraph/Subgraph/ThreadMapDetail.shadersubgraph @@ -1,5 +1,5 @@ { - "m_SGVersion": 2, + "m_SGVersion": 3, "m_Type": "UnityEditor.ShaderGraph.GraphData", "m_ObjectId": "65578d680ef541edb3cfa33ddccc4d96", "m_Properties": [ @@ -35,6 +35,12 @@ } ], "m_Keywords": [], + "m_Dropdowns": [], + "m_CategoryData": [ + { + "m_Id": "3b660f14f3b84803bdadc345e9225a0c" + } + ], "m_Nodes": [ { "m_Id": "487dae965da64ea38851394bac98ba3a" @@ -131,6 +137,12 @@ }, { "m_Id": "bfbb4fe1c5a2428ea2ccabb8297376e7" + }, + { + "m_Id": "c033d4389cf54046bf7a711bb51beb07" + }, + { + "m_Id": "de0d06640c6d43fcbe91127b77ce92e3" } ], "m_GroupDatas": [ @@ -172,9 +184,9 @@ }, "m_InputSlot": { "m_Node": { - "m_Id": "e57586dd10374a24bf68ee68d251a0af" + "m_Id": "de0d06640c6d43fcbe91127b77ce92e3" }, - "m_SlotId": 2 + "m_SlotId": 0 } }, { @@ -494,9 +506,9 @@ }, "m_InputSlot": { "m_Node": { - "m_Id": "25f8257d5a1645e991c837532a642f48" + "m_Id": "c033d4389cf54046bf7a711bb51beb07" }, - "m_SlotId": 2 + "m_SlotId": 0 } }, { @@ -583,6 +595,20 @@ "m_SlotId": 2 } }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "c033d4389cf54046bf7a711bb51beb07" + }, + "m_SlotId": 1 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "25f8257d5a1645e991c837532a642f48" + }, + "m_SlotId": 2 + } + }, { "m_OutputSlot": { "m_Node": { @@ -625,6 +651,20 @@ "m_SlotId": 0 } }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "de0d06640c6d43fcbe91127b77ce92e3" + }, + "m_SlotId": 1 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "e57586dd10374a24bf68ee68d251a0af" + }, + "m_SlotId": 2 + } + }, { "m_OutputSlot": { "m_Node": { @@ -672,10 +712,12 @@ "serializedMesh": { "m_SerializedMesh": "{\"mesh\":{\"instanceID\":0}}", "m_Guid": "" - } + }, + "preventRotation": false }, "m_Path": "Utility/High Definition Render Pipeline/Fabric", - "m_ConcretePrecision": 0, + "m_GraphPrecision": 0, + "m_PreviewMode": 2, "m_OutputNode": { "m_Id": "86bcf008f4934ed7a96b70a34f420629" }, @@ -689,7 +731,6 @@ "m_Id": 2, "m_DisplayName": "False", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "False", "m_StageCapability": 3, @@ -714,7 +755,6 @@ "m_Id": 0, "m_DisplayName": "In", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "In", "m_StageCapability": 3, @@ -761,6 +801,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": false, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] } @@ -773,7 +814,6 @@ "m_Id": 7, "m_DisplayName": "A", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "A", "m_StageCapability": 2, @@ -791,7 +831,6 @@ "m_Id": 1, "m_DisplayName": "Normal", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Normal", "m_StageCapability": 2, @@ -812,6 +851,30 @@ ] } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", + "m_ObjectId": "0d1a99acdbbd48e1a8500c722187ded9", + "m_Id": 0, + "m_DisplayName": "In", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "In", + "m_StageCapability": 3, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + } +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.PropertyNode", @@ -824,9 +887,9 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -458.0, - "y": 360.0, - "width": 215.0, + "x": -668.0, + "y": 364.0, + "width": 229.0, "height": 34.0 } }, @@ -838,6 +901,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] }, @@ -853,7 +917,6 @@ "m_Id": 0, "m_DisplayName": "A", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "A", "m_StageCapability": 3, @@ -878,7 +941,6 @@ "m_Id": 1, "m_DisplayName": "True", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "True", "m_StageCapability": 3, @@ -903,7 +965,6 @@ "m_Id": 0, "m_DisplayName": "In", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "In", "m_StageCapability": 3, @@ -928,7 +989,6 @@ "m_Id": 0, "m_DisplayName": "In", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "In", "m_StageCapability": 3, @@ -954,7 +1014,6 @@ "m_Id": 5, "m_DisplayName": "G", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "G", "m_StageCapability": 2, @@ -972,7 +1031,6 @@ "m_Id": 2, "m_DisplayName": "Out", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3, @@ -1043,6 +1101,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": false, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] }, @@ -1056,7 +1115,6 @@ "m_Id": 0, "m_DisplayName": "Smoothness", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3, @@ -1074,7 +1132,6 @@ "m_Id": 0, "m_DisplayName": "UV", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3, @@ -1100,16 +1157,23 @@ "m_GuidSerialized": "110f2c7b-3415-4e1f-b153-d0756fef216a" }, "m_Name": "ThreadMap", + "m_DefaultRefNameVersion": 0, + "m_RefNameGeneratedByDisplayName": "", "m_DefaultReferenceName": "Texture2D_4013167B", "m_OverrideReferenceName": "_ThreadMap", "m_GeneratePropertyBlock": true, + "m_UseCustomSlotLabel": false, + "m_CustomSlotLabel": "", "m_Precision": 0, - "m_GPUInstanced": false, + "overrideHLSLDeclaration": false, + "hlslDeclarationOverride": 0, "m_Hidden": false, "m_Value": { "m_SerializedTexture": "{\"texture\":{\"instanceID\":0}}", "m_Guid": "" }, + "isMainTexture": false, + "useTilingAndOffset": false, "m_Modifiable": true, "m_DefaultType": 2 } @@ -1126,9 +1190,9 @@ "m_Expanded": false, "m_Position": { "serializedVersion": "2", - "x": -151.0, - "y": 559.0, - "width": 121.0, + "x": -66.0, + "y": 561.0, + "width": 126.0, "height": 118.0 } }, @@ -1149,6 +1213,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": false, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] } @@ -1161,7 +1226,6 @@ "m_Id": 2, "m_DisplayName": "UV", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "UV", "m_StageCapability": 3, @@ -1187,7 +1251,6 @@ "m_Id": 1, "m_DisplayName": "Strength", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Strength", "m_StageCapability": 3, @@ -1224,6 +1287,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] }, @@ -1239,7 +1303,6 @@ "m_Id": 0, "m_DisplayName": "Normals", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3, @@ -1267,7 +1330,6 @@ "m_Id": 1, "m_DisplayName": "Out", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3, @@ -1317,6 +1379,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": false, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] }, @@ -1330,7 +1393,6 @@ "m_Id": 0, "m_DisplayName": "In", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "In", "m_StageCapability": 3, @@ -1386,6 +1448,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": false, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] } @@ -1417,6 +1480,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] }, @@ -1432,7 +1496,6 @@ "m_Id": 1, "m_DisplayName": "B", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "B", "m_StageCapability": 3, @@ -1457,7 +1520,6 @@ "m_Id": 0, "m_DisplayName": "In", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "In", "m_StageCapability": 3, @@ -1476,18 +1538,23 @@ } { - "m_SGVersion": 0, + "m_SGVersion": 1, "m_Type": "UnityEditor.ShaderGraph.Internal.Vector2ShaderProperty", "m_ObjectId": "385d0ecc6bcf4bdbb09efd22de620f42", "m_Guid": { "m_GuidSerialized": "0cfe9596-beed-43cb-a7c1-28df7483f9ed" }, "m_Name": "UV", + "m_DefaultRefNameVersion": 0, + "m_RefNameGeneratedByDisplayName": "", "m_DefaultReferenceName": "Vector2_18BA5697", "m_OverrideReferenceName": "_UV", "m_GeneratePropertyBlock": true, + "m_UseCustomSlotLabel": false, + "m_CustomSlotLabel": "", "m_Precision": 0, - "m_GPUInstanced": false, + "overrideHLSLDeclaration": false, + "hlslDeclarationOverride": 0, "m_Hidden": false, "m_Value": { "x": 1.0, @@ -1504,7 +1571,6 @@ "m_Id": 2, "m_DisplayName": "T", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "T", "m_StageCapability": 3, @@ -1533,6 +1599,45 @@ } } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.CategoryData", + "m_ObjectId": "3b660f14f3b84803bdadc345e9225a0c", + "m_Name": "", + "m_ChildObjectList": [ + { + "m_Id": "d9eb3340d6c6418989b4be944c61af31" + }, + { + "m_Id": "2312588c3c904cac9b599d16d8ed91d3" + }, + { + "m_Id": "385d0ecc6bcf4bdbb09efd22de620f42" + }, + { + "m_Id": "7e4daf60ec4f46009ba214691bfdee5b" + }, + { + "m_Id": "8ff38c629a0a408db9cb7db4cf4fa83a" + }, + { + "m_Id": "523c1af3d19d4e4a9818d69c311e0e3e" + }, + { + "m_Id": "90e7bc402411450eb4c585e2d52e7ae5" + }, + { + "m_Id": "4eef33670c92444f9b9b2537fa9620c1" + }, + { + "m_Id": "b5587cfc8ee94bf8aec4c4ae1e963732" + }, + { + "m_Id": "8c73e6e056a44794bf26b1f9ccc0f8a9" + } + ] +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.MultiplyNode", @@ -1565,6 +1670,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": false, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] } @@ -1577,7 +1683,6 @@ "m_Id": 0, "m_DisplayName": "Predicate", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Predicate", "m_StageCapability": 3, @@ -1592,7 +1697,6 @@ "m_Id": 0, "m_DisplayName": "Use Thread Map", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3, @@ -1607,7 +1711,6 @@ "m_Id": 3, "m_DisplayName": "Out", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3, @@ -1637,9 +1740,9 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -149.0, - "y": 697.0, - "width": 162.0, + "x": -64.0, + "y": 699.0, + "width": 170.0, "height": 34.0 } }, @@ -1651,6 +1754,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] }, @@ -1666,7 +1770,6 @@ "m_Id": 0, "m_DisplayName": "Thread Smoothness Strength", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3, @@ -1703,6 +1806,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] }, @@ -1758,11 +1862,13 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": false, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] }, "m_TextureType": 0, - "m_NormalMapSpace": 0 + "m_NormalMapSpace": 0, + "m_EnableGlobalMipBias": true } { @@ -1772,7 +1878,6 @@ "m_Id": 0, "m_DisplayName": "Thread AO Strength", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3, @@ -1790,7 +1895,6 @@ "m_Id": 1, "m_DisplayName": "B", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "B", "m_StageCapability": 3, @@ -1815,7 +1919,6 @@ "m_Id": 3, "m_DisplayName": "Ambient Occlusion", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "AmbientOcclusion", "m_StageCapability": 2, @@ -1833,7 +1936,6 @@ "m_Id": 3, "m_DisplayName": "Z", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Z", "m_StageCapability": 3, @@ -1845,18 +1947,23 @@ } { - "m_SGVersion": 0, + "m_SGVersion": 1, "m_Type": "UnityEditor.ShaderGraph.Internal.Vector1ShaderProperty", "m_ObjectId": "4eef33670c92444f9b9b2537fa9620c1", "m_Guid": { "m_GuidSerialized": "d935cf22-0a1b-43f1-b1fa-be9764d04755" }, "m_Name": "Thread AO Strength", + "m_DefaultRefNameVersion": 0, + "m_RefNameGeneratedByDisplayName": "", "m_DefaultReferenceName": "Vector1_2870F26B", "m_OverrideReferenceName": "_ThreadAOStrength", "m_GeneratePropertyBlock": true, + "m_UseCustomSlotLabel": false, + "m_CustomSlotLabel": "", "m_Precision": 0, - "m_GPUInstanced": false, + "overrideHLSLDeclaration": false, + "hlslDeclarationOverride": 0, "m_Hidden": false, "m_Value": 0.5, "m_FloatType": 1, @@ -1873,7 +1980,6 @@ "m_Id": 0, "m_DisplayName": "In", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "In", "m_StageCapability": 3, @@ -1892,18 +1998,23 @@ } { - "m_SGVersion": 0, + "m_SGVersion": 1, "m_Type": "UnityEditor.ShaderGraph.Internal.Vector1ShaderProperty", "m_ObjectId": "523c1af3d19d4e4a9818d69c311e0e3e", "m_Guid": { "m_GuidSerialized": "fc9b7ab9-d83b-4887-a555-28692897d85b" }, "m_Name": "Alpha", + "m_DefaultRefNameVersion": 0, + "m_RefNameGeneratedByDisplayName": "", "m_DefaultReferenceName": "Vector1_61CD5374", "m_OverrideReferenceName": "_Alpha", "m_GeneratePropertyBlock": true, + "m_UseCustomSlotLabel": false, + "m_CustomSlotLabel": "", "m_Precision": 0, - "m_GPUInstanced": false, + "overrideHLSLDeclaration": false, + "hlslDeclarationOverride": 0, "m_Hidden": false, "m_Value": 1.0, "m_FloatType": 0, @@ -1939,6 +2050,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] }, @@ -1954,7 +2066,6 @@ "m_Id": 0, "m_DisplayName": "Thread Normal Strength", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3, @@ -1972,7 +2083,6 @@ "m_Id": 0, "m_DisplayName": "A", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "A", "m_StageCapability": 3, @@ -2000,7 +2110,6 @@ "m_Id": 1, "m_DisplayName": "B", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "B", "m_StageCapability": 3, @@ -2021,6 +2130,30 @@ ] } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", + "m_ObjectId": "5ffc0b3bc6b64a2b83a785101fb32c19", + "m_Id": 0, + "m_DisplayName": "In", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "In", + "m_StageCapability": 3, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + } +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.NormalizeNode", @@ -2050,6 +2183,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": false, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] } @@ -2062,7 +2196,6 @@ "m_Id": 2, "m_DisplayName": "Y", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Y", "m_StageCapability": 3, @@ -2080,7 +2213,6 @@ "m_Id": 2, "m_DisplayName": "T", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "T", "m_StageCapability": 3, @@ -2105,10 +2237,10 @@ "m_Id": 3, "m_DisplayName": "Sampler", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Sampler", - "m_StageCapability": 3 + "m_StageCapability": 3, + "m_BareResource": false } { @@ -2118,7 +2250,6 @@ "m_Id": 0, "m_DisplayName": "Out", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3, @@ -2146,7 +2277,6 @@ "m_Id": 3, "m_DisplayName": "Out", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3, @@ -2171,7 +2301,6 @@ "m_Id": 0, "m_DisplayName": "AmbientOcclusion", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3, @@ -2189,7 +2318,6 @@ "m_Id": 0, "m_DisplayName": "A", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "A", "m_StageCapability": 3, @@ -2214,7 +2342,6 @@ "m_Id": 4, "m_DisplayName": "R", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "R", "m_StageCapability": 2, @@ -2237,9 +2364,9 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": 24.0, - "y": 565.0, - "width": 122.0, + "x": 109.0, + "y": 567.0, + "width": 126.0, "height": 118.0 } }, @@ -2257,6 +2384,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": false, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] } @@ -2288,6 +2416,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] }, @@ -2303,7 +2432,6 @@ "m_Id": 0, "m_DisplayName": "Normals", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3, @@ -2325,18 +2453,23 @@ } { - "m_SGVersion": 0, + "m_SGVersion": 1, "m_Type": "UnityEditor.ShaderGraph.Internal.Vector3ShaderProperty", "m_ObjectId": "7e4daf60ec4f46009ba214691bfdee5b", "m_Guid": { "m_GuidSerialized": "fa1b3334-3023-478f-8d87-82bcdec6ab47" }, "m_Name": "Normals", + "m_DefaultRefNameVersion": 0, + "m_RefNameGeneratedByDisplayName": "", "m_DefaultReferenceName": "Vector3_AFFB47E5", "m_OverrideReferenceName": "_Normals", "m_GeneratePropertyBlock": true, + "m_UseCustomSlotLabel": false, + "m_CustomSlotLabel": "", "m_Precision": 0, - "m_GPUInstanced": false, + "overrideHLSLDeclaration": false, + "hlslDeclarationOverride": 0, "m_Hidden": false, "m_Value": { "x": 0.5, @@ -2353,7 +2486,6 @@ "m_Id": 3, "m_DisplayName": "Out", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3, @@ -2378,7 +2510,6 @@ "m_Id": 1, "m_DisplayName": "True", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "True", "m_StageCapability": 3, @@ -2425,6 +2556,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": false, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] } @@ -2437,7 +2569,6 @@ "m_Id": 1, "m_DisplayName": "B", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "B", "m_StageCapability": 3, @@ -2490,6 +2621,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": false, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] } @@ -2507,9 +2639,9 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": 103.0, - "y": 507.0, - "width": 149.0, + "x": 188.0, + "y": 509.0, + "width": 164.0, "height": 34.0 } }, @@ -2521,6 +2653,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] }, @@ -2536,7 +2669,6 @@ "m_Id": 2, "m_DisplayName": "Out", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3, @@ -2561,7 +2693,6 @@ "m_Id": 0, "m_DisplayName": "Alpha", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3, @@ -2584,9 +2715,9 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -361.0, - "y": 623.0, - "width": 171.0, + "x": -469.0, + "y": 615.0, + "width": 180.0, "height": 34.0 } }, @@ -2598,6 +2729,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] }, @@ -2641,6 +2773,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] }, @@ -2654,7 +2787,6 @@ "m_Id": 3, "m_DisplayName": "Out", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3, @@ -2679,7 +2811,6 @@ "m_Id": 2, "m_DisplayName": "Smoothness", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Smoothness", "m_StageCapability": 2, @@ -2691,18 +2822,23 @@ } { - "m_SGVersion": 0, + "m_SGVersion": 1, "m_Type": "UnityEditor.ShaderGraph.Internal.Vector1ShaderProperty", "m_ObjectId": "8c73e6e056a44794bf26b1f9ccc0f8a9", "m_Guid": { "m_GuidSerialized": "24ff54bf-3f70-4881-aded-191bd20052f7" }, "m_Name": "Thread Smoothness Strength", + "m_DefaultRefNameVersion": 0, + "m_RefNameGeneratedByDisplayName": "", "m_DefaultReferenceName": "Vector1_D5B952A7", "m_OverrideReferenceName": "_ThreadSmoothnessStrength", "m_GeneratePropertyBlock": true, + "m_UseCustomSlotLabel": false, + "m_CustomSlotLabel": "", "m_Precision": 0, - "m_GPUInstanced": false, + "overrideHLSLDeclaration": false, + "hlslDeclarationOverride": 0, "m_Hidden": false, "m_Value": 0.5, "m_FloatType": 1, @@ -2725,9 +2861,9 @@ "m_Position": { "serializedVersion": "2", "x": -439.0, - "y": 248.0, - "width": 124.0, - "height": 94.0 + "y": 212.0, + "width": 128.0, + "height": 93.0 } }, "m_Slots": [ @@ -2747,24 +2883,30 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": false, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] } } { - "m_SGVersion": 0, + "m_SGVersion": 1, "m_Type": "UnityEditor.ShaderGraph.Internal.Vector1ShaderProperty", "m_ObjectId": "8ff38c629a0a408db9cb7db4cf4fa83a", "m_Guid": { "m_GuidSerialized": "f4d01d77-ecd0-43d5-9ed6-16cf78e4612a" }, "m_Name": "Smoothness", + "m_DefaultRefNameVersion": 0, + "m_RefNameGeneratedByDisplayName": "", "m_DefaultReferenceName": "Vector1_34701477", "m_OverrideReferenceName": "_Smoothness", "m_GeneratePropertyBlock": true, + "m_UseCustomSlotLabel": false, + "m_CustomSlotLabel": "", "m_Precision": 0, - "m_GPUInstanced": false, + "overrideHLSLDeclaration": false, + "hlslDeclarationOverride": 0, "m_Hidden": false, "m_Value": 0.5, "m_FloatType": 0, @@ -2781,7 +2923,6 @@ "m_Id": 1, "m_DisplayName": "True", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "True", "m_StageCapability": 3, @@ -2800,18 +2941,23 @@ } { - "m_SGVersion": 0, + "m_SGVersion": 1, "m_Type": "UnityEditor.ShaderGraph.Internal.Vector1ShaderProperty", "m_ObjectId": "90e7bc402411450eb4c585e2d52e7ae5", "m_Guid": { "m_GuidSerialized": "d2df6573-0f7e-4c62-b020-b8e4bbdae1f1" }, "m_Name": "AmbientOcclusion", + "m_DefaultRefNameVersion": 0, + "m_RefNameGeneratedByDisplayName": "", "m_DefaultReferenceName": "Vector1_BF2B2008", "m_OverrideReferenceName": "_AmbientOcclusion", "m_GeneratePropertyBlock": true, + "m_UseCustomSlotLabel": false, + "m_CustomSlotLabel": "", "m_Precision": 0, - "m_GPUInstanced": false, + "overrideHLSLDeclaration": false, + "hlslDeclarationOverride": 0, "m_Hidden": false, "m_Value": 1.0, "m_FloatType": 0, @@ -2828,7 +2974,6 @@ "m_Id": 0, "m_DisplayName": "A", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "A", "m_StageCapability": 3, @@ -2877,10 +3022,10 @@ "m_Id": 0, "m_DisplayName": "ThreadMap", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", - "m_StageCapability": 3 + "m_StageCapability": 3, + "m_BareResource": false } { @@ -2890,7 +3035,6 @@ "m_Id": 2, "m_DisplayName": "Out", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3, @@ -2958,6 +3102,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] }, @@ -2998,6 +3143,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": false, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] } @@ -3010,7 +3156,6 @@ "m_Id": 1, "m_DisplayName": "Out", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3, @@ -3038,7 +3183,6 @@ "m_Id": 2, "m_DisplayName": "Out", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3, @@ -3066,7 +3210,6 @@ "m_Id": 0, "m_DisplayName": "A", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "A", "m_StageCapability": 3, @@ -3090,8 +3233,32 @@ "m_ObjectId": "addd02d1c7c840c0982f4a1a282501cb", "m_Title": "Ambient Occlusion", "m_Position": { - "x": -386.0, - "y": 445.0 + "x": -470.0, + "y": 450.0 + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", + "m_ObjectId": "ae7f3eee64784528a019124a5c8760f0", + "m_Id": 1, + "m_DisplayName": "Out", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "Out", + "m_StageCapability": 3, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 } } @@ -3102,7 +3269,6 @@ "m_Id": 1, "m_DisplayName": "In Min Max", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "InMinMax", "m_StageCapability": 3, @@ -3146,6 +3312,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] }, @@ -3155,18 +3322,23 @@ } { - "m_SGVersion": 0, + "m_SGVersion": 1, "m_Type": "UnityEditor.ShaderGraph.Internal.Vector1ShaderProperty", "m_ObjectId": "b5587cfc8ee94bf8aec4c4ae1e963732", "m_Guid": { "m_GuidSerialized": "e96918ee-3bfd-4c51-b6d2-54b34d9ad706" }, "m_Name": "Thread Normal Strength", + "m_DefaultRefNameVersion": 0, + "m_RefNameGeneratedByDisplayName": "", "m_DefaultReferenceName": "Vector1_3DE8C8A3", "m_OverrideReferenceName": "_ThreadNormalStrength", "m_GeneratePropertyBlock": true, + "m_UseCustomSlotLabel": false, + "m_CustomSlotLabel": "", "m_Precision": 0, - "m_GPUInstanced": false, + "overrideHLSLDeclaration": false, + "hlslDeclarationOverride": 0, "m_Hidden": false, "m_Value": 0.5, "m_FloatType": 1, @@ -3183,7 +3355,6 @@ "m_Id": 1, "m_DisplayName": "Out", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3, @@ -3227,6 +3398,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] }, @@ -3261,6 +3433,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] }, @@ -3269,6 +3442,43 @@ } } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.SaturateNode", + "m_ObjectId": "c033d4389cf54046bf7a711bb51beb07", + "m_Group": { + "m_Id": "addd02d1c7c840c0982f4a1a282501cb" + }, + "m_Name": "Saturate", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": -254.0, + "y": 615.0, + "width": 128.0, + "height": 94.0 + } + }, + "m_Slots": [ + { + "m_Id": "5ffc0b3bc6b64a2b83a785101fb32c19" + }, + { + "m_Id": "eb23ee3850ff403d967c4078d85e27de" + } + ], + "synonyms": [ + "clamp" + ], + "m_Precision": 0, + "m_PreviewExpanded": false, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + } +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.GroupData", @@ -3287,7 +3497,6 @@ "m_Id": 1, "m_DisplayName": "B", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "B", "m_StageCapability": 3, @@ -3355,6 +3564,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] }, @@ -3370,7 +3580,6 @@ "m_Id": 0, "m_DisplayName": "Smoothness", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3, @@ -3388,7 +3597,6 @@ "m_Id": 0, "m_DisplayName": "Use Thread Map", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3, @@ -3403,7 +3611,6 @@ "m_Id": 3, "m_DisplayName": "Out", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3, @@ -3439,7 +3646,6 @@ "m_Id": 2, "m_DisplayName": "False", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "False", "m_StageCapability": 3, @@ -3464,7 +3670,6 @@ "m_Id": 2, "m_DisplayName": "Out", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3, @@ -3492,7 +3697,6 @@ "m_Id": 1, "m_DisplayName": "Out", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3, @@ -3517,7 +3721,6 @@ "m_Id": 0, "m_DisplayName": "A", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "A", "m_StageCapability": 3, @@ -3567,11 +3770,16 @@ "m_GuidSerialized": "d6aaba38-49a3-41d1-8163-914932324589" }, "m_Name": "Use Thread Map", + "m_DefaultRefNameVersion": 0, + "m_RefNameGeneratedByDisplayName": "", "m_DefaultReferenceName": "Boolean_AA2071D6", "m_OverrideReferenceName": "_UseThreadMap", "m_GeneratePropertyBlock": true, + "m_UseCustomSlotLabel": false, + "m_CustomSlotLabel": "", "m_Precision": 0, - "m_GPUInstanced": false, + "overrideHLSLDeclaration": false, + "hlslDeclarationOverride": 0, "m_Hidden": false, "m_Value": true } @@ -3611,6 +3819,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] }, @@ -3628,7 +3837,6 @@ "m_Id": 0, "m_DisplayName": "RGBA", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "RGBA", "m_StageCapability": 2, @@ -3654,7 +3862,6 @@ "m_Id": 3, "m_DisplayName": "Out", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3, @@ -3704,6 +3911,44 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": false, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.SaturateNode", + "m_ObjectId": "de0d06640c6d43fcbe91127b77ce92e3", + "m_Group": { + "m_Id": "3afed62abb5b4810a8359bbc547f9686" + }, + "m_Name": "Saturate", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": -425.0, + "y": 325.0, + "width": 128.0, + "height": 94.0 + } + }, + "m_Slots": [ + { + "m_Id": "0d1a99acdbbd48e1a8500c722187ded9" + }, + { + "m_Id": "ae7f3eee64784528a019124a5c8760f0" + } + ], + "synonyms": [ + "clamp" + ], + "m_Precision": 0, + "m_PreviewExpanded": false, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] } @@ -3716,7 +3961,6 @@ "m_Id": 6, "m_DisplayName": "B", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "B", "m_StageCapability": 2, @@ -3734,7 +3978,6 @@ "m_Id": 1, "m_DisplayName": "B", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "B", "m_StageCapability": 3, @@ -3811,11 +4054,36 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": false, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] } } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", + "m_ObjectId": "eb23ee3850ff403d967c4078d85e27de", + "m_Id": 1, + "m_DisplayName": "Out", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "Out", + "m_StageCapability": 3, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + } +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", @@ -3823,7 +4091,6 @@ "m_Id": 2, "m_DisplayName": "False", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "False", "m_StageCapability": 3, @@ -3848,7 +4115,6 @@ "m_Id": 0, "m_DisplayName": "Predicate", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Predicate", "m_StageCapability": 3, @@ -3863,7 +4129,6 @@ "m_Id": 0, "m_DisplayName": "Predicate", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Predicate", "m_StageCapability": 3, @@ -3878,7 +4143,6 @@ "m_Id": 4, "m_DisplayName": "Alpha", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Alpha", "m_StageCapability": 2, @@ -3896,7 +4160,6 @@ "m_Id": 0, "m_DisplayName": "Use Thread Map", "m_SlotType": 1, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3, @@ -3911,10 +4174,10 @@ "m_Id": 1, "m_DisplayName": "Texture", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "Texture", "m_StageCapability": 3, + "m_BareResource": false, "m_Texture": { "m_SerializedTexture": "{\"texture\":{\"instanceID\":0}}", "m_Guid": "" @@ -3934,9 +4197,9 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": 265.0, - "y": 565.0, - "width": 161.0, + "x": 350.0, + "y": 567.0, + "width": 170.0, "height": 142.0 } }, @@ -3957,6 +4220,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": false, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] } @@ -3969,7 +4233,6 @@ "m_Id": 2, "m_DisplayName": "Out Min Max", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "OutMinMax", "m_StageCapability": 3, @@ -3994,7 +4257,6 @@ "m_Id": 1, "m_DisplayName": "X", "m_SlotType": 0, - "m_Priority": 2147483647, "m_Hidden": false, "m_ShaderOutputName": "X", "m_StageCapability": 3, diff --git a/com.unity.render-pipelines.high-definition/Runtime/ShaderLibrary/ShaderVariablesGlobal.cs b/com.unity.render-pipelines.high-definition/Runtime/ShaderLibrary/ShaderVariablesGlobal.cs index e9157762458..e8be82747d1 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/ShaderLibrary/ShaderVariablesGlobal.cs +++ b/com.unity.render-pipelines.high-definition/Runtime/ShaderLibrary/ShaderVariablesGlobal.cs @@ -218,7 +218,7 @@ unsafe struct ShaderVariablesGlobal public uint _NumTileClusteredX; public uint _NumTileClusteredY; public int _EnvSliceSize; - public float _Pad7; + public uint _EnableDecalLayers; // Subsurface scattering // Use float4 to avoid any packing issue between compute and pixel shaders @@ -256,25 +256,10 @@ unsafe struct ShaderVariablesGlobal public int _RaytracingFrameIndex; // Index of the current frame [0, 7] public uint _EnableRecursiveRayTracing; - // Probe Volumes - public Vector4 _ProbeVolumeAtlasResolutionAndSliceCount; - public Vector4 _ProbeVolumeAtlasResolutionAndSliceCountInverse; - public Vector4 _ProbeVolumeAtlasOctahedralDepthResolutionAndInverse; - - public int _ProbeVolumeLeakMitigationMode; - public float _ProbeVolumeBilateralFilterWeightMin; - public float _ProbeVolumeBilateralFilterWeight; - public uint _EnableDecalLayers; - - [HLSLArray(7, typeof(Vector4))] - public fixed float _ProbeVolumeAmbientProbeFallbackPackedCoeffs[7 * 4]; // 3 bands of SH, packed for storing global ambient probe lighting as fallback to probe volumes. - public int _TransparentCameraOnlyMotionVectors; - // Can be set to 0 to globally "disable" tessellation // Because the DepthPrepass doesn't have a DEBUG_DISPLAY variant, it is the only way to disable it for debug modes public float _GlobalTessellationFactorMultiplier; - public float _SpecularOcclusionBlend; public float _DeExposureMultiplier; } diff --git a/com.unity.render-pipelines.high-definition/Runtime/ShaderLibrary/ShaderVariablesGlobal.cs.hlsl b/com.unity.render-pipelines.high-definition/Runtime/ShaderLibrary/ShaderVariablesGlobal.cs.hlsl index 3318ae78698..024ad9e0136 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/ShaderLibrary/ShaderVariablesGlobal.cs.hlsl +++ b/com.unity.render-pipelines.high-definition/Runtime/ShaderLibrary/ShaderVariablesGlobal.cs.hlsl @@ -124,7 +124,7 @@ GLOBAL_CBUFFER_START(ShaderVariablesGlobal, b0) uint _NumTileClusteredX; uint _NumTileClusteredY; int _EnvSliceSize; - float _Pad7; + uint _EnableDecalLayers; float4 _ShapeParamsAndMaxScatterDists[16]; float4 _TransmissionTintsAndFresnel0[16]; float4 _WorldScalesAndFilterRadiiAndThicknessRemaps[16]; @@ -145,14 +145,6 @@ GLOBAL_CBUFFER_START(ShaderVariablesGlobal, b0) int _EnableRayTracedReflections; int _RaytracingFrameIndex; uint _EnableRecursiveRayTracing; - float4 _ProbeVolumeAtlasResolutionAndSliceCount; - float4 _ProbeVolumeAtlasResolutionAndSliceCountInverse; - float4 _ProbeVolumeAtlasOctahedralDepthResolutionAndInverse; - int _ProbeVolumeLeakMitigationMode; - float _ProbeVolumeBilateralFilterWeightMin; - float _ProbeVolumeBilateralFilterWeight; - uint _EnableDecalLayers; - float4 _ProbeVolumeAmbientProbeFallbackPackedCoeffs[7]; int _TransparentCameraOnlyMotionVectors; float _GlobalTessellationFactorMultiplier; float _SpecularOcclusionBlend; diff --git a/com.unity.render-pipelines.high-definition/Runtime/Sky/SkyManager.cs b/com.unity.render-pipelines.high-definition/Runtime/Sky/SkyManager.cs index 626d7708e9c..bd8156ccc7f 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/Sky/SkyManager.cs +++ b/com.unity.render-pipelines.high-definition/Runtime/Sky/SkyManager.cs @@ -537,7 +537,7 @@ internal void SetupAmbientProbe(HDCamera hdCamera) RenderSettings.ambientIntensity = 1.0f; RenderSettings.ambientMode = AmbientMode.Skybox; // Force skybox for our HDRI RenderSettings.reflectionIntensity = 1.0f; - RenderSettings.customReflection = null; + RenderSettings.customReflectionTexture = null; } void BlitCubemap(CommandBuffer cmd, Cubemap source, RenderTexture dest) @@ -1254,7 +1254,7 @@ void OnBakeStarted() RenderSettings.ambientIntensity = 1.0f; RenderSettings.ambientMode = AmbientMode.Skybox; // Force skybox for our HDRI RenderSettings.reflectionIntensity = 1.0f; - RenderSettings.customReflection = null; + RenderSettings.customReflectionTexture = null; DynamicGI.UpdateEnvironment(); } diff --git a/com.unity.render-pipelines.high-definition/Runtime/Sky/VisualEnvironment.cs b/com.unity.render-pipelines.high-definition/Runtime/Sky/VisualEnvironment.cs index a3b74156caf..06b4e581719 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/Sky/VisualEnvironment.cs +++ b/com.unity.render-pipelines.high-definition/Runtime/Sky/VisualEnvironment.cs @@ -17,7 +17,7 @@ public sealed class VisualEnvironment : VolumeComponent /// Type of clouds that should be used for rendering. public NoInterpIntParameter cloudType = new NoInterpIntParameter(0); /// Defines the way the ambient probe should be computed. - public SkyAmbientModeParameter skyAmbientMode = new SkyAmbientModeParameter(SkyAmbientMode.Static); + public SkyAmbientModeParameter skyAmbientMode = new SkyAmbientModeParameter(SkyAmbientMode.Dynamic); /// Controls the global orientation of the wind relative to the X world vector. [Header("Wind")] diff --git a/com.unity.render-pipelines.high-definition/Tests/Editor/HDGlobalSettingsTests.cs b/com.unity.render-pipelines.high-definition/Tests/Editor/HDGlobalSettingsTests.cs deleted file mode 100644 index 8033e5fa2dc..00000000000 --- a/com.unity.render-pipelines.high-definition/Tests/Editor/HDGlobalSettingsTests.cs +++ /dev/null @@ -1,79 +0,0 @@ -using NUnit.Framework; -using UnityEditor; -using UnityEditor.SceneManagement; - -namespace UnityEngine.Rendering.HighDefinition.Tests -{ - public class HDGlobalSettingsTests : MonoBehaviour - { - HDRenderPipelineGlobalSettings initialGlobalSettings; - HDRenderPipelineGlobalSettings otherGlobalSettings; - - - [SetUp] - public void SetUp() - { - UnityEditor.SceneManagement.EditorSceneManager.NewScene(UnityEditor.SceneManagement.NewSceneSetup.DefaultGameObjects); - otherGlobalSettings = ScriptableObject.CreateInstance(); - } - - [TearDown] - public void TearDown() - { - ScriptableObject.DestroyImmediate(otherGlobalSettings); - EditorSceneManager.NewScene(NewSceneSetup.EmptyScene); - } - - void EnsureHDRPIsActivePipeline() - { - Camera.main.Render(); - initialGlobalSettings = HDRenderPipelineGlobalSettings.instance; - Assert.IsInstanceOf(RenderPipelineManager.currentPipeline); - Assert.IsNotNull(initialGlobalSettings); - } - - [Test] - public void HDRPFrameRendered_GlobalSettingsShouldBeAssigned() - { - EnsureHDRPIsActivePipeline(); - } - - [Test] - public void HDRPFrameRendered_EnsureGlobalSettingsIfNullAssigned() - { - EnsureHDRPIsActivePipeline(); - - HDRenderPipelineGlobalSettings.UpdateGraphicsSettings(null); - Assert.IsNull(HDRenderPipelineGlobalSettings.instance); - - Camera.main.Render(); - Assert.IsNotNull(HDRenderPipelineGlobalSettings.instance); - } - - [Test] - [Description("Case 1342987 - Support undo on Global Settings assignation ")] - public void Undo_HDRPActive_ChangeGlobalSettings() - { - EnsureHDRPIsActivePipeline(); - Undo.IncrementCurrentGroup(); - HDRenderPipelineGlobalSettings.UpdateGraphicsSettings(otherGlobalSettings); - Assert.AreEqual(otherGlobalSettings, HDRenderPipelineGlobalSettings.instance); - - Undo.PerformUndo(); - Assert.AreEqual(initialGlobalSettings, HDRenderPipelineGlobalSettings.instance); - } - - [Test] - [Description("Case 1342987 - Support undo on Global Settings assignation ")] - public void Undo_HDRPActive_UnregisterGlobalSettings() - { - EnsureHDRPIsActivePipeline(); - Undo.IncrementCurrentGroup(); - HDRenderPipelineGlobalSettings.UpdateGraphicsSettings(null); - Assert.IsNull(HDRenderPipelineGlobalSettings.instance); - - Undo.PerformUndo(); - Assert.AreEqual(initialGlobalSettings, HDRenderPipelineGlobalSettings.instance); - } - } -} diff --git a/com.unity.render-pipelines.high-definition/package.json b/com.unity.render-pipelines.high-definition/package.json index 536f4ce43e5..fc89916300e 100644 --- a/com.unity.render-pipelines.high-definition/package.json +++ b/com.unity.render-pipelines.high-definition/package.json @@ -1,9 +1,9 @@ { "name": "com.unity.render-pipelines.high-definition", "description": "The High Definition Render Pipeline (HDRP) is a high-fidelity Scriptable Render Pipeline built by Unity to target modern (Compute Shader compatible) platforms. HDRP utilizes Physically-Based Lighting techniques, linear lighting, HDR lighting, and a configurable hybrid Tile/Cluster deferred/Forward lighting architecture and gives you the tools you need to create games, technical demos, animations, and more to a high graphical standard.", - "version": "12.0.0", - "unity": "2021.2", - "unityRelease": "0b6", + "version": "13.0.0", + "unity": "2022.1", + "unityRelease": "0a8", "displayName": "High Definition RP", "dependencies": { "com.unity.mathematics": "1.2.1", @@ -12,10 +12,10 @@ "com.unity.modules.animation": "1.0.0", "com.unity.modules.imageconversion": "1.0.0", "com.unity.modules.terrain": "1.0.0", - "com.unity.render-pipelines.core": "12.0.0", - "com.unity.shadergraph": "12.0.0", - "com.unity.visualeffectgraph": "12.0.0", - "com.unity.render-pipelines.high-definition-config": "12.0.0" + "com.unity.render-pipelines.core": "13.0.0", + "com.unity.shadergraph": "13.0.0", + "com.unity.visualeffectgraph": "13.0.0", + "com.unity.render-pipelines.high-definition-config": "13.0.0" }, "keywords": [ "graphics", diff --git a/com.unity.render-pipelines.universal/CHANGELOG.md b/com.unity.render-pipelines.universal/CHANGELOG.md index a5c024c64a9..bd99d9d8db4 100644 --- a/com.unity.render-pipelines.universal/CHANGELOG.md +++ b/com.unity.render-pipelines.universal/CHANGELOG.md @@ -4,6 +4,11 @@ All notable changes to this package will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html). +## [13.0.0] - 2021-09-01 +### Added +- URP global setting for stripping post processing shader variants. +- URP global setting for stripping off shader variants. + ## [12.0.0] - 2021-01-11 ### Added - Added support for default sprite mask shaders for the 2D Renderer in URP. @@ -164,6 +169,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. - Fixed unlit shader function name ambiguity - Fixed Terrain holes not appearing in shadows [case 1349305] - VFX: Compilation issue with ShaderGraph and planar lit outputs [case 1349894](https://issuetracker.unity3d.com/product/unity/issues/guid/1349894/) +- Fixed an issue where _AfterPostProcessTexture was no longer being assigned in UniversalRenderer. - Fixed an issue where TerrainLit was rendering color lighter than Lit [case 1340751] (https://issuetracker.unity3d.com/product/unity/issues/guid/1340751/) - Fixed Camera rendering when capture action and post processing present. [case 1350313] - Fixed artifacts in Speed Tree 8 billboard LODs due to SpeedTree LOD smoothing/crossfading [case 1348407] @@ -171,6 +177,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. - Support undo of URP Global Settings asset assignation (case 1342987). - Removed unsupported fields from Presets of Light and Camera [case 1335979]. - Fixed graphical artefact when terrain height map is used with rendering layer mask for lighting. +- Fixed an issue where screen space shadows has flickering with deferred mode [case 1354681](https://issuetracker.unity3d.com/issues/screen-space-shadows-flicker-in-scene-view-when-using-deferred-rendering) ### Changed - Change Asset/Create/Shader/Universal Render Pipeline/Lit Shader Graph to Asset/Create/Shader Graph/URP/Lit Shader Graph diff --git a/com.unity.render-pipelines.universal/Documentation~/Images/how-to-blit-in-xr/forward-renderer-asset.png b/com.unity.render-pipelines.universal/Documentation~/Images/how-to-blit-in-xr/forward-renderer-asset.png new file mode 100644 index 00000000000..f1ce540fd62 --- /dev/null +++ b/com.unity.render-pipelines.universal/Documentation~/Images/how-to-blit-in-xr/forward-renderer-asset.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8c70f9272f40e47570f20a3d743359a15253a8ff4d40db81d74470564cf36db5 +size 10237 diff --git a/com.unity.render-pipelines.universal/Documentation~/Images/how-to-blit-in-xr/mock-hmd-render-mode.png b/com.unity.render-pipelines.universal/Documentation~/Images/how-to-blit-in-xr/mock-hmd-render-mode.png new file mode 100644 index 00000000000..caf935cebdb --- /dev/null +++ b/com.unity.render-pipelines.universal/Documentation~/Images/how-to-blit-in-xr/mock-hmd-render-mode.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5aa1785e8b69085644ad7520a050f6fc790628e4aa6d589214b540e30dea3d0b +size 13199 diff --git a/com.unity.render-pipelines.universal/Documentation~/Images/how-to-blit-in-xr/new-render-feature.png b/com.unity.render-pipelines.universal/Documentation~/Images/how-to-blit-in-xr/new-render-feature.png new file mode 100644 index 00000000000..5cf707f5018 --- /dev/null +++ b/com.unity.render-pipelines.universal/Documentation~/Images/how-to-blit-in-xr/new-render-feature.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:334cdde46b22acd6628c5c54998c56b07cbd43cd0b87e2d43ba28ca8bd0c342e +size 16457 diff --git a/com.unity.render-pipelines.universal/Documentation~/Images/how-to-blit-in-xr/render-obj-cube-color-output.PNG b/com.unity.render-pipelines.universal/Documentation~/Images/how-to-blit-in-xr/render-obj-cube-color-output.PNG new file mode 100644 index 00000000000..3de6f9432c6 --- /dev/null +++ b/com.unity.render-pipelines.universal/Documentation~/Images/how-to-blit-in-xr/render-obj-cube-color-output.PNG @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6ca13962144f56cea5f05c0c8450e97de70761ed6b3bf666e7d079590df863f8 +size 20560 diff --git a/com.unity.render-pipelines.universal/Documentation~/Images/how-to-blit-in-xr/render-obj-cube-depth-output.png b/com.unity.render-pipelines.universal/Documentation~/Images/how-to-blit-in-xr/render-obj-cube-depth-output.png new file mode 100644 index 00000000000..75006daf01c --- /dev/null +++ b/com.unity.render-pipelines.universal/Documentation~/Images/how-to-blit-in-xr/render-obj-cube-depth-output.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ddb73b3df55756e9c5a02a746fab73135830899164b72063d3d8e6524513d24f +size 8832 diff --git a/com.unity.render-pipelines.universal/Documentation~/Images/how-to-blit-in-xr/renderobj-cube.png b/com.unity.render-pipelines.universal/Documentation~/Images/how-to-blit-in-xr/renderobj-cube.png new file mode 100644 index 00000000000..0e49666350d --- /dev/null +++ b/com.unity.render-pipelines.universal/Documentation~/Images/how-to-blit-in-xr/renderobj-cube.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f58d72352396b0a5b5896ceba3903847af3785a3ba851020c653081cfc12cee7 +size 68451 diff --git a/com.unity.render-pipelines.universal/Documentation~/Images/how-to/blit-xr/add-renderer-feature.png b/com.unity.render-pipelines.universal/Documentation~/Images/how-to/blit-xr/add-renderer-feature.png new file mode 100644 index 00000000000..2a0d4d24fc1 --- /dev/null +++ b/com.unity.render-pipelines.universal/Documentation~/Images/how-to/blit-xr/add-renderer-feature.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2d3edf0da3bd8f9eff30b194a0bb2d8d3b5860956364d285de67c1bc2c2839c7 +size 10316 diff --git a/com.unity.render-pipelines.universal/Documentation~/Images/how-to/blit-xr/example-scene.png b/com.unity.render-pipelines.universal/Documentation~/Images/how-to/blit-xr/example-scene.png new file mode 100644 index 00000000000..4a73a7877c4 --- /dev/null +++ b/com.unity.render-pipelines.universal/Documentation~/Images/how-to/blit-xr/example-scene.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:145fe1e74e3e970001deeab54a1019f33833eacb65f1a43fa1454a0a5694c45f +size 76093 diff --git a/com.unity.render-pipelines.universal/Documentation~/Images/how-to/blit-xr/final-play-mode-view.png b/com.unity.render-pipelines.universal/Documentation~/Images/how-to/blit-xr/final-play-mode-view.png new file mode 100644 index 00000000000..333632264ce --- /dev/null +++ b/com.unity.render-pipelines.universal/Documentation~/Images/how-to/blit-xr/final-play-mode-view.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:29c78fce43cb97ef70a1f18cb03ec54b70b02c659c28507a64ea35cdcff9aa53 +size 30797 diff --git a/com.unity.render-pipelines.universal/Documentation~/Images/how-to/blit-xr/final-scene-and-game-view.png b/com.unity.render-pipelines.universal/Documentation~/Images/how-to/blit-xr/final-scene-and-game-view.png new file mode 100644 index 00000000000..a3d0c1f8d48 --- /dev/null +++ b/com.unity.render-pipelines.universal/Documentation~/Images/how-to/blit-xr/final-scene-and-game-view.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:de1cd60376d5c49c2755e9f931fa9e3f166dccf728c0321e1de58ec48420d9c4 +size 43015 diff --git a/com.unity.render-pipelines.universal/Documentation~/Images/how-to/blit-xr/urp-global-settings.png b/com.unity.render-pipelines.universal/Documentation~/Images/how-to/blit-xr/urp-global-settings.png new file mode 100644 index 00000000000..d9d927a06f5 --- /dev/null +++ b/com.unity.render-pipelines.universal/Documentation~/Images/how-to/blit-xr/urp-global-settings.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4a43d342fda0ad5c3ed51182781db484b1e2351513b8d39b0cdf07d49e09b2d6 +size 32636 diff --git a/com.unity.render-pipelines.universal/Documentation~/Images/how-to/blit-xr/xr-plugin-mockhmd.png b/com.unity.render-pipelines.universal/Documentation~/Images/how-to/blit-xr/xr-plugin-mockhmd.png new file mode 100644 index 00000000000..063317ef68a --- /dev/null +++ b/com.unity.render-pipelines.universal/Documentation~/Images/how-to/blit-xr/xr-plugin-mockhmd.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cf43b18e5a052f31d1d4f7741304195be289f65f031c9cc1dfdbdcba69b3d860 +size 20176 diff --git a/com.unity.render-pipelines.universal/Documentation~/TableOfContents.md b/com.unity.render-pipelines.universal/Documentation~/TableOfContents.md index c4d5eb3aa07..d8b409aa25a 100644 --- a/com.unity.render-pipelines.universal/Documentation~/TableOfContents.md +++ b/com.unity.render-pipelines.universal/Documentation~/TableOfContents.md @@ -94,6 +94,9 @@ * [Visualizing normal vectors](writing-shaders-urp-unlit-normals.md) * [Reconstruct the world space positions](writing-shaders-urp-reconstruct-world-position.md) * [URP ShaderLab Pass tags](urp-shaders/urp-shaderlab-pass-tags.md) +* [How to](how-to.md) + * [Blit in XR](renderer-features/how-to-fullscreen-blit-in-xr-spi.md) + * [Use Render Objects Renderer Feature](containers/how-to-custom-effect-render-objects.md) * [Customizing URP](customizing-urp.md) * [beginCameraRendering event](using-begincamerarendering.md) diff --git a/com.unity.render-pipelines.universal/Documentation~/containers/how-to-custom-effect-render-objects.md b/com.unity.render-pipelines.universal/Documentation~/containers/how-to-custom-effect-render-objects.md new file mode 100644 index 00000000000..92e132f76ea --- /dev/null +++ b/com.unity.render-pipelines.universal/Documentation~/containers/how-to-custom-effect-render-objects.md @@ -0,0 +1 @@ +[!include[](../renderer-features/how-to-custom-effect-render-objects.md)] diff --git a/com.unity.render-pipelines.universal/Documentation~/how-to.md b/com.unity.render-pipelines.universal/Documentation~/how-to.md new file mode 100644 index 00000000000..a15d6cc3404 --- /dev/null +++ b/com.unity.render-pipelines.universal/Documentation~/how-to.md @@ -0,0 +1,9 @@ +# Practical how-to guides + +This section contains practical how-to guides. + +The section contains the following topics: + +* [How to perform a full screen blit in Single Pass Instanced rendering in XR](renderer-features/how-to-fullscreen-blit-in-xr-spi.md). + +* [How to create a custom rendering effect using the Render Objects Renderer Feature](containers/how-to-custom-effect-render-objects.md) diff --git a/com.unity.render-pipelines.universal/Documentation~/lighting.md b/com.unity.render-pipelines.universal/Documentation~/lighting.md index 315a510f86e..c3440c12fd8 100644 --- a/com.unity.render-pipelines.universal/Documentation~/lighting.md +++ b/com.unity.render-pipelines.universal/Documentation~/lighting.md @@ -8,6 +8,7 @@ Areas where the Universal Render Pipeline (URP) differs from Unity's common ligh * The [Light component inspector](light-component.md), which displays some URP-specific controls. * The [Universal Additional Light Data](universal-additional-light-data.md) component, which allows Unity to store Light-related data that is specific to URP. +* Enlighten Realtime Global Illumination is supported in URP from version 12. For more information, see the forum post [Update on Global Illumination 2021](https://forum.unity.com/threads/update-on-global-illumination-2021.1067015/). For a full comparison of lighting features between Unity's Built-in Render Pipeline and URP, and an up to date list of lighting features that are currently under research, see [this feature comparison chart](universalrp-builtin-feature-comparison.md). diff --git a/com.unity.render-pipelines.universal/Documentation~/renderer-features/how-to-do-fullscreen-blitting-under-XR-SPI.md b/com.unity.render-pipelines.universal/Documentation~/renderer-features/how-to-do-fullscreen-blitting-under-XR-SPI.md new file mode 100644 index 00000000000..3bbc8d5c727 --- /dev/null +++ b/com.unity.render-pipelines.universal/Documentation~/renderer-features/how-to-do-fullscreen-blitting-under-XR-SPI.md @@ -0,0 +1,207 @@ +# Example: How to create a full screen blitting feature under Single Pass Instanced rendering in XR + +The example on this page describes how to create a custom scriptable rendering feature doing full screen blit in XR + +## Example overview + +This example adds a ScriptableRenderPass that blits ScriptableRenderPassInput.Color to the CameraColorTarget. It uses the command buffer to draw a full screen mesh for both eyes. +The example also includes a shader used to perform the GPU side of the rendering, which works by sampling the color buffer using XR sampler macros. + +## Prerequisites + +This example requires the following: + +* A Unity project with the URP package installed. + +* The **Scriptable Render Pipeline Settings** property refers to a URP asset (**Project Settings** > **Graphics** > **Scriptable Render Pipeline Settings**). + +## Create example Scene and GameObjects + +To follow the steps in this example, create a new Scene with the following GameObjects: + +1. Create a Cube. + + ![Scene Cube](../Images/how-to-blit-in-xr/renderobj-cube.png) + +Now you have the setup necessary to follow the steps in this example. + +## Example implementation + +This section assumes that you created a Scene as described in section [Example Scene and GameObjects](#example-objects). + +The example implementation uses Scriptable Renderer Features: to draw color buffer information on screen. + +### Create a Renderer Feature and configure both input and output + +Follow these steps to create a Renderer Feature + +1. Create a new feature under the project asset folder. In this example, we name the file `ColorBlitRendererFeature.cs`. +```cs +using UnityEngine; +using UnityEngine.Rendering; +using UnityEngine.Rendering.Universal; + +internal class ColorBlitRendererFeature : ScriptableRendererFeature +{ + public Shader m_Shader; + public float m_Intensity; + + Material m_Material; + + ColorBlitPass m_RenderPass = null; + + public override void AddRenderPasses(ScriptableRenderer renderer, ref RenderingData renderingData) + { + if (renderingData.cameraData.cameraType == CameraType.Game) + { + m_RenderPass.ConfigureInput(ScriptableRenderPassInput.Color); + m_RenderPass.SetTarget(renderer.cameraColorTarget, m_Intensity); + renderer.EnqueuePass(m_RenderPass); + } + } + + public override void Create() + { + if (m_Shader != null) + m_Material = new Material(m_Shader); + + m_RenderPass = new ColorBlitPass(m_Material); + } + + protected override void Dispose(bool disposing) + { + CoreUtils.Destroy(m_Material); + } +} + +``` +2. Create the scriptable render pass that issue the custom blit draw call. In this example, we name the file `ColorBlitPass.cs` +In this example, we use `cmd.DrawMesh` to draw a fullscreen quad that performs the blit operation. +Do **Not** use the `cmd.Blit` in URP XR as it has serveral compatibility issues with URP XR integration and it may enable/disable XR shader keyword behind the scene which breaks XR SPI rendering. +```cs +using UnityEngine; +using UnityEngine.Rendering; +using UnityEngine.Rendering.Universal; + +internal class ColorBlitPass : ScriptableRenderPass +{ + ProfilingSampler m_ProfilingSampler = new ProfilingSampler("ColorBlit"); + Material m_Material; + RenderTargetIdentifier m_CameraColorTarget; + float m_intensity; + + public ColorBlitPass(Material material) + { + m_Material = material; + renderPassEvent = RenderPassEvent.BeforeRenderingPostProcessing; + } + + public void SetTarget(RenderTargetIdentifier colorHandle, float intensity) + { + m_CameraColorTarget = colorHandle; + m_intensity = intensity; + } + + public override void Execute(ScriptableRenderContext context, ref RenderingData renderingData) + { + var camera = renderingData.cameraData.camera; + if (camera.cameraType != CameraType.Game) + return; + + if (m_Material == null) + return; + + CommandBuffer cmd = CommandBufferPool.Get(); + using (new ProfilingScope(cmd, m_ProfilingSampler)) + { + m_Material.SetFloat("_Intensity", m_intensity); + cmd.SetRenderTarget(new RenderTargetIdentifier(m_CameraColorTarget, 0, CubemapFace.Unknown, -1)); + cmd.DrawMesh(RenderingUtils.fullscreenMesh, Matrix4x4.identity, m_Material); + } + context.ExecuteCommandBuffer(cmd); + cmd.Clear(); + + CommandBufferPool.Release(cmd); + } +} +``` +3. Create the shader that performs the blit operation. In this example, we name the file `ColorBlit.shader`. The vertex stage outputs the fullscreen quad position. The fragment stage samples color buffer and writes out the `color*intencity` value to the render target. +```hlsl +Shader "ColorBlit" +{ + SubShader + { + Tags { "RenderType"="Opaque" "RenderPipeline" = "UniversalPipeline"} + LOD 100 + ZTest Always ZWrite Off Cull Off + Pass + { + Name "ColorBlitPass" + + HLSLPROGRAM + #pragma vertex vert + #pragma fragment frag + #include "Packages/com.unity.render-pipelines.universal/ShaderLibrary/Core.hlsl" + + struct Attributes + { + float4 positionHCS : POSITION; + float2 uv : TEXCOORD0; + UNITY_VERTEX_INPUT_INSTANCE_ID + }; + + struct Varyings + { + float4 positionCS : SV_POSITION; + float2 uv : TEXCOORD0; + UNITY_VERTEX_OUTPUT_STEREO + }; + + Varyings vert(Attributes input) + { + Varyings output; + UNITY_SETUP_INSTANCE_ID(input); + UNITY_INITIALIZE_VERTEX_OUTPUT_STEREO(output); + + // Note: The pass is setup with a mesh already in CS + // Therefore, we can just output vertex position + output.positionCS = float4(input.positionHCS.xyz, 1.0); + + #if UNITY_UV_STARTS_AT_TOP + output.positionCS.y *= -1; + #endif + + output.uv = input.uv; + return output; + } + + TEXTURE2D_X(_CameraOpaqueTexture); + SAMPLER(sampler_CameraOpaqueTexture); + + float _Intensity; + + half4 frag (Varyings input) : SV_Target + { + UNITY_SETUP_STEREO_EYE_INDEX_POST_VERTEX(input); + float4 color = SAMPLE_TEXTURE2D_X(_CameraOpaqueTexture, sampler_CameraOpaqueTexture, input.uv); + return color * _Intensity; + } + ENDHLSL + } + } +} +``` +4. Select forward renderer. + + ![Select Forward Renderer](../Images/how-to-blit-in-xr/forward-renderer-asset.png) + +7. Configure forward renderer to use the new render feature and set the intencity to 1.5. + + ![Configure New Renderer Feature](../Images/how-to-blit-in-xr/new-render-feature.png) + +6. Configure project to use XRSDK. Add mock hmd provider and select single pass instanced as rendering mode. + + ![Configure MockHMD](../Images/how-to-blit-in-xr/mock-hmd-render-mode.png) + +The example is complete. When running in playmode, color buffer is displayed. +![Color Output](../Images/how-to-blit-in-xr/render-obj-cube-color-output.PNG) diff --git a/com.unity.render-pipelines.universal/Documentation~/renderer-features/how-to-fullscreen-blit-in-xr-spi.md b/com.unity.render-pipelines.universal/Documentation~/renderer-features/how-to-fullscreen-blit-in-xr-spi.md new file mode 100644 index 00000000000..70ef1ea6072 --- /dev/null +++ b/com.unity.render-pipelines.universal/Documentation~/renderer-features/how-to-fullscreen-blit-in-xr-spi.md @@ -0,0 +1,223 @@ +# How to perform a full screen blit in Single Pass Instanced rendering in XR + +The example on this page describes how to create a custom Renderer Feature that performs a full screen blit in Single Pass Instanced rendering in XR. + +## Example overview + +This example implements the following solution: + +* A [custom Renderer Feature](https://docs.unity3d.com/Packages/com.unity.render-pipelines.universal@12.0/api/UnityEngine.Rendering.Universal.ScriptableRendererFeature.html) calls a custom [Render Pass](https://docs.unity3d.com/Packages/com.unity.render-pipelines.universal@12.0/api/UnityEngine.Rendering.Universal.ScriptableRenderPass.html). + +* The [Render Pass](https://docs.unity3d.com/Packages/com.unity.render-pipelines.universal@12.0/api/UnityEngine.Rendering.Universal.ScriptableRenderPass.html) blits the Opaque Texture to the the [Camera color target](https://docs.unity3d.com/Packages/com.unity.render-pipelines.universal@7.0/api/UnityEngine.Rendering.Universal.ScriptableRenderer.html#UnityEngine_Rendering_Universal_ScriptableRenderer_cameraColorTarget) for the current renderer. The render pass uses the command buffer to draw a full screen mesh for both eyes. + +The example includes [the shader](#shader) that performs the GPU side of the rendering. The shader samples the color buffer using XR sampler macros. + +## Prerequisites + +This example requires the following: + +* The **Scriptable Render Pipeline Settings** property refers to a URP asset (**Project Settings** > **Graphics** > **Scriptable Render Pipeline Settings**). + +## Create example Scene and GameObjects + +To follow the steps in this example, create a new Scene with the following GameObjects: + +1. Create a Cube. Ensure that the Cube is clearly visible from the main Camera. + + ![](../Images/how-to/blit-xr/example-scene.png) + +Now you have the Scene necessary to follow the steps in this example. + +## Example implementation + +This section assumes that you created a Scene as described in section [Create example Scene and GameObjects](#example-objects). + +Follow these steps to create a [custom Renderer Feature](https://docs.unity3d.com/Packages/com.unity.render-pipelines.universal@12.0/api/UnityEngine.Rendering.Universal.ScriptableRendererFeature.html) with a custom [Render Pass](https://docs.unity3d.com/Packages/com.unity.render-pipelines.universal@12.0/api/UnityEngine.Rendering.Universal.ScriptableRenderPass.html). + +1. Create a new C# script. Call it `ColorBlitRendererFeature.cs`. This script implements the custom Renderer Feature. + + ```C# + using UnityEngine; + using UnityEngine.Rendering; + using UnityEngine.Rendering.Universal; + + internal class ColorBlitRendererFeature : ScriptableRendererFeature + { + public Shader m_Shader; + public float m_Intensity; + + Material m_Material; + + ColorBlitPass m_RenderPass = null; + + public override void AddRenderPasses(ScriptableRenderer renderer, ref RenderingData renderingData) + { + if (renderingData.cameraData.cameraType == CameraType.Game) + { + //Calling ConfigureInput with the ScriptableRenderPassInput.Color argument ensures that the opaque texture is available to the Render Pass + m_RenderPass.ConfigureInput(ScriptableRenderPassInput.Color); + m_RenderPass.SetTarget(renderer.cameraColorTarget, m_Intensity); + renderer.EnqueuePass(m_RenderPass); + } + } + + public override void Create() + { + if (m_Shader != null) + m_Material = new Material(m_Shader); + + m_RenderPass = new ColorBlitPass(m_Material); + } + + protected override void Dispose(bool disposing) + { + CoreUtils.Destroy(m_Material); + } + } + ``` + +2. Create a new C# script. Call it `ColorBlitPass.cs`. This script implements the custom Render Pass that performs the custom blit draw call. + + This Render Pass uses the `cmd.DrawMesh` method to draw a full-screen quad and perform the blit operation. + + > **NOTE:** Do not use the `cmd.Blit` method in URP XR projects because that method has compatibility issues with the URP XR integration. Using `cmd.Blit` might implicitly enable or disable XR shader keywords, which breaks XR SPI rendering. + + ```C# + using UnityEngine; + using UnityEngine.Rendering; + using UnityEngine.Rendering.Universal; + + internal class ColorBlitPass : ScriptableRenderPass + { + ProfilingSampler m_ProfilingSampler = new ProfilingSampler("ColorBlit"); + Material m_Material; + RenderTargetIdentifier m_CameraColorTarget; + float m_Intensity; + + public ColorBlitPass(Material material) + { + m_Material = material; + renderPassEvent = RenderPassEvent.BeforeRenderingPostProcessing; + } + + public void SetTarget(RenderTargetIdentifier colorHandle, float intensity) + { + m_CameraColorTarget = colorHandle; + m_Intensity = intensity; + } + + public override void Execute(ScriptableRenderContext context, ref RenderingData renderingData) + { + var camera = renderingData.cameraData.camera; + if (camera.cameraType != CameraType.Game) + return; + + if (m_Material == null) + return; + + CommandBuffer cmd = CommandBufferPool.Get(); + using (new ProfilingScope(cmd, m_ProfilingSampler)) + { + m_Material.SetFloat("_Intensity", m_Intensity); + cmd.SetRenderTarget(new RenderTargetIdentifier(m_CameraColorTarget, 0, CubemapFace.Unknown, -1)); + //The RenderingUtils.fullscreenMesh argument specifies that the mesh to draw is a quad. + cmd.DrawMesh(RenderingUtils.fullscreenMesh, Matrix4x4.identity, m_Material); + } + context.ExecuteCommandBuffer(cmd); + cmd.Clear(); + + CommandBufferPool.Release(cmd); + } + } + ``` + +3. Create the shader that performs the blit operation. Call the shader file `ColorBlit.shader`. The vertex function outputs the full-screen quad position. The fragment function samples the color buffer and returns the `color * float4(0, _Intensity, 0, 1)` value to the render target. + + ```hlsl + Shader "ColorBlit" + { + SubShader + { + Tags { "RenderType"="Opaque" "RenderPipeline" = "UniversalPipeline"} + LOD 100 + ZWrite Off Cull Off + Pass + { + Name "ColorBlitPass" + + HLSLPROGRAM + #pragma vertex vert + #pragma fragment frag + #include "Packages/com.unity.render-pipelines.universal/ShaderLibrary/Core.hlsl" + + struct Attributes + { + float4 positionHCS : POSITION; + float2 uv : TEXCOORD0; + UNITY_VERTEX_INPUT_INSTANCE_ID + }; + + struct Varyings + { + float4 positionCS : SV_POSITION; + float2 uv : TEXCOORD0; + UNITY_VERTEX_OUTPUT_STEREO + }; + + Varyings vert(Attributes input) + { + Varyings output; + UNITY_SETUP_INSTANCE_ID(input); + UNITY_INITIALIZE_VERTEX_OUTPUT_STEREO(output); + + // Note: The pass is setup with a mesh already in clip + // space, that's why, it's enough to just output vertex + // positions + output.positionCS = float4(input.positionHCS.xyz, 1.0); + + #if UNITY_UV_STARTS_AT_TOP + output.positionCS.y *= -1; + #endif + + output.uv = input.uv; + return output; + } + + TEXTURE2D_X(_CameraOpaqueTexture); + SAMPLER(sampler_CameraOpaqueTexture); + + float _Intensity; + + half4 frag (Varyings input) : SV_Target + { + UNITY_SETUP_STEREO_EYE_INDEX_POST_VERTEX(input); + float4 color = SAMPLE_TEXTURE2D_X(_CameraOpaqueTexture, sampler_CameraOpaqueTexture, input.uv); + return color * float4(0, _Intensity, 0, 1); + } + ENDHLSL + } + } + } + ``` + +4. Add the `ColorBlitRendererFeature` to the Universal Renderer asset. + + ![Add Renderer Feature](../Images/how-to/blit-xr/add-renderer-feature.png) + + For information on how to add a Renderer Feature, see the page [How to add a Renderer Feature to a Renderer](../urp-renderer-feature-how-to-add.md). + + For this example, set the Intensity property to 1.5. + +5. To visualize the example, configure the project to use XR SDK. [Add the MockHMD XR Plugin to the project](https://docs.unity3d.com/Packages/com.unity.xr.mock-hmd@latest/index.html). Set the **Render Mode** property to **Single Pass Instanced**. + + ![Configure MockHMD](../Images/how-to/blit-xr/xr-plugin-mockhmd.png) + + Unity shows the following views: + + ![Final Scene and Game views](../Images/how-to/blit-xr/final-scene-and-game-view.png) + +6. Enter the Play mode. Unity shows the color buffer. + + ![Final Play mode view](../Images/how-to/blit-xr/final-play-mode-view.png) + +The example is complete. diff --git a/com.unity.render-pipelines.universal/Documentation~/universalrp-builtin-feature-comparison.md b/com.unity.render-pipelines.universal/Documentation~/universalrp-builtin-feature-comparison.md index 83c4b0caf3d..d6d7dd0b65e 100644 --- a/com.unity.render-pipelines.universal/Documentation~/universalrp-builtin-feature-comparison.md +++ b/com.unity.render-pipelines.universal/Documentation~/universalrp-builtin-feature-comparison.md @@ -45,11 +45,11 @@ This table provides an overview of the current features supported in the Univers | *Shadow Resolve Type*
Lighting Pass
Screen Space Pass |
Yes
Yes |
Yes
No | | Shadow Bias | Constant clip space offset + normal bias | Offsets shadowmap texels in the light direction + normal bias| | ***Lightmapping*** | | | -| Enlighten | Yes | Yes | +| Enlighten Baked Global Illumination | Yes |Yes | | Progressive Lightmapper, CPU | Yes | Yes | | Progressive Lightmapper, GPU | Yes | Yes | -| ***Realtime Global Illumination*** | | | -| Enlighten | Yes | Not supported | +| ***Real-time Global Illumination*** | | | +| Enlighten Realtime Global Illumination | Yes | Yes | | ***Mixed Lighting Mode*** | | | | Subtractive | Yes | Yes | | Baked Indirect | Yes | Yes | diff --git a/com.unity.render-pipelines.universal/Documentation~/urp-global-settings.md b/com.unity.render-pipelines.universal/Documentation~/urp-global-settings.md index 6a59120b775..8eea9367a41 100644 --- a/com.unity.render-pipelines.universal/Documentation~/urp-global-settings.md +++ b/com.unity.render-pipelines.universal/Documentation~/urp-global-settings.md @@ -12,8 +12,12 @@ The section contains the following settings. Use this section to define the names of Light Layers. Light Layers only work with 3D Renderers. -## Miscellaneous +## Shader Stripping + +The check boxes in this section define which shader variants Unity strips when you build the Player. | **Property** | **Description** | | --------------------------| ------------------------------------------------------------ | -| Runtime Debug Shaders | When disabled, all debug display shader variants are removed when you build for the Unity Player. This decreases build time, but prevents the use of Rendering Debugger in Player builds. | +| Strip Debug Variants | When enabled, Unity strips all debug view shader variants when you build the Player. This decreases build time, but prevents the use of Rendering Debugger in Player builds. | +| Strip Unused Post Processing Variants | When enabled, Unity assumes that the Player does not create new [Volume Profiles](VolumeProfile.md) at runtime. With this assumption, Unity only keeps the shader variants that the existing [Volume Profiles](VolumeProfile.md) use, and strips all the other variants. Unity keeps shader variants used in Volume Profiles even if the Scenes in the project do not use the Profiles. | +| Strip Unused Variants | When enabled, Unity performs shader stripping in a more efficient way. This option reduces the amount of shader variants in the Player by a factor of 2 if the project uses the following URP features:
  • Light Layers
  • Native Render Pass
  • Reflection Probe Blending
  • Reflection Probe Box Projection
  • SSAO Renderer Feature
  • Decal Renderer Feature
  • Certain post-processing effects
Disable this option only if you see issues in the Player. | diff --git a/com.unity.render-pipelines.universal/Editor/2D/ShaderGraph/Targets/UniversalSpriteCustomLitSubTarget.cs b/com.unity.render-pipelines.universal/Editor/2D/ShaderGraph/Targets/UniversalSpriteCustomLitSubTarget.cs index ac30e0c207c..f8a3c9f5257 100644 --- a/com.unity.render-pipelines.universal/Editor/2D/ShaderGraph/Targets/UniversalSpriteCustomLitSubTarget.cs +++ b/com.unity.render-pipelines.universal/Editor/2D/ShaderGraph/Targets/UniversalSpriteCustomLitSubTarget.cs @@ -1,7 +1,7 @@ using System; using System.Linq; using UnityEditor.ShaderGraph; -using UnityEditor.UIElements; + namespace UnityEditor.Rendering.Universal.ShaderGraph { @@ -64,7 +64,7 @@ public override void GetActiveBlocks(ref TargetActiveBlockContext context) public override void GetPropertiesGUI(ref TargetPropertyGUIContext context, Action onChange, Action registerUndo) { - context.AddProperty("Blending Mode", new EnumField(AlphaMode.Alpha) { value = target.alphaMode }, (evt) => + context.AddProperty("Blending Mode", new UnityEngine.UIElements.EnumField(AlphaMode.Alpha) { value = target.alphaMode }, (evt) => { if (Equals(target.alphaMode, evt.newValue)) return; diff --git a/com.unity.render-pipelines.universal/Editor/2D/ShaderGraph/Targets/UniversalSpriteLitSubTarget.cs b/com.unity.render-pipelines.universal/Editor/2D/ShaderGraph/Targets/UniversalSpriteLitSubTarget.cs index 55c571619c1..fe7a7309134 100644 --- a/com.unity.render-pipelines.universal/Editor/2D/ShaderGraph/Targets/UniversalSpriteLitSubTarget.cs +++ b/com.unity.render-pipelines.universal/Editor/2D/ShaderGraph/Targets/UniversalSpriteLitSubTarget.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using UnityEditor.ShaderGraph; using UnityEditor.ShaderGraph.Legacy; -using UnityEditor.UIElements; + namespace UnityEditor.Rendering.Universal.ShaderGraph { @@ -66,7 +66,7 @@ public override void GetActiveBlocks(ref TargetActiveBlockContext context) public override void GetPropertiesGUI(ref TargetPropertyGUIContext context, Action onChange, Action registerUndo) { - context.AddProperty("Blending Mode", new EnumField(AlphaMode.Alpha) { value = target.alphaMode }, (evt) => + context.AddProperty("Blending Mode", new UnityEngine.UIElements.EnumField(AlphaMode.Alpha) { value = target.alphaMode }, (evt) => { if (Equals(target.alphaMode, evt.newValue)) return; diff --git a/com.unity.render-pipelines.universal/Editor/2D/ShaderGraph/Targets/UniversalSpriteUnlitSubTarget.cs b/com.unity.render-pipelines.universal/Editor/2D/ShaderGraph/Targets/UniversalSpriteUnlitSubTarget.cs index 72aa82744c8..adfe44a12da 100644 --- a/com.unity.render-pipelines.universal/Editor/2D/ShaderGraph/Targets/UniversalSpriteUnlitSubTarget.cs +++ b/com.unity.render-pipelines.universal/Editor/2D/ShaderGraph/Targets/UniversalSpriteUnlitSubTarget.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using UnityEditor.ShaderGraph; using UnityEditor.ShaderGraph.Legacy; -using UnityEditor.UIElements; + namespace UnityEditor.Rendering.Universal.ShaderGraph { @@ -64,7 +64,7 @@ public override void GetActiveBlocks(ref TargetActiveBlockContext context) public override void GetPropertiesGUI(ref TargetPropertyGUIContext context, Action onChange, Action registerUndo) { - context.AddProperty("Blending Mode", new EnumField(AlphaMode.Alpha) { value = target.alphaMode }, (evt) => + context.AddProperty("Blending Mode", new UnityEngine.UIElements.EnumField(AlphaMode.Alpha) { value = target.alphaMode }, (evt) => { if (Equals(target.alphaMode, evt.newValue)) return; diff --git a/com.unity.render-pipelines.universal/Editor/GlobalSettings/SerializedUniversalRenderPipelineGlobalSettings.cs b/com.unity.render-pipelines.universal/Editor/GlobalSettings/SerializedUniversalRenderPipelineGlobalSettings.cs index 2006009e97b..c86b2c86f60 100644 --- a/com.unity.render-pipelines.universal/Editor/GlobalSettings/SerializedUniversalRenderPipelineGlobalSettings.cs +++ b/com.unity.render-pipelines.universal/Editor/GlobalSettings/SerializedUniversalRenderPipelineGlobalSettings.cs @@ -19,7 +19,9 @@ class SerializedUniversalRenderPipelineGlobalSettings public SerializedProperty lightLayerName6; public SerializedProperty lightLayerName7; - public SerializedProperty supportRuntimeDebugDisplay; + public SerializedProperty stripDebugVariants; + public SerializedProperty stripUnusedPostProcessingVariants; + public SerializedProperty stripUnusedVariants; public SerializedUniversalRenderPipelineGlobalSettings(SerializedObject serializedObject) { @@ -44,7 +46,9 @@ public SerializedUniversalRenderPipelineGlobalSettings(SerializedObject serializ lightLayerName6 = serializedObject.Find((UniversalRenderPipelineGlobalSettings s) => s.lightLayerName6); lightLayerName7 = serializedObject.Find((UniversalRenderPipelineGlobalSettings s) => s.lightLayerName7); - supportRuntimeDebugDisplay = serializedObject.Find((UniversalRenderPipelineGlobalSettings s) => s.supportRuntimeDebugDisplay); + stripDebugVariants = serializedObject.FindProperty("m_StripDebugVariants"); + stripUnusedPostProcessingVariants = serializedObject.FindProperty("m_StripUnusedPostProcessingVariants"); + stripUnusedVariants = serializedObject.FindProperty("m_StripUnusedVariants"); } } } diff --git a/com.unity.render-pipelines.universal/Editor/GlobalSettings/UniversalGlobalSettingsWindow.Skin.cs b/com.unity.render-pipelines.universal/Editor/GlobalSettings/UniversalGlobalSettingsWindow.Skin.cs index bedbd935d48..2407c8ed659 100644 --- a/com.unity.render-pipelines.universal/Editor/GlobalSettings/UniversalGlobalSettingsWindow.Skin.cs +++ b/com.unity.render-pipelines.universal/Editor/GlobalSettings/UniversalGlobalSettingsWindow.Skin.cs @@ -13,7 +13,7 @@ internal partial class UniversalGlobalSettingsPanelIMGUI { internal class Styles { - public const int labelWidth = 220; + public const int labelWidth = 260; public static readonly GUIContent lightLayersLabel = EditorGUIUtility.TrTextContent("Light Layer Names (3D)", "If the Light Layers feature is enabled in the URP Asset, Unity allocates memory for processing Light Layers. In the Deferred Rendering Path, this allocation includes an extra render target in GPU memory, which reduces performance."); public static readonly GUIContent lightLayerName0 = EditorGUIUtility.TrTextContent("Light Layer 0", "The display name for Light Layer 0."); @@ -25,8 +25,10 @@ internal class Styles public static readonly GUIContent lightLayerName6 = EditorGUIUtility.TrTextContent("Light Layer 6", "The display name for Light Layer 6."); public static readonly GUIContent lightLayerName7 = EditorGUIUtility.TrTextContent("Light Layer 7", "The display name for Light Layer 7."); - public static readonly GUIContent miscSettingsLabel = EditorGUIUtility.TrTextContent("Miscellaneous", "Miscellaneous settings"); - public static readonly GUIContent supportRuntimeDebugDisplayContentLabel = EditorGUIUtility.TrTextContent("Runtime Debug Shaders", "When disabled, all debug display shader variants are removed when you build for the Unity Player. This decreases build time, but prevents the use of Rendering Debugger in Player builds."); + public static readonly GUIContent miscSettingsLabel = EditorGUIUtility.TrTextContent("Shader Stripping", "Shader Stripping settings"); + public static readonly GUIContent stripDebugVariantsLabel = EditorGUIUtility.TrTextContent("Strip Debug Variants", "When disabled, all debug display shader variants are removed when you build for the Unity Player. This decreases build time, but prevents the use of Rendering Debugger in Player builds."); + public static readonly GUIContent stripUnusedPostProcessingVariantsLabel = EditorGUIUtility.TrTextContent("Strip Unused Post Processing Variants", "Controls whether strips automatically post processing shader variants based on VolumeProfile components. It strips based on VolumeProfiles in project and not scenes that actually uses it."); + public static readonly GUIContent stripUnusedVariantsLabel = EditorGUIUtility.TrTextContent("Strip Unused Variants", "Controls whether strip disabled keyword variants if the feature is enabled."); public static readonly string warningUrpNotActive = "Project graphics settings do not refer to a URP Asset. Check the settings: Graphics > Scriptable Render Pipeline Settings, Quality > Render Pipeline Asset."; public static readonly string warningGlobalSettingsMissing = "The Settings property does not contain a valid URP Global Settings asset. There might be issues in rendering. Select a valid URP Global Settings asset."; diff --git a/com.unity.render-pipelines.universal/Editor/GlobalSettings/UniversalGlobalSettingsWindow.cs b/com.unity.render-pipelines.universal/Editor/GlobalSettings/UniversalGlobalSettingsWindow.cs index 04212129d30..3c4a641a592 100644 --- a/com.unity.render-pipelines.universal/Editor/GlobalSettings/UniversalGlobalSettingsWindow.cs +++ b/com.unity.render-pipelines.universal/Editor/GlobalSettings/UniversalGlobalSettingsWindow.cs @@ -232,7 +232,9 @@ static void DrawMiscSettings(SerializedUniversalRenderPipelineGlobalSettings ser using (new EditorGUI.IndentLevelScope()) { - EditorGUILayout.PropertyField(serialized.supportRuntimeDebugDisplay, Styles.supportRuntimeDebugDisplayContentLabel); + EditorGUILayout.PropertyField(serialized.stripDebugVariants, Styles.stripDebugVariantsLabel); + EditorGUILayout.PropertyField(serialized.stripUnusedPostProcessingVariants, Styles.stripUnusedPostProcessingVariantsLabel); + EditorGUILayout.PropertyField(serialized.stripUnusedVariants, Styles.stripUnusedVariantsLabel); } EditorGUIUtility.labelWidth = oldWidth; diff --git a/com.unity.render-pipelines.universal/Editor/Lighting/UniversalRenderPipelineLightUI.Drawers.cs b/com.unity.render-pipelines.universal/Editor/Lighting/UniversalRenderPipelineLightUI.Drawers.cs index 13381cfa3f3..8ebb1173053 100644 --- a/com.unity.render-pipelines.universal/Editor/Lighting/UniversalRenderPipelineLightUI.Drawers.cs +++ b/com.unity.render-pipelines.universal/Editor/Lighting/UniversalRenderPipelineLightUI.Drawers.cs @@ -40,13 +40,13 @@ enum Expandable return !sceneLighting; }, (_, __) => EditorGUILayout.HelpBox(Styles.DisabledLightWarning.text, MessageType.Warning)), - CED.FoldoutGroup(Styles.generalHeader, + CED.FoldoutGroup(LightUI.Styles.generalHeader, Expandable.General, k_ExpandedState, DrawGeneralContent), CED.Conditional( (serializedLight, editor) => !serializedLight.settings.lightType.hasMultipleDifferentValues && serializedLight.settings.light.type == LightType.Spot, - CED.FoldoutGroup(Styles.shapeHeader, Expandable.Shape, k_ExpandedState, DrawSpotShapeContent)), + CED.FoldoutGroup(LightUI.Styles.shapeHeader, Expandable.Shape, k_ExpandedState, DrawSpotShapeContent)), CED.Conditional( (serializedLight, editor) => { @@ -55,16 +55,16 @@ enum Expandable var lightType = serializedLight.settings.light.type; return lightType == LightType.Rectangle || lightType == LightType.Disc; }, - CED.FoldoutGroup(Styles.shapeHeader, Expandable.Shape, k_ExpandedState, DrawAreaShapeContent)), - CED.FoldoutGroup(Styles.emissionHeader, + CED.FoldoutGroup(LightUI.Styles.shapeHeader, Expandable.Shape, k_ExpandedState, DrawAreaShapeContent)), + CED.FoldoutGroup(LightUI.Styles.emissionHeader, Expandable.Emission, k_ExpandedState, CED.Group(DrawerColor, DrawEmissionContent)), - CED.FoldoutGroup(Styles.renderingHeader, + CED.FoldoutGroup(LightUI.Styles.renderingHeader, Expandable.Rendering, k_ExpandedState, DrawRenderingContent), - CED.FoldoutGroup(Styles.shadowHeader, + CED.FoldoutGroup(LightUI.Styles.shadowHeader, Expandable.Shadows, k_ExpandedState, DrawShadowsContent), @@ -170,7 +170,7 @@ static void DrawGeneralContentInternal(UniversalRenderPipelineSerializedLight se if (lightType != LightType.Rectangle && !serializedLight.settings.isCompletelyBaked && UniversalRenderPipeline.asset.supportsLightLayers && !isInPreset) { EditorGUI.BeginChangeCheck(); - DrawLightLayerMask(serializedLight.lightLayerMask, Styles.LightLayer); + DrawLightLayerMask(serializedLight.lightLayerMask, LightUI.Styles.lightLayer); if (EditorGUI.EndChangeCheck()) { if (!serializedLight.customShadowLayers.boolValue) @@ -253,23 +253,22 @@ static void DrawerColor(UniversalRenderPipelineSerializedLight serializedLight, { // Use the color temperature bool to create a popup dropdown to choose between the two modes. var colorTemperaturePopupValue = Convert.ToInt32(serializedLight.settings.useColorTemperature.boolValue); - var lightAppearanceOptions = new[] { "Color", "Filter and Temperature" }; - colorTemperaturePopupValue = EditorGUILayout.Popup(Styles.lightAppearance, colorTemperaturePopupValue, lightAppearanceOptions); + colorTemperaturePopupValue = EditorGUILayout.Popup(LightUI.Styles.lightAppearance, colorTemperaturePopupValue, LightUI.Styles.lightAppearanceOptions); serializedLight.settings.useColorTemperature.boolValue = Convert.ToBoolean(colorTemperaturePopupValue); using (new EditorGUI.IndentLevelScope()) { if (serializedLight.settings.useColorTemperature.boolValue) { - EditorGUILayout.PropertyField(serializedLight.settings.color, Styles.colorFilter); - k_SliderWithTexture(Styles.colorTemperature, serializedLight.settings.colorTemperature, serializedLight.settings); + EditorGUILayout.PropertyField(serializedLight.settings.color, LightUI.Styles.colorFilter); + k_SliderWithTexture(LightUI.Styles.colorTemperature, serializedLight.settings.colorTemperature, serializedLight.settings); } else - EditorGUILayout.PropertyField(serializedLight.settings.color, Styles.color); + EditorGUILayout.PropertyField(serializedLight.settings.color, LightUI.Styles.color); } } else - EditorGUILayout.PropertyField(serializedLight.settings.color, Styles.color); + EditorGUILayout.PropertyField(serializedLight.settings.color, LightUI.Styles.color); } } diff --git a/com.unity.render-pipelines.universal/Editor/Lighting/UniversalRenderPipelineLightUI.PresetInspector.cs b/com.unity.render-pipelines.universal/Editor/Lighting/UniversalRenderPipelineLightUI.PresetInspector.cs index 72aeacc0ad1..82bf5d0ae4a 100644 --- a/com.unity.render-pipelines.universal/Editor/Lighting/UniversalRenderPipelineLightUI.PresetInspector.cs +++ b/com.unity.render-pipelines.universal/Editor/Lighting/UniversalRenderPipelineLightUI.PresetInspector.cs @@ -13,13 +13,13 @@ partial class UniversalRenderPipelineLightUI public static readonly CED.IDrawer PresetInspector = CED.Group( CED.Group((serialized, owner) => - EditorGUILayout.HelpBox(Styles.unsupportedPresetPropertiesMessage, MessageType.Info)), + EditorGUILayout.HelpBox(LightUI.Styles.unsupportedPresetPropertiesMessage, MessageType.Info)), CED.Group((serialized, owner) => EditorGUILayout.Space()), - CED.FoldoutGroup(Styles.generalHeader, + CED.FoldoutGroup(LightUI.Styles.generalHeader, Expandable.General, k_ExpandedStatePreset, DrawGeneralContentPreset), - CED.FoldoutGroup(Styles.emissionHeader, + CED.FoldoutGroup(LightUI.Styles.emissionHeader, Expandable.Emission, k_ExpandedStatePreset, CED.Group(DrawerColor, diff --git a/com.unity.render-pipelines.universal/Editor/Lighting/UniversalRenderPipelineLightUI.Skin.cs b/com.unity.render-pipelines.universal/Editor/Lighting/UniversalRenderPipelineLightUI.Skin.cs index 8414b405e51..d1605235505 100644 --- a/com.unity.render-pipelines.universal/Editor/Lighting/UniversalRenderPipelineLightUI.Skin.cs +++ b/com.unity.render-pipelines.universal/Editor/Lighting/UniversalRenderPipelineLightUI.Skin.cs @@ -7,11 +7,6 @@ partial class UniversalRenderPipelineLightUI { static class Styles { - public static readonly GUIContent generalHeader = new GUIContent("General"); - public static readonly GUIContent shapeHeader = new GUIContent("Shape"); - public static readonly GUIContent renderingHeader = new GUIContent("Rendering"); - public static readonly GUIContent emissionHeader = new GUIContent("Emission"); - public static readonly GUIContent shadowHeader = new GUIContent("Shadows"); public static readonly GUIContent lightCookieHeader = new GUIContent("Light Cookie"); public static readonly GUIContent Type = EditorGUIUtility.TrTextContent("Type", "Specifies the current type of light. Possible types are Directional, Spot, Point, and Area lights."); @@ -46,7 +41,7 @@ static class Styles }; public static readonly GUIContent[] ShadowResolutionDefaultOptions = { - new GUIContent("Custom"), + EditorGUIUtility.TrTextContent("Custom"), UniversalRenderPipelineAssetUI.Styles.additionalLightsShadowResolutionTierNames[0], UniversalRenderPipelineAssetUI.Styles.additionalLightsShadowResolutionTierNames[1], UniversalRenderPipelineAssetUI.Styles.additionalLightsShadowResolutionTierNames[2], @@ -61,18 +56,11 @@ static class Styles EditorGUIUtility.TrTextContent("Use settings from Render Pipeline Asset") }; - public static readonly GUIContent LightLayer = EditorGUIUtility.TrTextContent("Light Layer", "Specifies the current Light Layers that the Light affects. This Light illuminates corresponding Renderers with the same Light Layer flags."); public static readonly GUIContent customShadowLayers = EditorGUIUtility.TrTextContent("Custom Shadow Layers", "When enabled, you can use the Layer property below to specify the layers for shadows seperately to lighting. When disabled, the Light Layer property in the General section specifies the layers for both lighting and for shadows."); public static readonly GUIContent ShadowLayer = EditorGUIUtility.TrTextContent("Layer", "Specifies the light layer to use for shadows."); public static readonly GUIContent LightCookieSize = EditorGUIUtility.TrTextContent("Cookie Size", "Controls the size of the cookie mask currently assigned to the light."); public static readonly GUIContent LightCookieOffset = EditorGUIUtility.TrTextContent("Cookie Offset", "Controls the offset of the cookie mask currently assigned to the light."); - - public static readonly GUIContent colorTemperature = new GUIContent("Temperature", "Specifies a temperature (in Kelvin) used to correlate a color for the Light. For reference, White is 6500K."); - public static readonly GUIContent lightAppearance = new GUIContent("Light Appearance", "Specifies the mode for how this Light's color is calculated."); - public static readonly GUIContent color = new GUIContent("Color", "Specifies the color this Light emits."); - public static readonly GUIContent colorFilter = new GUIContent("Filter", "Specifies a color which tints the Light source."); - public static readonly string unsupportedPresetPropertiesMessage = L10n.Tr("When using Preset of Light Component, only a subset of properties are supported. Unsupported properties are hidden."); } } } diff --git a/com.unity.render-pipelines.universal/Editor/ShaderPreprocessor.cs b/com.unity.render-pipelines.universal/Editor/ShaderPreprocessor.cs index 6ac603b3c31..69b24ae7d31 100644 --- a/com.unity.render-pipelines.universal/Editor/ShaderPreprocessor.cs +++ b/com.unity.render-pipelines.universal/Editor/ShaderPreprocessor.cs @@ -7,6 +7,7 @@ using UnityEngine.Profiling; using UnityEngine.Rendering.Universal; using UnityEngine.Rendering; +using System.Runtime.CompilerServices; #if XR_MANAGEMENT_4_0_1_OR_NEWER using UnityEditor.XR.Management; @@ -27,24 +28,41 @@ enum ShaderFeatures MixedLighting = (1 << 6), TerrainHoles = (1 << 7), DeferredShading = (1 << 8), // DeferredRenderer is in the list of renderer - DeferredWithAccurateGbufferNormals = (1 << 9), - DeferredWithoutAccurateGbufferNormals = (1 << 10), - ScreenSpaceOcclusion = (1 << 11), - ScreenSpaceShadows = (1 << 12), - UseFastSRGBLinearConversion = (1 << 13), - LightLayers = (1 << 14), - ReflectionProbeBlending = (1 << 15), - ReflectionProbeBoxProjection = (1 << 16), - DBufferMRT1 = (1 << 17), - DBufferMRT2 = (1 << 18), - DBufferMRT3 = (1 << 19), - DecalScreenSpace = (1 << 20), - DecalGBuffer = (1 << 21), - DecalNormalBlendLow = (1 << 22), - DecalNormalBlendMedium = (1 << 23), - DecalNormalBlendHigh = (1 << 24), - ClusteredRendering = (1 << 25), - RenderPassEnabled = (1 << 26), + AccurateGbufferNormals = (1 << 9), + ScreenSpaceOcclusion = (1 << 10), + ScreenSpaceShadows = (1 << 11), + UseFastSRGBLinearConversion = (1 << 12), + LightLayers = (1 << 13), + ReflectionProbeBlending = (1 << 14), + ReflectionProbeBoxProjection = (1 << 15), + DBufferMRT1 = (1 << 16), + DBufferMRT2 = (1 << 17), + DBufferMRT3 = (1 << 18), + DecalScreenSpace = (1 << 19), + DecalGBuffer = (1 << 20), + DecalNormalBlendLow = (1 << 21), + DecalNormalBlendMedium = (1 << 22), + DecalNormalBlendHigh = (1 << 23), + ClusteredRendering = (1 << 24), + RenderPassEnabled = (1 << 25), + MainLightShadowsCascade = (1 << 26), + DrawProcedural = (1 << 27), + ScreenSpaceOcclusionAfterOpaque = (1 << 28), + } + + [Flags] + enum VolumeFeatures + { + None = 0, + Calculated = (1 << 0), + LensDistortion = (1 << 1), + Bloom = (1 << 2), + ChromaticAberration = (1 << 3), + ToneMaping = (1 << 4), + FilmGrain = (1 << 5), + DepthOfField = (1 << 6), + CameraMotionBlur = (1 << 7), + PaniniProjection = (1 << 8), } internal class ShaderPreprocessor : IPreprocessShaders @@ -59,44 +77,63 @@ internal class ShaderPreprocessor : IPreprocessShaders internal static event Action shaderPreprocessed; private static readonly System.Diagnostics.Stopwatch m_stripTimer = new System.Diagnostics.Stopwatch(); - ShaderKeyword m_MainLightShadows = new ShaderKeyword(ShaderKeywordStrings.MainLightShadows); - ShaderKeyword m_MainLightShadowsCascades = new ShaderKeyword(ShaderKeywordStrings.MainLightShadowCascades); - ShaderKeyword m_MainLightShadowsScreen = new ShaderKeyword(ShaderKeywordStrings.MainLightShadowScreen); - ShaderKeyword m_AdditionalLightsVertex = new ShaderKeyword(ShaderKeywordStrings.AdditionalLightsVertex); - ShaderKeyword m_AdditionalLightsPixel = new ShaderKeyword(ShaderKeywordStrings.AdditionalLightsPixel); - ShaderKeyword m_AdditionalLightShadows = new ShaderKeyword(ShaderKeywordStrings.AdditionalLightShadows); - ShaderKeyword m_ReflectionProbeBlending = new ShaderKeyword(ShaderKeywordStrings.ReflectionProbeBlending); - ShaderKeyword m_ReflectionProbeBoxProjection = new ShaderKeyword(ShaderKeywordStrings.ReflectionProbeBoxProjection); - ShaderKeyword m_CastingPunctualLightShadow = new ShaderKeyword(ShaderKeywordStrings.CastingPunctualLightShadow); - ShaderKeyword m_SoftShadows = new ShaderKeyword(ShaderKeywordStrings.SoftShadows); - ShaderKeyword m_MixedLightingSubtractive = new ShaderKeyword(ShaderKeywordStrings.MixedLightingSubtractive); - ShaderKeyword m_LightmapShadowMixing = new ShaderKeyword(ShaderKeywordStrings.LightmapShadowMixing); - ShaderKeyword m_ShadowsShadowMask = new ShaderKeyword(ShaderKeywordStrings.ShadowsShadowMask); - ShaderKeyword m_Lightmap = new ShaderKeyword(ShaderKeywordStrings.LIGHTMAP_ON); - ShaderKeyword m_DynamicLightmap = new ShaderKeyword(ShaderKeywordStrings.DYNAMICLIGHTMAP_ON); - ShaderKeyword m_DirectionalLightmap = new ShaderKeyword(ShaderKeywordStrings.DIRLIGHTMAP_COMBINED); - ShaderKeyword m_AlphaTestOn = new ShaderKeyword(ShaderKeywordStrings._ALPHATEST_ON); - ShaderKeyword m_DeferredStencil = new ShaderKeyword(ShaderKeywordStrings._DEFERRED_STENCIL); - ShaderKeyword m_GbufferNormalsOct = new ShaderKeyword(ShaderKeywordStrings._GBUFFER_NORMALS_OCT); - ShaderKeyword m_UseDrawProcedural = new ShaderKeyword(ShaderKeywordStrings.UseDrawProcedural); - ShaderKeyword m_ScreenSpaceOcclusion = new ShaderKeyword(ShaderKeywordStrings.ScreenSpaceOcclusion); - ShaderKeyword m_UseFastSRGBLinearConversion = new ShaderKeyword(ShaderKeywordStrings.UseFastSRGBLinearConversion); - ShaderKeyword m_LightLayers = new ShaderKeyword(ShaderKeywordStrings.LightLayers); - ShaderKeyword m_RenderPassEnabled = new ShaderKeyword(ShaderKeywordStrings.RenderPassEnabled); - ShaderKeyword m_DebugDisplay = new ShaderKeyword(ShaderKeywordStrings.DEBUG_DISPLAY); - ShaderKeyword m_DBufferMRT1 = new ShaderKeyword(ShaderKeywordStrings.DBufferMRT1); - ShaderKeyword m_DBufferMRT2 = new ShaderKeyword(ShaderKeywordStrings.DBufferMRT2); - ShaderKeyword m_DBufferMRT3 = new ShaderKeyword(ShaderKeywordStrings.DBufferMRT3); - ShaderKeyword m_DecalNormalBlendLow = new ShaderKeyword(ShaderKeywordStrings.DecalNormalBlendLow); - ShaderKeyword m_DecalNormalBlendMedium = new ShaderKeyword(ShaderKeywordStrings.DecalNormalBlendMedium); - ShaderKeyword m_DecalNormalBlendHigh = new ShaderKeyword(ShaderKeywordStrings.DecalNormalBlendHigh); - ShaderKeyword m_ClusteredRendering = new ShaderKeyword(ShaderKeywordStrings.ClusteredRendering); - ShaderKeyword m_EditorVisualization = new ShaderKeyword(ShaderKeywordStrings.EDITOR_VISUALIZATION); - - ShaderKeyword m_LocalDetailMulx2; - ShaderKeyword m_LocalDetailScaled; - ShaderKeyword m_LocalClearCoat; - ShaderKeyword m_LocalClearCoatMap; + LocalKeyword m_MainLightShadows; + LocalKeyword m_MainLightShadowsCascades; + LocalKeyword m_MainLightShadowsScreen; + LocalKeyword m_AdditionalLightsVertex; + LocalKeyword m_AdditionalLightsPixel; + LocalKeyword m_AdditionalLightShadows; + LocalKeyword m_ReflectionProbeBlending; + LocalKeyword m_ReflectionProbeBoxProjection; + LocalKeyword m_CastingPunctualLightShadow; + LocalKeyword m_SoftShadows; + LocalKeyword m_MixedLightingSubtractive; + LocalKeyword m_LightmapShadowMixing; + LocalKeyword m_ShadowsShadowMask; + LocalKeyword m_Lightmap; + LocalKeyword m_DynamicLightmap; + LocalKeyword m_DirectionalLightmap; + LocalKeyword m_AlphaTestOn; + LocalKeyword m_DeferredStencil; + LocalKeyword m_GbufferNormalsOct; + LocalKeyword m_UseDrawProcedural; + LocalKeyword m_ScreenSpaceOcclusion; + LocalKeyword m_UseFastSRGBLinearConversion; + LocalKeyword m_LightLayers; + LocalKeyword m_RenderPassEnabled; + LocalKeyword m_DebugDisplay; + LocalKeyword m_DBufferMRT1; + LocalKeyword m_DBufferMRT2; + LocalKeyword m_DBufferMRT3; + LocalKeyword m_DecalNormalBlendLow; + LocalKeyword m_DecalNormalBlendMedium; + LocalKeyword m_DecalNormalBlendHigh; + LocalKeyword m_ClusteredRendering; + LocalKeyword m_EditorVisualization; + + LocalKeyword m_LocalDetailMulx2; + LocalKeyword m_LocalDetailScaled; + LocalKeyword m_LocalClearCoat; + LocalKeyword m_LocalClearCoatMap; + + LocalKeyword m_LensDistortion; + LocalKeyword m_ChromaticAberration; + LocalKeyword m_BloomLQ; + LocalKeyword m_BloomHQ; + LocalKeyword m_BloomLQDirt; + LocalKeyword m_BloomHQDirt; + LocalKeyword m_HdrGrading; + LocalKeyword m_ToneMapACES; + LocalKeyword m_ToneMapNeutral; + LocalKeyword m_FilmGrain; + + Shader m_BokehDepthOfField = Shader.Find("Hidden/Universal Render Pipeline/BokehDepthOfField"); + Shader m_GaussianDepthOfField = Shader.Find("Hidden/Universal Render Pipeline/GaussianDepthOfField"); + Shader m_CameraMotionBlur = Shader.Find("Hidden/Universal Render Pipeline/CameraMotionBlur"); + Shader m_PaniniProjection = Shader.Find("Hidden/Universal Render Pipeline/PaniniProjection"); + Shader m_Bloom = Shader.Find("Hidden/Universal Render Pipeline/Bloom"); + + Shader StencilDeferred = Shader.Find("Hidden/Universal Render Pipeline/StencilDeferred"); int m_TotalVariantsInputCount; int m_TotalVariantsOutputCount; @@ -105,12 +142,63 @@ internal class ShaderPreprocessor : IPreprocessShaders // The first one executed is the one where callbackOrder is returning the smallest number. public int callbackOrder { get { return 0; } } + LocalKeyword TryGetLocalKeyword(Shader shader, string name) + { + return shader.keywordSpace.FindKeyword(name); + } + void InitializeLocalShaderKeywords(Shader shader) { - m_LocalDetailMulx2 = new ShaderKeyword(shader, ShaderKeywordStrings._DETAIL_MULX2); - m_LocalDetailScaled = new ShaderKeyword(shader, ShaderKeywordStrings._DETAIL_SCALED); - m_LocalClearCoat = new ShaderKeyword(shader, ShaderKeywordStrings._CLEARCOAT); - m_LocalClearCoatMap = new ShaderKeyword(shader, ShaderKeywordStrings._CLEARCOATMAP); + m_MainLightShadows = TryGetLocalKeyword(shader, ShaderKeywordStrings.MainLightShadows); + m_MainLightShadowsCascades = TryGetLocalKeyword(shader, ShaderKeywordStrings.MainLightShadowCascades); + m_MainLightShadowsScreen = TryGetLocalKeyword(shader, ShaderKeywordStrings.MainLightShadowScreen); + m_AdditionalLightsVertex = TryGetLocalKeyword(shader, ShaderKeywordStrings.AdditionalLightsVertex); + m_AdditionalLightsPixel = TryGetLocalKeyword(shader, ShaderKeywordStrings.AdditionalLightsPixel); + m_AdditionalLightShadows = TryGetLocalKeyword(shader, ShaderKeywordStrings.AdditionalLightShadows); + m_ReflectionProbeBlending = TryGetLocalKeyword(shader, ShaderKeywordStrings.ReflectionProbeBlending); + m_ReflectionProbeBoxProjection = TryGetLocalKeyword(shader, ShaderKeywordStrings.ReflectionProbeBoxProjection); + m_CastingPunctualLightShadow = TryGetLocalKeyword(shader, ShaderKeywordStrings.CastingPunctualLightShadow); + m_SoftShadows = TryGetLocalKeyword(shader, ShaderKeywordStrings.SoftShadows); + m_MixedLightingSubtractive = TryGetLocalKeyword(shader, ShaderKeywordStrings.MixedLightingSubtractive); + m_LightmapShadowMixing = TryGetLocalKeyword(shader, ShaderKeywordStrings.LightmapShadowMixing); + m_ShadowsShadowMask = TryGetLocalKeyword(shader, ShaderKeywordStrings.ShadowsShadowMask); + m_Lightmap = TryGetLocalKeyword(shader, ShaderKeywordStrings.LIGHTMAP_ON); + m_DynamicLightmap = TryGetLocalKeyword(shader, ShaderKeywordStrings.DYNAMICLIGHTMAP_ON); + m_DirectionalLightmap = TryGetLocalKeyword(shader, ShaderKeywordStrings.DIRLIGHTMAP_COMBINED); + m_AlphaTestOn = TryGetLocalKeyword(shader, ShaderKeywordStrings._ALPHATEST_ON); + m_DeferredStencil = TryGetLocalKeyword(shader, ShaderKeywordStrings._DEFERRED_STENCIL); + m_GbufferNormalsOct = TryGetLocalKeyword(shader, ShaderKeywordStrings._GBUFFER_NORMALS_OCT); + m_UseDrawProcedural = TryGetLocalKeyword(shader, ShaderKeywordStrings.UseDrawProcedural); + m_ScreenSpaceOcclusion = TryGetLocalKeyword(shader, ShaderKeywordStrings.ScreenSpaceOcclusion); + m_UseFastSRGBLinearConversion = TryGetLocalKeyword(shader, ShaderKeywordStrings.UseFastSRGBLinearConversion); + m_LightLayers = TryGetLocalKeyword(shader, ShaderKeywordStrings.LightLayers); + m_RenderPassEnabled = TryGetLocalKeyword(shader, ShaderKeywordStrings.RenderPassEnabled); + m_DebugDisplay = TryGetLocalKeyword(shader, ShaderKeywordStrings.DEBUG_DISPLAY); + m_DBufferMRT1 = TryGetLocalKeyword(shader, ShaderKeywordStrings.DBufferMRT1); + m_DBufferMRT2 = TryGetLocalKeyword(shader, ShaderKeywordStrings.DBufferMRT2); + m_DBufferMRT3 = TryGetLocalKeyword(shader, ShaderKeywordStrings.DBufferMRT3); + m_DecalNormalBlendLow = TryGetLocalKeyword(shader, ShaderKeywordStrings.DecalNormalBlendLow); + m_DecalNormalBlendMedium = TryGetLocalKeyword(shader, ShaderKeywordStrings.DecalNormalBlendMedium); + m_DecalNormalBlendHigh = TryGetLocalKeyword(shader, ShaderKeywordStrings.DecalNormalBlendHigh); + m_ClusteredRendering = TryGetLocalKeyword(shader, ShaderKeywordStrings.ClusteredRendering); + m_EditorVisualization = TryGetLocalKeyword(shader, ShaderKeywordStrings.EDITOR_VISUALIZATION); + + m_LocalDetailMulx2 = TryGetLocalKeyword(shader, ShaderKeywordStrings._DETAIL_MULX2); + m_LocalDetailScaled = TryGetLocalKeyword(shader, ShaderKeywordStrings._DETAIL_SCALED); + m_LocalClearCoat = TryGetLocalKeyword(shader, ShaderKeywordStrings._CLEARCOAT); + m_LocalClearCoatMap = TryGetLocalKeyword(shader, ShaderKeywordStrings._CLEARCOATMAP); + + // Post processing + m_LensDistortion = TryGetLocalKeyword(shader, ShaderKeywordStrings.Distortion); + m_ChromaticAberration = TryGetLocalKeyword(shader, ShaderKeywordStrings.ChromaticAberration); + m_BloomLQ = TryGetLocalKeyword(shader, ShaderKeywordStrings.BloomLQ); + m_BloomHQ = TryGetLocalKeyword(shader, ShaderKeywordStrings.BloomHQ); + m_BloomLQDirt = TryGetLocalKeyword(shader, ShaderKeywordStrings.BloomLQDirt); + m_BloomHQDirt = TryGetLocalKeyword(shader, ShaderKeywordStrings.BloomHQDirt); + m_HdrGrading = TryGetLocalKeyword(shader, ShaderKeywordStrings.HDRGrading); + m_ToneMapACES = TryGetLocalKeyword(shader, ShaderKeywordStrings.TonemapACES); + m_ToneMapNeutral = TryGetLocalKeyword(shader, ShaderKeywordStrings.TonemapNeutral); + m_FilmGrain = TryGetLocalKeyword(shader, ShaderKeywordStrings.FilmGrain); } bool IsFeatureEnabled(ShaderFeatures featureMask, ShaderFeatures feature) @@ -118,6 +206,11 @@ bool IsFeatureEnabled(ShaderFeatures featureMask, ShaderFeatures feature) return (featureMask & feature) != 0; } + bool IsFeatureEnabled(VolumeFeatures featureMask, VolumeFeatures feature) + { + return (featureMask & feature) != 0; + } + bool StripUnusedPass(ShaderFeatures features, ShaderSnippetData snippetData) { // Meta pass is needed in the player for Enlighten Precomputed Realtime GI albedo and emission. @@ -151,10 +244,102 @@ bool StripUnusedPass(ShaderFeatures features, ShaderSnippetData snippetData) return false; } + struct StripTool where T : System.Enum + { + T m_Features; + Shader m_Shader; + ShaderKeywordSet m_KeywordSet; + ShaderSnippetData m_SnippetData; + bool m_stripUnusedVariants; + + public StripTool(T features, Shader shader, ShaderSnippetData snippetData, in ShaderKeywordSet keywordSet, bool stripUnusedVariants) + { + m_Features = features; + m_Shader = shader; + m_SnippetData = snippetData; + m_KeywordSet = keywordSet; + m_stripUnusedVariants = stripUnusedVariants; + } + + bool ContainsKeyword(in LocalKeyword kw) + { + return ShaderUtil.PassHasKeyword(m_Shader, m_SnippetData.pass, kw, m_SnippetData.shaderType); + } + + public bool StripMultiCompileKeepOffVariant(in LocalKeyword kw, T feature, in LocalKeyword kw2, T feature2, in LocalKeyword kw3, T feature3) + { + if (StripMultiCompileKeepOffVariant(kw, feature)) + return true; + if (StripMultiCompileKeepOffVariant(kw2, feature2)) + return true; + if (StripMultiCompileKeepOffVariant(kw3, feature3)) + return true; + return false; + } + + public bool StripMultiCompile(in LocalKeyword kw, T feature, in LocalKeyword kw2, T feature2, in LocalKeyword kw3, T feature3) + { + if (StripMultiCompileKeepOffVariant(kw, feature, kw2, feature2, kw3, feature3)) + return true; + + bool containsKeywords = ContainsKeyword(kw) && ContainsKeyword(kw2) && ContainsKeyword(kw3); + bool keywordsDisabled = !m_KeywordSet.IsEnabled(kw) && !m_KeywordSet.IsEnabled(kw2) && !m_KeywordSet.IsEnabled(kw3); + bool hasAnyFeatureEnabled = m_Features.HasFlag(feature) || m_Features.HasFlag(feature2) || m_Features.HasFlag(feature3); + if (m_stripUnusedVariants && containsKeywords && keywordsDisabled && hasAnyFeatureEnabled) + return true; + + return false; + } + + public bool StripMultiCompileKeepOffVariant(in LocalKeyword kw, T feature, in LocalKeyword kw2, T feature2) + { + if (StripMultiCompileKeepOffVariant(kw, feature)) + return true; + if (StripMultiCompileKeepOffVariant(kw2, feature2)) + return true; + return false; + } + + public bool StripMultiCompile(in LocalKeyword kw, T feature, in LocalKeyword kw2, T feature2) + { + if (StripMultiCompileKeepOffVariant(kw, feature, kw2, feature2)) + return true; + + bool containsKeywords = ContainsKeyword(kw) && ContainsKeyword(kw2); + bool keywordsDisabled = !m_KeywordSet.IsEnabled(kw) && !m_KeywordSet.IsEnabled(kw2); + bool hasAnyFeatureEnabled = m_Features.HasFlag(feature) || m_Features.HasFlag(feature2); + if (m_stripUnusedVariants && containsKeywords && keywordsDisabled && hasAnyFeatureEnabled) + return true; + + return false; + } + + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public bool StripMultiCompileKeepOffVariant(in LocalKeyword kw, T feature) + { + return !m_Features.HasFlag(feature) && m_KeywordSet.IsEnabled(kw); + } + + public bool StripMultiCompile(in LocalKeyword kw, T feature) + { + if (!m_Features.HasFlag(feature)) + { + if (m_KeywordSet.IsEnabled(kw)) + return true; + } + else if (m_stripUnusedVariants) + { + if (!m_KeywordSet.IsEnabled(kw) && ContainsKeyword(kw)) + return true; + } + return false; + } + } + bool StripUnusedFeatures(ShaderFeatures features, Shader shader, ShaderSnippetData snippetData, ShaderCompilerData compilerData) { var globalSettings = UniversalRenderPipelineGlobalSettings.instance; - bool stripDebugDisplayShaders = !Debug.isDebugBuild || (globalSettings == null || !globalSettings.supportRuntimeDebugDisplay); + bool stripDebugDisplayShaders = !Debug.isDebugBuild || (globalSettings == null || globalSettings.stripDebugVariants); #if XR_MANAGEMENT_4_0_1_OR_NEWER var buildTargetSettings = XRGeneralSettingsPerBuildTarget.XRGeneralSettingsForBuildTarget(BuildTargetGroup.Standalone); @@ -169,24 +354,19 @@ bool StripUnusedFeatures(ShaderFeatures features, Shader shader, ShaderSnippetDa return true; } - // strip main light shadows, cascade and screen variants - if (!IsFeatureEnabled(features, ShaderFeatures.MainLightShadows)) - { - if (compilerData.shaderKeywordSet.IsEnabled(m_MainLightShadows)) - return true; - - if (compilerData.shaderKeywordSet.IsEnabled(m_MainLightShadowsCascades)) - return true; + var stripUnusedVariants = UniversalRenderPipelineGlobalSettings.instance?.stripUnusedVariants == true; + var stripTool = new StripTool(features, shader, snippetData, compilerData.shaderKeywordSet, stripUnusedVariants); - if (compilerData.shaderKeywordSet.IsEnabled(m_MainLightShadowsScreen)) - return true; - - if (snippetData.passType == PassType.ShadowCaster && !compilerData.shaderKeywordSet.IsEnabled(m_CastingPunctualLightShadow)) - return true; - } + // strip main light shadows, cascade and screen variants + // TODO: Strip disabled keyword once no light will re-use same variant + if (stripTool.StripMultiCompileKeepOffVariant( + m_MainLightShadows, ShaderFeatures.MainLightShadows, + m_MainLightShadowsCascades, ShaderFeatures.MainLightShadowsCascade, + m_MainLightShadowsScreen, ShaderFeatures.ScreenSpaceShadows)) + return true; - bool isSoftShadow = compilerData.shaderKeywordSet.IsEnabled(m_SoftShadows); - if (!IsFeatureEnabled(features, ShaderFeatures.SoftShadows) && isSoftShadow) + // TODO: Strip off variants once we have global soft shadows option for forcing instead as support + if (stripTool.StripMultiCompileKeepOffVariant(m_SoftShadows, ShaderFeatures.SoftShadows)) return true; // Left for backward compatibility @@ -194,8 +374,7 @@ bool StripUnusedFeatures(ShaderFeatures features, Shader shader, ShaderSnippetDa !IsFeatureEnabled(features, ShaderFeatures.MixedLighting)) return true; - if (compilerData.shaderKeywordSet.IsEnabled(m_UseFastSRGBLinearConversion) && - !IsFeatureEnabled(features, ShaderFeatures.UseFastSRGBLinearConversion)) + if (stripTool.StripMultiCompile(m_UseFastSRGBLinearConversion, ShaderFeatures.UseFastSRGBLinearConversion)) return true; // Strip here only if mixed lighting is disabled @@ -205,81 +384,140 @@ bool StripUnusedFeatures(ShaderFeatures features, Shader shader, ShaderSnippetDa !IsFeatureEnabled(features, ShaderFeatures.MixedLighting)) return true; - if (compilerData.shaderKeywordSet.IsEnabled(m_LightLayers) && - !IsFeatureEnabled(features, ShaderFeatures.LightLayers)) - return true; + if (compilerData.shaderCompilerPlatform == ShaderCompilerPlatform.GLES20) + { + // GLES2 does not support bitwise operations. + if (compilerData.shaderKeywordSet.IsEnabled(m_LightLayers)) + return true; + } + else + { + if (stripTool.StripMultiCompile(m_LightLayers, ShaderFeatures.LightLayers)) + return true; + } - if (compilerData.shaderKeywordSet.IsEnabled(m_RenderPassEnabled) && - !IsFeatureEnabled(features, ShaderFeatures.RenderPassEnabled)) + if (stripTool.StripMultiCompile(m_RenderPassEnabled, ShaderFeatures.RenderPassEnabled)) return true; // No additional light shadows - bool isAdditionalLightShadow = compilerData.shaderKeywordSet.IsEnabled(m_AdditionalLightShadows); - if (!IsFeatureEnabled(features, ShaderFeatures.AdditionalLightShadows) && isAdditionalLightShadow) + // TODO: Strip off variants once we support no shadow lights re-use same variant + if (stripTool.StripMultiCompileKeepOffVariant(m_AdditionalLightShadows, ShaderFeatures.AdditionalLightShadows)) return true; - bool isReflectionProbeBlending = compilerData.shaderKeywordSet.IsEnabled(m_ReflectionProbeBlending); - if (!IsFeatureEnabled(features, ShaderFeatures.ReflectionProbeBlending) && isReflectionProbeBlending) + if (stripTool.StripMultiCompile(m_ReflectionProbeBlending, ShaderFeatures.ReflectionProbeBlending)) return true; - bool isReflectionProbeBoxProjection = compilerData.shaderKeywordSet.IsEnabled(m_ReflectionProbeBoxProjection); - if (!IsFeatureEnabled(features, ShaderFeatures.ReflectionProbeBoxProjection) && isReflectionProbeBoxProjection) + if (stripTool.StripMultiCompile(m_ReflectionProbeBoxProjection, ShaderFeatures.ReflectionProbeBoxProjection)) return true; - bool isPunctualLightShadowCasterPass = (snippetData.passType == PassType.ShadowCaster) && compilerData.shaderKeywordSet.IsEnabled(m_CastingPunctualLightShadow); - if (!IsFeatureEnabled(features, ShaderFeatures.AdditionalLightShadows) && isPunctualLightShadowCasterPass) - return true; + // Shadow caster punctual light strip + if (snippetData.passType == PassType.ShadowCaster && ShaderUtil.PassHasKeyword(shader, snippetData.pass, m_CastingPunctualLightShadow, snippetData.shaderType)) + { + if (!IsFeatureEnabled(features, ShaderFeatures.AdditionalLightShadows) && compilerData.shaderKeywordSet.IsEnabled(m_CastingPunctualLightShadow)) + return true; + + bool mainLightShadows = + !IsFeatureEnabled(features, ShaderFeatures.MainLightShadows) && + !IsFeatureEnabled(features, ShaderFeatures.MainLightShadowsCascade) && + !IsFeatureEnabled(features, ShaderFeatures.ScreenSpaceShadows); + if (mainLightShadows && !compilerData.shaderKeywordSet.IsEnabled(m_CastingPunctualLightShadow)) + return true; + } // Additional light are shaded per-vertex or per-pixel. - bool isFeaturePerPixelLightingEnabled = IsFeatureEnabled(features, ShaderFeatures.AdditionalLights); - bool isFeaturePerVertexLightingEnabled = IsFeatureEnabled(features, ShaderFeatures.VertexLighting); - bool clusteredRendering = IsFeatureEnabled(features, ShaderFeatures.ClusteredRendering); - bool isAdditionalLightPerPixel = compilerData.shaderKeywordSet.IsEnabled(m_AdditionalLightsPixel); - bool isAdditionalLightPerVertex = compilerData.shaderKeywordSet.IsEnabled(m_AdditionalLightsVertex); + // TODO: Strip off variants once we support no additional lights re-used variants + if (stripTool.StripMultiCompileKeepOffVariant(m_AdditionalLightsVertex, ShaderFeatures.VertexLighting, + m_AdditionalLightsPixel, ShaderFeatures.AdditionalLights)) + return true; + + if (stripTool.StripMultiCompile(m_ClusteredRendering, ShaderFeatures.ClusteredRendering)) + return true; + + // Screen Space Occlusion + if (IsFeatureEnabled(features, ShaderFeatures.ScreenSpaceOcclusionAfterOpaque)) + { + // SSAO after opaque setting requires off variants + if (stripTool.StripMultiCompileKeepOffVariant(m_ScreenSpaceOcclusion, ShaderFeatures.ScreenSpaceOcclusion)) + return true; + } + else + { + if (stripTool.StripMultiCompile(m_ScreenSpaceOcclusion, ShaderFeatures.ScreenSpaceOcclusion)) + return true; + } + + // Decal DBuffer + if (stripTool.StripMultiCompile( + m_DBufferMRT1, ShaderFeatures.DBufferMRT1, + m_DBufferMRT2, ShaderFeatures.DBufferMRT2, + m_DBufferMRT3, ShaderFeatures.DBufferMRT3)) + return true; + + // TODO: Test against lightMode tag instead. + if (snippetData.passName == kPassNameGBuffer) + { + if (!IsFeatureEnabled(features, ShaderFeatures.DeferredShading)) + return true; + } - // Strip if Per-Pixel lighting is NOT used in the project and the - // Per-Pixel (_ADDITIONAL_LIGHTS) variant is enabled in the shader. - if (!isFeaturePerPixelLightingEnabled && isAdditionalLightPerPixel) + // Do not strip accurateGbufferNormals on Mobile Vulkan as some GPUs do not support R8G8B8A8_SNorm, which then force us to use accurateGbufferNormals + if (compilerData.shaderCompilerPlatform != ShaderCompilerPlatform.Vulkan && + stripTool.StripMultiCompile(m_GbufferNormalsOct, ShaderFeatures.AccurateGbufferNormals)) return true; - // Strip if Per-Vertex lighting is NOT used in the project and the - // Per-Vertex (_ADDITIONAL_LIGHTS_VERTEX) variant is enabled in the shader. - if (!isFeaturePerVertexLightingEnabled && isAdditionalLightPerVertex) + if (compilerData.shaderKeywordSet.IsEnabled(m_UseDrawProcedural) && + !IsFeatureEnabled(features, ShaderFeatures.DrawProcedural)) return true; - if (!clusteredRendering && compilerData.shaderKeywordSet.IsEnabled(m_ClusteredRendering)) + // Decal Normal Blend + if (stripTool.StripMultiCompile( + m_DecalNormalBlendLow, ShaderFeatures.DecalNormalBlendLow, + m_DecalNormalBlendMedium, ShaderFeatures.DecalNormalBlendMedium, + m_DecalNormalBlendHigh, ShaderFeatures.DecalNormalBlendHigh)) return true; - // Screen Space Shadows - if (!IsFeatureEnabled(features, ShaderFeatures.ScreenSpaceShadows) && - compilerData.shaderKeywordSet.IsEnabled(m_MainLightShadowsScreen)) + return false; + } + + bool StripVolumeFeatures(VolumeFeatures features, Shader shader, ShaderSnippetData snippetData, ShaderCompilerData compilerData) + { + var stripUnusedVariants = UniversalRenderPipelineGlobalSettings.instance?.stripUnusedVariants == true; + var stripTool = new StripTool(features, shader, snippetData, compilerData.shaderKeywordSet, stripUnusedVariants); + + if (stripTool.StripMultiCompileKeepOffVariant(m_LensDistortion, VolumeFeatures.LensDistortion)) return true; - // Screen Space Occlusion - if (!IsFeatureEnabled(features, ShaderFeatures.ScreenSpaceOcclusion) && - compilerData.shaderKeywordSet.IsEnabled(m_ScreenSpaceOcclusion)) + if (stripTool.StripMultiCompileKeepOffVariant(m_ChromaticAberration, VolumeFeatures.ChromaticAberration)) return true; - // Decal DBuffer - if (!IsFeatureEnabled(features, ShaderFeatures.DBufferMRT1) && - compilerData.shaderKeywordSet.IsEnabled(m_DBufferMRT1)) + if (stripTool.StripMultiCompileKeepOffVariant(m_BloomLQ, VolumeFeatures.Bloom)) + return true; + if (stripTool.StripMultiCompileKeepOffVariant(m_BloomHQ, VolumeFeatures.Bloom)) return true; - if (!IsFeatureEnabled(features, ShaderFeatures.DBufferMRT2) && - compilerData.shaderKeywordSet.IsEnabled(m_DBufferMRT2)) + if (stripTool.StripMultiCompileKeepOffVariant(m_BloomLQDirt, VolumeFeatures.Bloom)) return true; - if (!IsFeatureEnabled(features, ShaderFeatures.DBufferMRT3) && - compilerData.shaderKeywordSet.IsEnabled(m_DBufferMRT3)) + if (stripTool.StripMultiCompileKeepOffVariant(m_BloomHQDirt, VolumeFeatures.Bloom)) return true; - // Decal Normal Blend - if (!IsFeatureEnabled(features, ShaderFeatures.DecalNormalBlendLow) && - compilerData.shaderKeywordSet.IsEnabled(m_DecalNormalBlendLow)) + if (stripTool.StripMultiCompileKeepOffVariant(m_HdrGrading, VolumeFeatures.ToneMaping)) + return true; + if (stripTool.StripMultiCompileKeepOffVariant(m_ToneMapACES, VolumeFeatures.ToneMaping)) + return true; + if (stripTool.StripMultiCompileKeepOffVariant(m_ToneMapNeutral, VolumeFeatures.ToneMaping)) + return true; + if (stripTool.StripMultiCompileKeepOffVariant(m_FilmGrain, VolumeFeatures.FilmGrain)) return true; - if (!IsFeatureEnabled(features, ShaderFeatures.DecalNormalBlendMedium) && - compilerData.shaderKeywordSet.IsEnabled(m_DecalNormalBlendMedium)) + + // Strip post processing shaders + if (shader == m_BokehDepthOfField && !IsFeatureEnabled(ShaderBuildPreprocessor.volumeFeatures, VolumeFeatures.DepthOfField)) + return true; + if (shader == m_GaussianDepthOfField && !IsFeatureEnabled(ShaderBuildPreprocessor.volumeFeatures, VolumeFeatures.DepthOfField)) + return true; + if (shader == m_CameraMotionBlur && !IsFeatureEnabled(ShaderBuildPreprocessor.volumeFeatures, VolumeFeatures.CameraMotionBlur)) return true; - if (!IsFeatureEnabled(features, ShaderFeatures.DecalNormalBlendHigh) && - compilerData.shaderKeywordSet.IsEnabled(m_DecalNormalBlendHigh)) + if (shader == m_PaniniProjection && !IsFeatureEnabled(ShaderBuildPreprocessor.volumeFeatures, VolumeFeatures.PaniniProjection)) + return true; + if (shader == m_Bloom && !IsFeatureEnabled(ShaderBuildPreprocessor.volumeFeatures, VolumeFeatures.Bloom)) return true; return false; @@ -342,6 +580,17 @@ bool StripInvalidVariants(ShaderCompilerData compilerData) return false; } + bool StripUnusedShaders(ShaderFeatures features, Shader shader) + { + if (!IsFeatureEnabled(features, ShaderFeatures.DeferredShading)) + { + if (shader == StencilDeferred) + return true; + } + + return false; + } + bool StripUnused(ShaderFeatures features, Shader shader, ShaderSnippetData snippetData, ShaderCompilerData compilerData) { if (StripUnusedFeatures(features, shader, snippetData, compilerData)) @@ -356,6 +605,12 @@ bool StripUnused(ShaderFeatures features, Shader shader, ShaderSnippetData snipp if (StripUnusedPass(features, snippetData)) return true; + if (UniversalRenderPipelineGlobalSettings.instance?.stripUnusedVariants == true) + { + if (StripUnusedShaders(features, shader)) + return true; + } + // Strip terrain holes // TODO: checking for the string name here is expensive // maybe we can rename alpha clip keyword name to be specific to terrain? @@ -364,22 +619,10 @@ bool StripUnused(ShaderFeatures features, Shader shader, ShaderSnippetData snipp shader.name.Contains(kTerrainShaderName)) return true; - // TODO: Test against lightMode tag instead. - if (snippetData.passName == kPassNameGBuffer) - { - if (!IsFeatureEnabled(features, ShaderFeatures.DeferredShading)) - return true; - - // Do not strip accurateGbufferNormals on Mobile Vulkan as some GPUs do not support R8G8B8A8_SNorm, which then force us to use accurateGbufferNormals - if (!IsFeatureEnabled(features, ShaderFeatures.DeferredWithAccurateGbufferNormals) && compilerData.shaderKeywordSet.IsEnabled(m_GbufferNormalsOct) && compilerData.shaderCompilerPlatform != ShaderCompilerPlatform.Vulkan) - return true; - if (!IsFeatureEnabled(features, ShaderFeatures.DeferredWithoutAccurateGbufferNormals) && !compilerData.shaderKeywordSet.IsEnabled(m_GbufferNormalsOct)) - return true; - } return false; } - void LogShaderVariants(Shader shader, ShaderSnippetData snippetData, ShaderVariantLogLevel logLevel, int prevVariantsCount, int currVariantsCount) + void LogShaderVariants(Shader shader, ShaderSnippetData snippetData, ShaderVariantLogLevel logLevel, int prevVariantsCount, int currVariantsCount, double stripTimeMs) { if (logLevel == ShaderVariantLogLevel.AllShaders || shader.name.Contains("Universal Render Pipeline")) { @@ -387,10 +630,10 @@ void LogShaderVariants(Shader shader, ShaderSnippetData snippetData, ShaderVaria float percentageTotal = (float)m_TotalVariantsOutputCount / (float)m_TotalVariantsInputCount * 100f; string result = string.Format("STRIPPING: {0} ({1} pass) ({2}) -" + - " Remaining shader variants = {3}/{4} = {5}% - Total = {6}/{7} = {8}%", + " Remaining shader variants = {3}/{4} = {5}% - Total = {6}/{7} = {8}% TimeMs={9}", shader.name, snippetData.passName, snippetData.shaderType.ToString(), currVariantsCount, prevVariantsCount, percentageCurrent, m_TotalVariantsOutputCount, m_TotalVariantsInputCount, - percentageTotal); + percentageTotal, stripTimeMs); Debug.Log(result); } } @@ -405,16 +648,16 @@ public void OnProcessShader(Shader shader, ShaderSnippetData snippetData, IList< if (urpAsset == null || compilerDataList == null || compilerDataList.Count == 0) return; - // Local Keywords need to be initialized with the shader - InitializeLocalShaderKeywords(shader); - m_stripTimer.Start(); + InitializeLocalShaderKeywords(shader); + int prevVariantCount = compilerDataList.Count; var inputShaderVariantCount = compilerDataList.Count; for (int i = 0; i < inputShaderVariantCount;) { bool removeInput = true; + foreach (var supportedFeatures in ShaderBuildPreprocessor.supportedFeaturesList) { if (!StripUnused(supportedFeatures, shader, snippetData, compilerDataList[i])) @@ -424,6 +667,14 @@ public void OnProcessShader(Shader shader, ShaderSnippetData snippetData, IList< } } + if (UniversalRenderPipelineGlobalSettings.instance?.stripUnusedPostProcessingVariants == true) + { + if (!removeInput && StripVolumeFeatures(ShaderBuildPreprocessor.volumeFeatures, shader, snippetData, compilerDataList[i])) + { + removeInput = true; + } + } + // Remove at swap back if (removeInput) compilerDataList[i] = compilerDataList[--inputShaderVariantCount]; @@ -439,15 +690,16 @@ public void OnProcessShader(Shader shader, ShaderSnippetData snippetData, IList< compilerDataList.RemoveAt(i); } + m_stripTimer.Stop(); + double stripTimeMs = m_stripTimer.Elapsed.TotalMilliseconds; + m_stripTimer.Reset(); + if (urpAsset.shaderVariantLogLevel != ShaderVariantLogLevel.Disabled) { m_TotalVariantsInputCount += prevVariantCount; m_TotalVariantsOutputCount += compilerDataList.Count; - LogShaderVariants(shader, snippetData, urpAsset.shaderVariantLogLevel, prevVariantCount, compilerDataList.Count); + LogShaderVariants(shader, snippetData, urpAsset.shaderVariantLogLevel, prevVariantCount, compilerDataList.Count, stripTimeMs); } - m_stripTimer.Stop(); - double stripTimeMs = m_stripTimer.Elapsed.TotalMilliseconds; - m_stripTimer.Reset(); #if PROFILE_BUILD Profiler.EndSample(); @@ -472,6 +724,16 @@ public static List supportedFeaturesList private static List s_SupportedFeaturesList = new List(); + public static VolumeFeatures volumeFeatures + { + get + { + if (s_VolumeFeatures == VolumeFeatures.None) + FetchAllSupportedFeaturesFromVolumes(); + return s_VolumeFeatures; + } + } + private static VolumeFeatures s_VolumeFeatures; public int callbackOrder { get { return 0; } } #if PROFILE_BUILD @@ -485,6 +747,7 @@ public void OnPostprocessBuild(BuildReport report) public void OnPreprocessBuild(BuildReport report) { FetchAllSupportedFeatures(); + FetchAllSupportedFeaturesFromVolumes(); #if PROFILE_BUILD Profiler.enableBinaryLog = true; Profiler.logFile = "profilerlog.raw"; @@ -492,13 +755,59 @@ public void OnPreprocessBuild(BuildReport report) #endif } + static bool TryGetRenderPipelineAssetsForBuildTarget(BuildTarget buildTarget, List urps) + { + var qualitySettings = new SerializedObject(QualitySettings.GetQualitySettings()); + if (qualitySettings == null) + return false; + + var property = qualitySettings.FindProperty("m_QualitySettings"); + if (property == null) + return false; + + var activeBuildTargetGroup = BuildPipeline.GetBuildTargetGroup(buildTarget); + var activeBuildTargetGroupName = activeBuildTargetGroup.ToString(); + + for (int i = 0; i < property.arraySize; i++) + { + bool isExcluded = false; + + var excludedTargetPlatforms = property.GetArrayElementAtIndex(i).FindPropertyRelative("excludedTargetPlatforms"); + if (excludedTargetPlatforms == null) + return false; + + foreach (SerializedProperty excludedTargetPlatform in excludedTargetPlatforms) + { + var excludedBuildTargetGroupName = excludedTargetPlatform.stringValue; + if (activeBuildTargetGroupName == excludedBuildTargetGroupName) + { + Debug.Log($"Excluding quality level {QualitySettings.names[i]} from stripping."); // TODO: remove after QA + isExcluded = true; + break; + } + } + + if (!isExcluded) + urps.Add(QualitySettings.GetRenderPipelineAssetAt(i) as UniversalRenderPipelineAsset); + } + + return true; + } + private static void FetchAllSupportedFeatures() { List urps = new List(); urps.Add(GraphicsSettings.defaultRenderPipeline as UniversalRenderPipelineAsset); - for (int i = 0; i < QualitySettings.names.Length; i++) + + // TODO: Replace once we have official API for filtering urps per build target + if (!TryGetRenderPipelineAssetsForBuildTarget(EditorUserBuildSettings.activeBuildTarget, urps)) { - urps.Add(QualitySettings.GetRenderPipelineAssetAt(i) as UniversalRenderPipelineAsset); + // Fallback + Debug.LogWarning("Shader stripping per enabled quality levels failed! Stripping will use all quality levels. Please report a bug!"); + for (int i = 0; i < QualitySettings.names.Length; i++) + { + urps.Add(QualitySettings.GetRenderPipelineAssetAt(i) as UniversalRenderPipelineAsset); + } } s_SupportedFeaturesList.Clear(); @@ -507,18 +816,63 @@ private static void FetchAllSupportedFeatures() { if (urp != null) { - s_SupportedFeaturesList.Add(GetSupportedShaderFeatures(urp)); + int rendererCount = urp.m_RendererDataList.Length; + + for (int i = 0; i < rendererCount; ++i) + s_SupportedFeaturesList.Add(GetSupportedShaderFeatures(urp, i)); } } } - private static ShaderFeatures GetSupportedShaderFeatures(UniversalRenderPipelineAsset pipelineAsset) + private static void FetchAllSupportedFeaturesFromVolumes() + { + if (UniversalRenderPipelineGlobalSettings.instance?.stripUnusedPostProcessingVariants == false) + return; + + s_VolumeFeatures = VolumeFeatures.Calculated; + var guids = AssetDatabase.FindAssets("t:VolumeProfile"); + foreach (var guid in guids) + { + var path = AssetDatabase.GUIDToAssetPath(guid); + + // We only care what is in assets folder + if (!path.StartsWith("Assets")) + continue; + + var asset = AssetDatabase.LoadAssetAtPath(path); + if (asset == null) + continue; + + if (asset.Has()) + s_VolumeFeatures |= VolumeFeatures.LensDistortion; + if (asset.Has()) + s_VolumeFeatures |= VolumeFeatures.Bloom; + if (asset.Has()) + s_VolumeFeatures |= VolumeFeatures.ToneMaping; + if (asset.Has()) + s_VolumeFeatures |= VolumeFeatures.FilmGrain; + if (asset.Has()) + s_VolumeFeatures |= VolumeFeatures.DepthOfField; + if (asset.Has()) + s_VolumeFeatures |= VolumeFeatures.CameraMotionBlur; + if (asset.Has()) + s_VolumeFeatures |= VolumeFeatures.PaniniProjection; + if (asset.Has()) + s_VolumeFeatures |= VolumeFeatures.ChromaticAberration; + } + } + + private static ShaderFeatures GetSupportedShaderFeatures(UniversalRenderPipelineAsset pipelineAsset, int rendererIndex) { ShaderFeatures shaderFeatures; shaderFeatures = ShaderFeatures.MainLight; if (pipelineAsset.supportsMainLightShadows) + { + // User can change cascade count at runtime, so we have to include both of them for now shaderFeatures |= ShaderFeatures.MainLightShadows; + shaderFeatures |= ShaderFeatures.MainLightShadowsCascade; + } if (pipelineAsset.additionalLightsRenderingMode == LightRenderingMode.PerVertex) { @@ -549,14 +903,11 @@ private static ShaderFeatures GetSupportedShaderFeatures(UniversalRenderPipeline bool hasScreenSpaceShadows = false; bool hasScreenSpaceOcclusion = false; bool hasDeferredRenderer = false; - bool withAccurateGbufferNormals = false; - bool withoutAccurateGbufferNormals = false; + bool accurateGbufferNormals = false; bool clusteredRendering = false; bool onlyClusteredRendering = false; bool usesRenderPass = false; - int rendererCount = pipelineAsset.m_RendererDataList.Length; - for (int rendererIndex = 0; rendererIndex < rendererCount; ++rendererIndex) { ScriptableRenderer renderer = pipelineAsset.GetRenderer(rendererIndex); if (renderer is UniversalRenderer) @@ -565,8 +916,7 @@ private static ShaderFeatures GetSupportedShaderFeatures(UniversalRenderPipeline if (universalRenderer.renderingMode == RenderingMode.Deferred) { hasDeferredRenderer |= true; - withAccurateGbufferNormals |= universalRenderer.accurateGbufferNormals; - withoutAccurateGbufferNormals |= !universalRenderer.accurateGbufferNormals; + accurateGbufferNormals |= universalRenderer.accurateGbufferNormals; usesRenderPass |= universalRenderer.useRenderPassEnabled; } } @@ -587,6 +937,9 @@ private static ShaderFeatures GetSupportedShaderFeatures(UniversalRenderPipeline ScreenSpaceAmbientOcclusion ssao = rendererFeature as ScreenSpaceAmbientOcclusion; hasScreenSpaceOcclusion |= ssao != null; + if (ssao?.afterOpaque ?? false) + shaderFeatures |= ShaderFeatures.ScreenSpaceOcclusionAfterOpaque; + // Check for Decal Renderer Feature DecalRendererFeature decal = rendererFeature as DecalRendererFeature; if (decal != null) @@ -613,6 +966,11 @@ private static ShaderFeatures GetSupportedShaderFeatures(UniversalRenderPipeline { rendererClustered = universalRendererData.renderingMode == RenderingMode.Forward && universalRendererData.clusteredRendering; + +#if ENABLE_VR && ENABLE_XR_MODULE + if (universalRendererData.xrSystemData != null) + shaderFeatures |= ShaderFeatures.DrawProcedural; +#endif } } @@ -623,12 +981,8 @@ private static ShaderFeatures GetSupportedShaderFeatures(UniversalRenderPipeline if (hasDeferredRenderer) shaderFeatures |= ShaderFeatures.DeferredShading; - // We can only strip accurateGbufferNormals related variants if all DeferredRenderers use the same option. - if (withAccurateGbufferNormals) - shaderFeatures |= ShaderFeatures.DeferredWithAccurateGbufferNormals; - - if (withoutAccurateGbufferNormals) - shaderFeatures |= ShaderFeatures.DeferredWithoutAccurateGbufferNormals; + if (accurateGbufferNormals) + shaderFeatures |= ShaderFeatures.AccurateGbufferNormals; if (hasScreenSpaceShadows) shaderFeatures |= ShaderFeatures.ScreenSpaceShadows; diff --git a/com.unity.render-pipelines.universal/Runtime/Decal/Entities/DecalUpdateCachedSystem.cs b/com.unity.render-pipelines.universal/Runtime/Decal/Entities/DecalUpdateCachedSystem.cs index b3d680d8449..5823c692c9d 100644 --- a/com.unity.render-pipelines.universal/Runtime/Decal/Entities/DecalUpdateCachedSystem.cs +++ b/com.unity.render-pipelines.universal/Runtime/Decal/Entities/DecalUpdateCachedSystem.cs @@ -174,7 +174,7 @@ private void Execute(DecalEntityChunk entityChunk, DecalCachedChunk cachedChunk, decalToWorlds = cachedChunk.decalToWorlds, normalToWorlds = cachedChunk.normalToWorlds, boundingSpheres = cachedChunk.boundingSpheres, - minDistance = 0.0001f, + minDistance = System.Single.Epsilon, }; var handle = updateTransformJob.Schedule(entityChunk.transformAccessArray); diff --git a/com.unity.render-pipelines.universal/Runtime/Passes/FinalBlitPass.cs b/com.unity.render-pipelines.universal/Runtime/Passes/FinalBlitPass.cs index 72f516bb227..3b1f0cfb827 100644 --- a/com.unity.render-pipelines.universal/Runtime/Passes/FinalBlitPass.cs +++ b/com.unity.render-pipelines.universal/Runtime/Passes/FinalBlitPass.cs @@ -97,6 +97,7 @@ public override void Execute(ScriptableRenderContext context, ref RenderingData RenderBufferLoadAction.DontCare, RenderBufferStoreAction.Store, // color RenderBufferLoadAction.DontCare, RenderBufferStoreAction.DontCare); // depth cmd.Blit(m_Source, cameraTarget, m_BlitMaterial); + cameraData.renderer.ConfigureCameraTarget(cameraTarget, cameraTarget); } else { @@ -116,6 +117,7 @@ public override void Execute(ScriptableRenderContext context, ref RenderingData cmd.SetViewport(cameraData.pixelRect); cmd.DrawMesh(RenderingUtils.fullscreenMesh, Matrix4x4.identity, m_BlitMaterial); cmd.SetViewProjectionMatrices(camera.worldToCameraMatrix, camera.projectionMatrix); + cameraData.renderer.ConfigureCameraTarget(cameraTarget, cameraTarget); } } diff --git a/com.unity.render-pipelines.universal/Runtime/Passes/PostProcessPass.cs b/com.unity.render-pipelines.universal/Runtime/Passes/PostProcessPass.cs index 619edfa04ff..4391cfec4cc 100644 --- a/com.unity.render-pipelines.universal/Runtime/Passes/PostProcessPass.cs +++ b/com.unity.render-pipelines.universal/Runtime/Passes/PostProcessPass.cs @@ -185,6 +185,8 @@ public void SetupFinalPass(in RenderTargetHandle source, bool useSwapBuffer = fa /// public override void OnCameraSetup(CommandBuffer cmd, ref RenderingData renderingData) { + overrideCameraTarget = true; + if (m_Destination == RenderTargetHandle.CameraTarget) return; @@ -329,6 +331,24 @@ void Render(CommandBuffer cmd, ref RenderingData renderingData) { ref CameraData cameraData = ref renderingData.cameraData; ref ScriptableRenderer renderer = ref cameraData.renderer; + bool isSceneViewCamera = cameraData.isSceneViewCamera; + + //Check amount of swaps we have to do + //We blit back and forth without msaa untill the last blit. + bool useStopNan = cameraData.isStopNaNEnabled && m_Materials.stopNaN != null; + bool useSubPixeMorpAA = cameraData.antialiasing == AntialiasingMode.SubpixelMorphologicalAntiAliasing && SystemInfo.graphicsDeviceType != GraphicsDeviceType.OpenGLES2; + var dofMaterial = m_DepthOfField.mode.value == DepthOfFieldMode.Gaussian ? m_Materials.gaussianDepthOfField : m_Materials.bokehDepthOfField; + bool useDepthOfField = m_DepthOfField.IsActive() && !isSceneViewCamera && dofMaterial != null; + bool useLensFlare = !LensFlareCommonSRP.Instance.IsEmpty(); + bool useMotionBlur = m_MotionBlur.IsActive() && !isSceneViewCamera; + bool usePaniniProjection = m_PaniniProjection.IsActive() && !isSceneViewCamera; + + int amountOfPassesRemaining = (useStopNan ? 1 : 0) + (useSubPixeMorpAA ? 1 : 0) + (useDepthOfField ? 1 : 0) + (useLensFlare ? 1 : 0) + (useMotionBlur ? 1 : 0) + (usePaniniProjection ? 1 : 0); + + if (m_UseSwapBuffer && amountOfPassesRemaining > 0) + { + renderer.EnableSwapBufferMSAA(false); + } // Don't use these directly unless you have a good reason to, use GetSource() and // GetDestination() instead @@ -336,7 +356,6 @@ void Render(CommandBuffer cmd, ref RenderingData renderingData) bool tempTarget2Used = false; RenderTargetIdentifier source = m_UseSwapBuffer ? renderer.cameraColorTarget : m_Source; RenderTargetIdentifier destination = m_UseSwapBuffer ? renderer.GetCameraColorFrontBuffer(cmd) : -1; - bool isSceneViewCamera = cameraData.isSceneViewCamera; RenderTargetIdentifier GetSource() => source; @@ -365,8 +384,15 @@ RenderTargetIdentifier GetDestination() void Swap(ref ScriptableRenderer r) { + --amountOfPassesRemaining; if (m_UseSwapBuffer) { + //we want the last blit to be to MSAA + if (amountOfPassesRemaining == 0 && !m_HasFinalPass) + { + r.EnableSwapBufferMSAA(true); + } + r.SwapColorBuffer(cmd); source = r.cameraColorTarget; destination = r.GetCameraColorFrontBuffer(cmd); @@ -382,7 +408,7 @@ void Swap(ref ScriptableRenderer r) // Optional NaN killer before post-processing kicks in // stopNaN may be null on Adreno 3xx. It doesn't support full shader level 3.5, but SystemInfo.graphicsShaderLevel is 35. - if (cameraData.isStopNaNEnabled && m_Materials.stopNaN != null) + if (useStopNan) { using (new ProfilingScope(cmd, ProfilingSampler.Get(URPProfileId.StopNaNs))) { @@ -396,7 +422,7 @@ void Swap(ref ScriptableRenderer r) } // Anti-aliasing - if (cameraData.antialiasing == AntialiasingMode.SubpixelMorphologicalAntiAliasing && SystemInfo.graphicsDeviceType != GraphicsDeviceType.OpenGLES2) + if (useSubPixeMorpAA) { using (new ProfilingScope(cmd, ProfilingSampler.Get(URPProfileId.SMAA))) { @@ -408,8 +434,7 @@ void Swap(ref ScriptableRenderer r) // Depth of Field // Adreno 3xx SystemInfo.graphicsShaderLevel is 35, but instancing support is disabled due to buggy drivers. // DOF shader uses #pragma target 3.5 which adds requirement for instancing support, thus marking the shader unsupported on those devices. - var dofMaterial = m_DepthOfField.mode.value == DepthOfFieldMode.Gaussian ? m_Materials.gaussianDepthOfField : m_Materials.bokehDepthOfField; - if (m_DepthOfField.IsActive() && !isSceneViewCamera && dofMaterial != null) + if (useDepthOfField) { var markerName = m_DepthOfField.mode.value == DepthOfFieldMode.Gaussian ? URPProfileId.GaussianDepthOfField @@ -423,7 +448,7 @@ void Swap(ref ScriptableRenderer r) } // Motion blur - if (m_MotionBlur.IsActive() && !isSceneViewCamera) + if (useMotionBlur) { using (new ProfilingScope(cmd, ProfilingSampler.Get(URPProfileId.MotionBlur))) { @@ -434,7 +459,7 @@ void Swap(ref ScriptableRenderer r) // Panini projection is done as a fullscreen pass after all depth-based effects are done // and before bloom kicks in - if (m_PaniniProjection.IsActive() && !isSceneViewCamera) + if (usePaniniProjection) { using (new ProfilingScope(cmd, ProfilingSampler.Get(URPProfileId.PaniniProjection))) { @@ -444,7 +469,7 @@ void Swap(ref ScriptableRenderer r) } // Lens Flare - if (!LensFlareCommonSRP.Instance.IsEmpty()) + if (useLensFlare) { bool usePanini; float paniniDistance; @@ -565,6 +590,7 @@ void Swap(ref ScriptableRenderer r) #endif { cmd.SetRenderTarget(cameraTarget, colorLoadAction, RenderBufferStoreAction.Store, RenderBufferLoadAction.DontCare, RenderBufferStoreAction.DontCare); + cameraData.renderer.ConfigureCameraTarget(cameraTarget, cameraTarget); cmd.SetViewProjectionMatrices(Matrix4x4.identity, Matrix4x4.identity); if ((m_Destination == RenderTargetHandle.CameraTarget && !m_UseSwapBuffer) || m_ResolveToScreen) @@ -600,6 +626,8 @@ void Swap(ref ScriptableRenderer r) if (tempTarget2Used) cmd.ReleaseTemporaryRT(ShaderConstants._TempTarget2); + + cmd.ReleaseTemporaryRT(m_InternalLut.id); } } @@ -1401,6 +1429,7 @@ void RenderFinalPass(CommandBuffer cmd, ref RenderingData renderingData) cmd.SetViewport(cameraData.pixelRect); cmd.DrawMesh(RenderingUtils.fullscreenMesh, Matrix4x4.identity, material); cmd.SetViewProjectionMatrices(cameraData.camera.worldToCameraMatrix, cameraData.camera.projectionMatrix); + cameraData.renderer.ConfigureCameraTarget(cameraTarget, cameraTarget); } } diff --git a/com.unity.render-pipelines.universal/Runtime/RenderTargetBufferSystem.cs b/com.unity.render-pipelines.universal/Runtime/RenderTargetBufferSystem.cs index 4e3ab816297..222849288eb 100644 --- a/com.unity.render-pipelines.universal/Runtime/RenderTargetBufferSystem.cs +++ b/com.unity.render-pipelines.universal/Runtime/RenderTargetBufferSystem.cs @@ -10,68 +10,115 @@ namespace UnityEngine.Rendering.Universal.Internal //NOTE: This class is meant to be removed when RTHandles get implemented in urp internal sealed class RenderTargetBufferSystem { - RenderTargetHandle RTA; - RenderTargetHandle RTB; - bool m_FirstIsBackBuffer = true; - RenderTextureDescriptor m_Desc; - FilterMode m_FilterMode; - - int m_NameA; - int m_NameB; + struct SwapBuffer + { + public RenderTargetHandle rt; + public int name; + public int msaa; + } + SwapBuffer m_A, m_B; + static bool m_AisBackBuffer = true; + static RenderTextureDescriptor m_Desc; + FilterMode m_FilterMode; + bool m_AllowMSAA = true; bool m_RTisAllocated = false; + SwapBuffer backBuffer { get { return m_AisBackBuffer ? m_A : m_B; } } + SwapBuffer frontBuffer { get { return m_AisBackBuffer ? m_B : m_A; } } + public RenderTargetBufferSystem(string name) { - m_NameA = Shader.PropertyToID(name + "A"); - m_NameB = Shader.PropertyToID(name + "B"); - RTA.Init(name + "A"); - RTB.Init(name + "B"); + m_A.name = Shader.PropertyToID(name + "A"); + m_B.name = Shader.PropertyToID(name + "B"); + m_A.rt.Init(name + "A"); + m_B.rt.Init(name + "B"); } public RenderTargetHandle GetBackBuffer() { - return m_FirstIsBackBuffer ? RTA : RTB; + return backBuffer.rt; } public RenderTargetHandle GetBackBuffer(CommandBuffer cmd) { if (!m_RTisAllocated) Initialize(cmd); - return m_FirstIsBackBuffer ? RTA : RTB; + return backBuffer.rt; } public RenderTargetHandle GetFrontBuffer(CommandBuffer cmd) { if (!m_RTisAllocated) Initialize(cmd); - return m_FirstIsBackBuffer ? RTB : RTA; + + int pipelineMSAA = m_Desc.msaaSamples; + int bufferMSAA = frontBuffer.msaa; + + if (m_AllowMSAA && bufferMSAA != pipelineMSAA) + { + //We don't want a depth buffer on B buffer + var desc = m_Desc; + if (m_AisBackBuffer) + desc.depthBufferBits = 0; + + cmd.ReleaseTemporaryRT(frontBuffer.name); + cmd.GetTemporaryRT(frontBuffer.name, desc, m_FilterMode); + + if (m_AisBackBuffer) + m_B.msaa = desc.msaaSamples; + else m_A.msaa = desc.msaaSamples; + } + else if (!m_AllowMSAA && bufferMSAA > 1) + { + //We don't want a depth buffer on B buffer + var desc = m_Desc; + desc.msaaSamples = 1; + if (m_AisBackBuffer) + desc.depthBufferBits = 0; + + cmd.ReleaseTemporaryRT(frontBuffer.name); + cmd.GetTemporaryRT(frontBuffer.name, desc, m_FilterMode); + + if (m_AisBackBuffer) + m_B.msaa = desc.msaaSamples; + else m_A.msaa = desc.msaaSamples; + } + + return frontBuffer.rt; } public void Swap() { - m_FirstIsBackBuffer = !m_FirstIsBackBuffer; + m_AisBackBuffer = !m_AisBackBuffer; } void Initialize(CommandBuffer cmd) { - cmd.GetTemporaryRT(m_NameA, m_Desc, m_FilterMode); + m_A.msaa = m_Desc.msaaSamples; + m_B.msaa = m_Desc.msaaSamples; + + cmd.GetTemporaryRT(m_A.name, m_Desc, m_FilterMode); var descB = m_Desc; - descB.depthBufferBits = 0; - cmd.GetTemporaryRT(m_NameB, m_Desc, m_FilterMode); + //descB.depthBufferBits = 0; + cmd.GetTemporaryRT(m_B.name, descB, m_FilterMode); + m_RTisAllocated = true; } public void Clear(CommandBuffer cmd) { - cmd.ReleaseTemporaryRT(m_NameA); - cmd.ReleaseTemporaryRT(m_NameB); + cmd.ReleaseTemporaryRT(m_A.name); + cmd.ReleaseTemporaryRT(m_B.name); - m_FirstIsBackBuffer = true; + m_AisBackBuffer = true; + m_AllowMSAA = true; } public void SetCameraSettings(CommandBuffer cmd, RenderTextureDescriptor desc, FilterMode filterMode) { + Clear(cmd); //SetCameraSettings is called when new stack starts rendering. Make sure the targets are updated to use the new descriptor. + m_Desc = desc; m_FilterMode = filterMode; @@ -80,7 +127,12 @@ public void SetCameraSettings(CommandBuffer cmd, RenderTextureDescriptor desc, F public RenderTargetHandle GetBufferA() { - return RTA; + return m_A.rt; + } + + public void EnableMSAA(bool enable) + { + m_AllowMSAA = enable; } } } diff --git a/com.unity.render-pipelines.universal/Runtime/RendererFeatures/ScreenSpaceAmbientOcclusion.cs b/com.unity.render-pipelines.universal/Runtime/RendererFeatures/ScreenSpaceAmbientOcclusion.cs index b58b03a48a6..36fc33503c1 100644 --- a/com.unity.render-pipelines.universal/Runtime/RendererFeatures/ScreenSpaceAmbientOcclusion.cs +++ b/com.unity.render-pipelines.universal/Runtime/RendererFeatures/ScreenSpaceAmbientOcclusion.cs @@ -51,6 +51,8 @@ internal class ScreenSpaceAmbientOcclusion : ScriptableRendererFeature private const string k_SourceDepthKeyword = "_SOURCE_DEPTH"; private const string k_SourceDepthNormalsKeyword = "_SOURCE_DEPTH_NORMALS"; + internal bool afterOpaque => m_Settings.AfterOpaque; + /// public override void Create() { diff --git a/com.unity.render-pipelines.universal/Runtime/RendererFeatures/ScreenSpaceShadows.cs b/com.unity.render-pipelines.universal/Runtime/RendererFeatures/ScreenSpaceShadows.cs index 8a6768c574d..adfea370f63 100644 --- a/com.unity.render-pipelines.universal/Runtime/RendererFeatures/ScreenSpaceShadows.cs +++ b/com.unity.render-pipelines.universal/Runtime/RendererFeatures/ScreenSpaceShadows.cs @@ -34,7 +34,7 @@ public override void Create() LoadMaterial(); - m_SSShadowsPass.renderPassEvent = RenderPassEvent.AfterRenderingPrePasses; + m_SSShadowsPass.renderPassEvent = RenderPassEvent.AfterRenderingGbuffer; m_SSShadowsPostPass.renderPassEvent = RenderPassEvent.BeforeRenderingTransparents; } @@ -54,6 +54,12 @@ public override void AddRenderPasses(ScriptableRenderer renderer, ref RenderingD if (shouldEnqueue) { + bool isDeferredRenderingMode = renderer is UniversalRenderer && ((UniversalRenderer)renderer).renderingMode == RenderingMode.Deferred; + + m_SSShadowsPass.renderPassEvent = isDeferredRenderingMode + ? RenderPassEvent.AfterRenderingGbuffer + : RenderPassEvent.AfterRenderingPrePasses; + renderer.EnqueuePass(m_SSShadowsPass); renderer.EnqueuePass(m_SSShadowsPostPass); } diff --git a/com.unity.render-pipelines.universal/Runtime/ScriptableRenderer.cs b/com.unity.render-pipelines.universal/Runtime/ScriptableRenderer.cs index 66d8197edd5..a6ed15da98b 100644 --- a/com.unity.render-pipelines.universal/Runtime/ScriptableRenderer.cs +++ b/com.unity.render-pipelines.universal/Runtime/ScriptableRenderer.cs @@ -1320,6 +1320,7 @@ static void SetRenderTarget(CommandBuffer cmd, RenderTargetIdentifier[] colorAtt } internal virtual void SwapColorBuffer(CommandBuffer cmd) { } + internal virtual void EnableSwapBufferMSAA(bool enable) { } [Conditional("UNITY_EDITOR")] void DrawGizmos(ScriptableRenderContext context, Camera camera, GizmoSubset gizmoSubset) diff --git a/com.unity.render-pipelines.universal/Runtime/UniversalAdditionalCameraData.cs b/com.unity.render-pipelines.universal/Runtime/UniversalAdditionalCameraData.cs index bda4e11e1fc..5c24e4a26b2 100644 --- a/com.unity.render-pipelines.universal/Runtime/UniversalAdditionalCameraData.cs +++ b/com.unity.render-pipelines.universal/Runtime/UniversalAdditionalCameraData.cs @@ -212,7 +212,7 @@ public static string GetName(this CameraRenderType type) [RequireComponent(typeof(Camera))] [ImageEffectAllowedInSceneView] [URPHelpURL("universal-additional-camera-data")] - public class UniversalAdditionalCameraData : MonoBehaviour, ISerializationCallbackReceiver + public class UniversalAdditionalCameraData : MonoBehaviour, ISerializationCallbackReceiver, IAdditionalData { const string k_GizmoPath = "Packages/com.unity.render-pipelines.universal/Editor/Gizmos/"; const string k_BaseCameraGizmoPath = k_GizmoPath + "Camera_Base.png"; diff --git a/com.unity.render-pipelines.universal/Runtime/UniversalAdditionalLightData.cs b/com.unity.render-pipelines.universal/Runtime/UniversalAdditionalLightData.cs index 20f40b977e0..58591778e48 100644 --- a/com.unity.render-pipelines.universal/Runtime/UniversalAdditionalLightData.cs +++ b/com.unity.render-pipelines.universal/Runtime/UniversalAdditionalLightData.cs @@ -54,7 +54,7 @@ public static UniversalAdditionalLightData GetUniversalAdditionalLightData(this [DisallowMultipleComponent] [RequireComponent(typeof(Light))] [URPHelpURL("universal-additional-light-data")] - public class UniversalAdditionalLightData : MonoBehaviour + public class UniversalAdditionalLightData : MonoBehaviour, IAdditionalData { // Version 0 means serialized data before the version field. [SerializeField] int m_Version = 1; diff --git a/com.unity.render-pipelines.universal/Runtime/UniversalRenderPipelineGlobalSettings.cs b/com.unity.render-pipelines.universal/Runtime/UniversalRenderPipelineGlobalSettings.cs index 24453d03357..35f4d9bba13 100644 --- a/com.unity.render-pipelines.universal/Runtime/UniversalRenderPipelineGlobalSettings.cs +++ b/com.unity.render-pipelines.universal/Runtime/UniversalRenderPipelineGlobalSettings.cs @@ -1,4 +1,6 @@ +using System; using UnityEditor; +using UnityEngine.Serialization; namespace UnityEngine.Rendering.Universal { @@ -8,19 +10,22 @@ namespace UnityEngine.Rendering.Universal /// - light layer names /// [URPHelpURL("URP-Global-Settings")] - partial class UniversalRenderPipelineGlobalSettings : RenderPipelineGlobalSettings + partial class UniversalRenderPipelineGlobalSettings : RenderPipelineGlobalSettings, ISerializationCallbackReceiver { #region Version system #pragma warning disable CS0414 - [SerializeField] int k_AssetVersion = 1; - [SerializeField] int k_AssetPreviousVersion = 1; + [SerializeField] int k_AssetVersion = 2; #pragma warning restore CS0414 + public void OnBeforeSerialize() + { + } + public void OnAfterDeserialize() { #if UNITY_EDITOR - if (k_AssetPreviousVersion != k_AssetVersion) + if (k_AssetVersion != 2) { EditorApplication.delayCall += () => UpgradeAsset(this.GetInstanceID()); } @@ -30,7 +35,21 @@ public void OnAfterDeserialize() #if UNITY_EDITOR static void UpgradeAsset(int assetInstanceID) { - UniversalRenderPipelineAsset asset = EditorUtility.InstanceIDToObject(assetInstanceID) as UniversalRenderPipelineAsset; + UniversalRenderPipelineGlobalSettings asset = EditorUtility.InstanceIDToObject(assetInstanceID) as UniversalRenderPipelineGlobalSettings; + + if (asset.k_AssetVersion < 2) + { +#pragma warning disable 618 // Obsolete warning + // Renamed supportRuntimeDebugDisplay => stripDebugVariants, which results in inverted logic + asset.m_StripDebugVariants = !asset.supportRuntimeDebugDisplay; + asset.k_AssetVersion = 2; +#pragma warning restore 618 // Obsolete warning + + // For old test projects lets keep post processing stripping enabled, as huge chance they did not used runtime profile creating +#if UNITY_INCLUDE_TESTS + asset.m_StripUnusedPostProcessingVariants = true; +#endif + } EditorUtility.SetDirty(asset); } @@ -296,11 +315,34 @@ internal void ResetRenderingLayerNames() #region Misc Settings + [SerializeField] bool m_StripDebugVariants = true; + + [SerializeField] bool m_StripUnusedPostProcessingVariants = false; + + [SerializeField] bool m_StripUnusedVariants = true; + /// /// Controls whether debug display shaders for Rendering Debugger are available in Player builds. /// + [Obsolete("Please use stripRuntimeDebugShaders instead.", false)] public bool supportRuntimeDebugDisplay = false; + /// + /// Controls whether debug display shaders for Rendering Debugger are available in Player builds. + /// + public bool stripDebugVariants { get => m_StripDebugVariants; set { m_StripDebugVariants = value; } } + + /// + /// Controls whether strips automatically post processing shader variants based on components. + /// It strips based on VolumeProfiles in project and not scenes that actually uses it. + /// + public bool stripUnusedPostProcessingVariants { get => m_StripUnusedPostProcessingVariants; set { m_StripUnusedPostProcessingVariants = value; } } + + /// + /// Controls whether strip off variants if the feature is enabled. + /// + public bool stripUnusedVariants { get => m_StripUnusedVariants; set { m_StripUnusedVariants = value; } } + #endregion } } diff --git a/com.unity.render-pipelines.universal/Runtime/UniversalRenderer.cs b/com.unity.render-pipelines.universal/Runtime/UniversalRenderer.cs index a92bebcf382..7abb3d146a1 100644 --- a/com.unity.render-pipelines.universal/Runtime/UniversalRenderer.cs +++ b/com.unity.render-pipelines.universal/Runtime/UniversalRenderer.cs @@ -122,7 +122,6 @@ private static class Profiling internal ColorGradingLutPass colorGradingLutPass { get => m_PostProcessPasses.colorGradingLutPass; } internal PostProcessPass postProcessPass { get => m_PostProcessPasses.postProcessPass; } internal PostProcessPass finalPostProcessPass { get => m_PostProcessPasses.finalPostProcessPass; } - internal RenderTargetHandle afterPostProcessColor { get => m_PostProcessPasses.afterPostProcessColor; } internal RenderTargetHandle colorGradingLut { get => m_PostProcessPasses.colorGradingLut; } internal DeferredLights deferredLights { get => m_DeferredLights; } @@ -1022,6 +1021,8 @@ void CreateCameraRenderTarget(ScriptableRenderContext context, ref RenderTexture m_ActiveCameraColorAttachment = m_ColorBufferSystem.GetBackBuffer(cmd); cmd.SetGlobalTexture("_CameraColorTexture", m_ActiveCameraColorAttachment.id); + //Set _AfterPostProcessTexture, users might still rely on this although it is now always the cameratarget due to swapbuffer + cmd.SetGlobalTexture("_AfterPostProcessTexture", m_ActiveCameraColorAttachment.id); } if (m_ActiveCameraDepthAttachment != RenderTargetHandle.CameraTarget) @@ -1130,11 +1131,18 @@ internal override void SwapColorBuffer(CommandBuffer cmd) m_ActiveCameraColorAttachment = m_ColorBufferSystem.GetBackBuffer(); cmd.SetGlobalTexture("_CameraColorTexture", m_ActiveCameraColorAttachment.id); + //Set _AfterPostProcessTexture, users might still rely on this although it is now always the cameratarget due to swapbuffer + cmd.SetGlobalTexture("_AfterPostProcessTexture", m_ActiveCameraColorAttachment.id); } internal override RenderTargetIdentifier GetCameraColorFrontBuffer(CommandBuffer cmd) { return m_ColorBufferSystem.GetFrontBuffer(cmd).id; } + + internal override void EnableSwapBufferMSAA(bool enable) + { + m_ColorBufferSystem.EnableMSAA(enable); + } } } diff --git a/com.unity.render-pipelines.universal/Shaders/Lit.shader b/com.unity.render-pipelines.universal/Shaders/Lit.shader index 2aa981cd884..fb085b39a26 100644 --- a/com.unity.render-pipelines.universal/Shaders/Lit.shader +++ b/com.unity.render-pipelines.universal/Shaders/Lit.shader @@ -115,8 +115,6 @@ Shader "Universal Render Pipeline/Lit" // Universal Pipeline keywords #pragma multi_compile _ _MAIN_LIGHT_SHADOWS _MAIN_LIGHT_SHADOWS_CASCADE _MAIN_LIGHT_SHADOWS_SCREEN #pragma multi_compile _ _ADDITIONAL_LIGHTS_VERTEX _ADDITIONAL_LIGHTS - #pragma multi_compile _ LIGHTMAP_SHADOW_MIXING - #pragma multi_compile _ SHADOWS_SHADOWMASK #pragma multi_compile_fragment _ _ADDITIONAL_LIGHT_SHADOWS #pragma multi_compile_fragment _ _REFLECTION_PROBE_BLENDING #pragma multi_compile_fragment _ _REFLECTION_PROBE_BOX_PROJECTION @@ -129,6 +127,8 @@ Shader "Universal Render Pipeline/Lit" // ------------------------------------- // Unity defined keywords + #pragma multi_compile _ LIGHTMAP_SHADOW_MIXING + #pragma multi_compile _ SHADOWS_SHADOWMASK #pragma multi_compile _ DIRLIGHTMAP_COMBINED #pragma multi_compile _ LIGHTMAP_ON #pragma multi_compile _ DYNAMICLIGHTMAP_ON @@ -227,14 +227,14 @@ Shader "Universal Render Pipeline/Lit" #pragma multi_compile_fragment _ _REFLECTION_PROBE_BLENDING #pragma multi_compile_fragment _ _REFLECTION_PROBE_BOX_PROJECTION #pragma multi_compile_fragment _ _SHADOWS_SOFT - #pragma multi_compile _ LIGHTMAP_SHADOW_MIXING - #pragma multi_compile _ SHADOWS_SHADOWMASK #pragma multi_compile_fragment _ _DBUFFER_MRT1 _DBUFFER_MRT2 _DBUFFER_MRT3 #pragma multi_compile_fragment _ _LIGHT_LAYERS #pragma multi_compile_fragment _ _RENDER_PASS_ENABLED // ------------------------------------- // Unity defined keywords + #pragma multi_compile _ LIGHTMAP_SHADOW_MIXING + #pragma multi_compile _ SHADOWS_SHADOWMASK #pragma multi_compile _ DIRLIGHTMAP_COMBINED #pragma multi_compile _ LIGHTMAP_ON #pragma multi_compile _ DYNAMICLIGHTMAP_ON @@ -425,8 +425,6 @@ Shader "Universal Render Pipeline/Lit" // Universal Pipeline keywords #pragma multi_compile _ _MAIN_LIGHT_SHADOWS _MAIN_LIGHT_SHADOWS_CASCADE _MAIN_LIGHT_SHADOWS_SCREEN #pragma multi_compile _ _ADDITIONAL_LIGHTS_VERTEX _ADDITIONAL_LIGHTS - #pragma multi_compile _ LIGHTMAP_SHADOW_MIXING - #pragma multi_compile _ SHADOWS_SHADOWMASK #pragma multi_compile_fragment _ _ADDITIONAL_LIGHT_SHADOWS #pragma multi_compile_fragment _ _SHADOWS_SOFT #pragma multi_compile_fragment _ _SCREEN_SPACE_OCCLUSION @@ -439,6 +437,8 @@ Shader "Universal Render Pipeline/Lit" // ------------------------------------- // Unity defined keywords + #pragma multi_compile _ LIGHTMAP_SHADOW_MIXING + #pragma multi_compile _ SHADOWS_SHADOWMASK #pragma multi_compile _ DIRLIGHTMAP_COMBINED #pragma multi_compile _ LIGHTMAP_ON #pragma multi_compile_fog diff --git a/com.unity.render-pipelines.universal/Shaders/Nature/SpeedTree8.shader b/com.unity.render-pipelines.universal/Shaders/Nature/SpeedTree8.shader index 77e49a0149a..47c24003005 100644 --- a/com.unity.render-pipelines.universal/Shaders/Nature/SpeedTree8.shader +++ b/com.unity.render-pipelines.universal/Shaders/Nature/SpeedTree8.shader @@ -53,7 +53,7 @@ Shader "Universal Render Pipeline/Nature/SpeedTree8" #pragma multi_compile _ _MAIN_LIGHT_SHADOWS _MAIN_LIGHT_SHADOWS_CASCADE _MAIN_LIGHT_SHADOWS_SCREEN #pragma multi_compile _ _ADDITIONAL_LIGHTS_VERTEX _ADDITIONAL_LIGHTS - #pragma multi_compile _ _ADDITIONAL_LIGHT_SHADOWS + #pragma multi_compile_fragment _ _ADDITIONAL_LIGHT_SHADOWS #pragma multi_compile_fragment _ _REFLECTION_PROBE_BLENDING #pragma multi_compile_fragment _ _REFLECTION_PROBE_BOX_PROJECTION #pragma multi_compile_fragment _ _SHADOWS_SOFT diff --git a/com.unity.render-pipelines.universal/Shaders/Particles/ParticlesUnlit.shader b/com.unity.render-pipelines.universal/Shaders/Particles/ParticlesUnlit.shader index e5b7c015765..c43b3e776bd 100644 --- a/com.unity.render-pipelines.universal/Shaders/Particles/ParticlesUnlit.shader +++ b/com.unity.render-pipelines.universal/Shaders/Particles/ParticlesUnlit.shader @@ -70,7 +70,6 @@ Shader "Universal Render Pipeline/Particles/Unlit" Blend[_SrcBlend][_DstBlend] ZWrite[_ZWrite] Cull[_Cull] - ColorMask RGB HLSLPROGRAM #pragma target 2.0 diff --git a/com.unity.render-pipelines.universal/Shaders/SimpleLit.shader b/com.unity.render-pipelines.universal/Shaders/SimpleLit.shader index 3777130b059..96f8516e45b 100644 --- a/com.unity.render-pipelines.universal/Shaders/SimpleLit.shader +++ b/com.unity.render-pipelines.universal/Shaders/SimpleLit.shader @@ -180,8 +180,6 @@ Shader "Universal Render Pipeline/Simple Lit" //#pragma multi_compile _ _ADDITIONAL_LIGHTS_VERTEX _ADDITIONAL_LIGHTS //#pragma multi_compile _ _ADDITIONAL_LIGHT_SHADOWS #pragma multi_compile_fragment _ _SHADOWS_SOFT - #pragma multi_compile _ LIGHTMAP_SHADOW_MIXING - #pragma multi_compile _ SHADOWS_SHADOWMASK #pragma multi_compile_fragment _ _DBUFFER_MRT1 _DBUFFER_MRT2 _DBUFFER_MRT3 #pragma multi_compile_fragment _ _LIGHT_LAYERS @@ -190,6 +188,8 @@ Shader "Universal Render Pipeline/Simple Lit" #pragma multi_compile _ DIRLIGHTMAP_COMBINED #pragma multi_compile _ LIGHTMAP_ON #pragma multi_compile _ DYNAMICLIGHTMAP_ON + #pragma multi_compile _ LIGHTMAP_SHADOW_MIXING + #pragma multi_compile _ SHADOWS_SHADOWMASK #pragma multi_compile_fragment _ _GBUFFER_NORMALS_OCT #pragma multi_compile_fragment _ _RENDER_PASS_ENABLED diff --git a/com.unity.render-pipelines.universal/Shaders/Terrain/WavingGrass.shader b/com.unity.render-pipelines.universal/Shaders/Terrain/WavingGrass.shader index 5a25cfcc353..2225c75bf96 100644 --- a/com.unity.render-pipelines.universal/Shaders/Terrain/WavingGrass.shader +++ b/com.unity.render-pipelines.universal/Shaders/Terrain/WavingGrass.shader @@ -25,7 +25,7 @@ Shader "Hidden/TerrainEngine/Details/UniversalPipeline/WavingDoublePass" // Universal Pipeline keywords #pragma multi_compile _ _MAIN_LIGHT_SHADOWS _MAIN_LIGHT_SHADOWS_CASCADE _MAIN_LIGHT_SHADOWS_SCREEN #pragma multi_compile _ _ADDITIONAL_LIGHTS_VERTEX _ADDITIONAL_LIGHTS - #pragma multi_compile _ _ADDITIONAL_LIGHT_SHADOWS + #pragma multi_compile_fragment _ _ADDITIONAL_LIGHT_SHADOWS #pragma multi_compile_fragment _ _SHADOWS_SOFT #pragma multi_compile _ LIGHTMAP_SHADOW_MIXING #pragma multi_compile _ SHADOWS_SHADOWMASK diff --git a/com.unity.render-pipelines.universal/Shaders/Utils/ScreenSpaceShadows.shader b/com.unity.render-pipelines.universal/Shaders/Utils/ScreenSpaceShadows.shader index 176f5874e49..ff8d122af33 100644 --- a/com.unity.render-pipelines.universal/Shaders/Utils/ScreenSpaceShadows.shader +++ b/com.unity.render-pipelines.universal/Shaders/Utils/ScreenSpaceShadows.shader @@ -78,7 +78,7 @@ Shader "Hidden/Universal Render Pipeline/ScreenSpaceShadows" HLSLPROGRAM #pragma multi_compile _MAIN_LIGHT_SHADOWS _MAIN_LIGHT_SHADOWS_CASCADE - #pragma multi_compile _ _SHADOWS_SOFT + #pragma multi_compile_fragment _ _SHADOWS_SOFT #pragma vertex Vertex #pragma fragment Fragment diff --git a/com.unity.render-pipelines.universal/Tests/Editor/UniversalGlobalSettingsTests.cs b/com.unity.render-pipelines.universal/Tests/Editor/UniversalGlobalSettingsTests.cs deleted file mode 100644 index af7961394fe..00000000000 --- a/com.unity.render-pipelines.universal/Tests/Editor/UniversalGlobalSettingsTests.cs +++ /dev/null @@ -1,81 +0,0 @@ -using NUnit.Framework; -using UnityEditor; -using UnityEngine; -using UnityEngine.Rendering; -using UnityEngine.Rendering.Universal; -using UnityEditor.Rendering.Universal.Internal; -using UnityEngine.Experimental.Rendering.Universal; -using UnityEngine.TestTools; -using UnityEditor.SceneManagement; - -class UniversalGlobalSettingsTests -{ - UniversalRenderPipelineGlobalSettings initialGlobalSettings; - UniversalRenderPipelineGlobalSettings otherGlobalSettings; - - [SetUp] - public void SetUp() - { - UnityEditor.SceneManagement.EditorSceneManager.NewScene(UnityEditor.SceneManagement.NewSceneSetup.DefaultGameObjects); - otherGlobalSettings = ScriptableObject.CreateInstance(); - } - - [TearDown] - public void TearDown() - { - ScriptableObject.DestroyImmediate(otherGlobalSettings); - EditorSceneManager.NewScene(NewSceneSetup.EmptyScene); - } - - void EnsureUniversalRPIsActivePipeline() - { - Camera.main.Render(); - initialGlobalSettings = UniversalRenderPipelineGlobalSettings.instance; - Assert.IsInstanceOf(RenderPipelineManager.currentPipeline); - Assert.IsNotNull(initialGlobalSettings); - } - - [Test] - public void URPFrameRendered_GlobalSettingsShouldBeAssigned() - { - EnsureUniversalRPIsActivePipeline(); - } - - [Test] - public void URPFrameRendered_EnsureGlobalSettingsIfNullAssigned() - { - EnsureUniversalRPIsActivePipeline(); - - UniversalRenderPipelineGlobalSettings.UpdateGraphicsSettings(null); - Assert.IsNull(UniversalRenderPipelineGlobalSettings.instance); - - Camera.main.Render(); - Assert.IsNotNull(UniversalRenderPipelineGlobalSettings.instance); - } - - [Test] - [Description("Case 1342987 - Support undo on Global Settings assignation ")] - public void Undo_URPActive_ChangeGlobalSettings() - { - EnsureUniversalRPIsActivePipeline(); - Undo.IncrementCurrentGroup(); - UniversalRenderPipelineGlobalSettings.UpdateGraphicsSettings(otherGlobalSettings); - Assert.AreEqual(otherGlobalSettings, UniversalRenderPipelineGlobalSettings.instance); - - Undo.PerformUndo(); - Assert.AreEqual(initialGlobalSettings, UniversalRenderPipelineGlobalSettings.instance); - } - - [Test] - [Description("Case 1342987 - Support undo on Global Settings assignation ")] - public void Undo_UPActive_UnregisterGlobalSettings() - { - EnsureUniversalRPIsActivePipeline(); - Undo.IncrementCurrentGroup(); - UniversalRenderPipelineGlobalSettings.UpdateGraphicsSettings(null); - Assert.IsNull(UniversalRenderPipelineGlobalSettings.instance); - - Undo.PerformUndo(); - Assert.AreEqual(initialGlobalSettings, UniversalRenderPipelineGlobalSettings.instance); - } -} diff --git a/com.unity.render-pipelines.universal/ValidationExceptions.json b/com.unity.render-pipelines.universal/ValidationExceptions.json index 7a57fa6593f..5a682cbca67 100644 --- a/com.unity.render-pipelines.universal/ValidationExceptions.json +++ b/com.unity.render-pipelines.universal/ValidationExceptions.json @@ -3,8 +3,8 @@ [ { "ValidationTest": "Package Lifecycle Validation", - "ExceptionError": "Package com.unity.render-pipelines.universal@12.0.0 depends on package com.unity.burst@1.5.0 which is in an invalid track for release purposes. Release versions can only depend on Release versions.", - "PackageVersion": "12.0.0" + "ExceptionError": "Package com.unity.render-pipelines.universal@13.0.0 depends on package com.unity.burst@1.5.0 which is in an invalid track for release purposes. Release versions can only depend on Release versions.", + "PackageVersion": "13.0.0" } ] } diff --git a/com.unity.render-pipelines.universal/package.json b/com.unity.render-pipelines.universal/package.json index 0ff8bf5f56b..d69e97bdf92 100644 --- a/com.unity.render-pipelines.universal/package.json +++ b/com.unity.render-pipelines.universal/package.json @@ -1,15 +1,15 @@ { "name": "com.unity.render-pipelines.universal", "description": "The Universal Render Pipeline (URP) is a prebuilt Scriptable Render Pipeline, made by Unity. URP provides artist-friendly workflows that let you quickly and easily create optimized graphics across a range of platforms, from mobile to high-end consoles and PCs.", - "version": "12.0.0", - "unity": "2021.2", - "unityRelease": "0b6", + "version": "13.0.0", + "unity": "2022.1", + "unityRelease": "0a8", "displayName": "Universal RP", "dependencies": { "com.unity.mathematics": "1.2.1", "com.unity.burst": "1.5.0", - "com.unity.render-pipelines.core": "12.0.0", - "com.unity.shadergraph": "12.0.0" + "com.unity.render-pipelines.core": "13.0.0", + "com.unity.shadergraph": "13.0.0" }, "keywords": [ "graphics", diff --git a/com.unity.shadergraph/CHANGELOG.md b/com.unity.shadergraph/CHANGELOG.md index 87586735410..c141fa793ca 100644 --- a/com.unity.shadergraph/CHANGELOG.md +++ b/com.unity.shadergraph/CHANGELOG.md @@ -4,6 +4,11 @@ All notable changes to this package are documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html). +## [13.0.0] - 2021-09-01 + +Version Updated +The version number for this package has increased due to a version update of a related graphics package. + ## [12.0.0] - 2021-01-11 ### Added diff --git a/com.unity.shadergraph/package.json b/com.unity.shadergraph/package.json index 6095beeaaf5..0dbf609428d 100644 --- a/com.unity.shadergraph/package.json +++ b/com.unity.shadergraph/package.json @@ -1,12 +1,12 @@ { "name": "com.unity.shadergraph", "description": "The Shader Graph package adds a visual Shader editing tool to Unity. You can use this tool to create Shaders in a visual way instead of writing code. Specific render pipelines can implement specific graph features. Currently, both the High Definition Rendering Pipeline and the Universal Rendering Pipeline support Shader Graph.", - "version": "12.0.0", - "unity": "2021.2", - "unityRelease": "0b6", + "version": "13.0.0", + "unity": "2022.1", + "unityRelease": "0a8", "displayName": "Shader Graph", "dependencies": { - "com.unity.render-pipelines.core": "12.0.0", + "com.unity.render-pipelines.core": "13.0.0", "com.unity.searcher": "4.8.0" }, "samples": [ diff --git a/com.unity.template-hd/Assets/SampleSceneAssets/Scripts/LookWithMouse.cs b/com.unity.template-hd/Assets/SampleSceneAssets/Scripts/LookWithMouse.cs index 2aabbd014f9..f5cde4a4a14 100644 --- a/com.unity.template-hd/Assets/SampleSceneAssets/Scripts/LookWithMouse.cs +++ b/com.unity.template-hd/Assets/SampleSceneAssets/Scripts/LookWithMouse.cs @@ -20,11 +20,14 @@ public class LookWithMouse : MonoBehaviour void Start() { Cursor.lockState = CursorLockMode.Locked; + Cursor.visible = false; } // Update is called once per frame void Update() { + bool unlockPressed, lockPressed; + #if ENABLE_INPUT_SYSTEM float mouseX = 0, mouseY = 0; @@ -41,18 +44,38 @@ void Update() mouseY += value.y; } + unlockPressed = Keyboard.current.escapeKey.wasPressedThisFrame; + lockPressed = Mouse.current.leftButton.wasPressedThisFrame || Mouse.current.rightButton.wasPressedThisFrame; + mouseX *= mouseSensitivity * k_MouseSensitivityMultiplier; mouseY *= mouseSensitivity * k_MouseSensitivityMultiplier; #else float mouseX = Input.GetAxis("Mouse X") * mouseSensitivity * k_MouseSensitivityMultiplier; float mouseY = Input.GetAxis("Mouse Y") * mouseSensitivity * k_MouseSensitivityMultiplier; + + unlockPressed = Input.GetKeyDown(KeyCode.Escape); + lockPressed = Input.GetMouseButtonDown(0) || Input.GetMouseButtonDown(1); #endif - xRotation -= mouseY; - xRotation = Mathf.Clamp(xRotation, -90f, 90f); + if (unlockPressed) + { + Cursor.lockState = CursorLockMode.None; + Cursor.visible = true; + } + if (lockPressed) + { + Cursor.lockState = CursorLockMode.Locked; + Cursor.visible = false; + } + + if (Cursor.lockState == CursorLockMode.Locked) + { + xRotation -= mouseY; + xRotation = Mathf.Clamp(xRotation, -90f, 90f); - transform.localRotation = Quaternion.Euler(xRotation, 0f, 0f); + transform.localRotation = Quaternion.Euler(xRotation, 0f, 0f); - playerBody.Rotate(Vector3.up * mouseX); + playerBody.Rotate(Vector3.up * mouseX); + } } } diff --git a/com.unity.template-hd/Packages/com.unity.template.hd/CHANGELOG.md b/com.unity.template-hd/Packages/com.unity.template.hd/CHANGELOG.md index 54a1a40d91c..0aac69488f2 100644 --- a/com.unity.template-hd/Packages/com.unity.template.hd/CHANGELOG.md +++ b/com.unity.template-hd/Packages/com.unity.template.hd/CHANGELOG.md @@ -4,6 +4,11 @@ All notable changes to this project template will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html). +## [13.0.0] - 2021-09-01 + +### Changed +- Update SRP package to 13.0.0 + ## [12.2.0] - 2021-08-25 ### Changed diff --git a/com.unity.template-hd/Packages/com.unity.template.hd/package.json b/com.unity.template-hd/Packages/com.unity.template.hd/package.json index f27df950969..a894ab8c204 100644 --- a/com.unity.template-hd/Packages/com.unity.template.hd/package.json +++ b/com.unity.template-hd/Packages/com.unity.template.hd/package.json @@ -1,15 +1,15 @@ { "name": "com.unity.template.hd", "displayName": "High Definition RP", - "version": "12.2.0", + "version": "13.0.0", "type": "template", "host": "hub", - "unity": "2021.2", + "unity": "2022.1", "description": "This template utilizes the High Definition Render Pipeline. Making it a good starting point for people focused on high-end graphics that want to develop games for platforms that support Shader Model 5.0 (DX11 and above). \n\nBeyond being tuned for High End visuals this project includes\n\u25aa Shadergraph \n\u25aa Visual Effect Graph \n\u25aa Presets \n\u25aa Example content", "dependencies": { "com.unity.cinemachine": "2.8.0", "com.unity.inputsystem": "1.1.0-pre.5", "com.unity.learn.iet-framework": "2.0.0", - "com.unity.render-pipelines.high-definition": "12.0.0" + "com.unity.render-pipelines.high-definition": "13.0.0" } } diff --git a/com.unity.template-hd/Packages/manifest.json b/com.unity.template-hd/Packages/manifest.json index 6c2263a3526..89589dd0cee 100644 --- a/com.unity.template-hd/Packages/manifest.json +++ b/com.unity.template-hd/Packages/manifest.json @@ -6,7 +6,7 @@ "com.unity.ide.vscode": "1.2.3", "com.unity.inputsystem": "1.1.0-pre.5", "com.unity.learn.iet-framework": "2.0.0", - "com.unity.render-pipelines.high-definition": "12.0.0", + "com.unity.render-pipelines.high-definition": "13.0.0", "com.unity.learn.iet-framework.authoring": "1.0.0", "com.unity.timeline": "1.6.1", "com.unity.ugui": "1.0.0", diff --git a/com.unity.template-universal/Packages/com.unity.template.universal/CHANGELOG.md b/com.unity.template-universal/Packages/com.unity.template.universal/CHANGELOG.md index d768f57de06..2d5ce6d109d 100644 --- a/com.unity.template-universal/Packages/com.unity.template.universal/CHANGELOG.md +++ b/com.unity.template-universal/Packages/com.unity.template.universal/CHANGELOG.md @@ -4,6 +4,11 @@ All notable changes to this project template will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html). +## [13.0.0] - 2021-09-01 + +### Changed +- Update SRP package to 13.0.0 + ## [12.1.0] - 2021-07-28 Version Updated diff --git a/com.unity.template-universal/Packages/com.unity.template.universal/package.json b/com.unity.template-universal/Packages/com.unity.template.universal/package.json index 58d2ef06e85..a231e9cc0e7 100644 --- a/com.unity.template-universal/Packages/com.unity.template.universal/package.json +++ b/com.unity.template-universal/Packages/com.unity.template.universal/package.json @@ -1,12 +1,12 @@ { "name": "com.unity.template.universal", "displayName": "Universal Render Pipeline", - "version": "12.1.0", + "version": "13.0.0", "type": "template", - "unity": "2021.2", + "unity": "2022.1", "host": "hub", "description": "The Universal Render Pipeline Template configures Project settings for Projects where performance, wide platform support, and ease of customizing graphics are the primary considerations.\n\nThis Template uses the Universal Render Pipeline (URP) and Shader Graph. URP is prebuilt Scriptable Render Pipeline that is quick and easy to customize, and lets you create optimized graphics across a wide range of platforms. URP also includes an optimized 2D renderer complete with 2D lights and pixel perfect rendering, and an integrated post-processing solution. Shader Graph is a tool that allows you to create shaders using a visual node editor instead of writing code.\n\nThis template contains a sample Scene that contains examples of how to configure lighting settings, Materials, Shaders, and post-processing effects in URP, several preconfigured Universal Render Pipeline Assets that let you quickly swap between graphics quality levels, and Presets that have been optimized for use with URP.", "dependencies": { - "com.unity.render-pipelines.universal": "12.0.0" + "com.unity.render-pipelines.universal": "13.0.0" } } \ No newline at end of file diff --git a/com.unity.template-universal/Packages/manifest.json b/com.unity.template-universal/Packages/manifest.json index 7aef4d0c9e9..181428325b1 100644 --- a/com.unity.template-universal/Packages/manifest.json +++ b/com.unity.template-universal/Packages/manifest.json @@ -10,7 +10,7 @@ "com.unity.ide.visualstudio": "2.0.0", "com.unity.ide.vscode": "1.1.4", "com.unity.purchasing": "2.0.6", - "com.unity.render-pipelines.universal": "12.0.0", + "com.unity.render-pipelines.universal": "13.0.0", "com.unity.test-framework": "1.1.18", "com.unity.textmeshpro": "3.0.0-preview.4", "com.unity.timeline": "1.2.11", diff --git a/com.unity.testing.graphics-performance/package.json b/com.unity.testing.graphics-performance/package.json index 991c34e89e8..f2444778242 100644 --- a/com.unity.testing.graphics-performance/package.json +++ b/com.unity.testing.graphics-performance/package.json @@ -1,9 +1,9 @@ { "name": "com.unity.testing.graphics-performance", "displayName":"Performance Graphics Tests Framework", - "version": "12.0.0", - "unity": "2021.2", - "unityRelease": "0a1", + "version": "13.0.0", + "unity": "2022.1", + "unityRelease": "0a7", "description": "Provides performance framework helpers for writing tests for graphics code, such as test scene asset description, performance performance report and shader static analysis.", "keywords": ["qa", "test", "testing", "tests", "graphics", "performance"], "dependencies": { diff --git a/com.unity.testing.visualeffectgraph/package.json b/com.unity.testing.visualeffectgraph/package.json index b4121122f3d..54f4b8657a7 100644 --- a/com.unity.testing.visualeffectgraph/package.json +++ b/com.unity.testing.visualeffectgraph/package.json @@ -1,12 +1,12 @@ { "name": "com.unity.testing.visualeffectgraph", "displayName": "Visual Effect Graphic Tests", - "version": "12.0.0", - "unity": "2021.2", - "unityRelease": "0a1", + "version": "13.0.0", + "unity": "2022.1", + "unityRelease": "0a7", "description": "This package contains common graphics tests from several scriptable renderpipeline", "dependencies": { - "com.unity.visualeffectgraph": "12.0.0", + "com.unity.visualeffectgraph": "13.0.0", "com.unity.testframework.graphics": "7.8.11-preview", "com.unity.testing.graphics-performance": "8.0.0", "com.unity.test-framework": "1.1.18" diff --git a/com.unity.visualeffectgraph/CHANGELOG.md b/com.unity.visualeffectgraph/CHANGELOG.md index 0607caeafe6..8aa3b070d02 100644 --- a/com.unity.visualeffectgraph/CHANGELOG.md +++ b/com.unity.visualeffectgraph/CHANGELOG.md @@ -4,6 +4,11 @@ All notable changes to this package will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html). +## [13.0.0] - 2021-09-01 + +Version Updated +The version number for this package has increased due to a version update of a related graphics package. + ## [12.0.0] - 2021-01-11 ### Added - Added support for Texture2D Arrays in Flipbooks @@ -96,6 +101,9 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. - Exposed Parameter placement can be moved after sanitize - Fix rendering artifacts on some mobile devices [Case 1149057](https://issuetracker.unity3d.com/product/unity/issues/guid/1149057/) - Fix compilation failure on OpenGLES [Case 1348666](https://issuetracker.unity3d.com/product/unity/issues/guid/1348666/) +- Don't open an empty VFX Graph Editor when assigning a VFX Asset to a Visual Effect GameObject from the inspector [Case 1347399](https://issuetracker.unity3d.com/product/unity/issues/guid/1347399/) +- Visual Effect inspector input fields don't lose focus anymore while typing (Random seed) +- Subgraph output properties tooltips were not easily editable when multiline ## [11.0.0] - 2020-10-21 ### Added diff --git a/com.unity.visualeffectgraph/Editor/GraphView/Blackboard/VFXBlackboardPropertyView.cs b/com.unity.visualeffectgraph/Editor/GraphView/Blackboard/VFXBlackboardPropertyView.cs index 032260495f6..4caafbef1c4 100644 --- a/com.unity.visualeffectgraph/Editor/GraphView/Blackboard/VFXBlackboardPropertyView.cs +++ b/com.unity.visualeffectgraph/Editor/GraphView/Blackboard/VFXBlackboardPropertyView.cs @@ -308,6 +308,8 @@ public void SelfChange(int change) if (m_TooltipProperty == null) { m_TooltipProperty = new StringPropertyRM(new SimplePropertyRMProvider("Tooltip", () => controller.model.tooltip, t => controller.model.tooltip = t), 55); + TextField field = m_TooltipProperty.Query(); + field.multiline = true; } Insert(insertIndex++, m_TooltipProperty); } diff --git a/com.unity.visualeffectgraph/Editor/Inspector/VisualEffectEditor.cs b/com.unity.visualeffectgraph/Editor/Inspector/VisualEffectEditor.cs index f921f666baa..b388d69c145 100644 --- a/com.unity.visualeffectgraph/Editor/Inspector/VisualEffectEditor.cs +++ b/com.unity.visualeffectgraph/Editor/Inspector/VisualEffectEditor.cs @@ -801,7 +801,7 @@ public override void OnInspectorGUI() EditorGUI.indentLevel = 0; if (serializedObject.ApplyModifiedProperties()) { - var window = EditorWindow.GetWindow(); + var window = WindowLayout.FindEditorWindowOfType(typeof(VFXViewWindow)) as VFXViewWindow; if (window != null) window.OnVisualEffectComponentChanged(targets.Cast()); } diff --git a/com.unity.visualeffectgraph/Runtime/Utilities/PropertyBinding/Implementation/VFXTransformBinder.cs b/com.unity.visualeffectgraph/Runtime/Utilities/PropertyBinding/Implementation/VFXTransformBinder.cs index 8d8d133e20d..1dc5d91b9e4 100644 --- a/com.unity.visualeffectgraph/Runtime/Utilities/PropertyBinding/Implementation/VFXTransformBinder.cs +++ b/com.unity.visualeffectgraph/Runtime/Utilities/PropertyBinding/Implementation/VFXTransformBinder.cs @@ -40,9 +40,9 @@ public override bool IsValid(VisualEffect component) public override void UpdateBinding(VisualEffect component) { - component.SetVector3((int)Position, Target.transform.position); - component.SetVector3((int)Angles, Target.transform.eulerAngles); - component.SetVector3((int)Scale, Target.transform.localScale); + component.SetVector3((int)Position, Target.position); + component.SetVector3((int)Angles, Target.eulerAngles); + component.SetVector3((int)Scale, Target.localScale); } public override string ToString() diff --git a/com.unity.visualeffectgraph/package.json b/com.unity.visualeffectgraph/package.json index b1faa400e48..e244564fbc0 100644 --- a/com.unity.visualeffectgraph/package.json +++ b/com.unity.visualeffectgraph/package.json @@ -1,9 +1,9 @@ { "name": "com.unity.visualeffectgraph", "displayName": "Visual Effect Graph", - "version": "12.0.0", - "unity": "2021.2", - "unityRelease": "0b6", + "version": "13.0.0", + "unity": "2022.1", + "unityRelease": "0a8", "description": "The Visual Effect Graph is a node based visual effect editor. It allows you to author next generation visual effects that Unity simulates directly on the GPU. The Visual Effect Graph is production-ready for the High Definition Render Pipeline and runs on all platforms supported by it. Full support for the Universal Render Pipeline and compatible mobile devices is still in development.", "keywords": [ "vfx", @@ -13,8 +13,8 @@ "particles" ], "dependencies": { - "com.unity.shadergraph": "12.0.0", - "com.unity.render-pipelines.core": "12.0.0" + "com.unity.shadergraph": "13.0.0", + "com.unity.render-pipelines.core": "13.0.0" }, "samples": [ {