Skip to content

Commit fdadb28

Browse files
sebastienlagardeJulienIgnace-Unity
sebastienlagarde
and
JulienIgnace-Unity
authored
Enable render graph test (#873)
* re revert the PR * Fixed planar probes with render graph. * Fixed an issue with msaa resolve pass when movecs aren't enabled. Co-authored-by: Julien Ignace <[email protected]>
1 parent e9bf513 commit fdadb28

File tree

50 files changed

+4057
-1927
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+4057
-1927
lines changed

‎.yamato/all-hdrp.yml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@ All_HDRP_trunk:
1212
rerun: on-new-revision
1313
- path: .yamato/hdrp-win-dx11.yml#HDRP_Win_DX11_playmode_XR_trunk
1414
rerun: on-new-revision
15+
- path: .yamato/hdrp-win-dx11.yml#HDRP_Win_DX11_playmode_RenderGraph_trunk
16+
rerun: on-new-revision
1517
- path: .yamato/hdrp-win-dx11.yml#HDRP_Win_DX11_Standalone_trunk
1618
rerun: on-new-revision
1719
- path: .yamato/hdrp-win-dx12.yml#HDRP_Win_DX12_playmode_trunk
@@ -43,6 +45,8 @@ All_HDRP_fast-trunk:
4345
rerun: on-new-revision
4446
- path: .yamato/hdrp-win-dx11.yml#HDRP_Win_DX11_playmode_XR_fast-trunk
4547
rerun: on-new-revision
48+
- path: .yamato/hdrp-win-dx11.yml#HDRP_Win_DX11_playmode_RenderGraph_fast-trunk
49+
rerun: on-new-revision
4650
- path: .yamato/hdrp-win-dx11.yml#HDRP_Win_DX11_Standalone_fast-trunk
4751
rerun: on-new-revision
4852
- path: .yamato/hdrp-win-dx12.yml#HDRP_Win_DX12_playmode_fast-trunk
@@ -74,6 +78,8 @@ All_HDRP_CUSTOM-REVISION:
7478
rerun: always
7579
- path: .yamato/hdrp-win-dx11.yml#HDRP_Win_DX11_playmode_XR_CUSTOM-REVISION
7680
rerun: always
81+
- path: .yamato/hdrp-win-dx11.yml#HDRP_Win_DX11_playmode_RenderGraph_CUSTOM-REVISION
82+
rerun: always
7783
- path: .yamato/hdrp-win-dx11.yml#HDRP_Win_DX11_Standalone_CUSTOM-REVISION
7884
rerun: always
7985
- path: .yamato/hdrp-win-dx12.yml#HDRP_Win_DX12_playmode_CUSTOM-REVISION

‎.yamato/config/__shared.metafile‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ test_platforms:
1414
Standalone: --suite=playmode --platform=Standalone
1515
playmode: --suite=playmode
1616
playmode_XR: --suite=playmode --extra-editor-arg="-xr-tests"
17+
playmode_RenderGraph: --suite=playmode --extra-editor-arg="-rendergraph-tests"
1718
editmode: --suite=editor --platform=editmode
1819
project_platforms:
1920
Win:

‎.yamato/config/hdrp.metafile‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ project:
55
test_platforms:
66
- playmode
77
- playmode_XR
8+
- playmode_RenderGraph
89
- editmode
910
- Standalone
1011
platforms:
@@ -50,6 +51,7 @@ all:
5051
- editmode
5152
- playmode
5253
- playmode_XR
54+
- playmode_RenderGraph
5355
- Standalone
5456
- platform: Win
5557
api: DX12

‎.yamato/hdrp-linux-vulkan.yml‎

Lines changed: 64 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,27 @@ HDRP_Linux_Vulkan_playmode_trunk:
2424
logs:
2525
paths:
2626
- "**/test-results/**"
27+
HDRP_Linux_Vulkan_playmode_RenderGraph_trunk:
28+
name: HDRP on Linux_Vulkan_playmode_RenderGraph on version trunk
29+
agent:
30+
type: Unity::VM::GPU
31+
image: cds-ops/ubuntu-18.04-base:stable
32+
flavor: b1.large
33+
variables:
34+
UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates
35+
dependencies:
36+
- path: .yamato/_editor.yml#editor:priming:trunk:linux
37+
rerun: on-new-revision
38+
commands:
39+
- sudo -H pip install --upgrade pip
40+
- sudo -H pip install unity-downloader-cli --extra-index-url https://artifactory.internal.unity3d.com/api/pypi/common-python/simple --upgrade
41+
- git clone [email protected]:unity/utr.git TestProjects/HDRP_Tests/utr
42+
- cd TestProjects/HDRP_Tests && sudo unity-downloader-cli --source-file ../../unity_revision.txt -c editor -c il2cpp --wait --published-only
43+
- cd TestProjects/HDRP_Tests && DISPLAY=:0.0 utr/utr --suite=playmode --extra-editor-arg="-rendergraph-tests" --testproject=. --editor-location=.Editor --artifacts_path=test-results --extra-editor-arg="-force-vulkan"
44+
artifacts:
45+
logs:
46+
paths:
47+
- "**/test-results/**"
2748
HDRP_Linux_Vulkan_editmode_trunk:
2849
name: HDRP on Linux_Vulkan_editmode on version trunk
2950
agent:
@@ -87,6 +108,27 @@ HDRP_Linux_Vulkan_playmode_fast-trunk:
87108
logs:
88109
paths:
89110
- "**/test-results/**"
111+
HDRP_Linux_Vulkan_playmode_RenderGraph_fast-trunk:
112+
name: HDRP on Linux_Vulkan_playmode_RenderGraph on version fast-trunk
113+
agent:
114+
type: Unity::VM::GPU
115+
image: cds-ops/ubuntu-18.04-base:stable
116+
flavor: b1.large
117+
variables:
118+
UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates
119+
dependencies:
120+
- path: .yamato/_editor.yml#editor:priming:fast-trunk:linux
121+
rerun: on-new-revision
122+
commands:
123+
- sudo -H pip install --upgrade pip
124+
- sudo -H pip install unity-downloader-cli --extra-index-url https://artifactory.internal.unity3d.com/api/pypi/common-python/simple --upgrade
125+
- git clone [email protected]:unity/utr.git TestProjects/HDRP_Tests/utr
126+
- cd TestProjects/HDRP_Tests && sudo unity-downloader-cli --source-file ../../unity_revision.txt -c editor -c il2cpp --wait --published-only
127+
- cd TestProjects/HDRP_Tests && DISPLAY=:0.0 utr/utr --suite=playmode --extra-editor-arg="-rendergraph-tests" --testproject=. --editor-location=.Editor --artifacts_path=test-results --extra-editor-arg="-force-vulkan"
128+
artifacts:
129+
logs:
130+
paths:
131+
- "**/test-results/**"
90132
HDRP_Linux_Vulkan_editmode_fast-trunk:
91133
name: HDRP on Linux_Vulkan_editmode on version fast-trunk
92134
agent:
@@ -151,6 +193,28 @@ HDRP_Linux_Vulkan_playmode_CUSTOM-REVISION:
151193
logs:
152194
paths:
153195
- "**/test-results/**"
196+
HDRP_Linux_Vulkan_playmode_RenderGraph_CUSTOM-REVISION:
197+
name: HDRP on Linux_Vulkan_playmode_RenderGraph on version CUSTOM-REVISION
198+
agent:
199+
type: Unity::VM::GPU
200+
image: cds-ops/ubuntu-18.04-base:stable
201+
flavor: b1.large
202+
variables:
203+
UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates
204+
CUSTOM_REVISION: custom_revision_not_set
205+
dependencies:
206+
- path: .yamato/_editor.yml#editor:priming:CUSTOM-REVISION:linux
207+
rerun: always
208+
commands:
209+
- sudo -H pip install --upgrade pip
210+
- sudo -H pip install unity-downloader-cli --extra-index-url https://artifactory.internal.unity3d.com/api/pypi/common-python/simple --upgrade
211+
- git clone [email protected]:unity/utr.git TestProjects/HDRP_Tests/utr
212+
- cd TestProjects/HDRP_Tests && sudo unity-downloader-cli --source-file ../../unity_revision.txt -c editor -c il2cpp --wait --published-only
213+
- cd TestProjects/HDRP_Tests && DISPLAY=:0.0 utr/utr --suite=playmode --extra-editor-arg="-rendergraph-tests" --testproject=. --editor-location=.Editor --artifacts_path=test-results --extra-editor-arg="-force-vulkan"
214+
artifacts:
215+
logs:
216+
paths:
217+
- "**/test-results/**"
154218
HDRP_Linux_Vulkan_editmode_CUSTOM-REVISION:
155219
name: HDRP on Linux_Vulkan_editmode on version CUSTOM-REVISION
156220
agent:

‎.yamato/hdrp-osx-metal.yml‎

Lines changed: 85 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,34 @@ HDRP_OSX_Metal_playmode_XR_trunk:
5959
logs:
6060
paths:
6161
- "**/test-results/**"
62+
HDRP_OSX_Metal_playmode_RenderGraph_trunk:
63+
name: HDRP on OSX_Metal_playmode_RenderGraph on version trunk
64+
agent:
65+
type: Unity::metal::macmini
66+
image: slough-ops/macos-10.14-xcode:stable
67+
flavor: m1.mac
68+
variables:
69+
UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates
70+
dependencies:
71+
- path: .yamato/_editor.yml#editor:priming:trunk:macos
72+
rerun: on-new-revision
73+
commands:
74+
- git clone [email protected]:unity/utr.git TestProjects/HDRP_Tests/utr
75+
- ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP "bash -lc 'pip3 install --user unity-downloader-cli --extra-index-url https://artifactory.internal.unity3d.com/api/pypi/common-python/simple --upgrade'"
76+
- scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" -r $YAMATO_SOURCE_DIR bokken@$BOKKEN_DEVICE_IP:~/Graphics
77+
- scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP:~/.ssh/id_rsa_macmini
78+
- ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP '/Users/bokken/Library/Python/3.7/bin/unity-downloader-cli --source-file ~/Graphics/unity_revision.txt -c editor -c il2cpp --wait --published-only'
79+
- |5-
80+
81+
ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP 'cd ~/Graphics/TestProjects/HDRP_Tests && ~/Graphics/TestProjects/HDRP_Tests/utr/utr --suite=playmode --extra-editor-arg="-rendergraph-tests" --testproject=/Users/bokken/Graphics/TestProjects/HDRP_Tests --editor-location=/Users/bokken/.Editor --artifacts_path=/Users/bokken/Graphics/TestProjects/HDRP_Tests/test-results'
82+
UTR_RESULT=$?
83+
mkdir -p TestProjects/HDRP_Tests/test-results/
84+
scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/HDRP_Tests/test-results/ TestProjects/HDRP_Tests/test-results/
85+
exit $UTR_RESULT
86+
artifacts:
87+
logs:
88+
paths:
89+
- "**/test-results/**"
6290
HDRP_OSX_Metal_editmode_trunk:
6391
name: HDRP on OSX_Metal_editmode on version trunk
6492
agent:
@@ -171,6 +199,34 @@ HDRP_OSX_Metal_playmode_XR_fast-trunk:
171199
logs:
172200
paths:
173201
- "**/test-results/**"
202+
HDRP_OSX_Metal_playmode_RenderGraph_fast-trunk:
203+
name: HDRP on OSX_Metal_playmode_RenderGraph on version fast-trunk
204+
agent:
205+
type: Unity::metal::macmini
206+
image: slough-ops/macos-10.14-xcode:stable
207+
flavor: m1.mac
208+
variables:
209+
UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates
210+
dependencies:
211+
- path: .yamato/_editor.yml#editor:priming:fast-trunk:macos
212+
rerun: on-new-revision
213+
commands:
214+
- git clone [email protected]:unity/utr.git TestProjects/HDRP_Tests/utr
215+
- ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP "bash -lc 'pip3 install --user unity-downloader-cli --extra-index-url https://artifactory.internal.unity3d.com/api/pypi/common-python/simple --upgrade'"
216+
- scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" -r $YAMATO_SOURCE_DIR bokken@$BOKKEN_DEVICE_IP:~/Graphics
217+
- scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP:~/.ssh/id_rsa_macmini
218+
- ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP '/Users/bokken/Library/Python/3.7/bin/unity-downloader-cli --source-file ~/Graphics/unity_revision.txt -c editor -c il2cpp --wait --published-only'
219+
- |5-
220+
221+
ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP 'cd ~/Graphics/TestProjects/HDRP_Tests && ~/Graphics/TestProjects/HDRP_Tests/utr/utr --suite=playmode --extra-editor-arg="-rendergraph-tests" --testproject=/Users/bokken/Graphics/TestProjects/HDRP_Tests --editor-location=/Users/bokken/.Editor --artifacts_path=/Users/bokken/Graphics/TestProjects/HDRP_Tests/test-results'
222+
UTR_RESULT=$?
223+
mkdir -p TestProjects/HDRP_Tests/test-results/
224+
scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/HDRP_Tests/test-results/ TestProjects/HDRP_Tests/test-results/
225+
exit $UTR_RESULT
226+
artifacts:
227+
logs:
228+
paths:
229+
- "**/test-results/**"
174230
HDRP_OSX_Metal_editmode_fast-trunk:
175231
name: HDRP on OSX_Metal_editmode on version fast-trunk
176232
agent:
@@ -285,6 +341,35 @@ HDRP_OSX_Metal_playmode_XR_CUSTOM-REVISION:
285341
logs:
286342
paths:
287343
- "**/test-results/**"
344+
HDRP_OSX_Metal_playmode_RenderGraph_CUSTOM-REVISION:
345+
name: HDRP on OSX_Metal_playmode_RenderGraph on version CUSTOM-REVISION
346+
agent:
347+
type: Unity::metal::macmini
348+
image: slough-ops/macos-10.14-xcode:stable
349+
flavor: m1.mac
350+
variables:
351+
UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates
352+
CUSTOM_REVISION: custom_revision_not_set
353+
dependencies:
354+
- path: .yamato/_editor.yml#editor:priming:CUSTOM-REVISION:macos
355+
rerun: always
356+
commands:
357+
- git clone [email protected]:unity/utr.git TestProjects/HDRP_Tests/utr
358+
- ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP "bash -lc 'pip3 install --user unity-downloader-cli --extra-index-url https://artifactory.internal.unity3d.com/api/pypi/common-python/simple --upgrade'"
359+
- scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" -r $YAMATO_SOURCE_DIR bokken@$BOKKEN_DEVICE_IP:~/Graphics
360+
- scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP:~/.ssh/id_rsa_macmini
361+
- ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP '/Users/bokken/Library/Python/3.7/bin/unity-downloader-cli --source-file ~/Graphics/unity_revision.txt -c editor -c il2cpp --wait --published-only'
362+
- |5-
363+
364+
ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP 'cd ~/Graphics/TestProjects/HDRP_Tests && ~/Graphics/TestProjects/HDRP_Tests/utr/utr --suite=playmode --extra-editor-arg="-rendergraph-tests" --testproject=/Users/bokken/Graphics/TestProjects/HDRP_Tests --editor-location=/Users/bokken/.Editor --artifacts_path=/Users/bokken/Graphics/TestProjects/HDRP_Tests/test-results'
365+
UTR_RESULT=$?
366+
mkdir -p TestProjects/HDRP_Tests/test-results/
367+
scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/HDRP_Tests/test-results/ TestProjects/HDRP_Tests/test-results/
368+
exit $UTR_RESULT
369+
artifacts:
370+
logs:
371+
paths:
372+
- "**/test-results/**"
288373
HDRP_OSX_Metal_editmode_CUSTOM-REVISION:
289374
name: HDRP on OSX_Metal_editmode on version CUSTOM-REVISION
290375
agent:

‎.yamato/hdrp-win-dx11.yml‎

Lines changed: 64 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,27 @@ HDRP_Win_DX11_playmode_XR_trunk:
4545
logs:
4646
paths:
4747
- "**/test-results/**"
48+
HDRP_Win_DX11_playmode_RenderGraph_trunk:
49+
name: HDRP on Win_DX11_playmode_RenderGraph on version trunk
50+
agent:
51+
type: Unity::VM::GPU
52+
image: graphics-foundation/win10-dxr:latest
53+
flavor: b1.xlarge
54+
model: rtx2080
55+
variables:
56+
UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates
57+
dependencies:
58+
- path: .yamato/_editor.yml#editor:priming:trunk:windows
59+
rerun: on-new-revision
60+
commands:
61+
- git clone [email protected]:unity/utr.git TestProjects/HDRP_Tests/utr
62+
- pip install unity-downloader-cli --extra-index-url https://artifactory.internal.unity3d.com/api/pypi/common-python/simple --upgrade
63+
- cd TestProjects/HDRP_Tests && unity-downloader-cli --source-file ../../unity_revision.txt -c editor -c il2cpp --wait --published-only
64+
- cd TestProjects/HDRP_Tests && utr\utr --suite=playmode --extra-editor-arg="-rendergraph-tests" --testproject=. --editor-location=.Editor --artifacts_path=test-results --extra-editor-arg="-force-d3d11"
65+
artifacts:
66+
logs:
67+
paths:
68+
- "**/test-results/**"
4869
HDRP_Win_DX11_editmode_trunk:
4970
name: HDRP on Win_DX11_editmode on version trunk
5071
agent:
@@ -155,6 +176,27 @@ HDRP_Win_DX11_playmode_XR_fast-trunk:
155176
logs:
156177
paths:
157178
- "**/test-results/**"
179+
HDRP_Win_DX11_playmode_RenderGraph_fast-trunk:
180+
name: HDRP on Win_DX11_playmode_RenderGraph on version fast-trunk
181+
agent:
182+
type: Unity::VM::GPU
183+
image: graphics-foundation/win10-dxr:latest
184+
flavor: b1.xlarge
185+
model: rtx2080
186+
variables:
187+
UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates
188+
dependencies:
189+
- path: .yamato/_editor.yml#editor:priming:fast-trunk:windows
190+
rerun: on-new-revision
191+
commands:
192+
- git clone [email protected]:unity/utr.git TestProjects/HDRP_Tests/utr
193+
- pip install unity-downloader-cli --extra-index-url https://artifactory.internal.unity3d.com/api/pypi/common-python/simple --upgrade
194+
- cd TestProjects/HDRP_Tests && unity-downloader-cli --source-file ../../unity_revision.txt -c editor -c il2cpp --wait --published-only
195+
- cd TestProjects/HDRP_Tests && utr\utr --suite=playmode --extra-editor-arg="-rendergraph-tests" --testproject=. --editor-location=.Editor --artifacts_path=test-results --extra-editor-arg="-force-d3d11"
196+
artifacts:
197+
logs:
198+
paths:
199+
- "**/test-results/**"
158200
HDRP_Win_DX11_editmode_fast-trunk:
159201
name: HDRP on Win_DX11_editmode on version fast-trunk
160202
agent:
@@ -267,6 +309,28 @@ HDRP_Win_DX11_playmode_XR_CUSTOM-REVISION:
267309
logs:
268310
paths:
269311
- "**/test-results/**"
312+
HDRP_Win_DX11_playmode_RenderGraph_CUSTOM-REVISION:
313+
name: HDRP on Win_DX11_playmode_RenderGraph on version CUSTOM-REVISION
314+
agent:
315+
type: Unity::VM::GPU
316+
image: graphics-foundation/win10-dxr:latest
317+
flavor: b1.xlarge
318+
model: rtx2080
319+
variables:
320+
UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates
321+
CUSTOM_REVISION: custom_revision_not_set
322+
dependencies:
323+
- path: .yamato/_editor.yml#editor:priming:CUSTOM-REVISION:windows
324+
rerun: always
325+
commands:
326+
- git clone [email protected]:unity/utr.git TestProjects/HDRP_Tests/utr
327+
- pip install unity-downloader-cli --extra-index-url https://artifactory.internal.unity3d.com/api/pypi/common-python/simple --upgrade
328+
- cd TestProjects/HDRP_Tests && unity-downloader-cli --source-file ../../unity_revision.txt -c editor -c il2cpp --wait --published-only
329+
- cd TestProjects/HDRP_Tests && utr\utr --suite=playmode --extra-editor-arg="-rendergraph-tests" --testproject=. --editor-location=.Editor --artifacts_path=test-results --extra-editor-arg="-force-d3d11"
330+
artifacts:
331+
logs:
332+
paths:
333+
- "**/test-results/**"
270334
HDRP_Win_DX11_editmode_CUSTOM-REVISION:
271335
name: HDRP on Win_DX11_editmode on version CUSTOM-REVISION
272336
agent:

0 commit comments

Comments
 (0)