Skip to content

Commit 11b5984

Browse files
sebastienlagardesebastienlagarde
committed
Merge branch 'master' into hd/bugfix
2 parents d358740 + c3dcea4 commit 11b5984

File tree

91 files changed

+636
-925
lines changed

Some content is hidden

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

91 files changed

+636
-925
lines changed

‎.yamato/all-universal.yml‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -72,8 +72,6 @@ Nightly_Universal_trunk:
7272
rerun: on-new-revision
7373
- path: .yamato/universal-win-vulkan.yml#Universal_Win_Vulkan_playmode_mono_Linear_trunk
7474
rerun: on-new-revision
75-
- path: .yamato/universal-win-vulkan.yml#Universal_Win_Vulkan_playmode_XR_mono_Linear_trunk
76-
rerun: on-new-revision
7775
- path: .yamato/universal-linux-vulkan.yml#Universal_Linux_Vulkan_playmode_mono_Linear_trunk
7876
rerun: on-new-revision
7977
variables:
@@ -143,8 +141,6 @@ Nightly_Universal_CUSTOM-REVISION:
143141
rerun: always
144142
- path: .yamato/universal-win-vulkan.yml#Universal_Win_Vulkan_playmode_mono_Linear_CUSTOM-REVISION
145143
rerun: always
146-
- path: .yamato/universal-win-vulkan.yml#Universal_Win_Vulkan_playmode_XR_mono_Linear_CUSTOM-REVISION
147-
rerun: always
148144
- path: .yamato/universal-linux-vulkan.yml#Universal_Linux_Vulkan_playmode_mono_Linear_CUSTOM-REVISION
149145
rerun: always
150146
variables:

‎.yamato/config/universal.metafile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ test_platforms:
1515
- type: playmode
1616
name: playmode_XR
1717
utr_flags:
18-
- [all]: --extra-editor-arg="-xr-tests"
18+
- [all]: --extra-editor-arg="-xr-reuse-tests"
1919
expression_trigger:
2020
expression: 'pull_request.target eq "master" AND NOT pull_request.draft AND pull_request.changes.any match ["com.unity.render-pipelines.universal/**/*", "TestProjects/UniversalGraphicsTest/**/*"]'
2121
platforms:
@@ -199,7 +199,7 @@ nightly:
199199
color_space: Linear
200200
test_platforms:
201201
- playmode
202-
- playmode_XR
202+
# - playmode_XR
203203
- platform: Linux
204204
api: Vulkan
205205
build_config: mono

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ Universal_OSX_Metal_playmode_XR_mono_Linear_trunk:
8484
- ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP '$(python3 -m site --user-base)/bin/unity-downloader-cli -u {{editor_versions.trunk_latest_internal.macos.revision}} -c editor -c il2cpp --wait --published-only'
8585
- |5-
8686
87-
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 ~/Graphics/TestProjects/UniversalGraphicsTest && ~/Graphics/TestProjects/UniversalGraphicsTest/utr --artifacts_path=/Users/bokken/Graphics/TestProjects/UniversalGraphicsTest/test-results --editor-location=/Users/bokken/.Editor --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-xr-tests" --reruncount=2 --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=/Users/bokken/Graphics/TestProjects/UniversalGraphicsTest --zero-tests-are-ok=1"
87+
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 ~/Graphics/TestProjects/UniversalGraphicsTest && ~/Graphics/TestProjects/UniversalGraphicsTest/utr --artifacts_path=/Users/bokken/Graphics/TestProjects/UniversalGraphicsTest/test-results --editor-location=/Users/bokken/.Editor --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-xr-reuse-tests" --reruncount=2 --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=/Users/bokken/Graphics/TestProjects/UniversalGraphicsTest --zero-tests-are-ok=1"
8888
UTR_RESULT=$?
8989
mkdir -p TestProjects/UniversalGraphicsTest/test-results/
9090
scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/UniversalGraphicsTest/test-results/ TestProjects/UniversalGraphicsTest/test-results/
@@ -180,7 +180,7 @@ Universal_OSX_Metal_playmode_XR_mono_Linear_CUSTOM-REVISION:
180180
- ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP '$(python3 -m site --user-base)/bin/unity-downloader-cli --source-file ~/Graphics/unity_revision.txt -c editor -c il2cpp --wait --published-only'
181181
- |5-
182182
183-
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 ~/Graphics/TestProjects/UniversalGraphicsTest && ~/Graphics/TestProjects/UniversalGraphicsTest/utr --artifacts_path=/Users/bokken/Graphics/TestProjects/UniversalGraphicsTest/test-results --editor-location=/Users/bokken/.Editor --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-xr-tests" --reruncount=2 --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=/Users/bokken/Graphics/TestProjects/UniversalGraphicsTest --zero-tests-are-ok=1"
183+
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 ~/Graphics/TestProjects/UniversalGraphicsTest && ~/Graphics/TestProjects/UniversalGraphicsTest/utr --artifacts_path=/Users/bokken/Graphics/TestProjects/UniversalGraphicsTest/test-results --editor-location=/Users/bokken/.Editor --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-xr-reuse-tests" --reruncount=2 --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=/Users/bokken/Graphics/TestProjects/UniversalGraphicsTest --zero-tests-are-ok=1"
184184
UTR_RESULT=$?
185185
mkdir -p TestProjects/UniversalGraphicsTest/test-results/
186186
scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/UniversalGraphicsTest/test-results/ TestProjects/UniversalGraphicsTest/test-results/

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ Universal_Win_DX11_playmode_XR_mono_Linear_trunk:
130130
set /p GIT_REVISIONDATE=<revdate.tmp
131131
echo %GIT_REVISIONDATE%
132132
del revdate.tmp
133-
cd TestProjects/UniversalGraphicsTest && utr --artifacts_path=test-results --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-force-d3d11" --extra-editor-arg="-xr-tests" --reruncount=2 --scripting-backend=Mono2x --suite=playmode --testfilter=%TEST_FILTER% --testproject=. --zero-tests-are-ok=1
133+
cd TestProjects/UniversalGraphicsTest && utr --artifacts_path=test-results --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-force-d3d11" --extra-editor-arg="-xr-reuse-tests" --reruncount=2 --scripting-backend=Mono2x --suite=playmode --testfilter=%TEST_FILTER% --testproject=. --zero-tests-are-ok=1
134134
artifacts:
135135
logs:
136136
paths:
@@ -275,7 +275,7 @@ Universal_Win_DX11_playmode_XR_mono_Linear_CUSTOM-REVISION:
275275
set /p GIT_REVISIONDATE=<revdate.tmp
276276
echo %GIT_REVISIONDATE%
277277
del revdate.tmp
278-
cd TestProjects/UniversalGraphicsTest && utr --artifacts_path=test-results --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-force-d3d11" --extra-editor-arg="-xr-tests" --reruncount=2 --scripting-backend=Mono2x --suite=playmode --testfilter=%TEST_FILTER% --testproject=. --zero-tests-are-ok=1
278+
cd TestProjects/UniversalGraphicsTest && utr --artifacts_path=test-results --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-force-d3d11" --extra-editor-arg="-xr-reuse-tests" --reruncount=2 --scripting-backend=Mono2x --suite=playmode --testfilter=%TEST_FILTER% --testproject=. --zero-tests-are-ok=1
279279
artifacts:
280280
logs:
281281
paths:

‎.yamato/universal-win-dx12.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ Universal_Win_DX12_playmode_XR_mono_Linear_trunk:
130130
set /p GIT_REVISIONDATE=<revdate.tmp
131131
echo %GIT_REVISIONDATE%
132132
del revdate.tmp
133-
cd TestProjects/UniversalGraphicsTest && utr --artifacts_path=test-results --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-force-d3d12" --extra-editor-arg="-xr-tests" --reruncount=2 --scripting-backend=Mono2x --suite=playmode --testfilter=%TEST_FILTER% --testproject=. --zero-tests-are-ok=1
133+
cd TestProjects/UniversalGraphicsTest && utr --artifacts_path=test-results --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-force-d3d12" --extra-editor-arg="-xr-reuse-tests" --reruncount=2 --scripting-backend=Mono2x --suite=playmode --testfilter=%TEST_FILTER% --testproject=. --zero-tests-are-ok=1
134134
artifacts:
135135
logs:
136136
paths:
@@ -275,7 +275,7 @@ Universal_Win_DX12_playmode_XR_mono_Linear_CUSTOM-REVISION:
275275
set /p GIT_REVISIONDATE=<revdate.tmp
276276
echo %GIT_REVISIONDATE%
277277
del revdate.tmp
278-
cd TestProjects/UniversalGraphicsTest && utr --artifacts_path=test-results --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-force-d3d12" --extra-editor-arg="-xr-tests" --reruncount=2 --scripting-backend=Mono2x --suite=playmode --testfilter=%TEST_FILTER% --testproject=. --zero-tests-are-ok=1
278+
cd TestProjects/UniversalGraphicsTest && utr --artifacts_path=test-results --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-force-d3d12" --extra-editor-arg="-xr-reuse-tests" --reruncount=2 --scripting-backend=Mono2x --suite=playmode --testfilter=%TEST_FILTER% --testproject=. --zero-tests-are-ok=1
279279
artifacts:
280280
logs:
281281
paths:

‎.yamato/universal-win-vulkan.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ Universal_Win_Vulkan_playmode_XR_mono_Linear_trunk:
130130
set /p GIT_REVISIONDATE=<revdate.tmp
131131
echo %GIT_REVISIONDATE%
132132
del revdate.tmp
133-
cd TestProjects/UniversalGraphicsTest && utr --artifacts_path=test-results --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-force-vulkan" --extra-editor-arg="-xr-tests" --reruncount=2 --scripting-backend=Mono2x --suite=playmode --testfilter=%TEST_FILTER% --testproject=. --zero-tests-are-ok=1
133+
cd TestProjects/UniversalGraphicsTest && utr --artifacts_path=test-results --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-force-vulkan" --extra-editor-arg="-xr-reuse-tests" --reruncount=2 --scripting-backend=Mono2x --suite=playmode --testfilter=%TEST_FILTER% --testproject=. --zero-tests-are-ok=1
134134
artifacts:
135135
logs:
136136
paths:
@@ -275,7 +275,7 @@ Universal_Win_Vulkan_playmode_XR_mono_Linear_CUSTOM-REVISION:
275275
set /p GIT_REVISIONDATE=<revdate.tmp
276276
echo %GIT_REVISIONDATE%
277277
del revdate.tmp
278-
cd TestProjects/UniversalGraphicsTest && utr --artifacts_path=test-results --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-force-vulkan" --extra-editor-arg="-xr-tests" --reruncount=2 --scripting-backend=Mono2x --suite=playmode --testfilter=%TEST_FILTER% --testproject=. --zero-tests-are-ok=1
278+
cd TestProjects/UniversalGraphicsTest && utr --artifacts_path=test-results --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-force-vulkan" --extra-editor-arg="-xr-reuse-tests" --reruncount=2 --scripting-backend=Mono2x --suite=playmode --testfilter=%TEST_FILTER% --testproject=. --zero-tests-are-ok=1
279279
artifacts:
280280
logs:
281281
paths:

‎TestProjects/UniversalGraphicsTest/Assets/Scenes/056_2D_Lights/New 2D Renderer Data.asset‎

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -22,33 +22,21 @@ MonoBehaviour:
2222
- name: Operation 0
2323
maskTextureChannel: 0
2424
blendMode: 1
25-
customBlendFactors:
26-
multiplicative: 0
27-
additive: 0
2825
- name: Operation 1
2926
maskTextureChannel: 1
3027
blendMode: 0
31-
customBlendFactors:
32-
multiplicative: 0
33-
additive: 0
3428
- name: Blend Style 2
3529
maskTextureChannel: 0
3630
blendMode: 1
37-
customBlendFactors:
38-
multiplicative: 0
39-
additive: 0
4031
- name: Blend Style 3
4132
maskTextureChannel: 0
4233
blendMode: 1
43-
customBlendFactors:
44-
multiplicative: 0
45-
additive: 0
4634
m_UseDepthStencilBuffer: 1
4735
m_UseCameraSortingLayersTexture: 0
4836
m_CameraSortingLayersTextureBound: -1
4937
m_CameraSortingLayerDownsamplingMethod: 0
5038
m_MaxLightRenderTextureCount: 16
51-
m_MaxShadowRenderTextureCount: 1
39+
m_MaxShadowRenderTextureCount: 3
5240
m_ShapeLightShader: {fileID: 4800000, guid: d79e1c784eaf80c4585c0be7391f757a, type: 3}
5341
m_ShapeLightVolumeShader: {fileID: 4800000, guid: 7e60080c8cd24a2468cb08b4bfee5606,
5442
type: 3}

‎com.unity.render-pipelines.core/Editor/Lighting/ProbeVolume.meta‎

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎com.unity.render-pipelines.high-definition/Editor/Lighting/ProbeVolume/ProbeGIBaking.cs‎ renamed to ‎com.unity.render-pipelines.core/Editor/Lighting/ProbeVolume/ProbeGIBaking.cs‎

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@
55
using System;
66
using UnityEditor;
77

8-
using Brick = UnityEngine.Rendering.HighDefinition.ProbeBrickIndex.Brick;
8+
using Brick = UnityEngine.Rendering.ProbeBrickIndex.Brick;
99
using UnityEngine.SceneManagement;
1010

11-
namespace UnityEngine.Rendering.HighDefinition
11+
namespace UnityEngine.Rendering
1212
{
1313
struct DilationProbe : IComparable<DilationProbe>
1414
{
@@ -125,18 +125,15 @@ private static ProbeReferenceVolumeAuthoring GetCardinalAuthoringComponent()
125125

126126
private static void OnBakeStarted()
127127
{
128-
if (ShaderConfig.s_EnableProbeVolumes == 1)
129-
{
130-
bakingReferenceVolumeAuthoring = GetCardinalAuthoringComponent();
128+
bakingReferenceVolumeAuthoring = GetCardinalAuthoringComponent();
131129

132-
if (bakingReferenceVolumeAuthoring == null)
133-
{
134-
Debug.Log("Scene(s) have multiple inconsistent ProbeReferenceVolumeAuthoring components. Please ensure they use identical profiles and transforms before baking.");
135-
return;
136-
}
137-
138-
RunPlacement();
130+
if (bakingReferenceVolumeAuthoring == null)
131+
{
132+
Debug.Log("Scene(s) have multiple inconsistent ProbeReferenceVolumeAuthoring components. Please ensure they use identical profiles and transforms before baking.");
133+
return;
139134
}
135+
136+
RunPlacement();
140137
}
141138

142139
private static void OnAdditionalProbesBakeCompleted()

‎com.unity.render-pipelines.high-definition/Editor/Lighting/ProbeVolume/ProbeGIBaking.cs.meta‎ renamed to ‎com.unity.render-pipelines.core/Editor/Lighting/ProbeVolume/ProbeGIBaking.cs.meta‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)