Skip to content

Commit

Permalink
Merge branch 'master' into hd/bugfix
Browse files Browse the repository at this point in the history
  • Loading branch information
@sebastienlagarde
sebastienlagarde committed Feb 24, 2021
2 parents 2c5b4e0 + c2fd5b8 commit 309596a
Show file tree
Hide file tree
Showing 58 changed files with 3,665 additions and 102 deletions.
84 changes: 42 additions & 42 deletions .yamato/_green_job_revisions_trunk.metafile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ nightly_shadergraph_-_trunk:
updated_at: '2021-02-20 23:56:31.100339'
version: ''
shadergraph_pr_job_-_trunk:
updated_at: '2021-02-23 07:36:49.179740'
updated_at: '2021-02-24 07:37:27.327906'
last_green_revisions:
Android:
revision: 7a5ff5ef6845c9788af4ede00cde1808fc22ab41
Expand All @@ -45,7 +45,7 @@ shadergraph_pr_job_-_trunk:
updated_at: '2021-02-20 23:56:31.100339'
version: ''
vfx_urp_pr_job_-_trunk:
updated_at: '2021-02-23 07:36:49.179740'
updated_at: '2021-02-24 07:37:27.327906'
last_green_revisions:
Android:
revision: 7a5ff5ef6845c9788af4ede00cde1808fc22ab41
Expand All @@ -68,7 +68,7 @@ vfx_urp_pr_job_-_trunk:
updated_at: '2021-02-20 23:56:31.100339'
version: ''
vfx_hdrp_pr_job_-_trunk:
updated_at: '2021-02-23 07:36:49.179740'
updated_at: '2021-02-24 07:37:27.327906'
last_green_revisions:
Android:
revision: 7a5ff5ef6845c9788af4ede00cde1808fc22ab41
Expand All @@ -91,7 +91,7 @@ vfx_hdrp_pr_job_-_trunk:
updated_at: '2021-02-20 23:56:31.100339'
version: ''
nightly_vfx_urp_-_trunk:
updated_at: '2021-02-23 07:36:49.179740'
updated_at: '2021-02-24 07:37:27.327906'
last_green_revisions:
Android:
revision: 7a5ff5ef6845c9788af4ede00cde1808fc22ab41
Expand All @@ -114,76 +114,76 @@ nightly_vfx_urp_-_trunk:
updated_at: '2021-02-20 23:56:31.100339'
version: ''
nightly_vfx_hdrp_-_trunk:
updated_at: '2021-02-12 07:54:51.380909'
updated_at: '2021-02-24 07:37:27.327906'
last_green_revisions:
Android:
revision: c33158b9080ab162b75817850bb78880ba5becce
updated_at: '2021-02-11 00:22:24.894851'
revision: 7a5ff5ef6845c9788af4ede00cde1808fc22ab41
updated_at: '2021-02-20 23:56:31.100339'
version: ''
Linux:
revision: 1b0d27aa80de4a598d9c6ee60ef5a68aa8e8871e
updated_at: '2021-02-05 09:39:54.581483'
revision: 7a5ff5ef6845c9788af4ede00cde1808fc22ab41
updated_at: '2021-02-20 23:56:31.100339'
version: ''
OSX:
revision: c33158b9080ab162b75817850bb78880ba5becce
updated_at: '2021-02-11 00:22:24.894851'
revision: 7a5ff5ef6845c9788af4ede00cde1808fc22ab41
updated_at: '2021-02-20 23:56:31.100339'
version: ''
Win:
revision: c33158b9080ab162b75817850bb78880ba5becce
updated_at: '2021-02-11 00:22:24.894851'
revision: 7a5ff5ef6845c9788af4ede00cde1808fc22ab41
updated_at: '2021-02-20 23:56:31.100339'
version: ''
iPhone:
revision: c33158b9080ab162b75817850bb78880ba5becce
updated_at: '2021-02-11 00:22:24.894851'
revision: 7a5ff5ef6845c9788af4ede00cde1808fc22ab41
updated_at: '2021-02-20 23:56:31.100339'
version: ''
nightly_urp_2d_-_trunk:
updated_at: '2021-02-18 20:35:29.887547'
updated_at: '2021-02-24 07:37:27.327906'
last_green_revisions:
Android:
revision: 0048a9ca9c0b1bc60153957aa04778a3527b950f
updated_at: '2021-02-16 00:02:11.236704'
revision: 7a5ff5ef6845c9788af4ede00cde1808fc22ab41
updated_at: '2021-02-20 23:56:31.100339'
version: ''
Linux:
revision: 0048a9ca9c0b1bc60153957aa04778a3527b950f
updated_at: '2021-02-16 00:02:11.236704'
revision: 7a5ff5ef6845c9788af4ede00cde1808fc22ab41
updated_at: '2021-02-20 23:56:31.100339'
version: ''
OSX:
revision: 0048a9ca9c0b1bc60153957aa04778a3527b950f
updated_at: '2021-02-16 00:02:11.236704'
revision: 7a5ff5ef6845c9788af4ede00cde1808fc22ab41
updated_at: '2021-02-20 23:56:31.100339'
version: ''
Win:
revision: 0048a9ca9c0b1bc60153957aa04778a3527b950f
updated_at: '2021-02-16 00:02:11.236704'
revision: 7a5ff5ef6845c9788af4ede00cde1808fc22ab41
updated_at: '2021-02-20 23:56:31.100339'
version: ''
iPhone:
revision: 0048a9ca9c0b1bc60153957aa04778a3527b950f
updated_at: '2021-02-16 00:02:11.236704'
revision: 7a5ff5ef6845c9788af4ede00cde1808fc22ab41
updated_at: '2021-02-20 23:56:31.100339'
version: ''
urp_2d_pr_job_-_trunk:
updated_at: '2021-02-18 20:35:29.887547'
updated_at: '2021-02-24 07:37:27.327906'
last_green_revisions:
Android:
revision: 0048a9ca9c0b1bc60153957aa04778a3527b950f
updated_at: '2021-02-16 00:02:11.236704'
revision: 7a5ff5ef6845c9788af4ede00cde1808fc22ab41
updated_at: '2021-02-20 23:56:31.100339'
version: ''
Linux:
revision: 0048a9ca9c0b1bc60153957aa04778a3527b950f
updated_at: '2021-02-16 00:02:11.236704'
revision: 7a5ff5ef6845c9788af4ede00cde1808fc22ab41
updated_at: '2021-02-20 23:56:31.100339'
version: ''
OSX:
revision: 0048a9ca9c0b1bc60153957aa04778a3527b950f
updated_at: '2021-02-16 00:02:11.236704'
revision: 7a5ff5ef6845c9788af4ede00cde1808fc22ab41
updated_at: '2021-02-20 23:56:31.100339'
version: ''
Win:
revision: 0048a9ca9c0b1bc60153957aa04778a3527b950f
updated_at: '2021-02-16 00:02:11.236704'
revision: 7a5ff5ef6845c9788af4ede00cde1808fc22ab41
updated_at: '2021-02-20 23:56:31.100339'
version: ''
iPhone:
revision: 0048a9ca9c0b1bc60153957aa04778a3527b950f
updated_at: '2021-02-16 00:02:11.236704'
revision: 7a5ff5ef6845c9788af4ede00cde1808fc22ab41
updated_at: '2021-02-20 23:56:31.100339'
version: ''
nightly_urp_postpro_-_trunk:
updated_at: '2021-02-22 07:42:41.190015'
updated_at: '2021-02-24 07:37:27.327906'
last_green_revisions:
Android:
revision: 7a5ff5ef6845c9788af4ede00cde1808fc22ab41
Expand All @@ -206,7 +206,7 @@ nightly_urp_postpro_-_trunk:
updated_at: '2021-02-20 23:56:31.100339'
version: ''
urp_postpro_pr_job_-_trunk:
updated_at: '2021-02-22 07:42:41.190015'
updated_at: '2021-02-24 07:37:27.327906'
last_green_revisions:
Android:
revision: 7a5ff5ef6845c9788af4ede00cde1808fc22ab41
Expand Down Expand Up @@ -252,7 +252,7 @@ nightly_urp_terrain_-_trunk:
updated_at: '2021-02-20 23:56:31.100339'
version: ''
urp_terrain_pr_job_-_trunk:
updated_at: '2021-02-22 07:42:41.190015'
updated_at: '2021-02-24 07:37:27.327906'
last_green_revisions:
Android:
revision: 7a5ff5ef6845c9788af4ede00cde1808fc22ab41
Expand All @@ -275,7 +275,7 @@ urp_terrain_pr_job_-_trunk:
updated_at: '2021-02-20 23:56:31.100339'
version: ''
nightly_urp_foundation_-_trunk:
updated_at: '2021-02-23 07:36:49.179740'
updated_at: '2021-02-24 07:37:27.327906'
last_green_revisions:
Android:
revision: 7a5ff5ef6845c9788af4ede00cde1808fc22ab41
Expand All @@ -298,7 +298,7 @@ nightly_urp_foundation_-_trunk:
updated_at: '2021-02-20 23:56:31.100339'
version: ''
urp_foundation_pr_job_-_trunk:
updated_at: '2021-02-23 07:36:49.179740'
updated_at: '2021-02-24 07:37:27.327906'
last_green_revisions:
Android:
revision: 7a5ff5ef6845c9788af4ede00cde1808fc22ab41
Expand Down
48 changes: 24 additions & 24 deletions .yamato/_latest_editor_versions_trunk.metafile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,64 +9,64 @@ editor_version_names:
editor_versions:
trunk_latest_internal:
Android:
revision: 7a5ff5ef6845c9788af4ede00cde1808fc22ab41
updated_at: '2021-02-20 23:56:31.100339'
revision: 1caa39c8ddb623bb78747b80e56024cceef45d0b
updated_at: '2021-02-24 08:47:05.850164'
version: ''
Linux:
revision: 7a5ff5ef6845c9788af4ede00cde1808fc22ab41
updated_at: '2021-02-20 23:56:31.100339'
version: ''
OSX:
revision: 7a5ff5ef6845c9788af4ede00cde1808fc22ab41
updated_at: '2021-02-20 23:56:31.100339'
revision: 1caa39c8ddb623bb78747b80e56024cceef45d0b
updated_at: '2021-02-24 08:47:05.850164'
version: ''
Win:
revision: 7a5ff5ef6845c9788af4ede00cde1808fc22ab41
updated_at: '2021-02-20 23:56:31.100339'
revision: 1caa39c8ddb623bb78747b80e56024cceef45d0b
updated_at: '2021-02-24 08:47:05.850164'
version: ''
iPhone:
revision: 7a5ff5ef6845c9788af4ede00cde1808fc22ab41
updated_at: '2021-02-20 23:56:31.100339'
revision: 1caa39c8ddb623bb78747b80e56024cceef45d0b
updated_at: '2021-02-24 08:47:05.850164'
version: ''
trunk_latest_public:
Android:
revision: 7a5ff5ef6845c9788af4ede00cde1808fc22ab41
updated_at: '2021-02-20 23:56:31.100339'
revision: 1caa39c8ddb623bb78747b80e56024cceef45d0b
updated_at: '2021-02-24 08:47:05.850164'
version: ''
Linux:
revision: 7a5ff5ef6845c9788af4ede00cde1808fc22ab41
updated_at: '2021-02-20 23:56:31.100339'
revision: 1caa39c8ddb623bb78747b80e56024cceef45d0b
updated_at: '2021-02-24 08:47:05.850164'
version: ''
OSX:
revision: 7a5ff5ef6845c9788af4ede00cde1808fc22ab41
updated_at: '2021-02-20 23:56:31.100339'
version: ''
Win:
revision: 7a5ff5ef6845c9788af4ede00cde1808fc22ab41
updated_at: '2021-02-20 23:56:31.100339'
revision: 1caa39c8ddb623bb78747b80e56024cceef45d0b
updated_at: '2021-02-24 08:47:05.850164'
version: ''
iPhone:
revision: 7a5ff5ef6845c9788af4ede00cde1808fc22ab41
updated_at: '2021-02-20 23:56:31.100339'
revision: 1caa39c8ddb623bb78747b80e56024cceef45d0b
updated_at: '2021-02-24 08:47:05.850164'
version: ''
trunk_staging:
Android:
revision: 7a5ff5ef6845c9788af4ede00cde1808fc22ab41
updated_at: '2021-02-20 23:56:31.100339'
revision: 1caa39c8ddb623bb78747b80e56024cceef45d0b
updated_at: '2021-02-24 08:47:05.850164'
version: ''
Linux:
revision: 7a5ff5ef6845c9788af4ede00cde1808fc22ab41
updated_at: '2021-02-20 23:56:31.100339'
version: ''
OSX:
revision: 7a5ff5ef6845c9788af4ede00cde1808fc22ab41
updated_at: '2021-02-20 23:56:31.100339'
revision: 1caa39c8ddb623bb78747b80e56024cceef45d0b
updated_at: '2021-02-24 08:47:05.850164'
version: ''
Win:
revision: 7a5ff5ef6845c9788af4ede00cde1808fc22ab41
updated_at: '2021-02-20 23:56:31.100339'
revision: 1caa39c8ddb623bb78747b80e56024cceef45d0b
updated_at: '2021-02-24 08:47:05.850164'
version: ''
iPhone:
revision: 7a5ff5ef6845c9788af4ede00cde1808fc22ab41
updated_at: '2021-02-20 23:56:31.100339'
revision: 1caa39c8ddb623bb78747b80e56024cceef45d0b
updated_at: '2021-02-24 08:47:05.850164'
version: ''
33 changes: 12 additions & 21 deletions TestProjects/UniversalGraphicsTest_Foundation/Assets/Test/TestFilters/TestCaseFilters.asset
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ MonoBehaviour:
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 5f6aa9f32113aec4a8bded44c1febe5c, type: 3}
m_Name: TestCaseFilters
m_EditorClassIdentifier:
m_EditorClassIdentifier:
filters:
- FilteredScene: {fileID: 0}
FilteredScenes:
Expand All @@ -37,7 +37,7 @@ MonoBehaviour:
ColorSpace: -1
BuildPlatform: 19
GraphicsDevice: 21
XrSdk:
XrSdk:
StereoModes: 0
Reason: https://fogbugz.unity3d.com/f/cases/1305591/
- FilteredScene: {fileID: 0}
Expand Down Expand Up @@ -82,7 +82,7 @@ MonoBehaviour:
ColorSpace: -1
BuildPlatform: 19
GraphicsDevice: 21
XrSdk:
XrSdk:
StereoModes: 0
Reason: https://fogbugz.unity3d.com/f/cases/1305591/
- FilteredScene: {fileID: 0}
Expand Down Expand Up @@ -127,7 +127,7 @@ MonoBehaviour:
ColorSpace: -1
BuildPlatform: 31
GraphicsDevice: 13
XrSdk:
XrSdk:
StereoModes: 0
Reason: https://fogbugz.unity3d.com/f/cases/1293775/
- FilteredScene: {fileID: 0}
Expand All @@ -139,22 +139,13 @@ MonoBehaviour:
XrSdk: None
StereoModes: 0
Reason: OSX Standalone won't work with back buffer capture
- FilteredScene: {fileID: 0}
FilteredScenes:
- {fileID: 102900000, guid: c7b61419ee9382545afe530714fda0c2, type: 3}
ColorSpace: -1
BuildPlatform: 13
GraphicsDevice: 21
XrSdk: None
StereoModes: 0
Reason: 'Android Vulkan 119: tracked issue (1252270)'
- FilteredScene: {fileID: 0}
FilteredScenes:
- {fileID: 102900000, guid: c7b61419ee9382545afe530714fda0c2, type: 3}
ColorSpace: -1
BuildPlatform: 31
GraphicsDevice: 13
XrSdk:
XrSdk:
StereoModes: 0
Reason: https://fogbugz.unity3d.com/f/cases/1293775/
- FilteredScene: {fileID: 0}
Expand All @@ -163,7 +154,7 @@ MonoBehaviour:
ColorSpace: -1
BuildPlatform: 31
GraphicsDevice: 13
XrSdk:
XrSdk:
StereoModes: 0
Reason: https://fogbugz.unity3d.com/f/cases/1293775/
- FilteredScene: {fileID: 0}
Expand All @@ -172,7 +163,7 @@ MonoBehaviour:
ColorSpace: -1
BuildPlatform: 31
GraphicsDevice: 13
XrSdk:
XrSdk:
StereoModes: 0
Reason: https://fogbugz.unity3d.com/f/cases/1293775/
- FilteredScene: {fileID: 0}
Expand All @@ -181,7 +172,7 @@ MonoBehaviour:
ColorSpace: -1
BuildPlatform: 31
GraphicsDevice: 13
XrSdk:
XrSdk:
StereoModes: 0
Reason: https://fogbugz.unity3d.com/f/cases/1293775/
- FilteredScene: {fileID: 0}
Expand All @@ -199,7 +190,7 @@ MonoBehaviour:
ColorSpace: -1
BuildPlatform: 31
GraphicsDevice: 13
XrSdk:
XrSdk:
StereoModes: 0
Reason: https://fogbugz.unity3d.com/f/cases/1293775/
- FilteredScene: {fileID: 0}
Expand All @@ -217,7 +208,7 @@ MonoBehaviour:
ColorSpace: -1
BuildPlatform: 31
GraphicsDevice: 13
XrSdk:
XrSdk:
StereoModes: 0
Reason: https://fogbugz.unity3d.com/f/cases/1293775/
- FilteredScene: {fileID: 0}
Expand All @@ -244,7 +235,7 @@ MonoBehaviour:
ColorSpace: -1
BuildPlatform: 31
GraphicsDevice: 13
XrSdk:
XrSdk:
StereoModes: 0
Reason: https://fogbugz.unity3d.com/f/cases/1293775/
- FilteredScene: {fileID: 0}
Expand Down Expand Up @@ -280,7 +271,7 @@ MonoBehaviour:
ColorSpace: -1
BuildPlatform: 24
GraphicsDevice: 21
XrSdk:
XrSdk:
StereoModes: 0
Reason: https://fogbugz.unity3d.com/f/cases/1300373
- FilteredScene: {fileID: 0}
Expand Down
3 changes: 3 additions & 0 deletions ...ges/Linear/Android/OpenGLES3/None/146_AdditionalLightShadowCustomResolution.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit 309596a

Please sign in to comment.