Skip to content

Commit

Permalink
Merge pull request #8028 from Unity-Technologies/21.3/replace-graphic…
Browse files Browse the repository at this point in the history 
…s-foundation
  • Loading branch information
@varticcata
varticcata authored Feb 6, 2024
2 parents 7bbd0c0 + 64214b4 commit d2bd3a5
Show file tree
Hide file tree
Showing 8 changed files with 10 additions and 1,601 deletions.
109 changes: 0 additions & 109 deletions .yamato/all-postprocessing.yml
View file

This file was deleted.

54 changes: 10 additions & 44 deletions .yamato/config/__shared.metafile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,10 +60,8 @@ test_platforms:
- [Win_DX11, Win_DX12, Win_Vulkan, Win_]: --platform=StandaloneWindows64
- [Linux_OpenGlCore, Linux_Vulkan]: --platform=StandaloneLinux64
- [OSX_OpenGlCore, OSX_Metal]: --platform=StandaloneOSX
- [iPhone_Metal]: --platform=iOS
- [Android_OpenGLES3, Android_Vulkan, XRQuest_OpenGLES3, XRQuest_Vulkan]: --platform=Android

- [Android_OpenGLES3, Android_Vulkan, iPhone_Metal,Win_DX11, Win_DX12, Win_Vulkan, Win_, Linux_OpenGlCore, Linux_Vulkan, XRQuest_OpenGLES3, XRQuest_Vulkan, OSX_OpenGlCore]: --player-load-path=players
- [Win_DX11, Win_DX12, Win_Vulkan, Win_, Linux_OpenGlCore, Linux_Vulkan, OSX_OpenGlCore]: --player-load-path=players

- [all]: --artifacts_path=TestProjects/<PROJECT_FOLDER>/test-results
- [OSX_Metal]: --artifacts_path=/Users/bokken/Graphics/TestProjects/<PROJECT_FOLDER>/test-results
Expand All @@ -73,7 +71,6 @@ test_platforms:
- [OSX_Metal]: --scripting-backend=<SCRIPTING_BACKEND>
- [OSX_Metal]: --testfilter=%TEST_FILTER%

- [Android_OpenGLES3, Android_Vulkan, XRQuest_OpenGLES3, XRQuest_Vulkan]: --architecture=ARM64
- [OSX_Metal]: --testproject=/Users/bokken/Graphics/TestProjects/<PROJECT_FOLDER>
- [Win_DX11, Win_DX12, Win_Vulkan, Win_, Linux_OpenGlCore, Linux_Vulkan]: --player-connection-ip=auto

Expand All @@ -88,53 +85,37 @@ test_platforms:
- [Win_DX11, Win_DX12, Win_Vulkan, Win_]: --platform=StandaloneWindows64
- [Linux_OpenGlCore, Linux_Vulkan]: --platform=StandaloneLinux64
- [OSX_OpenGlCore, OSX_Metal]: --platform=StandaloneOSX
- [iPhone_Metal]: --platform=iOS
- [Android_OpenGLES3, Android_Vulkan, XRQuest_OpenGLES3, XRQuest_Vulkan]: --platform=Android

- [all]: --testproject=./TestProjects/<PROJECT_FOLDER>

- [all]: --editor-location=.Editor
- [Android_OpenGLES3, Android_Vulkan, XRQuest_OpenGLES3, XRQuest_Vulkan]: --editor-location=./WindowsEditor
- [XRQuest_Vulkan, XRQuest_OpenGLES3]: --extra-editor-arg="-enabledxrtargets=OculusXRSDK"

- [all]: --artifacts_path=TestProjects/<PROJECT_FOLDER>/test-results

- [Android_OpenGLES3, Android_Vulkan, iPhone_Metal, Win_DX11, Win_DX12, Win_Vulkan, Win_, Linux_OpenGlCore, Linux_Vulkan, XRQuest_OpenGLES3, XRQuest_Vulkan, OSX_OpenGlCore]: --player-save-path=players
- [Win_DX11, Win_DX12, Win_Vulkan, Win_, Linux_OpenGlCore, Linux_Vulkan, OSX_OpenGlCore]: --player-save-path=players

- [all]: --timeout=1200
- [Android_OpenGLES3, Android_Vulkan, XRQuest_OpenGLES3, XRQuest_Vulkan]: --timeout=2700
- [iPhone]: --timeout=1800

### The method and values live in /com.unity.testframework.graphics/.../Editor/SetupProject.cs
- [Win_DX11]: --extra-editor-arg="-executemethod" --extra-editor-arg="SetupProject.ApplySettings" --extra-editor-arg="d3d11" --extra-editor-arg="<COLORSPACE>"
- [Win_DX12]: --extra-editor-arg="-executemethod" --extra-editor-arg="SetupProject.ApplySettings" --extra-editor-arg="d3d12" --extra-editor-arg="<COLORSPACE>"
- [Win_Vulkan, Linux_Vulkan, Android_Vulkan, XRQuest_Vulkan]: --extra-editor-arg="-executemethod" --extra-editor-arg="SetupProject.ApplySettings" --extra-editor-arg="vulkan" --extra-editor-arg="<COLORSPACE>"
- [Android_OpenGLES3, XRQuest_OpenGLES3]: --extra-editor-arg="-executemethod" --extra-editor-arg="SetupProject.ApplySettings" --extra-editor-arg="gles3" --extra-editor-arg="<COLORSPACE>"
- [iPhone_Metal]: --extra-editor-arg="-executemethod" --extra-editor-arg="SetupProject.ApplySettings" --extra-editor-arg="metal" --extra-editor-arg="<COLORSPACE>"
- [Win_Vulkan, Linux_Vulkan]: --extra-editor-arg="-executemethod" --extra-editor-arg="SetupProject.ApplySettings" --extra-editor-arg="vulkan" --extra-editor-arg="<COLORSPACE>"

- [Win_DX11]: --extra-editor-arg="-playergraphicsapi=Direct3D11"
- [Win_DX12]: --extra-editor-arg="-playergraphicsapi=Direct3D12"
- [Win_Vulkan, Linux_Vulkan, Android_Vulkan, XRQuest_Vulkan]: --extra-editor-arg="-playergraphicsapi=Vulkan"
- [Android_OpenGLES3, XRQuest_OpenGLES3]: --extra-editor-arg="-playergraphicsapi=OpenGLES3"
- [iPhone_Metal]: --extra-editor-arg="-playergraphicsapi=Metal"

- [Android_OpenGLES3, Android_Vulkan, XRQuest_OpenGLES3, XRQuest_Vulkan]: --architecture=ARM64
- [Win_Vulkan, Linux_Vulkan]: --extra-editor-arg="-playergraphicsapi=Vulkan"
commands:
- [Android_OpenGLES3, Android_Vulkan]: <shared.platform.commands.connect_bokken>
- [Win_DX11, Win_DX12, Win_Vulkan, Android_OpenGLES3, Android_Vulkan]: <shared.platform.commands.turn_off_firewall>
- [all]: <shared.platform.commands.setup_utr>
- [OSX_Metal]: <shared.platform.commands.unity_downloader_cli>
- [all]: <shared.platform.commands.call_utr>
- [Android_OpenGLES3, Android_Vulkan]: <shared.platform.commands.kill_server>
commands_build:
- [Win_DX11, Win_DX12, Win_Vulkan, Android_OpenGLES3, Android_Vulkan]: <shared.platform.commands.turn_off_firewall>
- [all]: <shared.platform.commands.setup_utr>
- [all]: <shared.platform.commands.unity_downloader_cli>
- [all]: <shared.platform.commands.call_utr>
after:
- [OSX_OpenGlCore, OSX_Metal, iPhone_Metal, Android_OpenGLES3, Android_Vulkan, XRQuest_OpenGLES3, XRQuest_Vulkan, Linux_OpenGlCore, Linux_Vulkan]: <shared.platform.commands.find_instabilities>
- [OSX_OpenGlCore, OSX_Metal, Linux_OpenGlCore, Linux_Vulkan]: <shared.platform.commands.find_instabilities>
after_build:
- [OSX_OpenGlCore, iPhone_Metal, XRQuest_OpenGLES3, XRQuest_Vulkan, Linux_OpenGlCore, Linux_Vulkan]: <shared.platform.commands.find_instabilities>
- [OSX_OpenGlCore, Linux_OpenGlCore, Linux_Vulkan]: <shared.platform.commands.find_instabilities>
- type: playmode
allow_cache: False
utr_flags:
Expand All @@ -150,7 +131,6 @@ test_platforms:
- [OSX_Metal]: --testproject=/Users/bokken/Graphics/TestProjects/<PROJECT_FOLDER>

- [all]: --editor-location=.Editor
- [Android_OpenGLES3, Android_Vulkan, XRQuest_OpenGLES3, XRQuest_Vulkan]: --editor-location=./WindowsEditor
- [OSX_Metal]: --editor-location=/Users/bokken/.Editor

- [all]: --artifacts_path=TestProjects/<PROJECT_FOLDER>/test-results
Expand All @@ -161,12 +141,11 @@ test_platforms:
- [Win_Vulkan, Linux_Vulkan]: --extra-editor-arg="-force-vulkan"
- [Linux_OpenGlCore]: --extra-editor-arg="-force-glcore"
commands:
- [Win_DX11, Win_DX12, Win_Vulkan]: <shared.platform.commands.turn_off_firewall>
- [all]: <shared.platform.commands.setup_utr>
- [all]: <shared.platform.commands.unity_downloader_cli>
- [all]: <shared.platform.commands.call_utr>
after:
- [OSX_OpenGlCore, OSX_Metal, iPhone_Metal, Android_OpenGLES3, Android_Vulkan, XRQuest_OpenGLES3, XRQuest_Vulkan, Linux_OpenGlCore, Linux_Vulkan]: <shared.platform.commands.find_instabilities>
- [OSX_OpenGlCore, OSX_Metal, Linux_OpenGlCore, Linux_Vulkan]: <shared.platform.commands.find_instabilities>

- type: editmode
allow_cache: False
Expand All @@ -179,14 +158,11 @@ test_platforms:
- [all]: --scripting-backend=<SCRIPTING_BACKEND>
- [all]: --platform=editmode
- [all]: --extra-editor-arg="-colorspace=<COLORSPACE>"
- [Android_OpenGLES3, Android_Vulkan]: --platform=Android
- [iPhone_Metal]: --platform=iOS

- [all]: --testproject=./TestProjects/<PROJECT_FOLDER>
- [OSX_Metal]: --testproject=/Users/bokken/Graphics/TestProjects/<PROJECT_FOLDER>

- [all]: --editor-location=.Editor
- [Android_OpenGLES3, Android_Vulkan]: --editor-location=./WindowsEditor
- [OSX_Metal]: --editor-location=/Users/bokken/.Editor

- [all]: --artifacts_path=TestProjects/<PROJECT_FOLDER>/test-results
Expand All @@ -199,16 +175,13 @@ test_platforms:

- [Win_DX11]: --extra-editor-arg="-playergraphicsapi=Direct3D11"
- [Win_DX12]: --extra-editor-arg="-playergraphicsapi=Direct3D12"
- [Win_Vulkan, Linux_Vulkan, Android_Vulkan]: --extra-editor-arg="-playergraphicsapi=Vulkan"
- [Android_OpenGLES3]: --extra-editor-arg="-playergraphicsapi=OpenGLES3"
- [iPhone_Metal]: --extra-editor-arg="-playergraphicsapi=Metal"
- [Win_Vulkan, Linux_Vulkan]: --extra-editor-arg="-playergraphicsapi=Vulkan"
commands:
- [Win_DX11, Win_DX12, Win_Vulkan]: <shared.platform.commands.turn_off_firewall>
- [all]: <shared.platform.commands.setup_utr>
- [all]: <shared.platform.commands.unity_downloader_cli>
- [all]: <shared.platform.commands.call_utr>
after:
- [OSX_OpenGlCore, OSX_Metal, iPhone_Metal, Android_OpenGLES3, Android_Vulkan, XRQuest_OpenGLES3, XRQuest_Vulkan, Linux_OpenGlCore, Linux_Vulkan]: <shared.platform.commands.find_instabilities>
- [OSX_OpenGlCore, OSX_Metal, Linux_OpenGlCore, Linux_Vulkan]: <shared.platform.commands.find_instabilities>

platforms:
Win:
Expand Down Expand Up @@ -258,12 +231,10 @@ platforms:
del revdate.tmp
utr <UTR_FLAGS> & exit 0
unity_downloader_cli:
- command: choco install unity-downloader-cli -y -s https://artifactory.prd.it.unity3d.com/artifactory/api/nuget/unity-choco-local
- command: gsudo 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 <EDITOR_REVISION_CMD> -c editor -c il2cpp --wait --published-only
retries: 2
turn_off_firewall:
- command: NetSh Advfirewall set allprofiles state off
find_instabilities:
- command: pip3 install ant_instability_detection --index-url https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade || exit 0
- command: find_instabilities || exit 0
Expand All @@ -279,11 +250,6 @@ platforms:
type: Unity::metal::macmini
image: slough-ops/macos-10.14-xcode:v0.3.4-687060
flavor: m1.mac
agents_project_OpenGLCore:
default:
type: Unity::VM::osx
image: graphics-foundation/mac-10.15:v0.1.0-841394
flavor: m1.mac
agent_package:
type: Unity::VM::osx
image: package-ci/mac:v1.20.0-1079282
Expand Down
123 changes: 0 additions & 123 deletions .yamato/config/postprocessing.metafile
View file

This file was deleted.

Loading

0 comments on commit d2bd3a5

Please sign in to comment.