Feature/task 831 shader compile error (#89)

* Fixed: HDRP shader compile errors on 2021.2 * Added mac tests with 2020.3 2021.1 and 2021.2. * Fixed error on Light and Shdows scene 2021.2.
Unity-Technologies · Oct 20, 2021 · 3d724da · 3d724da
1 parent e2bc46c
commit 3d724da
Show file tree

Hide file tree

Showing 19 changed files with 853 additions and 345 deletions.
diff --git a/.yamato/osx_metal-hdrp-2020.3.yml b/.yamato/osx_metal-hdrp-2020.3.yml
@@ -0,0 +1,47 @@
+#
+#
+#
+test_projects:
+  - name: HdrpGraphicsTest-2020.3
+unity_versions:
+  - name: 2020.3
+  - name: 2021.1
+---
+{% for test_project in test_projects %}
+{% for unity_version in unity_versions %}
+{{ test_project.name }}_OSX_Metal_playmode_mono_Linear_{{ unity_version.name }}:
+    name: {{ test_project.name }} on OSX_Metal_playmode_mono_Linear on version {{ unity_version.name }}
+    agent:
+        type: Unity::metal::macmini
+        image: slough-ops/macos-10.14-xcode:stable
+        flavor: m1.mac
+    variables:
+        UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates
+    commands:
+      -  curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output TestProjects/{{ test_project.name }}/utr
+      -  chmod +x TestProjects/{{ test_project.name }}/utr
+      -  ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP "bash -lc 'pip3 install unity-downloader-cli --user --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade'"
+      -  scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" -r $YAMATO_SOURCE_DIR bokken@$BOKKEN_DEVICE_IP:~/com.unity.toonshader
+      -  scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP:~/.ssh/id_rsa_macmini
+      -  ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP '$(python3 -m site --user-base)/bin/unity-downloader-cli --source-file ~/com.unity.toonshader/unity_revision_{{ unity_version.name }}.txt -c editor -c il2cpp  --wait --published-only'
+      -  |5-
+
+                 ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; echo \$UPM_REGISTRY; cd ~/com.unity.toonshader/TestProjects/{{ test_project.name }} && ~/com.unity.toonshader/TestProjects/{{ test_project.name }}/utr --artifacts_path=/Users/bokken/com.unity.toonshader/TestProjects/{{ test_project.name }}/test-results --editor-location=/Users/bokken/.Editor --extra-editor-arg="-colorspace=Linear" --reruncount=2 --scripting-backend=Mono2x --suite=playmode --testproject=/Users/bokken/com.unity.toonshader/TestProjects/{{ test_project.name }}"
+                 UTR_RESULT=$? 
+                 mkdir -p TestProjects/{{ test_project.name }}/test-results/
+                 scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/com.unity.toonshader/TestProjects/{{ test_project.name }}/test-results/ TestProjects/{{ test_project.name }}/test-results/
+                 exit $UTR_RESULT
+    triggers:
+        branches:
+          only:
+          - "/.*/"
+    artifacts:
+        logs:
+            paths:
+              -  "**/test-results/**"
+              -  "TestProjects/{{ test_project.name }}/Logs/*.log"
+    dependencies:
+      -  path: .yamato/_editor.yml#editor:priming:{{ unity_version.name }}:macos
+         rerun: on-new-revision
+{% endfor %}
+{% endfor %}
diff --git a/.yamato/osx_metal-hdrp-2021.2.yml b/.yamato/osx_metal-hdrp-2021.2.yml
@@ -0,0 +1,46 @@
+#
+#
+#
+test_projects:
+  - name: HdrpGraphicsTest-2021.2
+unity_versions:
+  - name: 2021.2
+---
+{% for test_project in test_projects %}
+{% for unity_version in unity_versions %}
+{{ test_project.name }}_OSX_Metal_playmode_mono_Linear_{{ unity_version.name }}:
+    name: {{ test_project.name }} on OSX_Metal_playmode_mono_Linear on version {{ unity_version.name }}
+    agent:
+        type: Unity::metal::macmini
+        image: slough-ops/macos-10.14-xcode:stable
+        flavor: m1.mac
+    variables:
+        UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates
+    commands:
+      -  curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output TestProjects/{{ test_project.name }}/utr
+      -  chmod +x TestProjects/{{ test_project.name }}/utr
+      -  ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP "bash -lc 'pip3 install unity-downloader-cli --user --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade'"
+      -  scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" -r $YAMATO_SOURCE_DIR bokken@$BOKKEN_DEVICE_IP:~/com.unity.toonshader
+      -  scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP:~/.ssh/id_rsa_macmini
+      -  ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP '$(python3 -m site --user-base)/bin/unity-downloader-cli --source-file ~/com.unity.toonshader/unity_revision_{{ unity_version.name }}.txt -c editor -c il2cpp  --wait --published-only'
+      -  |5-
+
+                 ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; echo \$UPM_REGISTRY; cd ~/com.unity.toonshader/TestProjects/{{ test_project.name }} && ~/com.unity.toonshader/TestProjects/{{ test_project.name }}/utr --artifacts_path=/Users/bokken/com.unity.toonshader/TestProjects/{{ test_project.name }}/test-results --editor-location=/Users/bokken/.Editor --extra-editor-arg="-colorspace=Linear" --reruncount=2 --scripting-backend=Mono2x --suite=playmode --testproject=/Users/bokken/com.unity.toonshader/TestProjects/{{ test_project.name }}"
+                 UTR_RESULT=$? 
+                 mkdir -p TestProjects/{{ test_project.name }}/test-results/
+                 scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/com.unity.toonshader/TestProjects/{{ test_project.name }}/test-results/ TestProjects/{{ test_project.name }}/test-results/
+                 exit $UTR_RESULT
+    triggers:
+        branches:
+          only:
+          - "/.*/"
+    artifacts:
+        logs:
+            paths:
+              -  "**/test-results/**"
+              -  "TestProjects/{{ test_project.name }}/Logs/*.log"
+    dependencies:
+      -  path: .yamato/_editor.yml#editor:priming:{{ unity_version.name }}:macos
+         rerun: on-new-revision
+{% endfor %}
+{% endfor %}
diff --git a/.yamato/win_dx12-hdrp-2021.2.yml b/.yamato/win_dx12-hdrp-2021.2.yml
@@ -0,0 +1,39 @@
+#
+#
+#
+test_projects:
+  - name: HdrpDX12GraphicsTest-2021.2
+unity_versions:
+  - name: 2021.2
+---
+{% for test_project in test_projects %}
+{% for unity_version in unity_versions %}
+{{ test_project.name }}_Win_DX12_playmode_{{ unity_version.name }}:
+    name: {{ test_project.name }} on Win_DX11_playmode on version {{ unity_version.name }}
+    agent:
+        type: Unity::VM::GPU
+        image: graphics-foundation/win10-dxr:stable
+        flavor: b1.xlarge
+        model: rtx2080
+    variables:
+        UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates
+    dependencies:
+      -  path: .yamato/_editor.yml#editor:priming:{{ unity_version.name }}:windows
+         rerun: on-new-revision
+    commands:
+      -  curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr.bat --output TestProjects/{{ test_project.name }}/utr.bat
+      -  pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade
+      -  cd TestProjects/{{ test_project.name }} && unity-downloader-cli --source-file ../../unity_revision_{{ unity_version.name }}.txt -c editor -c il2cpp  --wait --published-only
+      -  cd TestProjects/{{ test_project.name }} && utr --suite=playmode --testproject=. --editor-location=.Editor --artifacts_path=test-results
+    timeout: 360000
+    retries: 1
+    triggers:
+        branches:
+          only:
+          - "/.*/"
+    artifacts:
+        logs:
+            paths:
+              -  "**/test-results/**"
+{% endfor %}
+{% endfor %}
diff --git a/.yamato/win_vulkan-hdrp-2021.2.yml b/.yamato/win_vulkan-hdrp-2021.2.yml
@@ -0,0 +1,40 @@
+#
+#
+#
+test_projects:
+  - name: HdrpGraphicsTest-2021.2
+unity_versions:
+  - name: 2021.2
+---
+{% for test_project in test_projects %}
+{% for unity_version in unity_versions %}
+{{ test_project.name }}_Win_Vulkan_playmode_{{ unity_version.name }}:
+    name: {{ test_project.name }} on Win_Vulkan_playmode on version {{ unity_version.name }}
+    agent:
+        type: Unity::VM::GPU
+        image: graphics-foundation/win10-dxr:stable
+        flavor: b1.xlarge
+        model: rtx2080
+    variables:
+        UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates
+    dependencies:
+      -  path: .yamato/_editor.yml#editor:priming:{{ unity_version.name }}:windows
+         rerun: on-new-revision
+    commands:
+      -  curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr.bat --output TestProjects/{{ test_project.name }}/utr.bat
+      -  pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade
+      -  cd TestProjects/{{ test_project.name }} && unity-downloader-cli --source-file ../../unity_revision_{{ unity_version.name }}.txt -c editor -c il2cpp  --wait --published-only
+#      -  cd TestProjects/{{ test_project.name }} && utr --scripting-backend=Mono2x --suite=playmode --suite=playmode --testproject=. --editor-location=.Editor --artifacts_path=test-results  --zero-tests-are-ok=1
+      -  cd TestProjects/{{ test_project.name }} && utr --suite=playmode --testproject=. --editor-location=.Editor --artifacts_path=test-results 
+    timeout: 360000
+    retries: 1
+    triggers:
+        branches:
+          only:
+          - "/.*/"
+    artifacts:
+        logs:
+            paths:
+              -  "**/test-results/**"
+{% endfor %}
+{% endfor %}
diff --git a/TestProjects/HdrpDX12GraphicsTest-2021.2/Assets/RP_Assets/HDRenderPipelineAsset_UTS.asset b/TestProjects/HdrpDX12GraphicsTest-2021.2/Assets/RP_Assets/HDRenderPipelineAsset_UTS.asset
@@ -276,7 +276,7 @@ MonoBehaviour:
     - format: 0
       sizeInMegaBytes: 128
   m_UseRenderGraph: 1
-  m_Version: 20
+  m_Version: 21
   m_ObsoleteFrameSettings:
     overrides: 0
     enableShadow: 0

diff --git a/TestProjects/HdrpDX12GraphicsTest-2021.2/Packages/manifest.json b/TestProjects/HdrpDX12GraphicsTest-2021.2/Packages/manifest.json
@@ -5,7 +5,7 @@
     "com.unity.ide.vscode": "1.2.4",
     "com.unity.package-validation-suite": "0.10.0-preview",
     "com.unity.raytracedhardshadow": "https://github.com/unity3d-jp/RaytracedHardShadow.git#bbba12aaf3e7c6fb1c198746ef9a0fcf408b79b9",
-    "com.unity.render-pipelines.high-definition": "12.0.0",
+    "com.unity.render-pipelines.high-definition": "12.1.0",
     "com.unity.test-framework": "1.1.29",
     "com.unity.test-framework.build": "0.0.1-preview.14",
     "com.unity.test-framework.utp-reporter": "1.0.2-preview",

diff --git a/TestProjects/HdrpDX12GraphicsTest-2021.2/Packages/packages-lock.json b/TestProjects/HdrpDX12GraphicsTest-2021.2/Packages/packages-lock.json
@@ -1,11 +1,11 @@
 {
   "dependencies": {
     "com.unity.addressables": {
-      "version": "1.18.15",
+      "version": "1.19.6",
       "depth": 1,
       "source": "registry",
       "dependencies": {
-        "com.unity.scriptablebuildpipeline": "1.19.1",
+        "com.unity.scriptablebuildpipeline": "1.19.2",
         "com.unity.modules.assetbundle": "1.0.0",
         "com.unity.modules.imageconversion": "1.0.0",
         "com.unity.modules.jsonserialize": "1.0.0",
@@ -65,7 +65,7 @@
       "url": "https://packages.unity.com"
     },
     "com.unity.mathematics": {
-      "version": "1.2.1",
+      "version": "1.2.4",
       "depth": 1,
       "source": "registry",
       "dependencies": {},
@@ -102,16 +102,17 @@
       "hash": "bbba12aaf3e7c6fb1c198746ef9a0fcf408b79b9"
     },
     "com.unity.render-pipelines.core": {
-      "version": "12.0.0",
+      "version": "12.1.0",
       "depth": 1,
       "source": "builtin",
       "dependencies": {
         "com.unity.ugui": "1.0.0",
-        "com.unity.modules.physics": "1.0.0"
+        "com.unity.modules.physics": "1.0.0",
+        "com.unity.modules.jsonserialize": "1.0.0"
       }
     },
     "com.unity.render-pipelines.high-definition": {
-      "version": "12.0.0",
+      "version": "12.1.0",
       "depth": 0,
       "source": "builtin",
       "dependencies": {
@@ -121,40 +122,40 @@
         "com.unity.modules.animation": "1.0.0",
         "com.unity.modules.imageconversion": "1.0.0",
         "com.unity.modules.terrain": "1.0.0",
-        "com.unity.render-pipelines.core": "12.0.0",
-        "com.unity.shadergraph": "12.0.0",
-        "com.unity.visualeffectgraph": "12.0.0",
-        "com.unity.render-pipelines.high-definition-config": "12.0.0"
+        "com.unity.render-pipelines.core": "12.1.0",
+        "com.unity.shadergraph": "12.1.0",
+        "com.unity.visualeffectgraph": "12.1.0",
+        "com.unity.render-pipelines.high-definition-config": "12.1.0"
       }
     },
     "com.unity.render-pipelines.high-definition-config": {
-      "version": "12.0.0",
+      "version": "12.1.0",
       "depth": 1,
       "source": "builtin",
       "dependencies": {
-        "com.unity.render-pipelines.core": "12.0.0"
+        "com.unity.render-pipelines.core": "12.1.0"
       }
     },
     "com.unity.scriptablebuildpipeline": {
-      "version": "1.19.1",
+      "version": "1.19.2",
       "depth": 2,
       "source": "registry",
       "dependencies": {},
       "url": "https://packages.unity.com"
     },
     "com.unity.searcher": {
-      "version": "4.8.0",
+      "version": "4.9.0",
       "depth": 2,
       "source": "registry",
       "dependencies": {},
       "url": "https://packages.unity.com"
     },
     "com.unity.shadergraph": {
-      "version": "12.0.0",
+      "version": "12.1.0",
       "depth": 1,
       "source": "builtin",
       "dependencies": {
-        "com.unity.render-pipelines.core": "12.0.0",
+        "com.unity.render-pipelines.core": "12.1.0",
         "com.unity.searcher": "4.8.0"
       }
     },
@@ -239,12 +240,12 @@
       }
     },
     "com.unity.visualeffectgraph": {
-      "version": "12.0.0",
+      "version": "12.1.0",
       "depth": 1,
       "source": "builtin",
       "dependencies": {
-        "com.unity.shadergraph": "12.0.0",
-        "com.unity.render-pipelines.core": "12.0.0"
+        "com.unity.shadergraph": "12.1.0",
+        "com.unity.render-pipelines.core": "12.1.0"
       }
     },
     "com.unity.xr.legacyinputhelpers": {

diff --git a/TestProjects/HdrpDX12GraphicsTest-2021.2/ProjectSettings/ProjectVersion.txt b/TestProjects/HdrpDX12GraphicsTest-2021.2/ProjectSettings/ProjectVersion.txt
@@ -1,2 +1,2 @@
-m_EditorVersion: 2021.2.0b13
-m_EditorVersionWithRevision: 2021.2.0b13 (94c1109a0557)
+m_EditorVersion: 2021.2.0b16
+m_EditorVersionWithRevision: 2021.2.0b16 (edbc0738c91b)
diff --git a/TestProjects/HdrpGraphicsTest-2021.2/Assets/RP_Assets/HDRenderPipelineAsset_UTS.asset b/TestProjects/HdrpGraphicsTest-2021.2/Assets/RP_Assets/HDRenderPipelineAsset_UTS.asset
@@ -276,7 +276,7 @@ MonoBehaviour:
     - format: 0
       sizeInMegaBytes: 128
   m_UseRenderGraph: 1
-  m_Version: 20
+  m_Version: 21
   m_ObsoleteFrameSettings:
     overrides: 0
     enableShadow: 0