From 5d5c01cfbfaf2423134b2389138e85b6732eb78a Mon Sep 17 00:00:00 2001
From: RSlysz <remi@unity3d.com>
Date: Thu, 2 Sep 2021 18:37:21 +0200
Subject: [PATCH 01/11] Add hiddable MenuItem for SRP

---
 .../Editor/LookDev/LookDev.cs                 |    6 -
 .../Editor/RenderGraph/RenderGraphViewer.cs   | 1079 +++++++++--------
 .../Editor/Utilities/MenuUtilities.cs         |  159 +++
 .../Editor/Utilities/MenuUtilities.cs.meta    |   11 +
 .../Editor/ToolMenus.cs                       |   16 +
 .../Editor/ToolMenus.cs.meta                  |   11 +
 6 files changed, 737 insertions(+), 545 deletions(-)
 create mode 100644 com.unity.render-pipelines.core/Editor/Utilities/MenuUtilities.cs
 create mode 100644 com.unity.render-pipelines.core/Editor/Utilities/MenuUtilities.cs.meta
 create mode 100644 com.unity.render-pipelines.high-definition/Editor/ToolMenus.cs
 create mode 100644 com.unity.render-pipelines.high-definition/Editor/ToolMenus.cs.meta

diff --git a/com.unity.render-pipelines.core/Editor/LookDev/LookDev.cs b/com.unity.render-pipelines.core/Editor/LookDev/LookDev.cs
index 31d7d7b88b4..6ae01f11931 100644
--- a/com.unity.render-pipelines.core/Editor/LookDev/LookDev.cs
+++ b/com.unity.render-pipelines.core/Editor/LookDev/LookDev.cs
@@ -74,12 +74,6 @@ static Context defaultContext
         internal static IViewDisplayer currentViewDisplayer => s_ViewDisplayer;
         internal static IEnvironmentDisplayer currentEnvironmentDisplayer => s_EnvironmentDisplayer;
 
-        [MenuItem("Window/Rendering/Look Dev", false, 10001)]
-        static void OpenLookDev() => Open();
-
-        [MenuItem("Window/Rendering/Look Dev", true, 10001)]
-        static bool LookDevAvailable() => supported;
-
         internal static bool waitingConfigure { get; private set; } = true;
 
         /// <summary>State of the LookDev window</summary>
diff --git a/com.unity.render-pipelines.core/Editor/RenderGraph/RenderGraphViewer.cs b/com.unity.render-pipelines.core/Editor/RenderGraph/RenderGraphViewer.cs
index a3b5746a702..816379af604 100644
--- a/com.unity.render-pipelines.core/Editor/RenderGraph/RenderGraphViewer.cs
+++ b/com.unity.render-pipelines.core/Editor/RenderGraph/RenderGraphViewer.cs
@@ -1,690 +1,691 @@
 using UnityEngine;
 using UnityEngine.UIElements;
-using UnityEditor;
 using UnityEditor.UIElements;
 using UnityEngine.Rendering;
 using UnityEngine.Experimental.Rendering.RenderGraphModule;
 using System.Collections.Generic;
 
-public class RenderGraphViewer : EditorWindow
+namespace UnityEditor.Rendering.RenderGraphModule
 {
-    static class Style
+    public class RenderGraphViewer : EditorWindow
     {
-        public static readonly GUIContent title = EditorGUIUtility.TrTextContent("Render Graph Viewer");
-    }
+        static class Style
+        {
+            public static readonly GUIContent title = EditorGUIUtility.TrTextContent("Render Graph Viewer");
+        }
 
-    const float kRenderPassWidth = 20.0f;
-    const float kResourceHeight = 15.0f;
+        const float kRenderPassWidth = 20.0f;
+        const float kResourceHeight = 15.0f;
 
-    class CellElement : VisualElement
-    {
-        public CellElement(int idxStart, int idxEnd)
+        class CellElement : VisualElement
         {
-            style.borderBottomLeftRadius = style.borderTopLeftRadius = style.borderBottomRightRadius = style.borderTopRightRadius = 5;
-            style.borderBottomWidth = style.borderTopWidth = style.borderLeftWidth = style.borderRightWidth = 1f;
-            style.borderBottomColor = style.borderTopColor = style.borderLeftColor = style.borderRightColor = new Color(0f, 0f, 0f, 1f);
-            style.backgroundColor = (Color)new Color32(88, 88, 88, 255);
-            style.height = kResourceHeight;
-            style.left = idxStart * kRenderPassWidth;
-            style.width = (idxEnd - idxStart + 1) * kRenderPassWidth;
+            public CellElement(int idxStart, int idxEnd)
+            {
+                style.borderBottomLeftRadius = style.borderTopLeftRadius = style.borderBottomRightRadius = style.borderTopRightRadius = 5;
+                style.borderBottomWidth = style.borderTopWidth = style.borderLeftWidth = style.borderRightWidth = 1f;
+                style.borderBottomColor = style.borderTopColor = style.borderLeftColor = style.borderRightColor = new Color(0f, 0f, 0f, 1f);
+                style.backgroundColor = (Color)new Color32(88, 88, 88, 255);
+                style.height = kResourceHeight;
+                style.left = idxStart * kRenderPassWidth;
+                style.width = (idxEnd - idxStart + 1) * kRenderPassWidth;
+            }
+
+            public void SetColor(StyleColor color)
+            {
+                style.backgroundColor = color;
+            }
         }
 
-        public void SetColor(StyleColor color)
+        public static void Open()
         {
-            style.backgroundColor = color;
+            // Get existing open window or if none, make a new one:
+            var window = GetWindow<RenderGraphViewer>();
+            window.titleContent = new GUIContent("Render Graph Viewer");
         }
-    }
-
-    [MenuItem("Window/Analysis/Render Graph Viewer", false, 10006)]
-    static void Init()
-    {
-        // Get existing open window or if none, make a new one:
-        var window = GetWindow<RenderGraphViewer>();
-        window.titleContent = new GUIContent("Render Graph Viewer");
-    }
 
-    [System.Flags]
-    enum Filter
-    {
-        ImportedResources = 1 << 0,
-        CulledPasses = 1 << 1,
-        Textures = 1 << 2,
-        ComputeBuffers = 1 << 3,
-    }
-
-    struct ResourceElementInfo
-    {
-        public VisualElement lifetime;
-        public VisualElement resourceLabel;
-
-        public void Reset()
+        [System.Flags]
+        enum Filter
         {
-            lifetime = null;
-            resourceLabel = null;
+            ImportedResources = 1 << 0,
+            CulledPasses = 1 << 1,
+            Textures = 1 << 2,
+            ComputeBuffers = 1 << 3,
         }
-    }
 
-    struct PassElementInfo
-    {
-        public VisualElement pass;
-        public int remap;
-
-        public void Reset()
+        struct ResourceElementInfo
         {
-            pass = null;
-            remap = -1;
+            public VisualElement lifetime;
+            public VisualElement resourceLabel;
+
+            public void Reset()
+            {
+                lifetime = null;
+                resourceLabel = null;
+            }
         }
-    }
 
-    Dictionary<RenderGraph, HashSet<string>> m_RegisteredGraphs = new Dictionary<RenderGraph, HashSet<string>>();
-    RenderGraphDebugData m_CurrentDebugData;
+        struct PassElementInfo
+        {
+            public VisualElement pass;
+            public int remap;
 
-    VisualElement m_Root;
-    VisualElement m_HeaderElement;
-    VisualElement m_GraphViewerElement;
+            public void Reset()
+            {
+                pass = null;
+                remap = -1;
+            }
+        }
 
-    readonly StyleColor m_ResourceColorRead = new StyleColor(new Color(0.2f, 1.0f, 0.2f));
-    readonly StyleColor m_ResourceColorWrite = new StyleColor(new Color(1.0f, 0.2f, 0.2f));
-    readonly StyleColor m_ImportedResourceColor = new StyleColor(new Color(0.3f, 0.75f, 0.75f));
-    readonly StyleColor m_CulledPassColor = new StyleColor(Color.black);
-    readonly StyleColor m_ResourceHighlightColor = new StyleColor(Color.white);
-    readonly StyleColor m_ResourceLifeHighLightColor = new StyleColor(new Color32(103, 103, 103, 255));
-    StyleColor m_OriginalResourceLifeColor;
-    StyleColor m_OriginalPassColor;
-    StyleColor m_OriginalResourceColor;
+        Dictionary<RenderGraph, HashSet<string>> m_RegisteredGraphs = new Dictionary<RenderGraph, HashSet<string>>();
+        RenderGraphDebugData m_CurrentDebugData;
 
-    DynamicArray<ResourceElementInfo>[] m_ResourceElementsInfo = new DynamicArray<ResourceElementInfo>[(int)RenderGraphResourceType.Count];
-    DynamicArray<PassElementInfo> m_PassElementsInfo = new DynamicArray<PassElementInfo>();
+        VisualElement m_Root;
+        VisualElement m_HeaderElement;
+        VisualElement m_GraphViewerElement;
 
-    Filter m_Filter = Filter.Textures | Filter.ComputeBuffers;
+        readonly StyleColor m_ResourceColorRead = new StyleColor(new Color(0.2f, 1.0f, 0.2f));
+        readonly StyleColor m_ResourceColorWrite = new StyleColor(new Color(1.0f, 0.2f, 0.2f));
+        readonly StyleColor m_ImportedResourceColor = new StyleColor(new Color(0.3f, 0.75f, 0.75f));
+        readonly StyleColor m_CulledPassColor = new StyleColor(Color.black);
+        readonly StyleColor m_ResourceHighlightColor = new StyleColor(Color.white);
+        readonly StyleColor m_ResourceLifeHighLightColor = new StyleColor(new Color32(103, 103, 103, 255));
+        StyleColor m_OriginalResourceLifeColor;
+        StyleColor m_OriginalPassColor;
+        StyleColor m_OriginalResourceColor;
 
-    void RenderPassLabelChanged(GeometryChangedEvent evt)
-    {
-        var label = evt.currentTarget as Label;
-        Vector2 textSize = label.MeasureTextSize(label.text, 0, VisualElement.MeasureMode.Undefined, 10, VisualElement.MeasureMode.Undefined);
-        float textWidth = Mathf.Max(kRenderPassWidth, textSize.x);
-        float desiredHeight = Mathf.Sqrt(textWidth * textWidth - kRenderPassWidth * kRenderPassWidth);
-        // Should be able to do that and rely on the parent layout but for some reason flex-end does not work so I set the parent's parent height instead.
-        //label.parent.style.height = desiredHeight;
-        var passNamesContainerHeight = Mathf.Max(label.parent.parent.style.height.value.value, desiredHeight);
-        label.parent.parent.style.height = passNamesContainerHeight;
-        label.parent.parent.style.minHeight = passNamesContainerHeight;
-
-        var topRowElement = m_GraphViewerElement.Q<VisualElement>("GraphViewer.TopRowElement");
-        topRowElement.style.minHeight = passNamesContainerHeight;
-    }
+        DynamicArray<ResourceElementInfo>[] m_ResourceElementsInfo = new DynamicArray<ResourceElementInfo>[(int)RenderGraphResourceType.Count];
+        DynamicArray<PassElementInfo> m_PassElementsInfo = new DynamicArray<PassElementInfo>();
 
-    void LastRenderPassLabelChanged(GeometryChangedEvent evt)
-    {
-        var label = evt.currentTarget as Label;
-        Vector2 textSize = label.MeasureTextSize(label.text, 0, VisualElement.MeasureMode.Undefined, 10, VisualElement.MeasureMode.Undefined);
-        float textWidth = Mathf.Max(kRenderPassWidth, textSize.x);
+        Filter m_Filter = Filter.Textures | Filter.ComputeBuffers;
 
-        // Keep a margin on the right of the container to avoid label being clipped.
-        var viewerContainer = m_GraphViewerElement.Q<VisualElement>("GraphViewer.ViewerContainer");
-        viewerContainer.style.marginRight = Mathf.Max(viewerContainer.style.marginRight.value.value, (textWidth - kRenderPassWidth));
-    }
+        void RenderPassLabelChanged(GeometryChangedEvent evt)
+        {
+            var label = evt.currentTarget as Label;
+            Vector2 textSize = label.MeasureTextSize(label.text, 0, VisualElement.MeasureMode.Undefined, 10, VisualElement.MeasureMode.Undefined);
+            float textWidth = Mathf.Max(kRenderPassWidth, textSize.x);
+            float desiredHeight = Mathf.Sqrt(textWidth * textWidth - kRenderPassWidth * kRenderPassWidth);
+            // Should be able to do that and rely on the parent layout but for some reason flex-end does not work so I set the parent's parent height instead.
+            //label.parent.style.height = desiredHeight;
+            var passNamesContainerHeight = Mathf.Max(label.parent.parent.style.height.value.value, desiredHeight);
+            label.parent.parent.style.height = passNamesContainerHeight;
+            label.parent.parent.style.minHeight = passNamesContainerHeight;
+
+            var topRowElement = m_GraphViewerElement.Q<VisualElement>("GraphViewer.TopRowElement");
+            topRowElement.style.minHeight = passNamesContainerHeight;
+        }
 
-    void UpdateResourceLifetimeColor(int passIndex, StyleColor colorRead, StyleColor colorWrite)
-    {
-        var pass = m_CurrentDebugData.passList[passIndex];
+        void LastRenderPassLabelChanged(GeometryChangedEvent evt)
+        {
+            var label = evt.currentTarget as Label;
+            Vector2 textSize = label.MeasureTextSize(label.text, 0, VisualElement.MeasureMode.Undefined, 10, VisualElement.MeasureMode.Undefined);
+            float textWidth = Mathf.Max(kRenderPassWidth, textSize.x);
 
-        if (pass.culled)
-            return;
+            // Keep a margin on the right of the container to avoid label being clipped.
+            var viewerContainer = m_GraphViewerElement.Q<VisualElement>("GraphViewer.ViewerContainer");
+            viewerContainer.style.marginRight = Mathf.Max(viewerContainer.style.marginRight.value.value, (textWidth - kRenderPassWidth));
+        }
 
-        for (int type = 0; type < (int)RenderGraphResourceType.Count; ++type)
+        void UpdateResourceLifetimeColor(int passIndex, StyleColor colorRead, StyleColor colorWrite)
         {
-            foreach (int resourceRead in pass.resourceReadLists[type])
-            {
-                CellElement resourceLifetime = m_ResourceElementsInfo[type][resourceRead].lifetime as CellElement;
-                if (resourceLifetime != null)
-                    resourceLifetime.SetColor(colorRead);
-            }
+            var pass = m_CurrentDebugData.passList[passIndex];
+
+            if (pass.culled)
+                return;
 
-            foreach (int resourceWrite in pass.resourceWriteLists[type])
+            for (int type = 0; type < (int)RenderGraphResourceType.Count; ++type)
             {
-                CellElement resourceLifetime = m_ResourceElementsInfo[type][resourceWrite].lifetime as CellElement;
-                if (resourceLifetime != null)
-                    resourceLifetime.SetColor(colorWrite);
+                foreach (int resourceRead in pass.resourceReadLists[type])
+                {
+                    CellElement resourceLifetime = m_ResourceElementsInfo[type][resourceRead].lifetime as CellElement;
+                    if (resourceLifetime != null)
+                        resourceLifetime.SetColor(colorRead);
+                }
+
+                foreach (int resourceWrite in pass.resourceWriteLists[type])
+                {
+                    CellElement resourceLifetime = m_ResourceElementsInfo[type][resourceWrite].lifetime as CellElement;
+                    if (resourceLifetime != null)
+                        resourceLifetime.SetColor(colorWrite);
+                }
             }
         }
-    }
-
-    void MouseEnterPassCallback(MouseEnterEvent evt, int index)
-    {
-        UpdateResourceLifetimeColor(index, m_ResourceColorRead, m_ResourceColorWrite);
-    }
 
-    void MouseLeavePassCallback(MouseLeaveEvent evt, int index)
-    {
-        UpdateResourceLifetimeColor(index, m_OriginalResourceLifeColor, m_OriginalResourceLifeColor);
-    }
+        void MouseEnterPassCallback(MouseEnterEvent evt, int index)
+        {
+            UpdateResourceLifetimeColor(index, m_ResourceColorRead, m_ResourceColorWrite);
+        }
 
-    void UpdatePassColor((int index, int resourceType) resInfo, StyleColor colorRead, StyleColor colorWrite)
-    {
-        var resource = m_CurrentDebugData.resourceLists[resInfo.resourceType][resInfo.index];
+        void MouseLeavePassCallback(MouseLeaveEvent evt, int index)
+        {
+            UpdateResourceLifetimeColor(index, m_OriginalResourceLifeColor, m_OriginalResourceLifeColor);
+        }
 
-        foreach (int consumer in resource.consumerList)
+        void UpdatePassColor((int index, int resourceType) resInfo, StyleColor colorRead, StyleColor colorWrite)
         {
-            var passDebugData = m_CurrentDebugData.passList[consumer];
-            if (passDebugData.culled)
-                continue;
+            var resource = m_CurrentDebugData.resourceLists[resInfo.resourceType][resInfo.index];
 
-            VisualElement passElement = m_PassElementsInfo[consumer].pass;
-            if (passElement != null)
+            foreach (int consumer in resource.consumerList)
             {
-                VisualElement passButton = passElement.Q("RenderPass.Cell");
-                passButton.style.backgroundColor = colorRead;
+                var passDebugData = m_CurrentDebugData.passList[consumer];
+                if (passDebugData.culled)
+                    continue;
+
+                VisualElement passElement = m_PassElementsInfo[consumer].pass;
+                if (passElement != null)
+                {
+                    VisualElement passButton = passElement.Q("RenderPass.Cell");
+                    passButton.style.backgroundColor = colorRead;
+                }
             }
-        }
 
-        foreach (int producer in resource.producerList)
-        {
-            var passDebugData = m_CurrentDebugData.passList[producer];
-            if (passDebugData.culled)
-                continue;
-
-            VisualElement passElement = m_PassElementsInfo[producer].pass;
-            if (passElement != null)
+            foreach (int producer in resource.producerList)
             {
-                VisualElement passButton = passElement.Q("RenderPass.Cell");
-                passButton.style.backgroundColor = colorWrite;
+                var passDebugData = m_CurrentDebugData.passList[producer];
+                if (passDebugData.culled)
+                    continue;
+
+                VisualElement passElement = m_PassElementsInfo[producer].pass;
+                if (passElement != null)
+                {
+                    VisualElement passButton = passElement.Q("RenderPass.Cell");
+                    passButton.style.backgroundColor = colorWrite;
+                }
             }
         }
-    }
 
-    void UpdateResourceLabelColor((int index, int resourceType) resInfo, StyleColor color)
-    {
-        var label = m_ResourceElementsInfo[resInfo.resourceType][resInfo.index].resourceLabel;
-        if (label != null)
+        void UpdateResourceLabelColor((int index, int resourceType) resInfo, StyleColor color)
         {
-            label.style.color = color;
+            var label = m_ResourceElementsInfo[resInfo.resourceType][resInfo.index].resourceLabel;
+            if (label != null)
+            {
+                label.style.color = color;
+            }
         }
-    }
 
-    void MouseEnterResourceCallback(MouseEnterEvent evt, (int index, int resourceType) info)
-    {
-        CellElement resourceLifetime = m_ResourceElementsInfo[info.resourceType][info.index].lifetime as CellElement;
-        resourceLifetime.SetColor(m_ResourceLifeHighLightColor);
-
-        UpdatePassColor(info, m_ResourceColorRead, m_ResourceColorWrite);
-        UpdateResourceLabelColor(info, m_ResourceHighlightColor);
-    }
-
-    void MouseLeaveResourceCallback(MouseLeaveEvent evt, (int index, int resourceType) info)
-    {
-        CellElement resourceLifetime = m_ResourceElementsInfo[info.resourceType][info.index].lifetime as CellElement;
-        resourceLifetime.SetColor(m_OriginalResourceLifeColor);
-
-        var resource = m_CurrentDebugData.resourceLists[info.resourceType][info.index];
-        UpdatePassColor(info, m_OriginalPassColor, m_OriginalPassColor);
-        UpdateResourceLabelColor(info, resource.imported ? m_ImportedResourceColor : m_OriginalResourceColor); ;
-    }
+        void MouseEnterResourceCallback(MouseEnterEvent evt, (int index, int resourceType) info)
+        {
+            CellElement resourceLifetime = m_ResourceElementsInfo[info.resourceType][info.index].lifetime as CellElement;
+            resourceLifetime.SetColor(m_ResourceLifeHighLightColor);
 
-    VisualElement CreateRenderPass(string name, int index, bool culled)
-    {
-        var container = new VisualElement();
-        container.name = "RenderPass";
-        container.style.width = kRenderPassWidth;
-        container.style.overflow = Overflow.Visible;
-        container.style.flexDirection = FlexDirection.ColumnReverse;
-        container.style.minWidth = kRenderPassWidth;
+            UpdatePassColor(info, m_ResourceColorRead, m_ResourceColorWrite);
+            UpdateResourceLabelColor(info, m_ResourceHighlightColor);
+        }
 
-        var cell = new Button();
-        cell.name = "RenderPass.Cell";
-        cell.style.marginBottom = 0.0f;
-        cell.style.marginLeft = 0.0f;
-        cell.style.marginRight = 0.0f;
-        cell.style.marginTop = 0.0f;
-        cell.RegisterCallback<MouseEnterEvent, int>(MouseEnterPassCallback, index);
-        cell.RegisterCallback<MouseLeaveEvent, int>(MouseLeavePassCallback, index);
+        void MouseLeaveResourceCallback(MouseLeaveEvent evt, (int index, int resourceType) info)
+        {
+            CellElement resourceLifetime = m_ResourceElementsInfo[info.resourceType][info.index].lifetime as CellElement;
+            resourceLifetime.SetColor(m_OriginalResourceLifeColor);
 
-        m_OriginalPassColor = cell.style.backgroundColor;
+            var resource = m_CurrentDebugData.resourceLists[info.resourceType][info.index];
+            UpdatePassColor(info, m_OriginalPassColor, m_OriginalPassColor);
+            UpdateResourceLabelColor(info, resource.imported ? m_ImportedResourceColor : m_OriginalResourceColor); ;
+        }
 
-        if (culled)
-            cell.style.backgroundColor = m_CulledPassColor;
+        VisualElement CreateRenderPass(string name, int index, bool culled)
+        {
+            var container = new VisualElement();
+            container.name = "RenderPass";
+            container.style.width = kRenderPassWidth;
+            container.style.overflow = Overflow.Visible;
+            container.style.flexDirection = FlexDirection.ColumnReverse;
+            container.style.minWidth = kRenderPassWidth;
 
-        container.Add(cell);
+            var cell = new Button();
+            cell.name = "RenderPass.Cell";
+            cell.style.marginBottom = 0.0f;
+            cell.style.marginLeft = 0.0f;
+            cell.style.marginRight = 0.0f;
+            cell.style.marginTop = 0.0f;
+            cell.RegisterCallback<MouseEnterEvent, int>(MouseEnterPassCallback, index);
+            cell.RegisterCallback<MouseLeaveEvent, int>(MouseLeavePassCallback, index);
 
-        var label = new Label(name);
-        label.name = "RenderPass.Label";
-        label.transform.rotation = Quaternion.Euler(new Vector3(0.0f, 0.0f, -45.0f));
-        container.Add(label);
+            m_OriginalPassColor = cell.style.backgroundColor;
 
-        label.RegisterCallback<GeometryChangedEvent>(RenderPassLabelChanged);
+            if (culled)
+                cell.style.backgroundColor = m_CulledPassColor;
 
-        return container;
-    }
+            container.Add(cell);
 
-    void ResourceNamesContainerChanged(GeometryChangedEvent evt)
-    {
-        var label = evt.currentTarget as Label;
-        float textWidth = label.MeasureTextSize(label.text, 0, VisualElement.MeasureMode.Undefined, 10, VisualElement.MeasureMode.Undefined).x;
+            var label = new Label(name);
+            label.name = "RenderPass.Label";
+            label.transform.rotation = Quaternion.Euler(new Vector3(0.0f, 0.0f, -45.0f));
+            container.Add(label);
 
-        var cornerElement = m_GraphViewerElement.Q<VisualElement>("GraphViewer.Corner");
-        cornerElement.style.width = Mathf.Max(textWidth, cornerElement.style.width.value.value);
-        cornerElement.style.minWidth = Mathf.Max(textWidth, cornerElement.style.minWidth.value.value);
+            label.RegisterCallback<GeometryChangedEvent>(RenderPassLabelChanged);
 
-        // We need to make sure all resource types have the same width
-        m_GraphViewerElement.Query("GraphViewer.Resources.ResourceNames").Build().ForEach((elem) =>
-        {
-            elem.style.width = Mathf.Max(textWidth, elem.style.width.value.value);
-            elem.style.minWidth = Mathf.Max(textWidth, elem.style.minWidth.value.value);
-        });
+            return container;
+        }
 
-        m_GraphViewerElement.Query("GraphViewer.Resources.ResourceTypeName").Build().ForEach((elem) =>
+        void ResourceNamesContainerChanged(GeometryChangedEvent evt)
         {
-            elem.style.width = Mathf.Max(textWidth, elem.style.width.value.value);
-            elem.style.minWidth = Mathf.Max(textWidth, elem.style.minWidth.value.value);
-        });
-    }
-
-    VisualElement CreateResourceLabel(string name, bool imported)
-    {
-        var label = new Label(name);
-        label.style.height = kResourceHeight;
-        label.style.overflow = Overflow.Hidden;
-        label.style.textOverflow = TextOverflow.Ellipsis;
-        label.style.unityTextOverflowPosition = TextOverflowPosition.End;
-        if (imported)
-            label.style.color = m_ImportedResourceColor;
-        else
-            m_OriginalResourceColor = label.style.color;
-
-        return label;
-    }
+            var label = evt.currentTarget as Label;
+            float textWidth = label.MeasureTextSize(label.text, 0, VisualElement.MeasureMode.Undefined, 10, VisualElement.MeasureMode.Undefined).x;
 
-    VisualElement CreateColorLegend(string name, StyleColor color)
-    {
-        VisualElement legend = new VisualElement();
-        legend.style.flexDirection = FlexDirection.Row;
-        Button button = new Button();
-        button.style.width = kRenderPassWidth;// * 2;
-        button.style.backgroundColor = color;
-        legend.Add(button);
-        var label = new Label(name);
-        label.style.unityTextAlign = TextAnchor.MiddleCenter;
-        legend.Add(label);
-        return legend;
-    }
-
-    string RenderGraphPopupCallback(RenderGraph rg)
-    {
-        var currentRG = GetCurrentRenderGraph();
-        if (currentRG != null && rg != currentRG)
-            RebuildHeaderExecutionPopup();
-        return rg.name;
-    }
+            var cornerElement = m_GraphViewerElement.Q<VisualElement>("GraphViewer.Corner");
+            cornerElement.style.width = Mathf.Max(textWidth, cornerElement.style.width.value.value);
+            cornerElement.style.minWidth = Mathf.Max(textWidth, cornerElement.style.minWidth.value.value);
 
-    string EmptyRenderGraphPopupCallback(RenderGraph rg)
-    {
-        return "NotAvailable";
-    }
+            // We need to make sure all resource types have the same width
+            m_GraphViewerElement.Query("GraphViewer.Resources.ResourceNames").Build().ForEach((elem) =>
+            {
+                elem.style.width = Mathf.Max(textWidth, elem.style.width.value.value);
+                elem.style.minWidth = Mathf.Max(textWidth, elem.style.minWidth.value.value);
+            });
 
-    string EmptExecutionListCallback(string name)
-    {
-        return "NotAvailable";
-    }
+            m_GraphViewerElement.Query("GraphViewer.Resources.ResourceTypeName").Build().ForEach((elem) =>
+            {
+                elem.style.width = Mathf.Max(textWidth, elem.style.width.value.value);
+                elem.style.minWidth = Mathf.Max(textWidth, elem.style.minWidth.value.value);
+            });
+        }
 
-    void OnCaptureGraph()
-    {
-        RebuildGraphViewerUI();
-    }
+        VisualElement CreateResourceLabel(string name, bool imported)
+        {
+            var label = new Label(name);
+            label.style.height = kResourceHeight;
+            label.style.overflow = Overflow.Hidden;
+            label.style.textOverflow = TextOverflow.Ellipsis;
+            label.style.unityTextOverflowPosition = TextOverflowPosition.End;
+            if (imported)
+                label.style.color = m_ImportedResourceColor;
+            else
+                m_OriginalResourceColor = label.style.color;
 
-    void RebuildHeaderExecutionPopup()
-    {
-        var controlsElement = m_HeaderElement.Q("Header.Controls");
-        var existingExecutionPopup = controlsElement.Q("Header.ExecutionPopup");
-        if (existingExecutionPopup != null)
-            controlsElement.Remove(existingExecutionPopup);
+            return label;
+        }
 
-        var currentRG = GetCurrentRenderGraph();
-        List<string> executionList = new List<string>();
-        if (currentRG != null)
+        VisualElement CreateColorLegend(string name, StyleColor color)
         {
-            m_RegisteredGraphs.TryGetValue(currentRG, out var executionSet);
-            Debug.Assert(executionSet != null);
-            executionList.AddRange(executionSet);
+            VisualElement legend = new VisualElement();
+            legend.style.flexDirection = FlexDirection.Row;
+            Button button = new Button();
+            button.style.width = kRenderPassWidth;// * 2;
+            button.style.backgroundColor = color;
+            legend.Add(button);
+            var label = new Label(name);
+            label.style.unityTextAlign = TextAnchor.MiddleCenter;
+            legend.Add(label);
+            return legend;
         }
 
-        PopupField<string> executionPopup = null;
-        if (executionList.Count != 0)
+        string RenderGraphPopupCallback(RenderGraph rg)
         {
-            executionPopup = new PopupField<string>("Current Execution", executionList, 0);
+            var currentRG = GetCurrentRenderGraph();
+            if (currentRG != null && rg != currentRG)
+                RebuildHeaderExecutionPopup();
+            return rg.name;
         }
-        else
+
+        string EmptyRenderGraphPopupCallback(RenderGraph rg)
         {
-            executionList.Add(null);
-            executionPopup = new PopupField<string>("Current Execution", executionList, 0, EmptExecutionListCallback, EmptExecutionListCallback);
+            return "NotAvailable";
         }
 
-        executionPopup.labelElement.style.minWidth = 0;
-        executionPopup.name = "Header.ExecutionPopup";
-        controlsElement.Add(executionPopup);
-    }
-
-    void RebuildHeaderUI()
-    {
-        m_HeaderElement.Clear();
-
-        var controlsElement = new VisualElement();
-        controlsElement.name = "Header.Controls";
-        controlsElement.style.flexDirection = FlexDirection.Row;
-
-        m_HeaderElement.Add(controlsElement);
-
-        var renderGraphList = new List<RenderGraph>(m_RegisteredGraphs.Keys);
-
-        PopupField<RenderGraph> renderGraphPopup = null;
-        if (renderGraphList.Count != 0)
+        string EmptExecutionListCallback(string name)
         {
-            renderGraphPopup = new PopupField<RenderGraph>("Current Graph", renderGraphList, 0, RenderGraphPopupCallback, RenderGraphPopupCallback);
+            return "NotAvailable";
         }
-        else
+
+        void OnCaptureGraph()
         {
-            renderGraphList.Add(null);
-            renderGraphPopup = new PopupField<RenderGraph>("Current Graph", renderGraphList, 0, EmptyRenderGraphPopupCallback, EmptyRenderGraphPopupCallback);
+            RebuildGraphViewerUI();
         }
 
-        renderGraphPopup.labelElement.style.minWidth = 0;
-        renderGraphPopup.name = "Header.RenderGraphPopup";
-        controlsElement.Add(renderGraphPopup);
+        void RebuildHeaderExecutionPopup()
+        {
+            var controlsElement = m_HeaderElement.Q("Header.Controls");
+            var existingExecutionPopup = controlsElement.Q("Header.ExecutionPopup");
+            if (existingExecutionPopup != null)
+                controlsElement.Remove(existingExecutionPopup);
+
+            var currentRG = GetCurrentRenderGraph();
+            List<string> executionList = new List<string>();
+            if (currentRG != null)
+            {
+                m_RegisteredGraphs.TryGetValue(currentRG, out var executionSet);
+                Debug.Assert(executionSet != null);
+                executionList.AddRange(executionSet);
+            }
 
-        RebuildHeaderExecutionPopup();
+            PopupField<string> executionPopup = null;
+            if (executionList.Count != 0)
+            {
+                executionPopup = new PopupField<string>("Current Execution", executionList, 0);
+            }
+            else
+            {
+                executionList.Add(null);
+                executionPopup = new PopupField<string>("Current Execution", executionList, 0, EmptExecutionListCallback, EmptExecutionListCallback);
+            }
 
-        var captureButton = new Button(OnCaptureGraph);
-        captureButton.text = "Capture Graph";
-        controlsElement.Add(captureButton);
+            executionPopup.labelElement.style.minWidth = 0;
+            executionPopup.name = "Header.ExecutionPopup";
+            controlsElement.Add(executionPopup);
+        }
 
-        var filters = new EnumFlagsField("Filters", m_Filter);
-        filters.labelElement.style.minWidth = 0;
-        filters.labelElement.style.alignItems = Align.Center;
-        filters.RegisterCallback<ChangeEvent<System.Enum>>((evt) =>
+        void RebuildHeaderUI()
         {
-            m_Filter = (Filter)evt.newValue;
-            RebuildGraphViewerUI();
-        });
-        controlsElement.Add(filters);
-
-        var legendsElement = new VisualElement();
-        legendsElement.name = "Header.Legends";
-        legendsElement.style.flexDirection = FlexDirection.Row;
-        legendsElement.style.alignContent = Align.FlexEnd;
+            m_HeaderElement.Clear();
 
-        legendsElement.Add(CreateColorLegend("Resource Read", m_ResourceColorRead));
-        legendsElement.Add(CreateColorLegend("Resource Write", m_ResourceColorWrite));
-        legendsElement.Add(CreateColorLegend("Culled Pass", m_CulledPassColor));
-        legendsElement.Add(CreateColorLegend("Imported Resource", m_ImportedResourceColor));
+            var controlsElement = new VisualElement();
+            controlsElement.name = "Header.Controls";
+            controlsElement.style.flexDirection = FlexDirection.Row;
 
-        m_HeaderElement.Add(legendsElement);
-    }
+            m_HeaderElement.Add(controlsElement);
 
-    RenderGraph GetCurrentRenderGraph()
-    {
-        var popup = m_HeaderElement.Q<PopupField<RenderGraph>>("Header.RenderGraphPopup");
-        if (popup != null)
-            return popup.value;
+            var renderGraphList = new List<RenderGraph>(m_RegisteredGraphs.Keys);
 
-        return null;
-    }
+            PopupField<RenderGraph> renderGraphPopup = null;
+            if (renderGraphList.Count != 0)
+            {
+                renderGraphPopup = new PopupField<RenderGraph>("Current Graph", renderGraphList, 0, RenderGraphPopupCallback, RenderGraphPopupCallback);
+            }
+            else
+            {
+                renderGraphList.Add(null);
+                renderGraphPopup = new PopupField<RenderGraph>("Current Graph", renderGraphList, 0, EmptyRenderGraphPopupCallback, EmptyRenderGraphPopupCallback);
+            }
 
-    RenderGraphDebugData GetCurrentDebugData()
-    {
-        var currentRG = GetCurrentRenderGraph();
-        if (currentRG != null)
-        {
-            var popup = m_HeaderElement.Q<PopupField<string>>("Header.ExecutionPopup");
-            if (popup != null && popup.value != null)
-                return currentRG.GetDebugData(popup.value);
-        }
+            renderGraphPopup.labelElement.style.minWidth = 0;
+            renderGraphPopup.name = "Header.RenderGraphPopup";
+            controlsElement.Add(renderGraphPopup);
 
-        return null;
-    }
+            RebuildHeaderExecutionPopup();
 
-    VisualElement CreateTopRowWithPasses(RenderGraphDebugData debugData, out int finalPassCount)
-    {
-        var topRowElement = new VisualElement();
-        topRowElement.name = "GraphViewer.TopRowElement";
-        topRowElement.style.flexDirection = FlexDirection.Row;
+            var captureButton = new Button(OnCaptureGraph);
+            captureButton.text = "Capture Graph";
+            controlsElement.Add(captureButton);
 
-        var cornerElement = new VisualElement();
-        cornerElement.name = "GraphViewer.Corner";
+            var filters = new EnumFlagsField("Filters", m_Filter);
+            filters.labelElement.style.minWidth = 0;
+            filters.labelElement.style.alignItems = Align.Center;
+            filters.RegisterCallback<ChangeEvent<System.Enum>>((evt) =>
+            {
+                m_Filter = (Filter)evt.newValue;
+                RebuildGraphViewerUI();
+            });
+            controlsElement.Add(filters);
+
+            var legendsElement = new VisualElement();
+            legendsElement.name = "Header.Legends";
+            legendsElement.style.flexDirection = FlexDirection.Row;
+            legendsElement.style.alignContent = Align.FlexEnd;
+
+            legendsElement.Add(CreateColorLegend("Resource Read", m_ResourceColorRead));
+            legendsElement.Add(CreateColorLegend("Resource Write", m_ResourceColorWrite));
+            legendsElement.Add(CreateColorLegend("Culled Pass", m_CulledPassColor));
+            legendsElement.Add(CreateColorLegend("Imported Resource", m_ImportedResourceColor));
+
+            m_HeaderElement.Add(legendsElement);
+        }
 
-        topRowElement.Add(cornerElement);
+        RenderGraph GetCurrentRenderGraph()
+        {
+            var popup = m_HeaderElement.Q<PopupField<RenderGraph>>("Header.RenderGraphPopup");
+            if (popup != null)
+                return popup.value;
 
-        var passNamesElement = new VisualElement();
-        passNamesElement.name = "GraphViewer.TopRowElement.PassNames";
-        passNamesElement.style.flexDirection = FlexDirection.Row;
+            return null;
+        }
 
-        int passIndex = 0;
-        finalPassCount = 0;
-        int lastValidPassIndex = -1;
-        foreach (var pass in debugData.passList)
+        RenderGraphDebugData GetCurrentDebugData()
         {
-            if ((pass.culled && !m_Filter.HasFlag(Filter.CulledPasses)) || !pass.generateDebugData)
-            {
-                m_PassElementsInfo[passIndex].Reset();
-            }
-            else
+            var currentRG = GetCurrentRenderGraph();
+            if (currentRG != null)
             {
-                var passElement = CreateRenderPass(pass.name, passIndex, pass.culled);
-                m_PassElementsInfo[passIndex].pass = passElement;
-                m_PassElementsInfo[passIndex].remap = finalPassCount;
-                passNamesElement.Add(passElement);
-                finalPassCount++;
-                lastValidPassIndex = passIndex;
+                var popup = m_HeaderElement.Q<PopupField<string>>("Header.ExecutionPopup");
+                if (popup != null && popup.value != null)
+                    return currentRG.GetDebugData(popup.value);
             }
-            passIndex++;
+
+            return null;
         }
 
-        if (lastValidPassIndex > 0)
+        VisualElement CreateTopRowWithPasses(RenderGraphDebugData debugData, out int finalPassCount)
         {
-            var label = m_PassElementsInfo[lastValidPassIndex].pass.Q<Label>("RenderPass.Label");
-            label.RegisterCallback<GeometryChangedEvent>(LastRenderPassLabelChanged);
-        }
+            var topRowElement = new VisualElement();
+            topRowElement.name = "GraphViewer.TopRowElement";
+            topRowElement.style.flexDirection = FlexDirection.Row;
 
-        topRowElement.Add(passNamesElement);
+            var cornerElement = new VisualElement();
+            cornerElement.name = "GraphViewer.Corner";
 
-        return topRowElement;
-    }
+            topRowElement.Add(cornerElement);
 
-    VisualElement CreateResourceViewer(RenderGraphDebugData debugData, int resourceType, int passCount)
-    {
-        var resourceElement = new VisualElement();
-        resourceElement.name = "GraphViewer.Resources";
-        resourceElement.style.flexDirection = FlexDirection.Row;
-
-        var resourceNamesContainer = new VisualElement();
-        resourceNamesContainer.name = "GraphViewer.Resources.ResourceNames";
-        resourceNamesContainer.style.flexDirection = FlexDirection.Column;
-        resourceNamesContainer.style.overflow = Overflow.Hidden;
-        resourceNamesContainer.style.alignItems = Align.FlexEnd;
-
-        var resourcesLifeTimeElement = new VisualElement();
-        resourcesLifeTimeElement.name = "GraphViewer.Resources.ResourceLifeTime";
-        resourcesLifeTimeElement.style.flexDirection = FlexDirection.Column;
-        resourcesLifeTimeElement.style.width = kRenderPassWidth * passCount;
-
-        int index = 0;
-        foreach (var resource in debugData.resourceLists[resourceType])
-        {
-            // Remove unused resource.
-            if (resource.releasePassIndex == -1 && resource.creationPassIndex == -1
-                || (resource.imported && !m_Filter.HasFlag(Filter.ImportedResources)))
+            var passNamesElement = new VisualElement();
+            passNamesElement.name = "GraphViewer.TopRowElement.PassNames";
+            passNamesElement.style.flexDirection = FlexDirection.Row;
+
+            int passIndex = 0;
+            finalPassCount = 0;
+            int lastValidPassIndex = -1;
+            foreach (var pass in debugData.passList)
             {
-                m_ResourceElementsInfo[resourceType][index++].Reset();
-                continue;
+                if ((pass.culled && !m_Filter.HasFlag(Filter.CulledPasses)) || !pass.generateDebugData)
+                {
+                    m_PassElementsInfo[passIndex].Reset();
+                }
+                else
+                {
+                    var passElement = CreateRenderPass(pass.name, passIndex, pass.culled);
+                    m_PassElementsInfo[passIndex].pass = passElement;
+                    m_PassElementsInfo[passIndex].remap = finalPassCount;
+                    passNamesElement.Add(passElement);
+                    finalPassCount++;
+                    lastValidPassIndex = passIndex;
+                }
+                passIndex++;
             }
 
-            var label = CreateResourceLabel(resource.name, resource.imported);
-            m_ResourceElementsInfo[resourceType][index].resourceLabel = label;
-            resourceNamesContainer.Add(label);
+            if (lastValidPassIndex > 0)
+            {
+                var label = m_PassElementsInfo[lastValidPassIndex].pass.Q<Label>("RenderPass.Label");
+                label.RegisterCallback<GeometryChangedEvent>(LastRenderPassLabelChanged);
+            }
 
-            var newCell = new CellElement(m_PassElementsInfo[resource.creationPassIndex].remap, m_PassElementsInfo[resource.releasePassIndex].remap);
-            newCell.RegisterCallback<MouseEnterEvent, (int, int)>(MouseEnterResourceCallback, (index, resourceType));
-            newCell.RegisterCallback<MouseLeaveEvent, (int, int)>(MouseLeaveResourceCallback, (index, resourceType));
-            m_OriginalResourceLifeColor = newCell.style.backgroundColor;
-            resourcesLifeTimeElement.Add(newCell);
+            topRowElement.Add(passNamesElement);
 
-            m_ResourceElementsInfo[resourceType][index++].lifetime = newCell;
+            return topRowElement;
         }
 
-        resourceElement.Add(resourceNamesContainer);
-        resourceElement.Add(resourcesLifeTimeElement);
+        VisualElement CreateResourceViewer(RenderGraphDebugData debugData, int resourceType, int passCount)
+        {
+            var resourceElement = new VisualElement();
+            resourceElement.name = "GraphViewer.Resources";
+            resourceElement.style.flexDirection = FlexDirection.Row;
+
+            var resourceNamesContainer = new VisualElement();
+            resourceNamesContainer.name = "GraphViewer.Resources.ResourceNames";
+            resourceNamesContainer.style.flexDirection = FlexDirection.Column;
+            resourceNamesContainer.style.overflow = Overflow.Hidden;
+            resourceNamesContainer.style.alignItems = Align.FlexEnd;
+
+            var resourcesLifeTimeElement = new VisualElement();
+            resourcesLifeTimeElement.name = "GraphViewer.Resources.ResourceLifeTime";
+            resourcesLifeTimeElement.style.flexDirection = FlexDirection.Column;
+            resourcesLifeTimeElement.style.width = kRenderPassWidth * passCount;
+
+            int index = 0;
+            foreach (var resource in debugData.resourceLists[resourceType])
+            {
+                // Remove unused resource.
+                if (resource.releasePassIndex == -1 && resource.creationPassIndex == -1
+                    || (resource.imported && !m_Filter.HasFlag(Filter.ImportedResources)))
+                {
+                    m_ResourceElementsInfo[resourceType][index++].Reset();
+                    continue;
+                }
+
+                var label = CreateResourceLabel(resource.name, resource.imported);
+                m_ResourceElementsInfo[resourceType][index].resourceLabel = label;
+                resourceNamesContainer.Add(label);
+
+                var newCell = new CellElement(m_PassElementsInfo[resource.creationPassIndex].remap, m_PassElementsInfo[resource.releasePassIndex].remap);
+                newCell.RegisterCallback<MouseEnterEvent, (int, int)>(MouseEnterResourceCallback, (index, resourceType));
+                newCell.RegisterCallback<MouseLeaveEvent, (int, int)>(MouseLeaveResourceCallback, (index, resourceType));
+                m_OriginalResourceLifeColor = newCell.style.backgroundColor;
+                resourcesLifeTimeElement.Add(newCell);
+
+                m_ResourceElementsInfo[resourceType][index++].lifetime = newCell;
+            }
 
-        return resourceElement;
-    }
+            resourceElement.Add(resourceNamesContainer);
+            resourceElement.Add(resourcesLifeTimeElement);
 
-    void RebuildGraphViewerUI()
-    {
-        m_GraphViewerElement.Clear();
+            return resourceElement;
+        }
 
-        m_CurrentDebugData = GetCurrentDebugData();
-        if (m_CurrentDebugData == null)
-            return;
+        void RebuildGraphViewerUI()
+        {
+            m_GraphViewerElement.Clear();
 
-        if (m_CurrentDebugData.passList.Count == 0)
-            return;
+            m_CurrentDebugData = GetCurrentDebugData();
+            if (m_CurrentDebugData == null)
+                return;
 
-        for (int i = 0; i < (int)RenderGraphResourceType.Count; ++i)
-            m_ResourceElementsInfo[i].Resize(m_CurrentDebugData.resourceLists[i].Count);
-        m_PassElementsInfo.Resize(m_CurrentDebugData.passList.Count);
+            if (m_CurrentDebugData.passList.Count == 0)
+                return;
 
-        var horizontalScrollView = new ScrollView(ScrollViewMode.Horizontal);
-        horizontalScrollView.name = "GraphViewer.HorizontalScrollView";
+            for (int i = 0; i < (int)RenderGraphResourceType.Count; ++i)
+                m_ResourceElementsInfo[i].Resize(m_CurrentDebugData.resourceLists[i].Count);
+            m_PassElementsInfo.Resize(m_CurrentDebugData.passList.Count);
 
-        var graphViewerElement = new VisualElement();
-        graphViewerElement.name = "GraphViewer.ViewerContainer";
-        graphViewerElement.style.flexDirection = FlexDirection.Column;
+            var horizontalScrollView = new ScrollView(ScrollViewMode.Horizontal);
+            horizontalScrollView.name = "GraphViewer.HorizontalScrollView";
 
-        var topRowElement = CreateTopRowWithPasses(m_CurrentDebugData, out int finalPassCount);
+            var graphViewerElement = new VisualElement();
+            graphViewerElement.name = "GraphViewer.ViewerContainer";
+            graphViewerElement.style.flexDirection = FlexDirection.Column;
 
-        var resourceScrollView = new ScrollView(ScrollViewMode.Vertical);
-        resourceScrollView.name = "GraphViewer.ResourceScrollView";
+            var topRowElement = CreateTopRowWithPasses(m_CurrentDebugData, out int finalPassCount);
 
-        // Has to match RenderGraphModule.RenderGraphResourceType order.
-        Filter[] resourceFilterFlags = { Filter.Textures, Filter.ComputeBuffers };
-        string[] resourceNames = { "Textures Resources", "Compute Buffer Resources" };
+            var resourceScrollView = new ScrollView(ScrollViewMode.Vertical);
+            resourceScrollView.name = "GraphViewer.ResourceScrollView";
 
-        for (int i = 0; i < (int)RenderGraphResourceType.Count; ++i)
-        {
-            if (m_Filter.HasFlag(resourceFilterFlags[i]))
+            // Has to match RenderGraphModule.RenderGraphResourceType order.
+            Filter[] resourceFilterFlags = { Filter.Textures, Filter.ComputeBuffers };
+            string[] resourceNames = { "Textures Resources", "Compute Buffer Resources" };
+
+            for (int i = 0; i < (int)RenderGraphResourceType.Count; ++i)
             {
-                var resourceViewerElement = CreateResourceViewer(m_CurrentDebugData, i, finalPassCount);
-                var resourceNameLabel = new Label(resourceNames[i]);
-                resourceNameLabel.name = "GraphViewer.Resources.ResourceTypeName";
-                resourceNameLabel.style.unityTextAlign = TextAnchor.MiddleRight;
-                resourceNameLabel.style.unityFontStyleAndWeight = FontStyle.Bold;
-                resourceNameLabel.style.fontSize = 13;
-                resourceNameLabel.RegisterCallback<GeometryChangedEvent>(ResourceNamesContainerChanged);
-                resourceScrollView.Add(resourceNameLabel);
-                resourceScrollView.Add(resourceViewerElement);
-
-                VisualElement separator = new VisualElement();
-                separator.style.minHeight = kResourceHeight;
-                resourceScrollView.Add(separator);
+                if (m_Filter.HasFlag(resourceFilterFlags[i]))
+                {
+                    var resourceViewerElement = CreateResourceViewer(m_CurrentDebugData, i, finalPassCount);
+                    var resourceNameLabel = new Label(resourceNames[i]);
+                    resourceNameLabel.name = "GraphViewer.Resources.ResourceTypeName";
+                    resourceNameLabel.style.unityTextAlign = TextAnchor.MiddleRight;
+                    resourceNameLabel.style.unityFontStyleAndWeight = FontStyle.Bold;
+                    resourceNameLabel.style.fontSize = 13;
+                    resourceNameLabel.RegisterCallback<GeometryChangedEvent>(ResourceNamesContainerChanged);
+                    resourceScrollView.Add(resourceNameLabel);
+                    resourceScrollView.Add(resourceViewerElement);
+
+                    VisualElement separator = new VisualElement();
+                    separator.style.minHeight = kResourceHeight;
+                    resourceScrollView.Add(separator);
+                }
             }
-        }
-
-        graphViewerElement.Add(topRowElement);
-        graphViewerElement.Add(resourceScrollView);
 
-        horizontalScrollView.Add(graphViewerElement);
+            graphViewerElement.Add(topRowElement);
+            graphViewerElement.Add(resourceScrollView);
 
-        m_GraphViewerElement.Add(horizontalScrollView);
-    }
+            horizontalScrollView.Add(graphViewerElement);
 
-    void RebuildUI()
-    {
-        rootVisualElement.Clear();
-
-        titleContent = Style.title;
+            m_GraphViewerElement.Add(horizontalScrollView);
+        }
 
-        m_Root = new VisualElement();
-        m_Root.name = "Root";
-        m_Root.style.flexDirection = FlexDirection.Column;
+        void RebuildUI()
+        {
+            rootVisualElement.Clear();
 
-        m_HeaderElement = new VisualElement();
-        m_HeaderElement.name = "Header";
-        m_HeaderElement.style.flexDirection = FlexDirection.Row;
-        m_HeaderElement.style.justifyContent = Justify.SpaceBetween;
-        m_HeaderElement.style.minHeight = 25.0f;
-        m_HeaderElement.style.marginBottom = 1.0f;
-        m_HeaderElement.style.marginTop = 1.0f;
-        m_HeaderElement.style.borderTopWidth = 1.0f;
-        m_HeaderElement.style.borderBottomWidth = 1.0f;
+            titleContent = Style.title;
 
-        RebuildHeaderUI();
+            m_Root = new VisualElement();
+            m_Root.name = "Root";
+            m_Root.style.flexDirection = FlexDirection.Column;
 
-        m_GraphViewerElement = new VisualElement();
-        m_GraphViewerElement.name = "GraphViewer";
-        m_GraphViewerElement.style.marginLeft = 20.0f; // Margin on the left of resource labels.
-        m_GraphViewerElement.style.flexDirection = FlexDirection.Column;
+            m_HeaderElement = new VisualElement();
+            m_HeaderElement.name = "Header";
+            m_HeaderElement.style.flexDirection = FlexDirection.Row;
+            m_HeaderElement.style.justifyContent = Justify.SpaceBetween;
+            m_HeaderElement.style.minHeight = 25.0f;
+            m_HeaderElement.style.marginBottom = 1.0f;
+            m_HeaderElement.style.marginTop = 1.0f;
+            m_HeaderElement.style.borderTopWidth = 1.0f;
+            m_HeaderElement.style.borderBottomWidth = 1.0f;
 
-        RebuildGraphViewerUI();
+            RebuildHeaderUI();
 
-        m_Root.Add(m_HeaderElement);
-        m_Root.Add(m_GraphViewerElement);
-        rootVisualElement.Add(m_Root);
-    }
+            m_GraphViewerElement = new VisualElement();
+            m_GraphViewerElement.name = "GraphViewer";
+            m_GraphViewerElement.style.marginLeft = 20.0f; // Margin on the left of resource labels.
+            m_GraphViewerElement.style.flexDirection = FlexDirection.Column;
 
-    void OnGraphRegistered(RenderGraph graph)
-    {
-        m_RegisteredGraphs.Add(graph, new HashSet<string>());
-        RebuildHeaderUI();
-    }
+            RebuildGraphViewerUI();
 
-    void OnGraphUnregistered(RenderGraph graph)
-    {
-        m_RegisteredGraphs.Remove(graph);
-        RebuildHeaderUI();
-    }
+            m_Root.Add(m_HeaderElement);
+            m_Root.Add(m_GraphViewerElement);
+            rootVisualElement.Add(m_Root);
+        }
 
-    void OnExecutionRegistered(RenderGraph graph, string name)
-    {
-        m_RegisteredGraphs.TryGetValue(graph, out var executionList);
-        Debug.Assert(executionList != null, $"RenderGraph {graph.name} should be registered before registering its executions.");
-        executionList.Add(name);
+        void OnGraphRegistered(RenderGraph graph)
+        {
+            m_RegisteredGraphs.Add(graph, new HashSet<string>());
+            RebuildHeaderUI();
+        }
 
-        RebuildHeaderUI();
-    }
+        void OnGraphUnregistered(RenderGraph graph)
+        {
+            m_RegisteredGraphs.Remove(graph);
+            RebuildHeaderUI();
+        }
 
-    void OnExecutionUnregistered(RenderGraph graph, string name)
-    {
-        m_RegisteredGraphs.TryGetValue(graph, out var executionList);
-        Debug.Assert(executionList != null, $"RenderGraph {graph.name} should be registered before unregistering its executions.");
-        executionList.Remove(name);
+        void OnExecutionRegistered(RenderGraph graph, string name)
+        {
+            m_RegisteredGraphs.TryGetValue(graph, out var executionList);
+            Debug.Assert(executionList != null, $"RenderGraph {graph.name} should be registered before registering its executions.");
+            executionList.Add(name);
 
-        RebuildHeaderUI();
-    }
+            RebuildHeaderUI();
+        }
 
-    void OnEnable()
-    {
-        for (int i = 0; i < (int)RenderGraphResourceType.Count; ++i)
-            m_ResourceElementsInfo[i] = new DynamicArray<ResourceElementInfo>();
+        void OnExecutionUnregistered(RenderGraph graph, string name)
+        {
+            m_RegisteredGraphs.TryGetValue(graph, out var executionList);
+            Debug.Assert(executionList != null, $"RenderGraph {graph.name} should be registered before unregistering its executions.");
+            executionList.Remove(name);
 
-        var registeredGraph = RenderGraph.GetRegisteredRenderGraphs();
-        foreach (var graph in registeredGraph)
-            m_RegisteredGraphs.Add(graph, new HashSet<string>());
+            RebuildHeaderUI();
+        }
 
-        RenderGraph.requireDebugData = true;
-        RenderGraph.onGraphRegistered += OnGraphRegistered;
-        RenderGraph.onGraphUnregistered += OnGraphUnregistered;
-        RenderGraph.onExecutionRegistered += OnExecutionRegistered;
-        RenderGraph.onExecutionUnregistered += OnExecutionUnregistered;
-    }
+        void OnEnable()
+        {
+            for (int i = 0; i < (int)RenderGraphResourceType.Count; ++i)
+                m_ResourceElementsInfo[i] = new DynamicArray<ResourceElementInfo>();
+
+            var registeredGraph = RenderGraph.GetRegisteredRenderGraphs();
+            foreach (var graph in registeredGraph)
+                m_RegisteredGraphs.Add(graph, new HashSet<string>());
+
+            RenderGraph.requireDebugData = true;
+            RenderGraph.onGraphRegistered += OnGraphRegistered;
+            RenderGraph.onGraphUnregistered += OnGraphUnregistered;
+            RenderGraph.onExecutionRegistered += OnExecutionRegistered;
+            RenderGraph.onExecutionUnregistered += OnExecutionUnregistered;
+        }
 
-    private void CreateGUI()
-    {
-        RebuildUI();
-    }
+        private void CreateGUI()
+        {
+            RebuildUI();
+        }
 
-    void OnDisable()
-    {
-        RenderGraph.requireDebugData = false;
-        RenderGraph.onGraphRegistered -= OnGraphRegistered;
-        RenderGraph.onGraphUnregistered -= OnGraphUnregistered;
-        RenderGraph.onExecutionRegistered -= OnExecutionRegistered;
-        RenderGraph.onExecutionUnregistered -= OnExecutionUnregistered;
+        void OnDisable()
+        {
+            RenderGraph.requireDebugData = false;
+            RenderGraph.onGraphRegistered -= OnGraphRegistered;
+            RenderGraph.onGraphUnregistered -= OnGraphUnregistered;
+            RenderGraph.onExecutionRegistered -= OnExecutionRegistered;
+            RenderGraph.onExecutionUnregistered -= OnExecutionUnregistered;
+        }
     }
 }
diff --git a/com.unity.render-pipelines.core/Editor/Utilities/MenuUtilities.cs b/com.unity.render-pipelines.core/Editor/Utilities/MenuUtilities.cs
new file mode 100644
index 00000000000..850e5c2e903
--- /dev/null
+++ b/com.unity.render-pipelines.core/Editor/Utilities/MenuUtilities.cs
@@ -0,0 +1,159 @@
+using System;
+using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Reflection;
+using System.Linq;
+using UnityEngine.Rendering;
+
+namespace UnityEditor.Rendering.Utilities
+{
+    class MenuUtilities
+    {
+        class MenuItemData
+        {
+            public MenuItemForRenderPipeline attribute;
+            public Action action;
+            public Func<bool> validate;
+        }
+
+        static private Dictionary<Type, List<MenuItemData>> s_MenuMap = new Dictionary<Type, List<MenuItemData>>();
+
+        static Action<string, string, bool, int, Action, Func<bool>> s_AddMenuItem;
+        static Action<string> s_RemoveMenuItem;
+
+        static MenuUtilities()
+        {
+            //AddMenuItem(string name, string shortcut, bool @checked, int priority, System.Action execute, System.Func<bool> validate);
+            MethodInfo addMenuItemMethodInfo = typeof(Menu).GetMethod("AddMenuItem", BindingFlags.Static | BindingFlags.NonPublic);
+
+            //RemoveMenuItem(string name);
+            MethodInfo removeMenuItemMethodInfo = typeof(Menu).GetMethod("RemoveMenuItem", BindingFlags.Static | BindingFlags.NonPublic);
+
+            var nameParam = Expression.Parameter(typeof(string), "name");
+            var shortcutParam = Expression.Parameter(typeof(string), "shortcut");
+            var checkedParam = Expression.Parameter(typeof(bool), "checked");
+            var priorityParam = Expression.Parameter(typeof(int), "priority");
+            var executeParam = Expression.Parameter(typeof(Action), "execute");
+            var validateParam = Expression.Parameter(typeof(Func<bool>), "validate");
+
+            var addMenuItemExpressionCall = Expression.Call(null, addMenuItemMethodInfo,
+                nameParam,
+                shortcutParam,
+                checkedParam,
+                priorityParam,
+                executeParam,
+                validateParam);
+            var removeMenuItemExpressionCall = Expression.Call(null, removeMenuItemMethodInfo,
+                nameParam);
+
+            s_AddMenuItem = Expression.Lambda<Action<string, string, bool, int, Action, Func<bool>>>(
+                addMenuItemExpressionCall,
+                nameParam,
+                shortcutParam,
+                checkedParam,
+                priorityParam,
+                executeParam,
+                validateParam).Compile();
+            s_RemoveMenuItem = Expression.Lambda<Action<string>>(
+                removeMenuItemExpressionCall,
+                nameParam).Compile();
+
+            RenderPipelineManager.activeRenderPipelineTypeChanged += UpdateMenuItemForRenderPipeline;
+        }
+
+        static void RegisterMenu(MenuItemData element)
+            => s_AddMenuItem(element.attribute.path,
+                string.Empty,
+                false,
+                element.attribute.priority,
+                element.action,
+                element.validate);
+
+        static void UnregisterMenu(MenuItemData element)
+            => s_RemoveMenuItem(element.attribute.path);
+
+        [InitializeOnLoadMethod]
+        static void ConstructMenuItemForRenderPipeline()
+        {
+            // Construct the MenuMap
+            // Possible scenario to take into acount:
+            //   - validate method can come before action method
+            //   - all packages add with same attribute (renderPipelineAssetTypes = { HDRPAsset, URPAsset })
+            //   - each package add its own attribute (one with renderPipelineAssetTypes = { HDRPAsset }, other with renderPipelineAssetTypes = { URPAsset })
+            var filteredMethods = TypeCache.GetMethodsWithAttribute<MenuItemForRenderPipeline>();
+            foreach (var methodInfo in filteredMethods)
+            {
+                var attribute = methodInfo.GetCustomAttribute<MenuItemForRenderPipeline>();
+                foreach (Type rpAssetType in attribute.renderPipelineAssetTypes)
+                {
+                    // Note: rpAssetType == null possible and should mean built-in
+
+                    if (!s_MenuMap.TryGetValue(rpAssetType, out var menuItemsForRP))
+                    {
+                        menuItemsForRP = new List<MenuItemData>();
+                        s_MenuMap[rpAssetType] = menuItemsForRP;
+                    }
+
+                    var query = menuItemsForRP.Where(mi => mi.attribute.path == attribute.path);
+                    bool alreadyHere = query.Count() > 0;
+                    var menuItemData = alreadyHere ? query.First() : new MenuItemData();
+
+                    menuItemData.attribute = attribute;
+                    if (attribute.validate)
+                        menuItemData.validate = (Func<bool>)Delegate.CreateDelegate(typeof(Func<bool>), methodInfo);
+                    else
+                        menuItemData.action = (Action)Delegate.CreateDelegate(typeof(Action), methodInfo);
+
+                    if (!alreadyHere)
+                        menuItemsForRP.Add(menuItemData);
+                }
+            }
+
+            //activating menuitems
+            UpdateMenuItemForRenderPipeline();
+        }
+
+        static void UpdateMenuItemForRenderPipeline()
+        {
+            // remove
+            foreach (var menuItemData in s_MenuMap.Values.SelectMany(mid => mid))
+                UnregisterMenu(menuItemData); //do nothing if not registered before
+
+            // add if required
+            if (GraphicsSettings.currentRenderPipeline == null || GraphicsSettings.currentRenderPipeline.Equals(null))
+                return;
+
+            Type currentSRPType = GraphicsSettings.currentRenderPipeline.GetType();
+            if (!s_MenuMap.TryGetValue(currentSRPType, out var menuItemDatasForRP))
+                return;
+
+            foreach (var menuItemData in menuItemDatasForRP)
+                RegisterMenu(menuItemData);
+        }
+    }
+
+    [AttributeUsage(AttributeTargets.Method)]
+    public class MenuItemForRenderPipeline : Attribute
+    {
+        public readonly Type[] renderPipelineAssetTypes;
+        public readonly string path;
+        public readonly int priority;
+        public readonly bool validate;
+
+        public MenuItemForRenderPipeline(string path, bool validate = false, int priority = 0, params Type[] renderPipelineAssetTypes)
+        {
+            if (renderPipelineAssetTypes == null || renderPipelineAssetTypes.Length == 0)
+                throw new ArgumentNullException("Argument cannot be null", "renderPipelineTypes");
+
+            foreach (Type type in renderPipelineAssetTypes)
+                if (!typeof(RenderPipelineAsset).IsAssignableFrom(type))
+                    throw new ArgumentException("Argument must be a RenderPipelineAsset child type", "renderPipelineTypes");
+
+            this.path = path;
+            this.renderPipelineAssetTypes = renderPipelineAssetTypes;
+            this.priority = priority;
+            this.validate = validate;
+        }
+    }
+
+}
diff --git a/com.unity.render-pipelines.core/Editor/Utilities/MenuUtilities.cs.meta b/com.unity.render-pipelines.core/Editor/Utilities/MenuUtilities.cs.meta
new file mode 100644
index 00000000000..edbf99adfd2
--- /dev/null
+++ b/com.unity.render-pipelines.core/Editor/Utilities/MenuUtilities.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: b03b8698fb81d3147ae065e787ce9b42
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/com.unity.render-pipelines.high-definition/Editor/ToolMenus.cs b/com.unity.render-pipelines.high-definition/Editor/ToolMenus.cs
new file mode 100644
index 00000000000..ca5a2ff3ff8
--- /dev/null
+++ b/com.unity.render-pipelines.high-definition/Editor/ToolMenus.cs
@@ -0,0 +1,16 @@
+using UnityEditor.Rendering.Utilities;
+using UnityEngine.Rendering.HighDefinition;
+
+namespace UnityEditor.Rendering.HighDefinition
+{
+    class ToolMenus
+    {
+        [MenuItemForRenderPipeline("Window/Rendering/Look Dev", false, 10001, typeof(HDRenderPipelineAsset))]
+        static void OpenLookDev()
+            => LookDev.LookDev.Open();
+
+        [MenuItemForRenderPipeline("Window/Analysis/Render Graph Viewer", false, 10006, typeof(HDRenderPipelineAsset))]
+        static void OpenRenderGraphViewer()
+            => RenderGraphModule.RenderGraphViewer.Open();
+    }
+}
diff --git a/com.unity.render-pipelines.high-definition/Editor/ToolMenus.cs.meta b/com.unity.render-pipelines.high-definition/Editor/ToolMenus.cs.meta
new file mode 100644
index 00000000000..3b41f4e522b
--- /dev/null
+++ b/com.unity.render-pipelines.high-definition/Editor/ToolMenus.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: e99d3a58a26d53f48adc7ad1e9fe99f9
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

From 70b46da010c40008b3d4b1a373124b7e50ca04d6 Mon Sep 17 00:00:00 2001
From: RSlysz <remi@unity3d.com>
Date: Thu, 2 Sep 2021 18:40:20 +0200
Subject: [PATCH 02/11] Update CHANGELOG.md

---
 com.unity.render-pipelines.core/CHANGELOG.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/com.unity.render-pipelines.core/CHANGELOG.md b/com.unity.render-pipelines.core/CHANGELOG.md
index 8bcffaba438..ecffc2906f0 100644
--- a/com.unity.render-pipelines.core/CHANGELOG.md
+++ b/com.unity.render-pipelines.core/CHANGELOG.md
@@ -9,6 +9,9 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 Version Updated
 The version number for this package has increased due to a version update of a related graphics package.
 
+### Added
+- Added MenuItemForRenderPipeline attribute that only show the MenuItem if the current pipeline is one of the ones provided.
+
 ## [12.0.0] - 2021-01-11
 
 ### Added

From 45cce3ef0a3670b1859ecda594fcad005793ed29 Mon Sep 17 00:00:00 2001
From: RSlysz <remi@unity3d.com>
Date: Thu, 2 Sep 2021 19:26:35 +0200
Subject: [PATCH 03/11] Add support for built-in as null type

---
 .../Editor/Utilities/MenuUtilities.cs          | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/com.unity.render-pipelines.core/Editor/Utilities/MenuUtilities.cs b/com.unity.render-pipelines.core/Editor/Utilities/MenuUtilities.cs
index 850e5c2e903..fe40ae083af 100644
--- a/com.unity.render-pipelines.core/Editor/Utilities/MenuUtilities.cs
+++ b/com.unity.render-pipelines.core/Editor/Utilities/MenuUtilities.cs
@@ -86,8 +86,6 @@ static void ConstructMenuItemForRenderPipeline()
                 var attribute = methodInfo.GetCustomAttribute<MenuItemForRenderPipeline>();
                 foreach (Type rpAssetType in attribute.renderPipelineAssetTypes)
                 {
-                    // Note: rpAssetType == null possible and should mean built-in
-
                     if (!s_MenuMap.TryGetValue(rpAssetType, out var menuItemsForRP))
                     {
                         menuItemsForRP = new List<MenuItemData>();
@@ -120,10 +118,10 @@ static void UpdateMenuItemForRenderPipeline()
                 UnregisterMenu(menuItemData); //do nothing if not registered before
 
             // add if required
-            if (GraphicsSettings.currentRenderPipeline == null || GraphicsSettings.currentRenderPipeline.Equals(null))
-                return;
 
-            Type currentSRPType = GraphicsSettings.currentRenderPipeline.GetType();
+            // Note: GraphicsSettings.currentRenderPipeline == null possible and should mean built-in
+            // though we cannot use null as key so it was early replaced by typeof(RenderPipelineAsset)
+            Type currentSRPType = GraphicsSettings.currentRenderPipeline?.GetType() ?? typeof(RenderPipelineAsset);
             if (!s_MenuMap.TryGetValue(currentSRPType, out var menuItemDatasForRP))
                 return;
 
@@ -143,17 +141,19 @@ public class MenuItemForRenderPipeline : Attribute
         public MenuItemForRenderPipeline(string path, bool validate = false, int priority = 0, params Type[] renderPipelineAssetTypes)
         {
             if (renderPipelineAssetTypes == null || renderPipelineAssetTypes.Length == 0)
-                throw new ArgumentNullException("Argument cannot be null", "renderPipelineTypes");
+                throw new ArgumentNullException("Argument cannot be null. Use MenuItem instead if you don't need to filter per RenderPipeline.", "renderPipelineTypes");
 
+            // Note: rpAssetType == null possible and should mean built-in
+            // but this is not possible as a key in s_MenuMap so we use the forbiden RenderPipelineAsset type for that
             foreach (Type type in renderPipelineAssetTypes)
-                if (!typeof(RenderPipelineAsset).IsAssignableFrom(type))
+                if (!typeof(RenderPipelineAsset).IsAssignableFrom(type) && type != null)
                     throw new ArgumentException("Argument must be a RenderPipelineAsset child type", "renderPipelineTypes");
 
+            this.renderPipelineAssetTypes = renderPipelineAssetTypes
+                .Select(rpat => rpat != null ? rpat : typeof(RenderPipelineAsset)).ToArray();
             this.path = path;
-            this.renderPipelineAssetTypes = renderPipelineAssetTypes;
             this.priority = priority;
             this.validate = validate;
         }
     }
-
 }

From 36e7afba9b1a8ee2eeaea90475d094bb06ab9661 Mon Sep 17 00:00:00 2001
From: RSlysz <remi@unity3d.com>
Date: Thu, 2 Sep 2021 19:32:37 +0200
Subject: [PATCH 04/11] Add documentation

---
 .../Editor/Utilities/MenuUtilities.cs                  | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/com.unity.render-pipelines.core/Editor/Utilities/MenuUtilities.cs b/com.unity.render-pipelines.core/Editor/Utilities/MenuUtilities.cs
index fe40ae083af..82dca3f8e28 100644
--- a/com.unity.render-pipelines.core/Editor/Utilities/MenuUtilities.cs
+++ b/com.unity.render-pipelines.core/Editor/Utilities/MenuUtilities.cs
@@ -130,14 +130,24 @@ static void UpdateMenuItemForRenderPipeline()
         }
     }
 
+    /// <summary>MenuItem filtered by used render pipeline</summary>
     [AttributeUsage(AttributeTargets.Method)]
     public class MenuItemForRenderPipeline : Attribute
     {
+        /// <summary>Supported render pipeline types</summary>
         public readonly Type[] renderPipelineAssetTypes;
+        /// <summary>Path in menu tree</summary>
         public readonly string path;
+        /// <summary>Position in tree</summary>
         public readonly int priority;
+        /// <summary>Is this the validate method?</summary>
         public readonly bool validate;
 
+        /// <summary>MenuItem filtered by used render pipeline</summary>
+        /// <param name="path">Path in menu tree</param>
+        /// <param name="validate">Is this the validate method?</param>
+        /// <param name="priority">Position in tree</param>
+        /// <param name="renderPipelineAssetTypes">Supported render pipeline types</param>
         public MenuItemForRenderPipeline(string path, bool validate = false, int priority = 0, params Type[] renderPipelineAssetTypes)
         {
             if (renderPipelineAssetTypes == null || renderPipelineAssetTypes.Length == 0)

From 2b228188a4994626d92e9932a3fd0e9e6685d094 Mon Sep 17 00:00:00 2001
From: Remi Slysz <40034005+RSlysz@users.noreply.github.com>
Date: Thu, 2 Sep 2021 22:15:01 +0200
Subject: [PATCH 05/11] Update
 com.unity.render-pipelines.core/Editor/Utilities/MenuUtilities.cs

Co-authored-by: alex-vazquez <76204843+alex-vazquez@users.noreply.github.com>
---
 .../Editor/Utilities/MenuUtilities.cs                           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/com.unity.render-pipelines.core/Editor/Utilities/MenuUtilities.cs b/com.unity.render-pipelines.core/Editor/Utilities/MenuUtilities.cs
index fe40ae083af..9d99c4ad693 100644
--- a/com.unity.render-pipelines.core/Editor/Utilities/MenuUtilities.cs
+++ b/com.unity.render-pipelines.core/Editor/Utilities/MenuUtilities.cs
@@ -141,7 +141,7 @@ public class MenuItemForRenderPipeline : Attribute
         public MenuItemForRenderPipeline(string path, bool validate = false, int priority = 0, params Type[] renderPipelineAssetTypes)
         {
             if (renderPipelineAssetTypes == null || renderPipelineAssetTypes.Length == 0)
-                throw new ArgumentNullException("Argument cannot be null. Use MenuItem instead if you don't need to filter per RenderPipeline.", "renderPipelineTypes");
+                throw new ArgumentNullException("Argument cannot be null. Use MenuItem instead if you don't need to filter per RenderPipeline.", nameof(renderPipelineTypes));
 
             // Note: rpAssetType == null possible and should mean built-in
             // but this is not possible as a key in s_MenuMap so we use the forbiden RenderPipelineAsset type for that

From a463c749ba7cfe682296934c920c38fdfeba8a8f Mon Sep 17 00:00:00 2001
From: Remi Slysz <40034005+RSlysz@users.noreply.github.com>
Date: Thu, 2 Sep 2021 22:15:13 +0200
Subject: [PATCH 06/11] Update
 com.unity.render-pipelines.core/Editor/Utilities/MenuUtilities.cs

Co-authored-by: alex-vazquez <76204843+alex-vazquez@users.noreply.github.com>
---
 .../Editor/Utilities/MenuUtilities.cs                           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/com.unity.render-pipelines.core/Editor/Utilities/MenuUtilities.cs b/com.unity.render-pipelines.core/Editor/Utilities/MenuUtilities.cs
index 9d99c4ad693..d605ad7f9d7 100644
--- a/com.unity.render-pipelines.core/Editor/Utilities/MenuUtilities.cs
+++ b/com.unity.render-pipelines.core/Editor/Utilities/MenuUtilities.cs
@@ -147,7 +147,7 @@ public MenuItemForRenderPipeline(string path, bool validate = false, int priorit
             // but this is not possible as a key in s_MenuMap so we use the forbiden RenderPipelineAsset type for that
             foreach (Type type in renderPipelineAssetTypes)
                 if (!typeof(RenderPipelineAsset).IsAssignableFrom(type) && type != null)
-                    throw new ArgumentException("Argument must be a RenderPipelineAsset child type", "renderPipelineTypes");
+                    throw new ArgumentException("Argument must be a RenderPipelineAsset child type", nameof(renderPipelineTypes));
 
             this.renderPipelineAssetTypes = renderPipelineAssetTypes
                 .Select(rpat => rpat != null ? rpat : typeof(RenderPipelineAsset)).ToArray();

From 5da8a6079ce09764b804ee1e602e8bbd5feeee5a Mon Sep 17 00:00:00 2001
From: Remi Slysz <40034005+RSlysz@users.noreply.github.com>
Date: Thu, 2 Sep 2021 22:15:28 +0200
Subject: [PATCH 07/11] Update
 com.unity.render-pipelines.core/Editor/Utilities/MenuUtilities.cs

Co-authored-by: alex-vazquez <76204843+alex-vazquez@users.noreply.github.com>
---
 .../Editor/Utilities/MenuUtilities.cs                           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/com.unity.render-pipelines.core/Editor/Utilities/MenuUtilities.cs b/com.unity.render-pipelines.core/Editor/Utilities/MenuUtilities.cs
index d605ad7f9d7..e38c20f8529 100644
--- a/com.unity.render-pipelines.core/Editor/Utilities/MenuUtilities.cs
+++ b/com.unity.render-pipelines.core/Editor/Utilities/MenuUtilities.cs
@@ -146,7 +146,7 @@ public MenuItemForRenderPipeline(string path, bool validate = false, int priorit
             // Note: rpAssetType == null possible and should mean built-in
             // but this is not possible as a key in s_MenuMap so we use the forbiden RenderPipelineAsset type for that
             foreach (Type type in renderPipelineAssetTypes)
-                if (!typeof(RenderPipelineAsset).IsAssignableFrom(type) && type != null)
+                if (type != null && !typeof(RenderPipelineAsset).IsAssignableFrom(type))
                     throw new ArgumentException("Argument must be a RenderPipelineAsset child type", nameof(renderPipelineTypes));
 
             this.renderPipelineAssetTypes = renderPipelineAssetTypes

From dcbf65dd3b774423f6a23d9f1968a17fa92a016f Mon Sep 17 00:00:00 2001
From: RSlysz <remi@unity3d.com>
Date: Thu, 2 Sep 2021 22:30:37 +0200
Subject: [PATCH 08/11] Add feedbacks on naming

---
 .../Editor/Utilities/MenuUtilities.cs                       | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/com.unity.render-pipelines.core/Editor/Utilities/MenuUtilities.cs b/com.unity.render-pipelines.core/Editor/Utilities/MenuUtilities.cs
index cffd41c4863..bd8a338f695 100644
--- a/com.unity.render-pipelines.core/Editor/Utilities/MenuUtilities.cs
+++ b/com.unity.render-pipelines.core/Editor/Utilities/MenuUtilities.cs
@@ -93,8 +93,8 @@ static void ConstructMenuItemForRenderPipeline()
                     }
 
                     var query = menuItemsForRP.Where(mi => mi.attribute.path == attribute.path);
-                    bool alreadyHere = query.Count() > 0;
-                    var menuItemData = alreadyHere ? query.First() : new MenuItemData();
+                    bool alreadyRegistered = query.Count() > 0;
+                    var menuItemData = alreadyRegistered ? query.First() : new MenuItemData();
 
                     menuItemData.attribute = attribute;
                     if (attribute.validate)
@@ -102,7 +102,7 @@ static void ConstructMenuItemForRenderPipeline()
                     else
                         menuItemData.action = (Action)Delegate.CreateDelegate(typeof(Action), methodInfo);
 
-                    if (!alreadyHere)
+                    if (!alreadyRegistered)
                         menuItemsForRP.Add(menuItemData);
                 }
             }

From 538447e3a8493155dd8891744aff15074995f7e1 Mon Sep 17 00:00:00 2001
From: RSlysz <remi@unity3d.com>
Date: Thu, 2 Sep 2021 22:34:04 +0200
Subject: [PATCH 09/11] Fix name

---
 .../Editor/Utilities/MenuUtilities.cs                         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/com.unity.render-pipelines.core/Editor/Utilities/MenuUtilities.cs b/com.unity.render-pipelines.core/Editor/Utilities/MenuUtilities.cs
index bd8a338f695..210d58f022c 100644
--- a/com.unity.render-pipelines.core/Editor/Utilities/MenuUtilities.cs
+++ b/com.unity.render-pipelines.core/Editor/Utilities/MenuUtilities.cs
@@ -151,13 +151,13 @@ public class MenuItemForRenderPipeline : Attribute
         public MenuItemForRenderPipeline(string path, bool validate = false, int priority = 0, params Type[] renderPipelineAssetTypes)
         {
             if (renderPipelineAssetTypes == null || renderPipelineAssetTypes.Length == 0)
-                throw new ArgumentNullException("Argument cannot be null. Use MenuItem instead if you don't need to filter per RenderPipeline.", nameof(renderPipelineTypes));
+                throw new ArgumentNullException("Argument cannot be null. Use MenuItem instead if you don't need to filter per RenderPipeline.", nameof(renderPipelineAssetTypes));
 
             // Note: rpAssetType == null possible and should mean built-in
             // but this is not possible as a key in s_MenuMap so we use the forbiden RenderPipelineAsset type for that
             foreach (Type type in renderPipelineAssetTypes)
                 if (type != null && !typeof(RenderPipelineAsset).IsAssignableFrom(type))
-                    throw new ArgumentException("Argument must be a RenderPipelineAsset child type", nameof(renderPipelineTypes));
+                    throw new ArgumentException("Argument must be a RenderPipelineAsset child type", nameof(renderPipelineAssetTypes));
 
             this.renderPipelineAssetTypes = renderPipelineAssetTypes
                 .Select(rpat => rpat != null ? rpat : typeof(RenderPipelineAsset)).ToArray();

From 665769669f7fce40df2fbe066c2af30fcd4b6752 Mon Sep 17 00:00:00 2001
From: RSlysz <remi@unity3d.com>
Date: Tue, 7 Sep 2021 10:38:32 +0200
Subject: [PATCH 10/11] Move LookDev and RenderGraph mechanisme into CoreRP

We know from CoreRP if they can or cannot be used.
Also cleaning code
---
 .../Editor/RenderGraph/RenderGraphViewer.cs   |  2 +-
 .../Editor/Utilities/MenuUtilities.cs         | 89 ++++++++++++++++---
 .../Editor/ToolMenus.cs                       | 16 ----
 .../Editor/ToolMenus.cs.meta                  | 11 ---
 4 files changed, 78 insertions(+), 40 deletions(-)
 delete mode 100644 com.unity.render-pipelines.high-definition/Editor/ToolMenus.cs
 delete mode 100644 com.unity.render-pipelines.high-definition/Editor/ToolMenus.cs.meta

diff --git a/com.unity.render-pipelines.core/Editor/RenderGraph/RenderGraphViewer.cs b/com.unity.render-pipelines.core/Editor/RenderGraph/RenderGraphViewer.cs
index 816379af604..66d0914e2aa 100644
--- a/com.unity.render-pipelines.core/Editor/RenderGraph/RenderGraphViewer.cs
+++ b/com.unity.render-pipelines.core/Editor/RenderGraph/RenderGraphViewer.cs
@@ -36,7 +36,7 @@ public void SetColor(StyleColor color)
             }
         }
 
-        public static void Open()
+        internal static void Open()
         {
             // Get existing open window or if none, make a new one:
             var window = GetWindow<RenderGraphViewer>();
diff --git a/com.unity.render-pipelines.core/Editor/Utilities/MenuUtilities.cs b/com.unity.render-pipelines.core/Editor/Utilities/MenuUtilities.cs
index 210d58f022c..dd6e35f29d9 100644
--- a/com.unity.render-pipelines.core/Editor/Utilities/MenuUtilities.cs
+++ b/com.unity.render-pipelines.core/Editor/Utilities/MenuUtilities.cs
@@ -7,21 +7,39 @@
 
 namespace UnityEditor.Rendering.Utilities
 {
-    class MenuUtilities
+    [InitializeOnLoad]
+    static class MenuUtilities
     {
-        class MenuItemData
+        static MenuUtilities()
         {
-            public MenuItemForRenderPipeline attribute;
-            public Action action;
-            public Func<bool> validate;
+            InitMethodsWithReflection();
+
+            ConstructMenuItemForRenderPipeline();
+
+            RenderPipelineManager.activeRenderPipelineTypeChanged += Update;
+
+            // PR on Hold due to this:
+            // We cannot guarantee that the ADB is ready - which means we cannot guarantee accessibility
+            // to the SRP asset of the current Quality level. We definitely need to push for a callback
+            // to guarantee those scenarios. (OnAssetDatabaseReady?)
+            Update();
         }
 
-        static private Dictionary<Type, List<MenuItemData>> s_MenuMap = new Dictionary<Type, List<MenuItemData>>();
+        static void Update()
+        {
+            UpdateRenderGraph();
+            UpdateLookDev();
+
+            // should always be updated last
+            UpdateMenuItemForRenderPipeline();
+        }
+
+        #region Reflection
 
         static Action<string, string, bool, int, Action, Func<bool>> s_AddMenuItem;
         static Action<string> s_RemoveMenuItem;
 
-        static MenuUtilities()
+        static void InitMethodsWithReflection()
         {
             //AddMenuItem(string name, string shortcut, bool @checked, int priority, System.Action execute, System.Func<bool> validate);
             MethodInfo addMenuItemMethodInfo = typeof(Menu).GetMethod("AddMenuItem", BindingFlags.Static | BindingFlags.NonPublic);
@@ -57,10 +75,21 @@ static MenuUtilities()
             s_RemoveMenuItem = Expression.Lambda<Action<string>>(
                 removeMenuItemExpressionCall,
                 nameParam).Compile();
+        }
+
+        #endregion
+
+        #region MenuItemForRenderPipeline Management
 
-            RenderPipelineManager.activeRenderPipelineTypeChanged += UpdateMenuItemForRenderPipeline;
+        class MenuItemData
+        {
+            public MenuItemForRenderPipeline attribute;
+            public Action action;
+            public Func<bool> validate;
         }
 
+        static private Dictionary<Type, List<MenuItemData>> s_MenuMap = new Dictionary<Type, List<MenuItemData>>();
+
         static void RegisterMenu(MenuItemData element)
             => s_AddMenuItem(element.attribute.path,
                 string.Empty,
@@ -72,7 +101,6 @@ static void RegisterMenu(MenuItemData element)
         static void UnregisterMenu(MenuItemData element)
             => s_RemoveMenuItem(element.attribute.path);
 
-        [InitializeOnLoadMethod]
         static void ConstructMenuItemForRenderPipeline()
         {
             // Construct the MenuMap
@@ -106,9 +134,6 @@ static void ConstructMenuItemForRenderPipeline()
                         menuItemsForRP.Add(menuItemData);
                 }
             }
-
-            //activating menuitems
-            UpdateMenuItemForRenderPipeline();
         }
 
         static void UpdateMenuItemForRenderPipeline()
@@ -128,6 +153,46 @@ static void UpdateMenuItemForRenderPipeline()
             foreach (var menuItemData in menuItemDatasForRP)
                 RegisterMenu(menuItemData);
         }
+
+        #endregion
+
+        #region Specific Menus
+
+        static void UpdateLookDev()
+        {
+            const string path = "Window/Rendering/Look Dev";
+            const int priority = 10001;
+
+            // LookDev supported if RenderPipeline implements LookDev.IDataProvider
+            if (RenderPipelineManager.currentPipeline is UnityEngine.Rendering.LookDev.IDataProvider)
+                s_AddMenuItem(path,
+                    string.Empty,
+                    false,
+                    priority,
+                    LookDev.LookDev.Open,
+                    () => true);
+            else
+                s_RemoveMenuItem(path);
+        }
+
+        static void UpdateRenderGraph()
+        {
+            const string path = "Window/Analysis/Render Graph Viewer";
+            const int priority = 10006;
+
+            // RenderGraph used if there is at least one registered
+            if (UnityEngine.Experimental.Rendering.RenderGraphModule.RenderGraph.GetRegisteredRenderGraphs().Count() > 0)
+                s_AddMenuItem(path,
+                    string.Empty,
+                    false,
+                    priority,
+                    RenderGraphModule.RenderGraphViewer.Open,
+                    () => true);
+            else
+                s_RemoveMenuItem(path);
+        }
+
+        #endregion
     }
 
     /// <summary>MenuItem filtered by used render pipeline</summary>
diff --git a/com.unity.render-pipelines.high-definition/Editor/ToolMenus.cs b/com.unity.render-pipelines.high-definition/Editor/ToolMenus.cs
deleted file mode 100644
index ca5a2ff3ff8..00000000000
--- a/com.unity.render-pipelines.high-definition/Editor/ToolMenus.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-using UnityEditor.Rendering.Utilities;
-using UnityEngine.Rendering.HighDefinition;
-
-namespace UnityEditor.Rendering.HighDefinition
-{
-    class ToolMenus
-    {
-        [MenuItemForRenderPipeline("Window/Rendering/Look Dev", false, 10001, typeof(HDRenderPipelineAsset))]
-        static void OpenLookDev()
-            => LookDev.LookDev.Open();
-
-        [MenuItemForRenderPipeline("Window/Analysis/Render Graph Viewer", false, 10006, typeof(HDRenderPipelineAsset))]
-        static void OpenRenderGraphViewer()
-            => RenderGraphModule.RenderGraphViewer.Open();
-    }
-}
diff --git a/com.unity.render-pipelines.high-definition/Editor/ToolMenus.cs.meta b/com.unity.render-pipelines.high-definition/Editor/ToolMenus.cs.meta
deleted file mode 100644
index 3b41f4e522b..00000000000
--- a/com.unity.render-pipelines.high-definition/Editor/ToolMenus.cs.meta
+++ /dev/null
@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: e99d3a58a26d53f48adc7ad1e9fe99f9
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

From 85899d3d71b1c945580afb54d7bd73fb8fabc5e2 Mon Sep 17 00:00:00 2001
From: RSlysz <remi@unity3d.com>
Date: Tue, 7 Sep 2021 10:57:12 +0200
Subject: [PATCH 11/11] Remove Unused MenuItemForRenderPipeline

---
 .../Editor/Utilities/MenuUtilities.cs         | 119 ------------------
 1 file changed, 119 deletions(-)

diff --git a/com.unity.render-pipelines.core/Editor/Utilities/MenuUtilities.cs b/com.unity.render-pipelines.core/Editor/Utilities/MenuUtilities.cs
index dd6e35f29d9..98265bdf438 100644
--- a/com.unity.render-pipelines.core/Editor/Utilities/MenuUtilities.cs
+++ b/com.unity.render-pipelines.core/Editor/Utilities/MenuUtilities.cs
@@ -14,8 +14,6 @@ static MenuUtilities()
         {
             InitMethodsWithReflection();
 
-            ConstructMenuItemForRenderPipeline();
-
             RenderPipelineManager.activeRenderPipelineTypeChanged += Update;
 
             // PR on Hold due to this:
@@ -29,9 +27,6 @@ static void Update()
         {
             UpdateRenderGraph();
             UpdateLookDev();
-
-            // should always be updated last
-            UpdateMenuItemForRenderPipeline();
         }
 
         #region Reflection
@@ -79,83 +74,6 @@ static void InitMethodsWithReflection()
 
         #endregion
 
-        #region MenuItemForRenderPipeline Management
-
-        class MenuItemData
-        {
-            public MenuItemForRenderPipeline attribute;
-            public Action action;
-            public Func<bool> validate;
-        }
-
-        static private Dictionary<Type, List<MenuItemData>> s_MenuMap = new Dictionary<Type, List<MenuItemData>>();
-
-        static void RegisterMenu(MenuItemData element)
-            => s_AddMenuItem(element.attribute.path,
-                string.Empty,
-                false,
-                element.attribute.priority,
-                element.action,
-                element.validate);
-
-        static void UnregisterMenu(MenuItemData element)
-            => s_RemoveMenuItem(element.attribute.path);
-
-        static void ConstructMenuItemForRenderPipeline()
-        {
-            // Construct the MenuMap
-            // Possible scenario to take into acount:
-            //   - validate method can come before action method
-            //   - all packages add with same attribute (renderPipelineAssetTypes = { HDRPAsset, URPAsset })
-            //   - each package add its own attribute (one with renderPipelineAssetTypes = { HDRPAsset }, other with renderPipelineAssetTypes = { URPAsset })
-            var filteredMethods = TypeCache.GetMethodsWithAttribute<MenuItemForRenderPipeline>();
-            foreach (var methodInfo in filteredMethods)
-            {
-                var attribute = methodInfo.GetCustomAttribute<MenuItemForRenderPipeline>();
-                foreach (Type rpAssetType in attribute.renderPipelineAssetTypes)
-                {
-                    if (!s_MenuMap.TryGetValue(rpAssetType, out var menuItemsForRP))
-                    {
-                        menuItemsForRP = new List<MenuItemData>();
-                        s_MenuMap[rpAssetType] = menuItemsForRP;
-                    }
-
-                    var query = menuItemsForRP.Where(mi => mi.attribute.path == attribute.path);
-                    bool alreadyRegistered = query.Count() > 0;
-                    var menuItemData = alreadyRegistered ? query.First() : new MenuItemData();
-
-                    menuItemData.attribute = attribute;
-                    if (attribute.validate)
-                        menuItemData.validate = (Func<bool>)Delegate.CreateDelegate(typeof(Func<bool>), methodInfo);
-                    else
-                        menuItemData.action = (Action)Delegate.CreateDelegate(typeof(Action), methodInfo);
-
-                    if (!alreadyRegistered)
-                        menuItemsForRP.Add(menuItemData);
-                }
-            }
-        }
-
-        static void UpdateMenuItemForRenderPipeline()
-        {
-            // remove
-            foreach (var menuItemData in s_MenuMap.Values.SelectMany(mid => mid))
-                UnregisterMenu(menuItemData); //do nothing if not registered before
-
-            // add if required
-
-            // Note: GraphicsSettings.currentRenderPipeline == null possible and should mean built-in
-            // though we cannot use null as key so it was early replaced by typeof(RenderPipelineAsset)
-            Type currentSRPType = GraphicsSettings.currentRenderPipeline?.GetType() ?? typeof(RenderPipelineAsset);
-            if (!s_MenuMap.TryGetValue(currentSRPType, out var menuItemDatasForRP))
-                return;
-
-            foreach (var menuItemData in menuItemDatasForRP)
-                RegisterMenu(menuItemData);
-        }
-
-        #endregion
-
         #region Specific Menus
 
         static void UpdateLookDev()
@@ -194,41 +112,4 @@ static void UpdateRenderGraph()
 
         #endregion
     }
-
-    /// <summary>MenuItem filtered by used render pipeline</summary>
-    [AttributeUsage(AttributeTargets.Method)]
-    public class MenuItemForRenderPipeline : Attribute
-    {
-        /// <summary>Supported render pipeline types</summary>
-        public readonly Type[] renderPipelineAssetTypes;
-        /// <summary>Path in menu tree</summary>
-        public readonly string path;
-        /// <summary>Position in tree</summary>
-        public readonly int priority;
-        /// <summary>Is this the validate method?</summary>
-        public readonly bool validate;
-
-        /// <summary>MenuItem filtered by used render pipeline</summary>
-        /// <param name="path">Path in menu tree</param>
-        /// <param name="validate">Is this the validate method?</param>
-        /// <param name="priority">Position in tree</param>
-        /// <param name="renderPipelineAssetTypes">Supported render pipeline types</param>
-        public MenuItemForRenderPipeline(string path, bool validate = false, int priority = 0, params Type[] renderPipelineAssetTypes)
-        {
-            if (renderPipelineAssetTypes == null || renderPipelineAssetTypes.Length == 0)
-                throw new ArgumentNullException("Argument cannot be null. Use MenuItem instead if you don't need to filter per RenderPipeline.", nameof(renderPipelineAssetTypes));
-
-            // Note: rpAssetType == null possible and should mean built-in
-            // but this is not possible as a key in s_MenuMap so we use the forbiden RenderPipelineAsset type for that
-            foreach (Type type in renderPipelineAssetTypes)
-                if (type != null && !typeof(RenderPipelineAsset).IsAssignableFrom(type))
-                    throw new ArgumentException("Argument must be a RenderPipelineAsset child type", nameof(renderPipelineAssetTypes));
-
-            this.renderPipelineAssetTypes = renderPipelineAssetTypes
-                .Select(rpat => rpat != null ? rpat : typeof(RenderPipelineAsset)).ToArray();
-            this.path = path;
-            this.priority = priority;
-            this.validate = validate;
-        }
-    }
 }