[2021.2][RenderPass] Depth, Normals and Decals fixes

.github/pr-commenter.yml

@@ -2,8 +2,8 @@ comment:
   on-update: edit
   header: |
     Hi! This comment will help you figure out which jobs to run before merging your PR. The suggestions are dynamic based on what files you have changed.
-    Link to Yamato: https://yamato.cds.internal.unity3d.com/jobs/902-Graphics
-    Search for your PR branch using the sidebar on the left, then add the following segment(s) to the end of the URL (you may need multiple tabs depending on how many packages you change)
+    Link to Yamato: https://unity-ci.cds.internal.unity3d.com/project/902/
+    Search for your PR branch using the search bar at the top, then add the following segment(s) to the end of the URL (you may need multiple tabs depending on how many packages you change)
   footer: |
     Depending on the scope of your PR, you may need to run more jobs than what has been suggested. Please speak to your lead or a Graphics SDET (#devs-graphics-automation) if you are unsure.
 
@@ -16,39 +16,43 @@ comment:
         - TestProjects/HDRP*/**/*
       body: |
         **HDRP**
-        `/.yamato%252Fall-hdrp.yml%2523PR_HDRP_2021.2`
+        `/jobDefinition/.yamato%2Fall-hdrp.yml%23PR_HDRP_2021.2`
+        With changes to HDRP packages, you should also run
+        `/jobDefinition/.yamato%2Fall-lightmapping.yml%23PR_Lightmapping_2021.2`
     - id: URP
       files:
         - com.unity.render-pipelines.universal/**/*
         - com.unity.testing.urp/**/*
         - TestProjects/Universal*/**/*
       body: |
         **URP**
-        `/.yamato%252Fall-urp.yml%2523PR_URP_2021.2`
+        `/jobDefinition/.yamato%2Fall-urp.yml%23PR_URP_2021.2`
+        With changes to URP packages, you should also run
+        `/jobDefinition/.yamato%2Fall-lightmapping.yml%23PR_Lightmapping_2021.2`
     - id: ShaderGraph
       files:
         - com.unity.shadergraph/**/*
         - TestProjects/ShaderGraph*/**/*
         - com.unity.render-pipelines.universal/Editor/ShaderGraph/*
       body: |
         **Shader Graph**
-        `/.yamato%252Fall-shadergraph.yml%2523PR_ShaderGraph_2021.2`
+        `/jobDefinition/.yamato%252Fall-shadergraph.yml%2523PR_ShaderGraph_2021.2`
         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`
+        `/jobDefinition/.yamato%252Fall-shadergraph_builtin_foundation.yml%2523PR_ShaderGraph_BuiltIn_Foundation_2021.2`
+         /jobDefinition/.yamato%2Fall-shadergraph_builtin_lighting.yml%23PR_ShaderGraph_BuiltIn_Lighting_2021.2
     - id: VFX
       files:
         - com.unity.visualeffectgraph/**/*
         - com.unity.testing.visualeffectgraph/**/*
         - TestProjects/VisualEffectGraph*/**/*
       body: |
         **VFX**
-        `/.yamato%252Fall-vfx.yml%2523PR_VFX_2021.2`
+        `/jobDefinition/.yamato%252Fall-vfx.yml%2523PR_VFX_2021.2`
     - 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`
+        `/jobDefinition/.yamato%2F_abv.yml%23all_project_ci_2021.2`
         Be aware that any modifications to the Core package impacts everyone in the Graphics repo so please discuss the PR with your lead.

.github/workflows/draft.yml

@@ -9,11 +9,11 @@ jobs:
     runs-on: ubuntu-latest
     if: github.event.pull_request.draft == false && github.event.pull_request.ready_for_review == false
     steps:
-    - uses: thollander/actions-comment-pull-request@master
-      with:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        message: |
-              It appears that you made a non-draft PR!
-              Please convert your PR to draft (button on the right side of the page).
-              See the PR template for more information.
-              Thank you!
+      - uses: thollander/actions-comment-pull-request@v1.0.4
+        with:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          message: |
+            It appears that you made a non-draft PR!
+            Please convert your PR to draft (button on the right side of the page).
+            See the PR template for more information.
+            Thank you!

.gitignore

@@ -47,3 +47,4 @@ node_modules
 manifest-updater.py
 TestProjects/UniversalGraphicsTest_Lighting/UserSettings/EditorUserSettings.asset
 TestProjects/UniversalGraphicsTest_Lighting/Packages/packages-lock.json
+com.unity.template-hd/InitCodeMarker

.yamato/_abv.yml

@@ -1,128 +1,12 @@
 
-# This file is generated by .yamato/ruamel/build.py. Don't edit this file manually.
-# Introduce any changes under .yamato/config/*.metafile files (for most cases) or under .yamato/ruamel/* within Python (more elaborate cases), and rerun build.py to regenerate all .yml files.
-# Read more under .yamato/docs/readme.md
+# This file is generated by ant_yaml_generation package, don't edit this file manually.
+# Introduce any changes under .yamato/config/*.metafile files and rerun yaml-generation (or check #devs-automation-tooling).
 
 {% metadata_file .yamato/_cache_config.metafile -%}
 {% metadata_file .yamato/_latest_editor_versions_2021.2.metafile -%}
-{% metadata_file .yamato/_latest_editor_versions_trunk.metafile -%}
 
 ---
 
-all_project_ci_trunk:
-    name: ABV (all PR jobs) on trunk
-    variables:
-        CUSTOM_REVISION: '{{trunk.changeset.id}}'
-        UTR_VERSION: "current"
-        TEST_FILTER: .*
-        CACHE_ARGS: '{{cache.flags}}'
-    dependencies:
-      -  path: .yamato/all-hdrp.yml#PR_HDRP_trunk
-         rerun: on_new_revision
-      -  path: .yamato/all-vfx.yml#PR_VFX_trunk
-         rerun: on_new_revision
-      -  path: .yamato/all-urp.yml#PR_URP_trunk
-         rerun: on_new_revision
-      -  path: .yamato/all-shadergraph.yml#PR_ShaderGraph_trunk
-         rerun: on_new_revision
-      -  path: .yamato/_abv.yml#General_Checks_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"
-        TEST_FILTER: .*
-        CACHE_ARGS: '{{cache.flags}}'
-    triggers:
-        recurring:
-          -  branch: master
-             frequency: weekly
-    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
-General_Checks_trunk:
-    name: General Checks on trunk
-    variables:
-        CUSTOM_REVISION: '{{trunk.changeset.id}}'
-        UTR_VERSION: "current"
-        TEST_FILTER: .*
-        CACHE_ARGS: '{{cache.flags}}'
-    dependencies:
-      -  path: .yamato/_projectcontext.yml#all_package_ci_project_trunk
-         rerun: on_new_revision
-      -  path: .yamato/_formatting.yml#formatting
-         rerun: on_new_revision
-      -  path: .yamato/all-smoke_test.yml#Smoke_Test_trunk
-         rerun: on_new_revision
-Trunk_verification_trunk:
-    name: Trunk verification 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_2d-win-dx11.yml#URP_2D_Win_DX11_editmode_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_foundation-win-dx11.yml#URP_Foundation_Win_DX11_editmode_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
-      -  path: .yamato/urp_lighting-win-dx11.yml#URP_Lighting_Win_DX11_editmode_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_postpro-win-dx11.yml#URP_PostPro_Win_DX11_editmode_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_terrain-win-dx11.yml#URP_Terrain_Win_DX11_editmode_mono_Linear_trunk
-         rerun: on_new_revision
-      -  path: .yamato/shadergraph-win-dx11.yml#ShaderGraph_Win_DX11_playmode_mono_Linear_trunk
-         rerun: on_new_revision
-      -  path: .yamato/shadergraph-win-dx11.yml#ShaderGraph_Win_DX11_editmode_mono_Linear_trunk
-         rerun: on_new_revision
-      -  path: .yamato/hdrp-win-dx11.yml#HDRP_Win_DX11_playmode_mono_Linear_trunk
-         rerun: on_new_revision
-      -  path: .yamato/hdrp-win-dx11.yml#HDRP_Win_DX11_editmode_mono_Linear_trunk
-         rerun: on_new_revision
-      -  path: .yamato/vfx_hdrp-win-dx11.yml#VFX_HDRP_Win_DX11_playmode_mono_Linear_trunk
-         rerun: on_new_revision
-      -  path: .yamato/vfx_hdrp-win-dx11.yml#VFX_HDRP_Win_DX11_editmode_mono_Linear_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:
@@ -150,7 +34,7 @@ all_project_ci_nightly_2021.2:
         CACHE_ARGS: '{{cache.flags}}'
     triggers:
         recurring:
-          -  branch: master
+          -  branch: 2021.2/staging
              frequency: 1 * * ?
     dependencies:
       -  path: .yamato/all-hdrp.yml#Nightly_HDRP_2021.2
@@ -161,39 +45,41 @@ all_project_ci_nightly_2021.2:
          rerun: on_new_revision
       -  path: .yamato/all-shadergraph.yml#Nightly_ShaderGraph_2021.2
          rerun: on_new_revision
+      -  path: .yamato/all-lightmapping.yml#Lightmapping_2021.2
+         rerun: on_new_revision
+      -  path: .yamato/_templates.yml#all_template_ci_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
+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/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
+      -  path: .yamato/_projectcontext.yml#all_package_ci_project_2021.2
          rerun: on_new_revision
-      -  path: .yamato/all-shadergraph.yml#Nightly_ShaderGraph_2021.2
+      -  path: .yamato/_formatting.yml#formatting
          rerun: on_new_revision
-      -  path: .yamato/_abv.yml#General_Checks_2021.2
+      -  path: .yamato/all-smoke_test.yml#Smoke_Test_2021.2
          rerun: on_new_revision
-General_Checks_2021.2:
-    name: General Checks on 2021.2
+Safety_net_2021.2:
+    name: Safety net on 2021.2
     variables:
         CUSTOM_REVISION: '{{2021_2.changeset.id}}'
         UTR_VERSION: "current"
         TEST_FILTER: .*
         CACHE_ARGS: '{{cache.flags}}'
+    triggers:
+        expression: pull_request.target eq "2021.2/staging" AND NOT pull_request.draft AND pull_request.changes.any match [".yamato/**/*", "com.unity.*/**/*", "TestProjects/**/*"]
     dependencies:
-      -  path: .yamato/_projectcontext.yml#all_package_ci_project_2021.2
+      -  path: .yamato/shadergraph-win-dx11.yml#ShaderGraph_Win_DX11_playmode_mono_Linear_2021.2
          rerun: on_new_revision
-      -  path: .yamato/_formatting.yml#formatting
+      -  path: .yamato/vfx_hdrp-win-dx11.yml#VFX_HDRP_Win_DX11_playmode_mono_Linear_2021.2
          rerun: on_new_revision
-      -  path: .yamato/all-smoke_test.yml#Smoke_Test_2021.2
+      -  path: .yamato/vfx_urp-win-dx11.yml#VFX_URP_Win_DX11_playmode_mono_Linear_2021.2
          rerun: on_new_revision
 Trunk_verification_2021.2:
     name: Trunk verification on 2021.2
@@ -271,39 +157,39 @@ all_project_ci_nightly_CUSTOM-REVISION:
          rerun: on_new_revision
       -  path: .yamato/all-shadergraph.yml#Nightly_ShaderGraph_CUSTOM-REVISION
          rerun: on_new_revision
+      -  path: .yamato/all-lightmapping.yml#Lightmapping_CUSTOM-REVISION
+         rerun: on_new_revision
+      -  path: .yamato/_templates.yml#all_template_ci_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
+General_Checks_CUSTOM-REVISION:
+    name: General Checks 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
+      -  path: .yamato/_projectcontext.yml#all_package_ci_project_CUSTOM-REVISION
          rerun: on_new_revision
-      -  path: .yamato/all-shadergraph.yml#Nightly_ShaderGraph_CUSTOM-REVISION
+      -  path: .yamato/_formatting.yml#formatting
          rerun: on_new_revision
-      -  path: .yamato/_abv.yml#General_Checks_CUSTOM-REVISION
+      -  path: .yamato/all-smoke_test.yml#Smoke_Test_CUSTOM-REVISION
          rerun: on_new_revision
-General_Checks_CUSTOM-REVISION:
-    name: General Checks on CUSTOM-REVISION
+Safety_net_CUSTOM-REVISION:
+    name: Safety net on CUSTOM-REVISION
     variables:
         CUSTOM_REVISION: custom_revision_not_set
         UTR_VERSION: "current"
         TEST_FILTER: .*
         CACHE_ARGS: '{{cache.flags}}'
     dependencies:
-      -  path: .yamato/_projectcontext.yml#all_package_ci_project_CUSTOM-REVISION
+      -  path: .yamato/shadergraph-win-dx11.yml#ShaderGraph_Win_DX11_playmode_mono_Linear_CUSTOM-REVISION
          rerun: on_new_revision
-      -  path: .yamato/_formatting.yml#formatting
+      -  path: .yamato/vfx_hdrp-win-dx11.yml#VFX_HDRP_Win_DX11_playmode_mono_Linear_CUSTOM-REVISION
          rerun: on_new_revision
-      -  path: .yamato/all-smoke_test.yml#Smoke_Test_CUSTOM-REVISION
+      -  path: .yamato/vfx_urp-win-dx11.yml#VFX_URP_Win_DX11_playmode_mono_Linear_CUSTOM-REVISION
          rerun: on_new_revision
 Trunk_verification_CUSTOM-REVISION:
     name: Trunk verification on CUSTOM-REVISION

.yamato/_cache_config.metafile

@@ -1,3 +1,2 @@
 cache:
-  flags: --extra-editor-arg="-adb2" --extra-editor-arg="-enableCacheServer" --extra-editor-arg="-cacheServerEndpoint" --extra-editor-arg="cacheserver-slo.hq.unity3d.com" --extra-editor-arg="-cacheServerNamespacePrefix" --extra-editor-arg="SRP_trunk" --extra-editor-arg="-cacheServerEnableDownload" --extra-editor-arg="true" --extra-editor-arg="-cacheServerEnableUpload" --extra-editor-arg="true"
-
+  flags: --extra-editor-arg="-cacheServerNamespacePrefix" --extra-editor-arg="SRP_2021.2" --extra-editor-arg="-adb2" --extra-editor-arg="-enableCacheServer" --extra-editor-arg="-cacheServerEndpoint" --extra-editor-arg="cacheserver-slo.hq.unity3d.com" --extra-editor-arg="-cacheServerEnableDownload" --extra-editor-arg="true" --extra-editor-arg="-cacheServerEnableUpload" --extra-editor-arg="true" --extra-editor-arg="-cacheServerWaitForUploadCompletion"

.yamato/_copycat.yml

@@ -9,7 +9,7 @@ nightly_katana_abv_validate:
   variables:
     MANIFEST: .copycat/graphics.json
     RELEASE_BRANCH: trunk
-    SRP_VERSION: "12.0.0"
+    SRP_VERSION: "12.1.2"
   skip_checkout: true
   commands:
     - eval "$COPYCAT_1"
@@ -31,7 +31,7 @@ vendor:
   variables:
     MANIFEST: .copycat/graphics.json
     RELEASE_BRANCH: trunk
-    SRP_VERSION: "12.0.0"
+    SRP_VERSION: "12.1.2"
   skip_checkout: true
   commands:
     - eval "$COPYCAT_1"

.yamato/_editor_pinning.yml

@@ -1,11 +1,9 @@
 
-# This file is generated by .yamato/ruamel/build.py. Don't edit this file manually.
-# Introduce any changes under .yamato/config/*.metafile files (for most cases) or under .yamato/ruamel/* within Python (more elaborate cases), and rerun build.py to regenerate all .yml files.
-# Read more under .yamato/docs/readme.md
+# This file is generated by ant_yaml_generation package, don't edit this file manually.
+# Introduce any changes under .yamato/config/*.metafile files and rerun yaml-generation (or check #devs-automation-tooling).
 
 {% metadata_file .yamato/_cache_config.metafile -%}
 {% metadata_file .yamato/_latest_editor_versions_2021.2.metafile -%}
-{% metadata_file .yamato/_latest_editor_versions_trunk.metafile -%}
 
 ---
 
@@ -28,9 +26,8 @@ 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 2021.2 --ono-branch $ONO_BRANCH_2021_2 --api-key $ONO_API_KEY --commit-and-push --nr-commits-to-retrieve 1
     triggers:
         recurring:
-          -  branch: master
+          -  branch: 2021.2/staging
              frequency: 23 * * ?