From 0a727a3bde1faa85cb9465cfb2a961946d1556af Mon Sep 17 00:00:00 2001 From: Sophia <16596228+sophiaaar@users.noreply.github.com> Date: Thu, 5 Nov 2020 11:58:26 +0100 Subject: [PATCH] [Yamato] Fix cmd line args for graphics API (#2437) * delete "SetupProject" from URP project * Fix API and colorspace templates for job builder * update GTF to 7.6.0-preview Co-authored-by: tomzig16 --- .yamato/config/__shared.metafile | 20 +++++------ .yamato/hdrp-linux-vulkan.yml | 4 +-- .yamato/hdrp-win-dx11.yml | 4 +-- .yamato/hdrp-win-dx12.yml | 4 +-- .yamato/hdrp-win-vulkan.yml | 4 +-- .yamato/hdrp_dxr-win-dx12.yml | 4 +-- .yamato/hdrp_hybrid-linux-vulkan.yml | 4 +-- .yamato/hdrp_hybrid-win-dx11.yml | 4 +-- .yamato/hdrp_hybrid-win-dx12.yml | 4 +-- .yamato/hdrp_hybrid-win-vulkan.yml | 4 +-- .yamato/shadergraph-linux-vulkan.yml | 4 +-- .yamato/shadergraph-win-dx11.yml | 4 +-- .yamato/shadergraph-win-vulkan.yml | 4 +-- .yamato/smoke_test-win-dx11.yml | 4 +-- .yamato/universal-android-opengles3.yml | 4 +-- .yamato/universal-android-vulkan.yml | 4 +-- .yamato/universal-iphone-metal.yml | 4 +-- .yamato/universal-linux-vulkan.yml | 4 +-- .yamato/universal-win-dx11.yml | 4 +-- .yamato/universal-win-dx12.yml | 4 +-- .yamato/universal-win-vulkan.yml | 4 +-- .../universal_hybrid-android-opengles3.yml | 4 +-- .yamato/universal_hybrid-android-vulkan.yml | 4 +-- .yamato/universal_hybrid-linux-vulkan.yml | 4 +-- .yamato/universal_hybrid-win-dx11.yml | 4 +-- .yamato/universal_hybrid-win-vulkan.yml | 4 +-- .yamato/vfx_hdrp-linux-vulkan.yml | 4 +-- .yamato/vfx_hdrp-win-dx11.yml | 4 +-- .yamato/vfx_hdrp-win-vulkan.yml | 4 +-- .yamato/vfx_urp-linux-vulkan.yml | 4 +-- .yamato/vfx_urp-win-dx11.yml | 4 +-- .yamato/vfx_urp-win-vulkan.yml | 4 +-- .../HDRP_DXR_Tests/Packages/manifest.json | 2 +- .../HDRP_HybridTests/Packages/manifest.json | 2 +- .../HDRP_RuntimeTests/Packages/manifest.json | 2 +- .../HDRP_Tests/Packages/manifest.json | 4 +-- .../SRP_SmokeTest/Packages/manifest.json | 2 +- .../ShaderGraph/Packages/manifest.json | 2 +- .../Packages/manifest.json | 2 +- .../Packages/manifest.json | 2 +- .../Assets/Test/Editor/SetupProject.cs | 36 ------------------- .../Assets/Test/Editor/SetupProject.cs.meta | 11 ------ .../Packages/manifest.json | 2 +- .../Packages/manifest.json | 2 +- .../Packages/manifest.json | 2 +- .../Packages/manifest.json | 2 +- 46 files changed, 85 insertions(+), 132 deletions(-) delete mode 100644 TestProjects/UniversalGraphicsTest/Assets/Test/Editor/SetupProject.cs delete mode 100644 TestProjects/UniversalGraphicsTest/Assets/Test/Editor/SetupProject.cs.meta diff --git a/.yamato/config/__shared.metafile b/.yamato/config/__shared.metafile index a6b5a8d234e..99610bbe56f 100644 --- a/.yamato/config/__shared.metafile +++ b/.yamato/config/__shared.metafile @@ -57,7 +57,7 @@ test_platforms: - [OSX_Metal]: --editor-location=/Users/bokken/.Editor - - [OSX_Metal]: --scripting-backend= + - [OSX_Metal]: --scripting-backend= - [Android_OpenGLES3, Android_Vulkan]: --architecture=ARM64 - [OSX_Metal]: --testproject=/Users/bokken/Graphics/TestProjects/ @@ -66,8 +66,8 @@ test_platforms: utr_flags_build: - [all]: --suite=playmode - [all]: --build-only - - [all]: --scripting-backend= - - [all]: --extra-editor-arg="-colorspace=" + - [all]: --scripting-backend= + - [all]: --extra-editor-arg="-colorspace=" - [Win_DX11, Win_DX12, Win_Vulkan, Win_]: --platform=StandaloneWindows64 - [Linux_OpenGlCore, Linux_Vulkan]: --platform=StandaloneLinux64 @@ -93,11 +93,11 @@ test_platforms: - [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" - - [Win_DX12]: --extra-editor-arg="-executemethod" --extra-editor-arg="SetupProject.ApplySettings" --extra-editor-arg="d3d12" - - [Win_Vulkan, Linux_Vulkan, Android_Vulkan]: --extra-editor-arg="-executemethod" --extra-editor-arg="SetupProject.ApplySettings" --extra-editor-arg="vulkan" - - [Android_OpenGLES3]: ---extra-editor-arg="-executemethod" --extra-editor-arg="SetupProject.ApplySettings" --extra-editor-arg="gles3" - - [iPhone_Metal]: --extra-editor-arg="-executemethod" --extra-editor-arg="SetupProject.ApplySettings" --extra-editor-arg="metal" + - [Win_DX11]: --extra-editor-arg="-executemethod" --extra-editor-arg="SetupProject.ApplySettings" --extra-editor-arg="d3d11" --extra-editor-arg="" + - [Win_DX12]: --extra-editor-arg="-executemethod" --extra-editor-arg="SetupProject.ApplySettings" --extra-editor-arg="d3d12" --extra-editor-arg="" + - [Win_Vulkan, Linux_Vulkan, Android_Vulkan]: --extra-editor-arg="-executemethod" --extra-editor-arg="SetupProject.ApplySettings" --extra-editor-arg="vulkan" --extra-editor-arg="" + - [Android_OpenGLES3]: ---extra-editor-arg="-executemethod" --extra-editor-arg="SetupProject.ApplySettings" --extra-editor-arg="gles3" --extra-editor-arg="" + - [iPhone_Metal]: --extra-editor-arg="-executemethod" --extra-editor-arg="SetupProject.ApplySettings" --extra-editor-arg="metal" --extra-editor-arg="" - [Win_DX11]: --extra-editor-arg="-playergraphicsapi=Direct3D11" - [Win_DX12]: --extra-editor-arg="-playergraphicsapi=Direct3D12" @@ -111,8 +111,8 @@ test_platforms: utr_flags: - [all]: --suite=playmode - [all]: --scripting-backend= - - [all]: --extra-editor-arg="-colorspace=" - [all]: --reruncount=2 + - [all]: --extra-editor-arg="-colorspace=" - [all]: --testproject=. - [Android_OpenGLES3, Android_Vulkan]: --testproject=./TestProjects/ @@ -136,8 +136,8 @@ test_platforms: - [all]: --suite=editor - [all]: --reruncount=2 - [all]: --scripting-backend= - - [all]: --extra-editor-arg="-colorspace=" - [all]: --platform=editmode + - [all]: --extra-editor-arg="-colorspace=" - [all]: --testproject=. - [Android_OpenGLES3, Android_Vulkan]: --testproject=./TestProjects/ diff --git a/.yamato/hdrp-linux-vulkan.yml b/.yamato/hdrp-linux-vulkan.yml index 5bf55172ab3..cab123df51b 100644 --- a/.yamato/hdrp-linux-vulkan.yml +++ b/.yamato/hdrp-linux-vulkan.yml @@ -101,7 +101,7 @@ Build_HDRP_Linux_Vulkan_Player_mono_Linear_trunk: - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr --output TestProjects/HDRP_RuntimeTests/utr - chmod +x TestProjects/HDRP_RuntimeTests/utr - cd TestProjects/HDRP_RuntimeTests && sudo unity-downloader-cli -u {{editor_versions.trunk_latest_internal.linux.revision}} -c editor -c il2cpp --wait --published-only - - cd TestProjects/HDRP_RuntimeTests && DISPLAY=:0.0 ./utr --artifacts_path=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="-playergraphicsapi=Vulkan" --platform=StandaloneLinux64 --player-save-path=../../players --scripting-backend=Mono2x --suite=playmode --testproject=. --timeout=1200 + - cd TestProjects/HDRP_RuntimeTests && DISPLAY=:0.0 ./utr --artifacts_path=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 --testproject=. --timeout=1200 artifacts: logs: paths: @@ -220,7 +220,7 @@ Build_HDRP_Linux_Vulkan_Player_mono_Linear_CUSTOM-REVISION: - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr --output TestProjects/HDRP_RuntimeTests/utr - chmod +x TestProjects/HDRP_RuntimeTests/utr - cd TestProjects/HDRP_RuntimeTests && sudo unity-downloader-cli --source-file ../../unity_revision.txt -c editor -c il2cpp --wait --published-only - - cd TestProjects/HDRP_RuntimeTests && DISPLAY=:0.0 ./utr --artifacts_path=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="-playergraphicsapi=Vulkan" --platform=StandaloneLinux64 --player-save-path=../../players --scripting-backend=Mono2x --suite=playmode --testproject=. --timeout=1200 + - cd TestProjects/HDRP_RuntimeTests && DISPLAY=:0.0 ./utr --artifacts_path=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 --testproject=. --timeout=1200 artifacts: logs: paths: diff --git a/.yamato/hdrp-win-dx11.yml b/.yamato/hdrp-win-dx11.yml index 1066032c491..237d335eb76 100644 --- a/.yamato/hdrp-win-dx11.yml +++ b/.yamato/hdrp-win-dx11.yml @@ -144,7 +144,7 @@ Build_HDRP_Win_DX11_Player_mono_Linear_trunk: set /p GIT_REVISIONDATE= - { - { "gamma", () => PlayerSettings.colorSpace = ColorSpace.Gamma }, - { "linear", () => PlayerSettings.colorSpace = ColorSpace.Linear }, - { "glcore", () => SetGraphicsAPI(GraphicsDeviceType.OpenGLCore) }, - { "d3d11", () => SetGraphicsAPI(GraphicsDeviceType.Direct3D11) }, - { "d3d12", () => SetGraphicsAPI(GraphicsDeviceType.Direct3D12) }, - { "vulkan", () => SetGraphicsAPI(GraphicsDeviceType.Vulkan) } - }; - - var args = Environment.GetCommandLineArgs(); - foreach (var arg in args) - { - Action action; - if (options.TryGetValue(arg, out action)) - action(); - } - } - - static void SetGraphicsAPI(GraphicsDeviceType api) - { - var currentTarget = EditorUserBuildSettings.activeBuildTarget; - PlayerSettings.SetGraphicsAPIs(currentTarget, new [] { api } ); - } -} diff --git a/TestProjects/UniversalGraphicsTest/Assets/Test/Editor/SetupProject.cs.meta b/TestProjects/UniversalGraphicsTest/Assets/Test/Editor/SetupProject.cs.meta deleted file mode 100644 index d13e5172e97..00000000000 --- a/TestProjects/UniversalGraphicsTest/Assets/Test/Editor/SetupProject.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: e3ca42651cb9072459e086f0544a388c -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/TestProjects/UniversalGraphicsTest/Packages/manifest.json b/TestProjects/UniversalGraphicsTest/Packages/manifest.json index 6422debc500..f16cbd8fd90 100644 --- a/TestProjects/UniversalGraphicsTest/Packages/manifest.json +++ b/TestProjects/UniversalGraphicsTest/Packages/manifest.json @@ -12,7 +12,7 @@ "com.unity.test-framework": "1.1.14", "com.unity.test-framework.build": "0.0.1-preview.12", "com.unity.test-framework.utp-reporter": "1.0.2-preview", - "com.unity.testframework.graphics": "7.5.0-preview", + "com.unity.testframework.graphics": "7.6.0-preview", "com.unity.ugui": "1.0.0", "com.unity.modules.ai": "1.0.0", "com.unity.modules.androidjni": "1.0.0", diff --git a/TestProjects/UniversalHybridTest/Packages/manifest.json b/TestProjects/UniversalHybridTest/Packages/manifest.json index 866767d374d..d5313d6db8e 100644 --- a/TestProjects/UniversalHybridTest/Packages/manifest.json +++ b/TestProjects/UniversalHybridTest/Packages/manifest.json @@ -18,7 +18,7 @@ "com.unity.test-framework": "1.1.16", "com.unity.test-framework.build": "0.0.1-preview.12", "com.unity.test-framework.utp-reporter": "0.2.3-preview", - "com.unity.testframework.graphics": "7.5.0-preview", + "com.unity.testframework.graphics": "7.6.0-preview", "com.unity.textmeshpro": "3.0.0-preview.1", "com.unity.timeline": "1.2.6", "com.unity.ugui": "1.0.0", diff --git a/TestProjects/VisualEffectGraph_HDRP/Packages/manifest.json b/TestProjects/VisualEffectGraph_HDRP/Packages/manifest.json index c61b26dee8a..ebdcfbde103 100644 --- a/TestProjects/VisualEffectGraph_HDRP/Packages/manifest.json +++ b/TestProjects/VisualEffectGraph_HDRP/Packages/manifest.json @@ -9,7 +9,7 @@ "com.unity.test-framework": "1.1.14", "com.unity.test-framework.build": "0.0.1-preview.12", "com.unity.test-framework.utp-reporter": "1.0.2-preview", - "com.unity.testframework.graphics": "7.5.0-preview", + "com.unity.testframework.graphics": "7.6.0-preview", "com.unity.testing.visualeffectgraph": "file:../../../com.unity.testing.visualeffectgraph", "com.unity.timeline": "1.2.9", "com.unity.ugui": "1.0.0", diff --git a/TestProjects/VisualEffectGraph_URP/Packages/manifest.json b/TestProjects/VisualEffectGraph_URP/Packages/manifest.json index e4ada394f93..60cabd0cb05 100644 --- a/TestProjects/VisualEffectGraph_URP/Packages/manifest.json +++ b/TestProjects/VisualEffectGraph_URP/Packages/manifest.json @@ -7,7 +7,7 @@ "com.unity.test-framework": "1.1.14", "com.unity.test-framework.build": "0.0.1-preview.12", "com.unity.test-framework.utp-reporter": "1.0.2-preview", - "com.unity.testframework.graphics": "7.5.0-preview", + "com.unity.testframework.graphics": "7.6.0-preview", "com.unity.testing.visualeffectgraph": "file:../../../com.unity.testing.visualeffectgraph", "com.unity.ugui": "1.0.0", "com.unity.visualeffectgraph": "file:../../../com.unity.visualeffectgraph",