Skip to content

Commit 1b765c6

Browse files
sebastienlagardesebastienlagarde
committed
Merge branch 'master' into HDRP/staging
2 parents 66439f1 + ead5289 commit 1b765c6

File tree

43 files changed

+480
-145
lines changed

Some content is hidden

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

43 files changed

+480
-145
lines changed

‎.yamato/config/universal.metafile‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ test_platforms:
77
OSX_Metal: 2400
88
timeout_build:
99
Android: 1800
10+
Win: 2000
1011
- type: playmode
1112
- type: editmode
1213
- type: playmode

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ Build_Universal_Win_DX11_Player_trunk:
3434
- curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr.bat --output TestProjects/UniversalGraphicsTest/utr.bat
3535
- pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade
3636
- cd TestProjects/UniversalGraphicsTest && unity-downloader-cli -u dc4a46d1cb369a5194a18beceb09063206b35c43 -c editor -c il2cpp --wait --published-only
37-
- cd TestProjects/UniversalGraphicsTest && utr --suite=playmode --platform=StandaloneWindows64 --testproject=. --editor-location=.Editor --artifacts_path=test-results --player-save-path=../../players --build-only --extra-editor-arg="-executemethod" --timeout=1200 --extra-editor-arg="CustomBuild.BuildWindowsDX11Linear"
37+
- cd TestProjects/UniversalGraphicsTest && utr --suite=playmode --platform=StandaloneWindows64 --testproject=. --editor-location=.Editor --artifacts_path=test-results --player-save-path=../../players --build-only --extra-editor-arg="-executemethod" --timeout=2000 --extra-editor-arg="CustomBuild.BuildWindowsDX11Linear"
3838
artifacts:
3939
logs:
4040
paths:
@@ -124,7 +124,7 @@ Build_Universal_Win_DX11_Player_2020.2:
124124
- curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr.bat --output TestProjects/UniversalGraphicsTest/utr.bat
125125
- pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade
126126
- cd TestProjects/UniversalGraphicsTest && unity-downloader-cli -u 93d432f0d085a8671a6c8a331ec8bdccb5c076ef -c editor -c il2cpp --wait --published-only
127-
- cd TestProjects/UniversalGraphicsTest && utr --suite=playmode --platform=StandaloneWindows64 --testproject=. --editor-location=.Editor --artifacts_path=test-results --player-save-path=../../players --build-only --extra-editor-arg="-executemethod" --timeout=1200 --extra-editor-arg="CustomBuild.BuildWindowsDX11Linear"
127+
- cd TestProjects/UniversalGraphicsTest && utr --suite=playmode --platform=StandaloneWindows64 --testproject=. --editor-location=.Editor --artifacts_path=test-results --player-save-path=../../players --build-only --extra-editor-arg="-executemethod" --timeout=2000 --extra-editor-arg="CustomBuild.BuildWindowsDX11Linear"
128128
artifacts:
129129
logs:
130130
paths:
@@ -218,7 +218,7 @@ Build_Universal_Win_DX11_Player_CUSTOM-REVISION:
218218
- curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr.bat --output TestProjects/UniversalGraphicsTest/utr.bat
219219
- pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade
220220
- cd TestProjects/UniversalGraphicsTest && unity-downloader-cli --source-file ../../unity_revision.txt -c editor -c il2cpp --wait --published-only
221-
- cd TestProjects/UniversalGraphicsTest && utr --suite=playmode --platform=StandaloneWindows64 --testproject=. --editor-location=.Editor --artifacts_path=test-results --player-save-path=../../players --build-only --extra-editor-arg="-executemethod" --timeout=1200 --extra-editor-arg="CustomBuild.BuildWindowsDX11Linear"
221+
- cd TestProjects/UniversalGraphicsTest && utr --suite=playmode --platform=StandaloneWindows64 --testproject=. --editor-location=.Editor --artifacts_path=test-results --player-save-path=../../players --build-only --extra-editor-arg="-executemethod" --timeout=2000 --extra-editor-arg="CustomBuild.BuildWindowsDX11Linear"
222222
artifacts:
223223
logs:
224224
paths:

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ Build_Universal_Win_DX12_Player_trunk:
3434
- curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr.bat --output TestProjects/UniversalGraphicsTest/utr.bat
3535
- pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade
3636
- cd TestProjects/UniversalGraphicsTest && unity-downloader-cli -u dc4a46d1cb369a5194a18beceb09063206b35c43 -c editor -c il2cpp --wait --published-only
37-
- cd TestProjects/UniversalGraphicsTest && utr --suite=playmode --platform=StandaloneWindows64 --testproject=. --editor-location=.Editor --artifacts_path=test-results --player-save-path=../../players --build-only --extra-editor-arg="-executemethod" --timeout=1200 --extra-editor-arg="CustomBuild.BuildWindowsDX12Linear"
37+
- cd TestProjects/UniversalGraphicsTest && utr --suite=playmode --platform=StandaloneWindows64 --testproject=. --editor-location=.Editor --artifacts_path=test-results --player-save-path=../../players --build-only --extra-editor-arg="-executemethod" --timeout=2000 --extra-editor-arg="CustomBuild.BuildWindowsDX12Linear"
3838
artifacts:
3939
logs:
4040
paths:
@@ -124,7 +124,7 @@ Build_Universal_Win_DX12_Player_2020.2:
124124
- curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr.bat --output TestProjects/UniversalGraphicsTest/utr.bat
125125
- pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade
126126
- cd TestProjects/UniversalGraphicsTest && unity-downloader-cli -u 93d432f0d085a8671a6c8a331ec8bdccb5c076ef -c editor -c il2cpp --wait --published-only
127-
- cd TestProjects/UniversalGraphicsTest && utr --suite=playmode --platform=StandaloneWindows64 --testproject=. --editor-location=.Editor --artifacts_path=test-results --player-save-path=../../players --build-only --extra-editor-arg="-executemethod" --timeout=1200 --extra-editor-arg="CustomBuild.BuildWindowsDX12Linear"
127+
- cd TestProjects/UniversalGraphicsTest && utr --suite=playmode --platform=StandaloneWindows64 --testproject=. --editor-location=.Editor --artifacts_path=test-results --player-save-path=../../players --build-only --extra-editor-arg="-executemethod" --timeout=2000 --extra-editor-arg="CustomBuild.BuildWindowsDX12Linear"
128128
artifacts:
129129
logs:
130130
paths:
@@ -218,7 +218,7 @@ Build_Universal_Win_DX12_Player_CUSTOM-REVISION:
218218
- curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr.bat --output TestProjects/UniversalGraphicsTest/utr.bat
219219
- pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade
220220
- cd TestProjects/UniversalGraphicsTest && unity-downloader-cli --source-file ../../unity_revision.txt -c editor -c il2cpp --wait --published-only
221-
- cd TestProjects/UniversalGraphicsTest && utr --suite=playmode --platform=StandaloneWindows64 --testproject=. --editor-location=.Editor --artifacts_path=test-results --player-save-path=../../players --build-only --extra-editor-arg="-executemethod" --timeout=1200 --extra-editor-arg="CustomBuild.BuildWindowsDX12Linear"
221+
- cd TestProjects/UniversalGraphicsTest && utr --suite=playmode --platform=StandaloneWindows64 --testproject=. --editor-location=.Editor --artifacts_path=test-results --player-save-path=../../players --build-only --extra-editor-arg="-executemethod" --timeout=2000 --extra-editor-arg="CustomBuild.BuildWindowsDX12Linear"
222222
artifacts:
223223
logs:
224224
paths:

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ Build_Universal_Win_Vulkan_Player_trunk:
3434
- curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr.bat --output TestProjects/UniversalGraphicsTest/utr.bat
3535
- pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade
3636
- cd TestProjects/UniversalGraphicsTest && unity-downloader-cli -u dc4a46d1cb369a5194a18beceb09063206b35c43 -c editor -c il2cpp --wait --published-only
37-
- cd TestProjects/UniversalGraphicsTest && utr --suite=playmode --platform=StandaloneWindows64 --testproject=. --editor-location=.Editor --artifacts_path=test-results --player-save-path=../../players --build-only --extra-editor-arg="-executemethod" --timeout=1200 --extra-editor-arg="CustomBuild.BuildWindowsVulkanLinear"
37+
- cd TestProjects/UniversalGraphicsTest && utr --suite=playmode --platform=StandaloneWindows64 --testproject=. --editor-location=.Editor --artifacts_path=test-results --player-save-path=../../players --build-only --extra-editor-arg="-executemethod" --timeout=2000 --extra-editor-arg="CustomBuild.BuildWindowsVulkanLinear"
3838
artifacts:
3939
logs:
4040
paths:
@@ -124,7 +124,7 @@ Build_Universal_Win_Vulkan_Player_2020.2:
124124
- curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr.bat --output TestProjects/UniversalGraphicsTest/utr.bat
125125
- pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade
126126
- cd TestProjects/UniversalGraphicsTest && unity-downloader-cli -u 93d432f0d085a8671a6c8a331ec8bdccb5c076ef -c editor -c il2cpp --wait --published-only
127-
- cd TestProjects/UniversalGraphicsTest && utr --suite=playmode --platform=StandaloneWindows64 --testproject=. --editor-location=.Editor --artifacts_path=test-results --player-save-path=../../players --build-only --extra-editor-arg="-executemethod" --timeout=1200 --extra-editor-arg="CustomBuild.BuildWindowsVulkanLinear"
127+
- cd TestProjects/UniversalGraphicsTest && utr --suite=playmode --platform=StandaloneWindows64 --testproject=. --editor-location=.Editor --artifacts_path=test-results --player-save-path=../../players --build-only --extra-editor-arg="-executemethod" --timeout=2000 --extra-editor-arg="CustomBuild.BuildWindowsVulkanLinear"
128128
artifacts:
129129
logs:
130130
paths:
@@ -218,7 +218,7 @@ Build_Universal_Win_Vulkan_Player_CUSTOM-REVISION:
218218
- curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr.bat --output TestProjects/UniversalGraphicsTest/utr.bat
219219
- pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade
220220
- cd TestProjects/UniversalGraphicsTest && unity-downloader-cli --source-file ../../unity_revision.txt -c editor -c il2cpp --wait --published-only
221-
- cd TestProjects/UniversalGraphicsTest && utr --suite=playmode --platform=StandaloneWindows64 --testproject=. --editor-location=.Editor --artifacts_path=test-results --player-save-path=../../players --build-only --extra-editor-arg="-executemethod" --timeout=1200 --extra-editor-arg="CustomBuild.BuildWindowsVulkanLinear"
221+
- cd TestProjects/UniversalGraphicsTest && utr --suite=playmode --platform=StandaloneWindows64 --testproject=. --editor-location=.Editor --artifacts_path=test-results --player-save-path=../../players --build-only --extra-editor-arg="-executemethod" --timeout=2000 --extra-editor-arg="CustomBuild.BuildWindowsVulkanLinear"
222222
artifacts:
223223
logs:
224224
paths:

‎TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/Mock HMD Loader/015_xr_Camera_FXAA.png‎

Lines changed: 2 additions & 2 deletions
Loading

‎TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/Mock HMD Loader/016_xr_Camera_SMAA.png‎

Lines changed: 2 additions & 2 deletions
Loading

‎TestProjects/UniversalGraphicsTest/Assets/Test/Runtime/Renderer2DTests.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ public void BaseRendererDoesNotCreateRenderTexturesIfStackIsEmpty()
5353
Assert.AreEqual(RenderTargetHandle.CameraTarget.Identifier(), baseRenderer.cameraColorTarget);
5454

5555
Assert.IsFalse(baseRenderer.createDepthTexture);
56-
Assert.AreEqual(RenderTargetHandle.CameraTarget.Identifier(), baseRenderer.cameraDepth);
56+
Assert.AreEqual(RenderTargetHandle.CameraTarget.Identifier(), baseRenderer.cameraDepthTarget);
5757
}
5858

5959
[Test]
@@ -69,7 +69,7 @@ public void BaseRendererCreatesRenderTexturesIfStackIsNotEmpty()
6969
Assert.AreNotEqual(RenderTargetHandle.CameraTarget.Identifier(), baseRenderer.cameraColorTarget);
7070

7171
Assert.IsTrue(baseRenderer.createDepthTexture);
72-
Assert.AreNotEqual(RenderTargetHandle.CameraTarget.Identifier(), baseRenderer.cameraDepth);
72+
Assert.AreNotEqual(RenderTargetHandle.CameraTarget.Identifier(), baseRenderer.cameraDepthTarget);
7373
}
7474

7575
[Test]
@@ -85,7 +85,7 @@ public void BaseRendererUsesDepthAttachmentOfColorTextureIfNoDepthTextureCreated
8585
Assert.AreNotEqual(RenderTargetHandle.CameraTarget.Identifier(), baseRenderer.cameraColorTarget);
8686

8787
Assert.IsFalse(baseRenderer.createDepthTexture);
88-
Assert.AreEqual(baseRenderer.cameraColorTarget, baseRenderer.cameraDepth);
88+
Assert.AreEqual(baseRenderer.cameraColorTarget, baseRenderer.cameraDepthTarget);
8989
}
9090

9191
[Test]
@@ -99,7 +99,7 @@ public void OverlayRendererUsesRenderTexturesFromBase()
9999
Renderer2D overlayRenderer = m_OverlayCameraData.scriptableRenderer as Renderer2D;
100100

101101
Assert.AreEqual(baseRenderer.cameraColorTarget, overlayRenderer.cameraColorTarget);
102-
Assert.AreEqual(baseRenderer.cameraDepth, overlayRenderer.cameraDepth);
102+
Assert.AreEqual(baseRenderer.cameraDepthTarget, overlayRenderer.cameraDepthTarget);
103103
}
104104

105105
[Test]

‎TestProjects/UniversalGraphicsTest/Assets/Test/TestFilters/TestCaseFilters.asset‎

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -440,24 +440,6 @@ MonoBehaviour:
440440
XrSdk: None
441441
StereoModes: 0
442442
Reason: Android Vulkan 143 regressed test scene
443-
- FilteredScene: {fileID: 0}
444-
FilteredScenes:
445-
- {fileID: 102900000, guid: fe73f67a2bc4933468c714f164c6596d, type: 3}
446-
ColorSpace: -1
447-
BuildPlatform: 13
448-
GraphicsDevice: 11
449-
XrSdk: None
450-
StereoModes: 0
451-
Reason: 'Android GLES3 max additional lights regression. '
452-
- FilteredScene: {fileID: 0}
453-
FilteredScenes:
454-
- {fileID: 102900000, guid: 169aede566e462449812f4bfb3f8d20d, type: 3}
455-
ColorSpace: -1
456-
BuildPlatform: 13
457-
GraphicsDevice: 11
458-
XrSdk: None
459-
StereoModes: 0
460-
Reason: 'Android GLES3 max additional lights regression. '
461443
- FilteredScene: {fileID: 0}
462444
FilteredScenes:
463445
- {fileID: 102900000, guid: 770b86964e87d47e4bdbafa425ccd238, type: 3}

‎TestProjects/UniversalGraphicsTest/ProjectSettings/ProjectSettings.asset‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -322,7 +322,7 @@ PlayerSettings:
322322
m_Enabled: 0
323323
m_Devices:
324324
- MockHMD
325-
openGLRequireES31: 0
325+
openGLRequireES31: 1
326326
openGLRequireES31AEP: 0
327327
openGLRequireES32: 0
328328
m_TemplateCustomTags: {}

‎com.unity.render-pipelines.core/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"description": "SRP Core makes it easier to create or customize a Scriptable Render Pipeline (SRP). SRP Core contains reusable code, including boilerplate code for working with platform-specific graphics APIs, utility functions for common rendering operations, and shader libraries. The code in SRP Core is use by the High Definition Render Pipeline (HDRP) and Universal Render Pipeline (URP). If you are creating a custom SRP from scratch or customizing a prebuilt SRP, using SRP Core will save you time.",
44
"version": "10.1.0",
55
"unity": "2020.2",
6-
"unityRelease": "0a20",
6+
"unityRelease": "0b5",
77
"displayName": "Core RP Library",
88
"dependencies": {
99
"com.unity.ugui": "1.0.0"

0 commit comments

Comments
 (0)