Merge branch 'master' into adaptive-performance/add-decals-scaler

* master:
  Add missing shader stages in shader keyword copying  (#6008)
  [Yamato] Add all DX11 job for URP (#6075)
  [HDRP] Add more performance test coverage (#5814)
  Fix templates ISO date (#6073)
  Fix division by 0 when AO is 0 (#6078)
  Fixed grammar errors (#6077)
  [HDRP][Path Tracing] Improved robustness of the stacklit material (#6066)
  [APV] Cell streaming system (#5731)
  Update revision for URP update test project (#6061)
  [HDRP][Path Tracing] Camera ray misses now return a null value with Minimum Depth > 1 (#6067)
  Renable missing test (Lens Flare) (#5456)
  [HDRP][Path Tracing] Added proper support for interleaved tiling (#5953)
  Fix to render depth or depth/normal of waving grass (#4097)
  Remove ScreenSpaceShadowResolvePass (#6002)
  [HDRP][Docs] Update docs with RendererList related option (#6031)
  Layer drawer used in ray/path tracing now matches 100% with camera's. (#5956)
  Fix iridescence tooltip (#5950)
  [HDRP] Change RenderGraph Begin/Execute function pattern to avoid leaks (#5929)
  [HDRP] Fix errors when switching build targets in editor (#5918)
  Generate a material as a subasset for ShaderGraphs (#5795)

Author: odbb

.github/pr-commenter.yml

@@ -16,9 +16,9 @@ comment:
         - TestProjects/HDRP*/**/*
       body: |
         **HDRP**
-        `/jobDefinition/.yamato%2Fall-hdrp.yml%23HDRP_trunk`
+        `/jobDefinition/.yamato%2Fall-hdrp.yml%23PR_HDRP_trunk`
         With changes to HDRP packages, you should also run
-        `/jobDefinition/.yamato%252Fall-lightmapper.yml%2523PR_LightMapper_trunk`
+        `/jobDefinition/.yamato%2Fall-lightmapping.yml%23PR_Lightmapping_trunk`
     - id: URP
       files:
         - com.unity.render-pipelines.universal/**/*
@@ -28,7 +28,7 @@ comment:
         **URP**
         `/jobDefinition/.yamato%252Fall-urp.yml%2523PR_URP_trunk`
         With changes to URP packages, you should also run
-        `/jobDefinition/.yamato%252Fall-lightmapper.yml%2523PR_LightMapper_trunk`
+        `/jobDefinition/.yamato%2Fall-lightmapping.yml%23PR_Lightmapping_trunk`
     - id: ShaderGraph
       files:
         - com.unity.shadergraph/**/*

.yamato/all-hdrp_performancetests.yml

@@ -20,6 +20,10 @@ 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
+      -  path: .yamato/hdrp_performancetests-win-dx11.yml#HDRP_PerformanceTests_Win_DX11_performance_counters_il2cpp_Linear_trunk
+         rerun: on_new_revision
+      -  path: .yamato/hdrp_performancetests-linux-vulkan.yml#HDRP_PerformanceTests_Linux_Vulkan_performance_counters_il2cpp_Linear_trunk
+         rerun: on_new_revision
 HDRP_PerformanceTests_CUSTOM-REVISION:
     name: HDRP_PerformanceTests on CUSTOM-REVISION
     variables:
@@ -33,3 +37,7 @@ HDRP_PerformanceTests_CUSTOM-REVISION:
          rerun: on_new_revision
       -  path: .yamato/hdrp_performancetests-win-dx11.yml#HDRP_PerformanceTests_Win_DX11_performance_run_build_il2cpp_Linear_CUSTOM-REVISION
          rerun: on_new_revision
+      -  path: .yamato/hdrp_performancetests-win-dx11.yml#HDRP_PerformanceTests_Win_DX11_performance_counters_il2cpp_Linear_CUSTOM-REVISION
+         rerun: on_new_revision
+      -  path: .yamato/hdrp_performancetests-linux-vulkan.yml#HDRP_PerformanceTests_Linux_Vulkan_performance_counters_il2cpp_Linear_CUSTOM-REVISION
+         rerun: on_new_revision

.yamato/all-urp.yml

@@ -69,6 +69,24 @@ Nightly_URP_trunk:
          rerun: on_new_revision
       -  path: .yamato/urp_upgrade.yml#URP_Upgrade_test_win_trunk
          rerun: on_new_revision
+All_URP_on_Win_DX11_playmode_trunk:
+    name: All URP on Win DX11 playmode on trunk
+    variables:
+        CUSTOM_REVISION: '{{trunk.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_trunk
+         rerun: on_new_revision
+      -  path: .yamato/urp_foundation-win-dx11.yml#URP_Foundation_Win_DX11_playmode_mono_Linear_trunk
+         rerun: on_new_revision
+      -  path: .yamato/urp_postpro-win-dx11.yml#URP_PostPro_Win_DX11_playmode_mono_Linear_trunk
+         rerun: on_new_revision
+      -  path: .yamato/urp_terrain-win-dx11.yml#URP_Terrain_Win_DX11_playmode_mono_Linear_trunk
+         rerun: on_new_revision
+      -  path: .yamato/urp_lighting-win-dx11.yml#URP_Lighting_Win_DX11_playmode_mono_Linear_trunk
+         rerun: on_new_revision
 PR_URP_CUSTOM-REVISION:
     name: PR URP on CUSTOM-REVISION
     variables:
@@ -131,3 +149,21 @@ Nightly_URP_CUSTOM-REVISION:
          rerun: on_new_revision
       -  path: .yamato/urp_upgrade.yml#URP_Upgrade_test_win_CUSTOM-REVISION
          rerun: on_new_revision
+All_URP_on_Win_DX11_playmode_CUSTOM-REVISION:
+    name: All URP on Win DX11 playmode on CUSTOM-REVISION
+    variables:
+        CUSTOM_REVISION: custom_revision_not_set
+        UTR_VERSION: "current"
+        TEST_FILTER: .*
+        CACHE_ARGS: '{{cache.flags}}'
+    dependencies:
+      -  path: .yamato/urp_2d-win-dx11.yml#URP_2D_Win_DX11_playmode_mono_Linear_CUSTOM-REVISION
+         rerun: on_new_revision
+      -  path: .yamato/urp_foundation-win-dx11.yml#URP_Foundation_Win_DX11_playmode_mono_Linear_CUSTOM-REVISION
+         rerun: on_new_revision
+      -  path: .yamato/urp_postpro-win-dx11.yml#URP_PostPro_Win_DX11_playmode_mono_Linear_CUSTOM-REVISION
+         rerun: on_new_revision
+      -  path: .yamato/urp_terrain-win-dx11.yml#URP_Terrain_Win_DX11_playmode_mono_Linear_CUSTOM-REVISION
+         rerun: on_new_revision
+      -  path: .yamato/urp_lighting-win-dx11.yml#URP_Lighting_Win_DX11_playmode_mono_Linear_CUSTOM-REVISION
+         rerun: on_new_revision

.yamato/all-urpupdate.yml

@@ -14,7 +14,7 @@ PR_URPUpdate_trunk:
         UTR_VERSION: "current"
         TEST_FILTER: .*
         TEMPLATE_UPDATE_PROJECT_BRANCH: master
-        TEMPLATE_UPDATE_PROJECT_REVISION: 818b6345d6bf46cf3e5644aceff134e866c6150e
+        TEMPLATE_UPDATE_PROJECT_REVISION: 84b55bcf7d483bb727f3a368e3ef88a4d8233ffe
         CACHE_ARGS: '{{cache.flags}}'
     dependencies:
       -  path: .yamato/urpupdate-win-dx11.yml#URPUpdate_Win_DX11_editmode_mono_Linear_trunk
@@ -28,7 +28,7 @@ Extra_URPUpdate_trunk:
         UTR_VERSION: "current"
         TEST_FILTER: .*
         TEMPLATE_UPDATE_PROJECT_BRANCH: master
-        TEMPLATE_UPDATE_PROJECT_REVISION: 818b6345d6bf46cf3e5644aceff134e866c6150e
+        TEMPLATE_UPDATE_PROJECT_REVISION: 84b55bcf7d483bb727f3a368e3ef88a4d8233ffe
         CACHE_ARGS: '{{cache.flags}}'
     dependencies: []
 URPUpdate_trunk:
@@ -38,7 +38,7 @@ URPUpdate_trunk:
         UTR_VERSION: "current"
         TEST_FILTER: .*
         TEMPLATE_UPDATE_PROJECT_BRANCH: master
-        TEMPLATE_UPDATE_PROJECT_REVISION: 818b6345d6bf46cf3e5644aceff134e866c6150e
+        TEMPLATE_UPDATE_PROJECT_REVISION: 84b55bcf7d483bb727f3a368e3ef88a4d8233ffe
         CACHE_ARGS: '{{cache.flags}}'
     dependencies:
       -  path: .yamato/all-urpupdate.yml#PR_URPUpdate_trunk
@@ -52,7 +52,7 @@ PR_URPUpdate_CUSTOM-REVISION:
         UTR_VERSION: "current"
         TEST_FILTER: .*
         TEMPLATE_UPDATE_PROJECT_BRANCH: master
-        TEMPLATE_UPDATE_PROJECT_REVISION: 818b6345d6bf46cf3e5644aceff134e866c6150e
+        TEMPLATE_UPDATE_PROJECT_REVISION: 84b55bcf7d483bb727f3a368e3ef88a4d8233ffe
         CACHE_ARGS: '{{cache.flags}}'
     dependencies:
       -  path: .yamato/urpupdate-win-dx11.yml#URPUpdate_Win_DX11_editmode_mono_Linear_CUSTOM-REVISION
@@ -66,7 +66,7 @@ Extra_URPUpdate_CUSTOM-REVISION:
         UTR_VERSION: "current"
         TEST_FILTER: .*
         TEMPLATE_UPDATE_PROJECT_BRANCH: master
-        TEMPLATE_UPDATE_PROJECT_REVISION: 818b6345d6bf46cf3e5644aceff134e866c6150e
+        TEMPLATE_UPDATE_PROJECT_REVISION: 84b55bcf7d483bb727f3a368e3ef88a4d8233ffe
         CACHE_ARGS: '{{cache.flags}}'
     dependencies: []
 URPUpdate_CUSTOM-REVISION:
@@ -76,7 +76,7 @@ URPUpdate_CUSTOM-REVISION:
         UTR_VERSION: "current"
         TEST_FILTER: .*
         TEMPLATE_UPDATE_PROJECT_BRANCH: master
-        TEMPLATE_UPDATE_PROJECT_REVISION: 818b6345d6bf46cf3e5644aceff134e866c6150e
+        TEMPLATE_UPDATE_PROJECT_REVISION: 84b55bcf7d483bb727f3a368e3ef88a4d8233ffe
         CACHE_ARGS: '{{cache.flags}}'
     dependencies:
       -  path: .yamato/all-urpupdate.yml#PR_URPUpdate_CUSTOM-REVISION

.yamato/config/hdrp_perf.metafile

@@ -31,6 +31,26 @@ test_platforms:
           - [all]: --timeout=7200
           - [all]: --platform=StandaloneWindows64
           - [all]: --loglevel=verbose
+  - type: playmode
+    name: performance_counters
+    add_artifacts:
+      - artifacts.logs.paths: "PrebuildLog/**"
+    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>
+      - [Win_DX11, Win_DX12, Win_Vulkan]:
+        - command: git checkout %GIT_BRANCH%
+      - [Linux_Vulkan]:
+        - command: git checkout $GIT_BRANCH
+      - [all]: <shared.platform.commands.call_utr_without_git>
+        flags:
+          - [all]: --testfilter=Counters
+          - [all]: --performance-project-version=. --report-performance-data --performance-project-id=HDRP
+          - [all]: --timeout=7200
+          - [Win]: --platform=StandaloneWindows64
+          - [Linux]: --platform=StandaloneLinux64
+          - [all]: --loglevel=verbose
   - type: editmode
     name: performance_run_build
     allow_cache: True
@@ -71,6 +91,13 @@ platforms:
         type: Unity::VM
         image: sdet/gamecode_win10:stable
         flavor: b1.large
+  - name: Linux
+    apis:
+      - name: Vulkan
+    build_configs:
+      - name: il2cpp
+    color_spaces:
+      - Linear
 
 jobs:
   - name: <PROJECT_NAME>
@@ -82,3 +109,10 @@ jobs:
         test_platforms:
           - performance_memory
           - performance_run_build
+          - performance_counters
+      - platform: Linux
+        api: Vulkan
+        build_config: il2cpp
+        color_space: Linear
+        test_platforms:
+          - performance_counters

.yamato/config/update_template.metafile

@@ -3,7 +3,7 @@ project:
   folder: URP-Update-Testing/URP-Update-Testing
   variables:
     TEMPLATE_UPDATE_PROJECT_BRANCH: master
-    TEMPLATE_UPDATE_PROJECT_REVISION: 818b6345d6bf46cf3e5644aceff134e866c6150e
+    TEMPLATE_UPDATE_PROJECT_REVISION: 84b55bcf7d483bb727f3a368e3ef88a4d8233ffe
 
 reuse_blocks:
   setup_with_utr:

.yamato/config/urp.metafile

@@ -35,4 +35,10 @@ jobs:
 #     - .yamato/all-urpupdate_boatattack.yml#URPUpdate_BoatAttack_<TRACK>
       - .yamato/all-urpupdate_top_asset_store.yml#URPUpdate_Top_Asset_Store_<TRACK>
       - .yamato/urp_upgrade.yml#URP_Upgrade_test_win_<TRACK>
-
+  - name: All <PROJECT_NAME> on Win DX11 playmode
+    dependencies:
+      - .yamato/urp_2d-win-dx11.yml#URP_2D_Win_DX11_playmode_mono_Linear_<TRACK>
+      - .yamato/urp_foundation-win-dx11.yml#URP_Foundation_Win_DX11_playmode_mono_Linear_<TRACK>
+      - .yamato/urp_postpro-win-dx11.yml#URP_PostPro_Win_DX11_playmode_mono_Linear_<TRACK>
+      - .yamato/urp_terrain-win-dx11.yml#URP_Terrain_Win_DX11_playmode_mono_Linear_<TRACK>
+      - .yamato/urp_lighting-win-dx11.yml#URP_Lighting_Win_DX11_playmode_mono_Linear_<TRACK>