Internal/6000.6/staging

Packages/com.unity.render-pipelines.core/CHANGELOG.md

@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [Unreleased]
 
+### Fixed
+- Fixed a `variant DISABLE_TEXTURE2D_X_ARRAY not found` shader error when copying MSAA textures on OpenGL ES 3.1 drivers that lack per-sample shading (`gl_SampleID`); these devices now fall back to a regular blit instead.
+- Fixed a "Shader 'Hidden/Core/ProbeVolumeDebug': All SubShaders were stripped" warning when building an HDRP project, caused by a leftover URP-specific RenderPipeline tag on the shared probe volume debug shader.
+
 Version Updated
 The version number for this package has increased due to a version update of a related graphics package.
 

Packages/com.unity.render-pipelines.core/Documentation~/UnifiedRayTracing/create-ray-tracing-context.md

@@ -36,19 +36,19 @@ rtResources.Load();
 **Note:** Since the Player doesn't give access to the Asset Database, this method only works in the Editor.
 
 To load the [`RayTracingResources`](xref:UnityEngine.Rendering.UnifiedRayTracing.RayTracingResources) in the Player, you can also build an AssetBundle that includes the following SRP Core files:
-- Runtime/UnifiedRayTracing/Common/GeometryPool/GeometryPoolKernels.compute
-- Runtime/UnifiedRayTracing/Common/Utilities/CopyBuffer.compute
-- Runtime/UnifiedRayTracing/Compute/RadeonRays/kernels/copyPositions.compute
-- Runtime/UnifiedRayTracing/Compute/RadeonRays/kernels/bit_histogram.compute
-- Runtime/UnifiedRayTracing/Compute/RadeonRays/kernels/block_reduce_part.compute
-- Runtime/UnifiedRayTracing/Compute/RadeonRays/kernels/block_scan.compute
-- Runtime/UnifiedRayTracing/Compute/RadeonRays/kernels/build_hlbvh.compute
-- Runtime/UnifiedRayTracing/Compute/RadeonRays/kernels/restructure_bvh.compute
-- Runtime/UnifiedRayTracing/Compute/RadeonRays/kernels/scatter.compute
+- `Runtime/UnifiedRayTracing/Common/GeometryPool/GeometryPoolKernels.compute`
+- `Runtime/UnifiedRayTracing/Common/Utilities/CopyBuffer.compute`
+- `Runtime/UnifiedRayTracing/Compute/RadeonRays/kernels/copyPositions.compute`
+- `Runtime/UnifiedRayTracing/Compute/RadeonRays/kernels/bit_histogram.compute`
+- `Runtime/UnifiedRayTracing/Compute/RadeonRays/kernels/block_reduce_part.compute`
+- `Runtime/UnifiedRayTracing/Compute/RadeonRays/kernels/block_scan.compute`
+- `Runtime/UnifiedRayTracing/Compute/RadeonRays/kernels/build_hlbvh.compute`
+- `Runtime/UnifiedRayTracing/Compute/RadeonRays/kernels/restructure_bvh.compute`
+- `Runtime/UnifiedRayTracing/Compute/RadeonRays/kernels/scatter.compute`
 
-For more information about how to build and load AssetBundles, refer to [AssetBundles](xref:AssetBundlesIntro).
+For more information about building and loading AssetBundles, refer to [AssetBundles](xref:AssetBundlesIntro).
 
-Once the AssetBundle is built, you can load it using the following:
+After you build the AssetBundle, use the following code to load it:
 ```C# 
 var rtResources = new RayTracingResources();
 

Packages/com.unity.render-pipelines.core/Documentation~/render-graph-writing-a-render-pipeline.md

@@ -124,7 +124,7 @@ public class ExampleRenderPipeline : RenderPipeline
         } 
         catch (Exception e)
         {
-            if (renderGraph.ResetGraphAndLogException(e))
+            if (myRenderGraph.ResetGraphAndLogException(e))
                 throw;
         }
 

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

@@ -1,5 +1,8 @@
 using System.Runtime.CompilerServices;
 
+// Core
+[assembly: InternalsVisibleTo("Unity.RenderPipelines.Core.Editor.Tests")]
+
 // HDRP
 [assembly: InternalsVisibleTo("Unity.RenderPipelines.HighDefinition.Editor")]
 [assembly: InternalsVisibleTo("Unity.RenderPipelines.HighDefinition.Editor.Tests")]

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

@@ -17,54 +17,139 @@ internal abstract class AssetsConverter : IRenderPipelineConverter
         public void Scan(Action<List<IRenderPipelineConverterItem>> onScanFinish)
         {
             assets.Clear();
-            void OnSearchFinish()
-            {
-                var returnList = new List<IRenderPipelineConverterItem>(assets.Count);
-                foreach (var asset in assets)
-                    returnList.Add(asset);
-                onScanFinish?.Invoke(returnList);
-            }
 
-            var processedIds = new HashSet<string>();
+            var pooledDict = UnityEngine.Pool.DictionaryPool<string, List<RenderPipelineConverterAssetItem>>.Get(out var assetsByDescription);
+            bool dictionaryReleased = false;
 
-            SearchServiceUtils.RunQueuedSearch
-            (
-                SearchServiceUtils.IndexingOptions.DeepSearch,
-                contextSearchQueriesAndIds,
-                (item, description) =>
+            try
+            {
+                void OnSearchFinish()
                 {
-                    // Direct conversion - works for both assets and scene objects
-                    var unityObject = item.ToObject();
+                    try
+                    {
+                        var organizedList = CategorizeResults(assets, assetsByDescription);
+                        onScanFinish?.Invoke(organizedList);
+                    }
+                    finally
+                    {
+                        if (!dictionaryReleased)
+                        {
+                            UnityEngine.Pool.DictionaryPool<string, List<RenderPipelineConverterAssetItem>>.Release(assetsByDescription);
+                            dictionaryReleased = true;
+                        }
+                    }
+                }
+
+                var processedIds = new HashSet<string>();
+                var perGroupProcessedIds = new Dictionary<string, HashSet<string>>();
+                var assetLookup = new Dictionary<string, RenderPipelineConverterAssetItem>();
+
+                SearchServiceUtils.RunQueuedSearch
+                (
+                    SearchServiceUtils.IndexingOptions.DeepSearch,
+                    contextSearchQueriesAndIds,
+                    (item, description) =>
+                    {
+                        var unityObject = item.ToObject();
+
+                        if (unityObject == null)
+                            return;
+
+                        GameObject go = null;
 
-                    if (unityObject == null)
+                        if (unityObject is GameObject gameObject)
+                            go = gameObject;
+                        else if (unityObject is Component component)
+                            go = component.gameObject;
+                        else
                             return;
 
-                    // Ensure we're always working with GameObjects
-                    GameObject go = null;
+                        var gid = GlobalObjectId.GetGlobalObjectIdSlow(go);
+                        var gidString = gid.ToString();
 
-                    if (unityObject is GameObject gameObject)
-                        go = gameObject;
-                    else if (unityObject is Component component)
-                        go = component.gameObject;
-                    else
-                        return; // Not a GameObject or Component
+                        string groupName = GetGroupNameFromDescription(description);
 
-                    var gid = GlobalObjectId.GetGlobalObjectIdSlow(go);
-                    if (!processedIds.Add(gid.ToString()))
-                        return;
+                        // Check if this group has already processed this object
+                        if (!perGroupProcessedIds.ContainsKey(groupName))
+                            perGroupProcessedIds[groupName] = new HashSet<string>();
 
-                    int type = gid.identifierType; // 1=Asset, 2=SceneObject
+                        if (!perGroupProcessedIds[groupName].Add(gidString))
+                            return;
 
-                    var assetItem = new RenderPipelineConverterAssetItem(gid.ToString())
-                    {
-                        name = $"{unityObject.name} ({(type == 1 ? "Prefab" : "SceneObject")})",
-                        info = type == 1 ? AssetDatabase.GetAssetPath(unityObject) : go.scene.path,
-                    };
-
-                    assets.Add(assetItem);
-                },
-                OnSearchFinish
-            );
+                        RenderPipelineConverterAssetItem assetItem;
+
+                        // Add to the global assets list only once
+                        bool isNewAsset = processedIds.Add(gidString);
+                        if (isNewAsset)
+                        {
+                            int type = gid.identifierType;
+
+                            assetItem = new RenderPipelineConverterAssetItem(gidString)
+                            {
+                                name = $"{unityObject.name} ({(type == GlobalObjectIdentifierType.ImportedAsset ? "Prefab" : "SceneObject")})",
+                                info = type == GlobalObjectIdentifierType.ImportedAsset ? AssetDatabase.GetAssetPath(unityObject) : go.scene.path,
+                            };
+
+                            assets.Add(assetItem);
+                            assetLookup[gidString] = assetItem;
+                        }
+                        else
+                        {
+                            assetItem = assetLookup[gidString];
+                        }
+
+                        // Add the asset item to the group
+                        if (!assetsByDescription.ContainsKey(groupName))
+                            assetsByDescription[groupName] = new List<RenderPipelineConverterAssetItem>();
+
+                        assetsByDescription[groupName].Add(assetItem);
+                    },
+                    OnSearchFinish
+                );
+            }
+            catch
+            {
+                if (!dictionaryReleased)
+                {
+                    UnityEngine.Pool.DictionaryPool<string, List<RenderPipelineConverterAssetItem>>.Release(assetsByDescription);
+                    dictionaryReleased = true;
+                }
+                throw;
+            }
+        }
+
+        /// <summary>
+        /// Categorizes scan results into a tree structure.
+        /// Override this method to customize how items are organized.
+        /// Default implementation returns a flat list.
+        /// </summary>
+        /// <param name="assets">All assets found during scan</param>
+        /// <param name="assetsByDescription">Assets grouped by their search description</param>
+        /// <returns>Organized list of converter items</returns>
+        protected virtual List<IRenderPipelineConverterItem> CategorizeResults(
+            List<RenderPipelineConverterAssetItem> assets,
+            Dictionary<string, List<RenderPipelineConverterAssetItem>> assetsByDescription)
+        {
+            if (assets == null || assets.Count == 0)
+                return new List<IRenderPipelineConverterItem>();
+
+            // Default: Return flat list
+            var flatList = new List<IRenderPipelineConverterItem>(assets.Count);
+            foreach (var asset in assets)
+                flatList.Add(asset);
+
+            return flatList;
+        }
+
+        /// <summary>
+        /// Extracts the group name from the search description.
+        /// Override this to customize how group names are extracted.
+        /// Default implementation removes " is being referenced" suffix.
+        /// Note: This string is coupled to the format used in ReadonlyMaterialConverter.GetMaterialSearchList()
+        /// </summary>
+        protected virtual string GetGroupNameFromDescription(string description)
+        {
+            return description.Replace(" is being referenced", "");
         }
 
         public virtual void BeforeConvert() { }
@@ -75,6 +160,12 @@ public Status Convert(IRenderPipelineConverterItem item, out string message)
         {
             var assetItem = item as RenderPipelineConverterAssetItem;
 
+            if (assetItem == null)
+            {
+                message = "Item is not a valid asset for conversion.";
+                return Status.Error;
+            }
+
             var obj = assetItem.LoadObject();
 
             if (obj == null)