Internal/master

Packages/com.unity.render-pipelines.core/Editor-PrivateShared/AssemblyInfo.cs

@@ -1,6 +1,10 @@
 using System.Runtime.CompilerServices;
 
+// HDRP
 [assembly: InternalsVisibleTo("Unity.RenderPipelines.HighDefinition.Editor")]
+[assembly: InternalsVisibleTo("Unity.RenderPipelines.HighDefinition.Editor.Tests")]
+
+// URP
 [assembly: InternalsVisibleTo("Unity.RenderPipelines.Universal.Editor")]
 [assembly: InternalsVisibleTo("Unity.RenderPipelines.Universal.Editor.Tests")]
 

Packages/com.unity.render-pipelines.core/Editor-PrivateShared/AssetCallbacks/AssetCreationUtil.cs

@@ -92,7 +92,7 @@ static void CreateAsset(string name, Action<string> callback = null, string exte
             assetCreationCallback.extension = extension;
 
             var icon = AssetPreview.GetMiniTypeThumbnail(type);
-            ProjectWindowUtil.StartNameEditingIfProjectWindowExists(0, assetCreationCallback, name, icon, null, false);
+            ProjectWindowUtil.StartNameEditingIfProjectWindowExists(EntityId.None, assetCreationCallback, name, icon, null, false);
         }
 
         class AssetCreationCallback : ProjectWindowCallback.AssetCreationEndAction

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

@@ -30,7 +30,10 @@ void OnSearchFinish()
                 contextSearchQueriesAndIds,
                 (item, description) =>
                 {
-                    var assetItem = new RenderPipelineConverterAssetItem(item.id);
+                    var assetItem = new RenderPipelineConverterAssetItem(item.id)
+                    {
+                        info = description
+                    };
                     assets.Add(assetItem);
                 },
                 OnSearchFinish

Packages/com.unity.render-pipelines.universal/Editor/Tools/Converters/ReadonlyMaterialConverter/ReadonlyMaterialConverter.MaterialReferenceBuilder.cs → Packages/com.unity.render-pipelines.core/Editor-PrivateShared/Tools/Converter/ReadonlyMaterialConverter/ReadonlyMaterialConverter.MaterialReferenceBuilder.cs

@@ -3,7 +3,7 @@
 using System;
 using UnityEngine;
 
-namespace UnityEditor.Rendering.Universal
+namespace UnityEditor.Rendering.Converter
 {
     internal class MaterialReferenceBuilder : IDisposable
     {

Packages/com.unity.render-pipelines.universal/Editor/Tools/Converters/ReadonlyMaterialConverter/ReadonlyMaterialConverter.MaterialReferenceChanger.cs → Packages/com.unity.render-pipelines.core/Editor-PrivateShared/Tools/Converter/ReadonlyMaterialConverter/ReadonlyMaterialConverter.MaterialReferenceChanger.cs

@@ -1,22 +1,23 @@
 using System;
-using System.ComponentModel;
 using System.Reflection;
 using System.Text;
 using UnityEditor.SceneManagement;
 using UnityEngine;
 using UnityEngine.SceneManagement;
-using static UnityEditor.Rendering.Universal.MaterialReferenceBuilder;
+using static UnityEditor.Rendering.Converter.MaterialReferenceBuilder;
 using Object = UnityEngine.Object;
 
-namespace UnityEditor.Rendering.Universal
+namespace UnityEditor.Rendering.Converter
 {
     internal class MaterialReferenceChanger : IDisposable
     {
         MaterialReferenceBuilder m_Builder;
+        ReadonlyMaterialMap m_Mappings;
 
-        public MaterialReferenceChanger()
+        public MaterialReferenceChanger(ReadonlyMaterialMap mappings)
         {
             m_Builder = new MaterialReferenceBuilder();
+            m_Mappings = mappings;
         }
 
         public void Dispose()
@@ -47,7 +48,7 @@ internal static bool AreMaterialsEqual(Material[] a, Material[] b)
             return true;
         }
 
-        private static bool TryChangeMaterialArray(Func<object> getter, Action<object> setter)
+        private bool TryChangeMaterialArray(Func<object> getter, Action<object> setter)
         {
             var materials = getter() as Material[];
             if (materials == null)
@@ -56,7 +57,7 @@ private static bool TryChangeMaterialArray(Func<object> getter, Action<object> s
             bool setIsNeeded = false;
             for (int i = 0; i < materials.Length; ++i)
             {
-                if (ReadonlyMaterialMap.TryGetMappingMaterial(materials[i], out var mappingMaterial))
+                if (m_Mappings.TryGetMappingMaterial(materials[i], out var mappingMaterial))
                 {
                     materials[i] = mappingMaterial;
                     setIsNeeded = true;
@@ -72,10 +73,10 @@ private static bool TryChangeMaterialArray(Func<object> getter, Action<object> s
             return true;
         }
 
-        private static bool TryChangeMaterial(Func<object> getter, Action<object> setter)
+        private bool TryChangeMaterial(Func<object> getter, Action<object> setter)
         {
             var material = getter() as Material;
-            if (ReadonlyMaterialMap.TryGetMappingMaterial(material, out var mappingMaterial))
+            if (m_Mappings.TryGetMappingMaterial(material, out var mappingMaterial))
             {
                 setter(mappingMaterial);
                 var updated = getter() as Material;
@@ -85,7 +86,7 @@ private static bool TryChangeMaterial(Func<object> getter, Action<object> setter
             return true;
         }
 
-        private static bool ReassignMaterialsFromInstance(object obj, MemberInfo member, bool isArray)
+        private bool ReassignMaterialsFromInstance(object obj, MemberInfo member, bool isArray)
         {
             if (obj == null || member == null)
                 return false;
@@ -206,7 +207,6 @@ public bool ReassignUnityObjectMaterials(Object obj, StringBuilder errors)
             {
                 // Make sure the changes get saved
                 EditorUtility.SetDirty(obj);
-                EditorSceneManager.SaveScene(SceneManager.GetActiveScene());
             }
             else
                 errors.AppendLine($"Could not reassign materials of {obj} with {obj.GetType()} type.");

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

@@ -0,0 +1,129 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using UnityEngine;
+
+namespace UnityEditor.Rendering.Converter
+{
+    internal class ReadonlyMaterialMap
+    {
+        public bool TryGetMappingMaterial(Material material, out Material mappingMaterial)
+        {
+            mappingMaterial = material;
+
+            if (m_BuiltInMaterialsMappings.TryGetValue(material.name, out var mapping))
+                mappingMaterial = mapping();
+
+            return mappingMaterial != null;
+        }
+
+        public int count => m_BuiltInMaterialsMappings.Count;
+
+        public IEnumerable<string> Keys => m_BuiltInMaterialsMappings.Keys;
+
+        Dictionary<string, Func<Material>> m_BuiltInMaterialsMappings = new();
+
+        public List<(string materialName, string searchQuery)> GetMaterialSearchList()
+        {
+            List<(string materialName, string searchQuery)> list = new();
+            foreach (var mat in GetBuiltInMaterials())
+            {
+                string formattedId = $"<$object:{GlobalObjectId.GetGlobalObjectIdSlow(mat)},UnityEngine.Object$>";
+                list.Add(($"p: ref={formattedId}", $"{mat.name} is being referenced"));
+            }
+            return list;
+        }
+
+        public ReadonlyMaterialMap(Dictionary<string, Func<Material>> mappings)
+        {
+            m_BuiltInMaterialsMappings = mappings;
+        }
+
+        public Material[] GetBuiltInMaterials()
+        {
+            using (UnityEngine.Pool.ListPool<Material>.Get(out var tmp))
+            {
+                foreach (var materialName in Keys)
+                {
+                    var name = materialName + ".mat";
+
+                    Material mat = null;
+                    foreach (var material in AssetDatabaseHelper.FindAssets<Material>())
+                    {
+                        if (material.name == materialName)
+                        {
+                            mat = material;
+                            break;
+                        }
+                    }
+
+                    if (mat == null)
+                    {
+                        mat = AssetDatabase.GetBuiltinExtraResource<Material>(name);
+                        if (mat == null)
+                        {
+                            mat = Resources.GetBuiltinResource<Material>(name);
+                            if (mat == null)
+                            {
+                                mat = Resources.Load<Material>(name);
+                            }
+                        }
+                    }
+
+                    if (mat == null)
+                    {
+                        Debug.LogError($"Material '{materialName}' not found in built-in resources or project assets.");
+                        continue;
+                    }
+
+                    tmp.Add(mat);
+                }
+                return tmp.ToArray();
+            }
+        }
+    }
+
+    [Serializable]
+    internal abstract class ReadonlyMaterialConverter : AssetsConverter
+    {
+        protected virtual Dictionary<string, Func<Material>> materialMappings { get; }
+
+        protected override List<(string query, string description)> contextSearchQueriesAndIds
+        {
+            get => mappings.GetMaterialSearchList();
+        }
+
+        internal MaterialReferenceChanger m_MaterialReferenceChanger;
+        private ReadonlyMaterialMap m_Mappings;
+
+        internal ReadonlyMaterialMap mappings
+        {
+            get
+            {
+                m_Mappings ??= new ReadonlyMaterialMap(materialMappings);
+                return m_Mappings;
+            }
+        }
+
+        public override void BeforeConvert()
+        {
+            m_MaterialReferenceChanger = new MaterialReferenceChanger(mappings);
+        }
+
+        public override void AfterConvert()
+        {
+            m_MaterialReferenceChanger?.Dispose();
+            m_MaterialReferenceChanger = null;
+        }
+
+        protected override Status ConvertObject(UnityEngine.Object obj, StringBuilder message)
+        {
+            if (!m_MaterialReferenceChanger.ReassignUnityObjectMaterials(obj, message))
+            {
+                return Status.Error;
+            }
+
+            return Status.Success;
+        }
+    }
+}

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

@@ -23,7 +23,8 @@ public string name
             }
         }
 
-        public string info => assetPath;
+        [field:SerializeField]
+        public string info {get; set; }
 
         public bool isEnabled { get; set; } = true;
         public string isDisabledMessage { get; set; } = string.Empty;

Packages/com.unity.render-pipelines.core/Editor/BuildProcessors/CoreBuildData.cs

@@ -34,7 +34,7 @@ public class CoreBuildData : IDisposable
         /// </summary>
         public List<RenderPipelineAsset> renderPipelineAssets { get; private set; } = new();
 
-        internal Dictionary<int, ComputeShader> computeShaderCache { get; private set; } = new();
+        internal Dictionary<EntityId, ComputeShader> computeShaderCache { get; private set; } = new();
 
         internal bool pipelineSupportGPUResidentDrawer { get; private set; } = false;
         internal bool playerNeedGPUResidentDrawer { get; private set; } = false;
@@ -80,8 +80,10 @@ private void CheckGPUResidentDrawerUsage()
             if (!playerNeedGPUResidentDrawer)
                 return;
 
+            #pragma warning disable 618 // Todo(@daniel.andersen): Remove deprecated API usage
             GraphicsSettings.GetRenderPipelineSettings<GPUResidentDrawerResources>()
                 .ForEachFieldOfType<ComputeShader>(computeShader => computeShaderCache.Add(computeShader.GetEntityId(), computeShader));
+            #pragma warning restore 618
         }
 
         /// <summary>

Packages/com.unity.render-pipelines.core/Editor/BuildProcessors/ShaderStrippers/SRPDisabledComputeShaderVariantStripper.cs

@@ -7,7 +7,9 @@ class SRPDisabledComputeShaderVariantStripper : IComputeShaderVariantStripper
     {
         public bool active => !CoreBuildData.instance.buildingPlayerForRenderPipeline;
 
+#pragma warning disable 618 // Todo(@daniel.andersen): Remove deprecated API usage
         public bool CanRemoveVariant([DisallowNull] ComputeShader shader, string _, ShaderCompilerData __)
             => CoreBuildData.instance.computeShaderCache.ContainsKey(shader.GetEntityId());
+#pragma warning restore 618
     }
 }

Packages/com.unity.render-pipelines.core/Editor/InternalBridge/AssemblyInfo.cs

@@ -1,3 +1,4 @@
 using System.Runtime.CompilerServices;
 
 [assembly: InternalsVisibleTo("Unity.RenderPipelines.Core.Editor")]
+[assembly: InternalsVisibleTo("Unity.RenderPipelines.HighDefinition.Editor")]

Packages/com.unity.render-pipelines.core/Editor/InternalBridge/ObjectSelector.cs

@@ -0,0 +1,14 @@
+using System.Collections.Generic;
+using System;
+using UnityEngine;
+
+namespace UnityEditor.Rendering
+{
+    static class ObjectSelector
+    {
+        public static void Show(UnityEngine.Object obj, Type requiredType, UnityEngine.Object objectBeingEdited, bool allowSceneObjects, List<EntityId> allowedEntityIds = null, Action<UnityEngine.Object> onObjectSelectorClosed = null, Action<UnityEngine.Object> onObjectSelectedUpdated = null, bool showNoneItem = true)
+        {
+            UnityEditor.ObjectSelector.get.Show(obj, requiredType, objectBeingEdited, allowSceneObjects, allowedEntityIds, onObjectSelectorClosed, onObjectSelectedUpdated, showNoneItem);
+        }
+    }
+}

Packages/com.unity.render-pipelines.core/Editor/Lighting/ProbeVolume/ProbeGIBaking.RenderingLayers.cs

@@ -104,7 +104,7 @@ public override void Initialize(ProbeVolumeBakingSet bakingSet, NativeArray<Vect
                 Graphics.ExecuteCommandBuffer(cmd);
                 cmd.Clear();
             }
-     
+
             static AccelStructAdapter BuildAccelerationStructure()
             {
                 var accelStruct = s_TracingContext.CreateAccelerationStructure();
@@ -127,14 +127,14 @@ static AccelStructAdapter BuildAccelerationStructure()
                     Span<bool> perSubMeshOpaqueness = stackalloc bool[subMeshCount];
                     perSubMeshOpaqueness.Fill(true);
 
-                    accelStruct.AddInstance(renderer.component.GetEntityId(), renderer.component, perSubMeshMask, matIndices, perSubMeshOpaqueness, 1);
+                    accelStruct.AddInstance(renderer.component.GetEntityId().GetRawData(), renderer.component, perSubMeshMask, matIndices, perSubMeshOpaqueness, 1);
                 }
 
                 foreach (var terrain in contributors.terrains)
                 {
                     uint mask = GetInstanceMask(terrain.component.shadowCastingMode);
                     uint materialID = terrain.component.renderingLayerMask; // repurpose the material id as we don't need it here
-                    accelStruct.AddInstance(terrain.component.GetEntityId(), terrain.component, new uint[1] { mask }, new uint[1] { materialID }, new bool[1] { true }, 1);
+                    accelStruct.AddInstance(terrain.component.GetEntityId().GetRawData(), terrain.component, new uint[1] { mask }, new uint[1] { materialID }, new bool[1] { true }, 1);
                 }
 
                 return accelStruct;

Packages/com.unity.render-pipelines.core/Editor/Lighting/ProbeVolume/ProbeGIBaking.SkyOcclusion.cs

@@ -223,13 +223,13 @@ static AccelStructAdapter BuildAccelerationStructure()
                     Span<bool> perSubMeshOpaqueness = stackalloc bool[subMeshCount];
                     perSubMeshOpaqueness.Fill(true);
 
-                    accelStruct.AddInstance((int)renderer.component.GetEntityId().GetRawData(), renderer.component, perSubMeshMask, matIndices, perSubMeshOpaqueness, 1);
+                    accelStruct.AddInstance(renderer.component.GetEntityId().GetRawData(), renderer.component, perSubMeshMask, matIndices, perSubMeshOpaqueness, 1);
                 }
 
                 foreach (var terrain in contributors.terrains)
                 {
                     uint mask = GetInstanceMask(terrain.component.shadowCastingMode);
-                    accelStruct.AddInstance(terrain.component.GetEntityId(), terrain.component, new uint[1] { mask }, new uint[1] { 0 }, new bool[1] { true }, 1);
+                    accelStruct.AddInstance(terrain.component.GetEntityId().GetRawData(), terrain.component, new uint[1] { mask }, new uint[1] { 0 }, new bool[1] { true }, 1);
                 }
 
                 return accelStruct;

Packages/com.unity.render-pipelines.core/Editor/Lighting/ProbeVolume/ProbeGIBaking.VirtualOffset.cs

@@ -149,7 +149,7 @@ static AccelStructAdapter BuildAccelerationStructure(int mask)
                     Span<bool> perSubMeshOpaqueness = stackalloc bool[subMeshCount];
                     perSubMeshOpaqueness.Fill(true);
 
-                    accelStruct.AddInstance(renderer.component.GetEntityId(), renderer.component, maskAndMatDummy, maskAndMatDummy, perSubMeshOpaqueness, 1);
+                    accelStruct.AddInstance(renderer.component.GetEntityId().GetRawData(), renderer.component, maskAndMatDummy, maskAndMatDummy, perSubMeshOpaqueness, 1);
                 }
 
                 foreach (var terrain in contributors.terrains)
@@ -158,7 +158,7 @@ static AccelStructAdapter BuildAccelerationStructure(int mask)
                     if ((layerMask & mask) == 0)
                         continue;
 
-                    accelStruct.AddInstance(terrain.component.GetEntityId(), terrain.component, new uint[1] { 0xFFFFFFFF }, new uint[1] { 0xFFFFFFFF }, new bool[1] { true }, 1);
+                    accelStruct.AddInstance(terrain.component.GetEntityId().GetRawData(), terrain.component, new uint[1] { 0xFFFFFFFF }, new uint[1] { 0xFFFFFFFF }, new bool[1] { true }, 1);
                 }
 
                 return accelStruct;