From 864e016a9ef4ace697e9d86db7277d93fa8c2194 Mon Sep 17 00:00:00 2001 From: Peter Bay Bastian Date: Thu, 18 Nov 2021 14:49:42 +0100 Subject: [PATCH 01/14] URP quality improvements (#6090) * "Add Renderer Feature" menu now uses the same menu as "Volume Overrides" * Universal Renderer help URL * Add page hash to help URL helper * Allow renderer features to use HelpURLAttribute and add it for SSAO, Decal, and Render Objects * Remove Name input for SSAO and Screen Space Shadows * Fix help URL for URP asset * Update change log * Fix change log * Remove `Attribute` suffix from attribute usage * Add docs for FilterWindow.Show * Move GetHelpURL to DocumentationUtils * Improve TryGetHelpURL interface --- .../Editor/FilterWindow.cs | 8 +- .../Editor/Volume/VolumeEditor.cs | 8 +- .../Runtime/Documentation.cs | 24 +++++- .../CHANGELOG.md | 5 ++ .../Editor/ScriptableRendererDataEditor.cs | 55 ++++---------- .../ScriptableRendererFeatureProvider.cs | 74 +++++++++++++++++++ .../ScriptableRendererFeatureProvider.cs.meta | 3 + .../Data/UniversalRenderPipelineAsset.cs | 1 + .../Runtime/Documentation.cs | 7 +- .../RendererFeatures/DecalRendererFeature.cs | 1 + .../Runtime/RendererFeatures/RenderObjects.cs | 1 + .../ScreenSpaceAmbientOcclusion.cs | 3 +- .../RendererFeatures/ScreenSpaceShadows.cs | 2 +- .../Runtime/UniversalRendererData.cs | 1 + 14 files changed, 137 insertions(+), 56 deletions(-) create mode 100644 com.unity.render-pipelines.universal/Editor/ScriptableRendererFeatureProvider.cs create mode 100644 com.unity.render-pipelines.universal/Editor/ScriptableRendererFeatureProvider.cs.meta diff --git a/com.unity.render-pipelines.core/Editor/FilterWindow.cs b/com.unity.render-pipelines.core/Editor/FilterWindow.cs index 037752f1f2f..3f73373c86e 100644 --- a/com.unity.render-pipelines.core/Editor/FilterWindow.cs +++ b/com.unity.render-pipelines.core/Editor/FilterWindow.cs @@ -239,7 +239,13 @@ internal static bool ValidateAddComponentMenuItem() return true; } - internal static bool Show(Vector2 position, IProvider provider) + /// + /// Shows the filter window using the given provider. + /// + /// The position to show the filter window at. + /// The provider of items for the filter window. + /// Returns true if the window is shown, false otherwise. + public static bool Show(Vector2 position, IProvider provider) { // If the window is already open, close it instead. var wins = Resources.FindObjectsOfTypeAll(typeof(FilterWindow)); diff --git a/com.unity.render-pipelines.core/Editor/Volume/VolumeEditor.cs b/com.unity.render-pipelines.core/Editor/Volume/VolumeEditor.cs index 834a94b5372..5be9452ad17 100644 --- a/com.unity.render-pipelines.core/Editor/Volume/VolumeEditor.cs +++ b/com.unity.render-pipelines.core/Editor/Volume/VolumeEditor.cs @@ -13,11 +13,7 @@ sealed class VolumeEditor : Editor static class Styles { public static readonly GUIContent mode = EditorGUIUtility.TrTextContent("Mode", "This property defines whether the Volume is Global or Local. Global: Volumes affect the Camera everywhere in the Scene. Local: Volumes affect the Camera if the Camera is within the bounds of the Collider."); - public static readonly GUIContent[] modes = - { - EditorGUIUtility.TrTextContent("Global"), - EditorGUIUtility.TrTextContent("Local") - }; + public static readonly GUIContent[] modes = {EditorGUIUtility.TrTextContent("Global"), EditorGUIUtility.TrTextContent("Local")}; public static readonly GUIContent addBoxCollider = EditorGUIUtility.TrTextContent("Add a Box Collider"); public static readonly GUIContent sphereBoxCollider = EditorGUIUtility.TrTextContent("Add a Sphere Collider"); @@ -218,9 +214,11 @@ public override void OnInspectorGUI() var path = AssetDatabase.GetAssetPath(m_Profile.objectReferenceValue); path = IsAssetInReadOnlyPackage(path) + // We may be in a read only package, in that case we need to clone the volume profile in an // editable area, such as the root of the project. ? AssetDatabase.GenerateUniqueAssetPath(Path.Combine("Assets", Path.GetFileName(path))) + // Otherwise, duplicate next to original asset. : AssetDatabase.GenerateUniqueAssetPath(path); diff --git a/com.unity.render-pipelines.core/Runtime/Documentation.cs b/com.unity.render-pipelines.core/Runtime/Documentation.cs index 8b5b7888501..de8aaee8c37 100644 --- a/com.unity.render-pipelines.core/Runtime/Documentation.cs +++ b/com.unity.render-pipelines.core/Runtime/Documentation.cs @@ -2,6 +2,7 @@ using System.Runtime.CompilerServices; using System.Diagnostics; using System.Linq; +using System.Reflection; #if UNITY_EDITOR using PackageInfo = UnityEditor.PackageManager.PackageInfo; #endif @@ -26,8 +27,9 @@ public class CoreRPHelpURLAttribute : HelpURLAttribute /// /// /// - public CoreRPHelpURLAttribute(string pageName, string packageName = "com.unity.render-pipelines.core") - : base(DocumentationInfo.GetPageLink(packageName, pageName)) + /// + public CoreRPHelpURLAttribute(string pageName, string packageName = "com.unity.render-pipelines.core", string pageHash = "") + : base(DocumentationInfo.GetPageLink(packageName, pageName, pageHash)) { } } @@ -39,7 +41,7 @@ public CoreRPHelpURLAttribute(string pageName, string packageName = "com.unity.r public class DocumentationInfo { const string fallbackVersion = "13.1"; - const string url = "https://docs.unity3d.com/Packages/{0}@{1}/manual/{2}.html"; + const string url = "https://docs.unity3d.com/Packages/{0}@{1}/manual/{2}.html{3}"; /// /// Current version of the documentation. @@ -62,8 +64,9 @@ public static string version /// /// The package name /// The page name + /// The page hash /// The full url page - public static string GetPageLink(string packageName, string pageName) => string.Format(url, packageName, version, pageName); + public static string GetPageLink(string packageName, string pageName, string pageHash = "") => string.Format(url, packageName, version, pageName, pageHash); } /// @@ -87,5 +90,18 @@ public static string GetHelpURL(TEnum mask = default) return helpURLAttribute == null ? string.Empty : $"{helpURLAttribute.URL}#{mask}"; } + + /// + /// Obtains the help URL from a type. + /// + /// The type decorated with the HelpURL attribute. + /// The full URL from the HelpURL attribute. If the attribute is not present, this value is null. + /// Returns true if the attribute is present, and false otherwise. + public static bool TryGetHelpURL(Type type, out string url) + { + var attribute = type.GetCustomAttribute(false); + url = attribute?.URL; + return attribute != null; + } } } diff --git a/com.unity.render-pipelines.universal/CHANGELOG.md b/com.unity.render-pipelines.universal/CHANGELOG.md index fd3527048de..b37cb47d0ee 100644 --- a/com.unity.render-pipelines.universal/CHANGELOG.md +++ b/com.unity.render-pipelines.universal/CHANGELOG.md @@ -9,11 +9,15 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. ### Added - Added minimal picking support for DOTS 1.0 (on parity with Hybrid Renderer V2) - Added support for `RTHandle`. +- Renderer Features can now use the HelpURLAttribute to specify a documentation URL to be used in the inspector. +- Added inspector documentation URLs to the SSAO, Decal, and Render Objects renderer features. ### Changed - Converted internal render targets to use `RTHandle` targets instead of `RenderTargetHandle` and `RenderTargetIdentifier`. - Set usage of `RenderTargetHandle` and public functions using `RenderTargetIdentifier` as obsolete for future removal. - Split RendererFeatures `AddRenderPasses` into two functions with `SetupRenderPasses` so render targets can be used after allocation. +- The "Add Renderer Feature" menu now supports filtering. +- Removed the name input for the SSAO and Screen Space Shadows renderer features. ### Fixed - Fixed an issue where 2D global lights with shadows enabled could break light layer batching [case 1376487](https://issuetracker.unity3d.com/issues/2d-urp-upgrading-global-light-sets-shadow-settings-to-enabled) @@ -24,6 +28,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. - Fixed an issue with MSAA falling back to the incorrect value when sample count 2 is not supported on some Android GPUs - Fixed decals to work with native render pass [case 1353141](https://issuetracker.unity3d.com/issues/urp-decals-are-not-visible-in-game-view-after-modifying-urp-asset-properties) - Fixed decals to work with render scale [1353885](https://issuetracker.unity3d.com/issues/urp-builtin-to-urp-render-pipeline-converter-freezes-the-editor-when-converting-rendering-settings) +- Fixed inspector documentation URLs for the URP asset and Universal Renderer asset. ## [13.1.1] - 2021-10-04 diff --git a/com.unity.render-pipelines.universal/Editor/ScriptableRendererDataEditor.cs b/com.unity.render-pipelines.universal/Editor/ScriptableRendererDataEditor.cs index ca7254cae2a..0cf02f44d77 100644 --- a/com.unity.render-pipelines.universal/Editor/ScriptableRendererDataEditor.cs +++ b/com.unity.render-pipelines.universal/Editor/ScriptableRendererDataEditor.cs @@ -3,6 +3,7 @@ using System.Reflection; using System.Text.RegularExpressions; using UnityEngine; +using UnityEngine.Rendering; using UnityEngine.Rendering.Universal; using Object = UnityEngine.Object; @@ -86,13 +87,18 @@ private void DrawRendererFeatureList() EditorGUILayout.Space(); //Add renderer - if (GUILayout.Button("Add Renderer Feature", EditorStyles.miniButton)) + using (var hscope = new EditorGUILayout.HorizontalScope()) { - AddPassMenu(); + if (GUILayout.Button("Add Renderer Feature", EditorStyles.miniButton)) + { + var r = hscope.rect; + var pos = new Vector2(r.x + r.width / 2f, r.yMax + 18f); + FilterWindow.Show(pos, new ScriptableRendererFeatureProvider(this)); +; } } } - private bool GetCustomTitle(Type type, out string title) + internal bool GetCustomTitle(Type type, out string title) { var isSingleFeature = type.GetCustomAttribute(); if (isSingleFeature != null) @@ -134,16 +140,18 @@ private void DrawRendererFeature(int index, ref SerializedProperty renderFeature string tooltip; GetTooltip(rendererFeatureObjRef.GetType(), out tooltip); + string helpURL; + DocumentationUtils.TryGetHelpURL(rendererFeatureObjRef.GetType(), out helpURL); + // Get the serialized object for the editor script & update it Editor rendererFeatureEditor = m_Editors[index]; SerializedObject serializedRendererFeaturesEditor = rendererFeatureEditor.serializedObject; serializedRendererFeaturesEditor.Update(); - // Foldout header EditorGUI.BeginChangeCheck(); SerializedProperty activeProperty = serializedRendererFeaturesEditor.FindProperty("m_Active"); - bool displayContent = CoreEditorUtils.DrawHeaderToggle(EditorGUIUtility.TrTextContent(title, tooltip), renderFeatureProperty, activeProperty, pos => OnContextClick(pos, index)); + bool displayContent = CoreEditorUtils.DrawHeaderToggle(EditorGUIUtility.TrTextContent(title, tooltip), renderFeatureProperty, activeProperty, pos => OnContextClick(pos, index), null, null, helpURL); hasChangedProperties |= EditorGUI.EndChangeCheck(); // ObjectEditor @@ -215,25 +223,7 @@ private void OnContextClick(Vector2 position, int id) menu.DropDown(new Rect(position, Vector2.zero)); } - private void AddPassMenu() - { - GenericMenu menu = new GenericMenu(); - TypeCache.TypeCollection types = TypeCache.GetTypesDerivedFrom(); - foreach (Type type in types) - { - var data = target as ScriptableRendererData; - if (data.DuplicateFeatureCheck(type)) - { - continue; - } - - string path = GetMenuNameFromType(type); - menu.AddItem(new GUIContent(path), false, AddComponent, type.Name); - } - menu.ShowAsContext(); - } - - private void AddComponent(object type) + internal void AddComponent(string type) { serializedObject.Update(); @@ -311,23 +301,6 @@ private void MoveComponent(int id, int offset) ForceSave(); } - private string GetMenuNameFromType(Type type) - { - string path; - if (!GetCustomTitle(type, out path)) - { - path = ObjectNames.NicifyVariableName(type.Name); - } - - if (type.Namespace != null) - { - if (type.Namespace.Contains("Experimental")) - path += " (Experimental)"; - } - - return path; - } - private string ValidateName(string name) { name = Regex.Replace(name, @"[^a-zA-Z0-9 ]", ""); diff --git a/com.unity.render-pipelines.universal/Editor/ScriptableRendererFeatureProvider.cs b/com.unity.render-pipelines.universal/Editor/ScriptableRendererFeatureProvider.cs new file mode 100644 index 00000000000..5d0a4f77433 --- /dev/null +++ b/com.unity.render-pipelines.universal/Editor/ScriptableRendererFeatureProvider.cs @@ -0,0 +1,74 @@ +using System; +using System.Collections.Generic; +using UnityEngine; +using UnityEngine.Rendering.Universal; + +namespace UnityEditor.Rendering.Universal +{ + class ScriptableRendererFeatureProvider : FilterWindow.IProvider + { + class FeatureElement : FilterWindow.Element + { + public Type type; + } + + readonly ScriptableRendererDataEditor m_Editor; + public Vector2 position { get; set; } + + public ScriptableRendererFeatureProvider(ScriptableRendererDataEditor editor) + { + m_Editor = editor; + } + + public void CreateComponentTree(List tree) + { + tree.Add(new FilterWindow.GroupElement(0, "Renderer Features")); + var types = TypeCache.GetTypesDerivedFrom(); + var data = m_Editor.target as ScriptableRendererData; + foreach (var type in types) + { + if (data.DuplicateFeatureCheck(type)) + { + continue; + } + + string path = GetMenuNameFromType(type); + tree.Add(new FeatureElement + { + content = new GUIContent(path), + level = 1, + type = type + }); + } + } + + public bool GoToChild(FilterWindow.Element element, bool addIfComponent) + { + if (element is FeatureElement featureElement) + { + m_Editor.AddComponent(featureElement.type.Name); + return true; + } + + return false; + } + + string GetMenuNameFromType(Type type) + { + string path; + if (!m_Editor.GetCustomTitle(type, out path)) + { + path = ObjectNames.NicifyVariableName(type.Name); + } + + if (type.Namespace != null) + { + if (type.Namespace.Contains("Experimental")) + path += " (Experimental)"; + } + + return path; + } + + } +} diff --git a/com.unity.render-pipelines.universal/Editor/ScriptableRendererFeatureProvider.cs.meta b/com.unity.render-pipelines.universal/Editor/ScriptableRendererFeatureProvider.cs.meta new file mode 100644 index 00000000000..a9ff69b38d1 --- /dev/null +++ b/com.unity.render-pipelines.universal/Editor/ScriptableRendererFeatureProvider.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 0b6b6a75a79e434b9c417f5164ef991d +timeCreated: 1634030073 \ No newline at end of file diff --git a/com.unity.render-pipelines.universal/Runtime/Data/UniversalRenderPipelineAsset.cs b/com.unity.render-pipelines.universal/Runtime/Data/UniversalRenderPipelineAsset.cs index 29abc75b883..9a4b8faaf19 100644 --- a/com.unity.render-pipelines.universal/Runtime/Data/UniversalRenderPipelineAsset.cs +++ b/com.unity.render-pipelines.universal/Runtime/Data/UniversalRenderPipelineAsset.cs @@ -138,6 +138,7 @@ public enum VolumeFrameworkUpdateMode } [ExcludeFromPreset] + [URPHelpURL("universalrp-asset")] public partial class UniversalRenderPipelineAsset : RenderPipelineAsset, ISerializationCallbackReceiver { Shader m_DefaultShader; diff --git a/com.unity.render-pipelines.universal/Runtime/Documentation.cs b/com.unity.render-pipelines.universal/Runtime/Documentation.cs index 5c8052d584b..0f1ef01cb4e 100644 --- a/com.unity.render-pipelines.universal/Runtime/Documentation.cs +++ b/com.unity.render-pipelines.universal/Runtime/Documentation.cs @@ -5,8 +5,8 @@ namespace UnityEngine.Rendering.Universal [Conditional("UNITY_EDITOR")] internal class URPHelpURLAttribute : CoreRPHelpURLAttribute { - public URPHelpURLAttribute(string pageName) - : base(pageName, Documentation.packageName) + public URPHelpURLAttribute(string pageName, string pageHash = "") + : base(pageName, Documentation.packageName, pageHash) { } } @@ -22,7 +22,8 @@ internal class Documentation : DocumentationInfo /// Generates a help url for the given package and page name /// /// The page name + /// The page hash /// The full url page - public static string GetPageLink(string pageName) => GetPageLink(packageName, pageName); + public static string GetPageLink(string pageName, string pageHash = "") => GetPageLink(packageName, pageName, pageHash); } } diff --git a/com.unity.render-pipelines.universal/Runtime/RendererFeatures/DecalRendererFeature.cs b/com.unity.render-pipelines.universal/Runtime/RendererFeatures/DecalRendererFeature.cs index 1569441d008..6cae34c5b24 100644 --- a/com.unity.render-pipelines.universal/Runtime/RendererFeatures/DecalRendererFeature.cs +++ b/com.unity.render-pipelines.universal/Runtime/RendererFeatures/DecalRendererFeature.cs @@ -149,6 +149,7 @@ private void OnDecalMaterialChange(DecalProjector decalProjector) [DisallowMultipleRendererFeature("Decal")] [Tooltip("With this Renderer Feature, Unity can project specific Materials (decals) onto other objects in the Scene.")] + [URPHelpURL("renderer-feature-decal")] internal class DecalRendererFeature : ScriptableRendererFeature { private static SharedDecalEntityManager sharedDecalEntityManager { get; } = new SharedDecalEntityManager(); diff --git a/com.unity.render-pipelines.universal/Runtime/RendererFeatures/RenderObjects.cs b/com.unity.render-pipelines.universal/Runtime/RendererFeatures/RenderObjects.cs index 269d79e6b81..068a768b5d7 100644 --- a/com.unity.render-pipelines.universal/Runtime/RendererFeatures/RenderObjects.cs +++ b/com.unity.render-pipelines.universal/Runtime/RendererFeatures/RenderObjects.cs @@ -12,6 +12,7 @@ public enum RenderQueueType [ExcludeFromPreset] [Tooltip("Render Objects simplifies the injection of additional render passes by exposing a selection of commonly used settings.")] + [URPHelpURL("urp-renderer-feature", "#render-objects-renderer-featurea-namerender-objects-renderer-featurea")] public class RenderObjects : ScriptableRendererFeature { [System.Serializable] diff --git a/com.unity.render-pipelines.universal/Runtime/RendererFeatures/ScreenSpaceAmbientOcclusion.cs b/com.unity.render-pipelines.universal/Runtime/RendererFeatures/ScreenSpaceAmbientOcclusion.cs index 936c57b31f6..11b26fd43fb 100644 --- a/com.unity.render-pipelines.universal/Runtime/RendererFeatures/ScreenSpaceAmbientOcclusion.cs +++ b/com.unity.render-pipelines.universal/Runtime/RendererFeatures/ScreenSpaceAmbientOcclusion.cs @@ -30,8 +30,9 @@ internal enum NormalQuality } } - [DisallowMultipleRendererFeature] + [DisallowMultipleRendererFeature("Screen Space Ambient Occlusion")] [Tooltip("The Ambient Occlusion effect darkens creases, holes, intersections and surfaces that are close to each other.")] + [URPHelpURL("post-processing-ssao")] internal class ScreenSpaceAmbientOcclusion : ScriptableRendererFeature { // Serialized Fields diff --git a/com.unity.render-pipelines.universal/Runtime/RendererFeatures/ScreenSpaceShadows.cs b/com.unity.render-pipelines.universal/Runtime/RendererFeatures/ScreenSpaceShadows.cs index f5dc3c5ce87..bf0a1e7604b 100644 --- a/com.unity.render-pipelines.universal/Runtime/RendererFeatures/ScreenSpaceShadows.cs +++ b/com.unity.render-pipelines.universal/Runtime/RendererFeatures/ScreenSpaceShadows.cs @@ -8,7 +8,7 @@ internal class ScreenSpaceShadowsSettings { } - [DisallowMultipleRendererFeature] + [DisallowMultipleRendererFeature("Screen Space Shadows")] [Tooltip("Screen Space Shadows")] internal class ScreenSpaceShadows : ScriptableRendererFeature { diff --git a/com.unity.render-pipelines.universal/Runtime/UniversalRendererData.cs b/com.unity.render-pipelines.universal/Runtime/UniversalRendererData.cs index b6eba330c5d..78fedd3989d 100644 --- a/com.unity.render-pipelines.universal/Runtime/UniversalRendererData.cs +++ b/com.unity.render-pipelines.universal/Runtime/UniversalRendererData.cs @@ -20,6 +20,7 @@ public enum CopyDepthMode } [Serializable, ReloadGroup, ExcludeFromPreset] + [URPHelpURL("urp-universal-renderer")] public class UniversalRendererData : ScriptableRendererData, ISerializationCallbackReceiver { #if UNITY_EDITOR From d16db9a98bc58c128d8bc3aa6a9ae409253478fa Mon Sep 17 00:00:00 2001 From: Erik Hakala <59870743+eh-unity@users.noreply.github.com> Date: Thu, 18 Nov 2021 16:13:04 +0200 Subject: [PATCH 02/14] Upgrade test materials and assets for premultiplied blend parity. (#6326) * Upgraded Runtime/Materials/*.mat files. * Foundation CommonAssets/ *.mat files upgrade. * Foundation Scenes/ .mat files upgrade. * Foundation Scenes/ .renderTexture files upgrade. * Lighting CommonAssets/ .mat upgrade. * Lighting EditMode Assets .mat files upgrade. * Lighting Scenes/ .mat files upgrade. * Lighting Scenes/ .renderTexture files upgrade. * Terrain CommonAssets/ .mat files upgrade. * Terrain Scenes/ .mat files upgrade. * PostProcessing CommonAssets/ .mat files upgrade. * PostProcessing Scenes/ .mat files upgrade. --- .../CommonAssets/Materials/CeramicTiles.mat | 19 +++++++++- .../Materials/Challenge-Brick.mat | 19 +++++++++- .../CommonAssets/Materials/Hole_mesh.mat | 21 ++++++++++- .../Materials/Hole_mesh_cutout.mat | 7 +++- .../Materials/IndustrialGlass.mat | 8 +++- .../CommonAssets/Materials/LW_Diffuse.mat | 19 +++++++++- .../Materials/LW_DiffuseParticles.mat | 4 +- .../LW_DiffuseParticlesWithTexture.mat | 4 +- .../Materials/LW_DiffuseTransparent.mat | 10 +++-- .../LW_DiffuseTransparentParticles.mat | 7 ++-- ...DiffuseTransparentParticlesWithTexture.mat | 7 ++-- .../LW_DiffuseTransparentWithTexture.mat | 10 +++-- .../Materials/LW_DiffuseUnlit.mat | 7 +++- ...seUnlitParticlesTransparentWithTexture.mat | 7 ++-- .../LW_DiffuseUnlitParticlesWithTexture.mat | 4 +- .../Materials/LW_DiffuseUnlitShaderGraph.mat | 17 ++++++++- .../LW_DiffuseUnlitTransparentWithTexture.mat | 9 +++-- .../Materials/LW_DiffuseUnlitWithTexture.mat | 7 +++- .../Materials/LW_DiffuseWithTexture.mat | 19 +++++++++- .../CommonAssets/Materials/LW_Material.mat | 19 +++++++++- .../Materials/LW_MaterialParticles.mat | 7 +++- .../LW_MaterialParticlesWithTexture.mat | 7 +++- .../Materials/LW_MaterialShaderGraph.mat | 17 ++++++++- .../Materials/LW_MaterialTransparent.mat | 10 +++-- .../LW_MaterialTransparentParticles.mat | 10 +++-- ...aterialTransparentParticlesWithTexture.mat | 10 +++-- .../LW_MaterialTransparentShaderGraph.mat | 17 ++++++++- .../LW_MaterialTransparentWithTexture.mat | 10 +++-- .../Materials/LW_MaterialWithTexture.mat | 21 ++++++++++- .../CommonAssets/Materials/PW_WoodLog.mat | 19 +++++++++- .../Materials/PyramidsWall-v01.mat | 5 ++- .../Assets/CommonAssets/Materials/Roofing.mat | 19 +++++++++- .../CommonAssets/Materials/ShoreRockSand.mat | 19 +++++++++- .../CommonAssets/Materials/UnlitColor.mat | 5 ++- .../Assets/CommonAssets/Materials/bark.mat | 19 +++++++++- .../Materials/herringbone_brick_floor.mat | 19 +++++++++- .../Materials/metal_aluminium_directional.mat | 19 +++++++++- .../Materials/metal_brushed_copper.mat | 19 +++++++++- .../CommonAssets/Materials/red_paint.mat | 19 +++++++++- .../Materials/rocks_dirt_ground.mat | 19 +++++++++- .../Crowd_LOD0_Mat_Limbs_metallic.mat | 19 +++++++++- .../Materials/Crowd_LOD0_Mat_Limbs_spec.mat | 19 +++++++++- .../Crowd_LOD0_Mat_Torso_metallic.mat | 19 +++++++++- .../Materials/Crowd_LOD0_Mat_Torso_spec.mat | 19 +++++++++- .../Meshes/PBRSpheres/PBRtest_Spec.mat | 19 +++++++++- .../Meshes/PBRSpheres/PBRtest_met.mat | 19 +++++++++- .../Scenes/001_SimpleCube/001_SimpleCube.mat | 17 ++++++++- .../002_Camera_Clip/002_CameraClip_Sphere.mat | 17 ++++++++- .../003_CameraOrtho_Sphere.mat | 17 ++++++++- .../004_CameraTargetTextureSphere.mat | 17 ++++++++- .../004_Camera_TargetTexture_Sphere.mat | 19 +++++++++- .../Cam_TargetTex.renderTexture | 18 +++++++-- .../007_LitShaderMaps_01_BaseWhite.mat | 17 ++++++++- .../007_LitShaderMaps_02_BaseColor.mat | 19 +++++++++- .../007_LitShaderMaps_03_Specular.mat | 17 ++++++++- .../007_LitShaderMaps_04_Normal.mat | 17 ++++++++- .../007_LitShaderMaps_05_Emission.mat | 17 ++++++++- .../007_LitShaderMaps_06_All.mat | 17 ++++++++- .../007_LitShaderMaps_UnlitMatTexture_08.mat | 17 ++++++++- .../007_LitShaderMaps_UnlitMat_07.mat | 7 +++- .../PBRSphere.mat | 19 +++++++++- .../PBRSphere1.mat | 5 ++- .../PBRSphere10.mat | 5 ++- .../PBRSphere11.mat | 5 ++- .../PBRSphere12.mat | 5 ++- .../PBRSphere13.mat | 5 ++- .../PBRSphere14.mat | 5 ++- .../PBRSphere15.mat | 5 ++- .../PBRSphere16.mat | 5 ++- .../PBRSphere17.mat | 5 ++- .../PBRSphere18.mat | 5 ++- .../PBRSphere19.mat | 5 ++- .../PBRSphere2.mat | 5 ++- .../PBRSphere20.mat | 5 ++- .../PBRSphere21.mat | 5 ++- .../PBRSphere3.mat | 5 ++- .../PBRSphere4.mat | 5 ++- .../PBRSphere5.mat | 5 ++- .../PBRSphere6.mat | 5 ++- .../PBRSphere7.mat | 5 ++- .../PBRSphere8.mat | 5 ++- .../PBRSphere9.mat | 5 ++- .../Materials/blue.mat | 19 +++++++++- .../Materials/green.mat | 19 +++++++++- .../Materials/red.mat | 17 ++++++++- .../Materials/yellow.mat | 19 +++++++++- .../Scenes/014_CameraMulti_MiniMap/red.mat | 19 +++++++++- .../Scenes/015_CameraMulti_FPSCam/blue.mat | 19 +++++++++- .../Scenes/015_CameraMulti_FPSCam/red.mat | 17 ++++++++- .../PhysicallyBased_NoReceiveShadows.mat | 19 +++++++++- .../SimpleLighting_NoReceiveShadows.mat | 19 +++++++++- .../BenchDrill/materials/kabel.mat | 19 +++++++++- .../BenchDrill/materials/korpus.mat | 19 +++++++++- .../BenchDrill/materials/kozhuh.mat | 19 +++++++++- .../BenchDrill/materials/motor.mat | 19 +++++++++- .../BenchDrill/materials/spindle.mat | 19 +++++++++- .../BenchDrill/materials/stanina.mat | 19 +++++++++- .../BenchDrill/materials/stanina_vk.mat | 19 +++++++++- .../BenchDrill/materials/top.mat | 19 +++++++++- .../BenchDrill/materials/val.mat | 19 +++++++++- .../Materials/031_IndustrialGlass.mat | 8 +++- .../037_Particles/Materials/1.Lit-Cutout.mat | 5 ++- .../037_Particles/Materials/1.Lit-Fade.mat | 6 ++- .../Materials/1.Lit-Shadow-Cutout.mat | 5 ++- .../Materials/1.Lit-Shadow-Fade.mat | 6 ++- .../Materials/1.Lit-Shadow-Opaque.mat | 5 ++- .../Materials/1.Lit-Shadow-Transparent.mat | 8 +++- .../Materials/2.Unlit-Additive.mat | 3 +- .../Materials/2.Unlit-CameraFading-Fade.mat | 3 +- .../2.Unlit-CameraFading-Transparent.mat | 5 ++- .../Materials/2.Unlit-Modulate.mat | 3 +- .../Materials/2.Unlit-SoftParticles-Fade.mat | 3 +- .../2.Unlit-SoftParticles-Transparent.mat | 5 ++- .../Materials/2.Unlit-Subtractive.mat | 3 +- .../Materials/3.Lit-Additive.mat | 3 +- .../037_Particles/Materials/3.Lit-Color.mat | 3 +- .../Materials/3.Lit-Difference.mat | 3 +- .../Materials/3.Lit-Multiply.mat | 3 +- .../037_Particles/Materials/3.Lit-Overlay.mat | 3 +- .../Materials/3.Lit-Subtractive.mat | 3 +- .../037_Particles/Materials/4.Lit-Opaque.mat | 5 ++- .../Materials/5.Lit-TwoSided.mat | 7 +++- .../Materials/5.Unlit-TwoSided.mat | 4 +- .../Materials/6.Lit-FlipBookSimple-Fade.mat | 6 ++- .../6.Unlit-FlipBookBlended-Fade.mat | 3 +- .../Materials/7.Lit-Transparent.mat | 8 +++- .../Materials/8.Lit-Distortion.mat | 3 +- .../Scenes/037_Particles/Materials/Plane.mat | 19 +++++++++- .../CurrentMaterials/ArchesMaterial.mat | 19 +++++++++- .../CurrentMaterials/BloxMaterial.mat | 19 +++++++++- .../CurrentMaterials/ClockGlassMaterial.mat | 21 ++++++++++- .../CurrentMaterials/ClockMaterial.mat | 19 +++++++++- .../CurrentMaterials/DollhouseMaterial.mat | 19 +++++++++- .../CurrentMaterials/DrawersMaterial.mat | 19 +++++++++- .../CurrentMaterials/EyesMaterial.mat | 19 +++++++++- .../FlareParticleMaterial.mat | 7 ++-- .../FluffParticleMaterial.mat | 19 +++++++++- .../CurrentMaterials/GunMaterial.mat | 21 ++++++++++- .../CurrentMaterials/HearseMaterial.mat | 21 ++++++++++- .../CurrentMaterials/HellephantMaterial.mat | 19 +++++++++- .../CurrentMaterials/PlanksMaterial.mat | 19 +++++++++- .../CurrentMaterials/PlayerMaterial.mat | 21 ++++++++++- .../CurrentMaterials/RobotMaterial.mat | 21 ++++++++++- .../CurrentMaterials/SpinningTopMaterial.mat | 19 +++++++++- .../CurrentMaterials/StarMaterial.mat | 19 +++++++++- .../CurrentMaterials/TrainMaterial.mat | 21 ++++++++++- .../CurrentMaterials/WallMaterial.mat | 23 ++++++++++-- .../CurrentMaterials/ZombearMaterial.mat | 19 +++++++++- .../CurrentMaterials/ZombunnyMaterial.mat | 19 +++++++++- .../050_Shader_Graphs/Graphs/PBR_Cutout.mat | 17 ++++++++- .../050_Shader_Graphs/Graphs/PBR_Maps.mat | 17 ++++++++- .../050_Shader_Graphs/Graphs/PBR_Meta.mat | 31 +++++++++++++++- .../Graphs/PBR_Transparent.mat | 17 ++++++++- .../Graphs/ShaderGraphs_Unlit_Alpha.mat | 17 ++++++++- .../050_Shader_Graphs/Graphs/Unlit_Cutout.mat | 17 ++++++++- .../050_Shader_Graphs/Graphs/Unlit_Maps.mat | 17 ++++++++- .../Graph/PBR_Cutout_Override.mat | 6 ++- .../Graph/PBR_Maps_Override.mat | 19 +++++++++- .../Graph/PBR_Meta_Override.mat | 19 +++++++++- .../Graph/PBR_Transparent_Override.mat | 11 ++++-- .../Graph/Unlit_Alpha_Override.mat | 8 ++-- .../Graph/Unlit_Cutout_Override.mat | 8 ++-- .../Graph/Unlit_Maps_Override.mat | 16 +++++++- .../053_UnlitShader/UnlitShaderRedGI.mat | 5 ++- .../053_UnlitShader/UnlitShaderRedNoGI.mat | 5 ++- .../053_UnlitShader/UnlitShaderWhiteGI.mat | 5 ++- .../109_CameraTargetTexture.mat | 7 +++- ...dersAlphaOutputRenderTexture.renderTexture | 6 ++- .../110_CameraTargetTexture.mat | 7 +++- ...rsAlphaOutputRendererFeature.renderTexture | 5 ++- .../Scenes/111_CameraStackMSAA/Blue.mat | 19 +++++++++- .../Assets/Scenes/111_CameraStackMSAA/Red.mat | 19 +++++++++- .../Scenes/111_CameraStackMSAA/White.mat | 17 ++++++++- .../Assets/Scenes/112_FogBasic/Lit.mat | 7 +++- .../Scenes/112_FogBasic/LitShaderGraph.mat | 4 +- .../Scenes/112_FogBasic/ParticleLit.mat | 7 +++- .../Scenes/112_FogBasic/ParticleUnlit.mat | 4 +- .../Assets/Scenes/112_FogBasic/SimpleLit.mat | 7 +++- .../SpeedTreeBillboard_disabled.mat | 6 ++- .../112_FogBasic/TerrainLit_disabled.mat | 7 +++- .../Assets/Scenes/112_FogBasic/Unlit.mat | 7 +++- .../Scenes/112_FogBasic/UnlitShaderGraph.mat | 4 +- .../MapRenderTexture.renderTexture | 5 ++- .../BottomLeftRT.renderTexture | 6 ++- .../BottomLeftTexture.mat | 7 +++- .../BottomRightRT.renderTexture | 6 ++- .../BottomRightTexture.mat | 7 +++- .../TopLeftRT.renderTexture | 6 ++- .../TopLeftTexture.mat | 7 +++- .../TopRightRT.renderTexture | 6 ++- .../TopRightTexture.mat | 7 +++- .../ShaderGraphs_SphereIntersector.mat | 15 ++++++++ .../Assets/Scenes/126_SampleDepth/unlit.mat | 5 ++- .../127_ClearRenderTexture/RTT.renderTexture | 6 ++- .../Scenes/127_ClearRenderTexture/Unlit.mat | 7 +++- .../Assets/Scenes/128_TBN/LitTBN.mat | 37 ++++++++++++++++++- .../131_ParallaxMapping/LitParallax.mat | 32 +++++++++++++++- .../ParallaxMappingNode.mat | 27 ++++++++++++++ .../Scenes/132_DetailMapping/Detail.mat | 17 ++++++++- .../132_DetailMapping/Detail_BaseOnly.mat | 5 ++- .../Detail_BaseOnly_Scaled.mat | 17 ++++++++- .../132_DetailMapping/Detail_MainNormal.mat | 17 ++++++++- .../Scenes/132_DetailMapping/Detail_Mask.mat | 17 ++++++++- .../132_DetailMapping/Detail_NormalOnly.mat | 17 ++++++++- .../Detail_NormalOnly_Scaled8x.mat | 5 ++- .../132_DetailMapping/Detail_Tiling5x.mat | 17 ++++++++- .../LightCookie_BakedLit.mat | 4 +- .../LightCookie_Lit.mat | 5 ++- .../LightCookie_Particles_Lit.mat | 5 ++- .../LightCookie_Particles_SimpleLit.mat | 2 +- .../LightCookie_Particles_Unlit.mat | 2 +- .../LightCookie_SG_Lit.mat | 2 +- .../LightCookie_SG_Unlit.mat | 2 +- .../LightCookie_SimpleLit.mat | 5 ++- .../LightCookie_Unlit.mat | 4 +- .../Scenes/200_Assets/Materials/Floor.mat | 5 ++- .../Materials/SSAO_MAT_LitClean.mat | 5 ++- .../Materials/SSAO_MAT_LitNormal.mat | 5 ++- .../SSAO_MAT_LitNormalAlphaClipped.mat | 5 ++- .../SSAO_MAT_LitNormalDetailParallax.mat | 5 ++- .../SSAO_MAT_LitParticlesAlphaClipped.mat | 5 ++- .../Materials/SSAO_MAT_LitParticlesClean.mat | 5 ++- .../Materials/SSAO_MAT_LitParticlesNormal.mat | 5 ++- .../Materials/SSAO_MAT_ParticlesSimpleLit.mat | 2 +- ...SAO_MAT_ParticlesSimpleLitAlphaClipped.mat | 2 +- .../SSAO_MAT_ParticlesSimpleLitNormal.mat | 2 +- .../Materials/SSAO_MAT_SG_NormalBlend.mat | 17 ++++++++- .../Materials/SSAO_MAT_SG_NormalStrength.mat | 15 ++++++++ .../Materials/SSAO_MAT_SG_NormalTriplanar.mat | 15 ++++++++ .../SSAO_MAT_SimpleLitAlphaClippedNormal.mat | 5 ++- .../Materials/SSAO_MAT_SimpleLitClean.mat | 5 ++- .../Materials/SSAO_MAT_SimpleLitNormal.mat | 5 ++- .../200_Assets/Materials/SSAO_MAT_Unlit.mat | 4 +- .../SSAO_MAT_UnlitParticlesAlphaClipped.mat | 2 +- .../SSAO_MAT_UnlitParticlesClean.mat | 2 +- .../SSAO_MAT_UnlitParticlesNormal.mat | 2 +- .../Scenes/206_Motion_Vectors/SGMaterial.mat | 6 ++- .../Scenes/230_Decals/Materials/Brick.mat | 2 +- .../Scenes/230_Decals/Materials/LitRed.mat | 3 +- .../Scenes/230_Decals/Materials/UnlitRed.mat | 3 +- .../CommonAssets/Materials/CeramicTiles.mat | 19 +++++++++- .../CommonAssets/Materials/CornellBox.mat | 5 ++- .../Materials/CornellBox_green.mat | 17 ++++++++- .../CommonAssets/Materials/CornellBox_red.mat | 17 ++++++++- .../CommonAssets/Materials/Fully_Metalic.mat | 5 ++- .../CommonAssets/Materials/LW_Diffuse.mat | 5 ++- .../CommonAssets/Materials/LW_Material.mat | 19 +++++++++- .../Assets/CommonAssets/Materials/Matte.mat | 19 +++++++++- .../Meshes/BenchDrill/materials/kabel.mat | 19 +++++++++- .../Meshes/BenchDrill/materials/korpus.mat | 19 +++++++++- .../Meshes/BenchDrill/materials/kozhuh.mat | 19 +++++++++- .../Meshes/BenchDrill/materials/motor.mat | 19 +++++++++- .../Meshes/BenchDrill/materials/spindle.mat | 19 +++++++++- .../Meshes/BenchDrill/materials/stanina.mat | 19 +++++++++- .../BenchDrill/materials/stanina_vk.mat | 19 +++++++++- .../Meshes/BenchDrill/materials/top.mat | 19 +++++++++- .../Meshes/BenchDrill/materials/val.mat | 19 +++++++++- .../contents/blue_emissive.mat | 5 ++- .../contents/green_emissive.mat | 5 ++- .../contents/grey.mat | 5 ++- .../contents/red_emissive.mat | 5 ++- .../contents/sphere.mat | 5 ++- .../005_LitBakeEmission_Sphere.mat | 17 ++++++++- .../006_LitShaderLightProbes_Sphere.mat | 17 ++++++++- .../CutoutBaked.mat | 37 ++++++++++++++++++- .../Materials/034_Hole_mesh.mat | 5 ++- .../Materials/034_Hole_mesh_highlights.mat | 5 ++- .../Materials/034_IndustrialGlass.mat | 7 +++- .../034_IndustrialGlass_highlights.mat | 7 +++- .../Materials/034_Roofing.mat | 5 ++- .../Materials/034_Roofing_highlights.mat | 5 ++- .../Materials/034_basic.mat | 19 +++++++++- .../Materials/034_basic_highlights.mat | 19 +++++++++- .../Materials/034_rocks_dirt_ground.mat | 19 +++++++++- .../034_rocks_dirt_ground_highlights.mat | 19 +++++++++- .../Dots.mat | 19 +++++++++- .../044_ReflectionProbe.mat | 19 +++++++++- .../044_ReflectionProbeRough.mat | 19 +++++++++- .../044_ReflectionProbeTextured.mat | 19 +++++++++- .../044_ReflectionProbeTextured_rough.mat | 10 +++-- .../ReflectiveMaterial.mat | 37 ++++++++++++++++++- .../UnlitCustomShadows.mat | 3 +- .../Materials/ParticleLit.mat | 2 +- .../Materials/SimpleLit.mat | 7 +++- .../Materials/Unlit.mat | 7 +++- .../150_LitRealtimeEmission_Sphere.mat | 2 +- ...orwardDeferred_RenderTexture.renderTexture | 5 ++- .../Enlighten_Shader_Graph.mat | 17 ++++++++- .../151_Lighting_EnlightenLights/White.mat | 2 +- .../153_Lighting_EnlightenTerrain/bark.mat | 7 +++- .../NonMetalicMaterial.mat | 7 +++- .../Scenes/200_Assets/Materials/Floor.mat | 5 ++- .../Materials/SSAO_MAT_BakedLit.mat | 4 +- .../SSAO_MAT_BakedLitAlphaClippedNormal.mat | 4 +- .../Materials/SSAO_MAT_BakedLitNormal.mat | 4 +- .../CommonAssets/Materials/Array Element.mat | 17 ++++++++- .../CommonAssets/Materials/BW Gradient.mat | 7 +++- .../CommonAssets/Materials/Hole_mesh.mat | 7 +++- .../Materials/Hole_mesh_cutout.mat | 7 +++- .../Assets/CommonAssets/Materials/Lit.mat | 5 ++- .../Materials/Pyramids Wall - v01.mat | 19 +++++++++- .../Materials/SyntheticColorChart.mat | 7 +++- .../CommonAssets/Materials/UnlitColor.mat | 5 ++- .../Materials/Unlit_GridMarkers_X1Y1.mat | 7 +++- .../Materials/Unlit_GridMarkers_X2Y1.mat | 7 +++- .../Materials/Unlit_GridMarkers_X6Y6.mat | 7 +++- .../CommonAssets/Materials/White_Mate.mat | 19 +++++++++- .../CommonAssets/Materials/red_paint.mat | 19 +++++++++- .../Billboard.mat | 2 +- .../LOD0/Branches_0.mat | 2 +- .../LOD0/Branches_1.mat | 2 +- .../LOD0/FacingLeaves_4.mat | 2 +- .../LOD0/Fronds_2.mat | 2 +- .../LOD0/Leaves_3.mat | 2 +- .../LOD1/Branches_0.mat | 2 +- .../LOD1/Branches_1.mat | 2 +- .../LOD1/FacingLeaves_4.mat | 2 +- .../LOD1/Fronds_2.mat | 2 +- .../LOD1/Leaves_3.mat | 2 +- .../LOD2/Branches_0.mat | 2 +- .../LOD2/Branches_1.mat | 2 +- .../LOD2/FacingLeaves_4.mat | 2 +- .../LOD2/Fronds_2.mat | 2 +- .../LOD2/Leaves_3.mat | 2 +- .../Billboard.mat | 2 +- .../LOD0/Branches_0.mat | 2 +- .../LOD0/Branches_1.mat | 2 +- .../LOD0/FacingLeaves_4.mat | 2 +- .../LOD0/Fronds_2.mat | 2 +- .../LOD0/Leaves_3.mat | 2 +- .../LOD1/Branches_0.mat | 2 +- .../LOD1/Branches_1.mat | 2 +- .../LOD1/FacingLeaves_4.mat | 2 +- .../LOD1/Fronds_2.mat | 2 +- .../LOD1/Leaves_3.mat | 2 +- .../LOD2/Branches_0.mat | 2 +- .../LOD2/Branches_1.mat | 2 +- .../LOD2/FacingLeaves_4.mat | 2 +- .../LOD2/Fronds_2.mat | 2 +- .../LOD2/Leaves_3.mat | 2 +- .../LOD0/Broadleaf_Desktop_Field.mat | 2 +- .../LOD0/Main_Bark.mat | 2 +- .../LOD1/Broadleaf_Desktop_Field.mat | 2 +- .../LOD1/Main_Bark.mat | 2 +- .../LOD2/Broadleaf_Desktop_Field.mat | 2 +- .../LOD2/Main_Bark.mat | 2 +- .../Broadleaf_Desktop_Field_Billboard.mat | 2 +- .../LOD0/Broadleaf_Desktop_Field.mat | 2 +- .../LOD0/Main_Bark.mat | 2 +- .../145_SoftParticlesStackWithPP/Red.mat | 19 +++++++++- .../SoftParticles.mat | 3 +- .../146_MSAA_RenderToBackbuffer/BlueUnlit.mat | 4 +- .../GreenUnlit.mat | 4 +- .../146_MSAA_RenderToBackbuffer/RedUnlit.mat | 4 +- .../YellowUnlit.mat | 4 +- .../170_CameraCaptureAction/Material.mat | 5 ++- .../CommonAssets/Materials/Emissive1.mat | 5 ++- .../Billboard.mat | 2 +- .../LOD0/Branches_0.mat | 2 +- .../LOD0/Branches_1.mat | 2 +- .../LOD0/FacingLeaves_4.mat | 2 +- .../LOD0/Fronds_2.mat | 2 +- .../LOD0/Leaves_3.mat | 2 +- .../LOD1/Branches_0.mat | 2 +- .../LOD1/Branches_1.mat | 2 +- .../LOD1/FacingLeaves_4.mat | 2 +- .../LOD1/Fronds_2.mat | 2 +- .../LOD1/Leaves_3.mat | 2 +- .../LOD2/Branches_0.mat | 2 +- .../LOD2/Branches_1.mat | 2 +- .../LOD2/FacingLeaves_4.mat | 2 +- .../LOD2/Fronds_2.mat | 2 +- .../LOD2/Leaves_3.mat | 2 +- .../Billboard.mat | 2 +- .../LOD0/Branches_0.mat | 2 +- .../LOD0/Branches_1.mat | 2 +- .../LOD0/FacingLeaves_4.mat | 2 +- .../LOD0/Fronds_2.mat | 2 +- .../LOD0/Leaves_3.mat | 2 +- .../LOD1/Branches_0.mat | 2 +- .../LOD1/Branches_1.mat | 2 +- .../LOD1/FacingLeaves_4.mat | 2 +- .../LOD1/Fronds_2.mat | 2 +- .../LOD1/Leaves_3.mat | 2 +- .../LOD2/Branches_0.mat | 2 +- .../LOD2/Branches_1.mat | 2 +- .../LOD2/FacingLeaves_4.mat | 2 +- .../LOD2/Fronds_2.mat | 2 +- .../LOD2/Leaves_3.mat | 2 +- .../LOD0/Broadleaf_Desktop_Field.mat | 2 +- .../LOD0/Main_Bark.mat | 2 +- .../LOD1/Broadleaf_Desktop_Field.mat | 2 +- .../LOD1/Main_Bark.mat | 2 +- .../LOD2/Broadleaf_Desktop_Field.mat | 2 +- .../LOD2/Main_Bark.mat | 2 +- .../Broadleaf_Desktop_Field_Billboard.mat | 2 +- .../LOD0/Broadleaf_Desktop_Field.mat | 2 +- .../LOD0/Main_Bark.mat | 2 +- .../LOD1/Broadleaf_Desktop_Field.mat | 2 +- .../LOD1/Main_Bark.mat | 2 +- .../LOD2/Broadleaf_Desktop_Field.mat | 2 +- .../LOD2/Main_Bark.mat | 2 +- .../Broadleaf_Desktop_Field_Billboard.mat | 2 +- .../Broadleaf_Mobile Materials/Billboard.mat | 2 +- .../LOD0/Branches_0.mat | 2 +- .../LOD0/Leaves_1.mat | 2 +- .../LOD1/Branches_0.mat | 2 +- .../LOD1/Leaves_1.mat | 2 +- .../LOD2/Branches_0.mat | 2 +- .../LOD2/Leaves_1.mat | 2 +- .../Scenes/035_Shader_TerrainShaders/Rock.mat | 5 ++- .../035_Shader_TerrainShaders/Terrain.mat | 2 +- .../Fern/Materials/Fern 2sided-Fern.mat | 5 ++- .../Runtime/Materials/Lit.mat | 5 ++- .../Runtime/Materials/ParticlesUnlit.mat | 2 +- .../Runtime/Materials/SimpleLit.mat | 5 ++- .../Runtime/Materials/TerrainLit.mat | 2 +- 417 files changed, 3245 insertions(+), 528 deletions(-) diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/CeramicTiles.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/CeramicTiles.mat index a8480b79015..ba50091c0d3 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/CeramicTiles.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/CeramicTiles.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -89,17 +89,33 @@ Material: 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: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoat: 0 - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 - _Cull: 2 - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 0.5 @@ -118,6 +134,7 @@ Material: - _SpecSource: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _WorkflowMode: 1 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/Challenge-Brick.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/Challenge-Brick.mat index 6a626d9ae33..e5c0c4916e8 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/Challenge-Brick.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/Challenge-Brick.mat @@ -76,17 +76,33 @@ Material: 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: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoat: 0 - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 - _Cull: 2 - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 0.5 @@ -105,6 +121,7 @@ Material: - _SpecSource: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _WorkflowMode: 1 @@ -127,4 +144,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/Hole_mesh.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/Hole_mesh.mat index 001ce8cb0e5..e82e01b9eee 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/Hole_mesh.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/Hole_mesh.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -25,7 +25,7 @@ Material: m_ShaderKeywords: _ALPHATEST_ON _METALLICSPECGLOSSMAP _NORMALMAP m_LightmapFlags: 4 m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 + m_DoubleSidedGI: 1 m_CustomRenderQueue: 2450 stringTagMap: RenderType: TransparentCutout @@ -89,17 +89,33 @@ Material: 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: - _AlphaClip: 1 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoat: 0 - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 - _Cull: 0 - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 0.5 @@ -118,6 +134,7 @@ Material: - _SpecSource: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _WorkflowMode: 1 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/Hole_mesh_cutout.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/Hole_mesh_cutout.mat index 92544bbd192..83911281f63 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/Hole_mesh_cutout.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/Hole_mesh_cutout.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -25,7 +25,7 @@ Material: m_ShaderKeywords: _ALPHATEST_ON m_LightmapFlags: 4 m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 + m_DoubleSidedGI: 1 m_CustomRenderQueue: 2450 stringTagMap: RenderType: TransparentCutout @@ -89,11 +89,13 @@ Material: m_Floats: - _AlphaClip: 1 - _Blend: 0 + - _BlendOp: 0 - _BumpScale: 1 - _Cull: 0 - _Cutoff: 0.5 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 0.5 @@ -113,6 +115,7 @@ Material: - _SpecSource: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _WorkflowMode: 1 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/IndustrialGlass.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/IndustrialGlass.mat index 0afc52678c8..fca311b740e 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/IndustrialGlass.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/IndustrialGlass.mat @@ -13,11 +13,12 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 3050 + m_CustomRenderQueue: 3000 stringTagMap: RenderType: Transparent disabledShaderPasses: - SHADOWCASTER + - DepthOnly m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -93,6 +94,7 @@ Material: m_Floats: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 0 - _BumpScale: 1 - _ClearCoat: 0 - _ClearCoatMask: 0 @@ -102,6 +104,7 @@ Material: - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 10 + - _DstBlendAlpha: 10 - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 0.5 @@ -120,6 +123,7 @@ Material: - _SpecSource: 0 - _SpecularHighlights: 1 - _SrcBlend: 5 + - _SrcBlendAlpha: 1 - _Surface: 1 - _UVSec: 0 - _WorkflowMode: 1 @@ -142,4 +146,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/LW_Diffuse.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/LW_Diffuse.mat index de163d1d71f..7eea823dd5f 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/LW_Diffuse.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/LW_Diffuse.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -69,15 +69,29 @@ Material: 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: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _Cull: 2 - _Cutoff: 0.5 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _GlossMapScale: 1 - _Glossiness: 0.5 - _GlossinessSource: 0 @@ -92,12 +106,13 @@ Material: - _SpecSource: 0 - _SpecularHighlights: 0 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _ZWrite: 1 m_Colors: - _BaseColor: {r: 0.5, g: 0.5, b: 0.5, a: 0.5} - - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1} + - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 0.5} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.5, g: 0.5, b: 0.5, a: 0.5} m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/LW_DiffuseParticles.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/LW_DiffuseParticles.mat index 475f943b57b..e8d97caaa20 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/LW_DiffuseParticles.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/LW_DiffuseParticles.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -123,7 +123,7 @@ Material: - _BaseColor: {r: 0.5, g: 0.5, b: 0.5, a: 0.5019608} - _BaseColorAddSubDiff: {r: 0, g: 0, b: 0, a: 0} - _CameraFadeParams: {r: 0, g: Infinity, b: 0, a: 0} - - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1} + - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 0.5019608} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SoftParticleFadeParams: {r: 0, g: 0, b: 0, a: 0} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/LW_DiffuseParticlesWithTexture.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/LW_DiffuseParticlesWithTexture.mat index a4e33155c2c..40673b4c60f 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/LW_DiffuseParticlesWithTexture.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/LW_DiffuseParticlesWithTexture.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -123,7 +123,7 @@ Material: - _BaseColor: {r: 0.5, g: 0.5, b: 0.5, a: 0.5} - _BaseColorAddSubDiff: {r: -1, g: 0, b: 0, a: 0} - _CameraFadeParams: {r: 0, g: Infinity, b: 0, a: 0} - - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1} + - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 0.5} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SoftParticleFadeParams: {r: 0, g: 0, b: 0, a: 0} - _SpecColor: {r: 0.45641106, g: 0.45641106, b: 0.45641106, a: 1} diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/LW_DiffuseTransparent.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/LW_DiffuseTransparent.mat index 6c3f40235a0..7301b437303 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/LW_DiffuseTransparent.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/LW_DiffuseTransparent.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -26,11 +26,12 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 3050 + m_CustomRenderQueue: 3000 stringTagMap: RenderType: Transparent disabledShaderPasses: - SHADOWCASTER + - DepthOnly m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -86,11 +87,13 @@ Material: m_Floats: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 0 - _BumpScale: 1 - _Cull: 2 - _Cutoff: 0.5 - _DetailNormalMapScale: 1 - _DstBlend: 10 + - _DstBlendAlpha: 10 - _GlossMapScale: 1 - _Glossiness: 0.5 - _GlossinessSource: 0 @@ -105,12 +108,13 @@ Material: - _SpecSource: 0 - _SpecularHighlights: 0 - _SrcBlend: 5 + - _SrcBlendAlpha: 1 - _Surface: 1 - _UVSec: 0 - _ZWrite: 0 m_Colors: - _BaseColor: {r: 0.5, g: 0.5, b: 0.5, a: 0.5} - - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1} + - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 0.5} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.5, g: 0.5, b: 0.5, a: 0.5} m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/LW_DiffuseTransparentParticles.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/LW_DiffuseTransparentParticles.mat index 157bd6086b6..7ba4dee6294 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/LW_DiffuseTransparentParticles.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/LW_DiffuseTransparentParticles.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -26,11 +26,12 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 3050 + m_CustomRenderQueue: 3000 stringTagMap: RenderType: Transparent disabledShaderPasses: - SHADOWCASTER + - DepthOnly m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -124,7 +125,7 @@ Material: - _BaseColor: {r: 0.5, g: 0.5, b: 0.5, a: 0.5019608} - _BaseColorAddSubDiff: {r: 0, g: 0, b: 0, a: 0} - _CameraFadeParams: {r: 0, g: Infinity, b: 0, a: 0} - - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1} + - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 0.5019608} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SoftParticleFadeParams: {r: 0, g: 0, b: 0, a: 0} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/LW_DiffuseTransparentParticlesWithTexture.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/LW_DiffuseTransparentParticlesWithTexture.mat index eba0db94cbb..93d0e501f98 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/LW_DiffuseTransparentParticlesWithTexture.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/LW_DiffuseTransparentParticlesWithTexture.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -26,11 +26,12 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 3050 + m_CustomRenderQueue: 3000 stringTagMap: RenderType: Transparent disabledShaderPasses: - SHADOWCASTER + - DepthOnly m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -124,7 +125,7 @@ Material: - _BaseColor: {r: 0.5, g: 0.5, b: 0.5, a: 0.5019608} - _BaseColorAddSubDiff: {r: 0, g: 0, b: 0, a: 0} - _CameraFadeParams: {r: 0, g: Infinity, b: 0, a: 0} - - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1} + - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 0.5019608} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SoftParticleFadeParams: {r: 0, g: 0, b: 0, a: 0} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/LW_DiffuseTransparentWithTexture.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/LW_DiffuseTransparentWithTexture.mat index a30ad27f662..c6b8ed38399 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/LW_DiffuseTransparentWithTexture.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/LW_DiffuseTransparentWithTexture.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -26,11 +26,12 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 3050 + m_CustomRenderQueue: 3000 stringTagMap: RenderType: Transparent disabledShaderPasses: - SHADOWCASTER + - DepthOnly m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -86,11 +87,13 @@ Material: m_Floats: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 0 - _BumpScale: 1 - _Cull: 2 - _Cutoff: 0.5 - _DetailNormalMapScale: 1 - _DstBlend: 10 + - _DstBlendAlpha: 10 - _GlossMapScale: 1 - _Glossiness: 0.5 - _GlossinessSource: 0 @@ -105,12 +108,13 @@ Material: - _SpecSource: 0 - _SpecularHighlights: 0 - _SrcBlend: 5 + - _SrcBlendAlpha: 1 - _Surface: 1 - _UVSec: 0 - _ZWrite: 0 m_Colors: - _BaseColor: {r: 0.5, g: 0.5, b: 0.5, a: 0.5019608} - - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1} + - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 0.5019608} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.5, g: 0.5, b: 0.5, a: 0.5} m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/LW_DiffuseUnlit.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/LW_DiffuseUnlit.mat index 9164380b026..95db44b2a57 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/LW_DiffuseUnlit.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/LW_DiffuseUnlit.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -81,11 +81,13 @@ Material: m_Floats: - _AlphaClip: 0 - _Blend: 0 + - _BlendOp: 0 - _BumpScale: 1 - _Cull: 2 - _Cutoff: 0.5 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 0.5 @@ -104,13 +106,14 @@ Material: - _SpecSource: 0 - _SpecularHighlights: 0 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _WorkflowMode: 1 - _ZWrite: 1 m_Colors: - _BaseColor: {r: 0.5, g: 0.5, b: 0.5, a: 0.5} - - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1} + - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 0.5} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.5, g: 0.5, b: 0.5, a: 0.5} m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/LW_DiffuseUnlitParticlesTransparentWithTexture.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/LW_DiffuseUnlitParticlesTransparentWithTexture.mat index e61d0ccf8c9..50e2c886396 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/LW_DiffuseUnlitParticlesTransparentWithTexture.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/LW_DiffuseUnlitParticlesTransparentWithTexture.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -26,11 +26,12 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 3050 + m_CustomRenderQueue: 3000 stringTagMap: RenderType: Transparent disabledShaderPasses: - SHADOWCASTER + - DepthOnly m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -128,7 +129,7 @@ Material: - _BaseColor: {r: 0.5, g: 0.5, b: 0.5, a: 0.5} - _BaseColorAddSubDiff: {r: 0, g: 0, b: 0, a: 0} - _CameraFadeParams: {r: 0, g: Infinity, b: 0, a: 0} - - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1} + - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 0.5} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SoftParticleFadeParams: {r: 0, g: 0, b: 0, a: 0} - _SpecColor: {r: 0.5, g: 0.5, b: 0.5, a: 0.5} diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/LW_DiffuseUnlitParticlesWithTexture.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/LW_DiffuseUnlitParticlesWithTexture.mat index ab12f6c343c..194fa4c25d5 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/LW_DiffuseUnlitParticlesWithTexture.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/LW_DiffuseUnlitParticlesWithTexture.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -127,7 +127,7 @@ Material: - _BaseColor: {r: 0.5, g: 0.5, b: 0.5, a: 0.5} - _BaseColorAddSubDiff: {r: 0, g: 0, b: 0, a: 0} - _CameraFadeParams: {r: 0, g: 0, b: 0, a: 0} - - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1} + - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 0.5} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SoftParticleFadeParams: {r: 0, g: 0, b: 0, a: 0} - _SpecColor: {r: 0.5, g: 0.5, b: 0.5, a: 0.5} diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/LW_DiffuseUnlitShaderGraph.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/LW_DiffuseUnlitShaderGraph.mat index d6344caf7ef..ecd63f89e6a 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/LW_DiffuseUnlitShaderGraph.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/LW_DiffuseUnlitShaderGraph.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -77,6 +77,19 @@ Material: 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: - _AlphaClip: 0 - _Blend: 0 @@ -93,6 +106,7 @@ Material: - _Metallic: 0 - _OcclusionStrength: 1 - _Parallax: 0.02 + - _QueueControl: 0 - _QueueOffset: 0 - _ReceiveShadows: 1 - _SampleGI: 0 @@ -112,3 +126,4 @@ Material: - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.5, g: 0.5, b: 0.5, a: 0.5} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/LW_DiffuseUnlitTransparentWithTexture.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/LW_DiffuseUnlitTransparentWithTexture.mat index 0b8cf53b0b0..a060bbec41f 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/LW_DiffuseUnlitTransparentWithTexture.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/LW_DiffuseUnlitTransparentWithTexture.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -26,11 +26,12 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 3050 + m_CustomRenderQueue: 3000 stringTagMap: RenderType: Transparent disabledShaderPasses: - SHADOWCASTER + - DepthOnly m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -88,6 +89,7 @@ Material: - _Cutoff: 0.5 - _DetailNormalMapScale: 1 - _DstBlend: 10 + - _DstBlendAlpha: 10 - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 0.5 @@ -106,13 +108,14 @@ Material: - _SpecSource: 0 - _SpecularHighlights: 0 - _SrcBlend: 5 + - _SrcBlendAlpha: 1 - _Surface: 1 - _UVSec: 0 - _WorkflowMode: 1 - _ZWrite: 0 m_Colors: - _BaseColor: {r: 0.5, g: 0.5, b: 0.5, a: 0.5} - - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1} + - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 0.5} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.5, g: 0.5, b: 0.5, a: 0.5} m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/LW_DiffuseUnlitWithTexture.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/LW_DiffuseUnlitWithTexture.mat index 918e3ddc1ee..6250a61f3df 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/LW_DiffuseUnlitWithTexture.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/LW_DiffuseUnlitWithTexture.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -81,11 +81,13 @@ Material: m_Floats: - _AlphaClip: 0 - _Blend: 0 + - _BlendOp: 0 - _BumpScale: 1 - _Cull: 2 - _Cutoff: 0.5 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 0.5 @@ -104,13 +106,14 @@ Material: - _SpecSource: 0 - _SpecularHighlights: 0 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _WorkflowMode: 1 - _ZWrite: 1 m_Colors: - _BaseColor: {r: 0.5, g: 0.5, b: 0.5, a: 0.5} - - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1} + - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 0.5} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.5, g: 0.5, b: 0.5, a: 0.5} m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/LW_DiffuseWithTexture.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/LW_DiffuseWithTexture.mat index 08920ad08e9..baef52eb7fa 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/LW_DiffuseWithTexture.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/LW_DiffuseWithTexture.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -69,15 +69,29 @@ Material: 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: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _Cull: 2 - _Cutoff: 0.5 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _GlossMapScale: 1 - _Glossiness: 0.5 - _GlossinessSource: 0 @@ -92,12 +106,13 @@ Material: - _SpecSource: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _ZWrite: 1 m_Colors: - _BaseColor: {r: 0.5, g: 0.5, b: 0.5, a: 0.5} - - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1} + - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 0.5} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.5, g: 0.5, b: 0.5, a: 0.5} m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/LW_Material.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/LW_Material.mat index 371e2b1a2de..14b20a2b4aa 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/LW_Material.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/LW_Material.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -81,17 +81,33 @@ Material: 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: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoat: 0 - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 - _Cull: 2 - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 0.5 @@ -105,6 +121,7 @@ Material: - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _WorkflowMode: 1 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/LW_MaterialParticles.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/LW_MaterialParticles.mat index 9eb8d5ce5af..d0bdc74a49a 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/LW_MaterialParticles.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/LW_MaterialParticles.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -81,6 +81,7 @@ Material: m_Floats: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BlendOp: 0 - _BumpScale: 1 - _CameraFadingEnabled: 0 @@ -95,6 +96,7 @@ Material: - _DistortionStrength: 1 - _DistortionStrengthScaled: 0.1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _FlipbookBlending: 0 - _FlipbookMode: 0 @@ -114,6 +116,7 @@ Material: - _SoftParticlesNearFadeDistance: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _WorkflowMode: 1 @@ -122,7 +125,7 @@ Material: - _BaseColor: {r: 0.5, g: 0.5, b: 0.5, a: 0.5019608} - _BaseColorAddSubDiff: {r: 0, g: 0, b: 0, a: 0} - _CameraFadeParams: {r: 0, g: Infinity, b: 0, a: 0} - - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1} + - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 0.5019608} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SoftParticleFadeParams: {r: 0, g: 0, b: 0, a: 0} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/LW_MaterialParticlesWithTexture.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/LW_MaterialParticlesWithTexture.mat index 0c3be0094bd..4b1d5a14e0c 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/LW_MaterialParticlesWithTexture.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/LW_MaterialParticlesWithTexture.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -81,6 +81,7 @@ Material: m_Floats: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BlendOp: 0 - _BumpScale: 1 - _CameraFadingEnabled: 0 @@ -95,6 +96,7 @@ Material: - _DistortionStrength: 1 - _DistortionStrengthScaled: 0.1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _FlipbookBlending: 0 - _FlipbookMode: 0 @@ -114,6 +116,7 @@ Material: - _SoftParticlesNearFadeDistance: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _WorkflowMode: 1 @@ -122,7 +125,7 @@ Material: - _BaseColor: {r: 0.5, g: 0.5, b: 0.5, a: 0.5019608} - _BaseColorAddSubDiff: {r: 0, g: 0, b: 0, a: 0} - _CameraFadeParams: {r: 0, g: Infinity, b: 0, a: 0} - - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1} + - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 0.5019608} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SoftParticleFadeParams: {r: 0, g: 0, b: 0, a: 0} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/LW_MaterialShaderGraph.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/LW_MaterialShaderGraph.mat index d6221963ca2..ebc42bcdb93 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/LW_MaterialShaderGraph.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/LW_MaterialShaderGraph.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -77,6 +77,19 @@ Material: 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: - _AlphaClip: 0 - _Blend: 0 @@ -92,6 +105,7 @@ Material: - _Metallic: 0 - _OcclusionStrength: 1 - _Parallax: 0.02 + - _QueueControl: 0 - _QueueOffset: 0 - _ReceiveShadows: 1 - _Smoothness: 0.5 @@ -107,3 +121,4 @@ Material: - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/LW_MaterialTransparent.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/LW_MaterialTransparent.mat index e0dae12071e..74b9607bb29 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/LW_MaterialTransparent.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/LW_MaterialTransparent.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -26,11 +26,12 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 3050 + m_CustomRenderQueue: 3000 stringTagMap: RenderType: Transparent disabledShaderPasses: - SHADOWCASTER + - DepthOnly m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -98,6 +99,7 @@ Material: m_Floats: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 0 - _BumpScale: 1 - _ClearCoat: 0 - _ClearCoatMask: 0 @@ -107,6 +109,7 @@ Material: - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 10 + - _DstBlendAlpha: 10 - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 0.5 @@ -120,13 +123,14 @@ Material: - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 5 + - _SrcBlendAlpha: 1 - _Surface: 1 - _UVSec: 0 - _WorkflowMode: 1 - _ZWrite: 0 m_Colors: - _BaseColor: {r: 0.5, g: 0.5, b: 0.5, a: 0.5019608} - - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1} + - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 0.5019608} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/LW_MaterialTransparentParticles.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/LW_MaterialTransparentParticles.mat index 429f764dff1..1a240712c7a 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/LW_MaterialTransparentParticles.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/LW_MaterialTransparentParticles.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -26,11 +26,12 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 3050 + m_CustomRenderQueue: 3000 stringTagMap: RenderType: Transparent disabledShaderPasses: - SHADOWCASTER + - DepthOnly m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -82,6 +83,7 @@ Material: m_Floats: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 0 - _BlendOp: 0 - _BumpScale: 1 - _CameraFadingEnabled: 0 @@ -96,6 +98,7 @@ Material: - _DistortionStrength: 1 - _DistortionStrengthScaled: 0.1 - _DstBlend: 10 + - _DstBlendAlpha: 10 - _EnvironmentReflections: 1 - _FlipbookBlending: 0 - _FlipbookMode: 0 @@ -115,6 +118,7 @@ Material: - _SoftParticlesNearFadeDistance: 0 - _SpecularHighlights: 1 - _SrcBlend: 5 + - _SrcBlendAlpha: 1 - _Surface: 1 - _UVSec: 0 - _WorkflowMode: 1 @@ -123,7 +127,7 @@ Material: - _BaseColor: {r: 0.5, g: 0.5, b: 0.5, a: 0.5019608} - _BaseColorAddSubDiff: {r: 0, g: 0, b: 0, a: 0} - _CameraFadeParams: {r: 0, g: Infinity, b: 0, a: 0} - - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1} + - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 0.5019608} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SoftParticleFadeParams: {r: 0, g: 0, b: 0, a: 0} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/LW_MaterialTransparentParticlesWithTexture.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/LW_MaterialTransparentParticlesWithTexture.mat index 72b91925568..ab3a0aa265c 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/LW_MaterialTransparentParticlesWithTexture.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/LW_MaterialTransparentParticlesWithTexture.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -26,11 +26,12 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 3050 + m_CustomRenderQueue: 3000 stringTagMap: RenderType: Transparent disabledShaderPasses: - SHADOWCASTER + - DepthOnly m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -82,6 +83,7 @@ Material: m_Floats: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 0 - _BlendOp: 0 - _BumpScale: 1 - _CameraFadingEnabled: 0 @@ -96,6 +98,7 @@ Material: - _DistortionStrength: 1 - _DistortionStrengthScaled: 0.1 - _DstBlend: 10 + - _DstBlendAlpha: 10 - _EnvironmentReflections: 1 - _FlipbookBlending: 0 - _FlipbookMode: 0 @@ -115,6 +118,7 @@ Material: - _SoftParticlesNearFadeDistance: 0 - _SpecularHighlights: 1 - _SrcBlend: 5 + - _SrcBlendAlpha: 1 - _Surface: 1 - _UVSec: 0 - _WorkflowMode: 1 @@ -123,7 +127,7 @@ Material: - _BaseColor: {r: 0.5, g: 0.5, b: 0.5, a: 0.5019608} - _BaseColorAddSubDiff: {r: 0, g: 0, b: 0, a: 0} - _CameraFadeParams: {r: 0, g: Infinity, b: 0, a: 0} - - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1} + - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 0.5019608} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SoftParticleFadeParams: {r: 0, g: 0, b: 0, a: 0} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/LW_MaterialTransparentShaderGraph.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/LW_MaterialTransparentShaderGraph.mat index 7d1bc9c87fc..1fe12ff932f 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/LW_MaterialTransparentShaderGraph.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/LW_MaterialTransparentShaderGraph.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -77,6 +77,19 @@ Material: 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: - _AlphaClip: 0 - _Blend: 0 @@ -92,6 +105,7 @@ Material: - _Metallic: 0 - _OcclusionStrength: 1 - _Parallax: 0.02 + - _QueueControl: 0 - _QueueOffset: 0 - _ReceiveShadows: 1 - _Smoothness: 0.5 @@ -107,3 +121,4 @@ Material: - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} + m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/LW_MaterialTransparentWithTexture.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/LW_MaterialTransparentWithTexture.mat index 67ba0f96567..6cf2b5e0c9a 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/LW_MaterialTransparentWithTexture.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/LW_MaterialTransparentWithTexture.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -26,11 +26,12 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 3050 + m_CustomRenderQueue: 3000 stringTagMap: RenderType: Transparent disabledShaderPasses: - SHADOWCASTER + - DepthOnly m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -98,6 +99,7 @@ Material: m_Floats: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 0 - _BumpScale: 1 - _ClearCoat: 0 - _ClearCoatMask: 0 @@ -107,6 +109,7 @@ Material: - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 10 + - _DstBlendAlpha: 10 - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 0.5 @@ -120,13 +123,14 @@ Material: - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 0 - _SrcBlend: 5 + - _SrcBlendAlpha: 1 - _Surface: 1 - _UVSec: 0 - _WorkflowMode: 1 - _ZWrite: 0 m_Colors: - _BaseColor: {r: 0.5, g: 0.5, b: 0.5, a: 0.5019608} - - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1} + - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 0.5019608} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/LW_MaterialWithTexture.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/LW_MaterialWithTexture.mat index 7ebee4d4007..af98fb394d7 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/LW_MaterialWithTexture.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/LW_MaterialWithTexture.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -81,17 +81,33 @@ Material: 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: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoat: 0 - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 - _Cull: 2 - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 0.5 @@ -105,13 +121,14 @@ Material: - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _WorkflowMode: 1 - _ZWrite: 1 m_Colors: - _BaseColor: {r: 0.5, g: 0.5, b: 0.5, a: 0.5019608} - - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1} + - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 0.5019608} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/PW_WoodLog.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/PW_WoodLog.mat index 7e319939d87..6e748b2425e 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/PW_WoodLog.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/PW_WoodLog.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -89,17 +89,33 @@ Material: 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: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoat: 0 - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 - _Cull: 2 - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 0.5 @@ -118,6 +134,7 @@ Material: - _SpecSource: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _WorkflowMode: 1 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/PyramidsWall-v01.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/PyramidsWall-v01.mat index b4735bb2a41..525655678a2 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/PyramidsWall-v01.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/PyramidsWall-v01.mat @@ -92,6 +92,7 @@ Material: m_Floats: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoat: 0 - _ClearCoatMask: 0 @@ -101,6 +102,7 @@ Material: - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 0.5 @@ -119,6 +121,7 @@ Material: - _SpecSource: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _WorkflowMode: 1 @@ -141,4 +144,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/Roofing.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/Roofing.mat index 56b96e0aa9f..e2991537e73 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/Roofing.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/Roofing.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -89,17 +89,33 @@ Material: 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: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoat: 0 - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 - _Cull: 2 - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 0.5 @@ -118,6 +134,7 @@ Material: - _SpecSource: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _WorkflowMode: 1 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/ShoreRockSand.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/ShoreRockSand.mat index 87497fc33ad..0b8bb88b1a7 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/ShoreRockSand.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/ShoreRockSand.mat @@ -76,17 +76,33 @@ Material: 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: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoat: 0 - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 - _Cull: 2 - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 0.5 @@ -105,6 +121,7 @@ Material: - _SpecSource: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _WorkflowMode: 1 @@ -127,4 +144,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/UnlitColor.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/UnlitColor.mat index 92ac58db5e1..7a441d35596 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/UnlitColor.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/UnlitColor.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -65,10 +65,12 @@ Material: m_Floats: - _AlphaClip: 0 - _Blend: 0 + - _BlendOp: 0 - _BumpScale: 1 - _Cull: 2 - _Cutoff: 0.5 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 0 - _Glossiness: 0 @@ -82,6 +84,7 @@ Material: - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _WorkflowMode: 1 - _ZWrite: 1 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/bark.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/bark.mat index ca820260692..9e9afde2788 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/bark.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/bark.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -89,17 +89,33 @@ Material: 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: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoat: 0 - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 - _Cull: 2 - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 0.5 @@ -118,6 +134,7 @@ Material: - _SpecSource: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _WorkflowMode: 1 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/herringbone_brick_floor.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/herringbone_brick_floor.mat index 21ebd563ccd..cac2d6524a2 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/herringbone_brick_floor.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/herringbone_brick_floor.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -89,17 +89,33 @@ Material: 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: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoat: 0 - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 - _Cull: 2 - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 0.5 @@ -118,6 +134,7 @@ Material: - _SpecSource: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _WorkflowMode: 1 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/metal_aluminium_directional.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/metal_aluminium_directional.mat index 144de54c7c0..9cb25e366cc 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/metal_aluminium_directional.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/metal_aluminium_directional.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -89,17 +89,33 @@ Material: 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: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoat: 0 - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 - _Cull: 2 - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 0.5 @@ -118,6 +134,7 @@ Material: - _SpecSource: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _WorkflowMode: 1 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/metal_brushed_copper.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/metal_brushed_copper.mat index d318fed0c40..a4e3f13abc1 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/metal_brushed_copper.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/metal_brushed_copper.mat @@ -76,17 +76,33 @@ Material: 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: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoat: 0 - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 - _Cull: 2 - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 0.5 @@ -105,6 +121,7 @@ Material: - _SpecSource: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _WorkflowMode: 1 @@ -127,4 +144,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/red_paint.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/red_paint.mat index 169c1f55b9e..5fe5d5f0791 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/red_paint.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/red_paint.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -89,17 +89,33 @@ Material: 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: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoat: 0 - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 - _Cull: 2 - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 0.5 @@ -118,6 +134,7 @@ Material: - _SpecSource: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _WorkflowMode: 1 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/rocks_dirt_ground.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/rocks_dirt_ground.mat index 4271cd901d9..19dfd1b9a4f 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/rocks_dirt_ground.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Materials/rocks_dirt_ground.mat @@ -76,17 +76,33 @@ Material: 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: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoat: 0 - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 - _Cull: 2 - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 0.5 @@ -105,6 +121,7 @@ Material: - _SpecSource: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _WorkflowMode: 1 @@ -127,4 +144,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Meshes/Adam/Materials/Crowd_LOD0_Mat_Limbs_metallic.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Meshes/Adam/Materials/Crowd_LOD0_Mat_Limbs_metallic.mat index af6734fd309..085f8d62037 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Meshes/Adam/Materials/Crowd_LOD0_Mat_Limbs_metallic.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Meshes/Adam/Materials/Crowd_LOD0_Mat_Limbs_metallic.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -85,17 +85,33 @@ Material: m_Texture: {fileID: 2800000, guid: c8851749012eba443a8ec7cd675bab92, type: 3} 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: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoat: 0 - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 - _Cull: 2 - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 0.5 @@ -110,6 +126,7 @@ Material: - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _WorkflowMode: 1 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Meshes/Adam/Materials/Crowd_LOD0_Mat_Limbs_spec.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Meshes/Adam/Materials/Crowd_LOD0_Mat_Limbs_spec.mat index ccc928d9cfc..c089759ec51 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Meshes/Adam/Materials/Crowd_LOD0_Mat_Limbs_spec.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Meshes/Adam/Materials/Crowd_LOD0_Mat_Limbs_spec.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -85,17 +85,33 @@ Material: m_Texture: {fileID: 2800000, guid: c8851749012eba443a8ec7cd675bab92, type: 3} 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: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoat: 0 - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 - _Cull: 2 - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 0.5 @@ -110,6 +126,7 @@ Material: - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _WorkflowMode: 0 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Meshes/Adam/Materials/Crowd_LOD0_Mat_Torso_metallic.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Meshes/Adam/Materials/Crowd_LOD0_Mat_Torso_metallic.mat index aa8d2dcbb2a..956e5c25658 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Meshes/Adam/Materials/Crowd_LOD0_Mat_Torso_metallic.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Meshes/Adam/Materials/Crowd_LOD0_Mat_Torso_metallic.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -85,17 +85,33 @@ Material: m_Texture: {fileID: 2800000, guid: 64a09234503ae404cb310166777fbd45, type: 3} 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: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoat: 0 - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 - _Cull: 2 - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 0.5 @@ -110,6 +126,7 @@ Material: - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _WorkflowMode: 1 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Meshes/Adam/Materials/Crowd_LOD0_Mat_Torso_spec.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Meshes/Adam/Materials/Crowd_LOD0_Mat_Torso_spec.mat index e7c6dc130eb..76e8f827d35 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Meshes/Adam/Materials/Crowd_LOD0_Mat_Torso_spec.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Meshes/Adam/Materials/Crowd_LOD0_Mat_Torso_spec.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -85,17 +85,33 @@ Material: m_Texture: {fileID: 2800000, guid: 64a09234503ae404cb310166777fbd45, type: 3} 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: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoat: 0 - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 - _Cull: 2 - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 0.5 @@ -110,6 +126,7 @@ Material: - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _WorkflowMode: 0 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Meshes/PBRSpheres/PBRtest_Spec.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Meshes/PBRSpheres/PBRtest_Spec.mat index d2972e4fea3..179770163b4 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Meshes/PBRSpheres/PBRtest_Spec.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Meshes/PBRSpheres/PBRtest_Spec.mat @@ -72,17 +72,33 @@ Material: m_Texture: {fileID: 2800000, guid: 8de821bfcfb574452896ed13a1405a5c, type: 3} 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: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoat: 0 - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 - _Cull: 2 - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 0.5 @@ -97,6 +113,7 @@ Material: - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _WorkflowMode: 0 @@ -119,4 +136,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Meshes/PBRSpheres/PBRtest_met.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Meshes/PBRSpheres/PBRtest_met.mat index 79cb63a8fef..4be3b9166c6 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Meshes/PBRSpheres/PBRtest_met.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/CommonAssets/Meshes/PBRSpheres/PBRtest_met.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -85,17 +85,33 @@ Material: 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: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoat: 0 - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 - _Cull: 2 - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 0.5 @@ -110,6 +126,7 @@ Material: - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _WorkflowMode: 1 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/001_SimpleCube/001_SimpleCube.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/001_SimpleCube/001_SimpleCube.mat index 7338ea3697a..68b16777498 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/001_SimpleCube/001_SimpleCube.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/001_SimpleCube/001_SimpleCube.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -81,15 +81,29 @@ Material: 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: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _Cull: 2 - _Cutoff: 0.5 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _GlossMapScale: 0.186 - _Glossiness: 1 - _GlossinessSource: 0 @@ -109,6 +123,7 @@ Material: - _SpecularHighlights: 0 - _SpecularStrength: 200 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _ZWrite: 1 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/002_Camera_Clip/002_CameraClip_Sphere.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/002_Camera_Clip/002_CameraClip_Sphere.mat index adbe42898da..a223664594d 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/002_Camera_Clip/002_CameraClip_Sphere.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/002_Camera_Clip/002_CameraClip_Sphere.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -81,15 +81,29 @@ Material: 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: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _Cull: 2 - _Cutoff: 0.5 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _GlossMapScale: 1 - _Glossiness: 0.5 - _GlossinessSource: 0 @@ -108,6 +122,7 @@ Material: - _SpecSource: 0 - _SpecularHighlights: 0 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _ZWrite: 1 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/003_Camera_Ortho/003_CameraOrtho_Sphere.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/003_Camera_Ortho/003_CameraOrtho_Sphere.mat index fa27b17c6d8..81a81df0fc6 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/003_Camera_Ortho/003_CameraOrtho_Sphere.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/003_Camera_Ortho/003_CameraOrtho_Sphere.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -81,15 +81,29 @@ Material: 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: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _Cull: 2 - _Cutoff: 0.5 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _GlossMapScale: 1 - _Glossiness: 0.5 - _GlossinessSource: 0 @@ -108,6 +122,7 @@ Material: - _SpecSource: 0 - _SpecularHighlights: 0 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _ZWrite: 1 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/004_Camera_TargetTexture/004_CameraTargetTextureSphere.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/004_Camera_TargetTexture/004_CameraTargetTextureSphere.mat index bdbe4cab89f..1bf1ff0f845 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/004_Camera_TargetTexture/004_CameraTargetTextureSphere.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/004_Camera_TargetTexture/004_CameraTargetTextureSphere.mat @@ -81,15 +81,29 @@ Material: 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: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _Cull: 2 - _Cutoff: 0.199 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _GlossMapScale: 1 - _Glossiness: 0.5 - _GlossinessSource: 1 @@ -108,6 +122,7 @@ Material: - _SpecSource: 0 - _SpecularHighlights: 0 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _ZWrite: 1 @@ -130,4 +145,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/004_Camera_TargetTexture/004_Camera_TargetTexture_Sphere.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/004_Camera_TargetTexture/004_Camera_TargetTexture_Sphere.mat index 8d0d3d08116..d0a42045f60 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/004_Camera_TargetTexture/004_Camera_TargetTexture_Sphere.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/004_Camera_TargetTexture/004_Camera_TargetTexture_Sphere.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -81,15 +81,29 @@ Material: 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: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _Cull: 2 - _Cutoff: 0.5 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _GlossMapScale: 1 - _Glossiness: 0.5 - _GlossinessSource: 0 @@ -108,12 +122,13 @@ Material: - _SpecSource: 0 - _SpecularHighlights: 0 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _ZWrite: 1 m_Colors: - _BaseColor: {r: 1, g: 1, b: 1, a: 0.5} - - _Color: {r: 1, g: 1, b: 1, a: 1} + - _Color: {r: 1, g: 1, b: 1, a: 0.5} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _ReflectColor: {r: 1, g: 1, b: 1, a: 1} - _SpecColor: {r: 1, g: 1, b: 1, a: 0.5} diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/004_Camera_TargetTexture/Cam_TargetTex.renderTexture b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/004_Camera_TargetTexture/Cam_TargetTex.renderTexture index e517328aaad..f3fdb1e34d3 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/004_Camera_TargetTexture/Cam_TargetTex.renderTexture +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/004_Camera_TargetTexture/Cam_TargetTex.renderTexture @@ -3,20 +3,29 @@ --- !u!84 &8400000 RenderTexture: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_Name: Cam_TargetTex m_ImageContentsHash: serializedVersion: 2 Hash: 00000000000000000000000000000000 + m_ForcedFallbackFormat: 4 + m_DownscaleFallback: 0 + m_IsAlphaChannelOptional: 0 + serializedVersion: 5 m_Width: 512 m_Height: 256 m_AntiAliasing: 1 - m_DepthFormat: 2 - m_ColorFormat: 0 + m_MipCount: -1 + m_DepthStencilFormat: 92 + m_ColorFormat: 8 m_MipMap: 0 m_GenerateMips: 1 m_SRGB: 0 + m_UseDynamicScale: 0 + m_BindMS: 0 + m_EnableCompatibleFormat: 1 m_TextureSettings: serializedVersion: 2 m_FilterMode: 1 @@ -27,3 +36,4 @@ RenderTexture: m_WrapW: 1 m_Dimension: 2 m_VolumeDepth: 1 + m_ShadowSamplingMode: 2 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/007_LitShaderMaps/007_LitShaderMaps_01_BaseWhite.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/007_LitShaderMaps/007_LitShaderMaps_01_BaseWhite.mat index 8d07f5136d3..c20dccfb950 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/007_LitShaderMaps/007_LitShaderMaps_01_BaseWhite.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/007_LitShaderMaps/007_LitShaderMaps_01_BaseWhite.mat @@ -56,15 +56,29 @@ Material: 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: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _Cull: 2 - _Cutoff: 0.5 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _GlossMapScale: 1 - _Glossiness: 0.5 - _GlossinessSource: 0 @@ -79,6 +93,7 @@ Material: - _SpecSource: 0 - _SpecularHighlights: 0 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _ZWrite: 1 @@ -100,4 +115,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/007_LitShaderMaps/007_LitShaderMaps_02_BaseColor.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/007_LitShaderMaps/007_LitShaderMaps_02_BaseColor.mat index b7e5d08ff74..e667c58d70f 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/007_LitShaderMaps/007_LitShaderMaps_02_BaseColor.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/007_LitShaderMaps/007_LitShaderMaps_02_BaseColor.mat @@ -12,7 +12,7 @@ Material: m_ShaderKeywords: _ALPHATEST_ON _SPECULAR_COLOR m_LightmapFlags: 4 m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 + m_DoubleSidedGI: 1 m_CustomRenderQueue: 2450 stringTagMap: RenderType: TransparentCutout @@ -68,15 +68,29 @@ Material: 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: - _AlphaClip: 1 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _Cull: 0 - _Cutoff: 0.5 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _GlossMapScale: 1 - _Glossiness: 0.5 - _GlossinessSource: 1 @@ -95,6 +109,7 @@ Material: - _SpecSource: 0 - _SpecularHighlights: 0 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _ZWrite: 1 @@ -117,4 +132,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/007_LitShaderMaps/007_LitShaderMaps_03_Specular.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/007_LitShaderMaps/007_LitShaderMaps_03_Specular.mat index 15d891e2937..45b3ce25f5e 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/007_LitShaderMaps/007_LitShaderMaps_03_Specular.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/007_LitShaderMaps/007_LitShaderMaps_03_Specular.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -81,15 +81,29 @@ Material: m_Texture: {fileID: 2800000, guid: 1a88ce5df35bb4c98aa9da12443ff932, type: 3} 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: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _Cull: 2 - _Cutoff: 0.5 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _GlossMapScale: 1 - _Glossiness: 0.5 - _GlossinessSource: 1 @@ -108,6 +122,7 @@ Material: - _SpecSource: 0 - _SpecularHighlights: 0 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _ZWrite: 1 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/007_LitShaderMaps/007_LitShaderMaps_04_Normal.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/007_LitShaderMaps/007_LitShaderMaps_04_Normal.mat index 6654537bba0..8bc3fc3cc18 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/007_LitShaderMaps/007_LitShaderMaps_04_Normal.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/007_LitShaderMaps/007_LitShaderMaps_04_Normal.mat @@ -68,15 +68,29 @@ Material: 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: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _Cull: 2 - _Cutoff: 0.5 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _GlossMapScale: 1 - _Glossiness: 0.5 - _GlossinessSource: 0 @@ -95,6 +109,7 @@ Material: - _SpecSource: 0 - _SpecularHighlights: 0 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _ZWrite: 1 @@ -117,4 +132,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/007_LitShaderMaps/007_LitShaderMaps_05_Emission.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/007_LitShaderMaps/007_LitShaderMaps_05_Emission.mat index 8017cb211b4..079e8d7f6ba 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/007_LitShaderMaps/007_LitShaderMaps_05_Emission.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/007_LitShaderMaps/007_LitShaderMaps_05_Emission.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -81,15 +81,29 @@ Material: 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: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _Cull: 2 - _Cutoff: 0.5 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _GlossMapScale: 1 - _Glossiness: 0.5 - _GlossinessSource: 0 @@ -108,6 +122,7 @@ Material: - _SpecSource: 1 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _ZWrite: 1 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/007_LitShaderMaps/007_LitShaderMaps_06_All.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/007_LitShaderMaps/007_LitShaderMaps_06_All.mat index d5cd23fa0e5..b5a8bf68fdd 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/007_LitShaderMaps/007_LitShaderMaps_06_All.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/007_LitShaderMaps/007_LitShaderMaps_06_All.mat @@ -68,15 +68,29 @@ Material: m_Texture: {fileID: 2800000, guid: 226a58968de1b4cf4a59aa1f39c891c4, type: 3} 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: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _Cull: 2 - _Cutoff: 0.5 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _GlossMapScale: 1 - _Glossiness: 0.5 - _GlossinessSource: 1 @@ -95,6 +109,7 @@ Material: - _SpecSource: 0 - _SpecularHighlights: 0 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _ZWrite: 1 @@ -117,4 +132,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/007_LitShaderMaps/007_LitShaderMaps_UnlitMatTexture_08.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/007_LitShaderMaps/007_LitShaderMaps_UnlitMatTexture_08.mat index 3877d96ce04..ff28352ba78 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/007_LitShaderMaps/007_LitShaderMaps_UnlitMatTexture_08.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/007_LitShaderMaps/007_LitShaderMaps_UnlitMatTexture_08.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -81,15 +81,29 @@ Material: m_Texture: {fileID: 2800000, guid: 226a58968de1b4cf4a59aa1f39c891c4, type: 3} 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: - _AlphaClip: 0 - _Blend: 0 + - _BlendOp: 0 - _BumpScale: 1 - _Cull: 2 - _Cutoff: 0.5 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _GlossMapScale: 1 - _Glossiness: 0.5 - _GlossinessSource: 0 @@ -106,6 +120,7 @@ Material: - _SpecSource: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _ZWrite: 1 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/007_LitShaderMaps/007_LitShaderMaps_UnlitMat_07.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/007_LitShaderMaps/007_LitShaderMaps_UnlitMat_07.mat index bb0600b87ed..7d7dc4b2ae7 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/007_LitShaderMaps/007_LitShaderMaps_UnlitMat_07.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/007_LitShaderMaps/007_LitShaderMaps_UnlitMat_07.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -85,11 +85,13 @@ Material: m_Floats: - _AlphaClip: 0 - _Blend: 0 + - _BlendOp: 0 - _BumpScale: 1 - _Cull: 2 - _Cutoff: 0.5 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _GlossMapScale: 1 - _Glossiness: 0.5 - _GlossinessSource: 0 @@ -106,12 +108,13 @@ Material: - _SpecSource: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _ZWrite: 1 m_Colors: - _BaseColor: {r: 0, g: 0.5897915, b: 1, a: 1} - - _Color: {r: 0, g: 0.58979154, b: 1, a: 1} + - _Color: {r: 0, g: 0.5897915, b: 1, a: 1} - _EmissionColor: {r: 0.20663926, g: 0.24034719, b: 0.28676468, a: 1} - _MainColor: {r: 1, g: 0, b: 0, a: 1} - _ReflectColor: {r: 1, g: 1, b: 1, a: 1} diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere.mat index 6a8407c7252..5e9e0f072cd 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere.mat @@ -76,17 +76,33 @@ Material: 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: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoat: 0 - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 - _Cull: 2 - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 0 @@ -105,6 +121,7 @@ Material: - _SpecSource: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _WorkFlowMode: 0 @@ -129,4 +146,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere1.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere1.mat index 10869c85c20..1dd11094d5b 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere1.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere1.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -105,6 +105,7 @@ Material: m_Floats: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoat: 0 - _ClearCoatMask: 0 @@ -114,6 +115,7 @@ Material: - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 0.1 @@ -132,6 +134,7 @@ Material: - _SpecSource: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _WorkFlowMode: 0 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere10.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere10.mat index e2d74e2ddbb..eeffd505340 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere10.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere10.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -105,6 +105,7 @@ Material: m_Floats: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoat: 0 - _ClearCoatMask: 0 @@ -114,6 +115,7 @@ Material: - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 1 @@ -132,6 +134,7 @@ Material: - _SpecSource: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _WorkFlowMode: 0 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere11.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere11.mat index 636d8035892..7a43c3f8ba9 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere11.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere11.mat @@ -92,6 +92,7 @@ Material: m_Floats: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoat: 0 - _ClearCoatMask: 0 @@ -101,6 +102,7 @@ Material: - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 0 @@ -119,6 +121,7 @@ Material: - _SpecSource: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _WorkFlowMode: 0 @@ -143,4 +146,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere12.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere12.mat index d8517bd9fac..31b776acc6f 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere12.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere12.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -105,6 +105,7 @@ Material: m_Floats: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoat: 0 - _ClearCoatMask: 0 @@ -114,6 +115,7 @@ Material: - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 0.1 @@ -132,6 +134,7 @@ Material: - _SpecSource: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _WorkFlowMode: 0 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere13.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere13.mat index 76f493dd0ae..b5dfd89d3da 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere13.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere13.mat @@ -92,6 +92,7 @@ Material: m_Floats: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoat: 0 - _ClearCoatMask: 0 @@ -101,6 +102,7 @@ Material: - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 0.2 @@ -119,6 +121,7 @@ Material: - _SpecSource: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _WorkFlowMode: 0 @@ -143,4 +146,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere14.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere14.mat index fce0c676e83..ee7463553ee 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere14.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere14.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -105,6 +105,7 @@ Material: m_Floats: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoat: 0 - _ClearCoatMask: 0 @@ -114,6 +115,7 @@ Material: - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 0.3 @@ -132,6 +134,7 @@ Material: - _SpecSource: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _WorkFlowMode: 0 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere15.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere15.mat index 595c6c3c1b3..4bc4dc71ba0 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere15.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere15.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -105,6 +105,7 @@ Material: m_Floats: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoat: 0 - _ClearCoatMask: 0 @@ -114,6 +115,7 @@ Material: - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 0.4 @@ -132,6 +134,7 @@ Material: - _SpecSource: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _WorkFlowMode: 0 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere16.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere16.mat index 14655ca529c..98a2866541f 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere16.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere16.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -105,6 +105,7 @@ Material: m_Floats: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoat: 0 - _ClearCoatMask: 0 @@ -114,6 +115,7 @@ Material: - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 0.5 @@ -132,6 +134,7 @@ Material: - _SpecSource: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _WorkFlowMode: 0 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere17.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere17.mat index 9977b33c556..75b277ee589 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere17.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere17.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -105,6 +105,7 @@ Material: m_Floats: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoat: 0 - _ClearCoatMask: 0 @@ -114,6 +115,7 @@ Material: - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 0.6 @@ -132,6 +134,7 @@ Material: - _SpecSource: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _WorkFlowMode: 0 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere18.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere18.mat index 404374a0b01..9e8412ecaef 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere18.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere18.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -105,6 +105,7 @@ Material: m_Floats: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoat: 0 - _ClearCoatMask: 0 @@ -114,6 +115,7 @@ Material: - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 0.7 @@ -132,6 +134,7 @@ Material: - _SpecSource: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _WorkFlowMode: 0 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere19.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere19.mat index d794b7ec8b6..e59c9a28342 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere19.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere19.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -105,6 +105,7 @@ Material: m_Floats: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoat: 0 - _ClearCoatMask: 0 @@ -114,6 +115,7 @@ Material: - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 0.8 @@ -132,6 +134,7 @@ Material: - _SpecSource: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _WorkFlowMode: 0 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere2.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere2.mat index 25f5e38ce77..acbd63ab3c5 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere2.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere2.mat @@ -92,6 +92,7 @@ Material: m_Floats: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoat: 0 - _ClearCoatMask: 0 @@ -101,6 +102,7 @@ Material: - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 0.2 @@ -119,6 +121,7 @@ Material: - _SpecSource: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _WorkFlowMode: 0 @@ -143,4 +146,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere20.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere20.mat index 91169e234a7..4d6b8960e71 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere20.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere20.mat @@ -92,6 +92,7 @@ Material: m_Floats: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoat: 0 - _ClearCoatMask: 0 @@ -101,6 +102,7 @@ Material: - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 0.9 @@ -119,6 +121,7 @@ Material: - _SpecSource: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _WorkFlowMode: 0 @@ -143,4 +146,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere21.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere21.mat index 6aca1ea9536..62115e3db8a 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere21.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere21.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -105,6 +105,7 @@ Material: m_Floats: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoat: 0 - _ClearCoatMask: 0 @@ -114,6 +115,7 @@ Material: - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 1 @@ -132,6 +134,7 @@ Material: - _SpecSource: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _WorkFlowMode: 0 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere3.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere3.mat index 866d1c1235d..8ede0d7e136 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere3.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere3.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -105,6 +105,7 @@ Material: m_Floats: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoat: 0 - _ClearCoatMask: 0 @@ -114,6 +115,7 @@ Material: - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 0.3 @@ -132,6 +134,7 @@ Material: - _SpecSource: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _WorkFlowMode: 0 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere4.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere4.mat index 97d7de4ba2c..70399636151 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere4.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere4.mat @@ -92,6 +92,7 @@ Material: m_Floats: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoat: 0 - _ClearCoatMask: 0 @@ -101,6 +102,7 @@ Material: - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 0.4 @@ -119,6 +121,7 @@ Material: - _SpecSource: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _WorkFlowMode: 0 @@ -143,4 +146,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere5.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere5.mat index 85fbbd31288..5d124bb878a 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere5.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere5.mat @@ -92,6 +92,7 @@ Material: m_Floats: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoat: 0 - _ClearCoatMask: 0 @@ -101,6 +102,7 @@ Material: - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 0.5 @@ -119,6 +121,7 @@ Material: - _SpecSource: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _WorkFlowMode: 0 @@ -143,4 +146,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere6.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere6.mat index 610b9bb7d75..3356b2c0f5b 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere6.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere6.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -105,6 +105,7 @@ Material: m_Floats: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoat: 0 - _ClearCoatMask: 0 @@ -114,6 +115,7 @@ Material: - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 0.6 @@ -132,6 +134,7 @@ Material: - _SpecSource: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _WorkFlowMode: 0 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere7.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere7.mat index 8a5c965b89e..c3abcf0a3a8 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere7.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere7.mat @@ -92,6 +92,7 @@ Material: m_Floats: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoat: 0 - _ClearCoatMask: 0 @@ -101,6 +102,7 @@ Material: - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 0.7 @@ -119,6 +121,7 @@ Material: - _SpecSource: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _WorkFlowMode: 0 @@ -143,4 +146,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere8.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere8.mat index 8b54a80e164..c1a6888dfcd 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere8.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere8.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -105,6 +105,7 @@ Material: m_Floats: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoat: 0 - _ClearCoatMask: 0 @@ -114,6 +115,7 @@ Material: - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 0.8 @@ -132,6 +134,7 @@ Material: - _SpecSource: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _WorkFlowMode: 0 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere9.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere9.mat index 7f62696daf5..77f4e5b5c63 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere9.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/012_PBS_EnvironmentBRDF_Spheres/PBRSphere9.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -105,6 +105,7 @@ Material: m_Floats: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoat: 0 - _ClearCoatMask: 0 @@ -114,6 +115,7 @@ Material: - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 0.9 @@ -132,6 +134,7 @@ Material: - _SpecSource: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _WorkFlowMode: 0 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/013_CameraMulti_Splitscreen/Materials/blue.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/013_CameraMulti_Splitscreen/Materials/blue.mat index 194a5da7115..1a34e793b0c 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/013_CameraMulti_Splitscreen/Materials/blue.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/013_CameraMulti_Splitscreen/Materials/blue.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -73,15 +73,29 @@ Material: 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: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _Cull: 2 - _Cutoff: 0.5 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _GlossMapScale: 1 - _Glossiness: 0.5 - _GlossinessSource: 0 @@ -98,12 +112,13 @@ Material: - _SpecSource: 0 - _SpecularHighlights: 0 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _ZWrite: 1 m_Colors: - _BaseColor: {r: 0, g: 0.089654885, b: 1, a: 1} - - _Color: {r: 0, g: 0.08965492, b: 1, a: 1} + - _Color: {r: 0, g: 0.089654855, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/013_CameraMulti_Splitscreen/Materials/green.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/013_CameraMulti_Splitscreen/Materials/green.mat index aeb2cb0fb45..4b96e8e5184 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/013_CameraMulti_Splitscreen/Materials/green.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/013_CameraMulti_Splitscreen/Materials/green.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -73,15 +73,29 @@ Material: 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: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _Cull: 2 - _Cutoff: 0.5 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _GlossMapScale: 1 - _Glossiness: 0.5 - _GlossinessSource: 0 @@ -98,12 +112,13 @@ Material: - _SpecSource: 0 - _SpecularHighlights: 0 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _ZWrite: 1 m_Colors: - _BaseColor: {r: 0, g: 1, b: 0.17241374, a: 1} - - _Color: {r: 0, g: 1, b: 0.17241383, a: 1} + - _Color: {r: 0, g: 1, b: 0.1724137, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/013_CameraMulti_Splitscreen/Materials/red.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/013_CameraMulti_Splitscreen/Materials/red.mat index f2754c1342d..2bbbf78f098 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/013_CameraMulti_Splitscreen/Materials/red.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/013_CameraMulti_Splitscreen/Materials/red.mat @@ -60,15 +60,29 @@ Material: 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: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _Cull: 2 - _Cutoff: 0.5 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _GlossMapScale: 1 - _Glossiness: 0.5 - _GlossinessSource: 0 @@ -85,6 +99,7 @@ Material: - _SpecSource: 0 - _SpecularHighlights: 0 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _ZWrite: 1 @@ -106,4 +121,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/013_CameraMulti_Splitscreen/Materials/yellow.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/013_CameraMulti_Splitscreen/Materials/yellow.mat index d1e1b3ebeb6..08c26c02098 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/013_CameraMulti_Splitscreen/Materials/yellow.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/013_CameraMulti_Splitscreen/Materials/yellow.mat @@ -60,15 +60,29 @@ Material: 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: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _Cull: 2 - _Cutoff: 0.5 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _GlossMapScale: 1 - _Glossiness: 0.5 - _GlossinessSource: 0 @@ -85,12 +99,13 @@ Material: - _SpecSource: 0 - _SpecularHighlights: 0 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _ZWrite: 1 m_Colors: - _BaseColor: {r: 1, g: 0.9724137, b: 0, a: 1} - - _Color: {r: 1, g: 0.9724138, b: 0, a: 1} + - _Color: {r: 1, g: 0.9724137, b: 0, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} m_BuildTextureStacks: [] @@ -106,4 +121,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/014_CameraMulti_MiniMap/red.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/014_CameraMulti_MiniMap/red.mat index e3d1203d391..e0dca117fed 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/014_CameraMulti_MiniMap/red.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/014_CameraMulti_MiniMap/red.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -73,15 +73,29 @@ Material: 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: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _Cull: 2 - _Cutoff: 0.5 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _GlossMapScale: 1 - _Glossiness: 0.5 - _GlossinessSource: 0 @@ -98,12 +112,13 @@ Material: - _SpecSource: 0 - _SpecularHighlights: 0 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _ZWrite: 1 m_Colors: - _BaseColor: {r: 1, g: 0, b: 0, a: 0.5} - - _Color: {r: 1, g: 0, b: 0, a: 1} + - _Color: {r: 1, g: 0, b: 0, a: 0.5} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/015_CameraMulti_FPSCam/blue.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/015_CameraMulti_FPSCam/blue.mat index 1842a459b41..dbb47a1acfe 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/015_CameraMulti_FPSCam/blue.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/015_CameraMulti_FPSCam/blue.mat @@ -60,15 +60,29 @@ Material: 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: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _Cull: 2 - _Cutoff: 0.5 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _GlossMapScale: 1 - _Glossiness: 0.5 - _GlossinessSource: 0 @@ -85,12 +99,13 @@ Material: - _SpecSource: 0 - _SpecularHighlights: 0 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _ZWrite: 1 m_Colors: - _BaseColor: {r: 0, g: 0.13103479, b: 1, a: 1} - - _Color: {r: 0, g: 0.13103485, b: 1, a: 1} + - _Color: {r: 0, g: 0.13103476, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} m_BuildTextureStacks: [] @@ -106,4 +121,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/015_CameraMulti_FPSCam/red.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/015_CameraMulti_FPSCam/red.mat index 5ec6c0d43a7..b41956a39df 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/015_CameraMulti_FPSCam/red.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/015_CameraMulti_FPSCam/red.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -73,15 +73,29 @@ Material: 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: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _Cull: 2 - _Cutoff: 0.5 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _GlossMapScale: 1 - _Glossiness: 0.5 - _GlossinessSource: 0 @@ -98,6 +112,7 @@ Material: - _SpecSource: 0 - _SpecularHighlights: 0 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _ZWrite: 1 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/020_Lighting_BasicDirectional/PhysicallyBased_NoReceiveShadows.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/020_Lighting_BasicDirectional/PhysicallyBased_NoReceiveShadows.mat index bbc0d2ae90b..ddb13edc714 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/020_Lighting_BasicDirectional/PhysicallyBased_NoReceiveShadows.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/020_Lighting_BasicDirectional/PhysicallyBased_NoReceiveShadows.mat @@ -68,17 +68,33 @@ Material: 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: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoat: 0 - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 - _Cull: 2 - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 0.5 @@ -92,6 +108,7 @@ Material: - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _WorkflowMode: 1 @@ -114,4 +131,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/020_Lighting_BasicDirectional/SimpleLighting_NoReceiveShadows.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/020_Lighting_BasicDirectional/SimpleLighting_NoReceiveShadows.mat index 99d0f9952e6..a5802cf2c48 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/020_Lighting_BasicDirectional/SimpleLighting_NoReceiveShadows.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/020_Lighting_BasicDirectional/SimpleLighting_NoReceiveShadows.mat @@ -68,17 +68,33 @@ Material: 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: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoat: 0 - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 - _Cull: 2 - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 0.5 @@ -92,6 +108,7 @@ Material: - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _WorkflowMode: 1 @@ -114,4 +131,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/026_Shader_PBRscene/BenchDrill/materials/kabel.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/026_Shader_PBRscene/BenchDrill/materials/kabel.mat index df203555925..2478a965e66 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/026_Shader_PBRscene/BenchDrill/materials/kabel.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/026_Shader_PBRscene/BenchDrill/materials/kabel.mat @@ -76,17 +76,33 @@ Material: 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: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoat: 0 - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 - _Cull: 2 - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 0 @@ -105,6 +121,7 @@ Material: - _SpecSource: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _WorkflowMode: 1 @@ -127,4 +144,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/026_Shader_PBRscene/BenchDrill/materials/korpus.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/026_Shader_PBRscene/BenchDrill/materials/korpus.mat index de9bf30728b..ef90378d2b6 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/026_Shader_PBRscene/BenchDrill/materials/korpus.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/026_Shader_PBRscene/BenchDrill/materials/korpus.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -89,17 +89,33 @@ Material: 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: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoat: 0 - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 - _Cull: 2 - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 0 @@ -118,6 +134,7 @@ Material: - _SpecSource: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _WorkflowMode: 1 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/026_Shader_PBRscene/BenchDrill/materials/kozhuh.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/026_Shader_PBRscene/BenchDrill/materials/kozhuh.mat index 1096a7d0da0..232b6c61892 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/026_Shader_PBRscene/BenchDrill/materials/kozhuh.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/026_Shader_PBRscene/BenchDrill/materials/kozhuh.mat @@ -76,17 +76,33 @@ Material: 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: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoat: 0 - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 - _Cull: 2 - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 0 @@ -105,6 +121,7 @@ Material: - _SpecSource: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _WorkflowMode: 1 @@ -127,4 +144,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/026_Shader_PBRscene/BenchDrill/materials/motor.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/026_Shader_PBRscene/BenchDrill/materials/motor.mat index d0c1e489f02..8d960549da7 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/026_Shader_PBRscene/BenchDrill/materials/motor.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/026_Shader_PBRscene/BenchDrill/materials/motor.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -89,17 +89,33 @@ Material: 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: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoat: 0 - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 - _Cull: 2 - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 0 @@ -118,6 +134,7 @@ Material: - _SpecSource: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _WorkflowMode: 1 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/026_Shader_PBRscene/BenchDrill/materials/spindle.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/026_Shader_PBRscene/BenchDrill/materials/spindle.mat index 9240ec7263e..a3c0c732d29 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/026_Shader_PBRscene/BenchDrill/materials/spindle.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/026_Shader_PBRscene/BenchDrill/materials/spindle.mat @@ -76,17 +76,33 @@ Material: 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: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoat: 0 - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 - _Cull: 2 - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 0 @@ -105,6 +121,7 @@ Material: - _SpecSource: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _WorkflowMode: 1 @@ -127,4 +144,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/026_Shader_PBRscene/BenchDrill/materials/stanina.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/026_Shader_PBRscene/BenchDrill/materials/stanina.mat index c87ed16e5e6..244ae0f447b 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/026_Shader_PBRscene/BenchDrill/materials/stanina.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/026_Shader_PBRscene/BenchDrill/materials/stanina.mat @@ -76,17 +76,33 @@ Material: 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: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoat: 0 - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 - _Cull: 2 - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 0 @@ -105,6 +121,7 @@ Material: - _SpecSource: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _WorkflowMode: 1 @@ -127,4 +144,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/026_Shader_PBRscene/BenchDrill/materials/stanina_vk.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/026_Shader_PBRscene/BenchDrill/materials/stanina_vk.mat index 16ecdd4146a..03441227ea2 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/026_Shader_PBRscene/BenchDrill/materials/stanina_vk.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/026_Shader_PBRscene/BenchDrill/materials/stanina_vk.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -89,17 +89,33 @@ Material: 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: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoat: 0 - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 - _Cull: 2 - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 0 @@ -118,6 +134,7 @@ Material: - _SpecSource: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _WorkflowMode: 1 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/026_Shader_PBRscene/BenchDrill/materials/top.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/026_Shader_PBRscene/BenchDrill/materials/top.mat index 55bee70824d..d8b5f2b4673 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/026_Shader_PBRscene/BenchDrill/materials/top.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/026_Shader_PBRscene/BenchDrill/materials/top.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -89,17 +89,33 @@ Material: 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: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoat: 0 - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 - _Cull: 2 - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 0 @@ -118,6 +134,7 @@ Material: - _SpecSource: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _WorkflowMode: 1 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/026_Shader_PBRscene/BenchDrill/materials/val.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/026_Shader_PBRscene/BenchDrill/materials/val.mat index b64f22e3e1f..5e3a5519a62 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/026_Shader_PBRscene/BenchDrill/materials/val.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/026_Shader_PBRscene/BenchDrill/materials/val.mat @@ -76,17 +76,33 @@ Material: 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: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoat: 0 - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 - _Cull: 2 - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 0 @@ -105,6 +121,7 @@ Material: - _SpecSource: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _WorkflowMode: 1 @@ -127,4 +144,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/031_Shader_GlossyEnvironmentSky/Materials/031_IndustrialGlass.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/031_Shader_GlossyEnvironmentSky/Materials/031_IndustrialGlass.mat index ed784d0df62..df150b7146a 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/031_Shader_GlossyEnvironmentSky/Materials/031_IndustrialGlass.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/031_Shader_GlossyEnvironmentSky/Materials/031_IndustrialGlass.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -27,11 +27,12 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 3050 + m_CustomRenderQueue: 3000 stringTagMap: RenderType: Transparent disabledShaderPasses: - SHADOWCASTER + - DepthOnly m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -107,6 +108,7 @@ Material: m_Floats: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 0 - _BumpScale: 1 - _ClearCoat: 0 - _ClearCoatMask: 0 @@ -116,6 +118,7 @@ Material: - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 10 + - _DstBlendAlpha: 10 - _EnvironmentReflections: 0 - _GlossMapScale: 1 - _Glossiness: 0.5 @@ -134,6 +137,7 @@ Material: - _SpecSource: 0 - _SpecularHighlights: 1 - _SrcBlend: 5 + - _SrcBlendAlpha: 1 - _Surface: 1 - _UVSec: 0 - _WorkflowMode: 1 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/037_Particles/Materials/1.Lit-Cutout.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/037_Particles/Materials/1.Lit-Cutout.mat index bfa2e76b142..bc61018c449 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/037_Particles/Materials/1.Lit-Cutout.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/037_Particles/Materials/1.Lit-Cutout.mat @@ -65,6 +65,7 @@ Material: m_Floats: - _AlphaClip: 1 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BlendOp: 0 - _BumpScale: 1 - _CameraFadingEnabled: 0 @@ -79,6 +80,7 @@ Material: - _DistortionStrength: 1 - _DistortionStrengthScaled: 0 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EmissionEnabled: 0 - _FlipbookBlending: 0 - _FlipbookMode: 0 @@ -100,6 +102,7 @@ Material: - _SoftParticlesNearFadeDistance: 1 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _ZWrite: 1 @@ -123,4 +126,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/037_Particles/Materials/1.Lit-Fade.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/037_Particles/Materials/1.Lit-Fade.mat index 823f2c7ab79..1a8381ac879 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/037_Particles/Materials/1.Lit-Fade.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/037_Particles/Materials/1.Lit-Fade.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -32,6 +32,7 @@ Material: disabledShaderPasses: - ALWAYS - SHADOWCASTER + - DepthOnly m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -79,6 +80,7 @@ Material: m_Floats: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 0 - _BlendOp: 0 - _BumpScale: 0.6 - _CameraFadingEnabled: 0 @@ -93,6 +95,7 @@ Material: - _DistortionStrength: 1 - _DistortionStrengthScaled: 0 - _DstBlend: 10 + - _DstBlendAlpha: 10 - _EmissionEnabled: 0 - _FlipbookBlending: 0 - _FlipbookMode: 0 @@ -114,6 +117,7 @@ Material: - _SoftParticlesNearFadeDistance: 1 - _SpecularHighlights: 1 - _SrcBlend: 5 + - _SrcBlendAlpha: 1 - _Surface: 1 - _UVSec: 0 - _ZWrite: 0 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/037_Particles/Materials/1.Lit-Shadow-Cutout.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/037_Particles/Materials/1.Lit-Shadow-Cutout.mat index 0515af4af4d..fb5f4486c3d 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/037_Particles/Materials/1.Lit-Shadow-Cutout.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/037_Particles/Materials/1.Lit-Shadow-Cutout.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -78,6 +78,7 @@ Material: m_Floats: - _AlphaClip: 1 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BlendOp: 0 - _BumpScale: 1 - _CameraFadingEnabled: 0 @@ -92,6 +93,7 @@ Material: - _DistortionStrength: 1 - _DistortionStrengthScaled: 0 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EmissionEnabled: 0 - _FlipbookBlending: 0 - _FlipbookMode: 0 @@ -113,6 +115,7 @@ Material: - _SoftParticlesNearFadeDistance: 1 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _ZWrite: 1 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/037_Particles/Materials/1.Lit-Shadow-Fade.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/037_Particles/Materials/1.Lit-Shadow-Fade.mat index 9decb3dd6e0..35e3b909c84 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/037_Particles/Materials/1.Lit-Shadow-Fade.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/037_Particles/Materials/1.Lit-Shadow-Fade.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -32,6 +32,7 @@ Material: disabledShaderPasses: - ALWAYS - SHADOWCASTER + - DepthOnly m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -79,6 +80,7 @@ Material: m_Floats: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 0 - _BlendOp: 0 - _BumpScale: 0.6 - _CameraFadingEnabled: 0 @@ -93,6 +95,7 @@ Material: - _DistortionStrength: 1 - _DistortionStrengthScaled: 0 - _DstBlend: 10 + - _DstBlendAlpha: 10 - _EmissionEnabled: 0 - _FlipbookBlending: 0 - _FlipbookMode: 0 @@ -114,6 +117,7 @@ Material: - _SoftParticlesNearFadeDistance: 1 - _SpecularHighlights: 1 - _SrcBlend: 5 + - _SrcBlendAlpha: 1 - _Surface: 1 - _UVSec: 0 - _ZWrite: 0 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/037_Particles/Materials/1.Lit-Shadow-Opaque.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/037_Particles/Materials/1.Lit-Shadow-Opaque.mat index d0e55240091..93a8804344f 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/037_Particles/Materials/1.Lit-Shadow-Opaque.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/037_Particles/Materials/1.Lit-Shadow-Opaque.mat @@ -65,6 +65,7 @@ Material: m_Floats: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BlendOp: 0 - _BumpScale: 1 - _CameraFadingEnabled: 0 @@ -79,6 +80,7 @@ Material: - _DistortionStrength: 1 - _DistortionStrengthScaled: 0 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EmissionEnabled: 0 - _FlipbookBlending: 0 - _FlipbookMode: 0 @@ -100,6 +102,7 @@ Material: - _SoftParticlesNearFadeDistance: 1 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _ZWrite: 1 @@ -123,4 +126,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/037_Particles/Materials/1.Lit-Shadow-Transparent.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/037_Particles/Materials/1.Lit-Shadow-Transparent.mat index 02ebcf2184c..553aac06859 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/037_Particles/Materials/1.Lit-Shadow-Transparent.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/037_Particles/Materials/1.Lit-Shadow-Transparent.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -32,6 +32,7 @@ Material: disabledShaderPasses: - ALWAYS - SHADOWCASTER + - DepthOnly m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -78,7 +79,8 @@ Material: m_Ints: [] m_Floats: - _AlphaClip: 0 - - _Blend: 1 + - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BlendOp: 0 - _BumpScale: 1 - _CameraFadingEnabled: 0 @@ -93,6 +95,7 @@ Material: - _DistortionStrength: 10 - _DistortionStrengthScaled: 0 - _DstBlend: 10 + - _DstBlendAlpha: 10 - _EmissionEnabled: 0 - _FlipbookBlending: 0 - _FlipbookMode: 0 @@ -115,6 +118,7 @@ Material: - _SoftParticlesNearFadeDistance: 1 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 1 - _UVSec: 0 - _ZWrite: 0 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/037_Particles/Materials/2.Unlit-Additive.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/037_Particles/Materials/2.Unlit-Additive.mat index c51d6667841..cbcaba36027 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/037_Particles/Materials/2.Unlit-Additive.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/037_Particles/Materials/2.Unlit-Additive.mat @@ -19,6 +19,7 @@ Material: disabledShaderPasses: - ALWAYS - SHADOWCASTER + - DepthOnly m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -123,4 +124,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/037_Particles/Materials/2.Unlit-CameraFading-Fade.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/037_Particles/Materials/2.Unlit-CameraFading-Fade.mat index 7851a2e55aa..289124fe605 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/037_Particles/Materials/2.Unlit-CameraFading-Fade.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/037_Particles/Materials/2.Unlit-CameraFading-Fade.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -32,6 +32,7 @@ Material: disabledShaderPasses: - ALWAYS - SHADOWCASTER + - DepthOnly m_SavedProperties: serializedVersion: 3 m_TexEnvs: diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/037_Particles/Materials/2.Unlit-CameraFading-Transparent.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/037_Particles/Materials/2.Unlit-CameraFading-Transparent.mat index 34d8b1fdb3e..3fa1834d178 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/037_Particles/Materials/2.Unlit-CameraFading-Transparent.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/037_Particles/Materials/2.Unlit-CameraFading-Transparent.mat @@ -9,7 +9,7 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: 2.Unlit-CameraFading-Transparent m_Shader: {fileID: 4800000, guid: 0406db5a14f94604a8c57ccfbc9f3b46, type: 3} - m_ShaderKeywords: _ALPHAPREMULTIPLY_ON _EMISSION _FADING_ON _SURFACE_TYPE_TRANSPARENT + m_ShaderKeywords: _EMISSION _FADING_ON _SURFACE_TYPE_TRANSPARENT m_LightmapFlags: 2 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -19,6 +19,7 @@ Material: disabledShaderPasses: - ALWAYS - SHADOWCASTER + - DepthOnly m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -123,4 +124,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/037_Particles/Materials/2.Unlit-Modulate.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/037_Particles/Materials/2.Unlit-Modulate.mat index b0a5f908d18..e902c742827 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/037_Particles/Materials/2.Unlit-Modulate.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/037_Particles/Materials/2.Unlit-Modulate.mat @@ -19,6 +19,7 @@ Material: disabledShaderPasses: - ALWAYS - SHADOWCASTER + - DepthOnly m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -123,4 +124,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/037_Particles/Materials/2.Unlit-SoftParticles-Fade.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/037_Particles/Materials/2.Unlit-SoftParticles-Fade.mat index a505edb6623..a3e42ee3d76 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/037_Particles/Materials/2.Unlit-SoftParticles-Fade.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/037_Particles/Materials/2.Unlit-SoftParticles-Fade.mat @@ -19,6 +19,7 @@ Material: disabledShaderPasses: - ALWAYS - SHADOWCASTER + - DepthOnly m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -123,4 +124,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/037_Particles/Materials/2.Unlit-SoftParticles-Transparent.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/037_Particles/Materials/2.Unlit-SoftParticles-Transparent.mat index a0f0b2808ba..36ab5bfb11c 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/037_Particles/Materials/2.Unlit-SoftParticles-Transparent.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/037_Particles/Materials/2.Unlit-SoftParticles-Transparent.mat @@ -9,7 +9,7 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: 2.Unlit-SoftParticles-Transparent m_Shader: {fileID: 4800000, guid: 0406db5a14f94604a8c57ccfbc9f3b46, type: 3} - m_ShaderKeywords: _ALPHAPREMULTIPLY_ON _EMISSION _FADING_ON _SOFTPARTICLES_ON _SURFACE_TYPE_TRANSPARENT + m_ShaderKeywords: _EMISSION _FADING_ON _SOFTPARTICLES_ON _SURFACE_TYPE_TRANSPARENT m_LightmapFlags: 2 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -19,6 +19,7 @@ Material: disabledShaderPasses: - ALWAYS - SHADOWCASTER + - DepthOnly m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -123,4 +124,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/037_Particles/Materials/2.Unlit-Subtractive.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/037_Particles/Materials/2.Unlit-Subtractive.mat index f6f7309f478..2368c3d084d 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/037_Particles/Materials/2.Unlit-Subtractive.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/037_Particles/Materials/2.Unlit-Subtractive.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -32,6 +32,7 @@ Material: disabledShaderPasses: - ALWAYS - SHADOWCASTER + - DepthOnly m_SavedProperties: serializedVersion: 3 m_TexEnvs: diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/037_Particles/Materials/3.Lit-Additive.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/037_Particles/Materials/3.Lit-Additive.mat index 2d297ef8e76..ca85c807233 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/037_Particles/Materials/3.Lit-Additive.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/037_Particles/Materials/3.Lit-Additive.mat @@ -19,6 +19,7 @@ Material: disabledShaderPasses: - ALWAYS - SHADOWCASTER + - DepthOnly m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -122,4 +123,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/037_Particles/Materials/3.Lit-Color.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/037_Particles/Materials/3.Lit-Color.mat index 0906ec58fe5..d1046dd428c 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/037_Particles/Materials/3.Lit-Color.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/037_Particles/Materials/3.Lit-Color.mat @@ -19,6 +19,7 @@ Material: disabledShaderPasses: - ALWAYS - SHADOWCASTER + - DepthOnly m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -122,4 +123,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/037_Particles/Materials/3.Lit-Difference.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/037_Particles/Materials/3.Lit-Difference.mat index 59fe0cdb9ab..ff704f833bf 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/037_Particles/Materials/3.Lit-Difference.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/037_Particles/Materials/3.Lit-Difference.mat @@ -19,6 +19,7 @@ Material: disabledShaderPasses: - ALWAYS - SHADOWCASTER + - DepthOnly m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -122,4 +123,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/037_Particles/Materials/3.Lit-Multiply.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/037_Particles/Materials/3.Lit-Multiply.mat index a5eb5b5678a..9f201ccf472 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/037_Particles/Materials/3.Lit-Multiply.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/037_Particles/Materials/3.Lit-Multiply.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -32,6 +32,7 @@ Material: disabledShaderPasses: - ALWAYS - SHADOWCASTER + - DepthOnly m_SavedProperties: serializedVersion: 3 m_TexEnvs: diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/037_Particles/Materials/3.Lit-Overlay.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/037_Particles/Materials/3.Lit-Overlay.mat index 2aa04b87115..3b21a68f69c 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/037_Particles/Materials/3.Lit-Overlay.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/037_Particles/Materials/3.Lit-Overlay.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -32,6 +32,7 @@ Material: disabledShaderPasses: - ALWAYS - SHADOWCASTER + - DepthOnly m_SavedProperties: serializedVersion: 3 m_TexEnvs: diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/037_Particles/Materials/3.Lit-Subtractive.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/037_Particles/Materials/3.Lit-Subtractive.mat index 35d463d4e4a..93b35467d68 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/037_Particles/Materials/3.Lit-Subtractive.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/037_Particles/Materials/3.Lit-Subtractive.mat @@ -19,6 +19,7 @@ Material: disabledShaderPasses: - ALWAYS - SHADOWCASTER + - DepthOnly m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -122,4 +123,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/037_Particles/Materials/4.Lit-Opaque.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/037_Particles/Materials/4.Lit-Opaque.mat index 8d22e54bd2c..0627c65bc89 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/037_Particles/Materials/4.Lit-Opaque.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/037_Particles/Materials/4.Lit-Opaque.mat @@ -65,6 +65,7 @@ Material: m_Floats: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BlendOp: 0 - _BumpScale: 1 - _CameraFadingEnabled: 0 @@ -79,6 +80,7 @@ Material: - _DistortionStrength: 1 - _DistortionStrengthScaled: 0 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EmissionEnabled: 0 - _FlipbookBlending: 0 - _FlipbookMode: 0 @@ -100,6 +102,7 @@ Material: - _SoftParticlesNearFadeDistance: 1 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _ZWrite: 1 @@ -124,4 +127,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/037_Particles/Materials/5.Lit-TwoSided.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/037_Particles/Materials/5.Lit-TwoSided.mat index 529e654598c..e019012c5a2 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/037_Particles/Materials/5.Lit-TwoSided.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/037_Particles/Materials/5.Lit-TwoSided.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -25,7 +25,7 @@ Material: m_ShaderKeywords: _METALLICSPECGLOSSMAP _NORMALMAP m_LightmapFlags: 6 m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 + m_DoubleSidedGI: 1 m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque @@ -78,6 +78,7 @@ Material: m_Floats: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BlendOp: 0 - _BumpScale: 1 - _CameraFadingEnabled: 0 @@ -92,6 +93,7 @@ Material: - _DistortionStrength: 1 - _DistortionStrengthScaled: 0 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EmissionEnabled: 0 - _FlipbookBlending: 0 - _FlipbookMode: 0 @@ -114,6 +116,7 @@ Material: - _SoftParticlesNearFadeDistance: 1 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _ZWrite: 1 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/037_Particles/Materials/5.Unlit-TwoSided.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/037_Particles/Materials/5.Unlit-TwoSided.mat index 1291a86a56f..a1734b00090 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/037_Particles/Materials/5.Unlit-TwoSided.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/037_Particles/Materials/5.Unlit-TwoSided.mat @@ -12,7 +12,7 @@ Material: m_ShaderKeywords: _NORMALMAP m_LightmapFlags: 6 m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 + m_DoubleSidedGI: 1 m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque @@ -122,4 +122,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/037_Particles/Materials/6.Lit-FlipBookSimple-Fade.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/037_Particles/Materials/6.Lit-FlipBookSimple-Fade.mat index 4471128385b..bba6adb0a22 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/037_Particles/Materials/6.Lit-FlipBookSimple-Fade.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/037_Particles/Materials/6.Lit-FlipBookSimple-Fade.mat @@ -19,6 +19,7 @@ Material: disabledShaderPasses: - ALWAYS - SHADOWCASTER + - DepthOnly m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -66,6 +67,7 @@ Material: m_Floats: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 0 - _BlendOp: 0 - _BumpScale: 1 - _CameraFadingEnabled: 0 @@ -80,6 +82,7 @@ Material: - _DistortionStrength: 10 - _DistortionStrengthScaled: 0 - _DstBlend: 10 + - _DstBlendAlpha: 10 - _EmissionEnabled: 0 - _FlipbookBlending: 1 - _FlipbookMode: 1 @@ -101,6 +104,7 @@ Material: - _SoftParticlesNearFadeDistance: 0 - _SpecularHighlights: 1 - _SrcBlend: 5 + - _SrcBlendAlpha: 1 - _Surface: 1 - _UVSec: 0 - _ZWrite: 0 @@ -124,4 +128,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/037_Particles/Materials/6.Unlit-FlipBookBlended-Fade.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/037_Particles/Materials/6.Unlit-FlipBookBlended-Fade.mat index 5e536354211..0216b1cb6e7 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/037_Particles/Materials/6.Unlit-FlipBookBlended-Fade.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/037_Particles/Materials/6.Unlit-FlipBookBlended-Fade.mat @@ -19,6 +19,7 @@ Material: disabledShaderPasses: - ALWAYS - SHADOWCASTER + - DepthOnly m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -123,4 +124,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/037_Particles/Materials/7.Lit-Transparent.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/037_Particles/Materials/7.Lit-Transparent.mat index d44d4320f7a..e1e61199ae8 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/037_Particles/Materials/7.Lit-Transparent.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/037_Particles/Materials/7.Lit-Transparent.mat @@ -19,6 +19,7 @@ Material: disabledShaderPasses: - ALWAYS - SHADOWCASTER + - DepthOnly m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -65,7 +66,8 @@ Material: m_Ints: [] m_Floats: - _AlphaClip: 0 - - _Blend: 1 + - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BlendOp: 0 - _BumpScale: 1 - _CameraFadingEnabled: 0 @@ -80,6 +82,7 @@ Material: - _DistortionStrength: 10 - _DistortionStrengthScaled: 1 - _DstBlend: 10 + - _DstBlendAlpha: 10 - _EmissionEnabled: 0 - _FlipbookBlending: 0 - _FlipbookMode: 0 @@ -101,6 +104,7 @@ Material: - _SoftParticlesNearFadeDistance: 1 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 1 - _UVSec: 0 - _ZWrite: 0 @@ -124,4 +128,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/037_Particles/Materials/8.Lit-Distortion.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/037_Particles/Materials/8.Lit-Distortion.mat index 6583127795f..ae6f6d0cdae 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/037_Particles/Materials/8.Lit-Distortion.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/037_Particles/Materials/8.Lit-Distortion.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -32,6 +32,7 @@ Material: disabledShaderPasses: - ALWAYS - SHADOWCASTER + - DepthOnly m_SavedProperties: serializedVersion: 3 m_TexEnvs: diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/037_Particles/Materials/Plane.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/037_Particles/Materials/Plane.mat index edaad3295a0..1411885e08c 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/037_Particles/Materials/Plane.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/037_Particles/Materials/Plane.mat @@ -68,17 +68,33 @@ Material: 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: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoat: 0 - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 - _Cull: 2 - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 0 @@ -96,6 +112,7 @@ Material: - _SpecSource: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _WorkflowMode: 1 @@ -118,4 +135,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/ArchesMaterial.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/ArchesMaterial.mat index 137edc115c6..032d57a5964 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/ArchesMaterial.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/ArchesMaterial.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -85,18 +85,34 @@ Material: 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: - _AlphaClip: 0 - _AlphaTestRef: 0.5 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoat: 0 - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 - _Cull: 2 - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EmissionScaleUI: 1 - _EnvironmentReflections: 1 - _GlossMapScale: 1 @@ -114,6 +130,7 @@ Material: - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _WorkflowMode: 0 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/BloxMaterial.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/BloxMaterial.mat index 86396779955..fd2e23f2536 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/BloxMaterial.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/BloxMaterial.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -85,18 +85,34 @@ Material: 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: - _AlphaClip: 0 - _AlphaTestRef: 0.5 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoat: 0 - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 - _Cull: 2 - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EmissionScaleUI: 1 - _EnvironmentReflections: 1 - _GlossMapScale: 1 @@ -114,6 +130,7 @@ Material: - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _WorkflowMode: 0 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/ClockGlassMaterial.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/ClockGlassMaterial.mat index dbd981b4644..1803bd78c7b 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/ClockGlassMaterial.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/ClockGlassMaterial.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -89,18 +89,34 @@ Material: 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: - _AlphaClip: 0 - _AlphaTestRef: 0.5 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoat: 0 - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 - _Cull: 2 - _Cutoff: 1 + - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EmissionScaleUI: 1 - _EnvironmentReflections: 1 - _GlossMapScale: 1 @@ -118,13 +134,14 @@ Material: - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _WorkflowMode: 0 - _ZWrite: 1 m_Colors: - _BaseColor: {r: 0.4573962, g: 0.56541884, b: 0.6911764, a: 0.21176471} - - _Color: {r: 0.4573962, g: 0.56541884, b: 0.6911765, a: 0.21176471} + - _Color: {r: 0.4573962, g: 0.56541884, b: 0.69117635, a: 0.21176471} - _Emission: {r: 0, g: 0, b: 0, a: 0} - _EmissionColor: {r: 0, g: 0, b: 0, a: 0.99999994} - _EmissionColorUI: {r: 0, g: 0, b: 0, a: 1} diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/ClockMaterial.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/ClockMaterial.mat index 0c42219206a..84061467c3a 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/ClockMaterial.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/ClockMaterial.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -85,18 +85,34 @@ Material: m_Texture: {fileID: 2800000, guid: a9b9ddf6fe2c8a34d94a0f40cc7288c0, type: 3} 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: - _AlphaClip: 0 - _AlphaTestRef: 0.5 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoat: 0 - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 - _Cull: 2 - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EmissionScaleUI: 1 - _EnvironmentReflections: 1 - _GlossMapScale: 1 @@ -114,6 +130,7 @@ Material: - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _WorkflowMode: 0 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/DollhouseMaterial.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/DollhouseMaterial.mat index bc85e8b8d51..a37f1e63a14 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/DollhouseMaterial.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/DollhouseMaterial.mat @@ -72,18 +72,34 @@ Material: m_Texture: {fileID: 2800000, guid: bd717824af089434aada5d941efbbe36, type: 3} 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: - _AlphaClip: 0 - _AlphaTestRef: 0.5 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoat: 0 - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 - _Cull: 2 - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EmissionScaleUI: 1 - _EnvironmentReflections: 1 - _GlossMapScale: 1 @@ -101,6 +117,7 @@ Material: - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _WorkflowMode: 0 @@ -126,4 +143,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/DrawersMaterial.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/DrawersMaterial.mat index 838c147d206..1c9adca9f30 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/DrawersMaterial.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/DrawersMaterial.mat @@ -72,18 +72,34 @@ Material: m_Texture: {fileID: 2800000, guid: 3e81aed82f687094da25b33759ee1c30, type: 3} 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: - _AlphaClip: 0 - _AlphaTestRef: 0.5 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoat: 0 - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 - _Cull: 2 - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EmissionScaleUI: 1 - _EnvironmentReflections: 1 - _GlossMapScale: 1 @@ -101,6 +117,7 @@ Material: - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _WorkflowMode: 0 @@ -126,4 +143,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/EyesMaterial.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/EyesMaterial.mat index 78ab6ab45e3..e39e8beb428 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/EyesMaterial.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/EyesMaterial.mat @@ -72,18 +72,34 @@ Material: 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: - _AlphaClip: 0 - _AlphaTestRef: 0.5 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoat: 0 - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 - _Cull: 2 - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EmissionScaleUI: 1 - _EnvironmentReflections: 1 - _GlossMapScale: 0.6 @@ -102,6 +118,7 @@ Material: - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _WorkflowMode: 0 @@ -128,4 +145,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/FlareParticleMaterial.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/FlareParticleMaterial.mat index b194ed85885..b957aff2595 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/FlareParticleMaterial.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/FlareParticleMaterial.mat @@ -9,16 +9,17 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: FlareParticleMaterial m_Shader: {fileID: 4800000, guid: 0406db5a14f94604a8c57ccfbc9f3b46, type: 3} - m_ShaderKeywords: _EMISSION _RECEIVE_SHADOWS_OFF _SURFACE_TYPE_TRANSPARENT + m_ShaderKeywords: _SURFACE_TYPE_TRANSPARENT m_LightmapFlags: 6 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 3050 + m_CustomRenderQueue: 3000 stringTagMap: RenderType: Transparent disabledShaderPasses: - ALWAYS - SHADOWCASTER + - DepthOnly m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -90,4 +91,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/FluffParticleMaterial.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/FluffParticleMaterial.mat index e4cb7df82c4..657506ea307 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/FluffParticleMaterial.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/FluffParticleMaterial.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -81,17 +81,33 @@ Material: 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: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoat: 0 - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 - _Cull: 2 - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EmissionScaleUI: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 1 @@ -108,6 +124,7 @@ Material: - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _WorkflowMode: 1 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/GunMaterial.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/GunMaterial.mat index a408b91e818..3ac8fdfe9a6 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/GunMaterial.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/GunMaterial.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -22,7 +22,7 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: GunMaterial m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} - m_ShaderKeywords: _EMISSION _METALLICSPECGLOSSMAP _NORMALMAP _OCCLUSIONMAP _SPECULAR_SETUP + m_ShaderKeywords: _METALLICSPECGLOSSMAP _NORMALMAP _OCCLUSIONMAP _SPECULAR_SETUP m_LightmapFlags: 6 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -85,18 +85,34 @@ Material: m_Texture: {fileID: 2800000, guid: 0bfd74eda21b8b4408f654c7cf1f3665, type: 3} 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: - _AlphaClip: 0 - _AlphaTestRef: 0.5 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoat: 0 - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 - _Cull: 2 - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EmissionScaleUI: 1 - _EnvironmentReflections: 1 - _GlossMapScale: 1 @@ -114,6 +130,7 @@ Material: - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _WorkflowMode: 0 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/HearseMaterial.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/HearseMaterial.mat index c8d486b68e8..251369af6b0 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/HearseMaterial.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/HearseMaterial.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -22,7 +22,7 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: HearseMaterial m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} - m_ShaderKeywords: _EMISSION _METALLICSPECGLOSSMAP _NORMALMAP _OCCLUSIONMAP _SPECULAR_SETUP + m_ShaderKeywords: _METALLICSPECGLOSSMAP _NORMALMAP _OCCLUSIONMAP _SPECULAR_SETUP m_LightmapFlags: 6 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -85,18 +85,34 @@ Material: m_Texture: {fileID: 2800000, guid: 72d2e042768206b46bb11e99674a6a2d, type: 3} 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: - _AlphaClip: 0 - _AlphaTestRef: 0.5 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoat: 0 - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 - _Cull: 2 - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EmissionScaleUI: 1 - _EnvironmentReflections: 1 - _GlossMapScale: 1 @@ -114,6 +130,7 @@ Material: - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _WorkflowMode: 0 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/HellephantMaterial.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/HellephantMaterial.mat index 0daa163e687..30a7f8d09c7 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/HellephantMaterial.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/HellephantMaterial.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -97,18 +97,34 @@ Material: m_Texture: {fileID: 2800000, guid: 2c38b41a69c9bdc4bbac4dbc9324dacf, type: 3} 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: - _AlphaClip: 0 - _AlphaTestRef: 0.5 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoat: 0 - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 - _Cull: 2 - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EmissionScaleUI: 0.4 - _EnvironmentReflections: 1 - _GlossMapScale: 1 @@ -127,6 +143,7 @@ Material: - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _WorkflowMode: 0 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/PlanksMaterial.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/PlanksMaterial.mat index 0d4f6a0b255..60ddfb2b9ee 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/PlanksMaterial.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/PlanksMaterial.mat @@ -72,18 +72,34 @@ Material: m_Texture: {fileID: 2800000, guid: 41a4fe639750e1f46a3f96eef43eac7e, type: 3} 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: - _AlphaClip: 0 - _AlphaTestRef: 0.5 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 0.85 - _ClearCoat: 0 - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 - _Cull: 2 - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EmissionScaleUI: 1 - _EnvironmentReflections: 1 - _GlossMapScale: 1 @@ -101,6 +117,7 @@ Material: - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _WorkflowMode: 0 @@ -126,4 +143,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/PlayerMaterial.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/PlayerMaterial.mat index 155fcf3be7c..339897ba356 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/PlayerMaterial.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/PlayerMaterial.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -22,7 +22,7 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: PlayerMaterial m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} - m_ShaderKeywords: _EMISSION _METALLICSPECGLOSSMAP _NORMALMAP _OCCLUSIONMAP _SPECULAR_SETUP + m_ShaderKeywords: _METALLICSPECGLOSSMAP _NORMALMAP _OCCLUSIONMAP _SPECULAR_SETUP m_LightmapFlags: 6 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -85,18 +85,34 @@ Material: m_Texture: {fileID: 2800000, guid: bc9b1c6383841ea4f9e532a49c651ff6, type: 3} 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: - _AlphaClip: 0 - _AlphaTestRef: 0.5 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoat: 0 - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 - _Cull: 2 - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EmissionScaleUI: 1 - _EnvironmentReflections: 1 - _GlossMapScale: 1 @@ -114,6 +130,7 @@ Material: - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _WorkflowMode: 0 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/RobotMaterial.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/RobotMaterial.mat index c60235d7052..9b7385719fd 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/RobotMaterial.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/RobotMaterial.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -22,7 +22,7 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: RobotMaterial m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} - m_ShaderKeywords: _EMISSION _METALLICSPECGLOSSMAP _NORMALMAP _OCCLUSIONMAP _SPECULAR_SETUP + m_ShaderKeywords: _METALLICSPECGLOSSMAP _NORMALMAP _OCCLUSIONMAP _SPECULAR_SETUP m_LightmapFlags: 6 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -85,18 +85,34 @@ Material: m_Texture: {fileID: 2800000, guid: 8136f0437c3f1304c90ab510cf2accd8, type: 3} 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: - _AlphaClip: 0 - _AlphaTestRef: 0.5 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoat: 0 - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 - _Cull: 2 - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EmissionScaleUI: 1 - _EnvironmentReflections: 1 - _GlossMapScale: 1 @@ -114,6 +130,7 @@ Material: - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _WorkflowMode: 0 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/SpinningTopMaterial.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/SpinningTopMaterial.mat index 6ec8a5558e2..eae50f61b64 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/SpinningTopMaterial.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/SpinningTopMaterial.mat @@ -72,18 +72,34 @@ Material: 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: - _AlphaClip: 0 - _AlphaTestRef: 0.5 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoat: 0 - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 - _Cull: 2 - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EmissionScaleUI: 1 - _EnvironmentReflections: 1 - _GlossMapScale: 1 @@ -101,6 +117,7 @@ Material: - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _WorkflowMode: 0 @@ -126,4 +143,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/StarMaterial.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/StarMaterial.mat index e89e8c9fcfa..e8fc767a29c 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/StarMaterial.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/StarMaterial.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -89,18 +89,34 @@ Material: 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: - _AlphaClip: 0 - _AlphaTestRef: 0.5 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoat: 0 - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 - _Cull: 2 - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _DynamicEmissionLM: 0 - _EmissionLM: 0 - _EmissionScaleUI: 15 @@ -120,6 +136,7 @@ Material: - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _WorkflowMode: 1 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/TrainMaterial.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/TrainMaterial.mat index c73ea5071d9..35e9bd377c2 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/TrainMaterial.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/TrainMaterial.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -22,7 +22,7 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: TrainMaterial m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} - m_ShaderKeywords: _EMISSION _NORMALMAP _OCCLUSIONMAP _SPECULAR_SETUP + m_ShaderKeywords: _NORMALMAP _OCCLUSIONMAP _SPECULAR_SETUP m_LightmapFlags: 6 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -85,18 +85,34 @@ Material: 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: - _AlphaClip: 0 - _AlphaTestRef: 0.5 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoat: 0 - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 - _Cull: 2 - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EmissionScaleUI: 1 - _EnvironmentReflections: 1 - _GlossMapScale: 1 @@ -114,6 +130,7 @@ Material: - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _WorkflowMode: 0 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/WallMaterial.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/WallMaterial.mat index 3e0e60086c4..de19b8aa496 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/WallMaterial.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/WallMaterial.mat @@ -9,7 +9,7 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: WallMaterial m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} - m_ShaderKeywords: _EMISSION _METALLICSPECGLOSSMAP _NORMALMAP _OCCLUSIONMAP _SPECULAR_SETUP + m_ShaderKeywords: _METALLICSPECGLOSSMAP _NORMALMAP _OCCLUSIONMAP _SPECULAR_SETUP m_LightmapFlags: 6 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -72,18 +72,34 @@ Material: m_Texture: {fileID: 2800000, guid: 3d9e68517e401ae449049a6e5ec82ff1, type: 3} 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: - _AlphaClip: 0 - _AlphaTestRef: 0.5 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoat: 0 - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 - _Cull: 2 - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EmissionScaleUI: 1 - _EnvironmentReflections: 1 - _GlossMapScale: 1 @@ -101,13 +117,14 @@ Material: - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _WorkflowMode: 0 - _ZWrite: 1 m_Colors: - _BaseColor: {r: 0.60365707, g: 0.5881271, b: 0.7205882, a: 1} - - _Color: {r: 0.60365707, g: 0.58812714, b: 0.7205882, a: 1} + - _Color: {r: 0.60365707, g: 0.5881271, b: 0.7205882, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 0.99999994} - _EmissionColorUI: {r: 0, g: 0, b: 0, a: 1} - _EmissionColorWithMapUI: {r: 1, g: 1, b: 1, a: 1} @@ -126,4 +143,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/ZombearMaterial.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/ZombearMaterial.mat index 6b291f88b1e..f90a3378ea9 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/ZombearMaterial.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/ZombearMaterial.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -85,18 +85,34 @@ Material: m_Texture: {fileID: 2800000, guid: 082a477a29c51434097a2cba0ae07c87, type: 3} 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: - _AlphaClip: 0 - _AlphaTestRef: 0.5 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoat: 0 - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 - _Cull: 2 - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EmissionScaleUI: 0.4 - _EnvironmentReflections: 1 - _GlossMapScale: 1 @@ -115,6 +131,7 @@ Material: - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _WorkflowMode: 0 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/ZombunnyMaterial.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/ZombunnyMaterial.mat index bdc40c77711..eca3353d77c 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/ZombunnyMaterial.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/040_UpgradeScene/Materials/CurrentMaterials/ZombunnyMaterial.mat @@ -72,18 +72,34 @@ Material: m_Texture: {fileID: 2800000, guid: 4f60b9a58009248478b8cac95541f9d1, type: 3} 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: - _AlphaClip: 0 - _AlphaTestRef: 0.5 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoat: 0 - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 - _Cull: 2 - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EmissionScaleUI: 0.6 - _EnvironmentReflections: 1 - _GlossMapScale: 1 @@ -102,6 +118,7 @@ Material: - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _WorkflowMode: 0 @@ -128,4 +145,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/050_Shader_Graphs/Graphs/PBR_Cutout.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/050_Shader_Graphs/Graphs/PBR_Cutout.mat index 54f9f7ade4e..098fd79667a 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/050_Shader_Graphs/Graphs/PBR_Cutout.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/050_Shader_Graphs/Graphs/PBR_Cutout.mat @@ -1,5 +1,18 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!114 &-7730018706621262414 +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: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -48,6 +61,8 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} m_Ints: [] - m_Floats: [] + m_Floats: + - _QueueControl: 0 + - _QueueOffset: 0 m_Colors: [] m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/050_Shader_Graphs/Graphs/PBR_Maps.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/050_Shader_Graphs/Graphs/PBR_Maps.mat index 4139ab0e292..54cac319e62 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/050_Shader_Graphs/Graphs/PBR_Maps.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/050_Shader_Graphs/Graphs/PBR_Maps.mat @@ -1,5 +1,18 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!114 &-6367256528357113983 +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: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -68,6 +81,8 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} m_Ints: [] - m_Floats: [] + m_Floats: + - _QueueControl: 0 + - _QueueOffset: 0 m_Colors: [] m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/050_Shader_Graphs/Graphs/PBR_Meta.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/050_Shader_Graphs/Graphs/PBR_Meta.mat index 28256f5a7c2..5a765f5bc9c 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/050_Shader_Graphs/Graphs/PBR_Meta.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/050_Shader_Graphs/Graphs/PBR_Meta.mat @@ -31,5 +31,34 @@ Material: m_Texture: {fileID: 2800000, guid: 381a7f93836b44c50b05d24f323b02cc, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - m_Floats: [] + - 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: + - _QueueControl: 0 + - _QueueOffset: 0 m_Colors: [] + m_BuildTextureStacks: [] +--- !u!114 &599612425908954852 +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: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/050_Shader_Graphs/Graphs/PBR_Transparent.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/050_Shader_Graphs/Graphs/PBR_Transparent.mat index f07624c4d47..e5d5b1f6877 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/050_Shader_Graphs/Graphs/PBR_Transparent.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/050_Shader_Graphs/Graphs/PBR_Transparent.mat @@ -1,5 +1,18 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!114 &-8714576472390649980 +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: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -80,6 +93,8 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} m_Ints: [] - m_Floats: [] + m_Floats: + - _QueueControl: 0 + - _QueueOffset: 0 m_Colors: [] m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/050_Shader_Graphs/Graphs/ShaderGraphs_Unlit_Alpha.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/050_Shader_Graphs/Graphs/ShaderGraphs_Unlit_Alpha.mat index 668544eaaba..bc4ab957264 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/050_Shader_Graphs/Graphs/ShaderGraphs_Unlit_Alpha.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/050_Shader_Graphs/Graphs/ShaderGraphs_Unlit_Alpha.mat @@ -1,5 +1,18 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!114 &-1739935094799035826 +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: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -33,6 +46,8 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} m_Ints: [] - m_Floats: [] + m_Floats: + - _QueueControl: 0 + - _QueueOffset: 0 m_Colors: [] m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/050_Shader_Graphs/Graphs/Unlit_Cutout.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/050_Shader_Graphs/Graphs/Unlit_Cutout.mat index ce1159702a9..82e736e6517 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/050_Shader_Graphs/Graphs/Unlit_Cutout.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/050_Shader_Graphs/Graphs/Unlit_Cutout.mat @@ -48,6 +48,21 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} m_Ints: [] - m_Floats: [] + m_Floats: + - _QueueControl: 0 + - _QueueOffset: 0 m_Colors: [] m_BuildTextureStacks: [] +--- !u!114 &7996778305891107488 +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: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/050_Shader_Graphs/Graphs/Unlit_Maps.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/050_Shader_Graphs/Graphs/Unlit_Maps.mat index e2efd535f7d..b7f9962d6fe 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/050_Shader_Graphs/Graphs/Unlit_Maps.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/050_Shader_Graphs/Graphs/Unlit_Maps.mat @@ -1,5 +1,18 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!114 &-1957053532852904669 +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: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -76,7 +89,9 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} m_Ints: [] - m_Floats: [] + m_Floats: + - _QueueControl: 0 + - _QueueOffset: 0 m_Colors: - Vector3_A9D9C453: {r: 1, g: 1, b: 1, a: 0} m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/050_Shader_Graphs_Override/Graph/PBR_Cutout_Override.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/050_Shader_Graphs_Override/Graph/PBR_Cutout_Override.mat index dd051623d02..f7bedbb273f 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/050_Shader_Graphs_Override/Graph/PBR_Cutout_Override.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/050_Shader_Graphs_Override/Graph/PBR_Cutout_Override.mat @@ -13,7 +13,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 + m_CustomRenderQueue: 2450 stringTagMap: RenderType: TransparentCutout disabledShaderPasses: [] @@ -52,9 +52,11 @@ Material: m_Floats: - _AlphaClip: 1 - _Blend: 0 + - _BlendModePreserveSpecular: 0 - _CastShadows: 1 - _Cull: 0 - _DstBlend: 0 + - _QueueControl: 0 - _QueueOffset: 0 - _ReceiveShadows: 1 - _SrcBlend: 1 @@ -77,4 +79,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/050_Shader_Graphs_Override/Graph/PBR_Maps_Override.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/050_Shader_Graphs_Override/Graph/PBR_Maps_Override.mat index b106ef94b61..37c3e995a6b 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/050_Shader_Graphs_Override/Graph/PBR_Maps_Override.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/050_Shader_Graphs_Override/Graph/PBR_Maps_Override.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -27,7 +27,8 @@ Material: m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 - stringTagMap: {} + stringTagMap: + RenderType: Opaque disabledShaderPasses: [] m_SavedProperties: serializedVersion: 3 @@ -82,6 +83,20 @@ Material: m_Offset: {x: 0, y: 0} m_Ints: [] m_Floats: + - _AlphaClip: 0 + - _Blend: 0 + - _BlendModePreserveSpecular: 0 + - _CastShadows: 1 + - _Cull: 2 + - _DstBlend: 0 + - _QueueControl: 0 - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _SrcBlend: 1 + - _Surface: 0 + - _WorkflowMode: 1 + - _ZTest: 4 + - _ZWrite: 1 + - _ZWriteControl: 0 m_Colors: [] m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/050_Shader_Graphs_Override/Graph/PBR_Meta_Override.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/050_Shader_Graphs_Override/Graph/PBR_Meta_Override.mat index f7286b9c55a..68ac0198f83 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/050_Shader_Graphs_Override/Graph/PBR_Meta_Override.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/050_Shader_Graphs_Override/Graph/PBR_Meta_Override.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -27,7 +27,8 @@ Material: m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 - stringTagMap: {} + stringTagMap: + RenderType: Opaque disabledShaderPasses: [] m_SavedProperties: serializedVersion: 3 @@ -58,6 +59,20 @@ Material: m_Offset: {x: 0, y: 0} m_Ints: [] m_Floats: + - _AlphaClip: 0 + - _Blend: 0 + - _BlendModePreserveSpecular: 0 + - _CastShadows: 1 + - _Cull: 2 + - _DstBlend: 0 + - _QueueControl: 0 - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _SrcBlend: 1 + - _Surface: 0 + - _WorkflowMode: 1 + - _ZTest: 4 + - _ZWrite: 1 + - _ZWriteControl: 0 m_Colors: [] m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/050_Shader_Graphs_Override/Graph/PBR_Transparent_Override.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/050_Shader_Graphs_Override/Graph/PBR_Transparent_Override.mat index 3df356149d0..78face071fa 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/050_Shader_Graphs_Override/Graph/PBR_Transparent_Override.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/050_Shader_Graphs_Override/Graph/PBR_Transparent_Override.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -26,10 +26,11 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 + m_CustomRenderQueue: 3000 stringTagMap: RenderType: Transparent - disabledShaderPasses: [] + disabledShaderPasses: + - DepthOnly m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -96,10 +97,12 @@ Material: m_Ints: [] m_Floats: - _AlphaClip: 0 - - _Blend: 1 + - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _CastShadows: 1 - _Cull: 2 - _DstBlend: 10 + - _QueueControl: 0 - _QueueOffset: 0 - _ReceiveShadows: 1 - _SrcBlend: 1 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/050_Shader_Graphs_Override/Graph/Unlit_Alpha_Override.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/050_Shader_Graphs_Override/Graph/Unlit_Alpha_Override.mat index 7ce0c72647c..e564836e1db 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/050_Shader_Graphs_Override/Graph/Unlit_Alpha_Override.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/050_Shader_Graphs_Override/Graph/Unlit_Alpha_Override.mat @@ -14,10 +14,11 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 + m_CustomRenderQueue: 3000 stringTagMap: RenderType: Transparent - disabledShaderPasses: [] + disabledShaderPasses: + - DepthOnly m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -40,6 +41,7 @@ Material: - _CastShadows: 1 - _Cull: 2 - _DstBlend: 10 + - _QueueControl: 0 - _QueueOffset: 0 - _SrcBlend: 5 - _Surface: 1 @@ -60,4 +62,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/050_Shader_Graphs_Override/Graph/Unlit_Cutout_Override.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/050_Shader_Graphs_Override/Graph/Unlit_Cutout_Override.mat index 9631fd64542..cc0c9d98e93 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/050_Shader_Graphs_Override/Graph/Unlit_Cutout_Override.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/050_Shader_Graphs_Override/Graph/Unlit_Cutout_Override.mat @@ -13,10 +13,11 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 + m_CustomRenderQueue: 3000 stringTagMap: RenderType: Transparent - disabledShaderPasses: [] + disabledShaderPasses: + - DepthOnly m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -55,6 +56,7 @@ Material: - _CastShadows: 1 - _Cull: 2 - _DstBlend: 10 + - _QueueControl: 0 - _QueueOffset: 0 - _SrcBlend: 5 - _Surface: 1 @@ -75,4 +77,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/050_Shader_Graphs_Override/Graph/Unlit_Maps_Override.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/050_Shader_Graphs_Override/Graph/Unlit_Maps_Override.mat index f01a288eebc..52fe0317bcb 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/050_Shader_Graphs_Override/Graph/Unlit_Maps_Override.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/050_Shader_Graphs_Override/Graph/Unlit_Maps_Override.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -27,7 +27,8 @@ Material: m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 - stringTagMap: {} + stringTagMap: + RenderType: Opaque disabledShaderPasses: [] m_SavedProperties: serializedVersion: 3 @@ -90,7 +91,18 @@ Material: m_Offset: {x: 0, y: 0} m_Ints: [] m_Floats: + - _AlphaClip: 0 + - _Blend: 0 + - _CastShadows: 1 + - _Cull: 2 + - _DstBlend: 0 + - _QueueControl: 0 - _QueueOffset: 0 + - _SrcBlend: 1 + - _Surface: 0 + - _ZTest: 4 + - _ZWrite: 1 + - _ZWriteControl: 0 m_Colors: - Vector3_A9D9C453: {r: 1, g: 1, b: 1, a: 0} m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/053_UnlitShader/UnlitShaderRedGI.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/053_UnlitShader/UnlitShaderRedGI.mat index 147ae640b5e..126a3d21e82 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/053_UnlitShader/UnlitShaderRedGI.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/053_UnlitShader/UnlitShaderRedGI.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -81,11 +81,13 @@ Material: m_Floats: - _AlphaClip: 0 - _Blend: 0 + - _BlendOp: 0 - _BumpScale: 1 - _Cull: 2 - _Cutoff: 0.5 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _GlossMapScale: 1 - _Glossiness: 0.5 - _GlossyReflections: 1 @@ -98,6 +100,7 @@ Material: - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _WorkflowMode: 1 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/053_UnlitShader/UnlitShaderRedNoGI.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/053_UnlitShader/UnlitShaderRedNoGI.mat index 46fa23cb796..d8f680b4307 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/053_UnlitShader/UnlitShaderRedNoGI.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/053_UnlitShader/UnlitShaderRedNoGI.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -93,11 +93,13 @@ Material: m_Floats: - _AlphaClip: 0 - _Blend: 0 + - _BlendOp: 0 - _BumpScale: 1 - _Cull: 2 - _Cutoff: 0.5 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _GlossMapScale: 1 - _Glossiness: 0.5 - _GlossyReflections: 1 @@ -110,6 +112,7 @@ Material: - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _WorkflowMode: 1 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/053_UnlitShader/UnlitShaderWhiteGI.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/053_UnlitShader/UnlitShaderWhiteGI.mat index ebcfcf6060b..a8efd1bdc97 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/053_UnlitShader/UnlitShaderWhiteGI.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/053_UnlitShader/UnlitShaderWhiteGI.mat @@ -84,6 +84,7 @@ Material: m_Floats: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoat: 0 - _ClearCoatMask: 0 @@ -93,6 +94,7 @@ Material: - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 0.5 @@ -106,6 +108,7 @@ Material: - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _WorkflowMode: 1 @@ -128,4 +131,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/109_URPShadersAlphaOutput/109_CameraTargetTexture.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/109_URPShadersAlphaOutput/109_CameraTargetTexture.mat index 1578894270b..1947b2d3ad7 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/109_URPShadersAlphaOutput/109_CameraTargetTexture.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/109_URPShadersAlphaOutput/109_CameraTargetTexture.mat @@ -85,11 +85,13 @@ Material: m_Floats: - _AlphaClip: 0 - _Blend: 0 + - _BlendOp: 0 - _BumpScale: 1 - _Cull: 2 - _Cutoff: 0.199 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _GlossMapScale: 1 - _Glossiness: 0.5 - _GlossinessSource: 1 @@ -109,12 +111,13 @@ Material: - _SpecSource: 0 - _SpecularHighlights: 0 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _ZWrite: 1 m_Colors: - _BaseColor: {r: 1, g: 1, b: 1, a: 1} - - _Color: {r: 0, g: 0, b: 0, a: 1} + - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 1, g: 1, b: 1, a: 1} - _ReflectColor: {r: 1, g: 1, b: 1, a: 1} - _SpecColor: {r: 1, g: 1, b: 1, a: 0.5} @@ -131,4 +134,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/109_URPShadersAlphaOutput/109_URPShadersAlphaOutputRenderTexture.renderTexture b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/109_URPShadersAlphaOutput/109_URPShadersAlphaOutputRenderTexture.renderTexture index fec455cf2fa..274de5fa9cb 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/109_URPShadersAlphaOutput/109_URPShadersAlphaOutputRenderTexture.renderTexture +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/109_URPShadersAlphaOutput/109_URPShadersAlphaOutputRenderTexture.renderTexture @@ -12,12 +12,13 @@ RenderTexture: Hash: 00000000000000000000000000000000 m_ForcedFallbackFormat: 4 m_DownscaleFallback: 0 - serializedVersion: 3 + m_IsAlphaChannelOptional: 0 + serializedVersion: 5 m_Width: 1280 m_Height: 720 m_AntiAliasing: 1 m_MipCount: -1 - m_DepthFormat: 2 + m_DepthStencilFormat: 92 m_ColorFormat: 8 m_MipMap: 0 m_GenerateMips: 1 @@ -35,3 +36,4 @@ RenderTexture: m_WrapW: 1 m_Dimension: 2 m_VolumeDepth: 1 + m_ShadowSamplingMode: 2 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/110_URPShadersAlphaOutputRendererFeature/110_CameraTargetTexture.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/110_URPShadersAlphaOutputRendererFeature/110_CameraTargetTexture.mat index 7651251702e..9caefe5ed64 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/110_URPShadersAlphaOutputRendererFeature/110_CameraTargetTexture.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/110_URPShadersAlphaOutputRendererFeature/110_CameraTargetTexture.mat @@ -85,11 +85,13 @@ Material: m_Floats: - _AlphaClip: 0 - _Blend: 0 + - _BlendOp: 0 - _BumpScale: 1 - _Cull: 2 - _Cutoff: 0.199 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _GlossMapScale: 1 - _Glossiness: 0.5 - _GlossinessSource: 1 @@ -109,12 +111,13 @@ Material: - _SpecSource: 0 - _SpecularHighlights: 0 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _ZWrite: 1 m_Colors: - _BaseColor: {r: 1, g: 1, b: 1, a: 1} - - _Color: {r: 0, g: 0, b: 0, a: 1} + - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 1, g: 1, b: 1, a: 1} - _ReflectColor: {r: 1, g: 1, b: 1, a: 1} - _SpecColor: {r: 1, g: 1, b: 1, a: 0.5} @@ -131,4 +134,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/110_URPShadersAlphaOutputRendererFeature/110_URPShadersAlphaOutputRendererFeature.renderTexture b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/110_URPShadersAlphaOutputRendererFeature/110_URPShadersAlphaOutputRendererFeature.renderTexture index d7fd49b2f64..12255e6ec9a 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/110_URPShadersAlphaOutputRendererFeature/110_URPShadersAlphaOutputRendererFeature.renderTexture +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/110_URPShadersAlphaOutputRendererFeature/110_URPShadersAlphaOutputRendererFeature.renderTexture @@ -13,12 +13,12 @@ RenderTexture: m_ForcedFallbackFormat: 4 m_DownscaleFallback: 0 m_IsAlphaChannelOptional: 0 - serializedVersion: 3 + serializedVersion: 5 m_Width: 1280 m_Height: 720 m_AntiAliasing: 1 m_MipCount: -1 - m_DepthFormat: 2 + m_DepthStencilFormat: 92 m_ColorFormat: 8 m_MipMap: 0 m_GenerateMips: 1 @@ -36,3 +36,4 @@ RenderTexture: m_WrapW: 1 m_Dimension: 2 m_VolumeDepth: 1 + m_ShadowSamplingMode: 2 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/111_CameraStackMSAA/Blue.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/111_CameraStackMSAA/Blue.mat index ccc5f03b066..a34019cdc54 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/111_CameraStackMSAA/Blue.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/111_CameraStackMSAA/Blue.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -81,10 +81,23 @@ Material: 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: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoat: 0 - _ClearCoatMask: 0 @@ -94,6 +107,7 @@ Material: - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 0 - _Glossiness: 0 @@ -108,12 +122,13 @@ Material: - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _WorkflowMode: 1 - _ZWrite: 1 m_Colors: - _BaseColor: {r: 0, g: 0, b: 1, a: 1} - - _Color: {r: 1, g: 1, b: 1, a: 1} + - _Color: {r: 0, g: 0, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/111_CameraStackMSAA/Red.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/111_CameraStackMSAA/Red.mat index c48d70558ed..6c25e51f547 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/111_CameraStackMSAA/Red.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/111_CameraStackMSAA/Red.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -81,10 +81,23 @@ Material: 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: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoat: 0 - _ClearCoatMask: 0 @@ -94,6 +107,7 @@ Material: - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 0 - _Glossiness: 0 @@ -107,12 +121,13 @@ Material: - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _WorkflowMode: 1 - _ZWrite: 1 m_Colors: - _BaseColor: {r: 1, g: 0, b: 0, a: 1} - - _Color: {r: 1, g: 1, b: 1, a: 1} + - _Color: {r: 1, g: 0, b: 0, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/111_CameraStackMSAA/White.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/111_CameraStackMSAA/White.mat index 375c39651f4..bfc70d65588 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/111_CameraStackMSAA/White.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/111_CameraStackMSAA/White.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -81,10 +81,23 @@ Material: 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: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoat: 0 - _ClearCoatMask: 0 @@ -94,6 +107,7 @@ Material: - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 0 - _Glossiness: 0 @@ -107,6 +121,7 @@ Material: - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _WorkflowMode: 1 - _ZWrite: 1 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/112_FogBasic/Lit.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/112_FogBasic/Lit.mat index d6688f9be97..6965f471dcb 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/112_FogBasic/Lit.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/112_FogBasic/Lit.mat @@ -80,6 +80,7 @@ Material: m_Floats: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoatMask: 0 - _ClearCoatSmoothness: 0 @@ -88,6 +89,7 @@ Material: - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 0 - _Glossiness: 0 @@ -101,12 +103,13 @@ Material: - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _WorkflowMode: 1 - _ZWrite: 1 m_Colors: - _BaseColor: {r: 0.627451, g: 0.0627451, b: 0.0627451, a: 1} - - _Color: {r: 1, g: 1, b: 1, a: 1} + - _Color: {r: 0.62745106, g: 0.06274508, b: 0.06274508, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] @@ -122,4 +125,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/112_FogBasic/LitShaderGraph.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/112_FogBasic/LitShaderGraph.mat index bca0b115e81..6699e24b26d 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/112_FogBasic/LitShaderGraph.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/112_FogBasic/LitShaderGraph.mat @@ -76,6 +76,7 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + m_Ints: [] m_Floats: - _AlphaClip: 0 - _Blend: 0 @@ -106,6 +107,7 @@ Material: - _Mode: 0 - _OcclusionStrength: 1 - _Parallax: 0.005 + - _QueueControl: 0 - _QueueOffset: 0 - _ReceiveShadows: 1 - _Smoothness: 0.5 @@ -141,4 +143,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 3 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/112_FogBasic/ParticleLit.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/112_FogBasic/ParticleLit.mat index 9c40dd57e8c..0d9e2640e29 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/112_FogBasic/ParticleLit.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/112_FogBasic/ParticleLit.mat @@ -80,6 +80,7 @@ Material: m_Floats: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BlendOp: 0 - _BumpScale: 1 - _CameraFadingEnabled: 0 @@ -97,6 +98,7 @@ Material: - _DistortionStrength: 1 - _DistortionStrengthScaled: 0.1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _FlipbookBlending: 0 - _FlipbookMode: 0 @@ -116,6 +118,7 @@ Material: - _SoftParticlesNearFadeDistance: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _WorkflowMode: 1 - _ZWrite: 1 @@ -123,7 +126,7 @@ Material: - _BaseColor: {r: 0.627451, g: 0.0627451, b: 0.0627451, a: 1} - _BaseColorAddSubDiff: {r: 0, g: 0, b: 0, a: 0} - _CameraFadeParams: {r: 0, g: 0, b: 0, a: 0} - - _Color: {r: 1, g: 1, b: 1, a: 1} + - _Color: {r: 0.62745106, g: 0.06274508, b: 0.06274508, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SoftParticleFadeParams: {r: 0, g: 0, b: 0, a: 0} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} @@ -140,4 +143,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/112_FogBasic/ParticleUnlit.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/112_FogBasic/ParticleUnlit.mat index 4d814071e85..1b4b4a2e626 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/112_FogBasic/ParticleUnlit.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/112_FogBasic/ParticleUnlit.mat @@ -128,7 +128,7 @@ Material: - _BaseColor: {r: 0.627451, g: 0.0627451, b: 0.0627451, a: 1} - _BaseColorAddSubDiff: {r: 0, g: 0, b: 0, a: 0} - _CameraFadeParams: {r: 0, g: 0, b: 0, a: 0} - - _Color: {r: 1, g: 1, b: 1, a: 1} + - _Color: {r: 0.62745106, g: 0.06274508, b: 0.06274508, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SoftParticleFadeParams: {r: 0, g: 0, b: 0, a: 0} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} @@ -145,4 +145,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/112_FogBasic/SimpleLit.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/112_FogBasic/SimpleLit.mat index 635f458a714..01d135fc451 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/112_FogBasic/SimpleLit.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/112_FogBasic/SimpleLit.mat @@ -80,6 +80,7 @@ Material: m_Floats: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoatMask: 0 - _ClearCoatSmoothness: 0 @@ -88,6 +89,7 @@ Material: - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 0 - _Glossiness: 0 @@ -105,12 +107,13 @@ Material: - _SpecSource: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _WorkflowMode: 1 - _ZWrite: 1 m_Colors: - _BaseColor: {r: 0.627451, g: 0.0627451, b: 0.0627451, a: 1} - - _Color: {r: 1, g: 1, b: 1, a: 1} + - _Color: {r: 0.62745106, g: 0.06274508, b: 0.06274508, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] @@ -126,4 +129,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/112_FogBasic/SpeedTreeBillboard_disabled.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/112_FogBasic/SpeedTreeBillboard_disabled.mat index 7b55af1ade0..679a923d2d8 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/112_FogBasic/SpeedTreeBillboard_disabled.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/112_FogBasic/SpeedTreeBillboard_disabled.mat @@ -172,6 +172,7 @@ Material: - _DistortionStrength: 1 - _DistortionStrengthScaled: 0.1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnableHeightBlend: 0 - _EnableInstancedPerPixelNormal: 1 - _EnvironmentReflections: 1 @@ -212,6 +213,7 @@ Material: - _SpecularHighlights: 1 - _SquashAmount: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _SubsurfaceIndirect: 0.25 - _SubsurfaceKwToggle: 0 - _Surface: 0 @@ -230,7 +232,7 @@ Material: - _BaseColor: {r: 0.627451, g: 0.0627451, b: 0.0627451, a: 1} - _BaseColorAddSubDiff: {r: 0, g: 0, b: 0, a: 0} - _CameraFadeParams: {r: 0, g: 0, b: 0, a: 0} - - _Color: {r: 1, g: 1, b: 1, a: 1} + - _Color: {r: 0.62745106, g: 0.06274508, b: 0.06274508, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _HueVariation: {r: 1, g: 0.5, b: 0, a: 0.1} - _HueVariationColor: {r: 1, g: 0.5, b: 0, a: 0.1} @@ -254,4 +256,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/112_FogBasic/TerrainLit_disabled.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/112_FogBasic/TerrainLit_disabled.mat index 9aac5c4c99b..383b5bd7ec2 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/112_FogBasic/TerrainLit_disabled.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/112_FogBasic/TerrainLit_disabled.mat @@ -136,6 +136,7 @@ Material: m_Floats: - _AlphaClip: 0 - _Blend: 0 + - _BlendOp: 0 - _BumpScale: 1 - _ClearCoatMask: 0 - _ClearCoatSmoothness: 0 @@ -144,6 +145,7 @@ Material: - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnableHeightBlend: 0 - _EnableInstancedPerPixelNormal: 1 - _EnvironmentReflections: 1 @@ -174,12 +176,13 @@ Material: - _SpecSource: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _WorkflowMode: 1 - _ZWrite: 1 m_Colors: - _BaseColor: {r: 0.627451, g: 0.0627451, b: 0.0627451, a: 1} - - _Color: {r: 1, g: 1, b: 1, a: 1} + - _Color: {r: 0.62745106, g: 0.06274508, b: 0.06274508, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] @@ -195,4 +198,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/112_FogBasic/Unlit.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/112_FogBasic/Unlit.mat index ee5f63b0eb8..a6555dfc9f0 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/112_FogBasic/Unlit.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/112_FogBasic/Unlit.mat @@ -80,6 +80,7 @@ Material: m_Floats: - _AlphaClip: 0 - _Blend: 0 + - _BlendOp: 0 - _BumpScale: 1 - _ClearCoatMask: 0 - _ClearCoatSmoothness: 0 @@ -88,6 +89,7 @@ Material: - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 0 - _Glossiness: 0 @@ -102,12 +104,13 @@ Material: - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _WorkflowMode: 1 - _ZWrite: 1 m_Colors: - _BaseColor: {r: 0.627451, g: 0.0627451, b: 0.0627451, a: 1} - - _Color: {r: 1, g: 1, b: 1, a: 1} + - _Color: {r: 0.62745106, g: 0.06274508, b: 0.06274508, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] @@ -123,4 +126,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/112_FogBasic/UnlitShaderGraph.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/112_FogBasic/UnlitShaderGraph.mat index bd63949abbb..558d9bf4254 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/112_FogBasic/UnlitShaderGraph.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/112_FogBasic/UnlitShaderGraph.mat @@ -76,6 +76,7 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + m_Ints: [] m_Floats: - _AlphaClip: 0 - _Blend: 0 @@ -106,6 +107,7 @@ Material: - _Mode: 0 - _OcclusionStrength: 1 - _Parallax: 0.005 + - _QueueControl: 0 - _QueueOffset: 0 - _ReceiveShadows: 1 - _Smoothness: 0.5 @@ -143,4 +145,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 3 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/119_CameraToRTWithViewportRect/MapRenderTexture.renderTexture b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/119_CameraToRTWithViewportRect/MapRenderTexture.renderTexture index b6e96ce48b8..e78b3acb92b 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/119_CameraToRTWithViewportRect/MapRenderTexture.renderTexture +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/119_CameraToRTWithViewportRect/MapRenderTexture.renderTexture @@ -13,12 +13,12 @@ RenderTexture: m_ForcedFallbackFormat: 4 m_DownscaleFallback: 0 m_IsAlphaChannelOptional: 0 - serializedVersion: 3 + serializedVersion: 5 m_Width: 32 m_Height: 64 m_AntiAliasing: 1 m_MipCount: -1 - m_DepthFormat: 0 + m_DepthStencilFormat: 0 m_ColorFormat: 8 m_MipMap: 0 m_GenerateMips: 1 @@ -36,3 +36,4 @@ RenderTexture: m_WrapW: 1 m_Dimension: 2 m_VolumeDepth: 1 + m_ShadowSamplingMode: 2 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/124_CameraStackingClearRT/BottomLeftRT.renderTexture b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/124_CameraStackingClearRT/BottomLeftRT.renderTexture index cae775574c7..f1e9300967a 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/124_CameraStackingClearRT/BottomLeftRT.renderTexture +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/124_CameraStackingClearRT/BottomLeftRT.renderTexture @@ -12,12 +12,13 @@ RenderTexture: Hash: 00000000000000000000000000000000 m_ForcedFallbackFormat: 4 m_DownscaleFallback: 0 - serializedVersion: 3 + m_IsAlphaChannelOptional: 0 + serializedVersion: 5 m_Width: 256 m_Height: 256 m_AntiAliasing: 1 m_MipCount: -1 - m_DepthFormat: 2 + m_DepthStencilFormat: 92 m_ColorFormat: 74 m_MipMap: 0 m_GenerateMips: 1 @@ -35,3 +36,4 @@ RenderTexture: m_WrapW: 1 m_Dimension: 2 m_VolumeDepth: 1 + m_ShadowSamplingMode: 2 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/124_CameraStackingClearRT/BottomLeftTexture.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/124_CameraStackingClearRT/BottomLeftTexture.mat index 68590b67420..f79101cfb66 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/124_CameraStackingClearRT/BottomLeftTexture.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/124_CameraStackingClearRT/BottomLeftTexture.mat @@ -52,10 +52,12 @@ Material: m_Floats: - _AlphaClip: 0 - _Blend: 0 + - _BlendOp: 0 - _BumpScale: 1 - _Cull: 2 - _Cutoff: 0.5 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 0 - _Glossiness: 0 @@ -69,12 +71,13 @@ Material: - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _WorkflowMode: 1 - _ZWrite: 1 m_Colors: - _BaseColor: {r: 1, g: 1, b: 1, a: 1} - - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1} + - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] @@ -90,4 +93,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/124_CameraStackingClearRT/BottomRightRT.renderTexture b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/124_CameraStackingClearRT/BottomRightRT.renderTexture index d78591a562b..595888ab196 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/124_CameraStackingClearRT/BottomRightRT.renderTexture +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/124_CameraStackingClearRT/BottomRightRT.renderTexture @@ -12,12 +12,13 @@ RenderTexture: Hash: 00000000000000000000000000000000 m_ForcedFallbackFormat: 4 m_DownscaleFallback: 0 - serializedVersion: 3 + m_IsAlphaChannelOptional: 0 + serializedVersion: 5 m_Width: 256 m_Height: 256 m_AntiAliasing: 1 m_MipCount: -1 - m_DepthFormat: 2 + m_DepthStencilFormat: 92 m_ColorFormat: 74 m_MipMap: 0 m_GenerateMips: 1 @@ -35,3 +36,4 @@ RenderTexture: m_WrapW: 1 m_Dimension: 2 m_VolumeDepth: 1 + m_ShadowSamplingMode: 2 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/124_CameraStackingClearRT/BottomRightTexture.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/124_CameraStackingClearRT/BottomRightTexture.mat index 567960f6215..41110bef929 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/124_CameraStackingClearRT/BottomRightTexture.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/124_CameraStackingClearRT/BottomRightTexture.mat @@ -52,10 +52,12 @@ Material: m_Floats: - _AlphaClip: 0 - _Blend: 0 + - _BlendOp: 0 - _BumpScale: 1 - _Cull: 2 - _Cutoff: 0.5 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 0 - _Glossiness: 0 @@ -69,12 +71,13 @@ Material: - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _WorkflowMode: 1 - _ZWrite: 1 m_Colors: - _BaseColor: {r: 1, g: 1, b: 1, a: 1} - - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1} + - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] @@ -90,4 +93,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/124_CameraStackingClearRT/TopLeftRT.renderTexture b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/124_CameraStackingClearRT/TopLeftRT.renderTexture index 374f0930a1b..62acd39f9d7 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/124_CameraStackingClearRT/TopLeftRT.renderTexture +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/124_CameraStackingClearRT/TopLeftRT.renderTexture @@ -12,12 +12,13 @@ RenderTexture: Hash: 00000000000000000000000000000000 m_ForcedFallbackFormat: 4 m_DownscaleFallback: 0 - serializedVersion: 3 + m_IsAlphaChannelOptional: 0 + serializedVersion: 5 m_Width: 256 m_Height: 256 m_AntiAliasing: 1 m_MipCount: -1 - m_DepthFormat: 2 + m_DepthStencilFormat: 92 m_ColorFormat: 74 m_MipMap: 0 m_GenerateMips: 1 @@ -35,3 +36,4 @@ RenderTexture: m_WrapW: 1 m_Dimension: 2 m_VolumeDepth: 1 + m_ShadowSamplingMode: 2 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/124_CameraStackingClearRT/TopLeftTexture.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/124_CameraStackingClearRT/TopLeftTexture.mat index 083a02b501f..506d9f25c08 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/124_CameraStackingClearRT/TopLeftTexture.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/124_CameraStackingClearRT/TopLeftTexture.mat @@ -52,10 +52,12 @@ Material: m_Floats: - _AlphaClip: 0 - _Blend: 0 + - _BlendOp: 0 - _BumpScale: 1 - _Cull: 2 - _Cutoff: 0.5 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 0 - _Glossiness: 0 @@ -69,12 +71,13 @@ Material: - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _WorkflowMode: 1 - _ZWrite: 1 m_Colors: - _BaseColor: {r: 1, g: 1, b: 1, a: 1} - - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1} + - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] @@ -90,4 +93,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/124_CameraStackingClearRT/TopRightRT.renderTexture b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/124_CameraStackingClearRT/TopRightRT.renderTexture index 34e0f5acd13..2032566d1a8 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/124_CameraStackingClearRT/TopRightRT.renderTexture +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/124_CameraStackingClearRT/TopRightRT.renderTexture @@ -12,12 +12,13 @@ RenderTexture: Hash: 00000000000000000000000000000000 m_ForcedFallbackFormat: 4 m_DownscaleFallback: 0 - serializedVersion: 3 + m_IsAlphaChannelOptional: 0 + serializedVersion: 5 m_Width: 256 m_Height: 256 m_AntiAliasing: 1 m_MipCount: -1 - m_DepthFormat: 2 + m_DepthStencilFormat: 92 m_ColorFormat: 74 m_MipMap: 0 m_GenerateMips: 1 @@ -35,3 +36,4 @@ RenderTexture: m_WrapW: 1 m_Dimension: 2 m_VolumeDepth: 1 + m_ShadowSamplingMode: 2 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/124_CameraStackingClearRT/TopRightTexture.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/124_CameraStackingClearRT/TopRightTexture.mat index 68107454ca0..1a6f93b7202 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/124_CameraStackingClearRT/TopRightTexture.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/124_CameraStackingClearRT/TopRightTexture.mat @@ -52,10 +52,12 @@ Material: m_Floats: - _AlphaClip: 0 - _Blend: 0 + - _BlendOp: 0 - _BumpScale: 1 - _Cull: 2 - _Cutoff: 0.5 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 0 - _Glossiness: 0 @@ -69,12 +71,13 @@ Material: - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _WorkflowMode: 1 - _ZWrite: 1 m_Colors: - _BaseColor: {r: 1, g: 1, b: 1, a: 1} - - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1} + - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] @@ -90,4 +93,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/126_SampleDepth/ShaderGraphs_SphereIntersector.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/126_SampleDepth/ShaderGraphs_SphereIntersector.mat index 081d767e325..0b9fca28879 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/126_SampleDepth/ShaderGraphs_SphereIntersector.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/126_SampleDepth/ShaderGraphs_SphereIntersector.mat @@ -1,5 +1,18 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!114 &-7047879695928620681 +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: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -46,6 +59,8 @@ Material: m_Floats: - Vector1_77D99915: 0.493 - Vector1_D93EC8F8: 0.495 + - _QueueControl: 0 + - _QueueOffset: 0 m_Colors: - Color_456FBD92: {r: 1, g: 0, b: 0, a: 0.5254902} m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/126_SampleDepth/unlit.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/126_SampleDepth/unlit.mat index e82e6394a21..d07001e14cf 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/126_SampleDepth/unlit.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/126_SampleDepth/unlit.mat @@ -52,10 +52,12 @@ Material: m_Floats: - _AlphaClip: 0 - _Blend: 0 + - _BlendOp: 0 - _BumpScale: 1 - _Cull: 2 - _Cutoff: 0.5 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 0 - _Glossiness: 0 @@ -69,6 +71,7 @@ Material: - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _WorkflowMode: 1 - _ZWrite: 1 @@ -90,4 +93,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/127_ClearRenderTexture/RTT.renderTexture b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/127_ClearRenderTexture/RTT.renderTexture index 44fcebf30a0..bac9a97d9cb 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/127_ClearRenderTexture/RTT.renderTexture +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/127_ClearRenderTexture/RTT.renderTexture @@ -12,12 +12,13 @@ RenderTexture: Hash: 00000000000000000000000000000000 m_ForcedFallbackFormat: 4 m_DownscaleFallback: 0 - serializedVersion: 3 + m_IsAlphaChannelOptional: 0 + serializedVersion: 5 m_Width: 1024 m_Height: 1024 m_AntiAliasing: 1 m_MipCount: -1 - m_DepthFormat: 2 + m_DepthStencilFormat: 92 m_ColorFormat: 8 m_MipMap: 0 m_GenerateMips: 1 @@ -35,3 +36,4 @@ RenderTexture: m_WrapW: 1 m_Dimension: 2 m_VolumeDepth: 1 + m_ShadowSamplingMode: 2 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/127_ClearRenderTexture/Unlit.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/127_ClearRenderTexture/Unlit.mat index 9c48a7abefa..75646c0a4d7 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/127_ClearRenderTexture/Unlit.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/127_ClearRenderTexture/Unlit.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -65,10 +65,12 @@ Material: m_Floats: - _AlphaClip: 0 - _Blend: 0 + - _BlendOp: 0 - _BumpScale: 1 - _Cull: 2 - _Cutoff: 0.5 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 0 - _Glossiness: 0 @@ -82,12 +84,13 @@ Material: - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _WorkflowMode: 1 - _ZWrite: 1 m_Colors: - _BaseColor: {r: 1, g: 1, b: 1, a: 1} - - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1} + - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/128_TBN/LitTBN.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/128_TBN/LitTBN.mat index 38e03e7fa2f..c7169cfe71d 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/128_TBN/LitTBN.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/128_TBN/LitTBN.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -45,6 +45,18 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _EmissionMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -61,32 +73,55 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _SpecGlossMap: 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: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoat: 0 - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 - _Cull: 2 - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 + - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 0 - _Glossiness: 0 - _GlossyReflections: 0 - _Metallic: 1 - _OcclusionStrength: 1 + - _Parallax: 0.005 - _QueueOffset: 0 - _ReceiveShadows: 1 - _Smoothness: 0.5 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _WorkflowMode: 1 - _ZWrite: 1 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/131_ParallaxMapping/LitParallax.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/131_ParallaxMapping/LitParallax.mat index 0f3d21aaa1b..9913f56bf20 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/131_ParallaxMapping/LitParallax.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/131_ParallaxMapping/LitParallax.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!114 &-2905550057155615101 MonoBehaviour: m_ObjectHideFlags: 11 @@ -97,10 +97,22 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + 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} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + 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} @@ -185,6 +197,18 @@ Material: 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: - Vector1_5d53f5f6cf064c3da7cb09a66acbdcea: 0.08 @@ -205,9 +229,11 @@ Material: - _Anisotropy: 0 - _Blend: 0 - _BlendMode: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoat: 0 - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 - _CoatCoverage: 1 - _CoatIOR: 0.5 - _CoatMask: 0 @@ -216,7 +242,9 @@ Material: - _CullModeForward: 2 - _Cutoff: 0.5 - _DepthOffsetEnable: 0 + - _DetailAlbedoMapScale: 1 - _DetailAlbedoScale: 1 + - _DetailNormalMapScale: 1 - _DetailNormalScale: 1 - _DetailSmoothnessScale: 1 - _DiffusionProfile: 0 @@ -242,6 +270,7 @@ Material: - _DoubleSidedNormalMode: 1 - _Drag: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EmissiveColorMode: 1 - _EmissiveExposureWeight: 1 - _EmissiveIntensity: 1 @@ -307,6 +336,7 @@ Material: - _SpecularHighlights: 1 - _SpecularOcclusionMode: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _StencilRef: 0 - _StencilRefDepth: 8 - _StencilRefDistortionVec: 4 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/131_ParallaxMapping/ParallaxMappingNode.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/131_ParallaxMapping/ParallaxMappingNode.mat index ca05f8f2e8b..7ac07aeec63 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/131_ParallaxMapping/ParallaxMappingNode.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/131_ParallaxMapping/ParallaxMappingNode.mat @@ -159,6 +159,19 @@ Material: 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: - Vector1_5d53f5f6cf064c3da7cb09a66acbdcea: 8 - _AORemapMax: 1 @@ -260,6 +273,7 @@ Material: - _PPDPrimitiveWidth: 1 - _Parallax: 0.08 - _PreRefractionPass: 0 + - _QueueControl: 0 - _QueueOffset: 0 - _RayTracing: 0 - _ReceiveShadows: 1 @@ -340,6 +354,19 @@ Material: - _UVMappingMask: {r: 1, g: 0, b: 0, a: 0} - _UVMappingMaskEmissive: {r: 1, g: 0, b: 0, a: 0} m_BuildTextureStacks: [] +--- !u!114 &847778799177982581 +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: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 6 --- !u!114 &3764524467883863570 MonoBehaviour: m_ObjectHideFlags: 11 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/132_DetailMapping/Detail.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/132_DetailMapping/Detail.mat index e923d4cc043..0af6d65f857 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/132_DetailMapping/Detail.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/132_DetailMapping/Detail.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -81,10 +81,23 @@ Material: 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: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoat: 0 - _ClearCoatMask: 0 @@ -95,6 +108,7 @@ Material: - _DetailMode: 0 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 0 - _Glossiness: 0 @@ -108,6 +122,7 @@ Material: - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _WorkflowMode: 1 - _ZWrite: 1 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/132_DetailMapping/Detail_BaseOnly.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/132_DetailMapping/Detail_BaseOnly.mat index 8f5012d79e1..b27e7391301 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/132_DetailMapping/Detail_BaseOnly.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/132_DetailMapping/Detail_BaseOnly.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -97,6 +97,7 @@ Material: m_Floats: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoat: 0 - _ClearCoatMask: 0 @@ -107,6 +108,7 @@ Material: - _DetailMode: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 0 - _Glossiness: 0 @@ -120,6 +122,7 @@ Material: - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _WorkflowMode: 1 - _ZWrite: 1 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/132_DetailMapping/Detail_BaseOnly_Scaled.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/132_DetailMapping/Detail_BaseOnly_Scaled.mat index 07f53656153..4654523a66a 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/132_DetailMapping/Detail_BaseOnly_Scaled.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/132_DetailMapping/Detail_BaseOnly_Scaled.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -81,10 +81,23 @@ Material: 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: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoat: 0 - _ClearCoatMask: 0 @@ -95,6 +108,7 @@ Material: - _DetailMode: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 0 - _Glossiness: 0 @@ -108,6 +122,7 @@ Material: - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _WorkflowMode: 1 - _ZWrite: 1 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/132_DetailMapping/Detail_MainNormal.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/132_DetailMapping/Detail_MainNormal.mat index 22e48666b97..b8b86e600f1 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/132_DetailMapping/Detail_MainNormal.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/132_DetailMapping/Detail_MainNormal.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -81,10 +81,23 @@ Material: 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: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoat: 0 - _ClearCoatMask: 0 @@ -95,6 +108,7 @@ Material: - _DetailMode: 0 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 0 - _Glossiness: 0 @@ -108,6 +122,7 @@ Material: - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _WorkflowMode: 1 - _ZWrite: 1 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/132_DetailMapping/Detail_Mask.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/132_DetailMapping/Detail_Mask.mat index 86ba1fb9bcb..3f0bccd9339 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/132_DetailMapping/Detail_Mask.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/132_DetailMapping/Detail_Mask.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -81,10 +81,23 @@ Material: 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: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoat: 0 - _ClearCoatMask: 0 @@ -95,6 +108,7 @@ Material: - _DetailMode: 0 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 0 - _Glossiness: 0 @@ -108,6 +122,7 @@ Material: - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _WorkflowMode: 1 - _ZWrite: 1 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/132_DetailMapping/Detail_NormalOnly.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/132_DetailMapping/Detail_NormalOnly.mat index 9cf7f29cab1..1a6f45f5e64 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/132_DetailMapping/Detail_NormalOnly.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/132_DetailMapping/Detail_NormalOnly.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -81,10 +81,23 @@ Material: 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: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoat: 0 - _ClearCoatMask: 0 @@ -95,6 +108,7 @@ Material: - _DetailMode: 0 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 0 - _Glossiness: 0 @@ -108,6 +122,7 @@ Material: - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _WorkflowMode: 1 - _ZWrite: 1 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/132_DetailMapping/Detail_NormalOnly_Scaled8x.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/132_DetailMapping/Detail_NormalOnly_Scaled8x.mat index 87531a9af39..8371eaa9f70 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/132_DetailMapping/Detail_NormalOnly_Scaled8x.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/132_DetailMapping/Detail_NormalOnly_Scaled8x.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -97,6 +97,7 @@ Material: m_Floats: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoat: 0 - _ClearCoatMask: 0 @@ -107,6 +108,7 @@ Material: - _DetailMode: 0 - _DetailNormalMapScale: 8 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 0 - _Glossiness: 0 @@ -120,6 +122,7 @@ Material: - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _WorkflowMode: 1 - _ZWrite: 1 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/132_DetailMapping/Detail_Tiling5x.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/132_DetailMapping/Detail_Tiling5x.mat index e2cf68371f7..5cbc817a424 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/132_DetailMapping/Detail_Tiling5x.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/132_DetailMapping/Detail_Tiling5x.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -81,10 +81,23 @@ Material: 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: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoat: 0 - _ClearCoatMask: 0 @@ -95,6 +108,7 @@ Material: - _DetailMode: 0 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 0 - _Glossiness: 0 @@ -108,6 +122,7 @@ Material: - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _WorkflowMode: 1 - _ZWrite: 1 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/147_LightCookies_Shaders/LightCookie_BakedLit.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/147_LightCookies_Shaders/LightCookie_BakedLit.mat index 06d8e887f60..5da9a4db2ae 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/147_LightCookies_Shaders/LightCookie_BakedLit.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/147_LightCookies_Shaders/LightCookie_BakedLit.mat @@ -163,6 +163,7 @@ Material: - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnableHeightBlend: 0 - _EnableInstancedPerPixelNormal: 1 - _EnvironmentReflections: 1 @@ -192,6 +193,7 @@ Material: - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _SubsurfaceIndirect: 0.25 - _SubsurfaceKwToggle: 0 - _Surface: 0 @@ -229,4 +231,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/147_LightCookies_Shaders/LightCookie_Lit.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/147_LightCookies_Shaders/LightCookie_Lit.mat index 11c21a589af..3abf7d1d61f 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/147_LightCookies_Shaders/LightCookie_Lit.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/147_LightCookies_Shaders/LightCookie_Lit.mat @@ -80,6 +80,7 @@ Material: m_Floats: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoatMask: 0 - _ClearCoatSmoothness: 0 @@ -88,6 +89,7 @@ Material: - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 0 - _Glossiness: 0 @@ -101,6 +103,7 @@ Material: - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _WorkflowMode: 1 - _ZWrite: 1 @@ -122,4 +125,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/147_LightCookies_Shaders/LightCookie_Particles_Lit.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/147_LightCookies_Shaders/LightCookie_Particles_Lit.mat index b7c9b8b33e3..a01d23c37c2 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/147_LightCookies_Shaders/LightCookie_Particles_Lit.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/147_LightCookies_Shaders/LightCookie_Particles_Lit.mat @@ -80,6 +80,7 @@ Material: m_Floats: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BlendOp: 0 - _BumpScale: 1 - _CameraFadingEnabled: 0 @@ -97,6 +98,7 @@ Material: - _DistortionStrength: 1 - _DistortionStrengthScaled: 0.1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _FlipbookBlending: 0 - _FlipbookMode: 0 @@ -116,6 +118,7 @@ Material: - _SoftParticlesNearFadeDistance: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _WorkflowMode: 1 - _ZWrite: 1 @@ -140,4 +143,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/147_LightCookies_Shaders/LightCookie_Particles_SimpleLit.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/147_LightCookies_Shaders/LightCookie_Particles_SimpleLit.mat index 7899915d8c2..8afb0b6cf0a 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/147_LightCookies_Shaders/LightCookie_Particles_SimpleLit.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/147_LightCookies_Shaders/LightCookie_Particles_SimpleLit.mat @@ -141,4 +141,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/147_LightCookies_Shaders/LightCookie_Particles_Unlit.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/147_LightCookies_Shaders/LightCookie_Particles_Unlit.mat index d7b8c26de91..9306044bd53 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/147_LightCookies_Shaders/LightCookie_Particles_Unlit.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/147_LightCookies_Shaders/LightCookie_Particles_Unlit.mat @@ -140,4 +140,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/147_LightCookies_Shaders/LightCookie_SG_Lit.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/147_LightCookies_Shaders/LightCookie_SG_Lit.mat index 0d0939f7402..633a919c38f 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/147_LightCookies_Shaders/LightCookie_SG_Lit.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/147_LightCookies_Shaders/LightCookie_SG_Lit.mat @@ -123,4 +123,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/147_LightCookies_Shaders/LightCookie_SG_Unlit.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/147_LightCookies_Shaders/LightCookie_SG_Unlit.mat index ee4b96182b9..3e37064b031 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/147_LightCookies_Shaders/LightCookie_SG_Unlit.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/147_LightCookies_Shaders/LightCookie_SG_Unlit.mat @@ -123,4 +123,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/147_LightCookies_Shaders/LightCookie_SimpleLit.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/147_LightCookies_Shaders/LightCookie_SimpleLit.mat index d65eb7fda07..7ccf2a6c83b 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/147_LightCookies_Shaders/LightCookie_SimpleLit.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/147_LightCookies_Shaders/LightCookie_SimpleLit.mat @@ -80,6 +80,7 @@ Material: m_Floats: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoatMask: 0 - _ClearCoatSmoothness: 0 @@ -88,6 +89,7 @@ Material: - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 0 - _Glossiness: 0 @@ -105,6 +107,7 @@ Material: - _SpecSource: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _WorkflowMode: 1 - _ZWrite: 1 @@ -126,4 +129,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/147_LightCookies_Shaders/LightCookie_Unlit.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/147_LightCookies_Shaders/LightCookie_Unlit.mat index cccc1c063fb..77916a8db66 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/147_LightCookies_Shaders/LightCookie_Unlit.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/147_LightCookies_Shaders/LightCookie_Unlit.mat @@ -89,6 +89,7 @@ Material: - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 0 - _Glossiness: 0 @@ -103,6 +104,7 @@ Material: - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _WorkflowMode: 1 - _ZWrite: 1 @@ -124,4 +126,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/200_Assets/Materials/Floor.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/200_Assets/Materials/Floor.mat index f841c79dc0f..e001e91c2a8 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/200_Assets/Materials/Floor.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/200_Assets/Materials/Floor.mat @@ -98,6 +98,7 @@ Material: - _BillboardKwToggle: 0 - _BillboardShadowFade: 0.5 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BlendOp: 0 - _BumpScale: 1 - _CameraFadingEnabled: 0 @@ -116,6 +117,7 @@ Material: - _DistortionStrength: 1 - _DistortionStrengthScaled: 0.1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 0 - _FlipbookBlending: 0 - _FlipbookMode: 0 @@ -141,6 +143,7 @@ Material: - _SpecSource: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _SubsurfaceIndirect: 0.25 - _SubsurfaceKwToggle: 0 - _Surface: 0 @@ -172,4 +175,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/200_Assets/Materials/SSAO_MAT_LitClean.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/200_Assets/Materials/SSAO_MAT_LitClean.mat index 171d37de124..f5e94d99cf6 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/200_Assets/Materials/SSAO_MAT_LitClean.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/200_Assets/Materials/SSAO_MAT_LitClean.mat @@ -98,6 +98,7 @@ Material: - _BillboardKwToggle: 0 - _BillboardShadowFade: 0.5 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BlendOp: 0 - _BumpScale: 1 - _CameraFadingEnabled: 0 @@ -116,6 +117,7 @@ Material: - _DistortionStrength: 1 - _DistortionStrengthScaled: 0.1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 0 - _FlipbookBlending: 0 - _FlipbookMode: 0 @@ -141,6 +143,7 @@ Material: - _SpecSource: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _SubsurfaceIndirect: 0.25 - _SubsurfaceKwToggle: 0 - _Surface: 0 @@ -172,4 +175,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/200_Assets/Materials/SSAO_MAT_LitNormal.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/200_Assets/Materials/SSAO_MAT_LitNormal.mat index cbf1b5c442b..dd783b4d6b5 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/200_Assets/Materials/SSAO_MAT_LitNormal.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/200_Assets/Materials/SSAO_MAT_LitNormal.mat @@ -98,6 +98,7 @@ Material: - _BillboardKwToggle: 0 - _BillboardShadowFade: 0.5 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BlendOp: 0 - _BumpScale: 2 - _CameraFadingEnabled: 0 @@ -116,6 +117,7 @@ Material: - _DistortionStrength: 1 - _DistortionStrengthScaled: 0.1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 0 - _FlipbookBlending: 0 - _FlipbookMode: 0 @@ -141,6 +143,7 @@ Material: - _SpecSource: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _SubsurfaceIndirect: 0.25 - _SubsurfaceKwToggle: 0 - _Surface: 0 @@ -172,4 +175,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/200_Assets/Materials/SSAO_MAT_LitNormalAlphaClipped.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/200_Assets/Materials/SSAO_MAT_LitNormalAlphaClipped.mat index 1f9b4f62e3c..f45bec70140 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/200_Assets/Materials/SSAO_MAT_LitNormalAlphaClipped.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/200_Assets/Materials/SSAO_MAT_LitNormalAlphaClipped.mat @@ -98,6 +98,7 @@ Material: - _BillboardKwToggle: 0 - _BillboardShadowFade: 0.5 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BlendOp: 0 - _BumpScale: 1 - _CameraFadingEnabled: 0 @@ -116,6 +117,7 @@ Material: - _DistortionStrength: 1 - _DistortionStrengthScaled: 0.1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 0 - _FlipbookBlending: 0 - _FlipbookMode: 0 @@ -141,6 +143,7 @@ Material: - _SpecSource: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _SubsurfaceIndirect: 0.25 - _SubsurfaceKwToggle: 0 - _Surface: 0 @@ -172,4 +175,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/200_Assets/Materials/SSAO_MAT_LitNormalDetailParallax.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/200_Assets/Materials/SSAO_MAT_LitNormalDetailParallax.mat index 48212d5a89c..b5c153fc6e0 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/200_Assets/Materials/SSAO_MAT_LitNormalDetailParallax.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/200_Assets/Materials/SSAO_MAT_LitNormalDetailParallax.mat @@ -98,6 +98,7 @@ Material: - _BillboardKwToggle: 0 - _BillboardShadowFade: 0.5 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BlendOp: 0 - _BumpScale: 0 - _CameraFadingEnabled: 0 @@ -116,6 +117,7 @@ Material: - _DistortionStrength: 1 - _DistortionStrengthScaled: 0.1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 0 - _FlipbookBlending: 0 - _FlipbookMode: 0 @@ -141,6 +143,7 @@ Material: - _SpecSource: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _SubsurfaceIndirect: 0.25 - _SubsurfaceKwToggle: 0 - _Surface: 0 @@ -172,4 +175,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/200_Assets/Materials/SSAO_MAT_LitParticlesAlphaClipped.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/200_Assets/Materials/SSAO_MAT_LitParticlesAlphaClipped.mat index 3454b4a1cdd..e51c52cc471 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/200_Assets/Materials/SSAO_MAT_LitParticlesAlphaClipped.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/200_Assets/Materials/SSAO_MAT_LitParticlesAlphaClipped.mat @@ -78,6 +78,7 @@ Material: - _BillboardKwToggle: 0 - _BillboardShadowFade: 0.5 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BlendOp: 0 - _BumpScale: 1.5 - _CameraFadingEnabled: 0 @@ -91,6 +92,7 @@ Material: - _DistortionStrength: 1 - _DistortionStrengthScaled: 0.1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 0 - _FlipbookBlending: 0 - _FlipbookMode: 0 @@ -115,6 +117,7 @@ Material: - _SpecSource: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _SubsurfaceIndirect: 0.25 - _SubsurfaceKwToggle: 0 - _Surface: 0 @@ -146,4 +149,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/200_Assets/Materials/SSAO_MAT_LitParticlesClean.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/200_Assets/Materials/SSAO_MAT_LitParticlesClean.mat index 4f6f93bf503..fde5c32da34 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/200_Assets/Materials/SSAO_MAT_LitParticlesClean.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/200_Assets/Materials/SSAO_MAT_LitParticlesClean.mat @@ -78,6 +78,7 @@ Material: - _BillboardKwToggle: 0 - _BillboardShadowFade: 0.5 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BlendOp: 0 - _BumpScale: 1.5 - _CameraFadingEnabled: 0 @@ -91,6 +92,7 @@ Material: - _DistortionStrength: 1 - _DistortionStrengthScaled: 0.1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 0 - _FlipbookBlending: 0 - _FlipbookMode: 0 @@ -115,6 +117,7 @@ Material: - _SpecSource: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _SubsurfaceIndirect: 0.25 - _SubsurfaceKwToggle: 0 - _Surface: 0 @@ -146,4 +149,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/200_Assets/Materials/SSAO_MAT_LitParticlesNormal.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/200_Assets/Materials/SSAO_MAT_LitParticlesNormal.mat index ddbbe2307dd..8a10d6b3b9e 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/200_Assets/Materials/SSAO_MAT_LitParticlesNormal.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/200_Assets/Materials/SSAO_MAT_LitParticlesNormal.mat @@ -78,6 +78,7 @@ Material: - _BillboardKwToggle: 0 - _BillboardShadowFade: 0.5 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BlendOp: 0 - _BumpScale: 1.5 - _CameraFadingEnabled: 0 @@ -91,6 +92,7 @@ Material: - _DistortionStrength: 1 - _DistortionStrengthScaled: 0.1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 0 - _FlipbookBlending: 0 - _FlipbookMode: 0 @@ -115,6 +117,7 @@ Material: - _SpecSource: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _SubsurfaceIndirect: 0.25 - _SubsurfaceKwToggle: 0 - _Surface: 0 @@ -146,4 +149,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/200_Assets/Materials/SSAO_MAT_ParticlesSimpleLit.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/200_Assets/Materials/SSAO_MAT_ParticlesSimpleLit.mat index 5f1b0d5b2ed..9bbb44ad133 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/200_Assets/Materials/SSAO_MAT_ParticlesSimpleLit.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/200_Assets/Materials/SSAO_MAT_ParticlesSimpleLit.mat @@ -146,4 +146,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/200_Assets/Materials/SSAO_MAT_ParticlesSimpleLitAlphaClipped.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/200_Assets/Materials/SSAO_MAT_ParticlesSimpleLitAlphaClipped.mat index c2482f38809..a689eb5395b 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/200_Assets/Materials/SSAO_MAT_ParticlesSimpleLitAlphaClipped.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/200_Assets/Materials/SSAO_MAT_ParticlesSimpleLitAlphaClipped.mat @@ -146,4 +146,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/200_Assets/Materials/SSAO_MAT_ParticlesSimpleLitNormal.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/200_Assets/Materials/SSAO_MAT_ParticlesSimpleLitNormal.mat index fcee2770412..28acded3485 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/200_Assets/Materials/SSAO_MAT_ParticlesSimpleLitNormal.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/200_Assets/Materials/SSAO_MAT_ParticlesSimpleLitNormal.mat @@ -146,4 +146,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/200_Assets/Materials/SSAO_MAT_SG_NormalBlend.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/200_Assets/Materials/SSAO_MAT_SG_NormalBlend.mat index 7d4442a669c..6f8e1147901 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/200_Assets/Materials/SSAO_MAT_SG_NormalBlend.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/200_Assets/Materials/SSAO_MAT_SG_NormalBlend.mat @@ -49,6 +49,21 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} m_Ints: [] - m_Floats: [] + m_Floats: + - _QueueControl: 1 + - _QueueOffset: 0 m_Colors: [] m_BuildTextureStacks: [] +--- !u!114 &4561937020678631499 +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: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/200_Assets/Materials/SSAO_MAT_SG_NormalStrength.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/200_Assets/Materials/SSAO_MAT_SG_NormalStrength.mat index 9bc2ffae4a5..91b0d09392b 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/200_Assets/Materials/SSAO_MAT_SG_NormalStrength.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/200_Assets/Materials/SSAO_MAT_SG_NormalStrength.mat @@ -1,5 +1,18 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!114 &-37601213753009020 +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: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -43,5 +56,7 @@ Material: m_Ints: [] m_Floats: - Vector1_C89186F: 1 + - _QueueControl: 1 + - _QueueOffset: 0 m_Colors: [] m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/200_Assets/Materials/SSAO_MAT_SG_NormalTriplanar.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/200_Assets/Materials/SSAO_MAT_SG_NormalTriplanar.mat index 86718c421b7..5ee2a7a4d92 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/200_Assets/Materials/SSAO_MAT_SG_NormalTriplanar.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/200_Assets/Materials/SSAO_MAT_SG_NormalTriplanar.mat @@ -39,7 +39,22 @@ Material: m_Ints: [] m_Floats: - _Blend: 1 + - _QueueControl: 0 + - _QueueOffset: 0 - _Tile: 1 m_Colors: - _Tiling: {r: 2.62, g: 1.37, b: 0, a: 0} m_BuildTextureStacks: [] +--- !u!114 &7230609976969288182 +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: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/200_Assets/Materials/SSAO_MAT_SimpleLitAlphaClippedNormal.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/200_Assets/Materials/SSAO_MAT_SimpleLitAlphaClippedNormal.mat index a4e6adf5941..272fc0ebcac 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/200_Assets/Materials/SSAO_MAT_SimpleLitAlphaClippedNormal.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/200_Assets/Materials/SSAO_MAT_SimpleLitAlphaClippedNormal.mat @@ -78,6 +78,7 @@ Material: - _BillboardKwToggle: 0 - _BillboardShadowFade: 0.5 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BlendOp: 0 - _BumpScale: 1.5 - _CameraFadingEnabled: 0 @@ -91,6 +92,7 @@ Material: - _DistortionStrength: 1 - _DistortionStrengthScaled: 0.1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 0 - _FlipbookBlending: 0 - _FlipbookMode: 0 @@ -115,6 +117,7 @@ Material: - _SpecSource: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _SubsurfaceIndirect: 0.25 - _SubsurfaceKwToggle: 0 - _Surface: 0 @@ -146,4 +149,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/200_Assets/Materials/SSAO_MAT_SimpleLitClean.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/200_Assets/Materials/SSAO_MAT_SimpleLitClean.mat index 6dff646be8f..551a1174c47 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/200_Assets/Materials/SSAO_MAT_SimpleLitClean.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/200_Assets/Materials/SSAO_MAT_SimpleLitClean.mat @@ -78,6 +78,7 @@ Material: - _BillboardKwToggle: 0 - _BillboardShadowFade: 0.5 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BlendOp: 0 - _BumpScale: 1.5 - _CameraFadingEnabled: 0 @@ -91,6 +92,7 @@ Material: - _DistortionStrength: 1 - _DistortionStrengthScaled: 0.1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 0 - _FlipbookBlending: 0 - _FlipbookMode: 0 @@ -115,6 +117,7 @@ Material: - _SpecSource: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _SubsurfaceIndirect: 0.25 - _SubsurfaceKwToggle: 0 - _Surface: 0 @@ -146,4 +149,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/200_Assets/Materials/SSAO_MAT_SimpleLitNormal.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/200_Assets/Materials/SSAO_MAT_SimpleLitNormal.mat index c2590d91b78..2752e8c0274 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/200_Assets/Materials/SSAO_MAT_SimpleLitNormal.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/200_Assets/Materials/SSAO_MAT_SimpleLitNormal.mat @@ -78,6 +78,7 @@ Material: - _BillboardKwToggle: 0 - _BillboardShadowFade: 0.5 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BlendOp: 0 - _BumpScale: 1.5 - _CameraFadingEnabled: 0 @@ -91,6 +92,7 @@ Material: - _DistortionStrength: 1 - _DistortionStrengthScaled: 0.1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 0 - _FlipbookBlending: 0 - _FlipbookMode: 0 @@ -115,6 +117,7 @@ Material: - _SpecSource: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _SubsurfaceIndirect: 0.25 - _SubsurfaceKwToggle: 0 - _Surface: 0 @@ -146,4 +149,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/200_Assets/Materials/SSAO_MAT_Unlit.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/200_Assets/Materials/SSAO_MAT_Unlit.mat index fbf2f21018d..699ed4554db 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/200_Assets/Materials/SSAO_MAT_Unlit.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/200_Assets/Materials/SSAO_MAT_Unlit.mat @@ -116,6 +116,7 @@ Material: - _DistortionStrength: 1 - _DistortionStrengthScaled: 0.1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 0 - _FlipbookBlending: 0 - _FlipbookMode: 0 @@ -142,6 +143,7 @@ Material: - _SpecSource: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _SubsurfaceIndirect: 0.25 - _SubsurfaceKwToggle: 0 - _Surface: 0 @@ -173,4 +175,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/200_Assets/Materials/SSAO_MAT_UnlitParticlesAlphaClipped.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/200_Assets/Materials/SSAO_MAT_UnlitParticlesAlphaClipped.mat index 3c05c626080..9c4a9cf34d7 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/200_Assets/Materials/SSAO_MAT_UnlitParticlesAlphaClipped.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/200_Assets/Materials/SSAO_MAT_UnlitParticlesAlphaClipped.mat @@ -146,4 +146,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/200_Assets/Materials/SSAO_MAT_UnlitParticlesClean.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/200_Assets/Materials/SSAO_MAT_UnlitParticlesClean.mat index b9f2714570b..7ca05eea828 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/200_Assets/Materials/SSAO_MAT_UnlitParticlesClean.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/200_Assets/Materials/SSAO_MAT_UnlitParticlesClean.mat @@ -146,4 +146,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/200_Assets/Materials/SSAO_MAT_UnlitParticlesNormal.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/200_Assets/Materials/SSAO_MAT_UnlitParticlesNormal.mat index a831387827c..eb9dd89c0d2 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/200_Assets/Materials/SSAO_MAT_UnlitParticlesNormal.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/200_Assets/Materials/SSAO_MAT_UnlitParticlesNormal.mat @@ -146,4 +146,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/206_Motion_Vectors/SGMaterial.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/206_Motion_Vectors/SGMaterial.mat index 6daaa2021ab..b4938749368 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/206_Motion_Vectors/SGMaterial.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/206_Motion_Vectors/SGMaterial.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -46,6 +46,8 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} m_Ints: [] - m_Floats: [] + m_Floats: + - _QueueControl: 0 + - _QueueOffset: 0 m_Colors: [] m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/230_Decals/Materials/Brick.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/230_Decals/Materials/Brick.mat index 02249ca0b3c..e3918ceb9fb 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/230_Decals/Materials/Brick.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/230_Decals/Materials/Brick.mat @@ -122,4 +122,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/230_Decals/Materials/LitRed.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/230_Decals/Materials/LitRed.mat index 98fddc3951f..5c568f7a1af 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/230_Decals/Materials/LitRed.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/230_Decals/Materials/LitRed.mat @@ -95,6 +95,7 @@ Material: - _Metallic: 0 - _OcclusionStrength: 0.387 - _Parallax: 0.0477 + - _QueueControl: 0 - _QueueOffset: 0 - _ReceiveShadows: 1 - _Smoothness: 0.742 @@ -123,4 +124,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/230_Decals/Materials/UnlitRed.mat b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/230_Decals/Materials/UnlitRed.mat index a32aeccfda4..38bc4fafe7c 100644 --- a/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/230_Decals/Materials/UnlitRed.mat +++ b/TestProjects/UniversalGraphicsTest_Foundation/Assets/Scenes/230_Decals/Materials/UnlitRed.mat @@ -95,6 +95,7 @@ Material: - _Metallic: 0 - _OcclusionStrength: 0.387 - _Parallax: 0.0477 + - _QueueControl: 0 - _QueueOffset: 0 - _ReceiveShadows: 1 - _Smoothness: 0.742 @@ -124,4 +125,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Lighting/Assets/CommonAssets/Materials/CeramicTiles.mat b/TestProjects/UniversalGraphicsTest_Lighting/Assets/CommonAssets/Materials/CeramicTiles.mat index a8480b79015..ba50091c0d3 100644 --- a/TestProjects/UniversalGraphicsTest_Lighting/Assets/CommonAssets/Materials/CeramicTiles.mat +++ b/TestProjects/UniversalGraphicsTest_Lighting/Assets/CommonAssets/Materials/CeramicTiles.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -89,17 +89,33 @@ Material: 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: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoat: 0 - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 - _Cull: 2 - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 0.5 @@ -118,6 +134,7 @@ Material: - _SpecSource: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _WorkflowMode: 1 diff --git a/TestProjects/UniversalGraphicsTest_Lighting/Assets/CommonAssets/Materials/CornellBox.mat b/TestProjects/UniversalGraphicsTest_Lighting/Assets/CommonAssets/Materials/CornellBox.mat index 1882372c75d..731d4a581ae 100644 --- a/TestProjects/UniversalGraphicsTest_Lighting/Assets/CommonAssets/Materials/CornellBox.mat +++ b/TestProjects/UniversalGraphicsTest_Lighting/Assets/CommonAssets/Materials/CornellBox.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -97,11 +97,13 @@ Material: m_Floats: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _Cull: 2 - _Cutoff: 0.5 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _GlossMapScale: 1 - _Glossiness: 0.5 - _GlossinessSource: 0 @@ -120,6 +122,7 @@ Material: - _SpecSource: 0 - _SpecularHighlights: 0 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _ZWrite: 1 diff --git a/TestProjects/UniversalGraphicsTest_Lighting/Assets/CommonAssets/Materials/CornellBox_green.mat b/TestProjects/UniversalGraphicsTest_Lighting/Assets/CommonAssets/Materials/CornellBox_green.mat index b29c8b34e94..7f4dcf1832d 100644 --- a/TestProjects/UniversalGraphicsTest_Lighting/Assets/CommonAssets/Materials/CornellBox_green.mat +++ b/TestProjects/UniversalGraphicsTest_Lighting/Assets/CommonAssets/Materials/CornellBox_green.mat @@ -68,15 +68,29 @@ Material: 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: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _Cull: 2 - _Cutoff: 0.5 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _GlossMapScale: 1 - _Glossiness: 0.5 - _GlossinessSource: 0 @@ -95,6 +109,7 @@ Material: - _SpecSource: 0 - _SpecularHighlights: 0 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _ZWrite: 1 @@ -117,4 +132,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Lighting/Assets/CommonAssets/Materials/CornellBox_red.mat b/TestProjects/UniversalGraphicsTest_Lighting/Assets/CommonAssets/Materials/CornellBox_red.mat index 4853141bb0f..72308f8800c 100644 --- a/TestProjects/UniversalGraphicsTest_Lighting/Assets/CommonAssets/Materials/CornellBox_red.mat +++ b/TestProjects/UniversalGraphicsTest_Lighting/Assets/CommonAssets/Materials/CornellBox_red.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -81,15 +81,29 @@ Material: 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: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _Cull: 2 - _Cutoff: 0.5 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _GlossMapScale: 1 - _Glossiness: 0.5 - _GlossinessSource: 0 @@ -108,6 +122,7 @@ Material: - _SpecSource: 0 - _SpecularHighlights: 0 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _ZWrite: 1 diff --git a/TestProjects/UniversalGraphicsTest_Lighting/Assets/CommonAssets/Materials/Fully_Metalic.mat b/TestProjects/UniversalGraphicsTest_Lighting/Assets/CommonAssets/Materials/Fully_Metalic.mat index 65b2b085ed2..b6dd5c0a627 100644 --- a/TestProjects/UniversalGraphicsTest_Lighting/Assets/CommonAssets/Materials/Fully_Metalic.mat +++ b/TestProjects/UniversalGraphicsTest_Lighting/Assets/CommonAssets/Materials/Fully_Metalic.mat @@ -80,6 +80,7 @@ Material: m_Floats: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoatMask: 0 - _ClearCoatSmoothness: 0 @@ -88,6 +89,7 @@ Material: - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 0 - _Glossiness: 0 @@ -101,6 +103,7 @@ Material: - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _WorkflowMode: 1 - _ZWrite: 1 @@ -122,4 +125,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Lighting/Assets/CommonAssets/Materials/LW_Diffuse.mat b/TestProjects/UniversalGraphicsTest_Lighting/Assets/CommonAssets/Materials/LW_Diffuse.mat index 992e51dc8a5..7eea823dd5f 100644 --- a/TestProjects/UniversalGraphicsTest_Lighting/Assets/CommonAssets/Materials/LW_Diffuse.mat +++ b/TestProjects/UniversalGraphicsTest_Lighting/Assets/CommonAssets/Materials/LW_Diffuse.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -85,11 +85,13 @@ Material: m_Floats: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _Cull: 2 - _Cutoff: 0.5 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _GlossMapScale: 1 - _Glossiness: 0.5 - _GlossinessSource: 0 @@ -104,6 +106,7 @@ Material: - _SpecSource: 0 - _SpecularHighlights: 0 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _ZWrite: 1 diff --git a/TestProjects/UniversalGraphicsTest_Lighting/Assets/CommonAssets/Materials/LW_Material.mat b/TestProjects/UniversalGraphicsTest_Lighting/Assets/CommonAssets/Materials/LW_Material.mat index 371e2b1a2de..14b20a2b4aa 100644 --- a/TestProjects/UniversalGraphicsTest_Lighting/Assets/CommonAssets/Materials/LW_Material.mat +++ b/TestProjects/UniversalGraphicsTest_Lighting/Assets/CommonAssets/Materials/LW_Material.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -81,17 +81,33 @@ Material: 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: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoat: 0 - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 - _Cull: 2 - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 0.5 @@ -105,6 +121,7 @@ Material: - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _WorkflowMode: 1 diff --git a/TestProjects/UniversalGraphicsTest_Lighting/Assets/CommonAssets/Materials/Matte.mat b/TestProjects/UniversalGraphicsTest_Lighting/Assets/CommonAssets/Materials/Matte.mat index 2c0a9bc0ae9..c0b9765ac61 100644 --- a/TestProjects/UniversalGraphicsTest_Lighting/Assets/CommonAssets/Materials/Matte.mat +++ b/TestProjects/UniversalGraphicsTest_Lighting/Assets/CommonAssets/Materials/Matte.mat @@ -68,17 +68,33 @@ Material: 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: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoat: 0 - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 - _Cull: 2 - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 1 @@ -93,6 +109,7 @@ Material: - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _WorkflowMode: 1 @@ -115,4 +132,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Lighting/Assets/CommonAssets/Meshes/BenchDrill/materials/kabel.mat b/TestProjects/UniversalGraphicsTest_Lighting/Assets/CommonAssets/Meshes/BenchDrill/materials/kabel.mat index df203555925..2478a965e66 100644 --- a/TestProjects/UniversalGraphicsTest_Lighting/Assets/CommonAssets/Meshes/BenchDrill/materials/kabel.mat +++ b/TestProjects/UniversalGraphicsTest_Lighting/Assets/CommonAssets/Meshes/BenchDrill/materials/kabel.mat @@ -76,17 +76,33 @@ Material: 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: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoat: 0 - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 - _Cull: 2 - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 0 @@ -105,6 +121,7 @@ Material: - _SpecSource: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _WorkflowMode: 1 @@ -127,4 +144,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Lighting/Assets/CommonAssets/Meshes/BenchDrill/materials/korpus.mat b/TestProjects/UniversalGraphicsTest_Lighting/Assets/CommonAssets/Meshes/BenchDrill/materials/korpus.mat index de9bf30728b..ef90378d2b6 100644 --- a/TestProjects/UniversalGraphicsTest_Lighting/Assets/CommonAssets/Meshes/BenchDrill/materials/korpus.mat +++ b/TestProjects/UniversalGraphicsTest_Lighting/Assets/CommonAssets/Meshes/BenchDrill/materials/korpus.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -89,17 +89,33 @@ Material: 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: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoat: 0 - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 - _Cull: 2 - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 0 @@ -118,6 +134,7 @@ Material: - _SpecSource: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _WorkflowMode: 1 diff --git a/TestProjects/UniversalGraphicsTest_Lighting/Assets/CommonAssets/Meshes/BenchDrill/materials/kozhuh.mat b/TestProjects/UniversalGraphicsTest_Lighting/Assets/CommonAssets/Meshes/BenchDrill/materials/kozhuh.mat index 1096a7d0da0..232b6c61892 100644 --- a/TestProjects/UniversalGraphicsTest_Lighting/Assets/CommonAssets/Meshes/BenchDrill/materials/kozhuh.mat +++ b/TestProjects/UniversalGraphicsTest_Lighting/Assets/CommonAssets/Meshes/BenchDrill/materials/kozhuh.mat @@ -76,17 +76,33 @@ Material: 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: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoat: 0 - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 - _Cull: 2 - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 0 @@ -105,6 +121,7 @@ Material: - _SpecSource: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _WorkflowMode: 1 @@ -127,4 +144,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Lighting/Assets/CommonAssets/Meshes/BenchDrill/materials/motor.mat b/TestProjects/UniversalGraphicsTest_Lighting/Assets/CommonAssets/Meshes/BenchDrill/materials/motor.mat index d0c1e489f02..8d960549da7 100644 --- a/TestProjects/UniversalGraphicsTest_Lighting/Assets/CommonAssets/Meshes/BenchDrill/materials/motor.mat +++ b/TestProjects/UniversalGraphicsTest_Lighting/Assets/CommonAssets/Meshes/BenchDrill/materials/motor.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -89,17 +89,33 @@ Material: 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: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoat: 0 - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 - _Cull: 2 - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 0 @@ -118,6 +134,7 @@ Material: - _SpecSource: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _WorkflowMode: 1 diff --git a/TestProjects/UniversalGraphicsTest_Lighting/Assets/CommonAssets/Meshes/BenchDrill/materials/spindle.mat b/TestProjects/UniversalGraphicsTest_Lighting/Assets/CommonAssets/Meshes/BenchDrill/materials/spindle.mat index 9240ec7263e..a3c0c732d29 100644 --- a/TestProjects/UniversalGraphicsTest_Lighting/Assets/CommonAssets/Meshes/BenchDrill/materials/spindle.mat +++ b/TestProjects/UniversalGraphicsTest_Lighting/Assets/CommonAssets/Meshes/BenchDrill/materials/spindle.mat @@ -76,17 +76,33 @@ Material: 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: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoat: 0 - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 - _Cull: 2 - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 0 @@ -105,6 +121,7 @@ Material: - _SpecSource: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _WorkflowMode: 1 @@ -127,4 +144,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Lighting/Assets/CommonAssets/Meshes/BenchDrill/materials/stanina.mat b/TestProjects/UniversalGraphicsTest_Lighting/Assets/CommonAssets/Meshes/BenchDrill/materials/stanina.mat index c87ed16e5e6..244ae0f447b 100644 --- a/TestProjects/UniversalGraphicsTest_Lighting/Assets/CommonAssets/Meshes/BenchDrill/materials/stanina.mat +++ b/TestProjects/UniversalGraphicsTest_Lighting/Assets/CommonAssets/Meshes/BenchDrill/materials/stanina.mat @@ -76,17 +76,33 @@ Material: 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: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoat: 0 - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 - _Cull: 2 - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 0 @@ -105,6 +121,7 @@ Material: - _SpecSource: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _WorkflowMode: 1 @@ -127,4 +144,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Lighting/Assets/CommonAssets/Meshes/BenchDrill/materials/stanina_vk.mat b/TestProjects/UniversalGraphicsTest_Lighting/Assets/CommonAssets/Meshes/BenchDrill/materials/stanina_vk.mat index 16ecdd4146a..03441227ea2 100644 --- a/TestProjects/UniversalGraphicsTest_Lighting/Assets/CommonAssets/Meshes/BenchDrill/materials/stanina_vk.mat +++ b/TestProjects/UniversalGraphicsTest_Lighting/Assets/CommonAssets/Meshes/BenchDrill/materials/stanina_vk.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -89,17 +89,33 @@ Material: 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: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoat: 0 - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 - _Cull: 2 - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 0 @@ -118,6 +134,7 @@ Material: - _SpecSource: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _WorkflowMode: 1 diff --git a/TestProjects/UniversalGraphicsTest_Lighting/Assets/CommonAssets/Meshes/BenchDrill/materials/top.mat b/TestProjects/UniversalGraphicsTest_Lighting/Assets/CommonAssets/Meshes/BenchDrill/materials/top.mat index 55bee70824d..d8b5f2b4673 100644 --- a/TestProjects/UniversalGraphicsTest_Lighting/Assets/CommonAssets/Meshes/BenchDrill/materials/top.mat +++ b/TestProjects/UniversalGraphicsTest_Lighting/Assets/CommonAssets/Meshes/BenchDrill/materials/top.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -89,17 +89,33 @@ Material: 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: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoat: 0 - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 - _Cull: 2 - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 0 @@ -118,6 +134,7 @@ Material: - _SpecSource: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _WorkflowMode: 1 diff --git a/TestProjects/UniversalGraphicsTest_Lighting/Assets/CommonAssets/Meshes/BenchDrill/materials/val.mat b/TestProjects/UniversalGraphicsTest_Lighting/Assets/CommonAssets/Meshes/BenchDrill/materials/val.mat index b64f22e3e1f..5e3a5519a62 100644 --- a/TestProjects/UniversalGraphicsTest_Lighting/Assets/CommonAssets/Meshes/BenchDrill/materials/val.mat +++ b/TestProjects/UniversalGraphicsTest_Lighting/Assets/CommonAssets/Meshes/BenchDrill/materials/val.mat @@ -76,17 +76,33 @@ Material: 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: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoat: 0 - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 - _Cull: 2 - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 0 @@ -105,6 +121,7 @@ Material: - _SpecSource: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _WorkflowMode: 1 @@ -127,4 +144,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Lighting/Assets/EditModeTestAssets/Lighting_ReflectionProbeBaking/contents/blue_emissive.mat b/TestProjects/UniversalGraphicsTest_Lighting/Assets/EditModeTestAssets/Lighting_ReflectionProbeBaking/contents/blue_emissive.mat index e9ce9a046cb..96d2ec06eef 100644 --- a/TestProjects/UniversalGraphicsTest_Lighting/Assets/EditModeTestAssets/Lighting_ReflectionProbeBaking/contents/blue_emissive.mat +++ b/TestProjects/UniversalGraphicsTest_Lighting/Assets/EditModeTestAssets/Lighting_ReflectionProbeBaking/contents/blue_emissive.mat @@ -80,6 +80,7 @@ Material: m_Floats: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoatMask: 0 - _ClearCoatSmoothness: 0 @@ -88,6 +89,7 @@ Material: - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 0 - _Glossiness: 0 @@ -101,6 +103,7 @@ Material: - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _WorkflowMode: 0 - _ZWrite: 1 @@ -122,4 +125,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Lighting/Assets/EditModeTestAssets/Lighting_ReflectionProbeBaking/contents/green_emissive.mat b/TestProjects/UniversalGraphicsTest_Lighting/Assets/EditModeTestAssets/Lighting_ReflectionProbeBaking/contents/green_emissive.mat index 4c4eb4bc930..6a2d10a3ac3 100644 --- a/TestProjects/UniversalGraphicsTest_Lighting/Assets/EditModeTestAssets/Lighting_ReflectionProbeBaking/contents/green_emissive.mat +++ b/TestProjects/UniversalGraphicsTest_Lighting/Assets/EditModeTestAssets/Lighting_ReflectionProbeBaking/contents/green_emissive.mat @@ -80,6 +80,7 @@ Material: m_Floats: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoatMask: 0 - _ClearCoatSmoothness: 0 @@ -88,6 +89,7 @@ Material: - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 0 - _Glossiness: 0 @@ -101,6 +103,7 @@ Material: - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _WorkflowMode: 0 - _ZWrite: 1 @@ -122,4 +125,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Lighting/Assets/EditModeTestAssets/Lighting_ReflectionProbeBaking/contents/grey.mat b/TestProjects/UniversalGraphicsTest_Lighting/Assets/EditModeTestAssets/Lighting_ReflectionProbeBaking/contents/grey.mat index 5ee97b410f9..317c55948f6 100644 --- a/TestProjects/UniversalGraphicsTest_Lighting/Assets/EditModeTestAssets/Lighting_ReflectionProbeBaking/contents/grey.mat +++ b/TestProjects/UniversalGraphicsTest_Lighting/Assets/EditModeTestAssets/Lighting_ReflectionProbeBaking/contents/grey.mat @@ -80,6 +80,7 @@ Material: m_Floats: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoatMask: 0 - _ClearCoatSmoothness: 0 @@ -88,6 +89,7 @@ Material: - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 0 - _Glossiness: 0 @@ -101,6 +103,7 @@ Material: - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _WorkflowMode: 0 - _ZWrite: 1 @@ -122,4 +125,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Lighting/Assets/EditModeTestAssets/Lighting_ReflectionProbeBaking/contents/red_emissive.mat b/TestProjects/UniversalGraphicsTest_Lighting/Assets/EditModeTestAssets/Lighting_ReflectionProbeBaking/contents/red_emissive.mat index 1be7aea0a9b..bf0021805a3 100644 --- a/TestProjects/UniversalGraphicsTest_Lighting/Assets/EditModeTestAssets/Lighting_ReflectionProbeBaking/contents/red_emissive.mat +++ b/TestProjects/UniversalGraphicsTest_Lighting/Assets/EditModeTestAssets/Lighting_ReflectionProbeBaking/contents/red_emissive.mat @@ -80,6 +80,7 @@ Material: m_Floats: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoatMask: 0 - _ClearCoatSmoothness: 0 @@ -88,6 +89,7 @@ Material: - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 0 - _Glossiness: 0 @@ -101,6 +103,7 @@ Material: - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _WorkflowMode: 0 - _ZWrite: 1 @@ -122,4 +125,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Lighting/Assets/EditModeTestAssets/Lighting_ReflectionProbeBaking/contents/sphere.mat b/TestProjects/UniversalGraphicsTest_Lighting/Assets/EditModeTestAssets/Lighting_ReflectionProbeBaking/contents/sphere.mat index f95f12d9d64..153ed6dc2ae 100644 --- a/TestProjects/UniversalGraphicsTest_Lighting/Assets/EditModeTestAssets/Lighting_ReflectionProbeBaking/contents/sphere.mat +++ b/TestProjects/UniversalGraphicsTest_Lighting/Assets/EditModeTestAssets/Lighting_ReflectionProbeBaking/contents/sphere.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -93,6 +93,7 @@ Material: m_Floats: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoatMask: 0 - _ClearCoatSmoothness: 0 @@ -101,6 +102,7 @@ Material: - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 0 - _Glossiness: 0 @@ -114,6 +116,7 @@ Material: - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _WorkflowMode: 0 - _ZWrite: 1 diff --git a/TestProjects/UniversalGraphicsTest_Lighting/Assets/Scenes/005_LitBakedEmission/005_LitBakeEmission_Sphere.mat b/TestProjects/UniversalGraphicsTest_Lighting/Assets/Scenes/005_LitBakedEmission/005_LitBakeEmission_Sphere.mat index 4575423dd3a..825fe11f063 100644 --- a/TestProjects/UniversalGraphicsTest_Lighting/Assets/Scenes/005_LitBakedEmission/005_LitBakeEmission_Sphere.mat +++ b/TestProjects/UniversalGraphicsTest_Lighting/Assets/Scenes/005_LitBakedEmission/005_LitBakeEmission_Sphere.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -81,15 +81,29 @@ Material: 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: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _Cull: 2 - _Cutoff: 0.5 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _GlossMapScale: 1 - _Glossiness: 0.5 - _GlossinessSource: 0 @@ -108,6 +122,7 @@ Material: - _SpecSource: 0 - _SpecularHighlights: 0 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _ZWrite: 1 diff --git a/TestProjects/UniversalGraphicsTest_Lighting/Assets/Scenes/006_LitShaderLightProbes/006_LitShaderLightProbes_Sphere.mat b/TestProjects/UniversalGraphicsTest_Lighting/Assets/Scenes/006_LitShaderLightProbes/006_LitShaderLightProbes_Sphere.mat index 0cc039dffac..9d08c04932f 100644 --- a/TestProjects/UniversalGraphicsTest_Lighting/Assets/Scenes/006_LitShaderLightProbes/006_LitShaderLightProbes_Sphere.mat +++ b/TestProjects/UniversalGraphicsTest_Lighting/Assets/Scenes/006_LitShaderLightProbes/006_LitShaderLightProbes_Sphere.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -81,15 +81,29 @@ Material: 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: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _Cull: 2 - _Cutoff: 0.5 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _GlossMapScale: 1 - _Glossiness: 0.5 - _GlossinessSource: 0 @@ -108,6 +122,7 @@ Material: - _SpecSource: 0 - _SpecularHighlights: 0 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _ZWrite: 1 diff --git a/TestProjects/UniversalGraphicsTest_Lighting/Assets/Scenes/017_Lighting_Scene_DirectionalBaked/CutoutBaked.mat b/TestProjects/UniversalGraphicsTest_Lighting/Assets/Scenes/017_Lighting_Scene_DirectionalBaked/CutoutBaked.mat index a047104c9c4..11c34e7c52a 100644 --- a/TestProjects/UniversalGraphicsTest_Lighting/Assets/Scenes/017_Lighting_Scene_DirectionalBaked/CutoutBaked.mat +++ b/TestProjects/UniversalGraphicsTest_Lighting/Assets/Scenes/017_Lighting_Scene_DirectionalBaked/CutoutBaked.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -45,6 +45,18 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _EmissionMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -61,32 +73,55 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _SpecGlossMap: 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: - _AlphaClip: 1 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoat: 0 - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 - _Cull: 0 - _Cutoff: 0.402 + - _DetailAlbedoMapScale: 1 + - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 0 - _Glossiness: 0 - _GlossyReflections: 0 - _Metallic: 0 - _OcclusionStrength: 1 + - _Parallax: 0.005 - _QueueOffset: 0 - _ReceiveShadows: 1 - _Smoothness: 0.5 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _WorkflowMode: 1 - _ZWrite: 1 diff --git a/TestProjects/UniversalGraphicsTest_Lighting/Assets/Scenes/034_Shader_HighlightsEnvironmentGradientBaked/Materials/034_Hole_mesh.mat b/TestProjects/UniversalGraphicsTest_Lighting/Assets/Scenes/034_Shader_HighlightsEnvironmentGradientBaked/Materials/034_Hole_mesh.mat index a9aa42033c9..7b9587c8dae 100644 --- a/TestProjects/UniversalGraphicsTest_Lighting/Assets/Scenes/034_Shader_HighlightsEnvironmentGradientBaked/Materials/034_Hole_mesh.mat +++ b/TestProjects/UniversalGraphicsTest_Lighting/Assets/Scenes/034_Shader_HighlightsEnvironmentGradientBaked/Materials/034_Hole_mesh.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -105,6 +105,7 @@ Material: m_Floats: - _AlphaClip: 1 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoat: 0 - _ClearCoatMask: 0 @@ -114,6 +115,7 @@ Material: - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 0.75 - _Glossiness: 0.5 @@ -132,6 +134,7 @@ Material: - _SpecSource: 0 - _SpecularHighlights: 0 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _WorkflowMode: 1 diff --git a/TestProjects/UniversalGraphicsTest_Lighting/Assets/Scenes/034_Shader_HighlightsEnvironmentGradientBaked/Materials/034_Hole_mesh_highlights.mat b/TestProjects/UniversalGraphicsTest_Lighting/Assets/Scenes/034_Shader_HighlightsEnvironmentGradientBaked/Materials/034_Hole_mesh_highlights.mat index 5a3d9172aab..dac8c8f846d 100644 --- a/TestProjects/UniversalGraphicsTest_Lighting/Assets/Scenes/034_Shader_HighlightsEnvironmentGradientBaked/Materials/034_Hole_mesh_highlights.mat +++ b/TestProjects/UniversalGraphicsTest_Lighting/Assets/Scenes/034_Shader_HighlightsEnvironmentGradientBaked/Materials/034_Hole_mesh_highlights.mat @@ -92,6 +92,7 @@ Material: m_Floats: - _AlphaClip: 1 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoat: 0 - _ClearCoatMask: 0 @@ -101,6 +102,7 @@ Material: - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 0.75 - _Glossiness: 0.5 @@ -119,6 +121,7 @@ Material: - _SpecSource: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _WorkflowMode: 1 @@ -141,4 +144,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Lighting/Assets/Scenes/034_Shader_HighlightsEnvironmentGradientBaked/Materials/034_IndustrialGlass.mat b/TestProjects/UniversalGraphicsTest_Lighting/Assets/Scenes/034_Shader_HighlightsEnvironmentGradientBaked/Materials/034_IndustrialGlass.mat index 3b9982dbda3..14e4cccd264 100644 --- a/TestProjects/UniversalGraphicsTest_Lighting/Assets/Scenes/034_Shader_HighlightsEnvironmentGradientBaked/Materials/034_IndustrialGlass.mat +++ b/TestProjects/UniversalGraphicsTest_Lighting/Assets/Scenes/034_Shader_HighlightsEnvironmentGradientBaked/Materials/034_IndustrialGlass.mat @@ -94,7 +94,8 @@ Material: m_Ints: [] m_Floats: - _AlphaClip: 0 - - _Blend: 1 + - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoat: 0 - _ClearCoatMask: 0 @@ -104,6 +105,7 @@ Material: - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 10 + - _DstBlendAlpha: 10 - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 0.5 @@ -122,6 +124,7 @@ Material: - _SpecSource: 0 - _SpecularHighlights: 0 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 1 - _UVSec: 0 - _WorkflowMode: 1 @@ -144,4 +147,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Lighting/Assets/Scenes/034_Shader_HighlightsEnvironmentGradientBaked/Materials/034_IndustrialGlass_highlights.mat b/TestProjects/UniversalGraphicsTest_Lighting/Assets/Scenes/034_Shader_HighlightsEnvironmentGradientBaked/Materials/034_IndustrialGlass_highlights.mat index 4f3fd39491c..2b9cb92d7e7 100644 --- a/TestProjects/UniversalGraphicsTest_Lighting/Assets/Scenes/034_Shader_HighlightsEnvironmentGradientBaked/Materials/034_IndustrialGlass_highlights.mat +++ b/TestProjects/UniversalGraphicsTest_Lighting/Assets/Scenes/034_Shader_HighlightsEnvironmentGradientBaked/Materials/034_IndustrialGlass_highlights.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -106,7 +106,8 @@ Material: m_Ints: [] m_Floats: - _AlphaClip: 0 - - _Blend: 1 + - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoat: 0 - _ClearCoatMask: 0 @@ -116,6 +117,7 @@ Material: - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 10 + - _DstBlendAlpha: 10 - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 0.5 @@ -134,6 +136,7 @@ Material: - _SpecSource: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 1 - _UVSec: 0 - _WorkflowMode: 1 diff --git a/TestProjects/UniversalGraphicsTest_Lighting/Assets/Scenes/034_Shader_HighlightsEnvironmentGradientBaked/Materials/034_Roofing.mat b/TestProjects/UniversalGraphicsTest_Lighting/Assets/Scenes/034_Shader_HighlightsEnvironmentGradientBaked/Materials/034_Roofing.mat index e92c5028f02..34c3be22c65 100644 --- a/TestProjects/UniversalGraphicsTest_Lighting/Assets/Scenes/034_Shader_HighlightsEnvironmentGradientBaked/Materials/034_Roofing.mat +++ b/TestProjects/UniversalGraphicsTest_Lighting/Assets/Scenes/034_Shader_HighlightsEnvironmentGradientBaked/Materials/034_Roofing.mat @@ -95,6 +95,7 @@ Material: m_Floats: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 0 - _BumpScale: 1 - _ClearCoat: 0 - _ClearCoatMask: 0 @@ -104,6 +105,7 @@ Material: - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 10 + - _DstBlendAlpha: 10 - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 0.5 @@ -122,6 +124,7 @@ Material: - _SpecSource: 0 - _SpecularHighlights: 0 - _SrcBlend: 5 + - _SrcBlendAlpha: 1 - _Surface: 1 - _UVSec: 0 - _WorkflowMode: 1 @@ -144,4 +147,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Lighting/Assets/Scenes/034_Shader_HighlightsEnvironmentGradientBaked/Materials/034_Roofing_highlights.mat b/TestProjects/UniversalGraphicsTest_Lighting/Assets/Scenes/034_Shader_HighlightsEnvironmentGradientBaked/Materials/034_Roofing_highlights.mat index 2b9db9255ec..65f606a9813 100644 --- a/TestProjects/UniversalGraphicsTest_Lighting/Assets/Scenes/034_Shader_HighlightsEnvironmentGradientBaked/Materials/034_Roofing_highlights.mat +++ b/TestProjects/UniversalGraphicsTest_Lighting/Assets/Scenes/034_Shader_HighlightsEnvironmentGradientBaked/Materials/034_Roofing_highlights.mat @@ -94,6 +94,7 @@ Material: m_Floats: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 0 - _BumpScale: 1 - _ClearCoat: 0 - _ClearCoatMask: 0 @@ -103,6 +104,7 @@ Material: - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 10 + - _DstBlendAlpha: 10 - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 0.5 @@ -121,6 +123,7 @@ Material: - _SpecSource: 0 - _SpecularHighlights: 1 - _SrcBlend: 5 + - _SrcBlendAlpha: 1 - _Surface: 1 - _UVSec: 0 - _WorkflowMode: 1 @@ -143,4 +146,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Lighting/Assets/Scenes/034_Shader_HighlightsEnvironmentGradientBaked/Materials/034_basic.mat b/TestProjects/UniversalGraphicsTest_Lighting/Assets/Scenes/034_Shader_HighlightsEnvironmentGradientBaked/Materials/034_basic.mat index 037d3295bc9..6115b4985f1 100644 --- a/TestProjects/UniversalGraphicsTest_Lighting/Assets/Scenes/034_Shader_HighlightsEnvironmentGradientBaked/Materials/034_basic.mat +++ b/TestProjects/UniversalGraphicsTest_Lighting/Assets/Scenes/034_Shader_HighlightsEnvironmentGradientBaked/Materials/034_basic.mat @@ -68,17 +68,33 @@ Material: 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: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoat: 0 - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 - _Cull: 2 - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 0.5 @@ -92,6 +108,7 @@ Material: - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 0 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _WorkflowMode: 1 @@ -114,4 +131,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Lighting/Assets/Scenes/034_Shader_HighlightsEnvironmentGradientBaked/Materials/034_basic_highlights.mat b/TestProjects/UniversalGraphicsTest_Lighting/Assets/Scenes/034_Shader_HighlightsEnvironmentGradientBaked/Materials/034_basic_highlights.mat index 91194daf528..6e9957d3962 100644 --- a/TestProjects/UniversalGraphicsTest_Lighting/Assets/Scenes/034_Shader_HighlightsEnvironmentGradientBaked/Materials/034_basic_highlights.mat +++ b/TestProjects/UniversalGraphicsTest_Lighting/Assets/Scenes/034_Shader_HighlightsEnvironmentGradientBaked/Materials/034_basic_highlights.mat @@ -68,17 +68,33 @@ Material: 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: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoat: 0 - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 - _Cull: 2 - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 0.5 @@ -92,6 +108,7 @@ Material: - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _WorkflowMode: 1 @@ -114,4 +131,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Lighting/Assets/Scenes/034_Shader_HighlightsEnvironmentGradientBaked/Materials/034_rocks_dirt_ground.mat b/TestProjects/UniversalGraphicsTest_Lighting/Assets/Scenes/034_Shader_HighlightsEnvironmentGradientBaked/Materials/034_rocks_dirt_ground.mat index 5d35afaee69..dbe8a5971e0 100644 --- a/TestProjects/UniversalGraphicsTest_Lighting/Assets/Scenes/034_Shader_HighlightsEnvironmentGradientBaked/Materials/034_rocks_dirt_ground.mat +++ b/TestProjects/UniversalGraphicsTest_Lighting/Assets/Scenes/034_Shader_HighlightsEnvironmentGradientBaked/Materials/034_rocks_dirt_ground.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -89,17 +89,33 @@ Material: 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: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoat: 0 - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 - _Cull: 2 - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 0.5 @@ -118,6 +134,7 @@ Material: - _SpecSource: 0 - _SpecularHighlights: 0 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _WorkflowMode: 1 diff --git a/TestProjects/UniversalGraphicsTest_Lighting/Assets/Scenes/034_Shader_HighlightsEnvironmentGradientBaked/Materials/034_rocks_dirt_ground_highlights.mat b/TestProjects/UniversalGraphicsTest_Lighting/Assets/Scenes/034_Shader_HighlightsEnvironmentGradientBaked/Materials/034_rocks_dirt_ground_highlights.mat index 54780cf3274..20628bb64ec 100644 --- a/TestProjects/UniversalGraphicsTest_Lighting/Assets/Scenes/034_Shader_HighlightsEnvironmentGradientBaked/Materials/034_rocks_dirt_ground_highlights.mat +++ b/TestProjects/UniversalGraphicsTest_Lighting/Assets/Scenes/034_Shader_HighlightsEnvironmentGradientBaked/Materials/034_rocks_dirt_ground_highlights.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -89,17 +89,33 @@ Material: 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: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoat: 0 - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 - _Cull: 2 - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 0.5 @@ -118,6 +134,7 @@ Material: - _SpecSource: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _WorkflowMode: 1 diff --git a/TestProjects/UniversalGraphicsTest_Lighting/Assets/Scenes/036_Lighting_Scene_DirectionalBakedDirectional/Dots.mat b/TestProjects/UniversalGraphicsTest_Lighting/Assets/Scenes/036_Lighting_Scene_DirectionalBakedDirectional/Dots.mat index 4a3d8358e92..e2fc5923c10 100644 --- a/TestProjects/UniversalGraphicsTest_Lighting/Assets/Scenes/036_Lighting_Scene_DirectionalBakedDirectional/Dots.mat +++ b/TestProjects/UniversalGraphicsTest_Lighting/Assets/Scenes/036_Lighting_Scene_DirectionalBakedDirectional/Dots.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -89,17 +89,33 @@ Material: 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: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoat: 0 - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 - _Cull: 2 - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 0 - _Glossiness: 0.5 @@ -118,6 +134,7 @@ Material: - _SpecSource: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _WorkflowMode: 1 diff --git a/TestProjects/UniversalGraphicsTest_Lighting/Assets/Scenes/044_Lighting_ReflectionProbe/044_ReflectionProbe.mat b/TestProjects/UniversalGraphicsTest_Lighting/Assets/Scenes/044_Lighting_ReflectionProbe/044_ReflectionProbe.mat index bcdffe62837..f368327cb09 100644 --- a/TestProjects/UniversalGraphicsTest_Lighting/Assets/Scenes/044_Lighting_ReflectionProbe/044_ReflectionProbe.mat +++ b/TestProjects/UniversalGraphicsTest_Lighting/Assets/Scenes/044_Lighting_ReflectionProbe/044_ReflectionProbe.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -81,17 +81,33 @@ Material: 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: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoat: 0 - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 - _Cull: 2 - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 1 @@ -106,6 +122,7 @@ Material: - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _WorkflowMode: 1 diff --git a/TestProjects/UniversalGraphicsTest_Lighting/Assets/Scenes/044_Lighting_ReflectionProbe/044_ReflectionProbeRough.mat b/TestProjects/UniversalGraphicsTest_Lighting/Assets/Scenes/044_Lighting_ReflectionProbe/044_ReflectionProbeRough.mat index d9ca438ce86..8abb6736795 100644 --- a/TestProjects/UniversalGraphicsTest_Lighting/Assets/Scenes/044_Lighting_ReflectionProbe/044_ReflectionProbeRough.mat +++ b/TestProjects/UniversalGraphicsTest_Lighting/Assets/Scenes/044_Lighting_ReflectionProbe/044_ReflectionProbeRough.mat @@ -68,17 +68,33 @@ Material: 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: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoat: 0 - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 - _Cull: 2 - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 0 @@ -93,6 +109,7 @@ Material: - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _WorkflowMode: 1 @@ -115,4 +132,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Lighting/Assets/Scenes/044_Lighting_ReflectionProbe/044_ReflectionProbeTextured.mat b/TestProjects/UniversalGraphicsTest_Lighting/Assets/Scenes/044_Lighting_ReflectionProbe/044_ReflectionProbeTextured.mat index 31c196bbfec..c88e3ab2f4d 100644 --- a/TestProjects/UniversalGraphicsTest_Lighting/Assets/Scenes/044_Lighting_ReflectionProbe/044_ReflectionProbeTextured.mat +++ b/TestProjects/UniversalGraphicsTest_Lighting/Assets/Scenes/044_Lighting_ReflectionProbe/044_ReflectionProbeTextured.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -81,17 +81,33 @@ Material: 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: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoat: 0 - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 - _Cull: 2 - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 1 @@ -106,6 +122,7 @@ Material: - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _WorkflowMode: 1 diff --git a/TestProjects/UniversalGraphicsTest_Lighting/Assets/Scenes/044_Lighting_ReflectionProbe/044_ReflectionProbeTextured_rough.mat b/TestProjects/UniversalGraphicsTest_Lighting/Assets/Scenes/044_Lighting_ReflectionProbe/044_ReflectionProbeTextured_rough.mat index 6d98242b28b..1b6536a859d 100644 --- a/TestProjects/UniversalGraphicsTest_Lighting/Assets/Scenes/044_Lighting_ReflectionProbe/044_ReflectionProbeTextured_rough.mat +++ b/TestProjects/UniversalGraphicsTest_Lighting/Assets/Scenes/044_Lighting_ReflectionProbe/044_ReflectionProbeTextured_rough.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -26,11 +26,12 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 3050 + m_CustomRenderQueue: 3000 stringTagMap: RenderType: Transparent disabledShaderPasses: - SHADOWCASTER + - DepthOnly m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -97,7 +98,8 @@ Material: m_Ints: [] m_Floats: - _AlphaClip: 0 - - _Blend: 1 + - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoat: 0 - _ClearCoatMask: 0 @@ -107,6 +109,7 @@ Material: - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 10 + - _DstBlendAlpha: 10 - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 1 @@ -121,6 +124,7 @@ Material: - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 1 - _UVSec: 0 - _WorkflowMode: 1 diff --git a/TestProjects/UniversalGraphicsTest_Lighting/Assets/Scenes/117_118_SkyboxReflectionTest/ReflectiveMaterial.mat b/TestProjects/UniversalGraphicsTest_Lighting/Assets/Scenes/117_118_SkyboxReflectionTest/ReflectiveMaterial.mat index 994ea70221e..0b89481f83d 100644 --- a/TestProjects/UniversalGraphicsTest_Lighting/Assets/Scenes/117_118_SkyboxReflectionTest/ReflectiveMaterial.mat +++ b/TestProjects/UniversalGraphicsTest_Lighting/Assets/Scenes/117_118_SkyboxReflectionTest/ReflectiveMaterial.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -45,6 +45,18 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _EmissionMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -61,32 +73,55 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _SpecGlossMap: 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: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoat: 0 - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 - _Cull: 2 - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 + - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 0 - _Glossiness: 0 - _GlossyReflections: 0 - _Metallic: 1 - _OcclusionStrength: 1 + - _Parallax: 0.005 - _QueueOffset: 0 - _ReceiveShadows: 1 - _Smoothness: 1 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _WorkflowMode: 1 - _ZWrite: 1 diff --git a/TestProjects/UniversalGraphicsTest_Lighting/Assets/Scenes/146_Unlit_Custom_Shadows/UnlitCustomShadows.mat b/TestProjects/UniversalGraphicsTest_Lighting/Assets/Scenes/146_Unlit_Custom_Shadows/UnlitCustomShadows.mat index f5172617e73..79525dbaa3c 100644 --- a/TestProjects/UniversalGraphicsTest_Lighting/Assets/Scenes/146_Unlit_Custom_Shadows/UnlitCustomShadows.mat +++ b/TestProjects/UniversalGraphicsTest_Lighting/Assets/Scenes/146_Unlit_Custom_Shadows/UnlitCustomShadows.mat @@ -97,6 +97,7 @@ Material: - _Metallic: 0 - _OcclusionStrength: 1 - _Parallax: 0.005 + - _QueueControl: 0 - _QueueOffset: 0 - _ReceiveShadows: 1 - _Smoothness: 0.5 @@ -124,4 +125,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 4 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Lighting/Assets/Scenes/148_Lighting_LightLayers/Materials/ParticleLit.mat b/TestProjects/UniversalGraphicsTest_Lighting/Assets/Scenes/148_Lighting_LightLayers/Materials/ParticleLit.mat index ec65735f380..fa2e2c4ba92 100644 --- a/TestProjects/UniversalGraphicsTest_Lighting/Assets/Scenes/148_Lighting_LightLayers/Materials/ParticleLit.mat +++ b/TestProjects/UniversalGraphicsTest_Lighting/Assets/Scenes/148_Lighting_LightLayers/Materials/ParticleLit.mat @@ -207,4 +207,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 4 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Lighting/Assets/Scenes/148_Lighting_LightLayers/Materials/SimpleLit.mat b/TestProjects/UniversalGraphicsTest_Lighting/Assets/Scenes/148_Lighting_LightLayers/Materials/SimpleLit.mat index e0c7427e703..ea8ae700dee 100644 --- a/TestProjects/UniversalGraphicsTest_Lighting/Assets/Scenes/148_Lighting_LightLayers/Materials/SimpleLit.mat +++ b/TestProjects/UniversalGraphicsTest_Lighting/Assets/Scenes/148_Lighting_LightLayers/Materials/SimpleLit.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 4 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -93,6 +93,7 @@ Material: m_Floats: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoatMask: 0 - _ClearCoatSmoothness: 0 @@ -101,6 +102,7 @@ Material: - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 0 - _Glossiness: 0 @@ -118,12 +120,13 @@ Material: - _SpecSource: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _WorkflowMode: 1 - _ZWrite: 1 m_Colors: - _BaseColor: {r: 0.5019608, g: 0.5019608, b: 0.5019608, a: 1} - - _Color: {r: 1, g: 1, b: 1, a: 1} + - _Color: {r: 0.5019608, g: 0.5019608, b: 0.5019608, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest_Lighting/Assets/Scenes/148_Lighting_LightLayers/Materials/Unlit.mat b/TestProjects/UniversalGraphicsTest_Lighting/Assets/Scenes/148_Lighting_LightLayers/Materials/Unlit.mat index 6d24afeec44..260ea30df57 100644 --- a/TestProjects/UniversalGraphicsTest_Lighting/Assets/Scenes/148_Lighting_LightLayers/Materials/Unlit.mat +++ b/TestProjects/UniversalGraphicsTest_Lighting/Assets/Scenes/148_Lighting_LightLayers/Materials/Unlit.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 4 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -93,6 +93,7 @@ Material: m_Floats: - _AlphaClip: 0 - _Blend: 0 + - _BlendOp: 0 - _BumpScale: 1 - _ClearCoatMask: 0 - _ClearCoatSmoothness: 0 @@ -101,6 +102,7 @@ Material: - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 0 - _Glossiness: 0 @@ -115,12 +117,13 @@ Material: - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _WorkflowMode: 1 - _ZWrite: 1 m_Colors: - _BaseColor: {r: 0.5019608, g: 0.5019608, b: 0.5019608, a: 1} - - _Color: {r: 1, g: 1, b: 1, a: 1} + - _Color: {r: 0.5019608, g: 0.5019608, b: 0.5019608, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest_Lighting/Assets/Scenes/150_Lighting_EnlightenEmission/150_LitRealtimeEmission_Sphere.mat b/TestProjects/UniversalGraphicsTest_Lighting/Assets/Scenes/150_Lighting_EnlightenEmission/150_LitRealtimeEmission_Sphere.mat index 0299f2d3c68..8ee58f0b522 100644 --- a/TestProjects/UniversalGraphicsTest_Lighting/Assets/Scenes/150_Lighting_EnlightenEmission/150_LitRealtimeEmission_Sphere.mat +++ b/TestProjects/UniversalGraphicsTest_Lighting/Assets/Scenes/150_Lighting_EnlightenEmission/150_LitRealtimeEmission_Sphere.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 4 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 diff --git a/TestProjects/UniversalGraphicsTest_Lighting/Assets/Scenes/151_Lighting_EnlightenLights/151_ForwardDeferred_RenderTexture.renderTexture b/TestProjects/UniversalGraphicsTest_Lighting/Assets/Scenes/151_Lighting_EnlightenLights/151_ForwardDeferred_RenderTexture.renderTexture index 79b51c66cd7..d761cd4c9d3 100644 --- a/TestProjects/UniversalGraphicsTest_Lighting/Assets/Scenes/151_Lighting_EnlightenLights/151_ForwardDeferred_RenderTexture.renderTexture +++ b/TestProjects/UniversalGraphicsTest_Lighting/Assets/Scenes/151_Lighting_EnlightenLights/151_ForwardDeferred_RenderTexture.renderTexture @@ -13,12 +13,12 @@ RenderTexture: m_ForcedFallbackFormat: 4 m_DownscaleFallback: 0 m_IsAlphaChannelOptional: 0 - serializedVersion: 3 + serializedVersion: 5 m_Width: 640 m_Height: 320 m_AntiAliasing: 1 m_MipCount: -1 - m_DepthFormat: 2 + m_DepthStencilFormat: 92 m_ColorFormat: 8 m_MipMap: 0 m_GenerateMips: 1 @@ -36,3 +36,4 @@ RenderTexture: m_WrapW: 1 m_Dimension: 2 m_VolumeDepth: 1 + m_ShadowSamplingMode: 2 diff --git a/TestProjects/UniversalGraphicsTest_Lighting/Assets/Scenes/151_Lighting_EnlightenLights/Enlighten_Shader_Graph.mat b/TestProjects/UniversalGraphicsTest_Lighting/Assets/Scenes/151_Lighting_EnlightenLights/Enlighten_Shader_Graph.mat index 626c59ad6f9..c07a510f7a1 100644 --- a/TestProjects/UniversalGraphicsTest_Lighting/Assets/Scenes/151_Lighting_EnlightenLights/Enlighten_Shader_Graph.mat +++ b/TestProjects/UniversalGraphicsTest_Lighting/Assets/Scenes/151_Lighting_EnlightenLights/Enlighten_Shader_Graph.mat @@ -33,6 +33,21 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} m_Ints: [] - m_Floats: [] + m_Floats: + - _QueueControl: 0 + - _QueueOffset: 0 m_Colors: [] m_BuildTextureStacks: [] +--- !u!114 &6711638571528999795 +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: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Lighting/Assets/Scenes/151_Lighting_EnlightenLights/White.mat b/TestProjects/UniversalGraphicsTest_Lighting/Assets/Scenes/151_Lighting_EnlightenLights/White.mat index 600ed37aae0..b42df3884ed 100644 --- a/TestProjects/UniversalGraphicsTest_Lighting/Assets/Scenes/151_Lighting_EnlightenLights/White.mat +++ b/TestProjects/UniversalGraphicsTest_Lighting/Assets/Scenes/151_Lighting_EnlightenLights/White.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 4 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 diff --git a/TestProjects/UniversalGraphicsTest_Lighting/Assets/Scenes/153_Lighting_EnlightenTerrain/bark.mat b/TestProjects/UniversalGraphicsTest_Lighting/Assets/Scenes/153_Lighting_EnlightenTerrain/bark.mat index d85904c57a6..31e259768db 100644 --- a/TestProjects/UniversalGraphicsTest_Lighting/Assets/Scenes/153_Lighting_EnlightenTerrain/bark.mat +++ b/TestProjects/UniversalGraphicsTest_Lighting/Assets/Scenes/153_Lighting_EnlightenTerrain/bark.mat @@ -80,6 +80,7 @@ Material: m_Floats: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoatMask: 0 - _ClearCoatSmoothness: 0 @@ -88,6 +89,7 @@ Material: - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 0 - _Glossiness: 0 @@ -101,12 +103,13 @@ Material: - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _WorkflowMode: 1 - _ZWrite: 1 m_Colors: - _BaseColor: {r: 0.9339623, g: 0.489574, b: 0.110137045, a: 1} - - _Color: {r: 1, g: 1, b: 1, a: 1} + - _Color: {r: 0.9339623, g: 0.4895739, b: 0.11013702, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] @@ -122,4 +125,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 4 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Lighting/Assets/Scenes/155_ReflectionProbes_BoxProjection/NonMetalicMaterial.mat b/TestProjects/UniversalGraphicsTest_Lighting/Assets/Scenes/155_ReflectionProbes_BoxProjection/NonMetalicMaterial.mat index cb5954656b9..8a571c2380c 100644 --- a/TestProjects/UniversalGraphicsTest_Lighting/Assets/Scenes/155_ReflectionProbes_BoxProjection/NonMetalicMaterial.mat +++ b/TestProjects/UniversalGraphicsTest_Lighting/Assets/Scenes/155_ReflectionProbes_BoxProjection/NonMetalicMaterial.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -93,6 +93,7 @@ Material: m_Floats: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoatMask: 0 - _ClearCoatSmoothness: 0 @@ -101,6 +102,7 @@ Material: - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 0 - _Glossiness: 0 @@ -114,12 +116,13 @@ Material: - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _WorkflowMode: 1 - _ZWrite: 1 m_Colors: - _BaseColor: {r: 0.7075472, g: 0.7075472, b: 0.7075472, a: 1} - - _Color: {r: 1, g: 1, b: 1, a: 1} + - _Color: {r: 0.7075471, g: 0.7075471, b: 0.7075471, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest_Lighting/Assets/Scenes/200_Assets/Materials/Floor.mat b/TestProjects/UniversalGraphicsTest_Lighting/Assets/Scenes/200_Assets/Materials/Floor.mat index f841c79dc0f..e001e91c2a8 100644 --- a/TestProjects/UniversalGraphicsTest_Lighting/Assets/Scenes/200_Assets/Materials/Floor.mat +++ b/TestProjects/UniversalGraphicsTest_Lighting/Assets/Scenes/200_Assets/Materials/Floor.mat @@ -98,6 +98,7 @@ Material: - _BillboardKwToggle: 0 - _BillboardShadowFade: 0.5 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BlendOp: 0 - _BumpScale: 1 - _CameraFadingEnabled: 0 @@ -116,6 +117,7 @@ Material: - _DistortionStrength: 1 - _DistortionStrengthScaled: 0.1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 0 - _FlipbookBlending: 0 - _FlipbookMode: 0 @@ -141,6 +143,7 @@ Material: - _SpecSource: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _SubsurfaceIndirect: 0.25 - _SubsurfaceKwToggle: 0 - _Surface: 0 @@ -172,4 +175,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Lighting/Assets/Scenes/200_Assets/Materials/SSAO_MAT_BakedLit.mat b/TestProjects/UniversalGraphicsTest_Lighting/Assets/Scenes/200_Assets/Materials/SSAO_MAT_BakedLit.mat index 59bcaf93d5b..515c280efe1 100644 --- a/TestProjects/UniversalGraphicsTest_Lighting/Assets/Scenes/200_Assets/Materials/SSAO_MAT_BakedLit.mat +++ b/TestProjects/UniversalGraphicsTest_Lighting/Assets/Scenes/200_Assets/Materials/SSAO_MAT_BakedLit.mat @@ -91,6 +91,7 @@ Material: - _DistortionStrength: 1 - _DistortionStrengthScaled: 0.1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 0 - _FlipbookBlending: 0 - _FlipbookMode: 0 @@ -115,6 +116,7 @@ Material: - _SpecSource: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _SubsurfaceIndirect: 0.25 - _SubsurfaceKwToggle: 0 - _Surface: 0 @@ -146,4 +148,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Lighting/Assets/Scenes/200_Assets/Materials/SSAO_MAT_BakedLitAlphaClippedNormal.mat b/TestProjects/UniversalGraphicsTest_Lighting/Assets/Scenes/200_Assets/Materials/SSAO_MAT_BakedLitAlphaClippedNormal.mat index bcb473769d6..3c049e8f721 100644 --- a/TestProjects/UniversalGraphicsTest_Lighting/Assets/Scenes/200_Assets/Materials/SSAO_MAT_BakedLitAlphaClippedNormal.mat +++ b/TestProjects/UniversalGraphicsTest_Lighting/Assets/Scenes/200_Assets/Materials/SSAO_MAT_BakedLitAlphaClippedNormal.mat @@ -91,6 +91,7 @@ Material: - _DistortionStrength: 1 - _DistortionStrengthScaled: 0.1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 0 - _FlipbookBlending: 0 - _FlipbookMode: 0 @@ -115,6 +116,7 @@ Material: - _SpecSource: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _SubsurfaceIndirect: 0.25 - _SubsurfaceKwToggle: 0 - _Surface: 0 @@ -146,4 +148,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Lighting/Assets/Scenes/200_Assets/Materials/SSAO_MAT_BakedLitNormal.mat b/TestProjects/UniversalGraphicsTest_Lighting/Assets/Scenes/200_Assets/Materials/SSAO_MAT_BakedLitNormal.mat index 908f6c14bdf..334208e4925 100644 --- a/TestProjects/UniversalGraphicsTest_Lighting/Assets/Scenes/200_Assets/Materials/SSAO_MAT_BakedLitNormal.mat +++ b/TestProjects/UniversalGraphicsTest_Lighting/Assets/Scenes/200_Assets/Materials/SSAO_MAT_BakedLitNormal.mat @@ -91,6 +91,7 @@ Material: - _DistortionStrength: 1 - _DistortionStrengthScaled: 0.1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 0 - _FlipbookBlending: 0 - _FlipbookMode: 0 @@ -115,6 +116,7 @@ Material: - _SpecSource: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _SubsurfaceIndirect: 0.25 - _SubsurfaceKwToggle: 0 - _Surface: 0 @@ -146,4 +148,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/Materials/Array Element.mat b/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/Materials/Array Element.mat index ebc55ab77c7..9b77f56116e 100644 --- a/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/Materials/Array Element.mat +++ b/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/Materials/Array Element.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -77,15 +77,29 @@ Material: 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: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _Cull: 2 - _Cutoff: 0.5 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _GlossMapScale: 1 - _Glossiness: 0 - _GlossinessSource: 0 @@ -104,6 +118,7 @@ Material: - _SpecSource: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _ZWrite: 1 diff --git a/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/Materials/BW Gradient.mat b/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/Materials/BW Gradient.mat index b986f171691..0170c78f49e 100644 --- a/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/Materials/BW Gradient.mat +++ b/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/Materials/BW Gradient.mat @@ -131,6 +131,7 @@ Material: - _Anisotropy: 0 - _Blend: 0 - _BlendMode: 0 + - _BlendOp: 0 - _CoatMask: 0 - _Cull: 2 - _CullMode: 2 @@ -164,6 +165,7 @@ Material: - _DoubleSidedNormalMode: 1 - _Drag: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EmissiveColorMode: 1 - _EmissiveExposureWeight: 1 - _EmissiveIntensity: 1 @@ -214,6 +216,7 @@ Material: - _SpecularAAScreenSpaceVariance: 0.1 - _SpecularAAThreshold: 0.2 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _StencilRef: 0 - _StencilRefDepth: 32 - _StencilRefDistortionVec: 64 @@ -251,7 +254,7 @@ Material: m_Colors: - _BaseColor: {r: 1, g: 1, b: 1, a: 1} - _BaseColorMap_MipInfo: {r: 0, g: 0, b: 0, a: 0} - - _Color: {r: 0, g: 0, b: 0, a: 1} + - _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} @@ -279,4 +282,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/Materials/Hole_mesh.mat b/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/Materials/Hole_mesh.mat index 3324b017b52..e82e01b9eee 100644 --- a/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/Materials/Hole_mesh.mat +++ b/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/Materials/Hole_mesh.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -25,7 +25,7 @@ Material: m_ShaderKeywords: _ALPHATEST_ON _METALLICSPECGLOSSMAP _NORMALMAP m_LightmapFlags: 4 m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 + m_DoubleSidedGI: 1 m_CustomRenderQueue: 2450 stringTagMap: RenderType: TransparentCutout @@ -105,6 +105,7 @@ Material: m_Floats: - _AlphaClip: 1 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoat: 0 - _ClearCoatMask: 0 @@ -114,6 +115,7 @@ Material: - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 0.5 @@ -132,6 +134,7 @@ Material: - _SpecSource: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _WorkflowMode: 1 diff --git a/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/Materials/Hole_mesh_cutout.mat b/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/Materials/Hole_mesh_cutout.mat index 92544bbd192..83911281f63 100644 --- a/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/Materials/Hole_mesh_cutout.mat +++ b/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/Materials/Hole_mesh_cutout.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -25,7 +25,7 @@ Material: m_ShaderKeywords: _ALPHATEST_ON m_LightmapFlags: 4 m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 + m_DoubleSidedGI: 1 m_CustomRenderQueue: 2450 stringTagMap: RenderType: TransparentCutout @@ -89,11 +89,13 @@ Material: m_Floats: - _AlphaClip: 1 - _Blend: 0 + - _BlendOp: 0 - _BumpScale: 1 - _Cull: 0 - _Cutoff: 0.5 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 0.5 @@ -113,6 +115,7 @@ Material: - _SpecSource: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _WorkflowMode: 1 diff --git a/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/Materials/Lit.mat b/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/Materials/Lit.mat index f72dc1c5593..9c58c028673 100644 --- a/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/Materials/Lit.mat +++ b/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/Materials/Lit.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -93,6 +93,7 @@ Material: m_Floats: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoatMask: 0 - _ClearCoatSmoothness: 0 @@ -101,6 +102,7 @@ Material: - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 0 - _Glossiness: 0 @@ -114,6 +116,7 @@ Material: - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _WorkflowMode: 1 - _ZWrite: 1 diff --git a/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/Materials/Pyramids Wall - v01.mat b/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/Materials/Pyramids Wall - v01.mat index 6a762d63127..b1a216c15ca 100644 --- a/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/Materials/Pyramids Wall - v01.mat +++ b/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/Materials/Pyramids Wall - v01.mat @@ -76,17 +76,33 @@ Material: 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: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoat: 0 - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 - _Cull: 2 - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 0.5 @@ -105,6 +121,7 @@ Material: - _SpecSource: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _WorkflowMode: 1 @@ -127,4 +144,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/Materials/SyntheticColorChart.mat b/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/Materials/SyntheticColorChart.mat index 25e83b95712..70c7ab653f4 100644 --- a/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/Materials/SyntheticColorChart.mat +++ b/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/Materials/SyntheticColorChart.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -144,6 +144,7 @@ Material: - _Anisotropy: 0 - _Blend: 0 - _BlendMode: 0 + - _BlendOp: 0 - _CoatMask: 0 - _Cull: 2 - _CullMode: 2 @@ -177,6 +178,7 @@ Material: - _DoubleSidedNormalMode: 1 - _Drag: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EmissiveColorMode: 1 - _EmissiveExposureWeight: 1 - _EmissiveIntensity: 1 @@ -227,6 +229,7 @@ Material: - _SpecularAAScreenSpaceVariance: 0.1 - _SpecularAAThreshold: 0.2 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _StencilRef: 0 - _StencilRefDepth: 32 - _StencilRefDistortionVec: 64 @@ -264,7 +267,7 @@ Material: m_Colors: - _BaseColor: {r: 1, g: 1, b: 1, a: 1} - _BaseColorMap_MipInfo: {r: 0, g: 0, b: 0, a: 0} - - _Color: {r: 0, g: 0, b: 0, a: 1} + - _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} diff --git a/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/Materials/UnlitColor.mat b/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/Materials/UnlitColor.mat index 92ac58db5e1..7a441d35596 100644 --- a/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/Materials/UnlitColor.mat +++ b/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/Materials/UnlitColor.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -65,10 +65,12 @@ Material: m_Floats: - _AlphaClip: 0 - _Blend: 0 + - _BlendOp: 0 - _BumpScale: 1 - _Cull: 2 - _Cutoff: 0.5 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 0 - _Glossiness: 0 @@ -82,6 +84,7 @@ Material: - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _WorkflowMode: 1 - _ZWrite: 1 diff --git a/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/Materials/Unlit_GridMarkers_X1Y1.mat b/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/Materials/Unlit_GridMarkers_X1Y1.mat index 78bf16e580d..da42f3641f8 100644 --- a/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/Materials/Unlit_GridMarkers_X1Y1.mat +++ b/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/Materials/Unlit_GridMarkers_X1Y1.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -144,6 +144,7 @@ Material: - _Anisotropy: 0 - _Blend: 0 - _BlendMode: 0 + - _BlendOp: 0 - _CoatMask: 0 - _Cull: 2 - _CullMode: 2 @@ -177,6 +178,7 @@ Material: - _DoubleSidedNormalMode: 1 - _Drag: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EmissiveColorMode: 1 - _EmissiveExposureWeight: 1 - _EmissiveIntensity: 1 @@ -227,6 +229,7 @@ Material: - _SpecularAAScreenSpaceVariance: 0.1 - _SpecularAAThreshold: 0.2 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _StencilRef: 0 - _StencilRefDepth: 32 - _StencilRefDistortionVec: 64 @@ -264,7 +267,7 @@ Material: m_Colors: - _BaseColor: {r: 1, g: 1, b: 1, a: 1} - _BaseColorMap_MipInfo: {r: 0, g: 0, b: 0, a: 0} - - _Color: {r: 0, g: 0, b: 0, a: 1} + - _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} diff --git a/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/Materials/Unlit_GridMarkers_X2Y1.mat b/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/Materials/Unlit_GridMarkers_X2Y1.mat index fbd64724964..e2a81ab5f1a 100644 --- a/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/Materials/Unlit_GridMarkers_X2Y1.mat +++ b/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/Materials/Unlit_GridMarkers_X2Y1.mat @@ -131,6 +131,7 @@ Material: - _Anisotropy: 0 - _Blend: 0 - _BlendMode: 0 + - _BlendOp: 0 - _CoatMask: 0 - _Cull: 2 - _CullMode: 2 @@ -164,6 +165,7 @@ Material: - _DoubleSidedNormalMode: 1 - _Drag: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EmissiveColorMode: 1 - _EmissiveExposureWeight: 1 - _EmissiveIntensity: 1 @@ -214,6 +216,7 @@ Material: - _SpecularAAScreenSpaceVariance: 0.1 - _SpecularAAThreshold: 0.2 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _StencilRef: 0 - _StencilRefDepth: 32 - _StencilRefDistortionVec: 64 @@ -251,7 +254,7 @@ Material: m_Colors: - _BaseColor: {r: 1, g: 1, b: 1, a: 1} - _BaseColorMap_MipInfo: {r: 0, g: 0, b: 0, a: 0} - - _Color: {r: 0, g: 0, b: 0, a: 1} + - _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} @@ -279,4 +282,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/Materials/Unlit_GridMarkers_X6Y6.mat b/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/Materials/Unlit_GridMarkers_X6Y6.mat index b8772f55794..63a249c25d6 100644 --- a/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/Materials/Unlit_GridMarkers_X6Y6.mat +++ b/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/Materials/Unlit_GridMarkers_X6Y6.mat @@ -131,6 +131,7 @@ Material: - _Anisotropy: 0 - _Blend: 0 - _BlendMode: 0 + - _BlendOp: 0 - _CoatMask: 0 - _Cull: 2 - _CullMode: 2 @@ -164,6 +165,7 @@ Material: - _DoubleSidedNormalMode: 1 - _Drag: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EmissiveColorMode: 1 - _EmissiveExposureWeight: 1 - _EmissiveIntensity: 1 @@ -214,6 +216,7 @@ Material: - _SpecularAAScreenSpaceVariance: 0.1 - _SpecularAAThreshold: 0.2 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _StencilRef: 0 - _StencilRefDepth: 32 - _StencilRefDistortionVec: 64 @@ -251,7 +254,7 @@ Material: m_Colors: - _BaseColor: {r: 1, g: 1, b: 1, a: 1} - _BaseColorMap_MipInfo: {r: 0, g: 0, b: 0, a: 0} - - _Color: {r: 0, g: 0, b: 0, a: 1} + - _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} @@ -279,4 +282,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/Materials/White_Mate.mat b/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/Materials/White_Mate.mat index 46fc466d921..bff12099c9c 100644 --- a/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/Materials/White_Mate.mat +++ b/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/Materials/White_Mate.mat @@ -125,6 +125,18 @@ Material: 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 @@ -139,6 +151,7 @@ Material: - _Anisotropy: 0 - _Blend: 0 - _BlendMode: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _CoatMask: 0 - _Cull: 2 @@ -171,6 +184,7 @@ Material: - _DoubleSidedNormalMode: 1 - _Drag: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EmissiveColorMode: 1 - _EnableBlendModePreserveSpecularLighting: 1 - _EnableFogOnTransparent: 1 @@ -222,6 +236,7 @@ Material: - _SpecularAAThreshold: 0.2 - _SpecularHighlights: 0 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _StencilRef: 2 - _StencilRefMV: 128 - _StencilWriteMask: 7 @@ -249,7 +264,7 @@ Material: - _ZWrite: 1 m_Colors: - _BaseColor: {r: 1, g: 1, b: 1, a: 0} - - _Color: {r: 1, g: 1, b: 1, a: 1} + - _Color: {r: 1, g: 1, b: 1, 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} @@ -275,4 +290,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/Materials/red_paint.mat b/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/Materials/red_paint.mat index 169c1f55b9e..5fe5d5f0791 100644 --- a/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/Materials/red_paint.mat +++ b/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/Materials/red_paint.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -89,17 +89,33 @@ Material: 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: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoat: 0 - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 - _Cull: 2 - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 0.5 @@ -118,6 +134,7 @@ Material: - _SpecSource: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _WorkflowMode: 1 diff --git a/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOff Materials/Billboard.mat b/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOff Materials/Billboard.mat index 7f4baf7a9e1..7da2dbc9094 100644 --- a/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOff Materials/Billboard.mat +++ b/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOff Materials/Billboard.mat @@ -47,4 +47,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOff Materials/LOD0/Branches_0.mat b/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOff Materials/LOD0/Branches_0.mat index 211c817fe72..7fa576d8bfa 100644 --- a/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOff Materials/LOD0/Branches_0.mat +++ b/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOff Materials/LOD0/Branches_0.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 diff --git a/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOff Materials/LOD0/Branches_1.mat b/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOff Materials/LOD0/Branches_1.mat index 1cda6db2ffe..baea98465ad 100644 --- a/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOff Materials/LOD0/Branches_1.mat +++ b/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOff Materials/LOD0/Branches_1.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 diff --git a/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOff Materials/LOD0/FacingLeaves_4.mat b/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOff Materials/LOD0/FacingLeaves_4.mat index add34d12b78..03ad36fdcc1 100644 --- a/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOff Materials/LOD0/FacingLeaves_4.mat +++ b/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOff Materials/LOD0/FacingLeaves_4.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 diff --git a/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOff Materials/LOD0/Fronds_2.mat b/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOff Materials/LOD0/Fronds_2.mat index 0b02be9d2bc..c2c7306ab1c 100644 --- a/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOff Materials/LOD0/Fronds_2.mat +++ b/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOff Materials/LOD0/Fronds_2.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 diff --git a/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOff Materials/LOD0/Leaves_3.mat b/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOff Materials/LOD0/Leaves_3.mat index 1b07d2f7fd0..2c5bfdec6b2 100644 --- a/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOff Materials/LOD0/Leaves_3.mat +++ b/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOff Materials/LOD0/Leaves_3.mat @@ -52,4 +52,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOff Materials/LOD1/Branches_0.mat b/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOff Materials/LOD1/Branches_0.mat index 463a493b0ff..1f85b1dc1be 100644 --- a/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOff Materials/LOD1/Branches_0.mat +++ b/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOff Materials/LOD1/Branches_0.mat @@ -52,4 +52,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOff Materials/LOD1/Branches_1.mat b/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOff Materials/LOD1/Branches_1.mat index 051d4d60ba0..e6b13099036 100644 --- a/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOff Materials/LOD1/Branches_1.mat +++ b/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOff Materials/LOD1/Branches_1.mat @@ -52,4 +52,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOff Materials/LOD1/FacingLeaves_4.mat b/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOff Materials/LOD1/FacingLeaves_4.mat index a5aa5db65ac..12396c9a33f 100644 --- a/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOff Materials/LOD1/FacingLeaves_4.mat +++ b/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOff Materials/LOD1/FacingLeaves_4.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 diff --git a/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOff Materials/LOD1/Fronds_2.mat b/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOff Materials/LOD1/Fronds_2.mat index 8da3b5e844f..ca8200597fe 100644 --- a/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOff Materials/LOD1/Fronds_2.mat +++ b/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOff Materials/LOD1/Fronds_2.mat @@ -52,4 +52,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOff Materials/LOD1/Leaves_3.mat b/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOff Materials/LOD1/Leaves_3.mat index ae1b64d777b..1e6d20692f8 100644 --- a/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOff Materials/LOD1/Leaves_3.mat +++ b/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOff Materials/LOD1/Leaves_3.mat @@ -52,4 +52,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOff Materials/LOD2/Branches_0.mat b/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOff Materials/LOD2/Branches_0.mat index 13e5cef96d8..db499876771 100644 --- a/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOff Materials/LOD2/Branches_0.mat +++ b/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOff Materials/LOD2/Branches_0.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 diff --git a/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOff Materials/LOD2/Branches_1.mat b/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOff Materials/LOD2/Branches_1.mat index 88627fc1a0c..746c0299e56 100644 --- a/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOff Materials/LOD2/Branches_1.mat +++ b/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOff Materials/LOD2/Branches_1.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 diff --git a/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOff Materials/LOD2/FacingLeaves_4.mat b/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOff Materials/LOD2/FacingLeaves_4.mat index 189fcb92605..b6656af6c03 100644 --- a/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOff Materials/LOD2/FacingLeaves_4.mat +++ b/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOff Materials/LOD2/FacingLeaves_4.mat @@ -52,4 +52,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOff Materials/LOD2/Fronds_2.mat b/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOff Materials/LOD2/Fronds_2.mat index 144e79a94f0..c1112d74431 100644 --- a/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOff Materials/LOD2/Fronds_2.mat +++ b/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOff Materials/LOD2/Fronds_2.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 diff --git a/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOff Materials/LOD2/Leaves_3.mat b/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOff Materials/LOD2/Leaves_3.mat index a9e576a743a..ba3378789cf 100644 --- a/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOff Materials/LOD2/Leaves_3.mat +++ b/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOff Materials/LOD2/Leaves_3.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 diff --git a/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOn Materials/Billboard.mat b/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOn Materials/Billboard.mat index 5a7c3dada6f..e2886ae8901 100644 --- a/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOn Materials/Billboard.mat +++ b/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOn Materials/Billboard.mat @@ -47,4 +47,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOn Materials/LOD0/Branches_0.mat b/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOn Materials/LOD0/Branches_0.mat index c5f31841961..de315bc19b9 100644 --- a/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOn Materials/LOD0/Branches_0.mat +++ b/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOn Materials/LOD0/Branches_0.mat @@ -52,4 +52,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOn Materials/LOD0/Branches_1.mat b/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOn Materials/LOD0/Branches_1.mat index 9277c95680e..61bd66e4394 100644 --- a/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOn Materials/LOD0/Branches_1.mat +++ b/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOn Materials/LOD0/Branches_1.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 diff --git a/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOn Materials/LOD0/FacingLeaves_4.mat b/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOn Materials/LOD0/FacingLeaves_4.mat index 66b18f0d45f..d6eb11601bc 100644 --- a/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOn Materials/LOD0/FacingLeaves_4.mat +++ b/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOn Materials/LOD0/FacingLeaves_4.mat @@ -52,4 +52,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOn Materials/LOD0/Fronds_2.mat b/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOn Materials/LOD0/Fronds_2.mat index 289833e4139..e655d75edfb 100644 --- a/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOn Materials/LOD0/Fronds_2.mat +++ b/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOn Materials/LOD0/Fronds_2.mat @@ -52,4 +52,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOn Materials/LOD0/Leaves_3.mat b/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOn Materials/LOD0/Leaves_3.mat index f536b3042e6..f2d29f7764b 100644 --- a/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOn Materials/LOD0/Leaves_3.mat +++ b/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOn Materials/LOD0/Leaves_3.mat @@ -52,4 +52,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOn Materials/LOD1/Branches_0.mat b/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOn Materials/LOD1/Branches_0.mat index 2fcb79dcf09..2120eaf7a13 100644 --- a/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOn Materials/LOD1/Branches_0.mat +++ b/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOn Materials/LOD1/Branches_0.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 diff --git a/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOn Materials/LOD1/Branches_1.mat b/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOn Materials/LOD1/Branches_1.mat index bec1d8663dc..0eadc2651e4 100644 --- a/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOn Materials/LOD1/Branches_1.mat +++ b/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOn Materials/LOD1/Branches_1.mat @@ -52,4 +52,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOn Materials/LOD1/FacingLeaves_4.mat b/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOn Materials/LOD1/FacingLeaves_4.mat index 8fb496c79ea..b85a0b3c370 100644 --- a/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOn Materials/LOD1/FacingLeaves_4.mat +++ b/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOn Materials/LOD1/FacingLeaves_4.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 diff --git a/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOn Materials/LOD1/Fronds_2.mat b/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOn Materials/LOD1/Fronds_2.mat index e275f57b394..f2df624525f 100644 --- a/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOn Materials/LOD1/Fronds_2.mat +++ b/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOn Materials/LOD1/Fronds_2.mat @@ -52,4 +52,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOn Materials/LOD1/Leaves_3.mat b/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOn Materials/LOD1/Leaves_3.mat index 6a9b0007eb9..544c6b1753e 100644 --- a/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOn Materials/LOD1/Leaves_3.mat +++ b/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOn Materials/LOD1/Leaves_3.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 diff --git a/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOn Materials/LOD2/Branches_0.mat b/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOn Materials/LOD2/Branches_0.mat index e54b517f039..08bc98f2e6d 100644 --- a/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOn Materials/LOD2/Branches_0.mat +++ b/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOn Materials/LOD2/Branches_0.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 diff --git a/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOn Materials/LOD2/Branches_1.mat b/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOn Materials/LOD2/Branches_1.mat index ce2792a63bf..bfef6ef07c4 100644 --- a/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOn Materials/LOD2/Branches_1.mat +++ b/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOn Materials/LOD2/Branches_1.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 diff --git a/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOn Materials/LOD2/FacingLeaves_4.mat b/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOn Materials/LOD2/FacingLeaves_4.mat index 8826b439933..8792b2f035c 100644 --- a/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOn Materials/LOD2/FacingLeaves_4.mat +++ b/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOn Materials/LOD2/FacingLeaves_4.mat @@ -52,4 +52,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOn Materials/LOD2/Fronds_2.mat b/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOn Materials/LOD2/Fronds_2.mat index ab20da1d80d..9eddf1187e0 100644 --- a/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOn Materials/LOD2/Fronds_2.mat +++ b/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOn Materials/LOD2/Fronds_2.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 diff --git a/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOn Materials/LOD2/Leaves_3.mat b/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOn Materials/LOD2/Leaves_3.mat index dcb555a1741..17fa0bbea1d 100644 --- a/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOn Materials/LOD2/Leaves_3.mat +++ b/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOn Materials/LOD2/Leaves_3.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 diff --git a/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV8/Broadleaf_Desktop_Field_OptionsOff Materials/LOD0/Broadleaf_Desktop_Field.mat b/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV8/Broadleaf_Desktop_Field_OptionsOff Materials/LOD0/Broadleaf_Desktop_Field.mat index 22335fa6912..553497efd29 100644 --- a/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV8/Broadleaf_Desktop_Field_OptionsOff Materials/LOD0/Broadleaf_Desktop_Field.mat +++ b/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV8/Broadleaf_Desktop_Field_OptionsOff Materials/LOD0/Broadleaf_Desktop_Field.mat @@ -64,4 +64,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV8/Broadleaf_Desktop_Field_OptionsOff Materials/LOD0/Main_Bark.mat b/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV8/Broadleaf_Desktop_Field_OptionsOff Materials/LOD0/Main_Bark.mat index ab7be53b36d..98ffc43704e 100644 --- a/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV8/Broadleaf_Desktop_Field_OptionsOff Materials/LOD0/Main_Bark.mat +++ b/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV8/Broadleaf_Desktop_Field_OptionsOff Materials/LOD0/Main_Bark.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 diff --git a/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV8/Broadleaf_Desktop_Field_OptionsOff Materials/LOD1/Broadleaf_Desktop_Field.mat b/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV8/Broadleaf_Desktop_Field_OptionsOff Materials/LOD1/Broadleaf_Desktop_Field.mat index 01ed1ba5243..acc49f50fbc 100644 --- a/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV8/Broadleaf_Desktop_Field_OptionsOff Materials/LOD1/Broadleaf_Desktop_Field.mat +++ b/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV8/Broadleaf_Desktop_Field_OptionsOff Materials/LOD1/Broadleaf_Desktop_Field.mat @@ -64,4 +64,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV8/Broadleaf_Desktop_Field_OptionsOff Materials/LOD1/Main_Bark.mat b/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV8/Broadleaf_Desktop_Field_OptionsOff Materials/LOD1/Main_Bark.mat index 3283ac58133..696325d529b 100644 --- a/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV8/Broadleaf_Desktop_Field_OptionsOff Materials/LOD1/Main_Bark.mat +++ b/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV8/Broadleaf_Desktop_Field_OptionsOff Materials/LOD1/Main_Bark.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 diff --git a/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV8/Broadleaf_Desktop_Field_OptionsOff Materials/LOD2/Broadleaf_Desktop_Field.mat b/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV8/Broadleaf_Desktop_Field_OptionsOff Materials/LOD2/Broadleaf_Desktop_Field.mat index 22b121191b6..e45169023d6 100644 --- a/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV8/Broadleaf_Desktop_Field_OptionsOff Materials/LOD2/Broadleaf_Desktop_Field.mat +++ b/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV8/Broadleaf_Desktop_Field_OptionsOff Materials/LOD2/Broadleaf_Desktop_Field.mat @@ -64,4 +64,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV8/Broadleaf_Desktop_Field_OptionsOff Materials/LOD2/Main_Bark.mat b/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV8/Broadleaf_Desktop_Field_OptionsOff Materials/LOD2/Main_Bark.mat index b84effb6768..82342dbb32b 100644 --- a/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV8/Broadleaf_Desktop_Field_OptionsOff Materials/LOD2/Main_Bark.mat +++ b/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV8/Broadleaf_Desktop_Field_OptionsOff Materials/LOD2/Main_Bark.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 diff --git a/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV8/Broadleaf_Desktop_Field_OptionsOff Materials/LOD3/Broadleaf_Desktop_Field_Billboard.mat b/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV8/Broadleaf_Desktop_Field_OptionsOff Materials/LOD3/Broadleaf_Desktop_Field_Billboard.mat index e1a1a5021f5..f4713166e4a 100644 --- a/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV8/Broadleaf_Desktop_Field_OptionsOff Materials/LOD3/Broadleaf_Desktop_Field_Billboard.mat +++ b/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV8/Broadleaf_Desktop_Field_OptionsOff Materials/LOD3/Broadleaf_Desktop_Field_Billboard.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 diff --git a/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV8/Broadleaf_Desktop_Field_OptionsOn Materials/LOD0/Broadleaf_Desktop_Field.mat b/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV8/Broadleaf_Desktop_Field_OptionsOn Materials/LOD0/Broadleaf_Desktop_Field.mat index 1da54ac3a62..470ff1c2bb2 100644 --- a/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV8/Broadleaf_Desktop_Field_OptionsOn Materials/LOD0/Broadleaf_Desktop_Field.mat +++ b/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV8/Broadleaf_Desktop_Field_OptionsOn Materials/LOD0/Broadleaf_Desktop_Field.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 diff --git a/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV8/Broadleaf_Desktop_Field_OptionsOn Materials/LOD0/Main_Bark.mat b/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV8/Broadleaf_Desktop_Field_OptionsOn Materials/LOD0/Main_Bark.mat index 800e4d3eda7..3871ce98110 100644 --- a/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV8/Broadleaf_Desktop_Field_OptionsOn Materials/LOD0/Main_Bark.mat +++ b/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/SpeedTree/SpeedTreeV8/Broadleaf_Desktop_Field_OptionsOn Materials/LOD0/Main_Bark.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 diff --git a/TestProjects/UniversalGraphicsTest_PostPro/Assets/Scenes/145_SoftParticlesStackWithPP/Red.mat b/TestProjects/UniversalGraphicsTest_PostPro/Assets/Scenes/145_SoftParticlesStackWithPP/Red.mat index 9287774a59f..bfb13e7852e 100644 --- a/TestProjects/UniversalGraphicsTest_PostPro/Assets/Scenes/145_SoftParticlesStackWithPP/Red.mat +++ b/TestProjects/UniversalGraphicsTest_PostPro/Assets/Scenes/145_SoftParticlesStackWithPP/Red.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -77,10 +77,23 @@ Material: 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: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoatMask: 0 - _ClearCoatSmoothness: 0 @@ -89,6 +102,7 @@ Material: - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 0 - _Glossiness: 0 @@ -102,12 +116,13 @@ Material: - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _WorkflowMode: 1 - _ZWrite: 1 m_Colors: - _BaseColor: {r: 1, g: 0.19886708, b: 0.18396229, a: 1} - - _Color: {r: 1, g: 1, b: 1, a: 1} + - _Color: {r: 1, g: 0.19886705, b: 0.18396226, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] diff --git a/TestProjects/UniversalGraphicsTest_PostPro/Assets/Scenes/145_SoftParticlesStackWithPP/SoftParticles.mat b/TestProjects/UniversalGraphicsTest_PostPro/Assets/Scenes/145_SoftParticlesStackWithPP/SoftParticles.mat index ec934112c26..2ed339dc6eb 100644 --- a/TestProjects/UniversalGraphicsTest_PostPro/Assets/Scenes/145_SoftParticlesStackWithPP/SoftParticles.mat +++ b/TestProjects/UniversalGraphicsTest_PostPro/Assets/Scenes/145_SoftParticlesStackWithPP/SoftParticles.mat @@ -18,6 +18,7 @@ Material: RenderType: Transparent disabledShaderPasses: - SHADOWCASTER + - DepthOnly m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -129,4 +130,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_PostPro/Assets/Scenes/146_MSAA_RenderToBackbuffer/BlueUnlit.mat b/TestProjects/UniversalGraphicsTest_PostPro/Assets/Scenes/146_MSAA_RenderToBackbuffer/BlueUnlit.mat index 934c1f65c1f..eddbc0b2009 100644 --- a/TestProjects/UniversalGraphicsTest_PostPro/Assets/Scenes/146_MSAA_RenderToBackbuffer/BlueUnlit.mat +++ b/TestProjects/UniversalGraphicsTest_PostPro/Assets/Scenes/146_MSAA_RenderToBackbuffer/BlueUnlit.mat @@ -89,6 +89,7 @@ Material: - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 0 - _Glossiness: 0 @@ -103,6 +104,7 @@ Material: - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _WorkflowMode: 1 - _ZWrite: 1 @@ -124,4 +126,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_PostPro/Assets/Scenes/146_MSAA_RenderToBackbuffer/GreenUnlit.mat b/TestProjects/UniversalGraphicsTest_PostPro/Assets/Scenes/146_MSAA_RenderToBackbuffer/GreenUnlit.mat index 977adcbe110..b9b57cc8f73 100644 --- a/TestProjects/UniversalGraphicsTest_PostPro/Assets/Scenes/146_MSAA_RenderToBackbuffer/GreenUnlit.mat +++ b/TestProjects/UniversalGraphicsTest_PostPro/Assets/Scenes/146_MSAA_RenderToBackbuffer/GreenUnlit.mat @@ -89,6 +89,7 @@ Material: - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 0 - _Glossiness: 0 @@ -103,6 +104,7 @@ Material: - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _WorkflowMode: 1 - _ZWrite: 1 @@ -124,4 +126,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_PostPro/Assets/Scenes/146_MSAA_RenderToBackbuffer/RedUnlit.mat b/TestProjects/UniversalGraphicsTest_PostPro/Assets/Scenes/146_MSAA_RenderToBackbuffer/RedUnlit.mat index 496794c0017..c637020dc0d 100644 --- a/TestProjects/UniversalGraphicsTest_PostPro/Assets/Scenes/146_MSAA_RenderToBackbuffer/RedUnlit.mat +++ b/TestProjects/UniversalGraphicsTest_PostPro/Assets/Scenes/146_MSAA_RenderToBackbuffer/RedUnlit.mat @@ -89,6 +89,7 @@ Material: - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 0 - _Glossiness: 0 @@ -103,6 +104,7 @@ Material: - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _WorkflowMode: 1 - _ZWrite: 1 @@ -124,4 +126,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_PostPro/Assets/Scenes/146_MSAA_RenderToBackbuffer/YellowUnlit.mat b/TestProjects/UniversalGraphicsTest_PostPro/Assets/Scenes/146_MSAA_RenderToBackbuffer/YellowUnlit.mat index 0987c0c583b..99790ef4d8d 100644 --- a/TestProjects/UniversalGraphicsTest_PostPro/Assets/Scenes/146_MSAA_RenderToBackbuffer/YellowUnlit.mat +++ b/TestProjects/UniversalGraphicsTest_PostPro/Assets/Scenes/146_MSAA_RenderToBackbuffer/YellowUnlit.mat @@ -89,6 +89,7 @@ Material: - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 0 - _Glossiness: 0 @@ -103,6 +104,7 @@ Material: - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _WorkflowMode: 1 - _ZWrite: 1 @@ -124,4 +126,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_PostPro/Assets/Scenes/170_CameraCaptureAction/Material.mat b/TestProjects/UniversalGraphicsTest_PostPro/Assets/Scenes/170_CameraCaptureAction/Material.mat index 202da4ad7a1..c2e469ddd82 100644 --- a/TestProjects/UniversalGraphicsTest_PostPro/Assets/Scenes/170_CameraCaptureAction/Material.mat +++ b/TestProjects/UniversalGraphicsTest_PostPro/Assets/Scenes/170_CameraCaptureAction/Material.mat @@ -80,6 +80,7 @@ Material: m_Floats: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoatMask: 0 - _ClearCoatSmoothness: 0 @@ -88,6 +89,7 @@ Material: - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 0 - _Glossiness: 0 @@ -101,6 +103,7 @@ Material: - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _WorkflowMode: 1 - _ZWrite: 1 @@ -122,4 +125,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/Materials/Emissive1.mat b/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/Materials/Emissive1.mat index 671dba5270e..a9e15c89438 100644 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/Materials/Emissive1.mat +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/Materials/Emissive1.mat @@ -84,6 +84,7 @@ Material: m_Floats: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoat: 0 - _ClearCoatMask: 0 @@ -93,6 +94,7 @@ Material: - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 0 - _Glossiness: 0 @@ -106,6 +108,7 @@ Material: - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _WorkflowMode: 1 - _ZWrite: 1 @@ -127,4 +130,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOff Materials/Billboard.mat b/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOff Materials/Billboard.mat index 7f4baf7a9e1..7da2dbc9094 100644 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOff Materials/Billboard.mat +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOff Materials/Billboard.mat @@ -47,4 +47,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOff Materials/LOD0/Branches_0.mat b/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOff Materials/LOD0/Branches_0.mat index 211c817fe72..7fa576d8bfa 100644 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOff Materials/LOD0/Branches_0.mat +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOff Materials/LOD0/Branches_0.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOff Materials/LOD0/Branches_1.mat b/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOff Materials/LOD0/Branches_1.mat index 1cda6db2ffe..baea98465ad 100644 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOff Materials/LOD0/Branches_1.mat +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOff Materials/LOD0/Branches_1.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOff Materials/LOD0/FacingLeaves_4.mat b/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOff Materials/LOD0/FacingLeaves_4.mat index add34d12b78..03ad36fdcc1 100644 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOff Materials/LOD0/FacingLeaves_4.mat +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOff Materials/LOD0/FacingLeaves_4.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOff Materials/LOD0/Fronds_2.mat b/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOff Materials/LOD0/Fronds_2.mat index 0b02be9d2bc..c2c7306ab1c 100644 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOff Materials/LOD0/Fronds_2.mat +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOff Materials/LOD0/Fronds_2.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOff Materials/LOD0/Leaves_3.mat b/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOff Materials/LOD0/Leaves_3.mat index 1b07d2f7fd0..2c5bfdec6b2 100644 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOff Materials/LOD0/Leaves_3.mat +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOff Materials/LOD0/Leaves_3.mat @@ -52,4 +52,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOff Materials/LOD1/Branches_0.mat b/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOff Materials/LOD1/Branches_0.mat index 463a493b0ff..1f85b1dc1be 100644 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOff Materials/LOD1/Branches_0.mat +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOff Materials/LOD1/Branches_0.mat @@ -52,4 +52,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOff Materials/LOD1/Branches_1.mat b/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOff Materials/LOD1/Branches_1.mat index 051d4d60ba0..e6b13099036 100644 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOff Materials/LOD1/Branches_1.mat +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOff Materials/LOD1/Branches_1.mat @@ -52,4 +52,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOff Materials/LOD1/FacingLeaves_4.mat b/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOff Materials/LOD1/FacingLeaves_4.mat index a5aa5db65ac..12396c9a33f 100644 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOff Materials/LOD1/FacingLeaves_4.mat +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOff Materials/LOD1/FacingLeaves_4.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOff Materials/LOD1/Fronds_2.mat b/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOff Materials/LOD1/Fronds_2.mat index 8da3b5e844f..ca8200597fe 100644 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOff Materials/LOD1/Fronds_2.mat +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOff Materials/LOD1/Fronds_2.mat @@ -52,4 +52,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOff Materials/LOD1/Leaves_3.mat b/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOff Materials/LOD1/Leaves_3.mat index ae1b64d777b..1e6d20692f8 100644 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOff Materials/LOD1/Leaves_3.mat +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOff Materials/LOD1/Leaves_3.mat @@ -52,4 +52,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOff Materials/LOD2/Branches_0.mat b/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOff Materials/LOD2/Branches_0.mat index 13e5cef96d8..db499876771 100644 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOff Materials/LOD2/Branches_0.mat +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOff Materials/LOD2/Branches_0.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOff Materials/LOD2/Branches_1.mat b/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOff Materials/LOD2/Branches_1.mat index 88627fc1a0c..746c0299e56 100644 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOff Materials/LOD2/Branches_1.mat +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOff Materials/LOD2/Branches_1.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOff Materials/LOD2/FacingLeaves_4.mat b/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOff Materials/LOD2/FacingLeaves_4.mat index 189fcb92605..b6656af6c03 100644 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOff Materials/LOD2/FacingLeaves_4.mat +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOff Materials/LOD2/FacingLeaves_4.mat @@ -52,4 +52,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOff Materials/LOD2/Fronds_2.mat b/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOff Materials/LOD2/Fronds_2.mat index 144e79a94f0..c1112d74431 100644 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOff Materials/LOD2/Fronds_2.mat +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOff Materials/LOD2/Fronds_2.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOff Materials/LOD2/Leaves_3.mat b/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOff Materials/LOD2/Leaves_3.mat index a9e576a743a..ba3378789cf 100644 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOff Materials/LOD2/Leaves_3.mat +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOff Materials/LOD2/Leaves_3.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOn Materials/Billboard.mat b/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOn Materials/Billboard.mat index 5a7c3dada6f..e2886ae8901 100644 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOn Materials/Billboard.mat +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOn Materials/Billboard.mat @@ -47,4 +47,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOn Materials/LOD0/Branches_0.mat b/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOn Materials/LOD0/Branches_0.mat index c5f31841961..de315bc19b9 100644 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOn Materials/LOD0/Branches_0.mat +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOn Materials/LOD0/Branches_0.mat @@ -52,4 +52,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOn Materials/LOD0/Branches_1.mat b/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOn Materials/LOD0/Branches_1.mat index 9277c95680e..61bd66e4394 100644 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOn Materials/LOD0/Branches_1.mat +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOn Materials/LOD0/Branches_1.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOn Materials/LOD0/FacingLeaves_4.mat b/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOn Materials/LOD0/FacingLeaves_4.mat index 66b18f0d45f..d6eb11601bc 100644 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOn Materials/LOD0/FacingLeaves_4.mat +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOn Materials/LOD0/FacingLeaves_4.mat @@ -52,4 +52,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOn Materials/LOD0/Fronds_2.mat b/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOn Materials/LOD0/Fronds_2.mat index 289833e4139..e655d75edfb 100644 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOn Materials/LOD0/Fronds_2.mat +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOn Materials/LOD0/Fronds_2.mat @@ -52,4 +52,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOn Materials/LOD0/Leaves_3.mat b/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOn Materials/LOD0/Leaves_3.mat index f536b3042e6..f2d29f7764b 100644 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOn Materials/LOD0/Leaves_3.mat +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOn Materials/LOD0/Leaves_3.mat @@ -52,4 +52,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOn Materials/LOD1/Branches_0.mat b/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOn Materials/LOD1/Branches_0.mat index 2fcb79dcf09..2120eaf7a13 100644 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOn Materials/LOD1/Branches_0.mat +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOn Materials/LOD1/Branches_0.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOn Materials/LOD1/Branches_1.mat b/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOn Materials/LOD1/Branches_1.mat index bec1d8663dc..0eadc2651e4 100644 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOn Materials/LOD1/Branches_1.mat +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOn Materials/LOD1/Branches_1.mat @@ -52,4 +52,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOn Materials/LOD1/FacingLeaves_4.mat b/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOn Materials/LOD1/FacingLeaves_4.mat index 8fb496c79ea..b85a0b3c370 100644 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOn Materials/LOD1/FacingLeaves_4.mat +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOn Materials/LOD1/FacingLeaves_4.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOn Materials/LOD1/Fronds_2.mat b/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOn Materials/LOD1/Fronds_2.mat index e275f57b394..f2df624525f 100644 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOn Materials/LOD1/Fronds_2.mat +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOn Materials/LOD1/Fronds_2.mat @@ -52,4 +52,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOn Materials/LOD1/Leaves_3.mat b/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOn Materials/LOD1/Leaves_3.mat index 6a9b0007eb9..544c6b1753e 100644 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOn Materials/LOD1/Leaves_3.mat +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOn Materials/LOD1/Leaves_3.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOn Materials/LOD2/Branches_0.mat b/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOn Materials/LOD2/Branches_0.mat index e54b517f039..08bc98f2e6d 100644 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOn Materials/LOD2/Branches_0.mat +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOn Materials/LOD2/Branches_0.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOn Materials/LOD2/Branches_1.mat b/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOn Materials/LOD2/Branches_1.mat index ce2792a63bf..bfef6ef07c4 100644 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOn Materials/LOD2/Branches_1.mat +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOn Materials/LOD2/Branches_1.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOn Materials/LOD2/FacingLeaves_4.mat b/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOn Materials/LOD2/FacingLeaves_4.mat index 8826b439933..8792b2f035c 100644 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOn Materials/LOD2/FacingLeaves_4.mat +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOn Materials/LOD2/FacingLeaves_4.mat @@ -52,4 +52,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOn Materials/LOD2/Fronds_2.mat b/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOn Materials/LOD2/Fronds_2.mat index ab20da1d80d..9eddf1187e0 100644 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOn Materials/LOD2/Fronds_2.mat +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOn Materials/LOD2/Fronds_2.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOn Materials/LOD2/Leaves_3.mat b/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOn Materials/LOD2/Leaves_3.mat index dcb555a1741..17fa0bbea1d 100644 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOn Materials/LOD2/Leaves_3.mat +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV7/Broadleaf_Desktop_OptionsOn Materials/LOD2/Leaves_3.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV8/Broadleaf_Desktop_Field_OptionsOff Materials/LOD0/Broadleaf_Desktop_Field.mat b/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV8/Broadleaf_Desktop_Field_OptionsOff Materials/LOD0/Broadleaf_Desktop_Field.mat index e3653a6a03a..fd22138943d 100644 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV8/Broadleaf_Desktop_Field_OptionsOff Materials/LOD0/Broadleaf_Desktop_Field.mat +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV8/Broadleaf_Desktop_Field_OptionsOff Materials/LOD0/Broadleaf_Desktop_Field.mat @@ -85,4 +85,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV8/Broadleaf_Desktop_Field_OptionsOff Materials/LOD0/Main_Bark.mat b/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV8/Broadleaf_Desktop_Field_OptionsOff Materials/LOD0/Main_Bark.mat index 22ea78d6852..856b4f167a2 100644 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV8/Broadleaf_Desktop_Field_OptionsOff Materials/LOD0/Main_Bark.mat +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV8/Broadleaf_Desktop_Field_OptionsOff Materials/LOD0/Main_Bark.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV8/Broadleaf_Desktop_Field_OptionsOff Materials/LOD1/Broadleaf_Desktop_Field.mat b/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV8/Broadleaf_Desktop_Field_OptionsOff Materials/LOD1/Broadleaf_Desktop_Field.mat index 5bde6ca5846..9199d71b19a 100644 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV8/Broadleaf_Desktop_Field_OptionsOff Materials/LOD1/Broadleaf_Desktop_Field.mat +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV8/Broadleaf_Desktop_Field_OptionsOff Materials/LOD1/Broadleaf_Desktop_Field.mat @@ -85,4 +85,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV8/Broadleaf_Desktop_Field_OptionsOff Materials/LOD1/Main_Bark.mat b/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV8/Broadleaf_Desktop_Field_OptionsOff Materials/LOD1/Main_Bark.mat index 2ff2d8340c9..1d534c70f90 100644 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV8/Broadleaf_Desktop_Field_OptionsOff Materials/LOD1/Main_Bark.mat +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV8/Broadleaf_Desktop_Field_OptionsOff Materials/LOD1/Main_Bark.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV8/Broadleaf_Desktop_Field_OptionsOff Materials/LOD2/Broadleaf_Desktop_Field.mat b/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV8/Broadleaf_Desktop_Field_OptionsOff Materials/LOD2/Broadleaf_Desktop_Field.mat index a39d1f9fc3c..8ec058a457b 100644 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV8/Broadleaf_Desktop_Field_OptionsOff Materials/LOD2/Broadleaf_Desktop_Field.mat +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV8/Broadleaf_Desktop_Field_OptionsOff Materials/LOD2/Broadleaf_Desktop_Field.mat @@ -85,4 +85,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV8/Broadleaf_Desktop_Field_OptionsOff Materials/LOD2/Main_Bark.mat b/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV8/Broadleaf_Desktop_Field_OptionsOff Materials/LOD2/Main_Bark.mat index 70976edc6b0..ea4eb4345d9 100644 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV8/Broadleaf_Desktop_Field_OptionsOff Materials/LOD2/Main_Bark.mat +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV8/Broadleaf_Desktop_Field_OptionsOff Materials/LOD2/Main_Bark.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV8/Broadleaf_Desktop_Field_OptionsOff Materials/LOD3/Broadleaf_Desktop_Field_Billboard.mat b/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV8/Broadleaf_Desktop_Field_OptionsOff Materials/LOD3/Broadleaf_Desktop_Field_Billboard.mat index 51fe3286061..241641a73b5 100644 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV8/Broadleaf_Desktop_Field_OptionsOff Materials/LOD3/Broadleaf_Desktop_Field_Billboard.mat +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV8/Broadleaf_Desktop_Field_OptionsOff Materials/LOD3/Broadleaf_Desktop_Field_Billboard.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV8/Broadleaf_Desktop_Field_OptionsOn Materials/LOD0/Broadleaf_Desktop_Field.mat b/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV8/Broadleaf_Desktop_Field_OptionsOn Materials/LOD0/Broadleaf_Desktop_Field.mat index f1e6acc5e6c..00d22bb35db 100644 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV8/Broadleaf_Desktop_Field_OptionsOn Materials/LOD0/Broadleaf_Desktop_Field.mat +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV8/Broadleaf_Desktop_Field_OptionsOn Materials/LOD0/Broadleaf_Desktop_Field.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV8/Broadleaf_Desktop_Field_OptionsOn Materials/LOD0/Main_Bark.mat b/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV8/Broadleaf_Desktop_Field_OptionsOn Materials/LOD0/Main_Bark.mat index 5fe046d6870..4148e4bad30 100644 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV8/Broadleaf_Desktop_Field_OptionsOn Materials/LOD0/Main_Bark.mat +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV8/Broadleaf_Desktop_Field_OptionsOn Materials/LOD0/Main_Bark.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV8/Broadleaf_Desktop_Field_OptionsOn Materials/LOD1/Broadleaf_Desktop_Field.mat b/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV8/Broadleaf_Desktop_Field_OptionsOn Materials/LOD1/Broadleaf_Desktop_Field.mat index dfd83d55279..99aede0ac14 100644 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV8/Broadleaf_Desktop_Field_OptionsOn Materials/LOD1/Broadleaf_Desktop_Field.mat +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV8/Broadleaf_Desktop_Field_OptionsOn Materials/LOD1/Broadleaf_Desktop_Field.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV8/Broadleaf_Desktop_Field_OptionsOn Materials/LOD1/Main_Bark.mat b/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV8/Broadleaf_Desktop_Field_OptionsOn Materials/LOD1/Main_Bark.mat index 321c6b8174b..0b0ac63170e 100644 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV8/Broadleaf_Desktop_Field_OptionsOn Materials/LOD1/Main_Bark.mat +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV8/Broadleaf_Desktop_Field_OptionsOn Materials/LOD1/Main_Bark.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV8/Broadleaf_Desktop_Field_OptionsOn Materials/LOD2/Broadleaf_Desktop_Field.mat b/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV8/Broadleaf_Desktop_Field_OptionsOn Materials/LOD2/Broadleaf_Desktop_Field.mat index 406fff485a2..6a9f7a22b02 100644 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV8/Broadleaf_Desktop_Field_OptionsOn Materials/LOD2/Broadleaf_Desktop_Field.mat +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV8/Broadleaf_Desktop_Field_OptionsOn Materials/LOD2/Broadleaf_Desktop_Field.mat @@ -85,4 +85,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV8/Broadleaf_Desktop_Field_OptionsOn Materials/LOD2/Main_Bark.mat b/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV8/Broadleaf_Desktop_Field_OptionsOn Materials/LOD2/Main_Bark.mat index 2ff3fdc4784..a70fbdc3956 100644 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV8/Broadleaf_Desktop_Field_OptionsOn Materials/LOD2/Main_Bark.mat +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV8/Broadleaf_Desktop_Field_OptionsOn Materials/LOD2/Main_Bark.mat @@ -85,4 +85,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV8/Broadleaf_Desktop_Field_OptionsOn Materials/LOD3/Broadleaf_Desktop_Field_Billboard.mat b/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV8/Broadleaf_Desktop_Field_OptionsOn Materials/LOD3/Broadleaf_Desktop_Field_Billboard.mat index 8a6e34a16d2..1be83ace735 100644 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV8/Broadleaf_Desktop_Field_OptionsOn Materials/LOD3/Broadleaf_Desktop_Field_Billboard.mat +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/CommonAssets/SpeedTree/SpeedTreeV8/Broadleaf_Desktop_Field_OptionsOn Materials/LOD3/Broadleaf_Desktop_Field_Billboard.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/Scenes/035_Shader_TerrainShaders/Free_SpeedTrees/Broadleaf_Mobile Materials/Billboard.mat b/TestProjects/UniversalGraphicsTest_Terrain/Assets/Scenes/035_Shader_TerrainShaders/Free_SpeedTrees/Broadleaf_Mobile Materials/Billboard.mat index b57423de8ba..27f05a0f4af 100644 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/Scenes/035_Shader_TerrainShaders/Free_SpeedTrees/Broadleaf_Mobile Materials/Billboard.mat +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/Scenes/035_Shader_TerrainShaders/Free_SpeedTrees/Broadleaf_Mobile Materials/Billboard.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/Scenes/035_Shader_TerrainShaders/Free_SpeedTrees/Broadleaf_Mobile Materials/LOD0/Branches_0.mat b/TestProjects/UniversalGraphicsTest_Terrain/Assets/Scenes/035_Shader_TerrainShaders/Free_SpeedTrees/Broadleaf_Mobile Materials/LOD0/Branches_0.mat index 088a43d7309..f153364a444 100644 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/Scenes/035_Shader_TerrainShaders/Free_SpeedTrees/Broadleaf_Mobile Materials/LOD0/Branches_0.mat +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/Scenes/035_Shader_TerrainShaders/Free_SpeedTrees/Broadleaf_Mobile Materials/LOD0/Branches_0.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/Scenes/035_Shader_TerrainShaders/Free_SpeedTrees/Broadleaf_Mobile Materials/LOD0/Leaves_1.mat b/TestProjects/UniversalGraphicsTest_Terrain/Assets/Scenes/035_Shader_TerrainShaders/Free_SpeedTrees/Broadleaf_Mobile Materials/LOD0/Leaves_1.mat index 0adafdb4167..f4e886156e3 100644 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/Scenes/035_Shader_TerrainShaders/Free_SpeedTrees/Broadleaf_Mobile Materials/LOD0/Leaves_1.mat +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/Scenes/035_Shader_TerrainShaders/Free_SpeedTrees/Broadleaf_Mobile Materials/LOD0/Leaves_1.mat @@ -52,4 +52,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/Scenes/035_Shader_TerrainShaders/Free_SpeedTrees/Broadleaf_Mobile Materials/LOD1/Branches_0.mat b/TestProjects/UniversalGraphicsTest_Terrain/Assets/Scenes/035_Shader_TerrainShaders/Free_SpeedTrees/Broadleaf_Mobile Materials/LOD1/Branches_0.mat index 823d2f48d32..b3235d551cc 100644 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/Scenes/035_Shader_TerrainShaders/Free_SpeedTrees/Broadleaf_Mobile Materials/LOD1/Branches_0.mat +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/Scenes/035_Shader_TerrainShaders/Free_SpeedTrees/Broadleaf_Mobile Materials/LOD1/Branches_0.mat @@ -52,4 +52,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/Scenes/035_Shader_TerrainShaders/Free_SpeedTrees/Broadleaf_Mobile Materials/LOD1/Leaves_1.mat b/TestProjects/UniversalGraphicsTest_Terrain/Assets/Scenes/035_Shader_TerrainShaders/Free_SpeedTrees/Broadleaf_Mobile Materials/LOD1/Leaves_1.mat index eaa1bc0beef..ce70e615395 100644 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/Scenes/035_Shader_TerrainShaders/Free_SpeedTrees/Broadleaf_Mobile Materials/LOD1/Leaves_1.mat +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/Scenes/035_Shader_TerrainShaders/Free_SpeedTrees/Broadleaf_Mobile Materials/LOD1/Leaves_1.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/Scenes/035_Shader_TerrainShaders/Free_SpeedTrees/Broadleaf_Mobile Materials/LOD2/Branches_0.mat b/TestProjects/UniversalGraphicsTest_Terrain/Assets/Scenes/035_Shader_TerrainShaders/Free_SpeedTrees/Broadleaf_Mobile Materials/LOD2/Branches_0.mat index cd0489c5c7a..ab9bbc1cf27 100644 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/Scenes/035_Shader_TerrainShaders/Free_SpeedTrees/Broadleaf_Mobile Materials/LOD2/Branches_0.mat +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/Scenes/035_Shader_TerrainShaders/Free_SpeedTrees/Broadleaf_Mobile Materials/LOD2/Branches_0.mat @@ -52,4 +52,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/Scenes/035_Shader_TerrainShaders/Free_SpeedTrees/Broadleaf_Mobile Materials/LOD2/Leaves_1.mat b/TestProjects/UniversalGraphicsTest_Terrain/Assets/Scenes/035_Shader_TerrainShaders/Free_SpeedTrees/Broadleaf_Mobile Materials/LOD2/Leaves_1.mat index eb2804adab1..8b9cc2b9262 100644 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/Scenes/035_Shader_TerrainShaders/Free_SpeedTrees/Broadleaf_Mobile Materials/LOD2/Leaves_1.mat +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/Scenes/035_Shader_TerrainShaders/Free_SpeedTrees/Broadleaf_Mobile Materials/LOD2/Leaves_1.mat @@ -52,4 +52,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/Scenes/035_Shader_TerrainShaders/Rock.mat b/TestProjects/UniversalGraphicsTest_Terrain/Assets/Scenes/035_Shader_TerrainShaders/Rock.mat index 1e370122146..3a40d17e657 100644 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/Scenes/035_Shader_TerrainShaders/Rock.mat +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/Scenes/035_Shader_TerrainShaders/Rock.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -97,6 +97,7 @@ Material: m_Floats: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoat: 0 - _ClearCoatMask: 0 @@ -106,6 +107,7 @@ Material: - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 0.5 @@ -119,6 +121,7 @@ Material: - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _WorkflowMode: 1 diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/Scenes/035_Shader_TerrainShaders/Terrain.mat b/TestProjects/UniversalGraphicsTest_Terrain/Assets/Scenes/035_Shader_TerrainShaders/Terrain.mat index 9d863dbf1ee..b7686607c9f 100644 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/Scenes/035_Shader_TerrainShaders/Terrain.mat +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/Scenes/035_Shader_TerrainShaders/Terrain.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/Scenes/035_Shader_TerrainShaders/__atsV2 Demoscene/Fern/Materials/Fern 2sided-Fern.mat b/TestProjects/UniversalGraphicsTest_Terrain/Assets/Scenes/035_Shader_TerrainShaders/__atsV2 Demoscene/Fern/Materials/Fern 2sided-Fern.mat index fcb4024e868..eae647d45f7 100644 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/Scenes/035_Shader_TerrainShaders/__atsV2 Demoscene/Fern/Materials/Fern 2sided-Fern.mat +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/Scenes/035_Shader_TerrainShaders/__atsV2 Demoscene/Fern/Materials/Fern 2sided-Fern.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -97,6 +97,7 @@ Material: m_Floats: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoat: 0 - _ClearCoatMask: 0 @@ -106,6 +107,7 @@ Material: - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 0 @@ -119,6 +121,7 @@ Material: - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _WorkflowMode: 1 diff --git a/com.unity.render-pipelines.universal/Runtime/Materials/Lit.mat b/com.unity.render-pipelines.universal/Runtime/Materials/Lit.mat index ee75030f91f..5d5b98d5038 100644 --- a/com.unity.render-pipelines.universal/Runtime/Materials/Lit.mat +++ b/com.unity.render-pipelines.universal/Runtime/Materials/Lit.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -105,6 +105,7 @@ Material: m_Floats: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoat: 0 - _ClearCoatMask: 0 @@ -114,6 +115,7 @@ Material: - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 0.5 @@ -132,6 +134,7 @@ Material: - _SpecSource: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _WorkflowMode: 1 diff --git a/com.unity.render-pipelines.universal/Runtime/Materials/ParticlesUnlit.mat b/com.unity.render-pipelines.universal/Runtime/Materials/ParticlesUnlit.mat index 4ca9d8e0f01..55ead432b37 100644 --- a/com.unity.render-pipelines.universal/Runtime/Materials/ParticlesUnlit.mat +++ b/com.unity.render-pipelines.universal/Runtime/Materials/ParticlesUnlit.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 diff --git a/com.unity.render-pipelines.universal/Runtime/Materials/SimpleLit.mat b/com.unity.render-pipelines.universal/Runtime/Materials/SimpleLit.mat index 2acc4b70dd8..1d7d18b485b 100644 --- a/com.unity.render-pipelines.universal/Runtime/Materials/SimpleLit.mat +++ b/com.unity.render-pipelines.universal/Runtime/Materials/SimpleLit.mat @@ -76,11 +76,13 @@ Material: m_Floats: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _Cull: 2 - _Cutoff: 0.5 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 0.5 @@ -97,6 +99,7 @@ Material: - _SpecSource: 0 - _SpecularHighlights: 0 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _ZWrite: 1 @@ -118,4 +121,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/com.unity.render-pipelines.universal/Runtime/Materials/TerrainLit.mat b/com.unity.render-pipelines.universal/Runtime/Materials/TerrainLit.mat index b16235f562b..6cc5dc38d14 100644 --- a/com.unity.render-pipelines.universal/Runtime/Materials/TerrainLit.mat +++ b/com.unity.render-pipelines.universal/Runtime/Materials/TerrainLit.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 From 3296d5d5f717b59532aedec35c0a056d44a462a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Elvar=20=C3=96rn=20Unn=C3=BE=C3=B3rsson?= Date: Thu, 18 Nov 2021 15:39:01 +0100 Subject: [PATCH 03/14] Making intermediate render textures scale with the RenderScale setting when a camera renders to a texture (#6274) --- com.unity.render-pipelines.universal/CHANGELOG.md | 1 + .../Runtime/UniversalRenderPipelineCore.cs | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/com.unity.render-pipelines.universal/CHANGELOG.md b/com.unity.render-pipelines.universal/CHANGELOG.md index b37cb47d0ee..00a07a5f897 100644 --- a/com.unity.render-pipelines.universal/CHANGELOG.md +++ b/com.unity.render-pipelines.universal/CHANGELOG.md @@ -64,6 +64,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. - Fixed disabled debug lighting modes on Vulkan and OpenGL following a shader compiler fix. [case 1334240] - Fixed an issue in where the Convert Renderering Settings would cause a freeze. [case 1353885](https://issuetracker.unity3d.com/issues/urp-builtin-to-urp-render-pipeline-converter-freezes-the-editor-when-converting-rendering-settings) - Fixed incorrect behavior of Reflections with Smoothness lighting debug mode. [case 1374181] +- Fixed an issue where intermediate rendertextures were not scaled when a camera was rendering to a texture [case 1342895](https://issuetracker.unity3d.com/issues/camera-rendertocubemap-offsets-and-stretches-out-the-ambient-occlusionl-layer-when-the-render-scale-is-not-equal-to-1) ## [13.1.0] - 2021-09-24 ### Added diff --git a/com.unity.render-pipelines.universal/Runtime/UniversalRenderPipelineCore.cs b/com.unity.render-pipelines.universal/Runtime/UniversalRenderPipelineCore.cs index b7196609b4f..e0cd6fb63f2 100644 --- a/com.unity.render-pipelines.universal/Runtime/UniversalRenderPipelineCore.cs +++ b/com.unity.render-pipelines.universal/Runtime/UniversalRenderPipelineCore.cs @@ -558,8 +558,8 @@ static RenderTextureDescriptor CreateRenderTextureDescriptor(Camera camera, floa else { desc = camera.targetTexture.descriptor; - desc.width = camera.pixelWidth; - desc.height = camera.pixelHeight; + desc.width = (int)((float)camera.pixelWidth * renderScale); + desc.height = (int)((float)camera.pixelHeight * renderScale); if (camera.cameraType == CameraType.SceneView && !isHdrEnabled) { desc.graphicsFormat = SystemInfo.GetGraphicsFormat(DefaultFormat.LDR); From 096b4000eb9fa017d83617bd1659861fe5e305c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Th=C3=A9o=20Penavaire?= Date: Thu, 18 Nov 2021 15:49:07 +0100 Subject: [PATCH 04/14] Fix API is in the wrong state issue (#6331) --- .../Runtime/Materials/Decal.mat | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/com.unity.render-pipelines.universal/Runtime/Materials/Decal.mat b/com.unity.render-pipelines.universal/Runtime/Materials/Decal.mat index 1918de63cf8..4d4562b3273 100644 --- a/com.unity.render-pipelines.universal/Runtime/Materials/Decal.mat +++ b/com.unity.render-pipelines.universal/Runtime/Materials/Decal.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -21,7 +21,8 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Decal - m_Shader: {fileID: -6465566751694194690, guid: 9b4e681081e2b4c469111bb649e2f7ee, type: 3} + m_Shader: {fileID: -6465566751694194690, guid: 9b4e681081e2b4c469111bb649e2f7ee, + type: 3} m_ShaderKeywords: m_LightmapFlags: 4 m_EnableInstancingVariants: 1 From 4943ded19a9551d2e58f9d00b409bc745912e729 Mon Sep 17 00:00:00 2001 From: mingwai Date: Thu, 18 Nov 2021 11:37:59 +0100 Subject: [PATCH 05/14] BatchRendererGroup Test Projects Automation (#6276) * update reference images * Update HDRP failing test reference images * Add HDRP Linux Vulkan test images * Rename UniversalHybridTest to BatchRendererGroup_URP * Move vulkan win ref images to None folder * Rename HDRP_HybridTests to BatchRenderGroup_HDRP * replace hybrid with BRG and add to nightly * Fix HDRP project name type * fix typo * Add .meta files of added reference images * remove playmode_xr * Update RenderBRG.cs scripts from hrnext-bugfix * Update BrgGameojbects hdrp reference images after master merge * Add vulkan to HDRP brg windows * use gpu for build, remove osx from ci * apply patch from the [Yamato] Formatting job * add BRG to nightly [skip ci] * remove the hybrid projects from repoconfig Co-authored-by: MingWai Chan Co-authored-by: Tomas Kiniulis Co-authored-by: Sophia --- .repoconfig | 2 - .yamato/_abv.yml | 4 + .yamato/all-batchrenderergroup.yml | 81 +++++++++ .yamato/all-hdrp_batchrenderergroup.yml | 97 +++++++++++ .yamato/all-hdrp_hybrid.yml | 73 -------- .yamato/all-universal_batchrenderergroup.yml | 89 ++++++++++ .yamato/all-universal_hybrid.yml | 73 -------- .yamato/config/abv.metafile | 1 + .yamato/config/batchrenderergroup.metafile | 16 ++ .yamato/config/hdrp.metafile | 3 +- ...afile => hdrp_batchrenderergroup.metafile} | 46 +++-- ... => universal_batchrenderergroup.metafile} | 35 ++-- .yamato/config/urp.metafile | 4 +- ... hdrp_batchrenderergroup-linux-vulkan.yml} | 108 ++++++------ ... => hdrp_batchrenderergroup-osx-metal.yml} | 60 +++---- ...l => hdrp_batchrenderergroup-win-dx11.yml} | 68 ++++---- ...l => hdrp_batchrenderergroup-win-dx12.yml} | 68 ++++---- ...=> hdrp_batchrenderergroup-win-vulkan.yml} | 68 ++++---- .yamato/hdrp_hybrid-linux-openglcore.yml | 85 --------- ...l_batchrenderergroup-linux-openglcore.yml} | 16 +- ...ersal_batchrenderergroup-linux-vulkan.yml} | 116 ++++++------- ...niversal_batchrenderergroup-osx-metal.yml} | 40 ++--- ...universal_batchrenderergroup-win-dx11.yml} | 52 +++--- ...iversal_batchrenderergroup-win-vulkan.yml} | 52 +++--- .../universal_hybrid-android-opengles3.yml | 163 ------------------ .yamato/universal_hybrid-android-vulkan.yml | 163 ------------------ .../Assets/HDRPDefaultResources.meta | 0 .../HDRenderPipelineGlobalSettings.asset | 0 .../HDRenderPipelineGlobalSettings.asset.meta | 0 .../Assets/HDRPSettings.meta | 0 .../Assets/HDRPSettings/DefaultHDRISky.exr | Bin .../HDRPSettings/DefaultHDRISky.exr.meta | 0 .../HDRPSettings/DefaultSceneRoot.prefab | 0 .../HDRPSettings/DefaultSceneRoot.prefab.meta | 0 .../Assets/HDRPSettings/Foliage.asset | 0 .../Assets/HDRPSettings/Foliage.asset.meta | 0 .../HDRPSettings/HDRPDefaultSettings.asset | 0 .../HDRPDefaultSettings.asset.meta | 0 .../HDRPSettings/HDRenderPipelineAsset.asset | 0 .../HDRenderPipelineAsset.asset.meta | 0 ...DRPSamplesBuildSettings.buildconfiguration | 0 ...mplesBuildSettings.buildconfiguration.meta | 0 .../Assets/HDRPSettings/Presets.meta | 0 .../Presets/AudioCompressedInMemory.preset | 0 .../AudioCompressedInMemory.preset.meta | 0 .../Presets/AudioStreaming.preset | 0 .../Presets/AudioStreaming.preset.meta | 0 .../Assets/HDRPSettings/Presets/Defaults.meta | 0 .../Defaults/AlbedoTexture_Default.preset | 0 .../AlbedoTexture_Default.preset.meta | 0 .../AudioDecompressOnLoad_Default.preset | 0 .../AudioDecompressOnLoad_Default.preset.meta | 0 .../Defaults/DirectionalLight_Default.preset | 0 .../DirectionalLight_Default.preset.meta | 0 .../Defaults/SSSSettings_Default.preset | 0 .../Defaults/SSSSettings_Default.preset.meta | 0 .../HDRPSettings/Presets/HDRTexture.preset | 0 .../Presets/HDRTexture.preset.meta | 0 .../HDRPSettings/Presets/NormalTexture.preset | 0 .../Presets/NormalTexture.preset.meta | 0 .../Presets/UtilityTexture.preset | 0 .../Presets/UtilityTexture.preset.meta | 0 .../SampleScenePostProcessingSettings.asset | 0 ...mpleScenePostProcessingSettings.asset.meta | 0 .../Assets/HDRPSettings/Skin.asset | 0 .../Assets/HDRPSettings/Skin.asset.meta | 0 .../HDRPSettings/Sky and Fog Settings.asset | 0 .../Sky and Fog Settings.asset.meta | 0 .../Assets/ReferenceImages.meta | 0 .../Assets/ReferenceImages/Linear.meta | 0 .../ReferenceImages/Linear/LinuxEditor.meta} | 2 +- .../Linear/LinuxEditor}/Vulkan.meta | 2 +- .../Linear/LinuxEditor}/Vulkan/None.meta | 2 +- .../Vulkan/None/BRGGameObjects.png | 3 + .../Vulkan/None/BRGGameObjects.png.meta} | 5 +- .../Vulkan/None/BatchRenderGroupRaw.png | 3 + .../Vulkan/None/BatchRenderGroupRaw.png.meta | 41 +---- .../ReferenceImages/Linear/LinuxPlayer.meta} | 2 +- .../Linear/LinuxPlayer/Vulkan.meta | 8 + .../Linear/LinuxPlayer/Vulkan}/None.meta | 2 +- .../Vulkan/None/BRGGameObjects.png | 3 + .../Vulkan/None/BRGGameObjects.png.meta | 41 +---- .../Vulkan/None/BatchRenderGroupRaw.png | 3 + .../Vulkan}/None/BatchRenderGroupRaw.png.meta | 41 +---- .../ReferenceImages/Linear/OSXEditor.meta | 0 .../Linear/OSXEditor/Metal.meta | 0 .../Linear/OSXEditor/Metal/None.meta | 0 .../OSXEditor/Metal/None/BRGGameObjects.png | 3 + .../Metal/None/BRGGameObjects.png.meta | 0 .../Metal/None/BatchRenderGroupRaw.png | 3 + .../Metal/None/BatchRenderGroupRaw.png.meta | 0 .../ReferenceImages/Linear/OSXPlayer.meta | 0 .../Linear/OSXPlayer/Metal.meta | 0 .../Linear/OSXPlayer/Metal/None.meta | 0 .../OSXPlayer/Metal/None/BRGGameObjects.png | 3 + .../Metal/None/BRGGameObjects.png.meta | 0 .../Metal/None/BatchRenderGroupRaw.png | 3 + .../Metal/None/BatchRenderGroupRaw.png.meta | 0 .../ReferenceImages/Linear/WindowsEditor.meta | 0 .../Linear/WindowsEditor/Direct3D11.meta | 0 .../Linear/WindowsEditor/Direct3D11/None.meta | 0 .../Direct3D11/None/BRGGameObjects.png | 3 + .../Direct3D11/None/BRGGameObjects.png.meta | 0 .../Direct3D11/None/BatchRenderGroupRaw.png | 3 + .../None/BatchRenderGroupRaw.png.meta | 0 .../Linear/WindowsEditor/Direct3D12.meta | 0 .../Linear/WindowsEditor/Direct3D12/None.meta | 0 .../Direct3D12/None/BRGGameObjects.png | 3 + .../Direct3D12/None/BRGGameObjects.png.meta | 0 .../Direct3D12/None/BatchRenderGroupRaw.png | 3 + .../None/BatchRenderGroupRaw.png.meta | 0 .../Linear/WindowsEditor/Vulkan.meta | 8 + .../Linear/WindowsEditor/Vulkan}/None.meta | 2 +- .../Vulkan/None/BRGGameObjects.png | 3 + .../Vulkan}/None/BRGGameObjects.png.meta | 41 +---- .../Vulkan/None/BatchRenderGroupRaw.png | 3 + .../Vulkan}/None/BatchRenderGroupRaw.png.meta | 41 +---- .../ReferenceImages/Linear/WindowsPlayer.meta | 0 .../Linear/WindowsPlayer/Direct3D11.meta | 0 .../Linear/WindowsPlayer/Direct3D11/None.meta | 0 .../Direct3D11/None/BRGGameObjects.png | 3 + .../Direct3D11/None/BRGGameObjects.png.meta | 0 .../Direct3D11/None/BatchRenderGroupRaw.png | 3 + .../None/BatchRenderGroupRaw.png.meta | 0 .../Linear/WindowsPlayer/Direct3D12.meta | 0 .../Linear/WindowsPlayer/Direct3D12/None.meta | 0 .../Direct3D12/None/BRGGameObjects.png | 3 + .../Direct3D12/None/BRGGameObjects.png.meta | 0 .../Direct3D12/None/BatchRenderGroupRaw.png | 3 + .../None/BatchRenderGroupRaw.png.meta | 0 .../Linear/WindowsPlayer/Vulkan.meta | 0 .../Linear/WindowsPlayer/Vulkan/None.meta | 0 .../Vulkan/None/BRGGameObjects.png | 3 + .../Vulkan/None/BRGGameObjects.png.meta | 0 .../Vulkan/None/BatchRenderGroupRaw.png | 3 + .../Vulkan/None/BatchRenderGroupRaw.png.meta | 0 .../Assets/SampleScenes.meta | 0 .../Assets/SampleScenes/BRGGameObjects.meta | 0 .../SampleScenes/BRGGameObjects/AABB.cs | 12 +- .../SampleScenes/BRGGameObjects/AABB.cs.meta | 0 .../BRGGameObjects/BRGGameObjects.unity | 0 .../BRGGameObjects/BRGGameObjects.unity.meta | 0 .../BRGGameObjects/BoundsToAABB.cs | 4 +- .../BRGGameObjects/BoundsToAABB.cs.meta | 0 .../BRGGameObjects/FrustumPlanes.cs | 0 .../BRGGameObjects/FrustumPlanes.cs.meta | 0 .../SampleScenes/BRGGameObjects/Lit.mat | 0 .../SampleScenes/BRGGameObjects/Lit.mat.meta | 0 .../BRGGameObjects/LitTessellation.mat | 0 .../BRGGameObjects/LitTessellation.mat.meta | 0 .../SampleScenes/BRGGameObjects/RenderBRG.cs | 15 +- .../BRGGameObjects/RenderBRG.cs.meta | 0 .../SampleScenes/BRGGameObjects/Unlit.mat | 0 .../BRGGameObjects/Unlit.mat.meta | 0 .../SampleScenes/BRGGameObjects/brick.jpg | 0 .../BRGGameObjects/brick.jpg.meta | 0 .../SampleScenes/BatchRenderGroupRaw.meta | 0 .../BatchRenderGroupRaw/BRGMaterial.mat | 0 .../BatchRenderGroupRaw/BRGMaterial.mat.meta | 0 .../BatchRenderGroupRaw/BRGSetup.cs | 15 +- .../BatchRenderGroupRaw/BRGSetup.cs.meta | 0 .../BatchRenderGroupRaw.meta | 0 .../BatchRenderGroupRaw.unity | 0 .../BatchRenderGroupRaw.unity.meta | 0 .../Global Volume Profile.asset | 0 .../Global Volume Profile.asset.meta | 0 .../Assets/Tests.meta | 0 .../Assets/Tests/Editor.meta | 0 .../Tests/Editor/SetupGraphicsTestCases.cs | 0 .../Editor/SetupGraphicsTestCases.cs.meta | 0 .../Assets/Tests/Editor/SetupProject.cs | 10 +- .../Assets/Tests/Editor/SetupProject.cs.meta | 0 .../Assets/Tests/Editor/TestEditor.asmdef | 0 .../Tests/Editor/TestEditor.asmdef.meta | 0 .../Assets/Tests/Runtime.meta | 0 .../Assets/Tests/Runtime/GraphicsTestFix.cs | 25 ++- .../Tests/Runtime/GraphicsTestFix.cs.meta | 0 .../Runtime/GraphicsTestSettingsCustom.cs | 2 +- .../GraphicsTestSettingsCustom.cs.meta | 0 .../Assets/Tests/Runtime/GraphicsTests.cs | 2 +- .../Tests/Runtime/GraphicsTests.cs.meta | 0 .../Assets/Tests/Runtime/TestRuntime.asmdef | 0 .../Tests/Runtime/TestRuntime.asmdef.meta | 0 .../Assets/VFXDefaultResources.asset | 0 .../Assets/VFXDefaultResources.asset.meta | 0 .../Packages/manifest.json | 0 .../Packages/packages-lock.json | 0 .../ProjectSettings/AudioManager.asset | 0 .../BurstAotSettings_StandaloneWindows.json | 0 .../ProjectSettings/ClusterInputManager.asset | 0 .../ProjectSettings/DynamicsManager.asset | 0 .../ProjectSettings/EditorBuildSettings.asset | 0 .../ProjectSettings/EditorSettings.asset | 0 .../ProjectSettings/GraphicsSettings.asset | 0 .../ProjectSettings/HDRPProjectSettings.asset | 0 .../ProjectSettings/InputManager.asset | 0 .../ProjectSettings/MemorySettings.asset | 0 .../ProjectSettings/NavMeshAreas.asset | 0 .../ProjectSettings/NetworkManager.asset | 0 .../PackageManagerSettings.asset | 0 .../ProjectSettings/Physics2DSettings.asset | 0 .../ProjectSettings/PresetManager.asset | 0 .../ProjectSettings/ProjectSettings.asset | 12 +- .../ProjectSettings/QualitySettings.asset | 0 .../SceneTemplateSettings.json | 0 .../ProjectSettings/ShaderGraphSettings.asset | 0 .../ProjectSettings/TagManager.asset | 0 .../ProjectSettings/TimeManager.asset | 0 .../UnityConnectSettings.asset | 0 .../ProjectSettings/VFXManager.asset | 0 .../VersionControlSettings.asset | 0 .../ProjectSettings/XRPackageSettings.asset | 0 .../ProjectSettings/XRSettings.asset | 0 .../TestRunnerOptions.json | 0 .../UserSettings/EditorUserSettings.asset | 0 .../UserSettings/Layouts/default-2022.dwlt | 0 .../UserSettings/Search.settings | 0 .../Assets/ReferenceImages.meta | 0 .../Assets/ReferenceImages/Linear.meta | 0 .../ReferenceImages/Linear/LinuxEditor.meta | 0 .../Linear/LinuxEditor/Vulkan.meta | 0 .../Linear/LinuxEditor/Vulkan/None.meta | 0 .../Vulkan}/None/BRGGameObjects.png | 0 .../Vulkan/None/BRGGameObjects.png.meta | 0 .../Vulkan/None/BatchRenderGroupRaw.png | 3 + .../Vulkan/None/BatchRenderGroupRaw.png.meta | 0 .../ReferenceImages/Linear/LinuxPlayer.meta | 0 .../Linear/LinuxPlayer/Vulkan.meta | 0 .../Linear/LinuxPlayer/Vulkan/None.meta | 0 .../Vulkan/None/BRGGameObjects.png | 0 .../Vulkan/None/BRGGameObjects.png.meta | 0 .../Vulkan/None/BatchRenderGroupRaw.png | 3 + .../Vulkan/None/BatchRenderGroupRaw.png.meta | 0 .../ReferenceImages/Linear/OSXEditor.meta | 0 .../Linear/OSXEditor/Metal.meta | 0 .../Linear/OSXEditor/Metal/None.meta | 0 .../OSXEditor/Metal}/None/BRGGameObjects.png | 0 .../Metal/None/BRGGameObjects.png.meta | 0 .../Metal/None/BatchRenderGroupRaw.png | 3 + .../Metal/None/BatchRenderGroupRaw.png.meta | 0 .../ReferenceImages/Linear/OSXPlayer.meta | 0 .../Linear/OSXPlayer/Metal.meta | 0 .../Linear/OSXPlayer/Metal/None.meta | 0 .../OSXPlayer/Metal}/None/BRGGameObjects.png | 0 .../Metal/None/BRGGameObjects.png.meta | 0 .../Metal/None/BatchRenderGroupRaw.png | 3 + .../Metal/None/BatchRenderGroupRaw.png.meta | 0 .../ReferenceImages/Linear/WindowsEditor.meta | 0 .../Linear/WindowsEditor/Direct3D11.meta | 0 .../Linear/WindowsEditor/Direct3D11/None.meta | 0 .../Direct3D11}/None/BRGGameObjects.png | 0 .../Direct3D11/None/BRGGameObjects.png.meta | 0 .../Direct3D11/None/BatchRenderGroupRaw.png | 3 + .../None/BatchRenderGroupRaw.png.meta | 0 .../Linear/WindowsEditor/Direct3D12.meta | 0 .../Linear/WindowsEditor/Direct3D12/None.meta | 0 .../Direct3D12}/None/BRGGameObjects.png | 0 .../Direct3D12/None/BRGGameObjects.png.meta | 0 .../Direct3D12/None/BatchRenderGroupRaw.png | 3 + .../None/BatchRenderGroupRaw.png.meta | 0 .../Linear/WindowsEditor/Vulkan.meta | 0 .../Linear/WindowsEditor/Vulkan/None.meta | 0 .../Vulkan}/None/BRGGameObjects.png | 0 .../Vulkan/None/BRGGameObjects.png.meta | 0 .../Vulkan/None/BatchRenderGroupRaw.png | 3 + .../Vulkan/None/BatchRenderGroupRaw.png.meta | 0 .../ReferenceImages/Linear/WindowsPlayer.meta | 0 .../Linear/WindowsPlayer/Direct3D11.meta | 0 .../Linear/WindowsPlayer/Direct3D11/None.meta | 0 .../Direct3D11}/None/BRGGameObjects.png | 0 .../Direct3D11/None/BRGGameObjects.png.meta | 0 .../Direct3D11/None/BatchRenderGroupRaw.png | 3 + .../None/BatchRenderGroupRaw.png.meta | 0 .../Linear/WindowsPlayer/Direct3D12.meta | 0 .../Linear/WindowsPlayer/Direct3D12/None.meta | 0 .../Direct3D12}/None/BRGGameObjects.png | 0 .../Direct3D12/None/BRGGameObjects.png.meta | 0 .../Direct3D12/None/BatchRenderGroupRaw.png | 3 + .../None/BatchRenderGroupRaw.png.meta | 0 .../Linear/WindowsPlayer/Vulkan.meta | 0 .../Linear/WindowsPlayer/Vulkan/None.meta | 0 .../Vulkan}/None/BRGGameObjects.png | 0 .../Vulkan/None/BRGGameObjects.png.meta | 0 .../Vulkan/None/BatchRenderGroupRaw.png | 3 + .../Vulkan/None/BatchRenderGroupRaw.png.meta | 0 .../Assets/SampleScenes.meta | 0 .../Assets/SampleScenes/BRGGameObjects.meta | 0 .../SampleScenes/BRGGameObjects/AABB.cs | 12 +- .../SampleScenes/BRGGameObjects/AABB.cs.meta | 0 .../BRGGameObjects/BRGGameObjects.unity | 0 .../BRGGameObjects/BRGGameObjects.unity.meta | 0 .../BRGGameObjects/BoundsToAABB.cs | 4 +- .../BRGGameObjects/BoundsToAABB.cs.meta | 0 .../BRGGameObjects/FrustumPlanes.cs | 0 .../BRGGameObjects/FrustumPlanes.cs.meta | 0 .../SampleScenes/BRGGameObjects/RenderBRG.cs | 15 +- .../BRGGameObjects/RenderBRG.cs.meta | 0 .../BRGGameObjects/TestMaterial1.mat | 5 +- .../BRGGameObjects/TestMaterial1.mat.meta | 0 .../BRGGameObjects/TestMaterial2.mat | 5 +- .../BRGGameObjects/TestMaterial2.mat.meta | 0 .../SampleScenes/BRGGameObjects/brick.jpg | 0 .../BRGGameObjects/brick.jpg.meta | 0 .../SampleScenes/BatchRenderGroupRaw.meta | 0 .../BatchRenderGroupRaw/BRGMaterial.mat | 5 +- .../BatchRenderGroupRaw/BRGMaterial.mat.meta | 0 .../BatchRenderGroupRaw/BRGSetup.cs | 15 +- .../BatchRenderGroupRaw/BRGSetup.cs.meta | 0 .../BatchRenderGroupRaw.meta | 0 .../BatchRenderGroupRaw.unity | 0 .../BatchRenderGroupRaw.unity.meta | 0 .../Global Volume Profile.asset | 0 .../Global Volume Profile.asset.meta | 0 .../Assets/SampleScenes/SimpleExample.meta | 0 .../SimpleExample/SimpleBRGExample.cs | 0 .../SimpleExample/SimpleBRGExample.cs.meta | 0 .../SimpleExample/SimpleBRGExample.unity | 0 .../SimpleExample/SimpleBRGExample.unity.meta | 0 .../Assets/Tests.meta | 0 .../Assets/Tests/Editor.meta | 0 .../Tests/Editor/SetupGraphicsTestCases.cs | 2 +- .../Editor/SetupGraphicsTestCases.cs.meta | 0 .../Assets/Tests/Editor/SetupProject.cs | 10 +- .../Assets/Tests/Editor/SetupProject.cs.meta | 0 .../Assets/Tests/Editor/TestEditor.asmdef | 0 .../Tests/Editor/TestEditor.asmdef.meta | 0 .../Assets/Tests/Runtime.meta | 0 .../Assets/Tests/Runtime/GraphicsTestFix.cs | 25 ++- .../Tests/Runtime/GraphicsTestFix.cs.meta | 0 .../Runtime/GraphicsTestSettingsCustom.cs | 2 +- .../GraphicsTestSettingsCustom.cs.meta | 0 .../Assets/Tests/Runtime/GraphicsTests.cs | 22 +-- .../Tests/Runtime/GraphicsTests.cs.meta | 0 .../Assets/Tests/Runtime/TestRuntime.asmdef | 0 .../Tests/Runtime/TestRuntime.asmdef.meta | 0 .../Assets/URPSettings.meta | 0 .../UniversalRenderPipelineAsset.asset | 0 .../UniversalRenderPipelineAsset.asset.meta | 0 ...niversalRenderPipelineAsset_Renderer.asset | 0 ...salRenderPipelineAsset_Renderer.asset.meta | 0 ...niversalRenderPipelineGlobalSettings.asset | 0 ...salRenderPipelineGlobalSettings.asset.meta | 0 .../Assets/VFXDefaultResources.asset | 0 .../Assets/VFXDefaultResources.asset.meta | 0 .../Packages/manifest.json | 0 .../Packages/packages-lock.json | 0 .../ProjectSettings/AudioManager.asset | 0 .../ProjectSettings/ClusterInputManager.asset | 0 .../ProjectSettings/DynamicsManager.asset | 0 .../ProjectSettings/EditorBuildSettings.asset | 0 .../ProjectSettings/EditorSettings.asset | 0 .../ProjectSettings/GraphicsSettings.asset | 0 .../ProjectSettings/InputManager.asset | 0 .../ProjectSettings/MemorySettings.asset | 0 .../ProjectSettings/NavMeshAreas.asset | 0 .../ProjectSettings/NetworkManager.asset | 0 .../PackageManagerSettings.asset | 0 .../ProjectSettings/Physics2DSettings.asset | 0 .../ProjectSettings/PresetManager.asset | 0 .../ProjectSettings/ProjectSettings.asset | 0 .../ProjectSettings/QualitySettings.asset | 0 .../ProjectSettings/ShaderGraphSettings.asset | 0 .../ProjectSettings/TagManager.asset | 0 .../ProjectSettings/TimeManager.asset | 0 .../ProjectSettings/URPProjectSettings.asset | 0 .../UnityConnectSettings.asset | 0 .../ProjectSettings/VFXManager.asset | 0 .../VersionControlSettings.asset | 0 .../ProjectSettings/XRPackageSettings.asset | 0 .../ProjectSettings/XRSettings.asset | 0 .../TestRunnerOptions.json | 0 .../UserSettings/EditorUserSettings.asset | 0 .../UserSettings/Layouts/default-2022.dwlt | 0 .../UserSettings/Search.settings | 0 .../OSXEditor/Metal/None/BRGGameObjects.png | 3 - .../Metal/None/BatchRenderGroupRaw.png | 3 - ...fferentImages_ThrowsAssertionException.png | 3 - .../OSXPlayer/Metal/None/BRGGameObjects.png | 3 - .../Metal/None/BatchRenderGroupRaw.png | 3 - .../Direct3D11/None/BRGGameObjects.png | 3 - .../Direct3D11/None/BatchRenderGroupRaw.png | 3 - .../Direct3D12/None/BRGGameObjects.png | 3 - .../Direct3D12/None/BatchRenderGroupRaw.png | 3 - .../Direct3D11/None/BRGGameObjects.png | 3 - .../Direct3D11/None/BatchRenderGroupRaw.png | 3 - .../Direct3D12/None/BRGGameObjects.png | 3 - .../Direct3D12/None/BatchRenderGroupRaw.png | 3 - .../Vulkan/None/BRGGameObjects.png | 3 - .../Vulkan/None/BatchRenderGroupRaw.png | 3 - .../OpenGLES3/None/BatchRenderGroupRaw.png | 3 - .../Vulkan/None/BatchRenderGroupRaw.png | 3 - .../Linear/LinuxEditor/OpenGLCore.meta | 8 - .../OpenGLCore/None/BRGGameObjects.png.meta | 122 ------------- .../OpenGLCore/None/BatchRenderGroupRaw.png | 3 - .../Vulkan/None/BatchRenderGroupRaw.png | 3 - .../Linear/LinuxPlayer/OpenGLCore.meta | 8 - .../Linear/LinuxPlayer/OpenGLCore/None.meta | 8 - .../OpenGLCore/None/BRGGameObjects.png.meta | 122 ------------- .../OpenGLCore/None/BatchRenderGroupRaw.png | 3 - .../None/BatchRenderGroupRaw.png.meta | 122 ------------- .../Vulkan/None/BatchRenderGroupRaw.png | 3 - .../Metal/None/BatchRenderGroupRaw.png | 3 - .../Metal/None/BatchRenderGroupRaw.png | 3 - .../Direct3D11/None/BatchRenderGroupRaw.png | 3 - .../Direct3D12/None/BatchRenderGroupRaw.png | 3 - .../Linear/WindowsEditor/OpenGLCore.meta | 8 - .../Linear/WindowsEditor/OpenGLCore/None.meta | 8 - .../OpenGLCore/None/BRGGameObjects.png | 3 - .../OpenGLCore/None/BRGGameObjects.png.meta | 122 ------------- .../OpenGLCore/None/BatchRenderGroupRaw.png | 3 - .../None/BatchRenderGroupRaw.png.meta | 122 ------------- .../Vulkan/None/BRGGameObjects.png | 3 - .../Vulkan/None/BatchRenderGroupRaw.png | 3 - .../Direct3D11/None/BRGGameObjects.png | 3 - .../Direct3D11/None/BatchRenderGroupRaw.png | 3 - .../Direct3D12/None/BRGGameObjects.png | 3 - .../Direct3D12/None/BatchRenderGroupRaw.png | 3 - .../Linear/WindowsPlayer/OpenGLCore.meta | 8 - .../Linear/WindowsPlayer/OpenGLCore/None.meta | 8 - .../OpenGLCore/None/BRGGameObjects.png | 3 - .../OpenGLCore/None/BRGGameObjects.png.meta | 122 ------------- .../OpenGLCore/None/BatchRenderGroupRaw.png | 3 - .../None/BatchRenderGroupRaw.png.meta | 122 ------------- .../Vulkan/None/BRGGameObjects.png | 3 - .../Vulkan/None/BatchRenderGroupRaw.png | 3 - .../ReferenceImages/Linear/iPhonePlayer.meta | 8 - .../Linear/iPhonePlayer/Metal.meta | 8 - .../Linear/iPhonePlayer/Metal/None.meta | 8 - .../Metal/None/BRGGameObjects.png | 3 - .../Metal/None/BRGGameObjects.png.meta | 122 ------------- .../Metal/None/BatchRenderGroupRaw.png | 3 - .../Metal/None/BatchRenderGroupRaw.png.meta | 122 ------------- 432 files changed, 950 insertions(+), 2475 deletions(-) create mode 100644 .yamato/all-batchrenderergroup.yml create mode 100644 .yamato/all-hdrp_batchrenderergroup.yml delete mode 100644 .yamato/all-hdrp_hybrid.yml create mode 100644 .yamato/all-universal_batchrenderergroup.yml delete mode 100644 .yamato/all-universal_hybrid.yml create mode 100644 .yamato/config/batchrenderergroup.metafile rename .yamato/config/{hdrp_hybrid.metafile => hdrp_batchrenderergroup.metafile} (71%) rename .yamato/config/{universal_hybrid.metafile => universal_batchrenderergroup.metafile} (75%) rename .yamato/{universal_hybrid-linux-vulkan.yml => hdrp_batchrenderergroup-linux-vulkan.yml} (71%) rename .yamato/{hdrp_hybrid-osx-metal.yml => hdrp_batchrenderergroup-osx-metal.yml} (78%) rename .yamato/{hdrp_hybrid-win-vulkan.yml => hdrp_batchrenderergroup-win-dx11.yml} (66%) rename .yamato/{hdrp_hybrid-win-dx11.yml => hdrp_batchrenderergroup-win-dx12.yml} (66%) rename .yamato/{hdrp_hybrid-win-dx12.yml => hdrp_batchrenderergroup-win-vulkan.yml} (66%) delete mode 100644 .yamato/hdrp_hybrid-linux-openglcore.yml rename .yamato/{universal_hybrid-linux-openglcore.yml => universal_batchrenderergroup-linux-openglcore.yml} (77%) rename .yamato/{hdrp_hybrid-linux-vulkan.yml => universal_batchrenderergroup-linux-vulkan.yml} (71%) rename .yamato/{universal_hybrid-osx-metal.yml => universal_batchrenderergroup-osx-metal.yml} (78%) rename .yamato/{universal_hybrid-win-vulkan.yml => universal_batchrenderergroup-win-dx11.yml} (65%) rename .yamato/{universal_hybrid-win-dx11.yml => universal_batchrenderergroup-win-vulkan.yml} (66%) delete mode 100644 .yamato/universal_hybrid-android-opengles3.yml delete mode 100644 .yamato/universal_hybrid-android-vulkan.yml rename TestProjects/{HDRP_HybridTests => BatchRendererGroup_HDRP}/Assets/HDRPDefaultResources.meta (100%) rename TestProjects/{HDRP_HybridTests => BatchRendererGroup_HDRP}/Assets/HDRPDefaultResources/HDRenderPipelineGlobalSettings.asset (100%) rename TestProjects/{HDRP_HybridTests => BatchRendererGroup_HDRP}/Assets/HDRPDefaultResources/HDRenderPipelineGlobalSettings.asset.meta (100%) rename TestProjects/{HDRP_HybridTests => BatchRendererGroup_HDRP}/Assets/HDRPSettings.meta (100%) rename TestProjects/{HDRP_HybridTests => BatchRendererGroup_HDRP}/Assets/HDRPSettings/DefaultHDRISky.exr (100%) rename TestProjects/{HDRP_HybridTests => BatchRendererGroup_HDRP}/Assets/HDRPSettings/DefaultHDRISky.exr.meta (100%) rename TestProjects/{HDRP_HybridTests => BatchRendererGroup_HDRP}/Assets/HDRPSettings/DefaultSceneRoot.prefab (100%) rename TestProjects/{HDRP_HybridTests => BatchRendererGroup_HDRP}/Assets/HDRPSettings/DefaultSceneRoot.prefab.meta (100%) rename TestProjects/{HDRP_HybridTests => BatchRendererGroup_HDRP}/Assets/HDRPSettings/Foliage.asset (100%) rename TestProjects/{HDRP_HybridTests => BatchRendererGroup_HDRP}/Assets/HDRPSettings/Foliage.asset.meta (100%) rename TestProjects/{HDRP_HybridTests => BatchRendererGroup_HDRP}/Assets/HDRPSettings/HDRPDefaultSettings.asset (100%) rename TestProjects/{HDRP_HybridTests => BatchRendererGroup_HDRP}/Assets/HDRPSettings/HDRPDefaultSettings.asset.meta (100%) rename TestProjects/{HDRP_HybridTests => BatchRendererGroup_HDRP}/Assets/HDRPSettings/HDRenderPipelineAsset.asset (100%) rename TestProjects/{HDRP_HybridTests => BatchRendererGroup_HDRP}/Assets/HDRPSettings/HDRenderPipelineAsset.asset.meta (100%) rename TestProjects/{HDRP_HybridTests => BatchRendererGroup_HDRP}/Assets/HDRPSettings/HybridHDRPSamplesBuildSettings.buildconfiguration (100%) rename TestProjects/{HDRP_HybridTests => BatchRendererGroup_HDRP}/Assets/HDRPSettings/HybridHDRPSamplesBuildSettings.buildconfiguration.meta (100%) rename TestProjects/{HDRP_HybridTests => BatchRendererGroup_HDRP}/Assets/HDRPSettings/Presets.meta (100%) rename TestProjects/{HDRP_HybridTests => BatchRendererGroup_HDRP}/Assets/HDRPSettings/Presets/AudioCompressedInMemory.preset (100%) rename TestProjects/{HDRP_HybridTests => BatchRendererGroup_HDRP}/Assets/HDRPSettings/Presets/AudioCompressedInMemory.preset.meta (100%) rename TestProjects/{HDRP_HybridTests => BatchRendererGroup_HDRP}/Assets/HDRPSettings/Presets/AudioStreaming.preset (100%) rename TestProjects/{HDRP_HybridTests => BatchRendererGroup_HDRP}/Assets/HDRPSettings/Presets/AudioStreaming.preset.meta (100%) rename TestProjects/{HDRP_HybridTests => BatchRendererGroup_HDRP}/Assets/HDRPSettings/Presets/Defaults.meta (100%) rename TestProjects/{HDRP_HybridTests => BatchRendererGroup_HDRP}/Assets/HDRPSettings/Presets/Defaults/AlbedoTexture_Default.preset (100%) rename TestProjects/{HDRP_HybridTests => BatchRendererGroup_HDRP}/Assets/HDRPSettings/Presets/Defaults/AlbedoTexture_Default.preset.meta (100%) rename TestProjects/{HDRP_HybridTests => BatchRendererGroup_HDRP}/Assets/HDRPSettings/Presets/Defaults/AudioDecompressOnLoad_Default.preset (100%) rename TestProjects/{HDRP_HybridTests => BatchRendererGroup_HDRP}/Assets/HDRPSettings/Presets/Defaults/AudioDecompressOnLoad_Default.preset.meta (100%) rename TestProjects/{HDRP_HybridTests => BatchRendererGroup_HDRP}/Assets/HDRPSettings/Presets/Defaults/DirectionalLight_Default.preset (100%) rename TestProjects/{HDRP_HybridTests => BatchRendererGroup_HDRP}/Assets/HDRPSettings/Presets/Defaults/DirectionalLight_Default.preset.meta (100%) rename TestProjects/{HDRP_HybridTests => BatchRendererGroup_HDRP}/Assets/HDRPSettings/Presets/Defaults/SSSSettings_Default.preset (100%) rename TestProjects/{HDRP_HybridTests => BatchRendererGroup_HDRP}/Assets/HDRPSettings/Presets/Defaults/SSSSettings_Default.preset.meta (100%) rename TestProjects/{HDRP_HybridTests => BatchRendererGroup_HDRP}/Assets/HDRPSettings/Presets/HDRTexture.preset (100%) rename TestProjects/{HDRP_HybridTests => BatchRendererGroup_HDRP}/Assets/HDRPSettings/Presets/HDRTexture.preset.meta (100%) rename TestProjects/{HDRP_HybridTests => BatchRendererGroup_HDRP}/Assets/HDRPSettings/Presets/NormalTexture.preset (100%) rename TestProjects/{HDRP_HybridTests => BatchRendererGroup_HDRP}/Assets/HDRPSettings/Presets/NormalTexture.preset.meta (100%) rename TestProjects/{HDRP_HybridTests => BatchRendererGroup_HDRP}/Assets/HDRPSettings/Presets/UtilityTexture.preset (100%) rename TestProjects/{HDRP_HybridTests => BatchRendererGroup_HDRP}/Assets/HDRPSettings/Presets/UtilityTexture.preset.meta (100%) rename TestProjects/{HDRP_HybridTests => BatchRendererGroup_HDRP}/Assets/HDRPSettings/SampleScenePostProcessingSettings.asset (100%) rename TestProjects/{HDRP_HybridTests => BatchRendererGroup_HDRP}/Assets/HDRPSettings/SampleScenePostProcessingSettings.asset.meta (100%) rename TestProjects/{HDRP_HybridTests => BatchRendererGroup_HDRP}/Assets/HDRPSettings/Skin.asset (100%) rename TestProjects/{HDRP_HybridTests => BatchRendererGroup_HDRP}/Assets/HDRPSettings/Skin.asset.meta (100%) rename TestProjects/{HDRP_HybridTests => BatchRendererGroup_HDRP}/Assets/HDRPSettings/Sky and Fog Settings.asset (100%) rename TestProjects/{HDRP_HybridTests => BatchRendererGroup_HDRP}/Assets/HDRPSettings/Sky and Fog Settings.asset.meta (100%) rename TestProjects/{HDRP_HybridTests => BatchRendererGroup_HDRP}/Assets/ReferenceImages.meta (100%) rename TestProjects/{HDRP_HybridTests => BatchRendererGroup_HDRP}/Assets/ReferenceImages/Linear.meta (100%) rename TestProjects/{UniversalHybridTest/Assets/ReferenceImages/Linear/Android.meta => BatchRendererGroup_HDRP/Assets/ReferenceImages/Linear/LinuxEditor.meta} (77%) rename TestProjects/{UniversalHybridTest/Assets/ReferenceImages/Linear/Android => BatchRendererGroup_HDRP/Assets/ReferenceImages/Linear/LinuxEditor}/Vulkan.meta (77%) rename TestProjects/{UniversalHybridTest/Assets/ReferenceImages/Linear/Android => BatchRendererGroup_HDRP/Assets/ReferenceImages/Linear/LinuxEditor}/Vulkan/None.meta (77%) create mode 100644 TestProjects/BatchRendererGroup_HDRP/Assets/ReferenceImages/Linear/LinuxEditor/Vulkan/None/BRGGameObjects.png rename TestProjects/{HDRP_HybridTests/Assets/ReferenceImages/Linear/OSXPlayer/Metal/None/AreEqual_WithTotallyDifferentImages_ThrowsAssertionException.png.meta => BatchRendererGroup_HDRP/Assets/ReferenceImages/Linear/LinuxEditor/Vulkan/None/BRGGameObjects.png.meta} (96%) create mode 100644 TestProjects/BatchRendererGroup_HDRP/Assets/ReferenceImages/Linear/LinuxEditor/Vulkan/None/BatchRenderGroupRaw.png rename TestProjects/{UniversalHybridTest/Assets/ReferenceImages/Linear/Android => BatchRendererGroup_HDRP/Assets/ReferenceImages/Linear/LinuxEditor}/Vulkan/None/BatchRenderGroupRaw.png.meta (71%) rename TestProjects/{UniversalHybridTest/Assets/ReferenceImages/Linear/Android/OpenGLES3.meta => BatchRendererGroup_HDRP/Assets/ReferenceImages/Linear/LinuxPlayer.meta} (77%) create mode 100644 TestProjects/BatchRendererGroup_HDRP/Assets/ReferenceImages/Linear/LinuxPlayer/Vulkan.meta rename TestProjects/{UniversalHybridTest/Assets/ReferenceImages/Linear/LinuxEditor/OpenGLCore => BatchRendererGroup_HDRP/Assets/ReferenceImages/Linear/LinuxPlayer/Vulkan}/None.meta (77%) create mode 100644 TestProjects/BatchRendererGroup_HDRP/Assets/ReferenceImages/Linear/LinuxPlayer/Vulkan/None/BRGGameObjects.png rename TestProjects/{UniversalHybridTest/Assets/ReferenceImages/Linear/Android => BatchRendererGroup_HDRP/Assets/ReferenceImages/Linear/LinuxPlayer}/Vulkan/None/BRGGameObjects.png.meta (71%) create mode 100644 TestProjects/BatchRendererGroup_HDRP/Assets/ReferenceImages/Linear/LinuxPlayer/Vulkan/None/BatchRenderGroupRaw.png rename TestProjects/{UniversalHybridTest/Assets/ReferenceImages/Linear/LinuxEditor/OpenGLCore => BatchRendererGroup_HDRP/Assets/ReferenceImages/Linear/LinuxPlayer/Vulkan}/None/BatchRenderGroupRaw.png.meta (71%) rename TestProjects/{HDRP_HybridTests => BatchRendererGroup_HDRP}/Assets/ReferenceImages/Linear/OSXEditor.meta (100%) rename TestProjects/{HDRP_HybridTests => BatchRendererGroup_HDRP}/Assets/ReferenceImages/Linear/OSXEditor/Metal.meta (100%) rename TestProjects/{HDRP_HybridTests => BatchRendererGroup_HDRP}/Assets/ReferenceImages/Linear/OSXEditor/Metal/None.meta (100%) create mode 100644 TestProjects/BatchRendererGroup_HDRP/Assets/ReferenceImages/Linear/OSXEditor/Metal/None/BRGGameObjects.png rename TestProjects/{HDRP_HybridTests => BatchRendererGroup_HDRP}/Assets/ReferenceImages/Linear/OSXEditor/Metal/None/BRGGameObjects.png.meta (100%) create mode 100644 TestProjects/BatchRendererGroup_HDRP/Assets/ReferenceImages/Linear/OSXEditor/Metal/None/BatchRenderGroupRaw.png rename TestProjects/{HDRP_HybridTests => BatchRendererGroup_HDRP}/Assets/ReferenceImages/Linear/OSXEditor/Metal/None/BatchRenderGroupRaw.png.meta (100%) rename TestProjects/{HDRP_HybridTests => BatchRendererGroup_HDRP}/Assets/ReferenceImages/Linear/OSXPlayer.meta (100%) rename TestProjects/{HDRP_HybridTests => BatchRendererGroup_HDRP}/Assets/ReferenceImages/Linear/OSXPlayer/Metal.meta (100%) rename TestProjects/{HDRP_HybridTests => BatchRendererGroup_HDRP}/Assets/ReferenceImages/Linear/OSXPlayer/Metal/None.meta (100%) create mode 100644 TestProjects/BatchRendererGroup_HDRP/Assets/ReferenceImages/Linear/OSXPlayer/Metal/None/BRGGameObjects.png rename TestProjects/{HDRP_HybridTests => BatchRendererGroup_HDRP}/Assets/ReferenceImages/Linear/OSXPlayer/Metal/None/BRGGameObjects.png.meta (100%) create mode 100644 TestProjects/BatchRendererGroup_HDRP/Assets/ReferenceImages/Linear/OSXPlayer/Metal/None/BatchRenderGroupRaw.png rename TestProjects/{HDRP_HybridTests => BatchRendererGroup_HDRP}/Assets/ReferenceImages/Linear/OSXPlayer/Metal/None/BatchRenderGroupRaw.png.meta (100%) rename TestProjects/{HDRP_HybridTests => BatchRendererGroup_HDRP}/Assets/ReferenceImages/Linear/WindowsEditor.meta (100%) rename TestProjects/{HDRP_HybridTests => BatchRendererGroup_HDRP}/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11.meta (100%) rename TestProjects/{HDRP_HybridTests => BatchRendererGroup_HDRP}/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/None.meta (100%) create mode 100644 TestProjects/BatchRendererGroup_HDRP/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/None/BRGGameObjects.png rename TestProjects/{HDRP_HybridTests => BatchRendererGroup_HDRP}/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/None/BRGGameObjects.png.meta (100%) create mode 100644 TestProjects/BatchRendererGroup_HDRP/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/None/BatchRenderGroupRaw.png rename TestProjects/{HDRP_HybridTests => BatchRendererGroup_HDRP}/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/None/BatchRenderGroupRaw.png.meta (100%) rename TestProjects/{HDRP_HybridTests => BatchRendererGroup_HDRP}/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D12.meta (100%) rename TestProjects/{HDRP_HybridTests => BatchRendererGroup_HDRP}/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D12/None.meta (100%) create mode 100644 TestProjects/BatchRendererGroup_HDRP/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D12/None/BRGGameObjects.png rename TestProjects/{HDRP_HybridTests => BatchRendererGroup_HDRP}/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D12/None/BRGGameObjects.png.meta (100%) create mode 100644 TestProjects/BatchRendererGroup_HDRP/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D12/None/BatchRenderGroupRaw.png rename TestProjects/{HDRP_HybridTests => BatchRendererGroup_HDRP}/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D12/None/BatchRenderGroupRaw.png.meta (100%) create mode 100644 TestProjects/BatchRendererGroup_HDRP/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan.meta rename TestProjects/{UniversalHybridTest/Assets/ReferenceImages/Linear/Android/OpenGLES3 => BatchRendererGroup_HDRP/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan}/None.meta (77%) create mode 100644 TestProjects/BatchRendererGroup_HDRP/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/None/BRGGameObjects.png rename TestProjects/{UniversalHybridTest/Assets/ReferenceImages/Linear/Android/OpenGLES3 => BatchRendererGroup_HDRP/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan}/None/BRGGameObjects.png.meta (71%) create mode 100644 TestProjects/BatchRendererGroup_HDRP/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/None/BatchRenderGroupRaw.png rename TestProjects/{UniversalHybridTest/Assets/ReferenceImages/Linear/Android/OpenGLES3 => BatchRendererGroup_HDRP/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan}/None/BatchRenderGroupRaw.png.meta (71%) rename TestProjects/{HDRP_HybridTests => BatchRendererGroup_HDRP}/Assets/ReferenceImages/Linear/WindowsPlayer.meta (100%) rename TestProjects/{HDRP_HybridTests => BatchRendererGroup_HDRP}/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11.meta (100%) rename TestProjects/{HDRP_HybridTests => BatchRendererGroup_HDRP}/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/None.meta (100%) create mode 100644 TestProjects/BatchRendererGroup_HDRP/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/None/BRGGameObjects.png rename TestProjects/{HDRP_HybridTests => BatchRendererGroup_HDRP}/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/None/BRGGameObjects.png.meta (100%) create mode 100644 TestProjects/BatchRendererGroup_HDRP/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/None/BatchRenderGroupRaw.png rename TestProjects/{HDRP_HybridTests => BatchRendererGroup_HDRP}/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/None/BatchRenderGroupRaw.png.meta (100%) rename TestProjects/{HDRP_HybridTests => BatchRendererGroup_HDRP}/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D12.meta (100%) rename TestProjects/{HDRP_HybridTests => BatchRendererGroup_HDRP}/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D12/None.meta (100%) create mode 100644 TestProjects/BatchRendererGroup_HDRP/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D12/None/BRGGameObjects.png rename TestProjects/{HDRP_HybridTests => BatchRendererGroup_HDRP}/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D12/None/BRGGameObjects.png.meta (100%) create mode 100644 TestProjects/BatchRendererGroup_HDRP/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D12/None/BatchRenderGroupRaw.png rename TestProjects/{HDRP_HybridTests => BatchRendererGroup_HDRP}/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D12/None/BatchRenderGroupRaw.png.meta (100%) rename TestProjects/{HDRP_HybridTests => BatchRendererGroup_HDRP}/Assets/ReferenceImages/Linear/WindowsPlayer/Vulkan.meta (100%) rename TestProjects/{HDRP_HybridTests => BatchRendererGroup_HDRP}/Assets/ReferenceImages/Linear/WindowsPlayer/Vulkan/None.meta (100%) create mode 100644 TestProjects/BatchRendererGroup_HDRP/Assets/ReferenceImages/Linear/WindowsPlayer/Vulkan/None/BRGGameObjects.png rename TestProjects/{HDRP_HybridTests => BatchRendererGroup_HDRP}/Assets/ReferenceImages/Linear/WindowsPlayer/Vulkan/None/BRGGameObjects.png.meta (100%) create mode 100644 TestProjects/BatchRendererGroup_HDRP/Assets/ReferenceImages/Linear/WindowsPlayer/Vulkan/None/BatchRenderGroupRaw.png rename TestProjects/{HDRP_HybridTests => BatchRendererGroup_HDRP}/Assets/ReferenceImages/Linear/WindowsPlayer/Vulkan/None/BatchRenderGroupRaw.png.meta (100%) rename TestProjects/{HDRP_HybridTests => BatchRendererGroup_HDRP}/Assets/SampleScenes.meta (100%) rename TestProjects/{HDRP_HybridTests => BatchRendererGroup_HDRP}/Assets/SampleScenes/BRGGameObjects.meta (100%) rename TestProjects/{UniversalHybridTest => BatchRendererGroup_HDRP}/Assets/SampleScenes/BRGGameObjects/AABB.cs (85%) rename TestProjects/{HDRP_HybridTests => BatchRendererGroup_HDRP}/Assets/SampleScenes/BRGGameObjects/AABB.cs.meta (100%) rename TestProjects/{HDRP_HybridTests => BatchRendererGroup_HDRP}/Assets/SampleScenes/BRGGameObjects/BRGGameObjects.unity (100%) rename TestProjects/{HDRP_HybridTests => BatchRendererGroup_HDRP}/Assets/SampleScenes/BRGGameObjects/BRGGameObjects.unity.meta (100%) rename TestProjects/{HDRP_HybridTests => BatchRendererGroup_HDRP}/Assets/SampleScenes/BRGGameObjects/BoundsToAABB.cs (91%) rename TestProjects/{HDRP_HybridTests => BatchRendererGroup_HDRP}/Assets/SampleScenes/BRGGameObjects/BoundsToAABB.cs.meta (100%) rename TestProjects/{HDRP_HybridTests => BatchRendererGroup_HDRP}/Assets/SampleScenes/BRGGameObjects/FrustumPlanes.cs (100%) rename TestProjects/{HDRP_HybridTests => BatchRendererGroup_HDRP}/Assets/SampleScenes/BRGGameObjects/FrustumPlanes.cs.meta (100%) rename TestProjects/{HDRP_HybridTests => BatchRendererGroup_HDRP}/Assets/SampleScenes/BRGGameObjects/Lit.mat (100%) rename TestProjects/{HDRP_HybridTests => BatchRendererGroup_HDRP}/Assets/SampleScenes/BRGGameObjects/Lit.mat.meta (100%) rename TestProjects/{HDRP_HybridTests => BatchRendererGroup_HDRP}/Assets/SampleScenes/BRGGameObjects/LitTessellation.mat (100%) rename TestProjects/{HDRP_HybridTests => BatchRendererGroup_HDRP}/Assets/SampleScenes/BRGGameObjects/LitTessellation.mat.meta (100%) rename TestProjects/{HDRP_HybridTests => BatchRendererGroup_HDRP}/Assets/SampleScenes/BRGGameObjects/RenderBRG.cs (99%) rename TestProjects/{HDRP_HybridTests => BatchRendererGroup_HDRP}/Assets/SampleScenes/BRGGameObjects/RenderBRG.cs.meta (100%) rename TestProjects/{HDRP_HybridTests => BatchRendererGroup_HDRP}/Assets/SampleScenes/BRGGameObjects/Unlit.mat (100%) rename TestProjects/{HDRP_HybridTests => BatchRendererGroup_HDRP}/Assets/SampleScenes/BRGGameObjects/Unlit.mat.meta (100%) rename TestProjects/{HDRP_HybridTests => BatchRendererGroup_HDRP}/Assets/SampleScenes/BRGGameObjects/brick.jpg (100%) rename TestProjects/{HDRP_HybridTests => BatchRendererGroup_HDRP}/Assets/SampleScenes/BRGGameObjects/brick.jpg.meta (100%) rename TestProjects/{HDRP_HybridTests => BatchRendererGroup_HDRP}/Assets/SampleScenes/BatchRenderGroupRaw.meta (100%) rename TestProjects/{HDRP_HybridTests => BatchRendererGroup_HDRP}/Assets/SampleScenes/BatchRenderGroupRaw/BRGMaterial.mat (100%) rename TestProjects/{HDRP_HybridTests => BatchRendererGroup_HDRP}/Assets/SampleScenes/BatchRenderGroupRaw/BRGMaterial.mat.meta (100%) rename TestProjects/{UniversalHybridTest => BatchRendererGroup_HDRP}/Assets/SampleScenes/BatchRenderGroupRaw/BRGSetup.cs (96%) rename TestProjects/{HDRP_HybridTests => BatchRendererGroup_HDRP}/Assets/SampleScenes/BatchRenderGroupRaw/BRGSetup.cs.meta (100%) rename TestProjects/{HDRP_HybridTests => BatchRendererGroup_HDRP}/Assets/SampleScenes/BatchRenderGroupRaw/BatchRenderGroupRaw.meta (100%) rename TestProjects/{HDRP_HybridTests => BatchRendererGroup_HDRP}/Assets/SampleScenes/BatchRenderGroupRaw/BatchRenderGroupRaw.unity (100%) rename TestProjects/{HDRP_HybridTests => BatchRendererGroup_HDRP}/Assets/SampleScenes/BatchRenderGroupRaw/BatchRenderGroupRaw.unity.meta (100%) rename TestProjects/{HDRP_HybridTests => BatchRendererGroup_HDRP}/Assets/SampleScenes/BatchRenderGroupRaw/BatchRenderGroupRaw/Global Volume Profile.asset (100%) rename TestProjects/{HDRP_HybridTests => BatchRendererGroup_HDRP}/Assets/SampleScenes/BatchRenderGroupRaw/BatchRenderGroupRaw/Global Volume Profile.asset.meta (100%) rename TestProjects/{HDRP_HybridTests => BatchRendererGroup_HDRP}/Assets/Tests.meta (100%) rename TestProjects/{HDRP_HybridTests => BatchRendererGroup_HDRP}/Assets/Tests/Editor.meta (100%) rename TestProjects/{HDRP_HybridTests => BatchRendererGroup_HDRP}/Assets/Tests/Editor/SetupGraphicsTestCases.cs (100%) rename TestProjects/{HDRP_HybridTests => BatchRendererGroup_HDRP}/Assets/Tests/Editor/SetupGraphicsTestCases.cs.meta (100%) rename TestProjects/{UniversalHybridTest => BatchRendererGroup_HDRP}/Assets/Tests/Editor/SetupProject.cs (90%) rename TestProjects/{HDRP_HybridTests => BatchRendererGroup_HDRP}/Assets/Tests/Editor/SetupProject.cs.meta (100%) rename TestProjects/{HDRP_HybridTests => BatchRendererGroup_HDRP}/Assets/Tests/Editor/TestEditor.asmdef (100%) rename TestProjects/{HDRP_HybridTests => BatchRendererGroup_HDRP}/Assets/Tests/Editor/TestEditor.asmdef.meta (100%) rename TestProjects/{HDRP_HybridTests => BatchRendererGroup_HDRP}/Assets/Tests/Runtime.meta (100%) rename TestProjects/{HDRP_HybridTests => BatchRendererGroup_HDRP}/Assets/Tests/Runtime/GraphicsTestFix.cs (66%) rename TestProjects/{HDRP_HybridTests => BatchRendererGroup_HDRP}/Assets/Tests/Runtime/GraphicsTestFix.cs.meta (100%) rename TestProjects/{HDRP_HybridTests => BatchRendererGroup_HDRP}/Assets/Tests/Runtime/GraphicsTestSettingsCustom.cs (91%) rename TestProjects/{HDRP_HybridTests => BatchRendererGroup_HDRP}/Assets/Tests/Runtime/GraphicsTestSettingsCustom.cs.meta (100%) rename TestProjects/{HDRP_HybridTests => BatchRendererGroup_HDRP}/Assets/Tests/Runtime/GraphicsTests.cs (98%) rename TestProjects/{HDRP_HybridTests => BatchRendererGroup_HDRP}/Assets/Tests/Runtime/GraphicsTests.cs.meta (100%) rename TestProjects/{HDRP_HybridTests => BatchRendererGroup_HDRP}/Assets/Tests/Runtime/TestRuntime.asmdef (100%) rename TestProjects/{HDRP_HybridTests => BatchRendererGroup_HDRP}/Assets/Tests/Runtime/TestRuntime.asmdef.meta (100%) rename TestProjects/{HDRP_HybridTests => BatchRendererGroup_HDRP}/Assets/VFXDefaultResources.asset (100%) rename TestProjects/{HDRP_HybridTests => BatchRendererGroup_HDRP}/Assets/VFXDefaultResources.asset.meta (100%) rename TestProjects/{HDRP_HybridTests => BatchRendererGroup_HDRP}/Packages/manifest.json (100%) rename TestProjects/{HDRP_HybridTests => BatchRendererGroup_HDRP}/Packages/packages-lock.json (100%) rename TestProjects/{HDRP_HybridTests => BatchRendererGroup_HDRP}/ProjectSettings/AudioManager.asset (100%) rename TestProjects/{HDRP_HybridTests => BatchRendererGroup_HDRP}/ProjectSettings/BurstAotSettings_StandaloneWindows.json (100%) rename TestProjects/{HDRP_HybridTests => BatchRendererGroup_HDRP}/ProjectSettings/ClusterInputManager.asset (100%) rename TestProjects/{HDRP_HybridTests => BatchRendererGroup_HDRP}/ProjectSettings/DynamicsManager.asset (100%) rename TestProjects/{HDRP_HybridTests => BatchRendererGroup_HDRP}/ProjectSettings/EditorBuildSettings.asset (100%) rename TestProjects/{HDRP_HybridTests => BatchRendererGroup_HDRP}/ProjectSettings/EditorSettings.asset (100%) rename TestProjects/{HDRP_HybridTests => BatchRendererGroup_HDRP}/ProjectSettings/GraphicsSettings.asset (100%) rename TestProjects/{HDRP_HybridTests => BatchRendererGroup_HDRP}/ProjectSettings/HDRPProjectSettings.asset (100%) rename TestProjects/{HDRP_HybridTests => BatchRendererGroup_HDRP}/ProjectSettings/InputManager.asset (100%) rename TestProjects/{HDRP_HybridTests => BatchRendererGroup_HDRP}/ProjectSettings/MemorySettings.asset (100%) rename TestProjects/{HDRP_HybridTests => BatchRendererGroup_HDRP}/ProjectSettings/NavMeshAreas.asset (100%) rename TestProjects/{HDRP_HybridTests => BatchRendererGroup_HDRP}/ProjectSettings/NetworkManager.asset (100%) rename TestProjects/{HDRP_HybridTests => BatchRendererGroup_HDRP}/ProjectSettings/PackageManagerSettings.asset (100%) rename TestProjects/{HDRP_HybridTests => BatchRendererGroup_HDRP}/ProjectSettings/Physics2DSettings.asset (100%) rename TestProjects/{HDRP_HybridTests => BatchRendererGroup_HDRP}/ProjectSettings/PresetManager.asset (100%) rename TestProjects/{HDRP_HybridTests => BatchRendererGroup_HDRP}/ProjectSettings/ProjectSettings.asset (98%) rename TestProjects/{HDRP_HybridTests => BatchRendererGroup_HDRP}/ProjectSettings/QualitySettings.asset (100%) rename TestProjects/{HDRP_HybridTests => BatchRendererGroup_HDRP}/ProjectSettings/SceneTemplateSettings.json (100%) rename TestProjects/{HDRP_HybridTests => BatchRendererGroup_HDRP}/ProjectSettings/ShaderGraphSettings.asset (100%) rename TestProjects/{HDRP_HybridTests => BatchRendererGroup_HDRP}/ProjectSettings/TagManager.asset (100%) rename TestProjects/{HDRP_HybridTests => BatchRendererGroup_HDRP}/ProjectSettings/TimeManager.asset (100%) rename TestProjects/{HDRP_HybridTests => BatchRendererGroup_HDRP}/ProjectSettings/UnityConnectSettings.asset (100%) rename TestProjects/{HDRP_HybridTests => BatchRendererGroup_HDRP}/ProjectSettings/VFXManager.asset (100%) rename TestProjects/{HDRP_HybridTests => BatchRendererGroup_HDRP}/ProjectSettings/VersionControlSettings.asset (100%) rename TestProjects/{HDRP_HybridTests => BatchRendererGroup_HDRP}/ProjectSettings/XRPackageSettings.asset (100%) rename TestProjects/{HDRP_HybridTests => BatchRendererGroup_HDRP}/ProjectSettings/XRSettings.asset (100%) rename TestProjects/{HDRP_HybridTests => BatchRendererGroup_HDRP}/TestRunnerOptions.json (100%) rename TestProjects/{HDRP_HybridTests => BatchRendererGroup_HDRP}/UserSettings/EditorUserSettings.asset (100%) rename TestProjects/{HDRP_HybridTests => BatchRendererGroup_HDRP}/UserSettings/Layouts/default-2022.dwlt (100%) rename TestProjects/{HDRP_HybridTests => BatchRendererGroup_HDRP}/UserSettings/Search.settings (100%) rename TestProjects/{UniversalHybridTest => BatchRendererGroup_URP}/Assets/ReferenceImages.meta (100%) rename TestProjects/{UniversalHybridTest => BatchRendererGroup_URP}/Assets/ReferenceImages/Linear.meta (100%) rename TestProjects/{UniversalHybridTest => BatchRendererGroup_URP}/Assets/ReferenceImages/Linear/LinuxEditor.meta (100%) rename TestProjects/{UniversalHybridTest => BatchRendererGroup_URP}/Assets/ReferenceImages/Linear/LinuxEditor/Vulkan.meta (100%) rename TestProjects/{UniversalHybridTest => BatchRendererGroup_URP}/Assets/ReferenceImages/Linear/LinuxEditor/Vulkan/None.meta (100%) rename TestProjects/{UniversalHybridTest/Assets/ReferenceImages/Linear/Android/OpenGLES3 => BatchRendererGroup_URP/Assets/ReferenceImages/Linear/LinuxEditor/Vulkan}/None/BRGGameObjects.png (100%) rename TestProjects/{UniversalHybridTest => BatchRendererGroup_URP}/Assets/ReferenceImages/Linear/LinuxEditor/Vulkan/None/BRGGameObjects.png.meta (100%) create mode 100644 TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/LinuxEditor/Vulkan/None/BatchRenderGroupRaw.png rename TestProjects/{UniversalHybridTest => BatchRendererGroup_URP}/Assets/ReferenceImages/Linear/LinuxEditor/Vulkan/None/BatchRenderGroupRaw.png.meta (100%) rename TestProjects/{UniversalHybridTest => BatchRendererGroup_URP}/Assets/ReferenceImages/Linear/LinuxPlayer.meta (100%) rename TestProjects/{UniversalHybridTest => BatchRendererGroup_URP}/Assets/ReferenceImages/Linear/LinuxPlayer/Vulkan.meta (100%) rename TestProjects/{UniversalHybridTest => BatchRendererGroup_URP}/Assets/ReferenceImages/Linear/LinuxPlayer/Vulkan/None.meta (100%) rename TestProjects/{UniversalHybridTest/Assets/ReferenceImages/Linear/Android => BatchRendererGroup_URP/Assets/ReferenceImages/Linear/LinuxPlayer}/Vulkan/None/BRGGameObjects.png (100%) rename TestProjects/{UniversalHybridTest => BatchRendererGroup_URP}/Assets/ReferenceImages/Linear/LinuxPlayer/Vulkan/None/BRGGameObjects.png.meta (100%) create mode 100644 TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/LinuxPlayer/Vulkan/None/BatchRenderGroupRaw.png rename TestProjects/{UniversalHybridTest => BatchRendererGroup_URP}/Assets/ReferenceImages/Linear/LinuxPlayer/Vulkan/None/BatchRenderGroupRaw.png.meta (100%) rename TestProjects/{UniversalHybridTest => BatchRendererGroup_URP}/Assets/ReferenceImages/Linear/OSXEditor.meta (100%) rename TestProjects/{UniversalHybridTest => BatchRendererGroup_URP}/Assets/ReferenceImages/Linear/OSXEditor/Metal.meta (100%) rename TestProjects/{UniversalHybridTest => BatchRendererGroup_URP}/Assets/ReferenceImages/Linear/OSXEditor/Metal/None.meta (100%) rename TestProjects/{UniversalHybridTest/Assets/ReferenceImages/Linear/LinuxEditor/OpenGLCore => BatchRendererGroup_URP/Assets/ReferenceImages/Linear/OSXEditor/Metal}/None/BRGGameObjects.png (100%) rename TestProjects/{UniversalHybridTest => BatchRendererGroup_URP}/Assets/ReferenceImages/Linear/OSXEditor/Metal/None/BRGGameObjects.png.meta (100%) create mode 100644 TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/OSXEditor/Metal/None/BatchRenderGroupRaw.png rename TestProjects/{UniversalHybridTest => BatchRendererGroup_URP}/Assets/ReferenceImages/Linear/OSXEditor/Metal/None/BatchRenderGroupRaw.png.meta (100%) rename TestProjects/{UniversalHybridTest => BatchRendererGroup_URP}/Assets/ReferenceImages/Linear/OSXPlayer.meta (100%) rename TestProjects/{UniversalHybridTest => BatchRendererGroup_URP}/Assets/ReferenceImages/Linear/OSXPlayer/Metal.meta (100%) rename TestProjects/{UniversalHybridTest => BatchRendererGroup_URP}/Assets/ReferenceImages/Linear/OSXPlayer/Metal/None.meta (100%) rename TestProjects/{UniversalHybridTest/Assets/ReferenceImages/Linear/LinuxEditor/Vulkan => BatchRendererGroup_URP/Assets/ReferenceImages/Linear/OSXPlayer/Metal}/None/BRGGameObjects.png (100%) rename TestProjects/{UniversalHybridTest => BatchRendererGroup_URP}/Assets/ReferenceImages/Linear/OSXPlayer/Metal/None/BRGGameObjects.png.meta (100%) create mode 100644 TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/OSXPlayer/Metal/None/BatchRenderGroupRaw.png rename TestProjects/{UniversalHybridTest => BatchRendererGroup_URP}/Assets/ReferenceImages/Linear/OSXPlayer/Metal/None/BatchRenderGroupRaw.png.meta (100%) rename TestProjects/{UniversalHybridTest => BatchRendererGroup_URP}/Assets/ReferenceImages/Linear/WindowsEditor.meta (100%) rename TestProjects/{UniversalHybridTest => BatchRendererGroup_URP}/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11.meta (100%) rename TestProjects/{UniversalHybridTest => BatchRendererGroup_URP}/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/None.meta (100%) rename TestProjects/{UniversalHybridTest/Assets/ReferenceImages/Linear/LinuxPlayer/OpenGLCore => BatchRendererGroup_URP/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11}/None/BRGGameObjects.png (100%) rename TestProjects/{UniversalHybridTest => BatchRendererGroup_URP}/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/None/BRGGameObjects.png.meta (100%) create mode 100644 TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/None/BatchRenderGroupRaw.png rename TestProjects/{UniversalHybridTest => BatchRendererGroup_URP}/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/None/BatchRenderGroupRaw.png.meta (100%) rename TestProjects/{UniversalHybridTest => BatchRendererGroup_URP}/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D12.meta (100%) rename TestProjects/{UniversalHybridTest => BatchRendererGroup_URP}/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D12/None.meta (100%) rename TestProjects/{UniversalHybridTest/Assets/ReferenceImages/Linear/LinuxPlayer/Vulkan => BatchRendererGroup_URP/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D12}/None/BRGGameObjects.png (100%) rename TestProjects/{UniversalHybridTest => BatchRendererGroup_URP}/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D12/None/BRGGameObjects.png.meta (100%) create mode 100644 TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D12/None/BatchRenderGroupRaw.png rename TestProjects/{UniversalHybridTest => BatchRendererGroup_URP}/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D12/None/BatchRenderGroupRaw.png.meta (100%) rename TestProjects/{UniversalHybridTest => BatchRendererGroup_URP}/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan.meta (100%) rename TestProjects/{UniversalHybridTest => BatchRendererGroup_URP}/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/None.meta (100%) rename TestProjects/{UniversalHybridTest/Assets/ReferenceImages/Linear/OSXEditor/Metal => BatchRendererGroup_URP/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan}/None/BRGGameObjects.png (100%) rename TestProjects/{UniversalHybridTest => BatchRendererGroup_URP}/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/None/BRGGameObjects.png.meta (100%) create mode 100644 TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/None/BatchRenderGroupRaw.png rename TestProjects/{UniversalHybridTest => BatchRendererGroup_URP}/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/None/BatchRenderGroupRaw.png.meta (100%) rename TestProjects/{UniversalHybridTest => BatchRendererGroup_URP}/Assets/ReferenceImages/Linear/WindowsPlayer.meta (100%) rename TestProjects/{UniversalHybridTest => BatchRendererGroup_URP}/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11.meta (100%) rename TestProjects/{UniversalHybridTest => BatchRendererGroup_URP}/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/None.meta (100%) rename TestProjects/{UniversalHybridTest/Assets/ReferenceImages/Linear/OSXPlayer/Metal => BatchRendererGroup_URP/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11}/None/BRGGameObjects.png (100%) rename TestProjects/{UniversalHybridTest => BatchRendererGroup_URP}/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/None/BRGGameObjects.png.meta (100%) create mode 100644 TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/None/BatchRenderGroupRaw.png rename TestProjects/{UniversalHybridTest => BatchRendererGroup_URP}/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/None/BatchRenderGroupRaw.png.meta (100%) rename TestProjects/{UniversalHybridTest => BatchRendererGroup_URP}/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D12.meta (100%) rename TestProjects/{UniversalHybridTest => BatchRendererGroup_URP}/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D12/None.meta (100%) rename TestProjects/{UniversalHybridTest/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11 => BatchRendererGroup_URP/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D12}/None/BRGGameObjects.png (100%) rename TestProjects/{UniversalHybridTest => BatchRendererGroup_URP}/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D12/None/BRGGameObjects.png.meta (100%) create mode 100644 TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D12/None/BatchRenderGroupRaw.png rename TestProjects/{UniversalHybridTest => BatchRendererGroup_URP}/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D12/None/BatchRenderGroupRaw.png.meta (100%) rename TestProjects/{UniversalHybridTest => BatchRendererGroup_URP}/Assets/ReferenceImages/Linear/WindowsPlayer/Vulkan.meta (100%) rename TestProjects/{UniversalHybridTest => BatchRendererGroup_URP}/Assets/ReferenceImages/Linear/WindowsPlayer/Vulkan/None.meta (100%) rename TestProjects/{UniversalHybridTest/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D12 => BatchRendererGroup_URP/Assets/ReferenceImages/Linear/WindowsPlayer/Vulkan}/None/BRGGameObjects.png (100%) rename TestProjects/{UniversalHybridTest => BatchRendererGroup_URP}/Assets/ReferenceImages/Linear/WindowsPlayer/Vulkan/None/BRGGameObjects.png.meta (100%) create mode 100644 TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/WindowsPlayer/Vulkan/None/BatchRenderGroupRaw.png rename TestProjects/{UniversalHybridTest => BatchRendererGroup_URP}/Assets/ReferenceImages/Linear/WindowsPlayer/Vulkan/None/BatchRenderGroupRaw.png.meta (100%) rename TestProjects/{UniversalHybridTest => BatchRendererGroup_URP}/Assets/SampleScenes.meta (100%) rename TestProjects/{UniversalHybridTest => BatchRendererGroup_URP}/Assets/SampleScenes/BRGGameObjects.meta (100%) rename TestProjects/{HDRP_HybridTests => BatchRendererGroup_URP}/Assets/SampleScenes/BRGGameObjects/AABB.cs (85%) rename TestProjects/{UniversalHybridTest => BatchRendererGroup_URP}/Assets/SampleScenes/BRGGameObjects/AABB.cs.meta (100%) rename TestProjects/{UniversalHybridTest => BatchRendererGroup_URP}/Assets/SampleScenes/BRGGameObjects/BRGGameObjects.unity (100%) rename TestProjects/{UniversalHybridTest => BatchRendererGroup_URP}/Assets/SampleScenes/BRGGameObjects/BRGGameObjects.unity.meta (100%) rename TestProjects/{UniversalHybridTest => BatchRendererGroup_URP}/Assets/SampleScenes/BRGGameObjects/BoundsToAABB.cs (91%) rename TestProjects/{UniversalHybridTest => BatchRendererGroup_URP}/Assets/SampleScenes/BRGGameObjects/BoundsToAABB.cs.meta (100%) rename TestProjects/{UniversalHybridTest => BatchRendererGroup_URP}/Assets/SampleScenes/BRGGameObjects/FrustumPlanes.cs (100%) rename TestProjects/{UniversalHybridTest => BatchRendererGroup_URP}/Assets/SampleScenes/BRGGameObjects/FrustumPlanes.cs.meta (100%) rename TestProjects/{UniversalHybridTest => BatchRendererGroup_URP}/Assets/SampleScenes/BRGGameObjects/RenderBRG.cs (99%) rename TestProjects/{UniversalHybridTest => BatchRendererGroup_URP}/Assets/SampleScenes/BRGGameObjects/RenderBRG.cs.meta (100%) rename TestProjects/{UniversalHybridTest => BatchRendererGroup_URP}/Assets/SampleScenes/BRGGameObjects/TestMaterial1.mat (97%) rename TestProjects/{UniversalHybridTest => BatchRendererGroup_URP}/Assets/SampleScenes/BRGGameObjects/TestMaterial1.mat.meta (100%) rename TestProjects/{UniversalHybridTest => BatchRendererGroup_URP}/Assets/SampleScenes/BRGGameObjects/TestMaterial2.mat (97%) rename TestProjects/{UniversalHybridTest => BatchRendererGroup_URP}/Assets/SampleScenes/BRGGameObjects/TestMaterial2.mat.meta (100%) rename TestProjects/{UniversalHybridTest => BatchRendererGroup_URP}/Assets/SampleScenes/BRGGameObjects/brick.jpg (100%) rename TestProjects/{UniversalHybridTest => BatchRendererGroup_URP}/Assets/SampleScenes/BRGGameObjects/brick.jpg.meta (100%) rename TestProjects/{UniversalHybridTest => BatchRendererGroup_URP}/Assets/SampleScenes/BatchRenderGroupRaw.meta (100%) rename TestProjects/{UniversalHybridTest => BatchRendererGroup_URP}/Assets/SampleScenes/BatchRenderGroupRaw/BRGMaterial.mat (97%) rename TestProjects/{UniversalHybridTest => BatchRendererGroup_URP}/Assets/SampleScenes/BatchRenderGroupRaw/BRGMaterial.mat.meta (100%) rename TestProjects/{HDRP_HybridTests => BatchRendererGroup_URP}/Assets/SampleScenes/BatchRenderGroupRaw/BRGSetup.cs (96%) rename TestProjects/{UniversalHybridTest => BatchRendererGroup_URP}/Assets/SampleScenes/BatchRenderGroupRaw/BRGSetup.cs.meta (100%) rename TestProjects/{UniversalHybridTest => BatchRendererGroup_URP}/Assets/SampleScenes/BatchRenderGroupRaw/BatchRenderGroupRaw.meta (100%) rename TestProjects/{UniversalHybridTest => BatchRendererGroup_URP}/Assets/SampleScenes/BatchRenderGroupRaw/BatchRenderGroupRaw.unity (100%) rename TestProjects/{UniversalHybridTest => BatchRendererGroup_URP}/Assets/SampleScenes/BatchRenderGroupRaw/BatchRenderGroupRaw.unity.meta (100%) rename TestProjects/{UniversalHybridTest => BatchRendererGroup_URP}/Assets/SampleScenes/BatchRenderGroupRaw/BatchRenderGroupRaw/Global Volume Profile.asset (100%) rename TestProjects/{UniversalHybridTest => BatchRendererGroup_URP}/Assets/SampleScenes/BatchRenderGroupRaw/BatchRenderGroupRaw/Global Volume Profile.asset.meta (100%) rename TestProjects/{UniversalHybridTest => BatchRendererGroup_URP}/Assets/SampleScenes/SimpleExample.meta (100%) rename TestProjects/{UniversalHybridTest => BatchRendererGroup_URP}/Assets/SampleScenes/SimpleExample/SimpleBRGExample.cs (100%) rename TestProjects/{UniversalHybridTest => BatchRendererGroup_URP}/Assets/SampleScenes/SimpleExample/SimpleBRGExample.cs.meta (100%) rename TestProjects/{UniversalHybridTest => BatchRendererGroup_URP}/Assets/SampleScenes/SimpleExample/SimpleBRGExample.unity (100%) rename TestProjects/{UniversalHybridTest => BatchRendererGroup_URP}/Assets/SampleScenes/SimpleExample/SimpleBRGExample.unity.meta (100%) rename TestProjects/{UniversalHybridTest => BatchRendererGroup_URP}/Assets/Tests.meta (100%) rename TestProjects/{UniversalHybridTest => BatchRendererGroup_URP}/Assets/Tests/Editor.meta (100%) rename TestProjects/{UniversalHybridTest => BatchRendererGroup_URP}/Assets/Tests/Editor/SetupGraphicsTestCases.cs (99%) rename TestProjects/{UniversalHybridTest => BatchRendererGroup_URP}/Assets/Tests/Editor/SetupGraphicsTestCases.cs.meta (100%) rename TestProjects/{HDRP_HybridTests => BatchRendererGroup_URP}/Assets/Tests/Editor/SetupProject.cs (90%) rename TestProjects/{UniversalHybridTest => BatchRendererGroup_URP}/Assets/Tests/Editor/SetupProject.cs.meta (100%) rename TestProjects/{UniversalHybridTest => BatchRendererGroup_URP}/Assets/Tests/Editor/TestEditor.asmdef (100%) rename TestProjects/{UniversalHybridTest => BatchRendererGroup_URP}/Assets/Tests/Editor/TestEditor.asmdef.meta (100%) rename TestProjects/{UniversalHybridTest => BatchRendererGroup_URP}/Assets/Tests/Runtime.meta (100%) rename TestProjects/{UniversalHybridTest => BatchRendererGroup_URP}/Assets/Tests/Runtime/GraphicsTestFix.cs (66%) rename TestProjects/{UniversalHybridTest => BatchRendererGroup_URP}/Assets/Tests/Runtime/GraphicsTestFix.cs.meta (100%) rename TestProjects/{UniversalHybridTest => BatchRendererGroup_URP}/Assets/Tests/Runtime/GraphicsTestSettingsCustom.cs (91%) rename TestProjects/{UniversalHybridTest => BatchRendererGroup_URP}/Assets/Tests/Runtime/GraphicsTestSettingsCustom.cs.meta (100%) rename TestProjects/{UniversalHybridTest => BatchRendererGroup_URP}/Assets/Tests/Runtime/GraphicsTests.cs (92%) rename TestProjects/{UniversalHybridTest => BatchRendererGroup_URP}/Assets/Tests/Runtime/GraphicsTests.cs.meta (100%) rename TestProjects/{UniversalHybridTest => BatchRendererGroup_URP}/Assets/Tests/Runtime/TestRuntime.asmdef (100%) rename TestProjects/{UniversalHybridTest => BatchRendererGroup_URP}/Assets/Tests/Runtime/TestRuntime.asmdef.meta (100%) rename TestProjects/{UniversalHybridTest => BatchRendererGroup_URP}/Assets/URPSettings.meta (100%) rename TestProjects/{UniversalHybridTest => BatchRendererGroup_URP}/Assets/URPSettings/UniversalRenderPipelineAsset.asset (100%) rename TestProjects/{UniversalHybridTest => BatchRendererGroup_URP}/Assets/URPSettings/UniversalRenderPipelineAsset.asset.meta (100%) rename TestProjects/{UniversalHybridTest => BatchRendererGroup_URP}/Assets/URPSettings/UniversalRenderPipelineAsset_Renderer.asset (100%) rename TestProjects/{UniversalHybridTest => BatchRendererGroup_URP}/Assets/URPSettings/UniversalRenderPipelineAsset_Renderer.asset.meta (100%) rename TestProjects/{UniversalHybridTest => BatchRendererGroup_URP}/Assets/UniversalRenderPipelineGlobalSettings.asset (100%) rename TestProjects/{UniversalHybridTest => BatchRendererGroup_URP}/Assets/UniversalRenderPipelineGlobalSettings.asset.meta (100%) rename TestProjects/{UniversalHybridTest => BatchRendererGroup_URP}/Assets/VFXDefaultResources.asset (100%) rename TestProjects/{UniversalHybridTest => BatchRendererGroup_URP}/Assets/VFXDefaultResources.asset.meta (100%) rename TestProjects/{UniversalHybridTest => BatchRendererGroup_URP}/Packages/manifest.json (100%) rename TestProjects/{UniversalHybridTest => BatchRendererGroup_URP}/Packages/packages-lock.json (100%) rename TestProjects/{UniversalHybridTest => BatchRendererGroup_URP}/ProjectSettings/AudioManager.asset (100%) rename TestProjects/{UniversalHybridTest => BatchRendererGroup_URP}/ProjectSettings/ClusterInputManager.asset (100%) rename TestProjects/{UniversalHybridTest => BatchRendererGroup_URP}/ProjectSettings/DynamicsManager.asset (100%) rename TestProjects/{UniversalHybridTest => BatchRendererGroup_URP}/ProjectSettings/EditorBuildSettings.asset (100%) rename TestProjects/{UniversalHybridTest => BatchRendererGroup_URP}/ProjectSettings/EditorSettings.asset (100%) rename TestProjects/{UniversalHybridTest => BatchRendererGroup_URP}/ProjectSettings/GraphicsSettings.asset (100%) rename TestProjects/{UniversalHybridTest => BatchRendererGroup_URP}/ProjectSettings/InputManager.asset (100%) rename TestProjects/{UniversalHybridTest => BatchRendererGroup_URP}/ProjectSettings/MemorySettings.asset (100%) rename TestProjects/{UniversalHybridTest => BatchRendererGroup_URP}/ProjectSettings/NavMeshAreas.asset (100%) rename TestProjects/{UniversalHybridTest => BatchRendererGroup_URP}/ProjectSettings/NetworkManager.asset (100%) rename TestProjects/{UniversalHybridTest => BatchRendererGroup_URP}/ProjectSettings/PackageManagerSettings.asset (100%) rename TestProjects/{UniversalHybridTest => BatchRendererGroup_URP}/ProjectSettings/Physics2DSettings.asset (100%) rename TestProjects/{UniversalHybridTest => BatchRendererGroup_URP}/ProjectSettings/PresetManager.asset (100%) rename TestProjects/{UniversalHybridTest => BatchRendererGroup_URP}/ProjectSettings/ProjectSettings.asset (100%) rename TestProjects/{UniversalHybridTest => BatchRendererGroup_URP}/ProjectSettings/QualitySettings.asset (100%) rename TestProjects/{UniversalHybridTest => BatchRendererGroup_URP}/ProjectSettings/ShaderGraphSettings.asset (100%) rename TestProjects/{UniversalHybridTest => BatchRendererGroup_URP}/ProjectSettings/TagManager.asset (100%) rename TestProjects/{UniversalHybridTest => BatchRendererGroup_URP}/ProjectSettings/TimeManager.asset (100%) rename TestProjects/{UniversalHybridTest => BatchRendererGroup_URP}/ProjectSettings/URPProjectSettings.asset (100%) rename TestProjects/{UniversalHybridTest => BatchRendererGroup_URP}/ProjectSettings/UnityConnectSettings.asset (100%) rename TestProjects/{UniversalHybridTest => BatchRendererGroup_URP}/ProjectSettings/VFXManager.asset (100%) rename TestProjects/{UniversalHybridTest => BatchRendererGroup_URP}/ProjectSettings/VersionControlSettings.asset (100%) rename TestProjects/{UniversalHybridTest => BatchRendererGroup_URP}/ProjectSettings/XRPackageSettings.asset (100%) rename TestProjects/{UniversalHybridTest => BatchRendererGroup_URP}/ProjectSettings/XRSettings.asset (100%) rename TestProjects/{UniversalHybridTest => BatchRendererGroup_URP}/TestRunnerOptions.json (100%) rename TestProjects/{UniversalHybridTest => BatchRendererGroup_URP}/UserSettings/EditorUserSettings.asset (100%) rename TestProjects/{UniversalHybridTest => BatchRendererGroup_URP}/UserSettings/Layouts/default-2022.dwlt (100%) rename TestProjects/{UniversalHybridTest => BatchRendererGroup_URP}/UserSettings/Search.settings (100%) delete mode 100644 TestProjects/HDRP_HybridTests/Assets/ReferenceImages/Linear/OSXEditor/Metal/None/BRGGameObjects.png delete mode 100644 TestProjects/HDRP_HybridTests/Assets/ReferenceImages/Linear/OSXEditor/Metal/None/BatchRenderGroupRaw.png delete mode 100644 TestProjects/HDRP_HybridTests/Assets/ReferenceImages/Linear/OSXPlayer/Metal/None/AreEqual_WithTotallyDifferentImages_ThrowsAssertionException.png delete mode 100644 TestProjects/HDRP_HybridTests/Assets/ReferenceImages/Linear/OSXPlayer/Metal/None/BRGGameObjects.png delete mode 100644 TestProjects/HDRP_HybridTests/Assets/ReferenceImages/Linear/OSXPlayer/Metal/None/BatchRenderGroupRaw.png delete mode 100644 TestProjects/HDRP_HybridTests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/None/BRGGameObjects.png delete mode 100644 TestProjects/HDRP_HybridTests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/None/BatchRenderGroupRaw.png delete mode 100644 TestProjects/HDRP_HybridTests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D12/None/BRGGameObjects.png delete mode 100644 TestProjects/HDRP_HybridTests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D12/None/BatchRenderGroupRaw.png delete mode 100644 TestProjects/HDRP_HybridTests/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/None/BRGGameObjects.png delete mode 100644 TestProjects/HDRP_HybridTests/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/None/BatchRenderGroupRaw.png delete mode 100644 TestProjects/HDRP_HybridTests/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D12/None/BRGGameObjects.png delete mode 100644 TestProjects/HDRP_HybridTests/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D12/None/BatchRenderGroupRaw.png delete mode 100644 TestProjects/HDRP_HybridTests/Assets/ReferenceImages/Linear/WindowsPlayer/Vulkan/None/BRGGameObjects.png delete mode 100644 TestProjects/HDRP_HybridTests/Assets/ReferenceImages/Linear/WindowsPlayer/Vulkan/None/BatchRenderGroupRaw.png delete mode 100644 TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/Android/OpenGLES3/None/BatchRenderGroupRaw.png delete mode 100644 TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/Android/Vulkan/None/BatchRenderGroupRaw.png delete mode 100644 TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/LinuxEditor/OpenGLCore.meta delete mode 100644 TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/LinuxEditor/OpenGLCore/None/BRGGameObjects.png.meta delete mode 100644 TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/LinuxEditor/OpenGLCore/None/BatchRenderGroupRaw.png delete mode 100644 TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/LinuxEditor/Vulkan/None/BatchRenderGroupRaw.png delete mode 100644 TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/LinuxPlayer/OpenGLCore.meta delete mode 100644 TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/LinuxPlayer/OpenGLCore/None.meta delete mode 100644 TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/LinuxPlayer/OpenGLCore/None/BRGGameObjects.png.meta delete mode 100644 TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/LinuxPlayer/OpenGLCore/None/BatchRenderGroupRaw.png delete mode 100644 TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/LinuxPlayer/OpenGLCore/None/BatchRenderGroupRaw.png.meta delete mode 100644 TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/LinuxPlayer/Vulkan/None/BatchRenderGroupRaw.png delete mode 100644 TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/OSXEditor/Metal/None/BatchRenderGroupRaw.png delete mode 100644 TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/OSXPlayer/Metal/None/BatchRenderGroupRaw.png delete mode 100644 TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/None/BatchRenderGroupRaw.png delete mode 100644 TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D12/None/BatchRenderGroupRaw.png delete mode 100644 TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/WindowsEditor/OpenGLCore.meta delete mode 100644 TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/WindowsEditor/OpenGLCore/None.meta delete mode 100644 TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/WindowsEditor/OpenGLCore/None/BRGGameObjects.png delete mode 100644 TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/WindowsEditor/OpenGLCore/None/BRGGameObjects.png.meta delete mode 100644 TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/WindowsEditor/OpenGLCore/None/BatchRenderGroupRaw.png delete mode 100644 TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/WindowsEditor/OpenGLCore/None/BatchRenderGroupRaw.png.meta delete mode 100644 TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/None/BRGGameObjects.png delete mode 100644 TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/None/BatchRenderGroupRaw.png delete mode 100644 TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/None/BRGGameObjects.png delete mode 100644 TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/None/BatchRenderGroupRaw.png delete mode 100644 TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D12/None/BRGGameObjects.png delete mode 100644 TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D12/None/BatchRenderGroupRaw.png delete mode 100644 TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/WindowsPlayer/OpenGLCore.meta delete mode 100644 TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/WindowsPlayer/OpenGLCore/None.meta delete mode 100644 TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/WindowsPlayer/OpenGLCore/None/BRGGameObjects.png delete mode 100644 TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/WindowsPlayer/OpenGLCore/None/BRGGameObjects.png.meta delete mode 100644 TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/WindowsPlayer/OpenGLCore/None/BatchRenderGroupRaw.png delete mode 100644 TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/WindowsPlayer/OpenGLCore/None/BatchRenderGroupRaw.png.meta delete mode 100644 TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/WindowsPlayer/Vulkan/None/BRGGameObjects.png delete mode 100644 TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/WindowsPlayer/Vulkan/None/BatchRenderGroupRaw.png delete mode 100644 TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/iPhonePlayer.meta delete mode 100644 TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/iPhonePlayer/Metal.meta delete mode 100644 TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/iPhonePlayer/Metal/None.meta delete mode 100644 TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/iPhonePlayer/Metal/None/BRGGameObjects.png delete mode 100644 TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/iPhonePlayer/Metal/None/BRGGameObjects.png.meta delete mode 100644 TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/iPhonePlayer/Metal/None/BatchRenderGroupRaw.png delete mode 100644 TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/iPhonePlayer/Metal/None/BatchRenderGroupRaw.png.meta diff --git a/.repoconfig b/.repoconfig index d3c8240d50f..8f62b34d7e9 100644 --- a/.repoconfig +++ b/.repoconfig @@ -22,14 +22,12 @@ path-ignore=< - .yamato/all-lightmapping.yml#Lightmapping_ - .yamato/all-postprocessing.yml#PostProcessing_ + - .yamato/all-batchrenderergroup.yml#BatchRendererGroup_ - #General_Checks_ triggers: recurring: diff --git a/.yamato/config/batchrenderergroup.metafile b/.yamato/config/batchrenderergroup.metafile new file mode 100644 index 00000000000..c4c016d9d83 --- /dev/null +++ b/.yamato/config/batchrenderergroup.metafile @@ -0,0 +1,16 @@ +project: + name: BatchRendererGroup + +jobs: + - name: + dependencies: + - #PR__ + - #Extra__ + - name: PR + dependencies: + - .yamato/all-universal_batchrenderergroup.yml#PR_Universal_BatchRendererGroup_ + - .yamato/all-hdrp_batchrenderergroup.yml#PR_HDRP_BatchRendererGroup_ + - name: Extra + dependencies: + - .yamato/all-universal_batchrenderergroup.yml#Extra_Universal_BatchRendererGroup_ + - .yamato/all-hdrp_batchrenderergroup.yml#Extra_HDRP_BatchRendererGroup_ diff --git a/.yamato/config/hdrp.metafile b/.yamato/config/hdrp.metafile index eb2c70b5497..23ff1d35aaa 100644 --- a/.yamato/config/hdrp.metafile +++ b/.yamato/config/hdrp.metafile @@ -133,7 +133,6 @@ jobs: - playmode - Standalone - .yamato/all-hdrp_dxr.yml#PR_HDRP_DXR_ - # - .yamato/all-hdrp_hybrid.yml#PR_HDRP_Hybrid_ - .yamato/all-vfx_hdrp.yml#PR_VFX_HDRP_ - .yamato/_abv.yml#General_Checks_ - name: Extra @@ -177,6 +176,6 @@ jobs: - name: Nightly dependencies: - .yamato/all-hdrp_performancetests.yml#HDRP_PerformanceTests_ -# - .yamato/all-hdrp_hybrid.yml#HDRP_Hybrid_ + #- .yamato/all-hdrp_BatchRendererGroup.yml#HDRP_BatchRendererGroup_ - .yamato/all-hdrp_dxr.yml#HDRP_DXR_ - .yamato/all-hdrp.yml#HDRP_ diff --git a/.yamato/config/hdrp_hybrid.metafile b/.yamato/config/hdrp_batchrenderergroup.metafile similarity index 71% rename from .yamato/config/hdrp_hybrid.metafile rename to .yamato/config/hdrp_batchrenderergroup.metafile index 4c193aa04d4..a0dac224e0c 100644 --- a/.yamato/config/hdrp_hybrid.metafile +++ b/.yamato/config/hdrp_batchrenderergroup.metafile @@ -1,6 +1,6 @@ project: - name: HDRP_Hybrid - folder: HDRP_HybridTests + name: HDRP_BatchRendererGroup + folder: BatchRendererGroup_HDRP test_platforms: - type: playmode utr_flags: @@ -60,10 +60,6 @@ platforms: - Linear - name: Linux apis: - - name: OpenGLCore - exclude_test_platforms: - - name: Standalone - - name: playmode_XR - name: Vulkan exclude_test_platforms: - name: playmode_XR @@ -71,6 +67,19 @@ platforms: - name: mono color_spaces: - Linear + agents_project: + default: + type: Unity::VM::GPU + image: package-ci/ubuntu:stable + flavor: b1.large + editmode: + type: Unity::VM + image: package-ci/ubuntu:stable + flavor: b1.large + standalone_build: + type: Unity::VM::GPU + image: package-ci/ubuntu:stable + flavor: b1.large jobs: - name: PR @@ -81,14 +90,31 @@ jobs: color_space: Linear test_platforms: - playmode - - name: Extra - dependencies: # add any dependencies + - Standalone - platform: Win - api: DX11 + api: DX12 build_config: mono color_space: Linear test_platforms: - - playmode_XR + - playmode + - Standalone + - platform: Win + api: Vulkan + build_config: mono + color_space: Linear + test_platforms: + - playmode + - Standalone + - platform: Linux + api: Vulkan + build_config: mono + color_space: Linear + test_platforms: + - playmode + - Standalone + - name: Extra + dependencies: + [] - name: dependencies: - #PR__ diff --git a/.yamato/config/universal_hybrid.metafile b/.yamato/config/universal_batchrenderergroup.metafile similarity index 75% rename from .yamato/config/universal_hybrid.metafile rename to .yamato/config/universal_batchrenderergroup.metafile index d69175f349a..822dcb9e1cd 100644 --- a/.yamato/config/universal_hybrid.metafile +++ b/.yamato/config/universal_batchrenderergroup.metafile @@ -1,6 +1,6 @@ project: - name: Universal_Hybrid - folder: UniversalHybridTest + name: Universal_BatchRendererGroup + folder: BatchRendererGroup_URP test_platforms: - type: Standalone utr_flags: @@ -44,38 +44,31 @@ platforms: - name: mono color_spaces: - Linear - - name: Android - apis: - - name: OpenGLES3 - exclude_test_platforms: - - name: playmode - - name: playmode_XR - - name: Vulkan - exclude_test_platforms: - - name: playmode - - name: playmode_XR - build_configs: - - name: mono - color_spaces: - - Linear jobs: - name: PR - dependencies: + dependencies: # add any dependencies - platform: Win api: DX11 build_config: mono color_space: Linear test_platforms: - playmode - #- playmode - - platform: OSX - api: Metal + - Standalone + - platform: Win + api: Vulkan + build_config: mono + color_space: Linear + test_platforms: + - playmode + - Standalone + - platform: Linux + api: Vulkan build_config: mono color_space: Linear test_platforms: - #- playmode - playmode + - Standalone - name: Extra dependencies: [] diff --git a/.yamato/config/urp.metafile b/.yamato/config/urp.metafile index 6c7c12e91b3..469cc1de773 100644 --- a/.yamato/config/urp.metafile +++ b/.yamato/config/urp.metafile @@ -7,7 +7,6 @@ jobs: # expression: pull_request.target eq "" AND NOT pull_request.draft AND pull_request.changes.any match ["com.unity.render-pipelines.universal/**/*", "TestProjects/UniversalGraphicsTest_*/**/*"] AND NOT pull_request.changes.all match ["*.md", "**/*.md", "doc/**/*", "**/Documentation*/**/*"] dependencies: - .yamato/all-universal_split.yml#PR_Universal_Split_ -# - .yamato/all-universal_hybrid.yml#PR_Universal_Hybrid_ - .yamato/all-universal_stereo.yml#PR_Universal_Stereo_ - .yamato/all-urpupdate.yml#PR_URPUpdate_ - .yamato/all-shadergraph.yml#PR_ShaderGraph_ @@ -16,7 +15,6 @@ jobs: - name: Extra dependencies: - .yamato/all-universal_split.yml#Extra_Universal_Split_ -# - .yamato/all-universal_hybrid.yml#Extra_Universal_Hybrid_ # - .yamato/all-universal_stereo.yml#Extra_Universal_Stereo_ # - .yamato/all-urpupdate.yml#Extra_URPUpdate_ # - .yamato/all-shadergraph.yml#Extra_ShaderGraph_Stereo_ @@ -28,7 +26,7 @@ jobs: - name: Nightly dependencies: - #_ -# - .yamato/all-universal_hybrid.yml#Universal_Hybrid_ + #- .yamato/all-universal_batchrenderergroup.yml#Universal_BatchRendererGroup_ - .yamato/all-universal_stereo.yml#Universal_Stereo_ - .yamato/all-urpupdate.yml#URPUpdate_ - .yamato/all-urp_perf.yml#URP_Perf_ diff --git a/.yamato/universal_hybrid-linux-vulkan.yml b/.yamato/hdrp_batchrenderergroup-linux-vulkan.yml similarity index 71% rename from .yamato/universal_hybrid-linux-vulkan.yml rename to .yamato/hdrp_batchrenderergroup-linux-vulkan.yml index 027d64cc4ae..b041a04fc0b 100644 --- a/.yamato/universal_hybrid-linux-vulkan.yml +++ b/.yamato/hdrp_batchrenderergroup-linux-vulkan.yml @@ -7,8 +7,8 @@ --- -Universal_Hybrid_Linux_Vulkan_Standalone_mono_Linear_trunk: - name: Universal_Hybrid on Linux_Vulkan_Standalone_mono_Linear on version trunk +HDRP_BatchRendererGroup_Linux_Vulkan_playmode_mono_Linear_trunk: + name: HDRP_BatchRendererGroup on Linux_Vulkan_playmode_mono_Linear on version trunk agent: type: Unity::VM::GPU image: package-ci/ubuntu:stable @@ -23,9 +23,17 @@ Universal_Hybrid_Linux_Vulkan_Standalone_mono_Linear_trunk: - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr retries: 2 - command: chmod +x utr + - command: sudo rm -f /etc/apt/sources.list /etc/apt/sources.list.d/{nodesource,teamviewer,deadsnakes-ubuntu-ppa-}* + - command: curl -L https://artifactory.prd.it.unity3d.com/artifactory/api/gpg/key/public | sudo apt-key add - + - command: sudo sh -c "echo 'deb https://artifactory.prd.it.unity3d.com/artifactory/unity-apt-local bionic main' > /etc/apt/sources.list.d/unity.list" + - command: sudo apt update + - command: sudo apt install unity-downloader-cli + retries: 2 + - command: sudo unity-downloader-cli --source-file unity_revision.txt -c editor -c il2cpp --wait --published-only + retries: 2 - command: |5- export GIT_REVISIONDATE=`git rev-parse HEAD | git show -s --format=%cI` - DISPLAY=:0.0 ./utr --artifacts_path=TestProjects/UniversalHybridTest/test-results --compilation-errors-as-warnings --platform=StandaloneLinux64 --player-connection-ip=auto --player-load-path=players --suite=playmode --timeout=1200 --zero-tests-are-ok=1 + DISPLAY=:0.0 ./utr $CACHE_ARGS --artifacts_path=TestProjects/BatchRendererGroup_HDRP/test-results --compilation-errors-as-warnings --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-force-vulkan" --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=./TestProjects/BatchRendererGroup_HDRP --zero-tests-are-ok=1 after: - command: pip3 install ant_instability_detection --index-url https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade || exit 0 - command: find_instabilities || exit 0 @@ -33,18 +41,16 @@ Universal_Hybrid_Linux_Vulkan_Standalone_mono_Linear_trunk: logs: paths: - "**/test-results/**" - - "TestProjects/UniversalHybridTest/Logs/*.log" + - "TestProjects/BatchRendererGroup_HDRP/Logs/*.log" dependencies: - path: .yamato/_editor_priming.yml#editor:priming:trunk:Linux rerun: on_new_revision - - path: .yamato/universal_hybrid-linux-vulkan.yml#Build_Universal_Hybrid_Linux_Vulkan_Standalone_mono_Linear_trunk - rerun: on_new_revision -Build_Universal_Hybrid_Linux_Vulkan_Standalone_mono_Linear_trunk: - name: Build Universal_Hybrid on Linux_Vulkan_mono_Linear_Standalone_build_Player on version trunk +HDRP_BatchRendererGroup_Linux_Vulkan_Standalone_mono_Linear_trunk: + name: HDRP_BatchRendererGroup on Linux_Vulkan_Standalone_mono_Linear on version trunk agent: - type: Unity::VM + type: Unity::VM::GPU image: package-ci/ubuntu:stable - flavor: b1.xlarge + flavor: b1.large variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates CUSTOM_REVISION: '{{trunk.changeset.id}}' @@ -55,17 +61,9 @@ Build_Universal_Hybrid_Linux_Vulkan_Standalone_mono_Linear_trunk: - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr retries: 2 - command: chmod +x utr - - command: sudo rm -f /etc/apt/sources.list /etc/apt/sources.list.d/{nodesource,teamviewer,deadsnakes-ubuntu-ppa-}* - - command: curl -L https://artifactory.prd.it.unity3d.com/artifactory/api/gpg/key/public | sudo apt-key add - - - command: sudo sh -c "echo 'deb https://artifactory.prd.it.unity3d.com/artifactory/unity-apt-local bionic main' > /etc/apt/sources.list.d/unity.list" - - command: sudo apt update - - command: sudo apt install unity-downloader-cli - retries: 2 - - command: sudo unity-downloader-cli --source-file unity_revision.txt -c editor -c il2cpp --wait --published-only - retries: 2 - command: |5- export GIT_REVISIONDATE=`git rev-parse HEAD | git show -s --format=%cI` - DISPLAY=:0.0 ./utr $CACHE_ARGS --artifacts_path=TestProjects/UniversalHybridTest/test-results --build-only --compilation-errors-as-warnings --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --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=./TestProjects/UniversalHybridTest --timeout=1200 + DISPLAY=:0.0 ./utr --artifacts_path=TestProjects/BatchRendererGroup_HDRP/test-results --compilation-errors-as-warnings --platform=StandaloneLinux64 --player-connection-ip=auto --player-load-path=players --suite=playmode --timeout=1200 --zero-tests-are-ok=1 after: - command: pip3 install ant_instability_detection --index-url https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade || exit 0 - command: find_instabilities || exit 0 @@ -73,15 +71,14 @@ Build_Universal_Hybrid_Linux_Vulkan_Standalone_mono_Linear_trunk: logs: paths: - "**/test-results/**" - - "TestProjects/UniversalHybridTest/Logs/*.log" - players: - paths: - - "players*/**" + - "TestProjects/BatchRendererGroup_HDRP/Logs/*.log" dependencies: - path: .yamato/_editor_priming.yml#editor:priming:trunk:Linux rerun: on_new_revision -Universal_Hybrid_Linux_Vulkan_playmode_mono_Linear_trunk: - name: Universal_Hybrid on Linux_Vulkan_playmode_mono_Linear on version trunk + - path: .yamato/hdrp_batchrenderergroup-linux-vulkan.yml#Build_HDRP_BatchRendererGroup_Linux_Vulkan_Standalone_mono_Linear_trunk + rerun: on_new_revision +Build_HDRP_BatchRendererGroup_Linux_Vulkan_Standalone_mono_Linear_trunk: + name: Build HDRP_BatchRendererGroup on Linux_Vulkan_mono_Linear_Standalone_build_Player on version trunk agent: type: Unity::VM::GPU image: package-ci/ubuntu:stable @@ -106,7 +103,7 @@ Universal_Hybrid_Linux_Vulkan_playmode_mono_Linear_trunk: retries: 2 - command: |5- export GIT_REVISIONDATE=`git rev-parse HEAD | git show -s --format=%cI` - DISPLAY=:0.0 ./utr $CACHE_ARGS --artifacts_path=TestProjects/UniversalHybridTest/test-results --compilation-errors-as-warnings --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-force-vulkan" --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=./TestProjects/UniversalHybridTest --zero-tests-are-ok=1 + DISPLAY=:0.0 ./utr $CACHE_ARGS --artifacts_path=TestProjects/BatchRendererGroup_HDRP/test-results --build-only --compilation-errors-as-warnings --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --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=./TestProjects/BatchRendererGroup_HDRP --timeout=1200 after: - command: pip3 install ant_instability_detection --index-url https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade || exit 0 - command: find_instabilities || exit 0 @@ -114,12 +111,15 @@ Universal_Hybrid_Linux_Vulkan_playmode_mono_Linear_trunk: logs: paths: - "**/test-results/**" - - "TestProjects/UniversalHybridTest/Logs/*.log" + - "TestProjects/BatchRendererGroup_HDRP/Logs/*.log" + players: + paths: + - "players*/**" dependencies: - path: .yamato/_editor_priming.yml#editor:priming:trunk:Linux rerun: on_new_revision -Universal_Hybrid_Linux_Vulkan_Standalone_mono_Linear_CUSTOM-REVISION: - name: Universal_Hybrid on Linux_Vulkan_Standalone_mono_Linear on version CUSTOM-REVISION +HDRP_BatchRendererGroup_Linux_Vulkan_playmode_mono_Linear_CUSTOM-REVISION: + name: HDRP_BatchRendererGroup on Linux_Vulkan_playmode_mono_Linear on version CUSTOM-REVISION agent: type: Unity::VM::GPU image: package-ci/ubuntu:stable @@ -134,9 +134,17 @@ Universal_Hybrid_Linux_Vulkan_Standalone_mono_Linear_CUSTOM-REVISION: - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr retries: 2 - command: chmod +x utr + - command: sudo rm -f /etc/apt/sources.list /etc/apt/sources.list.d/{nodesource,teamviewer,deadsnakes-ubuntu-ppa-}* + - command: curl -L https://artifactory.prd.it.unity3d.com/artifactory/api/gpg/key/public | sudo apt-key add - + - command: sudo sh -c "echo 'deb https://artifactory.prd.it.unity3d.com/artifactory/unity-apt-local bionic main' > /etc/apt/sources.list.d/unity.list" + - command: sudo apt update + - command: sudo apt install unity-downloader-cli + retries: 2 + - command: sudo unity-downloader-cli --source-file unity_revision.txt -c editor -c il2cpp --wait --published-only + retries: 2 - command: |5- export GIT_REVISIONDATE=`git rev-parse HEAD | git show -s --format=%cI` - DISPLAY=:0.0 ./utr --artifacts_path=TestProjects/UniversalHybridTest/test-results --compilation-errors-as-warnings --platform=StandaloneLinux64 --player-connection-ip=auto --player-load-path=players --suite=playmode --timeout=1200 --zero-tests-are-ok=1 + DISPLAY=:0.0 ./utr $CACHE_ARGS --artifacts_path=TestProjects/BatchRendererGroup_HDRP/test-results --compilation-errors-as-warnings --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-force-vulkan" --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=./TestProjects/BatchRendererGroup_HDRP --zero-tests-are-ok=1 after: - command: pip3 install ant_instability_detection --index-url https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade || exit 0 - command: find_instabilities || exit 0 @@ -144,18 +152,16 @@ Universal_Hybrid_Linux_Vulkan_Standalone_mono_Linear_CUSTOM-REVISION: logs: paths: - "**/test-results/**" - - "TestProjects/UniversalHybridTest/Logs/*.log" + - "TestProjects/BatchRendererGroup_HDRP/Logs/*.log" dependencies: - path: .yamato/_editor_priming.yml#editor:priming:CUSTOM-REVISION:Linux rerun: on_new_revision - - path: .yamato/universal_hybrid-linux-vulkan.yml#Build_Universal_Hybrid_Linux_Vulkan_Standalone_mono_Linear_CUSTOM-REVISION - rerun: on_new_revision -Build_Universal_Hybrid_Linux_Vulkan_Standalone_mono_Linear_CUSTOM-REVISION: - name: Build Universal_Hybrid on Linux_Vulkan_mono_Linear_Standalone_build_Player on version CUSTOM-REVISION +HDRP_BatchRendererGroup_Linux_Vulkan_Standalone_mono_Linear_CUSTOM-REVISION: + name: HDRP_BatchRendererGroup on Linux_Vulkan_Standalone_mono_Linear on version CUSTOM-REVISION agent: - type: Unity::VM + type: Unity::VM::GPU image: package-ci/ubuntu:stable - flavor: b1.xlarge + flavor: b1.large variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates CUSTOM_REVISION: custom_revision_not_set @@ -166,17 +172,9 @@ Build_Universal_Hybrid_Linux_Vulkan_Standalone_mono_Linear_CUSTOM-REVISION: - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr retries: 2 - command: chmod +x utr - - command: sudo rm -f /etc/apt/sources.list /etc/apt/sources.list.d/{nodesource,teamviewer,deadsnakes-ubuntu-ppa-}* - - command: curl -L https://artifactory.prd.it.unity3d.com/artifactory/api/gpg/key/public | sudo apt-key add - - - command: sudo sh -c "echo 'deb https://artifactory.prd.it.unity3d.com/artifactory/unity-apt-local bionic main' > /etc/apt/sources.list.d/unity.list" - - command: sudo apt update - - command: sudo apt install unity-downloader-cli - retries: 2 - - command: sudo unity-downloader-cli --source-file unity_revision.txt -c editor -c il2cpp --wait --published-only - retries: 2 - command: |5- export GIT_REVISIONDATE=`git rev-parse HEAD | git show -s --format=%cI` - DISPLAY=:0.0 ./utr $CACHE_ARGS --artifacts_path=TestProjects/UniversalHybridTest/test-results --build-only --compilation-errors-as-warnings --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --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=./TestProjects/UniversalHybridTest --timeout=1200 + DISPLAY=:0.0 ./utr --artifacts_path=TestProjects/BatchRendererGroup_HDRP/test-results --compilation-errors-as-warnings --platform=StandaloneLinux64 --player-connection-ip=auto --player-load-path=players --suite=playmode --timeout=1200 --zero-tests-are-ok=1 after: - command: pip3 install ant_instability_detection --index-url https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade || exit 0 - command: find_instabilities || exit 0 @@ -184,15 +182,14 @@ Build_Universal_Hybrid_Linux_Vulkan_Standalone_mono_Linear_CUSTOM-REVISION: logs: paths: - "**/test-results/**" - - "TestProjects/UniversalHybridTest/Logs/*.log" - players: - paths: - - "players*/**" + - "TestProjects/BatchRendererGroup_HDRP/Logs/*.log" dependencies: - path: .yamato/_editor_priming.yml#editor:priming:CUSTOM-REVISION:Linux rerun: on_new_revision -Universal_Hybrid_Linux_Vulkan_playmode_mono_Linear_CUSTOM-REVISION: - name: Universal_Hybrid on Linux_Vulkan_playmode_mono_Linear on version CUSTOM-REVISION + - path: .yamato/hdrp_batchrenderergroup-linux-vulkan.yml#Build_HDRP_BatchRendererGroup_Linux_Vulkan_Standalone_mono_Linear_CUSTOM-REVISION + rerun: on_new_revision +Build_HDRP_BatchRendererGroup_Linux_Vulkan_Standalone_mono_Linear_CUSTOM-REVISION: + name: Build HDRP_BatchRendererGroup on Linux_Vulkan_mono_Linear_Standalone_build_Player on version CUSTOM-REVISION agent: type: Unity::VM::GPU image: package-ci/ubuntu:stable @@ -217,7 +214,7 @@ Universal_Hybrid_Linux_Vulkan_playmode_mono_Linear_CUSTOM-REVISION: retries: 2 - command: |5- export GIT_REVISIONDATE=`git rev-parse HEAD | git show -s --format=%cI` - DISPLAY=:0.0 ./utr $CACHE_ARGS --artifacts_path=TestProjects/UniversalHybridTest/test-results --compilation-errors-as-warnings --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-force-vulkan" --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=./TestProjects/UniversalHybridTest --zero-tests-are-ok=1 + DISPLAY=:0.0 ./utr $CACHE_ARGS --artifacts_path=TestProjects/BatchRendererGroup_HDRP/test-results --build-only --compilation-errors-as-warnings --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --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=./TestProjects/BatchRendererGroup_HDRP --timeout=1200 after: - command: pip3 install ant_instability_detection --index-url https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade || exit 0 - command: find_instabilities || exit 0 @@ -225,7 +222,10 @@ Universal_Hybrid_Linux_Vulkan_playmode_mono_Linear_CUSTOM-REVISION: logs: paths: - "**/test-results/**" - - "TestProjects/UniversalHybridTest/Logs/*.log" + - "TestProjects/BatchRendererGroup_HDRP/Logs/*.log" + players: + paths: + - "players*/**" dependencies: - path: .yamato/_editor_priming.yml#editor:priming:CUSTOM-REVISION:Linux rerun: on_new_revision diff --git a/.yamato/hdrp_hybrid-osx-metal.yml b/.yamato/hdrp_batchrenderergroup-osx-metal.yml similarity index 78% rename from .yamato/hdrp_hybrid-osx-metal.yml rename to .yamato/hdrp_batchrenderergroup-osx-metal.yml index 9cd7548f5ae..1863940fc81 100644 --- a/.yamato/hdrp_hybrid-osx-metal.yml +++ b/.yamato/hdrp_batchrenderergroup-osx-metal.yml @@ -7,8 +7,8 @@ --- -HDRP_Hybrid_OSX_Metal_playmode_mono_Linear_trunk: - name: HDRP_Hybrid on OSX_Metal_playmode_mono_Linear on version trunk +HDRP_BatchRendererGroup_OSX_Metal_playmode_mono_Linear_trunk: + name: HDRP_BatchRendererGroup on OSX_Metal_playmode_mono_Linear on version trunk agent: type: Unity::metal::macmini image: slough-ops/macos-10.14-xcode:stable @@ -33,9 +33,9 @@ HDRP_Hybrid_OSX_Metal_playmode_mono_Linear_trunk: retries: 2 - command: |5- export GIT_REVISIONDATE=`git rev-parse HEAD | git show -s --format=%cI` - ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; GIT_BRANCH='$GIT_BRANCH' GIT_COMMIT_TIME='$GIT_COMMIT_TIME' GIT_REPOSITORY_URL='$GIT_REPOSITORY_URL' GIT_REVISION='$GIT_REVISION' YAMATO_JOBDEFINITION_FRIENDLY_NAME='$YAMATO_JOBDEFINITION_FRIENDLY_NAME' YAMATO_JOBDEFINITION_NAME='$YAMATO_JOBDEFINITION_NAME' YAMATO_JOB_ID='$YAMATO_JOB_ID' YAMATO_PROJECT_ID='$YAMATO_PROJECT_ID' YAMATO_PROJECT_NAME='$YAMATO_PROJECT_NAME' ~/Graphics/utr $CACHE_ARGS --artifacts_path=/Users/bokken/Graphics/TestProjects/HDRP_HybridTests/test-results --compilation-errors-as-warnings --editor-location=/Users/bokken/.Editor --extra-editor-arg="-colorspace=Linear" --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 bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; GIT_BRANCH='$GIT_BRANCH' GIT_COMMIT_TIME='$GIT_COMMIT_TIME' GIT_REPOSITORY_URL='$GIT_REPOSITORY_URL' GIT_REVISION='$GIT_REVISION' YAMATO_JOBDEFINITION_FRIENDLY_NAME='$YAMATO_JOBDEFINITION_FRIENDLY_NAME' YAMATO_JOBDEFINITION_NAME='$YAMATO_JOBDEFINITION_NAME' YAMATO_JOB_ID='$YAMATO_JOB_ID' YAMATO_PROJECT_ID='$YAMATO_PROJECT_ID' YAMATO_PROJECT_NAME='$YAMATO_PROJECT_NAME' ~/Graphics/utr $CACHE_ARGS --artifacts_path=/Users/bokken/Graphics/TestProjects/BatchRendererGroup_HDRP/test-results --compilation-errors-as-warnings --editor-location=/Users/bokken/.Editor --extra-editor-arg="-colorspace=Linear" --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=/Users/bokken/Graphics/TestProjects/BatchRendererGroup_HDRP --zero-tests-are-ok=1 " UTR_RESULT=$? - scp -i ~/.ssh/id_rsa_macmini -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/HDRP_HybridTests/test-results/ TestProjects/HDRP_HybridTests + scp -i ~/.ssh/id_rsa_macmini -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/BatchRendererGroup_HDRP/test-results/ TestProjects/BatchRendererGroup_HDRP exit $UTR_RESULT after: - command: pip3 install requests ant_instability_detection --index-url https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade || exit 0 @@ -44,12 +44,12 @@ HDRP_Hybrid_OSX_Metal_playmode_mono_Linear_trunk: logs: paths: - "**/test-results/**" - - "TestProjects/HDRP_HybridTests/Logs/*.log" + - "TestProjects/BatchRendererGroup_HDRP/Logs/*.log" dependencies: - path: .yamato/_editor_priming.yml#editor:priming:trunk:OSX rerun: on_new_revision -HDRP_Hybrid_OSX_Metal_playmode_XR_mono_Linear_trunk: - name: HDRP_Hybrid on OSX_Metal_playmode_XR_mono_Linear on version trunk +HDRP_BatchRendererGroup_OSX_Metal_playmode_XR_mono_Linear_trunk: + name: HDRP_BatchRendererGroup on OSX_Metal_playmode_XR_mono_Linear on version trunk agent: type: Unity::metal::macmini image: slough-ops/macos-10.14-xcode:stable @@ -74,9 +74,9 @@ HDRP_Hybrid_OSX_Metal_playmode_XR_mono_Linear_trunk: retries: 2 - command: |5- export GIT_REVISIONDATE=`git rev-parse HEAD | git show -s --format=%cI` - ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; GIT_BRANCH='$GIT_BRANCH' GIT_COMMIT_TIME='$GIT_COMMIT_TIME' GIT_REPOSITORY_URL='$GIT_REPOSITORY_URL' GIT_REVISION='$GIT_REVISION' YAMATO_JOBDEFINITION_FRIENDLY_NAME='$YAMATO_JOBDEFINITION_FRIENDLY_NAME' YAMATO_JOBDEFINITION_NAME='$YAMATO_JOBDEFINITION_NAME' YAMATO_JOB_ID='$YAMATO_JOB_ID' YAMATO_PROJECT_ID='$YAMATO_PROJECT_ID' YAMATO_PROJECT_NAME='$YAMATO_PROJECT_NAME' ~/Graphics/utr $CACHE_ARGS --artifacts_path=/Users/bokken/Graphics/TestProjects/HDRP_HybridTests/test-results --compilation-errors-as-warnings --editor-location=/Users/bokken/.Editor --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-xr-reuse-tests" --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 bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; GIT_BRANCH='$GIT_BRANCH' GIT_COMMIT_TIME='$GIT_COMMIT_TIME' GIT_REPOSITORY_URL='$GIT_REPOSITORY_URL' GIT_REVISION='$GIT_REVISION' YAMATO_JOBDEFINITION_FRIENDLY_NAME='$YAMATO_JOBDEFINITION_FRIENDLY_NAME' YAMATO_JOBDEFINITION_NAME='$YAMATO_JOBDEFINITION_NAME' YAMATO_JOB_ID='$YAMATO_JOB_ID' YAMATO_PROJECT_ID='$YAMATO_PROJECT_ID' YAMATO_PROJECT_NAME='$YAMATO_PROJECT_NAME' ~/Graphics/utr $CACHE_ARGS --artifacts_path=/Users/bokken/Graphics/TestProjects/BatchRendererGroup_HDRP/test-results --compilation-errors-as-warnings --editor-location=/Users/bokken/.Editor --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-xr-reuse-tests" --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=/Users/bokken/Graphics/TestProjects/BatchRendererGroup_HDRP --zero-tests-are-ok=1 " UTR_RESULT=$? - scp -i ~/.ssh/id_rsa_macmini -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/HDRP_HybridTests/test-results/ TestProjects/HDRP_HybridTests + scp -i ~/.ssh/id_rsa_macmini -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/BatchRendererGroup_HDRP/test-results/ TestProjects/BatchRendererGroup_HDRP exit $UTR_RESULT after: - command: pip3 install requests ant_instability_detection --index-url https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade || exit 0 @@ -85,12 +85,12 @@ HDRP_Hybrid_OSX_Metal_playmode_XR_mono_Linear_trunk: logs: paths: - "**/test-results/**" - - "TestProjects/HDRP_HybridTests/Logs/*.log" + - "TestProjects/BatchRendererGroup_HDRP/Logs/*.log" dependencies: - path: .yamato/_editor_priming.yml#editor:priming:trunk:OSX rerun: on_new_revision -HDRP_Hybrid_OSX_Metal_Standalone_mono_Linear_trunk: - name: HDRP_Hybrid on OSX_Metal_Standalone_mono_Linear on version trunk +HDRP_BatchRendererGroup_OSX_Metal_Standalone_mono_Linear_trunk: + name: HDRP_BatchRendererGroup on OSX_Metal_Standalone_mono_Linear on version trunk agent: type: Unity::metal::macmini image: slough-ops/macos-10.14-xcode:stable @@ -115,9 +115,9 @@ HDRP_Hybrid_OSX_Metal_Standalone_mono_Linear_trunk: retries: 2 - command: |5- export GIT_REVISIONDATE=`git rev-parse HEAD | git show -s --format=%cI` - ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; GIT_BRANCH='$GIT_BRANCH' GIT_COMMIT_TIME='$GIT_COMMIT_TIME' GIT_REPOSITORY_URL='$GIT_REPOSITORY_URL' GIT_REVISION='$GIT_REVISION' YAMATO_JOBDEFINITION_FRIENDLY_NAME='$YAMATO_JOBDEFINITION_FRIENDLY_NAME' YAMATO_JOBDEFINITION_NAME='$YAMATO_JOBDEFINITION_NAME' YAMATO_JOB_ID='$YAMATO_JOB_ID' YAMATO_PROJECT_ID='$YAMATO_PROJECT_ID' YAMATO_PROJECT_NAME='$YAMATO_PROJECT_NAME' ~/Graphics/utr $CACHE_ARGS --artifacts_path=/Users/bokken/Graphics/TestProjects/HDRP_HybridTests/test-results --compilation-errors-as-warnings --editor-location=.Editor --platform=StandaloneOSX --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=/Users/bokken/Graphics/TestProjects/HDRP_HybridTests --timeout=2400 --zero-tests-are-ok=1 " + ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; GIT_BRANCH='$GIT_BRANCH' GIT_COMMIT_TIME='$GIT_COMMIT_TIME' GIT_REPOSITORY_URL='$GIT_REPOSITORY_URL' GIT_REVISION='$GIT_REVISION' YAMATO_JOBDEFINITION_FRIENDLY_NAME='$YAMATO_JOBDEFINITION_FRIENDLY_NAME' YAMATO_JOBDEFINITION_NAME='$YAMATO_JOBDEFINITION_NAME' YAMATO_JOB_ID='$YAMATO_JOB_ID' YAMATO_PROJECT_ID='$YAMATO_PROJECT_ID' YAMATO_PROJECT_NAME='$YAMATO_PROJECT_NAME' ~/Graphics/utr $CACHE_ARGS --artifacts_path=/Users/bokken/Graphics/TestProjects/BatchRendererGroup_HDRP/test-results --compilation-errors-as-warnings --editor-location=.Editor --platform=StandaloneOSX --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=/Users/bokken/Graphics/TestProjects/BatchRendererGroup_HDRP --timeout=2400 --zero-tests-are-ok=1 " UTR_RESULT=$? - scp -i ~/.ssh/id_rsa_macmini -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/HDRP_HybridTests/test-results/ TestProjects/HDRP_HybridTests + scp -i ~/.ssh/id_rsa_macmini -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/BatchRendererGroup_HDRP/test-results/ TestProjects/BatchRendererGroup_HDRP exit $UTR_RESULT after: - command: pip3 install requests ant_instability_detection --index-url https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade || exit 0 @@ -126,12 +126,12 @@ HDRP_Hybrid_OSX_Metal_Standalone_mono_Linear_trunk: logs: paths: - "**/test-results/**" - - "TestProjects/HDRP_HybridTests/Logs/*.log" + - "TestProjects/BatchRendererGroup_HDRP/Logs/*.log" dependencies: - path: .yamato/_editor_priming.yml#editor:priming:trunk:OSX rerun: on_new_revision -HDRP_Hybrid_OSX_Metal_playmode_mono_Linear_CUSTOM-REVISION: - name: HDRP_Hybrid on OSX_Metal_playmode_mono_Linear on version CUSTOM-REVISION +HDRP_BatchRendererGroup_OSX_Metal_playmode_mono_Linear_CUSTOM-REVISION: + name: HDRP_BatchRendererGroup on OSX_Metal_playmode_mono_Linear on version CUSTOM-REVISION agent: type: Unity::metal::macmini image: slough-ops/macos-10.14-xcode:stable @@ -156,9 +156,9 @@ HDRP_Hybrid_OSX_Metal_playmode_mono_Linear_CUSTOM-REVISION: retries: 2 - command: |5- export GIT_REVISIONDATE=`git rev-parse HEAD | git show -s --format=%cI` - ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; GIT_BRANCH='$GIT_BRANCH' GIT_COMMIT_TIME='$GIT_COMMIT_TIME' GIT_REPOSITORY_URL='$GIT_REPOSITORY_URL' GIT_REVISION='$GIT_REVISION' YAMATO_JOBDEFINITION_FRIENDLY_NAME='$YAMATO_JOBDEFINITION_FRIENDLY_NAME' YAMATO_JOBDEFINITION_NAME='$YAMATO_JOBDEFINITION_NAME' YAMATO_JOB_ID='$YAMATO_JOB_ID' YAMATO_PROJECT_ID='$YAMATO_PROJECT_ID' YAMATO_PROJECT_NAME='$YAMATO_PROJECT_NAME' ~/Graphics/utr $CACHE_ARGS --artifacts_path=/Users/bokken/Graphics/TestProjects/HDRP_HybridTests/test-results --compilation-errors-as-warnings --editor-location=/Users/bokken/.Editor --extra-editor-arg="-colorspace=Linear" --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 bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; GIT_BRANCH='$GIT_BRANCH' GIT_COMMIT_TIME='$GIT_COMMIT_TIME' GIT_REPOSITORY_URL='$GIT_REPOSITORY_URL' GIT_REVISION='$GIT_REVISION' YAMATO_JOBDEFINITION_FRIENDLY_NAME='$YAMATO_JOBDEFINITION_FRIENDLY_NAME' YAMATO_JOBDEFINITION_NAME='$YAMATO_JOBDEFINITION_NAME' YAMATO_JOB_ID='$YAMATO_JOB_ID' YAMATO_PROJECT_ID='$YAMATO_PROJECT_ID' YAMATO_PROJECT_NAME='$YAMATO_PROJECT_NAME' ~/Graphics/utr $CACHE_ARGS --artifacts_path=/Users/bokken/Graphics/TestProjects/BatchRendererGroup_HDRP/test-results --compilation-errors-as-warnings --editor-location=/Users/bokken/.Editor --extra-editor-arg="-colorspace=Linear" --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=/Users/bokken/Graphics/TestProjects/BatchRendererGroup_HDRP --zero-tests-are-ok=1 " UTR_RESULT=$? - scp -i ~/.ssh/id_rsa_macmini -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/HDRP_HybridTests/test-results/ TestProjects/HDRP_HybridTests + scp -i ~/.ssh/id_rsa_macmini -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/BatchRendererGroup_HDRP/test-results/ TestProjects/BatchRendererGroup_HDRP exit $UTR_RESULT after: - command: pip3 install requests ant_instability_detection --index-url https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade || exit 0 @@ -167,12 +167,12 @@ HDRP_Hybrid_OSX_Metal_playmode_mono_Linear_CUSTOM-REVISION: logs: paths: - "**/test-results/**" - - "TestProjects/HDRP_HybridTests/Logs/*.log" + - "TestProjects/BatchRendererGroup_HDRP/Logs/*.log" dependencies: - path: .yamato/_editor_priming.yml#editor:priming:CUSTOM-REVISION:OSX rerun: on_new_revision -HDRP_Hybrid_OSX_Metal_playmode_XR_mono_Linear_CUSTOM-REVISION: - name: HDRP_Hybrid on OSX_Metal_playmode_XR_mono_Linear on version CUSTOM-REVISION +HDRP_BatchRendererGroup_OSX_Metal_playmode_XR_mono_Linear_CUSTOM-REVISION: + name: HDRP_BatchRendererGroup on OSX_Metal_playmode_XR_mono_Linear on version CUSTOM-REVISION agent: type: Unity::metal::macmini image: slough-ops/macos-10.14-xcode:stable @@ -197,9 +197,9 @@ HDRP_Hybrid_OSX_Metal_playmode_XR_mono_Linear_CUSTOM-REVISION: retries: 2 - command: |5- export GIT_REVISIONDATE=`git rev-parse HEAD | git show -s --format=%cI` - ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; GIT_BRANCH='$GIT_BRANCH' GIT_COMMIT_TIME='$GIT_COMMIT_TIME' GIT_REPOSITORY_URL='$GIT_REPOSITORY_URL' GIT_REVISION='$GIT_REVISION' YAMATO_JOBDEFINITION_FRIENDLY_NAME='$YAMATO_JOBDEFINITION_FRIENDLY_NAME' YAMATO_JOBDEFINITION_NAME='$YAMATO_JOBDEFINITION_NAME' YAMATO_JOB_ID='$YAMATO_JOB_ID' YAMATO_PROJECT_ID='$YAMATO_PROJECT_ID' YAMATO_PROJECT_NAME='$YAMATO_PROJECT_NAME' ~/Graphics/utr $CACHE_ARGS --artifacts_path=/Users/bokken/Graphics/TestProjects/HDRP_HybridTests/test-results --compilation-errors-as-warnings --editor-location=/Users/bokken/.Editor --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-xr-reuse-tests" --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 bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; GIT_BRANCH='$GIT_BRANCH' GIT_COMMIT_TIME='$GIT_COMMIT_TIME' GIT_REPOSITORY_URL='$GIT_REPOSITORY_URL' GIT_REVISION='$GIT_REVISION' YAMATO_JOBDEFINITION_FRIENDLY_NAME='$YAMATO_JOBDEFINITION_FRIENDLY_NAME' YAMATO_JOBDEFINITION_NAME='$YAMATO_JOBDEFINITION_NAME' YAMATO_JOB_ID='$YAMATO_JOB_ID' YAMATO_PROJECT_ID='$YAMATO_PROJECT_ID' YAMATO_PROJECT_NAME='$YAMATO_PROJECT_NAME' ~/Graphics/utr $CACHE_ARGS --artifacts_path=/Users/bokken/Graphics/TestProjects/BatchRendererGroup_HDRP/test-results --compilation-errors-as-warnings --editor-location=/Users/bokken/.Editor --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-xr-reuse-tests" --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=/Users/bokken/Graphics/TestProjects/BatchRendererGroup_HDRP --zero-tests-are-ok=1 " UTR_RESULT=$? - scp -i ~/.ssh/id_rsa_macmini -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/HDRP_HybridTests/test-results/ TestProjects/HDRP_HybridTests + scp -i ~/.ssh/id_rsa_macmini -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/BatchRendererGroup_HDRP/test-results/ TestProjects/BatchRendererGroup_HDRP exit $UTR_RESULT after: - command: pip3 install requests ant_instability_detection --index-url https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade || exit 0 @@ -208,12 +208,12 @@ HDRP_Hybrid_OSX_Metal_playmode_XR_mono_Linear_CUSTOM-REVISION: logs: paths: - "**/test-results/**" - - "TestProjects/HDRP_HybridTests/Logs/*.log" + - "TestProjects/BatchRendererGroup_HDRP/Logs/*.log" dependencies: - path: .yamato/_editor_priming.yml#editor:priming:CUSTOM-REVISION:OSX rerun: on_new_revision -HDRP_Hybrid_OSX_Metal_Standalone_mono_Linear_CUSTOM-REVISION: - name: HDRP_Hybrid on OSX_Metal_Standalone_mono_Linear on version CUSTOM-REVISION +HDRP_BatchRendererGroup_OSX_Metal_Standalone_mono_Linear_CUSTOM-REVISION: + name: HDRP_BatchRendererGroup on OSX_Metal_Standalone_mono_Linear on version CUSTOM-REVISION agent: type: Unity::metal::macmini image: slough-ops/macos-10.14-xcode:stable @@ -238,9 +238,9 @@ HDRP_Hybrid_OSX_Metal_Standalone_mono_Linear_CUSTOM-REVISION: retries: 2 - command: |5- export GIT_REVISIONDATE=`git rev-parse HEAD | git show -s --format=%cI` - ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; GIT_BRANCH='$GIT_BRANCH' GIT_COMMIT_TIME='$GIT_COMMIT_TIME' GIT_REPOSITORY_URL='$GIT_REPOSITORY_URL' GIT_REVISION='$GIT_REVISION' YAMATO_JOBDEFINITION_FRIENDLY_NAME='$YAMATO_JOBDEFINITION_FRIENDLY_NAME' YAMATO_JOBDEFINITION_NAME='$YAMATO_JOBDEFINITION_NAME' YAMATO_JOB_ID='$YAMATO_JOB_ID' YAMATO_PROJECT_ID='$YAMATO_PROJECT_ID' YAMATO_PROJECT_NAME='$YAMATO_PROJECT_NAME' ~/Graphics/utr $CACHE_ARGS --artifacts_path=/Users/bokken/Graphics/TestProjects/HDRP_HybridTests/test-results --compilation-errors-as-warnings --editor-location=.Editor --platform=StandaloneOSX --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=/Users/bokken/Graphics/TestProjects/HDRP_HybridTests --timeout=2400 --zero-tests-are-ok=1 " + ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; GIT_BRANCH='$GIT_BRANCH' GIT_COMMIT_TIME='$GIT_COMMIT_TIME' GIT_REPOSITORY_URL='$GIT_REPOSITORY_URL' GIT_REVISION='$GIT_REVISION' YAMATO_JOBDEFINITION_FRIENDLY_NAME='$YAMATO_JOBDEFINITION_FRIENDLY_NAME' YAMATO_JOBDEFINITION_NAME='$YAMATO_JOBDEFINITION_NAME' YAMATO_JOB_ID='$YAMATO_JOB_ID' YAMATO_PROJECT_ID='$YAMATO_PROJECT_ID' YAMATO_PROJECT_NAME='$YAMATO_PROJECT_NAME' ~/Graphics/utr $CACHE_ARGS --artifacts_path=/Users/bokken/Graphics/TestProjects/BatchRendererGroup_HDRP/test-results --compilation-errors-as-warnings --editor-location=.Editor --platform=StandaloneOSX --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=/Users/bokken/Graphics/TestProjects/BatchRendererGroup_HDRP --timeout=2400 --zero-tests-are-ok=1 " UTR_RESULT=$? - scp -i ~/.ssh/id_rsa_macmini -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/HDRP_HybridTests/test-results/ TestProjects/HDRP_HybridTests + scp -i ~/.ssh/id_rsa_macmini -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/BatchRendererGroup_HDRP/test-results/ TestProjects/BatchRendererGroup_HDRP exit $UTR_RESULT after: - command: pip3 install requests ant_instability_detection --index-url https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade || exit 0 @@ -249,7 +249,7 @@ HDRP_Hybrid_OSX_Metal_Standalone_mono_Linear_CUSTOM-REVISION: logs: paths: - "**/test-results/**" - - "TestProjects/HDRP_HybridTests/Logs/*.log" + - "TestProjects/BatchRendererGroup_HDRP/Logs/*.log" dependencies: - path: .yamato/_editor_priming.yml#editor:priming:CUSTOM-REVISION:OSX rerun: on_new_revision diff --git a/.yamato/hdrp_hybrid-win-vulkan.yml b/.yamato/hdrp_batchrenderergroup-win-dx11.yml similarity index 66% rename from .yamato/hdrp_hybrid-win-vulkan.yml rename to .yamato/hdrp_batchrenderergroup-win-dx11.yml index 0969ed91c45..d59d9a36ac3 100644 --- a/.yamato/hdrp_hybrid-win-vulkan.yml +++ b/.yamato/hdrp_batchrenderergroup-win-dx11.yml @@ -7,8 +7,8 @@ --- -HDRP_Hybrid_Win_Vulkan_playmode_mono_Linear_trunk: - name: HDRP_Hybrid on Win_Vulkan_playmode_mono_Linear on version trunk +HDRP_BatchRendererGroup_Win_DX11_playmode_mono_Linear_trunk: + name: HDRP_BatchRendererGroup on Win_DX11_playmode_mono_Linear on version trunk agent: type: Unity::VM::GPU image: graphics-foundation/win10-dxr:stable @@ -33,17 +33,17 @@ HDRP_Hybrid_Win_Vulkan_playmode_mono_Linear_trunk: set /p GIT_REVISIONDATE= /etc/apt/sources.list.d/unity.list" - - command: sudo apt update - - command: sudo apt install unity-downloader-cli - retries: 2 - - command: sudo unity-downloader-cli --source-file unity_revision.txt -c editor -c il2cpp --wait --published-only - retries: 2 - - command: |5- - export GIT_REVISIONDATE=`git rev-parse HEAD | git show -s --format=%cI` - DISPLAY=:0.0 ./utr $CACHE_ARGS --artifacts_path=TestProjects/HDRP_HybridTests/test-results --compilation-errors-as-warnings --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-force-glcore" --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=./TestProjects/HDRP_HybridTests --zero-tests-are-ok=1 - after: - - command: pip3 install ant_instability_detection --index-url https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade || exit 0 - - command: find_instabilities || exit 0 - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/HDRP_HybridTests/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:trunk:Linux - rerun: on_new_revision -HDRP_Hybrid_Linux_OpenGLCore_playmode_mono_Linear_CUSTOM-REVISION: - name: HDRP_Hybrid on Linux_OpenGLCore_playmode_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 - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - command: chmod +x utr - - command: sudo rm -f /etc/apt/sources.list /etc/apt/sources.list.d/{nodesource,teamviewer,deadsnakes-ubuntu-ppa-}* - - command: curl -L https://artifactory.prd.it.unity3d.com/artifactory/api/gpg/key/public | sudo apt-key add - - - command: sudo sh -c "echo 'deb https://artifactory.prd.it.unity3d.com/artifactory/unity-apt-local bionic main' > /etc/apt/sources.list.d/unity.list" - - command: sudo apt update - - command: sudo apt install unity-downloader-cli - retries: 2 - - command: sudo unity-downloader-cli --source-file unity_revision.txt -c editor -c il2cpp --wait --published-only - retries: 2 - - command: |5- - export GIT_REVISIONDATE=`git rev-parse HEAD | git show -s --format=%cI` - DISPLAY=:0.0 ./utr $CACHE_ARGS --artifacts_path=TestProjects/HDRP_HybridTests/test-results --compilation-errors-as-warnings --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-force-glcore" --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=./TestProjects/HDRP_HybridTests --zero-tests-are-ok=1 - after: - - command: pip3 install ant_instability_detection --index-url https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade || exit 0 - - command: find_instabilities || exit 0 - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/HDRP_HybridTests/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:CUSTOM-REVISION:Linux - rerun: on_new_revision diff --git a/.yamato/universal_hybrid-linux-openglcore.yml b/.yamato/universal_batchrenderergroup-linux-openglcore.yml similarity index 77% rename from .yamato/universal_hybrid-linux-openglcore.yml rename to .yamato/universal_batchrenderergroup-linux-openglcore.yml index ae3b1513d71..495e4c5ade2 100644 --- a/.yamato/universal_hybrid-linux-openglcore.yml +++ b/.yamato/universal_batchrenderergroup-linux-openglcore.yml @@ -7,8 +7,8 @@ --- -Universal_Hybrid_Linux_OpenGLCore_playmode_mono_Linear_trunk: - name: Universal_Hybrid on Linux_OpenGLCore_playmode_mono_Linear on version trunk +Universal_BatchRendererGroup_Linux_OpenGLCore_playmode_mono_Linear_trunk: + name: Universal_BatchRendererGroup on Linux_OpenGLCore_playmode_mono_Linear on version trunk agent: type: Unity::VM::GPU image: package-ci/ubuntu:stable @@ -33,7 +33,7 @@ Universal_Hybrid_Linux_OpenGLCore_playmode_mono_Linear_trunk: retries: 2 - command: |5- export GIT_REVISIONDATE=`git rev-parse HEAD | git show -s --format=%cI` - DISPLAY=:0.0 ./utr $CACHE_ARGS --artifacts_path=TestProjects/UniversalHybridTest/test-results --compilation-errors-as-warnings --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-force-glcore" --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=./TestProjects/UniversalHybridTest --zero-tests-are-ok=1 + DISPLAY=:0.0 ./utr $CACHE_ARGS --artifacts_path=TestProjects/BatchRendererGroup_URP/test-results --compilation-errors-as-warnings --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-force-glcore" --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=./TestProjects/BatchRendererGroup_URP --zero-tests-are-ok=1 after: - command: pip3 install ant_instability_detection --index-url https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade || exit 0 - command: find_instabilities || exit 0 @@ -41,12 +41,12 @@ Universal_Hybrid_Linux_OpenGLCore_playmode_mono_Linear_trunk: logs: paths: - "**/test-results/**" - - "TestProjects/UniversalHybridTest/Logs/*.log" + - "TestProjects/BatchRendererGroup_URP/Logs/*.log" dependencies: - path: .yamato/_editor_priming.yml#editor:priming:trunk:Linux rerun: on_new_revision -Universal_Hybrid_Linux_OpenGLCore_playmode_mono_Linear_CUSTOM-REVISION: - name: Universal_Hybrid on Linux_OpenGLCore_playmode_mono_Linear on version CUSTOM-REVISION +Universal_BatchRendererGroup_Linux_OpenGLCore_playmode_mono_Linear_CUSTOM-REVISION: + name: Universal_BatchRendererGroup on Linux_OpenGLCore_playmode_mono_Linear on version CUSTOM-REVISION agent: type: Unity::VM::GPU image: package-ci/ubuntu:stable @@ -71,7 +71,7 @@ Universal_Hybrid_Linux_OpenGLCore_playmode_mono_Linear_CUSTOM-REVISION: retries: 2 - command: |5- export GIT_REVISIONDATE=`git rev-parse HEAD | git show -s --format=%cI` - DISPLAY=:0.0 ./utr $CACHE_ARGS --artifacts_path=TestProjects/UniversalHybridTest/test-results --compilation-errors-as-warnings --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-force-glcore" --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=./TestProjects/UniversalHybridTest --zero-tests-are-ok=1 + DISPLAY=:0.0 ./utr $CACHE_ARGS --artifacts_path=TestProjects/BatchRendererGroup_URP/test-results --compilation-errors-as-warnings --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-force-glcore" --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=./TestProjects/BatchRendererGroup_URP --zero-tests-are-ok=1 after: - command: pip3 install ant_instability_detection --index-url https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade || exit 0 - command: find_instabilities || exit 0 @@ -79,7 +79,7 @@ Universal_Hybrid_Linux_OpenGLCore_playmode_mono_Linear_CUSTOM-REVISION: logs: paths: - "**/test-results/**" - - "TestProjects/UniversalHybridTest/Logs/*.log" + - "TestProjects/BatchRendererGroup_URP/Logs/*.log" dependencies: - path: .yamato/_editor_priming.yml#editor:priming:CUSTOM-REVISION:Linux rerun: on_new_revision diff --git a/.yamato/hdrp_hybrid-linux-vulkan.yml b/.yamato/universal_batchrenderergroup-linux-vulkan.yml similarity index 71% rename from .yamato/hdrp_hybrid-linux-vulkan.yml rename to .yamato/universal_batchrenderergroup-linux-vulkan.yml index 5073560655c..ec718e29e60 100644 --- a/.yamato/hdrp_hybrid-linux-vulkan.yml +++ b/.yamato/universal_batchrenderergroup-linux-vulkan.yml @@ -7,8 +7,8 @@ --- -HDRP_Hybrid_Linux_Vulkan_playmode_mono_Linear_trunk: - name: HDRP_Hybrid on Linux_Vulkan_playmode_mono_Linear on version trunk +Universal_BatchRendererGroup_Linux_Vulkan_Standalone_mono_Linear_trunk: + name: Universal_BatchRendererGroup on Linux_Vulkan_Standalone_mono_Linear on version trunk agent: type: Unity::VM::GPU image: package-ci/ubuntu:stable @@ -23,17 +23,9 @@ HDRP_Hybrid_Linux_Vulkan_playmode_mono_Linear_trunk: - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr retries: 2 - command: chmod +x utr - - command: sudo rm -f /etc/apt/sources.list /etc/apt/sources.list.d/{nodesource,teamviewer,deadsnakes-ubuntu-ppa-}* - - command: curl -L https://artifactory.prd.it.unity3d.com/artifactory/api/gpg/key/public | sudo apt-key add - - - command: sudo sh -c "echo 'deb https://artifactory.prd.it.unity3d.com/artifactory/unity-apt-local bionic main' > /etc/apt/sources.list.d/unity.list" - - command: sudo apt update - - command: sudo apt install unity-downloader-cli - retries: 2 - - command: sudo unity-downloader-cli --source-file unity_revision.txt -c editor -c il2cpp --wait --published-only - retries: 2 - command: |5- export GIT_REVISIONDATE=`git rev-parse HEAD | git show -s --format=%cI` - DISPLAY=:0.0 ./utr $CACHE_ARGS --artifacts_path=TestProjects/HDRP_HybridTests/test-results --compilation-errors-as-warnings --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-force-vulkan" --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=./TestProjects/HDRP_HybridTests --zero-tests-are-ok=1 + DISPLAY=:0.0 ./utr --artifacts_path=TestProjects/BatchRendererGroup_URP/test-results --compilation-errors-as-warnings --platform=StandaloneLinux64 --player-connection-ip=auto --player-load-path=players --suite=playmode --timeout=1200 --zero-tests-are-ok=1 after: - command: pip3 install ant_instability_detection --index-url https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade || exit 0 - command: find_instabilities || exit 0 @@ -41,16 +33,18 @@ HDRP_Hybrid_Linux_Vulkan_playmode_mono_Linear_trunk: logs: paths: - "**/test-results/**" - - "TestProjects/HDRP_HybridTests/Logs/*.log" + - "TestProjects/BatchRendererGroup_URP/Logs/*.log" dependencies: - path: .yamato/_editor_priming.yml#editor:priming:trunk:Linux rerun: on_new_revision -HDRP_Hybrid_Linux_Vulkan_Standalone_mono_Linear_trunk: - name: HDRP_Hybrid on Linux_Vulkan_Standalone_mono_Linear on version trunk + - path: .yamato/universal_batchrenderergroup-linux-vulkan.yml#Build_Universal_BatchRendererGroup_Linux_Vulkan_Standalone_mono_Linear_trunk + rerun: on_new_revision +Build_Universal_BatchRendererGroup_Linux_Vulkan_Standalone_mono_Linear_trunk: + name: Build Universal_BatchRendererGroup on Linux_Vulkan_mono_Linear_Standalone_build_Player on version trunk agent: - type: Unity::VM::GPU + type: Unity::VM image: package-ci/ubuntu:stable - flavor: b1.large + flavor: b1.xlarge variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates CUSTOM_REVISION: '{{trunk.changeset.id}}' @@ -61,9 +55,17 @@ HDRP_Hybrid_Linux_Vulkan_Standalone_mono_Linear_trunk: - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr retries: 2 - command: chmod +x utr + - command: sudo rm -f /etc/apt/sources.list /etc/apt/sources.list.d/{nodesource,teamviewer,deadsnakes-ubuntu-ppa-}* + - command: curl -L https://artifactory.prd.it.unity3d.com/artifactory/api/gpg/key/public | sudo apt-key add - + - command: sudo sh -c "echo 'deb https://artifactory.prd.it.unity3d.com/artifactory/unity-apt-local bionic main' > /etc/apt/sources.list.d/unity.list" + - command: sudo apt update + - command: sudo apt install unity-downloader-cli + retries: 2 + - command: sudo unity-downloader-cli --source-file unity_revision.txt -c editor -c il2cpp --wait --published-only + retries: 2 - command: |5- export GIT_REVISIONDATE=`git rev-parse HEAD | git show -s --format=%cI` - DISPLAY=:0.0 ./utr --artifacts_path=TestProjects/HDRP_HybridTests/test-results --compilation-errors-as-warnings --platform=StandaloneLinux64 --player-connection-ip=auto --player-load-path=players --suite=playmode --timeout=1200 --zero-tests-are-ok=1 + DISPLAY=:0.0 ./utr $CACHE_ARGS --artifacts_path=TestProjects/BatchRendererGroup_URP/test-results --build-only --compilation-errors-as-warnings --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --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=./TestProjects/BatchRendererGroup_URP --timeout=1200 after: - command: pip3 install ant_instability_detection --index-url https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade || exit 0 - command: find_instabilities || exit 0 @@ -71,18 +73,19 @@ HDRP_Hybrid_Linux_Vulkan_Standalone_mono_Linear_trunk: logs: paths: - "**/test-results/**" - - "TestProjects/HDRP_HybridTests/Logs/*.log" + - "TestProjects/BatchRendererGroup_URP/Logs/*.log" + players: + paths: + - "players*/**" dependencies: - path: .yamato/_editor_priming.yml#editor:priming:trunk:Linux rerun: on_new_revision - - path: .yamato/hdrp_hybrid-linux-vulkan.yml#Build_HDRP_Hybrid_Linux_Vulkan_Standalone_mono_Linear_trunk - rerun: on_new_revision -Build_HDRP_Hybrid_Linux_Vulkan_Standalone_mono_Linear_trunk: - name: Build HDRP_Hybrid on Linux_Vulkan_mono_Linear_Standalone_build_Player on version trunk +Universal_BatchRendererGroup_Linux_Vulkan_playmode_mono_Linear_trunk: + name: Universal_BatchRendererGroup on Linux_Vulkan_playmode_mono_Linear on version trunk agent: - type: Unity::VM + type: Unity::VM::GPU image: package-ci/ubuntu:stable - flavor: b1.xlarge + flavor: b1.large variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates CUSTOM_REVISION: '{{trunk.changeset.id}}' @@ -103,7 +106,7 @@ Build_HDRP_Hybrid_Linux_Vulkan_Standalone_mono_Linear_trunk: retries: 2 - command: |5- export GIT_REVISIONDATE=`git rev-parse HEAD | git show -s --format=%cI` - DISPLAY=:0.0 ./utr $CACHE_ARGS --artifacts_path=TestProjects/HDRP_HybridTests/test-results --build-only --compilation-errors-as-warnings --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --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=./TestProjects/HDRP_HybridTests --timeout=1200 + DISPLAY=:0.0 ./utr $CACHE_ARGS --artifacts_path=TestProjects/BatchRendererGroup_URP/test-results --compilation-errors-as-warnings --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-force-vulkan" --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=./TestProjects/BatchRendererGroup_URP --zero-tests-are-ok=1 after: - command: pip3 install ant_instability_detection --index-url https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade || exit 0 - command: find_instabilities || exit 0 @@ -111,15 +114,12 @@ Build_HDRP_Hybrid_Linux_Vulkan_Standalone_mono_Linear_trunk: logs: paths: - "**/test-results/**" - - "TestProjects/HDRP_HybridTests/Logs/*.log" - players: - paths: - - "players*/**" + - "TestProjects/BatchRendererGroup_URP/Logs/*.log" dependencies: - path: .yamato/_editor_priming.yml#editor:priming:trunk:Linux rerun: on_new_revision -HDRP_Hybrid_Linux_Vulkan_playmode_mono_Linear_CUSTOM-REVISION: - name: HDRP_Hybrid on Linux_Vulkan_playmode_mono_Linear on version CUSTOM-REVISION +Universal_BatchRendererGroup_Linux_Vulkan_Standalone_mono_Linear_CUSTOM-REVISION: + name: Universal_BatchRendererGroup on Linux_Vulkan_Standalone_mono_Linear on version CUSTOM-REVISION agent: type: Unity::VM::GPU image: package-ci/ubuntu:stable @@ -134,17 +134,9 @@ HDRP_Hybrid_Linux_Vulkan_playmode_mono_Linear_CUSTOM-REVISION: - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr retries: 2 - command: chmod +x utr - - command: sudo rm -f /etc/apt/sources.list /etc/apt/sources.list.d/{nodesource,teamviewer,deadsnakes-ubuntu-ppa-}* - - command: curl -L https://artifactory.prd.it.unity3d.com/artifactory/api/gpg/key/public | sudo apt-key add - - - command: sudo sh -c "echo 'deb https://artifactory.prd.it.unity3d.com/artifactory/unity-apt-local bionic main' > /etc/apt/sources.list.d/unity.list" - - command: sudo apt update - - command: sudo apt install unity-downloader-cli - retries: 2 - - command: sudo unity-downloader-cli --source-file unity_revision.txt -c editor -c il2cpp --wait --published-only - retries: 2 - command: |5- export GIT_REVISIONDATE=`git rev-parse HEAD | git show -s --format=%cI` - DISPLAY=:0.0 ./utr $CACHE_ARGS --artifacts_path=TestProjects/HDRP_HybridTests/test-results --compilation-errors-as-warnings --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-force-vulkan" --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=./TestProjects/HDRP_HybridTests --zero-tests-are-ok=1 + DISPLAY=:0.0 ./utr --artifacts_path=TestProjects/BatchRendererGroup_URP/test-results --compilation-errors-as-warnings --platform=StandaloneLinux64 --player-connection-ip=auto --player-load-path=players --suite=playmode --timeout=1200 --zero-tests-are-ok=1 after: - command: pip3 install ant_instability_detection --index-url https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade || exit 0 - command: find_instabilities || exit 0 @@ -152,16 +144,18 @@ HDRP_Hybrid_Linux_Vulkan_playmode_mono_Linear_CUSTOM-REVISION: logs: paths: - "**/test-results/**" - - "TestProjects/HDRP_HybridTests/Logs/*.log" + - "TestProjects/BatchRendererGroup_URP/Logs/*.log" dependencies: - path: .yamato/_editor_priming.yml#editor:priming:CUSTOM-REVISION:Linux rerun: on_new_revision -HDRP_Hybrid_Linux_Vulkan_Standalone_mono_Linear_CUSTOM-REVISION: - name: HDRP_Hybrid on Linux_Vulkan_Standalone_mono_Linear on version CUSTOM-REVISION + - path: .yamato/universal_batchrenderergroup-linux-vulkan.yml#Build_Universal_BatchRendererGroup_Linux_Vulkan_Standalone_mono_Linear_CUSTOM-REVISION + rerun: on_new_revision +Build_Universal_BatchRendererGroup_Linux_Vulkan_Standalone_mono_Linear_CUSTOM-REVISION: + name: Build Universal_BatchRendererGroup on Linux_Vulkan_mono_Linear_Standalone_build_Player on version CUSTOM-REVISION agent: - type: Unity::VM::GPU + type: Unity::VM image: package-ci/ubuntu:stable - flavor: b1.large + flavor: b1.xlarge variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates CUSTOM_REVISION: custom_revision_not_set @@ -172,9 +166,17 @@ HDRP_Hybrid_Linux_Vulkan_Standalone_mono_Linear_CUSTOM-REVISION: - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr retries: 2 - command: chmod +x utr + - command: sudo rm -f /etc/apt/sources.list /etc/apt/sources.list.d/{nodesource,teamviewer,deadsnakes-ubuntu-ppa-}* + - command: curl -L https://artifactory.prd.it.unity3d.com/artifactory/api/gpg/key/public | sudo apt-key add - + - command: sudo sh -c "echo 'deb https://artifactory.prd.it.unity3d.com/artifactory/unity-apt-local bionic main' > /etc/apt/sources.list.d/unity.list" + - command: sudo apt update + - command: sudo apt install unity-downloader-cli + retries: 2 + - command: sudo unity-downloader-cli --source-file unity_revision.txt -c editor -c il2cpp --wait --published-only + retries: 2 - command: |5- export GIT_REVISIONDATE=`git rev-parse HEAD | git show -s --format=%cI` - DISPLAY=:0.0 ./utr --artifacts_path=TestProjects/HDRP_HybridTests/test-results --compilation-errors-as-warnings --platform=StandaloneLinux64 --player-connection-ip=auto --player-load-path=players --suite=playmode --timeout=1200 --zero-tests-are-ok=1 + DISPLAY=:0.0 ./utr $CACHE_ARGS --artifacts_path=TestProjects/BatchRendererGroup_URP/test-results --build-only --compilation-errors-as-warnings --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --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=./TestProjects/BatchRendererGroup_URP --timeout=1200 after: - command: pip3 install ant_instability_detection --index-url https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade || exit 0 - command: find_instabilities || exit 0 @@ -182,18 +184,19 @@ HDRP_Hybrid_Linux_Vulkan_Standalone_mono_Linear_CUSTOM-REVISION: logs: paths: - "**/test-results/**" - - "TestProjects/HDRP_HybridTests/Logs/*.log" + - "TestProjects/BatchRendererGroup_URP/Logs/*.log" + players: + paths: + - "players*/**" dependencies: - path: .yamato/_editor_priming.yml#editor:priming:CUSTOM-REVISION:Linux rerun: on_new_revision - - path: .yamato/hdrp_hybrid-linux-vulkan.yml#Build_HDRP_Hybrid_Linux_Vulkan_Standalone_mono_Linear_CUSTOM-REVISION - rerun: on_new_revision -Build_HDRP_Hybrid_Linux_Vulkan_Standalone_mono_Linear_CUSTOM-REVISION: - name: Build HDRP_Hybrid on Linux_Vulkan_mono_Linear_Standalone_build_Player on version CUSTOM-REVISION +Universal_BatchRendererGroup_Linux_Vulkan_playmode_mono_Linear_CUSTOM-REVISION: + name: Universal_BatchRendererGroup on Linux_Vulkan_playmode_mono_Linear on version CUSTOM-REVISION agent: - type: Unity::VM + type: Unity::VM::GPU image: package-ci/ubuntu:stable - flavor: b1.xlarge + flavor: b1.large variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates CUSTOM_REVISION: custom_revision_not_set @@ -214,7 +217,7 @@ Build_HDRP_Hybrid_Linux_Vulkan_Standalone_mono_Linear_CUSTOM-REVISION: retries: 2 - command: |5- export GIT_REVISIONDATE=`git rev-parse HEAD | git show -s --format=%cI` - DISPLAY=:0.0 ./utr $CACHE_ARGS --artifacts_path=TestProjects/HDRP_HybridTests/test-results --build-only --compilation-errors-as-warnings --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --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=./TestProjects/HDRP_HybridTests --timeout=1200 + DISPLAY=:0.0 ./utr $CACHE_ARGS --artifacts_path=TestProjects/BatchRendererGroup_URP/test-results --compilation-errors-as-warnings --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-force-vulkan" --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=./TestProjects/BatchRendererGroup_URP --zero-tests-are-ok=1 after: - command: pip3 install ant_instability_detection --index-url https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade || exit 0 - command: find_instabilities || exit 0 @@ -222,10 +225,7 @@ Build_HDRP_Hybrid_Linux_Vulkan_Standalone_mono_Linear_CUSTOM-REVISION: logs: paths: - "**/test-results/**" - - "TestProjects/HDRP_HybridTests/Logs/*.log" - players: - paths: - - "players*/**" + - "TestProjects/BatchRendererGroup_URP/Logs/*.log" dependencies: - path: .yamato/_editor_priming.yml#editor:priming:CUSTOM-REVISION:Linux rerun: on_new_revision diff --git a/.yamato/universal_hybrid-osx-metal.yml b/.yamato/universal_batchrenderergroup-osx-metal.yml similarity index 78% rename from .yamato/universal_hybrid-osx-metal.yml rename to .yamato/universal_batchrenderergroup-osx-metal.yml index 5977859b7ea..540947d0d3f 100644 --- a/.yamato/universal_hybrid-osx-metal.yml +++ b/.yamato/universal_batchrenderergroup-osx-metal.yml @@ -7,8 +7,8 @@ --- -Universal_Hybrid_OSX_Metal_Standalone_mono_Linear_trunk: - name: Universal_Hybrid on OSX_Metal_Standalone_mono_Linear on version trunk +Universal_BatchRendererGroup_OSX_Metal_Standalone_mono_Linear_trunk: + name: Universal_BatchRendererGroup on OSX_Metal_Standalone_mono_Linear on version trunk agent: type: Unity::metal::macmini image: slough-ops/macos-10.14-xcode:stable @@ -33,9 +33,9 @@ Universal_Hybrid_OSX_Metal_Standalone_mono_Linear_trunk: retries: 2 - command: |5- export GIT_REVISIONDATE=`git rev-parse HEAD | git show -s --format=%cI` - ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; GIT_BRANCH='$GIT_BRANCH' GIT_COMMIT_TIME='$GIT_COMMIT_TIME' GIT_REPOSITORY_URL='$GIT_REPOSITORY_URL' GIT_REVISION='$GIT_REVISION' YAMATO_JOBDEFINITION_FRIENDLY_NAME='$YAMATO_JOBDEFINITION_FRIENDLY_NAME' YAMATO_JOBDEFINITION_NAME='$YAMATO_JOBDEFINITION_NAME' YAMATO_JOB_ID='$YAMATO_JOB_ID' YAMATO_PROJECT_ID='$YAMATO_PROJECT_ID' YAMATO_PROJECT_NAME='$YAMATO_PROJECT_NAME' ~/Graphics/utr $CACHE_ARGS --artifacts_path=/Users/bokken/Graphics/TestProjects/UniversalHybridTest/test-results --compilation-errors-as-warnings --editor-location=.Editor --platform=StandaloneOSX --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=/Users/bokken/Graphics/TestProjects/UniversalHybridTest --timeout=2400 --zero-tests-are-ok=1 " + ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; GIT_BRANCH='$GIT_BRANCH' GIT_COMMIT_TIME='$GIT_COMMIT_TIME' GIT_REPOSITORY_URL='$GIT_REPOSITORY_URL' GIT_REVISION='$GIT_REVISION' YAMATO_JOBDEFINITION_FRIENDLY_NAME='$YAMATO_JOBDEFINITION_FRIENDLY_NAME' YAMATO_JOBDEFINITION_NAME='$YAMATO_JOBDEFINITION_NAME' YAMATO_JOB_ID='$YAMATO_JOB_ID' YAMATO_PROJECT_ID='$YAMATO_PROJECT_ID' YAMATO_PROJECT_NAME='$YAMATO_PROJECT_NAME' ~/Graphics/utr $CACHE_ARGS --artifacts_path=/Users/bokken/Graphics/TestProjects/BatchRendererGroup_URP/test-results --compilation-errors-as-warnings --editor-location=.Editor --platform=StandaloneOSX --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=/Users/bokken/Graphics/TestProjects/BatchRendererGroup_URP --timeout=2400 --zero-tests-are-ok=1 " UTR_RESULT=$? - scp -i ~/.ssh/id_rsa_macmini -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/UniversalHybridTest/test-results/ TestProjects/UniversalHybridTest + scp -i ~/.ssh/id_rsa_macmini -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/BatchRendererGroup_URP/test-results/ TestProjects/BatchRendererGroup_URP exit $UTR_RESULT after: - command: pip3 install requests ant_instability_detection --index-url https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade || exit 0 @@ -44,12 +44,12 @@ Universal_Hybrid_OSX_Metal_Standalone_mono_Linear_trunk: logs: paths: - "**/test-results/**" - - "TestProjects/UniversalHybridTest/Logs/*.log" + - "TestProjects/BatchRendererGroup_URP/Logs/*.log" dependencies: - path: .yamato/_editor_priming.yml#editor:priming:trunk:OSX rerun: on_new_revision -Universal_Hybrid_OSX_Metal_playmode_mono_Linear_trunk: - name: Universal_Hybrid on OSX_Metal_playmode_mono_Linear on version trunk +Universal_BatchRendererGroup_OSX_Metal_playmode_mono_Linear_trunk: + name: Universal_BatchRendererGroup on OSX_Metal_playmode_mono_Linear on version trunk agent: type: Unity::metal::macmini image: slough-ops/macos-10.14-xcode:stable @@ -74,9 +74,9 @@ Universal_Hybrid_OSX_Metal_playmode_mono_Linear_trunk: retries: 2 - command: |5- export GIT_REVISIONDATE=`git rev-parse HEAD | git show -s --format=%cI` - ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; GIT_BRANCH='$GIT_BRANCH' GIT_COMMIT_TIME='$GIT_COMMIT_TIME' GIT_REPOSITORY_URL='$GIT_REPOSITORY_URL' GIT_REVISION='$GIT_REVISION' YAMATO_JOBDEFINITION_FRIENDLY_NAME='$YAMATO_JOBDEFINITION_FRIENDLY_NAME' YAMATO_JOBDEFINITION_NAME='$YAMATO_JOBDEFINITION_NAME' YAMATO_JOB_ID='$YAMATO_JOB_ID' YAMATO_PROJECT_ID='$YAMATO_PROJECT_ID' YAMATO_PROJECT_NAME='$YAMATO_PROJECT_NAME' ~/Graphics/utr $CACHE_ARGS --artifacts_path=/Users/bokken/Graphics/TestProjects/UniversalHybridTest/test-results --compilation-errors-as-warnings --editor-location=/Users/bokken/.Editor --extra-editor-arg="-colorspace=Linear" --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 bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; GIT_BRANCH='$GIT_BRANCH' GIT_COMMIT_TIME='$GIT_COMMIT_TIME' GIT_REPOSITORY_URL='$GIT_REPOSITORY_URL' GIT_REVISION='$GIT_REVISION' YAMATO_JOBDEFINITION_FRIENDLY_NAME='$YAMATO_JOBDEFINITION_FRIENDLY_NAME' YAMATO_JOBDEFINITION_NAME='$YAMATO_JOBDEFINITION_NAME' YAMATO_JOB_ID='$YAMATO_JOB_ID' YAMATO_PROJECT_ID='$YAMATO_PROJECT_ID' YAMATO_PROJECT_NAME='$YAMATO_PROJECT_NAME' ~/Graphics/utr $CACHE_ARGS --artifacts_path=/Users/bokken/Graphics/TestProjects/BatchRendererGroup_URP/test-results --compilation-errors-as-warnings --editor-location=/Users/bokken/.Editor --extra-editor-arg="-colorspace=Linear" --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=/Users/bokken/Graphics/TestProjects/BatchRendererGroup_URP --zero-tests-are-ok=1 " UTR_RESULT=$? - scp -i ~/.ssh/id_rsa_macmini -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/UniversalHybridTest/test-results/ TestProjects/UniversalHybridTest + scp -i ~/.ssh/id_rsa_macmini -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/BatchRendererGroup_URP/test-results/ TestProjects/BatchRendererGroup_URP exit $UTR_RESULT after: - command: pip3 install requests ant_instability_detection --index-url https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade || exit 0 @@ -85,12 +85,12 @@ Universal_Hybrid_OSX_Metal_playmode_mono_Linear_trunk: logs: paths: - "**/test-results/**" - - "TestProjects/UniversalHybridTest/Logs/*.log" + - "TestProjects/BatchRendererGroup_URP/Logs/*.log" dependencies: - path: .yamato/_editor_priming.yml#editor:priming:trunk:OSX rerun: on_new_revision -Universal_Hybrid_OSX_Metal_Standalone_mono_Linear_CUSTOM-REVISION: - name: Universal_Hybrid on OSX_Metal_Standalone_mono_Linear on version CUSTOM-REVISION +Universal_BatchRendererGroup_OSX_Metal_Standalone_mono_Linear_CUSTOM-REVISION: + name: Universal_BatchRendererGroup on OSX_Metal_Standalone_mono_Linear on version CUSTOM-REVISION agent: type: Unity::metal::macmini image: slough-ops/macos-10.14-xcode:stable @@ -115,9 +115,9 @@ Universal_Hybrid_OSX_Metal_Standalone_mono_Linear_CUSTOM-REVISION: retries: 2 - command: |5- export GIT_REVISIONDATE=`git rev-parse HEAD | git show -s --format=%cI` - ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; GIT_BRANCH='$GIT_BRANCH' GIT_COMMIT_TIME='$GIT_COMMIT_TIME' GIT_REPOSITORY_URL='$GIT_REPOSITORY_URL' GIT_REVISION='$GIT_REVISION' YAMATO_JOBDEFINITION_FRIENDLY_NAME='$YAMATO_JOBDEFINITION_FRIENDLY_NAME' YAMATO_JOBDEFINITION_NAME='$YAMATO_JOBDEFINITION_NAME' YAMATO_JOB_ID='$YAMATO_JOB_ID' YAMATO_PROJECT_ID='$YAMATO_PROJECT_ID' YAMATO_PROJECT_NAME='$YAMATO_PROJECT_NAME' ~/Graphics/utr $CACHE_ARGS --artifacts_path=/Users/bokken/Graphics/TestProjects/UniversalHybridTest/test-results --compilation-errors-as-warnings --editor-location=.Editor --platform=StandaloneOSX --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=/Users/bokken/Graphics/TestProjects/UniversalHybridTest --timeout=2400 --zero-tests-are-ok=1 " + ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; GIT_BRANCH='$GIT_BRANCH' GIT_COMMIT_TIME='$GIT_COMMIT_TIME' GIT_REPOSITORY_URL='$GIT_REPOSITORY_URL' GIT_REVISION='$GIT_REVISION' YAMATO_JOBDEFINITION_FRIENDLY_NAME='$YAMATO_JOBDEFINITION_FRIENDLY_NAME' YAMATO_JOBDEFINITION_NAME='$YAMATO_JOBDEFINITION_NAME' YAMATO_JOB_ID='$YAMATO_JOB_ID' YAMATO_PROJECT_ID='$YAMATO_PROJECT_ID' YAMATO_PROJECT_NAME='$YAMATO_PROJECT_NAME' ~/Graphics/utr $CACHE_ARGS --artifacts_path=/Users/bokken/Graphics/TestProjects/BatchRendererGroup_URP/test-results --compilation-errors-as-warnings --editor-location=.Editor --platform=StandaloneOSX --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=/Users/bokken/Graphics/TestProjects/BatchRendererGroup_URP --timeout=2400 --zero-tests-are-ok=1 " UTR_RESULT=$? - scp -i ~/.ssh/id_rsa_macmini -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/UniversalHybridTest/test-results/ TestProjects/UniversalHybridTest + scp -i ~/.ssh/id_rsa_macmini -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/BatchRendererGroup_URP/test-results/ TestProjects/BatchRendererGroup_URP exit $UTR_RESULT after: - command: pip3 install requests ant_instability_detection --index-url https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade || exit 0 @@ -126,12 +126,12 @@ Universal_Hybrid_OSX_Metal_Standalone_mono_Linear_CUSTOM-REVISION: logs: paths: - "**/test-results/**" - - "TestProjects/UniversalHybridTest/Logs/*.log" + - "TestProjects/BatchRendererGroup_URP/Logs/*.log" dependencies: - path: .yamato/_editor_priming.yml#editor:priming:CUSTOM-REVISION:OSX rerun: on_new_revision -Universal_Hybrid_OSX_Metal_playmode_mono_Linear_CUSTOM-REVISION: - name: Universal_Hybrid on OSX_Metal_playmode_mono_Linear on version CUSTOM-REVISION +Universal_BatchRendererGroup_OSX_Metal_playmode_mono_Linear_CUSTOM-REVISION: + name: Universal_BatchRendererGroup on OSX_Metal_playmode_mono_Linear on version CUSTOM-REVISION agent: type: Unity::metal::macmini image: slough-ops/macos-10.14-xcode:stable @@ -156,9 +156,9 @@ Universal_Hybrid_OSX_Metal_playmode_mono_Linear_CUSTOM-REVISION: retries: 2 - command: |5- export GIT_REVISIONDATE=`git rev-parse HEAD | git show -s --format=%cI` - ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; GIT_BRANCH='$GIT_BRANCH' GIT_COMMIT_TIME='$GIT_COMMIT_TIME' GIT_REPOSITORY_URL='$GIT_REPOSITORY_URL' GIT_REVISION='$GIT_REVISION' YAMATO_JOBDEFINITION_FRIENDLY_NAME='$YAMATO_JOBDEFINITION_FRIENDLY_NAME' YAMATO_JOBDEFINITION_NAME='$YAMATO_JOBDEFINITION_NAME' YAMATO_JOB_ID='$YAMATO_JOB_ID' YAMATO_PROJECT_ID='$YAMATO_PROJECT_ID' YAMATO_PROJECT_NAME='$YAMATO_PROJECT_NAME' ~/Graphics/utr $CACHE_ARGS --artifacts_path=/Users/bokken/Graphics/TestProjects/UniversalHybridTest/test-results --compilation-errors-as-warnings --editor-location=/Users/bokken/.Editor --extra-editor-arg="-colorspace=Linear" --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 bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; GIT_BRANCH='$GIT_BRANCH' GIT_COMMIT_TIME='$GIT_COMMIT_TIME' GIT_REPOSITORY_URL='$GIT_REPOSITORY_URL' GIT_REVISION='$GIT_REVISION' YAMATO_JOBDEFINITION_FRIENDLY_NAME='$YAMATO_JOBDEFINITION_FRIENDLY_NAME' YAMATO_JOBDEFINITION_NAME='$YAMATO_JOBDEFINITION_NAME' YAMATO_JOB_ID='$YAMATO_JOB_ID' YAMATO_PROJECT_ID='$YAMATO_PROJECT_ID' YAMATO_PROJECT_NAME='$YAMATO_PROJECT_NAME' ~/Graphics/utr $CACHE_ARGS --artifacts_path=/Users/bokken/Graphics/TestProjects/BatchRendererGroup_URP/test-results --compilation-errors-as-warnings --editor-location=/Users/bokken/.Editor --extra-editor-arg="-colorspace=Linear" --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=/Users/bokken/Graphics/TestProjects/BatchRendererGroup_URP --zero-tests-are-ok=1 " UTR_RESULT=$? - scp -i ~/.ssh/id_rsa_macmini -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/UniversalHybridTest/test-results/ TestProjects/UniversalHybridTest + scp -i ~/.ssh/id_rsa_macmini -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/BatchRendererGroup_URP/test-results/ TestProjects/BatchRendererGroup_URP exit $UTR_RESULT after: - command: pip3 install requests ant_instability_detection --index-url https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade || exit 0 @@ -167,7 +167,7 @@ Universal_Hybrid_OSX_Metal_playmode_mono_Linear_CUSTOM-REVISION: logs: paths: - "**/test-results/**" - - "TestProjects/UniversalHybridTest/Logs/*.log" + - "TestProjects/BatchRendererGroup_URP/Logs/*.log" dependencies: - path: .yamato/_editor_priming.yml#editor:priming:CUSTOM-REVISION:OSX rerun: on_new_revision diff --git a/.yamato/universal_hybrid-win-vulkan.yml b/.yamato/universal_batchrenderergroup-win-dx11.yml similarity index 65% rename from .yamato/universal_hybrid-win-vulkan.yml rename to .yamato/universal_batchrenderergroup-win-dx11.yml index 0e08bf2b5c6..d29fdfe7688 100644 --- a/.yamato/universal_hybrid-win-vulkan.yml +++ b/.yamato/universal_batchrenderergroup-win-dx11.yml @@ -7,8 +7,8 @@ --- -Universal_Hybrid_Win_Vulkan_Standalone_mono_Linear_trunk: - name: Universal_Hybrid on Win_Vulkan_Standalone_mono_Linear on version trunk +Universal_BatchRendererGroup_Win_DX11_Standalone_mono_Linear_trunk: + name: Universal_BatchRendererGroup on Win_DX11_Standalone_mono_Linear on version trunk agent: type: Unity::VM::GPU image: sdet/gamecode_win10:stable @@ -28,19 +28,19 @@ Universal_Hybrid_Win_Vulkan_Standalone_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= planes; [ReadOnly] @@ -160,7 +161,7 @@ public void Execute(int index) for (int i = start; i < end; i++) { ulong bit = FrustumPlanes.Intersect2NoPartial(planes, renderers[i].bounds) == FrustumPlanes.IntersectResult.In ? 1ul : 0ul; - visibleBits |= bit << (i-start); + visibleBits |= bit << (i - start); } rendererVisibility[index] = visibleBits; @@ -340,9 +341,13 @@ public JobHandle OnPerformCulling(BatchRendererGroup rendererGroup, BatchCulling return jobHandleOutput; } +#if UNITY_EDITOR public static Material LoadPickingMaterial() { Shader shader = Shader.Find("Hidden/HDRP/BRGPicking"); + + if (shader == null) return null; + Material material = new Material(shader); // Prevent Material unloading when switching scene @@ -352,14 +357,18 @@ public static Material LoadPickingMaterial() } Material m_pickingMaterial; +#endif + // Start is called before the first frame update void Start() { m_BatchRendererGroup = new BatchRendererGroup(this.OnPerformCulling, IntPtr.Zero); +#if UNITY_EDITOR m_pickingMaterial = LoadPickingMaterial(); m_BatchRendererGroup.SetPickingMaterial(m_pickingMaterial); +#endif // Create a batch... var renderers = FindObjectsOfType(); @@ -628,7 +637,9 @@ private void OnDestroy() m_instanceIndices.Dispose(); m_drawIndices.Dispose(); +#if UNITY_EDITOR DestroyImmediate(m_pickingMaterial); +#endif } } } diff --git a/TestProjects/HDRP_HybridTests/Assets/SampleScenes/BRGGameObjects/RenderBRG.cs.meta b/TestProjects/BatchRendererGroup_HDRP/Assets/SampleScenes/BRGGameObjects/RenderBRG.cs.meta similarity index 100% rename from TestProjects/HDRP_HybridTests/Assets/SampleScenes/BRGGameObjects/RenderBRG.cs.meta rename to TestProjects/BatchRendererGroup_HDRP/Assets/SampleScenes/BRGGameObjects/RenderBRG.cs.meta diff --git a/TestProjects/HDRP_HybridTests/Assets/SampleScenes/BRGGameObjects/Unlit.mat b/TestProjects/BatchRendererGroup_HDRP/Assets/SampleScenes/BRGGameObjects/Unlit.mat similarity index 100% rename from TestProjects/HDRP_HybridTests/Assets/SampleScenes/BRGGameObjects/Unlit.mat rename to TestProjects/BatchRendererGroup_HDRP/Assets/SampleScenes/BRGGameObjects/Unlit.mat diff --git a/TestProjects/HDRP_HybridTests/Assets/SampleScenes/BRGGameObjects/Unlit.mat.meta b/TestProjects/BatchRendererGroup_HDRP/Assets/SampleScenes/BRGGameObjects/Unlit.mat.meta similarity index 100% rename from TestProjects/HDRP_HybridTests/Assets/SampleScenes/BRGGameObjects/Unlit.mat.meta rename to TestProjects/BatchRendererGroup_HDRP/Assets/SampleScenes/BRGGameObjects/Unlit.mat.meta diff --git a/TestProjects/HDRP_HybridTests/Assets/SampleScenes/BRGGameObjects/brick.jpg b/TestProjects/BatchRendererGroup_HDRP/Assets/SampleScenes/BRGGameObjects/brick.jpg similarity index 100% rename from TestProjects/HDRP_HybridTests/Assets/SampleScenes/BRGGameObjects/brick.jpg rename to TestProjects/BatchRendererGroup_HDRP/Assets/SampleScenes/BRGGameObjects/brick.jpg diff --git a/TestProjects/HDRP_HybridTests/Assets/SampleScenes/BRGGameObjects/brick.jpg.meta b/TestProjects/BatchRendererGroup_HDRP/Assets/SampleScenes/BRGGameObjects/brick.jpg.meta similarity index 100% rename from TestProjects/HDRP_HybridTests/Assets/SampleScenes/BRGGameObjects/brick.jpg.meta rename to TestProjects/BatchRendererGroup_HDRP/Assets/SampleScenes/BRGGameObjects/brick.jpg.meta diff --git a/TestProjects/HDRP_HybridTests/Assets/SampleScenes/BatchRenderGroupRaw.meta b/TestProjects/BatchRendererGroup_HDRP/Assets/SampleScenes/BatchRenderGroupRaw.meta similarity index 100% rename from TestProjects/HDRP_HybridTests/Assets/SampleScenes/BatchRenderGroupRaw.meta rename to TestProjects/BatchRendererGroup_HDRP/Assets/SampleScenes/BatchRenderGroupRaw.meta diff --git a/TestProjects/HDRP_HybridTests/Assets/SampleScenes/BatchRenderGroupRaw/BRGMaterial.mat b/TestProjects/BatchRendererGroup_HDRP/Assets/SampleScenes/BatchRenderGroupRaw/BRGMaterial.mat similarity index 100% rename from TestProjects/HDRP_HybridTests/Assets/SampleScenes/BatchRenderGroupRaw/BRGMaterial.mat rename to TestProjects/BatchRendererGroup_HDRP/Assets/SampleScenes/BatchRenderGroupRaw/BRGMaterial.mat diff --git a/TestProjects/HDRP_HybridTests/Assets/SampleScenes/BatchRenderGroupRaw/BRGMaterial.mat.meta b/TestProjects/BatchRendererGroup_HDRP/Assets/SampleScenes/BatchRenderGroupRaw/BRGMaterial.mat.meta similarity index 100% rename from TestProjects/HDRP_HybridTests/Assets/SampleScenes/BatchRenderGroupRaw/BRGMaterial.mat.meta rename to TestProjects/BatchRendererGroup_HDRP/Assets/SampleScenes/BatchRenderGroupRaw/BRGMaterial.mat.meta diff --git a/TestProjects/UniversalHybridTest/Assets/SampleScenes/BatchRenderGroupRaw/BRGSetup.cs b/TestProjects/BatchRendererGroup_HDRP/Assets/SampleScenes/BatchRenderGroupRaw/BRGSetup.cs similarity index 96% rename from TestProjects/UniversalHybridTest/Assets/SampleScenes/BatchRenderGroupRaw/BRGSetup.cs rename to TestProjects/BatchRendererGroup_HDRP/Assets/SampleScenes/BatchRenderGroupRaw/BRGSetup.cs index a3d62d2bc40..d2e552d078a 100644 --- a/TestProjects/UniversalHybridTest/Assets/SampleScenes/BatchRenderGroupRaw/BRGSetup.cs +++ b/TestProjects/BatchRendererGroup_HDRP/Assets/SampleScenes/BatchRenderGroupRaw/BRGSetup.cs @@ -87,14 +87,14 @@ public JobHandle OnPerformCulling(BatchRendererGroup rendererGroup, BatchCulling for (int i = 0; i < itemGridSize; i++) { bool visible = true; - if ( m_cullTest ) + if (m_cullTest) { int dist = (r - itemGridSize / 2) * (r - itemGridSize / 2) + (i - itemGridSize / 2) * (i - itemGridSize / 2); - if ((dist >= radiusI) && ( dist <= radiusO)) + if ((dist >= radiusI) && (dist <= radiusO)) visible = false; } - if ( visible ) + if (visible) drawCommands.visibleInstances[n++] = r * itemGridSize + i; } } @@ -143,7 +143,7 @@ void Start() int objectToWorldID = Shader.PropertyToID("unity_ObjectToWorld"); int matrixPreviousMID = Shader.PropertyToID("unity_MatrixPreviousM"); -// int worldToObjectID = Shader.PropertyToID("unity_WorldToObject"); + // int worldToObjectID = Shader.PropertyToID("unity_WorldToObject"); int colorID = Shader.PropertyToID("_BaseColor"); // Generate a grid of objects... @@ -183,10 +183,11 @@ void Start() // Register batch m_batchID = m_BatchRendererGroup.AddBatch(batchMetadata, m_GPUPersistentInstanceData.bufferHandle); + m_initialized = true; } - void UpdatePositions(Vector3 pos) + void UpdatePositions(Vector3 pos) { int itemCountOffset = itemGridSize * itemGridSize * 3; // 3 float4 per matrix for (int z = 0; z < itemGridSize; z++) @@ -205,7 +206,7 @@ void UpdatePositions(Vector3 pos) // compute the new current frame matrix m_sysmemBuffer[i * 3 + 0] = new Vector4(1, 0, 0, 0); // hacky float3x4 layout m_sysmemBuffer[i * 3 + 1] = new Vector4(1, 0, 0, 0); - m_sysmemBuffer[i * 3 + 2] = new Vector4(1, px + pos.x, pos.y, pz+pos.z); + m_sysmemBuffer[i * 3 + 2] = new Vector4(1, px + pos.x, pos.y, pz + pos.z); } } @@ -217,7 +218,7 @@ void Update() { m_phase += Time.fixedDeltaTime * m_motionSpeed; - if ( m_motionAmplitude > 0.0f ) + if (m_motionAmplitude > 0.0f) { Vector3 pos = new Vector3(0, 0, Mathf.Cos(m_phase) * m_motionAmplitude); UpdatePositions(pos + m_center); diff --git a/TestProjects/HDRP_HybridTests/Assets/SampleScenes/BatchRenderGroupRaw/BRGSetup.cs.meta b/TestProjects/BatchRendererGroup_HDRP/Assets/SampleScenes/BatchRenderGroupRaw/BRGSetup.cs.meta similarity index 100% rename from TestProjects/HDRP_HybridTests/Assets/SampleScenes/BatchRenderGroupRaw/BRGSetup.cs.meta rename to TestProjects/BatchRendererGroup_HDRP/Assets/SampleScenes/BatchRenderGroupRaw/BRGSetup.cs.meta diff --git a/TestProjects/HDRP_HybridTests/Assets/SampleScenes/BatchRenderGroupRaw/BatchRenderGroupRaw.meta b/TestProjects/BatchRendererGroup_HDRP/Assets/SampleScenes/BatchRenderGroupRaw/BatchRenderGroupRaw.meta similarity index 100% rename from TestProjects/HDRP_HybridTests/Assets/SampleScenes/BatchRenderGroupRaw/BatchRenderGroupRaw.meta rename to TestProjects/BatchRendererGroup_HDRP/Assets/SampleScenes/BatchRenderGroupRaw/BatchRenderGroupRaw.meta diff --git a/TestProjects/HDRP_HybridTests/Assets/SampleScenes/BatchRenderGroupRaw/BatchRenderGroupRaw.unity b/TestProjects/BatchRendererGroup_HDRP/Assets/SampleScenes/BatchRenderGroupRaw/BatchRenderGroupRaw.unity similarity index 100% rename from TestProjects/HDRP_HybridTests/Assets/SampleScenes/BatchRenderGroupRaw/BatchRenderGroupRaw.unity rename to TestProjects/BatchRendererGroup_HDRP/Assets/SampleScenes/BatchRenderGroupRaw/BatchRenderGroupRaw.unity diff --git a/TestProjects/HDRP_HybridTests/Assets/SampleScenes/BatchRenderGroupRaw/BatchRenderGroupRaw.unity.meta b/TestProjects/BatchRendererGroup_HDRP/Assets/SampleScenes/BatchRenderGroupRaw/BatchRenderGroupRaw.unity.meta similarity index 100% rename from TestProjects/HDRP_HybridTests/Assets/SampleScenes/BatchRenderGroupRaw/BatchRenderGroupRaw.unity.meta rename to TestProjects/BatchRendererGroup_HDRP/Assets/SampleScenes/BatchRenderGroupRaw/BatchRenderGroupRaw.unity.meta diff --git a/TestProjects/HDRP_HybridTests/Assets/SampleScenes/BatchRenderGroupRaw/BatchRenderGroupRaw/Global Volume Profile.asset b/TestProjects/BatchRendererGroup_HDRP/Assets/SampleScenes/BatchRenderGroupRaw/BatchRenderGroupRaw/Global Volume Profile.asset similarity index 100% rename from TestProjects/HDRP_HybridTests/Assets/SampleScenes/BatchRenderGroupRaw/BatchRenderGroupRaw/Global Volume Profile.asset rename to TestProjects/BatchRendererGroup_HDRP/Assets/SampleScenes/BatchRenderGroupRaw/BatchRenderGroupRaw/Global Volume Profile.asset diff --git a/TestProjects/HDRP_HybridTests/Assets/SampleScenes/BatchRenderGroupRaw/BatchRenderGroupRaw/Global Volume Profile.asset.meta b/TestProjects/BatchRendererGroup_HDRP/Assets/SampleScenes/BatchRenderGroupRaw/BatchRenderGroupRaw/Global Volume Profile.asset.meta similarity index 100% rename from TestProjects/HDRP_HybridTests/Assets/SampleScenes/BatchRenderGroupRaw/BatchRenderGroupRaw/Global Volume Profile.asset.meta rename to TestProjects/BatchRendererGroup_HDRP/Assets/SampleScenes/BatchRenderGroupRaw/BatchRenderGroupRaw/Global Volume Profile.asset.meta diff --git a/TestProjects/HDRP_HybridTests/Assets/Tests.meta b/TestProjects/BatchRendererGroup_HDRP/Assets/Tests.meta similarity index 100% rename from TestProjects/HDRP_HybridTests/Assets/Tests.meta rename to TestProjects/BatchRendererGroup_HDRP/Assets/Tests.meta diff --git a/TestProjects/HDRP_HybridTests/Assets/Tests/Editor.meta b/TestProjects/BatchRendererGroup_HDRP/Assets/Tests/Editor.meta similarity index 100% rename from TestProjects/HDRP_HybridTests/Assets/Tests/Editor.meta rename to TestProjects/BatchRendererGroup_HDRP/Assets/Tests/Editor.meta diff --git a/TestProjects/HDRP_HybridTests/Assets/Tests/Editor/SetupGraphicsTestCases.cs b/TestProjects/BatchRendererGroup_HDRP/Assets/Tests/Editor/SetupGraphicsTestCases.cs similarity index 100% rename from TestProjects/HDRP_HybridTests/Assets/Tests/Editor/SetupGraphicsTestCases.cs rename to TestProjects/BatchRendererGroup_HDRP/Assets/Tests/Editor/SetupGraphicsTestCases.cs diff --git a/TestProjects/HDRP_HybridTests/Assets/Tests/Editor/SetupGraphicsTestCases.cs.meta b/TestProjects/BatchRendererGroup_HDRP/Assets/Tests/Editor/SetupGraphicsTestCases.cs.meta similarity index 100% rename from TestProjects/HDRP_HybridTests/Assets/Tests/Editor/SetupGraphicsTestCases.cs.meta rename to TestProjects/BatchRendererGroup_HDRP/Assets/Tests/Editor/SetupGraphicsTestCases.cs.meta diff --git a/TestProjects/UniversalHybridTest/Assets/Tests/Editor/SetupProject.cs b/TestProjects/BatchRendererGroup_HDRP/Assets/Tests/Editor/SetupProject.cs similarity index 90% rename from TestProjects/UniversalHybridTest/Assets/Tests/Editor/SetupProject.cs rename to TestProjects/BatchRendererGroup_HDRP/Assets/Tests/Editor/SetupProject.cs index 0957cb28e6b..fbf5425a987 100644 --- a/TestProjects/UniversalHybridTest/Assets/Tests/Editor/SetupProject.cs +++ b/TestProjects/BatchRendererGroup_HDRP/Assets/Tests/Editor/SetupProject.cs @@ -1,4 +1,4 @@ -//This script is copied from UniversalRP TestProject +//This script is copied from UniversalRP TestProject // https://github.com/Unity-Technologies/ScriptableRenderPipeline/blob/master/TestProjects/UniversalGraphicsTest/Assets/Test/Editor/SetupProject.cs using System; @@ -13,7 +13,7 @@ public static class SetupProject { public static void ApplySettings() { - #if UNITY_EDITOR +#if UNITY_EDITOR var options = new Dictionary { { "gamma", () => PlayerSettings.colorSpace = ColorSpace.Gamma }, @@ -31,14 +31,14 @@ public static void ApplySettings() if (options.TryGetValue(arg, out action)) action(); } - #endif +#endif } static void SetGraphicsAPI(GraphicsDeviceType api) { - #if UNITY_EDITOR +#if UNITY_EDITOR var currentTarget = EditorUserBuildSettings.activeBuildTarget; PlayerSettings.SetGraphicsAPIs(currentTarget, new [] { api } ); - #endif +#endif } } diff --git a/TestProjects/HDRP_HybridTests/Assets/Tests/Editor/SetupProject.cs.meta b/TestProjects/BatchRendererGroup_HDRP/Assets/Tests/Editor/SetupProject.cs.meta similarity index 100% rename from TestProjects/HDRP_HybridTests/Assets/Tests/Editor/SetupProject.cs.meta rename to TestProjects/BatchRendererGroup_HDRP/Assets/Tests/Editor/SetupProject.cs.meta diff --git a/TestProjects/HDRP_HybridTests/Assets/Tests/Editor/TestEditor.asmdef b/TestProjects/BatchRendererGroup_HDRP/Assets/Tests/Editor/TestEditor.asmdef similarity index 100% rename from TestProjects/HDRP_HybridTests/Assets/Tests/Editor/TestEditor.asmdef rename to TestProjects/BatchRendererGroup_HDRP/Assets/Tests/Editor/TestEditor.asmdef diff --git a/TestProjects/HDRP_HybridTests/Assets/Tests/Editor/TestEditor.asmdef.meta b/TestProjects/BatchRendererGroup_HDRP/Assets/Tests/Editor/TestEditor.asmdef.meta similarity index 100% rename from TestProjects/HDRP_HybridTests/Assets/Tests/Editor/TestEditor.asmdef.meta rename to TestProjects/BatchRendererGroup_HDRP/Assets/Tests/Editor/TestEditor.asmdef.meta diff --git a/TestProjects/HDRP_HybridTests/Assets/Tests/Runtime.meta b/TestProjects/BatchRendererGroup_HDRP/Assets/Tests/Runtime.meta similarity index 100% rename from TestProjects/HDRP_HybridTests/Assets/Tests/Runtime.meta rename to TestProjects/BatchRendererGroup_HDRP/Assets/Tests/Runtime.meta diff --git a/TestProjects/HDRP_HybridTests/Assets/Tests/Runtime/GraphicsTestFix.cs b/TestProjects/BatchRendererGroup_HDRP/Assets/Tests/Runtime/GraphicsTestFix.cs similarity index 66% rename from TestProjects/HDRP_HybridTests/Assets/Tests/Runtime/GraphicsTestFix.cs rename to TestProjects/BatchRendererGroup_HDRP/Assets/Tests/Runtime/GraphicsTestFix.cs index 42a335bad2e..c7c6ac15b46 100644 --- a/TestProjects/HDRP_HybridTests/Assets/Tests/Runtime/GraphicsTestFix.cs +++ b/TestProjects/BatchRendererGroup_HDRP/Assets/Tests/Runtime/GraphicsTestFix.cs @@ -1,4 +1,4 @@ -//This is for fixing yamato standalone test. Attach this component to MainCamera if standalone test is fine when you run locally but fails on yamato (sub-scene objects are not rendering / not stable) +//This is for fixing yamato standalone test. Attach this component to MainCamera if standalone test is fine when you run locally but fails on yamato (sub-scene objects are not rendering / not stable) using System.Collections; using System.Collections.Generic; using UnityEngine; @@ -6,7 +6,7 @@ public class GraphicsTestFix : MonoBehaviour { - #if !UNITY_EDITOR //wrapper so that it runs on player only +#if !UNITY_EDITOR //wrapper so that it runs on player only private GraphicsTestSettingsCustom settings; private Camera cam; @@ -22,15 +22,15 @@ void Start() void Update() { - if(count == settings.WaitFrames -3) + if (count == settings.WaitFrames - 3) { - Debug.Log(count+" GraphicsTestFix - start callback"); + Debug.Log(count + " GraphicsTestFix - start callback"); RenderPipelineManager.endFrameRendering += MyRenderFrame; } count++; } - - private void MyRenderFrame(ScriptableRenderContext context,Camera[] cameras) + + private void MyRenderFrame(ScriptableRenderContext context, Camera[] cameras) { //Make a capture when reached correct frame if (texture == null) @@ -38,16 +38,16 @@ private void MyRenderFrame(ScriptableRenderContext context,Camera[] cameras) texture = new Texture2D(cam.pixelWidth, cam.pixelHeight, TextureFormat.RGB24, false); texture.ReadPixels(new Rect(0, 0, texture.width, texture.height), 0, 0, false); texture.Apply(); - Debug.Log(count+" GraphicsTestFix - done ReadPixel"); + Debug.Log(count + " GraphicsTestFix - done ReadPixel"); } //Blit captured texture to the screen afterwards, so that the screen stays static if (texture != null) { - if(cam.targetTexture != null) + if (cam.targetTexture != null) { - Graphics.Blit(texture,cam.targetTexture); - Debug.Log(count+" GraphicsTestFix - done Blit to cam.targetTexture = "+cam.targetTexture.name); + Graphics.Blit(texture, cam.targetTexture); + Debug.Log(count + " GraphicsTestFix - done Blit to cam.targetTexture = " + cam.targetTexture.name); } else { @@ -73,8 +73,5 @@ private void CleanUp() RenderPipelineManager.endFrameRendering -= MyRenderFrame; } - #endif +#endif } - - - diff --git a/TestProjects/HDRP_HybridTests/Assets/Tests/Runtime/GraphicsTestFix.cs.meta b/TestProjects/BatchRendererGroup_HDRP/Assets/Tests/Runtime/GraphicsTestFix.cs.meta similarity index 100% rename from TestProjects/HDRP_HybridTests/Assets/Tests/Runtime/GraphicsTestFix.cs.meta rename to TestProjects/BatchRendererGroup_HDRP/Assets/Tests/Runtime/GraphicsTestFix.cs.meta diff --git a/TestProjects/HDRP_HybridTests/Assets/Tests/Runtime/GraphicsTestSettingsCustom.cs b/TestProjects/BatchRendererGroup_HDRP/Assets/Tests/Runtime/GraphicsTestSettingsCustom.cs similarity index 91% rename from TestProjects/HDRP_HybridTests/Assets/Tests/Runtime/GraphicsTestSettingsCustom.cs rename to TestProjects/BatchRendererGroup_HDRP/Assets/Tests/Runtime/GraphicsTestSettingsCustom.cs index b2fab1bdc07..9e2064c842a 100644 --- a/TestProjects/HDRP_HybridTests/Assets/Tests/Runtime/GraphicsTestSettingsCustom.cs +++ b/TestProjects/BatchRendererGroup_HDRP/Assets/Tests/Runtime/GraphicsTestSettingsCustom.cs @@ -1,4 +1,4 @@ -//This script is copied from UniversalRP TestProject +//This script is copied from UniversalRP TestProject // https://github.com/Unity-Technologies/ScriptableRenderPipeline/blob/master/TestProjects/UniversalGraphicsTest/Assets/Test/Runtime/UniversalGraphicsTestSettings.cs using UnityEngine.TestTools.Graphics; diff --git a/TestProjects/HDRP_HybridTests/Assets/Tests/Runtime/GraphicsTestSettingsCustom.cs.meta b/TestProjects/BatchRendererGroup_HDRP/Assets/Tests/Runtime/GraphicsTestSettingsCustom.cs.meta similarity index 100% rename from TestProjects/HDRP_HybridTests/Assets/Tests/Runtime/GraphicsTestSettingsCustom.cs.meta rename to TestProjects/BatchRendererGroup_HDRP/Assets/Tests/Runtime/GraphicsTestSettingsCustom.cs.meta diff --git a/TestProjects/HDRP_HybridTests/Assets/Tests/Runtime/GraphicsTests.cs b/TestProjects/BatchRendererGroup_HDRP/Assets/Tests/Runtime/GraphicsTests.cs similarity index 98% rename from TestProjects/HDRP_HybridTests/Assets/Tests/Runtime/GraphicsTests.cs rename to TestProjects/BatchRendererGroup_HDRP/Assets/Tests/Runtime/GraphicsTests.cs index 5125a15b1e7..585d228b07d 100644 --- a/TestProjects/HDRP_HybridTests/Assets/Tests/Runtime/GraphicsTests.cs +++ b/TestProjects/BatchRendererGroup_HDRP/Assets/Tests/Runtime/GraphicsTests.cs @@ -1,4 +1,4 @@ -//This script is copied from UniversalRP TestProject +//This script is copied from UniversalRP TestProject // https://github.com/Unity-Technologies/ScriptableRenderPipeline/blob/master/TestProjects/UniversalGraphicsTest/Assets/Test/Runtime/UniversalGraphicsTests.cs using System.Collections; diff --git a/TestProjects/HDRP_HybridTests/Assets/Tests/Runtime/GraphicsTests.cs.meta b/TestProjects/BatchRendererGroup_HDRP/Assets/Tests/Runtime/GraphicsTests.cs.meta similarity index 100% rename from TestProjects/HDRP_HybridTests/Assets/Tests/Runtime/GraphicsTests.cs.meta rename to TestProjects/BatchRendererGroup_HDRP/Assets/Tests/Runtime/GraphicsTests.cs.meta diff --git a/TestProjects/HDRP_HybridTests/Assets/Tests/Runtime/TestRuntime.asmdef b/TestProjects/BatchRendererGroup_HDRP/Assets/Tests/Runtime/TestRuntime.asmdef similarity index 100% rename from TestProjects/HDRP_HybridTests/Assets/Tests/Runtime/TestRuntime.asmdef rename to TestProjects/BatchRendererGroup_HDRP/Assets/Tests/Runtime/TestRuntime.asmdef diff --git a/TestProjects/HDRP_HybridTests/Assets/Tests/Runtime/TestRuntime.asmdef.meta b/TestProjects/BatchRendererGroup_HDRP/Assets/Tests/Runtime/TestRuntime.asmdef.meta similarity index 100% rename from TestProjects/HDRP_HybridTests/Assets/Tests/Runtime/TestRuntime.asmdef.meta rename to TestProjects/BatchRendererGroup_HDRP/Assets/Tests/Runtime/TestRuntime.asmdef.meta diff --git a/TestProjects/HDRP_HybridTests/Assets/VFXDefaultResources.asset b/TestProjects/BatchRendererGroup_HDRP/Assets/VFXDefaultResources.asset similarity index 100% rename from TestProjects/HDRP_HybridTests/Assets/VFXDefaultResources.asset rename to TestProjects/BatchRendererGroup_HDRP/Assets/VFXDefaultResources.asset diff --git a/TestProjects/HDRP_HybridTests/Assets/VFXDefaultResources.asset.meta b/TestProjects/BatchRendererGroup_HDRP/Assets/VFXDefaultResources.asset.meta similarity index 100% rename from TestProjects/HDRP_HybridTests/Assets/VFXDefaultResources.asset.meta rename to TestProjects/BatchRendererGroup_HDRP/Assets/VFXDefaultResources.asset.meta diff --git a/TestProjects/HDRP_HybridTests/Packages/manifest.json b/TestProjects/BatchRendererGroup_HDRP/Packages/manifest.json similarity index 100% rename from TestProjects/HDRP_HybridTests/Packages/manifest.json rename to TestProjects/BatchRendererGroup_HDRP/Packages/manifest.json diff --git a/TestProjects/HDRP_HybridTests/Packages/packages-lock.json b/TestProjects/BatchRendererGroup_HDRP/Packages/packages-lock.json similarity index 100% rename from TestProjects/HDRP_HybridTests/Packages/packages-lock.json rename to TestProjects/BatchRendererGroup_HDRP/Packages/packages-lock.json diff --git a/TestProjects/HDRP_HybridTests/ProjectSettings/AudioManager.asset b/TestProjects/BatchRendererGroup_HDRP/ProjectSettings/AudioManager.asset similarity index 100% rename from TestProjects/HDRP_HybridTests/ProjectSettings/AudioManager.asset rename to TestProjects/BatchRendererGroup_HDRP/ProjectSettings/AudioManager.asset diff --git a/TestProjects/HDRP_HybridTests/ProjectSettings/BurstAotSettings_StandaloneWindows.json b/TestProjects/BatchRendererGroup_HDRP/ProjectSettings/BurstAotSettings_StandaloneWindows.json similarity index 100% rename from TestProjects/HDRP_HybridTests/ProjectSettings/BurstAotSettings_StandaloneWindows.json rename to TestProjects/BatchRendererGroup_HDRP/ProjectSettings/BurstAotSettings_StandaloneWindows.json diff --git a/TestProjects/HDRP_HybridTests/ProjectSettings/ClusterInputManager.asset b/TestProjects/BatchRendererGroup_HDRP/ProjectSettings/ClusterInputManager.asset similarity index 100% rename from TestProjects/HDRP_HybridTests/ProjectSettings/ClusterInputManager.asset rename to TestProjects/BatchRendererGroup_HDRP/ProjectSettings/ClusterInputManager.asset diff --git a/TestProjects/HDRP_HybridTests/ProjectSettings/DynamicsManager.asset b/TestProjects/BatchRendererGroup_HDRP/ProjectSettings/DynamicsManager.asset similarity index 100% rename from TestProjects/HDRP_HybridTests/ProjectSettings/DynamicsManager.asset rename to TestProjects/BatchRendererGroup_HDRP/ProjectSettings/DynamicsManager.asset diff --git a/TestProjects/HDRP_HybridTests/ProjectSettings/EditorBuildSettings.asset b/TestProjects/BatchRendererGroup_HDRP/ProjectSettings/EditorBuildSettings.asset similarity index 100% rename from TestProjects/HDRP_HybridTests/ProjectSettings/EditorBuildSettings.asset rename to TestProjects/BatchRendererGroup_HDRP/ProjectSettings/EditorBuildSettings.asset diff --git a/TestProjects/HDRP_HybridTests/ProjectSettings/EditorSettings.asset b/TestProjects/BatchRendererGroup_HDRP/ProjectSettings/EditorSettings.asset similarity index 100% rename from TestProjects/HDRP_HybridTests/ProjectSettings/EditorSettings.asset rename to TestProjects/BatchRendererGroup_HDRP/ProjectSettings/EditorSettings.asset diff --git a/TestProjects/HDRP_HybridTests/ProjectSettings/GraphicsSettings.asset b/TestProjects/BatchRendererGroup_HDRP/ProjectSettings/GraphicsSettings.asset similarity index 100% rename from TestProjects/HDRP_HybridTests/ProjectSettings/GraphicsSettings.asset rename to TestProjects/BatchRendererGroup_HDRP/ProjectSettings/GraphicsSettings.asset diff --git a/TestProjects/HDRP_HybridTests/ProjectSettings/HDRPProjectSettings.asset b/TestProjects/BatchRendererGroup_HDRP/ProjectSettings/HDRPProjectSettings.asset similarity index 100% rename from TestProjects/HDRP_HybridTests/ProjectSettings/HDRPProjectSettings.asset rename to TestProjects/BatchRendererGroup_HDRP/ProjectSettings/HDRPProjectSettings.asset diff --git a/TestProjects/HDRP_HybridTests/ProjectSettings/InputManager.asset b/TestProjects/BatchRendererGroup_HDRP/ProjectSettings/InputManager.asset similarity index 100% rename from TestProjects/HDRP_HybridTests/ProjectSettings/InputManager.asset rename to TestProjects/BatchRendererGroup_HDRP/ProjectSettings/InputManager.asset diff --git a/TestProjects/HDRP_HybridTests/ProjectSettings/MemorySettings.asset b/TestProjects/BatchRendererGroup_HDRP/ProjectSettings/MemorySettings.asset similarity index 100% rename from TestProjects/HDRP_HybridTests/ProjectSettings/MemorySettings.asset rename to TestProjects/BatchRendererGroup_HDRP/ProjectSettings/MemorySettings.asset diff --git a/TestProjects/HDRP_HybridTests/ProjectSettings/NavMeshAreas.asset b/TestProjects/BatchRendererGroup_HDRP/ProjectSettings/NavMeshAreas.asset similarity index 100% rename from TestProjects/HDRP_HybridTests/ProjectSettings/NavMeshAreas.asset rename to TestProjects/BatchRendererGroup_HDRP/ProjectSettings/NavMeshAreas.asset diff --git a/TestProjects/HDRP_HybridTests/ProjectSettings/NetworkManager.asset b/TestProjects/BatchRendererGroup_HDRP/ProjectSettings/NetworkManager.asset similarity index 100% rename from TestProjects/HDRP_HybridTests/ProjectSettings/NetworkManager.asset rename to TestProjects/BatchRendererGroup_HDRP/ProjectSettings/NetworkManager.asset diff --git a/TestProjects/HDRP_HybridTests/ProjectSettings/PackageManagerSettings.asset b/TestProjects/BatchRendererGroup_HDRP/ProjectSettings/PackageManagerSettings.asset similarity index 100% rename from TestProjects/HDRP_HybridTests/ProjectSettings/PackageManagerSettings.asset rename to TestProjects/BatchRendererGroup_HDRP/ProjectSettings/PackageManagerSettings.asset diff --git a/TestProjects/HDRP_HybridTests/ProjectSettings/Physics2DSettings.asset b/TestProjects/BatchRendererGroup_HDRP/ProjectSettings/Physics2DSettings.asset similarity index 100% rename from TestProjects/HDRP_HybridTests/ProjectSettings/Physics2DSettings.asset rename to TestProjects/BatchRendererGroup_HDRP/ProjectSettings/Physics2DSettings.asset diff --git a/TestProjects/HDRP_HybridTests/ProjectSettings/PresetManager.asset b/TestProjects/BatchRendererGroup_HDRP/ProjectSettings/PresetManager.asset similarity index 100% rename from TestProjects/HDRP_HybridTests/ProjectSettings/PresetManager.asset rename to TestProjects/BatchRendererGroup_HDRP/ProjectSettings/PresetManager.asset diff --git a/TestProjects/HDRP_HybridTests/ProjectSettings/ProjectSettings.asset b/TestProjects/BatchRendererGroup_HDRP/ProjectSettings/ProjectSettings.asset similarity index 98% rename from TestProjects/HDRP_HybridTests/ProjectSettings/ProjectSettings.asset rename to TestProjects/BatchRendererGroup_HDRP/ProjectSettings/ProjectSettings.asset index 688fa6ea6c1..4813badb2aa 100644 --- a/TestProjects/HDRP_HybridTests/ProjectSettings/ProjectSettings.asset +++ b/TestProjects/BatchRendererGroup_HDRP/ProjectSettings/ProjectSettings.asset @@ -119,6 +119,8 @@ PlayerSettings: switchNVNShaderPoolsGranularity: 33554432 switchNVNDefaultPoolsGranularity: 16777216 switchNVNOtherPoolsGranularity: 16777216 + switchGpuScratchPoolGranularity: 2097152 + switchAllowGpuScratchShrinking: 0 switchNVNMaxPublicTextureIDCount: 0 switchNVNMaxPublicSamplerIDCount: 0 switchNVNGraphicsFirmwareMemory: 32 @@ -315,7 +317,7 @@ PlayerSettings: m_APIs: 10000000 m_Automatic: 0 - m_BuildTarget: WindowsStandaloneSupport - m_APIs: 1200000002000000 + m_APIs: 120000000200000015000000 m_Automatic: 0 - m_BuildTarget: iOSSupport m_APIs: 10000000 @@ -603,6 +605,12 @@ PlayerSettings: webGLLinkerTarget: 1 webGLThreadsSupport: 0 webGLDecompressionFallback: 0 + webGLInitialMemorySize: 32 + webGLMaximumMemorySize: 2048 + webGLMemoryGrowthMode: 2 + webGLMemoryLinearGrowthStep: 16 + webGLMemoryGeometricGrowthStep: 0.2 + webGLMemoryGeometricGrowthCap: 96 scriptingDefineSymbols: : UNITY_POST_PROCESSING_STACK_V2 Android: UNITY_POST_PROCESSING_STACK_V2 @@ -619,6 +627,7 @@ PlayerSettings: platformArchitecture: {} scriptingBackend: {} il2cppCompilerConfiguration: {} + il2cppCodeGeneration: {} managedStrippingLevel: {} incrementalIl2cppBuild: {} suppressCommonWarnings: 1 @@ -714,4 +723,3 @@ PlayerSettings: forceSRGBBlit: 1 virtualTexturingSupportEnabled: 0 insecureHttpOption: 0 - uploadClearedTextureDataAfterCreationFromScript: 1 diff --git a/TestProjects/HDRP_HybridTests/ProjectSettings/QualitySettings.asset b/TestProjects/BatchRendererGroup_HDRP/ProjectSettings/QualitySettings.asset similarity index 100% rename from TestProjects/HDRP_HybridTests/ProjectSettings/QualitySettings.asset rename to TestProjects/BatchRendererGroup_HDRP/ProjectSettings/QualitySettings.asset diff --git a/TestProjects/HDRP_HybridTests/ProjectSettings/SceneTemplateSettings.json b/TestProjects/BatchRendererGroup_HDRP/ProjectSettings/SceneTemplateSettings.json similarity index 100% rename from TestProjects/HDRP_HybridTests/ProjectSettings/SceneTemplateSettings.json rename to TestProjects/BatchRendererGroup_HDRP/ProjectSettings/SceneTemplateSettings.json diff --git a/TestProjects/HDRP_HybridTests/ProjectSettings/ShaderGraphSettings.asset b/TestProjects/BatchRendererGroup_HDRP/ProjectSettings/ShaderGraphSettings.asset similarity index 100% rename from TestProjects/HDRP_HybridTests/ProjectSettings/ShaderGraphSettings.asset rename to TestProjects/BatchRendererGroup_HDRP/ProjectSettings/ShaderGraphSettings.asset diff --git a/TestProjects/HDRP_HybridTests/ProjectSettings/TagManager.asset b/TestProjects/BatchRendererGroup_HDRP/ProjectSettings/TagManager.asset similarity index 100% rename from TestProjects/HDRP_HybridTests/ProjectSettings/TagManager.asset rename to TestProjects/BatchRendererGroup_HDRP/ProjectSettings/TagManager.asset diff --git a/TestProjects/HDRP_HybridTests/ProjectSettings/TimeManager.asset b/TestProjects/BatchRendererGroup_HDRP/ProjectSettings/TimeManager.asset similarity index 100% rename from TestProjects/HDRP_HybridTests/ProjectSettings/TimeManager.asset rename to TestProjects/BatchRendererGroup_HDRP/ProjectSettings/TimeManager.asset diff --git a/TestProjects/HDRP_HybridTests/ProjectSettings/UnityConnectSettings.asset b/TestProjects/BatchRendererGroup_HDRP/ProjectSettings/UnityConnectSettings.asset similarity index 100% rename from TestProjects/HDRP_HybridTests/ProjectSettings/UnityConnectSettings.asset rename to TestProjects/BatchRendererGroup_HDRP/ProjectSettings/UnityConnectSettings.asset diff --git a/TestProjects/HDRP_HybridTests/ProjectSettings/VFXManager.asset b/TestProjects/BatchRendererGroup_HDRP/ProjectSettings/VFXManager.asset similarity index 100% rename from TestProjects/HDRP_HybridTests/ProjectSettings/VFXManager.asset rename to TestProjects/BatchRendererGroup_HDRP/ProjectSettings/VFXManager.asset diff --git a/TestProjects/HDRP_HybridTests/ProjectSettings/VersionControlSettings.asset b/TestProjects/BatchRendererGroup_HDRP/ProjectSettings/VersionControlSettings.asset similarity index 100% rename from TestProjects/HDRP_HybridTests/ProjectSettings/VersionControlSettings.asset rename to TestProjects/BatchRendererGroup_HDRP/ProjectSettings/VersionControlSettings.asset diff --git a/TestProjects/HDRP_HybridTests/ProjectSettings/XRPackageSettings.asset b/TestProjects/BatchRendererGroup_HDRP/ProjectSettings/XRPackageSettings.asset similarity index 100% rename from TestProjects/HDRP_HybridTests/ProjectSettings/XRPackageSettings.asset rename to TestProjects/BatchRendererGroup_HDRP/ProjectSettings/XRPackageSettings.asset diff --git a/TestProjects/HDRP_HybridTests/ProjectSettings/XRSettings.asset b/TestProjects/BatchRendererGroup_HDRP/ProjectSettings/XRSettings.asset similarity index 100% rename from TestProjects/HDRP_HybridTests/ProjectSettings/XRSettings.asset rename to TestProjects/BatchRendererGroup_HDRP/ProjectSettings/XRSettings.asset diff --git a/TestProjects/HDRP_HybridTests/TestRunnerOptions.json b/TestProjects/BatchRendererGroup_HDRP/TestRunnerOptions.json similarity index 100% rename from TestProjects/HDRP_HybridTests/TestRunnerOptions.json rename to TestProjects/BatchRendererGroup_HDRP/TestRunnerOptions.json diff --git a/TestProjects/HDRP_HybridTests/UserSettings/EditorUserSettings.asset b/TestProjects/BatchRendererGroup_HDRP/UserSettings/EditorUserSettings.asset similarity index 100% rename from TestProjects/HDRP_HybridTests/UserSettings/EditorUserSettings.asset rename to TestProjects/BatchRendererGroup_HDRP/UserSettings/EditorUserSettings.asset diff --git a/TestProjects/HDRP_HybridTests/UserSettings/Layouts/default-2022.dwlt b/TestProjects/BatchRendererGroup_HDRP/UserSettings/Layouts/default-2022.dwlt similarity index 100% rename from TestProjects/HDRP_HybridTests/UserSettings/Layouts/default-2022.dwlt rename to TestProjects/BatchRendererGroup_HDRP/UserSettings/Layouts/default-2022.dwlt diff --git a/TestProjects/HDRP_HybridTests/UserSettings/Search.settings b/TestProjects/BatchRendererGroup_HDRP/UserSettings/Search.settings similarity index 100% rename from TestProjects/HDRP_HybridTests/UserSettings/Search.settings rename to TestProjects/BatchRendererGroup_HDRP/UserSettings/Search.settings diff --git a/TestProjects/UniversalHybridTest/Assets/ReferenceImages.meta b/TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages.meta similarity index 100% rename from TestProjects/UniversalHybridTest/Assets/ReferenceImages.meta rename to TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages.meta diff --git a/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear.meta b/TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear.meta similarity index 100% rename from TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear.meta rename to TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear.meta diff --git a/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/LinuxEditor.meta b/TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/LinuxEditor.meta similarity index 100% rename from TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/LinuxEditor.meta rename to TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/LinuxEditor.meta diff --git a/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/LinuxEditor/Vulkan.meta b/TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/LinuxEditor/Vulkan.meta similarity index 100% rename from TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/LinuxEditor/Vulkan.meta rename to TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/LinuxEditor/Vulkan.meta diff --git a/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/LinuxEditor/Vulkan/None.meta b/TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/LinuxEditor/Vulkan/None.meta similarity index 100% rename from TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/LinuxEditor/Vulkan/None.meta rename to TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/LinuxEditor/Vulkan/None.meta diff --git a/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/Android/OpenGLES3/None/BRGGameObjects.png b/TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/LinuxEditor/Vulkan/None/BRGGameObjects.png similarity index 100% rename from TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/Android/OpenGLES3/None/BRGGameObjects.png rename to TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/LinuxEditor/Vulkan/None/BRGGameObjects.png diff --git a/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/LinuxEditor/Vulkan/None/BRGGameObjects.png.meta b/TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/LinuxEditor/Vulkan/None/BRGGameObjects.png.meta similarity index 100% rename from TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/LinuxEditor/Vulkan/None/BRGGameObjects.png.meta rename to TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/LinuxEditor/Vulkan/None/BRGGameObjects.png.meta diff --git a/TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/LinuxEditor/Vulkan/None/BatchRenderGroupRaw.png b/TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/LinuxEditor/Vulkan/None/BatchRenderGroupRaw.png new file mode 100644 index 00000000000..eb48f16ff27 --- /dev/null +++ b/TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/LinuxEditor/Vulkan/None/BatchRenderGroupRaw.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:477684bf25c23f09ac77ed1bf1467f08824e6acdf494cbb0cdab423547c2920d +size 434303 diff --git a/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/LinuxEditor/Vulkan/None/BatchRenderGroupRaw.png.meta b/TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/LinuxEditor/Vulkan/None/BatchRenderGroupRaw.png.meta similarity index 100% rename from TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/LinuxEditor/Vulkan/None/BatchRenderGroupRaw.png.meta rename to TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/LinuxEditor/Vulkan/None/BatchRenderGroupRaw.png.meta diff --git a/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/LinuxPlayer.meta b/TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/LinuxPlayer.meta similarity index 100% rename from TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/LinuxPlayer.meta rename to TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/LinuxPlayer.meta diff --git a/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/LinuxPlayer/Vulkan.meta b/TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/LinuxPlayer/Vulkan.meta similarity index 100% rename from TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/LinuxPlayer/Vulkan.meta rename to TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/LinuxPlayer/Vulkan.meta diff --git a/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/LinuxPlayer/Vulkan/None.meta b/TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/LinuxPlayer/Vulkan/None.meta similarity index 100% rename from TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/LinuxPlayer/Vulkan/None.meta rename to TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/LinuxPlayer/Vulkan/None.meta diff --git a/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/Android/Vulkan/None/BRGGameObjects.png b/TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/LinuxPlayer/Vulkan/None/BRGGameObjects.png similarity index 100% rename from TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/Android/Vulkan/None/BRGGameObjects.png rename to TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/LinuxPlayer/Vulkan/None/BRGGameObjects.png diff --git a/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/LinuxPlayer/Vulkan/None/BRGGameObjects.png.meta b/TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/LinuxPlayer/Vulkan/None/BRGGameObjects.png.meta similarity index 100% rename from TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/LinuxPlayer/Vulkan/None/BRGGameObjects.png.meta rename to TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/LinuxPlayer/Vulkan/None/BRGGameObjects.png.meta diff --git a/TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/LinuxPlayer/Vulkan/None/BatchRenderGroupRaw.png b/TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/LinuxPlayer/Vulkan/None/BatchRenderGroupRaw.png new file mode 100644 index 00000000000..eb48f16ff27 --- /dev/null +++ b/TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/LinuxPlayer/Vulkan/None/BatchRenderGroupRaw.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:477684bf25c23f09ac77ed1bf1467f08824e6acdf494cbb0cdab423547c2920d +size 434303 diff --git a/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/LinuxPlayer/Vulkan/None/BatchRenderGroupRaw.png.meta b/TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/LinuxPlayer/Vulkan/None/BatchRenderGroupRaw.png.meta similarity index 100% rename from TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/LinuxPlayer/Vulkan/None/BatchRenderGroupRaw.png.meta rename to TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/LinuxPlayer/Vulkan/None/BatchRenderGroupRaw.png.meta diff --git a/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/OSXEditor.meta b/TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/OSXEditor.meta similarity index 100% rename from TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/OSXEditor.meta rename to TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/OSXEditor.meta diff --git a/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/OSXEditor/Metal.meta b/TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/OSXEditor/Metal.meta similarity index 100% rename from TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/OSXEditor/Metal.meta rename to TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/OSXEditor/Metal.meta diff --git a/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/OSXEditor/Metal/None.meta b/TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/OSXEditor/Metal/None.meta similarity index 100% rename from TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/OSXEditor/Metal/None.meta rename to TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/OSXEditor/Metal/None.meta diff --git a/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/LinuxEditor/OpenGLCore/None/BRGGameObjects.png b/TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/OSXEditor/Metal/None/BRGGameObjects.png similarity index 100% rename from TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/LinuxEditor/OpenGLCore/None/BRGGameObjects.png rename to TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/OSXEditor/Metal/None/BRGGameObjects.png diff --git a/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/OSXEditor/Metal/None/BRGGameObjects.png.meta b/TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/OSXEditor/Metal/None/BRGGameObjects.png.meta similarity index 100% rename from TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/OSXEditor/Metal/None/BRGGameObjects.png.meta rename to TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/OSXEditor/Metal/None/BRGGameObjects.png.meta diff --git a/TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/OSXEditor/Metal/None/BatchRenderGroupRaw.png b/TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/OSXEditor/Metal/None/BatchRenderGroupRaw.png new file mode 100644 index 00000000000..eb48f16ff27 --- /dev/null +++ b/TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/OSXEditor/Metal/None/BatchRenderGroupRaw.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:477684bf25c23f09ac77ed1bf1467f08824e6acdf494cbb0cdab423547c2920d +size 434303 diff --git a/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/OSXEditor/Metal/None/BatchRenderGroupRaw.png.meta b/TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/OSXEditor/Metal/None/BatchRenderGroupRaw.png.meta similarity index 100% rename from TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/OSXEditor/Metal/None/BatchRenderGroupRaw.png.meta rename to TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/OSXEditor/Metal/None/BatchRenderGroupRaw.png.meta diff --git a/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/OSXPlayer.meta b/TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/OSXPlayer.meta similarity index 100% rename from TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/OSXPlayer.meta rename to TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/OSXPlayer.meta diff --git a/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/OSXPlayer/Metal.meta b/TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/OSXPlayer/Metal.meta similarity index 100% rename from TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/OSXPlayer/Metal.meta rename to TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/OSXPlayer/Metal.meta diff --git a/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/OSXPlayer/Metal/None.meta b/TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/OSXPlayer/Metal/None.meta similarity index 100% rename from TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/OSXPlayer/Metal/None.meta rename to TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/OSXPlayer/Metal/None.meta diff --git a/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/LinuxEditor/Vulkan/None/BRGGameObjects.png b/TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/OSXPlayer/Metal/None/BRGGameObjects.png similarity index 100% rename from TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/LinuxEditor/Vulkan/None/BRGGameObjects.png rename to TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/OSXPlayer/Metal/None/BRGGameObjects.png diff --git a/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/OSXPlayer/Metal/None/BRGGameObjects.png.meta b/TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/OSXPlayer/Metal/None/BRGGameObjects.png.meta similarity index 100% rename from TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/OSXPlayer/Metal/None/BRGGameObjects.png.meta rename to TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/OSXPlayer/Metal/None/BRGGameObjects.png.meta diff --git a/TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/OSXPlayer/Metal/None/BatchRenderGroupRaw.png b/TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/OSXPlayer/Metal/None/BatchRenderGroupRaw.png new file mode 100644 index 00000000000..eb48f16ff27 --- /dev/null +++ b/TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/OSXPlayer/Metal/None/BatchRenderGroupRaw.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:477684bf25c23f09ac77ed1bf1467f08824e6acdf494cbb0cdab423547c2920d +size 434303 diff --git a/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/OSXPlayer/Metal/None/BatchRenderGroupRaw.png.meta b/TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/OSXPlayer/Metal/None/BatchRenderGroupRaw.png.meta similarity index 100% rename from TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/OSXPlayer/Metal/None/BatchRenderGroupRaw.png.meta rename to TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/OSXPlayer/Metal/None/BatchRenderGroupRaw.png.meta diff --git a/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/WindowsEditor.meta b/TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/WindowsEditor.meta similarity index 100% rename from TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/WindowsEditor.meta rename to TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/WindowsEditor.meta diff --git a/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11.meta b/TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11.meta similarity index 100% rename from TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11.meta rename to TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11.meta diff --git a/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/None.meta b/TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/None.meta similarity index 100% rename from TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/None.meta rename to TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/None.meta diff --git a/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/LinuxPlayer/OpenGLCore/None/BRGGameObjects.png b/TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/None/BRGGameObjects.png similarity index 100% rename from TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/LinuxPlayer/OpenGLCore/None/BRGGameObjects.png rename to TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/None/BRGGameObjects.png diff --git a/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/None/BRGGameObjects.png.meta b/TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/None/BRGGameObjects.png.meta similarity index 100% rename from TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/None/BRGGameObjects.png.meta rename to TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/None/BRGGameObjects.png.meta diff --git a/TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/None/BatchRenderGroupRaw.png b/TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/None/BatchRenderGroupRaw.png new file mode 100644 index 00000000000..eb48f16ff27 --- /dev/null +++ b/TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/None/BatchRenderGroupRaw.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:477684bf25c23f09ac77ed1bf1467f08824e6acdf494cbb0cdab423547c2920d +size 434303 diff --git a/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/None/BatchRenderGroupRaw.png.meta b/TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/None/BatchRenderGroupRaw.png.meta similarity index 100% rename from TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/None/BatchRenderGroupRaw.png.meta rename to TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/None/BatchRenderGroupRaw.png.meta diff --git a/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D12.meta b/TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D12.meta similarity index 100% rename from TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D12.meta rename to TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D12.meta diff --git a/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D12/None.meta b/TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D12/None.meta similarity index 100% rename from TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D12/None.meta rename to TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D12/None.meta diff --git a/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/LinuxPlayer/Vulkan/None/BRGGameObjects.png b/TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D12/None/BRGGameObjects.png similarity index 100% rename from TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/LinuxPlayer/Vulkan/None/BRGGameObjects.png rename to TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D12/None/BRGGameObjects.png diff --git a/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D12/None/BRGGameObjects.png.meta b/TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D12/None/BRGGameObjects.png.meta similarity index 100% rename from TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D12/None/BRGGameObjects.png.meta rename to TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D12/None/BRGGameObjects.png.meta diff --git a/TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D12/None/BatchRenderGroupRaw.png b/TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D12/None/BatchRenderGroupRaw.png new file mode 100644 index 00000000000..eb48f16ff27 --- /dev/null +++ b/TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D12/None/BatchRenderGroupRaw.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:477684bf25c23f09ac77ed1bf1467f08824e6acdf494cbb0cdab423547c2920d +size 434303 diff --git a/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D12/None/BatchRenderGroupRaw.png.meta b/TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D12/None/BatchRenderGroupRaw.png.meta similarity index 100% rename from TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D12/None/BatchRenderGroupRaw.png.meta rename to TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D12/None/BatchRenderGroupRaw.png.meta diff --git a/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan.meta b/TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan.meta similarity index 100% rename from TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan.meta rename to TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan.meta diff --git a/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/None.meta b/TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/None.meta similarity index 100% rename from TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/None.meta rename to TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/None.meta diff --git a/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/OSXEditor/Metal/None/BRGGameObjects.png b/TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/None/BRGGameObjects.png similarity index 100% rename from TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/OSXEditor/Metal/None/BRGGameObjects.png rename to TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/None/BRGGameObjects.png diff --git a/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/None/BRGGameObjects.png.meta b/TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/None/BRGGameObjects.png.meta similarity index 100% rename from TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/None/BRGGameObjects.png.meta rename to TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/None/BRGGameObjects.png.meta diff --git a/TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/None/BatchRenderGroupRaw.png b/TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/None/BatchRenderGroupRaw.png new file mode 100644 index 00000000000..eb48f16ff27 --- /dev/null +++ b/TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/None/BatchRenderGroupRaw.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:477684bf25c23f09ac77ed1bf1467f08824e6acdf494cbb0cdab423547c2920d +size 434303 diff --git a/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/None/BatchRenderGroupRaw.png.meta b/TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/None/BatchRenderGroupRaw.png.meta similarity index 100% rename from TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/None/BatchRenderGroupRaw.png.meta rename to TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/None/BatchRenderGroupRaw.png.meta diff --git a/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/WindowsPlayer.meta b/TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/WindowsPlayer.meta similarity index 100% rename from TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/WindowsPlayer.meta rename to TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/WindowsPlayer.meta diff --git a/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11.meta b/TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11.meta similarity index 100% rename from TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11.meta rename to TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11.meta diff --git a/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/None.meta b/TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/None.meta similarity index 100% rename from TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/None.meta rename to TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/None.meta diff --git a/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/OSXPlayer/Metal/None/BRGGameObjects.png b/TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/None/BRGGameObjects.png similarity index 100% rename from TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/OSXPlayer/Metal/None/BRGGameObjects.png rename to TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/None/BRGGameObjects.png diff --git a/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/None/BRGGameObjects.png.meta b/TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/None/BRGGameObjects.png.meta similarity index 100% rename from TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/None/BRGGameObjects.png.meta rename to TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/None/BRGGameObjects.png.meta diff --git a/TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/None/BatchRenderGroupRaw.png b/TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/None/BatchRenderGroupRaw.png new file mode 100644 index 00000000000..eb48f16ff27 --- /dev/null +++ b/TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/None/BatchRenderGroupRaw.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:477684bf25c23f09ac77ed1bf1467f08824e6acdf494cbb0cdab423547c2920d +size 434303 diff --git a/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/None/BatchRenderGroupRaw.png.meta b/TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/None/BatchRenderGroupRaw.png.meta similarity index 100% rename from TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/None/BatchRenderGroupRaw.png.meta rename to TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/None/BatchRenderGroupRaw.png.meta diff --git a/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D12.meta b/TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D12.meta similarity index 100% rename from TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D12.meta rename to TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D12.meta diff --git a/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D12/None.meta b/TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D12/None.meta similarity index 100% rename from TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D12/None.meta rename to TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D12/None.meta diff --git a/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/None/BRGGameObjects.png b/TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D12/None/BRGGameObjects.png similarity index 100% rename from TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/None/BRGGameObjects.png rename to TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D12/None/BRGGameObjects.png diff --git a/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D12/None/BRGGameObjects.png.meta b/TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D12/None/BRGGameObjects.png.meta similarity index 100% rename from TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D12/None/BRGGameObjects.png.meta rename to TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D12/None/BRGGameObjects.png.meta diff --git a/TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D12/None/BatchRenderGroupRaw.png b/TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D12/None/BatchRenderGroupRaw.png new file mode 100644 index 00000000000..eb48f16ff27 --- /dev/null +++ b/TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D12/None/BatchRenderGroupRaw.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:477684bf25c23f09ac77ed1bf1467f08824e6acdf494cbb0cdab423547c2920d +size 434303 diff --git a/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D12/None/BatchRenderGroupRaw.png.meta b/TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D12/None/BatchRenderGroupRaw.png.meta similarity index 100% rename from TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D12/None/BatchRenderGroupRaw.png.meta rename to TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D12/None/BatchRenderGroupRaw.png.meta diff --git a/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/WindowsPlayer/Vulkan.meta b/TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/WindowsPlayer/Vulkan.meta similarity index 100% rename from TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/WindowsPlayer/Vulkan.meta rename to TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/WindowsPlayer/Vulkan.meta diff --git a/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/WindowsPlayer/Vulkan/None.meta b/TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/WindowsPlayer/Vulkan/None.meta similarity index 100% rename from TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/WindowsPlayer/Vulkan/None.meta rename to TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/WindowsPlayer/Vulkan/None.meta diff --git a/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D12/None/BRGGameObjects.png b/TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/WindowsPlayer/Vulkan/None/BRGGameObjects.png similarity index 100% rename from TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D12/None/BRGGameObjects.png rename to TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/WindowsPlayer/Vulkan/None/BRGGameObjects.png diff --git a/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/WindowsPlayer/Vulkan/None/BRGGameObjects.png.meta b/TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/WindowsPlayer/Vulkan/None/BRGGameObjects.png.meta similarity index 100% rename from TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/WindowsPlayer/Vulkan/None/BRGGameObjects.png.meta rename to TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/WindowsPlayer/Vulkan/None/BRGGameObjects.png.meta diff --git a/TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/WindowsPlayer/Vulkan/None/BatchRenderGroupRaw.png b/TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/WindowsPlayer/Vulkan/None/BatchRenderGroupRaw.png new file mode 100644 index 00000000000..eb48f16ff27 --- /dev/null +++ b/TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/WindowsPlayer/Vulkan/None/BatchRenderGroupRaw.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:477684bf25c23f09ac77ed1bf1467f08824e6acdf494cbb0cdab423547c2920d +size 434303 diff --git a/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/WindowsPlayer/Vulkan/None/BatchRenderGroupRaw.png.meta b/TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/WindowsPlayer/Vulkan/None/BatchRenderGroupRaw.png.meta similarity index 100% rename from TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/WindowsPlayer/Vulkan/None/BatchRenderGroupRaw.png.meta rename to TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/WindowsPlayer/Vulkan/None/BatchRenderGroupRaw.png.meta diff --git a/TestProjects/UniversalHybridTest/Assets/SampleScenes.meta b/TestProjects/BatchRendererGroup_URP/Assets/SampleScenes.meta similarity index 100% rename from TestProjects/UniversalHybridTest/Assets/SampleScenes.meta rename to TestProjects/BatchRendererGroup_URP/Assets/SampleScenes.meta diff --git a/TestProjects/UniversalHybridTest/Assets/SampleScenes/BRGGameObjects.meta b/TestProjects/BatchRendererGroup_URP/Assets/SampleScenes/BRGGameObjects.meta similarity index 100% rename from TestProjects/UniversalHybridTest/Assets/SampleScenes/BRGGameObjects.meta rename to TestProjects/BatchRendererGroup_URP/Assets/SampleScenes/BRGGameObjects.meta diff --git a/TestProjects/HDRP_HybridTests/Assets/SampleScenes/BRGGameObjects/AABB.cs b/TestProjects/BatchRendererGroup_URP/Assets/SampleScenes/BRGGameObjects/AABB.cs similarity index 85% rename from TestProjects/HDRP_HybridTests/Assets/SampleScenes/BRGGameObjects/AABB.cs rename to TestProjects/BatchRendererGroup_URP/Assets/SampleScenes/BRGGameObjects/AABB.cs index 2f8c13a4661..845e23084f3 100644 --- a/TestProjects/HDRP_HybridTests/Assets/SampleScenes/BRGGameObjects/AABB.cs +++ b/TestProjects/BatchRendererGroup_URP/Assets/SampleScenes/BRGGameObjects/AABB.cs @@ -42,13 +42,13 @@ public bool Contains(float3 point) public bool Contains(AABB b) { return Contains(b.Center + float3(-b.Extents.x, -b.Extents.y, -b.Extents.z)) - && Contains(b.Center + float3(-b.Extents.x, -b.Extents.y, b.Extents.z)) - && Contains(b.Center + float3(-b.Extents.x, b.Extents.y, -b.Extents.z)) - && Contains(b.Center + float3(-b.Extents.x, b.Extents.y, b.Extents.z)) + && Contains(b.Center + float3(-b.Extents.x, -b.Extents.y, b.Extents.z)) + && Contains(b.Center + float3(-b.Extents.x, b.Extents.y, -b.Extents.z)) + && Contains(b.Center + float3(-b.Extents.x, b.Extents.y, b.Extents.z)) && Contains(b.Center + float3(b.Extents.x, -b.Extents.y, -b.Extents.z)) - && Contains(b.Center + float3(b.Extents.x, -b.Extents.y, b.Extents.z)) - && Contains(b.Center + float3(b.Extents.x, b.Extents.y, -b.Extents.z)) - && Contains(b.Center + float3(b.Extents.x, b.Extents.y, b.Extents.z)); + && Contains(b.Center + float3(b.Extents.x, -b.Extents.y, b.Extents.z)) + && Contains(b.Center + float3(b.Extents.x, b.Extents.y, -b.Extents.z)) + && Contains(b.Center + float3(b.Extents.x, b.Extents.y, b.Extents.z)); } static float3 RotateExtents(float3 extents, float3 m0, float3 m1, float3 m2) diff --git a/TestProjects/UniversalHybridTest/Assets/SampleScenes/BRGGameObjects/AABB.cs.meta b/TestProjects/BatchRendererGroup_URP/Assets/SampleScenes/BRGGameObjects/AABB.cs.meta similarity index 100% rename from TestProjects/UniversalHybridTest/Assets/SampleScenes/BRGGameObjects/AABB.cs.meta rename to TestProjects/BatchRendererGroup_URP/Assets/SampleScenes/BRGGameObjects/AABB.cs.meta diff --git a/TestProjects/UniversalHybridTest/Assets/SampleScenes/BRGGameObjects/BRGGameObjects.unity b/TestProjects/BatchRendererGroup_URP/Assets/SampleScenes/BRGGameObjects/BRGGameObjects.unity similarity index 100% rename from TestProjects/UniversalHybridTest/Assets/SampleScenes/BRGGameObjects/BRGGameObjects.unity rename to TestProjects/BatchRendererGroup_URP/Assets/SampleScenes/BRGGameObjects/BRGGameObjects.unity diff --git a/TestProjects/UniversalHybridTest/Assets/SampleScenes/BRGGameObjects/BRGGameObjects.unity.meta b/TestProjects/BatchRendererGroup_URP/Assets/SampleScenes/BRGGameObjects/BRGGameObjects.unity.meta similarity index 100% rename from TestProjects/UniversalHybridTest/Assets/SampleScenes/BRGGameObjects/BRGGameObjects.unity.meta rename to TestProjects/BatchRendererGroup_URP/Assets/SampleScenes/BRGGameObjects/BRGGameObjects.unity.meta diff --git a/TestProjects/UniversalHybridTest/Assets/SampleScenes/BRGGameObjects/BoundsToAABB.cs b/TestProjects/BatchRendererGroup_URP/Assets/SampleScenes/BRGGameObjects/BoundsToAABB.cs similarity index 91% rename from TestProjects/UniversalHybridTest/Assets/SampleScenes/BRGGameObjects/BoundsToAABB.cs rename to TestProjects/BatchRendererGroup_URP/Assets/SampleScenes/BRGGameObjects/BoundsToAABB.cs index 7ac8b61ea45..9376860bef5 100644 --- a/TestProjects/UniversalHybridTest/Assets/SampleScenes/BRGGameObjects/BoundsToAABB.cs +++ b/TestProjects/BatchRendererGroup_URP/Assets/SampleScenes/BRGGameObjects/BoundsToAABB.cs @@ -6,12 +6,12 @@ public static class AABBExtensions { public static AABB ToAABB(this Bounds bounds) { - return new AABB { Center = bounds.center, Extents = bounds.extents}; + return new AABB { Center = bounds.center, Extents = bounds.extents }; } public static Bounds ToBounds(this AABB aabb) { - return new Bounds { center = aabb.Center, extents = aabb.Extents}; + return new Bounds { center = aabb.Center, extents = aabb.Extents }; } } } diff --git a/TestProjects/UniversalHybridTest/Assets/SampleScenes/BRGGameObjects/BoundsToAABB.cs.meta b/TestProjects/BatchRendererGroup_URP/Assets/SampleScenes/BRGGameObjects/BoundsToAABB.cs.meta similarity index 100% rename from TestProjects/UniversalHybridTest/Assets/SampleScenes/BRGGameObjects/BoundsToAABB.cs.meta rename to TestProjects/BatchRendererGroup_URP/Assets/SampleScenes/BRGGameObjects/BoundsToAABB.cs.meta diff --git a/TestProjects/UniversalHybridTest/Assets/SampleScenes/BRGGameObjects/FrustumPlanes.cs b/TestProjects/BatchRendererGroup_URP/Assets/SampleScenes/BRGGameObjects/FrustumPlanes.cs similarity index 100% rename from TestProjects/UniversalHybridTest/Assets/SampleScenes/BRGGameObjects/FrustumPlanes.cs rename to TestProjects/BatchRendererGroup_URP/Assets/SampleScenes/BRGGameObjects/FrustumPlanes.cs diff --git a/TestProjects/UniversalHybridTest/Assets/SampleScenes/BRGGameObjects/FrustumPlanes.cs.meta b/TestProjects/BatchRendererGroup_URP/Assets/SampleScenes/BRGGameObjects/FrustumPlanes.cs.meta similarity index 100% rename from TestProjects/UniversalHybridTest/Assets/SampleScenes/BRGGameObjects/FrustumPlanes.cs.meta rename to TestProjects/BatchRendererGroup_URP/Assets/SampleScenes/BRGGameObjects/FrustumPlanes.cs.meta diff --git a/TestProjects/UniversalHybridTest/Assets/SampleScenes/BRGGameObjects/RenderBRG.cs b/TestProjects/BatchRendererGroup_URP/Assets/SampleScenes/BRGGameObjects/RenderBRG.cs similarity index 99% rename from TestProjects/UniversalHybridTest/Assets/SampleScenes/BRGGameObjects/RenderBRG.cs rename to TestProjects/BatchRendererGroup_URP/Assets/SampleScenes/BRGGameObjects/RenderBRG.cs index 53ca1cdd7b2..07ce0162127 100644 --- a/TestProjects/UniversalHybridTest/Assets/SampleScenes/BRGGameObjects/RenderBRG.cs +++ b/TestProjects/BatchRendererGroup_URP/Assets/SampleScenes/BRGGameObjects/RenderBRG.cs @@ -142,7 +142,8 @@ static MetadataValue CreateMetadataValue(int nameID, int gpuAddress, bool isOver [BurstCompile] private struct CullingJob : IJobParallelFor { - [DeallocateOnJobCompletion][ReadOnly] + [DeallocateOnJobCompletion] + [ReadOnly] public NativeArray planes; [ReadOnly] @@ -161,7 +162,7 @@ public void Execute(int index) for (int i = start; i < end; i++) { ulong bit = FrustumPlanes.Intersect2NoPartial(planes, renderers[i].bounds) == FrustumPlanes.IntersectResult.In ? 1ul : 0ul; - visibleBits |= bit << (i-start); + visibleBits |= bit << (i - start); } rendererVisibility[index] = visibleBits; @@ -341,9 +342,13 @@ public JobHandle OnPerformCulling(BatchRendererGroup rendererGroup, BatchCulling return jobHandleOutput; } +#if UNITY_EDITOR public static Material LoadPickingMaterial() { Shader shader = Shader.Find("Hidden/Universal Render Pipeline/BRGPicking"); + + if (shader == null) return null; + Material material = new Material(shader); // Prevent Material unloading when switching scene @@ -354,14 +359,18 @@ public static Material LoadPickingMaterial() Material m_pickingMaterial; +#endif + // Start is called before the first frame update void Start() { m_BatchRendererGroup = new BatchRendererGroup(this.OnPerformCulling, IntPtr.Zero); +#if UNITY_EDITOR m_pickingMaterial = LoadPickingMaterial(); m_BatchRendererGroup.SetPickingMaterial(m_pickingMaterial); +#endif // Create a batch... var renderers = FindObjectsOfType(); @@ -631,7 +640,9 @@ private void OnDestroy() m_instanceIndices.Dispose(); m_drawIndices.Dispose(); +#if UNITY_EDITOR DestroyImmediate(m_pickingMaterial); +#endif } } } diff --git a/TestProjects/UniversalHybridTest/Assets/SampleScenes/BRGGameObjects/RenderBRG.cs.meta b/TestProjects/BatchRendererGroup_URP/Assets/SampleScenes/BRGGameObjects/RenderBRG.cs.meta similarity index 100% rename from TestProjects/UniversalHybridTest/Assets/SampleScenes/BRGGameObjects/RenderBRG.cs.meta rename to TestProjects/BatchRendererGroup_URP/Assets/SampleScenes/BRGGameObjects/RenderBRG.cs.meta diff --git a/TestProjects/UniversalHybridTest/Assets/SampleScenes/BRGGameObjects/TestMaterial1.mat b/TestProjects/BatchRendererGroup_URP/Assets/SampleScenes/BRGGameObjects/TestMaterial1.mat similarity index 97% rename from TestProjects/UniversalHybridTest/Assets/SampleScenes/BRGGameObjects/TestMaterial1.mat rename to TestProjects/BatchRendererGroup_URP/Assets/SampleScenes/BRGGameObjects/TestMaterial1.mat index c0529630192..7553798e8b8 100644 --- a/TestProjects/UniversalHybridTest/Assets/SampleScenes/BRGGameObjects/TestMaterial1.mat +++ b/TestProjects/BatchRendererGroup_URP/Assets/SampleScenes/BRGGameObjects/TestMaterial1.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -93,6 +93,7 @@ Material: m_Floats: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoatMask: 0 - _ClearCoatSmoothness: 0 @@ -101,6 +102,7 @@ Material: - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 0 - _Glossiness: 0 @@ -114,6 +116,7 @@ Material: - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _WorkflowMode: 1 - _ZWrite: 1 diff --git a/TestProjects/UniversalHybridTest/Assets/SampleScenes/BRGGameObjects/TestMaterial1.mat.meta b/TestProjects/BatchRendererGroup_URP/Assets/SampleScenes/BRGGameObjects/TestMaterial1.mat.meta similarity index 100% rename from TestProjects/UniversalHybridTest/Assets/SampleScenes/BRGGameObjects/TestMaterial1.mat.meta rename to TestProjects/BatchRendererGroup_URP/Assets/SampleScenes/BRGGameObjects/TestMaterial1.mat.meta diff --git a/TestProjects/UniversalHybridTest/Assets/SampleScenes/BRGGameObjects/TestMaterial2.mat b/TestProjects/BatchRendererGroup_URP/Assets/SampleScenes/BRGGameObjects/TestMaterial2.mat similarity index 97% rename from TestProjects/UniversalHybridTest/Assets/SampleScenes/BRGGameObjects/TestMaterial2.mat rename to TestProjects/BatchRendererGroup_URP/Assets/SampleScenes/BRGGameObjects/TestMaterial2.mat index f4f8448b293..474e3e7d5e3 100644 --- a/TestProjects/UniversalHybridTest/Assets/SampleScenes/BRGGameObjects/TestMaterial2.mat +++ b/TestProjects/BatchRendererGroup_URP/Assets/SampleScenes/BRGGameObjects/TestMaterial2.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -93,6 +93,7 @@ Material: m_Floats: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoatMask: 0 - _ClearCoatSmoothness: 0 @@ -101,6 +102,7 @@ Material: - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 0 - _Glossiness: 0 @@ -114,6 +116,7 @@ Material: - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _WorkflowMode: 1 - _ZWrite: 1 diff --git a/TestProjects/UniversalHybridTest/Assets/SampleScenes/BRGGameObjects/TestMaterial2.mat.meta b/TestProjects/BatchRendererGroup_URP/Assets/SampleScenes/BRGGameObjects/TestMaterial2.mat.meta similarity index 100% rename from TestProjects/UniversalHybridTest/Assets/SampleScenes/BRGGameObjects/TestMaterial2.mat.meta rename to TestProjects/BatchRendererGroup_URP/Assets/SampleScenes/BRGGameObjects/TestMaterial2.mat.meta diff --git a/TestProjects/UniversalHybridTest/Assets/SampleScenes/BRGGameObjects/brick.jpg b/TestProjects/BatchRendererGroup_URP/Assets/SampleScenes/BRGGameObjects/brick.jpg similarity index 100% rename from TestProjects/UniversalHybridTest/Assets/SampleScenes/BRGGameObjects/brick.jpg rename to TestProjects/BatchRendererGroup_URP/Assets/SampleScenes/BRGGameObjects/brick.jpg diff --git a/TestProjects/UniversalHybridTest/Assets/SampleScenes/BRGGameObjects/brick.jpg.meta b/TestProjects/BatchRendererGroup_URP/Assets/SampleScenes/BRGGameObjects/brick.jpg.meta similarity index 100% rename from TestProjects/UniversalHybridTest/Assets/SampleScenes/BRGGameObjects/brick.jpg.meta rename to TestProjects/BatchRendererGroup_URP/Assets/SampleScenes/BRGGameObjects/brick.jpg.meta diff --git a/TestProjects/UniversalHybridTest/Assets/SampleScenes/BatchRenderGroupRaw.meta b/TestProjects/BatchRendererGroup_URP/Assets/SampleScenes/BatchRenderGroupRaw.meta similarity index 100% rename from TestProjects/UniversalHybridTest/Assets/SampleScenes/BatchRenderGroupRaw.meta rename to TestProjects/BatchRendererGroup_URP/Assets/SampleScenes/BatchRenderGroupRaw.meta diff --git a/TestProjects/UniversalHybridTest/Assets/SampleScenes/BatchRenderGroupRaw/BRGMaterial.mat b/TestProjects/BatchRendererGroup_URP/Assets/SampleScenes/BatchRenderGroupRaw/BRGMaterial.mat similarity index 97% rename from TestProjects/UniversalHybridTest/Assets/SampleScenes/BatchRenderGroupRaw/BRGMaterial.mat rename to TestProjects/BatchRendererGroup_URP/Assets/SampleScenes/BatchRenderGroupRaw/BRGMaterial.mat index 8ee4007b053..d42f482ce8a 100644 --- a/TestProjects/UniversalHybridTest/Assets/SampleScenes/BatchRenderGroupRaw/BRGMaterial.mat +++ b/TestProjects/BatchRendererGroup_URP/Assets/SampleScenes/BatchRenderGroupRaw/BRGMaterial.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -93,6 +93,7 @@ Material: m_Floats: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoatMask: 0 - _ClearCoatSmoothness: 0 @@ -101,6 +102,7 @@ Material: - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 0 - _Glossiness: 0 @@ -114,6 +116,7 @@ Material: - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _WorkflowMode: 1 - _ZWrite: 1 diff --git a/TestProjects/UniversalHybridTest/Assets/SampleScenes/BatchRenderGroupRaw/BRGMaterial.mat.meta b/TestProjects/BatchRendererGroup_URP/Assets/SampleScenes/BatchRenderGroupRaw/BRGMaterial.mat.meta similarity index 100% rename from TestProjects/UniversalHybridTest/Assets/SampleScenes/BatchRenderGroupRaw/BRGMaterial.mat.meta rename to TestProjects/BatchRendererGroup_URP/Assets/SampleScenes/BatchRenderGroupRaw/BRGMaterial.mat.meta diff --git a/TestProjects/HDRP_HybridTests/Assets/SampleScenes/BatchRenderGroupRaw/BRGSetup.cs b/TestProjects/BatchRendererGroup_URP/Assets/SampleScenes/BatchRenderGroupRaw/BRGSetup.cs similarity index 96% rename from TestProjects/HDRP_HybridTests/Assets/SampleScenes/BatchRenderGroupRaw/BRGSetup.cs rename to TestProjects/BatchRendererGroup_URP/Assets/SampleScenes/BatchRenderGroupRaw/BRGSetup.cs index 0cb8c454911..847c019a903 100644 --- a/TestProjects/HDRP_HybridTests/Assets/SampleScenes/BatchRenderGroupRaw/BRGSetup.cs +++ b/TestProjects/BatchRendererGroup_URP/Assets/SampleScenes/BatchRenderGroupRaw/BRGSetup.cs @@ -87,14 +87,14 @@ public JobHandle OnPerformCulling(BatchRendererGroup rendererGroup, BatchCulling for (int i = 0; i < itemGridSize; i++) { bool visible = true; - if ( m_cullTest ) + if (m_cullTest) { int dist = (r - itemGridSize / 2) * (r - itemGridSize / 2) + (i - itemGridSize / 2) * (i - itemGridSize / 2); - if ((dist >= radiusI) && ( dist <= radiusO)) + if ((dist >= radiusI) && (dist <= radiusO)) visible = false; } - if ( visible ) + if (visible) drawCommands.visibleInstances[n++] = r * itemGridSize + i; } } @@ -143,7 +143,7 @@ void Start() int objectToWorldID = Shader.PropertyToID("unity_ObjectToWorld"); int matrixPreviousMID = Shader.PropertyToID("unity_MatrixPreviousM"); -// int worldToObjectID = Shader.PropertyToID("unity_WorldToObject"); + // int worldToObjectID = Shader.PropertyToID("unity_WorldToObject"); int colorID = Shader.PropertyToID("_BaseColor"); // Generate a grid of objects... @@ -183,11 +183,10 @@ void Start() // Register batch m_batchID = m_BatchRendererGroup.AddBatch(batchMetadata, m_GPUPersistentInstanceData.bufferHandle); - m_initialized = true; } - void UpdatePositions(Vector3 pos) + void UpdatePositions(Vector3 pos) { int itemCountOffset = itemGridSize * itemGridSize * 3; // 3 float4 per matrix for (int z = 0; z < itemGridSize; z++) @@ -206,7 +205,7 @@ void UpdatePositions(Vector3 pos) // compute the new current frame matrix m_sysmemBuffer[i * 3 + 0] = new Vector4(1, 0, 0, 0); // hacky float3x4 layout m_sysmemBuffer[i * 3 + 1] = new Vector4(1, 0, 0, 0); - m_sysmemBuffer[i * 3 + 2] = new Vector4(1, px + pos.x, pos.y, pz+pos.z); + m_sysmemBuffer[i * 3 + 2] = new Vector4(1, px + pos.x, pos.y, pz + pos.z); } } @@ -218,7 +217,7 @@ void Update() { m_phase += Time.fixedDeltaTime * m_motionSpeed; - if ( m_motionAmplitude > 0.0f ) + if (m_motionAmplitude > 0.0f) { Vector3 pos = new Vector3(0, 0, Mathf.Cos(m_phase) * m_motionAmplitude); UpdatePositions(pos + m_center); diff --git a/TestProjects/UniversalHybridTest/Assets/SampleScenes/BatchRenderGroupRaw/BRGSetup.cs.meta b/TestProjects/BatchRendererGroup_URP/Assets/SampleScenes/BatchRenderGroupRaw/BRGSetup.cs.meta similarity index 100% rename from TestProjects/UniversalHybridTest/Assets/SampleScenes/BatchRenderGroupRaw/BRGSetup.cs.meta rename to TestProjects/BatchRendererGroup_URP/Assets/SampleScenes/BatchRenderGroupRaw/BRGSetup.cs.meta diff --git a/TestProjects/UniversalHybridTest/Assets/SampleScenes/BatchRenderGroupRaw/BatchRenderGroupRaw.meta b/TestProjects/BatchRendererGroup_URP/Assets/SampleScenes/BatchRenderGroupRaw/BatchRenderGroupRaw.meta similarity index 100% rename from TestProjects/UniversalHybridTest/Assets/SampleScenes/BatchRenderGroupRaw/BatchRenderGroupRaw.meta rename to TestProjects/BatchRendererGroup_URP/Assets/SampleScenes/BatchRenderGroupRaw/BatchRenderGroupRaw.meta diff --git a/TestProjects/UniversalHybridTest/Assets/SampleScenes/BatchRenderGroupRaw/BatchRenderGroupRaw.unity b/TestProjects/BatchRendererGroup_URP/Assets/SampleScenes/BatchRenderGroupRaw/BatchRenderGroupRaw.unity similarity index 100% rename from TestProjects/UniversalHybridTest/Assets/SampleScenes/BatchRenderGroupRaw/BatchRenderGroupRaw.unity rename to TestProjects/BatchRendererGroup_URP/Assets/SampleScenes/BatchRenderGroupRaw/BatchRenderGroupRaw.unity diff --git a/TestProjects/UniversalHybridTest/Assets/SampleScenes/BatchRenderGroupRaw/BatchRenderGroupRaw.unity.meta b/TestProjects/BatchRendererGroup_URP/Assets/SampleScenes/BatchRenderGroupRaw/BatchRenderGroupRaw.unity.meta similarity index 100% rename from TestProjects/UniversalHybridTest/Assets/SampleScenes/BatchRenderGroupRaw/BatchRenderGroupRaw.unity.meta rename to TestProjects/BatchRendererGroup_URP/Assets/SampleScenes/BatchRenderGroupRaw/BatchRenderGroupRaw.unity.meta diff --git a/TestProjects/UniversalHybridTest/Assets/SampleScenes/BatchRenderGroupRaw/BatchRenderGroupRaw/Global Volume Profile.asset b/TestProjects/BatchRendererGroup_URP/Assets/SampleScenes/BatchRenderGroupRaw/BatchRenderGroupRaw/Global Volume Profile.asset similarity index 100% rename from TestProjects/UniversalHybridTest/Assets/SampleScenes/BatchRenderGroupRaw/BatchRenderGroupRaw/Global Volume Profile.asset rename to TestProjects/BatchRendererGroup_URP/Assets/SampleScenes/BatchRenderGroupRaw/BatchRenderGroupRaw/Global Volume Profile.asset diff --git a/TestProjects/UniversalHybridTest/Assets/SampleScenes/BatchRenderGroupRaw/BatchRenderGroupRaw/Global Volume Profile.asset.meta b/TestProjects/BatchRendererGroup_URP/Assets/SampleScenes/BatchRenderGroupRaw/BatchRenderGroupRaw/Global Volume Profile.asset.meta similarity index 100% rename from TestProjects/UniversalHybridTest/Assets/SampleScenes/BatchRenderGroupRaw/BatchRenderGroupRaw/Global Volume Profile.asset.meta rename to TestProjects/BatchRendererGroup_URP/Assets/SampleScenes/BatchRenderGroupRaw/BatchRenderGroupRaw/Global Volume Profile.asset.meta diff --git a/TestProjects/UniversalHybridTest/Assets/SampleScenes/SimpleExample.meta b/TestProjects/BatchRendererGroup_URP/Assets/SampleScenes/SimpleExample.meta similarity index 100% rename from TestProjects/UniversalHybridTest/Assets/SampleScenes/SimpleExample.meta rename to TestProjects/BatchRendererGroup_URP/Assets/SampleScenes/SimpleExample.meta diff --git a/TestProjects/UniversalHybridTest/Assets/SampleScenes/SimpleExample/SimpleBRGExample.cs b/TestProjects/BatchRendererGroup_URP/Assets/SampleScenes/SimpleExample/SimpleBRGExample.cs similarity index 100% rename from TestProjects/UniversalHybridTest/Assets/SampleScenes/SimpleExample/SimpleBRGExample.cs rename to TestProjects/BatchRendererGroup_URP/Assets/SampleScenes/SimpleExample/SimpleBRGExample.cs diff --git a/TestProjects/UniversalHybridTest/Assets/SampleScenes/SimpleExample/SimpleBRGExample.cs.meta b/TestProjects/BatchRendererGroup_URP/Assets/SampleScenes/SimpleExample/SimpleBRGExample.cs.meta similarity index 100% rename from TestProjects/UniversalHybridTest/Assets/SampleScenes/SimpleExample/SimpleBRGExample.cs.meta rename to TestProjects/BatchRendererGroup_URP/Assets/SampleScenes/SimpleExample/SimpleBRGExample.cs.meta diff --git a/TestProjects/UniversalHybridTest/Assets/SampleScenes/SimpleExample/SimpleBRGExample.unity b/TestProjects/BatchRendererGroup_URP/Assets/SampleScenes/SimpleExample/SimpleBRGExample.unity similarity index 100% rename from TestProjects/UniversalHybridTest/Assets/SampleScenes/SimpleExample/SimpleBRGExample.unity rename to TestProjects/BatchRendererGroup_URP/Assets/SampleScenes/SimpleExample/SimpleBRGExample.unity diff --git a/TestProjects/UniversalHybridTest/Assets/SampleScenes/SimpleExample/SimpleBRGExample.unity.meta b/TestProjects/BatchRendererGroup_URP/Assets/SampleScenes/SimpleExample/SimpleBRGExample.unity.meta similarity index 100% rename from TestProjects/UniversalHybridTest/Assets/SampleScenes/SimpleExample/SimpleBRGExample.unity.meta rename to TestProjects/BatchRendererGroup_URP/Assets/SampleScenes/SimpleExample/SimpleBRGExample.unity.meta diff --git a/TestProjects/UniversalHybridTest/Assets/Tests.meta b/TestProjects/BatchRendererGroup_URP/Assets/Tests.meta similarity index 100% rename from TestProjects/UniversalHybridTest/Assets/Tests.meta rename to TestProjects/BatchRendererGroup_URP/Assets/Tests.meta diff --git a/TestProjects/UniversalHybridTest/Assets/Tests/Editor.meta b/TestProjects/BatchRendererGroup_URP/Assets/Tests/Editor.meta similarity index 100% rename from TestProjects/UniversalHybridTest/Assets/Tests/Editor.meta rename to TestProjects/BatchRendererGroup_URP/Assets/Tests/Editor.meta diff --git a/TestProjects/UniversalHybridTest/Assets/Tests/Editor/SetupGraphicsTestCases.cs b/TestProjects/BatchRendererGroup_URP/Assets/Tests/Editor/SetupGraphicsTestCases.cs similarity index 99% rename from TestProjects/UniversalHybridTest/Assets/Tests/Editor/SetupGraphicsTestCases.cs rename to TestProjects/BatchRendererGroup_URP/Assets/Tests/Editor/SetupGraphicsTestCases.cs index b72fa167364..2c496a48321 100644 --- a/TestProjects/UniversalHybridTest/Assets/Tests/Editor/SetupGraphicsTestCases.cs +++ b/TestProjects/BatchRendererGroup_URP/Assets/Tests/Editor/SetupGraphicsTestCases.cs @@ -16,4 +16,4 @@ public void Setup() // Configure project for XR tests Unity.Testing.XR.Editor.InjectMockHMD.SetupLoader(); } -} \ No newline at end of file +} diff --git a/TestProjects/UniversalHybridTest/Assets/Tests/Editor/SetupGraphicsTestCases.cs.meta b/TestProjects/BatchRendererGroup_URP/Assets/Tests/Editor/SetupGraphicsTestCases.cs.meta similarity index 100% rename from TestProjects/UniversalHybridTest/Assets/Tests/Editor/SetupGraphicsTestCases.cs.meta rename to TestProjects/BatchRendererGroup_URP/Assets/Tests/Editor/SetupGraphicsTestCases.cs.meta diff --git a/TestProjects/HDRP_HybridTests/Assets/Tests/Editor/SetupProject.cs b/TestProjects/BatchRendererGroup_URP/Assets/Tests/Editor/SetupProject.cs similarity index 90% rename from TestProjects/HDRP_HybridTests/Assets/Tests/Editor/SetupProject.cs rename to TestProjects/BatchRendererGroup_URP/Assets/Tests/Editor/SetupProject.cs index 0957cb28e6b..fbf5425a987 100644 --- a/TestProjects/HDRP_HybridTests/Assets/Tests/Editor/SetupProject.cs +++ b/TestProjects/BatchRendererGroup_URP/Assets/Tests/Editor/SetupProject.cs @@ -1,4 +1,4 @@ -//This script is copied from UniversalRP TestProject +//This script is copied from UniversalRP TestProject // https://github.com/Unity-Technologies/ScriptableRenderPipeline/blob/master/TestProjects/UniversalGraphicsTest/Assets/Test/Editor/SetupProject.cs using System; @@ -13,7 +13,7 @@ public static class SetupProject { public static void ApplySettings() { - #if UNITY_EDITOR +#if UNITY_EDITOR var options = new Dictionary { { "gamma", () => PlayerSettings.colorSpace = ColorSpace.Gamma }, @@ -31,14 +31,14 @@ public static void ApplySettings() if (options.TryGetValue(arg, out action)) action(); } - #endif +#endif } static void SetGraphicsAPI(GraphicsDeviceType api) { - #if UNITY_EDITOR +#if UNITY_EDITOR var currentTarget = EditorUserBuildSettings.activeBuildTarget; PlayerSettings.SetGraphicsAPIs(currentTarget, new [] { api } ); - #endif +#endif } } diff --git a/TestProjects/UniversalHybridTest/Assets/Tests/Editor/SetupProject.cs.meta b/TestProjects/BatchRendererGroup_URP/Assets/Tests/Editor/SetupProject.cs.meta similarity index 100% rename from TestProjects/UniversalHybridTest/Assets/Tests/Editor/SetupProject.cs.meta rename to TestProjects/BatchRendererGroup_URP/Assets/Tests/Editor/SetupProject.cs.meta diff --git a/TestProjects/UniversalHybridTest/Assets/Tests/Editor/TestEditor.asmdef b/TestProjects/BatchRendererGroup_URP/Assets/Tests/Editor/TestEditor.asmdef similarity index 100% rename from TestProjects/UniversalHybridTest/Assets/Tests/Editor/TestEditor.asmdef rename to TestProjects/BatchRendererGroup_URP/Assets/Tests/Editor/TestEditor.asmdef diff --git a/TestProjects/UniversalHybridTest/Assets/Tests/Editor/TestEditor.asmdef.meta b/TestProjects/BatchRendererGroup_URP/Assets/Tests/Editor/TestEditor.asmdef.meta similarity index 100% rename from TestProjects/UniversalHybridTest/Assets/Tests/Editor/TestEditor.asmdef.meta rename to TestProjects/BatchRendererGroup_URP/Assets/Tests/Editor/TestEditor.asmdef.meta diff --git a/TestProjects/UniversalHybridTest/Assets/Tests/Runtime.meta b/TestProjects/BatchRendererGroup_URP/Assets/Tests/Runtime.meta similarity index 100% rename from TestProjects/UniversalHybridTest/Assets/Tests/Runtime.meta rename to TestProjects/BatchRendererGroup_URP/Assets/Tests/Runtime.meta diff --git a/TestProjects/UniversalHybridTest/Assets/Tests/Runtime/GraphicsTestFix.cs b/TestProjects/BatchRendererGroup_URP/Assets/Tests/Runtime/GraphicsTestFix.cs similarity index 66% rename from TestProjects/UniversalHybridTest/Assets/Tests/Runtime/GraphicsTestFix.cs rename to TestProjects/BatchRendererGroup_URP/Assets/Tests/Runtime/GraphicsTestFix.cs index 42a335bad2e..c7c6ac15b46 100644 --- a/TestProjects/UniversalHybridTest/Assets/Tests/Runtime/GraphicsTestFix.cs +++ b/TestProjects/BatchRendererGroup_URP/Assets/Tests/Runtime/GraphicsTestFix.cs @@ -1,4 +1,4 @@ -//This is for fixing yamato standalone test. Attach this component to MainCamera if standalone test is fine when you run locally but fails on yamato (sub-scene objects are not rendering / not stable) +//This is for fixing yamato standalone test. Attach this component to MainCamera if standalone test is fine when you run locally but fails on yamato (sub-scene objects are not rendering / not stable) using System.Collections; using System.Collections.Generic; using UnityEngine; @@ -6,7 +6,7 @@ public class GraphicsTestFix : MonoBehaviour { - #if !UNITY_EDITOR //wrapper so that it runs on player only +#if !UNITY_EDITOR //wrapper so that it runs on player only private GraphicsTestSettingsCustom settings; private Camera cam; @@ -22,15 +22,15 @@ void Start() void Update() { - if(count == settings.WaitFrames -3) + if (count == settings.WaitFrames - 3) { - Debug.Log(count+" GraphicsTestFix - start callback"); + Debug.Log(count + " GraphicsTestFix - start callback"); RenderPipelineManager.endFrameRendering += MyRenderFrame; } count++; } - - private void MyRenderFrame(ScriptableRenderContext context,Camera[] cameras) + + private void MyRenderFrame(ScriptableRenderContext context, Camera[] cameras) { //Make a capture when reached correct frame if (texture == null) @@ -38,16 +38,16 @@ private void MyRenderFrame(ScriptableRenderContext context,Camera[] cameras) texture = new Texture2D(cam.pixelWidth, cam.pixelHeight, TextureFormat.RGB24, false); texture.ReadPixels(new Rect(0, 0, texture.width, texture.height), 0, 0, false); texture.Apply(); - Debug.Log(count+" GraphicsTestFix - done ReadPixel"); + Debug.Log(count + " GraphicsTestFix - done ReadPixel"); } //Blit captured texture to the screen afterwards, so that the screen stays static if (texture != null) { - if(cam.targetTexture != null) + if (cam.targetTexture != null) { - Graphics.Blit(texture,cam.targetTexture); - Debug.Log(count+" GraphicsTestFix - done Blit to cam.targetTexture = "+cam.targetTexture.name); + Graphics.Blit(texture, cam.targetTexture); + Debug.Log(count + " GraphicsTestFix - done Blit to cam.targetTexture = " + cam.targetTexture.name); } else { @@ -73,8 +73,5 @@ private void CleanUp() RenderPipelineManager.endFrameRendering -= MyRenderFrame; } - #endif +#endif } - - - diff --git a/TestProjects/UniversalHybridTest/Assets/Tests/Runtime/GraphicsTestFix.cs.meta b/TestProjects/BatchRendererGroup_URP/Assets/Tests/Runtime/GraphicsTestFix.cs.meta similarity index 100% rename from TestProjects/UniversalHybridTest/Assets/Tests/Runtime/GraphicsTestFix.cs.meta rename to TestProjects/BatchRendererGroup_URP/Assets/Tests/Runtime/GraphicsTestFix.cs.meta diff --git a/TestProjects/UniversalHybridTest/Assets/Tests/Runtime/GraphicsTestSettingsCustom.cs b/TestProjects/BatchRendererGroup_URP/Assets/Tests/Runtime/GraphicsTestSettingsCustom.cs similarity index 91% rename from TestProjects/UniversalHybridTest/Assets/Tests/Runtime/GraphicsTestSettingsCustom.cs rename to TestProjects/BatchRendererGroup_URP/Assets/Tests/Runtime/GraphicsTestSettingsCustom.cs index b2fab1bdc07..9e2064c842a 100644 --- a/TestProjects/UniversalHybridTest/Assets/Tests/Runtime/GraphicsTestSettingsCustom.cs +++ b/TestProjects/BatchRendererGroup_URP/Assets/Tests/Runtime/GraphicsTestSettingsCustom.cs @@ -1,4 +1,4 @@ -//This script is copied from UniversalRP TestProject +//This script is copied from UniversalRP TestProject // https://github.com/Unity-Technologies/ScriptableRenderPipeline/blob/master/TestProjects/UniversalGraphicsTest/Assets/Test/Runtime/UniversalGraphicsTestSettings.cs using UnityEngine.TestTools.Graphics; diff --git a/TestProjects/UniversalHybridTest/Assets/Tests/Runtime/GraphicsTestSettingsCustom.cs.meta b/TestProjects/BatchRendererGroup_URP/Assets/Tests/Runtime/GraphicsTestSettingsCustom.cs.meta similarity index 100% rename from TestProjects/UniversalHybridTest/Assets/Tests/Runtime/GraphicsTestSettingsCustom.cs.meta rename to TestProjects/BatchRendererGroup_URP/Assets/Tests/Runtime/GraphicsTestSettingsCustom.cs.meta diff --git a/TestProjects/UniversalHybridTest/Assets/Tests/Runtime/GraphicsTests.cs b/TestProjects/BatchRendererGroup_URP/Assets/Tests/Runtime/GraphicsTests.cs similarity index 92% rename from TestProjects/UniversalHybridTest/Assets/Tests/Runtime/GraphicsTests.cs rename to TestProjects/BatchRendererGroup_URP/Assets/Tests/Runtime/GraphicsTests.cs index 95164507121..69b10b1cecb 100644 --- a/TestProjects/UniversalHybridTest/Assets/Tests/Runtime/GraphicsTests.cs +++ b/TestProjects/BatchRendererGroup_URP/Assets/Tests/Runtime/GraphicsTests.cs @@ -1,4 +1,4 @@ - + using System.Collections; using System.Linq; using NUnit.Framework; @@ -10,10 +10,10 @@ public class GraphicsTests { - #if UNITY_ANDROID +#if UNITY_ANDROID static bool wasFirstSceneRan = false; const int firstSceneAdditionalFrames = 3; - #endif +#endif public const string path = "Assets/ReferenceImages"; [UnityTest, Category("GraphicsTest")] @@ -31,11 +31,11 @@ public IEnumerator Run(GraphicsTestCase testCase) var settings = Object.FindObjectOfType(); if (settings == null) Assert.Ignore("Ignoring this test for GraphicsTest because couldn't find GraphicsTestSettingsCustom"); - #if !UNITY_EDITOR +#if !UNITY_EDITOR Screen.SetResolution(settings.ImageComparisonSettings.TargetWidth, settings.ImageComparisonSettings.TargetHeight, false); - #endif +#endif - var cameras = GameObject.FindGameObjectsWithTag("MainCamera").Select(x=>x.GetComponent()); + var cameras = GameObject.FindGameObjectsWithTag("MainCamera").Select(x => x.GetComponent()); yield return null; @@ -55,7 +55,7 @@ public IEnumerator Run(GraphicsTestCase testCase) yield return new WaitForEndOfFrame(); - #if UNITY_ANDROID +#if UNITY_ANDROID // On Android first scene often needs a bit more frames to load all the assets // otherwise the screenshot is just a black screen if (!wasFirstSceneRan) @@ -66,7 +66,7 @@ public IEnumerator Run(GraphicsTestCase testCase) } wasFirstSceneRan = true; } - #endif +#endif ImageAssert.AreEqual(testCase.ReferenceImage, cameras.Where(x => x != null), settings.ImageComparisonSettings); } @@ -74,10 +74,10 @@ public IEnumerator Run(GraphicsTestCase testCase) [TearDown] public void DumpImagesInEditor() { - #if UNITY_EDITOR +#if UNITY_EDITOR UnityEditor.TestTools.Graphics.ResultsUtility.ExtractImagesFromTestProperties(TestContext.CurrentContext.Test); - #endif +#endif XRGraphicsAutomatedTests.running = false; } -} \ No newline at end of file +} diff --git a/TestProjects/UniversalHybridTest/Assets/Tests/Runtime/GraphicsTests.cs.meta b/TestProjects/BatchRendererGroup_URP/Assets/Tests/Runtime/GraphicsTests.cs.meta similarity index 100% rename from TestProjects/UniversalHybridTest/Assets/Tests/Runtime/GraphicsTests.cs.meta rename to TestProjects/BatchRendererGroup_URP/Assets/Tests/Runtime/GraphicsTests.cs.meta diff --git a/TestProjects/UniversalHybridTest/Assets/Tests/Runtime/TestRuntime.asmdef b/TestProjects/BatchRendererGroup_URP/Assets/Tests/Runtime/TestRuntime.asmdef similarity index 100% rename from TestProjects/UniversalHybridTest/Assets/Tests/Runtime/TestRuntime.asmdef rename to TestProjects/BatchRendererGroup_URP/Assets/Tests/Runtime/TestRuntime.asmdef diff --git a/TestProjects/UniversalHybridTest/Assets/Tests/Runtime/TestRuntime.asmdef.meta b/TestProjects/BatchRendererGroup_URP/Assets/Tests/Runtime/TestRuntime.asmdef.meta similarity index 100% rename from TestProjects/UniversalHybridTest/Assets/Tests/Runtime/TestRuntime.asmdef.meta rename to TestProjects/BatchRendererGroup_URP/Assets/Tests/Runtime/TestRuntime.asmdef.meta diff --git a/TestProjects/UniversalHybridTest/Assets/URPSettings.meta b/TestProjects/BatchRendererGroup_URP/Assets/URPSettings.meta similarity index 100% rename from TestProjects/UniversalHybridTest/Assets/URPSettings.meta rename to TestProjects/BatchRendererGroup_URP/Assets/URPSettings.meta diff --git a/TestProjects/UniversalHybridTest/Assets/URPSettings/UniversalRenderPipelineAsset.asset b/TestProjects/BatchRendererGroup_URP/Assets/URPSettings/UniversalRenderPipelineAsset.asset similarity index 100% rename from TestProjects/UniversalHybridTest/Assets/URPSettings/UniversalRenderPipelineAsset.asset rename to TestProjects/BatchRendererGroup_URP/Assets/URPSettings/UniversalRenderPipelineAsset.asset diff --git a/TestProjects/UniversalHybridTest/Assets/URPSettings/UniversalRenderPipelineAsset.asset.meta b/TestProjects/BatchRendererGroup_URP/Assets/URPSettings/UniversalRenderPipelineAsset.asset.meta similarity index 100% rename from TestProjects/UniversalHybridTest/Assets/URPSettings/UniversalRenderPipelineAsset.asset.meta rename to TestProjects/BatchRendererGroup_URP/Assets/URPSettings/UniversalRenderPipelineAsset.asset.meta diff --git a/TestProjects/UniversalHybridTest/Assets/URPSettings/UniversalRenderPipelineAsset_Renderer.asset b/TestProjects/BatchRendererGroup_URP/Assets/URPSettings/UniversalRenderPipelineAsset_Renderer.asset similarity index 100% rename from TestProjects/UniversalHybridTest/Assets/URPSettings/UniversalRenderPipelineAsset_Renderer.asset rename to TestProjects/BatchRendererGroup_URP/Assets/URPSettings/UniversalRenderPipelineAsset_Renderer.asset diff --git a/TestProjects/UniversalHybridTest/Assets/URPSettings/UniversalRenderPipelineAsset_Renderer.asset.meta b/TestProjects/BatchRendererGroup_URP/Assets/URPSettings/UniversalRenderPipelineAsset_Renderer.asset.meta similarity index 100% rename from TestProjects/UniversalHybridTest/Assets/URPSettings/UniversalRenderPipelineAsset_Renderer.asset.meta rename to TestProjects/BatchRendererGroup_URP/Assets/URPSettings/UniversalRenderPipelineAsset_Renderer.asset.meta diff --git a/TestProjects/UniversalHybridTest/Assets/UniversalRenderPipelineGlobalSettings.asset b/TestProjects/BatchRendererGroup_URP/Assets/UniversalRenderPipelineGlobalSettings.asset similarity index 100% rename from TestProjects/UniversalHybridTest/Assets/UniversalRenderPipelineGlobalSettings.asset rename to TestProjects/BatchRendererGroup_URP/Assets/UniversalRenderPipelineGlobalSettings.asset diff --git a/TestProjects/UniversalHybridTest/Assets/UniversalRenderPipelineGlobalSettings.asset.meta b/TestProjects/BatchRendererGroup_URP/Assets/UniversalRenderPipelineGlobalSettings.asset.meta similarity index 100% rename from TestProjects/UniversalHybridTest/Assets/UniversalRenderPipelineGlobalSettings.asset.meta rename to TestProjects/BatchRendererGroup_URP/Assets/UniversalRenderPipelineGlobalSettings.asset.meta diff --git a/TestProjects/UniversalHybridTest/Assets/VFXDefaultResources.asset b/TestProjects/BatchRendererGroup_URP/Assets/VFXDefaultResources.asset similarity index 100% rename from TestProjects/UniversalHybridTest/Assets/VFXDefaultResources.asset rename to TestProjects/BatchRendererGroup_URP/Assets/VFXDefaultResources.asset diff --git a/TestProjects/UniversalHybridTest/Assets/VFXDefaultResources.asset.meta b/TestProjects/BatchRendererGroup_URP/Assets/VFXDefaultResources.asset.meta similarity index 100% rename from TestProjects/UniversalHybridTest/Assets/VFXDefaultResources.asset.meta rename to TestProjects/BatchRendererGroup_URP/Assets/VFXDefaultResources.asset.meta diff --git a/TestProjects/UniversalHybridTest/Packages/manifest.json b/TestProjects/BatchRendererGroup_URP/Packages/manifest.json similarity index 100% rename from TestProjects/UniversalHybridTest/Packages/manifest.json rename to TestProjects/BatchRendererGroup_URP/Packages/manifest.json diff --git a/TestProjects/UniversalHybridTest/Packages/packages-lock.json b/TestProjects/BatchRendererGroup_URP/Packages/packages-lock.json similarity index 100% rename from TestProjects/UniversalHybridTest/Packages/packages-lock.json rename to TestProjects/BatchRendererGroup_URP/Packages/packages-lock.json diff --git a/TestProjects/UniversalHybridTest/ProjectSettings/AudioManager.asset b/TestProjects/BatchRendererGroup_URP/ProjectSettings/AudioManager.asset similarity index 100% rename from TestProjects/UniversalHybridTest/ProjectSettings/AudioManager.asset rename to TestProjects/BatchRendererGroup_URP/ProjectSettings/AudioManager.asset diff --git a/TestProjects/UniversalHybridTest/ProjectSettings/ClusterInputManager.asset b/TestProjects/BatchRendererGroup_URP/ProjectSettings/ClusterInputManager.asset similarity index 100% rename from TestProjects/UniversalHybridTest/ProjectSettings/ClusterInputManager.asset rename to TestProjects/BatchRendererGroup_URP/ProjectSettings/ClusterInputManager.asset diff --git a/TestProjects/UniversalHybridTest/ProjectSettings/DynamicsManager.asset b/TestProjects/BatchRendererGroup_URP/ProjectSettings/DynamicsManager.asset similarity index 100% rename from TestProjects/UniversalHybridTest/ProjectSettings/DynamicsManager.asset rename to TestProjects/BatchRendererGroup_URP/ProjectSettings/DynamicsManager.asset diff --git a/TestProjects/UniversalHybridTest/ProjectSettings/EditorBuildSettings.asset b/TestProjects/BatchRendererGroup_URP/ProjectSettings/EditorBuildSettings.asset similarity index 100% rename from TestProjects/UniversalHybridTest/ProjectSettings/EditorBuildSettings.asset rename to TestProjects/BatchRendererGroup_URP/ProjectSettings/EditorBuildSettings.asset diff --git a/TestProjects/UniversalHybridTest/ProjectSettings/EditorSettings.asset b/TestProjects/BatchRendererGroup_URP/ProjectSettings/EditorSettings.asset similarity index 100% rename from TestProjects/UniversalHybridTest/ProjectSettings/EditorSettings.asset rename to TestProjects/BatchRendererGroup_URP/ProjectSettings/EditorSettings.asset diff --git a/TestProjects/UniversalHybridTest/ProjectSettings/GraphicsSettings.asset b/TestProjects/BatchRendererGroup_URP/ProjectSettings/GraphicsSettings.asset similarity index 100% rename from TestProjects/UniversalHybridTest/ProjectSettings/GraphicsSettings.asset rename to TestProjects/BatchRendererGroup_URP/ProjectSettings/GraphicsSettings.asset diff --git a/TestProjects/UniversalHybridTest/ProjectSettings/InputManager.asset b/TestProjects/BatchRendererGroup_URP/ProjectSettings/InputManager.asset similarity index 100% rename from TestProjects/UniversalHybridTest/ProjectSettings/InputManager.asset rename to TestProjects/BatchRendererGroup_URP/ProjectSettings/InputManager.asset diff --git a/TestProjects/UniversalHybridTest/ProjectSettings/MemorySettings.asset b/TestProjects/BatchRendererGroup_URP/ProjectSettings/MemorySettings.asset similarity index 100% rename from TestProjects/UniversalHybridTest/ProjectSettings/MemorySettings.asset rename to TestProjects/BatchRendererGroup_URP/ProjectSettings/MemorySettings.asset diff --git a/TestProjects/UniversalHybridTest/ProjectSettings/NavMeshAreas.asset b/TestProjects/BatchRendererGroup_URP/ProjectSettings/NavMeshAreas.asset similarity index 100% rename from TestProjects/UniversalHybridTest/ProjectSettings/NavMeshAreas.asset rename to TestProjects/BatchRendererGroup_URP/ProjectSettings/NavMeshAreas.asset diff --git a/TestProjects/UniversalHybridTest/ProjectSettings/NetworkManager.asset b/TestProjects/BatchRendererGroup_URP/ProjectSettings/NetworkManager.asset similarity index 100% rename from TestProjects/UniversalHybridTest/ProjectSettings/NetworkManager.asset rename to TestProjects/BatchRendererGroup_URP/ProjectSettings/NetworkManager.asset diff --git a/TestProjects/UniversalHybridTest/ProjectSettings/PackageManagerSettings.asset b/TestProjects/BatchRendererGroup_URP/ProjectSettings/PackageManagerSettings.asset similarity index 100% rename from TestProjects/UniversalHybridTest/ProjectSettings/PackageManagerSettings.asset rename to TestProjects/BatchRendererGroup_URP/ProjectSettings/PackageManagerSettings.asset diff --git a/TestProjects/UniversalHybridTest/ProjectSettings/Physics2DSettings.asset b/TestProjects/BatchRendererGroup_URP/ProjectSettings/Physics2DSettings.asset similarity index 100% rename from TestProjects/UniversalHybridTest/ProjectSettings/Physics2DSettings.asset rename to TestProjects/BatchRendererGroup_URP/ProjectSettings/Physics2DSettings.asset diff --git a/TestProjects/UniversalHybridTest/ProjectSettings/PresetManager.asset b/TestProjects/BatchRendererGroup_URP/ProjectSettings/PresetManager.asset similarity index 100% rename from TestProjects/UniversalHybridTest/ProjectSettings/PresetManager.asset rename to TestProjects/BatchRendererGroup_URP/ProjectSettings/PresetManager.asset diff --git a/TestProjects/UniversalHybridTest/ProjectSettings/ProjectSettings.asset b/TestProjects/BatchRendererGroup_URP/ProjectSettings/ProjectSettings.asset similarity index 100% rename from TestProjects/UniversalHybridTest/ProjectSettings/ProjectSettings.asset rename to TestProjects/BatchRendererGroup_URP/ProjectSettings/ProjectSettings.asset diff --git a/TestProjects/UniversalHybridTest/ProjectSettings/QualitySettings.asset b/TestProjects/BatchRendererGroup_URP/ProjectSettings/QualitySettings.asset similarity index 100% rename from TestProjects/UniversalHybridTest/ProjectSettings/QualitySettings.asset rename to TestProjects/BatchRendererGroup_URP/ProjectSettings/QualitySettings.asset diff --git a/TestProjects/UniversalHybridTest/ProjectSettings/ShaderGraphSettings.asset b/TestProjects/BatchRendererGroup_URP/ProjectSettings/ShaderGraphSettings.asset similarity index 100% rename from TestProjects/UniversalHybridTest/ProjectSettings/ShaderGraphSettings.asset rename to TestProjects/BatchRendererGroup_URP/ProjectSettings/ShaderGraphSettings.asset diff --git a/TestProjects/UniversalHybridTest/ProjectSettings/TagManager.asset b/TestProjects/BatchRendererGroup_URP/ProjectSettings/TagManager.asset similarity index 100% rename from TestProjects/UniversalHybridTest/ProjectSettings/TagManager.asset rename to TestProjects/BatchRendererGroup_URP/ProjectSettings/TagManager.asset diff --git a/TestProjects/UniversalHybridTest/ProjectSettings/TimeManager.asset b/TestProjects/BatchRendererGroup_URP/ProjectSettings/TimeManager.asset similarity index 100% rename from TestProjects/UniversalHybridTest/ProjectSettings/TimeManager.asset rename to TestProjects/BatchRendererGroup_URP/ProjectSettings/TimeManager.asset diff --git a/TestProjects/UniversalHybridTest/ProjectSettings/URPProjectSettings.asset b/TestProjects/BatchRendererGroup_URP/ProjectSettings/URPProjectSettings.asset similarity index 100% rename from TestProjects/UniversalHybridTest/ProjectSettings/URPProjectSettings.asset rename to TestProjects/BatchRendererGroup_URP/ProjectSettings/URPProjectSettings.asset diff --git a/TestProjects/UniversalHybridTest/ProjectSettings/UnityConnectSettings.asset b/TestProjects/BatchRendererGroup_URP/ProjectSettings/UnityConnectSettings.asset similarity index 100% rename from TestProjects/UniversalHybridTest/ProjectSettings/UnityConnectSettings.asset rename to TestProjects/BatchRendererGroup_URP/ProjectSettings/UnityConnectSettings.asset diff --git a/TestProjects/UniversalHybridTest/ProjectSettings/VFXManager.asset b/TestProjects/BatchRendererGroup_URP/ProjectSettings/VFXManager.asset similarity index 100% rename from TestProjects/UniversalHybridTest/ProjectSettings/VFXManager.asset rename to TestProjects/BatchRendererGroup_URP/ProjectSettings/VFXManager.asset diff --git a/TestProjects/UniversalHybridTest/ProjectSettings/VersionControlSettings.asset b/TestProjects/BatchRendererGroup_URP/ProjectSettings/VersionControlSettings.asset similarity index 100% rename from TestProjects/UniversalHybridTest/ProjectSettings/VersionControlSettings.asset rename to TestProjects/BatchRendererGroup_URP/ProjectSettings/VersionControlSettings.asset diff --git a/TestProjects/UniversalHybridTest/ProjectSettings/XRPackageSettings.asset b/TestProjects/BatchRendererGroup_URP/ProjectSettings/XRPackageSettings.asset similarity index 100% rename from TestProjects/UniversalHybridTest/ProjectSettings/XRPackageSettings.asset rename to TestProjects/BatchRendererGroup_URP/ProjectSettings/XRPackageSettings.asset diff --git a/TestProjects/UniversalHybridTest/ProjectSettings/XRSettings.asset b/TestProjects/BatchRendererGroup_URP/ProjectSettings/XRSettings.asset similarity index 100% rename from TestProjects/UniversalHybridTest/ProjectSettings/XRSettings.asset rename to TestProjects/BatchRendererGroup_URP/ProjectSettings/XRSettings.asset diff --git a/TestProjects/UniversalHybridTest/TestRunnerOptions.json b/TestProjects/BatchRendererGroup_URP/TestRunnerOptions.json similarity index 100% rename from TestProjects/UniversalHybridTest/TestRunnerOptions.json rename to TestProjects/BatchRendererGroup_URP/TestRunnerOptions.json diff --git a/TestProjects/UniversalHybridTest/UserSettings/EditorUserSettings.asset b/TestProjects/BatchRendererGroup_URP/UserSettings/EditorUserSettings.asset similarity index 100% rename from TestProjects/UniversalHybridTest/UserSettings/EditorUserSettings.asset rename to TestProjects/BatchRendererGroup_URP/UserSettings/EditorUserSettings.asset diff --git a/TestProjects/UniversalHybridTest/UserSettings/Layouts/default-2022.dwlt b/TestProjects/BatchRendererGroup_URP/UserSettings/Layouts/default-2022.dwlt similarity index 100% rename from TestProjects/UniversalHybridTest/UserSettings/Layouts/default-2022.dwlt rename to TestProjects/BatchRendererGroup_URP/UserSettings/Layouts/default-2022.dwlt diff --git a/TestProjects/UniversalHybridTest/UserSettings/Search.settings b/TestProjects/BatchRendererGroup_URP/UserSettings/Search.settings similarity index 100% rename from TestProjects/UniversalHybridTest/UserSettings/Search.settings rename to TestProjects/BatchRendererGroup_URP/UserSettings/Search.settings diff --git a/TestProjects/HDRP_HybridTests/Assets/ReferenceImages/Linear/OSXEditor/Metal/None/BRGGameObjects.png b/TestProjects/HDRP_HybridTests/Assets/ReferenceImages/Linear/OSXEditor/Metal/None/BRGGameObjects.png deleted file mode 100644 index 069d30639ac..00000000000 --- a/TestProjects/HDRP_HybridTests/Assets/ReferenceImages/Linear/OSXEditor/Metal/None/BRGGameObjects.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:74cf52c6606eb93c9ae96370bc4fda89c8dbede6a7b614c1026d6a11ad666076 -size 129856 diff --git a/TestProjects/HDRP_HybridTests/Assets/ReferenceImages/Linear/OSXEditor/Metal/None/BatchRenderGroupRaw.png b/TestProjects/HDRP_HybridTests/Assets/ReferenceImages/Linear/OSXEditor/Metal/None/BatchRenderGroupRaw.png deleted file mode 100644 index 3db4f5a90f8..00000000000 --- a/TestProjects/HDRP_HybridTests/Assets/ReferenceImages/Linear/OSXEditor/Metal/None/BatchRenderGroupRaw.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5104f8d4c6acdd8265300e25cbc1ad131233e72881935048a923adef757afdd5 -size 968312 diff --git a/TestProjects/HDRP_HybridTests/Assets/ReferenceImages/Linear/OSXPlayer/Metal/None/AreEqual_WithTotallyDifferentImages_ThrowsAssertionException.png b/TestProjects/HDRP_HybridTests/Assets/ReferenceImages/Linear/OSXPlayer/Metal/None/AreEqual_WithTotallyDifferentImages_ThrowsAssertionException.png deleted file mode 100644 index 2db7b660b18..00000000000 --- a/TestProjects/HDRP_HybridTests/Assets/ReferenceImages/Linear/OSXPlayer/Metal/None/AreEqual_WithTotallyDifferentImages_ThrowsAssertionException.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9e1b2fb7becd40bcfce82dfe66ca3689d727154d45d3036db4a3ebf108214274 -size 69 diff --git a/TestProjects/HDRP_HybridTests/Assets/ReferenceImages/Linear/OSXPlayer/Metal/None/BRGGameObjects.png b/TestProjects/HDRP_HybridTests/Assets/ReferenceImages/Linear/OSXPlayer/Metal/None/BRGGameObjects.png deleted file mode 100644 index 2766950bf04..00000000000 --- a/TestProjects/HDRP_HybridTests/Assets/ReferenceImages/Linear/OSXPlayer/Metal/None/BRGGameObjects.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f63d3a2406404eafcc810a2a07fc13882dfeeba1e34746bcf5f5548185b8bd6d -size 129712 diff --git a/TestProjects/HDRP_HybridTests/Assets/ReferenceImages/Linear/OSXPlayer/Metal/None/BatchRenderGroupRaw.png b/TestProjects/HDRP_HybridTests/Assets/ReferenceImages/Linear/OSXPlayer/Metal/None/BatchRenderGroupRaw.png deleted file mode 100644 index 66339bda365..00000000000 --- a/TestProjects/HDRP_HybridTests/Assets/ReferenceImages/Linear/OSXPlayer/Metal/None/BatchRenderGroupRaw.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0f99f89c48400245b59de9a4137392917d83ef97f2c92fbcc6517fae2c25a7c8 -size 965472 diff --git a/TestProjects/HDRP_HybridTests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/None/BRGGameObjects.png b/TestProjects/HDRP_HybridTests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/None/BRGGameObjects.png deleted file mode 100644 index e2eeb6ba0af..00000000000 --- a/TestProjects/HDRP_HybridTests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/None/BRGGameObjects.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a62a7418926c4da5d329d27635a29092a96661dcac671cbbd02b16db8814b85c -size 130470 diff --git a/TestProjects/HDRP_HybridTests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/None/BatchRenderGroupRaw.png b/TestProjects/HDRP_HybridTests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/None/BatchRenderGroupRaw.png deleted file mode 100644 index b036031f65f..00000000000 --- a/TestProjects/HDRP_HybridTests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/None/BatchRenderGroupRaw.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7a5733ca044730bb7755746321da50632d069f75c3d011e0dcb84cb88f7ff135 -size 973272 diff --git a/TestProjects/HDRP_HybridTests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D12/None/BRGGameObjects.png b/TestProjects/HDRP_HybridTests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D12/None/BRGGameObjects.png deleted file mode 100644 index e2eeb6ba0af..00000000000 --- a/TestProjects/HDRP_HybridTests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D12/None/BRGGameObjects.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a62a7418926c4da5d329d27635a29092a96661dcac671cbbd02b16db8814b85c -size 130470 diff --git a/TestProjects/HDRP_HybridTests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D12/None/BatchRenderGroupRaw.png b/TestProjects/HDRP_HybridTests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D12/None/BatchRenderGroupRaw.png deleted file mode 100644 index 02858e4fb96..00000000000 --- a/TestProjects/HDRP_HybridTests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D12/None/BatchRenderGroupRaw.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:531cd8334741ce287524f4d09340f7888626b5b0e1a97c1e3e2a8e87edaaddaf -size 973278 diff --git a/TestProjects/HDRP_HybridTests/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/None/BRGGameObjects.png b/TestProjects/HDRP_HybridTests/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/None/BRGGameObjects.png deleted file mode 100644 index 6e18e4cfcac..00000000000 --- a/TestProjects/HDRP_HybridTests/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/None/BRGGameObjects.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0abb6314645e8e68cfcadedb01841177652a7b60831ae2939feb137bc84b58a5 -size 130364 diff --git a/TestProjects/HDRP_HybridTests/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/None/BatchRenderGroupRaw.png b/TestProjects/HDRP_HybridTests/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/None/BatchRenderGroupRaw.png deleted file mode 100644 index 2b8410b16f8..00000000000 --- a/TestProjects/HDRP_HybridTests/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/None/BatchRenderGroupRaw.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9c047f42185b862f2cc6e8f7e2fa4286122eacd76c1d0948010c6226ebabb7eb -size 973214 diff --git a/TestProjects/HDRP_HybridTests/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D12/None/BRGGameObjects.png b/TestProjects/HDRP_HybridTests/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D12/None/BRGGameObjects.png deleted file mode 100644 index e2eeb6ba0af..00000000000 --- a/TestProjects/HDRP_HybridTests/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D12/None/BRGGameObjects.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a62a7418926c4da5d329d27635a29092a96661dcac671cbbd02b16db8814b85c -size 130470 diff --git a/TestProjects/HDRP_HybridTests/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D12/None/BatchRenderGroupRaw.png b/TestProjects/HDRP_HybridTests/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D12/None/BatchRenderGroupRaw.png deleted file mode 100644 index b036031f65f..00000000000 --- a/TestProjects/HDRP_HybridTests/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D12/None/BatchRenderGroupRaw.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7a5733ca044730bb7755746321da50632d069f75c3d011e0dcb84cb88f7ff135 -size 973272 diff --git a/TestProjects/HDRP_HybridTests/Assets/ReferenceImages/Linear/WindowsPlayer/Vulkan/None/BRGGameObjects.png b/TestProjects/HDRP_HybridTests/Assets/ReferenceImages/Linear/WindowsPlayer/Vulkan/None/BRGGameObjects.png deleted file mode 100644 index e2eeb6ba0af..00000000000 --- a/TestProjects/HDRP_HybridTests/Assets/ReferenceImages/Linear/WindowsPlayer/Vulkan/None/BRGGameObjects.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a62a7418926c4da5d329d27635a29092a96661dcac671cbbd02b16db8814b85c -size 130470 diff --git a/TestProjects/HDRP_HybridTests/Assets/ReferenceImages/Linear/WindowsPlayer/Vulkan/None/BatchRenderGroupRaw.png b/TestProjects/HDRP_HybridTests/Assets/ReferenceImages/Linear/WindowsPlayer/Vulkan/None/BatchRenderGroupRaw.png deleted file mode 100644 index b036031f65f..00000000000 --- a/TestProjects/HDRP_HybridTests/Assets/ReferenceImages/Linear/WindowsPlayer/Vulkan/None/BatchRenderGroupRaw.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7a5733ca044730bb7755746321da50632d069f75c3d011e0dcb84cb88f7ff135 -size 973272 diff --git a/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/Android/OpenGLES3/None/BatchRenderGroupRaw.png b/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/Android/OpenGLES3/None/BatchRenderGroupRaw.png deleted file mode 100644 index 31973b01272..00000000000 --- a/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/Android/OpenGLES3/None/BatchRenderGroupRaw.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:44204711ea07f852b9bc8f12d316f68aef8d6b4e74fedb9c9801c11dff5d613d -size 718231 diff --git a/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/Android/Vulkan/None/BatchRenderGroupRaw.png b/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/Android/Vulkan/None/BatchRenderGroupRaw.png deleted file mode 100644 index 31973b01272..00000000000 --- a/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/Android/Vulkan/None/BatchRenderGroupRaw.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:44204711ea07f852b9bc8f12d316f68aef8d6b4e74fedb9c9801c11dff5d613d -size 718231 diff --git a/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/LinuxEditor/OpenGLCore.meta b/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/LinuxEditor/OpenGLCore.meta deleted file mode 100644 index 90fd4194ff4..00000000000 --- a/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/LinuxEditor/OpenGLCore.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: d2d5af19c42ee2645adf52f0de3156d7 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/LinuxEditor/OpenGLCore/None/BRGGameObjects.png.meta b/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/LinuxEditor/OpenGLCore/None/BRGGameObjects.png.meta deleted file mode 100644 index 8c38631679a..00000000000 --- a/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/LinuxEditor/OpenGLCore/None/BRGGameObjects.png.meta +++ /dev/null @@ -1,122 +0,0 @@ -fileFormatVersion: 2 -guid: c8f927d108df1004cba1039794c27f4a -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 - ignoreMasterTextureLimit: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: 1 - aniso: 1 - mipBias: 0 - 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: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Server - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - 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: [] - nameFileIdTable: {} - spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/LinuxEditor/OpenGLCore/None/BatchRenderGroupRaw.png b/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/LinuxEditor/OpenGLCore/None/BatchRenderGroupRaw.png deleted file mode 100644 index 31973b01272..00000000000 --- a/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/LinuxEditor/OpenGLCore/None/BatchRenderGroupRaw.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:44204711ea07f852b9bc8f12d316f68aef8d6b4e74fedb9c9801c11dff5d613d -size 718231 diff --git a/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/LinuxEditor/Vulkan/None/BatchRenderGroupRaw.png b/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/LinuxEditor/Vulkan/None/BatchRenderGroupRaw.png deleted file mode 100644 index 31973b01272..00000000000 --- a/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/LinuxEditor/Vulkan/None/BatchRenderGroupRaw.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:44204711ea07f852b9bc8f12d316f68aef8d6b4e74fedb9c9801c11dff5d613d -size 718231 diff --git a/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/LinuxPlayer/OpenGLCore.meta b/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/LinuxPlayer/OpenGLCore.meta deleted file mode 100644 index b39f7e4339c..00000000000 --- a/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/LinuxPlayer/OpenGLCore.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: ebf8c4ee7b60aed4dace8da0ea33521d -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/LinuxPlayer/OpenGLCore/None.meta b/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/LinuxPlayer/OpenGLCore/None.meta deleted file mode 100644 index 5a0e3072ba2..00000000000 --- a/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/LinuxPlayer/OpenGLCore/None.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: b95d5db8fec276d428fc54e306111485 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/LinuxPlayer/OpenGLCore/None/BRGGameObjects.png.meta b/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/LinuxPlayer/OpenGLCore/None/BRGGameObjects.png.meta deleted file mode 100644 index b2ff3471e5d..00000000000 --- a/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/LinuxPlayer/OpenGLCore/None/BRGGameObjects.png.meta +++ /dev/null @@ -1,122 +0,0 @@ -fileFormatVersion: 2 -guid: 5879c5325114ab0488899b972fe86334 -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 - ignoreMasterTextureLimit: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: 1 - aniso: 1 - mipBias: 0 - 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: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Server - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - 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: [] - nameFileIdTable: {} - spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/LinuxPlayer/OpenGLCore/None/BatchRenderGroupRaw.png b/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/LinuxPlayer/OpenGLCore/None/BatchRenderGroupRaw.png deleted file mode 100644 index 31973b01272..00000000000 --- a/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/LinuxPlayer/OpenGLCore/None/BatchRenderGroupRaw.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:44204711ea07f852b9bc8f12d316f68aef8d6b4e74fedb9c9801c11dff5d613d -size 718231 diff --git a/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/LinuxPlayer/OpenGLCore/None/BatchRenderGroupRaw.png.meta b/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/LinuxPlayer/OpenGLCore/None/BatchRenderGroupRaw.png.meta deleted file mode 100644 index 8c91bb13312..00000000000 --- a/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/LinuxPlayer/OpenGLCore/None/BatchRenderGroupRaw.png.meta +++ /dev/null @@ -1,122 +0,0 @@ -fileFormatVersion: 2 -guid: 2c1ef02a4ecc71746a008f70d3dce994 -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 - ignoreMasterTextureLimit: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: 1 - aniso: 1 - mipBias: 0 - 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: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Server - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - 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: [] - nameFileIdTable: {} - spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/LinuxPlayer/Vulkan/None/BatchRenderGroupRaw.png b/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/LinuxPlayer/Vulkan/None/BatchRenderGroupRaw.png deleted file mode 100644 index 31973b01272..00000000000 --- a/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/LinuxPlayer/Vulkan/None/BatchRenderGroupRaw.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:44204711ea07f852b9bc8f12d316f68aef8d6b4e74fedb9c9801c11dff5d613d -size 718231 diff --git a/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/OSXEditor/Metal/None/BatchRenderGroupRaw.png b/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/OSXEditor/Metal/None/BatchRenderGroupRaw.png deleted file mode 100644 index 31973b01272..00000000000 --- a/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/OSXEditor/Metal/None/BatchRenderGroupRaw.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:44204711ea07f852b9bc8f12d316f68aef8d6b4e74fedb9c9801c11dff5d613d -size 718231 diff --git a/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/OSXPlayer/Metal/None/BatchRenderGroupRaw.png b/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/OSXPlayer/Metal/None/BatchRenderGroupRaw.png deleted file mode 100644 index 31973b01272..00000000000 --- a/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/OSXPlayer/Metal/None/BatchRenderGroupRaw.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:44204711ea07f852b9bc8f12d316f68aef8d6b4e74fedb9c9801c11dff5d613d -size 718231 diff --git a/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/None/BatchRenderGroupRaw.png b/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/None/BatchRenderGroupRaw.png deleted file mode 100644 index 31973b01272..00000000000 --- a/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/None/BatchRenderGroupRaw.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:44204711ea07f852b9bc8f12d316f68aef8d6b4e74fedb9c9801c11dff5d613d -size 718231 diff --git a/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D12/None/BatchRenderGroupRaw.png b/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D12/None/BatchRenderGroupRaw.png deleted file mode 100644 index 31973b01272..00000000000 --- a/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D12/None/BatchRenderGroupRaw.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:44204711ea07f852b9bc8f12d316f68aef8d6b4e74fedb9c9801c11dff5d613d -size 718231 diff --git a/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/WindowsEditor/OpenGLCore.meta b/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/WindowsEditor/OpenGLCore.meta deleted file mode 100644 index 9657bfad049..00000000000 --- a/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/WindowsEditor/OpenGLCore.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: d038189fa506e0a4eb3f256b7af4a1b8 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/WindowsEditor/OpenGLCore/None.meta b/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/WindowsEditor/OpenGLCore/None.meta deleted file mode 100644 index e8957772c82..00000000000 --- a/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/WindowsEditor/OpenGLCore/None.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 5cb171632ac012149a2f3d95a8638245 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/WindowsEditor/OpenGLCore/None/BRGGameObjects.png b/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/WindowsEditor/OpenGLCore/None/BRGGameObjects.png deleted file mode 100644 index 18432128d12..00000000000 --- a/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/WindowsEditor/OpenGLCore/None/BRGGameObjects.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:dc31b9a69b7eee83e9802b202f97bb3463039fc7ab7565ec9763dcd9cde70e97 -size 110090 diff --git a/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/WindowsEditor/OpenGLCore/None/BRGGameObjects.png.meta b/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/WindowsEditor/OpenGLCore/None/BRGGameObjects.png.meta deleted file mode 100644 index b93e3470e83..00000000000 --- a/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/WindowsEditor/OpenGLCore/None/BRGGameObjects.png.meta +++ /dev/null @@ -1,122 +0,0 @@ -fileFormatVersion: 2 -guid: 95364670a012423469284916b9ab32d0 -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 - ignoreMasterTextureLimit: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: 1 - aniso: 1 - mipBias: 0 - 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: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Server - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - 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: [] - nameFileIdTable: {} - spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/WindowsEditor/OpenGLCore/None/BatchRenderGroupRaw.png b/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/WindowsEditor/OpenGLCore/None/BatchRenderGroupRaw.png deleted file mode 100644 index 31973b01272..00000000000 --- a/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/WindowsEditor/OpenGLCore/None/BatchRenderGroupRaw.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:44204711ea07f852b9bc8f12d316f68aef8d6b4e74fedb9c9801c11dff5d613d -size 718231 diff --git a/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/WindowsEditor/OpenGLCore/None/BatchRenderGroupRaw.png.meta b/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/WindowsEditor/OpenGLCore/None/BatchRenderGroupRaw.png.meta deleted file mode 100644 index a345daede09..00000000000 --- a/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/WindowsEditor/OpenGLCore/None/BatchRenderGroupRaw.png.meta +++ /dev/null @@ -1,122 +0,0 @@ -fileFormatVersion: 2 -guid: 18eea19848f65474b936fde9919d513e -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 - ignoreMasterTextureLimit: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: 1 - aniso: 1 - mipBias: 0 - 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: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Server - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - 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: [] - nameFileIdTable: {} - spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/None/BRGGameObjects.png b/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/None/BRGGameObjects.png deleted file mode 100644 index 18432128d12..00000000000 --- a/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/None/BRGGameObjects.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:dc31b9a69b7eee83e9802b202f97bb3463039fc7ab7565ec9763dcd9cde70e97 -size 110090 diff --git a/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/None/BatchRenderGroupRaw.png b/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/None/BatchRenderGroupRaw.png deleted file mode 100644 index 31973b01272..00000000000 --- a/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/None/BatchRenderGroupRaw.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:44204711ea07f852b9bc8f12d316f68aef8d6b4e74fedb9c9801c11dff5d613d -size 718231 diff --git a/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/None/BRGGameObjects.png b/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/None/BRGGameObjects.png deleted file mode 100644 index 18432128d12..00000000000 --- a/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/None/BRGGameObjects.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:dc31b9a69b7eee83e9802b202f97bb3463039fc7ab7565ec9763dcd9cde70e97 -size 110090 diff --git a/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/None/BatchRenderGroupRaw.png b/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/None/BatchRenderGroupRaw.png deleted file mode 100644 index 31973b01272..00000000000 --- a/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/None/BatchRenderGroupRaw.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:44204711ea07f852b9bc8f12d316f68aef8d6b4e74fedb9c9801c11dff5d613d -size 718231 diff --git a/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D12/None/BRGGameObjects.png b/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D12/None/BRGGameObjects.png deleted file mode 100644 index 18432128d12..00000000000 --- a/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D12/None/BRGGameObjects.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:dc31b9a69b7eee83e9802b202f97bb3463039fc7ab7565ec9763dcd9cde70e97 -size 110090 diff --git a/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D12/None/BatchRenderGroupRaw.png b/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D12/None/BatchRenderGroupRaw.png deleted file mode 100644 index 31973b01272..00000000000 --- a/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D12/None/BatchRenderGroupRaw.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:44204711ea07f852b9bc8f12d316f68aef8d6b4e74fedb9c9801c11dff5d613d -size 718231 diff --git a/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/WindowsPlayer/OpenGLCore.meta b/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/WindowsPlayer/OpenGLCore.meta deleted file mode 100644 index e49c18c7a7a..00000000000 --- a/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/WindowsPlayer/OpenGLCore.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 2066287f7ed6b714e8d8c7de5622b712 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/WindowsPlayer/OpenGLCore/None.meta b/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/WindowsPlayer/OpenGLCore/None.meta deleted file mode 100644 index 8c047f02647..00000000000 --- a/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/WindowsPlayer/OpenGLCore/None.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 380f1571115b2ef4680055ea9aac0ecb -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/WindowsPlayer/OpenGLCore/None/BRGGameObjects.png b/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/WindowsPlayer/OpenGLCore/None/BRGGameObjects.png deleted file mode 100644 index 18432128d12..00000000000 --- a/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/WindowsPlayer/OpenGLCore/None/BRGGameObjects.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:dc31b9a69b7eee83e9802b202f97bb3463039fc7ab7565ec9763dcd9cde70e97 -size 110090 diff --git a/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/WindowsPlayer/OpenGLCore/None/BRGGameObjects.png.meta b/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/WindowsPlayer/OpenGLCore/None/BRGGameObjects.png.meta deleted file mode 100644 index 756a83bae9f..00000000000 --- a/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/WindowsPlayer/OpenGLCore/None/BRGGameObjects.png.meta +++ /dev/null @@ -1,122 +0,0 @@ -fileFormatVersion: 2 -guid: d0d8a4164cc95e94fba09d822edf62bf -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 - ignoreMasterTextureLimit: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: 1 - aniso: 1 - mipBias: 0 - 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: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Server - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - 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: [] - nameFileIdTable: {} - spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/WindowsPlayer/OpenGLCore/None/BatchRenderGroupRaw.png b/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/WindowsPlayer/OpenGLCore/None/BatchRenderGroupRaw.png deleted file mode 100644 index 31973b01272..00000000000 --- a/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/WindowsPlayer/OpenGLCore/None/BatchRenderGroupRaw.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:44204711ea07f852b9bc8f12d316f68aef8d6b4e74fedb9c9801c11dff5d613d -size 718231 diff --git a/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/WindowsPlayer/OpenGLCore/None/BatchRenderGroupRaw.png.meta b/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/WindowsPlayer/OpenGLCore/None/BatchRenderGroupRaw.png.meta deleted file mode 100644 index 47de5d1f17d..00000000000 --- a/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/WindowsPlayer/OpenGLCore/None/BatchRenderGroupRaw.png.meta +++ /dev/null @@ -1,122 +0,0 @@ -fileFormatVersion: 2 -guid: 060b0516353100c4090c38fe974d648d -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 - ignoreMasterTextureLimit: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: 1 - aniso: 1 - mipBias: 0 - 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: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Server - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - 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: [] - nameFileIdTable: {} - spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/WindowsPlayer/Vulkan/None/BRGGameObjects.png b/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/WindowsPlayer/Vulkan/None/BRGGameObjects.png deleted file mode 100644 index 18432128d12..00000000000 --- a/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/WindowsPlayer/Vulkan/None/BRGGameObjects.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:dc31b9a69b7eee83e9802b202f97bb3463039fc7ab7565ec9763dcd9cde70e97 -size 110090 diff --git a/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/WindowsPlayer/Vulkan/None/BatchRenderGroupRaw.png b/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/WindowsPlayer/Vulkan/None/BatchRenderGroupRaw.png deleted file mode 100644 index 31973b01272..00000000000 --- a/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/WindowsPlayer/Vulkan/None/BatchRenderGroupRaw.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:44204711ea07f852b9bc8f12d316f68aef8d6b4e74fedb9c9801c11dff5d613d -size 718231 diff --git a/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/iPhonePlayer.meta b/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/iPhonePlayer.meta deleted file mode 100644 index ed4155b8ec7..00000000000 --- a/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/iPhonePlayer.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: eb496a0e0f0cdc84fab8a0ff9fc258da -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/iPhonePlayer/Metal.meta b/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/iPhonePlayer/Metal.meta deleted file mode 100644 index 59f3402ff41..00000000000 --- a/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/iPhonePlayer/Metal.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: c8dbde478a8f60f4b82a0cb885f36367 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/iPhonePlayer/Metal/None.meta b/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/iPhonePlayer/Metal/None.meta deleted file mode 100644 index f4b66050a5a..00000000000 --- a/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/iPhonePlayer/Metal/None.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 395f11b7d4ac1ad4abe6072892dfbe27 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/iPhonePlayer/Metal/None/BRGGameObjects.png b/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/iPhonePlayer/Metal/None/BRGGameObjects.png deleted file mode 100644 index 18432128d12..00000000000 --- a/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/iPhonePlayer/Metal/None/BRGGameObjects.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:dc31b9a69b7eee83e9802b202f97bb3463039fc7ab7565ec9763dcd9cde70e97 -size 110090 diff --git a/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/iPhonePlayer/Metal/None/BRGGameObjects.png.meta b/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/iPhonePlayer/Metal/None/BRGGameObjects.png.meta deleted file mode 100644 index 6161474dbc2..00000000000 --- a/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/iPhonePlayer/Metal/None/BRGGameObjects.png.meta +++ /dev/null @@ -1,122 +0,0 @@ -fileFormatVersion: 2 -guid: fa12e93057055fe42a21c9ff01d2fbf5 -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 - ignoreMasterTextureLimit: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: 1 - aniso: 1 - mipBias: 0 - 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: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Server - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - 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: [] - nameFileIdTable: {} - spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/iPhonePlayer/Metal/None/BatchRenderGroupRaw.png b/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/iPhonePlayer/Metal/None/BatchRenderGroupRaw.png deleted file mode 100644 index 31973b01272..00000000000 --- a/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/iPhonePlayer/Metal/None/BatchRenderGroupRaw.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:44204711ea07f852b9bc8f12d316f68aef8d6b4e74fedb9c9801c11dff5d613d -size 718231 diff --git a/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/iPhonePlayer/Metal/None/BatchRenderGroupRaw.png.meta b/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/iPhonePlayer/Metal/None/BatchRenderGroupRaw.png.meta deleted file mode 100644 index dd17a97c38e..00000000000 --- a/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/iPhonePlayer/Metal/None/BatchRenderGroupRaw.png.meta +++ /dev/null @@ -1,122 +0,0 @@ -fileFormatVersion: 2 -guid: b15a0db3d8891e54d981b900960d365c -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 - ignoreMasterTextureLimit: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: 1 - aniso: 1 - mipBias: 0 - 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: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Server - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - 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: [] - nameFileIdTable: {} - spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 - userData: - assetBundleName: - assetBundleVariant: From 8fdcd3c8082d40964d0a22ef2d39efb4bcbfea6e Mon Sep 17 00:00:00 2001 From: Andrem Date: Thu, 18 Nov 2021 16:15:01 +0100 Subject: [PATCH 06/14] Tweaked bloom quality options --- .../Editor/Overrides/BloomEditor.cs | 9 ++++++--- .../Runtime/Overrides/Bloom.cs | 16 ++++++++++++++-- .../Runtime/Passes/PostProcessPass.cs | 19 +++++++++++++++---- 3 files changed, 35 insertions(+), 9 deletions(-) diff --git a/com.unity.render-pipelines.universal/Editor/Overrides/BloomEditor.cs b/com.unity.render-pipelines.universal/Editor/Overrides/BloomEditor.cs index 3bef592cb0d..58b6d788487 100644 --- a/com.unity.render-pipelines.universal/Editor/Overrides/BloomEditor.cs +++ b/com.unity.render-pipelines.universal/Editor/Overrides/BloomEditor.cs @@ -13,7 +13,8 @@ sealed class BloomEditor : VolumeComponentEditor SerializedDataParameter m_Clamp; SerializedDataParameter m_Tint; SerializedDataParameter m_HighQualityFiltering; - SerializedDataParameter m_SkipIterations; + SerializedDataParameter m_Downsample; + SerializedDataParameter m_MaxIterations; SerializedDataParameter m_DirtTexture; SerializedDataParameter m_DirtIntensity; @@ -27,7 +28,8 @@ public override void OnEnable() m_Clamp = Unpack(o.Find(x => x.clamp)); m_Tint = Unpack(o.Find(x => x.tint)); m_HighQualityFiltering = Unpack(o.Find(x => x.highQualityFiltering)); - m_SkipIterations = Unpack(o.Find(x => x.skipIterations)); + m_Downsample = Unpack(o.Find(x => x.downscale)); + m_MaxIterations = Unpack(o.Find(x => x.maxIterations)); m_DirtTexture = Unpack(o.Find(x => x.dirtTexture)); m_DirtIntensity = Unpack(o.Find(x => x.dirtIntensity)); } @@ -44,7 +46,8 @@ public override void OnInspectorGUI() if (m_HighQualityFiltering.overrideState.boolValue && m_HighQualityFiltering.value.boolValue && CoreEditorUtils.buildTargets.Contains(GraphicsDeviceType.OpenGLES2)) EditorGUILayout.HelpBox("High Quality Bloom isn't supported on GLES2 platforms.", MessageType.Warning); - PropertyField(m_SkipIterations); + PropertyField(m_Downsample); + PropertyField(m_MaxIterations); PropertyField(m_DirtTexture); PropertyField(m_DirtIntensity); diff --git a/com.unity.render-pipelines.universal/Runtime/Overrides/Bloom.cs b/com.unity.render-pipelines.universal/Runtime/Overrides/Bloom.cs index 549ba5ea8f8..b23fef07563 100644 --- a/com.unity.render-pipelines.universal/Runtime/Overrides/Bloom.cs +++ b/com.unity.render-pipelines.universal/Runtime/Overrides/Bloom.cs @@ -2,6 +2,12 @@ namespace UnityEngine.Rendering.Universal { + public enum Downscale + { + Half, + Quarter, + } + [Serializable, VolumeComponentMenuForRenderPipeline("Post-processing/Bloom", typeof(UniversalRenderPipeline))] public sealed class Bloom : VolumeComponent, IPostProcessComponent { @@ -24,8 +30,11 @@ public sealed class Bloom : VolumeComponent, IPostProcessComponent [Tooltip("Use bicubic sampling instead of bilinear sampling for the upsampling passes. This is slightly more expensive but helps getting smoother visuals.")] public BoolParameter highQualityFiltering = new BoolParameter(false); - [Tooltip("The number of final iterations to skip in the effect processing sequence.")] - public ClampedIntParameter skipIterations = new ClampedIntParameter(1, 0, 16); + [Tooltip("The starting resolution that this effect begins processing.")] + public DownscaleParameter downscale = new DownscaleParameter(Downscale.Half); + + [Tooltip("The maximum number of iterations in the effect processing sequence.")] + public ClampedIntParameter maxIterations = new ClampedIntParameter(6, 2, 8); [Header("Lens Dirt")] [Tooltip("Dirtiness texture to add smudges or dust to the bloom effect.")] @@ -38,4 +47,7 @@ public sealed class Bloom : VolumeComponent, IPostProcessComponent public bool IsTileCompatible() => false; } + + [Serializable] + public sealed class DownscaleParameter : VolumeParameter { public DownscaleParameter(Downscale value, bool overrideState = false) : base(value, overrideState) { } } } diff --git a/com.unity.render-pipelines.universal/Runtime/Passes/PostProcessPass.cs b/com.unity.render-pipelines.universal/Runtime/Passes/PostProcessPass.cs index ffadb18a3d2..3cd755d6cea 100644 --- a/com.unity.render-pipelines.universal/Runtime/Passes/PostProcessPass.cs +++ b/com.unity.render-pipelines.universal/Runtime/Passes/PostProcessPass.cs @@ -1095,14 +1095,25 @@ Vector2 CalcCropExtents(Camera camera, float d) void SetupBloom(CommandBuffer cmd, RenderTargetIdentifier source, Material uberMaterial) { // Start at half-res - int tw = m_Descriptor.width >> 1; - int th = m_Descriptor.height >> 1; + int downres = 1; + switch (m_Bloom.downscale.value) + { + case Downscale.Half: + downres = 1; + break; + case Downscale.Quarter: + downres = 2; + break; + default: + throw new ArgumentOutOfRangeException(); + } + int tw = m_Descriptor.width >> downres; + int th = m_Descriptor.height >> downres; // Determine the iteration count int maxSize = Mathf.Max(tw, th); int iterations = Mathf.FloorToInt(Mathf.Log(maxSize, 2f) - 1); - iterations -= m_Bloom.skipIterations.value; - int mipCount = Mathf.Clamp(iterations, 1, k_MaxPyramidSize); + int mipCount = Mathf.Clamp(iterations, 1, m_Bloom.maxIterations.value); // Pre-filtering parameters float clamp = m_Bloom.clamp.value; From f0eb0c578942112d623d77e65abf80ee09a579da Mon Sep 17 00:00:00 2001 From: Andrem Date: Thu, 18 Nov 2021 16:17:39 +0100 Subject: [PATCH 07/14] made new settings additional --- .../Runtime/Overrides/Bloom.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/com.unity.render-pipelines.universal/Runtime/Overrides/Bloom.cs b/com.unity.render-pipelines.universal/Runtime/Overrides/Bloom.cs index b23fef07563..409979463db 100644 --- a/com.unity.render-pipelines.universal/Runtime/Overrides/Bloom.cs +++ b/com.unity.render-pipelines.universal/Runtime/Overrides/Bloom.cs @@ -30,10 +30,10 @@ public sealed class Bloom : VolumeComponent, IPostProcessComponent [Tooltip("Use bicubic sampling instead of bilinear sampling for the upsampling passes. This is slightly more expensive but helps getting smoother visuals.")] public BoolParameter highQualityFiltering = new BoolParameter(false); - [Tooltip("The starting resolution that this effect begins processing.")] + [Tooltip("The starting resolution that this effect begins processing."), AdditionalProperty] public DownscaleParameter downscale = new DownscaleParameter(Downscale.Half); - [Tooltip("The maximum number of iterations in the effect processing sequence.")] + [Tooltip("The maximum number of iterations in the effect processing sequence."), AdditionalProperty] public ClampedIntParameter maxIterations = new ClampedIntParameter(6, 2, 8); [Header("Lens Dirt")] From 34628cde43ec57c5a8c94710657c8e924f65b15e Mon Sep 17 00:00:00 2001 From: Andrem Date: Mon, 22 Nov 2021 12:54:42 +0100 Subject: [PATCH 08/14] Updated docs --- .../Documentation~/Images/Inspectors/Bloom.png | 4 ++-- .../Documentation~/post-processing-bloom.md | 6 ++++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/com.unity.render-pipelines.universal/Documentation~/Images/Inspectors/Bloom.png b/com.unity.render-pipelines.universal/Documentation~/Images/Inspectors/Bloom.png index 0080d4ce595..28a3dd13687 100644 --- a/com.unity.render-pipelines.universal/Documentation~/Images/Inspectors/Bloom.png +++ b/com.unity.render-pipelines.universal/Documentation~/Images/Inspectors/Bloom.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2a93840611aa974d249b8a24cf1aa909a2f2d78dc0ecf0801cb1ee4656cde3a7 -size 11288 +oid sha256:be0eadf61350b7321b7e3118a808f9e10a9be1349bf0517e76cf9628c771eb47 +size 37609 diff --git a/com.unity.render-pipelines.universal/Documentation~/post-processing-bloom.md b/com.unity.render-pipelines.universal/Documentation~/post-processing-bloom.md index 426c2807823..a6e2ede53ee 100644 --- a/com.unity.render-pipelines.universal/Documentation~/post-processing-bloom.md +++ b/com.unity.render-pipelines.universal/Documentation~/post-processing-bloom.md @@ -27,7 +27,8 @@ To add **Bloom** to a Volume: | **Tint** | Use the color picker to select a color for the Bloom effect to tint to. | | **Clamp** | Set the maximum intensity that Unity uses to calculate Bloom. If pixels in your Scene are more intense than this, URP renders them at their current intensity, but uses this intensity value for the purposes of Bloom calculations. The default value is 65472. | | **High Quality Filtering** | Enable this to use high quality sampling. This reduces flickering and improves the overall smoothness, but is more resource-intensive and can affect performance. | -| **Skip Iterations** | The last iterations in the processing sequence might have little contribution to the appearance of the rendered frame. In this setting you define the number of final iterations to skip. Increasing this value reduces processing load and increases performance, especially on mobile devices. The default value is 1. | +| **Downscale** | Set the initial resolution scale for the effect. Using a greater reduction reduces the cost of the initial blur by only starting from a lower resolution. +| **Max Iterations** | The amount of iterations is based upon the size of hte rendered image. In this setting you define the maximum number of iterations. Decreasing this value reduces processing load and increases performance, especially on mobile devices with high DPI screens. The default value is 6. | ### Lens Dirt @@ -41,4 +42,5 @@ To add **Bloom** to a Volume: There are multiple ways to improve the performance impact of Bloom. Listed in order of effectiveness, you can: 1. Disable **High Quality Filtering**. Bloom then uses bilinear filtering instead of bicubic. This reduces the overall smoothness of the Bloom effect, but greatly improves performance, especially on lower-end hardware and platforms. In some extreme cases, you might see blocky graphical artifacts in your Scene. -2. Use a lower resolution **Lens Dirt** Texture to reduce memory pressure and speed up blending across volumes. +2. Set **Downscale** to **Quarter** starting resolution to make the initial cost of Bloom much lower. +3. Use a lower resolution **Lens Dirt** Texture to reduce memory pressure and speed up blending across volumes. From feaf1549b18059b0e92123ebe3da3319fe2a42f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Elvar=20O=CC=88rn=20Unn=C3=BEo=CC=81rsson?= Date: Tue, 23 Nov 2021 13:04:14 +0100 Subject: [PATCH 09/14] Improving the Bloom Test scene so that it tests Max Iterations, Downscale, Dirt Texture and Dirt Intensity --- .../Textures/BloomDirtTexture.png | 3 + .../Textures/BloomDirtTexture.png.meta | 111 ++++++++++++++++++ .../Android/OpenGLES3/None/100_BloomHDR.png | 4 +- .../OpenGLES3/None/100_BloomHDR.png.meta | 19 +-- .../Android/Vulkan/None/100_BloomHDR.png | 4 +- .../Android/Vulkan/None/100_BloomHDR.png.meta | 19 +-- .../IPhonePlayer/Metal/None/100_BloomHDR.png | 4 +- .../Metal/None/100_BloomHDR.png.meta | 19 +-- .../OpenGLCore/None/100_BloomHDR.png | 4 +- .../OpenGLCore/None/100_BloomHDR.png.meta | 19 +-- .../LinuxEditor/Vulkan/None/100_BloomHDR.png | 4 +- .../Vulkan/None/100_BloomHDR.png.meta | 19 +-- .../LinuxPlayer/Vulkan/None/100_BloomHDR.png | 4 +- .../Vulkan/None/100_BloomHDR.png.meta | 19 +-- .../OSXEditor/Metal/None/100_BloomHDR.png | 4 +- .../Metal/None/100_BloomHDR.png.meta | 19 +-- .../OpenGLCore/None/100_BloomHDR.png | 4 +- .../OpenGLCore/None/100_BloomHDR.png.meta | 19 +-- .../OSXPlayer/Metal/None/100_BloomHDR.png | 4 +- .../Metal/None/100_BloomHDR.png.meta | 19 +-- .../OpenGLCore/None/100_BloomHDR.png | 4 +- .../OpenGLCore/None/100_BloomHDR.png.meta | 19 +-- .../Direct3D11/None/100_BloomHDR.png | 4 +- .../Direct3D11/None/100_BloomHDR.png.meta | 27 +++-- .../Direct3D12/None/100_BloomHDR.png | 4 +- .../Direct3D12/None/100_BloomHDR.png.meta | 19 +-- .../Vulkan/None/100_BloomHDR.png | 4 +- .../Vulkan/None/100_BloomHDR.png.meta | 19 +-- .../Direct3D11/None/100_BloomHDR.png | 4 +- .../Direct3D11/None/100_BloomHDR.png.meta | 19 +-- .../Direct3D12/None/100_BloomHDR.png | 4 +- .../Direct3D12/None/100_BloomHDR.png.meta | 19 +-- .../Vulkan/None/100_BloomHDR.png | 4 +- .../Vulkan/None/100_BloomHDR.png.meta | 19 +-- .../Post Processing Profile.asset | 20 ++-- 35 files changed, 334 insertions(+), 176 deletions(-) create mode 100644 TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/Textures/BloomDirtTexture.png create mode 100644 TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/Textures/BloomDirtTexture.png.meta diff --git a/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/Textures/BloomDirtTexture.png b/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/Textures/BloomDirtTexture.png new file mode 100644 index 00000000000..c483e7094ef --- /dev/null +++ b/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/Textures/BloomDirtTexture.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:31d69b13619ffb4fd737f4fb548fc836fe468f3a78ebd394178ff37bb43b238c +size 552794 diff --git a/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/Textures/BloomDirtTexture.png.meta b/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/Textures/BloomDirtTexture.png.meta new file mode 100644 index 00000000000..e3b5134b873 --- /dev/null +++ b/TestProjects/UniversalGraphicsTest_PostPro/Assets/CommonAssets/Textures/BloomDirtTexture.png.meta @@ -0,0 +1,111 @@ +fileFormatVersion: 2 +guid: 220714ff18b784b78a00045b03b790ef +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 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMasterTextureLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 + nPOTScale: 1 + 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 + swizzle: 50462976 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + 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: 1 + 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: [] + nameFileIdTable: {} + spritePackingTag: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/TestProjects/UniversalGraphicsTest_PostPro/Assets/ReferenceImages/Linear/Android/OpenGLES3/None/100_BloomHDR.png b/TestProjects/UniversalGraphicsTest_PostPro/Assets/ReferenceImages/Linear/Android/OpenGLES3/None/100_BloomHDR.png index f12adfc37ac..fb99d5cb6bf 100644 --- a/TestProjects/UniversalGraphicsTest_PostPro/Assets/ReferenceImages/Linear/Android/OpenGLES3/None/100_BloomHDR.png +++ b/TestProjects/UniversalGraphicsTest_PostPro/Assets/ReferenceImages/Linear/Android/OpenGLES3/None/100_BloomHDR.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e2311f5f70cb980266175fe1455e2a4b4cfb003a95e4a66e2a1cca8463562241 -size 217977 +oid sha256:fbfdcc46e1e49f62dc7071737f0feed9e2b183aaba928577bf46da8941fbb1ce +size 229123 diff --git a/TestProjects/UniversalGraphicsTest_PostPro/Assets/ReferenceImages/Linear/Android/OpenGLES3/None/100_BloomHDR.png.meta b/TestProjects/UniversalGraphicsTest_PostPro/Assets/ReferenceImages/Linear/Android/OpenGLES3/None/100_BloomHDR.png.meta index bd9b0dc80c1..52cdd0d6229 100644 --- a/TestProjects/UniversalGraphicsTest_PostPro/Assets/ReferenceImages/Linear/Android/OpenGLES3/None/100_BloomHDR.png.meta +++ b/TestProjects/UniversalGraphicsTest_PostPro/Assets/ReferenceImages/Linear/Android/OpenGLES3/None/100_BloomHDR.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 1d49f1325b41f964588ec2a198dbbc06 +guid: 7d6cd9ab50a374329bc25170507f6e8a TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -20,10 +20,12 @@ TextureImporter: externalNormalMap: 0 heightScale: 0.25 normalMapFilter: 0 + flipGreenChannel: 0 isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 vTOnly: 0 + ignoreMasterTextureLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -32,12 +34,12 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: -1 - aniso: -1 - mipBias: -100 - wrapU: -1 - wrapV: -1 - wrapW: -1 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 nPOTScale: 1 lightmap: 0 compressionQuality: 50 @@ -62,6 +64,7 @@ TextureImporter: textureFormatSet: 0 ignorePngGamma: 0 applyGammaDecoding: 0 + swizzle: 50462976 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform @@ -88,9 +91,9 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] + nameFileIdTable: {} spritePackingTag: pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/TestProjects/UniversalGraphicsTest_PostPro/Assets/ReferenceImages/Linear/Android/Vulkan/None/100_BloomHDR.png b/TestProjects/UniversalGraphicsTest_PostPro/Assets/ReferenceImages/Linear/Android/Vulkan/None/100_BloomHDR.png index e6bd1a2f5ce..fb99d5cb6bf 100644 --- a/TestProjects/UniversalGraphicsTest_PostPro/Assets/ReferenceImages/Linear/Android/Vulkan/None/100_BloomHDR.png +++ b/TestProjects/UniversalGraphicsTest_PostPro/Assets/ReferenceImages/Linear/Android/Vulkan/None/100_BloomHDR.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:41a7afbc9a80ad338c6989461cfa0f9564028b18645f774389a32f768f1b3bfd -size 223015 +oid sha256:fbfdcc46e1e49f62dc7071737f0feed9e2b183aaba928577bf46da8941fbb1ce +size 229123 diff --git a/TestProjects/UniversalGraphicsTest_PostPro/Assets/ReferenceImages/Linear/Android/Vulkan/None/100_BloomHDR.png.meta b/TestProjects/UniversalGraphicsTest_PostPro/Assets/ReferenceImages/Linear/Android/Vulkan/None/100_BloomHDR.png.meta index 4d2e06d864a..c2458933940 100644 --- a/TestProjects/UniversalGraphicsTest_PostPro/Assets/ReferenceImages/Linear/Android/Vulkan/None/100_BloomHDR.png.meta +++ b/TestProjects/UniversalGraphicsTest_PostPro/Assets/ReferenceImages/Linear/Android/Vulkan/None/100_BloomHDR.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 9c696cd0601ac424992dcb770d2bf414 +guid: 53b4ebb789e8f46ecb9205cf49db5c20 TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -20,10 +20,12 @@ TextureImporter: externalNormalMap: 0 heightScale: 0.25 normalMapFilter: 0 + flipGreenChannel: 0 isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 vTOnly: 0 + ignoreMasterTextureLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -32,12 +34,12 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: -1 - aniso: -1 - mipBias: -100 - wrapU: -1 - wrapV: -1 - wrapW: -1 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 nPOTScale: 1 lightmap: 0 compressionQuality: 50 @@ -62,6 +64,7 @@ TextureImporter: textureFormatSet: 0 ignorePngGamma: 0 applyGammaDecoding: 0 + swizzle: 50462976 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform @@ -88,9 +91,9 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] + nameFileIdTable: {} spritePackingTag: pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/TestProjects/UniversalGraphicsTest_PostPro/Assets/ReferenceImages/Linear/IPhonePlayer/Metal/None/100_BloomHDR.png b/TestProjects/UniversalGraphicsTest_PostPro/Assets/ReferenceImages/Linear/IPhonePlayer/Metal/None/100_BloomHDR.png index fa0da5fbe05..fb99d5cb6bf 100644 --- a/TestProjects/UniversalGraphicsTest_PostPro/Assets/ReferenceImages/Linear/IPhonePlayer/Metal/None/100_BloomHDR.png +++ b/TestProjects/UniversalGraphicsTest_PostPro/Assets/ReferenceImages/Linear/IPhonePlayer/Metal/None/100_BloomHDR.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c7e7bb661fa61fbcdce9168a22265a7b7ca056a7e0b631ebbec3d3ea95218994 -size 223880 +oid sha256:fbfdcc46e1e49f62dc7071737f0feed9e2b183aaba928577bf46da8941fbb1ce +size 229123 diff --git a/TestProjects/UniversalGraphicsTest_PostPro/Assets/ReferenceImages/Linear/IPhonePlayer/Metal/None/100_BloomHDR.png.meta b/TestProjects/UniversalGraphicsTest_PostPro/Assets/ReferenceImages/Linear/IPhonePlayer/Metal/None/100_BloomHDR.png.meta index 4ce52126b06..ebca424cbdc 100644 --- a/TestProjects/UniversalGraphicsTest_PostPro/Assets/ReferenceImages/Linear/IPhonePlayer/Metal/None/100_BloomHDR.png.meta +++ b/TestProjects/UniversalGraphicsTest_PostPro/Assets/ReferenceImages/Linear/IPhonePlayer/Metal/None/100_BloomHDR.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 69834605fd7364f9d8c3e67a7132325c +guid: 98e0d774a2d1842828bcb9c1e1990f83 TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -20,10 +20,12 @@ TextureImporter: externalNormalMap: 0 heightScale: 0.25 normalMapFilter: 0 + flipGreenChannel: 0 isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 vTOnly: 0 + ignoreMasterTextureLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -32,12 +34,12 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: -1 - aniso: -1 - mipBias: -100 - wrapU: -1 - wrapV: -1 - wrapW: -1 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 nPOTScale: 1 lightmap: 0 compressionQuality: 50 @@ -62,6 +64,7 @@ TextureImporter: textureFormatSet: 0 ignorePngGamma: 0 applyGammaDecoding: 0 + swizzle: 50462976 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform @@ -88,9 +91,9 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] + nameFileIdTable: {} spritePackingTag: pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/TestProjects/UniversalGraphicsTest_PostPro/Assets/ReferenceImages/Linear/LinuxEditor/OpenGLCore/None/100_BloomHDR.png b/TestProjects/UniversalGraphicsTest_PostPro/Assets/ReferenceImages/Linear/LinuxEditor/OpenGLCore/None/100_BloomHDR.png index 7281c43fe6e..fb99d5cb6bf 100644 --- a/TestProjects/UniversalGraphicsTest_PostPro/Assets/ReferenceImages/Linear/LinuxEditor/OpenGLCore/None/100_BloomHDR.png +++ b/TestProjects/UniversalGraphicsTest_PostPro/Assets/ReferenceImages/Linear/LinuxEditor/OpenGLCore/None/100_BloomHDR.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:048f32941be7545c455e0b3963522160667c112daee6db25dce84196efbf7459 -size 216761 +oid sha256:fbfdcc46e1e49f62dc7071737f0feed9e2b183aaba928577bf46da8941fbb1ce +size 229123 diff --git a/TestProjects/UniversalGraphicsTest_PostPro/Assets/ReferenceImages/Linear/LinuxEditor/OpenGLCore/None/100_BloomHDR.png.meta b/TestProjects/UniversalGraphicsTest_PostPro/Assets/ReferenceImages/Linear/LinuxEditor/OpenGLCore/None/100_BloomHDR.png.meta index 5f268fbbe7b..b6504a71268 100644 --- a/TestProjects/UniversalGraphicsTest_PostPro/Assets/ReferenceImages/Linear/LinuxEditor/OpenGLCore/None/100_BloomHDR.png.meta +++ b/TestProjects/UniversalGraphicsTest_PostPro/Assets/ReferenceImages/Linear/LinuxEditor/OpenGLCore/None/100_BloomHDR.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 37a34b9cdadc7a546b8ab1d12b34c9db +guid: 85d650b918c784e129993c98778cd116 TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -20,10 +20,12 @@ TextureImporter: externalNormalMap: 0 heightScale: 0.25 normalMapFilter: 0 + flipGreenChannel: 0 isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 vTOnly: 0 + ignoreMasterTextureLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -32,12 +34,12 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: -1 - aniso: -1 - mipBias: -100 - wrapU: -1 - wrapV: -1 - wrapW: -1 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 nPOTScale: 1 lightmap: 0 compressionQuality: 50 @@ -62,6 +64,7 @@ TextureImporter: textureFormatSet: 0 ignorePngGamma: 0 applyGammaDecoding: 0 + swizzle: 50462976 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform @@ -88,9 +91,9 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] + nameFileIdTable: {} spritePackingTag: pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/TestProjects/UniversalGraphicsTest_PostPro/Assets/ReferenceImages/Linear/LinuxEditor/Vulkan/None/100_BloomHDR.png b/TestProjects/UniversalGraphicsTest_PostPro/Assets/ReferenceImages/Linear/LinuxEditor/Vulkan/None/100_BloomHDR.png index 24aa95c9d1b..fb99d5cb6bf 100644 --- a/TestProjects/UniversalGraphicsTest_PostPro/Assets/ReferenceImages/Linear/LinuxEditor/Vulkan/None/100_BloomHDR.png +++ b/TestProjects/UniversalGraphicsTest_PostPro/Assets/ReferenceImages/Linear/LinuxEditor/Vulkan/None/100_BloomHDR.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6933dabc4d0d6ec8598ca4e7a1a1cb53162708d371385f89a3f1b74b9989fe81 -size 215654 +oid sha256:fbfdcc46e1e49f62dc7071737f0feed9e2b183aaba928577bf46da8941fbb1ce +size 229123 diff --git a/TestProjects/UniversalGraphicsTest_PostPro/Assets/ReferenceImages/Linear/LinuxEditor/Vulkan/None/100_BloomHDR.png.meta b/TestProjects/UniversalGraphicsTest_PostPro/Assets/ReferenceImages/Linear/LinuxEditor/Vulkan/None/100_BloomHDR.png.meta index 3a82208f33a..a76c2cbc9c6 100644 --- a/TestProjects/UniversalGraphicsTest_PostPro/Assets/ReferenceImages/Linear/LinuxEditor/Vulkan/None/100_BloomHDR.png.meta +++ b/TestProjects/UniversalGraphicsTest_PostPro/Assets/ReferenceImages/Linear/LinuxEditor/Vulkan/None/100_BloomHDR.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 073da62c2f202a24a920f6caeafe962d +guid: e693b1881b3e440c4b2cfd79d591a757 TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -20,10 +20,12 @@ TextureImporter: externalNormalMap: 0 heightScale: 0.25 normalMapFilter: 0 + flipGreenChannel: 0 isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 vTOnly: 0 + ignoreMasterTextureLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -32,12 +34,12 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: -1 - aniso: -1 - mipBias: -100 - wrapU: -1 - wrapV: -1 - wrapW: -1 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 nPOTScale: 1 lightmap: 0 compressionQuality: 50 @@ -62,6 +64,7 @@ TextureImporter: textureFormatSet: 0 ignorePngGamma: 0 applyGammaDecoding: 0 + swizzle: 50462976 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform @@ -88,9 +91,9 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] + nameFileIdTable: {} spritePackingTag: pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/TestProjects/UniversalGraphicsTest_PostPro/Assets/ReferenceImages/Linear/LinuxPlayer/Vulkan/None/100_BloomHDR.png b/TestProjects/UniversalGraphicsTest_PostPro/Assets/ReferenceImages/Linear/LinuxPlayer/Vulkan/None/100_BloomHDR.png index 24aa95c9d1b..fb99d5cb6bf 100644 --- a/TestProjects/UniversalGraphicsTest_PostPro/Assets/ReferenceImages/Linear/LinuxPlayer/Vulkan/None/100_BloomHDR.png +++ b/TestProjects/UniversalGraphicsTest_PostPro/Assets/ReferenceImages/Linear/LinuxPlayer/Vulkan/None/100_BloomHDR.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6933dabc4d0d6ec8598ca4e7a1a1cb53162708d371385f89a3f1b74b9989fe81 -size 215654 +oid sha256:fbfdcc46e1e49f62dc7071737f0feed9e2b183aaba928577bf46da8941fbb1ce +size 229123 diff --git a/TestProjects/UniversalGraphicsTest_PostPro/Assets/ReferenceImages/Linear/LinuxPlayer/Vulkan/None/100_BloomHDR.png.meta b/TestProjects/UniversalGraphicsTest_PostPro/Assets/ReferenceImages/Linear/LinuxPlayer/Vulkan/None/100_BloomHDR.png.meta index b069bb462d9..839d74b141e 100644 --- a/TestProjects/UniversalGraphicsTest_PostPro/Assets/ReferenceImages/Linear/LinuxPlayer/Vulkan/None/100_BloomHDR.png.meta +++ b/TestProjects/UniversalGraphicsTest_PostPro/Assets/ReferenceImages/Linear/LinuxPlayer/Vulkan/None/100_BloomHDR.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 39333edc48390f64b8ccd3a9e7eff4ce +guid: 4a561103b4dd34e8180e12a8c6678f47 TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -20,10 +20,12 @@ TextureImporter: externalNormalMap: 0 heightScale: 0.25 normalMapFilter: 0 + flipGreenChannel: 0 isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 vTOnly: 0 + ignoreMasterTextureLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -32,12 +34,12 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: -1 - aniso: -1 - mipBias: -100 - wrapU: -1 - wrapV: -1 - wrapW: -1 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 nPOTScale: 1 lightmap: 0 compressionQuality: 50 @@ -62,6 +64,7 @@ TextureImporter: textureFormatSet: 0 ignorePngGamma: 0 applyGammaDecoding: 0 + swizzle: 50462976 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform @@ -88,9 +91,9 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] + nameFileIdTable: {} spritePackingTag: pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/TestProjects/UniversalGraphicsTest_PostPro/Assets/ReferenceImages/Linear/OSXEditor/Metal/None/100_BloomHDR.png b/TestProjects/UniversalGraphicsTest_PostPro/Assets/ReferenceImages/Linear/OSXEditor/Metal/None/100_BloomHDR.png index 5bc14ab4099..fb99d5cb6bf 100644 --- a/TestProjects/UniversalGraphicsTest_PostPro/Assets/ReferenceImages/Linear/OSXEditor/Metal/None/100_BloomHDR.png +++ b/TestProjects/UniversalGraphicsTest_PostPro/Assets/ReferenceImages/Linear/OSXEditor/Metal/None/100_BloomHDR.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2314029a1708a9c43e555baf54d7bfd63afbe9e216cb4dc523ba0b4989f8c867 -size 214960 +oid sha256:fbfdcc46e1e49f62dc7071737f0feed9e2b183aaba928577bf46da8941fbb1ce +size 229123 diff --git a/TestProjects/UniversalGraphicsTest_PostPro/Assets/ReferenceImages/Linear/OSXEditor/Metal/None/100_BloomHDR.png.meta b/TestProjects/UniversalGraphicsTest_PostPro/Assets/ReferenceImages/Linear/OSXEditor/Metal/None/100_BloomHDR.png.meta index 58d8effd628..bad66ba1f31 100644 --- a/TestProjects/UniversalGraphicsTest_PostPro/Assets/ReferenceImages/Linear/OSXEditor/Metal/None/100_BloomHDR.png.meta +++ b/TestProjects/UniversalGraphicsTest_PostPro/Assets/ReferenceImages/Linear/OSXEditor/Metal/None/100_BloomHDR.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 9cf02ae08394369478c283a613a1227d +guid: 359bb51c47ff94e5d8f2fbac5ccfd4e8 TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -20,10 +20,12 @@ TextureImporter: externalNormalMap: 0 heightScale: 0.25 normalMapFilter: 0 + flipGreenChannel: 0 isReadable: 1 streamingMipmaps: 0 streamingMipmapsPriority: 0 vTOnly: 0 + ignoreMasterTextureLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -32,12 +34,12 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: -1 - aniso: -1 - mipBias: -100 - wrapU: -1 - wrapV: -1 - wrapW: -1 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 nPOTScale: 0 lightmap: 0 compressionQuality: 50 @@ -62,6 +64,7 @@ TextureImporter: textureFormatSet: 0 ignorePngGamma: 0 applyGammaDecoding: 0 + swizzle: 50462976 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform @@ -88,9 +91,9 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] + nameFileIdTable: {} spritePackingTag: pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/TestProjects/UniversalGraphicsTest_PostPro/Assets/ReferenceImages/Linear/OSXEditor/OpenGLCore/None/100_BloomHDR.png b/TestProjects/UniversalGraphicsTest_PostPro/Assets/ReferenceImages/Linear/OSXEditor/OpenGLCore/None/100_BloomHDR.png index aa7f3aecdb5..fb99d5cb6bf 100644 --- a/TestProjects/UniversalGraphicsTest_PostPro/Assets/ReferenceImages/Linear/OSXEditor/OpenGLCore/None/100_BloomHDR.png +++ b/TestProjects/UniversalGraphicsTest_PostPro/Assets/ReferenceImages/Linear/OSXEditor/OpenGLCore/None/100_BloomHDR.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:58a3806f670301e054147799f7b2b46fd969952590464eb6aa70a780c50a32ea -size 212732 +oid sha256:fbfdcc46e1e49f62dc7071737f0feed9e2b183aaba928577bf46da8941fbb1ce +size 229123 diff --git a/TestProjects/UniversalGraphicsTest_PostPro/Assets/ReferenceImages/Linear/OSXEditor/OpenGLCore/None/100_BloomHDR.png.meta b/TestProjects/UniversalGraphicsTest_PostPro/Assets/ReferenceImages/Linear/OSXEditor/OpenGLCore/None/100_BloomHDR.png.meta index 70e623c81e0..5d8b8ba17c7 100644 --- a/TestProjects/UniversalGraphicsTest_PostPro/Assets/ReferenceImages/Linear/OSXEditor/OpenGLCore/None/100_BloomHDR.png.meta +++ b/TestProjects/UniversalGraphicsTest_PostPro/Assets/ReferenceImages/Linear/OSXEditor/OpenGLCore/None/100_BloomHDR.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 1462fb989a14f43448e2ecb9178c8718 +guid: 39673f2477298439f8f1bc0476e41cf6 TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -20,10 +20,12 @@ TextureImporter: externalNormalMap: 0 heightScale: 0.25 normalMapFilter: 0 + flipGreenChannel: 0 isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 vTOnly: 0 + ignoreMasterTextureLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -32,12 +34,12 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: -1 - aniso: -1 - mipBias: -100 - wrapU: -1 - wrapV: -1 - wrapW: -1 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 nPOTScale: 1 lightmap: 0 compressionQuality: 50 @@ -62,6 +64,7 @@ TextureImporter: textureFormatSet: 0 ignorePngGamma: 0 applyGammaDecoding: 0 + swizzle: 50462976 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform @@ -88,9 +91,9 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] + nameFileIdTable: {} spritePackingTag: pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/TestProjects/UniversalGraphicsTest_PostPro/Assets/ReferenceImages/Linear/OSXPlayer/Metal/None/100_BloomHDR.png b/TestProjects/UniversalGraphicsTest_PostPro/Assets/ReferenceImages/Linear/OSXPlayer/Metal/None/100_BloomHDR.png index 5bc14ab4099..fb99d5cb6bf 100644 --- a/TestProjects/UniversalGraphicsTest_PostPro/Assets/ReferenceImages/Linear/OSXPlayer/Metal/None/100_BloomHDR.png +++ b/TestProjects/UniversalGraphicsTest_PostPro/Assets/ReferenceImages/Linear/OSXPlayer/Metal/None/100_BloomHDR.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2314029a1708a9c43e555baf54d7bfd63afbe9e216cb4dc523ba0b4989f8c867 -size 214960 +oid sha256:fbfdcc46e1e49f62dc7071737f0feed9e2b183aaba928577bf46da8941fbb1ce +size 229123 diff --git a/TestProjects/UniversalGraphicsTest_PostPro/Assets/ReferenceImages/Linear/OSXPlayer/Metal/None/100_BloomHDR.png.meta b/TestProjects/UniversalGraphicsTest_PostPro/Assets/ReferenceImages/Linear/OSXPlayer/Metal/None/100_BloomHDR.png.meta index 7d71f7ec9b5..7ea85729ccd 100644 --- a/TestProjects/UniversalGraphicsTest_PostPro/Assets/ReferenceImages/Linear/OSXPlayer/Metal/None/100_BloomHDR.png.meta +++ b/TestProjects/UniversalGraphicsTest_PostPro/Assets/ReferenceImages/Linear/OSXPlayer/Metal/None/100_BloomHDR.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 6e34a7dc38c6b6648a41c0523fe333a4 +guid: 910b546a26bb24eca9bfeabc45e61381 TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -20,10 +20,12 @@ TextureImporter: externalNormalMap: 0 heightScale: 0.25 normalMapFilter: 0 + flipGreenChannel: 0 isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 vTOnly: 0 + ignoreMasterTextureLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -32,12 +34,12 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: -1 - aniso: -1 - mipBias: -100 - wrapU: -1 - wrapV: -1 - wrapW: -1 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 nPOTScale: 1 lightmap: 0 compressionQuality: 50 @@ -62,6 +64,7 @@ TextureImporter: textureFormatSet: 0 ignorePngGamma: 0 applyGammaDecoding: 0 + swizzle: 50462976 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform @@ -88,9 +91,9 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] + nameFileIdTable: {} spritePackingTag: pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/TestProjects/UniversalGraphicsTest_PostPro/Assets/ReferenceImages/Linear/OSXPlayer/OpenGLCore/None/100_BloomHDR.png b/TestProjects/UniversalGraphicsTest_PostPro/Assets/ReferenceImages/Linear/OSXPlayer/OpenGLCore/None/100_BloomHDR.png index aa7f3aecdb5..fb99d5cb6bf 100644 --- a/TestProjects/UniversalGraphicsTest_PostPro/Assets/ReferenceImages/Linear/OSXPlayer/OpenGLCore/None/100_BloomHDR.png +++ b/TestProjects/UniversalGraphicsTest_PostPro/Assets/ReferenceImages/Linear/OSXPlayer/OpenGLCore/None/100_BloomHDR.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:58a3806f670301e054147799f7b2b46fd969952590464eb6aa70a780c50a32ea -size 212732 +oid sha256:fbfdcc46e1e49f62dc7071737f0feed9e2b183aaba928577bf46da8941fbb1ce +size 229123 diff --git a/TestProjects/UniversalGraphicsTest_PostPro/Assets/ReferenceImages/Linear/OSXPlayer/OpenGLCore/None/100_BloomHDR.png.meta b/TestProjects/UniversalGraphicsTest_PostPro/Assets/ReferenceImages/Linear/OSXPlayer/OpenGLCore/None/100_BloomHDR.png.meta index 592cf7126ad..e8fb6a3a7b6 100644 --- a/TestProjects/UniversalGraphicsTest_PostPro/Assets/ReferenceImages/Linear/OSXPlayer/OpenGLCore/None/100_BloomHDR.png.meta +++ b/TestProjects/UniversalGraphicsTest_PostPro/Assets/ReferenceImages/Linear/OSXPlayer/OpenGLCore/None/100_BloomHDR.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 50d551bf3ea1ec14a900baca6dd445d3 +guid: 82720ee5f90e24fb18c0f1706a238285 TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -20,10 +20,12 @@ TextureImporter: externalNormalMap: 0 heightScale: 0.25 normalMapFilter: 0 + flipGreenChannel: 0 isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 vTOnly: 0 + ignoreMasterTextureLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -32,12 +34,12 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: -1 - aniso: -1 - mipBias: -100 - wrapU: -1 - wrapV: -1 - wrapW: -1 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 nPOTScale: 1 lightmap: 0 compressionQuality: 50 @@ -62,6 +64,7 @@ TextureImporter: textureFormatSet: 0 ignorePngGamma: 0 applyGammaDecoding: 0 + swizzle: 50462976 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform @@ -88,9 +91,9 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] + nameFileIdTable: {} spritePackingTag: pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/TestProjects/UniversalGraphicsTest_PostPro/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/None/100_BloomHDR.png b/TestProjects/UniversalGraphicsTest_PostPro/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/None/100_BloomHDR.png index 24aa95c9d1b..fb99d5cb6bf 100644 --- a/TestProjects/UniversalGraphicsTest_PostPro/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/None/100_BloomHDR.png +++ b/TestProjects/UniversalGraphicsTest_PostPro/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/None/100_BloomHDR.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6933dabc4d0d6ec8598ca4e7a1a1cb53162708d371385f89a3f1b74b9989fe81 -size 215654 +oid sha256:fbfdcc46e1e49f62dc7071737f0feed9e2b183aaba928577bf46da8941fbb1ce +size 229123 diff --git a/TestProjects/UniversalGraphicsTest_PostPro/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/None/100_BloomHDR.png.meta b/TestProjects/UniversalGraphicsTest_PostPro/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/None/100_BloomHDR.png.meta index 7f06d96402c..7755ce1c252 100644 --- a/TestProjects/UniversalGraphicsTest_PostPro/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/None/100_BloomHDR.png.meta +++ b/TestProjects/UniversalGraphicsTest_PostPro/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/None/100_BloomHDR.png.meta @@ -1,12 +1,12 @@ fileFormatVersion: 2 -guid: 4b799dbf2e0e2614cba09fdcb0dbf439 +guid: 75e4d4b76bde145ae84d782f896a1a8e TextureImporter: internalIDToNameTable: [] externalObjects: {} serializedVersion: 11 mipmaps: mipMapMode: 0 - enableMipMap: 0 + enableMipMap: 1 sRGBTexture: 1 linearTexture: 0 fadeOut: 0 @@ -20,10 +20,12 @@ TextureImporter: externalNormalMap: 0 heightScale: 0.25 normalMapFilter: 0 - isReadable: 1 + flipGreenChannel: 0 + isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 vTOnly: 0 + ignoreMasterTextureLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -32,13 +34,13 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: -1 - aniso: -1 - mipBias: -100 - wrapU: -1 - wrapV: -1 - wrapW: -1 - nPOTScale: 0 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 + nPOTScale: 1 lightmap: 0 compressionQuality: 50 spriteMode: 0 @@ -62,13 +64,14 @@ TextureImporter: textureFormatSet: 0 ignorePngGamma: 0 applyGammaDecoding: 0 + swizzle: 50462976 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 0 + textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -88,9 +91,9 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] + nameFileIdTable: {} spritePackingTag: pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/TestProjects/UniversalGraphicsTest_PostPro/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D12/None/100_BloomHDR.png b/TestProjects/UniversalGraphicsTest_PostPro/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D12/None/100_BloomHDR.png index 24aa95c9d1b..fb99d5cb6bf 100644 --- a/TestProjects/UniversalGraphicsTest_PostPro/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D12/None/100_BloomHDR.png +++ b/TestProjects/UniversalGraphicsTest_PostPro/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D12/None/100_BloomHDR.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6933dabc4d0d6ec8598ca4e7a1a1cb53162708d371385f89a3f1b74b9989fe81 -size 215654 +oid sha256:fbfdcc46e1e49f62dc7071737f0feed9e2b183aaba928577bf46da8941fbb1ce +size 229123 diff --git a/TestProjects/UniversalGraphicsTest_PostPro/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D12/None/100_BloomHDR.png.meta b/TestProjects/UniversalGraphicsTest_PostPro/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D12/None/100_BloomHDR.png.meta index 7485ecd8527..c0f0b29e75b 100644 --- a/TestProjects/UniversalGraphicsTest_PostPro/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D12/None/100_BloomHDR.png.meta +++ b/TestProjects/UniversalGraphicsTest_PostPro/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D12/None/100_BloomHDR.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 601fbc6e71f17480f9141ae02354977a +guid: 2ed5c4e217c7a41dea459e8c41b42b10 TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -20,10 +20,12 @@ TextureImporter: externalNormalMap: 0 heightScale: 0.25 normalMapFilter: 0 + flipGreenChannel: 0 isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 vTOnly: 0 + ignoreMasterTextureLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -32,12 +34,12 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: -1 - aniso: -1 - mipBias: -100 - wrapU: -1 - wrapV: -1 - wrapW: -1 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 nPOTScale: 1 lightmap: 0 compressionQuality: 50 @@ -62,6 +64,7 @@ TextureImporter: textureFormatSet: 0 ignorePngGamma: 0 applyGammaDecoding: 0 + swizzle: 50462976 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform @@ -88,9 +91,9 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] + nameFileIdTable: {} spritePackingTag: pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/TestProjects/UniversalGraphicsTest_PostPro/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/None/100_BloomHDR.png b/TestProjects/UniversalGraphicsTest_PostPro/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/None/100_BloomHDR.png index 24aa95c9d1b..fb99d5cb6bf 100644 --- a/TestProjects/UniversalGraphicsTest_PostPro/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/None/100_BloomHDR.png +++ b/TestProjects/UniversalGraphicsTest_PostPro/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/None/100_BloomHDR.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6933dabc4d0d6ec8598ca4e7a1a1cb53162708d371385f89a3f1b74b9989fe81 -size 215654 +oid sha256:fbfdcc46e1e49f62dc7071737f0feed9e2b183aaba928577bf46da8941fbb1ce +size 229123 diff --git a/TestProjects/UniversalGraphicsTest_PostPro/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/None/100_BloomHDR.png.meta b/TestProjects/UniversalGraphicsTest_PostPro/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/None/100_BloomHDR.png.meta index 9f6748d64be..f54a8aa240b 100644 --- a/TestProjects/UniversalGraphicsTest_PostPro/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/None/100_BloomHDR.png.meta +++ b/TestProjects/UniversalGraphicsTest_PostPro/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/None/100_BloomHDR.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 10648b59e1150b84d8cc668a2fb951c6 +guid: d634eb0e5724d4272b099ded8cdb3fad TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -20,10 +20,12 @@ TextureImporter: externalNormalMap: 0 heightScale: 0.25 normalMapFilter: 0 + flipGreenChannel: 0 isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 vTOnly: 0 + ignoreMasterTextureLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -32,12 +34,12 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: -1 - aniso: -1 - mipBias: -100 - wrapU: -1 - wrapV: -1 - wrapW: -1 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 nPOTScale: 1 lightmap: 0 compressionQuality: 50 @@ -62,6 +64,7 @@ TextureImporter: textureFormatSet: 0 ignorePngGamma: 0 applyGammaDecoding: 0 + swizzle: 50462976 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform @@ -88,9 +91,9 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] + nameFileIdTable: {} spritePackingTag: pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/TestProjects/UniversalGraphicsTest_PostPro/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/None/100_BloomHDR.png b/TestProjects/UniversalGraphicsTest_PostPro/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/None/100_BloomHDR.png index 24aa95c9d1b..fb99d5cb6bf 100644 --- a/TestProjects/UniversalGraphicsTest_PostPro/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/None/100_BloomHDR.png +++ b/TestProjects/UniversalGraphicsTest_PostPro/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/None/100_BloomHDR.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6933dabc4d0d6ec8598ca4e7a1a1cb53162708d371385f89a3f1b74b9989fe81 -size 215654 +oid sha256:fbfdcc46e1e49f62dc7071737f0feed9e2b183aaba928577bf46da8941fbb1ce +size 229123 diff --git a/TestProjects/UniversalGraphicsTest_PostPro/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/None/100_BloomHDR.png.meta b/TestProjects/UniversalGraphicsTest_PostPro/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/None/100_BloomHDR.png.meta index 60d8242bc67..3d95ec8e986 100644 --- a/TestProjects/UniversalGraphicsTest_PostPro/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/None/100_BloomHDR.png.meta +++ b/TestProjects/UniversalGraphicsTest_PostPro/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/None/100_BloomHDR.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: beab9e25ba15e9944beffa7ec4e38ecc +guid: dd380370a170648bf9fbde7ac289a177 TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -20,10 +20,12 @@ TextureImporter: externalNormalMap: 0 heightScale: 0.25 normalMapFilter: 0 + flipGreenChannel: 0 isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 vTOnly: 0 + ignoreMasterTextureLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -32,12 +34,12 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: -1 - aniso: -1 - mipBias: -100 - wrapU: -1 - wrapV: -1 - wrapW: -1 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 nPOTScale: 1 lightmap: 0 compressionQuality: 50 @@ -62,6 +64,7 @@ TextureImporter: textureFormatSet: 0 ignorePngGamma: 0 applyGammaDecoding: 0 + swizzle: 50462976 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform @@ -88,9 +91,9 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] + nameFileIdTable: {} spritePackingTag: pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/TestProjects/UniversalGraphicsTest_PostPro/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D12/None/100_BloomHDR.png b/TestProjects/UniversalGraphicsTest_PostPro/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D12/None/100_BloomHDR.png index 24aa95c9d1b..fb99d5cb6bf 100644 --- a/TestProjects/UniversalGraphicsTest_PostPro/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D12/None/100_BloomHDR.png +++ b/TestProjects/UniversalGraphicsTest_PostPro/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D12/None/100_BloomHDR.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6933dabc4d0d6ec8598ca4e7a1a1cb53162708d371385f89a3f1b74b9989fe81 -size 215654 +oid sha256:fbfdcc46e1e49f62dc7071737f0feed9e2b183aaba928577bf46da8941fbb1ce +size 229123 diff --git a/TestProjects/UniversalGraphicsTest_PostPro/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D12/None/100_BloomHDR.png.meta b/TestProjects/UniversalGraphicsTest_PostPro/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D12/None/100_BloomHDR.png.meta index 9070e0660b8..90e30efdcad 100644 --- a/TestProjects/UniversalGraphicsTest_PostPro/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D12/None/100_BloomHDR.png.meta +++ b/TestProjects/UniversalGraphicsTest_PostPro/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D12/None/100_BloomHDR.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 10a58e9cae3da4ef1abb39c6f491b8d2 +guid: 4a67f775de1c443bbb0450212bd4605e TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -20,10 +20,12 @@ TextureImporter: externalNormalMap: 0 heightScale: 0.25 normalMapFilter: 0 + flipGreenChannel: 0 isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 vTOnly: 0 + ignoreMasterTextureLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -32,12 +34,12 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: -1 - aniso: -1 - mipBias: -100 - wrapU: -1 - wrapV: -1 - wrapW: -1 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 nPOTScale: 1 lightmap: 0 compressionQuality: 50 @@ -62,6 +64,7 @@ TextureImporter: textureFormatSet: 0 ignorePngGamma: 0 applyGammaDecoding: 0 + swizzle: 50462976 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform @@ -88,9 +91,9 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] + nameFileIdTable: {} spritePackingTag: pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/TestProjects/UniversalGraphicsTest_PostPro/Assets/ReferenceImages/Linear/WindowsPlayer/Vulkan/None/100_BloomHDR.png b/TestProjects/UniversalGraphicsTest_PostPro/Assets/ReferenceImages/Linear/WindowsPlayer/Vulkan/None/100_BloomHDR.png index 24aa95c9d1b..fb99d5cb6bf 100644 --- a/TestProjects/UniversalGraphicsTest_PostPro/Assets/ReferenceImages/Linear/WindowsPlayer/Vulkan/None/100_BloomHDR.png +++ b/TestProjects/UniversalGraphicsTest_PostPro/Assets/ReferenceImages/Linear/WindowsPlayer/Vulkan/None/100_BloomHDR.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6933dabc4d0d6ec8598ca4e7a1a1cb53162708d371385f89a3f1b74b9989fe81 -size 215654 +oid sha256:fbfdcc46e1e49f62dc7071737f0feed9e2b183aaba928577bf46da8941fbb1ce +size 229123 diff --git a/TestProjects/UniversalGraphicsTest_PostPro/Assets/ReferenceImages/Linear/WindowsPlayer/Vulkan/None/100_BloomHDR.png.meta b/TestProjects/UniversalGraphicsTest_PostPro/Assets/ReferenceImages/Linear/WindowsPlayer/Vulkan/None/100_BloomHDR.png.meta index cfa1825cd4e..bd6d3865b69 100644 --- a/TestProjects/UniversalGraphicsTest_PostPro/Assets/ReferenceImages/Linear/WindowsPlayer/Vulkan/None/100_BloomHDR.png.meta +++ b/TestProjects/UniversalGraphicsTest_PostPro/Assets/ReferenceImages/Linear/WindowsPlayer/Vulkan/None/100_BloomHDR.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 68a07e0f148da8843bc3595b30fadf22 +guid: e3407b621e8964b20aa50577c6f80867 TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -20,10 +20,12 @@ TextureImporter: externalNormalMap: 0 heightScale: 0.25 normalMapFilter: 0 + flipGreenChannel: 0 isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 vTOnly: 0 + ignoreMasterTextureLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -32,12 +34,12 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: -1 - aniso: -1 - mipBias: -100 - wrapU: -1 - wrapV: -1 - wrapW: -1 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 nPOTScale: 1 lightmap: 0 compressionQuality: 50 @@ -62,6 +64,7 @@ TextureImporter: textureFormatSet: 0 ignorePngGamma: 0 applyGammaDecoding: 0 + swizzle: 50462976 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform @@ -88,9 +91,9 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] + nameFileIdTable: {} spritePackingTag: pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/TestProjects/UniversalGraphicsTest_PostPro/Assets/Scenes/100_BloomHDR/Post Processing Profile.asset b/TestProjects/UniversalGraphicsTest_PostPro/Assets/Scenes/100_BloomHDR/Post Processing Profile.asset index 1154a4dab0c..9fc0a15b142 100644 --- a/TestProjects/UniversalGraphicsTest_PostPro/Assets/Scenes/100_BloomHDR/Post Processing Profile.asset +++ b/TestProjects/UniversalGraphicsTest_PostPro/Assets/Scenes/100_BloomHDR/Post Processing Profile.asset @@ -13,40 +13,36 @@ MonoBehaviour: m_Name: Bloom m_EditorClassIdentifier: active: 1 - m_AdvancedMode: 0 threshold: m_OverrideState: 1 m_Value: 1 - min: 0 intensity: m_OverrideState: 1 m_Value: 1 - min: 0 scatter: m_OverrideState: 1 m_Value: 0.7 - min: 0 - max: 1 clamp: m_OverrideState: 1 m_Value: 65472 - min: 0 tint: m_OverrideState: 1 m_Value: {r: 0.8254717, g: 0.9369203, b: 1, a: 1} - hdr: 0 - showAlpha: 0 - showEyeDropper: 1 highQualityFiltering: m_OverrideState: 1 m_Value: 1 + downscale: + m_OverrideState: 1 + m_Value: 1 + maxIterations: + m_OverrideState: 1 + m_Value: 3 dirtTexture: m_OverrideState: 1 - m_Value: {fileID: 0} + m_Value: {fileID: 2800000, guid: 220714ff18b784b78a00045b03b790ef, type: 3} dirtIntensity: m_OverrideState: 1 - m_Value: 0 - min: 0 + m_Value: 5 --- !u!114 &11400000 MonoBehaviour: m_ObjectHideFlags: 0 From 2d2422f8c427abc377a09c0d0fafb20ab329e976 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Elvar=20O=CC=88rn=20Unn=C3=BEo=CC=81rsson?= Date: Tue, 23 Nov 2021 13:20:06 +0100 Subject: [PATCH 10/14] Renaming the Downscale enum to BloomDownscaleMode --- .../Runtime/Overrides/Bloom.cs | 6 +++--- .../Runtime/Passes/PostProcessPass.cs | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/com.unity.render-pipelines.universal/Runtime/Overrides/Bloom.cs b/com.unity.render-pipelines.universal/Runtime/Overrides/Bloom.cs index 409979463db..666942fcd8d 100644 --- a/com.unity.render-pipelines.universal/Runtime/Overrides/Bloom.cs +++ b/com.unity.render-pipelines.universal/Runtime/Overrides/Bloom.cs @@ -2,7 +2,7 @@ namespace UnityEngine.Rendering.Universal { - public enum Downscale + public enum BloomDownscaleMode { Half, Quarter, @@ -31,7 +31,7 @@ public sealed class Bloom : VolumeComponent, IPostProcessComponent public BoolParameter highQualityFiltering = new BoolParameter(false); [Tooltip("The starting resolution that this effect begins processing."), AdditionalProperty] - public DownscaleParameter downscale = new DownscaleParameter(Downscale.Half); + public DownscaleParameter downscale = new DownscaleParameter(BloomDownscaleMode.Half); [Tooltip("The maximum number of iterations in the effect processing sequence."), AdditionalProperty] public ClampedIntParameter maxIterations = new ClampedIntParameter(6, 2, 8); @@ -49,5 +49,5 @@ public sealed class Bloom : VolumeComponent, IPostProcessComponent } [Serializable] - public sealed class DownscaleParameter : VolumeParameter { public DownscaleParameter(Downscale value, bool overrideState = false) : base(value, overrideState) { } } + public sealed class DownscaleParameter : VolumeParameter { public DownscaleParameter(BloomDownscaleMode value, bool overrideState = false) : base(value, overrideState) { } } } diff --git a/com.unity.render-pipelines.universal/Runtime/Passes/PostProcessPass.cs b/com.unity.render-pipelines.universal/Runtime/Passes/PostProcessPass.cs index 3cd755d6cea..5192c0b365a 100644 --- a/com.unity.render-pipelines.universal/Runtime/Passes/PostProcessPass.cs +++ b/com.unity.render-pipelines.universal/Runtime/Passes/PostProcessPass.cs @@ -1098,10 +1098,10 @@ void SetupBloom(CommandBuffer cmd, RenderTargetIdentifier source, Material uberM int downres = 1; switch (m_Bloom.downscale.value) { - case Downscale.Half: + case BloomDownscaleMode.Half: downres = 1; break; - case Downscale.Quarter: + case BloomDownscaleMode.Quarter: downres = 2; break; default: From d54c8a6954ec56dfd21383235f151aa4d5fd68af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Elvar=20O=CC=88rn=20Unn=C3=BEo=CC=81rsson?= Date: Tue, 23 Nov 2021 13:31:17 +0100 Subject: [PATCH 11/14] Deprecating the skipIterations variable --- com.unity.render-pipelines.universal/Runtime/Deprecated.cs | 7 +++++++ .../Runtime/Overrides/Bloom.cs | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/com.unity.render-pipelines.universal/Runtime/Deprecated.cs b/com.unity.render-pipelines.universal/Runtime/Deprecated.cs index 837968bfcc6..f0784b947ef 100644 --- a/com.unity.render-pipelines.universal/Runtime/Deprecated.cs +++ b/com.unity.render-pipelines.universal/Runtime/Deprecated.cs @@ -127,4 +127,11 @@ public RenderTargetIdentifier cameraDepth get => m_CameraDepthTarget.nameID; } } + + public sealed partial class Bloom : VolumeComponent, IPostProcessComponent + { + // Deprecated in 13.x.x + [Obsolete("This is obsolete, please use maxIterations instead.", false)] + public ClampedIntParameter skipIterations = new ClampedIntParameter(1, 0, 16); + } } diff --git a/com.unity.render-pipelines.universal/Runtime/Overrides/Bloom.cs b/com.unity.render-pipelines.universal/Runtime/Overrides/Bloom.cs index 666942fcd8d..ee638931da2 100644 --- a/com.unity.render-pipelines.universal/Runtime/Overrides/Bloom.cs +++ b/com.unity.render-pipelines.universal/Runtime/Overrides/Bloom.cs @@ -9,7 +9,7 @@ public enum BloomDownscaleMode } [Serializable, VolumeComponentMenuForRenderPipeline("Post-processing/Bloom", typeof(UniversalRenderPipeline))] - public sealed class Bloom : VolumeComponent, IPostProcessComponent + public sealed partial class Bloom : VolumeComponent, IPostProcessComponent { [Header("Bloom")] [Tooltip("Filters out pixels under this level of brightness. Value is in gamma-space.")] From 4e747794e830eec7d4b0925105537ca3153ce662 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Elvar=20O=CC=88rn=20Unn=C3=BEo=CC=81rsson?= Date: Wed, 24 Nov 2021 09:10:09 +0100 Subject: [PATCH 12/14] Changelog --- com.unity.render-pipelines.universal/CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/com.unity.render-pipelines.universal/CHANGELOG.md b/com.unity.render-pipelines.universal/CHANGELOG.md index 2d6b9804f67..530df91fb8e 100644 --- a/com.unity.render-pipelines.universal/CHANGELOG.md +++ b/com.unity.render-pipelines.universal/CHANGELOG.md @@ -11,6 +11,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. - Added support for `RTHandle`. - Renderer Features can now use the HelpURLAttribute to specify a documentation URL to be used in the inspector. - Added inspector documentation URLs to the SSAO, Decal, and Render Objects renderer features. +- Added Downscale and Max Iterations options for Bloom ### Changed - Converted internal render targets to use `RTHandle` targets instead of `RenderTargetHandle` and `RenderTargetIdentifier`. @@ -18,6 +19,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. - Split RendererFeatures `AddRenderPasses` into two functions with `SetupRenderPasses` so render targets can be used after allocation. - The "Add Renderer Feature" menu now supports filtering. - Removed the name input for the SSAO and Screen Space Shadows renderer features. +- Removed skipIterations from Bloom settings. It has now been replaced with maxIterations. ### Fixed - Fixed an issue where 2D global lights with shadows enabled could break light layer batching [case 1376487](https://issuetracker.unity3d.com/issues/2d-urp-upgrading-global-light-sets-shadow-settings-to-enabled) From c20d4ae129752abc4f4d78ba29afa884c97edc6e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Elvar=20O=CC=88rn=20Unn=C3=BEo=CC=81rsson?= Date: Mon, 29 Nov 2021 09:49:24 +0100 Subject: [PATCH 13/14] Changelog --- com.unity.render-pipelines.universal/CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/com.unity.render-pipelines.universal/CHANGELOG.md b/com.unity.render-pipelines.universal/CHANGELOG.md index 336a340923c..7047d149305 100644 --- a/com.unity.render-pipelines.universal/CHANGELOG.md +++ b/com.unity.render-pipelines.universal/CHANGELOG.md @@ -10,6 +10,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. - Renderer Features can now use the HelpURLAttribute to specify a documentation URL to be used in the inspector. - Added inspector documentation URLs to the SSAO, Decal, and Render Objects renderer features. - Changed "_USE_DRAW_PROCEDURAL" to be used only in vertex shader in Post Processing related shaders as they are not needed for fragment shaders. In result we now generate less shader variants. +- Added Downscale and Max Iterations options for Bloom + +### Changed +- Removed skipIterations from Bloom settings. It has now been replaced with maxIterations. ### Fixed - Fix shadow rendering correctly to work with shader stripping in WebGl. [case 1381881](https://issuetracker.unity3d.com/issues/webgl-urp-mesh-is-not-rendered-in-the-scene-on-webgl-build) From 7141a81d2d857204b6022a0335dd62e47286d271 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Elvar=20O=CC=88rn=20Unn=C3=BEo=CC=81rsson?= Date: Tue, 7 Dec 2021 13:55:35 +0100 Subject: [PATCH 14/14] Updating bloom reference image for Android GLES3 --- .../Linear/Android/OpenGLES3/None/100_BloomHDR.png | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/TestProjects/UniversalGraphicsTest_PostPro/Assets/ReferenceImages/Linear/Android/OpenGLES3/None/100_BloomHDR.png b/TestProjects/UniversalGraphicsTest_PostPro/Assets/ReferenceImages/Linear/Android/OpenGLES3/None/100_BloomHDR.png index fb99d5cb6bf..1a1ed2d51a3 100644 --- a/TestProjects/UniversalGraphicsTest_PostPro/Assets/ReferenceImages/Linear/Android/OpenGLES3/None/100_BloomHDR.png +++ b/TestProjects/UniversalGraphicsTest_PostPro/Assets/ReferenceImages/Linear/Android/OpenGLES3/None/100_BloomHDR.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fbfdcc46e1e49f62dc7071737f0feed9e2b183aaba928577bf46da8941fbb1ce -size 229123 +oid sha256:ae7da57b97c253d8e007436e1c1e8598f4fff77b05d6b755abfdcc407345cd8d +size 217884