Merge branch 'master' into HDRP/fallback-directional-rt

Unity-Technologies · Nov 25, 2020 · dd1b810 · dd1b810
2 parents 3003af0 + 9898bf6
commit dd1b810
Show file tree

Hide file tree

Showing 659 changed files with 11,357 additions and 1,920 deletions.
diff --git a/.yamato/all-hdrp.yml b/.yamato/all-hdrp.yml
@@ -48,6 +48,8 @@ All_HDRP_trunk:
          rerun: on-new-revision
       -  path: .yamato/all-hdrp_hybrid.yml#All_HDRP_Hybrid_trunk
          rerun: on-new-revision
+    variables:
+        TEST_FILTER: .*
 All_HDRP_CUSTOM-REVISION:
     name: All HDRP CI - CUSTOM-REVISION
     dependencies:
@@ -91,3 +93,4 @@ All_HDRP_CUSTOM-REVISION:
          rerun: always
     variables:
         CUSTOM_REVISION: custom_revision_not_set
+        TEST_FILTER: .*
diff --git a/.yamato/all-hdrp_dxr.yml b/.yamato/all-hdrp_dxr.yml
@@ -18,6 +18,8 @@ All_HDRP_DXR_trunk:
          rerun: on-new-revision
       -  path: .yamato/hdrp_dxr-win-dx12.yml#HDRP_DXR_Win_DX12_playmode_NonRenderGraph_mono_Linear_trunk
          rerun: on-new-revision
+    variables:
+        TEST_FILTER: .*
 All_HDRP_DXR_CUSTOM-REVISION:
     name: All HDRP_DXR CI - CUSTOM-REVISION
     dependencies:
@@ -31,3 +33,4 @@ All_HDRP_DXR_CUSTOM-REVISION:
          rerun: always
     variables:
         CUSTOM_REVISION: custom_revision_not_set
+        TEST_FILTER: .*
diff --git a/.yamato/all-hdrp_hybrid.yml b/.yamato/all-hdrp_hybrid.yml
@@ -14,6 +14,8 @@ All_HDRP_Hybrid_trunk:
          rerun: on-new-revision
       -  path: .yamato/hdrp_hybrid-win-dx11.yml#HDRP_Hybrid_Win_DX11_playmode_XR_mono_Linear_trunk
          rerun: on-new-revision
+    variables:
+        TEST_FILTER: .*
 All_HDRP_Hybrid_CUSTOM-REVISION:
     name: All HDRP_Hybrid CI - CUSTOM-REVISION
     dependencies:
@@ -23,3 +25,4 @@ All_HDRP_Hybrid_CUSTOM-REVISION:
          rerun: always
     variables:
         CUSTOM_REVISION: custom_revision_not_set
+        TEST_FILTER: .*
diff --git a/.yamato/all-shadergraph.yml b/.yamato/all-shadergraph.yml
@@ -20,6 +20,8 @@ All_ShaderGraph_trunk:
          rerun: on-new-revision
       -  path: .yamato/all-shadergraph_stereo.yml#All_ShaderGraph_Stereo_trunk
          rerun: on-new-revision
+    variables:
+        TEST_FILTER: .*
 All_ShaderGraph_CUSTOM-REVISION:
     name: All ShaderGraph CI - CUSTOM-REVISION
     dependencies:
@@ -35,3 +37,4 @@ All_ShaderGraph_CUSTOM-REVISION:
          rerun: always
     variables:
         CUSTOM_REVISION: custom_revision_not_set
+        TEST_FILTER: .*
diff --git a/.yamato/all-shadergraph_stereo.yml b/.yamato/all-shadergraph_stereo.yml
@@ -14,6 +14,8 @@ All_ShaderGraph_Stereo_trunk:
          rerun: on-new-revision
       -  path: .yamato/shadergraph_stereo-win.yml#ShaderGraph_Stereo_Win_editmode_mono_Linear_trunk
          rerun: on-new-revision
+    variables:
+        TEST_FILTER: .*
 All_ShaderGraph_Stereo_CUSTOM-REVISION:
     name: All ShaderGraph_Stereo CI - CUSTOM-REVISION
     dependencies:
@@ -23,3 +25,4 @@ All_ShaderGraph_Stereo_CUSTOM-REVISION:
          rerun: always
     variables:
         CUSTOM_REVISION: custom_revision_not_set
+        TEST_FILTER: .*
diff --git a/.yamato/all-smoke_test.yml b/.yamato/all-smoke_test.yml
@@ -16,6 +16,8 @@ All_Smoke_Test_trunk:
          rerun: on-new-revision
       -  path: .yamato/smoke_test-win-dx11.yml#Smoke_Test_Win_DX11_Standalone_mono_Linear_trunk
          rerun: on-new-revision
+    variables:
+        TEST_FILTER: .*
 All_Smoke_Test_CUSTOM-REVISION:
     name: All Smoke_Test CI - CUSTOM-REVISION
     dependencies:
@@ -27,3 +29,4 @@ All_Smoke_Test_CUSTOM-REVISION:
          rerun: always
     variables:
         CUSTOM_REVISION: custom_revision_not_set
+        TEST_FILTER: .*
diff --git a/.yamato/all-universal.yml b/.yamato/all-universal.yml
@@ -22,10 +22,18 @@ All_Universal_trunk:
          rerun: on-new-revision
       -  path: .yamato/universal-osx-openglcore.yml#Universal_OSX_OpenGLCore_editmode_mono_Linear_trunk
          rerun: on-new-revision
+      -  path: .yamato/universal-android-opengles3.yml#Universal_Android_OpenGLES3_Standalone_il2cpp_Linear_trunk
+         rerun: on-new-revision
+      -  path: .yamato/universal-android-vulkan.yml#Universal_Android_Vulkan_Standalone_il2cpp_Linear_trunk
+         rerun: on-new-revision
+      -  path: .yamato/universal-iphone-metal.yml#Universal_iPhone_Metal_Standalone_il2cpp_Linear_trunk
+         rerun: on-new-revision
       -  path: .yamato/all-universal_stereo.yml#All_Universal_Stereo_trunk
          rerun: on-new-revision
       -  path: .yamato/all-universal_hybrid.yml#All_Universal_Hybrid_trunk
          rerun: on-new-revision
+    variables:
+        TEST_FILTER: .*
 All_Universal_CUSTOM-REVISION:
     name: All Universal CI - CUSTOM-REVISION
     dependencies:
@@ -41,9 +49,16 @@ All_Universal_CUSTOM-REVISION:
          rerun: always
       -  path: .yamato/universal-osx-openglcore.yml#Universal_OSX_OpenGLCore_editmode_mono_Linear_CUSTOM-REVISION
          rerun: always
+      -  path: .yamato/universal-android-opengles3.yml#Universal_Android_OpenGLES3_Standalone_il2cpp_Linear_CUSTOM-REVISION
+         rerun: always
+      -  path: .yamato/universal-android-vulkan.yml#Universal_Android_Vulkan_Standalone_il2cpp_Linear_CUSTOM-REVISION
+         rerun: always
+      -  path: .yamato/universal-iphone-metal.yml#Universal_iPhone_Metal_Standalone_il2cpp_Linear_CUSTOM-REVISION
+         rerun: always
       -  path: .yamato/all-universal_stereo.yml#All_Universal_Stereo_CUSTOM-REVISION
          rerun: always
       -  path: .yamato/all-universal_hybrid.yml#All_Universal_Hybrid_CUSTOM-REVISION
          rerun: always
     variables:
         CUSTOM_REVISION: custom_revision_not_set
+        TEST_FILTER: .*
diff --git a/.yamato/all-universal_hybrid.yml b/.yamato/all-universal_hybrid.yml
@@ -14,6 +14,8 @@ All_Universal_Hybrid_trunk:
          rerun: on-new-revision
       -  path: .yamato/universal_hybrid-osx-metal.yml#Universal_Hybrid_OSX_Metal_playmode_mono_Linear_trunk
          rerun: on-new-revision
+    variables:
+        TEST_FILTER: .*
 All_Universal_Hybrid_CUSTOM-REVISION:
     name: All Universal_Hybrid CI - CUSTOM-REVISION
     dependencies:
@@ -23,3 +25,4 @@ All_Universal_Hybrid_CUSTOM-REVISION:
          rerun: always
     variables:
         CUSTOM_REVISION: custom_revision_not_set
+        TEST_FILTER: .*
diff --git a/.yamato/all-universal_stereo.yml b/.yamato/all-universal_stereo.yml
@@ -14,6 +14,8 @@ All_Universal_Stereo_trunk:
          rerun: on-new-revision
       -  path: .yamato/universal_stereo-win.yml#Universal_Stereo_Win_editmode_mono_Linear_trunk
          rerun: on-new-revision
+    variables:
+        TEST_FILTER: .*
 All_Universal_Stereo_CUSTOM-REVISION:
     name: All Universal_Stereo CI - CUSTOM-REVISION
     dependencies:
@@ -23,3 +25,4 @@ All_Universal_Stereo_CUSTOM-REVISION:
          rerun: always
     variables:
         CUSTOM_REVISION: custom_revision_not_set
+        TEST_FILTER: .*
diff --git a/.yamato/all-urp_performance_boatattack.yml b/.yamato/all-urp_performance_boatattack.yml
@@ -29,6 +29,7 @@ All_URP_Performance_BoatAttack_trunk:
       -  path: .yamato/urp_performance_boatattack-iphone-metal.yml#URP_Performance_BoatAttack_iPhone_Metal_performance_build_editmode_il2cpp_Linear_trunk
          rerun: on-new-revision
     variables:
+        TEST_FILTER: .*
         BOAT_ATTACK_BRANCH: master
         BOAT_ATTACK_REVISION: 60b6bc595f20b29f4869d3236ce1aa91a490ef6b
 All_URP_Performance_BoatAttack_CUSTOM-REVISION:
@@ -54,5 +55,6 @@ All_URP_Performance_BoatAttack_CUSTOM-REVISION:
          rerun: always
     variables:
         CUSTOM_REVISION: custom_revision_not_set
+        TEST_FILTER: .*
         BOAT_ATTACK_BRANCH: master
         BOAT_ATTACK_REVISION: 60b6bc595f20b29f4869d3236ce1aa91a490ef6b
diff --git a/.yamato/all-urpupdate.yml b/.yamato/all-urpupdate.yml
@@ -16,6 +16,8 @@ All_URPUpdate_trunk:
          rerun: on-new-revision
       -  path: .yamato/all-urpupdate_top_asset_store.yml#All_URPUpdate_Top_Asset_Store_trunk
          rerun: on-new-revision
+    variables:
+        TEST_FILTER: .*
 All_URPUpdate_CUSTOM-REVISION:
     name: All URPUpdate CI - CUSTOM-REVISION
     dependencies:
@@ -27,3 +29,4 @@ All_URPUpdate_CUSTOM-REVISION:
          rerun: always
     variables:
         CUSTOM_REVISION: custom_revision_not_set
+        TEST_FILTER: .*
diff --git a/.yamato/all-urpupdate_boatattack.yml b/.yamato/all-urpupdate_boatattack.yml
@@ -14,6 +14,8 @@ All_URPUpdate_BoatAttack_trunk:
          rerun: on-new-revision
       -  path: .yamato/urpupdate_boatattack-win-dx11.yml#URPUpdate_BoatAttack_Win_DX11_playmode_mono_Linear_trunk
          rerun: on-new-revision
+    variables:
+        TEST_FILTER: .*
 All_URPUpdate_BoatAttack_CUSTOM-REVISION:
     name: All URPUpdate_BoatAttack CI - CUSTOM-REVISION
     dependencies:
@@ -23,3 +25,4 @@ All_URPUpdate_BoatAttack_CUSTOM-REVISION:
          rerun: always
     variables:
         CUSTOM_REVISION: custom_revision_not_set
+        TEST_FILTER: .*
diff --git a/.yamato/all-urpupdate_top_asset_store.yml b/.yamato/all-urpupdate_top_asset_store.yml
@@ -14,6 +14,8 @@ All_URPUpdate_Top_Asset_Store_trunk:
          rerun: on-new-revision
       -  path: .yamato/urpupdate_top_asset_store-win-dx11.yml#URPUpdate_Top_Asset_Store_Win_DX11_playmode_mono_Linear_trunk
          rerun: on-new-revision
+    variables:
+        TEST_FILTER: .*
 All_URPUpdate_Top_Asset_Store_CUSTOM-REVISION:
     name: All URPUpdate_Top_Asset_Store CI - CUSTOM-REVISION
     dependencies:
@@ -23,3 +25,4 @@ All_URPUpdate_Top_Asset_Store_CUSTOM-REVISION:
          rerun: always
     variables:
         CUSTOM_REVISION: custom_revision_not_set
+        TEST_FILTER: .*
diff --git a/.yamato/all-vfx_hdrp.yml b/.yamato/all-vfx_hdrp.yml
@@ -18,6 +18,8 @@ All_VFX_HDRP_trunk:
          rerun: on-new-revision
       -  path: .yamato/vfx_hdrp-win-dx11.yml#VFX_HDRP_Win_DX11_playmode_XR_mono_Linear_trunk
          rerun: on-new-revision
+    variables:
+        TEST_FILTER: .*
 All_VFX_HDRP_CUSTOM-REVISION:
     name: All VFX_HDRP CI - CUSTOM-REVISION
     dependencies:
@@ -31,3 +33,4 @@ All_VFX_HDRP_CUSTOM-REVISION:
          rerun: always
     variables:
         CUSTOM_REVISION: custom_revision_not_set
+        TEST_FILTER: .*
diff --git a/.yamato/all-vfx_urp.yml b/.yamato/all-vfx_urp.yml
@@ -14,6 +14,8 @@ All_VFX_URP_trunk:
          rerun: on-new-revision
       -  path: .yamato/vfx_urp-win-dx11.yml#VFX_URP_Win_DX11_playmode_mono_Linear_trunk
          rerun: on-new-revision
+    variables:
+        TEST_FILTER: .*
 All_VFX_URP_CUSTOM-REVISION:
     name: All VFX_URP CI - CUSTOM-REVISION
     dependencies:
@@ -23,3 +25,4 @@ All_VFX_URP_CUSTOM-REVISION:
          rerun: always
     variables:
         CUSTOM_REVISION: custom_revision_not_set
+        TEST_FILTER: .*
diff --git a/.yamato/config/__shared.metafile b/.yamato/config/__shared.metafile
@@ -50,20 +50,22 @@ test_platforms:
       - [Android_OpenGLES3, Android_Vulkan]: --platform=Android
 
       - [Win_DX11, Win_DX12, Win_Vulkan, Win_, Linux_OpenGlCore, Linux_Vulkan]: --player-load-path=../../players 
-      - [Android_OpenGLES3, Android_Vulkan, iPhone_Metal]: --player-load-path=players<TEST_FILTER> 
+      - [Android_OpenGLES3, Android_Vulkan, iPhone_Metal]: --player-load-path=players
 
       - [all]: --artifacts_path=test-results
       - [OSX_Metal]: --artifacts_path=/Users/bokken/Graphics/TestProjects/<PROJECT_FOLDER>/test-results
 
       - [OSX_Metal]: --editor-location=/Users/bokken/.Editor
 
       - [OSX_Metal]: --scripting-backend=<SCRIPTING_BACKEND>
+      - [OSX_Metal]: --testfilter=%TEST_FILTER% 
 
       - [Android_OpenGLES3, Android_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  
 
     utr_flags_build:
+      - [all]: --testfilter=%TEST_FILTER% 
       - [all]: --suite=playmode
       - [all]: --build-only
       - [all]: --scripting-backend=<SCRIPTING_BACKEND>
@@ -85,7 +87,7 @@ test_platforms:
       - [OSX_Metal]: --artifacts_path=/Users/bokken/Graphics/TestProjects/<PROJECT_FOLDER>/test-results
 
       - [Win_DX11, Win_DX12, Win_Vulkan, Win_, Linux_OpenGlCore, Linux_Vulkan]: --player-save-path=../../players 
-      - [Android_OpenGLES3, Android_Vulkan, iPhone_Metal]: --player-save-path=players<TEST_FILTER>
+      - [Android_OpenGLES3, Android_Vulkan, iPhone_Metal]: --player-save-path=players
 
       - [all]: --timeout=1200
       - [Android_OpenGLES3, Android_Vulkan]: --timeout=2700
@@ -108,6 +110,7 @@ test_platforms:
 
   - type: playmode
     utr_flags:
+      - [all]: --testfilter=%TEST_FILTER% 
       - [all]: --suite=playmode
       - [all]: --scripting-backend=<SCRIPTING_BACKEND> 
       - [all]: --reruncount=2
@@ -131,6 +134,7 @@ test_platforms:
 
   - type: editmode
     utr_flags:
+      - [all]: --testfilter=%TEST_FILTER% 
       - [all]: --suite=editor
       - [all]: --reruncount=2
       - [all]: --scripting-backend=<SCRIPTING_BACKEND> 

diff --git a/.yamato/config/universal.metafile b/.yamato/config/universal.metafile
@@ -102,6 +102,24 @@ all:
       color_space: Linear
       test_platforms:
         - editmode
+    - platform: Android
+      api: OpenGLES3
+      build_config: il2cpp
+      color_space: Linear
+      test_platforms:
+        - Standalone
+    - platform: Android
+      api: Vulkan
+      build_config: il2cpp
+      color_space: Linear
+      test_platforms:
+        - Standalone
+    - platform: iPhone
+      api: Metal
+      build_config: il2cpp
+      color_space: Linear
+      test_platforms:
+        - Standalone
     - project: Universal_Stereo
       all: true
     - project: Universal_Hybrid

diff --git a/.yamato/config/universal_perf_boatattack.metafile b/.yamato/config/universal_perf_boatattack.metafile
@@ -9,7 +9,6 @@ test_platforms:
       - [all]: --report-performance-data
       - [all]: --performance-project-id=BoatAttack
       - [iPhone_Metal]: --timeout=2400
-      - [iPhone_Metal, Android_Vulkan, Android_OpenGLES3]: --testfilter="Low;Medium"
     utr_flags_build:
       - [all]: --extra-editor-arg="-executemethod" --extra-editor-arg="Editor.Setup"
       - [all]: --extra-editor-arg="-addscenetobuild=Assets/scenes/Testing/benchmark_island-static.unity"
@@ -24,7 +23,17 @@ test_platforms:
       - [iPhone_Metal]: --extra-editor-arg="-buildtarget" --extra-editor-arg="iOS"
       - [Android_Vulkan, Android_OpenGLES3]: --extra-editor-arg="-buildtarget" --extra-editor-arg="Android"
       - [all]: --extra-editor-arg="-scriptingbackend=<SCRIPTING_BACKEND>" 
-      - [iPhone_Metal, Android_Vulkan, Android_OpenGLES3]: --testfilter="Low;Medium"
+    utr_repeat:
+      - utr_flags:
+        - [iPhone_Metal, Android_Vulkan, Android_OpenGLES3]: --player-load-path=playersLow
+        utr_flags_build:
+        - [iPhone_Metal, Android_Vulkan, Android_OpenGLES3]: --testfilter=Low
+        - [iPhone_Metal, Android_Vulkan, Android_OpenGLES3]: --player-save-path=playersLow
+      - utr_flags:
+        - [iPhone_Metal, Android_Vulkan, Android_OpenGLES3]: --player-load-path=playersMedium
+        utr_flags_build:
+        - [iPhone_Metal, Android_Vulkan, Android_OpenGLES3]: --testfilter=Medium
+        - [iPhone_Metal, Android_Vulkan, Android_OpenGLES3]: --player-save-path=playersMedium
   - type: playmode
     name: performance_playmode_editor
     is_performance: True