Internal/6000.2/staging

Internal/6000.2/staging

Author: claire-nicholson

Packages/com.unity.render-pipelines.core/Editor/Debugging/DebugWindow.cs

@@ -30,7 +30,7 @@ public int selectedPanel
             get => Mathf.Max(0, DebugManager.instance.PanelIndex(selectedPanelDisplayName));
             set
             {
-                var displayName = DebugManager.instance.PanelDiplayName(value);
+                var displayName = DebugManager.instance.PanelDisplayName(value);
                 if (!string.IsNullOrEmpty(displayName))
                     selectedPanelDisplayName = displayName;
             }

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

@@ -361,6 +361,7 @@ void BakingGUI()
                 activeSet = newSet;
 
                 ProbeReferenceVolume.instance.Clear();
+                ProbeReferenceVolume.instance.SetActiveBakingSet(newSet);
             }
 
             if (activeSet != null)

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

@@ -32,6 +32,10 @@ private void Reset()
         /// <param name="settings"><see cref="IDebugDisplaySettings"/> to be registered</param>
         public void RegisterDebug(IDebugDisplaySettings settings)
         {
+#if UNITY_EDITOR
+            if (UnityEditor.BuildPipeline.isBuildingPlayer)
+                return;
+#endif
             DebugManager debugManager = DebugManager.instance;
             List<IDebugDisplaySettingsPanelDisposable> panels = new List<IDebugDisplaySettingsPanelDisposable>();
 

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

@@ -297,12 +297,24 @@ public int PanelIndex([DisallowNull] string displayName)
             return -1;
         }
 
+
+        /// <summary>
+        /// Returns the panel display name
+        /// </summary>
+        /// <param name="panelIndex">The panelIndex for the panel to get the name</param>
+        /// <returns>The display name of the panel, or empty string otherwise</returns>
+        [Obsolete("Method is obsolete. Use PanelDisplayName instead. #from(6000.4) (UnityUpgradable) -> PanelDisplayName", true)]
+        public string PanelDiplayName(int panelIndex)
+        {
+            return PanelDisplayName(panelIndex);
+        }
+        
         /// <summary>
         /// Returns the panel display name
         /// </summary>
         /// <param name="panelIndex">The panelIndex for the panel to get the name</param>
         /// <returns>The display name of the panel, or empty string otherwise</returns>
-        public string PanelDiplayName([DisallowNull] int panelIndex)
+        public string PanelDisplayName(int panelIndex)
         {
             if (panelIndex < 0 || panelIndex > m_Panels.Count - 1)
                 return string.Empty;

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

@@ -574,9 +574,7 @@ IEnumerable<Camera> cameras
 
                         if (camera.cameraType != CameraType.Preview && camera.cameraType != CameraType.Reflection)
                         {
-                            if (!camera.TryGetComponent<IAdditionalData>(out var additionalData))
-                                Debug.LogWarning($"Camera {camera.name} does not contain an additional camera data component. Open the Game Object in the inspector to add additional camera data.");
-                            else
+                            if (camera.TryGetComponent<IAdditionalData>(out _))
                                 m_Cameras.Add(camera);
                         }
                     }

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

@@ -77,7 +77,13 @@ struct APVResources
 
 struct APVResourcesRW
 {
+#ifdef SHADER_API_METAL
+    // We need to use float4 on Metal, since HLSLcc will generate invalid MSL otherwise.
+    // See https://jira.unity3d.com/browse/UUM-127198
+    RWTexture3D<float4> L0_L1Rx;
+#else
     RWTexture3D<half4> L0_L1Rx;
+#endif
     RWTexture3D<unorm float4> L1G_L1Ry;
     RWTexture3D<unorm float4> L1B_L1Rz;
     RWTexture3D<unorm float4> L2_0;

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

@@ -15,7 +15,13 @@ Texture3D<float4> _State1_L0_L1Rx;
 Texture3D<float4> _State1_L1G_L1Ry;
 Texture3D<float4> _State1_L1B_L1Rz;
 
+#ifdef SHADER_API_METAL
+// We need to use float4 on Metal, since HLSLcc will generate invalid MSL otherwise.
+// See https://jira.unity3d.com/browse/UUM-127198
+RWTexture3D<float4> _Out_L0_L1Rx;
+#else
 RWTexture3D<half4> _Out_L0_L1Rx;
+#endif
 RWTexture3D<unorm float4> _Out_L1G_L1Ry;
 RWTexture3D<unorm float4> _Out_L1B_L1Rz;
 

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

@@ -9,7 +9,13 @@
 #pragma multi_compile_local _ PROBE_VOLUMES_SKY_SHADING_DIRECTION
 #pragma multi_compile_local _ PROBE_VOLUMES_PROBE_OCCLUSION
 
+#ifdef SHADER_API_METAL
+// We need to use float4 on Metal, since HLSLcc will generate invalid MSL otherwise.
+// See https://jira.unity3d.com/browse/UUM-127198
+RWTexture3D<float4> _Out_L0_L1Rx;
+#else
 RWTexture3D<half4> _Out_L0_L1Rx;
+#endif
 RWTexture3D<unorm float4> _Out_L1G_L1Ry;
 RWTexture3D<unorm float4> _Out_L1B_L1Rz;
 

Packages/com.unity.render-pipelines.high-definition/Runtime/Debug/DebugDisplay.cs

@@ -2125,6 +2125,11 @@ void UnregisterRenderingDebug()
 
         internal void RegisterDebug()
         {
+#if UNITY_EDITOR
+            if (UnityEditor.BuildPipeline.isBuildingPlayer)
+                return;
+#endif
+            
             RegisterMaterialDebug();
             RegisterLightingDebug();
             RegisterRenderingDebug();
@@ -2142,6 +2147,9 @@ internal void UnregisterDebug()
 
         void UnregisterDebugItems(string panelName, DebugUI.Widget[] items)
         {
+            if (items == null || items.Length == 0)
+                return;
+            
             var panel = DebugManager.instance.GetPanel(panelName);
             if (panel != null)
                 panel.children.Remove(items);

Packages/com.unity.render-pipelines.high-definition/Runtime/Debug/NVIDIADebugView.cs

@@ -253,6 +253,9 @@ String resToString(uint a, uint b)
 
         private void UpdateDebugUITable()
         {
+            if (m_DlssViewStateTableRows == null)
+                return;
+        
             for (int r = 0; r < m_DlssViewStateTableRows.Length; ++r)
             {
                 var d = m_Data.dlssFeatureInfos[r].data;