Skip to content

Commit 3d724da

Browse files
H3idi-XH3idi-X
authored
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.
1 parent e2bc46c commit 3d724da

File tree

19 files changed

+853
-345
lines changed

19 files changed

+853
-345
lines changed

‎.yamato/osx_metal-hdrp-2020.3.yml‎

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
#
2+
#
3+
#
4+
test_projects:
5+
- name: HdrpGraphicsTest-2020.3
6+
unity_versions:
7+
- name: 2020.3
8+
- name: 2021.1
9+
---
10+
{% for test_project in test_projects %}
11+
{% for unity_version in unity_versions %}
12+
{{ test_project.name }}_OSX_Metal_playmode_mono_Linear_{{ unity_version.name }}:
13+
name: {{ test_project.name }} on OSX_Metal_playmode_mono_Linear on version {{ unity_version.name }}
14+
agent:
15+
type: Unity::metal::macmini
16+
image: slough-ops/macos-10.14-xcode:stable
17+
flavor: m1.mac
18+
variables:
19+
UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates
20+
commands:
21+
- curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output TestProjects/{{ test_project.name }}/utr
22+
- chmod +x TestProjects/{{ test_project.name }}/utr
23+
- 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'"
24+
- scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" -r $YAMATO_SOURCE_DIR bokken@$BOKKEN_DEVICE_IP:~/com.unity.toonshader
25+
- scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP:~/.ssh/id_rsa_macmini
26+
- 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'
27+
- |5-
28+
29+
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 }}"
30+
UTR_RESULT=$?
31+
mkdir -p TestProjects/{{ test_project.name }}/test-results/
32+
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/
33+
exit $UTR_RESULT
34+
triggers:
35+
branches:
36+
only:
37+
- "/.*/"
38+
artifacts:
39+
logs:
40+
paths:
41+
- "**/test-results/**"
42+
- "TestProjects/{{ test_project.name }}/Logs/*.log"
43+
dependencies:
44+
- path: .yamato/_editor.yml#editor:priming:{{ unity_version.name }}:macos
45+
rerun: on-new-revision
46+
{% endfor %}
47+
{% endfor %}

‎.yamato/osx_metal-hdrp-2021.2.yml‎

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
#
2+
#
3+
#
4+
test_projects:
5+
- name: HdrpGraphicsTest-2021.2
6+
unity_versions:
7+
- name: 2021.2
8+
---
9+
{% for test_project in test_projects %}
10+
{% for unity_version in unity_versions %}
11+
{{ test_project.name }}_OSX_Metal_playmode_mono_Linear_{{ unity_version.name }}:
12+
name: {{ test_project.name }} on OSX_Metal_playmode_mono_Linear on version {{ unity_version.name }}
13+
agent:
14+
type: Unity::metal::macmini
15+
image: slough-ops/macos-10.14-xcode:stable
16+
flavor: m1.mac
17+
variables:
18+
UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates
19+
commands:
20+
- curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output TestProjects/{{ test_project.name }}/utr
21+
- chmod +x TestProjects/{{ test_project.name }}/utr
22+
- 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'"
23+
- scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" -r $YAMATO_SOURCE_DIR bokken@$BOKKEN_DEVICE_IP:~/com.unity.toonshader
24+
- scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP:~/.ssh/id_rsa_macmini
25+
- 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'
26+
- |5-
27+
28+
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 }}"
29+
UTR_RESULT=$?
30+
mkdir -p TestProjects/{{ test_project.name }}/test-results/
31+
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/
32+
exit $UTR_RESULT
33+
triggers:
34+
branches:
35+
only:
36+
- "/.*/"
37+
artifacts:
38+
logs:
39+
paths:
40+
- "**/test-results/**"
41+
- "TestProjects/{{ test_project.name }}/Logs/*.log"
42+
dependencies:
43+
- path: .yamato/_editor.yml#editor:priming:{{ unity_version.name }}:macos
44+
rerun: on-new-revision
45+
{% endfor %}
46+
{% endfor %}

‎.yamato/win_dx12-hdrp-2021.2.yml‎

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
#
2+
#
3+
#
4+
test_projects:
5+
- name: HdrpDX12GraphicsTest-2021.2
6+
unity_versions:
7+
- name: 2021.2
8+
---
9+
{% for test_project in test_projects %}
10+
{% for unity_version in unity_versions %}
11+
{{ test_project.name }}_Win_DX12_playmode_{{ unity_version.name }}:
12+
name: {{ test_project.name }} on Win_DX11_playmode on version {{ unity_version.name }}
13+
agent:
14+
type: Unity::VM::GPU
15+
image: graphics-foundation/win10-dxr:stable
16+
flavor: b1.xlarge
17+
model: rtx2080
18+
variables:
19+
UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates
20+
dependencies:
21+
- path: .yamato/_editor.yml#editor:priming:{{ unity_version.name }}:windows
22+
rerun: on-new-revision
23+
commands:
24+
- curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr.bat --output TestProjects/{{ test_project.name }}/utr.bat
25+
- pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade
26+
- cd TestProjects/{{ test_project.name }} && unity-downloader-cli --source-file ../../unity_revision_{{ unity_version.name }}.txt -c editor -c il2cpp --wait --published-only
27+
- cd TestProjects/{{ test_project.name }} && utr --suite=playmode --testproject=. --editor-location=.Editor --artifacts_path=test-results
28+
timeout: 360000
29+
retries: 1
30+
triggers:
31+
branches:
32+
only:
33+
- "/.*/"
34+
artifacts:
35+
logs:
36+
paths:
37+
- "**/test-results/**"
38+
{% endfor %}
39+
{% endfor %}

‎.yamato/win_vulkan-hdrp-2021.2.yml‎

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
#
2+
#
3+
#
4+
test_projects:
5+
- name: HdrpGraphicsTest-2021.2
6+
unity_versions:
7+
- name: 2021.2
8+
---
9+
{% for test_project in test_projects %}
10+
{% for unity_version in unity_versions %}
11+
{{ test_project.name }}_Win_Vulkan_playmode_{{ unity_version.name }}:
12+
name: {{ test_project.name }} on Win_Vulkan_playmode on version {{ unity_version.name }}
13+
agent:
14+
type: Unity::VM::GPU
15+
image: graphics-foundation/win10-dxr:stable
16+
flavor: b1.xlarge
17+
model: rtx2080
18+
variables:
19+
UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates
20+
dependencies:
21+
- path: .yamato/_editor.yml#editor:priming:{{ unity_version.name }}:windows
22+
rerun: on-new-revision
23+
commands:
24+
- curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr.bat --output TestProjects/{{ test_project.name }}/utr.bat
25+
- pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade
26+
- cd TestProjects/{{ test_project.name }} && unity-downloader-cli --source-file ../../unity_revision_{{ unity_version.name }}.txt -c editor -c il2cpp --wait --published-only
27+
# - 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
28+
- cd TestProjects/{{ test_project.name }} && utr --suite=playmode --testproject=. --editor-location=.Editor --artifacts_path=test-results
29+
timeout: 360000
30+
retries: 1
31+
triggers:
32+
branches:
33+
only:
34+
- "/.*/"
35+
artifacts:
36+
logs:
37+
paths:
38+
- "**/test-results/**"
39+
{% endfor %}
40+
{% endfor %}

‎TestProjects/HdrpDX12GraphicsTest-2021.2/Assets/RP_Assets/HDRenderPipelineAsset_UTS.asset‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -276,7 +276,7 @@ MonoBehaviour:
276276
- format: 0
277277
sizeInMegaBytes: 128
278278
m_UseRenderGraph: 1
279-
m_Version: 20
279+
m_Version: 21
280280
m_ObsoleteFrameSettings:
281281
overrides: 0
282282
enableShadow: 0

‎TestProjects/HdrpDX12GraphicsTest-2021.2/Packages/manifest.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"com.unity.ide.vscode": "1.2.4",
66
"com.unity.package-validation-suite": "0.10.0-preview",
77
"com.unity.raytracedhardshadow": "https://github.com/unity3d-jp/RaytracedHardShadow.git#bbba12aaf3e7c6fb1c198746ef9a0fcf408b79b9",
8-
"com.unity.render-pipelines.high-definition": "12.0.0",
8+
"com.unity.render-pipelines.high-definition": "12.1.0",
99
"com.unity.test-framework": "1.1.29",
1010
"com.unity.test-framework.build": "0.0.1-preview.14",
1111
"com.unity.test-framework.utp-reporter": "1.0.2-preview",

‎TestProjects/HdrpDX12GraphicsTest-2021.2/Packages/packages-lock.json‎

Lines changed: 20 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
{
22
"dependencies": {
33
"com.unity.addressables": {
4-
"version": "1.18.15",
4+
"version": "1.19.6",
55
"depth": 1,
66
"source": "registry",
77
"dependencies": {
8-
"com.unity.scriptablebuildpipeline": "1.19.1",
8+
"com.unity.scriptablebuildpipeline": "1.19.2",
99
"com.unity.modules.assetbundle": "1.0.0",
1010
"com.unity.modules.imageconversion": "1.0.0",
1111
"com.unity.modules.jsonserialize": "1.0.0",
@@ -65,7 +65,7 @@
6565
"url": "https://packages.unity.com"
6666
},
6767
"com.unity.mathematics": {
68-
"version": "1.2.1",
68+
"version": "1.2.4",
6969
"depth": 1,
7070
"source": "registry",
7171
"dependencies": {},
@@ -102,16 +102,17 @@
102102
"hash": "bbba12aaf3e7c6fb1c198746ef9a0fcf408b79b9"
103103
},
104104
"com.unity.render-pipelines.core": {
105-
"version": "12.0.0",
105+
"version": "12.1.0",
106106
"depth": 1,
107107
"source": "builtin",
108108
"dependencies": {
109109
"com.unity.ugui": "1.0.0",
110-
"com.unity.modules.physics": "1.0.0"
110+
"com.unity.modules.physics": "1.0.0",
111+
"com.unity.modules.jsonserialize": "1.0.0"
111112
}
112113
},
113114
"com.unity.render-pipelines.high-definition": {
114-
"version": "12.0.0",
115+
"version": "12.1.0",
115116
"depth": 0,
116117
"source": "builtin",
117118
"dependencies": {
@@ -121,40 +122,40 @@
121122
"com.unity.modules.animation": "1.0.0",
122123
"com.unity.modules.imageconversion": "1.0.0",
123124
"com.unity.modules.terrain": "1.0.0",
124-
"com.unity.render-pipelines.core": "12.0.0",
125-
"com.unity.shadergraph": "12.0.0",
126-
"com.unity.visualeffectgraph": "12.0.0",
127-
"com.unity.render-pipelines.high-definition-config": "12.0.0"
125+
"com.unity.render-pipelines.core": "12.1.0",
126+
"com.unity.shadergraph": "12.1.0",
127+
"com.unity.visualeffectgraph": "12.1.0",
128+
"com.unity.render-pipelines.high-definition-config": "12.1.0"
128129
}
129130
},
130131
"com.unity.render-pipelines.high-definition-config": {
131-
"version": "12.0.0",
132+
"version": "12.1.0",
132133
"depth": 1,
133134
"source": "builtin",
134135
"dependencies": {
135-
"com.unity.render-pipelines.core": "12.0.0"
136+
"com.unity.render-pipelines.core": "12.1.0"
136137
}
137138
},
138139
"com.unity.scriptablebuildpipeline": {
139-
"version": "1.19.1",
140+
"version": "1.19.2",
140141
"depth": 2,
141142
"source": "registry",
142143
"dependencies": {},
143144
"url": "https://packages.unity.com"
144145
},
145146
"com.unity.searcher": {
146-
"version": "4.8.0",
147+
"version": "4.9.0",
147148
"depth": 2,
148149
"source": "registry",
149150
"dependencies": {},
150151
"url": "https://packages.unity.com"
151152
},
152153
"com.unity.shadergraph": {
153-
"version": "12.0.0",
154+
"version": "12.1.0",
154155
"depth": 1,
155156
"source": "builtin",
156157
"dependencies": {
157-
"com.unity.render-pipelines.core": "12.0.0",
158+
"com.unity.render-pipelines.core": "12.1.0",
158159
"com.unity.searcher": "4.8.0"
159160
}
160161
},
@@ -239,12 +240,12 @@
239240
}
240241
},
241242
"com.unity.visualeffectgraph": {
242-
"version": "12.0.0",
243+
"version": "12.1.0",
243244
"depth": 1,
244245
"source": "builtin",
245246
"dependencies": {
246-
"com.unity.shadergraph": "12.0.0",
247-
"com.unity.render-pipelines.core": "12.0.0"
247+
"com.unity.shadergraph": "12.1.0",
248+
"com.unity.render-pipelines.core": "12.1.0"
248249
}
249250
},
250251
"com.unity.xr.legacyinputhelpers": {

‎TestProjects/HdrpDX12GraphicsTest-2021.2/ProjectSettings/ProjectVersion.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
m_EditorVersion: 2021.2.0b13
2-
m_EditorVersionWithRevision: 2021.2.0b13 (94c1109a0557)
1+
m_EditorVersion: 2021.2.0b16
2+
m_EditorVersionWithRevision: 2021.2.0b16 (edbc0738c91b)

‎TestProjects/HdrpGraphicsTest-2021.2/Assets/RP_Assets/HDRenderPipelineAsset_UTS.asset‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -276,7 +276,7 @@ MonoBehaviour:
276276
- format: 0
277277
sizeInMegaBytes: 128
278278
m_UseRenderGraph: 1
279-
m_Version: 20
279+
m_Version: 21
280280
m_ObsoleteFrameSettings:
281281
overrides: 0
282282
enableShadow: 0

0 commit comments

Comments
 (0)