Internal/6000.0/staging

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

@@ -241,6 +241,13 @@ static ProbeSubdivisionResult GetBricksFromLoaded()
             var dataList = GetPerSceneDataList();
             var result = new ProbeSubdivisionResult();
 
+            // We read bricks from the asset rather than using the currently loaded cells.
+            // This is because not all bricks from the previous bake are guaranteed to be currently loaded,
+            // we may for example have hit the max brick count given the selected memory budget.
+            ProbeVolumeStreamableAsset bricksDataAsset = m_BakingSet.cellBricksDataAsset;
+            bricksDataAsset.EnsureAssetLoaded();
+            using NativeArray<Brick> previousBricks = bricksDataAsset.asset.GetData<Brick>();
+
             foreach (var data in dataList)
             {
                 var cellSize = m_ProfileInfo.minDistanceBetweenProbes * 3.0f * m_ProfileInfo.cellSizeInBricks;
@@ -252,15 +259,20 @@ static ProbeSubdivisionResult GetBricksFromLoaded()
                 foreach (var cellIndex in cells)
                 {
                     var cellDesc = m_BakingSet.GetCellDesc(cellIndex);
-                    var cellData = m_BakingSet.GetCellData(cellIndex);
                     var cellPos = cellDesc.position;
 
                     if (!result.scenesPerCells.ContainsKey(cellPos))
                     {
                         result.scenesPerCells[cellPos] = new HashSet<string>();
 
                         var center = new Vector3((cellPos.x + 0.5f) * cellSize, (cellPos.y + 0.5f) * cellSize, (cellPos.z + 0.5f) * cellSize);
-                        result.cells.Add((cellPos, new Bounds(center, cellDimensions), cellData.bricks.ToArray()));
+
+                        var cellStreamingDesc = bricksDataAsset.streamableCellDescs[cellIndex];
+                        int bricksOffset = cellStreamingDesc.offset / bricksDataAsset.elementSize;
+                        int bricksCount = Mathf.Min(cellStreamingDesc.elementCount, cellDesc.bricksCount);
+                        Brick[] bricks = previousBricks.GetSubArray(bricksOffset, bricksCount).ToArray();
+
+                        result.cells.Add((cellPos, new Bounds(center, cellDimensions), bricks));
                     }
                     result.scenesPerCells[cellPos].Add(data.sceneGUID);
                 }

Packages/com.unity.render-pipelines.core/Editor/Lighting/ProbeVolume/ProbeVolumeCellDilation.compute

@@ -1,6 +1,6 @@
 #pragma kernel DilateCell
 
-#pragma only_renderers d3d11 playstation xboxone xboxseries vulkan metal switch webgpu
+#pragma only_renderers d3d11 playstation xboxone xboxseries vulkan metal switch switch2 webgpu
 
 #include "Packages/com.unity.render-pipelines.core/ShaderLibrary/Common.hlsl"
 #include "Packages/com.unity.render-pipelines.core/ShaderLibrary/CommonLighting.hlsl"

Packages/com.unity.render-pipelines.core/Editor/Lighting/ProbeVolume/ProbeVolumeSubdivide.compute

@@ -6,7 +6,7 @@
 #pragma kernel VoxelizeProbeVolumeData
 #pragma kernel Subdivide
 
-#pragma only_renderers d3d11 playstation xboxone xboxseries vulkan metal switch webgpu
+#pragma only_renderers d3d11 playstation xboxone xboxseries vulkan metal switch switch2 webgpu
 
 // #pragma enable_d3d11_debug_symbols
 

Packages/com.unity.render-pipelines.core/Editor/Lighting/ProbeVolume/VirtualOffset/TraceVirtualOffset.urtshader

@@ -1,4 +1,4 @@
-#pragma only_renderers d3d11 playstation xboxone xboxseries vulkan metal webgpu switch
+#pragma only_renderers d3d11 playstation xboxone xboxseries vulkan metal webgpu switch switch2
 #define UNIFIED_RT_GROUP_SIZE_X 64
 #define UNIFIED_RT_GROUP_SIZE_Y 1
 

Packages/com.unity.render-pipelines.core/Editor/Settings/DefaultVolumeProfileEditor.cs

@@ -242,7 +242,7 @@ void OnVolumeComponentContextClick(Vector2 position, VolumeComponentEditor targe
             menu.AddItem(VolumeProfileUtils.Styles.copySettings, false, () => VolumeComponentCopyPaste.CopySettings(targetComponent));
 
             if (VolumeComponentCopyPaste.CanPaste(targetComponent))
-                menu.AddItem(VolumeProfileUtils.Styles.pasteSettings, false, () => VolumeComponentCopyPaste.PasteSettings(targetComponent));
+                menu.AddItem(VolumeProfileUtils.Styles.pasteSettings, false, () => VolumeComponentCopyPaste.PasteSettings(targetComponent, m_Profile));
             else
                 menu.AddDisabledItem(VolumeProfileUtils.Styles.pasteSettings);
 

Packages/com.unity.render-pipelines.core/Editor/Volume/VolumeComponentCopyPaste.cs

@@ -62,7 +62,7 @@ public static void CopySettings(VolumeComponent targetComponent)
             EditorGUIUtility.systemCopyBuffer = writer.ToString();
         }
 
-        public static void PasteSettings(VolumeComponent targetComponent)
+        public static void PasteSettings(VolumeComponent targetComponent, VolumeProfile asset)
         {
             if (targetComponent == null)
                 return;
@@ -72,6 +72,11 @@ public static void PasteSettings(VolumeComponent targetComponent)
             using var reader = new StringReader(EditorGUIUtility.systemCopyBuffer);
             if (TryReadCopyBuffer(reader, out var typeAndValue))
                 JsonUtility.FromJsonOverwrite(typeAndValue[1], targetComponent);
+
+            if (EditorUtility.IsPersistent(asset))
+            {
+                EditorUtility.SetDirty(asset);
+            }
         }
 
         public static void CopySettings(List<VolumeComponent> targetComponents)
@@ -87,7 +92,7 @@ public static void CopySettings(List<VolumeComponent> targetComponents)
             EditorGUIUtility.systemCopyBuffer = writer.ToString();
         }
 
-        public static void PasteSettings(List<VolumeComponent> targetComponents)
+        public static void PasteSettings(List<VolumeComponent> targetComponents, VolumeProfile asset)
         {
             if (targetComponents == null || targetComponents.Count == 0)
                 return;
@@ -113,6 +118,11 @@ public static void PasteSettings(List<VolumeComponent> targetComponents)
                     JsonUtility.FromJsonOverwrite(typeAndValue[1], targetComponent);
                 }
             }
+
+            if (EditorUtility.IsPersistent(asset))
+            {
+                EditorUtility.SetDirty(asset);
+            }
         }
     }
 }

Packages/com.unity.render-pipelines.core/Editor/Volume/VolumeComponentListEditor.cs

@@ -470,7 +470,7 @@ void OnContextClick(Vector2 position, VolumeComponentEditor targetEditor, int id
             if (VolumeComponentCopyPaste.CanPaste(targetComponent))
                 menu.AddItem(EditorGUIUtility.TrTextContent("Paste Settings"), false, () =>
                 {
-                    VolumeComponentCopyPaste.PasteSettings(targetComponent);
+                    VolumeComponentCopyPaste.PasteSettings(targetComponent, asset);
                     VolumeManager.instance.OnVolumeProfileChanged(asset);
                 });
             else

Packages/com.unity.render-pipelines.core/Editor/Volume/VolumeEditor.cs

@@ -266,29 +266,62 @@ void OnVolumeProfileContextClick()
 
             if (profileRef != null)
             {
+                bool hasNoComponents = profileRef.components.Count == 0;
+
                 var cloneLabel = targetVolume.HasInstantiatedProfile() ? Styles.saveLabel : Styles.cloneLabel;
                 menu.AddItem(cloneLabel, false, CloneProfile);
                 menu.AddSeparator(string.Empty);
-                menu.AddItem(VolumeProfileUtils.Styles.collapseAll, false, () =>
+
+                if (hasNoComponents)
                 {
-                    VolumeProfileUtils.SetComponentEditorsExpanded(m_ComponentList.editors, false);
-                });
-                menu.AddItem(VolumeProfileUtils.Styles.expandAll, false, () =>
+                    menu.AddDisabledItem(VolumeProfileUtils.Styles.collapseAll);
+                    menu.AddDisabledItem(VolumeProfileUtils.Styles.expandAll);
+                }
+                else
                 {
-                    VolumeProfileUtils.SetComponentEditorsExpanded(m_ComponentList.editors, true);
-                });
+                    menu.AddItem(VolumeProfileUtils.Styles.collapseAll, false, () =>
+                    {
+                        VolumeProfileUtils.SetComponentEditorsExpanded(m_ComponentList.editors, false);
+                    });
+                    menu.AddItem(VolumeProfileUtils.Styles.expandAll, false, () =>
+                    {
+                        VolumeProfileUtils.SetComponentEditorsExpanded(m_ComponentList.editors, true);
+                    });
+                }
+
                 menu.AddSeparator(string.Empty);
-                menu.AddItem(Styles.enableAll, false, () => SetComponentsActive(true));
-                menu.AddItem(Styles.disableAll, false, () => SetComponentsActive(false));
-                menu.AddItem(Styles.removeAll, false, () => m_ComponentList.RemoveAllComponents());
-                menu.AddItem(VolumeProfileUtils.Styles.resetAll, false, () => m_ComponentList.ResetAllComponents());
+
+                if (hasNoComponents)
+                {
+                    menu.AddDisabledItem(Styles.enableAll);
+                    menu.AddDisabledItem(Styles.disableAll);
+                    menu.AddDisabledItem(Styles.removeAll);
+                    menu.AddDisabledItem(VolumeProfileUtils.Styles.resetAll);
+                }
+                else
+                {
+                    menu.AddItem(Styles.enableAll, false, () => SetComponentsActive(true));
+                    menu.AddItem(Styles.disableAll, false, () => SetComponentsActive(false));
+                    menu.AddItem(Styles.removeAll, false, () => m_ComponentList.RemoveAllComponents());
+                    menu.AddItem(VolumeProfileUtils.Styles.resetAll, false, () => m_ComponentList.ResetAllComponents());
+                }
+
                 menu.AddSeparator(string.Empty);
-                menu.AddItem(VolumeProfileUtils.Styles.copyAllSettings, false,
-                    () => VolumeComponentCopyPaste.CopySettings(profileRef.components));
+
+                if (hasNoComponents)
+                {
+                    menu.AddDisabledItem(VolumeProfileUtils.Styles.copyAllSettings);
+                }
+                else
+                {
+                    menu.AddItem(VolumeProfileUtils.Styles.copyAllSettings, false,
+                        () => VolumeComponentCopyPaste.CopySettings(profileRef.components));
+                }
+
                 if (VolumeComponentCopyPaste.CanPaste(profileRef.components))
                     menu.AddItem(VolumeProfileUtils.Styles.pasteSettings, false, () =>
                     {
-                        VolumeComponentCopyPaste.PasteSettings(profileRef.components);
+                        VolumeComponentCopyPaste.PasteSettings(profileRef.components, profileRef);
                         VolumeManager.instance.OnVolumeProfileChanged(profileRef);
                     });
                 else

Packages/com.unity.render-pipelines.core/Editor/Volume/VolumeProfileUtils.cs

@@ -325,7 +325,7 @@ public static void AddVolumeProfileContextMenuItems(
                 if (VolumeComponentCopyPaste.CanPaste(volumeProfile.components))
                     menu.AddItem(Styles.pasteSettings, false, () =>
                     {
-                        VolumeComponentCopyPaste.PasteSettings(volumeProfile.components);
+                        VolumeComponentCopyPaste.PasteSettings(volumeProfile.components, volumeProfile);
                         VolumeManager.instance.OnVolumeProfileChanged(volumeProfile);
                     });
                 else
@@ -411,7 +411,7 @@ public static void OnVolumeProfileContextClick(
                 if (VolumeComponentCopyPaste.CanPaste(volumeProfile.components))
                     menu.AddItem(Styles.pasteSettings, false, () =>
                     {
-                        VolumeComponentCopyPaste.PasteSettings(volumeProfile.components);
+                        VolumeComponentCopyPaste.PasteSettings(volumeProfile.components, volumeProfile);
                         VolumeManager.instance.OnVolumeProfileChanged(volumeProfile);
                     });
                 else

Packages/com.unity.render-pipelines.core/Runtime/Debug/ProbeVolumeDebug.shader

@@ -7,7 +7,7 @@ Shader "Hidden/Core/ProbeVolumeDebug"
 
         HLSLINCLUDE
         #pragma target 4.5
-        #pragma only_renderers d3d11 playstation xboxone xboxseries vulkan metal switch
+        #pragma only_renderers d3d11 playstation xboxone xboxseries vulkan metal switch switch2
         #pragma multi_compile_fragment _ PROBE_VOLUMES_L1 PROBE_VOLUMES_L2
 
         // Central render pipeline specific includes

Packages/com.unity.render-pipelines.core/Runtime/Debug/ProbeVolumeFragmentationDebug.shader

@@ -13,7 +13,7 @@ Shader "Hidden/Core/ProbeVolumeFragmentationDebug"
             HLSLPROGRAM
             #pragma editor_sync_compilation
             #pragma target 4.5
-            #pragma only_renderers d3d11 playstation xboxone xboxseries vulkan metal switch
+            #pragma only_renderers d3d11 playstation xboxone xboxseries vulkan metal switch switch2
             // #pragma enable_d3d11_debug_symbols
 
             #pragma vertex Vert

Packages/com.unity.render-pipelines.core/Runtime/Debug/ProbeVolumeOffsetDebug.shader

@@ -8,7 +8,7 @@ Shader "Hidden/Core/ProbeVolumeOffsetDebug"
         HLSLINCLUDE
         #pragma editor_sync_compilation
         #pragma target 4.5
-        #pragma only_renderers d3d11 playstation xboxone xboxseries vulkan metal switch
+        #pragma only_renderers d3d11 playstation xboxone xboxseries vulkan metal switch switch2
         #pragma multi_compile_fragment _ PROBE_VOLUMES_L1 PROBE_VOLUMES_L2
 
         // Central render pipeline specific includes

Packages/com.unity.render-pipelines.core/Runtime/Debug/ProbeVolumeSamplingDebug.shader

@@ -9,7 +9,7 @@ Shader "Hidden/Core/ProbeVolumeSamplingDebug"
         HLSLINCLUDE
         #pragma editor_sync_compilation
         #pragma target 4.5
-        #pragma only_renderers d3d11 playstation xboxone xboxseries vulkan metal switch
+        #pragma only_renderers d3d11 playstation xboxone xboxseries vulkan metal switch switch2
         #pragma multi_compile_fragment _ PROBE_VOLUMES_L1 PROBE_VOLUMES_L2
         //#pragma enable_d3d11_debug_symbols
 

Packages/com.unity.render-pipelines.core/Runtime/Debugging/DebugManager.UIState.cs

@@ -6,7 +6,7 @@
 using UnityEditor;
 #endif
 
-#if UNITY_ANDROID || UNITY_IPHONE || UNITY_TVOS || UNITY_SWITCH
+#if UNITY_ANDROID || UNITY_IPHONE || UNITY_TVOS || UNITY_SWITCH || UNITY_SWITCH2
 using UnityEngine.UI;
 #endif
 
@@ -104,7 +104,7 @@ public bool displayRuntimeUI
                     m_Root.transform.localPosition = Vector3.zero;
                     m_RootUICanvas = m_Root.GetComponent<DebugUIHandlerCanvas>();
 
-#if UNITY_ANDROID || UNITY_IPHONE || UNITY_TVOS || UNITY_SWITCH
+#if UNITY_ANDROID || UNITY_IPHONE || UNITY_TVOS || UNITY_SWITCH || UNITY_SWITCH2
                     var canvasScaler = m_Root.GetComponent<CanvasScaler>();
                     canvasScaler.uiScaleMode = CanvasScaler.ScaleMode.ScaleWithScreenSize;
 #endif

Packages/com.unity.render-pipelines.core/Runtime/Debugging/VolumeDebugSettings.cs

@@ -183,7 +183,7 @@ float ComputeWeight(Volume volume, Vector3 triggerPos)
         public Volume[] GetVolumes()
         {
             return VolumeManager.instance.GetVolumes(selectedCameraLayerMask)
-                .Where(v => v.sharedProfile != null)
+                .Where(v => v.profileRef != null)
                 .Reverse().ToArray();
         }
 

Packages/com.unity.render-pipelines.core/Runtime/GPUDriven/GPUResidentDrawer.Validator.cs

@@ -18,6 +18,7 @@ static class Strings
             public static readonly string batchRendererGroupShaderStrippingModeInvalid = $"{nameof(GPUResidentDrawer)} \"BatchRendererGroup Variants\" setting must be \"Keep All\". " +
                 " The current setting will cause errors when building a player because all DOTS instancing shaders will be stripped" +
                 " To fix, modify Graphics settings and set \"BatchRendererGroup Variants\" to \"Keep All\".";
+            public static readonly string visionOSNotSupported = $"{nameof(GPUResidentDrawer)} Disabled on VisionOS as it is non applicable. This platform uses a custom rendering path and doesn't go through the resident drawer.";
         }
 
         internal static bool IsProjectSupported()
@@ -30,6 +31,13 @@ internal static bool IsProjectSupported(out string message, out LogType severity
             message = string.Empty;
             severity = LogType.Log;
 
+            if (Application.platform == RuntimePlatform.VisionOS)
+            {
+                message = Strings.visionOSNotSupported;
+                severity = LogType.Log;
+                return false;
+            }
+
             // The GPUResidentDrawer only has support when the RawBuffer path of providing data
             // ConstantBuffer path and any other unsupported platforms early out here
             if (BatchRendererGroup.BufferTarget != BatchBufferTarget.RawBuffer)

Packages/com.unity.render-pipelines.core/Runtime/Lighting/ProbeVolume/ProbeVolume.hlsl

@@ -1,9 +1,9 @@
 #ifndef __PROBEVOLUME_HLSL__
 #define __PROBEVOLUME_HLSL__
 
-#if defined(SHADER_API_MOBILE) || defined(SHADER_API_SWITCH)
+#if defined(SHADER_API_MOBILE) || defined(SHADER_API_SWITCH) || defined(SHADER_API_SWITCH2)
 //#define USE_APV_TEXTURE_HALF
-#endif // SHADER_API_MOBILE || SHADER_API_SWITCH
+#endif // SHADER_API_MOBILE || SHADER_API_SWITCH || SHADER_API_SWITCH2
 
 #include "Packages/com.unity.render-pipelines.core/Runtime/Lighting/ProbeVolume/ShaderVariablesProbeVolumes.cs.hlsl"
 #include "Packages/com.unity.render-pipelines.core/ShaderLibrary/SphericalHarmonics.hlsl"

Packages/com.unity.render-pipelines.core/Runtime/Lighting/ProbeVolume/ProbeVolumeBlendStates.compute

@@ -1,4 +1,4 @@
-#pragma only_renderers d3d11 playstation xboxone xboxseries vulkan metal switch webgpu gles3
+#pragma only_renderers d3d11 playstation xboxone xboxseries vulkan metal switch switch2 webgpu gles3
 //#pragma enable_d3d11_debug_symbols
 
 #pragma kernel BlendScenarios

Packages/com.unity.render-pipelines.core/Runtime/Lighting/ProbeVolume/ProbeVolumeUploadData.compute

@@ -1,4 +1,4 @@
-#pragma only_renderers d3d11 playstation xboxone xboxseries vulkan metal switch webgpu gles3
+#pragma only_renderers d3d11 playstation xboxone xboxseries vulkan metal switch switch2 webgpu gles3
 //#pragma enable_d3d11_debug_symbols
 
 #include "Packages/com.unity.render-pipelines.core/Runtime/Lighting/ProbeVolume/ProbeVolumeUploadDataCommon.hlsl"

Packages/com.unity.render-pipelines.core/Runtime/Lighting/ProbeVolume/ProbeVolumeUploadDataL2.compute

@@ -1,4 +1,4 @@
-#pragma only_renderers d3d11 playstation xboxone xboxseries vulkan metal switch webgpu gles3
+#pragma only_renderers d3d11 playstation xboxone xboxseries vulkan metal switch switch2 webgpu gles3
 //#pragma enable_d3d11_debug_symbols
 
 #include "Packages/com.unity.render-pipelines.core/Runtime/Lighting/ProbeVolume/ProbeVolumeUploadDataCommon.hlsl"

Packages/com.unity.render-pipelines.core/Runtime/RenderGraph/Compiler/NativePassCompiler.Debug.cs

@@ -76,7 +76,10 @@ internal static string MakePassMergeMessage(CompilerContextData ctx, in PassData
                                $"- {passName}: {pass.fragmentInfoWidth}x{pass.fragmentInfoHeight}, {pass.fragmentInfoSamples} sample(s).";
                     break;
                 case PassBreakReason.NextPassReadsTexture:
-                    message += "The next pass reads one of the outputs as a regular texture, the pass needs to break.";
+                    message += $"{prevPassName} output is sampled by {passName} as a regular texture, the pass needs to break.";
+                    break;
+                case PassBreakReason.NextPassTargetsTexture:
+                    message += $"{prevPassName} reads a texture that {passName} targets to, the pass needs to break.";
                     break;
                 case PassBreakReason.NonRasterPass:
                     message += $"{prevPassName} is type {prevPass.type}. Only Raster passes can be merged.";