Skip to content

Commit ecfc936

Browse files
PaulDemeulenaerePaulDemeulenaere
committed
Merge branch 'master' into vfx/staging
# Conflicts: # TestProjects/VisualEffectGraph_HDRP/Assets/AllTests/Editor/Tests/VFXCustomSpawnerTimeCheckerTest.cs # TestProjects/VisualEffectGraph_HDRP/Assets/AllTests/Editor/Tests/VFXCustomSpawnerTimeCheckerTest.cs.meta # TestProjects/VisualEffectGraph_HDRP/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/None/009_ReadAttributeInSpawner.png # TestProjects/VisualEffectGraph_HDRP/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/None/009_ReadAttributeInSpawner.png.meta # TestProjects/VisualEffectGraph_HDRP/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/None/009_ReadAttributeInSpawner.png # TestProjects/VisualEffectGraph_HDRP/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/None/009_ReadAttributeInSpawner.png.meta # TestProjects/VisualEffectGraph_URP/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/None/009_ReadAttributeInSpawner.png # TestProjects/VisualEffectGraph_URP/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/None/009_ReadAttributeInSpawner.png.meta # TestProjects/VisualEffectGraph_URP/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/None/009_ReadAttributeInSpawner.png # TestProjects/VisualEffectGraph_URP/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/None/009_ReadAttributeInSpawner.png.meta
2 parents e7e4645 + 5fdf047 commit ecfc936

File tree

1,790 files changed

+32409
-4465
lines changed

Some content is hidden

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

1,790 files changed

+32409
-4465
lines changed

‎.yamato/_abv.yml‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -87,9 +87,9 @@ all_project_ci_trunk:
8787
rerun: on-new-revision
8888
- path: .yamato/all-hdrp.yml#All_HDRP_trunk
8989
rerun: on-new-revision
90-
- path: .yamato/all-vfxmain.yml#All_VFXMain_trunk
90+
- path: .yamato/all-vfx_hdrp.yml#All_VFX_HDRP_trunk
9191
rerun: on-new-revision
92-
- path: .yamato/all-vfx_lwrp.yml#All_VFX_LWRP_trunk
92+
- path: .yamato/all-vfx_urp.yml#All_VFX_URP_trunk
9393
rerun: on-new-revision
9494
all_project_ci_nightly_trunk:
9595
name: _Nightly ABV against trunk
@@ -131,11 +131,11 @@ trunk_verification_trunk:
131131
rerun: on-new-revision
132132
- path: .yamato/hdrp-win-dx11.yml#HDRP_Win_DX11_editmode_trunk
133133
rerun: on-new-revision
134-
- path: .yamato/vfxmain-win-dx11.yml#VFXMain_Win_DX11_playmode_trunk
134+
- path: .yamato/vfx_hdrp-win-dx11.yml#VFX_HDRP_Win_DX11_playmode_trunk
135135
rerun: on-new-revision
136-
- path: .yamato/vfxmain-win-dx11.yml#VFXMain_Win_DX11_editmode_trunk
136+
- path: .yamato/vfx_hdrp-win-dx11.yml#VFX_HDRP_Win_DX11_editmode_trunk
137137
rerun: on-new-revision
138-
- path: .yamato/vfx_lwrp-win-dx11.yml#VFX_LWRP_Win_DX11_playmode_trunk
138+
- path: .yamato/vfx_urp-win-dx11.yml#VFX_URP_Win_DX11_playmode_trunk
139139
rerun: on-new-revision
140140
smoke_test_Standalone_fast-trunk:
141141
name: SRP Smoke Test - Standalone_fast-trunk
@@ -221,9 +221,9 @@ all_project_ci_fast-trunk:
221221
rerun: on-new-revision
222222
- path: .yamato/all-hdrp.yml#All_HDRP_fast-trunk
223223
rerun: on-new-revision
224-
- path: .yamato/all-vfxmain.yml#All_VFXMain_fast-trunk
224+
- path: .yamato/all-vfx_hdrp.yml#All_VFX_HDRP_fast-trunk
225225
rerun: on-new-revision
226-
- path: .yamato/all-vfx_lwrp.yml#All_VFX_LWRP_fast-trunk
226+
- path: .yamato/all-vfx_urp.yml#All_VFX_URP_fast-trunk
227227
rerun: on-new-revision
228228
triggers:
229229
expression: pull_request.target eq "master" AND NOT pull_request.draft AND NOT pull_request.push.changes.all match ["**/*.md", "doc/**/*", "**/Documentation*/**/*"]
@@ -242,11 +242,11 @@ trunk_verification_fast-trunk:
242242
rerun: on-new-revision
243243
- path: .yamato/hdrp-win-dx11.yml#HDRP_Win_DX11_editmode_fast-trunk
244244
rerun: on-new-revision
245-
- path: .yamato/vfxmain-win-dx11.yml#VFXMain_Win_DX11_playmode_fast-trunk
245+
- path: .yamato/vfx_hdrp-win-dx11.yml#VFX_HDRP_Win_DX11_playmode_fast-trunk
246246
rerun: on-new-revision
247-
- path: .yamato/vfxmain-win-dx11.yml#VFXMain_Win_DX11_editmode_fast-trunk
247+
- path: .yamato/vfx_hdrp-win-dx11.yml#VFX_HDRP_Win_DX11_editmode_fast-trunk
248248
rerun: on-new-revision
249-
- path: .yamato/vfx_lwrp-win-dx11.yml#VFX_LWRP_Win_DX11_playmode_fast-trunk
249+
- path: .yamato/vfx_urp-win-dx11.yml#VFX_URP_Win_DX11_playmode_fast-trunk
250250
rerun: on-new-revision
251251
smoke_test_Standalone_CUSTOM-REVISION:
252252
name: SRP Smoke Test - Standalone_CUSTOM-REVISION
@@ -337,9 +337,9 @@ all_project_ci_CUSTOM-REVISION:
337337
rerun: always
338338
- path: .yamato/all-hdrp.yml#All_HDRP_CUSTOM-REVISION
339339
rerun: always
340-
- path: .yamato/all-vfxmain.yml#All_VFXMain_CUSTOM-REVISION
340+
- path: .yamato/all-vfx_hdrp.yml#All_VFX_HDRP_CUSTOM-REVISION
341341
rerun: always
342-
- path: .yamato/all-vfx_lwrp.yml#All_VFX_LWRP_CUSTOM-REVISION
342+
- path: .yamato/all-vfx_urp.yml#All_VFX_URP_CUSTOM-REVISION
343343
rerun: always
344344
variables:
345345
CUSTOM_REVISION: custom_revision_not_set
@@ -358,11 +358,11 @@ trunk_verification_CUSTOM-REVISION:
358358
rerun: always
359359
- path: .yamato/hdrp-win-dx11.yml#HDRP_Win_DX11_editmode_CUSTOM-REVISION
360360
rerun: always
361-
- path: .yamato/vfxmain-win-dx11.yml#VFXMain_Win_DX11_playmode_CUSTOM-REVISION
361+
- path: .yamato/vfx_hdrp-win-dx11.yml#VFX_HDRP_Win_DX11_playmode_CUSTOM-REVISION
362362
rerun: always
363-
- path: .yamato/vfxmain-win-dx11.yml#VFXMain_Win_DX11_editmode_CUSTOM-REVISION
363+
- path: .yamato/vfx_hdrp-win-dx11.yml#VFX_HDRP_Win_DX11_editmode_CUSTOM-REVISION
364364
rerun: always
365-
- path: .yamato/vfx_lwrp-win-dx11.yml#VFX_LWRP_Win_DX11_playmode_CUSTOM-REVISION
365+
- path: .yamato/vfx_urp-win-dx11.yml#VFX_URP_Win_DX11_playmode_CUSTOM-REVISION
366366
rerun: always
367367
variables:
368368
CUSTOM_REVISION: custom_revision_not_set

‎.yamato/all-vfx_hdrp.yml‎

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
2+
# This file is generated by .yamato/ruamel/build.py. Don't edit this file manually.
3+
# 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.
4+
# Read more under .yamato/docs/readme.md
5+
6+
All_VFX_HDRP_trunk:
7+
name: All VFX_HDRP CI - trunk
8+
dependencies:
9+
- path: .yamato/vfx_hdrp-win-dx11.yml#VFX_HDRP_Win_DX11_Standalone_trunk
10+
rerun: on-new-revision
11+
- path: .yamato/vfx_hdrp-win-dx11.yml#VFX_HDRP_Win_DX11_editmode_trunk
12+
rerun: on-new-revision
13+
- path: .yamato/vfx_hdrp-win-dx11.yml#VFX_HDRP_Win_DX11_playmode_trunk
14+
rerun: on-new-revision
15+
- path: .yamato/vfx_hdrp-win-dx11.yml#VFX_HDRP_Win_DX11_playmode_XR_trunk
16+
rerun: on-new-revision
17+
All_VFX_HDRP_fast-trunk:
18+
name: All VFX_HDRP CI - fast-trunk
19+
dependencies:
20+
- path: .yamato/vfx_hdrp-win-dx11.yml#VFX_HDRP_Win_DX11_Standalone_fast-trunk
21+
rerun: on-new-revision
22+
- path: .yamato/vfx_hdrp-win-dx11.yml#VFX_HDRP_Win_DX11_editmode_fast-trunk
23+
rerun: on-new-revision
24+
- path: .yamato/vfx_hdrp-win-dx11.yml#VFX_HDRP_Win_DX11_playmode_fast-trunk
25+
rerun: on-new-revision
26+
- path: .yamato/vfx_hdrp-win-dx11.yml#VFX_HDRP_Win_DX11_playmode_XR_fast-trunk
27+
rerun: on-new-revision
28+
All_VFX_HDRP_CUSTOM-REVISION:
29+
name: All VFX_HDRP CI - CUSTOM-REVISION
30+
dependencies:
31+
- path: .yamato/vfx_hdrp-win-dx11.yml#VFX_HDRP_Win_DX11_Standalone_CUSTOM-REVISION
32+
rerun: always
33+
- path: .yamato/vfx_hdrp-win-dx11.yml#VFX_HDRP_Win_DX11_editmode_CUSTOM-REVISION
34+
rerun: always
35+
- path: .yamato/vfx_hdrp-win-dx11.yml#VFX_HDRP_Win_DX11_playmode_CUSTOM-REVISION
36+
rerun: always
37+
- path: .yamato/vfx_hdrp-win-dx11.yml#VFX_HDRP_Win_DX11_playmode_XR_CUSTOM-REVISION
38+
rerun: always
39+
variables:
40+
CUSTOM_REVISION: custom_revision_not_set

‎.yamato/all-vfx_lwrp.yml‎

Lines changed: 0 additions & 28 deletions
This file was deleted.

‎.yamato/all-vfx_urp.yml‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
2+
# This file is generated by .yamato/ruamel/build.py. Don't edit this file manually.
3+
# 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.
4+
# Read more under .yamato/docs/readme.md
5+
6+
All_VFX_URP_trunk:
7+
name: All VFX_URP CI - trunk
8+
dependencies:
9+
- path: .yamato/vfx_urp-win-dx11.yml#VFX_URP_Win_DX11_Standalone_trunk
10+
rerun: on-new-revision
11+
- path: .yamato/vfx_urp-win-dx11.yml#VFX_URP_Win_DX11_playmode_trunk
12+
rerun: on-new-revision
13+
All_VFX_URP_fast-trunk:
14+
name: All VFX_URP CI - fast-trunk
15+
dependencies:
16+
- path: .yamato/vfx_urp-win-dx11.yml#VFX_URP_Win_DX11_Standalone_fast-trunk
17+
rerun: on-new-revision
18+
- path: .yamato/vfx_urp-win-dx11.yml#VFX_URP_Win_DX11_playmode_fast-trunk
19+
rerun: on-new-revision
20+
All_VFX_URP_CUSTOM-REVISION:
21+
name: All VFX_URP CI - CUSTOM-REVISION
22+
dependencies:
23+
- path: .yamato/vfx_urp-win-dx11.yml#VFX_URP_Win_DX11_Standalone_CUSTOM-REVISION
24+
rerun: always
25+
- path: .yamato/vfx_urp-win-dx11.yml#VFX_URP_Win_DX11_playmode_CUSTOM-REVISION
26+
rerun: always
27+
variables:
28+
CUSTOM_REVISION: custom_revision_not_set

‎.yamato/all-vfxmain.yml‎

Lines changed: 0 additions & 34 deletions
This file was deleted.

‎.yamato/config/_abv.metafile‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ abv: # specify the editor versions for which to create the expression trigger fo
77
- name: ShaderGraph
88
- name: ShaderGraph_Stereo
99
- name: HDRP
10-
- name: VFXMain
11-
- name: VFX_LWRP
10+
- name: VFX_HDRP
11+
- name: VFX_URP
1212
nightly:
1313
allowed_editors: # specify the editor versions for which to create nightly jobs
1414
- trunk
@@ -60,13 +60,13 @@ trunk_verification: # jobs to include in trunk verification job
6060
test_platforms:
6161
- playmode
6262
- editmode
63-
- project: VFXMain
63+
- project: VFX_HDRP
6464
platform: Win
6565
api: DX11
6666
test_platforms:
6767
- playmode
6868
- editmode
69-
- project: VFX_LWRP
69+
- project: VFX_URP
7070
platform: Win
7171
api: DX11
7272
test_platforms:

‎.yamato/config/vfxmain.metafile‎ renamed to ‎.yamato/config/vfx_hdrp.metafile‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
project:
2-
name: VFXMain
3-
folder: VisualEffectGraph
2+
name: VFX_HDRP
3+
folder: VisualEffectGraph_HDRP
44
test_platforms:
55
- Standalone
66
- playmode
7+
- playmode_XR
78
- editmode
89
platforms:
910
- name: Win
@@ -25,3 +26,4 @@ all:
2526
- Standalone
2627
- editmode
2728
- playmode
29+
- playmode_XR

‎.yamato/config/vfx_lwrp.metafile‎ renamed to ‎.yamato/config/vfx_urp.metafile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
project:
2-
name: VFX_LWRP
3-
folder: VisualEffectGraph_LWRP
2+
name: VFX_URP
3+
folder: VisualEffectGraph_URP
44
test_platforms:
55
- Standalone
66
- playmode

0 commit comments

Comments
 (0)