Merge pull request #8248 from Unity-Technologies/internal/master

Mirror Internal/master

Author: KEngelstoft

.gitattributes

@@ -375,10 +375,15 @@ Editor/Resources/unity[[:space:]]editor[[:space:]]resources filter=lfs diff=lfs
 # memoryprofiler test snapshots
 **/com.unity.memoryprofiler.tests/**/*.[sS][nN][aA][pP] filter=lfs diff=lfs merge=lfs -text
 
-
 # buginfo tools
 /Tools/Unity.BugInfo.Coverage/bin/* filter=lfs diff=lfs merge=lfs -text
 
 # search test cases
 /Modules/QuickSearch/Tests/QuickSearch/Assets/Cases/UUM-113048/uum-113048.index filter=lfs diff=lfs merge=lfs -text
 
+#SRP Templates
+/Templates/**/LightingData.asset binary
+/Templates/**/*.[pP][nN][gG] filter=lfs diff=lfs merge=lfs -text
+/Templates/**/*.[tT][gG][aA] filter=lfs diff=lfs merge=lfs -text
+/Templates/**/*.[tT][iI][fF] filter=lfs diff=lfs merge=lfs -text
+/Templates/**/*.[fF][bB][xX] filter=lfs diff=lfs merge=lfs -text

Packages/com.unity.render-pipelines.core/Editor-PrivateShared/Tools/Converter/AssetsConverter.cs

@@ -52,7 +52,7 @@ public Status Convert(IRenderPipelineConverterItem item, out string message)
 
             if (obj == null)
             {
-                message = $"Failed to load {assetItem.name} Global ID {assetItem.guid} Asset Path {assetItem.assetPath}";
+                message = $"Failed to load {assetItem.name} Global ID {assetItem.GlobalObjectId} Asset Path {assetItem.assetPath}";
                 return Status.Error;
             }
 

Packages/com.unity.render-pipelines.core/Editor-PrivateShared/Tools/Converter/RenderPipelineConverterAssetItem.cs

@@ -7,24 +7,30 @@ namespace UnityEditor.Rendering.Converter
     [Serializable]
     internal class RenderPipelineConverterAssetItem : IRenderPipelineConverterItem
     {
-        public string assetPath { get; }
-        public string guid { get; }
+        [SerializeField]
+        private string m_AssetPath;
 
-        public string name
+        public string assetPath
         {
-            get
-            {
-                var obj = LoadObject();
-                if (obj != null)
-                    return obj.name;
-
-                // Fallback to asset path name
-                return System.IO.Path.GetFileNameWithoutExtension(assetPath);
-            }
+            get => m_AssetPath;
+            protected set => m_AssetPath = value;
         }
 
-        [field:SerializeField]
-        public string info {get; set; }
+        [SerializeField]
+        private string m_GlobalObjectId;
+
+        public string GlobalObjectId => m_GlobalObjectId;
+
+        public string name => System.IO.Path.GetFileNameWithoutExtension(assetPath);
+
+        [SerializeField]
+        private string m_Info;
+
+        public string info
+        {
+            get => m_Info;
+            set => m_Info = value;
+        }
 
         public bool isEnabled { get; set; } = true;
         public string isDisabledMessage { get; set; } = string.Empty;
@@ -33,50 +39,47 @@ public Texture2D icon
         {
             get
             {
-                var obj = LoadObject();
-                if (obj == null)
-                    return null;
-
-                // Try the object's thumbnail/icon
-                var icon = AssetPreview.GetMiniThumbnail(obj);
-                if (icon != null) return icon;
-
-                // Fallback to type icon
-                var type = obj.GetType();
-                icon = EditorGUIUtility.ObjectContent(null, type).image as Texture2D;
-                return icon;
+                if (!string.IsNullOrEmpty(assetPath))
+                {
+                    // Get the cached icon without loading the asset
+                    var icon = AssetDatabase.GetCachedIcon(assetPath);
+                    if (icon != null)
+                        return icon as Texture2D;
+                }
+
+                return null;
             }
         }
 
         public RenderPipelineConverterAssetItem(string id)
         {
-            if (!GlobalObjectId.TryParse(id, out var gid))
+            if (!UnityEditor.GlobalObjectId.TryParse(id, out var gid))
                 throw new ArgumentException(nameof(id), $"Unable to perform GlobalObjectId.TryParse with the given id {id}");
 
-            assetPath = AssetDatabase.GUIDToAssetPath(gid.assetGUID);
-            guid = gid.ToString();
+            m_AssetPath = AssetDatabase.GUIDToAssetPath(gid.assetGUID);
+            m_GlobalObjectId = gid.ToString();
         }
 
         public RenderPipelineConverterAssetItem(GlobalObjectId gid, string assetPath)
         {
             if (!AssetDatabase.AssetPathExists(assetPath))
                 throw new ArgumentException(nameof(assetPath), $"{assetPath} does not exist");
 
-            this.assetPath = assetPath;
-            guid = gid.ToString();
+            m_AssetPath = assetPath;
+            m_GlobalObjectId = gid.ToString();
         }
 
         public UnityEngine.Object LoadObject()
         {
             UnityEngine.Object obj = null;
 
-            if (GlobalObjectId.TryParse(guid, out var globalId))
+            if (UnityEditor.GlobalObjectId.TryParse(GlobalObjectId, out var globalId))
             {
                 // Try loading the object
                 // TODO: Upcoming changes to GlobalObjectIdentifierToObjectSlow will allow it
                 //       to return direct references to prefabs and their children.
                 //       Once that change happens there are several items which should be adjusted.
-                obj = GlobalObjectId.GlobalObjectIdentifierToObjectSlow(globalId);
+                obj = UnityEditor.GlobalObjectId.GlobalObjectIdentifierToObjectSlow(globalId);
 
                 // If the object was not loaded, it is probably part of an unopened scene or prefab;
                 // if so, then the solution is to first load the scene here.
@@ -100,7 +103,7 @@ public UnityEngine.Object LoadObject()
                     // Reload object if it is still null (because it's in a previously unopened scene)
                     if (!obj)
                     {
-                        obj = GlobalObjectId.GlobalObjectIdentifierToObjectSlow(globalId);
+                        obj = UnityEditor.GlobalObjectId.GlobalObjectIdentifierToObjectSlow(globalId);
                     }
                 }
             }

Packages/com.unity.render-pipelines.core/Editor-PrivateShared/Tools/Converter/Window/RenderPipelineConvertersEditor.cs

@@ -353,6 +353,7 @@ void OnConverterScanFinished()
                 {
                     Debug.LogError($"An exception occurred while initializing converter {current.displayName}. See console for more details.");
                     Debug.LogException(ex);
+                    InitializationFinish();
                 }
             }
 

Packages/com.unity.render-pipelines.core/Editor/HeaderFoldout.cs

@@ -1,5 +1,4 @@
 using System;
-using System.Runtime.Serialization.Configuration;
 using UnityEngine;
 using UnityEngine.UIElements;
 

Packages/com.unity.render-pipelines.core/Editor/RenderGraph/RenderGraphTestsCore.cs

@@ -144,7 +144,6 @@ public void Setup()
 
             // Getting the RG from the custom asset pipeline
             m_RenderGraph = m_RenderGraphTestPipeline.renderGraph;
-            m_RenderGraph.nativeRenderPassesEnabled = true;
 
             // Necessary to disable it for the Unit Tests, as the caller is not the same.
             RenderGraph.RenderGraphExceptionMessages.enableCaller = false;

Packages/com.unity.render-pipelines.core/Editor/RenderGraph/RenderGraphViewer.SidePanel.cs

@@ -12,15 +12,13 @@ public partial class RenderGraphViewer
     {
         static readonly string[] k_PassTypeNames =
         {
-            "Legacy Render Pass",
             "Unsafe Render Pass",
             "Raster Render Pass",
             "Compute Pass"
         };
 
         static readonly string[] k_PassTypeNamesNotMergedMessage =
         {
-            "This is a Legacy Render Pass. Only Raster Render Passes can be merged.",
             "This is an Unsafe Render Pass. Only Raster Render Passes can be merged.",
             "Pass merging was disabled.",
             "This is a Compute Pass. Only Raster Render Passes can be merged."
@@ -292,8 +290,7 @@ void PopulateResourceList()
                     resourceItem.Add(new Label($"Clear: {resourceData.textureData.clearBuffer}"));
                     resourceItem.Add(new Label($"BindMS: {resourceData.textureData.bindMS}"));
                     resourceItem.Add(new Label($"Samples: {resourceData.textureData.samples}"));
-                    if (m_CurrentDebugData.isNRPCompiler)
-                        resourceItem.Add(new Label($"Memoryless: {resourceData.memoryless}"));
+                    resourceItem.Add(new Label($"Memoryless: {resourceData.memoryless}"));
                 }
                 else if (type == RenderGraphResourceType.Buffer && resourceData.bufferData != null)
                 {
@@ -315,11 +312,6 @@ void PopulateResourceList()
         void PopulatePassList()
         {
             HeaderFoldout headerFoldout = rootVisualElement.Q<HeaderFoldout>(Names.kPassListFoldout);
-            if (!m_CurrentDebugData.isNRPCompiler)
-            {
-                headerFoldout.style.display = DisplayStyle.None;
-                return;
-            }
             headerFoldout.style.display = DisplayStyle.Flex;
 
             ScrollView content = headerFoldout.Q<ScrollView>();
@@ -501,7 +493,7 @@ void SaveSplitViewFixedPaneHeight()
 
         void UpdatePanelHeights()
         {
-            bool passListExpanded = m_PassListExpanded && HasValidDebugData && m_CurrentDebugData.isNRPCompiler;
+            bool passListExpanded = m_PassListExpanded && HasValidDebugData;
             const int kFoldoutHeaderHeightPx = 18;
             const int kFoldoutHeaderExpandedMinHeightPx = 50;
             const int kWindowExtraMarginPx = 6;