From b9da5fa496adb5bd473af2df6cabec31cf507450 Mon Sep 17 00:00:00 2001 From: Kleber Garcia Date: Thu, 14 Jan 2021 06:52:46 -0500 Subject: [PATCH 01/21] Hd/fix 1299116 tesselation cull (#3057) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Fixed Render Graph immediate mode. (#3033) Co-authored-by: Sebastien Lagarde * Fix issue with shadow mask and area lights (#3019) * Not checking NdotL since it's not really valid for area lights (We have multiple valid light directions, not one) * Changelog Co-authored-by: sebastienlagarde * Fix issue with capture callback (now includes post processing results) (#3035) Co-authored-by: sebastienlagarde * [HDRP] Fix decal draw order for ShaderGraph decal materials (#3018) * Fixed ShaderGraph decal draw order * Updated changelog Co-authored-by: sebastienlagarde * Fixed various Look Dev issues after exiting Playmode (#2956) * Fixed access to invalid Contexts references after exiting playmode. * Fixed comparison gizmo after playmode. * Fixes from PR feedback * StackLit: Fix SG surface option property block to only display energy conserving specular color option for the specular input parametrization (similar to case 1257050) (#3060) * Fixed missing BeginCameraRendering call for custom render mode of a Camera (#3063) * Implement custom drawer for layer mask parameters (#3066) * Adding mixed light baking shadowmask test (#3052) * adding a shadow mask test * Update reference images * Fixing hull constant shader's tesselation cull algorithm. Before it was comparing edges being out of the frustum. This is wrong because the camera could be inside a triangle, in which case the edges could be out of at least 1 frustum plane. Correct fix is to check all three vertices if they are out of at least 1 plane. Result packed tightly into the functions w return component. * Renamed to a new function so we keep backwards compatibility. Restored the shadow shader pass path, accidentally changed it to bool4 and use near plane. * Fixing type back to bool, instead of bool4 * Merging changelog information from rebase. * Making sure scene declaration pass is a bool4 * Adding new test for tesselation culling, with a weird camera angle which fails previous setup. * Fixing formatting of code, rearranging order of test in editor build settings. * Adding reference images for test. * Missing meta file for new tests * Fix bad merge issue * fix bad merge issue * fix bad merge issue Co-authored-by: JulienIgnace-Unity Co-authored-by: Sebastien Lagarde Co-authored-by: FrancescoC-unity <43168857+FrancescoC-unity@users.noreply.github.com> Co-authored-by: Pavlos Mavridis Co-authored-by: Antoine Lelievre Co-authored-by: slunity <37302815+slunity@users.noreply.github.com> Co-authored-by: Adrien de Tocqueville Co-authored-by: Rémi Chapelain <57442369+remi-chapelain@users.noreply.github.com> --- .../1224_Lit_Tesselation_Culling.meta | 8 + .../1224_Lit_Tesselation_Culling.unity | 345 ++++++++++++++++++ .../1224_Lit_Tesselation_Culling.unity.meta | 7 + .../TesselationPlaneMaterial.mat | 288 +++++++++++++++ .../TesselationPlaneMaterial.mat.meta | 8 + .../None/1224_Lit_Tesselation_Culling.png | 3 + .../1224_Lit_Tesselation_Culling.png.meta | 108 ++++++ .../None/1224_Lit_Tesselation_Culling.png | 3 + .../1224_Lit_Tesselation_Culling.png.meta | 108 ++++++ .../None/1224_Lit_Tesselation_Culling.png | 3 + .../1224_Lit_Tesselation_Culling.png.meta | 108 ++++++ .../None/1224_Lit_Tesselation_Culling.png | 3 + .../1224_Lit_Tesselation_Culling.png.meta | 108 ++++++ .../None/1224_Lit_Tesselation_Culling.png | 3 + .../1224_Lit_Tesselation_Culling.png.meta | 108 ++++++ .../ProjectSettings/EditorBuildSettings.asset | 3 + com.unity.render-pipelines.core/CHANGELOG.md | 4 + .../ShaderLibrary/GeometricTools.hlsl | 30 +- .../CHANGELOG.md | 1 + .../Material/Lit/LitDataMeshModification.hlsl | 6 +- 20 files changed, 1245 insertions(+), 10 deletions(-) create mode 100644 TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1224_Lit_Tesselation_Culling.meta create mode 100644 TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1224_Lit_Tesselation_Culling.unity create mode 100644 TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1224_Lit_Tesselation_Culling.unity.meta create mode 100644 TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1224_Lit_Tesselation_Culling/TesselationPlaneMaterial.mat create mode 100644 TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1224_Lit_Tesselation_Culling/TesselationPlaneMaterial.mat.meta create mode 100644 TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/LinuxEditor/Vulkan/None/1224_Lit_Tesselation_Culling.png create mode 100644 TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/LinuxEditor/Vulkan/None/1224_Lit_Tesselation_Culling.png.meta create mode 100644 TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/OSXEditor/Metal/None/1224_Lit_Tesselation_Culling.png create mode 100644 TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/OSXEditor/Metal/None/1224_Lit_Tesselation_Culling.png.meta create mode 100644 TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/None/1224_Lit_Tesselation_Culling.png create mode 100644 TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/None/1224_Lit_Tesselation_Culling.png.meta create mode 100644 TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D12/None/1224_Lit_Tesselation_Culling.png create mode 100644 TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D12/None/1224_Lit_Tesselation_Culling.png.meta create mode 100644 TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/None/1224_Lit_Tesselation_Culling.png create mode 100644 TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/None/1224_Lit_Tesselation_Culling.png.meta diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1224_Lit_Tesselation_Culling.meta b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1224_Lit_Tesselation_Culling.meta new file mode 100644 index 00000000000..4c3b0f8c6ec --- /dev/null +++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1224_Lit_Tesselation_Culling.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 3e15a4def182a184d9dafc2122db4c90 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1224_Lit_Tesselation_Culling.unity b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1224_Lit_Tesselation_Culling.unity new file mode 100644 index 00000000000..f5d60bb85fb --- /dev/null +++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1224_Lit_Tesselation_Culling.unity @@ -0,0 +1,345 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!29 &1 +OcclusionCullingSettings: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_OcclusionBakeSettings: + smallestOccluder: 5 + smallestHole: 0.25 + backfaceThreshold: 100 + m_SceneGUID: 00000000000000000000000000000000 + m_OcclusionCullingData: {fileID: 0} +--- !u!104 &2 +RenderSettings: + m_ObjectHideFlags: 0 + serializedVersion: 9 + m_Fog: 0 + m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_FogMode: 3 + m_FogDensity: 0.01 + m_LinearFogStart: 0 + m_LinearFogEnd: 300 + m_AmbientSkyColor: {r: 0.212, g: 0.227, b: 0.259, a: 1} + m_AmbientEquatorColor: {r: 0.114, g: 0.125, b: 0.133, a: 1} + m_AmbientGroundColor: {r: 0.047, g: 0.043, b: 0.035, a: 1} + m_AmbientIntensity: 1 + m_AmbientMode: 0 + m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1} + m_SkyboxMaterial: {fileID: 0} + m_HaloStrength: 0.5 + m_FlareStrength: 1 + m_FlareFadeSpeed: 3 + m_HaloTexture: {fileID: 0} + m_SpotCookie: {fileID: 10001, guid: 0000000000000000e000000000000000, type: 0} + m_DefaultReflectionMode: 0 + m_DefaultReflectionResolution: 128 + m_ReflectionBounces: 1 + m_ReflectionIntensity: 1 + m_CustomReflection: {fileID: 0} + m_Sun: {fileID: 0} + m_IndirectSpecularColor: {r: 0.31006354, g: 0.3258909, b: 0.36047056, a: 1} + m_UseRadianceAmbientProbe: 0 +--- !u!157 &3 +LightmapSettings: + m_ObjectHideFlags: 0 + serializedVersion: 12 + m_GIWorkflowMode: 1 + m_GISettings: + serializedVersion: 2 + m_BounceScale: 1 + m_IndirectOutputScale: 1 + m_AlbedoBoost: 1 + m_EnvironmentLightingMode: 0 + m_EnableBakedLightmaps: 1 + m_EnableRealtimeLightmaps: 0 + m_LightmapEditorSettings: + serializedVersion: 12 + m_Resolution: 2 + m_BakeResolution: 40 + m_AtlasSize: 1024 + m_AO: 0 + m_AOMaxDistance: 1 + m_CompAOExponent: 1 + m_CompAOExponentDirect: 0 + m_ExtractAmbientOcclusion: 0 + m_Padding: 2 + m_LightmapParameters: {fileID: 0} + m_LightmapsBakeMode: 1 + m_TextureCompression: 1 + m_FinalGather: 0 + m_FinalGatherFiltering: 1 + m_FinalGatherRayCount: 256 + m_ReflectionCompression: 2 + m_MixedBakeMode: 2 + m_BakeBackend: 1 + m_PVRSampling: 1 + m_PVRDirectSampleCount: 32 + m_PVRSampleCount: 512 + m_PVRBounces: 2 + m_PVREnvironmentSampleCount: 256 + m_PVREnvironmentReferencePointCount: 2048 + m_PVRFilteringMode: 1 + m_PVRDenoiserTypeDirect: 1 + m_PVRDenoiserTypeIndirect: 1 + m_PVRDenoiserTypeAO: 1 + m_PVRFilterTypeDirect: 0 + m_PVRFilterTypeIndirect: 0 + m_PVRFilterTypeAO: 0 + m_PVREnvironmentMIS: 1 + m_PVRCulling: 1 + m_PVRFilteringGaussRadiusDirect: 1 + m_PVRFilteringGaussRadiusIndirect: 5 + m_PVRFilteringGaussRadiusAO: 2 + m_PVRFilteringAtrousPositionSigmaDirect: 0.5 + m_PVRFilteringAtrousPositionSigmaIndirect: 2 + m_PVRFilteringAtrousPositionSigmaAO: 1 + m_ExportTrainingData: 0 + m_TrainingDataDestination: TrainingData + m_LightProbeSampleCountMultiplier: 4 + m_LightingDataAsset: {fileID: 0} + m_LightingSettings: {fileID: 0} +--- !u!196 &4 +NavMeshSettings: + serializedVersion: 2 + m_ObjectHideFlags: 0 + m_BuildSettings: + serializedVersion: 2 + agentTypeID: 0 + agentRadius: 0.5 + agentHeight: 2 + agentSlope: 45 + agentClimb: 0.4 + ledgeDropHeight: 0 + maxJumpAcrossDistance: 0 + minRegionArea: 2 + manualCellSize: 0 + cellSize: 0.16666667 + manualTileSize: 0 + tileSize: 256 + accuratePlacement: 0 + maxJobWorkers: 0 + preserveTilesOutsideBounds: 0 + debug: + m_Flags: 0 + m_NavMeshData: {fileID: 0} +--- !u!1001 &224682462 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 1381370728658774, guid: e0446b620fbf66540b1b93f937834a01, type: 3} + propertyPath: m_Name + value: HDRP_Default_Sky + objectReference: {fileID: 0} + - target: {fileID: 4827451743472390, guid: e0446b620fbf66540b1b93f937834a01, type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4827451743472390, guid: e0446b620fbf66540b1b93f937834a01, type: 3} + propertyPath: m_LocalPosition.x + value: -7.5937176 + objectReference: {fileID: 0} + - target: {fileID: 4827451743472390, guid: e0446b620fbf66540b1b93f937834a01, type: 3} + propertyPath: m_LocalPosition.y + value: 8.722061 + objectReference: {fileID: 0} + - target: {fileID: 4827451743472390, guid: e0446b620fbf66540b1b93f937834a01, type: 3} + propertyPath: m_LocalPosition.z + value: -16.973507 + objectReference: {fileID: 0} + - target: {fileID: 4827451743472390, guid: e0446b620fbf66540b1b93f937834a01, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4827451743472390, guid: e0446b620fbf66540b1b93f937834a01, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4827451743472390, guid: e0446b620fbf66540b1b93f937834a01, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4827451743472390, guid: e0446b620fbf66540b1b93f937834a01, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4827451743472390, guid: e0446b620fbf66540b1b93f937834a01, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4827451743472390, guid: e0446b620fbf66540b1b93f937834a01, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4827451743472390, guid: e0446b620fbf66540b1b93f937834a01, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: e0446b620fbf66540b1b93f937834a01, type: 3} +--- !u!1 &1418940182 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1418940186} + - component: {fileID: 1418940185} + - component: {fileID: 1418940184} + - component: {fileID: 1418940183} + m_Layer: 0 + m_Name: Cube + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!65 &1418940183 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1418940182} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 1, y: 1, z: 1} + m_Center: {x: 0, y: 0, z: 0} +--- !u!23 &1418940184 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1418940182} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 257 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: e980b2b23fed9644f8ea87b1e2459a7b, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!33 &1418940185 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1418940182} + m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!4 &1418940186 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1418940182} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 1.86, y: 0, z: -4.57} + m_LocalScale: {x: 28.739809, y: 1, z: 29.833057} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1001 &1795242445 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 1132393308280272, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} + propertyPath: m_Name + value: HDRP_Test_Camera + objectReference: {fileID: 0} + - target: {fileID: 4209882255362944, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4209882255362944, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} + propertyPath: m_LocalPosition.x + value: 14.25 + objectReference: {fileID: 0} + - target: {fileID: 4209882255362944, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} + propertyPath: m_LocalPosition.y + value: 2.34 + objectReference: {fileID: 0} + - target: {fileID: 4209882255362944, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} + propertyPath: m_LocalPosition.z + value: -16.9 + objectReference: {fileID: 0} + - target: {fileID: 4209882255362944, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} + propertyPath: m_LocalRotation.w + value: 0.8770103 + objectReference: {fileID: 0} + - target: {fileID: 4209882255362944, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} + propertyPath: m_LocalRotation.x + value: 0.35872343 + objectReference: {fileID: 0} + - target: {fileID: 4209882255362944, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} + propertyPath: m_LocalRotation.y + value: -0.30594522 + objectReference: {fileID: 0} + - target: {fileID: 4209882255362944, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} + propertyPath: m_LocalRotation.z + value: 0.09256382 + objectReference: {fileID: 0} + - target: {fileID: 4209882255362944, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 43.302 + objectReference: {fileID: 0} + - target: {fileID: 4209882255362944, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: -40.251 + objectReference: {fileID: 0} + - target: {fileID: 4209882255362944, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: -4.503 + objectReference: {fileID: 0} + - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7, + type: 3} + propertyPath: exposureTarget + value: + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1224_Lit_Tesselation_Culling.unity.meta b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1224_Lit_Tesselation_Culling.unity.meta new file mode 100644 index 00000000000..9d27300b422 --- /dev/null +++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1224_Lit_Tesselation_Culling.unity.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: e6dbeb027fe017c41839dd2fcfc728f3 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1224_Lit_Tesselation_Culling/TesselationPlaneMaterial.mat b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1224_Lit_Tesselation_Culling/TesselationPlaneMaterial.mat new file mode 100644 index 00000000000..9b498ad3b3f --- /dev/null +++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1224_Lit_Tesselation_Culling/TesselationPlaneMaterial.mat @@ -0,0 +1,288 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &-3012003138654363470 +MonoBehaviour: + m_ObjectHideFlags: 11 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 11 +--- !u!21 &2100000 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: TesselationPlaneMaterial + m_Shader: {fileID: 4800000, guid: 756bac9090102564582875f4c7e30202, type: 3} + m_ShaderKeywords: _NORMALMAP_TANGENT_SPACE + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: 2225 + stringTagMap: {} + disabledShaderPasses: + - DistortionVectors + - MOTIONVECTORS + - TransparentDepthPrepass + - TransparentDepthPostpass + - TransparentBackface + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _AnisotropyMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BaseColorMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BentNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BentNormalMapOS: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _CoatMaskMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DistortionVectorMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissiveColorMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _HeightMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _IridescenceMaskMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _IridescenceThicknessMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MaskMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _NormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _NormalMapOS: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _SpecularColorMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _SubsurfaceMaskMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _TangentMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _TangentMapOS: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ThicknessMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _TransmittanceColorMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _AORemapMax: 1 + - _AORemapMin: 0 + - _ATDistance: 1 + - _AddPrecomputedVelocity: 0 + - _AlbedoAffectEmissive: 0 + - _AlphaCutoff: 0.5 + - _AlphaCutoffEnable: 0 + - _AlphaCutoffPostpass: 0.5 + - _AlphaCutoffPrepass: 0.5 + - _AlphaCutoffShadow: 0.5 + - _AlphaDstBlend: 0 + - _AlphaSrcBlend: 1 + - _AlphaToMask: 0 + - _AlphaToMaskInspectorValue: 0 + - _Anisotropy: 0 + - _BlendMode: 0 + - _CoatMask: 0 + - _CullMode: 2 + - _CullModeForward: 2 + - _Cutoff: 0.5 + - _DepthOffsetEnable: 0 + - _DetailAlbedoScale: 1 + - _DetailNormalScale: 1 + - _DetailSmoothnessScale: 1 + - _DiffusionProfile: 0 + - _DiffusionProfileHash: 0 + - _DisplacementLockObjectScale: 1 + - _DisplacementLockTilingScale: 1 + - _DisplacementMode: 0 + - _DistortionBlendMode: 0 + - _DistortionBlurBlendMode: 0 + - _DistortionBlurDstBlend: 1 + - _DistortionBlurRemapMax: 1 + - _DistortionBlurRemapMin: 0 + - _DistortionBlurScale: 1 + - _DistortionBlurSrcBlend: 1 + - _DistortionDepthTest: 1 + - _DistortionDstBlend: 1 + - _DistortionEnable: 0 + - _DistortionScale: 1 + - _DistortionSrcBlend: 1 + - _DistortionVectorBias: -1 + - _DistortionVectorScale: 2 + - _DoubleSidedEnable: 0 + - _DoubleSidedNormalMode: 1 + - _DstBlend: 0 + - _EmissiveColorMode: 1 + - _EmissiveExposureWeight: 1 + - _EmissiveIntensity: 1 + - _EmissiveIntensityUnit: 0 + - _EnableBlendModePreserveSpecularLighting: 1 + - _EnableFogOnTransparent: 1 + - _EnableGeometricSpecularAA: 0 + - _EnergyConservingSpecularColor: 1 + - _HeightAmplitude: 0.02 + - _HeightCenter: 0.5 + - _HeightMapParametrization: 0 + - _HeightMax: 1 + - _HeightMin: -1 + - _HeightOffset: 0 + - _HeightPoMAmplitude: 2 + - _HeightTessAmplitude: 2 + - _HeightTessCenter: 0.5 + - _InvTilingScale: 1 + - _Ior: 1.5 + - _IridescenceMask: 1 + - _IridescenceThickness: 1 + - _LinkDetailsWithBase: 1 + - _MaterialID: 1 + - _Metallic: 0 + - _MetallicRemapMax: 1 + - _MetallicRemapMin: 0 + - _NormalMapSpace: 0 + - _NormalScale: 1 + - _OpaqueCullMode: 2 + - _PPDLodThreshold: 5 + - _PPDMaxSamples: 15 + - _PPDMinSamples: 5 + - _PPDPrimitiveLength: 1 + - _PPDPrimitiveWidth: 1 + - _RayTracing: 0 + - _ReceivesSSR: 1 + - _ReceivesSSRTransparent: 0 + - _RefractionModel: 0 + - _Smoothness: 0.5 + - _SmoothnessRemapMax: 1 + - _SmoothnessRemapMin: 0 + - _SpecularAAScreenSpaceVariance: 0.1 + - _SpecularAAThreshold: 0.2 + - _SpecularOcclusionMode: 1 + - _SrcBlend: 1 + - _StencilRef: 0 + - _StencilRefDepth: 8 + - _StencilRefDistortionVec: 4 + - _StencilRefGBuffer: 10 + - _StencilRefMV: 40 + - _StencilWriteMask: 6 + - _StencilWriteMaskDepth: 8 + - _StencilWriteMaskDistortionVec: 4 + - _StencilWriteMaskGBuffer: 14 + - _StencilWriteMaskMV: 40 + - _SubsurfaceMask: 1 + - _SupportDecals: 1 + - _SurfaceType: 0 + - _TessellationBackFaceCullEpsilon: -0.25 + - _TessellationFactor: 4 + - _TessellationFactorMaxDistance: 50 + - _TessellationFactorMinDistance: 20 + - _TessellationFactorTriangleSize: 100 + - _TessellationMode: 0 + - _TessellationShapeFactor: 0.75 + - _TexWorldScale: 1 + - _TexWorldScaleEmissive: 1 + - _Thickness: 1 + - _ThicknessMultiplier: 1 + - _TransmissionEnable: 1 + - _TransparentBackfaceEnable: 0 + - _TransparentCullMode: 2 + - _TransparentDepthPostpassEnable: 0 + - _TransparentDepthPrepassEnable: 0 + - _TransparentSortPriority: 0 + - _TransparentWritingMotionVec: 0 + - _TransparentZWrite: 0 + - _UVBase: 0 + - _UVDetail: 0 + - _UVEmissive: 0 + - _UseEmissiveIntensity: 0 + - _UseShadowThreshold: 0 + - _ZTestDepthEqualForOpaque: 3 + - _ZTestGBuffer: 4 + - _ZTestModeDistortion: 4 + - _ZTestTransparent: 4 + - _ZWrite: 1 + m_Colors: + - _BaseColor: {r: 1, g: 1, b: 1, a: 1} + - _BaseColorMap_MipInfo: {r: 0, g: 0, b: 0, a: 0} + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _DiffusionProfileAsset: {r: 0, g: 0, b: 0, a: 0} + - _DoubleSidedConstants: {r: 1, g: 1, b: -1, a: 0} + - _EmissionColor: {r: 1, g: 1, b: 1, a: 1} + - _EmissiveColor: {r: 0, g: 0, b: 0, a: 1} + - _EmissiveColorLDR: {r: 0, g: 0, b: 0, a: 1} + - _InvPrimScale: {r: 1, g: 1, b: 0, a: 0} + - _IridescenceThicknessRemap: {r: 0, g: 1, b: 0, a: 0} + - _SpecularColor: {r: 1, g: 1, b: 1, a: 1} + - _ThicknessRemap: {r: 0, g: 1, b: 0, a: 0} + - _TransmittanceColor: {r: 1, g: 1, b: 1, a: 1} + - _UVDetailsMappingMask: {r: 1, g: 0, b: 0, a: 0} + - _UVMappingMask: {r: 1, g: 0, b: 0, a: 0} + - _UVMappingMaskEmissive: {r: 1, g: 0, b: 0, a: 0} + m_BuildTextureStacks: [] diff --git a/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1224_Lit_Tesselation_Culling/TesselationPlaneMaterial.mat.meta b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1224_Lit_Tesselation_Culling/TesselationPlaneMaterial.mat.meta new file mode 100644 index 00000000000..8b63ddc25a4 --- /dev/null +++ b/TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1224_Lit_Tesselation_Culling/TesselationPlaneMaterial.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: e980b2b23fed9644f8ea87b1e2459a7b +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/LinuxEditor/Vulkan/None/1224_Lit_Tesselation_Culling.png b/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/LinuxEditor/Vulkan/None/1224_Lit_Tesselation_Culling.png new file mode 100644 index 00000000000..3e535eb4402 --- /dev/null +++ b/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/LinuxEditor/Vulkan/None/1224_Lit_Tesselation_Culling.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ee2205b0afb3a6be0d59aaf739e4b56e063309802d4e2e412d89259d48d1312a +size 19660 diff --git a/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/LinuxEditor/Vulkan/None/1224_Lit_Tesselation_Culling.png.meta b/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/LinuxEditor/Vulkan/None/1224_Lit_Tesselation_Culling.png.meta new file mode 100644 index 00000000000..1ee2d25580d --- /dev/null +++ b/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/LinuxEditor/Vulkan/None/1224_Lit_Tesselation_Culling.png.meta @@ -0,0 +1,108 @@ +fileFormatVersion: 2 +guid: 28798005a1e3f20408983140563599a5 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 1 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: -1 + wrapV: -1 + wrapW: -1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/OSXEditor/Metal/None/1224_Lit_Tesselation_Culling.png b/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/OSXEditor/Metal/None/1224_Lit_Tesselation_Culling.png new file mode 100644 index 00000000000..8a1899e3a13 --- /dev/null +++ b/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/OSXEditor/Metal/None/1224_Lit_Tesselation_Culling.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6cccca6544389077be9382ec3330fe138c614bded7f22acb8746e590ad70df5a +size 18417 diff --git a/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/OSXEditor/Metal/None/1224_Lit_Tesselation_Culling.png.meta b/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/OSXEditor/Metal/None/1224_Lit_Tesselation_Culling.png.meta new file mode 100644 index 00000000000..1df632edc69 --- /dev/null +++ b/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/OSXEditor/Metal/None/1224_Lit_Tesselation_Culling.png.meta @@ -0,0 +1,108 @@ +fileFormatVersion: 2 +guid: 4c596160d92518742ad14f6ac452294d +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 1 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: -1 + wrapV: -1 + wrapW: -1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/None/1224_Lit_Tesselation_Culling.png b/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/None/1224_Lit_Tesselation_Culling.png new file mode 100644 index 00000000000..6c0047806bc --- /dev/null +++ b/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/None/1224_Lit_Tesselation_Culling.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:24126fabef74bf34451d9c0945454b2fdb63d9e07a886a5f3673b50175d12011 +size 19649 diff --git a/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/None/1224_Lit_Tesselation_Culling.png.meta b/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/None/1224_Lit_Tesselation_Culling.png.meta new file mode 100644 index 00000000000..30981ad345b --- /dev/null +++ b/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/None/1224_Lit_Tesselation_Culling.png.meta @@ -0,0 +1,108 @@ +fileFormatVersion: 2 +guid: 46f33bc5edf73f54f854540c9dc6f0e2 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 1 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: -1 + wrapV: -1 + wrapW: -1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D12/None/1224_Lit_Tesselation_Culling.png b/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D12/None/1224_Lit_Tesselation_Culling.png new file mode 100644 index 00000000000..bd484dd3ee5 --- /dev/null +++ b/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D12/None/1224_Lit_Tesselation_Culling.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c833cf671c68cad0dcf4d70be7a605434b85415456d57b845d7ad7425c5d8676 +size 20345 diff --git a/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D12/None/1224_Lit_Tesselation_Culling.png.meta b/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D12/None/1224_Lit_Tesselation_Culling.png.meta new file mode 100644 index 00000000000..53d4c8a5846 --- /dev/null +++ b/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D12/None/1224_Lit_Tesselation_Culling.png.meta @@ -0,0 +1,108 @@ +fileFormatVersion: 2 +guid: 9a66e269a4e2ddb4c87243ad5d9bd39b +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 1 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: -1 + wrapV: -1 + wrapW: -1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/None/1224_Lit_Tesselation_Culling.png b/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/None/1224_Lit_Tesselation_Culling.png new file mode 100644 index 00000000000..3e535eb4402 --- /dev/null +++ b/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/None/1224_Lit_Tesselation_Culling.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ee2205b0afb3a6be0d59aaf739e4b56e063309802d4e2e412d89259d48d1312a +size 19660 diff --git a/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/None/1224_Lit_Tesselation_Culling.png.meta b/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/None/1224_Lit_Tesselation_Culling.png.meta new file mode 100644 index 00000000000..3177c6fa4a6 --- /dev/null +++ b/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/None/1224_Lit_Tesselation_Culling.png.meta @@ -0,0 +1,108 @@ +fileFormatVersion: 2 +guid: 1af73e82db44222419418834ae98b87c +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 1 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: -1 + wrapV: -1 + wrapW: -1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/TestProjects/HDRP_Tests/ProjectSettings/EditorBuildSettings.asset b/TestProjects/HDRP_Tests/ProjectSettings/EditorBuildSettings.asset index 0d41d4d287e..48ab39900e9 100644 --- a/TestProjects/HDRP_Tests/ProjectSettings/EditorBuildSettings.asset +++ b/TestProjects/HDRP_Tests/ProjectSettings/EditorBuildSettings.asset @@ -89,6 +89,9 @@ EditorBuildSettings: - enabled: 1 path: Assets/GraphicTests/Scenes/1x_Materials/1223_Lit_Iridescence.unity guid: b447fc323b2e7604e9404972d093fb77 + - enabled: 1 + path: Assets/GraphicTests/Scenes/1x_Materials/1224_Lit_Tesselation_Culling.unity + guid: e6dbeb027fe017c41839dd2fcfc728f3 - enabled: 1 path: Assets/GraphicTests/Scenes/1x_Materials/1301_StackLitSG.unity guid: eefb6e7ceaa685442bbf61fd2b82f9ae diff --git a/com.unity.render-pipelines.core/CHANGELOG.md b/com.unity.render-pipelines.core/CHANGELOG.md index 357ab1c1284..285502dcbe3 100644 --- a/com.unity.render-pipelines.core/CHANGELOG.md +++ b/com.unity.render-pipelines.core/CHANGELOG.md @@ -18,6 +18,10 @@ The version number for this package has increased due to a version update of a r - Fixed ACES tonemaping for Nintendo Switch by forcing some shader color conversion functions to full float precision. - Fixed a bug in FreeCamera which would only provide a speed boost for the first frame when pressing the Shfit key. +## Added +- New function in GeometryTools.hlsl to calculate triangle edge and full triangle culling. + + ## [10.2.0] - 2020-10-19 Version Updated diff --git a/com.unity.render-pipelines.core/ShaderLibrary/GeometricTools.hlsl b/com.unity.render-pipelines.core/ShaderLibrary/GeometricTools.hlsl index 99784432eed..c9e2e149ce0 100644 --- a/com.unity.render-pipelines.core/ShaderLibrary/GeometricTools.hlsl +++ b/com.unity.render-pipelines.core/ShaderLibrary/GeometricTools.hlsl @@ -234,9 +234,12 @@ bool CullTriangleFrustum(float3 p0, float3 p1, float3 p2, float epsilon, float4 // Returns 'true' if the edge of the triangle is outside of the frustum. // The edges are defined s.t. they are on the opposite side of the point with the given index. // 'epsilon' is the (negative) distance to (outside of) the frustum below which we cull the triangle. -bool3 CullTriangleEdgesFrustum(float3 p0, float3 p1, float3 p2, float epsilon, float4 frustumPlanes[6], int numPlanes) +//output packing: +// x,y,z - one component per triangle edge, true if outside, false otherwise +// w - true if entire triangle is outside of at least 1 plane of the frustum, false otherwise +bool4 CullFullTriangleAndEdgesFrustum(float3 p0, float3 p1, float3 p2, float epsilon, float4 frustumPlanes[6], int numPlanes) { - bool3 edgesOutside = false; + bool4 edgesOutsideXYZ_triangleOutsideW = false; for (int i = 0; i < numPlanes; i++) { @@ -244,13 +247,26 @@ bool3 CullTriangleEdgesFrustum(float3 p0, float3 p1, float3 p2, float epsilon, f DistanceFromPlane(p1, frustumPlanes[i]) < epsilon, DistanceFromPlane(p2, frustumPlanes[i]) < epsilon); - // If both points of the edge are behind any of the planes, we cull. - edgesOutside.x = edgesOutside.x || (pointsOutside.y && pointsOutside.z); - edgesOutside.y = edgesOutside.y || (pointsOutside.x && pointsOutside.z); - edgesOutside.z = edgesOutside.z || (pointsOutside.x && pointsOutside.y); + bool3 edgesOutside; + // If both points of the edge are behind any of the planes, we cull. + edgesOutside.x = pointsOutside.y && pointsOutside.z; + edgesOutside.y = pointsOutside.x && pointsOutside.z; + edgesOutside.z = pointsOutside.x && pointsOutside.y; + + edgesOutsideXYZ_triangleOutsideW = edgesOutsideXYZ_triangleOutsideW || bool4(edgesOutside.xyz, all(pointsOutside)); } - return edgesOutside; + return edgesOutsideXYZ_triangleOutsideW; +} + +// Returns 'true' if the edge of the triangle is outside of the frustum. +// The edges are defined s.t. they are on the opposite side of the point with the given index. +// 'epsilon' is the (negative) distance to (outside of) the frustum below which we cull the triangle. +//output packing: +// x,y,z - one component per triangle edge, true if outside, false otherwise +bool3 CullTriangleEdgesFrustum(float3 p0, float3 p1, float3 p2, float epsilon, float4 frustumPlanes[6], int numPlanes) +{ + return CullFullTriangleAndEdgesFrustum(p0, p1, p2, epsilon, frustumPlanes, numPlanes).xyz; } bool CullTriangleBackFaceView(float3 p0, float3 p1, float3 p2, float epsilon, float3 V, float winding) diff --git a/com.unity.render-pipelines.high-definition/CHANGELOG.md b/com.unity.render-pipelines.high-definition/CHANGELOG.md index ce192f7464e..c569133be04 100644 --- a/com.unity.render-pipelines.high-definition/CHANGELOG.md +++ b/com.unity.render-pipelines.high-definition/CHANGELOG.md @@ -50,6 +50,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. - Fixed LayerMask editor for volume parameters. - Fixed the condition on temporal accumulation in the reflection denoiser (case 1303504). - Fixed box light attenuation. +- Fixed tesselation culling, big triangles using lit tesselation shader would dissapear when camera is too close to them (case 1299116) ### Changed - Removed the material pass probe volumes evaluation mode. diff --git a/com.unity.render-pipelines.high-definition/Runtime/Material/Lit/LitDataMeshModification.hlsl b/com.unity.render-pipelines.high-definition/Runtime/Material/Lit/LitDataMeshModification.hlsl index 7ea5f75fe58..2151286da7a 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/Material/Lit/LitDataMeshModification.hlsl +++ b/com.unity.render-pipelines.high-definition/Runtime/Material/Lit/LitDataMeshModification.hlsl @@ -62,14 +62,14 @@ float4 GetTessellationFactors(float3 p0, float3 p1, float3 p2, float3 n0, float3 // TODO: the only reason I test the near plane here is that I am not sure that the product of other tessellation factors // (such as screen-space/distance-based) results in the tessellation factor of 1 for the geometry behind the near plane. // If that is the case (and, IMHO, it should be), we shouldn't have to test the near plane here. - bool3 frustumCullEdgesMainView = CullTriangleEdgesFrustum(p0, p1, p2, frustumEps, _FrustumPlanes, 5); // Do not test the far plane + bool4 frustumCullEdgesMainView = CullFullTriangleAndEdgesFrustum(p0, p1, p2, frustumEps, _FrustumPlanes, 5); // Do not test the far plane #else // During the scene picking pass, we have no access to camera frustum planes - bool3 frustumCullEdgesMainView = false; + bool4 frustumCullEdgesMainView = false; #endif #if defined(SHADERPASS) && (SHADERPASS != SHADERPASS_SHADOWS) - bool frustumCullCurrView = all(frustumCullEdgesMainView); + bool frustumCullCurrView = frustumCullEdgesMainView.w; #else bool frustumCullCurrView = CullTriangleFrustum(p0, p1, p2, frustumEps, _ShadowFrustumPlanes, 4); // Do not test near/far planes #endif From 5b57f642ca0104acc61aa51833d7ddd081009446 Mon Sep 17 00:00:00 2001 From: anisunity <42026998+anisunity@users.noreply.github.com> Date: Thu, 14 Jan 2021 14:09:01 +0100 Subject: [PATCH 02/21] Change the source value for the ray tracing frame index iterator from m_FrameCount to the camera frame count (case 1301356). (#3032) Co-authored-by: sebastienlagarde --- com.unity.render-pipelines.high-definition/CHANGELOG.md | 3 +++ .../Runtime/RenderPipeline/Raytracing/HDRaytracingManager.cs | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/com.unity.render-pipelines.high-definition/CHANGELOG.md b/com.unity.render-pipelines.high-definition/CHANGELOG.md index c569133be04..977dc08cbb2 100644 --- a/com.unity.render-pipelines.high-definition/CHANGELOG.md +++ b/com.unity.render-pipelines.high-definition/CHANGELOG.md @@ -10,6 +10,9 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. - Fixed GC allocations from XR occlusion mesh when using multipass. - Fixed XR depth copy when using MSAA. +### Changed +- Change the source value for the ray tracing frame index iterator from m_FrameCount to the camera frame count (case 1301356). + ## [11.0.0] - 2020-10-21 ### Added diff --git a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Raytracing/HDRaytracingManager.cs b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Raytracing/HDRaytracingManager.cs index 8f7637d9551..a1ff1e86267 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Raytracing/HDRaytracingManager.cs +++ b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Raytracing/HDRaytracingManager.cs @@ -523,7 +523,7 @@ internal int RayTracingFrameIndex(HDCamera hdCamera) return 0; else #endif - return hdCamera.IsTAAEnabled() ? hdCamera.taaFrameIndex : (int)m_FrameCount % 8; + return (int)hdCamera.GetCameraFrameCount() % 8; } internal int RayTracingFrameIndex(HDCamera hdCamera, int targetFrameCount = 8) From b21345b01c2f588ea451358fab84a6988ed3adc1 Mon Sep 17 00:00:00 2001 From: Antoine Lelievre Date: Thu, 14 Jan 2021 14:15:01 +0100 Subject: [PATCH 03/21] [HDRP] Added a RenderGraph pass that resets the camera size after the dynamic res upscale (#3070) * Added a RenderGraph pass that resets the camera size after the dynamic res upscale * Updated changelog # Conflicts: # com.unity.render-pipelines.high-definition/CHANGELOG.md * fixed class name * update class name * PR fix * Fixed RTHandle scale Co-authored-by: sebastienlagarde --- .../CHANGELOG.md | 1 + .../Runtime/RenderPipeline/Camera/HDCamera.cs | 2 ++ .../HDRenderPipeline.RenderGraph.cs | 30 +++++++++++++++++++ 3 files changed, 33 insertions(+) diff --git a/com.unity.render-pipelines.high-definition/CHANGELOG.md b/com.unity.render-pipelines.high-definition/CHANGELOG.md index 977dc08cbb2..1eacae0524d 100644 --- a/com.unity.render-pipelines.high-definition/CHANGELOG.md +++ b/com.unity.render-pipelines.high-definition/CHANGELOG.md @@ -9,6 +9,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. ### Fixed - Fixed GC allocations from XR occlusion mesh when using multipass. - Fixed XR depth copy when using MSAA. +- Fixed after post process custom pass scale issue when dynamic resolution is enabled (case 1299194). ### Changed - Change the source value for the ray tracing frame index iterator from m_FrameCount to the camera frame count (case 1301356). diff --git a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Camera/HDCamera.cs b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Camera/HDCamera.cs index 7cff5f8e8de..7ecf73340e1 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Camera/HDCamera.cs +++ b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Camera/HDCamera.cs @@ -343,6 +343,8 @@ internal GameObject exposureTarget internal bool stopNaNs => m_AdditionalCameraData != null && m_AdditionalCameraData.stopNaNs; + internal bool allowDynamicResolution => m_AdditionalCameraData != null && m_AdditionalCameraData.allowDynamicResolution; + internal HDPhysicalCamera physicalParameters { get; private set; } internal IEnumerable aovRequests => diff --git a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.RenderGraph.cs b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.RenderGraph.cs index 1b590e7743a..9284080bde8 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.RenderGraph.cs +++ b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.RenderGraph.cs @@ -275,6 +275,8 @@ void ExecuteWithRenderGraph(RenderRequest renderRequest, } PushFullScreenExposureDebugTexture(m_RenderGraph, postProcessDest); + ResetCameraSizeForAfterPostProcess(m_RenderGraph, hdCamera, commandBuffer); + RenderCustomPass(m_RenderGraph, hdCamera, postProcessDest, prepassOutput, customPassCullingResults, cullingResults, CustomPassInjectionPoint.AfterPostProcess, aovRequest, aovCustomPassBuffers); CopyXRDepth(m_RenderGraph, hdCamera, prepassOutput.resolvedDepthBuffer, backBuffer); @@ -1542,6 +1544,34 @@ bool RenderCustomPass(RenderGraph renderGraph, return executed; } + class ResetCameraSizeForAfterPostProcessPassData + { + public HDCamera hdCamera; + public ShaderVariablesGlobal shaderVariablesGlobal; + } + + void ResetCameraSizeForAfterPostProcess(RenderGraph renderGraph, HDCamera hdCamera, CommandBuffer commandBuffer) + { + if (DynamicResolutionHandler.instance.DynamicResolutionEnabled()) + { + using (var builder = renderGraph.AddRenderPass("Reset Camera Size After Post Process", out ResetCameraSizeForAfterPostProcessPassData passData)) + { + passData.hdCamera = hdCamera; + passData.shaderVariablesGlobal = m_ShaderVariablesGlobalCB; + builder.AllowPassCulling(false); + + builder.SetRenderFunc( + (ResetCameraSizeForAfterPostProcessPassData data, RenderGraphContext ctx) => + { + data.shaderVariablesGlobal._ScreenSize = new Vector4(data.hdCamera.finalViewport.width, data.hdCamera.finalViewport.height, 1.0f / data.hdCamera.finalViewport.width, 1.0f / data.hdCamera.finalViewport.height); + data.shaderVariablesGlobal._RTHandleScale = RTHandles.rtHandleProperties.rtHandleScale; + ConstantBuffer.PushGlobal(ctx.cmd, data.shaderVariablesGlobal, HDShaderIDs._ShaderVariablesGlobal); + RTHandles.SetReferenceSize((int)data.hdCamera.finalViewport.width, (int)data.hdCamera.finalViewport.height, data.hdCamera.msaaSamples); + }); + } + } + } + class BindCustomPassBuffersPassData { public Lazy customColorTexture; From 9581f3862332c53e542c6cb2f8fa35852d63d605 Mon Sep 17 00:00:00 2001 From: John Parsaie Date: Thu, 14 Jan 2021 08:20:37 -0500 Subject: [PATCH 04/21] Fix Light Intensity UI Prefab Override Application (1299563) (#3061) * Fixed Render Graph immediate mode. (#3033) Co-authored-by: Sebastien Lagarde * Fix issue with shadow mask and area lights (#3019) * Not checking NdotL since it's not really valid for area lights (We have multiple valid light directions, not one) * Changelog Co-authored-by: sebastienlagarde * Fix issue with capture callback (now includes post processing results) (#3035) Co-authored-by: sebastienlagarde * [HDRP] Fix decal draw order for ShaderGraph decal materials (#3018) * Fixed ShaderGraph decal draw order * Updated changelog Co-authored-by: sebastienlagarde * Fixed various Look Dev issues after exiting Playmode (#2956) * Fixed access to invalid Contexts references after exiting playmode. * Fixed comparison gizmo after playmode. * Fixes from PR feedback * Apply the fix * Changelog * Mofified approach to the fix, this time also fixing override saving of light unit * Use more precise rect line offset calculation * Update CHANGELOG.md Co-authored-by: JulienIgnace-Unity Co-authored-by: Sebastien Lagarde Co-authored-by: FrancescoC-unity <43168857+FrancescoC-unity@users.noreply.github.com> Co-authored-by: Pavlos Mavridis Co-authored-by: Antoine Lelievre --- com.unity.render-pipelines.high-definition/CHANGELOG.md | 1 + .../Editor/Lighting/HDLightUI.cs | 9 ++++++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/com.unity.render-pipelines.high-definition/CHANGELOG.md b/com.unity.render-pipelines.high-definition/CHANGELOG.md index 1eacae0524d..1ce324dbed9 100644 --- a/com.unity.render-pipelines.high-definition/CHANGELOG.md +++ b/com.unity.render-pipelines.high-definition/CHANGELOG.md @@ -10,6 +10,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. - Fixed GC allocations from XR occlusion mesh when using multipass. - Fixed XR depth copy when using MSAA. - Fixed after post process custom pass scale issue when dynamic resolution is enabled (case 1299194). +- Fixed an issue with light intensity prefab override application not visible in the inspector (case 1299563). ### Changed - Change the source value for the ray tracing frame index iterator from m_FrameCount to the camera frame count (case 1301356). diff --git a/com.unity.render-pipelines.high-definition/Editor/Lighting/HDLightUI.cs b/com.unity.render-pipelines.high-definition/Editor/Lighting/HDLightUI.cs index c76349aab05..a2cf3026925 100644 --- a/com.unity.render-pipelines.high-definition/Editor/Lighting/HDLightUI.cs +++ b/com.unity.render-pipelines.high-definition/Editor/Lighting/HDLightUI.cs @@ -599,11 +599,18 @@ static void DrawLightIntensityGUILayout(SerializedHDLight serialized, Editor own Rect labelRect = lineRect; labelRect.width = EditorGUIUtility.labelWidth; + // Expand to reach both lines of the intensity field. + var interlineOffset = EditorGUIUtility.singleLineHeight + 2f; + labelRect.height += interlineOffset; + //handling of prefab overrides in a parent label GUIContent parentLabel = s_Styles.lightIntensity; - parentLabel = EditorGUI.BeginProperty(labelRect, parentLabel, serialized.intensity); parentLabel = EditorGUI.BeginProperty(labelRect, parentLabel, serialized.lightUnit); + parentLabel = EditorGUI.BeginProperty(labelRect, parentLabel, serialized.intensity); { + // Restore the original rect for actually drawing the label. + labelRect.height -= interlineOffset; + EditorGUI.LabelField(labelRect, parentLabel); } EditorGUI.EndProperty(); From 525ebf58f70a54f2056bdaaed11a20a0d0f5a949 Mon Sep 17 00:00:00 2001 From: John Parsaie Date: Thu, 14 Jan 2021 08:24:42 -0500 Subject: [PATCH 05/21] Fix Undo/Redo Stability for Light Temperature (1304176, 1301076) (#3079) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Fixed Render Graph immediate mode. (#3033) Co-authored-by: Sebastien Lagarde * Fix issue with shadow mask and area lights (#3019) * Not checking NdotL since it's not really valid for area lights (We have multiple valid light directions, not one) * Changelog Co-authored-by: sebastienlagarde * Fix issue with capture callback (now includes post processing results) (#3035) Co-authored-by: sebastienlagarde * [HDRP] Fix decal draw order for ShaderGraph decal materials (#3018) * Fixed ShaderGraph decal draw order * Updated changelog Co-authored-by: sebastienlagarde * Fixed various Look Dev issues after exiting Playmode (#2956) * Fixed access to invalid Contexts references after exiting playmode. * Fixed comparison gizmo after playmode. * Fixes from PR feedback * StackLit: Fix SG surface option property block to only display energy conserving specular color option for the specular input parametrization (similar to case 1257050) (#3060) * Fixed missing BeginCameraRendering call for custom render mode of a Camera (#3063) * Implement custom drawer for layer mask parameters (#3066) * Adding mixed light baking shadowmask test (#3052) * adding a shadow mask test * Update reference images * Apply the fix * Changelog * Update CHANGELOG.md * fix merge issue Co-authored-by: JulienIgnace-Unity Co-authored-by: Sebastien Lagarde Co-authored-by: FrancescoC-unity <43168857+FrancescoC-unity@users.noreply.github.com> Co-authored-by: Pavlos Mavridis Co-authored-by: Antoine Lelievre Co-authored-by: slunity <37302815+slunity@users.noreply.github.com> Co-authored-by: Adrien de Tocqueville Co-authored-by: Rémi Chapelain <57442369+remi-chapelain@users.noreply.github.com> --- com.unity.render-pipelines.high-definition/CHANGELOG.md | 1 + .../Editor/Lighting/LightUnit/LightUnitSlider.cs | 8 +++++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/com.unity.render-pipelines.high-definition/CHANGELOG.md b/com.unity.render-pipelines.high-definition/CHANGELOG.md index 1ce324dbed9..14f9d78aef5 100644 --- a/com.unity.render-pipelines.high-definition/CHANGELOG.md +++ b/com.unity.render-pipelines.high-definition/CHANGELOG.md @@ -11,6 +11,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. - Fixed XR depth copy when using MSAA. - Fixed after post process custom pass scale issue when dynamic resolution is enabled (case 1299194). - Fixed an issue with light intensity prefab override application not visible in the inspector (case 1299563). +- Fixed Undo/Redo instability of light temperature. ### Changed - Change the source value for the ray tracing frame index iterator from m_FrameCount to the camera frame count (case 1301356). diff --git a/com.unity.render-pipelines.high-definition/Editor/Lighting/LightUnit/LightUnitSlider.cs b/com.unity.render-pipelines.high-definition/Editor/Lighting/LightUnit/LightUnitSlider.cs index 363ff159c6b..f6356a5c89b 100644 --- a/com.unity.render-pipelines.high-definition/Editor/Lighting/LightUnit/LightUnitSlider.cs +++ b/com.unity.render-pipelines.high-definition/Editor/Lighting/LightUnit/LightUnitSlider.cs @@ -569,12 +569,14 @@ void SliderWithTextureNoTextField(Rect rect, ref float value, Vector2 range, Lig // Draw the exponential slider that fits 6500K to the white point on the gradient texture. var internalValue = GUI.HorizontalSlider(rect, ValueToSlider(value), 0f, 1f, SliderStyles.k_TemperatureBorder, SliderStyles.k_TemperatureThumb); - // Map the value back into kelvin. - value = SliderToValue(internalValue); - // Round to nearest since so much precision is not necessary for kelvin while sliding. if (EditorGUI.EndChangeCheck()) + { + // Map the value back into kelvin. + value = SliderToValue(internalValue); + value = Mathf.Round(value); + } } } From 8007c4838e6c0fd983ebd415e01ccfb5d5eebcd3 Mon Sep 17 00:00:00 2001 From: Adrien de Tocqueville Date: Thu, 14 Jan 2021 14:35:35 +0100 Subject: [PATCH 06/21] Fix labels style (#3046) * Fixed Render Graph immediate mode. (#3033) Co-authored-by: Sebastien Lagarde * Fix issue with shadow mask and area lights (#3019) * Not checking NdotL since it's not really valid for area lights (We have multiple valid light directions, not one) * Changelog Co-authored-by: sebastienlagarde * Fix issue with capture callback (now includes post processing results) (#3035) Co-authored-by: sebastienlagarde * [HDRP] Fix decal draw order for ShaderGraph decal materials (#3018) * Fixed ShaderGraph decal draw order * Updated changelog Co-authored-by: sebastienlagarde * Fixed various Look Dev issues after exiting Playmode (#2956) * Fixed access to invalid Contexts references after exiting playmode. * Fixed comparison gizmo after playmode. * Fixes from PR feedback * Fix labels style * Update CHANGELOG.md Co-authored-by: JulienIgnace-Unity Co-authored-by: Sebastien Lagarde Co-authored-by: FrancescoC-unity <43168857+FrancescoC-unity@users.noreply.github.com> Co-authored-by: Pavlos Mavridis Co-authored-by: Antoine Lelievre --- .../CHANGELOG.md | 1 + .../PhysicallyBasedSky/PhysicallyBasedSkyEditor.cs | 14 +++++++------- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/com.unity.render-pipelines.high-definition/CHANGELOG.md b/com.unity.render-pipelines.high-definition/CHANGELOG.md index 14f9d78aef5..601b3650648 100644 --- a/com.unity.render-pipelines.high-definition/CHANGELOG.md +++ b/com.unity.render-pipelines.high-definition/CHANGELOG.md @@ -12,6 +12,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. - Fixed after post process custom pass scale issue when dynamic resolution is enabled (case 1299194). - Fixed an issue with light intensity prefab override application not visible in the inspector (case 1299563). - Fixed Undo/Redo instability of light temperature. +- Fixed label style in pbr sky editor. ### Changed - Change the source value for the ray tracing frame index iterator from m_FrameCount to the camera frame count (case 1301356). diff --git a/com.unity.render-pipelines.high-definition/Editor/Sky/PhysicallyBasedSky/PhysicallyBasedSkyEditor.cs b/com.unity.render-pipelines.high-definition/Editor/Sky/PhysicallyBasedSky/PhysicallyBasedSkyEditor.cs index fa70349fef4..d7163aa5fb8 100644 --- a/com.unity.render-pipelines.high-definition/Editor/Sky/PhysicallyBasedSky/PhysicallyBasedSkyEditor.cs +++ b/com.unity.render-pipelines.high-definition/Editor/Sky/PhysicallyBasedSky/PhysicallyBasedSkyEditor.cs @@ -96,7 +96,7 @@ public override void OnEnable() public override void OnInspectorGUI() { - EditorGUILayout.LabelField("Model"); + EditorGUILayout.LabelField("Model", EditorStyles.miniLabel); using (new EditorGUILayout.HorizontalScope()) { @@ -111,7 +111,7 @@ public override void OnInspectorGUI() PhysicallyBasedSkyModel type = (PhysicallyBasedSkyModel)m_Type.value.intValue; EditorGUILayout.Space(); - EditorGUILayout.LabelField("Planet"); + EditorGUILayout.LabelField("Planet", EditorStyles.miniLabel); if (type == PhysicallyBasedSkyModel.EarthSimple) PropertyField(m_SeaLevel); @@ -146,7 +146,7 @@ public override void OnInspectorGUI() if (type != PhysicallyBasedSkyModel.EarthSimple) { EditorGUILayout.Space(); - EditorGUILayout.LabelField("Space"); + EditorGUILayout.LabelField("Space", EditorStyles.miniLabel); PropertyField(m_SpaceRotation); PropertyField(m_SpaceEmissionTexture); PropertyField(m_SpaceEmissionMultiplier); @@ -155,7 +155,7 @@ public override void OnInspectorGUI() if (type == PhysicallyBasedSkyModel.Custom) { EditorGUILayout.Space(); - EditorGUILayout.LabelField("Air"); + EditorGUILayout.LabelField("Air", EditorStyles.miniLabel); PropertyField(m_AirMaximumAltitude); PropertyField(m_AirDensityR); PropertyField(m_AirDensityG); @@ -164,7 +164,7 @@ public override void OnInspectorGUI() } EditorGUILayout.Space(); - EditorGUILayout.LabelField("Aerosols"); + EditorGUILayout.LabelField("Aerosols", EditorStyles.miniLabel); PropertyField(m_AerosolDensity); PropertyField(m_AerosolTint); if (type != PhysicallyBasedSkyModel.EarthSimple) @@ -174,7 +174,7 @@ public override void OnInspectorGUI() } EditorGUILayout.Space(); - EditorGUILayout.LabelField("Artistic Overrides"); + EditorGUILayout.LabelField("Artistic Overrides", EditorStyles.miniLabel); PropertyField(m_ColorSaturation); PropertyField(m_AlphaSaturation); PropertyField(m_AlphaMultiplier); @@ -183,7 +183,7 @@ public override void OnInspectorGUI() PropertyField(m_ZenithTint); EditorGUILayout.Space(); - EditorGUILayout.LabelField("Miscellaneous"); + EditorGUILayout.LabelField("Miscellaneous", EditorStyles.miniLabel); PropertyField(m_NumberOfBounces); base.CommonSkySettingsGUI(); From 2df01855a663942bd298dbf23252c27bd38652ac Mon Sep 17 00:00:00 2001 From: Adrien de Tocqueville Date: Thu, 14 Jan 2021 14:50:57 +0100 Subject: [PATCH 07/21] Fixed side effect on styles during compositor rendering. (#3081) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Fixed Render Graph immediate mode. (#3033) Co-authored-by: Sebastien Lagarde * Fix issue with shadow mask and area lights (#3019) * Not checking NdotL since it's not really valid for area lights (We have multiple valid light directions, not one) * Changelog Co-authored-by: sebastienlagarde * Fix issue with capture callback (now includes post processing results) (#3035) Co-authored-by: sebastienlagarde * [HDRP] Fix decal draw order for ShaderGraph decal materials (#3018) * Fixed ShaderGraph decal draw order * Updated changelog Co-authored-by: sebastienlagarde * Fixed various Look Dev issues after exiting Playmode (#2956) * Fixed access to invalid Contexts references after exiting playmode. * Fixed comparison gizmo after playmode. * Fixes from PR feedback * StackLit: Fix SG surface option property block to only display energy conserving specular color option for the specular input parametrization (similar to case 1257050) (#3060) * Fixed missing BeginCameraRendering call for custom render mode of a Camera (#3063) * Implement custom drawer for layer mask parameters (#3066) * Adding mixed light baking shadowmask test (#3052) * adding a shadow mask test * Update reference images * Changed the clamping approach for RTR and RTGI (in both perf and quality) to improve visual quality. (#3020) Co-authored-by: sebastienlagarde * Fixed the condition on temporal accumulation in the reflection denoiser (case 1303504). (#3027) Co-authored-by: sebastienlagarde * Changed the warning message for ray traced area shadows (case 1303410). (#3029) * - Changed the warning message for ray traced area shadows (case 1303410). * Adds approximation information about ray-traced area shadows Co-authored-by: Lewis Jordan Co-authored-by: sebastienlagarde * Fixed side effect on styles during compositor rendering. * Update CHANGELOG.md * fix merge issue Co-authored-by: JulienIgnace-Unity Co-authored-by: Sebastien Lagarde Co-authored-by: FrancescoC-unity <43168857+FrancescoC-unity@users.noreply.github.com> Co-authored-by: Pavlos Mavridis Co-authored-by: Antoine Lelievre Co-authored-by: slunity <37302815+slunity@users.noreply.github.com> Co-authored-by: Rémi Chapelain <57442369+remi-chapelain@users.noreply.github.com> Co-authored-by: anisunity <42026998+anisunity@users.noreply.github.com> Co-authored-by: Lewis Jordan --- com.unity.render-pipelines.high-definition/CHANGELOG.md | 1 + .../Editor/Compositor/CompositionManagerEditor.Styles.cs | 1 + .../Editor/Compositor/CompositionManagerEditor.cs | 9 ++++----- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/com.unity.render-pipelines.high-definition/CHANGELOG.md b/com.unity.render-pipelines.high-definition/CHANGELOG.md index 601b3650648..f27b3e1d84a 100644 --- a/com.unity.render-pipelines.high-definition/CHANGELOG.md +++ b/com.unity.render-pipelines.high-definition/CHANGELOG.md @@ -13,6 +13,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. - Fixed an issue with light intensity prefab override application not visible in the inspector (case 1299563). - Fixed Undo/Redo instability of light temperature. - Fixed label style in pbr sky editor. +- Fixed side effect on styles during compositor rendering. ### Changed - Change the source value for the ray tracing frame index iterator from m_FrameCount to the camera frame count (case 1301356). diff --git a/com.unity.render-pipelines.high-definition/Editor/Compositor/CompositionManagerEditor.Styles.cs b/com.unity.render-pipelines.high-definition/Editor/Compositor/CompositionManagerEditor.Styles.cs index 3f91497af2a..c22eb160480 100644 --- a/com.unity.render-pipelines.high-definition/Editor/Compositor/CompositionManagerEditor.Styles.cs +++ b/com.unity.render-pipelines.high-definition/Editor/Compositor/CompositionManagerEditor.Styles.cs @@ -19,6 +19,7 @@ static internal class CompositorStyle internal static readonly int k_IconSize = 28; + internal static readonly int k_HeaderFontSize = 14; internal static readonly int k_ListItemPading = 4; internal static readonly int k_ListItemStackPading = 20; internal static readonly float k_SingleLineHeight = EditorGUIUtility.singleLineHeight; diff --git a/com.unity.render-pipelines.high-definition/Editor/Compositor/CompositionManagerEditor.cs b/com.unity.render-pipelines.high-definition/Editor/Compositor/CompositionManagerEditor.cs index e2fe265363a..610e834e067 100644 --- a/com.unity.render-pipelines.high-definition/Editor/Compositor/CompositionManagerEditor.cs +++ b/com.unity.render-pipelines.high-definition/Editor/Compositor/CompositionManagerEditor.cs @@ -29,6 +29,8 @@ static partial class Styles static public readonly string k_AlphaWarningPipeline = "The rendering pipeline was not configured to output an alpha channel. You can select a color buffer format that supports alpha in the HDRP quality settings."; static public readonly string k_AlphaWarningPost = "The post processing system was not configured to process the alpha channel. You can select a buffer format that supports alpha in the HDRP quality settings."; static public readonly string k_ShaderWarning = "You must specify a composition graph to see an output from the compositor."; + + static public readonly GUIStyle k_HeaderStyle = new GUIStyle(EditorStyles.helpBox) { fontSize = CompositorStyle.k_HeaderFontSize }; } ReorderableList m_layerList; @@ -121,9 +123,6 @@ public override void OnInspectorGUI() return; } - var headerStyle = EditorStyles.helpBox; - headerStyle.fontSize = 14; - // Cache the serialized property fields if (m_IsEditorDirty || m_SerializedProperties == null) { @@ -273,7 +272,7 @@ public override void OnInspectorGUI() EditorGUI.BeginChangeCheck(); EditorGUILayout.BeginVertical(); - EditorGUILayout.LabelField(Styles.k_RenderSchedule, headerStyle); + EditorGUILayout.LabelField(Styles.k_RenderSchedule, Styles.k_HeaderStyle); m_layerList.DoLayoutList(); EditorGUILayout.EndVertical(); if (EditorGUI.EndChangeCheck()) @@ -292,7 +291,7 @@ public override void OnInspectorGUI() EditorGUI.BeginChangeCheck(); if (m_layerList.index >= 0) { - EditorGUILayout.LabelField(Styles.k_Properties, headerStyle); + EditorGUILayout.LabelField(Styles.k_Properties, Styles.k_HeaderStyle); rectangle.y += EditorGUIUtility.singleLineHeight * 1.5f; rectangle.x += 5; From bf833cea9a3a76913a52196b1ee9b8c1775aae68 Mon Sep 17 00:00:00 2001 From: Pavlos Mavridis Date: Thu, 14 Jan 2021 14:56:18 +0100 Subject: [PATCH 08/21] [HDRP][Compositor] Fix size and spacing of compositor info boxes (#3101) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Fixed Render Graph immediate mode. (#3033) Co-authored-by: Sebastien Lagarde * Fix issue with shadow mask and area lights (#3019) * Not checking NdotL since it's not really valid for area lights (We have multiple valid light directions, not one) * Changelog Co-authored-by: sebastienlagarde * Fix issue with capture callback (now includes post processing results) (#3035) Co-authored-by: sebastienlagarde * [HDRP] Fix decal draw order for ShaderGraph decal materials (#3018) * Fixed ShaderGraph decal draw order * Updated changelog Co-authored-by: sebastienlagarde * Fixed various Look Dev issues after exiting Playmode (#2956) * Fixed access to invalid Contexts references after exiting playmode. * Fixed comparison gizmo after playmode. * Fixes from PR feedback * StackLit: Fix SG surface option property block to only display energy conserving specular color option for the specular input parametrization (similar to case 1257050) (#3060) * Fixed missing BeginCameraRendering call for custom render mode of a Camera (#3063) * Implement custom drawer for layer mask parameters (#3066) * Adding mixed light baking shadowmask test (#3052) * adding a shadow mask test * Update reference images * Changed the clamping approach for RTR and RTGI (in both perf and quality) to improve visual quality. (#3020) Co-authored-by: sebastienlagarde * Fixed the condition on temporal accumulation in the reflection denoiser (case 1303504). (#3027) Co-authored-by: sebastienlagarde * Changed the warning message for ray traced area shadows (case 1303410). (#3029) * - Changed the warning message for ray traced area shadows (case 1303410). * Adds approximation information about ray-traced area shadows Co-authored-by: Lewis Jordan Co-authored-by: sebastienlagarde * Disabled specular occlusion for what we consider medium and larger scale rtao > 1.25 with a 25cm falloff interval. (#3023) Co-authored-by: sebastienlagarde * Removed 2505_Area_Light_ShadowMask_Baking from baking queue (#3087) * Lightmaps / Removed scene from baking queue + meta files * update reference screenshots Co-authored-by: Sebastien Lagarde * Fix size and spacing of compositor info boxes * Fix typo in changelog Co-authored-by: JulienIgnace-Unity Co-authored-by: Sebastien Lagarde Co-authored-by: FrancescoC-unity <43168857+FrancescoC-unity@users.noreply.github.com> Co-authored-by: Antoine Lelievre Co-authored-by: slunity <37302815+slunity@users.noreply.github.com> Co-authored-by: Adrien de Tocqueville Co-authored-by: Rémi Chapelain <57442369+remi-chapelain@users.noreply.github.com> Co-authored-by: anisunity <42026998+anisunity@users.noreply.github.com> Co-authored-by: Lewis Jordan --- .../CHANGELOG.md | 1 + .../Editor/Compositor/CompositionLayerUI.Drawers.cs | 10 +++++----- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/com.unity.render-pipelines.high-definition/CHANGELOG.md b/com.unity.render-pipelines.high-definition/CHANGELOG.md index f27b3e1d84a..fb927845387 100644 --- a/com.unity.render-pipelines.high-definition/CHANGELOG.md +++ b/com.unity.render-pipelines.high-definition/CHANGELOG.md @@ -14,6 +14,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. - Fixed Undo/Redo instability of light temperature. - Fixed label style in pbr sky editor. - Fixed side effect on styles during compositor rendering. +- Fixed size and spacing of compositor info boxes (case 1305652). ### Changed - Change the source value for the ray tracing frame index iterator from m_FrameCount to the camera frame count (case 1301356). diff --git a/com.unity.render-pipelines.high-definition/Editor/Compositor/CompositionLayerUI.Drawers.cs b/com.unity.render-pipelines.high-definition/Editor/Compositor/CompositionLayerUI.Drawers.cs index 7fa245af7a0..eb17462fad8 100644 --- a/com.unity.render-pipelines.high-definition/Editor/Compositor/CompositionLayerUI.Drawers.cs +++ b/com.unity.render-pipelines.high-definition/Editor/Compositor/CompositionLayerUI.Drawers.cs @@ -32,7 +32,7 @@ static partial class Styles static public readonly GUIContent k_VolumeMask = EditorGUIUtility.TrTextContent("Volume Mask", "To override the volume mask, activate the option by clicking on the check-box and then select the desired value."); static public readonly GUIContent k_AlphaRange = EditorGUIUtility.TrTextContent("Alpha Range", "The range of alpha values used when transitioning from post-processed to plain image regions. A smaller range will result in a steeper transition."); - static public readonly string k_AlphaInfoPost = "The use of AOVs properties in a player require to to enable the Runtime AOV API support in the HDRP quality settings."; + static public readonly string k_AlphaInfoPost = "The use of AOVs properties in a player requires to enable the Runtime AOV API support in the HDRP quality settings."; static public readonly string k_ShaderCompilationWarning = "The Unity Editor is compiling the AOV shaders for the first time. The output might not be correct until the compilation is over."; @@ -154,10 +154,10 @@ public static void DrawOutputLayerProperties(Rect rect, SerializedCompositionLay Rect infoRect = rect; // Compute the height of the infobox based on the width of the window and the amount of text GUIStyle.none.CalcMinMaxWidth(new GUIContent(Styles.k_ShaderCompilationWarning), out float minWidth, out float maxWidth); - float lines = Mathf.CeilToInt(maxWidth / (rect.width - Styles.infoBoxIconWidth)); + float lines = Mathf.Max(2, Mathf.CeilToInt(maxWidth / (rect.width - Styles.infoBoxIconWidth))); infoRect.height = lines * CompositorStyle.k_Spacing; EditorGUI.HelpBox(infoRect, Styles.k_ShaderCompilationWarning, MessageType.Warning); - rect.y += infoRect.height; + rect.y += infoRect.height + EditorGUIUtility.standardVerticalSpacing; } else { @@ -189,10 +189,10 @@ public static void DrawOutputLayerProperties(Rect rect, SerializedCompositionLay Rect infoRect = rect; // Compute the height of the infobox based on the width of the window and the amount of text GUIStyle.none.CalcMinMaxWidth(new GUIContent(Styles.k_AlphaInfoPost), out float minWidth, out float maxWidth); - float lines = Mathf.CeilToInt(maxWidth / (rect.width - Styles.infoBoxIconWidth)); + float lines = Mathf.Max(2, Mathf.CeilToInt(maxWidth / (rect.width - Styles.infoBoxIconWidth))); infoRect.height = lines * CompositorStyle.k_Spacing; EditorGUI.HelpBox(infoRect, Styles.k_AlphaInfoPost, MessageType.Info); - rect.y += infoRect.height; + rect.y += infoRect.height + EditorGUIUtility.standardVerticalSpacing; } } From 7be5e6cae77b518a78d61e3cafc95a0ec3e31176 Mon Sep 17 00:00:00 2001 From: Pavlos Mavridis Date: Thu, 14 Jan 2021 14:57:19 +0100 Subject: [PATCH 09/21] [HDRP][Compositor] Fix color picker UI glitch in the Graphics Compositor (#3105) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Fixed Render Graph immediate mode. (#3033) Co-authored-by: Sebastien Lagarde * Fix issue with shadow mask and area lights (#3019) * Not checking NdotL since it's not really valid for area lights (We have multiple valid light directions, not one) * Changelog Co-authored-by: sebastienlagarde * Fix issue with capture callback (now includes post processing results) (#3035) Co-authored-by: sebastienlagarde * [HDRP] Fix decal draw order for ShaderGraph decal materials (#3018) * Fixed ShaderGraph decal draw order * Updated changelog Co-authored-by: sebastienlagarde * Fixed various Look Dev issues after exiting Playmode (#2956) * Fixed access to invalid Contexts references after exiting playmode. * Fixed comparison gizmo after playmode. * Fixes from PR feedback * StackLit: Fix SG surface option property block to only display energy conserving specular color option for the specular input parametrization (similar to case 1257050) (#3060) * Fixed missing BeginCameraRendering call for custom render mode of a Camera (#3063) * Implement custom drawer for layer mask parameters (#3066) * Adding mixed light baking shadowmask test (#3052) * adding a shadow mask test * Update reference images * Changed the clamping approach for RTR and RTGI (in both perf and quality) to improve visual quality. (#3020) Co-authored-by: sebastienlagarde * Fixed the condition on temporal accumulation in the reflection denoiser (case 1303504). (#3027) Co-authored-by: sebastienlagarde * Changed the warning message for ray traced area shadows (case 1303410). (#3029) * - Changed the warning message for ray traced area shadows (case 1303410). * Adds approximation information about ray-traced area shadows Co-authored-by: Lewis Jordan Co-authored-by: sebastienlagarde * Disabled specular occlusion for what we consider medium and larger scale rtao > 1.25 with a 25cm falloff interval. (#3023) Co-authored-by: sebastienlagarde * Removed 2505_Area_Light_ShadowMask_Baking from baking queue (#3087) * Lightmaps / Removed scene from baking queue + meta files * update reference screenshots Co-authored-by: Sebastien Lagarde * Removed unused index parameter * Fix box light attenuation (#3056) * Fix box light attenuation * Update screenshots Co-authored-by: sebastienlagarde * Revert "Disabled specular occlusion for what we consider medium and larger scale rtao > 1.25 with a 25cm falloff interval. (#3023)" This reverts commit 55bb6ff781233350ca8f3db747b8593acfbda4a3. * Revert "Revert "Disabled specular occlusion for what we consider medium and larger scale rtao > 1.25 with a 25cm falloff interval. (#3023)"" This reverts commit 57ee23b9177c581f50c8a8ac4e3dfd166646acc7. * Fix default value of _SpecularOcclusionBlend * Fix color picker UI glitch in the Graphics Compositor Co-authored-by: JulienIgnace-Unity Co-authored-by: Sebastien Lagarde Co-authored-by: FrancescoC-unity <43168857+FrancescoC-unity@users.noreply.github.com> Co-authored-by: Antoine Lelievre Co-authored-by: slunity <37302815+slunity@users.noreply.github.com> Co-authored-by: Adrien de Tocqueville Co-authored-by: Rémi Chapelain <57442369+remi-chapelain@users.noreply.github.com> Co-authored-by: anisunity <42026998+anisunity@users.noreply.github.com> Co-authored-by: Lewis Jordan --- com.unity.render-pipelines.high-definition/CHANGELOG.md | 1 + .../Editor/Compositor/CompositionManagerEditor.Styles.cs | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/com.unity.render-pipelines.high-definition/CHANGELOG.md b/com.unity.render-pipelines.high-definition/CHANGELOG.md index fb927845387..12931b2a5bc 100644 --- a/com.unity.render-pipelines.high-definition/CHANGELOG.md +++ b/com.unity.render-pipelines.high-definition/CHANGELOG.md @@ -15,6 +15,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. - Fixed label style in pbr sky editor. - Fixed side effect on styles during compositor rendering. - Fixed size and spacing of compositor info boxes (case 1305652). +- Fixed spacing of UI widgets in the Graphics Compositor (case 1305638). ### Changed - Change the source value for the ray tracing frame index iterator from m_FrameCount to the camera frame count (case 1301356). diff --git a/com.unity.render-pipelines.high-definition/Editor/Compositor/CompositionManagerEditor.Styles.cs b/com.unity.render-pipelines.high-definition/Editor/Compositor/CompositionManagerEditor.Styles.cs index c22eb160480..c5ff1997599 100644 --- a/com.unity.render-pipelines.high-definition/Editor/Compositor/CompositionManagerEditor.Styles.cs +++ b/com.unity.render-pipelines.high-definition/Editor/Compositor/CompositionManagerEditor.Styles.cs @@ -23,6 +23,6 @@ static internal class CompositorStyle internal static readonly int k_ListItemPading = 4; internal static readonly int k_ListItemStackPading = 20; internal static readonly float k_SingleLineHeight = EditorGUIUtility.singleLineHeight; - internal static readonly float k_Spacing = k_SingleLineHeight * 1.1f; + internal static readonly float k_Spacing = k_SingleLineHeight + EditorGUIUtility.standardVerticalSpacing; } } From 6413dc64b39019b0deea6dc8428cd90b2bac93af Mon Sep 17 00:00:00 2001 From: skhiat <55133890+skhiat@users.noreply.github.com> Date: Thu, 14 Jan 2021 17:05:25 +0100 Subject: [PATCH 10/21] Fix 1299233 ies resize bug (#3094) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Fixed Render Graph immediate mode. (#3033) Co-authored-by: Sebastien Lagarde * Fix issue with shadow mask and area lights (#3019) * Not checking NdotL since it's not really valid for area lights (We have multiple valid light directions, not one) * Changelog Co-authored-by: sebastienlagarde * Fix issue with capture callback (now includes post processing results) (#3035) Co-authored-by: sebastienlagarde * [HDRP] Fix decal draw order for ShaderGraph decal materials (#3018) * Fixed ShaderGraph decal draw order * Updated changelog Co-authored-by: sebastienlagarde * Fixed various Look Dev issues after exiting Playmode (#2956) * Fixed access to invalid Contexts references after exiting playmode. * Fixed comparison gizmo after playmode. * Fixes from PR feedback * StackLit: Fix SG surface option property block to only display energy conserving specular color option for the specular input parametrization (similar to case 1257050) (#3060) * Fixed missing BeginCameraRendering call for custom render mode of a Camera (#3063) * Implement custom drawer for layer mask parameters (#3066) * Adding mixed light baking shadowmask test (#3052) * adding a shadow mask test * Update reference images * Changed the clamping approach for RTR and RTGI (in both perf and quality) to improve visual quality. (#3020) Co-authored-by: sebastienlagarde * Fixed the condition on temporal accumulation in the reflection denoiser (case 1303504). (#3027) Co-authored-by: sebastienlagarde * Changed the warning message for ray traced area shadows (case 1303410). (#3029) * - Changed the warning message for ray traced area shadows (case 1303410). * Adds approximation information about ray-traced area shadows Co-authored-by: Lewis Jordan Co-authored-by: sebastienlagarde * Disabled specular occlusion for what we consider medium and larger scale rtao > 1.25 with a 25cm falloff interval. (#3023) Co-authored-by: sebastienlagarde * Fix 1299233 ies resize bug * change log * Update CHANGELOG.md * fix merge issue Co-authored-by: JulienIgnace-Unity Co-authored-by: Sebastien Lagarde Co-authored-by: FrancescoC-unity <43168857+FrancescoC-unity@users.noreply.github.com> Co-authored-by: Pavlos Mavridis Co-authored-by: Antoine Lelievre Co-authored-by: slunity <37302815+slunity@users.noreply.github.com> Co-authored-by: Adrien de Tocqueville Co-authored-by: Rémi Chapelain <57442369+remi-chapelain@users.noreply.github.com> Co-authored-by: anisunity <42026998+anisunity@users.noreply.github.com> Co-authored-by: Lewis Jordan --- .../CHANGELOG.md | 1 + .../Runtime/Lighting/LightCookieManager.cs | 6 ++-- .../Utility/PowerOfTwoTextureAtlas.cs | 29 ++++++++++++++++++- 3 files changed, 32 insertions(+), 4 deletions(-) diff --git a/com.unity.render-pipelines.high-definition/CHANGELOG.md b/com.unity.render-pipelines.high-definition/CHANGELOG.md index 12931b2a5bc..a8e2b7095c5 100644 --- a/com.unity.render-pipelines.high-definition/CHANGELOG.md +++ b/com.unity.render-pipelines.high-definition/CHANGELOG.md @@ -9,6 +9,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. ### Fixed - Fixed GC allocations from XR occlusion mesh when using multipass. - Fixed XR depth copy when using MSAA. +- Fixed resize IES when already baked in the Atlas 1299233 - Fixed after post process custom pass scale issue when dynamic resolution is enabled (case 1299194). - Fixed an issue with light intensity prefab override application not visible in the inspector (case 1299563). - Fixed Undo/Redo instability of light temperature. diff --git a/com.unity.render-pipelines.high-definition/Runtime/Lighting/LightCookieManager.cs b/com.unity.render-pipelines.high-definition/Runtime/Lighting/LightCookieManager.cs index d2cb31d2e1e..fed7f14959a 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/Lighting/LightCookieManager.cs +++ b/com.unity.render-pipelines.high-definition/Runtime/Lighting/LightCookieManager.cs @@ -341,7 +341,7 @@ public void ReserveSpace(Texture cookieA, Texture cookieB) if (width < k_MinCookieSize || height < k_MinCookieSize) return; - if (!m_CookieAtlas.ReserveSpace(m_CookieAtlas.GetTextureID(cookieA, cookieB), width, height)) + if (!m_CookieAtlas.ReserveSpace(cookieA, cookieB, width, height)) m_2DCookieAtlasNeedsLayouting = true; } @@ -369,7 +369,7 @@ public void ReserveSpaceCube(Texture cookie) if (projectionSize < k_MinCookieSize) return; - if (!m_CookieAtlas.ReserveSpace(m_CookieAtlas.GetTextureID(cookie), projectionSize, projectionSize)) + if (!m_CookieAtlas.ReserveSpace(cookie, projectionSize, projectionSize)) m_2DCookieAtlasNeedsLayouting = true; } @@ -385,7 +385,7 @@ public void ReserveSpaceCube(Texture cookieA, Texture cookieB) if (projectionSize < k_MinCookieSize) return; - if (!m_CookieAtlas.ReserveSpace(m_CookieAtlas.GetTextureID(cookieA, cookieB), projectionSize, projectionSize)) + if (!m_CookieAtlas.ReserveSpace(cookieA, cookieB, projectionSize, projectionSize)) m_2DCookieAtlasNeedsLayouting = true; } diff --git a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Utility/PowerOfTwoTextureAtlas.cs b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Utility/PowerOfTwoTextureAtlas.cs index 4d7e0830bc5..ed9218ce65e 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Utility/PowerOfTwoTextureAtlas.cs +++ b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Utility/PowerOfTwoTextureAtlas.cs @@ -195,6 +195,9 @@ public bool ReserveSpace(Texture texture) { m_RequestedTextures[texture.GetInstanceID()] = new Vector2Int(texture.width, texture.height); + if (NeedsUpdate(texture)) + return false; + // new texture if (!IsCached(out _, texture)) { @@ -205,10 +208,34 @@ public bool ReserveSpace(Texture texture) return true; } - public bool ReserveSpace(int id, int width, int height) + // pass width and height for CubeMap (use 2*width) & Texture2D (use width) + public bool ReserveSpace(Texture texture, int width, int height) { + int id = GetTextureID(texture); m_RequestedTextures[id] = new Vector2Int(width, height); + if (NeedsUpdate(texture)) + return false; + + // new texture + if (!IsCached(out _, id)) + { + Vector4 scaleBias = Vector4.zero; + if (!AllocateTextureWithoutBlit(id, width, height, ref scaleBias)) + return false; + } + return true; + } + + // pass width and height for CubeMap (use 2*width) & Texture2D (use width) + public bool ReserveSpace(Texture textureA, Texture textureB, int width, int height) + { + int id = GetTextureID(textureA, textureB); + m_RequestedTextures[id] = new Vector2Int(width, height); + + if (NeedsUpdate(textureA, textureB)) + return false; + // new texture if (!IsCached(out _, id)) { From 8998567c205955c0d38508a7b382029ef126c313 Mon Sep 17 00:00:00 2001 From: Martin Thorzen <35328557+martint-unity@users.noreply.github.com> Date: Fri, 15 Jan 2021 09:46:58 +0100 Subject: [PATCH 11/21] filter for xbone addded (#3116) --- .../Test/TestFilters/TestCaseFilters.asset | 131 ++++++++++-------- 1 file changed, 70 insertions(+), 61 deletions(-) diff --git a/TestProjects/UniversalGraphicsTest/Assets/Test/TestFilters/TestCaseFilters.asset b/TestProjects/UniversalGraphicsTest/Assets/Test/TestFilters/TestCaseFilters.asset index 5d90301598d..05bf0815090 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Test/TestFilters/TestCaseFilters.asset +++ b/TestProjects/UniversalGraphicsTest/Assets/Test/TestFilters/TestCaseFilters.asset @@ -107,20 +107,20 @@ MonoBehaviour: FilteredScenes: - {fileID: 102900000, guid: bcb8635ea84c143f0ae0823f1e9b6f25, type: 3} ColorSpace: -1 - BuildPlatform: 9 - GraphicsDevice: 16 - XrSdk: None + BuildPlatform: 19 + GraphicsDevice: 21 + XrSdk: StereoModes: 0 - Reason: 'Filtered out due to OoM issue (FB: 1304672)' + Reason: https://fogbugz.unity3d.com/f/cases/1305591/ - FilteredScene: {fileID: 0} FilteredScenes: - {fileID: 102900000, guid: bcb8635ea84c143f0ae0823f1e9b6f25, type: 3} ColorSpace: -1 - BuildPlatform: 19 - GraphicsDevice: 21 - XrSdk: + BuildPlatform: 9 + GraphicsDevice: 16 + XrSdk: None StereoModes: 0 - Reason: https://fogbugz.unity3d.com/f/cases/1305591/ + Reason: 'Filtered out due to OoM issue (FB: 1304672)' - FilteredScene: {fileID: 0} FilteredScenes: - {fileID: 102900000, guid: 2d287b701f8e1bf429c14805ac505eb9, type: 3} @@ -161,44 +161,44 @@ MonoBehaviour: FilteredScenes: - {fileID: 102900000, guid: 770b86964e87d47e4bdbafa425ccd238, type: 3} ColorSpace: -1 - BuildPlatform: 31 - GraphicsDevice: 13 - XrSdk: + BuildPlatform: -2 + GraphicsDevice: 17 + XrSdk: None StereoModes: 0 - Reason: https://fogbugz.unity3d.com/f/cases/1304675 + Reason: Needs fixing in OpenGL - FilteredScene: {fileID: 0} FilteredScenes: - {fileID: 102900000, guid: 770b86964e87d47e4bdbafa425ccd238, type: 3} ColorSpace: -1 - BuildPlatform: 5 - GraphicsDevice: 21 - XrSdk: None + BuildPlatform: 33 + GraphicsDevice: 23 + XrSdk: StereoModes: 0 Reason: https://fogbugz.unity3d.com/f/cases/1304675 - FilteredScene: {fileID: 0} FilteredScenes: - {fileID: 102900000, guid: 770b86964e87d47e4bdbafa425ccd238, type: 3} ColorSpace: -1 - BuildPlatform: 13 - GraphicsDevice: 11 + BuildPlatform: 9 + GraphicsDevice: 16 XrSdk: None StereoModes: 0 - Reason: https://fogbugz.unity3d.com/f/cases/1304675 + Reason: 'Filtered out due to OoM issue (FB: 1304672)' - FilteredScene: {fileID: 0} FilteredScenes: - {fileID: 102900000, guid: 770b86964e87d47e4bdbafa425ccd238, type: 3} ColorSpace: -1 - BuildPlatform: 13 - GraphicsDevice: 21 - XrSdk: None + BuildPlatform: 38 + GraphicsDevice: 22 + XrSdk: StereoModes: 0 Reason: https://fogbugz.unity3d.com/f/cases/1304675 - FilteredScene: {fileID: 0} FilteredScenes: - {fileID: 102900000, guid: 770b86964e87d47e4bdbafa425ccd238, type: 3} ColorSpace: -1 - BuildPlatform: 24 - GraphicsDevice: 21 + BuildPlatform: 19 + GraphicsDevice: 2 XrSdk: None StereoModes: 0 Reason: https://fogbugz.unity3d.com/f/cases/1304675 @@ -206,17 +206,17 @@ MonoBehaviour: FilteredScenes: - {fileID: 102900000, guid: 770b86964e87d47e4bdbafa425ccd238, type: 3} ColorSpace: -1 - BuildPlatform: 5 + BuildPlatform: 19 GraphicsDevice: 18 - XrSdk: None + XrSdk: StereoModes: 0 Reason: https://fogbugz.unity3d.com/f/cases/1304675 - FilteredScene: {fileID: 0} FilteredScenes: - {fileID: 102900000, guid: 770b86964e87d47e4bdbafa425ccd238, type: 3} ColorSpace: -1 - BuildPlatform: 19 - GraphicsDevice: 21 + BuildPlatform: 33 + GraphicsDevice: 14 XrSdk: StereoModes: 0 Reason: https://fogbugz.unity3d.com/f/cases/1304675 @@ -224,17 +224,17 @@ MonoBehaviour: FilteredScenes: - {fileID: 102900000, guid: 770b86964e87d47e4bdbafa425ccd238, type: 3} ColorSpace: -1 - BuildPlatform: 19 + BuildPlatform: 5 GraphicsDevice: 18 - XrSdk: + XrSdk: None StereoModes: 0 Reason: https://fogbugz.unity3d.com/f/cases/1304675 - FilteredScene: {fileID: 0} FilteredScenes: - {fileID: 102900000, guid: 770b86964e87d47e4bdbafa425ccd238, type: 3} ColorSpace: -1 - BuildPlatform: 19 - GraphicsDevice: 2 + BuildPlatform: 24 + GraphicsDevice: 21 XrSdk: None StereoModes: 0 Reason: https://fogbugz.unity3d.com/f/cases/1304675 @@ -242,26 +242,35 @@ MonoBehaviour: FilteredScenes: - {fileID: 102900000, guid: 770b86964e87d47e4bdbafa425ccd238, type: 3} ColorSpace: -1 - BuildPlatform: 38 - GraphicsDevice: 22 - XrSdk: + BuildPlatform: 13 + GraphicsDevice: 21 + XrSdk: None StereoModes: 0 Reason: https://fogbugz.unity3d.com/f/cases/1304675 - FilteredScene: {fileID: 0} FilteredScenes: - {fileID: 102900000, guid: 770b86964e87d47e4bdbafa425ccd238, type: 3} ColorSpace: -1 - BuildPlatform: 9 - GraphicsDevice: 16 + BuildPlatform: 13 + GraphicsDevice: 11 XrSdk: None StereoModes: 0 - Reason: 'Filtered out due to OoM issue (FB: 1304672)' + Reason: https://fogbugz.unity3d.com/f/cases/1304675 - FilteredScene: {fileID: 0} FilteredScenes: - {fileID: 102900000, guid: 770b86964e87d47e4bdbafa425ccd238, type: 3} ColorSpace: -1 - BuildPlatform: 33 - GraphicsDevice: 23 + BuildPlatform: 5 + GraphicsDevice: 21 + XrSdk: None + StereoModes: 0 + Reason: https://fogbugz.unity3d.com/f/cases/1304675 + - FilteredScene: {fileID: 0} + FilteredScenes: + - {fileID: 102900000, guid: 770b86964e87d47e4bdbafa425ccd238, type: 3} + ColorSpace: -1 + BuildPlatform: 31 + GraphicsDevice: 13 XrSdk: StereoModes: 0 Reason: https://fogbugz.unity3d.com/f/cases/1304675 @@ -269,11 +278,11 @@ MonoBehaviour: FilteredScenes: - {fileID: 102900000, guid: 770b86964e87d47e4bdbafa425ccd238, type: 3} ColorSpace: -1 - BuildPlatform: -2 - GraphicsDevice: 17 - XrSdk: None + BuildPlatform: 19 + GraphicsDevice: 21 + XrSdk: StereoModes: 0 - Reason: Needs fixing in OpenGL + Reason: https://fogbugz.unity3d.com/f/cases/1304675 - FilteredScene: {fileID: 0} FilteredScenes: - {fileID: 102900000, guid: 7a8ef7ce062f0465b9e493dd5730cecb, type: 3} @@ -455,15 +464,6 @@ MonoBehaviour: XrSdk: None StereoModes: 0 Reason: Needs fixing in OpenGL - - FilteredScene: {fileID: 0} - FilteredScenes: - - {fileID: 102900000, guid: 83adeebeb3ba74a13816f2b8636588aa, type: 3} - ColorSpace: -1 - BuildPlatform: 24 - GraphicsDevice: 21 - XrSdk: None - StereoModes: 0 - Reason: https://fogbugz.unity3d.com/f/cases/1305639/ - FilteredScene: {fileID: 0} FilteredScenes: - {fileID: 102900000, guid: 83adeebeb3ba74a13816f2b8636588aa, type: 3} @@ -482,6 +482,15 @@ MonoBehaviour: XrSdk: StereoModes: 0 Reason: https://fogbugz.unity3d.com/f/cases/1293775/ + - FilteredScene: {fileID: 0} + FilteredScenes: + - {fileID: 102900000, guid: 83adeebeb3ba74a13816f2b8636588aa, type: 3} + ColorSpace: -1 + BuildPlatform: 24 + GraphicsDevice: 21 + XrSdk: None + StereoModes: 0 + Reason: https://fogbugz.unity3d.com/f/cases/1305639/ - FilteredScene: {fileID: 0} FilteredScenes: - {fileID: 102900000, guid: c7b61419ee9382545afe530714fda0c2, type: 3} @@ -572,6 +581,15 @@ MonoBehaviour: XrSdk: None StereoModes: 0 Reason: OSX Standalone won't work with back buffer capture + - FilteredScene: {fileID: 0} + FilteredScenes: + - {fileID: 102900000, guid: 9173c5ffc1365594aa9b927c4cd84c54, type: 3} + ColorSpace: -1 + BuildPlatform: -2 + GraphicsDevice: 17 + XrSdk: None + StereoModes: 0 + Reason: Needs fixing in OpenGL - FilteredScene: {fileID: 0} FilteredScenes: - {fileID: 102900000, guid: 9173c5ffc1365594aa9b927c4cd84c54, type: 3} @@ -590,15 +608,6 @@ MonoBehaviour: XrSdk: None StereoModes: 0 Reason: OSX Standalone won't work with back buffer capture - - FilteredScene: {fileID: 0} - FilteredScenes: - - {fileID: 102900000, guid: 9173c5ffc1365594aa9b927c4cd84c54, type: 3} - ColorSpace: -1 - BuildPlatform: -2 - GraphicsDevice: 17 - XrSdk: None - StereoModes: 0 - Reason: Needs fixing in OpenGL - FilteredScene: {fileID: 0} FilteredScenes: - {fileID: 102900000, guid: d66b74ae4e7264d62bdb2c4f56261030, type: 3} From 027cb377be5b8c6d9a044408fb884b9d54ee376e Mon Sep 17 00:00:00 2001 From: Sophia <16596228+sophiaaar@users.noreply.github.com> Date: Fri, 15 Jan 2021 10:05:46 +0100 Subject: [PATCH 12/21] [Yamato] Enable cache server for standalone build jobs (#3106) * create standalone_cache jobs * use cache jobs for trunk verification * fix commands so linux can recognise them need to wrap each string around "extra-editor-arg" --- .yamato/_abv.yml | 20 +-- .yamato/all-hdrp.yml | 12 +- .yamato/all-shadergraph.yml | 16 +-- .yamato/all-shadergraph_stereo.yml | 4 +- .yamato/all-universal.yml | 40 +++--- .yamato/all-universal_stereo.yml | 4 +- .yamato/all-vfx_hdrp.yml | 8 +- .yamato/all-vfx_urp.yml | 4 +- .yamato/config/_abv.metafile | 10 +- .yamato/config/hdrp.metafile | 31 ++++- .yamato/config/hdrp_dxr.metafile | 29 +++- .yamato/config/hdrp_hybrid.metafile | 28 +++- .yamato/config/shadergraph.metafile | 37 +++-- .yamato/config/shadergraph_stereo.metafile | 19 ++- .yamato/config/universal.metafile | 49 +++++-- .yamato/config/universal_hybrid.metafile | 26 +++- .yamato/config/universal_stereo.metafile | 21 ++- .yamato/config/vfx_hdrp.metafile | 29 +++- .yamato/config/vfx_urp.metafile | 31 ++++- .yamato/hdrp-linux-vulkan.yml | 109 ++++++++++++++- .yamato/hdrp-osx-metal.yml | 66 ++++++++- .yamato/hdrp-win-dx11.yml | 115 ++++++++++++++- .yamato/hdrp-win-dx12.yml | 115 ++++++++++++++- .yamato/hdrp-win-vulkan.yml | 115 ++++++++++++++- .yamato/hdrp_dxr-win-dx12.yml | 121 +++++++++++++++- .yamato/hdrp_hybrid-linux-openglcore.yml | 4 +- .yamato/hdrp_hybrid-linux-vulkan.yml | 109 ++++++++++++++- .yamato/hdrp_hybrid-osx-metal.yml | 66 ++++++++- .yamato/hdrp_hybrid-win-dx11.yml | 113 ++++++++++++++- .yamato/hdrp_hybrid-win-dx12.yml | 113 ++++++++++++++- .yamato/hdrp_hybrid-win-vulkan.yml | 113 ++++++++++++++- .yamato/shadergraph-android-opengles3.yml | 131 ++++++++++++++++++ .yamato/shadergraph-android-vulkan.yml | 131 ++++++++++++++++++ .yamato/shadergraph-iphone-metal.yml | 113 +++++++++++++++ .yamato/shadergraph-linux-openglcore.yml | 4 +- .yamato/shadergraph-linux-vulkan.yml | 109 ++++++++++++++- .yamato/shadergraph-osx-metal.yml | 66 ++++++++- .yamato/shadergraph-osx-openglcore.yml | 4 +- .yamato/shadergraph-win-dx11.yml | 113 ++++++++++++++- .yamato/shadergraph-win-vulkan.yml | 113 ++++++++++++++- .yamato/shadergraph_stereo-win.yml | 109 +++++++++++++++ .yamato/universal-android-opengles3.yml | 131 ++++++++++++++++++ .yamato/universal-android-vulkan.yml | 131 ++++++++++++++++++ .yamato/universal-iphone-metal.yml | 113 +++++++++++++++ .yamato/universal-linux-openglcore.yml | 4 +- .yamato/universal-linux-vulkan.yml | 109 ++++++++++++++- .yamato/universal-osx-metal.yml | 66 ++++++++- .yamato/universal-osx-openglcore.yml | 4 +- .yamato/universal-win-dx11.yml | 115 ++++++++++++++- .yamato/universal-win-dx12.yml | 115 ++++++++++++++- .yamato/universal-win-vulkan.yml | 115 ++++++++++++++- .../universal_hybrid-android-opengles3.yml | 131 ++++++++++++++++++ .yamato/universal_hybrid-android-vulkan.yml | 131 ++++++++++++++++++ .yamato/universal_hybrid-linux-openglcore.yml | 4 +- .yamato/universal_hybrid-linux-vulkan.yml | 109 ++++++++++++++- .yamato/universal_hybrid-osx-metal.yml | 66 ++++++++- .yamato/universal_hybrid-win-dx11.yml | 113 ++++++++++++++- .yamato/universal_hybrid-win-vulkan.yml | 113 ++++++++++++++- .yamato/universal_stereo-win.yml | 109 +++++++++++++++ .yamato/vfx_hdrp-linux-vulkan.yml | 109 ++++++++++++++- .yamato/vfx_hdrp-osx-metal.yml | 66 ++++++++- .yamato/vfx_hdrp-win-dx11.yml | 115 ++++++++++++++- .yamato/vfx_hdrp-win-dx12.yml | 115 ++++++++++++++- .yamato/vfx_hdrp-win-vulkan.yml | 115 ++++++++++++++- .yamato/vfx_urp-iphone-metal.yml | 113 +++++++++++++++ .yamato/vfx_urp-linux-openglcore.yml | 4 +- .yamato/vfx_urp-linux-vulkan.yml | 109 ++++++++++++++- .yamato/vfx_urp-osx-metal.yml | 66 ++++++++- .yamato/vfx_urp-osx-openglcore.yml | 4 +- .yamato/vfx_urp-win-dx11.yml | 113 ++++++++++++++- .yamato/vfx_urp-win-vulkan.yml | 113 ++++++++++++++- 71 files changed, 4989 insertions(+), 202 deletions(-) diff --git a/.yamato/_abv.yml b/.yamato/_abv.yml index 41ed3dda08d..8a0b0343f17 100644 --- a/.yamato/_abv.yml +++ b/.yamato/_abv.yml @@ -57,23 +57,23 @@ all_project_ci_weekly_trunk: trunk_verification_trunk: name: Trunk verification - trunk dependencies: - - path: .yamato/universal-win-dx11.yml#Universal_Win_DX11_playmode_mono_Linear_trunk + - path: .yamato/universal-win-dx11.yml#Universal_Win_DX11_playmode_cache_mono_Linear_trunk rerun: on-new-revision - path: .yamato/universal-win-dx11.yml#Universal_Win_DX11_editmode_mono_Linear_trunk rerun: on-new-revision - - path: .yamato/shadergraph-win-dx11.yml#ShaderGraph_Win_DX11_playmode_mono_Linear_trunk + - path: .yamato/shadergraph-win-dx11.yml#ShaderGraph_Win_DX11_playmode_cache_mono_Linear_trunk rerun: on-new-revision - path: .yamato/shadergraph-win-dx11.yml#ShaderGraph_Win_DX11_editmode_mono_Linear_trunk rerun: on-new-revision - - path: .yamato/hdrp-win-dx11.yml#HDRP_Win_DX11_playmode_mono_Linear_trunk + - path: .yamato/hdrp-win-dx11.yml#HDRP_Win_DX11_playmode_cache_mono_Linear_trunk rerun: on-new-revision - path: .yamato/hdrp-win-dx11.yml#HDRP_Win_DX11_editmode_mono_Linear_trunk rerun: on-new-revision - - path: .yamato/vfx_hdrp-win-dx11.yml#VFX_HDRP_Win_DX11_playmode_mono_Linear_trunk + - path: .yamato/vfx_hdrp-win-dx11.yml#VFX_HDRP_Win_DX11_playmode_cache_mono_Linear_trunk rerun: on-new-revision - path: .yamato/vfx_hdrp-win-dx11.yml#VFX_HDRP_Win_DX11_editmode_mono_Linear_trunk rerun: on-new-revision - - path: .yamato/vfx_urp-win-dx11.yml#VFX_URP_Win_DX11_playmode_mono_Linear_trunk + - path: .yamato/vfx_urp-win-dx11.yml#VFX_URP_Win_DX11_playmode_cache_mono_Linear_trunk rerun: on-new-revision all_project_ci_CUSTOM-REVISION: name: _ABV for SRP repository (all PR jobs) - CUSTOM-REVISION @@ -95,23 +95,23 @@ all_project_ci_CUSTOM-REVISION: trunk_verification_CUSTOM-REVISION: name: Trunk verification - CUSTOM-REVISION dependencies: - - path: .yamato/universal-win-dx11.yml#Universal_Win_DX11_playmode_mono_Linear_CUSTOM-REVISION + - path: .yamato/universal-win-dx11.yml#Universal_Win_DX11_playmode_cache_mono_Linear_CUSTOM-REVISION rerun: always - path: .yamato/universal-win-dx11.yml#Universal_Win_DX11_editmode_mono_Linear_CUSTOM-REVISION rerun: always - - path: .yamato/shadergraph-win-dx11.yml#ShaderGraph_Win_DX11_playmode_mono_Linear_CUSTOM-REVISION + - path: .yamato/shadergraph-win-dx11.yml#ShaderGraph_Win_DX11_playmode_cache_mono_Linear_CUSTOM-REVISION rerun: always - path: .yamato/shadergraph-win-dx11.yml#ShaderGraph_Win_DX11_editmode_mono_Linear_CUSTOM-REVISION rerun: always - - path: .yamato/hdrp-win-dx11.yml#HDRP_Win_DX11_playmode_mono_Linear_CUSTOM-REVISION + - path: .yamato/hdrp-win-dx11.yml#HDRP_Win_DX11_playmode_cache_mono_Linear_CUSTOM-REVISION rerun: always - path: .yamato/hdrp-win-dx11.yml#HDRP_Win_DX11_editmode_mono_Linear_CUSTOM-REVISION rerun: always - - path: .yamato/vfx_hdrp-win-dx11.yml#VFX_HDRP_Win_DX11_playmode_mono_Linear_CUSTOM-REVISION + - path: .yamato/vfx_hdrp-win-dx11.yml#VFX_HDRP_Win_DX11_playmode_cache_mono_Linear_CUSTOM-REVISION rerun: always - path: .yamato/vfx_hdrp-win-dx11.yml#VFX_HDRP_Win_DX11_editmode_mono_Linear_CUSTOM-REVISION rerun: always - - path: .yamato/vfx_urp-win-dx11.yml#VFX_URP_Win_DX11_playmode_mono_Linear_CUSTOM-REVISION + - path: .yamato/vfx_urp-win-dx11.yml#VFX_URP_Win_DX11_playmode_cache_mono_Linear_CUSTOM-REVISION rerun: always variables: CUSTOM_REVISION: custom_revision_not_set diff --git a/.yamato/all-hdrp.yml b/.yamato/all-hdrp.yml index c3ee1449517..3bb3805fc77 100644 --- a/.yamato/all-hdrp.yml +++ b/.yamato/all-hdrp.yml @@ -10,7 +10,7 @@ PR_HDRP_trunk: name: HDRP PR Job - trunk dependencies: - - path: .yamato/hdrp-win-dx11.yml#HDRP_Win_DX11_Standalone_mono_Linear_trunk + - path: .yamato/hdrp-win-dx11.yml#HDRP_Win_DX11_Standalone_cache_mono_Linear_trunk rerun: on-new-revision - path: .yamato/hdrp-win-dx11.yml#HDRP_Win_DX11_playmode_cache_mono_Linear_trunk rerun: on-new-revision @@ -52,11 +52,11 @@ Nightly_HDRP_trunk: rerun: on-new-revision - path: .yamato/all-smoke_test.yml#Nightly_Smoke_Test_trunk rerun: on-new-revision - - path: .yamato/hdrp-win-dx12.yml#HDRP_Win_DX12_Standalone_mono_Linear_trunk + - path: .yamato/hdrp-win-dx12.yml#HDRP_Win_DX12_Standalone_cache_mono_Linear_trunk rerun: on-new-revision - path: .yamato/hdrp-win-dx12.yml#HDRP_Win_DX12_playmode_XR_mono_Linear_trunk rerun: on-new-revision - - path: .yamato/hdrp-win-vulkan.yml#HDRP_Win_Vulkan_Standalone_mono_Linear_trunk + - path: .yamato/hdrp-win-vulkan.yml#HDRP_Win_Vulkan_Standalone_cache_mono_Linear_trunk rerun: on-new-revision - path: .yamato/hdrp-win-vulkan.yml#HDRP_Win_Vulkan_playmode_XR_mono_Linear_trunk rerun: on-new-revision @@ -68,7 +68,7 @@ Nightly_HDRP_trunk: PR_HDRP_CUSTOM-REVISION: name: HDRP PR Job - CUSTOM-REVISION dependencies: - - path: .yamato/hdrp-win-dx11.yml#HDRP_Win_DX11_Standalone_mono_Linear_CUSTOM-REVISION + - path: .yamato/hdrp-win-dx11.yml#HDRP_Win_DX11_Standalone_cache_mono_Linear_CUSTOM-REVISION rerun: always - path: .yamato/hdrp-win-dx11.yml#HDRP_Win_DX11_playmode_cache_mono_Linear_CUSTOM-REVISION rerun: always @@ -109,11 +109,11 @@ Nightly_HDRP_CUSTOM-REVISION: rerun: always - path: .yamato/all-smoke_test.yml#Nightly_Smoke_Test_CUSTOM-REVISION rerun: always - - path: .yamato/hdrp-win-dx12.yml#HDRP_Win_DX12_Standalone_mono_Linear_CUSTOM-REVISION + - path: .yamato/hdrp-win-dx12.yml#HDRP_Win_DX12_Standalone_cache_mono_Linear_CUSTOM-REVISION rerun: always - path: .yamato/hdrp-win-dx12.yml#HDRP_Win_DX12_playmode_XR_mono_Linear_CUSTOM-REVISION rerun: always - - path: .yamato/hdrp-win-vulkan.yml#HDRP_Win_Vulkan_Standalone_mono_Linear_CUSTOM-REVISION + - path: .yamato/hdrp-win-vulkan.yml#HDRP_Win_Vulkan_Standalone_cache_mono_Linear_CUSTOM-REVISION rerun: always - path: .yamato/hdrp-win-vulkan.yml#HDRP_Win_Vulkan_playmode_XR_mono_Linear_CUSTOM-REVISION rerun: always diff --git a/.yamato/all-shadergraph.yml b/.yamato/all-shadergraph.yml index da09b4e44ec..d6c2ce07059 100644 --- a/.yamato/all-shadergraph.yml +++ b/.yamato/all-shadergraph.yml @@ -10,15 +10,15 @@ PR_ShaderGraph_trunk: name: ShaderGraph PR Job - trunk dependencies: - - path: .yamato/shadergraph-win-dx11.yml#ShaderGraph_Win_DX11_Standalone_mono_Linear_trunk + - path: .yamato/shadergraph-win-dx11.yml#ShaderGraph_Win_DX11_Standalone_cache_mono_Linear_trunk rerun: on-new-revision - path: .yamato/shadergraph-osx-openglcore.yml#ShaderGraph_OSX_OpenGLCore_editmode_mono_Linear_trunk rerun: on-new-revision - - path: .yamato/shadergraph-linux-vulkan.yml#ShaderGraph_Linux_Vulkan_Standalone_mono_Linear_trunk + - path: .yamato/shadergraph-linux-vulkan.yml#ShaderGraph_Linux_Vulkan_Standalone_cache_mono_Linear_trunk rerun: on-new-revision - path: .yamato/shadergraph-osx-metal.yml#ShaderGraph_OSX_Metal_playmode_cache_mono_Linear_trunk rerun: on-new-revision - - path: .yamato/shadergraph-iphone-metal.yml#ShaderGraph_iPhone_Metal_Standalone_il2cpp_Linear_trunk + - path: .yamato/shadergraph-iphone-metal.yml#ShaderGraph_iPhone_Metal_Standalone_cache_il2cpp_Linear_trunk rerun: on-new-revision - path: .yamato/all-shadergraph_stereo.yml#PR_ShaderGraph_Stereo_trunk rerun: on-new-revision @@ -42,7 +42,7 @@ Nightly_ShaderGraph_trunk: rerun: on-new-revision - path: .yamato/shadergraph-linux-vulkan.yml#ShaderGraph_Linux_Vulkan_playmode_cache_mono_Linear_trunk rerun: on-new-revision - - path: .yamato/shadergraph-android-vulkan.yml#ShaderGraph_Android_Vulkan_Standalone_il2cpp_Linear_trunk + - path: .yamato/shadergraph-android-vulkan.yml#ShaderGraph_Android_Vulkan_Standalone_cache_il2cpp_Linear_trunk rerun: on-new-revision variables: UTR_VERSION: "current" @@ -50,15 +50,15 @@ Nightly_ShaderGraph_trunk: PR_ShaderGraph_CUSTOM-REVISION: name: ShaderGraph PR Job - CUSTOM-REVISION dependencies: - - path: .yamato/shadergraph-win-dx11.yml#ShaderGraph_Win_DX11_Standalone_mono_Linear_CUSTOM-REVISION + - path: .yamato/shadergraph-win-dx11.yml#ShaderGraph_Win_DX11_Standalone_cache_mono_Linear_CUSTOM-REVISION rerun: always - path: .yamato/shadergraph-osx-openglcore.yml#ShaderGraph_OSX_OpenGLCore_editmode_mono_Linear_CUSTOM-REVISION rerun: always - - path: .yamato/shadergraph-linux-vulkan.yml#ShaderGraph_Linux_Vulkan_Standalone_mono_Linear_CUSTOM-REVISION + - path: .yamato/shadergraph-linux-vulkan.yml#ShaderGraph_Linux_Vulkan_Standalone_cache_mono_Linear_CUSTOM-REVISION rerun: always - path: .yamato/shadergraph-osx-metal.yml#ShaderGraph_OSX_Metal_playmode_cache_mono_Linear_CUSTOM-REVISION rerun: always - - path: .yamato/shadergraph-iphone-metal.yml#ShaderGraph_iPhone_Metal_Standalone_il2cpp_Linear_CUSTOM-REVISION + - path: .yamato/shadergraph-iphone-metal.yml#ShaderGraph_iPhone_Metal_Standalone_cache_il2cpp_Linear_CUSTOM-REVISION rerun: always - path: .yamato/all-shadergraph_stereo.yml#PR_ShaderGraph_Stereo_CUSTOM-REVISION rerun: always @@ -81,7 +81,7 @@ Nightly_ShaderGraph_CUSTOM-REVISION: rerun: always - path: .yamato/shadergraph-linux-vulkan.yml#ShaderGraph_Linux_Vulkan_playmode_cache_mono_Linear_CUSTOM-REVISION rerun: always - - path: .yamato/shadergraph-android-vulkan.yml#ShaderGraph_Android_Vulkan_Standalone_il2cpp_Linear_CUSTOM-REVISION + - path: .yamato/shadergraph-android-vulkan.yml#ShaderGraph_Android_Vulkan_Standalone_cache_il2cpp_Linear_CUSTOM-REVISION rerun: always variables: CUSTOM_REVISION: custom_revision_not_set diff --git a/.yamato/all-shadergraph_stereo.yml b/.yamato/all-shadergraph_stereo.yml index f6a78183906..462a084aedf 100644 --- a/.yamato/all-shadergraph_stereo.yml +++ b/.yamato/all-shadergraph_stereo.yml @@ -10,7 +10,7 @@ PR_ShaderGraph_Stereo_trunk: name: ShaderGraph_Stereo PR Job - trunk dependencies: - - path: .yamato/shadergraph_stereo-win.yml#ShaderGraph_Stereo_Win_Standalone_mono_Linear_trunk + - path: .yamato/shadergraph_stereo-win.yml#ShaderGraph_Stereo_Win_Standalone_cache_mono_Linear_trunk rerun: on-new-revision - path: .yamato/shadergraph_stereo-win.yml#ShaderGraph_Stereo_Win_editmode_mono_Linear_trunk rerun: on-new-revision @@ -28,7 +28,7 @@ Nightly_ShaderGraph_Stereo_trunk: PR_ShaderGraph_Stereo_CUSTOM-REVISION: name: ShaderGraph_Stereo PR Job - CUSTOM-REVISION dependencies: - - path: .yamato/shadergraph_stereo-win.yml#ShaderGraph_Stereo_Win_Standalone_mono_Linear_CUSTOM-REVISION + - path: .yamato/shadergraph_stereo-win.yml#ShaderGraph_Stereo_Win_Standalone_cache_mono_Linear_CUSTOM-REVISION rerun: always - path: .yamato/shadergraph_stereo-win.yml#ShaderGraph_Stereo_Win_editmode_mono_Linear_CUSTOM-REVISION rerun: always diff --git a/.yamato/all-universal.yml b/.yamato/all-universal.yml index a7559f915b0..4df56d144f8 100644 --- a/.yamato/all-universal.yml +++ b/.yamato/all-universal.yml @@ -10,33 +10,33 @@ PR_Universal_trunk: name: Universal PR Job - trunk dependencies: - - path: .yamato/universal-win-dx11.yml#Universal_Win_DX11_Standalone_mono_Linear_trunk + - path: .yamato/universal-win-dx11.yml#Universal_Win_DX11_Standalone_cache_mono_Linear_trunk rerun: on-new-revision - path: .yamato/universal-win-dx11.yml#Universal_Win_DX11_playmode_XR_mono_Linear_trunk rerun: on-new-revision - path: .yamato/universal-win-dx11.yml#Universal_Win_DX11_editmode_mono_Linear_trunk rerun: on-new-revision - - path: .yamato/universal-win-dx12.yml#Universal_Win_DX12_Standalone_mono_Linear_trunk + - path: .yamato/universal-win-dx12.yml#Universal_Win_DX12_Standalone_cache_mono_Linear_trunk rerun: on-new-revision - - path: .yamato/universal-win-vulkan.yml#Universal_Win_Vulkan_Standalone_mono_Linear_trunk + - path: .yamato/universal-win-vulkan.yml#Universal_Win_Vulkan_Standalone_cache_mono_Linear_trunk rerun: on-new-revision - - path: .yamato/universal-linux-vulkan.yml#Universal_Linux_Vulkan_Standalone_mono_Linear_trunk + - path: .yamato/universal-linux-vulkan.yml#Universal_Linux_Vulkan_Standalone_cache_mono_Linear_trunk rerun: on-new-revision - - path: .yamato/universal-android-opengles3.yml#Universal_Android_OpenGLES3_Standalone_il2cpp_Linear_trunk + - path: .yamato/universal-android-opengles3.yml#Universal_Android_OpenGLES3_Standalone_cache_il2cpp_Linear_trunk rerun: on-new-revision - - path: .yamato/universal-android-vulkan.yml#Universal_Android_Vulkan_Standalone_il2cpp_Linear_trunk + - path: .yamato/universal-android-vulkan.yml#Universal_Android_Vulkan_Standalone_cache_il2cpp_Linear_trunk rerun: on-new-revision - - path: .yamato/universal-iphone-metal.yml#Universal_iPhone_Metal_Standalone_il2cpp_Linear_trunk + - path: .yamato/universal-iphone-metal.yml#Universal_iPhone_Metal_Standalone_cache_il2cpp_Linear_trunk rerun: on-new-revision - path: .yamato/universal-osx-metal.yml#Universal_OSX_Metal_playmode_cache_mono_Linear_trunk rerun: on-new-revision - path: .yamato/universal-osx-openglcore.yml#Universal_OSX_OpenGLCore_editmode_mono_Linear_trunk rerun: on-new-revision - - path: .yamato/universal-android-opengles3.yml#Universal_Android_OpenGLES3_Standalone_il2cpp_Linear_trunk + - path: .yamato/universal-android-opengles3.yml#Universal_Android_OpenGLES3_Standalone_cache_il2cpp_Linear_trunk rerun: on-new-revision - - path: .yamato/universal-android-vulkan.yml#Universal_Android_Vulkan_Standalone_il2cpp_Linear_trunk + - path: .yamato/universal-android-vulkan.yml#Universal_Android_Vulkan_Standalone_cache_il2cpp_Linear_trunk rerun: on-new-revision - - path: .yamato/universal-iphone-metal.yml#Universal_iPhone_Metal_Standalone_il2cpp_Linear_trunk + - path: .yamato/universal-iphone-metal.yml#Universal_iPhone_Metal_Standalone_cache_il2cpp_Linear_trunk rerun: on-new-revision - path: .yamato/all-universal_stereo.yml#PR_Universal_Stereo_trunk rerun: on-new-revision @@ -80,33 +80,33 @@ Nightly_Universal_trunk: PR_Universal_CUSTOM-REVISION: name: Universal PR Job - CUSTOM-REVISION dependencies: - - path: .yamato/universal-win-dx11.yml#Universal_Win_DX11_Standalone_mono_Linear_CUSTOM-REVISION + - path: .yamato/universal-win-dx11.yml#Universal_Win_DX11_Standalone_cache_mono_Linear_CUSTOM-REVISION rerun: always - path: .yamato/universal-win-dx11.yml#Universal_Win_DX11_playmode_XR_mono_Linear_CUSTOM-REVISION rerun: always - path: .yamato/universal-win-dx11.yml#Universal_Win_DX11_editmode_mono_Linear_CUSTOM-REVISION rerun: always - - path: .yamato/universal-win-dx12.yml#Universal_Win_DX12_Standalone_mono_Linear_CUSTOM-REVISION + - path: .yamato/universal-win-dx12.yml#Universal_Win_DX12_Standalone_cache_mono_Linear_CUSTOM-REVISION rerun: always - - path: .yamato/universal-win-vulkan.yml#Universal_Win_Vulkan_Standalone_mono_Linear_CUSTOM-REVISION + - path: .yamato/universal-win-vulkan.yml#Universal_Win_Vulkan_Standalone_cache_mono_Linear_CUSTOM-REVISION rerun: always - - path: .yamato/universal-linux-vulkan.yml#Universal_Linux_Vulkan_Standalone_mono_Linear_CUSTOM-REVISION + - path: .yamato/universal-linux-vulkan.yml#Universal_Linux_Vulkan_Standalone_cache_mono_Linear_CUSTOM-REVISION rerun: always - - path: .yamato/universal-android-opengles3.yml#Universal_Android_OpenGLES3_Standalone_il2cpp_Linear_CUSTOM-REVISION + - path: .yamato/universal-android-opengles3.yml#Universal_Android_OpenGLES3_Standalone_cache_il2cpp_Linear_CUSTOM-REVISION rerun: always - - path: .yamato/universal-android-vulkan.yml#Universal_Android_Vulkan_Standalone_il2cpp_Linear_CUSTOM-REVISION + - path: .yamato/universal-android-vulkan.yml#Universal_Android_Vulkan_Standalone_cache_il2cpp_Linear_CUSTOM-REVISION rerun: always - - path: .yamato/universal-iphone-metal.yml#Universal_iPhone_Metal_Standalone_il2cpp_Linear_CUSTOM-REVISION + - path: .yamato/universal-iphone-metal.yml#Universal_iPhone_Metal_Standalone_cache_il2cpp_Linear_CUSTOM-REVISION rerun: always - path: .yamato/universal-osx-metal.yml#Universal_OSX_Metal_playmode_cache_mono_Linear_CUSTOM-REVISION rerun: always - path: .yamato/universal-osx-openglcore.yml#Universal_OSX_OpenGLCore_editmode_mono_Linear_CUSTOM-REVISION rerun: always - - path: .yamato/universal-android-opengles3.yml#Universal_Android_OpenGLES3_Standalone_il2cpp_Linear_CUSTOM-REVISION + - path: .yamato/universal-android-opengles3.yml#Universal_Android_OpenGLES3_Standalone_cache_il2cpp_Linear_CUSTOM-REVISION rerun: always - - path: .yamato/universal-android-vulkan.yml#Universal_Android_Vulkan_Standalone_il2cpp_Linear_CUSTOM-REVISION + - path: .yamato/universal-android-vulkan.yml#Universal_Android_Vulkan_Standalone_cache_il2cpp_Linear_CUSTOM-REVISION rerun: always - - path: .yamato/universal-iphone-metal.yml#Universal_iPhone_Metal_Standalone_il2cpp_Linear_CUSTOM-REVISION + - path: .yamato/universal-iphone-metal.yml#Universal_iPhone_Metal_Standalone_cache_il2cpp_Linear_CUSTOM-REVISION rerun: always - path: .yamato/all-universal_stereo.yml#PR_Universal_Stereo_CUSTOM-REVISION rerun: always diff --git a/.yamato/all-universal_stereo.yml b/.yamato/all-universal_stereo.yml index cbadf5f9ee8..f0791d68ab9 100644 --- a/.yamato/all-universal_stereo.yml +++ b/.yamato/all-universal_stereo.yml @@ -10,7 +10,7 @@ PR_Universal_Stereo_trunk: name: Universal_Stereo PR Job - trunk dependencies: - - path: .yamato/universal_stereo-win.yml#Universal_Stereo_Win_Standalone_mono_Linear_trunk + - path: .yamato/universal_stereo-win.yml#Universal_Stereo_Win_Standalone_cache_mono_Linear_trunk rerun: on-new-revision - path: .yamato/universal_stereo-win.yml#Universal_Stereo_Win_editmode_mono_Linear_trunk rerun: on-new-revision @@ -28,7 +28,7 @@ Nightly_Universal_Stereo_trunk: PR_Universal_Stereo_CUSTOM-REVISION: name: Universal_Stereo PR Job - CUSTOM-REVISION dependencies: - - path: .yamato/universal_stereo-win.yml#Universal_Stereo_Win_Standalone_mono_Linear_CUSTOM-REVISION + - path: .yamato/universal_stereo-win.yml#Universal_Stereo_Win_Standalone_cache_mono_Linear_CUSTOM-REVISION rerun: always - path: .yamato/universal_stereo-win.yml#Universal_Stereo_Win_editmode_mono_Linear_CUSTOM-REVISION rerun: always diff --git a/.yamato/all-vfx_hdrp.yml b/.yamato/all-vfx_hdrp.yml index 51b037a8027..72e1dab90cf 100644 --- a/.yamato/all-vfx_hdrp.yml +++ b/.yamato/all-vfx_hdrp.yml @@ -10,11 +10,11 @@ PR_VFX_HDRP_trunk: name: VFX_HDRP PR Job - trunk dependencies: - - path: .yamato/vfx_hdrp-win-dx11.yml#VFX_HDRP_Win_DX11_Standalone_mono_Linear_trunk + - path: .yamato/vfx_hdrp-win-dx11.yml#VFX_HDRP_Win_DX11_Standalone_cache_mono_Linear_trunk rerun: on-new-revision - path: .yamato/vfx_hdrp-win-dx11.yml#VFX_HDRP_Win_DX11_playmode_XR_mono_Linear_trunk rerun: on-new-revision - - path: .yamato/vfx_hdrp-win-dx12.yml#VFX_HDRP_Win_DX12_Standalone_mono_Linear_trunk + - path: .yamato/vfx_hdrp-win-dx12.yml#VFX_HDRP_Win_DX12_Standalone_cache_mono_Linear_trunk rerun: on-new-revision triggers: expression: pull_request.target eq "master" AND NOT pull_request.draft AND pull_request.changes.any match ["com.unity.visualeffectgraph/**/*", "TestProjects/VisualEffectGraph_HDRP/**/*"] @@ -38,11 +38,11 @@ Nightly_VFX_HDRP_trunk: PR_VFX_HDRP_CUSTOM-REVISION: name: VFX_HDRP PR Job - CUSTOM-REVISION dependencies: - - path: .yamato/vfx_hdrp-win-dx11.yml#VFX_HDRP_Win_DX11_Standalone_mono_Linear_CUSTOM-REVISION + - path: .yamato/vfx_hdrp-win-dx11.yml#VFX_HDRP_Win_DX11_Standalone_cache_mono_Linear_CUSTOM-REVISION rerun: always - path: .yamato/vfx_hdrp-win-dx11.yml#VFX_HDRP_Win_DX11_playmode_XR_mono_Linear_CUSTOM-REVISION rerun: always - - path: .yamato/vfx_hdrp-win-dx12.yml#VFX_HDRP_Win_DX12_Standalone_mono_Linear_CUSTOM-REVISION + - path: .yamato/vfx_hdrp-win-dx12.yml#VFX_HDRP_Win_DX12_Standalone_cache_mono_Linear_CUSTOM-REVISION rerun: always variables: CUSTOM_REVISION: custom_revision_not_set diff --git a/.yamato/all-vfx_urp.yml b/.yamato/all-vfx_urp.yml index 14a85841d17..582e1b26818 100644 --- a/.yamato/all-vfx_urp.yml +++ b/.yamato/all-vfx_urp.yml @@ -10,7 +10,7 @@ PR_VFX_URP_trunk: name: VFX_URP PR Job - trunk dependencies: - - path: .yamato/vfx_urp-win-dx11.yml#VFX_URP_Win_DX11_Standalone_mono_Linear_trunk + - path: .yamato/vfx_urp-win-dx11.yml#VFX_URP_Win_DX11_Standalone_cache_mono_Linear_trunk rerun: on-new-revision triggers: expression: pull_request.target eq "master" AND NOT pull_request.draft AND pull_request.changes.any match ["com.unity.visualeffectgraph/**/*", "TestProjects/VisualEffectGraph_URP/**/*"] @@ -32,7 +32,7 @@ Nightly_VFX_URP_trunk: PR_VFX_URP_CUSTOM-REVISION: name: VFX_URP PR Job - CUSTOM-REVISION dependencies: - - path: .yamato/vfx_urp-win-dx11.yml#VFX_URP_Win_DX11_Standalone_mono_Linear_CUSTOM-REVISION + - path: .yamato/vfx_urp-win-dx11.yml#VFX_URP_Win_DX11_Standalone_cache_mono_Linear_CUSTOM-REVISION rerun: always variables: CUSTOM_REVISION: custom_revision_not_set diff --git a/.yamato/config/_abv.metafile b/.yamato/config/_abv.metafile index d132e23dbde..f4a55b42228 100644 --- a/.yamato/config/_abv.metafile +++ b/.yamato/config/_abv.metafile @@ -29,7 +29,7 @@ trunk_verification: # jobs to include in trunk verification job build_config: mono color_space: Linear test_platforms: - - playmode + - playmode_cache - editmode - project: ShaderGraph platform: Win @@ -37,7 +37,7 @@ trunk_verification: # jobs to include in trunk verification job build_config: mono color_space: Linear test_platforms: - - playmode + - playmode_cache - editmode - project: HDRP platform: Win @@ -45,7 +45,7 @@ trunk_verification: # jobs to include in trunk verification job build_config: mono color_space: Linear test_platforms: - - playmode + - playmode_cache - editmode - project: VFX_HDRP platform: Win @@ -53,7 +53,7 @@ trunk_verification: # jobs to include in trunk verification job build_config: mono color_space: Linear test_platforms: - - playmode + - playmode_cache - editmode - project: VFX_URP platform: Win @@ -61,4 +61,4 @@ trunk_verification: # jobs to include in trunk verification job build_config: mono color_space: Linear test_platforms: - - playmode + - playmode_cache diff --git a/.yamato/config/hdrp.metafile b/.yamato/config/hdrp.metafile index 0f9be6822c4..e31fc37a762 100644 --- a/.yamato/config/hdrp.metafile +++ b/.yamato/config/hdrp.metafile @@ -9,10 +9,10 @@ test_platforms: utr_flags: - [all]: --extra-editor-arg="-adb2" - [all]: --extra-editor-arg="-enableCacheServer" - - [all]: --extra-editor-arg="-cacheServerEndpoint cacheserver-slo.hq.unity3d.com" - - [all]: --extra-editor-arg="-cacheServerNamespacePrefix SRP" - - [all]: --extra-editor-arg="-cacheServerEnableDownload true" - - [all]: --extra-editor-arg="-cacheServerEnableUpload true" + - [all]: --extra-editor-arg="-cacheServerEndpoint" --extra-editor-arg="cacheserver-slo.hq.unity3d.com" + - [all]: --extra-editor-arg="-cacheServerNamespacePrefix" --extra-editor-arg="SRP" + - [all]: --extra-editor-arg="-cacheServerEnableDownload" --extra-editor-arg="true" + - [all]: --extra-editor-arg="-cacheServerEnableUpload" --extra-editor-arg="true" - type: playmode name: playmode_XR utr_flags: @@ -21,6 +21,23 @@ test_platforms: - type: Standalone utr_flags: - [OSX_Metal]: --timeout=2400 + - type: Standalone + name: Standalone_cache + utr_flags: + - [all]: --extra-editor-arg="-adb2" + - [all]: --extra-editor-arg="-enableCacheServer" + - [all]: --extra-editor-arg="-cacheServerEndpoint" --extra-editor-arg="cacheserver-slo.hq.unity3d.com" + - [all]: --extra-editor-arg="-cacheServerNamespacePrefix" --extra-editor-arg="SRP" + - [all]: --extra-editor-arg="-cacheServerEnableDownload" --extra-editor-arg="true" + - [all]: --extra-editor-arg="-cacheServerEnableUpload" --extra-editor-arg="true" + utr_flags_build: + - [all]: --timeout=3000 + - [all]: --extra-editor-arg="-adb2" + - [all]: --extra-editor-arg="-enableCacheServer" + - [all]: --extra-editor-arg="-cacheServerEndpoint" --extra-editor-arg="cacheserver-slo.hq.unity3d.com" + - [all]: --extra-editor-arg="-cacheServerNamespacePrefix" --extra-editor-arg="SRP" + - [all]: --extra-editor-arg="-cacheServerEnableDownload" --extra-editor-arg="true" + - [all]: --extra-editor-arg="-cacheServerEnableUpload" --extra-editor-arg="true" expression_trigger: expression: 'pull_request.target eq "master" AND NOT pull_request.draft AND pull_request.changes.any match ["com.unity.render-pipelines.high-definition/**/*", "com.unity.render-pipelines.high-definition-config/**/*", "TestProjects/HDRP_Tests/**/*"]' platforms: @@ -78,7 +95,7 @@ pr: build_config: mono color_space: Linear test_platforms: - - Standalone + - Standalone_cache - playmode_cache - playmode_XR - editmode @@ -131,14 +148,14 @@ nightly: build_config: mono color_space: Linear test_platforms: - - Standalone + - Standalone_cache - playmode_XR - platform: Win api: Vulkan build_config: mono color_space: Linear test_platforms: - - Standalone + - Standalone_cache - playmode_XR - platform: Linux api: Vulkan diff --git a/.yamato/config/hdrp_dxr.metafile b/.yamato/config/hdrp_dxr.metafile index 349950753b2..cccf86934e1 100644 --- a/.yamato/config/hdrp_dxr.metafile +++ b/.yamato/config/hdrp_dxr.metafile @@ -9,14 +9,31 @@ test_platforms: utr_flags: - [all]: --extra-editor-arg="-adb2" - [all]: --extra-editor-arg="-enableCacheServer" - - [all]: --extra-editor-arg="-cacheServerEndpoint cacheserver-slo.hq.unity3d.com" - - [all]: --extra-editor-arg="-cacheServerNamespacePrefix SRP" - - [all]: --extra-editor-arg="-cacheServerEnableDownload true" - - [all]: --extra-editor-arg="-cacheServerEnableUpload true" + - [all]: --extra-editor-arg="-cacheServerEndpoint" --extra-editor-arg="cacheserver-slo.hq.unity3d.com" + - [all]: --extra-editor-arg="-cacheServerNamespacePrefix" --extra-editor-arg="SRP" + - [all]: --extra-editor-arg="-cacheServerEnableDownload" --extra-editor-arg="true" + - [all]: --extra-editor-arg="-cacheServerEnableUpload" --extra-editor-arg="true" - type: playmode name: playmode_XR utr_flags: - - [all]: --extra-editor-arg="-xr-reuse-tests" + - [all]: --extra-editor-arg="-xr-tests" + - type: Standalone + name: Standalone_cache + utr_flags: + - [all]: --extra-editor-arg="-adb2" + - [all]: --extra-editor-arg="-enableCacheServer" + - [all]: --extra-editor-arg="-cacheServerEndpoint" --extra-editor-arg="cacheserver-slo.hq.unity3d.com" + - [all]: --extra-editor-arg="-cacheServerNamespacePrefix" --extra-editor-arg="SRP" + - [all]: --extra-editor-arg="-cacheServerEnableDownload" --extra-editor-arg="true" + - [all]: --extra-editor-arg="-cacheServerEnableUpload" --extra-editor-arg="true" + utr_flags_build: + - [all]: --timeout=3000 + - [all]: --extra-editor-arg="-adb2" + - [all]: --extra-editor-arg="-enableCacheServer" + - [all]: --extra-editor-arg="-cacheServerEndpoint" --extra-editor-arg="cacheserver-slo.hq.unity3d.com" + - [all]: --extra-editor-arg="-cacheServerNamespacePrefix" --extra-editor-arg="SRP" + - [all]: --extra-editor-arg="-cacheServerEnableDownload" --extra-editor-arg="true" + - [all]: --extra-editor-arg="-cacheServerEnableUpload" --extra-editor-arg="true" expression_trigger: expression: "" platforms: @@ -51,4 +68,4 @@ nightly: color_space: Linear test_platforms: - playmode_XR - # - Standalone + # - Standalone_cache diff --git a/.yamato/config/hdrp_hybrid.metafile b/.yamato/config/hdrp_hybrid.metafile index 8150c08987a..8ce1f3f7d4a 100644 --- a/.yamato/config/hdrp_hybrid.metafile +++ b/.yamato/config/hdrp_hybrid.metafile @@ -11,10 +11,10 @@ test_platforms: - [all]: --compilation-errors-as-warnings - [all]: --extra-editor-arg="-adb2" - [all]: --extra-editor-arg="-enableCacheServer" - - [all]: --extra-editor-arg="-cacheServerEndpoint cacheserver-slo.hq.unity3d.com" - - [all]: --extra-editor-arg="-cacheServerNamespacePrefix SRP" - - [all]: --extra-editor-arg="-cacheServerEnableDownload true" - - [all]: --extra-editor-arg="-cacheServerEnableUpload true" + - [all]: --extra-editor-arg="-cacheServerEndpoint" --extra-editor-arg="cacheserver-slo.hq.unity3d.com" + - [all]: --extra-editor-arg="-cacheServerNamespacePrefix" --extra-editor-arg="SRP" + - [all]: --extra-editor-arg="-cacheServerEnableDownload" --extra-editor-arg="true" + - [all]: --extra-editor-arg="-cacheServerEnableUpload" --extra-editor-arg="true" - type: playmode name: playmode_XR utr_flags: @@ -29,6 +29,25 @@ test_platforms: - [OSX_Metal]: --timeout=2400 utr_flags_build: - [all]: --compilation-errors-as-warnings + - type: Standalone + name: Standalone_cache + utr_flags: + - [all]: --compilation-errors-as-warnings + - [all]: --extra-editor-arg="-adb2" + - [all]: --extra-editor-arg="-enableCacheServer" + - [all]: --extra-editor-arg="-cacheServerEndpoint" --extra-editor-arg="cacheserver-slo.hq.unity3d.com" + - [all]: --extra-editor-arg="-cacheServerNamespacePrefix" --extra-editor-arg="SRP" + - [all]: --extra-editor-arg="-cacheServerEnableDownload" --extra-editor-arg="true" + - [all]: --extra-editor-arg="-cacheServerEnableUpload" --extra-editor-arg="true" + utr_flags_build: + - [all]: --compilation-errors-as-warnings + - [all]: --timeout=3000 + - [all]: --extra-editor-arg="-adb2" + - [all]: --extra-editor-arg="-enableCacheServer" + - [all]: --extra-editor-arg="-cacheServerEndpoint" --extra-editor-arg="cacheserver-slo.hq.unity3d.com" + - [all]: --extra-editor-arg="-cacheServerNamespacePrefix" --extra-editor-arg="SRP" + - [all]: --extra-editor-arg="-cacheServerEnableDownload" --extra-editor-arg="true" + - [all]: --extra-editor-arg="-cacheServerEnableUpload" --extra-editor-arg="true" expression_trigger: expression: "" platforms: @@ -55,6 +74,7 @@ platforms: - name: OpenGLCore exclude_test_platforms: - name: Standalone + - name: Standalone_cache - name: playmode_XR - name: Vulkan exclude_test_platforms: diff --git a/.yamato/config/shadergraph.metafile b/.yamato/config/shadergraph.metafile index 71697caf6d4..73210d87a4b 100644 --- a/.yamato/config/shadergraph.metafile +++ b/.yamato/config/shadergraph.metafile @@ -11,11 +11,28 @@ test_platforms: utr_flags: - [all]: --extra-editor-arg="-adb2" - [all]: --extra-editor-arg="-enableCacheServer" - - [all]: --extra-editor-arg="-cacheServerEndpoint cacheserver-slo.hq.unity3d.com" - - [all]: --extra-editor-arg="-cacheServerNamespacePrefix SRP" - - [all]: --extra-editor-arg="-cacheServerEnableDownload true" - - [all]: --extra-editor-arg="-cacheServerEnableUpload true" + - [all]: --extra-editor-arg="-cacheServerEndpoint" --extra-editor-arg="cacheserver-slo.hq.unity3d.com" + - [all]: --extra-editor-arg="-cacheServerNamespacePrefix" --extra-editor-arg="SRP" + - [all]: --extra-editor-arg="-cacheServerEnableDownload" --extra-editor-arg="true" + - [all]: --extra-editor-arg="-cacheServerEnableUpload" --extra-editor-arg="true" - type: editmode + - type: Standalone + name: Standalone_cache + utr_flags: + - [all]: --extra-editor-arg="-adb2" + - [all]: --extra-editor-arg="-enableCacheServer" + - [all]: --extra-editor-arg="-cacheServerEndpoint" --extra-editor-arg="cacheserver-slo.hq.unity3d.com" + - [all]: --extra-editor-arg="-cacheServerNamespacePrefix" --extra-editor-arg="SRP" + - [all]: --extra-editor-arg="-cacheServerEnableDownload" --extra-editor-arg="true" + - [all]: --extra-editor-arg="-cacheServerEnableUpload" --extra-editor-arg="true" + utr_flags_build: + - [all]: --timeout=3000 + - [all]: --extra-editor-arg="-adb2" + - [all]: --extra-editor-arg="-enableCacheServer" + - [all]: --extra-editor-arg="-cacheServerEndpoint" --extra-editor-arg="cacheserver-slo.hq.unity3d.com" + - [all]: --extra-editor-arg="-cacheServerNamespacePrefix" --extra-editor-arg="SRP" + - [all]: --extra-editor-arg="-cacheServerEnableDownload" --extra-editor-arg="true" + - [all]: --extra-editor-arg="-cacheServerEnableUpload" --extra-editor-arg="true" expression_trigger: expression: 'pull_request.target eq "master" AND NOT pull_request.draft AND pull_request.changes.any match ["com.unity.shadergraph/**/*", "TestProjects/ShaderGraph/**/*"]' platforms: @@ -35,6 +52,7 @@ platforms: - name: OpenGLCore exclude_test_platforms: - name: Standalone + - name: Standalone_cache build_configs: - name: mono color_spaces: @@ -44,6 +62,7 @@ platforms: - name: OpenGLCore exclude_test_platforms: - name: Standalone + - name: Standalone_cache - name: Vulkan build_configs: - name: mono @@ -86,7 +105,7 @@ pr: build_config: mono color_space: Linear test_platforms: - - Standalone + - Standalone_cache - platform: OSX api: OpenGLCore build_config: mono @@ -98,20 +117,20 @@ pr: build_config: mono color_space: Linear test_platforms: - - Standalone + - Standalone_cache - platform: OSX api: Metal build_config: mono color_space: Linear test_platforms: - # - Standalone + # - Standalone_cache - playmode_cache - platform: iPhone api: Metal build_config: il2cpp color_space: Linear test_platforms: - - Standalone + - Standalone_cache - project: ShaderGraph_Stereo pr: true nightly: @@ -139,5 +158,5 @@ nightly: build_config: il2cpp color_space: Linear test_platforms: - - Standalone + - Standalone_cache diff --git a/.yamato/config/shadergraph_stereo.metafile b/.yamato/config/shadergraph_stereo.metafile index ca301bcf087..b3253c9ec9a 100644 --- a/.yamato/config/shadergraph_stereo.metafile +++ b/.yamato/config/shadergraph_stereo.metafile @@ -4,6 +4,23 @@ project: test_platforms: - type: Standalone - type: editmode + - type: Standalone + name: Standalone_cache + utr_flags: + - [all]: --extra-editor-arg="-adb2" + - [all]: --extra-editor-arg="-enableCacheServer" + - [all]: --extra-editor-arg="-cacheServerEndpoint" --extra-editor-arg="cacheserver-slo.hq.unity3d.com" + - [all]: --extra-editor-arg="-cacheServerNamespacePrefix" --extra-editor-arg="SRP" + - [all]: --extra-editor-arg="-cacheServerEnableDownload" --extra-editor-arg="true" + - [all]: --extra-editor-arg="-cacheServerEnableUpload" --extra-editor-arg="true" + utr_flags_build: + - [all]: --timeout=3000 + - [all]: --extra-editor-arg="-adb2" + - [all]: --extra-editor-arg="-enableCacheServer" + - [all]: --extra-editor-arg="-cacheServerEndpoint" --extra-editor-arg="cacheserver-slo.hq.unity3d.com" + - [all]: --extra-editor-arg="-cacheServerNamespacePrefix" --extra-editor-arg="SRP" + - [all]: --extra-editor-arg="-cacheServerEnableDownload" --extra-editor-arg="true" + - [all]: --extra-editor-arg="-cacheServerEnableUpload" --extra-editor-arg="true" platforms: - name: Win apis: @@ -20,7 +37,7 @@ pr: build_config: mono color_space: Linear test_platforms: - - Standalone + - Standalone_cache - editmode nightly: dependencies: diff --git a/.yamato/config/universal.metafile b/.yamato/config/universal.metafile index 388f669bdfc..6593c9954e0 100644 --- a/.yamato/config/universal.metafile +++ b/.yamato/config/universal.metafile @@ -16,15 +16,32 @@ test_platforms: utr_flags: - [all]: --extra-editor-arg="-adb2" - [all]: --extra-editor-arg="-enableCacheServer" - - [all]: --extra-editor-arg="-cacheServerEndpoint cacheserver-slo.hq.unity3d.com" - - [all]: --extra-editor-arg="-cacheServerNamespacePrefix SRP" - - [all]: --extra-editor-arg="-cacheServerEnableDownload true" - - [all]: --extra-editor-arg="-cacheServerEnableUpload true" + - [all]: --extra-editor-arg="-cacheServerEndpoint" --extra-editor-arg="cacheserver-slo.hq.unity3d.com" + - [all]: --extra-editor-arg="-cacheServerNamespacePrefix" --extra-editor-arg="SRP" + - [all]: --extra-editor-arg="-cacheServerEnableDownload" --extra-editor-arg="true" + - [all]: --extra-editor-arg="-cacheServerEnableUpload" --extra-editor-arg="true" - type: editmode - type: playmode name: playmode_XR utr_flags: - [all]: --extra-editor-arg="-xr-reuse-tests" + - type: Standalone + name: Standalone_cache + utr_flags: + - [all]: --extra-editor-arg="-adb2" + - [all]: --extra-editor-arg="-enableCacheServer" + - [all]: --extra-editor-arg="-cacheServerEndpoint" --extra-editor-arg="cacheserver-slo.hq.unity3d.com" + - [all]: --extra-editor-arg="-cacheServerNamespacePrefix" --extra-editor-arg="SRP" + - [all]: --extra-editor-arg="-cacheServerEnableDownload" --extra-editor-arg="true" + - [all]: --extra-editor-arg="-cacheServerEnableUpload" --extra-editor-arg="true" + utr_flags_build: + - [all]: --timeout=3000 + - [all]: --extra-editor-arg="-adb2" + - [all]: --extra-editor-arg="-enableCacheServer" + - [all]: --extra-editor-arg="-cacheServerEndpoint" --extra-editor-arg="cacheserver-slo.hq.unity3d.com" + - [all]: --extra-editor-arg="-cacheServerNamespacePrefix" --extra-editor-arg="SRP" + - [all]: --extra-editor-arg="-cacheServerEnableDownload" --extra-editor-arg="true" + - [all]: --extra-editor-arg="-cacheServerEnableUpload" --extra-editor-arg="true" expression_trigger: expression: 'pull_request.target eq "master" AND NOT pull_request.draft AND pull_request.changes.any match ["com.unity.render-pipelines.universal/**/*", "TestProjects/UniversalGraphicsTest/**/*"]' platforms: @@ -46,6 +63,7 @@ platforms: exclude_test_platforms: - name: playmode_XR - name: Standalone + - name: Standalone_cache build_configs: - name: mono color_spaces: @@ -55,6 +73,7 @@ platforms: - name: OpenGLCore exclude_test_platforms: - name: Standalone + - name: Standalone_cache - name: playmode_XR - name: Vulkan exclude_test_platforms: @@ -100,7 +119,7 @@ pr: build_config: mono color_space: Linear test_platforms: - - Standalone + - Standalone_cache - playmode_XR - editmode - platform: Win @@ -108,43 +127,43 @@ pr: build_config: mono color_space: Linear test_platforms: - - Standalone + - Standalone_cache - platform: Win api: Vulkan build_config: mono color_space: Linear test_platforms: - - Standalone + - Standalone_cache - platform: Linux api: Vulkan build_config: mono color_space: Linear test_platforms: - - Standalone + - Standalone_cache - platform: Android api: OpenGLES3 build_config: il2cpp color_space: Linear test_platforms: - - Standalone + - Standalone_cache - platform: Android api: Vulkan build_config: il2cpp color_space: Linear test_platforms: - - Standalone + - Standalone_cache - platform: iPhone api: Metal build_config: il2cpp color_space: Linear test_platforms: - - Standalone + - Standalone_cache - platform: OSX api: Metal build_config: mono color_space: Linear test_platforms: - # - Standalone + # - Standalone_cache - playmode_cache - platform: OSX api: OpenGLCore @@ -157,19 +176,19 @@ pr: build_config: il2cpp color_space: Linear test_platforms: - - Standalone + - Standalone_cache - platform: Android api: Vulkan build_config: il2cpp color_space: Linear test_platforms: - - Standalone + - Standalone_cache - platform: iPhone api: Metal build_config: il2cpp color_space: Linear test_platforms: - - Standalone + - Standalone_cache - project: Universal_Stereo pr: true - project: Universal_Hybrid diff --git a/.yamato/config/universal_hybrid.metafile b/.yamato/config/universal_hybrid.metafile index 7a95e6e95e6..aaa7269d3e0 100644 --- a/.yamato/config/universal_hybrid.metafile +++ b/.yamato/config/universal_hybrid.metafile @@ -18,10 +18,27 @@ test_platforms: - [all]: --compilation-errors-as-warnings - [all]: --extra-editor-arg="-adb2" - [all]: --extra-editor-arg="-enableCacheServer" - - [all]: --extra-editor-arg="-cacheServerEndpoint cacheserver-slo.hq.unity3d.com" - - [all]: --extra-editor-arg="-cacheServerNamespacePrefix SRP" - - [all]: --extra-editor-arg="-cacheServerEnableDownload true" - - [all]: --extra-editor-arg="-cacheServerEnableUpload true" + - [all]: --extra-editor-arg="-cacheServerEndpoint" --extra-editor-arg="cacheserver-slo.hq.unity3d.com" + - [all]: --extra-editor-arg="-cacheServerNamespacePrefix" --extra-editor-arg="SRP" + - [all]: --extra-editor-arg="-cacheServerEnableDownload" --extra-editor-arg="true" + - [all]: --extra-editor-arg="-cacheServerEnableUpload" --extra-editor-arg="true" + - type: Standalone + name: Standalone_cache + utr_flags: + - [all]: --extra-editor-arg="-adb2" + - [all]: --extra-editor-arg="-enableCacheServer" + - [all]: --extra-editor-arg="-cacheServerEndpoint" --extra-editor-arg="cacheserver-slo.hq.unity3d.com" + - [all]: --extra-editor-arg="-cacheServerNamespacePrefix" --extra-editor-arg="SRP" + - [all]: --extra-editor-arg="-cacheServerEnableDownload" --extra-editor-arg="true" + - [all]: --extra-editor-arg="-cacheServerEnableUpload" --extra-editor-arg="true" + utr_flags_build: + - [all]: --timeout=3000 + - [all]: --extra-editor-arg="-adb2" + - [all]: --extra-editor-arg="-enableCacheServer" + - [all]: --extra-editor-arg="-cacheServerEndpoint" --extra-editor-arg="cacheserver-slo.hq.unity3d.com" + - [all]: --extra-editor-arg="-cacheServerNamespacePrefix" --extra-editor-arg="SRP" + - [all]: --extra-editor-arg="-cacheServerEnableDownload" --extra-editor-arg="true" + - [all]: --extra-editor-arg="-cacheServerEnableUpload" --extra-editor-arg="true" expression_trigger: expression: "" platforms: @@ -47,6 +64,7 @@ platforms: - name: OpenGLCore exclude_test_platforms: - name: Standalone + - name: Standalone_cache - name: playmode_XR - name: Vulkan exclude_test_platforms: diff --git a/.yamato/config/universal_stereo.metafile b/.yamato/config/universal_stereo.metafile index cb0c1f54529..9137e71c1fe 100644 --- a/.yamato/config/universal_stereo.metafile +++ b/.yamato/config/universal_stereo.metafile @@ -6,6 +6,25 @@ test_platforms: utr_flags: - [all]: compilation-errors-as-warnings - type: editmode + - type: Standalone + name: Standalone_cache + utr_flags: + - [all]: compilation-errors-as-warnings + - [all]: --extra-editor-arg="-adb2" + - [all]: --extra-editor-arg="-enableCacheServer" + - [all]: --extra-editor-arg="-cacheServerEndpoint" --extra-editor-arg="cacheserver-slo.hq.unity3d.com" + - [all]: --extra-editor-arg="-cacheServerNamespacePrefix" --extra-editor-arg="SRP" + - [all]: --extra-editor-arg="-cacheServerEnableDownload" --extra-editor-arg="true" + - [all]: --extra-editor-arg="-cacheServerEnableUpload" --extra-editor-arg="true" + utr_flags_build: + - [all]: compilation-errors-as-warnings + - [all]: --timeout=3000 + - [all]: --extra-editor-arg="-adb2" + - [all]: --extra-editor-arg="-enableCacheServer" + - [all]: --extra-editor-arg="-cacheServerEndpoint" --extra-editor-arg="cacheserver-slo.hq.unity3d.com" + - [all]: --extra-editor-arg="-cacheServerNamespacePrefix" --extra-editor-arg="SRP" + - [all]: --extra-editor-arg="-cacheServerEnableDownload" --extra-editor-arg="true" + - [all]: --extra-editor-arg="-cacheServerEnableUpload" --extra-editor-arg="true" expression_trigger: expression: "" platforms: @@ -22,7 +41,7 @@ pr: build_config: mono color_space: Linear test_platforms: - - Standalone + - Standalone_cache - editmode nightly: dependencies: diff --git a/.yamato/config/vfx_hdrp.metafile b/.yamato/config/vfx_hdrp.metafile index 934fe5256b5..85cddeedd4f 100644 --- a/.yamato/config/vfx_hdrp.metafile +++ b/.yamato/config/vfx_hdrp.metafile @@ -11,15 +11,32 @@ test_platforms: utr_flags: - [all]: --extra-editor-arg="-adb2" - [all]: --extra-editor-arg="-enableCacheServer" - - [all]: --extra-editor-arg="-cacheServerEndpoint cacheserver-slo.hq.unity3d.com" - - [all]: --extra-editor-arg="-cacheServerNamespacePrefix SRP" - - [all]: --extra-editor-arg="-cacheServerEnableDownload true" - - [all]: --extra-editor-arg="-cacheServerEnableUpload true" + - [all]: --extra-editor-arg="-cacheServerEndpoint" --extra-editor-arg="cacheserver-slo.hq.unity3d.com" + - [all]: --extra-editor-arg="-cacheServerNamespacePrefix" --extra-editor-arg="SRP" + - [all]: --extra-editor-arg="-cacheServerEnableDownload" --extra-editor-arg="true" + - [all]: --extra-editor-arg="-cacheServerEnableUpload" --extra-editor-arg="true" - type: playmode name: playmode_XR utr_flags: - [all]: --extra-editor-arg="-xr-reuse-tests" - type: editmode + - type: Standalone + name: Standalone_cache + utr_flags: + - [all]: --extra-editor-arg="-adb2" + - [all]: --extra-editor-arg="-enableCacheServer" + - [all]: --extra-editor-arg="-cacheServerEndpoint" --extra-editor-arg="cacheserver-slo.hq.unity3d.com" + - [all]: --extra-editor-arg="-cacheServerNamespacePrefix" --extra-editor-arg="SRP" + - [all]: --extra-editor-arg="-cacheServerEnableDownload" --extra-editor-arg="true" + - [all]: --extra-editor-arg="-cacheServerEnableUpload" --extra-editor-arg="true" + utr_flags_build: + - [all]: --timeout=3000 + - [all]: --extra-editor-arg="-adb2" + - [all]: --extra-editor-arg="-enableCacheServer" + - [all]: --extra-editor-arg="-cacheServerEndpoint" --extra-editor-arg="cacheserver-slo.hq.unity3d.com" + - [all]: --extra-editor-arg="-cacheServerNamespacePrefix" --extra-editor-arg="SRP" + - [all]: --extra-editor-arg="-cacheServerEnableDownload" --extra-editor-arg="true" + - [all]: --extra-editor-arg="-cacheServerEnableUpload" --extra-editor-arg="true" expression_trigger: expression: 'pull_request.target eq "master" AND NOT pull_request.draft AND pull_request.changes.any match ["com.unity.visualeffectgraph/**/*", "TestProjects/VisualEffectGraph_HDRP/**/*"]' platforms: @@ -77,14 +94,14 @@ pr: build_config: mono color_space: Linear test_platforms: - - Standalone + - Standalone_cache - playmode_XR - platform: Win api: DX12 build_config: mono color_space: Linear test_platforms: - - Standalone + - Standalone_cache nightly: dependencies: - project: VFX_HDRP diff --git a/.yamato/config/vfx_urp.metafile b/.yamato/config/vfx_urp.metafile index 1636f626b7d..b15301640eb 100644 --- a/.yamato/config/vfx_urp.metafile +++ b/.yamato/config/vfx_urp.metafile @@ -11,10 +11,27 @@ test_platforms: utr_flags: - [all]: --extra-editor-arg="-adb2" - [all]: --extra-editor-arg="-enableCacheServer" - - [all]: --extra-editor-arg="-cacheServerEndpoint cacheserver-slo.hq.unity3d.com" - - [all]: --extra-editor-arg="-cacheServerNamespacePrefix SRP" - - [all]: --extra-editor-arg="-cacheServerEnableDownload true" - - [all]: --extra-editor-arg="-cacheServerEnableUpload true" + - [all]: --extra-editor-arg="-cacheServerEndpoint" --extra-editor-arg="cacheserver-slo.hq.unity3d.com" + - [all]: --extra-editor-arg="-cacheServerNamespacePrefix" --extra-editor-arg="SRP" + - [all]: --extra-editor-arg="-cacheServerEnableDownload" --extra-editor-arg="true" + - [all]: --extra-editor-arg="-cacheServerEnableUpload" --extra-editor-arg="true" + - type: Standalone + name: Standalone_cache + utr_flags: + - [all]: --extra-editor-arg="-adb2" + - [all]: --extra-editor-arg="-enableCacheServer" + - [all]: --extra-editor-arg="-cacheServerEndpoint" --extra-editor-arg="cacheserver-slo.hq.unity3d.com" + - [all]: --extra-editor-arg="-cacheServerNamespacePrefix" --extra-editor-arg="SRP" + - [all]: --extra-editor-arg="-cacheServerEnableDownload" --extra-editor-arg="true" + - [all]: --extra-editor-arg="-cacheServerEnableUpload" --extra-editor-arg="true" + utr_flags_build: + - [all]: --timeout=3000 + - [all]: --extra-editor-arg="-adb2" + - [all]: --extra-editor-arg="-enableCacheServer" + - [all]: --extra-editor-arg="-cacheServerEndpoint" --extra-editor-arg="cacheserver-slo.hq.unity3d.com" + - [all]: --extra-editor-arg="-cacheServerNamespacePrefix" --extra-editor-arg="SRP" + - [all]: --extra-editor-arg="-cacheServerEnableDownload" --extra-editor-arg="true" + - [all]: --extra-editor-arg="-cacheServerEnableUpload" --extra-editor-arg="true" # - type: editmode expression_trigger: expression: 'pull_request.target eq "master" AND NOT pull_request.draft AND pull_request.changes.any match ["com.unity.visualeffectgraph/**/*", "TestProjects/VisualEffectGraph_URP/**/*"]' @@ -37,6 +54,7 @@ platforms: exclude_test_platforms: - name: playmode_XR - name: Standalone + - name: Standalone_cache build_configs: - name: mono color_spaces: @@ -46,6 +64,7 @@ platforms: - name: OpenGLCore exclude_test_platforms: - name: Standalone + - name: Standalone_cache - name: playmode_XR - name: Vulkan exclude_test_platforms: @@ -81,7 +100,7 @@ pr: build_config: mono color_space: Linear test_platforms: - - Standalone + - Standalone_cache nightly: dependencies: - project: VFX_URP @@ -97,5 +116,5 @@ nightly: build_config: mono color_space: Linear test_platforms: - # - Standalone + # - Standalone_cache - playmode_cache \ No newline at end of file diff --git a/.yamato/hdrp-linux-vulkan.yml b/.yamato/hdrp-linux-vulkan.yml index 36c194926e0..8a30204243b 100644 --- a/.yamato/hdrp-linux-vulkan.yml +++ b/.yamato/hdrp-linux-vulkan.yml @@ -49,7 +49,7 @@ HDRP_Linux_Vulkan_playmode_cache_mono_Linear_trunk: - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr --output TestProjects/HDRP_Tests/utr - chmod +x TestProjects/HDRP_Tests/utr - cd TestProjects/HDRP_Tests && sudo unity-downloader-cli -u {{editor_versions.trunk_latest_internal.linux.revision}} -c editor -c il2cpp --wait --published-only - - cd TestProjects/HDRP_Tests && DISPLAY=:0.0 ./utr --artifacts_path=test-results --editor-location=.Editor --extra-editor-arg="-adb2" --extra-editor-arg="-cacheServerEnableDownload true" --extra-editor-arg="-cacheServerEnableUpload true" --extra-editor-arg="-cacheServerEndpoint cacheserver-slo.hq.unity3d.com" --extra-editor-arg="-cacheServerNamespacePrefix SRP" --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-enableCacheServer" --extra-editor-arg="-force-vulkan" --reruncount=2 --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=. --zero-tests-are-ok=1 + - cd TestProjects/HDRP_Tests && DISPLAY=:0.0 ./utr --artifacts_path=test-results --editor-location=.Editor --extra-editor-arg="-adb2" --extra-editor-arg="-cacheServerEnableDownload" --extra-editor-arg="true" --extra-editor-arg="-cacheServerEnableUpload" --extra-editor-arg="true" --extra-editor-arg="-cacheServerEndpoint" --extra-editor-arg="cacheserver-slo.hq.unity3d.com" --extra-editor-arg="-cacheServerNamespacePrefix" --extra-editor-arg="SRP" --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-enableCacheServer" --extra-editor-arg="-force-vulkan" --reruncount=2 --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=. --zero-tests-are-ok=1 artifacts: logs: paths: @@ -128,6 +128,55 @@ Build_HDRP_Linux_Vulkan_Standalone_mono_Linear_trunk: players: paths: - "players*/**" +HDRP_Linux_Vulkan_Standalone_cache_mono_Linear_trunk: + name: HDRP on Linux_Vulkan_Standalone_cache_mono_Linear on version trunk + agent: + type: Unity::VM::GPU + image: package-ci/ubuntu:stable + flavor: b1.large + variables: + UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates + UTR_VERSION: "current" + TEST_FILTER: .* + commands: + - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr --output TestProjects/HDRP_RuntimeTests/utr + - chmod +x TestProjects/HDRP_RuntimeTests/utr + - cd TestProjects/HDRP_RuntimeTests && ./utr --artifacts_path=test-results --extra-editor-arg="-adb2" --extra-editor-arg="-cacheServerEnableDownload" --extra-editor-arg="true" --extra-editor-arg="-cacheServerEnableUpload" --extra-editor-arg="true" --extra-editor-arg="-cacheServerEndpoint" --extra-editor-arg="cacheserver-slo.hq.unity3d.com" --extra-editor-arg="-cacheServerNamespacePrefix" --extra-editor-arg="SRP" --extra-editor-arg="-enableCacheServer" --platform=StandaloneLinux64 --player-connection-ip=auto --player-load-path=../../players --reruncount=2 --suite=playmode --timeout=1200 --zero-tests-are-ok=1 + artifacts: + logs: + paths: + - "**/test-results/**" + - "TestProjects/HDRP_RuntimeTests/Logs/*.log" + dependencies: + - path: .yamato/hdrp-linux-vulkan.yml#Build_HDRP_Linux_Vulkan_Standalone_cache_mono_Linear_trunk + rerun: on-new-revision +Build_HDRP_Linux_Vulkan_Standalone_cache_mono_Linear_trunk: + name: Build HDRP on Linux_Vulkan_mono_Linear_Standalone_cache_build_Player on version trunk + agent: + type: Unity::VM + image: package-ci/ubuntu:stable + flavor: b1.xlarge + variables: + UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates + UTR_VERSION: "current" + TEST_FILTER: .* + commands: + - curl -L https://artifactory.prd.it.unity3d.com/artifactory/api/gpg/key/public | sudo apt-key add - + - sudo sh -c "echo 'deb https://artifactory.prd.it.unity3d.com/artifactory/unity-apt-local bionic main' > /etc/apt/sources.list.d/unity.list" + - sudo apt update + - sudo apt install unity-downloader-cli + - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr --output TestProjects/HDRP_RuntimeTests/utr + - chmod +x TestProjects/HDRP_RuntimeTests/utr + - cd TestProjects/HDRP_RuntimeTests && sudo unity-downloader-cli -u {{editor_versions.trunk_latest_internal.linux.revision}} -c editor -c il2cpp --wait --published-only + - cd TestProjects/HDRP_RuntimeTests && DISPLAY=:0.0 ./utr --artifacts_path=test-results --build-only --editor-location=.Editor --extra-editor-arg="-adb2" --extra-editor-arg="-cacheServerEnableDownload" --extra-editor-arg="true" --extra-editor-arg="-cacheServerEnableUpload" --extra-editor-arg="true" --extra-editor-arg="-cacheServerEndpoint" --extra-editor-arg="cacheserver-slo.hq.unity3d.com" --extra-editor-arg="-cacheServerNamespacePrefix" --extra-editor-arg="SRP" --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-enableCacheServer" --extra-editor-arg="-executemethod" --extra-editor-arg="SetupProject.ApplySettings" --extra-editor-arg="vulkan" --extra-editor-arg="Linear" --extra-editor-arg="-playergraphicsapi=Vulkan" --platform=StandaloneLinux64 --player-save-path=../../players --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=. --timeout=3000 + artifacts: + logs: + paths: + - "**/test-results/**" + - "TestProjects/HDRP_RuntimeTests/Logs/*.log" + players: + paths: + - "players*/**" HDRP_Linux_Vulkan_playmode_mono_Linear_CUSTOM-REVISION: name: HDRP on Linux_Vulkan_playmode_mono_Linear on version CUSTOM-REVISION agent: @@ -175,7 +224,7 @@ HDRP_Linux_Vulkan_playmode_cache_mono_Linear_CUSTOM-REVISION: - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr --output TestProjects/HDRP_Tests/utr - chmod +x TestProjects/HDRP_Tests/utr - cd TestProjects/HDRP_Tests && sudo unity-downloader-cli --source-file ../../unity_revision.txt -c editor -c il2cpp --wait --published-only - - cd TestProjects/HDRP_Tests && DISPLAY=:0.0 ./utr --artifacts_path=test-results --editor-location=.Editor --extra-editor-arg="-adb2" --extra-editor-arg="-cacheServerEnableDownload true" --extra-editor-arg="-cacheServerEnableUpload true" --extra-editor-arg="-cacheServerEndpoint cacheserver-slo.hq.unity3d.com" --extra-editor-arg="-cacheServerNamespacePrefix SRP" --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-enableCacheServer" --extra-editor-arg="-force-vulkan" --reruncount=2 --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=. --zero-tests-are-ok=1 + - cd TestProjects/HDRP_Tests && DISPLAY=:0.0 ./utr --artifacts_path=test-results --editor-location=.Editor --extra-editor-arg="-adb2" --extra-editor-arg="-cacheServerEnableDownload" --extra-editor-arg="true" --extra-editor-arg="-cacheServerEnableUpload" --extra-editor-arg="true" --extra-editor-arg="-cacheServerEndpoint" --extra-editor-arg="cacheserver-slo.hq.unity3d.com" --extra-editor-arg="-cacheServerNamespacePrefix" --extra-editor-arg="SRP" --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-enableCacheServer" --extra-editor-arg="-force-vulkan" --reruncount=2 --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=. --zero-tests-are-ok=1 artifacts: logs: paths: @@ -268,3 +317,59 @@ Build_HDRP_Linux_Vulkan_Standalone_mono_Linear_CUSTOM-REVISION: dependencies: - path: .yamato/_editor_priming.yml#editor:priming:CUSTOM-REVISION:linux rerun: always +HDRP_Linux_Vulkan_Standalone_cache_mono_Linear_CUSTOM-REVISION: + name: HDRP on Linux_Vulkan_Standalone_cache_mono_Linear on version CUSTOM-REVISION + agent: + type: Unity::VM::GPU + image: package-ci/ubuntu:stable + flavor: b1.large + variables: + UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates + CUSTOM_REVISION: custom_revision_not_set + UTR_VERSION: "current" + TEST_FILTER: .* + commands: + - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr --output TestProjects/HDRP_RuntimeTests/utr + - chmod +x TestProjects/HDRP_RuntimeTests/utr + - cd TestProjects/HDRP_RuntimeTests && ./utr --artifacts_path=test-results --extra-editor-arg="-adb2" --extra-editor-arg="-cacheServerEnableDownload" --extra-editor-arg="true" --extra-editor-arg="-cacheServerEnableUpload" --extra-editor-arg="true" --extra-editor-arg="-cacheServerEndpoint" --extra-editor-arg="cacheserver-slo.hq.unity3d.com" --extra-editor-arg="-cacheServerNamespacePrefix" --extra-editor-arg="SRP" --extra-editor-arg="-enableCacheServer" --platform=StandaloneLinux64 --player-connection-ip=auto --player-load-path=../../players --reruncount=2 --suite=playmode --timeout=1200 --zero-tests-are-ok=1 + artifacts: + logs: + paths: + - "**/test-results/**" + - "TestProjects/HDRP_RuntimeTests/Logs/*.log" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:CUSTOM-REVISION:linux + rerun: always + - path: .yamato/hdrp-linux-vulkan.yml#Build_HDRP_Linux_Vulkan_Standalone_cache_mono_Linear_CUSTOM-REVISION + rerun: always +Build_HDRP_Linux_Vulkan_Standalone_cache_mono_Linear_CUSTOM-REVISION: + name: Build HDRP on Linux_Vulkan_mono_Linear_Standalone_cache_build_Player on version CUSTOM-REVISION + agent: + type: Unity::VM + image: package-ci/ubuntu:stable + flavor: b1.xlarge + variables: + UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates + CUSTOM_REVISION: custom_revision_not_set + UTR_VERSION: "current" + TEST_FILTER: .* + commands: + - curl -L https://artifactory.prd.it.unity3d.com/artifactory/api/gpg/key/public | sudo apt-key add - + - sudo sh -c "echo 'deb https://artifactory.prd.it.unity3d.com/artifactory/unity-apt-local bionic main' > /etc/apt/sources.list.d/unity.list" + - sudo apt update + - sudo apt install unity-downloader-cli + - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr --output TestProjects/HDRP_RuntimeTests/utr + - chmod +x TestProjects/HDRP_RuntimeTests/utr + - cd TestProjects/HDRP_RuntimeTests && sudo unity-downloader-cli --source-file ../../unity_revision.txt -c editor -c il2cpp --wait --published-only + - cd TestProjects/HDRP_RuntimeTests && DISPLAY=:0.0 ./utr --artifacts_path=test-results --build-only --editor-location=.Editor --extra-editor-arg="-adb2" --extra-editor-arg="-cacheServerEnableDownload" --extra-editor-arg="true" --extra-editor-arg="-cacheServerEnableUpload" --extra-editor-arg="true" --extra-editor-arg="-cacheServerEndpoint" --extra-editor-arg="cacheserver-slo.hq.unity3d.com" --extra-editor-arg="-cacheServerNamespacePrefix" --extra-editor-arg="SRP" --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-enableCacheServer" --extra-editor-arg="-executemethod" --extra-editor-arg="SetupProject.ApplySettings" --extra-editor-arg="vulkan" --extra-editor-arg="Linear" --extra-editor-arg="-playergraphicsapi=Vulkan" --platform=StandaloneLinux64 --player-save-path=../../players --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=. --timeout=3000 + artifacts: + logs: + paths: + - "**/test-results/**" + - "TestProjects/HDRP_RuntimeTests/Logs/*.log" + players: + paths: + - "players*/**" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:CUSTOM-REVISION:linux + rerun: always diff --git a/.yamato/hdrp-osx-metal.yml b/.yamato/hdrp-osx-metal.yml index 548080acde6..4c7d615b4ea 100644 --- a/.yamato/hdrp-osx-metal.yml +++ b/.yamato/hdrp-osx-metal.yml @@ -55,7 +55,7 @@ HDRP_OSX_Metal_playmode_cache_mono_Linear_trunk: - 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' - |5- - 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/HDRP_Tests && ~/Graphics/TestProjects/HDRP_Tests/utr --artifacts_path=/Users/bokken/Graphics/TestProjects/HDRP_Tests/test-results --editor-location=/Users/bokken/.Editor --extra-editor-arg="-adb2" --extra-editor-arg="-cacheServerEnableDownload true" --extra-editor-arg="-cacheServerEnableUpload true" --extra-editor-arg="-cacheServerEndpoint cacheserver-slo.hq.unity3d.com" --extra-editor-arg="-cacheServerNamespacePrefix SRP" --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-enableCacheServer" --reruncount=2 --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=/Users/bokken/Graphics/TestProjects/HDRP_Tests --zero-tests-are-ok=1" + 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/HDRP_Tests && ~/Graphics/TestProjects/HDRP_Tests/utr --artifacts_path=/Users/bokken/Graphics/TestProjects/HDRP_Tests/test-results --editor-location=/Users/bokken/.Editor --extra-editor-arg="-adb2" --extra-editor-arg="-cacheServerEnableDownload" --extra-editor-arg="true" --extra-editor-arg="-cacheServerEnableUpload" --extra-editor-arg="true" --extra-editor-arg="-cacheServerEndpoint" --extra-editor-arg="cacheserver-slo.hq.unity3d.com" --extra-editor-arg="-cacheServerNamespacePrefix" --extra-editor-arg="SRP" --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-enableCacheServer" --reruncount=2 --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=/Users/bokken/Graphics/TestProjects/HDRP_Tests --zero-tests-are-ok=1" UTR_RESULT=$? mkdir -p TestProjects/HDRP_Tests/test-results/ 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/ @@ -123,6 +123,35 @@ HDRP_OSX_Metal_Standalone_mono_Linear_trunk: paths: - "**/test-results/**" - "TestProjects/HDRP_RuntimeTests/Logs/*.log" +HDRP_OSX_Metal_Standalone_cache_mono_Linear_trunk: + name: HDRP on OSX_Metal_Standalone_cache_mono_Linear on version trunk + agent: + type: Unity::metal::macmini + image: slough-ops/macos-10.14-xcode:stable + flavor: m1.mac + variables: + UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates + UTR_VERSION: "current" + TEST_FILTER: .* + commands: + - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr --output TestProjects/HDRP_RuntimeTests/utr + - chmod +x TestProjects/HDRP_RuntimeTests/utr + - ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP "bash -lc 'pip3 install unity-downloader-cli --user --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade'" + - scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" -r $YAMATO_SOURCE_DIR bokken@$BOKKEN_DEVICE_IP:~/Graphics + - scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP:~/.ssh/id_rsa_macmini + - 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' + - |5- + + 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/HDRP_RuntimeTests && ~/Graphics/TestProjects/HDRP_RuntimeTests/utr --artifacts_path=/Users/bokken/Graphics/TestProjects/HDRP_RuntimeTests/test-results --editor-location=.Editor --extra-editor-arg="-adb2" --extra-editor-arg="-cacheServerEnableDownload" --extra-editor-arg="true" --extra-editor-arg="-cacheServerEnableUpload" --extra-editor-arg="true" --extra-editor-arg="-cacheServerEndpoint" --extra-editor-arg="cacheserver-slo.hq.unity3d.com" --extra-editor-arg="-cacheServerNamespacePrefix" --extra-editor-arg="SRP" --extra-editor-arg="-enableCacheServer" --platform=StandaloneOSX --reruncount=2 --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=/Users/bokken/Graphics/TestProjects/HDRP_RuntimeTests --timeout=1200 --zero-tests-are-ok=1" + UTR_RESULT=$? + mkdir -p TestProjects/HDRP_RuntimeTests/test-results/ + scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/HDRP_RuntimeTests/test-results/ TestProjects/HDRP_RuntimeTests/test-results/ + exit $UTR_RESULT + artifacts: + logs: + paths: + - "**/test-results/**" + - "TestProjects/HDRP_RuntimeTests/Logs/*.log" HDRP_OSX_Metal_playmode_mono_Linear_CUSTOM-REVISION: name: HDRP on OSX_Metal_playmode_mono_Linear on version CUSTOM-REVISION agent: @@ -176,7 +205,7 @@ HDRP_OSX_Metal_playmode_cache_mono_Linear_CUSTOM-REVISION: - 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' - |5- - 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/HDRP_Tests && ~/Graphics/TestProjects/HDRP_Tests/utr --artifacts_path=/Users/bokken/Graphics/TestProjects/HDRP_Tests/test-results --editor-location=/Users/bokken/.Editor --extra-editor-arg="-adb2" --extra-editor-arg="-cacheServerEnableDownload true" --extra-editor-arg="-cacheServerEnableUpload true" --extra-editor-arg="-cacheServerEndpoint cacheserver-slo.hq.unity3d.com" --extra-editor-arg="-cacheServerNamespacePrefix SRP" --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-enableCacheServer" --reruncount=2 --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=/Users/bokken/Graphics/TestProjects/HDRP_Tests --zero-tests-are-ok=1" + 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/HDRP_Tests && ~/Graphics/TestProjects/HDRP_Tests/utr --artifacts_path=/Users/bokken/Graphics/TestProjects/HDRP_Tests/test-results --editor-location=/Users/bokken/.Editor --extra-editor-arg="-adb2" --extra-editor-arg="-cacheServerEnableDownload" --extra-editor-arg="true" --extra-editor-arg="-cacheServerEnableUpload" --extra-editor-arg="true" --extra-editor-arg="-cacheServerEndpoint" --extra-editor-arg="cacheserver-slo.hq.unity3d.com" --extra-editor-arg="-cacheServerNamespacePrefix" --extra-editor-arg="SRP" --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-enableCacheServer" --reruncount=2 --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=/Users/bokken/Graphics/TestProjects/HDRP_Tests --zero-tests-are-ok=1" UTR_RESULT=$? mkdir -p TestProjects/HDRP_Tests/test-results/ 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/ @@ -255,3 +284,36 @@ HDRP_OSX_Metal_Standalone_mono_Linear_CUSTOM-REVISION: dependencies: - path: .yamato/_editor_priming.yml#editor:priming:CUSTOM-REVISION:macos rerun: always +HDRP_OSX_Metal_Standalone_cache_mono_Linear_CUSTOM-REVISION: + name: HDRP on OSX_Metal_Standalone_cache_mono_Linear on version CUSTOM-REVISION + agent: + type: Unity::metal::macmini + image: slough-ops/macos-10.14-xcode:stable + flavor: m1.mac + variables: + UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates + CUSTOM_REVISION: custom_revision_not_set + UTR_VERSION: "current" + TEST_FILTER: .* + commands: + - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr --output TestProjects/HDRP_RuntimeTests/utr + - chmod +x TestProjects/HDRP_RuntimeTests/utr + - ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP "bash -lc 'pip3 install unity-downloader-cli --user --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade'" + - scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" -r $YAMATO_SOURCE_DIR bokken@$BOKKEN_DEVICE_IP:~/Graphics + - scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP:~/.ssh/id_rsa_macmini + - 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' + - |5- + + 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/HDRP_RuntimeTests && ~/Graphics/TestProjects/HDRP_RuntimeTests/utr --artifacts_path=/Users/bokken/Graphics/TestProjects/HDRP_RuntimeTests/test-results --editor-location=.Editor --extra-editor-arg="-adb2" --extra-editor-arg="-cacheServerEnableDownload" --extra-editor-arg="true" --extra-editor-arg="-cacheServerEnableUpload" --extra-editor-arg="true" --extra-editor-arg="-cacheServerEndpoint" --extra-editor-arg="cacheserver-slo.hq.unity3d.com" --extra-editor-arg="-cacheServerNamespacePrefix" --extra-editor-arg="SRP" --extra-editor-arg="-enableCacheServer" --platform=StandaloneOSX --reruncount=2 --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=/Users/bokken/Graphics/TestProjects/HDRP_RuntimeTests --timeout=1200 --zero-tests-are-ok=1" + UTR_RESULT=$? + mkdir -p TestProjects/HDRP_RuntimeTests/test-results/ + scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/HDRP_RuntimeTests/test-results/ TestProjects/HDRP_RuntimeTests/test-results/ + exit $UTR_RESULT + artifacts: + logs: + paths: + - "**/test-results/**" + - "TestProjects/HDRP_RuntimeTests/Logs/*.log" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:CUSTOM-REVISION:macos + rerun: always diff --git a/.yamato/hdrp-win-dx11.yml b/.yamato/hdrp-win-dx11.yml index fa830cb96c9..f0a81e62c5d 100644 --- a/.yamato/hdrp-win-dx11.yml +++ b/.yamato/hdrp-win-dx11.yml @@ -57,7 +57,7 @@ HDRP_Win_DX11_playmode_cache_mono_Linear_trunk: set /p GIT_REVISIONDATE= revdate.tmp + set /p GIT_REVISIONDATE= revdate.tmp + set /p GIT_REVISIONDATE= revdate.tmp + set /p GIT_REVISIONDATE= revdate.tmp + set /p GIT_REVISIONDATE= revdate.tmp + set /p GIT_REVISIONDATE= revdate.tmp + set /p GIT_REVISIONDATE= revdate.tmp + set /p GIT_REVISIONDATE= revdate.tmp + set /p GIT_REVISIONDATE= /etc/apt/sources.list.d/unity.list" + - sudo apt update + - sudo apt install unity-downloader-cli + - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr --output TestProjects/HDRP_HybridTests/utr + - chmod +x TestProjects/HDRP_HybridTests/utr + - cd TestProjects/HDRP_HybridTests && sudo unity-downloader-cli -u {{editor_versions.trunk_latest_internal.linux.revision}} -c editor -c il2cpp --wait --published-only + - cd TestProjects/HDRP_HybridTests && DISPLAY=:0.0 ./utr --artifacts_path=test-results --build-only --compilation-errors-as-warnings --editor-location=.Editor --extra-editor-arg="-adb2" --extra-editor-arg="-cacheServerEnableDownload" --extra-editor-arg="true" --extra-editor-arg="-cacheServerEnableUpload" --extra-editor-arg="true" --extra-editor-arg="-cacheServerEndpoint" --extra-editor-arg="cacheserver-slo.hq.unity3d.com" --extra-editor-arg="-cacheServerNamespacePrefix" --extra-editor-arg="SRP" --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-enableCacheServer" --extra-editor-arg="-executemethod" --extra-editor-arg="SetupProject.ApplySettings" --extra-editor-arg="vulkan" --extra-editor-arg="Linear" --extra-editor-arg="-playergraphicsapi=Vulkan" --platform=StandaloneLinux64 --player-save-path=../../players --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=. --timeout=3000 + artifacts: + logs: + paths: + - "**/test-results/**" + - "TestProjects/HDRP_HybridTests/Logs/*.log" + players: + paths: + - "players*/**" HDRP_Hybrid_Linux_Vulkan_playmode_mono_Linear_CUSTOM-REVISION: name: HDRP_Hybrid on Linux_Vulkan_playmode_mono_Linear on version CUSTOM-REVISION agent: @@ -151,7 +200,7 @@ HDRP_Hybrid_Linux_Vulkan_playmode_cache_mono_Linear_CUSTOM-REVISION: - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr --output TestProjects/HDRP_HybridTests/utr - chmod +x TestProjects/HDRP_HybridTests/utr - cd TestProjects/HDRP_HybridTests && sudo unity-downloader-cli --source-file ../../unity_revision.txt -c editor -c il2cpp --wait --published-only - - cd TestProjects/HDRP_HybridTests && DISPLAY=:0.0 ./utr --artifacts_path=test-results --compilation-errors-as-warnings --editor-location=.Editor --extra-editor-arg="-adb2" --extra-editor-arg="-cacheServerEnableDownload true" --extra-editor-arg="-cacheServerEnableUpload true" --extra-editor-arg="-cacheServerEndpoint cacheserver-slo.hq.unity3d.com" --extra-editor-arg="-cacheServerNamespacePrefix SRP" --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-enableCacheServer" --extra-editor-arg="-force-vulkan" --reruncount=2 --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=. --zero-tests-are-ok=1 + - cd TestProjects/HDRP_HybridTests && DISPLAY=:0.0 ./utr --artifacts_path=test-results --compilation-errors-as-warnings --editor-location=.Editor --extra-editor-arg="-adb2" --extra-editor-arg="-cacheServerEnableDownload" --extra-editor-arg="true" --extra-editor-arg="-cacheServerEnableUpload" --extra-editor-arg="true" --extra-editor-arg="-cacheServerEndpoint" --extra-editor-arg="cacheserver-slo.hq.unity3d.com" --extra-editor-arg="-cacheServerNamespacePrefix" --extra-editor-arg="SRP" --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-enableCacheServer" --extra-editor-arg="-force-vulkan" --reruncount=2 --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=. --zero-tests-are-ok=1 artifacts: logs: paths: @@ -216,3 +265,59 @@ Build_HDRP_Hybrid_Linux_Vulkan_Standalone_mono_Linear_CUSTOM-REVISION: dependencies: - path: .yamato/_editor_priming.yml#editor:priming:CUSTOM-REVISION:linux rerun: always +HDRP_Hybrid_Linux_Vulkan_Standalone_cache_mono_Linear_CUSTOM-REVISION: + name: HDRP_Hybrid on Linux_Vulkan_Standalone_cache_mono_Linear on version CUSTOM-REVISION + agent: + type: Unity::VM::GPU + image: package-ci/ubuntu:stable + flavor: b1.large + variables: + UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates + CUSTOM_REVISION: custom_revision_not_set + UTR_VERSION: "current" + TEST_FILTER: .* + commands: + - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr --output TestProjects/HDRP_HybridTests/utr + - chmod +x TestProjects/HDRP_HybridTests/utr + - cd TestProjects/HDRP_HybridTests && ./utr --artifacts_path=test-results --compilation-errors-as-warnings --extra-editor-arg="-adb2" --extra-editor-arg="-cacheServerEnableDownload" --extra-editor-arg="true" --extra-editor-arg="-cacheServerEnableUpload" --extra-editor-arg="true" --extra-editor-arg="-cacheServerEndpoint" --extra-editor-arg="cacheserver-slo.hq.unity3d.com" --extra-editor-arg="-cacheServerNamespacePrefix" --extra-editor-arg="SRP" --extra-editor-arg="-enableCacheServer" --platform=StandaloneLinux64 --player-connection-ip=auto --player-load-path=../../players --reruncount=2 --suite=playmode --timeout=1200 --zero-tests-are-ok=1 + artifacts: + logs: + paths: + - "**/test-results/**" + - "TestProjects/HDRP_HybridTests/Logs/*.log" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:CUSTOM-REVISION:linux + rerun: always + - path: .yamato/hdrp_hybrid-linux-vulkan.yml#Build_HDRP_Hybrid_Linux_Vulkan_Standalone_cache_mono_Linear_CUSTOM-REVISION + rerun: always +Build_HDRP_Hybrid_Linux_Vulkan_Standalone_cache_mono_Linear_CUSTOM-REVISION: + name: Build HDRP_Hybrid on Linux_Vulkan_mono_Linear_Standalone_cache_build_Player on version CUSTOM-REVISION + agent: + type: Unity::VM + image: package-ci/ubuntu:stable + flavor: b1.xlarge + variables: + UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates + CUSTOM_REVISION: custom_revision_not_set + UTR_VERSION: "current" + TEST_FILTER: .* + commands: + - curl -L https://artifactory.prd.it.unity3d.com/artifactory/api/gpg/key/public | sudo apt-key add - + - sudo sh -c "echo 'deb https://artifactory.prd.it.unity3d.com/artifactory/unity-apt-local bionic main' > /etc/apt/sources.list.d/unity.list" + - sudo apt update + - sudo apt install unity-downloader-cli + - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr --output TestProjects/HDRP_HybridTests/utr + - chmod +x TestProjects/HDRP_HybridTests/utr + - cd TestProjects/HDRP_HybridTests && sudo unity-downloader-cli --source-file ../../unity_revision.txt -c editor -c il2cpp --wait --published-only + - cd TestProjects/HDRP_HybridTests && DISPLAY=:0.0 ./utr --artifacts_path=test-results --build-only --compilation-errors-as-warnings --editor-location=.Editor --extra-editor-arg="-adb2" --extra-editor-arg="-cacheServerEnableDownload" --extra-editor-arg="true" --extra-editor-arg="-cacheServerEnableUpload" --extra-editor-arg="true" --extra-editor-arg="-cacheServerEndpoint" --extra-editor-arg="cacheserver-slo.hq.unity3d.com" --extra-editor-arg="-cacheServerNamespacePrefix" --extra-editor-arg="SRP" --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-enableCacheServer" --extra-editor-arg="-executemethod" --extra-editor-arg="SetupProject.ApplySettings" --extra-editor-arg="vulkan" --extra-editor-arg="Linear" --extra-editor-arg="-playergraphicsapi=Vulkan" --platform=StandaloneLinux64 --player-save-path=../../players --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=. --timeout=3000 + artifacts: + logs: + paths: + - "**/test-results/**" + - "TestProjects/HDRP_HybridTests/Logs/*.log" + players: + paths: + - "players*/**" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:CUSTOM-REVISION:linux + rerun: always diff --git a/.yamato/hdrp_hybrid-osx-metal.yml b/.yamato/hdrp_hybrid-osx-metal.yml index 415bc8e4584..3704a2908e4 100644 --- a/.yamato/hdrp_hybrid-osx-metal.yml +++ b/.yamato/hdrp_hybrid-osx-metal.yml @@ -55,7 +55,7 @@ HDRP_Hybrid_OSX_Metal_playmode_cache_mono_Linear_trunk: - 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' - |5- - 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/HDRP_HybridTests && ~/Graphics/TestProjects/HDRP_HybridTests/utr --artifacts_path=/Users/bokken/Graphics/TestProjects/HDRP_HybridTests/test-results --compilation-errors-as-warnings --editor-location=/Users/bokken/.Editor --extra-editor-arg="-adb2" --extra-editor-arg="-cacheServerEnableDownload true" --extra-editor-arg="-cacheServerEnableUpload true" --extra-editor-arg="-cacheServerEndpoint cacheserver-slo.hq.unity3d.com" --extra-editor-arg="-cacheServerNamespacePrefix SRP" --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-enableCacheServer" --reruncount=2 --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=/Users/bokken/Graphics/TestProjects/HDRP_HybridTests --zero-tests-are-ok=1" + 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/HDRP_HybridTests && ~/Graphics/TestProjects/HDRP_HybridTests/utr --artifacts_path=/Users/bokken/Graphics/TestProjects/HDRP_HybridTests/test-results --compilation-errors-as-warnings --editor-location=/Users/bokken/.Editor --extra-editor-arg="-adb2" --extra-editor-arg="-cacheServerEnableDownload" --extra-editor-arg="true" --extra-editor-arg="-cacheServerEnableUpload" --extra-editor-arg="true" --extra-editor-arg="-cacheServerEndpoint" --extra-editor-arg="cacheserver-slo.hq.unity3d.com" --extra-editor-arg="-cacheServerNamespacePrefix" --extra-editor-arg="SRP" --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-enableCacheServer" --reruncount=2 --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=/Users/bokken/Graphics/TestProjects/HDRP_HybridTests --zero-tests-are-ok=1" UTR_RESULT=$? mkdir -p TestProjects/HDRP_HybridTests/test-results/ scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/HDRP_HybridTests/test-results/ TestProjects/HDRP_HybridTests/test-results/ @@ -123,6 +123,35 @@ HDRP_Hybrid_OSX_Metal_Standalone_mono_Linear_trunk: paths: - "**/test-results/**" - "TestProjects/HDRP_HybridTests/Logs/*.log" +HDRP_Hybrid_OSX_Metal_Standalone_cache_mono_Linear_trunk: + name: HDRP_Hybrid on OSX_Metal_Standalone_cache_mono_Linear on version trunk + agent: + type: Unity::metal::macmini + image: slough-ops/macos-10.14-xcode:stable + flavor: m1.mac + variables: + UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates + UTR_VERSION: "current" + TEST_FILTER: .* + commands: + - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr --output TestProjects/HDRP_HybridTests/utr + - chmod +x TestProjects/HDRP_HybridTests/utr + - ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP "bash -lc 'pip3 install unity-downloader-cli --user --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade'" + - scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" -r $YAMATO_SOURCE_DIR bokken@$BOKKEN_DEVICE_IP:~/Graphics + - scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP:~/.ssh/id_rsa_macmini + - 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' + - |5- + + 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/HDRP_HybridTests && ~/Graphics/TestProjects/HDRP_HybridTests/utr --artifacts_path=/Users/bokken/Graphics/TestProjects/HDRP_HybridTests/test-results --compilation-errors-as-warnings --editor-location=.Editor --extra-editor-arg="-adb2" --extra-editor-arg="-cacheServerEnableDownload" --extra-editor-arg="true" --extra-editor-arg="-cacheServerEnableUpload" --extra-editor-arg="true" --extra-editor-arg="-cacheServerEndpoint" --extra-editor-arg="cacheserver-slo.hq.unity3d.com" --extra-editor-arg="-cacheServerNamespacePrefix" --extra-editor-arg="SRP" --extra-editor-arg="-enableCacheServer" --platform=StandaloneOSX --reruncount=2 --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=/Users/bokken/Graphics/TestProjects/HDRP_HybridTests --timeout=1200 --zero-tests-are-ok=1" + UTR_RESULT=$? + mkdir -p TestProjects/HDRP_HybridTests/test-results/ + scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/HDRP_HybridTests/test-results/ TestProjects/HDRP_HybridTests/test-results/ + exit $UTR_RESULT + artifacts: + logs: + paths: + - "**/test-results/**" + - "TestProjects/HDRP_HybridTests/Logs/*.log" HDRP_Hybrid_OSX_Metal_playmode_mono_Linear_CUSTOM-REVISION: name: HDRP_Hybrid on OSX_Metal_playmode_mono_Linear on version CUSTOM-REVISION agent: @@ -176,7 +205,7 @@ HDRP_Hybrid_OSX_Metal_playmode_cache_mono_Linear_CUSTOM-REVISION: - 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' - |5- - 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/HDRP_HybridTests && ~/Graphics/TestProjects/HDRP_HybridTests/utr --artifacts_path=/Users/bokken/Graphics/TestProjects/HDRP_HybridTests/test-results --compilation-errors-as-warnings --editor-location=/Users/bokken/.Editor --extra-editor-arg="-adb2" --extra-editor-arg="-cacheServerEnableDownload true" --extra-editor-arg="-cacheServerEnableUpload true" --extra-editor-arg="-cacheServerEndpoint cacheserver-slo.hq.unity3d.com" --extra-editor-arg="-cacheServerNamespacePrefix SRP" --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-enableCacheServer" --reruncount=2 --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=/Users/bokken/Graphics/TestProjects/HDRP_HybridTests --zero-tests-are-ok=1" + 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/HDRP_HybridTests && ~/Graphics/TestProjects/HDRP_HybridTests/utr --artifacts_path=/Users/bokken/Graphics/TestProjects/HDRP_HybridTests/test-results --compilation-errors-as-warnings --editor-location=/Users/bokken/.Editor --extra-editor-arg="-adb2" --extra-editor-arg="-cacheServerEnableDownload" --extra-editor-arg="true" --extra-editor-arg="-cacheServerEnableUpload" --extra-editor-arg="true" --extra-editor-arg="-cacheServerEndpoint" --extra-editor-arg="cacheserver-slo.hq.unity3d.com" --extra-editor-arg="-cacheServerNamespacePrefix" --extra-editor-arg="SRP" --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-enableCacheServer" --reruncount=2 --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=/Users/bokken/Graphics/TestProjects/HDRP_HybridTests --zero-tests-are-ok=1" UTR_RESULT=$? mkdir -p TestProjects/HDRP_HybridTests/test-results/ scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/HDRP_HybridTests/test-results/ TestProjects/HDRP_HybridTests/test-results/ @@ -255,3 +284,36 @@ HDRP_Hybrid_OSX_Metal_Standalone_mono_Linear_CUSTOM-REVISION: dependencies: - path: .yamato/_editor_priming.yml#editor:priming:CUSTOM-REVISION:macos rerun: always +HDRP_Hybrid_OSX_Metal_Standalone_cache_mono_Linear_CUSTOM-REVISION: + name: HDRP_Hybrid on OSX_Metal_Standalone_cache_mono_Linear on version CUSTOM-REVISION + agent: + type: Unity::metal::macmini + image: slough-ops/macos-10.14-xcode:stable + flavor: m1.mac + variables: + UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates + CUSTOM_REVISION: custom_revision_not_set + UTR_VERSION: "current" + TEST_FILTER: .* + commands: + - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr --output TestProjects/HDRP_HybridTests/utr + - chmod +x TestProjects/HDRP_HybridTests/utr + - ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP "bash -lc 'pip3 install unity-downloader-cli --user --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade'" + - scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" -r $YAMATO_SOURCE_DIR bokken@$BOKKEN_DEVICE_IP:~/Graphics + - scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP:~/.ssh/id_rsa_macmini + - 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' + - |5- + + 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/HDRP_HybridTests && ~/Graphics/TestProjects/HDRP_HybridTests/utr --artifacts_path=/Users/bokken/Graphics/TestProjects/HDRP_HybridTests/test-results --compilation-errors-as-warnings --editor-location=.Editor --extra-editor-arg="-adb2" --extra-editor-arg="-cacheServerEnableDownload" --extra-editor-arg="true" --extra-editor-arg="-cacheServerEnableUpload" --extra-editor-arg="true" --extra-editor-arg="-cacheServerEndpoint" --extra-editor-arg="cacheserver-slo.hq.unity3d.com" --extra-editor-arg="-cacheServerNamespacePrefix" --extra-editor-arg="SRP" --extra-editor-arg="-enableCacheServer" --platform=StandaloneOSX --reruncount=2 --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=/Users/bokken/Graphics/TestProjects/HDRP_HybridTests --timeout=1200 --zero-tests-are-ok=1" + UTR_RESULT=$? + mkdir -p TestProjects/HDRP_HybridTests/test-results/ + scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/HDRP_HybridTests/test-results/ TestProjects/HDRP_HybridTests/test-results/ + exit $UTR_RESULT + artifacts: + logs: + paths: + - "**/test-results/**" + - "TestProjects/HDRP_HybridTests/Logs/*.log" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:CUSTOM-REVISION:macos + rerun: always diff --git a/.yamato/hdrp_hybrid-win-dx11.yml b/.yamato/hdrp_hybrid-win-dx11.yml index e2092727866..742d239b9fe 100644 --- a/.yamato/hdrp_hybrid-win-dx11.yml +++ b/.yamato/hdrp_hybrid-win-dx11.yml @@ -55,7 +55,7 @@ HDRP_Hybrid_Win_DX11_playmode_cache_mono_Linear_trunk: set /p GIT_REVISIONDATE= revdate.tmp + set /p GIT_REVISIONDATE= revdate.tmp + set /p GIT_REVISIONDATE= revdate.tmp + set /p GIT_REVISIONDATE= revdate.tmp + set /p GIT_REVISIONDATE= revdate.tmp + set /p GIT_REVISIONDATE= revdate.tmp + set /p GIT_REVISIONDATE= revdate.tmp + set /p GIT_REVISIONDATE= revdate.tmp + set /p GIT_REVISIONDATE= revdate.tmp + set /p GIT_REVISIONDATE= revdate.tmp + set /p GIT_REVISIONDATE= revdate.tmp + set /p GIT_REVISIONDATE= revdate.tmp + set /p GIT_REVISIONDATE= revdate.tmp + set /p GIT_REVISIONDATE= revdate.tmp + set /p GIT_REVISIONDATE= /etc/apt/sources.list.d/unity.list" + - sudo apt update + - sudo apt install unity-downloader-cli + - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr --output TestProjects/ShaderGraph/utr + - chmod +x TestProjects/ShaderGraph/utr + - cd TestProjects/ShaderGraph && sudo unity-downloader-cli -u {{editor_versions.trunk_latest_internal.linux.revision}} -c editor -c il2cpp --wait --published-only + - cd TestProjects/ShaderGraph && DISPLAY=:0.0 ./utr --artifacts_path=test-results --build-only --editor-location=.Editor --extra-editor-arg="-adb2" --extra-editor-arg="-cacheServerEnableDownload" --extra-editor-arg="true" --extra-editor-arg="-cacheServerEnableUpload" --extra-editor-arg="true" --extra-editor-arg="-cacheServerEndpoint" --extra-editor-arg="cacheserver-slo.hq.unity3d.com" --extra-editor-arg="-cacheServerNamespacePrefix" --extra-editor-arg="SRP" --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-enableCacheServer" --extra-editor-arg="-executemethod" --extra-editor-arg="SetupProject.ApplySettings" --extra-editor-arg="vulkan" --extra-editor-arg="Linear" --extra-editor-arg="-playergraphicsapi=Vulkan" --platform=StandaloneLinux64 --player-save-path=../../players --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=. --timeout=3000 + artifacts: + logs: + paths: + - "**/test-results/**" + - "TestProjects/ShaderGraph/Logs/*.log" + players: + paths: + - "players*/**" ShaderGraph_Linux_Vulkan_Standalone_mono_Linear_CUSTOM-REVISION: name: ShaderGraph on Linux_Vulkan_Standalone_mono_Linear on version CUSTOM-REVISION agent: @@ -231,7 +280,7 @@ ShaderGraph_Linux_Vulkan_playmode_cache_mono_Linear_CUSTOM-REVISION: - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr --output TestProjects/ShaderGraph/utr - chmod +x TestProjects/ShaderGraph/utr - cd TestProjects/ShaderGraph && sudo unity-downloader-cli --source-file ../../unity_revision.txt -c editor -c il2cpp --wait --published-only - - cd TestProjects/ShaderGraph && DISPLAY=:0.0 ./utr --artifacts_path=test-results --editor-location=.Editor --extra-editor-arg="-adb2" --extra-editor-arg="-cacheServerEnableDownload true" --extra-editor-arg="-cacheServerEnableUpload true" --extra-editor-arg="-cacheServerEndpoint cacheserver-slo.hq.unity3d.com" --extra-editor-arg="-cacheServerNamespacePrefix SRP" --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-enableCacheServer" --extra-editor-arg="-force-vulkan" --reruncount=2 --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=. --zero-tests-are-ok=1 + - cd TestProjects/ShaderGraph && DISPLAY=:0.0 ./utr --artifacts_path=test-results --editor-location=.Editor --extra-editor-arg="-adb2" --extra-editor-arg="-cacheServerEnableDownload" --extra-editor-arg="true" --extra-editor-arg="-cacheServerEnableUpload" --extra-editor-arg="true" --extra-editor-arg="-cacheServerEndpoint" --extra-editor-arg="cacheserver-slo.hq.unity3d.com" --extra-editor-arg="-cacheServerNamespacePrefix" --extra-editor-arg="SRP" --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-enableCacheServer" --extra-editor-arg="-force-vulkan" --reruncount=2 --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=. --zero-tests-are-ok=1 artifacts: logs: paths: @@ -268,3 +317,59 @@ ShaderGraph_Linux_Vulkan_editmode_mono_Linear_CUSTOM-REVISION: dependencies: - path: .yamato/_editor_priming.yml#editor:priming:CUSTOM-REVISION:linux rerun: always +ShaderGraph_Linux_Vulkan_Standalone_cache_mono_Linear_CUSTOM-REVISION: + name: ShaderGraph on Linux_Vulkan_Standalone_cache_mono_Linear on version CUSTOM-REVISION + agent: + type: Unity::VM::GPU + image: package-ci/ubuntu:stable + flavor: b1.large + variables: + UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates + CUSTOM_REVISION: custom_revision_not_set + UTR_VERSION: "current" + TEST_FILTER: .* + commands: + - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr --output TestProjects/ShaderGraph/utr + - chmod +x TestProjects/ShaderGraph/utr + - cd TestProjects/ShaderGraph && ./utr --artifacts_path=test-results --extra-editor-arg="-adb2" --extra-editor-arg="-cacheServerEnableDownload" --extra-editor-arg="true" --extra-editor-arg="-cacheServerEnableUpload" --extra-editor-arg="true" --extra-editor-arg="-cacheServerEndpoint" --extra-editor-arg="cacheserver-slo.hq.unity3d.com" --extra-editor-arg="-cacheServerNamespacePrefix" --extra-editor-arg="SRP" --extra-editor-arg="-enableCacheServer" --platform=StandaloneLinux64 --player-connection-ip=auto --player-load-path=../../players --reruncount=2 --suite=playmode --timeout=1200 --zero-tests-are-ok=1 + artifacts: + logs: + paths: + - "**/test-results/**" + - "TestProjects/ShaderGraph/Logs/*.log" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:CUSTOM-REVISION:linux + rerun: always + - path: .yamato/shadergraph-linux-vulkan.yml#Build_ShaderGraph_Linux_Vulkan_Standalone_cache_mono_Linear_CUSTOM-REVISION + rerun: always +Build_ShaderGraph_Linux_Vulkan_Standalone_cache_mono_Linear_CUSTOM-REVISION: + name: Build ShaderGraph on Linux_Vulkan_mono_Linear_Standalone_cache_build_Player on version CUSTOM-REVISION + agent: + type: Unity::VM + image: package-ci/ubuntu:stable + flavor: b1.xlarge + variables: + UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates + CUSTOM_REVISION: custom_revision_not_set + UTR_VERSION: "current" + TEST_FILTER: .* + commands: + - curl -L https://artifactory.prd.it.unity3d.com/artifactory/api/gpg/key/public | sudo apt-key add - + - sudo sh -c "echo 'deb https://artifactory.prd.it.unity3d.com/artifactory/unity-apt-local bionic main' > /etc/apt/sources.list.d/unity.list" + - sudo apt update + - sudo apt install unity-downloader-cli + - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr --output TestProjects/ShaderGraph/utr + - chmod +x TestProjects/ShaderGraph/utr + - cd TestProjects/ShaderGraph && sudo unity-downloader-cli --source-file ../../unity_revision.txt -c editor -c il2cpp --wait --published-only + - cd TestProjects/ShaderGraph && DISPLAY=:0.0 ./utr --artifacts_path=test-results --build-only --editor-location=.Editor --extra-editor-arg="-adb2" --extra-editor-arg="-cacheServerEnableDownload" --extra-editor-arg="true" --extra-editor-arg="-cacheServerEnableUpload" --extra-editor-arg="true" --extra-editor-arg="-cacheServerEndpoint" --extra-editor-arg="cacheserver-slo.hq.unity3d.com" --extra-editor-arg="-cacheServerNamespacePrefix" --extra-editor-arg="SRP" --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-enableCacheServer" --extra-editor-arg="-executemethod" --extra-editor-arg="SetupProject.ApplySettings" --extra-editor-arg="vulkan" --extra-editor-arg="Linear" --extra-editor-arg="-playergraphicsapi=Vulkan" --platform=StandaloneLinux64 --player-save-path=../../players --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=. --timeout=3000 + artifacts: + logs: + paths: + - "**/test-results/**" + - "TestProjects/ShaderGraph/Logs/*.log" + players: + paths: + - "players*/**" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:CUSTOM-REVISION:linux + rerun: always diff --git a/.yamato/shadergraph-osx-metal.yml b/.yamato/shadergraph-osx-metal.yml index e924161ed0c..da3f0cd831d 100644 --- a/.yamato/shadergraph-osx-metal.yml +++ b/.yamato/shadergraph-osx-metal.yml @@ -84,7 +84,36 @@ ShaderGraph_OSX_Metal_playmode_cache_mono_Linear_trunk: - 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' - |5- - 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/ShaderGraph && ~/Graphics/TestProjects/ShaderGraph/utr --artifacts_path=/Users/bokken/Graphics/TestProjects/ShaderGraph/test-results --editor-location=/Users/bokken/.Editor --extra-editor-arg="-adb2" --extra-editor-arg="-cacheServerEnableDownload true" --extra-editor-arg="-cacheServerEnableUpload true" --extra-editor-arg="-cacheServerEndpoint cacheserver-slo.hq.unity3d.com" --extra-editor-arg="-cacheServerNamespacePrefix SRP" --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-enableCacheServer" --reruncount=2 --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=/Users/bokken/Graphics/TestProjects/ShaderGraph --zero-tests-are-ok=1" + 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/ShaderGraph && ~/Graphics/TestProjects/ShaderGraph/utr --artifacts_path=/Users/bokken/Graphics/TestProjects/ShaderGraph/test-results --editor-location=/Users/bokken/.Editor --extra-editor-arg="-adb2" --extra-editor-arg="-cacheServerEnableDownload" --extra-editor-arg="true" --extra-editor-arg="-cacheServerEnableUpload" --extra-editor-arg="true" --extra-editor-arg="-cacheServerEndpoint" --extra-editor-arg="cacheserver-slo.hq.unity3d.com" --extra-editor-arg="-cacheServerNamespacePrefix" --extra-editor-arg="SRP" --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-enableCacheServer" --reruncount=2 --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=/Users/bokken/Graphics/TestProjects/ShaderGraph --zero-tests-are-ok=1" + UTR_RESULT=$? + mkdir -p TestProjects/ShaderGraph/test-results/ + scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/ShaderGraph/test-results/ TestProjects/ShaderGraph/test-results/ + exit $UTR_RESULT + artifacts: + logs: + paths: + - "**/test-results/**" + - "TestProjects/ShaderGraph/Logs/*.log" +ShaderGraph_OSX_Metal_Standalone_cache_mono_Linear_trunk: + name: ShaderGraph on OSX_Metal_Standalone_cache_mono_Linear on version trunk + agent: + type: Unity::metal::macmini + image: slough-ops/macos-10.14-xcode:stable + flavor: m1.mac + variables: + UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates + UTR_VERSION: "current" + TEST_FILTER: .* + commands: + - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr --output TestProjects/ShaderGraph/utr + - chmod +x TestProjects/ShaderGraph/utr + - ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP "bash -lc 'pip3 install unity-downloader-cli --user --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade'" + - scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" -r $YAMATO_SOURCE_DIR bokken@$BOKKEN_DEVICE_IP:~/Graphics + - scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP:~/.ssh/id_rsa_macmini + - 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' + - |5- + + 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/ShaderGraph && ~/Graphics/TestProjects/ShaderGraph/utr --artifacts_path=/Users/bokken/Graphics/TestProjects/ShaderGraph/test-results --editor-location=.Editor --extra-editor-arg="-adb2" --extra-editor-arg="-cacheServerEnableDownload" --extra-editor-arg="true" --extra-editor-arg="-cacheServerEnableUpload" --extra-editor-arg="true" --extra-editor-arg="-cacheServerEndpoint" --extra-editor-arg="cacheserver-slo.hq.unity3d.com" --extra-editor-arg="-cacheServerNamespacePrefix" --extra-editor-arg="SRP" --extra-editor-arg="-enableCacheServer" --platform=StandaloneOSX --reruncount=2 --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=/Users/bokken/Graphics/TestProjects/ShaderGraph --timeout=1200 --zero-tests-are-ok=1" UTR_RESULT=$? mkdir -p TestProjects/ShaderGraph/test-results/ scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/ShaderGraph/test-results/ TestProjects/ShaderGraph/test-results/ @@ -180,7 +209,40 @@ ShaderGraph_OSX_Metal_playmode_cache_mono_Linear_CUSTOM-REVISION: - 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' - |5- - 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/ShaderGraph && ~/Graphics/TestProjects/ShaderGraph/utr --artifacts_path=/Users/bokken/Graphics/TestProjects/ShaderGraph/test-results --editor-location=/Users/bokken/.Editor --extra-editor-arg="-adb2" --extra-editor-arg="-cacheServerEnableDownload true" --extra-editor-arg="-cacheServerEnableUpload true" --extra-editor-arg="-cacheServerEndpoint cacheserver-slo.hq.unity3d.com" --extra-editor-arg="-cacheServerNamespacePrefix SRP" --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-enableCacheServer" --reruncount=2 --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=/Users/bokken/Graphics/TestProjects/ShaderGraph --zero-tests-are-ok=1" + 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/ShaderGraph && ~/Graphics/TestProjects/ShaderGraph/utr --artifacts_path=/Users/bokken/Graphics/TestProjects/ShaderGraph/test-results --editor-location=/Users/bokken/.Editor --extra-editor-arg="-adb2" --extra-editor-arg="-cacheServerEnableDownload" --extra-editor-arg="true" --extra-editor-arg="-cacheServerEnableUpload" --extra-editor-arg="true" --extra-editor-arg="-cacheServerEndpoint" --extra-editor-arg="cacheserver-slo.hq.unity3d.com" --extra-editor-arg="-cacheServerNamespacePrefix" --extra-editor-arg="SRP" --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-enableCacheServer" --reruncount=2 --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=/Users/bokken/Graphics/TestProjects/ShaderGraph --zero-tests-are-ok=1" + UTR_RESULT=$? + mkdir -p TestProjects/ShaderGraph/test-results/ + scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/ShaderGraph/test-results/ TestProjects/ShaderGraph/test-results/ + exit $UTR_RESULT + artifacts: + logs: + paths: + - "**/test-results/**" + - "TestProjects/ShaderGraph/Logs/*.log" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:CUSTOM-REVISION:macos + rerun: always +ShaderGraph_OSX_Metal_Standalone_cache_mono_Linear_CUSTOM-REVISION: + name: ShaderGraph on OSX_Metal_Standalone_cache_mono_Linear on version CUSTOM-REVISION + agent: + type: Unity::metal::macmini + image: slough-ops/macos-10.14-xcode:stable + flavor: m1.mac + variables: + UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates + CUSTOM_REVISION: custom_revision_not_set + UTR_VERSION: "current" + TEST_FILTER: .* + commands: + - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr --output TestProjects/ShaderGraph/utr + - chmod +x TestProjects/ShaderGraph/utr + - ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP "bash -lc 'pip3 install unity-downloader-cli --user --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade'" + - scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" -r $YAMATO_SOURCE_DIR bokken@$BOKKEN_DEVICE_IP:~/Graphics + - scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP:~/.ssh/id_rsa_macmini + - 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' + - |5- + + 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/ShaderGraph && ~/Graphics/TestProjects/ShaderGraph/utr --artifacts_path=/Users/bokken/Graphics/TestProjects/ShaderGraph/test-results --editor-location=.Editor --extra-editor-arg="-adb2" --extra-editor-arg="-cacheServerEnableDownload" --extra-editor-arg="true" --extra-editor-arg="-cacheServerEnableUpload" --extra-editor-arg="true" --extra-editor-arg="-cacheServerEndpoint" --extra-editor-arg="cacheserver-slo.hq.unity3d.com" --extra-editor-arg="-cacheServerNamespacePrefix" --extra-editor-arg="SRP" --extra-editor-arg="-enableCacheServer" --platform=StandaloneOSX --reruncount=2 --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=/Users/bokken/Graphics/TestProjects/ShaderGraph --timeout=1200 --zero-tests-are-ok=1" UTR_RESULT=$? mkdir -p TestProjects/ShaderGraph/test-results/ scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/ShaderGraph/test-results/ TestProjects/ShaderGraph/test-results/ diff --git a/.yamato/shadergraph-osx-openglcore.yml b/.yamato/shadergraph-osx-openglcore.yml index 40cbda5d324..3f55c10dfe5 100644 --- a/.yamato/shadergraph-osx-openglcore.yml +++ b/.yamato/shadergraph-osx-openglcore.yml @@ -45,7 +45,7 @@ ShaderGraph_OSX_OpenGLCore_playmode_cache_mono_Linear_trunk: - brew tap --force-auto-update unity/unity git@github.cds.internal.unity3d.com:unity/homebrew-unity.git - brew install unity-downloader-cli - cd TestProjects/ShaderGraph && unity-downloader-cli -u {{editor_versions.trunk_latest_internal.macos.revision}} -c editor -c il2cpp --wait --published-only - - cd TestProjects/ShaderGraph && ./utr --artifacts_path=test-results --editor-location=.Editor --extra-editor-arg="-adb2" --extra-editor-arg="-cacheServerEnableDownload true" --extra-editor-arg="-cacheServerEnableUpload true" --extra-editor-arg="-cacheServerEndpoint cacheserver-slo.hq.unity3d.com" --extra-editor-arg="-cacheServerNamespacePrefix SRP" --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-enableCacheServer" --reruncount=2 --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=. --zero-tests-are-ok=1 + - cd TestProjects/ShaderGraph && ./utr --artifacts_path=test-results --editor-location=.Editor --extra-editor-arg="-adb2" --extra-editor-arg="-cacheServerEnableDownload" --extra-editor-arg="true" --extra-editor-arg="-cacheServerEnableUpload" --extra-editor-arg="true" --extra-editor-arg="-cacheServerEndpoint" --extra-editor-arg="cacheserver-slo.hq.unity3d.com" --extra-editor-arg="-cacheServerNamespacePrefix" --extra-editor-arg="SRP" --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-enableCacheServer" --reruncount=2 --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=. --zero-tests-are-ok=1 artifacts: logs: paths: @@ -116,7 +116,7 @@ ShaderGraph_OSX_OpenGLCore_playmode_cache_mono_Linear_CUSTOM-REVISION: - brew tap --force-auto-update unity/unity git@github.cds.internal.unity3d.com:unity/homebrew-unity.git - brew install unity-downloader-cli - cd TestProjects/ShaderGraph && unity-downloader-cli --source-file ../../unity_revision.txt -c editor -c il2cpp --wait --published-only - - cd TestProjects/ShaderGraph && ./utr --artifacts_path=test-results --editor-location=.Editor --extra-editor-arg="-adb2" --extra-editor-arg="-cacheServerEnableDownload true" --extra-editor-arg="-cacheServerEnableUpload true" --extra-editor-arg="-cacheServerEndpoint cacheserver-slo.hq.unity3d.com" --extra-editor-arg="-cacheServerNamespacePrefix SRP" --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-enableCacheServer" --reruncount=2 --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=. --zero-tests-are-ok=1 + - cd TestProjects/ShaderGraph && ./utr --artifacts_path=test-results --editor-location=.Editor --extra-editor-arg="-adb2" --extra-editor-arg="-cacheServerEnableDownload" --extra-editor-arg="true" --extra-editor-arg="-cacheServerEnableUpload" --extra-editor-arg="true" --extra-editor-arg="-cacheServerEndpoint" --extra-editor-arg="cacheserver-slo.hq.unity3d.com" --extra-editor-arg="-cacheServerNamespacePrefix" --extra-editor-arg="SRP" --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-enableCacheServer" --reruncount=2 --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=. --zero-tests-are-ok=1 artifacts: logs: paths: diff --git a/.yamato/shadergraph-win-dx11.yml b/.yamato/shadergraph-win-dx11.yml index ba8111a5db3..8121ff99ddb 100644 --- a/.yamato/shadergraph-win-dx11.yml +++ b/.yamato/shadergraph-win-dx11.yml @@ -106,7 +106,7 @@ ShaderGraph_Win_DX11_playmode_cache_mono_Linear_trunk: set /p GIT_REVISIONDATE= revdate.tmp + set /p GIT_REVISIONDATE= revdate.tmp + set /p GIT_REVISIONDATE= revdate.tmp + set /p GIT_REVISIONDATE= revdate.tmp + set /p GIT_REVISIONDATE= revdate.tmp + set /p GIT_REVISIONDATE= revdate.tmp + set /p GIT_REVISIONDATE= revdate.tmp + set /p GIT_REVISIONDATE= revdate.tmp + set /p GIT_REVISIONDATE= revdate.tmp + set /p GIT_REVISIONDATE= revdate.tmp + set /p GIT_REVISIONDATE= revdate.tmp + set /p GIT_REVISIONDATE= revdate.tmp + set /p GIT_REVISIONDATE= revdate.tmp + set /p GIT_REVISIONDATE= revdate.tmp + set /p GIT_REVISIONDATE= /etc/apt/sources.list.d/unity.list" + - sudo apt update + - sudo apt install unity-downloader-cli + - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr --output TestProjects/UniversalGraphicsTest/utr + - chmod +x TestProjects/UniversalGraphicsTest/utr + - cd TestProjects/UniversalGraphicsTest && sudo unity-downloader-cli -u {{editor_versions.trunk_latest_internal.linux.revision}} -c editor -c il2cpp --wait --published-only + - cd TestProjects/UniversalGraphicsTest && DISPLAY=:0.0 ./utr --artifacts_path=test-results --build-only --editor-location=.Editor --extra-editor-arg="-adb2" --extra-editor-arg="-cacheServerEnableDownload" --extra-editor-arg="true" --extra-editor-arg="-cacheServerEnableUpload" --extra-editor-arg="true" --extra-editor-arg="-cacheServerEndpoint" --extra-editor-arg="cacheserver-slo.hq.unity3d.com" --extra-editor-arg="-cacheServerNamespacePrefix" --extra-editor-arg="SRP" --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-enableCacheServer" --extra-editor-arg="-executemethod" --extra-editor-arg="SetupProject.ApplySettings" --extra-editor-arg="vulkan" --extra-editor-arg="Linear" --extra-editor-arg="-playergraphicsapi=Vulkan" --platform=StandaloneLinux64 --player-save-path=../../players --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=. --timeout=3000 + artifacts: + logs: + paths: + - "**/test-results/**" + - "TestProjects/UniversalGraphicsTest/Logs/*.log" + players: + paths: + - "players*/**" Universal_Linux_Vulkan_Standalone_mono_Linear_CUSTOM-REVISION: name: Universal on Linux_Vulkan_Standalone_mono_Linear on version CUSTOM-REVISION agent: @@ -231,7 +280,7 @@ Universal_Linux_Vulkan_playmode_cache_mono_Linear_CUSTOM-REVISION: - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr --output TestProjects/UniversalGraphicsTest/utr - chmod +x TestProjects/UniversalGraphicsTest/utr - cd TestProjects/UniversalGraphicsTest && sudo unity-downloader-cli --source-file ../../unity_revision.txt -c editor -c il2cpp --wait --published-only - - cd TestProjects/UniversalGraphicsTest && DISPLAY=:0.0 ./utr --artifacts_path=test-results --editor-location=.Editor --extra-editor-arg="-adb2" --extra-editor-arg="-cacheServerEnableDownload true" --extra-editor-arg="-cacheServerEnableUpload true" --extra-editor-arg="-cacheServerEndpoint cacheserver-slo.hq.unity3d.com" --extra-editor-arg="-cacheServerNamespacePrefix SRP" --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-enableCacheServer" --extra-editor-arg="-force-vulkan" --reruncount=2 --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=. --zero-tests-are-ok=1 + - cd TestProjects/UniversalGraphicsTest && DISPLAY=:0.0 ./utr --artifacts_path=test-results --editor-location=.Editor --extra-editor-arg="-adb2" --extra-editor-arg="-cacheServerEnableDownload" --extra-editor-arg="true" --extra-editor-arg="-cacheServerEnableUpload" --extra-editor-arg="true" --extra-editor-arg="-cacheServerEndpoint" --extra-editor-arg="cacheserver-slo.hq.unity3d.com" --extra-editor-arg="-cacheServerNamespacePrefix" --extra-editor-arg="SRP" --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-enableCacheServer" --extra-editor-arg="-force-vulkan" --reruncount=2 --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=. --zero-tests-are-ok=1 artifacts: logs: paths: @@ -268,3 +317,59 @@ Universal_Linux_Vulkan_editmode_mono_Linear_CUSTOM-REVISION: dependencies: - path: .yamato/_editor_priming.yml#editor:priming:CUSTOM-REVISION:linux rerun: always +Universal_Linux_Vulkan_Standalone_cache_mono_Linear_CUSTOM-REVISION: + name: Universal on Linux_Vulkan_Standalone_cache_mono_Linear on version CUSTOM-REVISION + agent: + type: Unity::VM::GPU + image: package-ci/ubuntu:stable + flavor: b1.large + variables: + UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates + CUSTOM_REVISION: custom_revision_not_set + UTR_VERSION: "current" + TEST_FILTER: .* + commands: + - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr --output TestProjects/UniversalGraphicsTest/utr + - chmod +x TestProjects/UniversalGraphicsTest/utr + - cd TestProjects/UniversalGraphicsTest && ./utr --artifacts_path=test-results --extra-editor-arg="-adb2" --extra-editor-arg="-cacheServerEnableDownload" --extra-editor-arg="true" --extra-editor-arg="-cacheServerEnableUpload" --extra-editor-arg="true" --extra-editor-arg="-cacheServerEndpoint" --extra-editor-arg="cacheserver-slo.hq.unity3d.com" --extra-editor-arg="-cacheServerNamespacePrefix" --extra-editor-arg="SRP" --extra-editor-arg="-enableCacheServer" --platform=StandaloneLinux64 --player-connection-ip=auto --player-load-path=../../players --reruncount=2 --suite=playmode --timeout=1200 --zero-tests-are-ok=1 + artifacts: + logs: + paths: + - "**/test-results/**" + - "TestProjects/UniversalGraphicsTest/Logs/*.log" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:CUSTOM-REVISION:linux + rerun: always + - path: .yamato/universal-linux-vulkan.yml#Build_Universal_Linux_Vulkan_Standalone_cache_mono_Linear_CUSTOM-REVISION + rerun: always +Build_Universal_Linux_Vulkan_Standalone_cache_mono_Linear_CUSTOM-REVISION: + name: Build Universal on Linux_Vulkan_mono_Linear_Standalone_cache_build_Player on version CUSTOM-REVISION + agent: + type: Unity::VM + image: package-ci/ubuntu:stable + flavor: b1.xlarge + variables: + UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates + CUSTOM_REVISION: custom_revision_not_set + UTR_VERSION: "current" + TEST_FILTER: .* + commands: + - curl -L https://artifactory.prd.it.unity3d.com/artifactory/api/gpg/key/public | sudo apt-key add - + - sudo sh -c "echo 'deb https://artifactory.prd.it.unity3d.com/artifactory/unity-apt-local bionic main' > /etc/apt/sources.list.d/unity.list" + - sudo apt update + - sudo apt install unity-downloader-cli + - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr --output TestProjects/UniversalGraphicsTest/utr + - chmod +x TestProjects/UniversalGraphicsTest/utr + - cd TestProjects/UniversalGraphicsTest && sudo unity-downloader-cli --source-file ../../unity_revision.txt -c editor -c il2cpp --wait --published-only + - cd TestProjects/UniversalGraphicsTest && DISPLAY=:0.0 ./utr --artifacts_path=test-results --build-only --editor-location=.Editor --extra-editor-arg="-adb2" --extra-editor-arg="-cacheServerEnableDownload" --extra-editor-arg="true" --extra-editor-arg="-cacheServerEnableUpload" --extra-editor-arg="true" --extra-editor-arg="-cacheServerEndpoint" --extra-editor-arg="cacheserver-slo.hq.unity3d.com" --extra-editor-arg="-cacheServerNamespacePrefix" --extra-editor-arg="SRP" --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-enableCacheServer" --extra-editor-arg="-executemethod" --extra-editor-arg="SetupProject.ApplySettings" --extra-editor-arg="vulkan" --extra-editor-arg="Linear" --extra-editor-arg="-playergraphicsapi=Vulkan" --platform=StandaloneLinux64 --player-save-path=../../players --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=. --timeout=3000 + artifacts: + logs: + paths: + - "**/test-results/**" + - "TestProjects/UniversalGraphicsTest/Logs/*.log" + players: + paths: + - "players*/**" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:CUSTOM-REVISION:linux + rerun: always diff --git a/.yamato/universal-osx-metal.yml b/.yamato/universal-osx-metal.yml index 2019db0ced5..f3d02aaa20f 100644 --- a/.yamato/universal-osx-metal.yml +++ b/.yamato/universal-osx-metal.yml @@ -84,7 +84,7 @@ Universal_OSX_Metal_playmode_cache_mono_Linear_trunk: - 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' - |5- - 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="-adb2" --extra-editor-arg="-cacheServerEnableDownload true" --extra-editor-arg="-cacheServerEnableUpload true" --extra-editor-arg="-cacheServerEndpoint cacheserver-slo.hq.unity3d.com" --extra-editor-arg="-cacheServerNamespacePrefix SRP" --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-enableCacheServer" --reruncount=2 --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=/Users/bokken/Graphics/TestProjects/UniversalGraphicsTest --zero-tests-are-ok=1" + 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="-adb2" --extra-editor-arg="-cacheServerEnableDownload" --extra-editor-arg="true" --extra-editor-arg="-cacheServerEnableUpload" --extra-editor-arg="true" --extra-editor-arg="-cacheServerEndpoint" --extra-editor-arg="cacheserver-slo.hq.unity3d.com" --extra-editor-arg="-cacheServerNamespacePrefix" --extra-editor-arg="SRP" --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-enableCacheServer" --reruncount=2 --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=/Users/bokken/Graphics/TestProjects/UniversalGraphicsTest --zero-tests-are-ok=1" UTR_RESULT=$? mkdir -p TestProjects/UniversalGraphicsTest/test-results/ 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/ @@ -123,6 +123,35 @@ Universal_OSX_Metal_playmode_XR_mono_Linear_trunk: paths: - "**/test-results/**" - "TestProjects/UniversalGraphicsTest/Logs/*.log" +Universal_OSX_Metal_Standalone_cache_mono_Linear_trunk: + name: Universal on OSX_Metal_Standalone_cache_mono_Linear on version trunk + agent: + type: Unity::metal::macmini + image: slough-ops/macos-10.14-xcode:stable + flavor: m1.mac + variables: + UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates + UTR_VERSION: "current" + TEST_FILTER: .* + commands: + - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr --output TestProjects/UniversalGraphicsTest/utr + - chmod +x TestProjects/UniversalGraphicsTest/utr + - ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP "bash -lc 'pip3 install unity-downloader-cli --user --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade'" + - scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" -r $YAMATO_SOURCE_DIR bokken@$BOKKEN_DEVICE_IP:~/Graphics + - scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP:~/.ssh/id_rsa_macmini + - 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' + - |5- + + 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=.Editor --extra-editor-arg="-adb2" --extra-editor-arg="-cacheServerEnableDownload" --extra-editor-arg="true" --extra-editor-arg="-cacheServerEnableUpload" --extra-editor-arg="true" --extra-editor-arg="-cacheServerEndpoint" --extra-editor-arg="cacheserver-slo.hq.unity3d.com" --extra-editor-arg="-cacheServerNamespacePrefix" --extra-editor-arg="SRP" --extra-editor-arg="-enableCacheServer" --platform=StandaloneOSX --reruncount=2 --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=/Users/bokken/Graphics/TestProjects/UniversalGraphicsTest --timeout=1200 --zero-tests-are-ok=1" + UTR_RESULT=$? + mkdir -p TestProjects/UniversalGraphicsTest/test-results/ + 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/ + exit $UTR_RESULT + artifacts: + logs: + paths: + - "**/test-results/**" + - "TestProjects/UniversalGraphicsTest/Logs/*.log" Universal_OSX_Metal_Standalone_mono_Linear_CUSTOM-REVISION: name: Universal on OSX_Metal_Standalone_mono_Linear on version CUSTOM-REVISION agent: @@ -209,7 +238,7 @@ Universal_OSX_Metal_playmode_cache_mono_Linear_CUSTOM-REVISION: - 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' - |5- - 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="-adb2" --extra-editor-arg="-cacheServerEnableDownload true" --extra-editor-arg="-cacheServerEnableUpload true" --extra-editor-arg="-cacheServerEndpoint cacheserver-slo.hq.unity3d.com" --extra-editor-arg="-cacheServerNamespacePrefix SRP" --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-enableCacheServer" --reruncount=2 --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=/Users/bokken/Graphics/TestProjects/UniversalGraphicsTest --zero-tests-are-ok=1" + 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="-adb2" --extra-editor-arg="-cacheServerEnableDownload" --extra-editor-arg="true" --extra-editor-arg="-cacheServerEnableUpload" --extra-editor-arg="true" --extra-editor-arg="-cacheServerEndpoint" --extra-editor-arg="cacheserver-slo.hq.unity3d.com" --extra-editor-arg="-cacheServerNamespacePrefix" --extra-editor-arg="SRP" --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-enableCacheServer" --reruncount=2 --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=/Users/bokken/Graphics/TestProjects/UniversalGraphicsTest --zero-tests-are-ok=1" UTR_RESULT=$? mkdir -p TestProjects/UniversalGraphicsTest/test-results/ 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/ @@ -255,3 +284,36 @@ Universal_OSX_Metal_playmode_XR_mono_Linear_CUSTOM-REVISION: dependencies: - path: .yamato/_editor_priming.yml#editor:priming:CUSTOM-REVISION:macos rerun: always +Universal_OSX_Metal_Standalone_cache_mono_Linear_CUSTOM-REVISION: + name: Universal on OSX_Metal_Standalone_cache_mono_Linear on version CUSTOM-REVISION + agent: + type: Unity::metal::macmini + image: slough-ops/macos-10.14-xcode:stable + flavor: m1.mac + variables: + UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates + CUSTOM_REVISION: custom_revision_not_set + UTR_VERSION: "current" + TEST_FILTER: .* + commands: + - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr --output TestProjects/UniversalGraphicsTest/utr + - chmod +x TestProjects/UniversalGraphicsTest/utr + - ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP "bash -lc 'pip3 install unity-downloader-cli --user --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade'" + - scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" -r $YAMATO_SOURCE_DIR bokken@$BOKKEN_DEVICE_IP:~/Graphics + - scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP:~/.ssh/id_rsa_macmini + - 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' + - |5- + + 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=.Editor --extra-editor-arg="-adb2" --extra-editor-arg="-cacheServerEnableDownload" --extra-editor-arg="true" --extra-editor-arg="-cacheServerEnableUpload" --extra-editor-arg="true" --extra-editor-arg="-cacheServerEndpoint" --extra-editor-arg="cacheserver-slo.hq.unity3d.com" --extra-editor-arg="-cacheServerNamespacePrefix" --extra-editor-arg="SRP" --extra-editor-arg="-enableCacheServer" --platform=StandaloneOSX --reruncount=2 --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=/Users/bokken/Graphics/TestProjects/UniversalGraphicsTest --timeout=1200 --zero-tests-are-ok=1" + UTR_RESULT=$? + mkdir -p TestProjects/UniversalGraphicsTest/test-results/ + 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/ + exit $UTR_RESULT + artifacts: + logs: + paths: + - "**/test-results/**" + - "TestProjects/UniversalGraphicsTest/Logs/*.log" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:CUSTOM-REVISION:macos + rerun: always diff --git a/.yamato/universal-osx-openglcore.yml b/.yamato/universal-osx-openglcore.yml index 2b522b1c2d3..1fed5d321c6 100644 --- a/.yamato/universal-osx-openglcore.yml +++ b/.yamato/universal-osx-openglcore.yml @@ -45,7 +45,7 @@ Universal_OSX_OpenGLCore_playmode_cache_mono_Linear_trunk: - brew tap --force-auto-update unity/unity git@github.cds.internal.unity3d.com:unity/homebrew-unity.git - brew install unity-downloader-cli - cd TestProjects/UniversalGraphicsTest && unity-downloader-cli -u {{editor_versions.trunk_latest_internal.macos.revision}} -c editor -c il2cpp --wait --published-only - - cd TestProjects/UniversalGraphicsTest && ./utr --artifacts_path=test-results --editor-location=.Editor --extra-editor-arg="-adb2" --extra-editor-arg="-cacheServerEnableDownload true" --extra-editor-arg="-cacheServerEnableUpload true" --extra-editor-arg="-cacheServerEndpoint cacheserver-slo.hq.unity3d.com" --extra-editor-arg="-cacheServerNamespacePrefix SRP" --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-enableCacheServer" --reruncount=2 --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=. --zero-tests-are-ok=1 + - cd TestProjects/UniversalGraphicsTest && ./utr --artifacts_path=test-results --editor-location=.Editor --extra-editor-arg="-adb2" --extra-editor-arg="-cacheServerEnableDownload" --extra-editor-arg="true" --extra-editor-arg="-cacheServerEnableUpload" --extra-editor-arg="true" --extra-editor-arg="-cacheServerEndpoint" --extra-editor-arg="cacheserver-slo.hq.unity3d.com" --extra-editor-arg="-cacheServerNamespacePrefix" --extra-editor-arg="SRP" --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-enableCacheServer" --reruncount=2 --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=. --zero-tests-are-ok=1 artifacts: logs: paths: @@ -116,7 +116,7 @@ Universal_OSX_OpenGLCore_playmode_cache_mono_Linear_CUSTOM-REVISION: - brew tap --force-auto-update unity/unity git@github.cds.internal.unity3d.com:unity/homebrew-unity.git - brew install unity-downloader-cli - cd TestProjects/UniversalGraphicsTest && unity-downloader-cli --source-file ../../unity_revision.txt -c editor -c il2cpp --wait --published-only - - cd TestProjects/UniversalGraphicsTest && ./utr --artifacts_path=test-results --editor-location=.Editor --extra-editor-arg="-adb2" --extra-editor-arg="-cacheServerEnableDownload true" --extra-editor-arg="-cacheServerEnableUpload true" --extra-editor-arg="-cacheServerEndpoint cacheserver-slo.hq.unity3d.com" --extra-editor-arg="-cacheServerNamespacePrefix SRP" --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-enableCacheServer" --reruncount=2 --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=. --zero-tests-are-ok=1 + - cd TestProjects/UniversalGraphicsTest && ./utr --artifacts_path=test-results --editor-location=.Editor --extra-editor-arg="-adb2" --extra-editor-arg="-cacheServerEnableDownload" --extra-editor-arg="true" --extra-editor-arg="-cacheServerEnableUpload" --extra-editor-arg="true" --extra-editor-arg="-cacheServerEndpoint" --extra-editor-arg="cacheserver-slo.hq.unity3d.com" --extra-editor-arg="-cacheServerNamespacePrefix" --extra-editor-arg="SRP" --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-enableCacheServer" --reruncount=2 --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=. --zero-tests-are-ok=1 artifacts: logs: paths: diff --git a/.yamato/universal-win-dx11.yml b/.yamato/universal-win-dx11.yml index fca8c1716a4..03c925c9a26 100644 --- a/.yamato/universal-win-dx11.yml +++ b/.yamato/universal-win-dx11.yml @@ -107,7 +107,7 @@ Universal_Win_DX11_playmode_cache_mono_Linear_trunk: set /p GIT_REVISIONDATE= revdate.tmp + set /p GIT_REVISIONDATE= revdate.tmp + set /p GIT_REVISIONDATE= revdate.tmp + set /p GIT_REVISIONDATE= revdate.tmp + set /p GIT_REVISIONDATE= revdate.tmp + set /p GIT_REVISIONDATE= revdate.tmp + set /p GIT_REVISIONDATE= revdate.tmp + set /p GIT_REVISIONDATE= revdate.tmp + set /p GIT_REVISIONDATE= revdate.tmp + set /p GIT_REVISIONDATE= revdate.tmp + set /p GIT_REVISIONDATE= revdate.tmp + set /p GIT_REVISIONDATE= revdate.tmp + set /p GIT_REVISIONDATE= revdate.tmp + set /p GIT_REVISIONDATE= revdate.tmp + set /p GIT_REVISIONDATE= /etc/apt/sources.list.d/unity.list" + - sudo apt update + - sudo apt install unity-downloader-cli + - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr --output TestProjects/UniversalHybridTest/utr + - chmod +x TestProjects/UniversalHybridTest/utr + - cd TestProjects/UniversalHybridTest && sudo unity-downloader-cli -u {{editor_versions.trunk_latest_internal.linux.revision}} -c editor -c il2cpp --wait --published-only + - cd TestProjects/UniversalHybridTest && DISPLAY=:0.0 ./utr --artifacts_path=test-results --build-only --editor-location=.Editor --extra-editor-arg="-adb2" --extra-editor-arg="-cacheServerEnableDownload" --extra-editor-arg="true" --extra-editor-arg="-cacheServerEnableUpload" --extra-editor-arg="true" --extra-editor-arg="-cacheServerEndpoint" --extra-editor-arg="cacheserver-slo.hq.unity3d.com" --extra-editor-arg="-cacheServerNamespacePrefix" --extra-editor-arg="SRP" --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-enableCacheServer" --extra-editor-arg="-executemethod" --extra-editor-arg="SetupProject.ApplySettings" --extra-editor-arg="vulkan" --extra-editor-arg="Linear" --extra-editor-arg="-playergraphicsapi=Vulkan" --platform=StandaloneLinux64 --player-save-path=../../players --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=. --timeout=3000 + artifacts: + logs: + paths: + - "**/test-results/**" + - "TestProjects/UniversalHybridTest/Logs/*.log" + players: + paths: + - "players*/**" Universal_Hybrid_Linux_Vulkan_Standalone_mono_Linear_CUSTOM-REVISION: name: Universal_Hybrid on Linux_Vulkan_Standalone_mono_Linear on version CUSTOM-REVISION agent: @@ -207,7 +256,7 @@ Universal_Hybrid_Linux_Vulkan_playmode_cache_mono_Linear_CUSTOM-REVISION: - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr --output TestProjects/UniversalHybridTest/utr - chmod +x TestProjects/UniversalHybridTest/utr - cd TestProjects/UniversalHybridTest && sudo unity-downloader-cli --source-file ../../unity_revision.txt -c editor -c il2cpp --wait --published-only - - cd TestProjects/UniversalHybridTest && DISPLAY=:0.0 ./utr --artifacts_path=test-results --compilation-errors-as-warnings --editor-location=.Editor --extra-editor-arg="-adb2" --extra-editor-arg="-cacheServerEnableDownload true" --extra-editor-arg="-cacheServerEnableUpload true" --extra-editor-arg="-cacheServerEndpoint cacheserver-slo.hq.unity3d.com" --extra-editor-arg="-cacheServerNamespacePrefix SRP" --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-enableCacheServer" --extra-editor-arg="-force-vulkan" --reruncount=2 --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=. --zero-tests-are-ok=1 + - cd TestProjects/UniversalHybridTest && DISPLAY=:0.0 ./utr --artifacts_path=test-results --compilation-errors-as-warnings --editor-location=.Editor --extra-editor-arg="-adb2" --extra-editor-arg="-cacheServerEnableDownload" --extra-editor-arg="true" --extra-editor-arg="-cacheServerEnableUpload" --extra-editor-arg="true" --extra-editor-arg="-cacheServerEndpoint" --extra-editor-arg="cacheserver-slo.hq.unity3d.com" --extra-editor-arg="-cacheServerNamespacePrefix" --extra-editor-arg="SRP" --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-enableCacheServer" --extra-editor-arg="-force-vulkan" --reruncount=2 --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=. --zero-tests-are-ok=1 artifacts: logs: paths: @@ -216,3 +265,59 @@ Universal_Hybrid_Linux_Vulkan_playmode_cache_mono_Linear_CUSTOM-REVISION: dependencies: - path: .yamato/_editor_priming.yml#editor:priming:CUSTOM-REVISION:linux rerun: always +Universal_Hybrid_Linux_Vulkan_Standalone_cache_mono_Linear_CUSTOM-REVISION: + name: Universal_Hybrid on Linux_Vulkan_Standalone_cache_mono_Linear on version CUSTOM-REVISION + agent: + type: Unity::VM::GPU + image: package-ci/ubuntu:stable + flavor: b1.large + variables: + UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates + CUSTOM_REVISION: custom_revision_not_set + UTR_VERSION: "current" + TEST_FILTER: .* + commands: + - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr --output TestProjects/UniversalHybridTest/utr + - chmod +x TestProjects/UniversalHybridTest/utr + - cd TestProjects/UniversalHybridTest && ./utr --artifacts_path=test-results --extra-editor-arg="-adb2" --extra-editor-arg="-cacheServerEnableDownload" --extra-editor-arg="true" --extra-editor-arg="-cacheServerEnableUpload" --extra-editor-arg="true" --extra-editor-arg="-cacheServerEndpoint" --extra-editor-arg="cacheserver-slo.hq.unity3d.com" --extra-editor-arg="-cacheServerNamespacePrefix" --extra-editor-arg="SRP" --extra-editor-arg="-enableCacheServer" --platform=StandaloneLinux64 --player-connection-ip=auto --player-load-path=../../players --reruncount=2 --suite=playmode --timeout=1200 --zero-tests-are-ok=1 + artifacts: + logs: + paths: + - "**/test-results/**" + - "TestProjects/UniversalHybridTest/Logs/*.log" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:CUSTOM-REVISION:linux + rerun: always + - path: .yamato/universal_hybrid-linux-vulkan.yml#Build_Universal_Hybrid_Linux_Vulkan_Standalone_cache_mono_Linear_CUSTOM-REVISION + rerun: always +Build_Universal_Hybrid_Linux_Vulkan_Standalone_cache_mono_Linear_CUSTOM-REVISION: + name: Build Universal_Hybrid on Linux_Vulkan_mono_Linear_Standalone_cache_build_Player on version CUSTOM-REVISION + agent: + type: Unity::VM + image: package-ci/ubuntu:stable + flavor: b1.xlarge + variables: + UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates + CUSTOM_REVISION: custom_revision_not_set + UTR_VERSION: "current" + TEST_FILTER: .* + commands: + - curl -L https://artifactory.prd.it.unity3d.com/artifactory/api/gpg/key/public | sudo apt-key add - + - sudo sh -c "echo 'deb https://artifactory.prd.it.unity3d.com/artifactory/unity-apt-local bionic main' > /etc/apt/sources.list.d/unity.list" + - sudo apt update + - sudo apt install unity-downloader-cli + - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr --output TestProjects/UniversalHybridTest/utr + - chmod +x TestProjects/UniversalHybridTest/utr + - cd TestProjects/UniversalHybridTest && sudo unity-downloader-cli --source-file ../../unity_revision.txt -c editor -c il2cpp --wait --published-only + - cd TestProjects/UniversalHybridTest && DISPLAY=:0.0 ./utr --artifacts_path=test-results --build-only --editor-location=.Editor --extra-editor-arg="-adb2" --extra-editor-arg="-cacheServerEnableDownload" --extra-editor-arg="true" --extra-editor-arg="-cacheServerEnableUpload" --extra-editor-arg="true" --extra-editor-arg="-cacheServerEndpoint" --extra-editor-arg="cacheserver-slo.hq.unity3d.com" --extra-editor-arg="-cacheServerNamespacePrefix" --extra-editor-arg="SRP" --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-enableCacheServer" --extra-editor-arg="-executemethod" --extra-editor-arg="SetupProject.ApplySettings" --extra-editor-arg="vulkan" --extra-editor-arg="Linear" --extra-editor-arg="-playergraphicsapi=Vulkan" --platform=StandaloneLinux64 --player-save-path=../../players --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=. --timeout=3000 + artifacts: + logs: + paths: + - "**/test-results/**" + - "TestProjects/UniversalHybridTest/Logs/*.log" + players: + paths: + - "players*/**" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:CUSTOM-REVISION:linux + rerun: always diff --git a/.yamato/universal_hybrid-osx-metal.yml b/.yamato/universal_hybrid-osx-metal.yml index 4cb7fe0f08a..a04e96dfdc4 100644 --- a/.yamato/universal_hybrid-osx-metal.yml +++ b/.yamato/universal_hybrid-osx-metal.yml @@ -84,7 +84,36 @@ Universal_Hybrid_OSX_Metal_playmode_cache_mono_Linear_trunk: - 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' - |5- - 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/UniversalHybridTest && ~/Graphics/TestProjects/UniversalHybridTest/utr --artifacts_path=/Users/bokken/Graphics/TestProjects/UniversalHybridTest/test-results --compilation-errors-as-warnings --editor-location=/Users/bokken/.Editor --extra-editor-arg="-adb2" --extra-editor-arg="-cacheServerEnableDownload true" --extra-editor-arg="-cacheServerEnableUpload true" --extra-editor-arg="-cacheServerEndpoint cacheserver-slo.hq.unity3d.com" --extra-editor-arg="-cacheServerNamespacePrefix SRP" --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-enableCacheServer" --reruncount=2 --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=/Users/bokken/Graphics/TestProjects/UniversalHybridTest --zero-tests-are-ok=1" + 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/UniversalHybridTest && ~/Graphics/TestProjects/UniversalHybridTest/utr --artifacts_path=/Users/bokken/Graphics/TestProjects/UniversalHybridTest/test-results --compilation-errors-as-warnings --editor-location=/Users/bokken/.Editor --extra-editor-arg="-adb2" --extra-editor-arg="-cacheServerEnableDownload" --extra-editor-arg="true" --extra-editor-arg="-cacheServerEnableUpload" --extra-editor-arg="true" --extra-editor-arg="-cacheServerEndpoint" --extra-editor-arg="cacheserver-slo.hq.unity3d.com" --extra-editor-arg="-cacheServerNamespacePrefix" --extra-editor-arg="SRP" --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-enableCacheServer" --reruncount=2 --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=/Users/bokken/Graphics/TestProjects/UniversalHybridTest --zero-tests-are-ok=1" + UTR_RESULT=$? + mkdir -p TestProjects/UniversalHybridTest/test-results/ + scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/UniversalHybridTest/test-results/ TestProjects/UniversalHybridTest/test-results/ + exit $UTR_RESULT + artifacts: + logs: + paths: + - "**/test-results/**" + - "TestProjects/UniversalHybridTest/Logs/*.log" +Universal_Hybrid_OSX_Metal_Standalone_cache_mono_Linear_trunk: + name: Universal_Hybrid on OSX_Metal_Standalone_cache_mono_Linear on version trunk + agent: + type: Unity::metal::macmini + image: slough-ops/macos-10.14-xcode:stable + flavor: m1.mac + variables: + UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates + UTR_VERSION: "current" + TEST_FILTER: .* + commands: + - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr --output TestProjects/UniversalHybridTest/utr + - chmod +x TestProjects/UniversalHybridTest/utr + - ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP "bash -lc 'pip3 install unity-downloader-cli --user --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade'" + - scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" -r $YAMATO_SOURCE_DIR bokken@$BOKKEN_DEVICE_IP:~/Graphics + - scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP:~/.ssh/id_rsa_macmini + - 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' + - |5- + + 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/UniversalHybridTest && ~/Graphics/TestProjects/UniversalHybridTest/utr --artifacts_path=/Users/bokken/Graphics/TestProjects/UniversalHybridTest/test-results --editor-location=.Editor --extra-editor-arg="-adb2" --extra-editor-arg="-cacheServerEnableDownload" --extra-editor-arg="true" --extra-editor-arg="-cacheServerEnableUpload" --extra-editor-arg="true" --extra-editor-arg="-cacheServerEndpoint" --extra-editor-arg="cacheserver-slo.hq.unity3d.com" --extra-editor-arg="-cacheServerNamespacePrefix" --extra-editor-arg="SRP" --extra-editor-arg="-enableCacheServer" --platform=StandaloneOSX --reruncount=2 --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=/Users/bokken/Graphics/TestProjects/UniversalHybridTest --timeout=1200 --zero-tests-are-ok=1" UTR_RESULT=$? mkdir -p TestProjects/UniversalHybridTest/test-results/ scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/UniversalHybridTest/test-results/ TestProjects/UniversalHybridTest/test-results/ @@ -180,7 +209,40 @@ Universal_Hybrid_OSX_Metal_playmode_cache_mono_Linear_CUSTOM-REVISION: - 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' - |5- - 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/UniversalHybridTest && ~/Graphics/TestProjects/UniversalHybridTest/utr --artifacts_path=/Users/bokken/Graphics/TestProjects/UniversalHybridTest/test-results --compilation-errors-as-warnings --editor-location=/Users/bokken/.Editor --extra-editor-arg="-adb2" --extra-editor-arg="-cacheServerEnableDownload true" --extra-editor-arg="-cacheServerEnableUpload true" --extra-editor-arg="-cacheServerEndpoint cacheserver-slo.hq.unity3d.com" --extra-editor-arg="-cacheServerNamespacePrefix SRP" --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-enableCacheServer" --reruncount=2 --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=/Users/bokken/Graphics/TestProjects/UniversalHybridTest --zero-tests-are-ok=1" + 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/UniversalHybridTest && ~/Graphics/TestProjects/UniversalHybridTest/utr --artifacts_path=/Users/bokken/Graphics/TestProjects/UniversalHybridTest/test-results --compilation-errors-as-warnings --editor-location=/Users/bokken/.Editor --extra-editor-arg="-adb2" --extra-editor-arg="-cacheServerEnableDownload" --extra-editor-arg="true" --extra-editor-arg="-cacheServerEnableUpload" --extra-editor-arg="true" --extra-editor-arg="-cacheServerEndpoint" --extra-editor-arg="cacheserver-slo.hq.unity3d.com" --extra-editor-arg="-cacheServerNamespacePrefix" --extra-editor-arg="SRP" --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-enableCacheServer" --reruncount=2 --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=/Users/bokken/Graphics/TestProjects/UniversalHybridTest --zero-tests-are-ok=1" + UTR_RESULT=$? + mkdir -p TestProjects/UniversalHybridTest/test-results/ + scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/UniversalHybridTest/test-results/ TestProjects/UniversalHybridTest/test-results/ + exit $UTR_RESULT + artifacts: + logs: + paths: + - "**/test-results/**" + - "TestProjects/UniversalHybridTest/Logs/*.log" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:CUSTOM-REVISION:macos + rerun: always +Universal_Hybrid_OSX_Metal_Standalone_cache_mono_Linear_CUSTOM-REVISION: + name: Universal_Hybrid on OSX_Metal_Standalone_cache_mono_Linear on version CUSTOM-REVISION + agent: + type: Unity::metal::macmini + image: slough-ops/macos-10.14-xcode:stable + flavor: m1.mac + variables: + UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates + CUSTOM_REVISION: custom_revision_not_set + UTR_VERSION: "current" + TEST_FILTER: .* + commands: + - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr --output TestProjects/UniversalHybridTest/utr + - chmod +x TestProjects/UniversalHybridTest/utr + - ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP "bash -lc 'pip3 install unity-downloader-cli --user --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade'" + - scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" -r $YAMATO_SOURCE_DIR bokken@$BOKKEN_DEVICE_IP:~/Graphics + - scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP:~/.ssh/id_rsa_macmini + - 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' + - |5- + + 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/UniversalHybridTest && ~/Graphics/TestProjects/UniversalHybridTest/utr --artifacts_path=/Users/bokken/Graphics/TestProjects/UniversalHybridTest/test-results --editor-location=.Editor --extra-editor-arg="-adb2" --extra-editor-arg="-cacheServerEnableDownload" --extra-editor-arg="true" --extra-editor-arg="-cacheServerEnableUpload" --extra-editor-arg="true" --extra-editor-arg="-cacheServerEndpoint" --extra-editor-arg="cacheserver-slo.hq.unity3d.com" --extra-editor-arg="-cacheServerNamespacePrefix" --extra-editor-arg="SRP" --extra-editor-arg="-enableCacheServer" --platform=StandaloneOSX --reruncount=2 --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=/Users/bokken/Graphics/TestProjects/UniversalHybridTest --timeout=1200 --zero-tests-are-ok=1" UTR_RESULT=$? mkdir -p TestProjects/UniversalHybridTest/test-results/ scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/UniversalHybridTest/test-results/ TestProjects/UniversalHybridTest/test-results/ diff --git a/.yamato/universal_hybrid-win-dx11.yml b/.yamato/universal_hybrid-win-dx11.yml index 489f0614647..28e8fcf602d 100644 --- a/.yamato/universal_hybrid-win-dx11.yml +++ b/.yamato/universal_hybrid-win-dx11.yml @@ -106,12 +106,63 @@ Universal_Hybrid_Win_DX11_playmode_cache_mono_Linear_trunk: set /p GIT_REVISIONDATE= revdate.tmp + set /p GIT_REVISIONDATE= revdate.tmp + set /p GIT_REVISIONDATE= revdate.tmp + set /p GIT_REVISIONDATE= revdate.tmp + set /p GIT_REVISIONDATE= revdate.tmp + set /p GIT_REVISIONDATE= revdate.tmp + set /p GIT_REVISIONDATE= /etc/apt/sources.list.d/unity.list" + - sudo apt update + - sudo apt install unity-downloader-cli + - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr --output TestProjects/VisualEffectGraph_HDRP/utr + - chmod +x TestProjects/VisualEffectGraph_HDRP/utr + - cd TestProjects/VisualEffectGraph_HDRP && sudo unity-downloader-cli -u {{editor_versions.trunk_latest_internal.linux.revision}} -c editor -c il2cpp --wait --published-only + - cd TestProjects/VisualEffectGraph_HDRP && DISPLAY=:0.0 ./utr --artifacts_path=test-results --build-only --editor-location=.Editor --extra-editor-arg="-adb2" --extra-editor-arg="-cacheServerEnableDownload" --extra-editor-arg="true" --extra-editor-arg="-cacheServerEnableUpload" --extra-editor-arg="true" --extra-editor-arg="-cacheServerEndpoint" --extra-editor-arg="cacheserver-slo.hq.unity3d.com" --extra-editor-arg="-cacheServerNamespacePrefix" --extra-editor-arg="SRP" --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-enableCacheServer" --extra-editor-arg="-executemethod" --extra-editor-arg="SetupProject.ApplySettings" --extra-editor-arg="vulkan" --extra-editor-arg="Linear" --extra-editor-arg="-playergraphicsapi=Vulkan" --platform=StandaloneLinux64 --player-save-path=../../players --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=. --timeout=3000 + artifacts: + logs: + paths: + - "**/test-results/**" + - "TestProjects/VisualEffectGraph_HDRP/Logs/*.log" + players: + paths: + - "players*/**" VFX_HDRP_Linux_Vulkan_Standalone_mono_Linear_CUSTOM-REVISION: name: VFX_HDRP on Linux_Vulkan_Standalone_mono_Linear on version CUSTOM-REVISION agent: @@ -231,7 +280,7 @@ VFX_HDRP_Linux_Vulkan_playmode_cache_mono_Linear_CUSTOM-REVISION: - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr --output TestProjects/VisualEffectGraph_HDRP/utr - chmod +x TestProjects/VisualEffectGraph_HDRP/utr - cd TestProjects/VisualEffectGraph_HDRP && sudo unity-downloader-cli --source-file ../../unity_revision.txt -c editor -c il2cpp --wait --published-only - - cd TestProjects/VisualEffectGraph_HDRP && DISPLAY=:0.0 ./utr --artifacts_path=test-results --editor-location=.Editor --extra-editor-arg="-adb2" --extra-editor-arg="-cacheServerEnableDownload true" --extra-editor-arg="-cacheServerEnableUpload true" --extra-editor-arg="-cacheServerEndpoint cacheserver-slo.hq.unity3d.com" --extra-editor-arg="-cacheServerNamespacePrefix SRP" --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-enableCacheServer" --extra-editor-arg="-force-vulkan" --reruncount=2 --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=. --zero-tests-are-ok=1 + - cd TestProjects/VisualEffectGraph_HDRP && DISPLAY=:0.0 ./utr --artifacts_path=test-results --editor-location=.Editor --extra-editor-arg="-adb2" --extra-editor-arg="-cacheServerEnableDownload" --extra-editor-arg="true" --extra-editor-arg="-cacheServerEnableUpload" --extra-editor-arg="true" --extra-editor-arg="-cacheServerEndpoint" --extra-editor-arg="cacheserver-slo.hq.unity3d.com" --extra-editor-arg="-cacheServerNamespacePrefix" --extra-editor-arg="SRP" --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-enableCacheServer" --extra-editor-arg="-force-vulkan" --reruncount=2 --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=. --zero-tests-are-ok=1 artifacts: logs: paths: @@ -268,3 +317,59 @@ VFX_HDRP_Linux_Vulkan_editmode_mono_Linear_CUSTOM-REVISION: dependencies: - path: .yamato/_editor_priming.yml#editor:priming:CUSTOM-REVISION:linux rerun: always +VFX_HDRP_Linux_Vulkan_Standalone_cache_mono_Linear_CUSTOM-REVISION: + name: VFX_HDRP on Linux_Vulkan_Standalone_cache_mono_Linear on version CUSTOM-REVISION + agent: + type: Unity::VM::GPU + image: package-ci/ubuntu:stable + flavor: b1.large + variables: + UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates + CUSTOM_REVISION: custom_revision_not_set + UTR_VERSION: "current" + TEST_FILTER: .* + commands: + - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr --output TestProjects/VisualEffectGraph_HDRP/utr + - chmod +x TestProjects/VisualEffectGraph_HDRP/utr + - cd TestProjects/VisualEffectGraph_HDRP && ./utr --artifacts_path=test-results --extra-editor-arg="-adb2" --extra-editor-arg="-cacheServerEnableDownload" --extra-editor-arg="true" --extra-editor-arg="-cacheServerEnableUpload" --extra-editor-arg="true" --extra-editor-arg="-cacheServerEndpoint" --extra-editor-arg="cacheserver-slo.hq.unity3d.com" --extra-editor-arg="-cacheServerNamespacePrefix" --extra-editor-arg="SRP" --extra-editor-arg="-enableCacheServer" --platform=StandaloneLinux64 --player-connection-ip=auto --player-load-path=../../players --reruncount=2 --suite=playmode --timeout=1200 --zero-tests-are-ok=1 + artifacts: + logs: + paths: + - "**/test-results/**" + - "TestProjects/VisualEffectGraph_HDRP/Logs/*.log" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:CUSTOM-REVISION:linux + rerun: always + - path: .yamato/vfx_hdrp-linux-vulkan.yml#Build_VFX_HDRP_Linux_Vulkan_Standalone_cache_mono_Linear_CUSTOM-REVISION + rerun: always +Build_VFX_HDRP_Linux_Vulkan_Standalone_cache_mono_Linear_CUSTOM-REVISION: + name: Build VFX_HDRP on Linux_Vulkan_mono_Linear_Standalone_cache_build_Player on version CUSTOM-REVISION + agent: + type: Unity::VM + image: package-ci/ubuntu:stable + flavor: b1.xlarge + variables: + UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates + CUSTOM_REVISION: custom_revision_not_set + UTR_VERSION: "current" + TEST_FILTER: .* + commands: + - curl -L https://artifactory.prd.it.unity3d.com/artifactory/api/gpg/key/public | sudo apt-key add - + - sudo sh -c "echo 'deb https://artifactory.prd.it.unity3d.com/artifactory/unity-apt-local bionic main' > /etc/apt/sources.list.d/unity.list" + - sudo apt update + - sudo apt install unity-downloader-cli + - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr --output TestProjects/VisualEffectGraph_HDRP/utr + - chmod +x TestProjects/VisualEffectGraph_HDRP/utr + - cd TestProjects/VisualEffectGraph_HDRP && sudo unity-downloader-cli --source-file ../../unity_revision.txt -c editor -c il2cpp --wait --published-only + - cd TestProjects/VisualEffectGraph_HDRP && DISPLAY=:0.0 ./utr --artifacts_path=test-results --build-only --editor-location=.Editor --extra-editor-arg="-adb2" --extra-editor-arg="-cacheServerEnableDownload" --extra-editor-arg="true" --extra-editor-arg="-cacheServerEnableUpload" --extra-editor-arg="true" --extra-editor-arg="-cacheServerEndpoint" --extra-editor-arg="cacheserver-slo.hq.unity3d.com" --extra-editor-arg="-cacheServerNamespacePrefix" --extra-editor-arg="SRP" --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-enableCacheServer" --extra-editor-arg="-executemethod" --extra-editor-arg="SetupProject.ApplySettings" --extra-editor-arg="vulkan" --extra-editor-arg="Linear" --extra-editor-arg="-playergraphicsapi=Vulkan" --platform=StandaloneLinux64 --player-save-path=../../players --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=. --timeout=3000 + artifacts: + logs: + paths: + - "**/test-results/**" + - "TestProjects/VisualEffectGraph_HDRP/Logs/*.log" + players: + paths: + - "players*/**" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:CUSTOM-REVISION:linux + rerun: always diff --git a/.yamato/vfx_hdrp-osx-metal.yml b/.yamato/vfx_hdrp-osx-metal.yml index 3d9c1ea1d8e..44be3ae537a 100644 --- a/.yamato/vfx_hdrp-osx-metal.yml +++ b/.yamato/vfx_hdrp-osx-metal.yml @@ -84,7 +84,7 @@ VFX_HDRP_OSX_Metal_playmode_cache_mono_Linear_trunk: - 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' - |5- - 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/VisualEffectGraph_HDRP && ~/Graphics/TestProjects/VisualEffectGraph_HDRP/utr --artifacts_path=/Users/bokken/Graphics/TestProjects/VisualEffectGraph_HDRP/test-results --editor-location=/Users/bokken/.Editor --extra-editor-arg="-adb2" --extra-editor-arg="-cacheServerEnableDownload true" --extra-editor-arg="-cacheServerEnableUpload true" --extra-editor-arg="-cacheServerEndpoint cacheserver-slo.hq.unity3d.com" --extra-editor-arg="-cacheServerNamespacePrefix SRP" --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-enableCacheServer" --reruncount=2 --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=/Users/bokken/Graphics/TestProjects/VisualEffectGraph_HDRP --zero-tests-are-ok=1" + 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/VisualEffectGraph_HDRP && ~/Graphics/TestProjects/VisualEffectGraph_HDRP/utr --artifacts_path=/Users/bokken/Graphics/TestProjects/VisualEffectGraph_HDRP/test-results --editor-location=/Users/bokken/.Editor --extra-editor-arg="-adb2" --extra-editor-arg="-cacheServerEnableDownload" --extra-editor-arg="true" --extra-editor-arg="-cacheServerEnableUpload" --extra-editor-arg="true" --extra-editor-arg="-cacheServerEndpoint" --extra-editor-arg="cacheserver-slo.hq.unity3d.com" --extra-editor-arg="-cacheServerNamespacePrefix" --extra-editor-arg="SRP" --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-enableCacheServer" --reruncount=2 --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=/Users/bokken/Graphics/TestProjects/VisualEffectGraph_HDRP --zero-tests-are-ok=1" UTR_RESULT=$? mkdir -p TestProjects/VisualEffectGraph_HDRP/test-results/ scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/VisualEffectGraph_HDRP/test-results/ TestProjects/VisualEffectGraph_HDRP/test-results/ @@ -123,6 +123,35 @@ VFX_HDRP_OSX_Metal_playmode_XR_mono_Linear_trunk: paths: - "**/test-results/**" - "TestProjects/VisualEffectGraph_HDRP/Logs/*.log" +VFX_HDRP_OSX_Metal_Standalone_cache_mono_Linear_trunk: + name: VFX_HDRP on OSX_Metal_Standalone_cache_mono_Linear on version trunk + agent: + type: Unity::metal::macmini + image: slough-ops/macos-10.14-xcode:stable + flavor: m1.mac + variables: + UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates + UTR_VERSION: "current" + TEST_FILTER: .* + commands: + - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr --output TestProjects/VisualEffectGraph_HDRP/utr + - chmod +x TestProjects/VisualEffectGraph_HDRP/utr + - ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP "bash -lc 'pip3 install unity-downloader-cli --user --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade'" + - scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" -r $YAMATO_SOURCE_DIR bokken@$BOKKEN_DEVICE_IP:~/Graphics + - scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP:~/.ssh/id_rsa_macmini + - 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' + - |5- + + 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/VisualEffectGraph_HDRP && ~/Graphics/TestProjects/VisualEffectGraph_HDRP/utr --artifacts_path=/Users/bokken/Graphics/TestProjects/VisualEffectGraph_HDRP/test-results --editor-location=.Editor --extra-editor-arg="-adb2" --extra-editor-arg="-cacheServerEnableDownload" --extra-editor-arg="true" --extra-editor-arg="-cacheServerEnableUpload" --extra-editor-arg="true" --extra-editor-arg="-cacheServerEndpoint" --extra-editor-arg="cacheserver-slo.hq.unity3d.com" --extra-editor-arg="-cacheServerNamespacePrefix" --extra-editor-arg="SRP" --extra-editor-arg="-enableCacheServer" --platform=StandaloneOSX --reruncount=2 --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=/Users/bokken/Graphics/TestProjects/VisualEffectGraph_HDRP --timeout=1200 --zero-tests-are-ok=1" + UTR_RESULT=$? + mkdir -p TestProjects/VisualEffectGraph_HDRP/test-results/ + scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/VisualEffectGraph_HDRP/test-results/ TestProjects/VisualEffectGraph_HDRP/test-results/ + exit $UTR_RESULT + artifacts: + logs: + paths: + - "**/test-results/**" + - "TestProjects/VisualEffectGraph_HDRP/Logs/*.log" VFX_HDRP_OSX_Metal_Standalone_mono_Linear_CUSTOM-REVISION: name: VFX_HDRP on OSX_Metal_Standalone_mono_Linear on version CUSTOM-REVISION agent: @@ -209,7 +238,7 @@ VFX_HDRP_OSX_Metal_playmode_cache_mono_Linear_CUSTOM-REVISION: - 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' - |5- - 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/VisualEffectGraph_HDRP && ~/Graphics/TestProjects/VisualEffectGraph_HDRP/utr --artifacts_path=/Users/bokken/Graphics/TestProjects/VisualEffectGraph_HDRP/test-results --editor-location=/Users/bokken/.Editor --extra-editor-arg="-adb2" --extra-editor-arg="-cacheServerEnableDownload true" --extra-editor-arg="-cacheServerEnableUpload true" --extra-editor-arg="-cacheServerEndpoint cacheserver-slo.hq.unity3d.com" --extra-editor-arg="-cacheServerNamespacePrefix SRP" --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-enableCacheServer" --reruncount=2 --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=/Users/bokken/Graphics/TestProjects/VisualEffectGraph_HDRP --zero-tests-are-ok=1" + 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/VisualEffectGraph_HDRP && ~/Graphics/TestProjects/VisualEffectGraph_HDRP/utr --artifacts_path=/Users/bokken/Graphics/TestProjects/VisualEffectGraph_HDRP/test-results --editor-location=/Users/bokken/.Editor --extra-editor-arg="-adb2" --extra-editor-arg="-cacheServerEnableDownload" --extra-editor-arg="true" --extra-editor-arg="-cacheServerEnableUpload" --extra-editor-arg="true" --extra-editor-arg="-cacheServerEndpoint" --extra-editor-arg="cacheserver-slo.hq.unity3d.com" --extra-editor-arg="-cacheServerNamespacePrefix" --extra-editor-arg="SRP" --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-enableCacheServer" --reruncount=2 --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=/Users/bokken/Graphics/TestProjects/VisualEffectGraph_HDRP --zero-tests-are-ok=1" UTR_RESULT=$? mkdir -p TestProjects/VisualEffectGraph_HDRP/test-results/ scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/VisualEffectGraph_HDRP/test-results/ TestProjects/VisualEffectGraph_HDRP/test-results/ @@ -255,3 +284,36 @@ VFX_HDRP_OSX_Metal_playmode_XR_mono_Linear_CUSTOM-REVISION: dependencies: - path: .yamato/_editor_priming.yml#editor:priming:CUSTOM-REVISION:macos rerun: always +VFX_HDRP_OSX_Metal_Standalone_cache_mono_Linear_CUSTOM-REVISION: + name: VFX_HDRP on OSX_Metal_Standalone_cache_mono_Linear on version CUSTOM-REVISION + agent: + type: Unity::metal::macmini + image: slough-ops/macos-10.14-xcode:stable + flavor: m1.mac + variables: + UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates + CUSTOM_REVISION: custom_revision_not_set + UTR_VERSION: "current" + TEST_FILTER: .* + commands: + - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr --output TestProjects/VisualEffectGraph_HDRP/utr + - chmod +x TestProjects/VisualEffectGraph_HDRP/utr + - ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP "bash -lc 'pip3 install unity-downloader-cli --user --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade'" + - scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" -r $YAMATO_SOURCE_DIR bokken@$BOKKEN_DEVICE_IP:~/Graphics + - scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP:~/.ssh/id_rsa_macmini + - 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' + - |5- + + 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/VisualEffectGraph_HDRP && ~/Graphics/TestProjects/VisualEffectGraph_HDRP/utr --artifacts_path=/Users/bokken/Graphics/TestProjects/VisualEffectGraph_HDRP/test-results --editor-location=.Editor --extra-editor-arg="-adb2" --extra-editor-arg="-cacheServerEnableDownload" --extra-editor-arg="true" --extra-editor-arg="-cacheServerEnableUpload" --extra-editor-arg="true" --extra-editor-arg="-cacheServerEndpoint" --extra-editor-arg="cacheserver-slo.hq.unity3d.com" --extra-editor-arg="-cacheServerNamespacePrefix" --extra-editor-arg="SRP" --extra-editor-arg="-enableCacheServer" --platform=StandaloneOSX --reruncount=2 --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=/Users/bokken/Graphics/TestProjects/VisualEffectGraph_HDRP --timeout=1200 --zero-tests-are-ok=1" + UTR_RESULT=$? + mkdir -p TestProjects/VisualEffectGraph_HDRP/test-results/ + scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/VisualEffectGraph_HDRP/test-results/ TestProjects/VisualEffectGraph_HDRP/test-results/ + exit $UTR_RESULT + artifacts: + logs: + paths: + - "**/test-results/**" + - "TestProjects/VisualEffectGraph_HDRP/Logs/*.log" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:CUSTOM-REVISION:macos + rerun: always diff --git a/.yamato/vfx_hdrp-win-dx11.yml b/.yamato/vfx_hdrp-win-dx11.yml index f922a6bc150..65467328996 100644 --- a/.yamato/vfx_hdrp-win-dx11.yml +++ b/.yamato/vfx_hdrp-win-dx11.yml @@ -109,7 +109,7 @@ VFX_HDRP_Win_DX11_playmode_cache_mono_Linear_trunk: set /p GIT_REVISIONDATE= revdate.tmp + set /p GIT_REVISIONDATE= revdate.tmp + set /p GIT_REVISIONDATE= revdate.tmp + set /p GIT_REVISIONDATE= revdate.tmp + set /p GIT_REVISIONDATE= revdate.tmp + set /p GIT_REVISIONDATE= revdate.tmp + set /p GIT_REVISIONDATE= /etc/apt/sources.list.d/unity.list" + - sudo apt update + - sudo apt install unity-downloader-cli + - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr --output TestProjects/VisualEffectGraph_URP/utr + - chmod +x TestProjects/VisualEffectGraph_URP/utr + - cd TestProjects/VisualEffectGraph_URP && sudo unity-downloader-cli -u {{editor_versions.trunk_latest_internal.linux.revision}} -c editor -c il2cpp --wait --published-only + - cd TestProjects/VisualEffectGraph_URP && DISPLAY=:0.0 ./utr --artifacts_path=test-results --build-only --editor-location=.Editor --extra-editor-arg="-adb2" --extra-editor-arg="-cacheServerEnableDownload" --extra-editor-arg="true" --extra-editor-arg="-cacheServerEnableUpload" --extra-editor-arg="true" --extra-editor-arg="-cacheServerEndpoint" --extra-editor-arg="cacheserver-slo.hq.unity3d.com" --extra-editor-arg="-cacheServerNamespacePrefix" --extra-editor-arg="SRP" --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-enableCacheServer" --extra-editor-arg="-executemethod" --extra-editor-arg="SetupProject.ApplySettings" --extra-editor-arg="vulkan" --extra-editor-arg="Linear" --extra-editor-arg="-playergraphicsapi=Vulkan" --platform=StandaloneLinux64 --player-save-path=../../players --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=. --timeout=3000 + artifacts: + logs: + paths: + - "**/test-results/**" + - "TestProjects/VisualEffectGraph_URP/Logs/*.log" + players: + paths: + - "players*/**" VFX_URP_Linux_Vulkan_Standalone_mono_Linear_CUSTOM-REVISION: name: VFX_URP on Linux_Vulkan_Standalone_mono_Linear on version CUSTOM-REVISION agent: @@ -207,7 +256,7 @@ VFX_URP_Linux_Vulkan_playmode_cache_mono_Linear_CUSTOM-REVISION: - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr --output TestProjects/VisualEffectGraph_URP/utr - chmod +x TestProjects/VisualEffectGraph_URP/utr - cd TestProjects/VisualEffectGraph_URP && sudo unity-downloader-cli --source-file ../../unity_revision.txt -c editor -c il2cpp --wait --published-only - - cd TestProjects/VisualEffectGraph_URP && DISPLAY=:0.0 ./utr --artifacts_path=test-results --editor-location=.Editor --extra-editor-arg="-adb2" --extra-editor-arg="-cacheServerEnableDownload true" --extra-editor-arg="-cacheServerEnableUpload true" --extra-editor-arg="-cacheServerEndpoint cacheserver-slo.hq.unity3d.com" --extra-editor-arg="-cacheServerNamespacePrefix SRP" --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-enableCacheServer" --extra-editor-arg="-force-vulkan" --reruncount=2 --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=. --zero-tests-are-ok=1 + - cd TestProjects/VisualEffectGraph_URP && DISPLAY=:0.0 ./utr --artifacts_path=test-results --editor-location=.Editor --extra-editor-arg="-adb2" --extra-editor-arg="-cacheServerEnableDownload" --extra-editor-arg="true" --extra-editor-arg="-cacheServerEnableUpload" --extra-editor-arg="true" --extra-editor-arg="-cacheServerEndpoint" --extra-editor-arg="cacheserver-slo.hq.unity3d.com" --extra-editor-arg="-cacheServerNamespacePrefix" --extra-editor-arg="SRP" --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-enableCacheServer" --extra-editor-arg="-force-vulkan" --reruncount=2 --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=. --zero-tests-are-ok=1 artifacts: logs: paths: @@ -216,3 +265,59 @@ VFX_URP_Linux_Vulkan_playmode_cache_mono_Linear_CUSTOM-REVISION: dependencies: - path: .yamato/_editor_priming.yml#editor:priming:CUSTOM-REVISION:linux rerun: always +VFX_URP_Linux_Vulkan_Standalone_cache_mono_Linear_CUSTOM-REVISION: + name: VFX_URP on Linux_Vulkan_Standalone_cache_mono_Linear on version CUSTOM-REVISION + agent: + type: Unity::VM::GPU + image: package-ci/ubuntu:stable + flavor: b1.large + variables: + UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates + CUSTOM_REVISION: custom_revision_not_set + UTR_VERSION: "current" + TEST_FILTER: .* + commands: + - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr --output TestProjects/VisualEffectGraph_URP/utr + - chmod +x TestProjects/VisualEffectGraph_URP/utr + - cd TestProjects/VisualEffectGraph_URP && ./utr --artifacts_path=test-results --extra-editor-arg="-adb2" --extra-editor-arg="-cacheServerEnableDownload" --extra-editor-arg="true" --extra-editor-arg="-cacheServerEnableUpload" --extra-editor-arg="true" --extra-editor-arg="-cacheServerEndpoint" --extra-editor-arg="cacheserver-slo.hq.unity3d.com" --extra-editor-arg="-cacheServerNamespacePrefix" --extra-editor-arg="SRP" --extra-editor-arg="-enableCacheServer" --platform=StandaloneLinux64 --player-connection-ip=auto --player-load-path=../../players --reruncount=2 --suite=playmode --timeout=1200 --zero-tests-are-ok=1 + artifacts: + logs: + paths: + - "**/test-results/**" + - "TestProjects/VisualEffectGraph_URP/Logs/*.log" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:CUSTOM-REVISION:linux + rerun: always + - path: .yamato/vfx_urp-linux-vulkan.yml#Build_VFX_URP_Linux_Vulkan_Standalone_cache_mono_Linear_CUSTOM-REVISION + rerun: always +Build_VFX_URP_Linux_Vulkan_Standalone_cache_mono_Linear_CUSTOM-REVISION: + name: Build VFX_URP on Linux_Vulkan_mono_Linear_Standalone_cache_build_Player on version CUSTOM-REVISION + agent: + type: Unity::VM + image: package-ci/ubuntu:stable + flavor: b1.xlarge + variables: + UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates + CUSTOM_REVISION: custom_revision_not_set + UTR_VERSION: "current" + TEST_FILTER: .* + commands: + - curl -L https://artifactory.prd.it.unity3d.com/artifactory/api/gpg/key/public | sudo apt-key add - + - sudo sh -c "echo 'deb https://artifactory.prd.it.unity3d.com/artifactory/unity-apt-local bionic main' > /etc/apt/sources.list.d/unity.list" + - sudo apt update + - sudo apt install unity-downloader-cli + - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr --output TestProjects/VisualEffectGraph_URP/utr + - chmod +x TestProjects/VisualEffectGraph_URP/utr + - cd TestProjects/VisualEffectGraph_URP && sudo unity-downloader-cli --source-file ../../unity_revision.txt -c editor -c il2cpp --wait --published-only + - cd TestProjects/VisualEffectGraph_URP && DISPLAY=:0.0 ./utr --artifacts_path=test-results --build-only --editor-location=.Editor --extra-editor-arg="-adb2" --extra-editor-arg="-cacheServerEnableDownload" --extra-editor-arg="true" --extra-editor-arg="-cacheServerEnableUpload" --extra-editor-arg="true" --extra-editor-arg="-cacheServerEndpoint" --extra-editor-arg="cacheserver-slo.hq.unity3d.com" --extra-editor-arg="-cacheServerNamespacePrefix" --extra-editor-arg="SRP" --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-enableCacheServer" --extra-editor-arg="-executemethod" --extra-editor-arg="SetupProject.ApplySettings" --extra-editor-arg="vulkan" --extra-editor-arg="Linear" --extra-editor-arg="-playergraphicsapi=Vulkan" --platform=StandaloneLinux64 --player-save-path=../../players --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=. --timeout=3000 + artifacts: + logs: + paths: + - "**/test-results/**" + - "TestProjects/VisualEffectGraph_URP/Logs/*.log" + players: + paths: + - "players*/**" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:CUSTOM-REVISION:linux + rerun: always diff --git a/.yamato/vfx_urp-osx-metal.yml b/.yamato/vfx_urp-osx-metal.yml index bfbb73fbcd3..cb34cd76884 100644 --- a/.yamato/vfx_urp-osx-metal.yml +++ b/.yamato/vfx_urp-osx-metal.yml @@ -84,7 +84,36 @@ VFX_URP_OSX_Metal_playmode_cache_mono_Linear_trunk: - 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' - |5- - 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/VisualEffectGraph_URP && ~/Graphics/TestProjects/VisualEffectGraph_URP/utr --artifacts_path=/Users/bokken/Graphics/TestProjects/VisualEffectGraph_URP/test-results --editor-location=/Users/bokken/.Editor --extra-editor-arg="-adb2" --extra-editor-arg="-cacheServerEnableDownload true" --extra-editor-arg="-cacheServerEnableUpload true" --extra-editor-arg="-cacheServerEndpoint cacheserver-slo.hq.unity3d.com" --extra-editor-arg="-cacheServerNamespacePrefix SRP" --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-enableCacheServer" --reruncount=2 --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=/Users/bokken/Graphics/TestProjects/VisualEffectGraph_URP --zero-tests-are-ok=1" + 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/VisualEffectGraph_URP && ~/Graphics/TestProjects/VisualEffectGraph_URP/utr --artifacts_path=/Users/bokken/Graphics/TestProjects/VisualEffectGraph_URP/test-results --editor-location=/Users/bokken/.Editor --extra-editor-arg="-adb2" --extra-editor-arg="-cacheServerEnableDownload" --extra-editor-arg="true" --extra-editor-arg="-cacheServerEnableUpload" --extra-editor-arg="true" --extra-editor-arg="-cacheServerEndpoint" --extra-editor-arg="cacheserver-slo.hq.unity3d.com" --extra-editor-arg="-cacheServerNamespacePrefix" --extra-editor-arg="SRP" --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-enableCacheServer" --reruncount=2 --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=/Users/bokken/Graphics/TestProjects/VisualEffectGraph_URP --zero-tests-are-ok=1" + UTR_RESULT=$? + mkdir -p TestProjects/VisualEffectGraph_URP/test-results/ + scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/VisualEffectGraph_URP/test-results/ TestProjects/VisualEffectGraph_URP/test-results/ + exit $UTR_RESULT + artifacts: + logs: + paths: + - "**/test-results/**" + - "TestProjects/VisualEffectGraph_URP/Logs/*.log" +VFX_URP_OSX_Metal_Standalone_cache_mono_Linear_trunk: + name: VFX_URP on OSX_Metal_Standalone_cache_mono_Linear on version trunk + agent: + type: Unity::metal::macmini + image: slough-ops/macos-10.14-xcode:stable + flavor: m1.mac + variables: + UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates + UTR_VERSION: "current" + TEST_FILTER: .* + commands: + - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr --output TestProjects/VisualEffectGraph_URP/utr + - chmod +x TestProjects/VisualEffectGraph_URP/utr + - ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP "bash -lc 'pip3 install unity-downloader-cli --user --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade'" + - scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" -r $YAMATO_SOURCE_DIR bokken@$BOKKEN_DEVICE_IP:~/Graphics + - scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP:~/.ssh/id_rsa_macmini + - 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' + - |5- + + 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/VisualEffectGraph_URP && ~/Graphics/TestProjects/VisualEffectGraph_URP/utr --artifacts_path=/Users/bokken/Graphics/TestProjects/VisualEffectGraph_URP/test-results --editor-location=.Editor --extra-editor-arg="-adb2" --extra-editor-arg="-cacheServerEnableDownload" --extra-editor-arg="true" --extra-editor-arg="-cacheServerEnableUpload" --extra-editor-arg="true" --extra-editor-arg="-cacheServerEndpoint" --extra-editor-arg="cacheserver-slo.hq.unity3d.com" --extra-editor-arg="-cacheServerNamespacePrefix" --extra-editor-arg="SRP" --extra-editor-arg="-enableCacheServer" --platform=StandaloneOSX --reruncount=2 --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=/Users/bokken/Graphics/TestProjects/VisualEffectGraph_URP --timeout=1200 --zero-tests-are-ok=1" UTR_RESULT=$? mkdir -p TestProjects/VisualEffectGraph_URP/test-results/ scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/VisualEffectGraph_URP/test-results/ TestProjects/VisualEffectGraph_URP/test-results/ @@ -180,7 +209,40 @@ VFX_URP_OSX_Metal_playmode_cache_mono_Linear_CUSTOM-REVISION: - 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' - |5- - 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/VisualEffectGraph_URP && ~/Graphics/TestProjects/VisualEffectGraph_URP/utr --artifacts_path=/Users/bokken/Graphics/TestProjects/VisualEffectGraph_URP/test-results --editor-location=/Users/bokken/.Editor --extra-editor-arg="-adb2" --extra-editor-arg="-cacheServerEnableDownload true" --extra-editor-arg="-cacheServerEnableUpload true" --extra-editor-arg="-cacheServerEndpoint cacheserver-slo.hq.unity3d.com" --extra-editor-arg="-cacheServerNamespacePrefix SRP" --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-enableCacheServer" --reruncount=2 --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=/Users/bokken/Graphics/TestProjects/VisualEffectGraph_URP --zero-tests-are-ok=1" + 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/VisualEffectGraph_URP && ~/Graphics/TestProjects/VisualEffectGraph_URP/utr --artifacts_path=/Users/bokken/Graphics/TestProjects/VisualEffectGraph_URP/test-results --editor-location=/Users/bokken/.Editor --extra-editor-arg="-adb2" --extra-editor-arg="-cacheServerEnableDownload" --extra-editor-arg="true" --extra-editor-arg="-cacheServerEnableUpload" --extra-editor-arg="true" --extra-editor-arg="-cacheServerEndpoint" --extra-editor-arg="cacheserver-slo.hq.unity3d.com" --extra-editor-arg="-cacheServerNamespacePrefix" --extra-editor-arg="SRP" --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-enableCacheServer" --reruncount=2 --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=/Users/bokken/Graphics/TestProjects/VisualEffectGraph_URP --zero-tests-are-ok=1" + UTR_RESULT=$? + mkdir -p TestProjects/VisualEffectGraph_URP/test-results/ + scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/VisualEffectGraph_URP/test-results/ TestProjects/VisualEffectGraph_URP/test-results/ + exit $UTR_RESULT + artifacts: + logs: + paths: + - "**/test-results/**" + - "TestProjects/VisualEffectGraph_URP/Logs/*.log" + dependencies: + - path: .yamato/_editor_priming.yml#editor:priming:CUSTOM-REVISION:macos + rerun: always +VFX_URP_OSX_Metal_Standalone_cache_mono_Linear_CUSTOM-REVISION: + name: VFX_URP on OSX_Metal_Standalone_cache_mono_Linear on version CUSTOM-REVISION + agent: + type: Unity::metal::macmini + image: slough-ops/macos-10.14-xcode:stable + flavor: m1.mac + variables: + UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates + CUSTOM_REVISION: custom_revision_not_set + UTR_VERSION: "current" + TEST_FILTER: .* + commands: + - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr --output TestProjects/VisualEffectGraph_URP/utr + - chmod +x TestProjects/VisualEffectGraph_URP/utr + - ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP "bash -lc 'pip3 install unity-downloader-cli --user --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade'" + - scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" -r $YAMATO_SOURCE_DIR bokken@$BOKKEN_DEVICE_IP:~/Graphics + - scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP:~/.ssh/id_rsa_macmini + - 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' + - |5- + + 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/VisualEffectGraph_URP && ~/Graphics/TestProjects/VisualEffectGraph_URP/utr --artifacts_path=/Users/bokken/Graphics/TestProjects/VisualEffectGraph_URP/test-results --editor-location=.Editor --extra-editor-arg="-adb2" --extra-editor-arg="-cacheServerEnableDownload" --extra-editor-arg="true" --extra-editor-arg="-cacheServerEnableUpload" --extra-editor-arg="true" --extra-editor-arg="-cacheServerEndpoint" --extra-editor-arg="cacheserver-slo.hq.unity3d.com" --extra-editor-arg="-cacheServerNamespacePrefix" --extra-editor-arg="SRP" --extra-editor-arg="-enableCacheServer" --platform=StandaloneOSX --reruncount=2 --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=/Users/bokken/Graphics/TestProjects/VisualEffectGraph_URP --timeout=1200 --zero-tests-are-ok=1" UTR_RESULT=$? mkdir -p TestProjects/VisualEffectGraph_URP/test-results/ scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/VisualEffectGraph_URP/test-results/ TestProjects/VisualEffectGraph_URP/test-results/ diff --git a/.yamato/vfx_urp-osx-openglcore.yml b/.yamato/vfx_urp-osx-openglcore.yml index 7923c16d2b1..c359450283e 100644 --- a/.yamato/vfx_urp-osx-openglcore.yml +++ b/.yamato/vfx_urp-osx-openglcore.yml @@ -45,7 +45,7 @@ VFX_URP_OSX_OpenGLCore_playmode_cache_mono_Linear_trunk: - brew tap --force-auto-update unity/unity git@github.cds.internal.unity3d.com:unity/homebrew-unity.git - brew install unity-downloader-cli - cd TestProjects/VisualEffectGraph_URP && unity-downloader-cli -u {{editor_versions.trunk_latest_internal.macos.revision}} -c editor -c il2cpp --wait --published-only - - cd TestProjects/VisualEffectGraph_URP && ./utr --artifacts_path=test-results --editor-location=.Editor --extra-editor-arg="-adb2" --extra-editor-arg="-cacheServerEnableDownload true" --extra-editor-arg="-cacheServerEnableUpload true" --extra-editor-arg="-cacheServerEndpoint cacheserver-slo.hq.unity3d.com" --extra-editor-arg="-cacheServerNamespacePrefix SRP" --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-enableCacheServer" --reruncount=2 --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=. --zero-tests-are-ok=1 + - cd TestProjects/VisualEffectGraph_URP && ./utr --artifacts_path=test-results --editor-location=.Editor --extra-editor-arg="-adb2" --extra-editor-arg="-cacheServerEnableDownload" --extra-editor-arg="true" --extra-editor-arg="-cacheServerEnableUpload" --extra-editor-arg="true" --extra-editor-arg="-cacheServerEndpoint" --extra-editor-arg="cacheserver-slo.hq.unity3d.com" --extra-editor-arg="-cacheServerNamespacePrefix" --extra-editor-arg="SRP" --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-enableCacheServer" --reruncount=2 --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=. --zero-tests-are-ok=1 artifacts: logs: paths: @@ -94,7 +94,7 @@ VFX_URP_OSX_OpenGLCore_playmode_cache_mono_Linear_CUSTOM-REVISION: - brew tap --force-auto-update unity/unity git@github.cds.internal.unity3d.com:unity/homebrew-unity.git - brew install unity-downloader-cli - cd TestProjects/VisualEffectGraph_URP && unity-downloader-cli --source-file ../../unity_revision.txt -c editor -c il2cpp --wait --published-only - - cd TestProjects/VisualEffectGraph_URP && ./utr --artifacts_path=test-results --editor-location=.Editor --extra-editor-arg="-adb2" --extra-editor-arg="-cacheServerEnableDownload true" --extra-editor-arg="-cacheServerEnableUpload true" --extra-editor-arg="-cacheServerEndpoint cacheserver-slo.hq.unity3d.com" --extra-editor-arg="-cacheServerNamespacePrefix SRP" --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-enableCacheServer" --reruncount=2 --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=. --zero-tests-are-ok=1 + - cd TestProjects/VisualEffectGraph_URP && ./utr --artifacts_path=test-results --editor-location=.Editor --extra-editor-arg="-adb2" --extra-editor-arg="-cacheServerEnableDownload" --extra-editor-arg="true" --extra-editor-arg="-cacheServerEnableUpload" --extra-editor-arg="true" --extra-editor-arg="-cacheServerEndpoint" --extra-editor-arg="cacheserver-slo.hq.unity3d.com" --extra-editor-arg="-cacheServerNamespacePrefix" --extra-editor-arg="SRP" --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-enableCacheServer" --reruncount=2 --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=. --zero-tests-are-ok=1 artifacts: logs: paths: diff --git a/.yamato/vfx_urp-win-dx11.yml b/.yamato/vfx_urp-win-dx11.yml index 70d6e55cae7..d75f535d0ff 100644 --- a/.yamato/vfx_urp-win-dx11.yml +++ b/.yamato/vfx_urp-win-dx11.yml @@ -106,12 +106,63 @@ VFX_URP_Win_DX11_playmode_cache_mono_Linear_trunk: set /p GIT_REVISIONDATE= revdate.tmp + set /p GIT_REVISIONDATE= revdate.tmp + set /p GIT_REVISIONDATE= revdate.tmp + set /p GIT_REVISIONDATE= revdate.tmp + set /p GIT_REVISIONDATE= Date: Fri, 15 Jan 2021 10:18:12 +0100 Subject: [PATCH 13/21] Fix undo redo on layered lit editor (#3059) * Fixed Render Graph immediate mode. (#3033) Co-authored-by: Sebastien Lagarde * Fix issue with shadow mask and area lights (#3019) * Not checking NdotL since it's not really valid for area lights (We have multiple valid light directions, not one) * Changelog Co-authored-by: sebastienlagarde * Fix issue with capture callback (now includes post processing results) (#3035) Co-authored-by: sebastienlagarde * [HDRP] Fix decal draw order for ShaderGraph decal materials (#3018) * Fixed ShaderGraph decal draw order * Updated changelog Co-authored-by: sebastienlagarde * Fixed various Look Dev issues after exiting Playmode (#2956) * Fixed access to invalid Contexts references after exiting playmode. * Fixed comparison gizmo after playmode. * Fixes from PR feedback * Fix undo redo on layered lit editor * Update CHANGELOG.md Co-authored-by: JulienIgnace-Unity Co-authored-by: Sebastien Lagarde Co-authored-by: FrancescoC-unity <43168857+FrancescoC-unity@users.noreply.github.com> Co-authored-by: Pavlos Mavridis Co-authored-by: Antoine Lelievre --- .../CHANGELOG.md | 1 + .../Material/LayeredLit/LayeredLitGUI.cs | 54 ++++++++++++------- .../Material/UIBlocks/LayerListUIBlock.cs | 38 +++++-------- 3 files changed, 48 insertions(+), 45 deletions(-) diff --git a/com.unity.render-pipelines.high-definition/CHANGELOG.md b/com.unity.render-pipelines.high-definition/CHANGELOG.md index a8e2b7095c5..d8ffdbf0a79 100644 --- a/com.unity.render-pipelines.high-definition/CHANGELOG.md +++ b/com.unity.render-pipelines.high-definition/CHANGELOG.md @@ -17,6 +17,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. - Fixed side effect on styles during compositor rendering. - Fixed size and spacing of compositor info boxes (case 1305652). - Fixed spacing of UI widgets in the Graphics Compositor (case 1305638). +- Fixed undo-redo on layered lit editor. ### Changed - Change the source value for the ray tracing frame index iterator from m_FrameCount to the camera frame count (case 1301356). diff --git a/com.unity.render-pipelines.high-definition/Editor/Material/LayeredLit/LayeredLitGUI.cs b/com.unity.render-pipelines.high-definition/Editor/Material/LayeredLit/LayeredLitGUI.cs index d9083dba157..fbc15551b18 100644 --- a/com.unity.render-pipelines.high-definition/Editor/Material/LayeredLit/LayeredLitGUI.cs +++ b/com.unity.render-pipelines.high-definition/Editor/Material/LayeredLit/LayeredLitGUI.cs @@ -13,6 +13,7 @@ namespace UnityEditor.Rendering.HighDefinition internal struct SerializeableGUIDs { public string[] GUIDArray; + public bool[] withUV; } /// @@ -254,37 +255,27 @@ public static void SynchronizeAllLayers(Material material) AssetImporter materialImporter = AssetImporter.GetAtPath(AssetDatabase.GetAssetPath(material.GetInstanceID())); Material[] layers = null; + bool[] withUV = null; // Material importer can be null when the selected material doesn't exists as asset (Material saved inside the scene) if (materialImporter != null) - InitializeMaterialLayers(material, ref layers); + InitializeMaterialLayers(material, ref layers, ref withUV); // We could have no userData in the assets, so test if we have load something - if (layers != null) + if (layers != null && withUV != null) { for (int i = 0; i < layerCount; ++i) { - SynchronizeLayerProperties(material, layers, i, true); + SynchronizeLayerProperties(material, i, layers[i], withUV[i]); } } } - public static void SynchronizeAllLayersProperties(Material material, Material[] materialLayers, bool excludeUVMappingProperties) - { - int numLayer = material.GetLayerCount(); - - for (int i = 0; i < numLayer; ++i) - { - SynchronizeLayerProperties(material, materialLayers, i, excludeUVMappingProperties); - } - } - // This function will look for all referenced lit material, and assign value from Lit to layered lit layers. // This is based on the naming of the variables, i.E BaseColor will match BaseColor0, if a properties shouldn't be override // put the name in the exclusionList below - public static void SynchronizeLayerProperties(Material material, Material[] layers, int layerIndex, bool excludeUVMappingProperties) + public static void SynchronizeLayerProperties(Material material, int layerIndex, Material layerMaterial, bool includeUVMappingProperties) { - Material layerMaterial = layers[layerIndex]; string[] exclusionList = { kTexWorldScale, kUVBase, kUVMappingMask, kUVDetail, kUVDetailsMappingMask }; if (layerMaterial != null) @@ -296,7 +287,7 @@ public static void SynchronizeLayerProperties(Material material, Material[] laye string propertyName = ShaderUtil.GetPropertyName(layerShader, i); string layerPropertyName = propertyName + layerIndex; - if (!exclusionList.Contains(propertyName) || !excludeUVMappingProperties) + if (includeUVMappingProperties || !exclusionList.Contains(propertyName)) { if (material.HasProperty(layerPropertyName)) { @@ -322,7 +313,7 @@ public static void SynchronizeLayerProperties(Material material, Material[] laye case ShaderUtil.ShaderPropertyType.TexEnv: { material.SetTexture(layerPropertyName, layerMaterial.GetTexture(propertyName)); - if (!excludeUVMappingProperties) + if (includeUVMappingProperties) { material.SetTextureOffset(layerPropertyName, layerMaterial.GetTextureOffset(propertyName)); material.SetTextureScale(layerPropertyName, layerMaterial.GetTextureScale(propertyName)); @@ -338,10 +329,14 @@ public static void SynchronizeLayerProperties(Material material, Material[] laye // We use the user data to save a string that represent the referenced lit material // so we can keep reference during serialization - public static void InitializeMaterialLayers(Material material, ref Material[] layers) + public static void InitializeMaterialLayers(Material material, ref Material[] layers, ref bool[] withUV) { AssetImporter materialImporter = AssetImporter.GetAtPath(AssetDatabase.GetAssetPath(material.GetInstanceID())); + InitializeMaterialLayers(materialImporter, ref layers, ref withUV); + } + public static void InitializeMaterialLayers(AssetImporter materialImporter, ref Material[] layers, ref bool[] withUV) + { if (materialImporter.userData != string.Empty) { SerializeableGUIDs layersGUID = JsonUtility.FromJson(materialImporter.userData); @@ -353,19 +348,40 @@ public static void InitializeMaterialLayers(Material material, ref Material[] la layers[i] = AssetDatabase.LoadAssetAtPath(AssetDatabase.GUIDToAssetPath(layersGUID.GUIDArray[i]), typeof(Material)) as Material; } } + if (layersGUID.withUV.Length > 0) + { + withUV = new bool[layersGUID.withUV.Length]; + for (int i = 0; i < layersGUID.withUV.Length; ++i) + withUV[i] = layersGUID.withUV[i]; + } + } + else + { + if (layers != null) + { + for (int i = 0; i < layers.Length; ++i) + layers[i] = null; + } + if (withUV != null) + { + for (int i = 0; i < withUV.Length; ++i) + withUV[i] = true; + } } } - public static void SaveMaterialLayers(Material material, Material[] materialLayers) + public static void SaveMaterialLayers(Material material, Material[] materialLayers, bool[] withUV) { AssetImporter materialImporter = AssetImporter.GetAtPath(AssetDatabase.GetAssetPath(material.GetInstanceID())); SerializeableGUIDs layersGUID; layersGUID.GUIDArray = new string[materialLayers.Length]; + layersGUID.withUV = new bool[withUV.Length]; for (int i = 0; i < materialLayers.Length; ++i) { if (materialLayers[i] != null) layersGUID.GUIDArray[i] = AssetDatabase.AssetPathToGUID(AssetDatabase.GetAssetPath(materialLayers[i].GetInstanceID())); + layersGUID.withUV[i] = withUV[i]; } materialImporter.userData = JsonUtility.ToJson(layersGUID); diff --git a/com.unity.render-pipelines.high-definition/Editor/Material/UIBlocks/LayerListUIBlock.cs b/com.unity.render-pipelines.high-definition/Editor/Material/UIBlocks/LayerListUIBlock.cs index 01529ff8e52..ff91945e624 100644 --- a/com.unity.render-pipelines.high-definition/Editor/Material/UIBlocks/LayerListUIBlock.cs +++ b/com.unity.render-pipelines.high-definition/Editor/Material/UIBlocks/LayerListUIBlock.cs @@ -35,7 +35,7 @@ internal class Styles MaterialProperty layerCount = null; ExpandableBit m_ExpandableBit; - bool[] m_WithUV; + bool[] m_WithUV = new bool[kMaxLayerCount]; Material[] m_MaterialLayers = new Material[kMaxLayerCount]; AssetImporter m_MaterialImporter; @@ -69,7 +69,6 @@ void UpdateEditorExpended(int layerNumber) public LayerListUIBlock(ExpandableBit expandableBit) { m_ExpandableBit = expandableBit; - m_WithUV = new bool[] { true, true, true, true }; } /// @@ -86,25 +85,7 @@ public override void LoadMaterialProperties() // Material importer can be null when the selected material doesn't exists as asset (Material saved inside the scene) if (m_MaterialImporter != null) - InitializeMaterialLayers(m_MaterialImporter, ref m_MaterialLayers); - } - - // We use the user data to save a string that represent the referenced lit material - // so we can keep reference during serialization - static void InitializeMaterialLayers(AssetImporter materialImporter, ref Material[] layers) - { - if (materialImporter.userData != string.Empty) - { - SerializeableGUIDs layersGUID = JsonUtility.FromJson(materialImporter.userData); - if (layersGUID.GUIDArray.Length > 0) - { - layers = new Material[layersGUID.GUIDArray.Length]; - for (int i = 0; i < layersGUID.GUIDArray.Length; ++i) - { - layers[i] = AssetDatabase.LoadAssetAtPath(AssetDatabase.GUIDToAssetPath(layersGUID.GUIDArray[i]), typeof(Material)) as Material; - } - } - } + LayeredLitGUI.InitializeMaterialLayers(m_MaterialImporter, ref m_MaterialLayers, ref m_WithUV); } /// @@ -153,19 +134,18 @@ void DrawLayerListGUI() { using (new EditorGUILayout.HorizontalScope()) { - EditorGUI.BeginChangeCheck(); - Rect lineRect = GUILayoutUtility.GetRect(1, EditorGUIUtility.singleLineHeight); Rect colorRect = new Rect(lineRect.x + 17f, lineRect.y + 7f, colorWidth, colorWidth); Rect materialRect = new Rect(lineRect.x + padding + colorRect.width, lineRect.y, lineRect.width - UVWidth - padding - 3 - resetButtonWidth + endOffset, lineRect.height); Rect uvRect = new Rect(lineRect.x + lineRect.width - resetButtonWidth - padding - UVWidth - endOffset, lineRect.y, UVWidth, lineRect.height); Rect resetRect = new Rect(lineRect.x + lineRect.width - resetButtonWidth - endOffset, lineRect.y, resetButtonWidth, lineRect.height); + EditorGUI.BeginChangeCheck(); m_MaterialLayers[layerIndex] = EditorGUI.ObjectField(materialRect, Styles.layerLabels[layerIndex], m_MaterialLayers[layerIndex], typeof(Material), allowSceneObjects: true) as Material; if (EditorGUI.EndChangeCheck()) { Undo.RecordObjects(new UnityEngine.Object[] { material, m_MaterialImporter }, "Change layer material"); - LayeredLitGUI.SynchronizeLayerProperties(material, m_MaterialLayers, layerIndex, true); + LayeredLitGUI.SynchronizeLayerProperties(material, layerIndex, m_MaterialLayers[layerIndex], m_WithUV[layerIndex]); layersChanged = true; // Update external reference. @@ -178,12 +158,18 @@ void DrawLayerListGUI() EditorGUI.DrawRect(colorRect, kLayerColors[layerIndex]); + EditorGUI.BeginChangeCheck(); m_WithUV[layerIndex] = EditorGUI.Toggle(uvRect, m_WithUV[layerIndex]); + if (EditorGUI.EndChangeCheck()) + { + Undo.RecordObjects(new UnityEngine.Object[] { material, m_MaterialImporter }, "Change layer material"); + layersChanged = true; + } if (GUI.Button(resetRect, GUIContent.none)) { Undo.RecordObjects(new UnityEngine.Object[] { material, m_MaterialImporter }, "Reset layer material"); - LayeredLitGUI.SynchronizeLayerProperties(material, m_MaterialLayers, layerIndex, !m_WithUV[layerIndex]); + LayeredLitGUI.SynchronizeLayerProperties(material, layerIndex, m_MaterialLayers[layerIndex], m_WithUV[layerIndex]); layersChanged = true; } @@ -212,7 +198,7 @@ void DrawLayerListGUI() // SaveAssetsProcessor the referenced material in the users data if (m_MaterialImporter != null) - LayeredLitGUI.SaveMaterialLayers(material, m_MaterialLayers); + LayeredLitGUI.SaveMaterialLayers(material, m_MaterialLayers, m_WithUV); // We should always do this call at the end materialEditor.serializedObject.ApplyModifiedProperties(); From 9c216c85c5e1eec6707a94ca1e06e2df9a697b3e Mon Sep 17 00:00:00 2001 From: Antoine Lelievre Date: Fri, 15 Jan 2021 11:12:35 +0100 Subject: [PATCH 14/21] [HDRP] Added Vulkan install in system requirements (#3122) * Added vulkan install in system requirements * Reworded content Co-authored-by: Lewis Jordan --- .../Documentation~/System-Requirements.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/com.unity.render-pipelines.high-definition/Documentation~/System-Requirements.md b/com.unity.render-pipelines.high-definition/Documentation~/System-Requirements.md index 6add0640630..1f90455530b 100644 --- a/com.unity.render-pipelines.high-definition/Documentation~/System-Requirements.md +++ b/com.unity.render-pipelines.high-definition/Documentation~/System-Requirements.md @@ -37,7 +37,7 @@ HRDP is only compatible with the following platforms: - MacOS (minimum version 10.13) using Metal graphics - Linux and Windows platforms with Vulkan -**Note: HDRP only works on these platforms if the device used supports Compute Shaders. HDRP does not support OpenGL or OpenGL ES devices.** +**Note: HDRP only works on these platforms if the device used supports Compute Shaders. HDRP does not support OpenGL or OpenGL ES devices. On Linux, Vulkan may not be installed by default. In that case you need to install it manually to run HDRP.** ### Ray tracing From 8dbde86d66635510a049885a758eb9ca78ddef4c Mon Sep 17 00:00:00 2001 From: Pavlos Mavridis Date: Fri, 15 Jan 2021 11:54:19 +0100 Subject: [PATCH 15/21] [HDRP] Fix issue with compositor related custom passes (#3055) * Fixed Render Graph immediate mode. (#3033) Co-authored-by: Sebastien Lagarde * Fix issue with shadow mask and area lights (#3019) * Not checking NdotL since it's not really valid for area lights (We have multiple valid light directions, not one) * Changelog Co-authored-by: sebastienlagarde * Fix issue with capture callback (now includes post processing results) (#3035) Co-authored-by: sebastienlagarde * [HDRP] Fix decal draw order for ShaderGraph decal materials (#3018) * Fixed ShaderGraph decal draw order * Updated changelog Co-authored-by: sebastienlagarde * Fixed various Look Dev issues after exiting Playmode (#2956) * Fixed access to invalid Contexts references after exiting playmode. * Fixed comparison gizmo after playmode. * Fixes from PR feedback * Fix issue with compositor related custom passes still active after disabling the compositor Co-authored-by: JulienIgnace-Unity Co-authored-by: Sebastien Lagarde Co-authored-by: FrancescoC-unity <43168857+FrancescoC-unity@users.noreply.github.com> Co-authored-by: Antoine Lelievre --- .../CHANGELOG.md | 1 + .../Runtime/Compositor/AlphaInjection.cs | 2 + .../Runtime/Compositor/ChromaKeying.cs | 2 + .../Runtime/Compositor/CompositionManager.cs | 72 +++++++++++++++---- 4 files changed, 62 insertions(+), 15 deletions(-) diff --git a/com.unity.render-pipelines.high-definition/CHANGELOG.md b/com.unity.render-pipelines.high-definition/CHANGELOG.md index 5fd18cb6302..abf1ddebe2f 100644 --- a/com.unity.render-pipelines.high-definition/CHANGELOG.md +++ b/com.unity.render-pipelines.high-definition/CHANGELOG.md @@ -20,6 +20,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. - Fixed spacing of UI widgets in the Graphics Compositor (case 1305638). - Fixed undo-redo on layered lit editor. - Fixed tesselation culling, big triangles using lit tesselation shader would dissapear when camera is too close to them (case 1299116) +- Fixed issue with compositor related custom passes still active after disabling the compositor (case 1305330) ### Changed - Change the source value for the ray tracing frame index iterator from m_FrameCount to the camera frame count (case 1301356). diff --git a/com.unity.render-pipelines.high-definition/Runtime/Compositor/AlphaInjection.cs b/com.unity.render-pipelines.high-definition/Runtime/Compositor/AlphaInjection.cs index 8e7ee09e4eb..4eed8e821fb 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/Compositor/AlphaInjection.cs +++ b/com.unity.render-pipelines.high-definition/Runtime/Compositor/AlphaInjection.cs @@ -27,6 +27,8 @@ public override void Setup() var hdrpAsset = HDRenderPipeline.defaultAsset; if (hdrpAsset != null) m_Material = CoreUtils.CreateEngineMaterial(hdrpAsset.renderPipelineResources.shaders.alphaInjectionPS); + + name = "AlphaInjection"; // Needed to get a scope name in RenderDoc captures } public override void Render(CommandBuffer cmd, HDCamera camera, RTHandle source, RTHandle destination) diff --git a/com.unity.render-pipelines.high-definition/Runtime/Compositor/ChromaKeying.cs b/com.unity.render-pipelines.high-definition/Runtime/Compositor/ChromaKeying.cs index 42241172924..03e13a689e1 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/Compositor/ChromaKeying.cs +++ b/com.unity.render-pipelines.high-definition/Runtime/Compositor/ChromaKeying.cs @@ -30,6 +30,8 @@ public override void Setup() var hdrpAsset = HDRenderPipeline.defaultAsset; if (hdrpAsset != null) m_Material = CoreUtils.CreateEngineMaterial(hdrpAsset.renderPipelineResources.shaders.chromaKeyingPS); + + name = "ChromaKeying"; // Needed to get a scope name in RenderDoc captures } public override void Render(CommandBuffer cmd, HDCamera camera, RTHandle source, RTHandle destination) diff --git a/com.unity.render-pipelines.high-definition/Runtime/Compositor/CompositionManager.cs b/com.unity.render-pipelines.high-definition/Runtime/Compositor/CompositionManager.cs index 103a3bc93f7..a475ebe798a 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/Compositor/CompositionManager.cs +++ b/com.unity.render-pipelines.high-definition/Runtime/Compositor/CompositionManager.cs @@ -63,7 +63,7 @@ public bool enableOutput { m_OutputCamera.enabled = value; - // also change the layers + // Aside from the output compositor camera, we also have to change the cameras of the layers foreach (var layer in m_InputLayers) { if (layer.camera && layer.isUsingACameraClone) @@ -72,11 +72,22 @@ public bool enableOutput } else { - // The target texture was managed by the compositor, reset it so the user can se the camera output + // The target texture was managed by the compositor, reset it so the user can see the camera output if (layer.camera && value == false) layer.camera.targetTexture = null; } } + + // Toggle the compositor-related custom passes + var hdPipeline = RenderPipelineManager.currentPipeline as HDRenderPipeline; + if (value) + { + RegisterCustomPasses(hdPipeline); + } + else + { + UnRegisterCustomPasses(hdPipeline); + } } } } @@ -186,19 +197,7 @@ bool ValidatePipeline() m_AlphaSupport = AlphaChannelSupport.Rendering; } - int indx = hdPipeline.asset.beforePostProcessCustomPostProcesses.FindIndex(x => x == typeof(ChromaKeying).AssemblyQualifiedName); - if (indx < 0) - { - //Debug.Log("Registering chroma keying pass for the HDRP pipeline"); - hdPipeline.asset.beforePostProcessCustomPostProcesses.Add(typeof(ChromaKeying).AssemblyQualifiedName); - } - - indx = hdPipeline.asset.beforePostProcessCustomPostProcesses.FindIndex(x => x == typeof(AlphaInjection).AssemblyQualifiedName); - if (indx < 0) - { - //Debug.Log("Registering alpha injection pass for the HDRP pipeline"); - hdPipeline.asset.beforePostProcessCustomPostProcesses.Add(typeof(AlphaInjection).AssemblyQualifiedName); - } + RegisterCustomPasses(hdPipeline); return true; } return false; @@ -920,5 +919,48 @@ static internal RenderTexture GetClearDepthForStackedCamera(HDCamera hdCamera) } return null; } + + // Register the custom pp passes used by the compositor + static internal void RegisterCustomPasses(HDRenderPipeline hdPipeline) + { + if (hdPipeline == null) + { + return; + } + + // If custom post processes are not registered in the HDRP asset, they are never executed so we have to add them manually + int indx = hdPipeline.asset.beforePostProcessCustomPostProcesses.FindIndex(x => x == typeof(ChromaKeying).AssemblyQualifiedName); + if (indx < 0) + { + hdPipeline.asset.beforePostProcessCustomPostProcesses.Add(typeof(ChromaKeying).AssemblyQualifiedName); + } + + indx = hdPipeline.asset.beforePostProcessCustomPostProcesses.FindIndex(x => x == typeof(AlphaInjection).AssemblyQualifiedName); + if (indx < 0) + { + hdPipeline.asset.beforePostProcessCustomPostProcesses.Add(typeof(AlphaInjection).AssemblyQualifiedName); + } + } + + // Unregister the custom pp passes used by the compositor + static internal void UnRegisterCustomPasses(HDRenderPipeline hdPipeline) + { + if (hdPipeline == null) + { + return; + } + + int indx = hdPipeline.asset.beforePostProcessCustomPostProcesses.FindIndex(x => x == typeof(ChromaKeying).AssemblyQualifiedName); + if (indx >= 0) + { + hdPipeline.asset.beforePostProcessCustomPostProcesses.Remove(typeof(ChromaKeying).AssemblyQualifiedName); + } + + indx = hdPipeline.asset.beforePostProcessCustomPostProcesses.FindIndex(x => x == typeof(AlphaInjection).AssemblyQualifiedName); + if (indx >= 0) + { + hdPipeline.asset.beforePostProcessCustomPostProcesses.Remove(typeof(AlphaInjection).AssemblyQualifiedName); + } + } } } From a5a659080715d0ac33b81833a120437f875d224d Mon Sep 17 00:00:00 2001 From: JulienIgnace-Unity Date: Fri, 15 Jan 2021 12:16:03 +0100 Subject: [PATCH 16/21] Fixed some render texture leaks. (#3050) * Fixed Render Graph immediate mode. (#3033) Co-authored-by: Sebastien Lagarde * Fix issue with shadow mask and area lights (#3019) * Not checking NdotL since it's not really valid for area lights (We have multiple valid light directions, not one) * Changelog Co-authored-by: sebastienlagarde * Fix issue with capture callback (now includes post processing results) (#3035) Co-authored-by: sebastienlagarde * [HDRP] Fix decal draw order for ShaderGraph decal materials (#3018) * Fixed ShaderGraph decal draw order * Updated changelog Co-authored-by: sebastienlagarde * Fixed various Look Dev issues after exiting Playmode (#2956) * Fixed access to invalid Contexts references after exiting playmode. * Fixed comparison gizmo after playmode. * Fixes from PR feedback * Fixed a few render texture memory leaks. * Update changelog * Added comment * Update CHANGELOG.md Co-authored-by: Sebastien Lagarde Co-authored-by: FrancescoC-unity <43168857+FrancescoC-unity@users.noreply.github.com> Co-authored-by: Pavlos Mavridis Co-authored-by: Antoine Lelievre --- .../RenderGraph/RenderGraphResourceComputeBuffer.cs | 2 +- .../Runtime/RenderGraph/RenderGraphResourcePool.cs | 9 +++++++++ .../Runtime/RenderGraph/RenderGraphResourceTexture.cs | 2 +- com.unity.render-pipelines.high-definition/CHANGELOG.md | 1 + .../Runtime/RenderPipeline/Camera/HDCamera.cs | 2 ++ .../Runtime/RenderPipeline/Utility/Texture3DAtlas.cs | 3 ++- 6 files changed, 16 insertions(+), 3 deletions(-) diff --git a/com.unity.render-pipelines.core/Runtime/RenderGraph/RenderGraphResourceComputeBuffer.cs b/com.unity.render-pipelines.core/Runtime/RenderGraph/RenderGraphResourceComputeBuffer.cs index 6455ba5aba9..15c167c8ec9 100644 --- a/com.unity.render-pipelines.core/Runtime/RenderGraph/RenderGraphResourceComputeBuffer.cs +++ b/com.unity.render-pipelines.core/Runtime/RenderGraph/RenderGraphResourceComputeBuffer.cs @@ -203,7 +203,7 @@ override public void PurgeUnusedResources(int currentFrameIndex) var list = kvp.Value; list.RemoveAll(obj => { - if (obj.frameIndex < s_CurrentFrameIndex) + if (ShouldReleaseResource(obj.frameIndex, s_CurrentFrameIndex)) { obj.resource.Release(); return true; diff --git a/com.unity.render-pipelines.core/Runtime/RenderGraph/RenderGraphResourcePool.cs b/com.unity.render-pipelines.core/Runtime/RenderGraph/RenderGraphResourcePool.cs index bfc3f65d116..00c3e0d4898 100644 --- a/com.unity.render-pipelines.core/Runtime/RenderGraph/RenderGraphResourcePool.cs +++ b/com.unity.render-pipelines.core/Runtime/RenderGraph/RenderGraphResourcePool.cs @@ -21,6 +21,7 @@ abstract class RenderGraphResourcePool : IRenderGraphResourcePool where Ty List<(int, Type)> m_FrameAllocatedResources = new List<(int, Type)>(); protected static int s_CurrentFrameIndex; + const int kStaleResourceLifetime = 10; // Release the GPU resource itself protected abstract void ReleaseInternalResource(Type res); @@ -123,5 +124,13 @@ public override void LogResources(RenderGraphLogger logger) foreach (var element in allocationList) logger.LogLine("[{0}]\t[{1:#.##} MB]\t{2}", index++, element.size / 1024.0f, element.name); } + + static protected bool ShouldReleaseResource(int lastUsedFrameIndex, int currentFrameIndex) + { + // We need to have a delay of a few frames before releasing resources for good. + // Indeed, when having multiple off-screen cameras, they are rendered in a separate SRP render call and thus with a different frame index than main camera + // This causes texture to be deallocated/reallocated every frame if the two cameras don't need the same buffers. + return (lastUsedFrameIndex + kStaleResourceLifetime) < currentFrameIndex; + } } } diff --git a/com.unity.render-pipelines.core/Runtime/RenderGraph/RenderGraphResourceTexture.cs b/com.unity.render-pipelines.core/Runtime/RenderGraph/RenderGraphResourceTexture.cs index dd2056ed7c8..768763c681d 100644 --- a/com.unity.render-pipelines.core/Runtime/RenderGraph/RenderGraphResourceTexture.cs +++ b/com.unity.render-pipelines.core/Runtime/RenderGraph/RenderGraphResourceTexture.cs @@ -406,7 +406,7 @@ override public void PurgeUnusedResources(int currentFrameIndex) var list = kvp.Value; list.RemoveAll(obj => { - if (obj.frameIndex < s_CurrentFrameIndex) + if (ShouldReleaseResource(obj.frameIndex, s_CurrentFrameIndex)) { obj.resource.Release(); return true; diff --git a/com.unity.render-pipelines.high-definition/CHANGELOG.md b/com.unity.render-pipelines.high-definition/CHANGELOG.md index abf1ddebe2f..15c956b6ccc 100644 --- a/com.unity.render-pipelines.high-definition/CHANGELOG.md +++ b/com.unity.render-pipelines.high-definition/CHANGELOG.md @@ -21,6 +21,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. - Fixed undo-redo on layered lit editor. - Fixed tesselation culling, big triangles using lit tesselation shader would dissapear when camera is too close to them (case 1299116) - Fixed issue with compositor related custom passes still active after disabling the compositor (case 1305330) +- Fixed some render texture leaks. ### Changed - Change the source value for the ray tracing frame index iterator from m_FrameCount to the camera frame count (case 1301356). diff --git a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Camera/HDCamera.cs b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Camera/HDCamera.cs index 7ecf73340e1..34305f761c2 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Camera/HDCamera.cs +++ b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Camera/HDCamera.cs @@ -1365,6 +1365,8 @@ Matrix4x4 ComputePixelCoordToWorldSpaceViewDirectionMatrix(ViewConstants viewCon void Dispose() { + HDRenderPipeline.DestroyVolumetricHistoryBuffers(this); + VolumeManager.instance.DestroyStack(volumeStack); if (m_HistoryRTSystem != null) diff --git a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Utility/Texture3DAtlas.cs b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Utility/Texture3DAtlas.cs index 1d89cf6e6ed..1878d8beafb 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Utility/Texture3DAtlas.cs +++ b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Utility/Texture3DAtlas.cs @@ -525,7 +525,8 @@ void GenerateMip(CommandBuffer cmd, Texture source, Vector3Int sourceOffset, int public void Release() { ClearTextures(); - m_Atlas.Release(); + CoreUtils.Destroy(m_Atlas); + CoreUtils.Destroy(m_MipMapGenerationTemp); } public static long GetApproxCacheSizeInByte(int elementSize, int elementCount, GraphicsFormat format, bool hasMipMaps) From 229f3e8e7e3f3a9a0e504eb88e0e699bb87ffda6 Mon Sep 17 00:00:00 2001 From: Remi Slysz <40034005+RSlysz@users.noreply.github.com> Date: Fri, 15 Jan 2021 12:30:18 +0100 Subject: [PATCH 17/21] Hd/fix wizard runtime resources (#3123) * Fix runtim resource wizard fix regression * Update CHANGELOG.md Co-authored-by: sebastienlagarde --- .../CHANGELOG.md | 1 + .../Editor/Wizard/HDWizard.Configuration.cs | 12 ++++++------ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/com.unity.render-pipelines.high-definition/CHANGELOG.md b/com.unity.render-pipelines.high-definition/CHANGELOG.md index 15c956b6ccc..febe313733e 100644 --- a/com.unity.render-pipelines.high-definition/CHANGELOG.md +++ b/com.unity.render-pipelines.high-definition/CHANGELOG.md @@ -22,6 +22,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. - Fixed tesselation culling, big triangles using lit tesselation shader would dissapear when camera is too close to them (case 1299116) - Fixed issue with compositor related custom passes still active after disabling the compositor (case 1305330) - Fixed some render texture leaks. +- Fixed regression in Wizard that not fix runtime ressource anymore (case 1287627) ### Changed - Change the source value for the ray tracing frame index iterator from m_FrameCount to the camera frame count (case 1301356). diff --git a/com.unity.render-pipelines.high-definition/Editor/Wizard/HDWizard.Configuration.cs b/com.unity.render-pipelines.high-definition/Editor/Wizard/HDWizard.Configuration.cs index 4c7d8375220..f385c47b157 100644 --- a/com.unity.render-pipelines.high-definition/Editor/Wizard/HDWizard.Configuration.cs +++ b/com.unity.render-pipelines.high-definition/Editor/Wizard/HDWizard.Configuration.cs @@ -403,15 +403,15 @@ void FixHdrpAssetRuntimeResources(bool fromAsyncUnused) if (hdrpAsset == null) return; - var editorResourcesPath = HDUtils.GetHDRenderPipelinePath() + "Editor/RenderPipelineResources/HDRenderPipelineEditorResources.asset"; - var objs = InternalEditorUtility.LoadSerializedFileAndForget(editorResourcesPath); - hdrpAsset.renderPipelineEditorResources = objs != null && objs.Length > 0 ? objs.First() as HDRenderPipelineEditorResources : null; - if (ResourceReloader.ReloadAllNullIn(HDRenderPipeline.defaultAsset.renderPipelineEditorResources, + var runtimeResourcesPath = HDUtils.GetHDRenderPipelinePath() + "Runtime/RenderPipelineResources/HDRenderPipelineResources.asset"; + var objs = InternalEditorUtility.LoadSerializedFileAndForget(runtimeResourcesPath); + hdrpAsset.renderPipelineResources = objs != null && objs.Length > 0 ? objs.First() as RenderPipelineResources : null; + if (ResourceReloader.ReloadAllNullIn(HDRenderPipeline.defaultAsset.renderPipelineResources, HDUtils.GetHDRenderPipelinePath())) { InternalEditorUtility.SaveToSerializedFileAndForget( - new UnityEngine.Object[] { HDRenderPipeline.defaultAsset.renderPipelineEditorResources }, - editorResourcesPath, + new UnityEngine.Object[] { HDRenderPipeline.defaultAsset.renderPipelineResources }, + runtimeResourcesPath, true); } } From 0a42f9b913265011e7d2202f272545fb1a7b5a40 Mon Sep 17 00:00:00 2001 From: Antoine Lelievre Date: Fri, 15 Jan 2021 14:16:38 +0100 Subject: [PATCH 18/21] [HDRP] Fixed lookdev reload bug when viewing a scene object (#3108) * Fixed lookdev reload bug when viewing a scene object * Updated changelog * Re-added lookdev fix Co-authored-by: sebastienlagarde --- .../Editor/LookDev/LookDev.cs | 9 ++++----- com.unity.render-pipelines.high-definition/CHANGELOG.md | 1 + 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/com.unity.render-pipelines.core/Editor/LookDev/LookDev.cs b/com.unity.render-pipelines.core/Editor/LookDev/LookDev.cs index 756dacb06b9..6548aa12bef 100644 --- a/com.unity.render-pipelines.core/Editor/LookDev/LookDev.cs +++ b/com.unity.render-pipelines.core/Editor/LookDev/LookDev.cs @@ -129,7 +129,10 @@ internal static void Initialize(DisplayWindow window) s_ViewDisplayer = window; s_EnvironmentDisplayer = window; open = true; - ConfigureLookDev(reloadWithTemporaryID: false); + + // Lookdev Initialize can be called when the window is re-created by the editor layout system. + // In that case, the current context won't be null and there might be objects to reload from the temp ID + ConfigureLookDev(reloadWithTemporaryID: s_CurrentContext != null); } [Callbacks.DidReloadScripts] @@ -188,10 +191,6 @@ static void LinkViewDisplayer() s_ViewDisplayer = null; //currentContext = null; - //release editorInstanceIDs - currentContext.GetViewContent(ViewIndex.First).CleanTemporaryObjectIndexes(); - currentContext.GetViewContent(ViewIndex.Second).CleanTemporaryObjectIndexes(); - SaveConfig(); open = false; diff --git a/com.unity.render-pipelines.high-definition/CHANGELOG.md b/com.unity.render-pipelines.high-definition/CHANGELOG.md index febe313733e..91fbe79c9c6 100644 --- a/com.unity.render-pipelines.high-definition/CHANGELOG.md +++ b/com.unity.render-pipelines.high-definition/CHANGELOG.md @@ -69,6 +69,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. - Fixed box light attenuation. - Fixed compilation issues on platforms that don't support XR. - Fixed issue with compute shader stripping for probe volumes variants. +- Fixed a reload bug when using objects from the scene in the lookdev (case 1300916). ### Changed - Removed the material pass probe volumes evaluation mode. From eb1d07499f677c8308fc198b9d5180a0c1ab47af Mon Sep 17 00:00:00 2001 From: Pavlos Mavridis Date: Fri, 15 Jan 2021 16:11:57 +0100 Subject: [PATCH 19/21] [HDRP] Fix error in Depth Of Field near radius blur calculation (#3131) * Fix error in Depth Of Field near radius blur calculation * Fix typo Co-authored-by: sebastienlagarde --- com.unity.render-pipelines.high-definition/CHANGELOG.md | 1 + .../PostProcessing/PostProcessSystem.RenderGraph.cs | 5 ++++- .../Runtime/PostProcessing/PostProcessSystem.cs | 9 +++++++-- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/com.unity.render-pipelines.high-definition/CHANGELOG.md b/com.unity.render-pipelines.high-definition/CHANGELOG.md index 91fbe79c9c6..6c3c95d0c15 100644 --- a/com.unity.render-pipelines.high-definition/CHANGELOG.md +++ b/com.unity.render-pipelines.high-definition/CHANGELOG.md @@ -23,6 +23,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. - Fixed issue with compositor related custom passes still active after disabling the compositor (case 1305330) - Fixed some render texture leaks. - Fixed regression in Wizard that not fix runtime ressource anymore (case 1287627) +- Fixed error in Depth Of Field near radius blur calculation (case 1306228). ### Changed - Change the source value for the ray tracing frame index iterator from m_FrameCount to the camera frame count (case 1301356). diff --git a/com.unity.render-pipelines.high-definition/Runtime/PostProcessing/PostProcessSystem.RenderGraph.cs b/com.unity.render-pipelines.high-definition/Runtime/PostProcessing/PostProcessSystem.RenderGraph.cs index bf1869b7ef9..52848d3862b 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/PostProcessing/PostProcessSystem.RenderGraph.cs +++ b/com.unity.render-pipelines.high-definition/Runtime/PostProcessing/PostProcessSystem.RenderGraph.cs @@ -507,7 +507,10 @@ TextureHandle DepthOfFieldPass(RenderGraph renderGraph, HDCamera hdCamera, Textu passData.fullresCoC = builder.CreateTransientTexture(new TextureDesc(Vector2.one, true, true) { colorFormat = k_CoCFormat, enableRandomWrite = true, name = "Full res CoC" }); - int passCount = Mathf.CeilToInt((passData.parameters.nearMaxBlur + 2f) / 4f); + GetDoFResolutionScale(passData.parameters, out float unused, out float resolutionScale); + float actualNearMaxBlur = passData.parameters.nearMaxBlur * resolutionScale; + int passCount = Mathf.CeilToInt((actualNearMaxBlur + 2f) / 4f); + passData.dilationPingPongRT = TextureHandle.nullHandle; if (passCount > 1) { diff --git a/com.unity.render-pipelines.high-definition/Runtime/PostProcessing/PostProcessSystem.cs b/com.unity.render-pipelines.high-definition/Runtime/PostProcessing/PostProcessSystem.cs index 6d6f68999d4..d1a37c0f329 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/PostProcessing/PostProcessSystem.cs +++ b/com.unity.render-pipelines.high-definition/Runtime/PostProcessing/PostProcessSystem.cs @@ -1498,6 +1498,12 @@ DepthOfFieldParameters PrepareDoFParameters(HDCamera camera) return parameters; } + static void GetDoFResolutionScale(in DepthOfFieldParameters dofParameters, out float scale, out float resolutionScale) + { + scale = 1f / (float)dofParameters.resolution; + resolutionScale = (dofParameters.camera.actualHeight / 1080f) * (scale * 2f); + } + // // Reference used: // "A Lens and Aperture Camera Model for Synthetic Image Generation" [Potmesil81] @@ -1551,14 +1557,13 @@ static void DoDepthOfField(in DepthOfFieldParameters dofParameters, CommandBuffe float anamorphism = dofParameters.physicalCameraAnamorphism / 4f; float barrelClipping = dofParameters.physicalCameraBarrelClipping / 3f; - float scale = 1f / (float)dofParameters.resolution; + GetDoFResolutionScale(dofParameters, out float scale, out float resolutionScale); var screenScale = new Vector2(scale, scale); int targetWidth = Mathf.RoundToInt(dofParameters.camera.actualWidth * scale); int targetHeight = Mathf.RoundToInt(dofParameters.camera.actualHeight * scale); cmd.SetGlobalVector(HDShaderIDs._TargetScale, new Vector4((float)dofParameters.resolution, scale, 0f, 0f)); - float resolutionScale = (dofParameters.camera.actualHeight / 1080f) * (scale * 2f); int farSamples = dofParameters.farSampleCount; int nearSamples = dofParameters.nearSampleCount; From 22b5b7f13ed66571fa0139bc8b5ffb6a379f5bc4 Mon Sep 17 00:00:00 2001 From: Pavlos Mavridis Date: Fri, 15 Jan 2021 19:45:56 +0100 Subject: [PATCH 20/21] [HDRP] Fix GC allocs (#3136) * Fix gc alloc errors * Avoid setting the name of an object during render (gc alloc) * Avoid gc allocs (for real this time) --- .../Runtime/Compositor/AlphaInjection.cs | 2 -- .../Runtime/Compositor/ChromaKeying.cs | 2 -- .../Runtime/Compositor/CompositionManager.cs | 16 ++++++++-------- 3 files changed, 8 insertions(+), 12 deletions(-) diff --git a/com.unity.render-pipelines.high-definition/Runtime/Compositor/AlphaInjection.cs b/com.unity.render-pipelines.high-definition/Runtime/Compositor/AlphaInjection.cs index 4eed8e821fb..8e7ee09e4eb 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/Compositor/AlphaInjection.cs +++ b/com.unity.render-pipelines.high-definition/Runtime/Compositor/AlphaInjection.cs @@ -27,8 +27,6 @@ public override void Setup() var hdrpAsset = HDRenderPipeline.defaultAsset; if (hdrpAsset != null) m_Material = CoreUtils.CreateEngineMaterial(hdrpAsset.renderPipelineResources.shaders.alphaInjectionPS); - - name = "AlphaInjection"; // Needed to get a scope name in RenderDoc captures } public override void Render(CommandBuffer cmd, HDCamera camera, RTHandle source, RTHandle destination) diff --git a/com.unity.render-pipelines.high-definition/Runtime/Compositor/ChromaKeying.cs b/com.unity.render-pipelines.high-definition/Runtime/Compositor/ChromaKeying.cs index 03e13a689e1..42241172924 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/Compositor/ChromaKeying.cs +++ b/com.unity.render-pipelines.high-definition/Runtime/Compositor/ChromaKeying.cs @@ -30,8 +30,6 @@ public override void Setup() var hdrpAsset = HDRenderPipeline.defaultAsset; if (hdrpAsset != null) m_Material = CoreUtils.CreateEngineMaterial(hdrpAsset.renderPipelineResources.shaders.chromaKeyingPS); - - name = "ChromaKeying"; // Needed to get a scope name in RenderDoc captures } public override void Render(CommandBuffer cmd, HDCamera camera, RTHandle source, RTHandle destination) diff --git a/com.unity.render-pipelines.high-definition/Runtime/Compositor/CompositionManager.cs b/com.unity.render-pipelines.high-definition/Runtime/Compositor/CompositionManager.cs index a475ebe798a..df1272d3647 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/Compositor/CompositionManager.cs +++ b/com.unity.render-pipelines.high-definition/Runtime/Compositor/CompositionManager.cs @@ -551,6 +551,10 @@ void OnDestroy() CoreUtils.Destroy(volume); } } + + // We don't need the custom passes anymore + var hdPipeline = RenderPipelineManager.currentPipeline as HDRenderPipeline; + UnRegisterCustomPasses(hdPipeline); } public void AddInputFilterAtLayer(CompositionFilter filter, int index) @@ -929,14 +933,12 @@ static internal void RegisterCustomPasses(HDRenderPipeline hdPipeline) } // If custom post processes are not registered in the HDRP asset, they are never executed so we have to add them manually - int indx = hdPipeline.asset.beforePostProcessCustomPostProcesses.FindIndex(x => x == typeof(ChromaKeying).AssemblyQualifiedName); - if (indx < 0) + if (!hdPipeline.asset.beforePostProcessCustomPostProcesses.Contains(typeof(ChromaKeying).AssemblyQualifiedName)) { hdPipeline.asset.beforePostProcessCustomPostProcesses.Add(typeof(ChromaKeying).AssemblyQualifiedName); } - indx = hdPipeline.asset.beforePostProcessCustomPostProcesses.FindIndex(x => x == typeof(AlphaInjection).AssemblyQualifiedName); - if (indx < 0) + if (!hdPipeline.asset.beforePostProcessCustomPostProcesses.Contains(typeof(AlphaInjection).AssemblyQualifiedName)) { hdPipeline.asset.beforePostProcessCustomPostProcesses.Add(typeof(AlphaInjection).AssemblyQualifiedName); } @@ -950,14 +952,12 @@ static internal void UnRegisterCustomPasses(HDRenderPipeline hdPipeline) return; } - int indx = hdPipeline.asset.beforePostProcessCustomPostProcesses.FindIndex(x => x == typeof(ChromaKeying).AssemblyQualifiedName); - if (indx >= 0) + if (hdPipeline.asset.beforePostProcessCustomPostProcesses.Contains(typeof(ChromaKeying).AssemblyQualifiedName)) { hdPipeline.asset.beforePostProcessCustomPostProcesses.Remove(typeof(ChromaKeying).AssemblyQualifiedName); } - indx = hdPipeline.asset.beforePostProcessCustomPostProcesses.FindIndex(x => x == typeof(AlphaInjection).AssemblyQualifiedName); - if (indx >= 0) + if (hdPipeline.asset.beforePostProcessCustomPostProcesses.Contains(typeof(AlphaInjection).AssemblyQualifiedName)) { hdPipeline.asset.beforePostProcessCustomPostProcesses.Remove(typeof(AlphaInjection).AssemblyQualifiedName); } From 8cd8fe61cfd9de0e5caa0258517de7cd241b44fc Mon Sep 17 00:00:00 2001 From: Sebastien Lagarde Date: Fri, 15 Jan 2021 20:16:40 +0100 Subject: [PATCH 21/21] Revert: Fix 1299233 ies resize bug (#3094) --- .../CHANGELOG.md | 1 - .../Runtime/Lighting/LightCookieManager.cs | 6 ++-- .../Utility/PowerOfTwoTextureAtlas.cs | 29 +------------------ 3 files changed, 4 insertions(+), 32 deletions(-) diff --git a/com.unity.render-pipelines.high-definition/CHANGELOG.md b/com.unity.render-pipelines.high-definition/CHANGELOG.md index 6c3c95d0c15..636edca9a23 100644 --- a/com.unity.render-pipelines.high-definition/CHANGELOG.md +++ b/com.unity.render-pipelines.high-definition/CHANGELOG.md @@ -10,7 +10,6 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. - Fixed GC allocations from XR occlusion mesh when using multipass. - Fixed XR depth copy when using MSAA. - Fixed register spilling on FXC in light list shaders. -- Fixed resize IES when already baked in the Atlas 1299233 - Fixed after post process custom pass scale issue when dynamic resolution is enabled (case 1299194). - Fixed an issue with light intensity prefab override application not visible in the inspector (case 1299563). - Fixed Undo/Redo instability of light temperature. diff --git a/com.unity.render-pipelines.high-definition/Runtime/Lighting/LightCookieManager.cs b/com.unity.render-pipelines.high-definition/Runtime/Lighting/LightCookieManager.cs index fed7f14959a..d2cb31d2e1e 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/Lighting/LightCookieManager.cs +++ b/com.unity.render-pipelines.high-definition/Runtime/Lighting/LightCookieManager.cs @@ -341,7 +341,7 @@ public void ReserveSpace(Texture cookieA, Texture cookieB) if (width < k_MinCookieSize || height < k_MinCookieSize) return; - if (!m_CookieAtlas.ReserveSpace(cookieA, cookieB, width, height)) + if (!m_CookieAtlas.ReserveSpace(m_CookieAtlas.GetTextureID(cookieA, cookieB), width, height)) m_2DCookieAtlasNeedsLayouting = true; } @@ -369,7 +369,7 @@ public void ReserveSpaceCube(Texture cookie) if (projectionSize < k_MinCookieSize) return; - if (!m_CookieAtlas.ReserveSpace(cookie, projectionSize, projectionSize)) + if (!m_CookieAtlas.ReserveSpace(m_CookieAtlas.GetTextureID(cookie), projectionSize, projectionSize)) m_2DCookieAtlasNeedsLayouting = true; } @@ -385,7 +385,7 @@ public void ReserveSpaceCube(Texture cookieA, Texture cookieB) if (projectionSize < k_MinCookieSize) return; - if (!m_CookieAtlas.ReserveSpace(cookieA, cookieB, projectionSize, projectionSize)) + if (!m_CookieAtlas.ReserveSpace(m_CookieAtlas.GetTextureID(cookieA, cookieB), projectionSize, projectionSize)) m_2DCookieAtlasNeedsLayouting = true; } diff --git a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Utility/PowerOfTwoTextureAtlas.cs b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Utility/PowerOfTwoTextureAtlas.cs index ed9218ce65e..4d7e0830bc5 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Utility/PowerOfTwoTextureAtlas.cs +++ b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Utility/PowerOfTwoTextureAtlas.cs @@ -195,9 +195,6 @@ public bool ReserveSpace(Texture texture) { m_RequestedTextures[texture.GetInstanceID()] = new Vector2Int(texture.width, texture.height); - if (NeedsUpdate(texture)) - return false; - // new texture if (!IsCached(out _, texture)) { @@ -208,34 +205,10 @@ public bool ReserveSpace(Texture texture) return true; } - // pass width and height for CubeMap (use 2*width) & Texture2D (use width) - public bool ReserveSpace(Texture texture, int width, int height) + public bool ReserveSpace(int id, int width, int height) { - int id = GetTextureID(texture); m_RequestedTextures[id] = new Vector2Int(width, height); - if (NeedsUpdate(texture)) - return false; - - // new texture - if (!IsCached(out _, id)) - { - Vector4 scaleBias = Vector4.zero; - if (!AllocateTextureWithoutBlit(id, width, height, ref scaleBias)) - return false; - } - return true; - } - - // pass width and height for CubeMap (use 2*width) & Texture2D (use width) - public bool ReserveSpace(Texture textureA, Texture textureB, int width, int height) - { - int id = GetTextureID(textureA, textureB); - m_RequestedTextures[id] = new Vector2Int(width, height); - - if (NeedsUpdate(textureA, textureB)) - return false; - // new texture if (!IsCached(out _, id)) {