Internal/6000.0/staging

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

@@ -279,13 +279,6 @@ internal void Init()
             var supportedOn = volumeComponentType.GetCustomAttribute<VolumeComponentMenuForRenderPipeline>();
             m_LegacyPipelineTypes = supportedOn != null ? supportedOn.pipelineTypes : Array.Empty<Type>();
 #pragma warning restore CS0618
-
-            EditorApplication.contextualPropertyMenu += OnPropertyContextMenu;
-        }
-
-        void OnDestroy()
-        {
-            EditorApplication.contextualPropertyMenu -= OnPropertyContextMenu;
         }
 
         internal void DetermineVisibility(Type renderPipelineAssetType, Type renderPipelineType)
@@ -393,23 +386,13 @@ internal void AddDefaultProfileContextMenuEntries(
                 profile != null &&
                 defaultProfile != profile)
             {
+                menu.AddSeparator(string.Empty);
                 menu.AddItem(EditorGUIUtility.TrTextContent($"Show Default Volume Profile"), false,
                     () => Selection.activeObject = defaultProfile);
                 menu.AddItem(EditorGUIUtility.TrTextContent($"Apply Values to Default Volume Profile"), false, copyAction);
             }
         }
 
-        void OnPropertyContextMenu(GenericMenu menu, SerializedProperty property)
-        {
-            if (property.serializedObject.targetObject != target)
-                return;
-
-            var targetComponent = property.serializedObject.targetObject as VolumeComponent;
-
-            AddDefaultProfileContextMenuEntries(menu, VolumeManager.instance.globalDefaultProfile,
-                () => VolumeProfileUtils.AssignValuesToProfile(VolumeManager.instance.globalDefaultProfile, targetComponent, property));
-        }
-
         /// <summary>
         /// Unity calls this method after drawing the header for each VolumeComponentEditor
         /// </summary>

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

@@ -445,13 +445,14 @@ void OnContextClick(Vector2 position, VolumeComponentEditor targetEditor, int id
             if (!m_IsDefaultVolumeProfile)
                 menu.AddItem(EditorGUIUtility.TrTextContent("Remove"), false, () => RemoveComponent(id));
 
-            menu.AddSeparator(string.Empty);
 
             if (targetEditor.hasAdditionalProperties)
+            {
+                menu.AddSeparator(string.Empty);
                 menu.AddAdvancedPropertiesBoolMenuItem(() => targetEditor.showAdditionalProperties,
                                                        () => targetEditor.showAdditionalProperties ^= true);
+            }
 
-            menu.AddSeparator(string.Empty);
             targetEditor.AddDefaultProfileContextMenuEntries(menu, VolumeManager.instance.globalDefaultProfile,
                 () => VolumeProfileUtils.CopyValuesToProfile(targetComponent, VolumeManager.instance.globalDefaultProfile));
 

Packages/com.unity.render-pipelines.core/Runtime/GPUDriven/Debug/DebugDisplayGPUResidentDrawer.cs

@@ -1,6 +1,9 @@
 using System;
 using System.Collections.Generic;
 using Unity.Collections;
+#if UNITY_EDITOR
+using UnityEditor;
+#endif
 using static UnityEngine.Rendering.DebugUI;
 using static UnityEngine.Rendering.DebugUI.Widget;
 
@@ -106,6 +109,7 @@ private static InstanceOcclusionEventStats GetInstanceOcclusionEventStats(int pa
             else
                 return new InstanceOcclusionEventStats();
         }
+
         static class Strings
         {
             public const string drawerSettingsContainerName = "GPU Resident Drawer Settings";
@@ -144,6 +148,7 @@ private static int GetInstanceOcclusionEventCount()
         {
             return GPUResidentDrawer.GetDebugStats()?.instanceOcclusionEventStats.Length ?? 0;
         }
+
         private static DebugUI.Table.Row AddInstanceCullerViewDataRow(int viewIndex)
         {
             return new DebugUI.Table.Row
@@ -154,9 +159,32 @@ private static DebugUI.Table.Row AddInstanceCullerViewDataRow(int viewIndex)
                 children =
                 {
                     new DebugUI.Value { displayName = "View Type",          refreshRate = k_RefreshRate, formatString = k_FormatString, getter = () => GetInstanceCullerViewStats(viewIndex).viewType },
-                    new DebugUI.Value { displayName = "View Instance ID",   refreshRate = k_RefreshRate, formatString = k_FormatString, getter = () => GetInstanceCullerViewStats(viewIndex).viewInstanceID },
+                    new DebugUI.Value { displayName = "View Instance ID",   refreshRate = k_RefreshRate, formatString = k_FormatString, getter = () =>
+                        {
+                            var viewStats = GetInstanceCullerViewStats(viewIndex);
+#if UNITY_EDITOR
+                            Object view = EditorUtility.InstanceIDToObject(viewStats.viewInstanceID);
+                            if (view)
+                            {
+                                return $"{viewStats.viewInstanceID} ({view.name})";
+                            }
+#endif
+                            return viewStats.viewInstanceID;
+                        }
+                    },
                     new DebugUI.Value { displayName = "Split Index",        refreshRate = k_RefreshRate, formatString = k_FormatString, getter = () => GetInstanceCullerViewStats(viewIndex).splitIndex },
-                    new DebugUI.Value { displayName = "Visible Instances",  refreshRate = k_RefreshRate, formatString = k_FormatString, getter = () => GetInstanceCullerViewStats(viewIndex).visibleInstances },
+                    new DebugUI.Value { displayName = "Visible Instances CPU | GPU", tooltip = "Visible instances after CPU culling and after GPU culling.", refreshRate = k_RefreshRate, formatString = k_FormatString, getter = () =>
+                        {
+                            var viewStats = GetInstanceCullerViewStats(viewIndex);
+                            return $"{viewStats.visibleInstancesOnCPU} | {viewStats.visibleInstancesOnGPU}";
+                        }
+                    },
+                    new DebugUI.Value { displayName = "Visible Primitives CPU | GPU", tooltip = "Visible primitives after CPU culling and after GPU culling.", refreshRate = k_RefreshRate, formatString = k_FormatString, getter = () =>
+                        {
+                            var viewStats = GetInstanceCullerViewStats(viewIndex);
+                            return $"{viewStats.visiblePrimitivesOnCPU} | {viewStats.visiblePrimitivesOnGPU}";
+                        }
+                    },
                     new DebugUI.Value { displayName = "Draw Commands",      refreshRate = k_RefreshRate, formatString = k_FormatString, getter = () => GetInstanceCullerViewStats(viewIndex).drawCommands },
                 }
             };
@@ -182,6 +210,16 @@ private static object CulledInstancesString(in InstanceOcclusionEventStats stats
             return (stats.eventType == InstanceOcclusionEventType.OcclusionTest) ? stats.culledInstances : "-";
         }
 
+        private static object VisiblePrimitivesString(in InstanceOcclusionEventStats stats)
+        {
+            return (stats.eventType == InstanceOcclusionEventType.OcclusionTest) ? stats.visiblePrimitives : "-";
+        }
+
+        private static object CulledPrimitivesString(in InstanceOcclusionEventStats stats)
+        {
+            return (stats.eventType == InstanceOcclusionEventType.OcclusionTest) ? stats.culledPrimitives : "-";
+        }
+
         private static DebugUI.Table.Row AddInstanceOcclusionPassDataRow(int eventIndex)
         {
             return new DebugUI.Table.Row
@@ -191,13 +229,27 @@ private static DebugUI.Table.Row AddInstanceOcclusionPassDataRow(int eventIndex)
                 isHiddenCallback = () => { return eventIndex >= GetInstanceOcclusionEventCount(); },
                 children =
                 {
-                    new DebugUI.Value { displayName = "View Instance ID",   refreshRate = k_RefreshRate, formatString = k_FormatString, getter = () => GetInstanceOcclusionEventStats(eventIndex).viewInstanceID },
+                    new DebugUI.Value { displayName = "View Instance ID",   refreshRate = k_RefreshRate, formatString = k_FormatString, getter = () =>
+                        {
+                            var eventStats = GetInstanceOcclusionEventStats(eventIndex);
+#if UNITY_EDITOR
+                            Object view = EditorUtility.InstanceIDToObject(eventStats.viewInstanceID);
+                            if (view)
+                            {
+                                return $"{eventStats.viewInstanceID} ({view.name})";
+                            }
+#endif
+                            return eventStats.viewInstanceID;
+                        }
+                    },
                     new DebugUI.Value { displayName = "Event Type",         refreshRate = k_RefreshRate, formatString = k_FormatString, getter = () => $"{GetInstanceOcclusionEventStats(eventIndex).eventType}" },
                     new DebugUI.Value { displayName = "Occluder Version",   refreshRate = k_RefreshRate, formatString = k_FormatString, getter = () => OccluderVersionString(GetInstanceOcclusionEventStats(eventIndex)) },
                     new DebugUI.Value { displayName = "Subview Mask",       refreshRate = k_RefreshRate, formatString = k_FormatString, getter = () => $"0x{GetInstanceOcclusionEventStats(eventIndex).subviewMask:X}" },
                     new DebugUI.Value { displayName = "Occlusion Test",     refreshRate = k_RefreshRate, formatString = k_FormatString, getter = () => $"{OcclusionTestString(GetInstanceOcclusionEventStats(eventIndex))}" },
                     new DebugUI.Value { displayName = "Visible Instances",  refreshRate = k_RefreshRate, formatString = k_FormatString, getter = () => VisibleInstancesString(GetInstanceOcclusionEventStats(eventIndex)) },
                     new DebugUI.Value { displayName = "Culled Instances",   refreshRate = k_RefreshRate, formatString = k_FormatString, getter = () => CulledInstancesString(GetInstanceOcclusionEventStats(eventIndex)) },
+                    new DebugUI.Value { displayName = "Visible Primitives",  refreshRate = k_RefreshRate, formatString = k_FormatString, getter = () => VisiblePrimitivesString(GetInstanceOcclusionEventStats(eventIndex)) },
+                    new DebugUI.Value { displayName = "Culled Primitives",   refreshRate = k_RefreshRate, formatString = k_FormatString, getter = () => CulledPrimitivesString(GetInstanceOcclusionEventStats(eventIndex)) },
                 }
             };
         }
@@ -298,6 +350,104 @@ private void AddInstanceCullingStatsWidget(DebugDisplayGPUResidentDrawer data)
                     }
                 });
 
+                instanceCullerStats.children.Add(new DebugUI.ValueTuple()
+                {
+                    displayName = "Total Visible Instances (Cameras | Lights | Both)",
+                    values = new[]
+                    {
+                        new DebugUI.Value { refreshRate = k_RefreshRate, formatString = k_FormatString, getter = () =>
+                            {
+                                int totalGRDInstances = 0;
+
+                                for (int viewIndex = 0; viewIndex < GetInstanceCullerViewCount(); viewIndex++)
+                                {
+                                    var viewStats = GetInstanceCullerViewStats(viewIndex);
+                                    if (viewStats.viewType == BatchCullingViewType.Camera)
+                                        totalGRDInstances += viewStats.visibleInstancesOnGPU;
+                                }
+                                return totalGRDInstances;
+                            }
+                        },
+                        new DebugUI.Value { refreshRate = k_RefreshRate, formatString = k_FormatString, getter = () =>
+                            {
+                                int totalGRDInstances = 0;
+
+                                for (int viewIndex = 0; viewIndex < GetInstanceCullerViewCount(); viewIndex++)
+                                {
+                                    var viewStats = GetInstanceCullerViewStats(viewIndex);
+                                    if (viewStats.viewType == BatchCullingViewType.Light)
+                                        totalGRDInstances += viewStats.visibleInstancesOnGPU;
+                                }
+                                return totalGRDInstances;
+                            }
+                        },
+                        new DebugUI.Value { refreshRate = k_RefreshRate, formatString = k_FormatString, getter = () =>
+                        {
+                            int totalGRDInstances = 0;
+
+                            for (int viewIndex = 0; viewIndex < GetInstanceCullerViewCount(); viewIndex++)
+                            {
+                                var viewStats = GetInstanceCullerViewStats(viewIndex);
+                                if (viewStats.viewType != BatchCullingViewType.Filtering
+                                    && viewStats.viewType != BatchCullingViewType.Picking
+                                    && viewStats.viewType != BatchCullingViewType.SelectionOutline)
+                                    totalGRDInstances += viewStats.visibleInstancesOnGPU;
+                            }
+                            return totalGRDInstances;
+                        }
+                        },
+                    }
+                });
+
+                instanceCullerStats.children.Add(new DebugUI.ValueTuple()
+                {
+                    displayName = "Total Visible Primitives (Cameras | Lights | Both)",
+                    values = new[]
+                    {
+                        new DebugUI.Value { refreshRate = k_RefreshRate, formatString = k_FormatString, getter = () =>
+                            {
+                                int totalGRDPrimitives = 0;
+
+                                for (int viewIndex = 0; viewIndex < GetInstanceCullerViewCount(); viewIndex++)
+                                {
+                                    var viewStats = GetInstanceCullerViewStats(viewIndex);
+                                    if (viewStats.viewType == BatchCullingViewType.Camera)
+                                        totalGRDPrimitives += viewStats.visiblePrimitivesOnGPU;
+                                }
+                                return totalGRDPrimitives;
+                            }
+                        },
+                        new DebugUI.Value { refreshRate = k_RefreshRate, formatString = k_FormatString, getter = () =>
+                            {
+                                int totalGRDPrimitives = 0;
+
+                                for (int viewIndex = 0; viewIndex < GetInstanceCullerViewCount(); viewIndex++)
+                                {
+                                    var viewStats = GetInstanceCullerViewStats(viewIndex);
+                                    if (viewStats.viewType == BatchCullingViewType.Light)
+                                        totalGRDPrimitives += viewStats.visiblePrimitivesOnGPU;
+                                }
+                                return totalGRDPrimitives;
+                            }
+                        },
+                        new DebugUI.Value { refreshRate = k_RefreshRate, formatString = k_FormatString, getter = () =>
+                            {
+                                int totalGRDPrimitives = 0;
+
+                                for (int viewIndex = 0; viewIndex < GetInstanceCullerViewCount(); viewIndex++)
+                                {
+                                    var viewStats = GetInstanceCullerViewStats(viewIndex);
+                                    if (viewStats.viewType != BatchCullingViewType.Filtering
+                                        && viewStats.viewType != BatchCullingViewType.Picking
+                                        && viewStats.viewType != BatchCullingViewType.SelectionOutline)
+                                        totalGRDPrimitives += viewStats.visiblePrimitivesOnGPU;
+                                }
+                                return totalGRDPrimitives;
+                            }
+                        },
+                    }
+                });
+
                 DebugUI.Table viewTable = new DebugUI.Table
                 {
                     displayName = "",