diff --git a/Packages/com.unity.render-pipelines.core/CHANGELOG.md b/Packages/com.unity.render-pipelines.core/CHANGELOG.md
index bc9c177054a..28ddd3eb859 100644
--- a/Packages/com.unity.render-pipelines.core/CHANGELOG.md
+++ b/Packages/com.unity.render-pipelines.core/CHANGELOG.md
@@ -10,6 +10,12 @@ 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.
 
+## [17.5.0] - 2026-02-18
+
+This version is compatible with Unity 6000.6.0a7.
+
+For the release notes, refer to the [Unity download archive](https://unity.com/releases/editor/archive).
+
 ## [17.4.0] - 2025-10-22
 
 This version is compatible with Unity 6000.4.0a4.
diff --git a/Packages/com.unity.render-pipelines.core/Editor-PrivateShared/Tools/Converter/ConverterItemState.cs b/Packages/com.unity.render-pipelines.core/Editor-PrivateShared/Tools/Converter/ConverterItemState.cs
index 20ccab79b56..dcd5e8b30a9 100644
--- a/Packages/com.unity.render-pipelines.core/Editor-PrivateShared/Tools/Converter/ConverterItemState.cs
+++ b/Packages/com.unity.render-pipelines.core/Editor-PrivateShared/Tools/Converter/ConverterItemState.cs
@@ -22,6 +22,7 @@ public bool isSelected
             }
         }
         public IRenderPipelineConverterItem item;
+        [NonSerialized]
         public (Status Status, string Message) conversionResult = (Status.Pending, string.Empty);
         internal bool hasConverted => conversionResult.Status != Status.Pending;
 
diff --git a/Packages/com.unity.render-pipelines.core/Editor-PrivateShared/Tools/Converter/ConverterState.cs b/Packages/com.unity.render-pipelines.core/Editor-PrivateShared/Tools/Converter/ConverterState.cs
index ef31c5175ae..baa1a17c9c4 100644
--- a/Packages/com.unity.render-pipelines.core/Editor-PrivateShared/Tools/Converter/ConverterState.cs
+++ b/Packages/com.unity.render-pipelines.core/Editor-PrivateShared/Tools/Converter/ConverterState.cs
@@ -31,7 +31,7 @@ class ConverterState
         public IRenderPipelineConverter converter;
 
         public DisplayFilter currentFilter = DisplayFilter.All;
-        public IList<TreeViewItemData<ConverterItemState>> filteredItems = new List<TreeViewItemData<ConverterItemState>>();
+        public IList<TreeViewItemData<ConverterItemState>> filteredItems {get; private set; } = new List<TreeViewItemData<ConverterItemState>>();
 
         private int CountItemWithFlag(Status status)
         {
diff --git a/Packages/com.unity.render-pipelines.core/Editor-PrivateShared/Tools/Converter/Window/RenderPipelineConvertersEditor.uxml b/Packages/com.unity.render-pipelines.core/Editor-PrivateShared/Tools/Converter/Window/RenderPipelineConvertersEditor.uxml
index c537e9592bd..033f4de02dc 100644
--- a/Packages/com.unity.render-pipelines.core/Editor-PrivateShared/Tools/Converter/Window/RenderPipelineConvertersEditor.uxml
+++ b/Packages/com.unity.render-pipelines.core/Editor-PrivateShared/Tools/Converter/Window/RenderPipelineConvertersEditor.uxml
@@ -14,7 +14,7 @@
             </ui:VisualElement>
         </ui:VisualElement>
         
-        <ui:ScrollView scroll-deceleration-rate="0,135" elasticity="0,1" name="convertersScrollView" horizontal-scroller-visibility="Hidden" vertical-scroller-visibility="Auto" class="converter-scroll-view" />
+        <ui:ScrollView scroll-deceleration-rate="0.135" elasticity="0.1" name="convertersScrollView" horizontal-scroller-visibility="Hidden" vertical-scroller-visibility="Auto" class="converter-scroll-view" />
         
         <ui:VisualElement name="bottomButtonVE" class="converter-bottom-row">
             <ui:Button text="Scan" name="initializeButton" tooltip="Executes a project scanning based on the selected converters" class="converter-button"/>
diff --git a/Packages/com.unity.render-pipelines.core/Editor/Debugging/DebugWindow.SearchFilter.cs b/Packages/com.unity.render-pipelines.core/Editor/Debugging/DebugWindow.SearchFilter.cs
new file mode 100644
index 00000000000..598e6490a18
--- /dev/null
+++ b/Packages/com.unity.render-pipelines.core/Editor/Debugging/DebugWindow.SearchFilter.cs
@@ -0,0 +1,148 @@
+#if ENABLE_UIELEMENTS_MODULE && (UNITY_EDITOR || DEVELOPMENT_BUILD)
+#define ENABLE_RENDERING_DEBUGGER_UI
+#endif
+
+using System;
+using System.Collections.Generic;
+using UnityEditor.UIElements;
+using UnityEngine;
+using UnityEngine.Rendering;
+using UnityEngine.UIElements;
+
+namespace UnityEditor.Rendering
+{
+    internal class WidgetSearchData
+    {
+        public List<TextElement> textElements;
+        public string aggregatedAdditionalSearchText;
+
+        public WidgetSearchData(List<TextElement> textElements, string aggregatedAdditionalSearchText)
+        {
+            this.textElements = textElements;
+            this.aggregatedAdditionalSearchText = aggregatedAdditionalSearchText;
+        }
+    }
+
+    sealed partial class DebugWindow
+    {
+#if ENABLE_RENDERING_DEBUGGER_UI
+        readonly Dictionary<DebugUI.Widget, WidgetSearchData> m_WidgetSearchElementCache = new();
+        readonly List<TextElement> m_PanelHeaderTextElements = new();
+        UIElementSearchFilter m_SearchFilter;
+
+        void BuildSearchCache()
+        {
+            m_WidgetSearchElementCache.Clear();
+            m_PanelHeaderTextElements.Clear();
+
+            foreach (var panelElement in m_RightPaneElement.Children())
+            {
+                var headerLabel = panelElement.Q<Label>(className: "debug-window-search-filter-target");
+                if (headerLabel != null)
+                    m_PanelHeaderTextElements.Add(headerLabel);
+            }
+
+            DebugManager.instance.ForEachWidget(widget =>
+            {
+                if (widget.m_VisualElement == null)
+                    return;
+
+                List<TextElement> textElements = widget.m_VisualElement.Query()
+                        .Descendents<TextElement>(classname: "debug-window-search-filter-target")
+                        .ToList();
+
+                string aggregatedText = CollectAggregatedAdditionalSearchText(widget);
+                m_WidgetSearchElementCache[widget] = new WidgetSearchData(textElements, aggregatedText);
+            });
+        }
+
+        void InitializeSearchField()
+        {
+            m_SearchFilter = new UIElementSearchFilter(
+                rootVisualElement,
+                searchString =>
+                {
+                    var visiblePanels = PerformSearch(m_WidgetSearchElementCache, searchString, hideRootElementIfNoMatch: true);
+
+                    foreach (var headerLabel in m_PanelHeaderTextElements)
+                        UIElementSearchFilter.ApplySearchAndHighlight(headerLabel, searchString, out _);
+
+                    foreach (var panel in DebugManager.instance.panels)
+                    {
+                        var tab = m_LeftPaneElement.Q<VisualElement>(name: panel.displayName + "_Tab");
+                        if (tab != null)
+                        {
+                            bool shouldShow = string.IsNullOrEmpty(searchString) || visiblePanels.Contains(panel.displayName);
+                            tab.style.display = shouldShow ? DisplayStyle.Flex : DisplayStyle.None;
+                        }
+                    }
+                }
+            );
+            m_SearchFilter.InitializeSearchField("search-field");
+        }
+
+        internal static string CollectAggregatedAdditionalSearchText(DebugUI.Widget widget)
+        {
+            var parts = new List<string>();
+
+            if (!string.IsNullOrEmpty(widget.m_AdditionalSearchText))
+                parts.Add(widget.m_AdditionalSearchText);
+
+            if (widget is DebugUI.Container container)
+            {
+                foreach (var child in container.children)
+                {
+                    string childAggregated = CollectAggregatedAdditionalSearchText(child);
+                    if (!string.IsNullOrEmpty(childAggregated))
+                        parts.Add(childAggregated);
+                }
+            }
+
+            return parts.Count > 0 ? string.Join(",", parts) : string.Empty;
+        }
+
+        internal static HashSet<string> PerformSearch(Dictionary<DebugUI.Widget, WidgetSearchData> elementCache, string searchString, bool hideRootElementIfNoMatch = false)
+        {
+            var panelsWithVisibleWidgets = new HashSet<string>();
+
+            foreach (var (widget, searchData) in elementCache)
+            {
+                bool anyDescendantMatchesSearch = false;
+                foreach (var elem in searchData.textElements)
+                {
+                    UIElementSearchFilter.ApplySearchAndHighlight(elem, searchString, out bool matched);
+                    if (matched)
+                        anyDescendantMatchesSearch = true;
+                }
+
+                if (!string.IsNullOrEmpty(searchData.aggregatedAdditionalSearchText))
+                {
+                    if (searchData.aggregatedAdditionalSearchText.Contains(searchString, StringComparison.CurrentCultureIgnoreCase))
+                        anyDescendantMatchesSearch = true;
+                }
+
+                if (hideRootElementIfNoMatch)
+                {
+                    if (searchString == string.Empty && searchData.textElements.Count == 0)
+                    {
+                        widget.m_IsHiddenBySearchFilter = false;
+                    }
+                    else
+                    {
+                        widget.m_IsHiddenBySearchFilter = !anyDescendantMatchesSearch;
+                    }
+                }
+                else
+                {
+                    widget.m_IsHiddenBySearchFilter = false;
+                }
+
+                if (!widget.m_IsHiddenBySearchFilter && widget.panel != null)
+                    panelsWithVisibleWidgets.Add(widget.panel.displayName);
+            }
+
+            return panelsWithVisibleWidgets;
+        }
+#endif
+    }
+}
diff --git a/Packages/com.unity.render-pipelines.core/Editor/Debugging/DebugWindow.SearchFilter.cs.meta b/Packages/com.unity.render-pipelines.core/Editor/Debugging/DebugWindow.SearchFilter.cs.meta
new file mode 100644
index 00000000000..99b68212cf9
--- /dev/null
+++ b/Packages/com.unity.render-pipelines.core/Editor/Debugging/DebugWindow.SearchFilter.cs.meta
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: e60528a842c858f469435e8e9683025a
\ No newline at end of file
diff --git a/Packages/com.unity.render-pipelines.core/Editor/Debugging/DebugWindow.cs b/Packages/com.unity.render-pipelines.core/Editor/Debugging/DebugWindow.cs
index 9d5fc8b904e..506245e32a4 100644
--- a/Packages/com.unity.render-pipelines.core/Editor/Debugging/DebugWindow.cs
+++ b/Packages/com.unity.render-pipelines.core/Editor/Debugging/DebugWindow.cs
@@ -163,11 +163,15 @@ static void SendWidgetValueChangedAnalytic<T>(string queryPath, T previousValue,
         // Note: this won't get called if the window is opened when the editor itself is closed
         void OnDestroy()
         {
-            // Note: In the case where the window is maximized/unmaximized, OnEnable for the new window gets called *before* OnDestroy.
-            //       Therefore you need to be careful with statics/globals. In this case, we only mark displayEditorUI as false if we are
-            //       closing the only/last DebugWindow instance.
-            if (Resources.FindObjectsOfTypeAll(typeof(DebugWindow)).Length == 0)
-                DebugManager.instance.displayEditorUI = false;
+            EditorApplication.delayCall += () =>
+            {
+                // Note: In the case where the window is maximized/unmaximized, OnEnable for the new window gets called *before* OnDestroy.
+                //       Therefore you need to be careful with statics/globals. In this case, we only mark displayEditorUI as false if we are
+                //       closing the only/last DebugWindow instance. The check is delayed because inside OnDestroy, the current window still exists.
+                var debugWindows = Resources.FindObjectsOfTypeAll(typeof(DebugWindow));
+                if (debugWindows.Length == 0)
+                    DebugManager.instance.displayEditorUI = false;
+            };
 
             DebugManager.instance.onSetDirty -= MarkDirty;
 
@@ -286,6 +290,9 @@ private void RecreateGUI()
                 // The schedulers themselves are created in AttachToPanelEvent so we need to delay to ensure this has happened.
                 EditorApplication.delayCall += () => SetSelectedPanel(m_SelectedPanelName);
             });
+
+            BuildSearchCache();
+            InitializeSearchField();
         }
 
         void ResetClicked()
diff --git a/Packages/com.unity.render-pipelines.core/Editor/Debugging/DebugWindow.uss b/Packages/com.unity.render-pipelines.core/Editor/Debugging/DebugWindow.uss
index c20ad397f69..534784f6d0a 100644
--- a/Packages/com.unity.render-pipelines.core/Editor/Debugging/DebugWindow.uss
+++ b/Packages/com.unity.render-pipelines.core/Editor/Debugging/DebugWindow.uss
@@ -1,7 +1,9 @@
 :root {
 }
 
-/* Lateral Tab Panel */
+.top-toolbar {
+    height: 22px;
+}
 
 #debug-window-tab-panel {
     align-items: stretch;
diff --git a/Packages/com.unity.render-pipelines.core/Editor/Debugging/DebugWindow.uxml b/Packages/com.unity.render-pipelines.core/Editor/Debugging/DebugWindow.uxml
index f9909738a2e..67dec473cd9 100644
--- a/Packages/com.unity.render-pipelines.core/Editor/Debugging/DebugWindow.uxml
+++ b/Packages/com.unity.render-pipelines.core/Editor/Debugging/DebugWindow.uxml
@@ -2,6 +2,7 @@
     engine="UnityEngine.UIElements" editor="UnityEditor.UIElements" noNamespaceSchemaLocation="../../../../../UIElementsSchema/UIElements.xsd" editor-extension-mode="True">
     <uie:Toolbar class="top-toolbar">
         <uie:ToolbarSpacer style="flex-grow: 1" />
+        <uie:ToolbarSearchField name="search-field"/>
         <uie:ToolbarButton text="Reset" name="btn-reset" focusable="false" />
     </uie:Toolbar>
     <ui:TwoPaneSplitView fixed-pane-index="0" fixed-pane-initial-dimension="225" view-data-key="debug-window-split-view">
diff --git a/Packages/com.unity.render-pipelines.core/Editor/FilterWindow.cs b/Packages/com.unity.render-pipelines.core/Editor/FilterWindow.cs
index 7264c443c39..4c63caa3fc8 100644
--- a/Packages/com.unity.render-pipelines.core/Editor/FilterWindow.cs
+++ b/Packages/com.unity.render-pipelines.core/Editor/FilterWindow.cs
@@ -53,6 +53,7 @@ public interface IProvider
         /// An element from the filtered list or tree.
         /// </summary>
         /// <seealso cref="GroupElement"/>
+        [Serializable]
         public class Element : IComparable
         {
             /// <summary>
diff --git a/Packages/com.unity.render-pipelines.core/Editor/Lighting/LightingSearchSelectors.cs b/Packages/com.unity.render-pipelines.core/Editor/Lighting/LightingSearchSelectors.cs
new file mode 100644
index 00000000000..bff90e1c5fd
--- /dev/null
+++ b/Packages/com.unity.render-pipelines.core/Editor/Lighting/LightingSearchSelectors.cs
@@ -0,0 +1,460 @@
+using System;
+using UnityEditor.Search;
+using UnityEngine;
+using UnityEngine.Rendering;
+using UnityEngine.UIElements;
+
+namespace UnityEditor.Lighting
+{
+    static class CoreLightingSearchSelectors
+    {
+        internal const string k_SceneProvider = "scene";
+        internal const string k_BakingSetPath = "BakingSets/";
+        internal const string k_VolumePath = "Volume/";
+        internal const string k_LightPath = "Light/";
+        internal const string k_LightShapePath = k_LightPath + "Shape";
+        internal const string k_BakingModePath = k_BakingSetPath + "BakingMode";
+        internal const string k_SkyOcclusionBakingSamplesPath = k_BakingSetPath + "SkyOcclusionBakingSamples";
+        internal const string k_VolumeModePath = k_VolumePath + "Mode";
+        internal const string k_VolumeProfilePath = k_VolumePath + "Profile";
+
+        const string k_StyleSheetPath = "StyleSheets/LightingSearchSelectors.uss";
+        const int k_DefaultSearchSelectorPriority = 99;
+        const int k_MinBakingSamples = 1;
+        const int k_MaxBakingSamples = 8192;
+        static StyleSheet s_StyleSheet;
+
+        static StyleSheet LoadStyleSheet()
+        {
+            if (s_StyleSheet == null)
+            {
+                s_StyleSheet = EditorGUIUtility.Load(k_StyleSheetPath) as StyleSheet;
+            }
+            return s_StyleSheet;
+        }
+
+        [SearchSelector(k_VolumeModePath, provider: k_SceneProvider, priority: k_DefaultSearchSelectorPriority)]
+        static object VolumeModeSearchSelector(SearchSelectorArgs args)
+        {
+            var go = args.current.ToObject<GameObject>();
+            if (go == null)
+                return null;
+
+            return LightingSearchDataAccessors.GetVolumeMode(go);
+        }
+
+        [SearchSelector(k_VolumeProfilePath, provider: k_SceneProvider, priority: k_DefaultSearchSelectorPriority)]
+        static object VolumeProfileSearchSelector(SearchSelectorArgs args)
+        {
+            var go = args.current.ToObject<GameObject>();
+            if (go == null)
+                return null;
+
+            return LightingSearchDataAccessors.GetVolumeProfile(go);
+        }
+
+        [SearchColumnProvider(k_BakingModePath)]
+        public static void BakingModeSearchColumnProvider(SearchColumn column)
+        {
+            column.getter = args =>
+            {
+                var bakingSet = args.item.ToObject() as ProbeVolumeBakingSet;
+                if (bakingSet == null)
+                    return null;
+
+                return LightingSearchDataAccessors.GetBakingMode(bakingSet);
+            };
+            column.setter = args =>
+            {
+                if (args.value is not string)
+                    return;
+
+                var bakingSet = args.item.ToObject() as ProbeVolumeBakingSet;
+                if (bakingSet == null)
+                    return;
+
+                LightingSearchDataAccessors.SetBakingMode(bakingSet, (string)args.value);
+            };
+            column.cellCreator = _ =>
+            {
+                var dropdown = new DropdownField
+                {
+                    choices = new System.Collections.Generic.List<string> { "Baking Set", "Single Scene" }
+                };
+                return dropdown;
+            };
+            column.binder = (args, ve) =>
+            {
+                var bakingSet = args.item.ToObject() as ProbeVolumeBakingSet;
+                if (bakingSet == null)
+                {
+                    ve.visible = false;
+                    return;
+                }
+
+                var dropdown = (DropdownField)ve;
+                var mode = (string)args.value;
+
+                ve.visible = true;
+                dropdown.SetValueWithoutNotify(mode);
+            };
+        }
+
+        [SearchColumnProvider(k_SkyOcclusionBakingSamplesPath)]
+        public static void SkyOcclusionBakingSamplesSearchColumnProvider(SearchColumn column)
+        {
+            static int SamplesToSliderValue(int samples)
+            {
+                int value = k_MinBakingSamples;
+                while (value < samples && value < k_MaxBakingSamples)
+                {
+                    value *= 2;
+                }
+                return value;
+            }
+
+            column.getter = args =>
+            {
+                var bakingSet = args.item.ToObject() as ProbeVolumeBakingSet;
+                if (bakingSet == null)
+                    return null;
+
+                return LightingSearchDataAccessors.GetSkyOcclusionBakingSamples(bakingSet);
+            };
+            column.setter = args =>
+            {
+                if (args.value is not int)
+                    return;
+
+                var bakingSet = args.item.ToObject() as ProbeVolumeBakingSet;
+                if (bakingSet == null)
+                    return;
+
+                int samples = (int)args.value;
+                int roundedSamplesValue = SamplesToSliderValue(samples);
+
+                LightingSearchDataAccessors.SetSkyOcclusionBakingSamples(bakingSet, roundedSamplesValue);
+            };
+            column.cellCreator = _ =>
+            {
+                var container = new VisualElement();
+                container.AddToClassList("core-lighting-search-baking-samples");
+
+                var slider = new SliderInt(k_MinBakingSamples, k_MaxBakingSamples);
+                slider.AddToClassList("core-lighting-search-baking-samples__slider");
+
+                var integerField = new IntegerField();
+                integerField.AddToClassList("core-lighting-search-baking-samples__text-field");
+
+                container.Add(slider);
+                container.Add(integerField);
+
+                var styleSheet = LoadStyleSheet();
+                if (styleSheet != null)
+                    container.styleSheets.Add(styleSheet);
+
+                return container;
+            };
+            column.binder = (args, ve) =>
+            {
+                var bakingSet = args.item.ToObject() as ProbeVolumeBakingSet;
+                if (bakingSet == null)
+                {
+                    ve.visible = false;
+                    return;
+                }
+
+                var samples = (int)args.value;
+
+                ve.visible = true;
+                var slider = ve.Q<SliderInt>();
+                var textField = ve.Q<IntegerField>();
+
+                slider.SetValueWithoutNotify(samples);
+                textField.SetValueWithoutNotify(samples);
+            };
+        }
+
+        [SearchColumnProvider(k_VolumeModePath)]
+        public static void VolumeModeSearchColumnProvider(SearchColumn column)
+        {
+            column.getter = args =>
+            {
+                var go = args.item.data as GameObject ?? args.item.ToObject<GameObject>();
+                if (go == null)
+                    return null;
+
+                return LightingSearchDataAccessors.GetVolumeMode(go);
+            };
+            column.setter = args =>
+            {
+                if (args.value is not string)
+                    return;
+
+                var go = args.item.data as GameObject ?? args.item.ToObject<GameObject>();
+                if (go == null)
+                    return;
+
+                LightingSearchDataAccessors.SetVolumeMode(go, (string)args.value);
+            };
+            column.cellCreator = _ =>
+            {
+                var dropdown = new DropdownField
+                {
+                    choices = new System.Collections.Generic.List<string> { "Global", "Local" }
+                };
+                return dropdown;
+            };
+            column.binder = (args, ve) =>
+            {
+                var go = args.item.ToObject<GameObject>();
+                if (go == null || !go.TryGetComponent<Volume>(out _))
+                {
+                    ve.visible = false;
+                    return;
+                }
+
+                var dropdown = (DropdownField)ve;
+                var mode = (string)args.value;
+
+                ve.visible = true;
+                dropdown.SetValueWithoutNotify(mode);
+            };
+        }
+
+        [SearchColumnProvider(k_VolumeProfilePath)]
+        public static void VolumeProfileSearchColumnProvider(SearchColumn column)
+        {
+            column.getter = args =>
+            {
+                var go = args.item.data as GameObject ?? args.item.ToObject<GameObject>();
+                if (go == null)
+                    return null;
+
+                return LightingSearchDataAccessors.GetVolumeProfile(go);
+            };
+            column.setter = args =>
+            {
+                if (args.value is not VolumeProfile)
+                    return;
+
+                var go = args.item.data as GameObject ?? args.item.ToObject<GameObject>();
+                if (go == null)
+                    return;
+
+                LightingSearchDataAccessors.SetVolumeProfile(go, (VolumeProfile)args.value);
+            };
+            column.cellCreator = _ =>
+            {
+                var field = new UnityEditor.UIElements.ObjectField { objectType = typeof(VolumeProfile) };
+                field.AddToClassList("core-lighting-search-volume-profile");
+
+                var styleSheet = LoadStyleSheet();
+                if (styleSheet != null)
+                    field.styleSheets.Add(styleSheet);
+
+                return field;
+            };
+            column.binder = (args, ve) =>
+            {
+                var go = args.item.ToObject<GameObject>();
+                if (go == null || !go.TryGetComponent<Volume>(out _))
+                {
+                    ve.visible = false;
+                    return;
+                }
+
+                var objectField = (UnityEditor.UIElements.ObjectField)ve;
+                var profile = args.value as VolumeProfile;
+
+                ve.visible = true;
+                objectField.SetValueWithoutNotify(profile);
+            };
+        }
+
+        [SearchColumnProvider(k_LightShapePath)]
+        internal static void LightShapeSearchColumnProvider(SearchColumn column)
+        {
+            column.getter = args =>
+            {
+                var go = args.item.data as GameObject ?? args.item.ToObject<GameObject>();
+                if (go == null)
+                    return null;
+
+                if (!go.TryGetComponent<Light>(out var light))
+                    return null;
+
+                return LightingSearchDataAccessors.GetLightShape(go);
+            };
+            column.setter = args =>
+            {
+                if (args.value == null || !args.value.GetType().IsEnum)
+                    return;
+
+                var go = args.item.data as GameObject ?? args.item.ToObject<GameObject>();
+                if (go == null)
+                    return;
+
+                LightingSearchDataAccessors.SetLightShape(go, (LightType)args.value);
+            };
+            column.cellCreator = _ => new LightShapeField();
+            column.binder = (args, ve) =>
+            {
+                var field = (LightShapeField)ve;
+                if (args.value is LightType lightType)
+                {
+                    if (IsLightShapeApplicable(lightType))
+                    {
+                        field.visible = true;
+                        field.SetValueWithoutNotify(lightType);
+                    }
+                    else
+                    {
+                        field.visible = false;
+                    }
+                }
+                else
+                {
+                    field.visible = false;
+                }
+            };
+        }
+
+        static class LightingSearchDataAccessors
+        {
+            internal static string GetBakingMode(ProbeVolumeBakingSet bakingSet)
+            {
+                return bakingSet.singleSceneMode ? "Single Scene" : "Baking Set";
+            }
+
+            internal static void SetBakingMode(ProbeVolumeBakingSet bakingSet, string mode)
+            {
+                bakingSet.singleSceneMode = (mode == "Single Scene");
+            }
+
+            internal static int GetSkyOcclusionBakingSamples(ProbeVolumeBakingSet bakingSet)
+            {
+                return bakingSet.skyOcclusionBakingSamples;
+            }
+
+            internal static void SetSkyOcclusionBakingSamples(ProbeVolumeBakingSet bakingSet, int samples)
+            {
+                bakingSet.skyOcclusionBakingSamples = samples;
+            }
+
+            internal static string GetVolumeMode(GameObject go)
+            {
+                if (!go.TryGetComponent<Volume>(out var volume))
+                    return null;
+
+                return volume.isGlobal ? "Global" : "Local";
+            }
+
+            internal static void SetVolumeMode(GameObject go, string mode)
+            {
+                if (!go.TryGetComponent<Volume>(out var volume))
+                    return;
+
+                volume.isGlobal = (mode == "Global");
+            }
+
+            internal static VolumeProfile GetVolumeProfile(GameObject go)
+            {
+                if (!go.TryGetComponent<Volume>(out var volume))
+                    return null;
+
+                return volume.HasInstantiatedProfile() ? volume.profile : volume.sharedProfile;
+            }
+
+            internal static void SetVolumeProfile(GameObject go, VolumeProfile profile)
+            {
+                if (!go.TryGetComponent<Volume>(out var volume))
+                    return;
+
+                volume.sharedProfile = profile;
+            }
+
+            internal static LightType? GetLightShape(GameObject go)
+            {
+                if (!go.TryGetComponent<Light>(out var light))
+                    return null;
+
+                return light.type;
+            }
+
+            internal static void SetLightShape(GameObject go, LightType value)
+            {
+                if (!go.TryGetComponent<Light>(out var light))
+                    return;
+
+                if (IsLightShapeApplicable(value))
+                {
+                    light.type = value;
+                }
+            }
+        }
+
+        internal static bool IsLightShapeApplicable(LightType lightType)
+        {
+            return IsAreaLight(lightType);
+        }
+
+        static bool IsAreaLight(LightType lightType)
+        {
+            return lightType is LightType.Rectangle or LightType.Disc or LightType.Tube;
+        }
+
+        enum AreaLightShape
+        {
+            Rectangle = LightType.Rectangle,
+            Disc = LightType.Disc,
+            Tube = LightType.Tube
+        }
+
+        class LightShapeField : EnumField
+        {
+            LightType m_Value;
+
+            public new LightType value
+            {
+                get => m_Value;
+                set
+                {
+                    if (m_Value != value)
+                    {
+                        m_Value = value;
+                        UpdateEnumField();
+                    }
+                }
+            }
+
+            public LightShapeField() : base(AreaLightShape.Rectangle)
+            {
+                m_Value = LightType.Rectangle;
+
+                AddToClassList("core-lighting-search-light-shape");
+
+                var styleSheet = LoadStyleSheet();
+                if (styleSheet != null)
+                    styleSheets.Add(styleSheet);
+            }
+
+            public void SetValueWithoutNotify(LightType newValue)
+            {
+                if (m_Value == newValue)
+                    return;
+
+                m_Value = newValue;
+                UpdateEnumField();
+            }
+
+            void UpdateEnumField()
+            {
+                if (IsAreaLight(m_Value))
+                {
+                    Init((AreaLightShape)m_Value, false);
+                }
+            }
+        }
+    }
+}
diff --git a/Packages/com.unity.render-pipelines.core/Editor/Lighting/LightingSearchSelectors.cs.meta b/Packages/com.unity.render-pipelines.core/Editor/Lighting/LightingSearchSelectors.cs.meta
new file mode 100644
index 00000000000..428ebc7f4d4
--- /dev/null
+++ b/Packages/com.unity.render-pipelines.core/Editor/Lighting/LightingSearchSelectors.cs.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: dedbe1894d884f119869df1b2fbf35fc
+timeCreated: 1764173616
\ No newline at end of file
diff --git a/Packages/com.unity.render-pipelines.core/Editor/Lighting/ProbeVolume/DynamicGI/DynamicGISkyOcclusion.urtshader b/Packages/com.unity.render-pipelines.core/Editor/Lighting/ProbeVolume/DynamicGI/DynamicGISkyOcclusion.urtshader
index d69846750b5..62b4551d148 100644
--- a/Packages/com.unity.render-pipelines.core/Editor/Lighting/ProbeVolume/DynamicGI/DynamicGISkyOcclusion.urtshader
+++ b/Packages/com.unity.render-pipelines.core/Editor/Lighting/ProbeVolume/DynamicGI/DynamicGISkyOcclusion.urtshader
@@ -1,4 +1,4 @@
-#pragma only_renderers d3d11 xboxone xboxseries vulkan metal webgpu
+#pragma only_renderers d3d11 xboxone xboxseries vulkan metal
 #define UNIFIED_RT_GROUP_SIZE_X 64
 #define UNIFIED_RT_GROUP_SIZE_Y 1
 
diff --git a/Packages/com.unity.render-pipelines.core/Editor/Lighting/ProbeVolume/RenderingLayerMask/TraceRenderingLayerMask.urtshader b/Packages/com.unity.render-pipelines.core/Editor/Lighting/ProbeVolume/RenderingLayerMask/TraceRenderingLayerMask.urtshader
index ed6daaaeee5..fd542ba65f5 100644
--- a/Packages/com.unity.render-pipelines.core/Editor/Lighting/ProbeVolume/RenderingLayerMask/TraceRenderingLayerMask.urtshader
+++ b/Packages/com.unity.render-pipelines.core/Editor/Lighting/ProbeVolume/RenderingLayerMask/TraceRenderingLayerMask.urtshader
@@ -1,6 +1,7 @@
 #pragma only_renderers d3d11 xboxone xboxseries vulkan metal webgpu
 #define UNIFIED_RT_GROUP_SIZE_X 64
 #define UNIFIED_RT_GROUP_SIZE_Y 1
+#pragma exclude_renderers webgpu
 
 #include "Packages/com.unity.render-pipelines.core/ShaderLibrary/Common.hlsl"
 #include "Packages/com.unity.render-pipelines.core/Runtime/Lighting/ProbeVolume/ShaderVariablesProbeVolumes.cs.hlsl"
diff --git a/Packages/com.unity.render-pipelines.core/Editor/Lighting/ProbeVolume/VirtualOffset/TraceVirtualOffset.urtshader b/Packages/com.unity.render-pipelines.core/Editor/Lighting/ProbeVolume/VirtualOffset/TraceVirtualOffset.urtshader
index c340f1bb9c6..3ee1830a257 100644
--- a/Packages/com.unity.render-pipelines.core/Editor/Lighting/ProbeVolume/VirtualOffset/TraceVirtualOffset.urtshader
+++ b/Packages/com.unity.render-pipelines.core/Editor/Lighting/ProbeVolume/VirtualOffset/TraceVirtualOffset.urtshader
@@ -1,4 +1,4 @@
-#pragma only_renderers d3d11 xboxone xboxseries vulkan metal webgpu
+#pragma only_renderers d3d11 xboxone xboxseries vulkan metal
 #define UNIFIED_RT_GROUP_SIZE_X 64
 #define UNIFIED_RT_GROUP_SIZE_Y 1
 
diff --git a/Packages/com.unity.render-pipelines.core/Editor/Lighting/ProbeVolume/VoxelizeScene.shader b/Packages/com.unity.render-pipelines.core/Editor/Lighting/ProbeVolume/VoxelizeScene.shader
index 03a822ab880..8c82c33ffb8 100644
--- a/Packages/com.unity.render-pipelines.core/Editor/Lighting/ProbeVolume/VoxelizeScene.shader
+++ b/Packages/com.unity.render-pipelines.core/Editor/Lighting/ProbeVolume/VoxelizeScene.shader
@@ -23,7 +23,7 @@ Shader "Hidden/ProbeVolume/VoxelizeScene"
             #pragma vertex TerrainVert
             #pragma fragment TerrainFrag
             #pragma require randomwrite
-            // #pragma enable_d3d11_debug_symbols
+            // #pragma enable_debug_symbols
 
             #include "Packages/com.unity.render-pipelines.core/Editor/Lighting/ProbeVolume/VoxelizeScene.hlsl"
 
diff --git a/Packages/com.unity.render-pipelines.core/Editor/PathTracing/BakeInputToWorldConversion.cs b/Packages/com.unity.render-pipelines.core/Editor/PathTracing/BakeInputToWorldConversion.cs
index ff5ba7c9097..af5158ef66d 100644
--- a/Packages/com.unity.render-pipelines.core/Editor/PathTracing/BakeInputToWorldConversion.cs
+++ b/Packages/com.unity.render-pipelines.core/Editor/PathTracing/BakeInputToWorldConversion.cs
@@ -110,6 +110,7 @@ private static UnityEngine.LightType LightBakerLightTypeToUnityLightType(LightBa
                 case LightBakerBridge.LightType.Rectangle: return UnityEngine.LightType.Rectangle;
                 case LightBakerBridge.LightType.Disc: return UnityEngine.LightType.Disc;
                 case LightBakerBridge.LightType.SpotBoxShape: return UnityEngine.LightType.Box;
+                case LightBakerBridge.LightType.SpotPyramidShape: return UnityEngine.LightType.Pyramid;
                 default: throw new ArgumentException("Unknown light type");
             }
         }
@@ -172,7 +173,7 @@ internal static void InjectAnalyticalLights(
                 lightDescriptor.ShadowMaskChannel = (lightData.shadowMaskChannel < 4) ? (int)lightData.shadowMaskChannel : -1;
                 lightDescriptor.UseColorTemperature = false;
                 lightDescriptor.FalloffType = LightBakerFalloffTypeToUnityFalloffType(lightData.falloff);
-                lightDescriptor.ShadowRadius = Util.IsPunctualLightType(lightDescriptor.Type) ? lightData.shape0 : 0.0f;
+                lightDescriptor.ShadowRadius = GetLightShadowRadius(lightDescriptor.Type, lightData);
                 lightDescriptor.CookieSize = lightData.cookieScale;
                 lightDescriptor.CookieTexture = Util.IsCookieValid(lightData.cookieTextureIndex) ? CreateTextureFromCookieData(in bakeInput.cookieData[lightData.cookieTextureIndex]) : null;
                 if (lightDescriptor.CookieTexture != null)
@@ -185,6 +186,10 @@ internal static void InjectAnalyticalLights(
                         lightDescriptor.AreaSize = new Vector2(lightData.shape0, lightData.shape1);
                         break;
 
+                    case UnityEngine.LightType.Pyramid:
+                        lightDescriptor.AreaSize = GetPyramidLightRect(lightData.coneAngle, lightData.shape0);
+                        break;
+
                     case UnityEngine.LightType.Disc:
                         lightDescriptor.AreaSize = new Vector2(lightData.shape0, lightData.shape0);
                         break;
@@ -207,6 +212,22 @@ internal static void InjectAnalyticalLights(
             lightHandles = world.AddLights(lights, false, autoEstimateLUTRange, bakeInput.lightingSettings.mixedLightingMode);
         }
 
+        static Vector2 GetPyramidLightRect(float coneAngleInRads, float pyramidAspectRadio)
+        {
+            float ar = pyramidAspectRadio;
+            float h = 2.0f * Mathf.Tan(coneAngleInRads * 0.5f);
+
+            float width = ar >= 1.0f ? (h * ar) : h;
+            float height = ar >= 1.0f ? h : (h / ar);
+
+            return new Vector2(width, height);
+        }
+
+        static float GetLightShadowRadius(UnityEngine.LightType lightType, in LightData lightData)
+        {
+            return (Util.IsPunctualLightType(lightType) && lightType != UnityEngine.LightType.Pyramid && lightType != UnityEngine.LightType.Box) ? lightData.shape0 : 0.0f;
+        }
+
         internal static void InjectEnvironmentLight(
             World world,
             in BakeInput bakeInput,
@@ -375,6 +396,22 @@ internal static Mesh TerrainDataToMesh(in TerrainData terrainData, in HeightmapD
             return outMesh;
         }
 
+        private static Bounds CalculateMeshBounds(Vector3[] vertices, Matrix4x4 localToWorldMatrix4x4, out Vector3 meshMinVertex, out Vector3 meshMaxVertex)
+        {
+            meshMinVertex = new Vector3(float.MaxValue, float.MaxValue, float.MaxValue);
+            meshMaxVertex = new Vector3(float.MinValue, float.MinValue, float.MinValue);
+            foreach (Vector3 vert in vertices)
+            {
+                // TODO: transform the bounding box instead of looping verts (https://jira.unity3d.com/browse/GFXFEAT-667)
+                Vector3 v = localToWorldMatrix4x4.MultiplyPoint(vert);
+                meshMinVertex = Vector3.Min(v, meshMinVertex);
+                meshMaxVertex = Vector3.Max(v, meshMaxVertex);
+            }
+            Bounds meshBounds = new Bounds();
+            meshBounds.SetMinMax(meshMinVertex, meshMaxVertex);
+            return meshBounds;
+        }
+
         internal static void ConvertInstancesAndMeshes(
             World world,
             in BakeInput bakeInput,
@@ -386,8 +423,6 @@ internal static void ConvertInstancesAndMeshes(
             List<UnityEngine.Object> allocatedObjects,
             uint renderingObjectLayer)
         {
-            sceneBounds = new Bounds();
-
             // Extract meshes
             meshes = new Mesh[bakeInput.meshData.Length + bakeInput.terrainData.Length];
             int meshIndex = 0;
@@ -423,6 +458,9 @@ internal static void ConvertInstancesAndMeshes(
             RenderedGameObjectsFilter filter = RenderedGameObjectsFilter.OnlyStatic;
             const bool isStatic = true;
 
+            Vector3 sceneMinVertex = new Vector3(float.MaxValue, float.MaxValue, float.MaxValue);
+            Vector3 sceneMaxVertex = new Vector3(float.MinValue, float.MinValue, float.MinValue);
+
             // Extract instances
             List<FatInstance> fatInstanceList = new();
             for (int i = 0; i < bakeInput.instanceData.Length; i++)
@@ -444,17 +482,11 @@ internal static void ConvertInstancesAndMeshes(
                 Vector2 uvBoundsOffset = uvBoundsOffsets[globalMeshIndex];
 
                 // Calculate bounds
-                var bounds = new Bounds();
-                foreach (Vector3 vert in mesh.vertices)
-                {
-                    bounds.Encapsulate(localToWorldMatrix4x4.MultiplyPoint(vert)); // TODO: transform the bounding box instead of looping verts (https://jira.unity3d.com/browse/GFXFEAT-667)
-                }
+                Bounds meshBounds = CalculateMeshBounds(mesh.vertices, localToWorldMatrix4x4, out Vector3 meshMinVertex, out Vector3 meshMaxVertex);
 
                 // Keep track of scene bounds as we go
-                if (i == 0)
-                    sceneBounds = bounds;
-                else
-                    sceneBounds.Encapsulate(bounds);
+                sceneMinVertex = Vector3.Min(sceneMinVertex, meshMinVertex);
+                sceneMaxVertex = Vector3.Max(sceneMaxVertex, meshMaxVertex);
 
                 // Get masks
                 uint[] subMeshMasks = new uint[mesh.subMeshCount];
@@ -477,7 +509,7 @@ internal static void ConvertInstancesAndMeshes(
                     Materials = materials,
                     SubMeshMasks = subMeshMasks,
                     LocalToWorldMatrix = localToWorldMatrix4x4,
-                    Bounds = bounds,
+                    Bounds = meshBounds,
                     IsStatic = isStatic,
                     LodIdentifier = lodIdentifier,
                     ReceiveShadows = instanceData.receiveShadows,
@@ -489,6 +521,9 @@ internal static void ConvertInstancesAndMeshes(
             }
             fatInstances = fatInstanceList.ToArray();
             Debug.Assert(fatInstances.Length == bakeInput.instanceData.Length);
+
+            sceneBounds = new Bounds();
+            sceneBounds.SetMinMax(sceneMinVertex, sceneMaxVertex);
         }
 
         internal static void PopulateWorld(InputExtraction.BakeInput input, UnityComputeWorld world, SamplingResources samplingResources, CommandBuffer cmd, bool autoEstimateLUTRange)
diff --git a/Packages/com.unity.render-pipelines.core/Editor/PathTracing/LightBakerStrangler.cs b/Packages/com.unity.render-pipelines.core/Editor/PathTracing/LightBakerStrangler.cs
index d5ba4eb2309..948a2c17da5 100644
--- a/Packages/com.unity.render-pipelines.core/Editor/PathTracing/LightBakerStrangler.cs
+++ b/Packages/com.unity.render-pipelines.core/Editor/PathTracing/LightBakerStrangler.cs
@@ -884,16 +884,18 @@ internal static Result ExecuteLightmapRequests(
             bool debugDispatches = integrationSettings.DebugDispatches;
             bool doDirectionality = AnyLightmapRequestHasOutput(lightmapRequestData.requests, LightmapRequestOutputType.DirectionalityDirect) || AnyLightmapRequestHasOutput(lightmapRequestData.requests, LightmapRequestOutputType.DirectionalityIndirect);
 
-            // Find the max index count in any mesh, so we can pre-allocate various buffers based on it.
+            // Find the max index and vertex count in any mesh, so we can pre-allocate various buffers based on it.
             uint maxIndexCount = 1;
+            uint maxVertexCount = 1;
             for (int meshIdx = 0; meshIdx < world.Meshes.Length; ++meshIdx)
             {
                 maxIndexCount = Math.Max(maxIndexCount, world.Meshes[meshIdx].GetTotalIndexCount());
+                maxVertexCount = Math.Max(maxVertexCount, (uint)world.Meshes[meshIdx].vertexCount);
             }
 
             (int width, int height)[] atlasSizes = lightmapRequestData.atlassing.m_AtlasSizes;
             int initialLightmapResolution = atlasSizes.Length > 0 ? atlasSizes[0].width : 1024;
-            if (!lightmappingContext.Initialize(deviceContext, initialLightmapResolution, initialLightmapResolution, world, maxIndexCount, lightmapResourceLib))
+            if (!lightmappingContext.Initialize(deviceContext, initialLightmapResolution, initialLightmapResolution, world, maxIndexCount, maxVertexCount, lightmapResourceLib))
                 return Result.InitializeFailure;
 
             lightmappingContext.IntegratorContext.Initialize(samplingResources, lightmapResourceLib, !useLegacyBakingBehavior);
@@ -1047,6 +1049,7 @@ internal static Result ExecuteLightmapRequests(
                                 // now perform the normal generation for the chunk
                                 // geometry pool bindings
                                 Util.BindAccelerationStructure(cmd, normalShader, world.PathTracingWorld.GetAccelerationStructure());
+                                Util.BindMaterialsAndTextures(cmd, normalShader, world.PathTracingWorld);
 
                                 var requiredSizeInBytes = normalShader.GetTraceScratchBufferRequiredSizeInBytes((uint)chunkSize, 1, 1);
                                 if (requiredSizeInBytes > 0)
diff --git a/Packages/com.unity.render-pipelines.core/Editor/PostProcessing/LensFlareEditor.cs b/Packages/com.unity.render-pipelines.core/Editor/PostProcessing/LensFlareEditor.cs
deleted file mode 100644
index bc452231970..00000000000
--- a/Packages/com.unity.render-pipelines.core/Editor/PostProcessing/LensFlareEditor.cs
+++ /dev/null
@@ -1,24 +0,0 @@
-using UnityEngine;
-using UnityEngine.Rendering;
-
-namespace UnityEditor
-{
-    /// <summary>
-    /// Editor for Lens Flare (builtin): Editor to show an error message
-    /// </summary>
-    [CustomEditor(typeof(LensFlare))]
-    [CanEditMultipleObjects]
-    class LensFlareEditor : Editor
-    {
-        /// <summary>
-        /// Implement this function to make a custom inspector
-        /// </summary>
-        public override void OnInspectorGUI()
-        {
-            if (GraphicsSettings.isScriptableRenderPipelineEnabled)
-                EditorGUILayout.HelpBox("This component doesn't work on SRP, use Lens Flare (SRP) instead.", MessageType.Error);
-            else
-                DrawDefaultInspector();
-        }
-    }
-}
diff --git a/Packages/com.unity.render-pipelines.core/Editor/PostProcessing/LensFlareEditor.cs.meta b/Packages/com.unity.render-pipelines.core/Editor/PostProcessing/LensFlareEditor.cs.meta
deleted file mode 100644
index 3cea5d0770b..00000000000
--- a/Packages/com.unity.render-pipelines.core/Editor/PostProcessing/LensFlareEditor.cs.meta
+++ /dev/null
@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: f9c70a18f33000140b98877df32d3c63
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/Packages/com.unity.render-pipelines.core/Editor/ProjectorEditor.cs b/Packages/com.unity.render-pipelines.core/Editor/ProjectorEditor.cs
deleted file mode 100644
index 4020bd278f1..00000000000
--- a/Packages/com.unity.render-pipelines.core/Editor/ProjectorEditor.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-using UnityEngine;
-using UnityEngine.Rendering;
-
-namespace UnityEditor.Rendering
-{
-    [CustomEditor(typeof(Projector))]
-    [CanEditMultipleObjects]
-    class ProjectorEditor : Editor
-    {
-        static readonly GUIContent k_Message =
-            EditorGUIUtility.TrTextContent("The active render pipeline does not support the Projector component. If using HDRP or URP, use the Decal Projector component instead.");
-
-        public override void OnInspectorGUI()
-        {
-            if (GraphicsSettings.isScriptableRenderPipelineEnabled)
-                EditorGUILayout.HelpBox(k_Message.text, MessageType.Warning);
-            else
-                DrawDefaultInspector();
-        }
-    }
-}
diff --git a/Packages/com.unity.render-pipelines.core/Editor/ProjectorEditor.cs.meta b/Packages/com.unity.render-pipelines.core/Editor/ProjectorEditor.cs.meta
deleted file mode 100644
index ace67aa2bf4..00000000000
--- a/Packages/com.unity.render-pipelines.core/Editor/ProjectorEditor.cs.meta
+++ /dev/null
@@ -1,3 +0,0 @@
-fileFormatVersion: 2
-guid: cb4bfc396f2f4be69c46d1055d00781f
-timeCreated: 1611068571
\ No newline at end of file
diff --git a/Packages/com.unity.render-pipelines.core/Editor/RenderGraph/RenderGraphTestsCore.cs b/Packages/com.unity.render-pipelines.core/Editor/RenderGraph/RenderGraphTestsCore.cs
index 67b9c6cf544..1314ca0e791 100644
--- a/Packages/com.unity.render-pipelines.core/Editor/RenderGraph/RenderGraphTestsCore.cs
+++ b/Packages/com.unity.render-pipelines.core/Editor/RenderGraph/RenderGraphTestsCore.cs
@@ -35,7 +35,7 @@ internal class RenderGraphTestPipelineAsset : RenderPipelineAsset<RenderGraphTes
         {
             public Action<ScriptableRenderContext, Camera, CommandBuffer> recordRenderGraphBody;
 
-            public RenderGraph renderGraph;
+            public RenderGraph renderGraph { get; private set; }
 
             public RenderTextureUVOriginStrategy renderTextureUVOriginStrategy;
 
diff --git a/Packages/com.unity.render-pipelines.core/Editor/RenderGraph/RenderGraphViewer.SidePanel.cs b/Packages/com.unity.render-pipelines.core/Editor/RenderGraph/RenderGraphViewer.SidePanel.cs
index 8a8810d99b2..205ce872847 100644
--- a/Packages/com.unity.render-pipelines.core/Editor/RenderGraph/RenderGraphViewer.SidePanel.cs
+++ b/Packages/com.unity.render-pipelines.core/Editor/RenderGraph/RenderGraphViewer.SidePanel.cs
@@ -44,9 +44,6 @@ static partial class Classes
             public const string kCustomFoldoutArrow = "custom-foldout-arrow";
         }
 
-        internal const string k_SelectionColorBeginTag = "<mark=#3169ACAB>";
-        internal const string k_SelectionColorEndTag = "</mark>";
-
         TwoPaneSplitView m_SidePanelSplitView;
         bool m_ResourceListExpanded = true;
         bool m_PassListExpanded = true;
@@ -59,6 +56,7 @@ static partial class Classes
         Dictionary<VisualElement, List<TextElement>> m_SidePanelPassTexts = new ();
         Dictionary<VisualElement, List<TextElement>> m_GridResourceListTexts = new ();
         Dictionary<VisualElement, List<TextElement>> m_GridPassListTexts = new ();
+        UIElementSearchFilter m_SearchFilter;
 
         void InitializeSidePanel()
         {
@@ -106,117 +104,29 @@ void InitializeSidePanel()
             passListFoldout.icon = m_PassListIcon;
             passListFoldout.contextMenuGenerator = () => CreateContextMenu(passListFoldout.Q<ScrollView>());
 
-            var searchField = rootVisualElement.Q<ToolbarSearchField>(Names.kSearchField);
-            searchField.placeholderText = L10n.Tr("Search");
-            searchField.RegisterValueChangedCallback(evt => OnSearchFilterChanged(evt.newValue));
-        }
-
-        static bool IsInsideTag(string input, int index)
-        {
-            int openTagIndex = input.LastIndexOf('<', index);
-            int closeTagIndex = input.LastIndexOf('>', index);
-            return openTagIndex > closeTagIndex;
-        }
-
-        static bool IsSearchFilterMatch(string str, string searchString, out int startIndex, out int endIndex)
-        {
-            startIndex = -1;
-            endIndex = -1;
-
-            if (searchString.Length == 0)
-                return true;
-
-            int searchStartIndex = 0;
-            for (;;)
-            {
-                startIndex = str.IndexOf(searchString, searchStartIndex, StringComparison.CurrentCultureIgnoreCase);
-
-                // If we found a match but it is inside another tag, ignore it and continue
-                if (startIndex != -1 && IsInsideTag(str, startIndex))
-                {
-                    searchStartIndex = startIndex + 1;
-                    continue;
-                }
-
-                // Either valid match (not inside another tag) or no match
-                break;
-            }
-
-            if (startIndex == -1)
-                return false;
-
-            endIndex = startIndex + searchString.Length - 1;
-            return true;
-        }
-
-        private IVisualElementScheduledItem m_PreviousSearch;
-        private string m_PendingSearchString = string.Empty;
-        private const int k_SearchStringLimit = 15;
-        void OnSearchFilterChanged(string searchString)
-        {
-            // Ensure the search string is within the allowed length limit (15 chars max)
-            if (searchString.Length > k_SearchStringLimit)
-            {
-                searchString = searchString[..k_SearchStringLimit];  // Trim to max 15 chars
-                Debug.LogWarning("[Render Graph Viewer] Search string limit exceeded: " + k_SearchStringLimit);
-            }
-
-            // Sanitize to not match rich text tags
-            searchString = searchString.Replace("<", string.Empty).Replace(">", string.Empty);
-
-            // If the search string hasn't changed, avoid repeating the same search
-            if (m_PendingSearchString == searchString)
-                return;
-
-            m_PendingSearchString = searchString;
-
-            if (m_PreviousSearch != null && m_PreviousSearch.isActive)
-                m_PreviousSearch.Pause();
-
-            m_PreviousSearch = rootVisualElement
-                .schedule
-                .Execute(() =>
+            m_SearchFilter = new UIElementSearchFilter(
+                rootVisualElement,
+                searchString =>
                 {
                     PerformSearch(m_SidePanelResourceTexts, searchString, hideRootElementIfNoMatch: true);
                     PerformSearch(m_SidePanelPassTexts, searchString, hideRootElementIfNoMatch: true);
                     PerformSearch(m_GridResourceListTexts, searchString);
                     PerformSearch(m_GridPassListTexts, searchString);
-                })
-                .StartingIn(5); // Avoid spamming multiple search if the user types really fast
+                }
+            );
+            m_SearchFilter.InitializeSearchField(Names.kSearchField);
         }
 
         internal static void PerformSearch(Dictionary<VisualElement, List<TextElement>> elementCache, string searchString, bool hideRootElementIfNoMatch = false)
         {
-            // Display filter
             foreach (var (rootElement, textElements) in elementCache)
             {
                 bool anyDescendantMatchesSearch = false;
                 foreach (var elem in textElements)
                 {
-                    var text = elem.text;
-
-                    // Remove existing match highlight tags
-                    var hasHighlight = text.IndexOf(k_SelectionColorBeginTag, StringComparison.Ordinal) >= 0;
-                    if (hasHighlight)
-                    {
-                        text = text.Replace(k_SelectionColorBeginTag, string.Empty);
-                        text = text.Replace(k_SelectionColorEndTag, string.Empty);
-                    }
-
-                    if (!IsSearchFilterMatch(text, searchString, out int startHighlight, out int endHighlight))
-                    {
-                        // Reset original text
-                        elem.text = text;
-                        continue;
-                    }
-
-                    if (startHighlight >= 0 && endHighlight >= 0)
-                    {
-                        text = text.Insert(startHighlight, k_SelectionColorBeginTag);
-                        text = text.Insert(endHighlight + k_SelectionColorBeginTag.Length + 1, k_SelectionColorEndTag);
-                    }
-                    elem.text = text;
-                    anyDescendantMatchesSearch = true;
+                    UIElementSearchFilter.ApplySearchAndHighlight(elem, searchString, out bool matched);
+                    if (matched)
+                        anyDescendantMatchesSearch = true;
                 }
 
                 if (hideRootElementIfNoMatch)
diff --git a/Packages/com.unity.render-pipelines.core/Editor/StyleSheets/LightingSearchSelectors.uss b/Packages/com.unity.render-pipelines.core/Editor/StyleSheets/LightingSearchSelectors.uss
new file mode 100644
index 00000000000..662472ba953
--- /dev/null
+++ b/Packages/com.unity.render-pipelines.core/Editor/StyleSheets/LightingSearchSelectors.uss
@@ -0,0 +1,48 @@
+/* Core RP Lighting Search Selectors Styles */
+
+/* Light Shape Field */
+.core-lighting-search-light-shape {
+    flex-grow: 1;
+}
+
+/* Override Subdivision Levels Field */
+.core-lighting-search-subdivision-levels {
+    flex-direction: row;
+    align-items: center;
+    height: 20px;
+}
+
+.core-lighting-search-subdivision-levels__toggle {
+    margin-right: 5px;
+    width: 20px;
+}
+
+.core-lighting-search-subdivision-levels__min-field {
+    flex-grow: 1;
+    margin-right: 2px;
+}
+
+.core-lighting-search-subdivision-levels__max-field {
+    flex-grow: 1;
+}
+
+/* Sky Occlusion Baking Samples Field */
+.core-lighting-search-baking-samples {
+    flex-direction: row;
+    align-items: center;
+    height: 20px;
+}
+
+.core-lighting-search-baking-samples__slider {
+    flex-grow: 1;
+    margin-right: 5px;
+}
+
+.core-lighting-search-baking-samples__text-field {
+    min-width: 50px;
+}
+
+/* Volume Profile Field */
+.core-lighting-search-volume-profile {
+    flex-grow: 1;
+}
diff --git a/Packages/com.unity.render-pipelines.core/Editor/StyleSheets/LightingSearchSelectors.uss.meta b/Packages/com.unity.render-pipelines.core/Editor/StyleSheets/LightingSearchSelectors.uss.meta
new file mode 100644
index 00000000000..4b986b53d41
--- /dev/null
+++ b/Packages/com.unity.render-pipelines.core/Editor/StyleSheets/LightingSearchSelectors.uss.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 86bb22b0f58049838f9c49469f6b82e7
+ScriptedImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 2
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+  script: {fileID: 12385, guid: 0000000000000000e000000000000000, type: 0}
+  disableValidation: 0
diff --git a/Packages/com.unity.render-pipelines.core/Editor/Utilities/UIElementSearchFilter.cs b/Packages/com.unity.render-pipelines.core/Editor/Utilities/UIElementSearchFilter.cs
new file mode 100644
index 00000000000..9e9e21d03a8
--- /dev/null
+++ b/Packages/com.unity.render-pipelines.core/Editor/Utilities/UIElementSearchFilter.cs
@@ -0,0 +1,132 @@
+using System;
+using UnityEditor.UIElements;
+using UnityEngine;
+using UnityEngine.UIElements;
+
+namespace UnityEditor.Rendering
+{
+    // Utility class for adding search filtering functionality to UITK views.
+    // Provides text highlighting, search input throttling, and common search operations.
+    class UIElementSearchFilter
+    {
+        internal const string k_SelectionColorBeginTag = "<mark=#3169ACAB>";
+        internal const string k_SelectionColorEndTag = "</mark>";
+        const int k_SearchStringLimit = 15;
+
+        IVisualElementScheduledItem m_PreviousSearch;
+        string m_PendingSearchString;
+        readonly VisualElement m_RootElement;
+        readonly Action<string> m_PerformSearchCallback;
+
+        public UIElementSearchFilter(VisualElement rootElement, Action<string> performSearchCallback)
+        {
+            m_RootElement = rootElement;
+            m_PerformSearchCallback = performSearchCallback;
+        }
+
+        public void InitializeSearchField(string searchFieldName)
+        {
+            var searchField = m_RootElement.Q<ToolbarSearchField>(searchFieldName);
+            searchField.placeholderText = L10n.Tr("Search");
+            searchField.RegisterValueChangedCallback(evt => OnSearchFilterChanged(evt.newValue));
+
+            // Apply empty search once in case the entire window was reloaded with a non-empty search. Search
+            // modifies the UI document directly, and its state is not reset when triggering the Reload Window option.
+            OnSearchFilterChanged(string.Empty);
+        }
+
+        void OnSearchFilterChanged(string searchString)
+        {
+            // Ensure the search string is within the allowed length limit
+            if (searchString.Length > k_SearchStringLimit)
+            {
+                searchString = searchString[..k_SearchStringLimit];
+                Debug.LogWarning($"Search string limit exceeded: {k_SearchStringLimit}");
+            }
+
+            // Sanitize to not match rich text tags
+            searchString = searchString.Replace("<", string.Empty).Replace(">", string.Empty);
+
+            // If the search string hasn't changed, avoid repeating the same search
+            if (m_PendingSearchString == searchString)
+                return;
+
+            m_PendingSearchString = searchString;
+
+            if (m_PreviousSearch != null && m_PreviousSearch.isActive)
+                m_PreviousSearch.Pause();
+
+            m_PreviousSearch = m_RootElement
+                .schedule
+                .Execute(() => m_PerformSearchCallback(searchString))
+                .StartingIn(5);  // Avoid spamming multiple search if the user types really fast
+        }
+
+        static bool IsInsideTag(string input, int index)
+        {
+            int openTagIndex = input.LastIndexOf('<', index);
+            int closeTagIndex = input.LastIndexOf('>', index);
+            return openTagIndex > closeTagIndex;
+        }
+
+        static bool IsSearchFilterMatch(string str, string searchString, out int startIndex, out int endIndex)
+        {
+            startIndex = -1;
+            endIndex = -1;
+
+            if (searchString.Length == 0)
+                return true;
+
+            int searchStartIndex = 0;
+            for (;;)
+            {
+                startIndex = str.IndexOf(searchString, searchStartIndex, StringComparison.CurrentCultureIgnoreCase);
+
+                // If we found a match but it is inside another tag, ignore it and continue
+                if (startIndex != -1 && IsInsideTag(str, startIndex))
+                {
+                    searchStartIndex = startIndex + 1;
+                    continue;
+                }
+
+                // Either valid match (not inside another tag) or no match
+                break;
+            }
+
+            if (startIndex == -1)
+                return false;
+
+            endIndex = startIndex + searchString.Length - 1;
+            return true;
+        }
+
+        public static void ApplySearchAndHighlight(TextElement textElement, string searchString, out bool isMatch)
+        {
+            var text = textElement.text;
+
+            // Remove existing match highlight tags
+            var hasHighlight = text.IndexOf(k_SelectionColorBeginTag, StringComparison.Ordinal) >= 0;
+            if (hasHighlight)
+            {
+                text = text.Replace(k_SelectionColorBeginTag, string.Empty);
+                text = text.Replace(k_SelectionColorEndTag, string.Empty);
+            }
+
+            if (!IsSearchFilterMatch(text, searchString, out int startHighlight, out int endHighlight))
+            {
+                // Reset original text
+                textElement.text = text;
+                isMatch = false;
+                return;
+            }
+
+            if (startHighlight >= 0 && endHighlight >= 0)
+            {
+                text = text.Insert(startHighlight, k_SelectionColorBeginTag);
+                text = text.Insert(endHighlight + k_SelectionColorBeginTag.Length + 1, k_SelectionColorEndTag);
+            }
+            textElement.text = text;
+            isMatch = true;
+        }
+    }
+}
diff --git a/Packages/com.unity.render-pipelines.core/Editor/Utilities/UIElementSearchFilter.cs.meta b/Packages/com.unity.render-pipelines.core/Editor/Utilities/UIElementSearchFilter.cs.meta
new file mode 100644
index 00000000000..942cab774ef
--- /dev/null
+++ b/Packages/com.unity.render-pipelines.core/Editor/Utilities/UIElementSearchFilter.cs.meta
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: 5b5f2f0a59748ee45bd932de0ff19731
\ No newline at end of file
diff --git a/Packages/com.unity.render-pipelines.core/Runtime/Debug/ProbeVolumeFragmentationDebug.shader b/Packages/com.unity.render-pipelines.core/Runtime/Debug/ProbeVolumeFragmentationDebug.shader
index a845ec3ed05..27f5b1d605c 100644
--- a/Packages/com.unity.render-pipelines.core/Runtime/Debug/ProbeVolumeFragmentationDebug.shader
+++ b/Packages/com.unity.render-pipelines.core/Runtime/Debug/ProbeVolumeFragmentationDebug.shader
@@ -14,7 +14,7 @@ Shader "Hidden/Core/ProbeVolumeFragmentationDebug"
             #pragma editor_sync_compilation
             #pragma target 4.5
             #pragma only_renderers d3d11 playstation xboxone xboxseries vulkan metal switch switch2
-            // #pragma enable_d3d11_debug_symbols
+            // #pragma enable_debug_symbols
 
             #pragma vertex Vert
             #pragma fragment Frag
diff --git a/Packages/com.unity.render-pipelines.core/Runtime/Debug/ProbeVolumeSamplingDebug.shader b/Packages/com.unity.render-pipelines.core/Runtime/Debug/ProbeVolumeSamplingDebug.shader
index dc1395e9a07..2a2b3267a62 100644
--- a/Packages/com.unity.render-pipelines.core/Runtime/Debug/ProbeVolumeSamplingDebug.shader
+++ b/Packages/com.unity.render-pipelines.core/Runtime/Debug/ProbeVolumeSamplingDebug.shader
@@ -11,7 +11,7 @@ Shader "Hidden/Core/ProbeVolumeSamplingDebug"
         #pragma target 4.5
         #pragma only_renderers d3d11 playstation xboxone xboxseries vulkan metal switch switch2
         #pragma multi_compile_fragment _ PROBE_VOLUMES_L1 PROBE_VOLUMES_L2
-        //#pragma enable_d3d11_debug_symbols
+        //#pragma enable_debug_symbols
 
         #include "Packages/com.unity.render-pipelines.core/ShaderLibrary/EntityLighting.hlsl"
         #include "Packages/com.unity.render-pipelines.core/Runtime/Debug/ProbeVolumeDebugBase.hlsl"
diff --git a/Packages/com.unity.render-pipelines.core/Runtime/Debugging/DebugDisplaySettingsUI.cs b/Packages/com.unity.render-pipelines.core/Runtime/Debugging/DebugDisplaySettingsUI.cs
index f7fd9098d8e..6216867ad25 100644
--- a/Packages/com.unity.render-pipelines.core/Runtime/Debugging/DebugDisplaySettingsUI.cs
+++ b/Packages/com.unity.render-pipelines.core/Runtime/Debugging/DebugDisplaySettingsUI.cs
@@ -32,42 +32,55 @@ private void Reset()
         /// <param name="settings"><see cref="IDebugDisplaySettings"/> to be registered</param>
         public void RegisterDebug(IDebugDisplaySettings settings)
         {
-            DebugManager debugManager = DebugManager.instance;
-            List<IDebugDisplaySettingsPanelDisposable> panels = new List<IDebugDisplaySettingsPanelDisposable>();
-
-            debugManager.RegisterData(this);
-
+            DebugManager.instance.RegisterData(this);
             m_Settings = settings;
-            m_DisposablePanels = panels;
-
             m_Settings.Add(new DebugDisplaySettingsRenderGraph());
 
-            Action<IDebugDisplaySettingsData> onExecute = (data) =>
+            // Don't initialize the UI immediately to avoid unnecessary work at pipeline init time. Instaed,
+            // initialize UI when any debug UI is opened (or if the editor window is already open)
+            DebugManager.windowStateChanged += DebugUIOpened;
+            if (DebugManager.instance.isAnyDebugUIActive)
+                InitializeDebugUI();
+        }
+
+        void DebugUIOpened(DebugManager.UIMode uiMode, bool isOpen)
+        {
+            InitializeDebugUI();
+        }
+
+        internal void InitializeDebugUI()
+        {
+            if (m_DisposablePanels == null)
             {
-                IDebugDisplaySettingsPanelDisposable disposableSettingsPanel = data.CreatePanel();
+                var panels = new List<IDebugDisplaySettingsPanelDisposable>();
 
-                DebugUI.Widget[] panelWidgets = disposableSettingsPanel.Widgets;
+                Action<IDebugDisplaySettingsData> onExecute = (data) =>
+                {
+                    IDebugDisplaySettingsPanelDisposable disposableSettingsPanel = data.CreatePanel();
 
-                DebugUI.Panel panel = debugManager.GetPanel(
-                    displayName: disposableSettingsPanel.PanelName,
-                    createIfNull: true,
-                    groupIndex: (disposableSettingsPanel is DebugDisplaySettingsPanel debugDisplaySettingsPanel) ? debugDisplaySettingsPanel.Order : 0);
-#if UNITY_EDITOR
+                    DebugUI.Widget[] panelWidgets = disposableSettingsPanel.Widgets;
 
-                if (DocumentationUtils.TryGetHelpURL(disposableSettingsPanel.GetType(), out var documentationUrl))
-                    panel.documentationUrl = documentationUrl;
+                    DebugUI.Panel panel = DebugManager.instance.GetPanel(
+                        displayName: disposableSettingsPanel.PanelName,
+                        createIfNull: true,
+                        groupIndex: (disposableSettingsPanel is DebugDisplaySettingsPanel debugDisplaySettingsPanel) ? debugDisplaySettingsPanel.Order : 0);
+#if UNITY_EDITOR
+                    if (DocumentationUtils.TryGetHelpURL(disposableSettingsPanel.GetType(), out var documentationUrl))
+                        panel.documentationUrl = documentationUrl;
 #endif
 
-                ObservableList<DebugUI.Widget> panelChildren = panel.children;
+                    ObservableList<DebugUI.Widget> panelChildren = panel.children;
 
-                panel.flags = disposableSettingsPanel.Flags;
-                panels.Add(disposableSettingsPanel);
-                panelChildren.Add(panelWidgets);
-            };
+                    panel.flags = disposableSettingsPanel.Flags;
+                    panels.Add(disposableSettingsPanel);
+                    panelChildren.Add(panelWidgets);
+                };
 
-            m_Settings.ForEach(onExecute);
+                m_Settings.ForEach(onExecute);
+                m_DisposablePanels = panels;
 
-            DebugDisplaySerializer.LoadFoldoutStates();
+                DebugDisplaySerializer.LoadFoldoutStates();
+            }
         }
 
         /// <summary>
@@ -96,6 +109,8 @@ public void UnregisterDebug()
             }
 
             debugManager.UnregisterData(this);
+
+            DebugManager.windowStateChanged -= DebugUIOpened;
         }
 
         #region IDebugData
diff --git a/Packages/com.unity.render-pipelines.core/Runtime/Debugging/DebugManager.Input.cs b/Packages/com.unity.render-pipelines.core/Runtime/Debugging/DebugManager.Input.cs
index f69c81c8836..d10ba23c3ed 100644
--- a/Packages/com.unity.render-pipelines.core/Runtime/Debugging/DebugManager.Input.cs
+++ b/Packages/com.unity.render-pipelines.core/Runtime/Debugging/DebugManager.Input.cs
@@ -23,24 +23,25 @@ public sealed partial class DebugManager
 #if USE_INPUT_SYSTEM
         const string k_AnyTouch = "Any Touch";
 
-        readonly InputActionMap m_DebugActionMap = new InputActionMap("Debug Menu");
+        readonly InputActionMap m_DebugMenuEnableActions = new InputActionMap("Debug Menu Enable Actions");
+        readonly InputActionMap m_DebugMenuActions = new InputActionMap("Debug Menu Actions");
         InputAction m_MultiplierAction;
 
         internal void EnableInputCallbacks()
         {
-            m_DebugActionMap.Enable();
+            m_DebugMenuEnableActions.Enable();
         }
 
         internal void DisableInputCallbacks()
         {
-            m_DebugActionMap.Disable();
+            m_DebugMenuEnableActions.Disable();
         }
 
         void ToggleRuntimeUI() => displayRuntimeUI = !displayRuntimeUI;
 
         void RegisterDebugInputs()
         {
-            var enableAction = m_DebugActionMap.AddAction(k_EnableDebug, type: InputActionType.Button);
+            var enableAction = m_DebugMenuEnableActions.AddAction(k_EnableDebug, type: InputActionType.Button);
             enableAction.AddCompositeBinding("ButtonWithOneModifier")
                 .With("Modifier", "<Gamepad>/rightStickPress")
                 .With("Button", "<Gamepad>/leftStickPress")
@@ -48,7 +49,7 @@ void RegisterDebugInputs()
                 .With("Button", "<Keyboard>/backspace");
             enableAction.performed += _ => ToggleRuntimeUI();
 
-            var anyTouchAction = m_DebugActionMap.AddAction(k_AnyTouch, type: InputActionType.Button);
+            var anyTouchAction = m_DebugMenuEnableActions.AddAction(k_AnyTouch, type: InputActionType.Button);
             anyTouchAction.AddBinding("<Touchscreen>/touch2/tap"); // touch2 means "third finger"
             anyTouchAction.performed += ctx =>
             {
@@ -63,7 +64,7 @@ void RegisterDebugInputs()
             };
 
 #if ENABLE_RENDERING_DEBUGGER_UI
-            var resetAction = m_DebugActionMap.AddAction(k_ResetBtn, type: InputActionType.Button);
+            var resetAction = m_DebugMenuActions.AddAction(k_ResetBtn, type: InputActionType.Button);
             resetAction.AddCompositeBinding("ButtonWithOneModifier")
                 .With("Modifier", "<Gamepad>/rightStickPress")
                 .With("Button", "<Gamepad>/b")
@@ -71,26 +72,26 @@ void RegisterDebugInputs()
                 .With("Button", "<Keyboard>/backspace");
             resetAction.performed += _ => { Reset(); };
 
-            var next = m_DebugActionMap.AddAction(k_DebugNextBtn, type: InputActionType.Button);
+            var next = m_DebugMenuActions.AddAction(k_DebugNextBtn, type: InputActionType.Button);
             next.AddBinding("<Keyboard>/pageDown");
             next.AddBinding("<Gamepad>/rightShoulder");
             next.performed += _ => { m_RuntimeDebugWindow.SelectNextPanel(); };
 
-            var previous = m_DebugActionMap.AddAction(k_DebugPreviousBtn, type: InputActionType.Button);
+            var previous = m_DebugMenuActions.AddAction(k_DebugPreviousBtn, type: InputActionType.Button);
             previous.AddBinding("<Keyboard>/pageUp");
             previous.AddBinding("<Gamepad>/leftShoulder");
             previous.performed += _ => { m_RuntimeDebugWindow.SelectPreviousPanel(); };
 
-            var persistentAction = m_DebugActionMap.AddAction(k_PersistentBtn, type: InputActionType.Button);
+            var persistentAction = m_DebugMenuActions.AddAction(k_PersistentBtn, type: InputActionType.Button);
             persistentAction.AddBinding("<Keyboard>/rightShift");
             persistentAction.AddBinding("<Gamepad>/x");
             persistentAction.performed += _ => { TogglePersistent(); };
 
-            m_MultiplierAction = m_DebugActionMap.AddAction(k_MultiplierBtn, type: InputActionType.Value);
+            m_MultiplierAction = m_DebugMenuActions.AddAction(k_MultiplierBtn, type: InputActionType.Value);
             m_MultiplierAction.AddBinding("<Keyboard>/leftShift");
             m_MultiplierAction.AddBinding("<Gamepad>/y");
 
-            var moveHorizontalAction = m_DebugActionMap.AddAction(k_DPadHorizontal);
+            var moveHorizontalAction = m_DebugMenuActions.AddAction(k_DPadHorizontal);
             moveHorizontalAction.AddCompositeBinding("1DAxis")
                 .With("Positive", "<Gamepad>/dpad/right")
                 .With("Negative", "<Gamepad>/dpad/left")
@@ -102,11 +103,11 @@ void RegisterDebugInputs()
                 bool increment = ctx.ReadValue<float>() > 0.0f;
                 if (increment)
                 {
-                    selectedWidget.OnIncrement(multiplierPressed);
+                    selectedWidget?.OnIncrement(multiplierPressed);
                 }
                 else
                 {
-                    selectedWidget.OnDecrement(multiplierPressed);
+                    selectedWidget?.OnDecrement(multiplierPressed);
                 }
             };
 #endif
diff --git a/Packages/com.unity.render-pipelines.core/Runtime/Debugging/DebugManager.UIState.cs b/Packages/com.unity.render-pipelines.core/Runtime/Debugging/DebugManager.UIState.cs
index 1214c4385b6..f0d30531a58 100644
--- a/Packages/com.unity.render-pipelines.core/Runtime/Debugging/DebugManager.UIState.cs
+++ b/Packages/com.unity.render-pipelines.core/Runtime/Debugging/DebugManager.UIState.cs
@@ -1,6 +1,9 @@
 #if ENABLE_UIELEMENTS_MODULE && (UNITY_EDITOR || DEVELOPMENT_BUILD)
 #define ENABLE_RENDERING_DEBUGGER_UI
 #endif
+#if ENABLE_INPUT_SYSTEM && ENABLE_INPUT_SYSTEM_PACKAGE
+#define USE_INPUT_SYSTEM
+#endif
 
 using System;
 
@@ -33,8 +36,8 @@ class UIState
         {
             public UIMode mode;
 
-            [SerializeField]
-            private bool m_Open;
+            bool m_Open;
+
             public bool open
             {
                 get => m_Open;
@@ -50,18 +53,18 @@ public bool open
             }
         }
 
-        private UIState editorUIState = new UIState() { mode = UIMode.EditorMode };
+        readonly UIState m_EditorUIState = new UIState() { mode = UIMode.EditorMode };
 
         /// <summary>
         /// Is the debug editor window open.
         /// </summary>
         public bool displayEditorUI
         {
-            get => editorUIState.open;
-            set => editorUIState.open = value;
+            get => m_EditorUIState.open;
+            set => m_EditorUIState.open = value;
         }
 
-        private bool m_EnableRuntimeUI = true;
+        bool m_EnableRuntimeUI = true;
 
         /// <summary>
         /// Controls whether runtime UI can be enabled. When this is set to false, there will be no overhead
@@ -80,7 +83,7 @@ public bool enableRuntimeUI
             }
         }
 
-        private UIState runtimeUIState = new UIState() { mode = UIMode.RuntimeMode };
+        readonly UIState m_RuntimeUIState = new UIState() { mode = UIMode.RuntimeMode };
 
         /// <summary>
         /// Displays the runtime version of the debug window.
@@ -99,6 +102,9 @@ public bool displayRuntimeUI
                         m_RuntimeDebugWindow = go.AddComponent<RuntimeDebugWindow>();
                         go.SetActive(true);
                     }
+#if USE_INPUT_SYSTEM
+                    m_DebugMenuActions.Enable();
+#endif
                 }
                 else
                 {
@@ -107,11 +113,14 @@ public bool displayRuntimeUI
                         CoreUtils.Destroy(m_RuntimeDebugWindow.gameObject);
                         m_RuntimeDebugWindow = null;
                     }
+#if USE_INPUT_SYSTEM
+                    m_DebugMenuActions.Disable();
+#endif
                 }
 
                 onDisplayRuntimeUIChanged(value);
 
-                runtimeUIState.open = m_RuntimeDebugWindow != null && m_RuntimeDebugWindow.gameObject.activeInHierarchy;
+                m_RuntimeUIState.open = m_RuntimeDebugWindow != null && m_RuntimeDebugWindow.gameObject.activeInHierarchy;
             }
 #else
             get => false;
diff --git a/Packages/com.unity.render-pipelines.core/Runtime/Debugging/DebugUI.Containers.cs b/Packages/com.unity.render-pipelines.core/Runtime/Debugging/DebugUI.Containers.cs
index 94afe08d2fc..9120f02952c 100644
--- a/Packages/com.unity.render-pipelines.core/Runtime/Debugging/DebugUI.Containers.cs
+++ b/Packages/com.unity.render-pipelines.core/Runtime/Debugging/DebugUI.Containers.cs
@@ -31,6 +31,7 @@ protected override VisualElement Create()
                 {
                     var label = new Label(displayName);
                     label.AddToClassList("debug-window-container-displayname");
+                    label.AddToClassList("debug-window-search-filter-target");
                     container.Add(label);
                 }
 
@@ -246,6 +247,7 @@ protected override VisualElement Create()
 
                 // Add special classes for styles
                 container.AddToClassList("debug-window-foldout");
+                container.Q(className: "unity-foldout__text").AddToClassList("debug-window-search-filter-target");
 
                 // Update UI to match object's initial state
                 container.SetValueWithoutNotify(GetValue());
@@ -595,7 +597,10 @@ protected override VisualElement Create()
                                 if (i == 0)
                                     child.style.display = displayRowNames ? DisplayStyle.Flex : DisplayStyle.None;
                                 else
+                                {
                                     child.style.width = width;
+                                    child.style.display = DisplayStyle.Flex;
+                                }
                                 ++i;
                             }
                         }
@@ -629,6 +634,7 @@ protected override VisualElement Create()
 
                     var label = new Label(displayName) { style = { width = ValueTuple.GetLabelWidth(m_Context) }, };
                     label.AddToClassList("debug-window-table-row-displayname");
+                    label.AddToClassList("debug-window-search-filter-target");
                     rowContainer.Add(label);
 
                     foreach (var c in children)
diff --git a/Packages/com.unity.render-pipelines.core/Runtime/Debugging/DebugUI.FieldUtils.cs b/Packages/com.unity.render-pipelines.core/Runtime/Debugging/DebugUI.FieldUtils.cs
index fcd2e6de075..ba5450913bc 100644
--- a/Packages/com.unity.render-pipelines.core/Runtime/Debugging/DebugUI.FieldUtils.cs
+++ b/Packages/com.unity.render-pipelines.core/Runtime/Debugging/DebugUI.FieldUtils.cs
@@ -19,6 +19,7 @@ internal static void ConfigureBaseField<T>(Field<T> widget, UIElements.BaseField
                 field.label = widget.displayName;
                 field.style.flexGrow = 0f;
                 field.AddToClassList($"debug-window-basefield_{typeof(T).Name.ToLower()}");
+                field.labelElement.AddToClassList("debug-window-search-filter-target");
 
                 field.RegisterCallback<ChangeEvent<T>>(evt => widget.SetValue(evt.newValue));
 
diff --git a/Packages/com.unity.render-pipelines.core/Runtime/Debugging/DebugUI.Fields.cs b/Packages/com.unity.render-pipelines.core/Runtime/Debugging/DebugUI.Fields.cs
index f1d0a7950aa..654fb1b7e92 100644
--- a/Packages/com.unity.render-pipelines.core/Runtime/Debugging/DebugUI.Fields.cs
+++ b/Packages/com.unity.render-pipelines.core/Runtime/Debugging/DebugUI.Fields.cs
@@ -193,10 +193,12 @@ protected override VisualElement Create()
             {
                 var valueContainer = new UIElements.VisualElement();
                 valueContainer.AddToClassList("debug-window-historyboolfield");
-                valueContainer.Add(new Label(displayName)
+                var label = new Label(displayName)
                 {
                     style = { width = ValueTuple.GetLabelWidth(m_Context) }
-                });
+                };
+                label.AddToClassList("debug-window-search-filter-target");
+                valueContainer.Add(label);
 
                 var boolField = new DebugUI.BoolField()
                 {
@@ -583,6 +585,7 @@ private int maxRenderingLayerCount
             protected override VisualElement Create()
             {
                 var maskField = new UIElements.MaskField(displayName, new List<string>(m_RenderingLayersNames), 0);
+                maskField.labelElement.AddToClassList("debug-window-search-filter-target");
                 maskField.RegisterCallback<ChangeEvent<int>>(evt =>
                 {
                     SetValue(evt.newValue);
@@ -733,6 +736,7 @@ protected override VisualElement Create()
                     choices = enumNames.Select(e => e.text).ToList()
                 };
                 field.AddToClassList("debug-window-enumfield");
+                field.labelElement.AddToClassList("debug-window-search-filter-target");
                 field.AddToClassList(UIElements.BaseField<int>.alignedFieldUssClassName);
 
                 this.ScheduleTracked(field, () => field.schedule.Execute(() =>
@@ -749,6 +753,8 @@ protected override VisualElement Create()
                     }
                 }).Every(100));
 
+                m_AdditionalSearchText = string.Join(",", field.choices);
+
                 return field;
             }
 #endif
@@ -850,6 +856,7 @@ protected override VisualElement Create()
                     choices = enumNames.Select(e => e.text).ToList()
                 };
                 field.AddToClassList("debug-window-enumfield");
+                field.labelElement.AddToClassList("debug-window-search-filter-target");
                 field.AddToClassList(UIElements.BaseField<int>.alignedFieldUssClassName);
 
                 HackPopupHoverColor(field, m_Context);
@@ -872,6 +879,8 @@ protected override VisualElement Create()
                         field.SetValueWithoutNotify(enumNames[currentIndex].text);
                 }).Every(100));
 
+                m_AdditionalSearchText = string.Join(",", field.choices);
+
                 return field;
             }
 #endif
@@ -990,6 +999,7 @@ protected override VisualElement Create()
                 };
 
                 field.AddToClassList("debug-window-objectpopupfield");
+                field.labelElement.AddToClassList("debug-window-search-filter-target");
                 HackPopupHoverColor(field, m_Context);
 
                 field.RegisterCallback<ChangeEvent<UnityEngine.Object>>(evt =>
@@ -1080,10 +1090,13 @@ protected override VisualElement Create()
             {
                 var valueContainer = new UIElements.VisualElement();
                 valueContainer.AddToClassList("debug-window-historyenum");
-                valueContainer.Add(new Label(displayName)
+
+                var label = new Label(displayName)
                 {
                     style = { width = ValueTuple.GetLabelWidth(m_Context) }
-                });
+                };
+                label.AddToClassList("debug-window-search-filter-target");
+                valueContainer.Add(label);
 
                 var enumField = new DebugUI.EnumField()
                 {
@@ -1116,6 +1129,8 @@ protected override VisualElement Create()
                     field.SetEnabled(false);
                     valueContainer.Add(field);
                 }
+                var enumNameStrings = enumNames.Select(e => e.text).ToList();
+                m_AdditionalSearchText = string.Join(",", enumNameStrings);
 
                 return valueContainer;
             }
@@ -1154,8 +1169,10 @@ public class BitField : EnumField<Enum>
             /// <inheritdoc/>
             protected override VisualElement Create()
             {
-                var maskField = new UIElements.MaskField(displayName, enumNames.Select(e => e.text).ToList(), 0);
+                var enumNameStrings = enumNames.Select(e => e.text).ToList();
+                var maskField = new UIElements.MaskField(displayName, enumNameStrings, 0);
                 maskField.AddToClassList("debug-window-bitfield");
+                maskField.labelElement.AddToClassList("debug-window-search-filter-target");
                 HackPopupHoverColor(maskField, m_Context);
 
                 maskField.RegisterCallback<ChangeEvent<int>>(evt =>
@@ -1172,6 +1189,9 @@ protected override VisualElement Create()
                 .Every(100));
 
                 maskField.AddToClassList(UIElements.BaseField<int>.alignedFieldUssClassName);
+
+                m_AdditionalSearchText = string.Join(",", enumNameStrings);
+
                 return maskField;
             }
 #endif
@@ -1295,6 +1315,7 @@ protected override VisualElement Create()
                 if (field != null)
                 {
                     field.AddToClassList("debug-window-colorfield");
+                    field.labelElement.AddToClassList("debug-window-search-filter-target");
                     field.AddToClassList(UIElements.BaseField<Color>.alignedFieldUssClassName);
                     field.RegisterCallback<ChangeEvent<Color>>(evt => SetValue(evt.newValue));
                     this.ScheduleTracked(field, () => field.schedule.Execute(() =>
@@ -1700,6 +1721,7 @@ protected override VisualElement Create()
                 }
 
                 field.AddToClassList("debug-window-objectfield");
+                field.labelElement.AddToClassList("debug-window-search-filter-target");
                 field.AddToClassList(UIElements.BaseField<Object>.alignedFieldUssClassName);
                 field.RegisterCallback<ChangeEvent<Object>>(evt => SetValue(evt.newValue));
                 this.ScheduleTracked(field, () => field.schedule.Execute(() =>
@@ -1732,6 +1754,7 @@ protected override VisualElement Create()
                     text = displayName
                 };
                 container.AddToClassList("debug-window-objectlistfield");
+                container.Q(className: "unity-foldout__text").AddToClassList("debug-window-search-filter-target");
 
                 // TODO: Allow selection
                 foreach (var o in GetValue())
@@ -1760,6 +1783,7 @@ protected override VisualElement Create()
             {
                 var helpBox = new HelpBox(displayName, (HelpBoxMessageType)style);
                 helpBox.text = message;
+                helpBox.Q(className: "unity-help-box__label").AddToClassList("debug-window-search-filter-target");
                 helpBox.AddToClassList("debug-window-messagebox");
 
                 if (messageCallback != null)
diff --git a/Packages/com.unity.render-pipelines.core/Runtime/Debugging/DebugUI.Panel.cs b/Packages/com.unity.render-pipelines.core/Runtime/Debugging/DebugUI.Panel.cs
index c23bb6ff8d7..f3d85d97b6c 100644
--- a/Packages/com.unity.render-pipelines.core/Runtime/Debugging/DebugUI.Panel.cs
+++ b/Packages/com.unity.render-pipelines.core/Runtime/Debugging/DebugUI.Panel.cs
@@ -31,6 +31,7 @@ public VisualElement Create(DebugUI.Context context)
 
                 var label = container.Q<Label>(className:"unity-group-box__label");
                 label.AddToClassList("debug-window-header-title");
+                label.AddToClassList("debug-window-search-filter-target");
                 container.AddToClassList("debug-window-tab-content");
                 container.AddToClassList("unity-inspector-element");
 
diff --git a/Packages/com.unity.render-pipelines.core/Runtime/Debugging/DebugUI.cs b/Packages/com.unity.render-pipelines.core/Runtime/Debugging/DebugUI.cs
index 79c602d286c..8ffc3f27344 100644
--- a/Packages/com.unity.render-pipelines.core/Runtime/Debugging/DebugUI.cs
+++ b/Packages/com.unity.render-pipelines.core/Runtime/Debugging/DebugUI.cs
@@ -218,12 +218,23 @@ public virtual Panel panel
             /// </summary>
             internal bool keepLayoutWhenHidden { private get; set; }
 
+            internal bool m_IsHiddenBySearchFilter;
+
+            internal string m_AdditionalSearchText = string.Empty;
+
             protected internal bool m_RequiresLegacyStateHandling = false;
 
             void UpdateElementVisibility()
             {
+                if (m_IsHiddenBySearchFilter)
+                {
+                    m_VisualElement.style.display = DisplayStyle.None;
+                    return;
+                }
+
                 if (keepLayoutWhenHidden)
                 {
+                    m_VisualElement.style.display = DisplayStyle.Flex;
                     m_VisualElement.style.visibility = isHidden ? Visibility.Hidden : Visibility.Visible;
                 }
                 else
@@ -550,6 +561,7 @@ protected override VisualElement Create()
                     text = displayName
                 };
                 button.AddToClassList("debug-window-button");
+                button.AddToClassList("debug-window-search-filter-target");
                 button.clicked += () => action();
                 return button;
             }
@@ -580,6 +592,7 @@ protected override VisualElement Create()
 
                 var nameLabel = new Label() { text = displayName };
                 nameLabel.AddToClassList("debug-window-value-name");
+                nameLabel.AddToClassList("debug-window-search-filter-target");
 
                 var valueLabel = new Label() { text = FormatString(GetValue()) };
                 valueLabel.AddToClassList("debug-window-value-value");
@@ -737,6 +750,7 @@ protected override VisualElement Create()
                 valueContainer.AddToClassList("debug-window-valuetuple");
 
                 var label = new Label(displayName) { style = { minWidth = ValueTuple.GetLabelWidth(m_Context) }, };
+                label.AddToClassList("debug-window-search-filter-target");
 
                 if (isHeader)
                     label.style.unityFontStyleAndWeight = FontStyle.Bold;
diff --git a/Packages/com.unity.render-pipelines.core/Runtime/Debugging/RuntimeDebugWindow.cs b/Packages/com.unity.render-pipelines.core/Runtime/Debugging/RuntimeDebugWindow.cs
index 3dc42d6b0c6..fd7d4c934ab 100644
--- a/Packages/com.unity.render-pipelines.core/Runtime/Debugging/RuntimeDebugWindow.cs
+++ b/Packages/com.unity.render-pipelines.core/Runtime/Debugging/RuntimeDebugWindow.cs
@@ -116,6 +116,8 @@ void OnDestroy()
             // Need to unregister here as well because when the UI is closed and reopened, it is a different object so the member
             // function will be a different object and the Unregister call in RecreateGUI does nothing.
             m_PanelRootElement.UnregisterCallback<NavigationMoveEvent>(ConvertNavigationMoveEvents, TrickleDown.TrickleDown);
+
+            DebugManager.instance.displayRuntimeUI = false;
         }
 
         void ConvertNavigationMoveEvents(NavigationMoveEvent evt)
diff --git a/Packages/com.unity.render-pipelines.core/Runtime/Deprecated.cs b/Packages/com.unity.render-pipelines.core/Runtime/Deprecated.cs
index 13f35093f16..5375653abfe 100644
--- a/Packages/com.unity.render-pipelines.core/Runtime/Deprecated.cs
+++ b/Packages/com.unity.render-pipelines.core/Runtime/Deprecated.cs
@@ -101,7 +101,7 @@ public sealed partial class DebugManager
         /// </summary>
         /// <param name="open">State of the debug window.</param>
         [Obsolete("Use DebugManager.instance.displayEditorUI property instead. #from(2023.1)")]
-        public void ToggleEditorUI(bool open) => editorUIState.open = open;
+        public void ToggleEditorUI(bool open) => m_EditorUIState.open = open;
 
         /// <summary>
         /// Get hashcode state of the Debug Window.
diff --git a/Packages/com.unity.render-pipelines.core/Runtime/Lighting/ProbeVolume/ProbeReferenceVolume.Debug.cs b/Packages/com.unity.render-pipelines.core/Runtime/Lighting/ProbeVolume/ProbeReferenceVolume.Debug.cs
index 7c7b09e7ee5..99ffcf56b71 100644
--- a/Packages/com.unity.render-pipelines.core/Runtime/Lighting/ProbeVolume/ProbeReferenceVolume.Debug.cs
+++ b/Packages/com.unity.render-pipelines.core/Runtime/Lighting/ProbeVolume/ProbeReferenceVolume.Debug.cs
@@ -1,3 +1,7 @@
+#if DEVELOPMENT_BUILD || UNITY_EDITOR
+#define PROBEREFERENCEVOLUME_DEBUG
+#endif
+
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -261,6 +265,7 @@ public void RenderDebug(Camera camera, Texture exposureTexture)
         /// <param name="exposureTexture">Texture containing the exposure value for this frame.</param>
         public void RenderDebug(Camera camera, ProbeVolumesOptions options, Texture exposureTexture)
         {
+#if PROBEREFERENCEVOLUME_DEBUG
             if (camera.cameraType != CameraType.Reflection && camera.cameraType != CameraType.Preview)
             {
                 if (options != null)
@@ -268,6 +273,7 @@ public void RenderDebug(Camera camera, ProbeVolumesOptions options, Texture expo
 
                 DrawProbeDebug(camera, exposureTexture);
             }
+#endif
         }
 
         /// <summary>
@@ -360,6 +366,7 @@ static void SceneGUI(SceneView sceneView)
         }
 #endif
 
+#if PROBEREFERENCEVOLUME_DEBUG
         bool TryCreateDebugRenderData()
         {
             if (!GraphicsSettings.TryGetRenderPipelineSettings<ProbeVolumeDebugResources>(out var debugResources))
@@ -436,11 +443,6 @@ void CleanupDebug()
 #endif
         }
 
-        void DebugCellIndexChanged<T>(DebugUI.Field<T> field, T value)
-        {
-            ClearDebugData();
-        }
-
         void RegisterDebug()
         {
             void RefreshDebug<T>(DebugUI.Field<T> field, T value)
@@ -807,6 +809,8 @@ void UnregisterDebug(bool destroyPanel)
                 DebugManager.instance.GetPanel(k_DebugPanelName, false).children.Remove(m_DebugItems);
         }
 
+#endif // PROBEREFERENCEVOLUME_DEBUG
+
         class RenderFragmentationOverlayPassData
         {
             public Material debugFragmentationMaterial;
@@ -856,6 +860,7 @@ public void RenderFragmentationOverlay(RenderGraph renderGraph, TextureHandle co
             }
         }
 
+#if PROBEREFERENCEVOLUME_DEBUG
         bool ShouldCullCell(Vector3 cellPosition, Transform cameraTransform, Plane[] frustumPlanes)
         {
             var volumeAABB = GetCellBounds(cellPosition);
@@ -1056,7 +1061,7 @@ void DrawProbeDebug(Camera camera, Texture exposureTexture)
                         var probeBuffer = debug.probeBuffers[i];
                         m_DebugMaterial.SetInt("_DebugProbeVolumeSampling", 0);
                         m_DebugMaterial.SetBuffer("_positionNormalBuffer", probeSamplingDebugData.positionNormalBuffer);
-                        Graphics.DrawMeshInstanced(debugMesh, 0, m_DebugMaterial, probeBuffer, probeBuffer.Length, props, ShadowCastingMode.Off, false, 0, camera, LightProbeUsage.Off, null);
+                        Graphics.DrawMeshInstanced(debugMesh, 0, m_DebugMaterial, probeBuffer, probeBuffer.Length, props, ShadowCastingMode.Off, false, 0, camera, LightProbeUsage.Off);
                     }
 
                     if (probeVolumeDebug.drawProbeSamplingDebug)
@@ -1068,7 +1073,7 @@ void DrawProbeDebug(Camera camera, Texture exposureTexture)
                         props.SetInt("_DebugSamplingNoise", Convert.ToInt32(probeVolumeDebug.debugWithSamplingNoise));
                         props.SetInt("_RenderingLayerMask", (int)probeVolumeDebug.samplingRenderingLayer);
                         m_ProbeSamplingDebugMaterial02.SetBuffer("_positionNormalBuffer", probeSamplingDebugData.positionNormalBuffer);
-                        Graphics.DrawMeshInstanced(debugMesh, 0, m_ProbeSamplingDebugMaterial02, probeBuffer, probeBuffer.Length, props, ShadowCastingMode.Off, false, 0, camera, LightProbeUsage.Off, null);
+                        Graphics.DrawMeshInstanced(debugMesh, 0, m_ProbeSamplingDebugMaterial02, probeBuffer, probeBuffer.Length, props, ShadowCastingMode.Off, false, 0, camera, LightProbeUsage.Off);
                     }
 
                     if (probeVolumeDebug.drawVirtualOffsetPush)
@@ -1077,11 +1082,12 @@ void DrawProbeDebug(Camera camera, Texture exposureTexture)
                         m_DebugOffsetMaterial.SetInt("_AdjustmentVolumeCount", probeVolumeDebug.isolationProbeDebug ? adjustmentVolumeCount : 0);
 
                         var offsetBuffer = debug.offsetBuffers[i];
-                        Graphics.DrawMeshInstanced(m_DebugOffsetMesh, 0, m_DebugOffsetMaterial, offsetBuffer, offsetBuffer.Length, props, ShadowCastingMode.Off, false, 0, camera, LightProbeUsage.Off, null);
+                        Graphics.DrawMeshInstanced(m_DebugOffsetMesh, 0, m_DebugOffsetMaterial, offsetBuffer, offsetBuffer.Length, props, ShadowCastingMode.Off, false, 0, camera, LightProbeUsage.Off);
                     }
                 }
             }
         }
+#endif // PROBEREFERENCEVOLUME_DEBUG
 
         internal void ResetDebugViewToMaxSubdiv()
         {
diff --git a/Packages/com.unity.render-pipelines.core/Runtime/Lighting/ProbeVolume/ProbeReferenceVolume.cs b/Packages/com.unity.render-pipelines.core/Runtime/Lighting/ProbeVolume/ProbeReferenceVolume.cs
index 0110d89efeb..e56392a58b0 100644
--- a/Packages/com.unity.render-pipelines.core/Runtime/Lighting/ProbeVolume/ProbeReferenceVolume.cs
+++ b/Packages/com.unity.render-pipelines.core/Runtime/Lighting/ProbeVolume/ProbeReferenceVolume.cs
@@ -1,3 +1,7 @@
+#if DEVELOPMENT_BUILD || UNITY_EDITOR
+#define PROBEREFERENCEVOLUME_DEBUG
+#endif
+
 using System;
 using System.Diagnostics;
 using System.Collections.Generic;
@@ -1045,7 +1049,9 @@ public void Initialize(in ProbeVolumeSystemParameters parameters)
             // For now this condition is redundant with m_SupportDiskStreaming but we plan to support disk streaming without compute in the future.
             // So we need to split the conditions to plan for that.
             m_DiskStreamingUseCompute = SystemInfo.supportsComputeShaders && streamingUploadCS != null && streamingUploadL2CS != null;
+#if PROBEREFERENCEVOLUME_DEBUG
             InitializeDebug();
+#endif
             ProbeVolumeConstantRuntimeResources.Initialize();
             ProbeBrickPool.Initialize();
             ProbeBrickBlendingPool.Initialize();
@@ -1131,7 +1137,9 @@ public void Cleanup()
             }
 
             CleanupLoadedData();
+#if PROBEREFERENCEVOLUME_DEBUG
             CleanupDebug();
+#endif
             CleanupStreaming();
             DeinitProbeReferenceVolume();
             m_IsInitialized = false;
@@ -1675,13 +1683,14 @@ void InitProbeReferenceVolume()
 
                 m_NeedLoadAsset = true;
             }
-
+#if PROBEREFERENCEVOLUME_DEBUG
             // Refresh debug menu
             if (DebugManager.instance.GetPanel(k_DebugPanelName, false) != null)
             {
                 instance.UnregisterDebug(false);
                 instance.RegisterDebug();
             }
+#endif
         }
 
         ProbeReferenceVolume()
diff --git a/Packages/com.unity.render-pipelines.core/Runtime/Lighting/ProbeVolume/ProbeVolume.hlsl b/Packages/com.unity.render-pipelines.core/Runtime/Lighting/ProbeVolume/ProbeVolume.hlsl
index 0365e1fe724..e82cead81f1 100644
--- a/Packages/com.unity.render-pipelines.core/Runtime/Lighting/ProbeVolume/ProbeVolume.hlsl
+++ b/Packages/com.unity.render-pipelines.core/Runtime/Lighting/ProbeVolume/ProbeVolume.hlsl
@@ -77,13 +77,7 @@ struct APVResources
 
 struct APVResourcesRW
 {
-#ifdef SHADER_API_METAL
-    // We need to use float4 on Metal, since HLSLcc will generate invalid MSL otherwise.
-    // See https://jira.unity3d.com/browse/UUM-127198
-    RWTexture3D<float4> L0_L1Rx;
-#else
     RWTexture3D<half4> L0_L1Rx;
-#endif
     RWTexture3D<unorm float4> L1G_L1Ry;
     RWTexture3D<unorm float4> L1B_L1Rz;
     RWTexture3D<unorm float4> L2_0;
diff --git a/Packages/com.unity.render-pipelines.core/Runtime/Lighting/ProbeVolume/ProbeVolumeBlendStates.compute b/Packages/com.unity.render-pipelines.core/Runtime/Lighting/ProbeVolume/ProbeVolumeBlendStates.compute
index 75d333d3b4f..30f8252f1d0 100644
--- a/Packages/com.unity.render-pipelines.core/Runtime/Lighting/ProbeVolume/ProbeVolumeBlendStates.compute
+++ b/Packages/com.unity.render-pipelines.core/Runtime/Lighting/ProbeVolume/ProbeVolumeBlendStates.compute
@@ -15,13 +15,7 @@ Texture3D<float4> _State1_L0_L1Rx;
 Texture3D<float4> _State1_L1G_L1Ry;
 Texture3D<float4> _State1_L1B_L1Rz;
 
-#ifdef SHADER_API_METAL
-// We need to use float4 on Metal, since HLSLcc will generate invalid MSL otherwise.
-// See https://jira.unity3d.com/browse/UUM-127198
-RWTexture3D<float4> _Out_L0_L1Rx;
-#else
 RWTexture3D<half4> _Out_L0_L1Rx;
-#endif
 RWTexture3D<unorm float4> _Out_L1G_L1Ry;
 RWTexture3D<unorm float4> _Out_L1B_L1Rz;
 
diff --git a/Packages/com.unity.render-pipelines.core/Runtime/Lighting/ProbeVolume/ProbeVolumeUploadData.compute b/Packages/com.unity.render-pipelines.core/Runtime/Lighting/ProbeVolume/ProbeVolumeUploadData.compute
index e43d5d7767e..33418a71fe4 100644
--- a/Packages/com.unity.render-pipelines.core/Runtime/Lighting/ProbeVolume/ProbeVolumeUploadData.compute
+++ b/Packages/com.unity.render-pipelines.core/Runtime/Lighting/ProbeVolume/ProbeVolumeUploadData.compute
@@ -9,13 +9,7 @@
 #pragma multi_compile_local _ PROBE_VOLUMES_SKY_SHADING_DIRECTION
 #pragma multi_compile_local _ PROBE_VOLUMES_PROBE_OCCLUSION
 
-#ifdef SHADER_API_METAL
-// We need to use float4 on Metal, since HLSLcc will generate invalid MSL otherwise.
-// See https://jira.unity3d.com/browse/UUM-127198
-RWTexture3D<float4> _Out_L0_L1Rx;
-#else
 RWTexture3D<half4> _Out_L0_L1Rx;
-#endif
 RWTexture3D<unorm float4> _Out_L1G_L1Ry;
 RWTexture3D<unorm float4> _Out_L1B_L1Rz;
 
diff --git a/Packages/com.unity.render-pipelines.core/Runtime/Lighting/SurfaceCache/Estimation.hlsl b/Packages/com.unity.render-pipelines.core/Runtime/Lighting/SurfaceCache/Estimation.hlsl
index 505a7850d0f..ffe7296f483 100644
--- a/Packages/com.unity.render-pipelines.core/Runtime/Lighting/SurfaceCache/Estimation.hlsl
+++ b/Packages/com.unity.render-pipelines.core/Runtime/Lighting/SurfaceCache/Estimation.hlsl
@@ -75,30 +75,29 @@ void ProcessAndStoreRadianceSample(RWStructuredBuffer<SphericalHarmonics::RGBL1>
     patchStatistics[patchIdx] = newStats;
 }
 
-void ProjectAndAccumulate(inout SphericalHarmonics::RGBL1 accumulator, float3 sample, float3 direction)
+void ProjectAndAccumulate(inout SphericalHarmonics::RGBL1 accumulator, float3 sampleRadiance, float3 sampleDirection)
 {
-    accumulator.l0 += sample * SphericalHarmonics::y0;
-    accumulator.l1s[0] += sample * SphericalHarmonics::y1Constant * direction.y;
-    accumulator.l1s[1] += sample * SphericalHarmonics::y1Constant * direction.z;
-    accumulator.l1s[2] += sample * SphericalHarmonics::y1Constant * direction.x;
+    accumulator.l0 += sampleRadiance * SphericalHarmonics::y0;
+    accumulator.l1s[0] += sampleRadiance * SphericalHarmonics::y1Constant * sampleDirection.y;
+    accumulator.l1s[1] += sampleRadiance * SphericalHarmonics::y1Constant * sampleDirection.z;
+    accumulator.l1s[2] += sampleRadiance * SphericalHarmonics::y1Constant * sampleDirection.x;
 }
 
 void SamplePunctualLightBounceRadiance(
     inout QrngKronecker2D rng,
-    uint patchIdx,
     UnifiedRT::RayTracingAccelStruct accelStruct,
     UnifiedRT::DispatchInfo dispatchInfo,
     PatchUtil::PatchGeometry patchGeo,
     inout SphericalHarmonics::RGBL1 accumulator,
     inout bool gotValidSamples)
 {
-    rng.Init(patchIdx, _FrameIdx * _SampleCount);
     SphericalHarmonics::RGBL1 radianceAccumulator = (SphericalHarmonics::RGBL1)0;
 
     uint validSampleCount = 0;
     for(uint sampleIdx = 0; sampleIdx < _SampleCount; ++sampleIdx)
     {
-        PunctualLightBounceRadianceSample sample = SamplePunctualLightBounceRadiance(
+        // Using `sample` as a variable name causes compilation errors on PS5.
+        PunctualLightBounceRadianceSample sample_ = SamplePunctualLightBounceRadiance(
             dispatchInfo,
             accelStruct,
             _PunctualLightSamples,
@@ -107,11 +106,11 @@ void SamplePunctualLightBounceRadiance(
             patchGeo.position,
             patchGeo.normal);
 
-        if (!sample.IsValid())
+        if (!sample_.IsValid())
             continue;
 
         validSampleCount++;
-        ProjectAndAccumulate(radianceAccumulator, sample.radianceOverDensity, sample.direction);
+        ProjectAndAccumulate(radianceAccumulator, sample_.radianceOverDensity, sample_.direction);
 
         rng.NextSample();
     }
@@ -126,7 +125,6 @@ void SamplePunctualLightBounceRadiance(
 
 void SampleEnvironmentAndDirectionalBounceAndMultiBounceRadiance(
     inout QrngKronecker2D rng,
-    uint patchIdx,
     UnifiedRT::RayTracingAccelStruct accelStruct,
     UnifiedRT::DispatchInfo dispatchInfo,
     MaterialPoolParamSet matPoolParams,
@@ -134,8 +132,6 @@ void SampleEnvironmentAndDirectionalBounceAndMultiBounceRadiance(
     inout SphericalHarmonics::RGBL1 accumulator,
     inout bool gotValidSamples)
 {
-    rng.Init(patchIdx, _FrameIdx * _SampleCount);
-
     UnifiedRT::Ray ray;
     ray.origin = OffsetRayOrigin(patchGeo.position, patchGeo.normal);
     ray.tMin = 0;
@@ -209,9 +205,12 @@ void Estimate(UnifiedRT::DispatchInfo dispatchInfo)
     SphericalHarmonics::RGBL1 radianceSampleMean = (SphericalHarmonics::RGBL1)0;
     bool gotValidSamples = false;
 
+    const uint patchIdxHash = LowBiasHash32(patchIdx);
+    const uint sampleOffset = _FrameIdx * _SampleCount;
+
+    rng.Init(patchIdxHash, sampleOffset);
     SampleEnvironmentAndDirectionalBounceAndMultiBounceRadiance(
         rng,
-        patchIdx,
         accelStruct,
         dispatchInfo,
         matPoolParams,
@@ -221,9 +220,9 @@ void Estimate(UnifiedRT::DispatchInfo dispatchInfo)
 
     if (_PunctualLightCount != 0)
     {
+        rng.Init(patchIdxHash, sampleOffset);
         SamplePunctualLightBounceRadiance(
             rng,
-            patchIdx,
             accelStruct,
             dispatchInfo,
             patchGeo,
diff --git a/Packages/com.unity.render-pipelines.core/Runtime/PathTracing/BakeLightmapDriver.cs b/Packages/com.unity.render-pipelines.core/Runtime/PathTracing/BakeLightmapDriver.cs
index a72ab26ebce..ed23964ed80 100644
--- a/Packages/com.unity.render-pipelines.core/Runtime/PathTracing/BakeLightmapDriver.cs
+++ b/Packages/com.unity.render-pipelines.core/Runtime/PathTracing/BakeLightmapDriver.cs
@@ -253,7 +253,7 @@ internal static uint AccumulateLightmapInstance(
                     string sampleOutput = new("");
                     foreach (var sample in uvSampleData)
                         sampleOutput += string.Format(System.Globalization.CultureInfo.InvariantCulture, "float2({0}, {1})\n", sample.x, sample.y);
-                    
+
                     System.Console.WriteLine(sampleOutput);
                 }
 
@@ -332,6 +332,7 @@ internal static uint AccumulateLightmapInstance(
                             instance.ReceiveShadows,
                             lightmapBakeSettings.PushOff,
                             lightmapBakeSettings.DirectLightingEvaluationCount,
+                            (uint)lightmappingContext.World.PathTracingWorld.MaxLightsInAnyCell,
                             newChunkStarted
                         );
                         break;
@@ -384,7 +385,6 @@ internal static uint AccumulateLightmapInstance(
                             lightmappingContext.IntegratorContext.CompactedGBufferLength,
                             instance.ReceiveShadows,
                             lightmapBakeSettings.PushOff,
-                            lightmapBakeSettings.DirectLightingEvaluationCount,
                             newChunkStarted
                         );
                         break;
diff --git a/Packages/com.unity.render-pipelines.core/Runtime/PathTracing/Environment/CubemapRender.cs b/Packages/com.unity.render-pipelines.core/Runtime/PathTracing/Environment/CubemapRender.cs
index 293fe19145d..6e59d8f8ec2 100644
--- a/Packages/com.unity.render-pipelines.core/Runtime/PathTracing/Environment/CubemapRender.cs
+++ b/Packages/com.unity.render-pipelines.core/Runtime/PathTracing/Environment/CubemapRender.cs
@@ -18,6 +18,8 @@ internal enum Mode
         }
 
         private Material _material;
+        private Shader _lastUsedShader;
+        private LocalKeyword? _noSunKeyword;
         private Color _color = Color.black;
         private readonly Mesh _skyboxMesh;
         private readonly Mesh _sixFaceSkyboxMesh;
@@ -140,11 +142,6 @@ private void RenderWithMaterial(CommandBuffer cmd, Light sun, int cubemapResolut
         {
             EnsureCubemapExistsWithParticularResolution(cubemapResolution);
 
-            // We don't want to render  a (procedural) sun in our skybox for path tracing as it's already sampled as direct light
-            bool isSunDisabled = _material.IsKeywordEnabled("_SUNDISK_NONE");
-            if (!isSunDisabled)
-                _material.EnableKeyword("_SUNDISK_NONE");
-
             var properties = new MaterialPropertyBlock();
             if (sun != null)
             {
@@ -157,6 +154,16 @@ private void RenderWithMaterial(CommandBuffer cmd, Light sun, int cubemapResolut
                 properties.SetVector(Shader.PropertyToID("_WorldSpaceLightPos0"), new Vector4(0, 0, -1, 0));
             }
 
+            if (_lastUsedShader != _material.shader)
+            {
+                var keyword = _material.shader.keywordSpace.FindKeyword("_SUNDISK_NONE");
+                _noSunKeyword = keyword.isValid ? keyword : null;
+                _lastUsedShader = _material.shader;
+            }
+
+            if (_noSunKeyword.HasValue)
+                cmd.EnableKeyword(_material, _noSunKeyword.Value);
+
             for (int faceIndex = 0; faceIndex < 6; ++faceIndex)
             {
                 var viewMatrix = _cubemapFaceBases[faceIndex];
@@ -186,8 +193,8 @@ private void RenderWithMaterial(CommandBuffer cmd, Light sun, int cubemapResolut
 #endif
             }
 
-            if (!isSunDisabled)
-                _material.DisableKeyword("_SUNDISK_NONE");
+            if (_noSunKeyword.HasValue)
+                cmd.DisableKeyword(_material, _noSunKeyword.Value);
         }
 
         private void EnsureCubemapExistsWithParticularResolution(int resolution)
diff --git a/Packages/com.unity.render-pipelines.core/Runtime/PathTracing/LightmapIntegration.cs b/Packages/com.unity.render-pipelines.core/Runtime/PathTracing/LightmapIntegration.cs
index c08a922417e..4fe13bde428 100644
--- a/Packages/com.unity.render-pipelines.core/Runtime/PathTracing/LightmapIntegration.cs
+++ b/Packages/com.unity.render-pipelines.core/Runtime/PathTracing/LightmapIntegration.cs
@@ -58,6 +58,7 @@ internal static class LightmapIntegratorShaderIDs
         public static readonly int ExpandedSampleCountInW = Shader.PropertyToID("g_ExpandedSampleCountInW");
         public static readonly int ExpandedTexelSampleWidth = Shader.PropertyToID("g_ExpandedTexelSampleWidth");
         public static readonly int MaxLocalSampleCount = Shader.PropertyToID("g_MaxLocalSampleCount");
+        public static readonly int LightIndexInCell = Shader.PropertyToID("g_LightIndexInCell");
         public static readonly int SourceBuffer = Shader.PropertyToID("g_SourceBuffer");
         public static readonly int SourceLength = Shader.PropertyToID("g_SourceLength");
         public static readonly int SourceStride = Shader.PropertyToID("g_SourceStride");
@@ -153,7 +154,8 @@ public void Accumulate(
             GraphicsBuffer compactedGbufferLength,
             bool receiveShadows,
             float pushOff,
-            uint lightEvaluationsPerBounce,
+            uint risCandidateCount,
+            uint maxLightsInAnyCell,
             bool newChunkStarted)
         {
             bool doDirectional = expandedDirectional != null;
@@ -167,7 +169,7 @@ public void Accumulate(
             // path tracing inputs
             bool preExpose = false;
             float environmentIntensityMultiplier = 1.0f;
-            Util.BindPathTracingInputs(cmd, _accumulationShader, false, lightEvaluationsPerBounce, preExpose, 0, environmentIntensityMultiplier, RenderedGameObjectsFilter.OnlyStatic, _samplingResources, _emptyTexture);
+            Util.BindPathTracingInputs(cmd, _accumulationShader, false, risCandidateCount, preExpose, 0, environmentIntensityMultiplier, RenderedGameObjectsFilter.OnlyStatic, _samplingResources, _emptyTexture);
             Util.BindWorld(cmd, _accumulationShader, world);
 
             var requiredSizeInBytes = _accumulationShader.GetTraceScratchBufferRequiredSizeInBytes((uint)expandedOutput.count, 1, 1);
@@ -205,9 +207,15 @@ public void Accumulate(
             {
                 _accumulationShader.SetIntParam(cmd, LightmapIntegratorShaderIDs.SampleOffset, (int)currentSampleCountPerTexel);
                 _accumulationShader.SetIntParam(cmd, LightmapIntegratorShaderIDs.MaxLocalSampleCount, (int)sampleCountToTakePerTexel);
-                cmd.BeginSample("Accumulation (Expanded)");
-                _accumulationShader.Dispatch(cmd, traceScratchBuffer, _accumulationDispatchBuffer);
-                cmd.EndSample("Accumulation (Expanded)");
+
+                uint loopCount = maxLightsInAnyCell;
+                for (int lightIndexInCell = 0; lightIndexInCell < loopCount; ++lightIndexInCell)
+                {
+                    _accumulationShader.SetIntParam(cmd, LightmapIntegratorShaderIDs.LightIndexInCell, lightIndexInCell);
+                    cmd.BeginSample("Accumulation (Expanded)");
+                    _accumulationShader.Dispatch(cmd, traceScratchBuffer, _accumulationDispatchBuffer);
+                    cmd.EndSample("Accumulation (Expanded)");
+                }
             }
         }
 
@@ -293,7 +301,7 @@ public void Accumulate(
             GraphicsBuffer compactedTexelIndices,
             GraphicsBuffer compactedGbufferLength,
             float pushOff,
-            uint lightEvaluationsPerBounce,
+            uint risCandidateCount,
             bool newChunkStarted)
         {
             bool doDirectional = expandedDirectional != null;
@@ -307,7 +315,7 @@ public void Accumulate(
             // path tracing inputs
             bool preExpose = false;
             float environmentIntensityMultiplier = 1.0f;
-            Util.BindPathTracingInputs(cmd, _accumulationShader, _countNEERayAsPathSegment, lightEvaluationsPerBounce, preExpose, (int)bounceCount, environmentIntensityMultiplier, RenderedGameObjectsFilter.OnlyStatic, _samplingResources, _emptyTexture);
+            Util.BindPathTracingInputs(cmd, _accumulationShader, _countNEERayAsPathSegment, risCandidateCount, preExpose, (int)bounceCount, environmentIntensityMultiplier, RenderedGameObjectsFilter.OnlyStatic, _samplingResources, _emptyTexture);
             Util.BindWorld(cmd, _accumulationShader, world);
 
             var requiredSizeInBytes = _accumulationShader.GetTraceScratchBufferRequiredSizeInBytes((uint)expandedOutput.count, 1, 1);
@@ -652,7 +660,6 @@ public void Accumulate(
             GraphicsBuffer compactedGbufferLength,
             bool receiveShadows,
             float pushOff,
-            uint lightEvaluationsPerBounce,
             bool newChunkStarted)
         {
             int instanceWidth = instanceTexelSize.x;
@@ -665,7 +672,7 @@ public void Accumulate(
             // path tracing inputs
             bool preExpose = false;
             float environmentIntensityMultiplier = 1.0f;
-            Util.BindPathTracingInputs(cmd, _accumulationShader, false, lightEvaluationsPerBounce, preExpose, 0, environmentIntensityMultiplier, RenderedGameObjectsFilter.OnlyStatic, _samplingResources, _emptyTexture);
+            Util.BindPathTracingInputs(cmd, _accumulationShader, false, 1, preExpose, 0, environmentIntensityMultiplier, RenderedGameObjectsFilter.OnlyStatic, _samplingResources, _emptyTexture);
             Util.BindWorld(cmd, _accumulationShader, world);
 
             var requiredSizeInBytes = _accumulationShader.GetTraceScratchBufferRequiredSizeInBytes((uint)expandedOutput.count, 1, 1);
diff --git a/Packages/com.unity.render-pipelines.core/Runtime/PathTracing/LightmappingContext.cs b/Packages/com.unity.render-pipelines.core/Runtime/PathTracing/LightmappingContext.cs
index 5520402012f..491011d463f 100644
--- a/Packages/com.unity.render-pipelines.core/Runtime/PathTracing/LightmappingContext.cs
+++ b/Packages/com.unity.render-pipelines.core/Runtime/PathTracing/LightmappingContext.cs
@@ -130,7 +130,7 @@ internal bool InitializeExpandedBuffer(UInt64 expandedSize)
             return true;
         }
 
-        internal bool Initialize(UnityComputeDeviceContext deviceContext, int width, int height, UnityComputeWorld world, uint maxIndexCount, LightmapResourceLibrary resources)
+        internal bool Initialize(UnityComputeDeviceContext deviceContext, int width, int height, UnityComputeWorld world, uint maxIndexCount, uint maxVertexCount, LightmapResourceLibrary resources)
         {
             _deviceContext = deviceContext;
             World = world;
@@ -138,7 +138,7 @@ internal bool Initialize(UnityComputeDeviceContext deviceContext, int width, int
             ResourceCache = new LightmapIntegrationResourceCache();
 
             ChartRasterizer = new ChartRasterizer(resources.SoftwareChartRasterizationShader, resources.HardwareChartRasterizationShader);
-            InitializeChartRasterizationBuffers(maxIndexCount);
+            InitializeChartRasterizationBuffers(maxIndexCount, maxVertexCount);
 
             return SetOutputResolution(width, height);
         }
@@ -189,7 +189,7 @@ public void InitializeTraceScratchBuffer(uint width, uint height, uint expandedS
             }
         }
 
-        private void InitializeChartRasterizationBuffers(uint maxIndexCount)
+        private void InitializeChartRasterizationBuffers(uint maxIndexCount, uint maxVertexCount)
         {
             ChartRasterizerBuffers.vertex?.Dispose();
             ChartRasterizerBuffers.vertex = null;
@@ -198,10 +198,11 @@ private void InitializeChartRasterizationBuffers(uint maxIndexCount)
             ChartRasterizerBuffers.vertexToChartID?.Dispose();
             ChartRasterizerBuffers.vertexToChartID = null;
 
-            // We base the size of the temporary buffers on the triangle count of the mesh with the most triangles, to avoid constant reallocations.
-            ChartRasterizerBuffers.vertex = new GraphicsBuffer(GraphicsBuffer.Target.Structured, (int)maxIndexCount, UnsafeUtility.SizeOf<Vector2>());
-            ChartRasterizerBuffers.vertexToOriginalVertex = new GraphicsBuffer(GraphicsBuffer.Target.Structured, (int)maxIndexCount, sizeof(uint));
-            ChartRasterizerBuffers.vertexToChartID = new GraphicsBuffer(GraphicsBuffer.Target.Structured, (int)maxIndexCount, sizeof(uint));
+            // We base the size of the temporary buffers on the vertex count or index count of the mesh with the most vertices / indices, to avoid constant reallocations.
+            uint maxCount = Math.Max(maxIndexCount, maxVertexCount);
+            ChartRasterizerBuffers.vertex = new GraphicsBuffer(GraphicsBuffer.Target.Structured, (int)maxCount, UnsafeUtility.SizeOf<Vector2>());
+            ChartRasterizerBuffers.vertexToOriginalVertex = new GraphicsBuffer(GraphicsBuffer.Target.Structured, (int)maxCount, sizeof(uint));
+            ChartRasterizerBuffers.vertexToChartID = new GraphicsBuffer(GraphicsBuffer.Target.Structured, (int)maxCount, sizeof(uint));
         }
 
         public CommandBuffer GetCommandBuffer()
diff --git a/Packages/com.unity.render-pipelines.core/Runtime/PathTracing/ManyLightSampling.cs b/Packages/com.unity.render-pipelines.core/Runtime/PathTracing/ManyLightSampling.cs
index bdbff7067bf..43dd4646fd5 100644
--- a/Packages/com.unity.render-pipelines.core/Runtime/PathTracing/ManyLightSampling.cs
+++ b/Packages/com.unity.render-pipelines.core/Runtime/PathTracing/ManyLightSampling.cs
@@ -57,6 +57,17 @@ public static Vector3Int ComputeLightGridDims(Vector3 sceneBounds, int maxLightG
             Debug.Assert(gridDims.x * gridDims.y * gridDims.z <= maxLightGridCellCount);
             return gridDims;
         }
+
+        public static int ComputeMaxLightsInAnyCell(int2[] grid, Vector3Int gridDims)
+        {
+            int maxLightsInAnyCell = 0;
+            for (int i = 0; i < gridDims.x * gridDims.y * gridDims.z; i++)
+            {
+                int lightCount = grid[i].y;
+                maxLightsInAnyCell = Math.Max(maxLightsInAnyCell, lightCount);
+            }
+            return maxLightsInAnyCell;
+        }
     }
 
 
@@ -67,6 +78,7 @@ internal class ConservativeLightGrid : IManyLightSampling
         public int MaxLightsPerCell = 64; // Only used with GridMemLayout.Dense
         public GridSizingStrategy LightGridSizingStrategy = GridSizingStrategy.FitToSceneBounds;
         public GridMemLayout GridMemLayout = GridMemLayout.Sparse;
+        public int MaxLightsInAnyCell => _maxLightsInAnyCell;
 
         public ConservativeLightGrid(ComputeShader shader)
         {
@@ -168,6 +180,11 @@ public void Build(CommandBuffer cmd, World.LightState lightState, Bounds sceneBo
             // Build the grid
             cmd.SetComputeBufferParam(_shader, _buildLightGridlKernel, ShaderProperties.LightGridCellsData, _lightGridCellsDataBuffer);
             DispatchBuild(cmd, 1);
+
+            GraphicsHelpers.Flush(cmd);
+            int2[] grid = new int2[_lightGridBuffer.count];
+            _lightGridBuffer.GetData(grid);
+            _maxLightsInAnyCell = LightGridUtils.ComputeMaxLightsInAnyCell(grid, _lightGridDims);
         }
 
         public void Bind(CommandBuffer cmd, IRayTracingShader shader)
@@ -226,6 +243,7 @@ void DispatchBuild(CommandBuffer cmd, int buildPass)
         Vector4 _cellSize;
         Vector4 _invCellSize;
         Vector3Int _lightGridDims;
+        int _maxLightsInAnyCell;
     }
 
     internal class RegirLightGrid : IManyLightSampling
@@ -235,6 +253,7 @@ internal class RegirLightGrid : IManyLightSampling
         public int MaxLightsPerCell = 64;
         public int NumCandidates = -1; // -1 means we iterate over all the lights
         public GridSizingStrategy LightGridSizingStrategy = GridSizingStrategy.Uniform;
+        public int MaxLightsInAnyCell => _maxLightsInAnyCell;
 
         public RegirLightGrid(ComputeShader shader)
         {
@@ -308,6 +327,11 @@ public void Build(CommandBuffer cmd, World.LightState lightState, Bounds sceneBo
                 GraphicsHelpers.DivUp(_lightGridDims.x, groupDim),
                 GraphicsHelpers.DivUp(_lightGridDims.y, groupDim),
                 GraphicsHelpers.DivUp(_lightGridDims.z, groupDim));
+
+            GraphicsHelpers.Flush(cmd);
+            int2[] grid = new int2[_lightGridBuffer.count];
+            _lightGridBuffer.GetData(grid);
+            _maxLightsInAnyCell = LightGridUtils.ComputeMaxLightsInAnyCell(grid, _lightGridDims);
         }
 
         public void Bind(CommandBuffer cmd, IRayTracingShader shader)
@@ -354,5 +378,6 @@ public void Dispose()
         Vector4 _cellSize;
         Vector4 _invCellSize;
         Vector3Int _lightGridDims;
+        int _maxLightsInAnyCell;
     }
 }
diff --git a/Packages/com.unity.render-pipelines.core/Runtime/PathTracing/PathTracingUtil.cs b/Packages/com.unity.render-pipelines.core/Runtime/PathTracing/PathTracingUtil.cs
index 549ce4de580..80b52051806 100644
--- a/Packages/com.unity.render-pipelines.core/Runtime/PathTracing/PathTracingUtil.cs
+++ b/Packages/com.unity.render-pipelines.core/Runtime/PathTracing/PathTracingUtil.cs
@@ -129,7 +129,7 @@ static internal void BindPathTracingInputs(
             CommandBuffer cmd,
             IRayTracingShader shader,
             bool countNEERayAsPathSegment,
-            uint lightEvaluationsPerBounce,
+            uint risCandidateCount,
             bool preExpose,
             int bounces,
             float environmentIntensityMultiplier,
@@ -137,7 +137,7 @@ static internal void BindPathTracingInputs(
             SamplingResources samplingResources,
             RTHandle emptyTexture)
         {
-            shader.SetIntParam(cmd, ShaderProperties.LightEvaluations, (int)lightEvaluationsPerBounce);
+            shader.SetIntParam(cmd, ShaderProperties.LightEvaluations, (int)risCandidateCount);
             shader.SetIntParam(cmd, ShaderProperties.PathtracerAsGiPreviewMode, 0);
             shader.SetIntParam(cmd, ShaderProperties.CountNEERayAsPathSegment, countNEERayAsPathSegment ? 1 : 0);
             shader.SetIntParam(cmd, ShaderProperties.RenderedInstances, (int)renderedGameObjectsFilter);
@@ -187,7 +187,7 @@ internal static bool IsCookieValid(uint cookieTextureIndex)
 
         internal static bool IsPunctualLightType(LightType lightType)
         {
-            return lightType == LightType.Directional || lightType == LightType.Spot || lightType == LightType.Point || lightType == LightType.Box;
+            return lightType == LightType.Directional || lightType == LightType.Spot || lightType == LightType.Point || lightType == LightType.Box || lightType == LightType.Pyramid;
         }
 
         // Our old baker, LightBaker, multiplied intensities of punctual lights by PI. This isn't quite correct, but it was never changed as it would be breaking.
diff --git a/Packages/com.unity.render-pipelines.core/Runtime/PathTracing/ProbeIntegrator.cs b/Packages/com.unity.render-pipelines.core/Runtime/PathTracing/ProbeIntegrator.cs
index 4f8b2f0b610..6c23fde3359 100644
--- a/Packages/com.unity.render-pipelines.core/Runtime/PathTracing/ProbeIntegrator.cs
+++ b/Packages/com.unity.render-pipelines.core/Runtime/PathTracing/ProbeIntegrator.cs
@@ -60,6 +60,7 @@ private static class ShaderProperties
             public static readonly int PerProbeLightIndices = Shader.PropertyToID("g_PerProbeLightIndices");
             public static readonly int PerProbeLightIndicesOffset = Shader.PropertyToID("g_PerProbeLightIndicesOffset");
             public static readonly int MaxLightsPerProbe = Shader.PropertyToID("g_MaxLightsPerProbe");
+            public static readonly int LightIndexInCell = Shader.PropertyToID("g_LightIndexInCell");
         }
 
         public ProbeIntegrator(bool countNEERayAsPathSegment)
@@ -104,7 +105,9 @@ private void DispatchRadianceEstimationKernel(
             uint bounceCount,
             uint sampleOffset,
             uint sampleCount,
-            uint lightEvaluationPerEvent,
+            uint risCandidateCount,
+            uint maxLightsInAnyCell,
+            bool roundRobin,
             float environmentIntensityMultiplier,
             GraphicsBuffer radianceShl2,
             uint radianceOffset,
@@ -115,7 +118,7 @@ private void DispatchRadianceEstimationKernel(
 
             // General path tracing parameters
             bool preExpose = false;
-            Util.BindPathTracingInputs(cmd, shader, _countNEERayAsPathSegment, lightEvaluationPerEvent, preExpose, (int)bounceCount, environmentIntensityMultiplier, RenderedGameObjectsFilter.OnlyStatic, _samplingResources, _emptyExposureTexture);
+            Util.BindPathTracingInputs(cmd, shader, _countNEERayAsPathSegment, risCandidateCount, preExpose, (int)bounceCount, environmentIntensityMultiplier, RenderedGameObjectsFilter.OnlyStatic, _samplingResources, _emptyExposureTexture);
             Util.BindWorld(cmd, shader, world);
 
             // Zero initialize the output buffer
@@ -123,7 +126,7 @@ private void DispatchRadianceEstimationKernel(
             cmd.SetBufferData(radianceShl2, new float[positionCount * floatsPerSH]);
 
             DispatchProbeKernel(cmd, shader, positionOffset, positionCount, sampleOffset, sampleCount, floatsPerSH, ShaderProperties.RadianceShl2, radianceShl2, radianceOffset, expansionBuffer, reductionBuffer,
-                bounceCount);
+                bounceCount, roundRobin, maxLightsInAnyCell);
         }
 
         private void DispatchProbeKernel(
@@ -139,7 +142,9 @@ private void DispatchProbeKernel(
             uint outputOffset,
             GraphicsBuffer expansionBuffer,
             GraphicsBuffer reductionBuffer,
-            uint bounceCount)
+            uint bounceCount,
+            bool roundRobin,
+            uint maxLightsInAnyCell)
         {
             // Set constant kernel parameters
             shader.SetBufferParam(cmd, ShaderProperties.Positions, _positionsBuffer);
@@ -166,7 +171,13 @@ private void DispatchProbeKernel(
                     // Calculate as many samples as possible given the budget
                     uint probesToDispatch = Math.Min(maxProbesPerDispatch, positionCount - probeOffset);
                     uint samplesToDispatch = probesToDispatch * sampleCount;
-                    shader.Dispatch(cmd, _traceScratchBuffer, samplesToDispatch, 1, 1);
+
+                    uint loopCount = roundRobin ? maxLightsInAnyCell : 1;
+                    for (int lightIndexInCell = 0; lightIndexInCell < loopCount; ++lightIndexInCell)
+                    {
+                        shader.SetIntParam(cmd, ShaderProperties.LightIndexInCell, lightIndexInCell);
+                        shader.Dispatch(cmd, _traceScratchBuffer, samplesToDispatch, 1, 1);
+                    }
 
                     // Perform reduction of each probes samples
                     _resourceLibrary.GatherKernel.TwoPassSegmentedReduction(
@@ -201,7 +212,8 @@ internal void EstimateIndirectRadianceShl2(
             uint bounceCount,
             uint sampleOffset,
             uint sampleCount,
-            uint lightEvaluationsPerBounce,
+            uint risCandidateCount,
+            uint maxLightsInAnyCell,
             bool ignoreEnvironment,
             GraphicsBuffer radianceShl2,
             uint radianceOffset,
@@ -209,7 +221,7 @@ internal void EstimateIndirectRadianceShl2(
             GraphicsBuffer reductionBuffer)
         {
             float environmentIntensityMultiplier = ignoreEnvironment ? 0.0f : 1.0f;
-            DispatchRadianceEstimationKernel(cmd, _resourceLibrary.IndirectShader, world, positionOffset, positionCount, bounceCount, sampleOffset, sampleCount, lightEvaluationsPerBounce, environmentIntensityMultiplier, radianceShl2, radianceOffset, expansionBuffer, reductionBuffer);
+            DispatchRadianceEstimationKernel(cmd, _resourceLibrary.IndirectShader, world, positionOffset, positionCount, bounceCount, sampleOffset, sampleCount, risCandidateCount, maxLightsInAnyCell, false, environmentIntensityMultiplier, radianceShl2, radianceOffset, expansionBuffer, reductionBuffer);
         }
 
         internal void EstimateDirectRadianceShl2(
@@ -219,7 +231,8 @@ internal void EstimateDirectRadianceShl2(
             uint positionCount,
             uint sampleOffset,
             uint sampleCount,
-            uint lightEvaluationsPerBounce,
+            uint risCandidateCount,
+            uint maxLightsInAnyCell,
             bool ignoreEnvironment,
             GraphicsBuffer radianceShl2,
             uint radianceOffset,
@@ -227,7 +240,7 @@ internal void EstimateDirectRadianceShl2(
             GraphicsBuffer reductionBuffer)
         {
             float environmentIntensityMultiplier = ignoreEnvironment ? 0.0f : 1.0f;
-            DispatchRadianceEstimationKernel(cmd, _resourceLibrary.DirectShader, world, positionOffset, positionCount, 0, sampleOffset, sampleCount, lightEvaluationsPerBounce, environmentIntensityMultiplier, radianceShl2, radianceOffset, expansionBuffer, reductionBuffer);
+            DispatchRadianceEstimationKernel(cmd, _resourceLibrary.DirectShader, world, positionOffset, positionCount, 0, sampleOffset, sampleCount, risCandidateCount, maxLightsInAnyCell, true, environmentIntensityMultiplier, radianceShl2, radianceOffset, expansionBuffer, reductionBuffer);
         }
 
         internal void EstimateValidity(
@@ -250,7 +263,7 @@ internal void EstimateValidity(
             SamplingResources.Bind(cmd, _samplingResources);
 
             DispatchProbeKernel(cmd, validityShader, positionOffset, positionCount, sampleOffset, sampleCount, 1, ShaderProperties.Validity, validity, validityOffset, expansionBuffer, reductionBuffer,
-                0);
+                0, false, 0);
         }
 
         internal void EstimateLightOcclusion(
@@ -279,7 +292,7 @@ internal void EstimateLightOcclusion(
             occlusionShader.SetIntParam(cmd, ShaderProperties.MaxLightsPerProbe, (int)maxLightsPerProbe);
 
             DispatchProbeKernel(cmd, occlusionShader, positionOffset, positionCount, sampleOffset, sampleCount, maxLightsPerProbe, ShaderProperties.Occlusion, occlusion, occlusionOffset, expansionBuffer, reductionBuffer,
-                0);
+                0, false, 0);
         }
 
         private void ReleaseExistingAllocations()
diff --git a/Packages/com.unity.render-pipelines.core/Runtime/PathTracing/Shaders/BuildLightGrid.compute b/Packages/com.unity.render-pipelines.core/Runtime/PathTracing/Shaders/BuildLightGrid.compute
index 1459450a124..9021a676c44 100644
--- a/Packages/com.unity.render-pipelines.core/Runtime/PathTracing/Shaders/BuildLightGrid.compute
+++ b/Packages/com.unity.render-pipelines.core/Runtime/PathTracing/Shaders/BuildLightGrid.compute
@@ -1,7 +1,7 @@
 #pragma only_renderers d3d11 vulkan metal glcore
 #pragma multi_compile _ SPARSE_GRID
-
 #include "Packages/com.unity.render-pipelines.core/ShaderLibrary/Common.hlsl"
+#include "Packages/com.unity.render-pipelines.core/ShaderLibrary/GeometricTools.hlsl"
 #include "Packages/com.unity.render-pipelines.core/ShaderLibrary/CommonLighting.hlsl"
 
 #include "PathTracingCommon.hlsl"
@@ -39,88 +39,109 @@ RWStructuredBuffer<ThinReservoir>   g_LightGridCellsData;
 RWStructuredBuffer<uint2>           g_LightGrid;
 RWStructuredBuffer<uint>            g_TotalLightsInGridCount;
 
-// Source: https://bartwronski.com/2017/04/13/cull-that-cone/
-bool TestConeVsSphere(in float3 origin, in float3 forward, in float size, in float angle, in float4 testSphere)
+float4 PlaneFromNormalAndPosition(float3 normal, float3 pos)
 {
-    const float3 V = testSphere.xyz - origin;
-    const float VlenSq = dot(V, V);
-    const float V1len = dot(V, forward);
-    const float distanceClosestPoint = cos(angle) * sqrt(VlenSq - V1len * V1len) - V1len * sin(angle);
-
-    const bool angleCull = distanceClosestPoint > testSphere.w;
-    const bool frontCull = V1len > testSphere.w + size;
-    const bool backCull = V1len < -testSphere.w;
-    return !(angleCull || frontCull || backCull);
+    return float4(normal, -dot(normal, pos));
+}
+
+void GetBoxLightFrustumPlanes(float3 lightOrigin, float3 lightBasisX, float3 lightBasisY, float3 lightBasisZ, float halfSizeX, float halfSizeY, float range, out float4 frustumPlanes[6])
+{
+    // sides along X
+    frustumPlanes[0] = PlaneFromNormalAndPosition(-lightBasisX, lightOrigin + lightBasisX * halfSizeX);
+    frustumPlanes[1] = PlaneFromNormalAndPosition(lightBasisX, lightOrigin - lightBasisX * halfSizeX);
+    // sides along Y
+    frustumPlanes[2] = PlaneFromNormalAndPosition(-lightBasisY, lightOrigin + lightBasisY * halfSizeY);
+    frustumPlanes[3] = PlaneFromNormalAndPosition(lightBasisY, lightOrigin - lightBasisY * halfSizeY);
+    // sides along Z
+    frustumPlanes[4] = PlaneFromNormalAndPosition(lightBasisZ, lightOrigin);
+    frustumPlanes[5] = PlaneFromNormalAndPosition(-lightBasisZ, lightOrigin + lightBasisZ * range);
+}
+
+void GetPyramidLightFrustumPlanes(float3 lightOrigin, float3 lightBasisX, float3 lightBasisY, float3 lightBasisZ, float halfSizeX, float halfSizeY, float range, out float4 frustumPlanes[6])
+{
+    float2 nX = normalize(float2(1.0, halfSizeX));
+    float2 nY = normalize(float2(1.0, halfSizeY));
+
+    // the plane's normals point towards the interior of the frustum
+
+    // Pyramid sides along X
+    frustumPlanes[0] = PlaneFromNormalAndPosition(nX.y * lightBasisZ + nX.x * lightBasisX, lightOrigin);
+    frustumPlanes[1] = PlaneFromNormalAndPosition(nX.y * lightBasisZ - nX.x * lightBasisX, lightOrigin);
+    // Pyramid sides along Y
+    frustumPlanes[2] = PlaneFromNormalAndPosition(nY.y * lightBasisZ + nY.x * lightBasisY, lightOrigin);
+    frustumPlanes[3] = PlaneFromNormalAndPosition(nY.y * lightBasisZ - nY.x * lightBasisY, lightOrigin);
+    // Pyramid near and far planes
+    frustumPlanes[4] = PlaneFromNormalAndPosition(lightBasisZ, lightOrigin);
+    frustumPlanes[5] = PlaneFromNormalAndPosition(-lightBasisZ, lightOrigin + lightBasisZ * range);
 }
 
 // Estimate the maximum emission in a voxel / Target function for RIS
 float3 EstimateEmission(PTLight light, float3 worldPosition)
 {
-    const float Deg2Rad = PI * 2.0f / 360.0f;
-    float3 emission = float3(1.0f, 1.0f, 1.0f);
-
-    if (light.type == DIRECTIONAL_LIGHT)
-        // Directional lights affect all cells
-        emission = light.intensity;
-    else if (light.type == ENVIRONMENT_LIGHT)
-         // Environment light affects all cells
-         // For conservtive culling, returning any positive value is enough, but for ReGIR we can improve the sampling with a better estimate
-        emission = float3(1.0f, 1.0f, 1.0f);
-    else if ((light.type == POINT_LIGHT) || (light.type == SPOT_LIGHT))
+    // Evaluate the light's distance attenuation
+    float distAttenuation = 1.0;
+    if (light.type != DIRECTIONAL_LIGHT && light.type != ENVIRONMENT_LIGHT && light.type != BOX_LIGHT && light.type != EMISSIVE_MESH)
     {
         // First compute the point light attenuation
         float d = length(light.position - worldPosition);
 
-        // To be conservative on the attenuation, we substruct the cell radius of the grid
-        d = max(0.01f, d - GetCellSize());
+        // To be conservative on the attenuation, we substruct the cell radius of the grid.
+        // We also substract the radius (of the bounding sphere) of the light
+        float r = 0.0f;
+        if (light.type == DISC_LIGHT)
+            r = light.width;
+        if (light.type == RECTANGULAR_LIGHT)
+            r = 0.5f * sqrt(light.width * light.width + light.height * light.height);
 
-        // Analytical range attenuation from SRP core
-        float attenuation = SmoothWindowedDistanceAttenuation(d * d, rcp(d), light.attenuation.x, light.attenuation.y);
+        // To be conservative on the attenuation, we substruct the cell radius of the grid
+        d = max(0.01f, d - GetCellSize() - r);
 
-        if (light.type == SPOT_LIGHT)
-        {
-            // For spotlights, we also do a conservative anglular atenuation: 0 if the spotlight cone does not intersect the voxel, 1 otherwise.
-            float4 bSphere = float4(worldPosition, 0.5 * GetCellSize());
-            bool intersection = TestConeVsSphere(light.position, light.forward, light.range, 0.5 * light.spotAngle.x * Deg2Rad, bSphere);
-            attenuation = intersection ? attenuation : 0.0f;
-        }
+        distAttenuation = SmoothWindowedDistanceAttenuation(d * d, rcp(d), light.attenuation.x, light.attenuation.y);
+    }
 
-        emission = attenuation * light.intensity;
+    // Evaluate the lights's emission + culling by light's bounding shape
+    const float Deg2Rad = PI * 2.0f / 360.0f;
+    float3 emission = float3(1.0f, 1.0f, 1.0f);
+    if (light.type == DIRECTIONAL_LIGHT || light.type == POINT_LIGHT)
+    {
+        emission = light.intensity;
     }
-    else if (light.type == RECTANGULAR_LIGHT || light.type == DISC_LIGHT)
+    else if (light.type == ENVIRONMENT_LIGHT || light.type == EMISSIVE_MESH)
     {
-         // First compute the point light attenuation
-        float d = length(light.position - worldPosition);
+        emission = float3(1.0f, 1.0f, 1.0f);
+    }
+    else if (light.type == BOX_LIGHT) // Frustum vs cell AABB culling
+    {
+        float4 frustumPlanes[6];
+        GetBoxLightFrustumPlanes(light.position, light.right, light.up, light.forward, 0.5 * light.width, 0.5 * light.height, light.range, frustumPlanes);
 
-        // To be conservative on the attenuation, we substruct the cell radius of the grid.
-        // We also substract the radius (of the bounding sphere) of the light
-        float r = light.type == DISC_LIGHT ? light.width : 0.5f * sqrt(light.width * light.width + light.height * light.height);
-        d = max(0.01f, d - GetCellSize() - r);
+        float3 aabbCenter = worldPosition;
+        float3 aabbExtent = 0.5 * GetCellSize();
+        bool intersection = IntersectFrustumPlanesAABB(frustumPlanes, aabbCenter, aabbExtent);
 
-        // Analytical range attenuation from SRP core
-        float attenuation = SmoothWindowedDistanceAttenuation(d * d, rcp(d), light.attenuation.x, light.attenuation.y);
+        emission = intersection ? light.intensity : 0.0f;
+    }
+    else if (light.type == PYRAMID_LIGHT) // Frustum vs cell AABB culling
+    {
+        float4 frustumPlanes[6];
+        GetPyramidLightFrustumPlanes(light.position, light.right, light.up, light.forward, 0.5 * light.width, 0.5 * light.height, light.range, frustumPlanes);
 
-        // The analytical lights are single sided. To properly do the conservative culling, we re-use the spotlight culling code
-        float4 bSphere = float4(worldPosition, 0.5 * GetCellSize());
-        const float angle = 0.5f * 180.0f * Deg2Rad;
-        bool intersection = TestConeVsSphere(light.position, light.forward, light.range, angle, bSphere);
-        attenuation = intersection ? attenuation : 0.0f;
+        float3 aabbCenter = worldPosition;
+        float3 aabbExtent = 0.5 * GetCellSize();
+        bool intersection = IntersectFrustumPlanesAABB(frustumPlanes, aabbCenter, aabbExtent);
 
-        emission = attenuation * light.intensity;
+        emission = intersection ? light.intensity : 0.0f;
     }
-    else if (light.type == BOX_LIGHT)
+    else // SPOT_LIGHT || RECTANGULAR_LIGHT || DISC_LIGHT (cone vs cell's bounding sphere culling)
     {
-        // For box ligths we only do some basic culling based on the bounding sphere of the cell and the near/far plane, reusing the existing code
-        // Note: box lights/projectors don't have range attenuation
+        float coneAngle = (light.type == SPOT_LIGHT) ? 0.5 * light.spotAngle.x * Deg2Rad : 0.5f * 180.0f * Deg2Rad;
         float4 bSphere = float4(worldPosition, 0.5 * GetCellSize());
-        const float angle = 0.5f * 180.0f * Deg2Rad;
-        bool intersection = TestConeVsSphere(light.position, light.forward, light.range, angle, bSphere);
-        float attenuation = intersection ? 1.0f : 0.0f;
+        bool intersection = IntersectSphericalConeWithSphere(light.position, light.forward, light.range, cos(coneAngle), sin(coneAngle), bSphere);
 
-        emission = attenuation * light.intensity;
+        emission = intersection ? light.intensity : 0.0f;
     }
 
-    return emission;
+    return distAttenuation * emission;
 }
 
 
diff --git a/Packages/com.unity.render-pipelines.core/Runtime/PathTracing/Shaders/LightSampling.hlsl b/Packages/com.unity.render-pipelines.core/Runtime/PathTracing/Shaders/LightSampling.hlsl
index d4029fc3d18..9ba5446dc29 100644
--- a/Packages/com.unity.render-pipelines.core/Runtime/PathTracing/Shaders/LightSampling.hlsl
+++ b/Packages/com.unity.render-pipelines.core/Runtime/PathTracing/Shaders/LightSampling.hlsl
@@ -4,6 +4,7 @@
 #include "PathTracingCommon.hlsl"
 #include "PathTracingMaterials.hlsl"
 #include "PathTracingLightGrid.hlsl"
+#include "Packages/com.unity.render-pipelines.core/Runtime/Sampling/PseudoRandom.hlsl"
 #include "Packages/com.unity.render-pipelines.core/ShaderLibrary/Common.hlsl"
 #include "Packages/com.unity.render-pipelines.core/ShaderLibrary/Sampling/Sampling.hlsl"
 #include "Packages/com.unity.render-pipelines.core/ShaderLibrary/CommonLighting.hlsl"
@@ -11,14 +12,9 @@
 #include "Packages/com.unity.render-pipelines.core/Runtime/PathTracing/Environment/EnvironmentImportanceSampling.hlsl"
 
 #define SOLID_ANGLE_SAMPLING
-#define RESAMPLED_IMPORTANCE_SAMPLING
 #define TRANSMISSION_IN_SHADOW_RAYS
 #define USE_DISTANCE_ATTENUATION_LUT
 
-#ifndef QRNG_METHOD_GLOBAL_SOBOL_BLUE_NOISE
-// Unless we use global sobol, stratification improves light selection
-#define STRATIFIED_LIGHT_PICKING
-#endif
 TextureCube<float4>             g_EnvTex;
 SamplerState                    sampler_g_EnvTex;
 float                           g_EnvIntensityMultiplier;
@@ -138,12 +134,10 @@ bool CastJitteredShadowRay(
     float distance,
     uint shadowRayMask,
     float2 uSample,
-    inout uint dimsUsed,
     out float3 attenuation)
 {
     if (shadowRadius > 0.0f)
     {
-        dimsUsed += 1;
         // jitter the light direction within the shadow radius
         direction = CalculateJitteredLightVec(shadowRadius, uSample, lightVector);
     }
@@ -161,12 +155,10 @@ struct SphQuad
     float S;
 };
 
-bool SampleRectangularLight(inout PathTracingSampler rngState, uint dimsOffset, out uint dimsUsed, float3 P, PTLight light, inout LightShapeSample lightSample)
+bool SampleRectangularLight(float2 rng, float3 P, PTLight light, inout LightShapeSample lightSample)
 {
-    float2 uv = rngState.GetSample2D(dimsOffset);
-    float u = uv.x;
-    float v = uv.y;
-    dimsUsed = 1;
+    float u = rng.x;
+    float v = rng.y;
 
 #ifndef SOLID_ANGLE_SAMPLING
     // Area sampling
@@ -301,12 +293,10 @@ bool SampleRectangularLight(inout PathTracingSampler rngState, uint dimsOffset,
 #endif
 }
 
-bool SampleDiscLight(inout PathTracingSampler rngState, uint dimsOffset, out uint dimsUsed, float3 P, PTLight light, inout LightShapeSample lightSample)
+bool SampleDiscLight(float2 rng, float3 P, PTLight light, inout LightShapeSample lightSample)
 {
-    float2 uv = rngState.GetSample2D(dimsOffset);
-    float u = uv.x;
-    float v = uv.y;
-    dimsUsed = 1;
+    float u = rng.x;
+    float v = rng.y;
 
     float2 coord = SampleDiskUniform(u, v);
     const float radius = light.width;
@@ -353,18 +343,14 @@ float2 MapUnitSquareToUnitTriangle(float2 unitSquareCoords)
     return unitSquareCoords;
 }
 
-bool SampleEmissiveMesh(StructuredBuffer<UnifiedRT::InstanceData> instanceList, inout PathTracingSampler rngState, uint dimsOffset, out uint dimsUsed, float3 P, PTLight light, inout LightShapeSample lightSample)
+bool SampleEmissiveMesh(StructuredBuffer<UnifiedRT::InstanceData> instanceList, float2 rand0, float2 rand1, float3 P, PTLight light, inout LightShapeSample lightSample)
 {
-    float2 r1 = rngState.GetSample2D(dimsOffset);
-    float r2 = rngState.GetSample1D(dimsOffset+1);
-    dimsUsed = 2;
-
     // random point in unit triangle
-    float2 samplePoint = MapUnitSquareToUnitTriangle(r1);
+    float2 samplePoint = MapUnitSquareToUnitTriangle(rand0);
 
     int instanceIndex = light.height;
     int numPrimitives = light.attenuation.x;
-    int primitiveIndex = (r2 * numPrimitives) % numPrimitives;
+    int primitiveIndex = (rand1.x * numPrimitives) % numPrimitives;
 
     // fetch the triangle vertices from the geometry pool
 
@@ -440,8 +426,32 @@ float2 PunctualLightCookieUVs(float3 L, PTLight light)
 
 bool SamplePunctualLight(float3 P, PTLight light, out LightShapeSample lightSample)
 {
-    lightSample.lightVector = light.type == DIRECTIONAL_LIGHT ? -light.forward : light.position - P;
-    lightSample.distanceToLight = light.type == DIRECTIONAL_LIGHT ? K_T_MAX : length(lightSample.lightVector);
+    if (light.type == DIRECTIONAL_LIGHT)
+    {
+        lightSample.lightVector = -light.forward ;
+        lightSample.distanceToLight = K_T_MAX;
+    }
+    else if (light.type != BOX_LIGHT) // SPOT_LIGHT or POINT_LIGHT
+    {
+        lightSample.lightVector = light.position - P;
+        lightSample.distanceToLight = length(lightSample.lightVector);
+    }
+    else // BOX_LIGHT
+    {
+        float distanceToLight = dot(-light.forward, light.position - P);
+        float3 v = light.position - P;
+
+        float x = abs(dot(v, light.right));
+        float y = abs(dot(v, light.up));
+        float2 sideLimits = float2(light.width, light.height) * 0.5;
+
+        if (distanceToLight < 0 || distanceToLight > light.range || x >= sideLimits.x || y >= sideLimits.y)
+            return false;
+
+        lightSample.lightVector = -light.forward * distanceToLight;
+        lightSample.distanceToLight = distanceToLight;
+    }
+
     lightSample.L = normalize(lightSample.lightVector);
     lightSample.weight = 1.0f;
     lightSample.materialIndex = -1;
@@ -456,15 +466,13 @@ bool SamplePunctualLight(float3 P, PTLight light, out LightShapeSample lightSamp
     return true;
 }
 
-bool SampleEnvironmentLight(inout PathTracingSampler rngState, uint dimsOffset, out uint dimsUsed, float3 P, PTLight light, out LightShapeSample lightSample)
+bool SampleEnvironmentLight(float2 rng, float3 P, PTLight light, out LightShapeSample lightSample)
 {
     lightSample = (LightShapeSample)0;
-    const float2 rand = rngState.GetSample2D(dimsOffset);
-    dimsUsed = 1;
 
 #ifdef UNIFORM_ENVSAMPLING
     // Sample the environment with a random direction. Should only be used for reference / ground truth.
-    lightSample.lightVector = SampleSphereUniform(rand.x, rand.y);
+    lightSample.lightVector = SampleSphereUniform(rng.x, rng.y);
     lightSample.weight = 4 * PI;
 #else
     float normalizationFactor = GetSkyPDFNormalizationFactor(_EnvironmentCdfMarginalBuffer);
@@ -476,7 +484,7 @@ bool SampleEnvironmentLight(inout PathTracingSampler rngState, uint dimsOffset,
         return false;
 
     const float2 u = SampleSky(
-        rand,
+        rng,
         _EnvironmentCdfMarginalResolution,
         _EnvironmentCdfMarginalBuffer,
         _EnvironmentCdfConditionalResolution,
@@ -499,26 +507,25 @@ bool SampleEnvironmentLight(inout PathTracingSampler rngState, uint dimsOffset,
     return true;
 }
 
-bool SampleLightShape(StructuredBuffer<UnifiedRT::InstanceData> instanceList, inout PathTracingSampler rngState, uint dimsOffset, out uint dimsUsed, float3 P, PTLight light, out LightShapeSample lightSample)
+bool SampleLightShape(StructuredBuffer<UnifiedRT::InstanceData> instanceList, float2 rand0, float2 rand1, float3 P, PTLight light, out LightShapeSample lightSample)
 {
-    dimsUsed = 0;
     lightSample = (LightShapeSample)0;
     bool result = false;
     if (light.type == RECTANGULAR_LIGHT)
     {
-        result = SampleRectangularLight(rngState, dimsOffset, dimsUsed, P, light, lightSample);
+        result = SampleRectangularLight(rand0, P, light, lightSample);
     }
     else if (light.type == DISC_LIGHT)
     {
-        result = SampleDiscLight(rngState, dimsOffset, dimsUsed, P, light, lightSample);
+        result = SampleDiscLight(rand0, P, light, lightSample);
     }
     else if (light.type == EMISSIVE_MESH)
     {
-        result = SampleEmissiveMesh(instanceList, rngState, dimsOffset, dimsUsed, P, light, lightSample);
+        result = SampleEmissiveMesh(instanceList, rand0, rand1, P, light, lightSample);
     }
     else if (light.type == ENVIRONMENT_LIGHT)
     {
-        result = SampleEnvironmentLight(rngState, dimsOffset, dimsUsed, P, light, lightSample);
+        result = SampleEnvironmentLight(rand0, P, light, lightSample);
     }
     else
     {
@@ -622,14 +629,19 @@ float PunctualLightAngleAttenuation(float4 distances, float rangeAttenuationScal
 
 float GetPunctualAttenuation(PTLight light, LightShapeSample lightSample)
 {
-    float x = abs(dot(lightSample.lightVector, 2 * light.right / light.width));
-    float y = abs(dot(lightSample.lightVector, 2 * light.up / light.height));
-    float z = abs(dot(lightSample.lightVector, light.forward));
-
     if (light.type == BOX_LIGHT)
+        return 1.0;
+
+    if (light.type == PYRAMID_LIGHT)
     {
-        // box attenuation
-        return ((z > 0) && (x < 1.0 && y < 1.0)) ? 1.0 : 0.0;
+        // compute lit position in light basis
+        float x = abs(dot(lightSample.lightVector, light.right));
+        float y = abs(dot(lightSample.lightVector, light.up));
+        float z = abs(dot(lightSample.lightVector, light.forward));
+
+        float2 sideLimits = float2(light.width, light.height) * 0.5 * z;
+        if (x >= sideLimits.x || y >= sideLimits.y)
+            return 0.0f;
     }
 
     // Punctual attenuation
@@ -683,7 +695,7 @@ float3 AreaCookieAttenuation(PTLight light, LightShapeSample lightSample)
 
 float3 PunctualCookieAttenuation(PTLight light, LightShapeSample lightSample)
 {
-    if (light.type == SPOT_LIGHT || light.type == BOX_LIGHT)
+    if (light.type == SPOT_LIGHT || light.type == BOX_LIGHT || light.type == PYRAMID_LIGHT)
         return LightCookie(light, lightSample);
     else if (light.type == POINT_LIGHT)
         return PointLightCookie(light, lightSample);
@@ -725,7 +737,7 @@ float3 GetDiscLightEmission(PTLight light, LightShapeSample lightSample)
     }
 }
 
-float3 GetEmissiveMeshEmission(PTLight light, LightShapeSample lightSample)
+float3 GetEmissiveMeshEmission(LightShapeSample lightSample)
 {
     PTMaterial matInfo = g_MaterialList[lightSample.materialIndex];
 
@@ -739,6 +751,14 @@ float3 GetEmissiveMeshEmission(PTLight light, LightShapeSample lightSample)
         emission = matInfo.emissionColor;
     }
 
+    // To match the behavior of the old baker, emission should be attenuated by transmission.
+    // Think about a mesh with a cutout shader - the portions that are cut out should obviously not emit light.
+    if (matInfo.transmissionTextureIndex != -1)
+    {
+        float3 transmission = SampleAtlas(g_TransmissionTextures, sampler_g_TransmissionTextures, matInfo.transmissionTextureIndex, lightSample.uv, matInfo.transmissionScale, matInfo.transmissionOffset, false).rgb;
+        emission *= 1.0-transmission;
+    }
+
     return emission;
 }
 
@@ -777,7 +797,7 @@ float3 GetEmission(PTLight light, LightShapeSample lightSample)
     {
         emission = GetDirectionalEmission(light, lightSample);
     }
-    else if (light.type == SPOT_LIGHT || light.type == POINT_LIGHT || light.type == BOX_LIGHT)
+    else if (light.type == POINT_LIGHT || light.type == SPOT_LIGHT || light.type == BOX_LIGHT || light.type == PYRAMID_LIGHT)
     {
         emission = GetPunctualEmission(light, lightSample);
     }
@@ -791,7 +811,7 @@ float3 GetEmission(PTLight light, LightShapeSample lightSample)
     }
     else if (light.type == EMISSIVE_MESH)
     {
-        emission = GetEmissiveMeshEmission(light, lightSample);
+        emission = GetEmissiveMeshEmission(lightSample);
     }
     else if (light.type == ENVIRONMENT_LIGHT)
     {
@@ -877,19 +897,32 @@ struct Reservoir
     }
 };
 
-uint GetNumLights(float3 origin, uint maxLightEvaluations)
+uint GetNumLights(float3 origin)
 {
     if (g_LightPickingMethod == LIGHT_PICKING_METHOD_RESERVOIR_GRID  || g_LightPickingMethod == LIGHT_PICKING_METHOD_LIGHT_GRID)
     {
         uint cellIndex = GetCellIndexFromPosition(origin);
         uint numReservoirs = g_LightGrid[cellIndex].y;
-        return min(numReservoirs, maxLightEvaluations);
+        return numReservoirs;
     }
 
-    return min(maxLightEvaluations, g_NumLights);
+    return g_NumLights;
 }
 
-bool SampleLight(PTLight light, float3 shadowRayOrigin, float3 normal, bool isDirect, uint enabledLightsLayerMask, StructuredBuffer<UnifiedRT::InstanceData> instanceList, uint dimsOffset, inout PathTracingSampler rngState, out ReservoirLightSample lightSample)
+PTLight GetLightInCell(float3 origin, uint lightIndex)
+{
+    if (g_LightPickingMethod == LIGHT_PICKING_METHOD_RESERVOIR_GRID  || g_LightPickingMethod == LIGHT_PICKING_METHOD_LIGHT_GRID)
+    {
+        uint cellIndex = GetCellIndexFromPosition(origin);
+        uint firstReservoir = g_LightGrid[cellIndex].x;
+        ThinReservoir reservoir = g_LightGridCellsData[firstReservoir + lightIndex];
+        lightIndex = reservoir.lightIndex;
+    }
+
+    return FetchLight(lightIndex);
+}
+
+bool SampleLight(PTLight light, float3 shadowRayOrigin, float3 normal, bool isDirect, uint enabledLightsLayerMask, StructuredBuffer<UnifiedRT::InstanceData> instanceList, float2 rand0, float2 rand1, out ReservoirLightSample lightSample)
 {
     lightSample = (ReservoirLightSample)0;
 
@@ -903,8 +936,7 @@ bool SampleLight(PTLight light, float3 shadowRayOrigin, float3 normal, bool isDi
 
     LightShapeSample lightShapeSample;
 
-    uint dimsUsed = 0;
-    if (!SampleLightShape(instanceList, rngState, dimsOffset, dimsUsed, shadowRayOrigin, light, lightShapeSample))
+    if (!SampleLightShape(instanceList, rand0, rand1, shadowRayOrigin, light, lightShapeSample))
         return false;
 
     float3 emission = GetEmission(light, lightShapeSample);
@@ -936,13 +968,13 @@ struct SampleLightsOptions
     uint numLightCandidates;
 };
 
-PTLight PickLight(float pickingSample, float3 receiverOrigin, out float lighPickingPmf)
+PTLight PickLight(float pickingSample, float3 receiverOrigin, out float lightPickingPmf)
 {
     uint lightIndex;
     if (g_LightPickingMethod == LIGHT_PICKING_METHOD_RESERVOIR_GRID || g_LightPickingMethod == LIGHT_PICKING_METHOD_LIGHT_GRID)
-        PickLightFromGrid(pickingSample, receiverOrigin, lightIndex, lighPickingPmf);
+        PickLightFromGrid(pickingSample, receiverOrigin, lightIndex, lightPickingPmf);
     else
-        PickLightUniformly(pickingSample, lightIndex, lighPickingPmf);
+        PickLightUniformly(pickingSample, lightIndex, lightPickingPmf);
 
     return FetchLight(lightIndex);
 }
@@ -952,33 +984,45 @@ bool SampleLightsRadianceRIS(
     float3 receiverOrigin, float3 receiverNormal, SampleLightsOptions options, inout PathTracingSampler rngState, out LightSample resLightSample)
 {
     resLightSample = (LightSample)0;
+
     // Find how many lights we will evaluate
-    uint numLightCandidates = GetNumLights(receiverOrigin, options.numLightCandidates);
+    uint numLightCandidates = min(GetNumLights(receiverOrigin), options.numLightCandidates);
 
-    Reservoir reservoir = (Reservoir) 0;
+    // We want to seed the 2 RNGs below with the pixel coordinate and sample index. To avoid calculating a 3D hash,
+    // we just offset the sequence using the sample index. The constant added to the pixel coord is to decorrelate
+    // them from the main RNG used elsewhere in the path tracer, and from each other.
+
+    // RNG for generating samples.
+    QRNG_TYPE sampleGenerationRng;
+    sampleGenerationRng.Init(rngState.pixelCoord+3141, rngState.pathIndex * numLightCandidates);
 
+    // RNG for selecting the RIS winner. Use white instead of blue noise for this one.
+    QrngPcg4D winnerSelectionRng;
+    winnerSelectionRng.Init(rngState.pixelCoord+2718, rngState.pathIndex * numLightCandidates);
+
+    Reservoir reservoir = (Reservoir) 0;
     for (uint i = 0; i < numLightCandidates; ++i)
     {
-        float pickingSample = rngState.GetSample1D(RAND_DIM_LIGHT_SELECTION + RAND_SAMPLES_PER_LIGHT * i);
-        #ifdef STRATIFIED_LIGHT_PICKING
-            pickingSample = (i + pickingSample) / numLightCandidates;
-        #endif
-
-        float lighPickingPmf;
-        PTLight light = PickLight(pickingSample, receiverOrigin, lighPickingPmf);
+        float pickingSample = sampleGenerationRng.GetSample(RAND_DIM_LIGHT_SELECTION).x;
+        float winnerSample = winnerSelectionRng.GetSample();
 
-        uint dimsOffset = RAND_DIM_LIGHT_SELECTION + RAND_SAMPLES_PER_LIGHT * i + 1;
+        float lightPickingPmf;
+        PTLight light = PickLight(pickingSample, receiverOrigin, lightPickingPmf);
 
         ReservoirLightSample lightSample;
-        if (!SampleLight(light, receiverOrigin, receiverNormal, options.isDirect, options.lightsRenderingLayerMask, instanceList, dimsOffset, rngState, lightSample))
-            continue;
+        float2 sampleRand0 = sampleGenerationRng.GetSample(RAND_DIM_LIGHT_SELECTION + 1);
+        float2 sampleRand1 = sampleGenerationRng.GetSample(RAND_DIM_LIGHT_SELECTION + 2);
+        if (SampleLight(light, receiverOrigin, receiverNormal, options.isDirect, options.lightsRenderingLayerMask, instanceList, sampleRand0, sampleRand1, lightSample))
+        {
+            lightSample.pdf *= lightPickingPmf;
 
-        lightSample.pdf *= lighPickingPmf;
+            float targetFunc = Luminance(lightSample.radiance);
+            float risWeight = targetFunc / lightSample.pdf; // w = targetFunc / sourcePdf
+            reservoir.Update(lightSample, risWeight, winnerSample);
+        }
 
-        float r = rngState.GetSample1D(RAND_DIM_LIGHT_SELECTION + RAND_SAMPLES_PER_LIGHT * i + 3);
-        float targetFunc = Luminance(lightSample.radiance);
-        float risWeight = targetFunc / lightSample.pdf; // w = targetFunc / sourcePdf
-        reservoir.Update(lightSample, risWeight, r);
+        sampleGenerationRng.NextSample();
+        winnerSelectionRng.NextSample();
     }
 
     float sampleTargetFuncEval = Luminance(reservoir.bestSample.radiance);
@@ -993,9 +1037,8 @@ bool SampleLightsRadianceRIS(
 
     // cast a shadow ray
     float3 attenuation = 1.0f;
-    uint dimsUsed = 0;
     float2 shadowSample = rngState.GetSample2D(RAND_DIM_JITTERED_SHADOW);
-    bool isShadowed = castShadows && options.receiveShadows && !CastJitteredShadowRay(dispatchInfo, accelStruct, bestSample.shadowRadius, lightType == DIRECTIONAL_LIGHT ? bestSample.lightDirection : bestSample.lightDirection*bestSample.distanceToLight, receiverOrigin, bestSample.lightDirection, bestSample.distanceToLight, options.shadowRayMask, shadowSample, dimsUsed, attenuation);
+    bool isShadowed = castShadows && options.receiveShadows && !CastJitteredShadowRay(dispatchInfo, accelStruct, bestSample.shadowRadius, lightType == DIRECTIONAL_LIGHT ? bestSample.lightDirection : bestSample.lightDirection*bestSample.distanceToLight, receiverOrigin, bestSample.lightDirection, bestSample.distanceToLight, options.shadowRayMask, shadowSample, attenuation);
     if (isShadowed)
         return false;
 
@@ -1016,24 +1059,54 @@ bool SampleLightsRadianceMC(
     float3 receiverOrigin, float3 receiverNormal, SampleLightsOptions options, inout PathTracingSampler rngState, out LightSample resLightSample)
 {
     resLightSample = (LightSample)0;
-    // Find how many lights we will evaluate
-    uint numLightCandidates = GetNumLights(receiverOrigin, 1);
 
     float pickingSample = rngState.GetSample1D(RAND_DIM_LIGHT_SELECTION);
-    float lighPickingPmf;
-    PTLight light = PickLight(pickingSample, receiverOrigin, lighPickingPmf);
+    float lightPickingPmf;
+    PTLight light = PickLight(pickingSample, receiverOrigin, lightPickingPmf);
+
+    ReservoirLightSample lightSample;
+    float2 sampleRand0 = rngState.GetSample2D(RAND_DIM_LIGHT_SELECTION + 1);
+    float2 sampleRand1 = rngState.GetSample2D(RAND_DIM_LIGHT_SELECTION + 2);
+    if (!SampleLight(light, receiverOrigin, receiverNormal, options.isDirect, options.lightsRenderingLayerMask, instanceList, sampleRand0, sampleRand1, lightSample))
+        return false;
+
+    lightSample.pdf *= lightPickingPmf;
+
+    float3 attenuation = 1.0f;
+    float2 shadowSample = rngState.GetSample2D(RAND_DIM_JITTERED_SHADOW);
+    bool isShadowed = light.castsShadows && options.receiveShadows && !CastJitteredShadowRay(dispatchInfo, accelStruct, light.shadowRadius, light.type == DIRECTIONAL_LIGHT ? lightSample.lightDirection : lightSample.lightDirection*lightSample.distanceToLight, receiverOrigin, lightSample.lightDirection, lightSample.distanceToLight, options.shadowRayMask, shadowSample, attenuation);
+    if (isShadowed)
+        return false;
+
+    resLightSample.radiance = attenuation * lightSample.radiance / lightSample.pdf;
+    resLightSample.direction = lightSample.lightDirection;
+    resLightSample.risSourcePdf = lightSample.pdf;
+    resLightSample.lightType = light.type;
+
+    return true;
+}
+
+// Sample incoming radiance from a specific light.
+bool SampleLightRadiance(
+    UnifiedRT::DispatchInfo dispatchInfo, UnifiedRT::RayTracingAccelStruct accelStruct, StructuredBuffer<UnifiedRT::InstanceData> instanceList,
+    float3 receiverOrigin, float3 receiverNormal, SampleLightsOptions options, PTLight light, inout PathTracingSampler rngState, out LightSample resLightSample)
+{
+    resLightSample = (LightSample)0;
+
+    uint numLights = GetNumLights(receiverOrigin);
+    float lightPickingPmf = rcp(numLights);
 
-    uint dimsOffset = RAND_DIM_LIGHT_SELECTION + 1;
     ReservoirLightSample lightSample;
-    if (!SampleLight(light, receiverOrigin, receiverNormal, options.isDirect, options.lightsRenderingLayerMask, instanceList, dimsOffset, rngState, lightSample))
+    float2 sampleRand0 = rngState.GetSample2D(RAND_DIM_LIGHT_SELECTION + 1);
+    float2 sampleRand1 = rngState.GetSample2D(RAND_DIM_LIGHT_SELECTION + 2);
+    if (!SampleLight(light, receiverOrigin, receiverNormal, options.isDirect, options.lightsRenderingLayerMask, instanceList, sampleRand0, sampleRand1, lightSample))
         return false;
 
-    lightSample.pdf *= lighPickingPmf;
+    lightSample.pdf *= lightPickingPmf;
 
     float3 attenuation = 1.0f;
-    uint dimsUsed = 0;
     float2 shadowSample = rngState.GetSample2D(RAND_DIM_JITTERED_SHADOW);
-    bool isShadowed = light.castsShadows && options.receiveShadows && !CastJitteredShadowRay(dispatchInfo, accelStruct, light.shadowRadius, light.type == DIRECTIONAL_LIGHT ? lightSample.lightDirection : lightSample.lightDirection*lightSample.distanceToLight, receiverOrigin, lightSample.lightDirection, lightSample.distanceToLight, options.shadowRayMask, shadowSample, dimsUsed, attenuation);
+    bool isShadowed = light.castsShadows && options.receiveShadows && !CastJitteredShadowRay(dispatchInfo, accelStruct, light.shadowRadius, light.type == DIRECTIONAL_LIGHT ? lightSample.lightDirection : lightSample.lightDirection*lightSample.distanceToLight, receiverOrigin, lightSample.lightDirection, lightSample.distanceToLight, options.shadowRayMask, shadowSample, attenuation);
     if (isShadowed)
         return false;
 
@@ -1045,6 +1118,7 @@ bool SampleLightsRadianceMC(
     return true;
 }
 
+// Sample incoming radiance from a random light, picked using either RIS or raw monte carlo.
 bool SampleLightsRadiance(
     UnifiedRT::DispatchInfo dispatchInfo, UnifiedRT::RayTracingAccelStruct accelStruct, StructuredBuffer<UnifiedRT:: InstanceData> instanceList,
     float3 receiverOrigin, float3 receiverNormal, SampleLightsOptions options, inout PathTracingSampler rngState, out LightSample resLightSample)
@@ -1090,7 +1164,6 @@ bool IsLightVisibleFromPoint(
     float3 worldPosition,
     inout PathTracingSampler rngState,
     uint dimsOffset,
-    out uint dimsUsed,
     PTLight light,
     bool receiveShadows,
     out float3 attenuation)
@@ -1098,19 +1171,20 @@ bool IsLightVisibleFromPoint(
     attenuation = 1.0f;
 
     LightShapeSample lightSample;
-    if (!SampleLightShape(instanceList, rngState, dimsOffset, dimsUsed, worldPosition, light, lightSample))
+    float2 sampleRand0 = rngState.GetSample2D(dimsOffset);
+    float2 sampleRand1 = rngState.GetSample2D(dimsOffset+1);
+    if (!SampleLightShape(instanceList, sampleRand0, sampleRand1, worldPosition, light, lightSample))
         return false;
-    dimsOffset += dimsUsed;
 
     if (light.type != DIRECTIONAL_LIGHT && lightSample.distanceToLight >= light.range)
         return false;
-    if (light.type == SPOT_LIGHT && GetPunctualAttenuation(light, lightSample) < 0.000001f)
+    if ((light.type == SPOT_LIGHT || light.type == BOX_LIGHT || light.type == PYRAMID_LIGHT) && GetPunctualAttenuation(light, lightSample) < 0.000001f)
         return false;
 
     if (light.castsShadows && receiveShadows)
     {
-        float2 shadowSample = rngState.GetSample2D(dimsOffset);
-        return CastJitteredShadowRay(dispatchInfo, accelStruct, light.shadowRadius, lightSample.lightVector, worldPosition, lightSample.L, lightSample.distanceToLight, shadowRayMask, shadowSample, dimsUsed, attenuation);
+        float2 shadowSample = rngState.GetSample2D(dimsOffset+2);
+        return CastJitteredShadowRay(dispatchInfo, accelStruct, light.shadowRadius, lightSample.lightVector, worldPosition, lightSample.L, lightSample.distanceToLight, shadowRayMask, shadowSample, attenuation);
     }
     return true;
 }
diff --git a/Packages/com.unity.render-pipelines.core/Runtime/PathTracing/Shaders/LightmapDirectIntegration.urtshader b/Packages/com.unity.render-pipelines.core/Runtime/PathTracing/Shaders/LightmapDirectIntegration.urtshader
index f5bf2d7e233..d2ecbae128f 100644
--- a/Packages/com.unity.render-pipelines.core/Runtime/PathTracing/Shaders/LightmapDirectIntegration.urtshader
+++ b/Packages/com.unity.render-pipelines.core/Runtime/PathTracing/Shaders/LightmapDirectIntegration.urtshader
@@ -3,14 +3,16 @@
 #define UNIFIED_RT_GROUP_SIZE_Y 1
 #define UNIFIED_RT_RAYGEN_FUNC AccumulateInternal
 
-// Set to MIS, LIGHT_SAMPLING or BRDF_SAMPLING for debugging.
+#define RESAMPLED_IMPORTANCE_SAMPLING
 #define EMISSIVE_SAMPLING MIS
+#define LIGHT_SAMPLING_ROUND_ROBIN
 
 #include "PathTracing.hlsl"
 #include "LightmapIntegrationHelpers.hlsl"
 
 #pragma exclude_renderers switch switch2
 
+uint g_LightIndexInCell;
 int g_AccumulateDirectional;
 int g_SampleOffset;
 uint g_ReceiveShadows;
@@ -18,6 +20,36 @@ float g_PushOff;
 RWStructuredBuffer<float4> g_ExpandedOutput;
 RWStructuredBuffer<float4> g_ExpandedDirectional;
 
+// Sample a specific light directly, weight with MIS.
+// Assumes 2 sampling strategies, the other being cosine weighted hemisphere sampling.
+void EstimateMISWeightedIrradianceForSpecificLightUsingDirectSampling(
+    UnifiedRT::DispatchInfo dispatchInfo,
+    UnifiedRT::RayTracingAccelStruct accelStruct,
+    StructuredBuffer<UnifiedRT::InstanceData> instanceList,
+    float3 origin,
+    float3 normal,
+    SampleLightsOptions options,
+    uint lightIndexInCell,
+    inout PathTracingSampler rngState,
+    inout float4 irradiance,
+    inout float4 directional,
+    out LightSample lightSample)
+{
+    float3 sampleRadiance = 0.f;
+    float3 sampleDirection = 0.f;
+    float sampleDensity = 0.f;
+
+    PTLight light = GetLightInCell(origin, lightIndexInCell);
+    if (SampleLightRadiance(dispatchInfo, accelStruct, g_AccelStructInstanceList, origin, normal, options, light, rngState, lightSample))
+    {
+        float sampleMISWeight = EmissiveMISWeightForLightRay(lightSample.lightType, lightSample.direction, lightSample.risSourcePdf, normal);
+        float3 e = sampleMISWeight * ClampedCosine(normal, lightSample.direction) * lightSample.radiance;
+
+        irradiance.rgb += e;
+        directional += float4(lightSample.direction, 1.f) * Luminance(e);
+    }
+}
+
 // Sample every light directly, weight with MIS.
 // Assumes 2 sampling strategies, the other being cosine weighted hemisphere sampling.
 void EstimateMISWeightedIrradianceUsingDirectSampling(
@@ -26,29 +58,22 @@ void EstimateMISWeightedIrradianceUsingDirectSampling(
     StructuredBuffer<UnifiedRT::InstanceData> instanceList,
     float3 origin,
     float3 normal,
-    bool receiveShadows,
+    SampleLightsOptions options,
     inout PathTracingSampler rngState,
     inout float4 irradiance,
-    inout float4 directional)
+    inout float4 directional,
+    out LightSample lightSample)
 {
     float3 sampleRadiance = 0.f;
     float3 sampleDirection = 0.f;
     float sampleDensity = 0.f;
 
-    SampleLightsOptions options;
-    options.isDirect = true;
-    options.receiveShadows = receiveShadows;
-    options.shadowRayMask = ShadowRayMask();
-    options.lightsRenderingLayerMask = 0xFFFFFFFF;
-    options.numLightCandidates = min(g_LightEvaluations, MAX_LIGHT_EVALUATIONS);
-
-    LightSample lightSample = (LightSample)0;
     if (SampleLightsRadiance(dispatchInfo, accelStruct, instanceList, origin, normal, options, rngState, lightSample))
     {
         float sampleMISWeight = EmissiveMISWeightForLightRay(lightSample.lightType, lightSample.direction, lightSample.risSourcePdf, normal);
         float3 e = sampleMISWeight * ClampedCosine(normal, lightSample.direction) * lightSample.radiance;
 
-        irradiance.rgb +=  e;
+        irradiance.rgb += e;
         directional += float4(lightSample.direction, 1.f) * Luminance(e);
     }
 }
@@ -62,13 +87,13 @@ void EstimateMISWeightedIrradianceUsingCosineSampling(
     StructuredBuffer<UnifiedRT::InstanceData> instanceList,
     float3 origin,
     float3 normal,
-    float2 rng,
+    inout PathTracingSampler rngState,
     inout float4 irradiance,
     inout float4 directional)
 {
     UnifiedRT::Ray ray;
     ray.origin = origin;
-    ray.direction = CosineSample(rng, normal);
+    ray.direction = CosineSample(rngState.GetSample2D(RAND_DIM_SURF_SCATTER), normal);
     ray.tMin = 0;
     ray.tMax = FLT_MAX;
 
@@ -76,7 +101,6 @@ void EstimateMISWeightedIrradianceUsingCosineSampling(
     float lightDensity = 0.f;
     float3 emission = 0.f;
     float3 attenuation = 1.0f;
-    bool hitSurface = false;
 
     for (uint i = 0; i < MAX_TRANSMISSION_BOUNCES; i++)
     {
@@ -88,28 +112,29 @@ void EstimateMISWeightedIrradianceUsingCosineSampling(
             geometry.FixNormals(ray.direction);
             MaterialProperties material = LoadMaterialProperties(instance, false, geometry.uv0, geometry.uv1);
 
-            // Transmissive material, continue ray and attenuate
-            if (material.isTransmissive)
+            // Transmissive material, either continue or terminate ray, then apply attenuation.
+            if (ShouldTransmitRay(rngState, material))
             {
                 attenuation *= saturate(material.transmission);
                 ray.origin = geometry.NextTransmissionRayOrigin();
+                rngState.NextBounce();
                 continue;
             }
-            hitSurface = true;
-
             // Hit emissive frontface
-            if (!ShouldTreatAsBackface(hitResult, material) && any(material.emissive))
+            else if (!ShouldTreatAsBackface(hitResult, material) && any(material.emissive))
             {
-                lightDensity = ComputeMeshLightDensity(instanceList, geometry, hitResult.instanceID, ray.origin);
+                lightDensity = ComputeEmissiveTriangleDensity(instanceList, geometry, hitResult.instanceID, ray.origin);
+                lightDensity /= GetNumLights(ray.origin);
                 emission = material.emissive;
-                break;
             }
+            break;
+        }
+        else // Hit skybox, so stop
+        {
+            GetEnvironmentLightEmissionAndDensity(ray.direction, emission, lightDensity);
+            lightDensity /= GetNumLights(ray.origin);
+            break;
         }
-    }
-
-    if (!hitSurface) // Hit environment
-    {
-        GetEnvironmentLightEmissionAndDensity(ray.direction, emission, lightDensity);
     }
 
     // Tint the emissiom by the transmissive attenuation before accumulating
@@ -142,24 +167,51 @@ void AccumulateInternal(UnifiedRT::DispatchInfo dispatchInfo)
 
     float3 origin = OffsetRayOrigin(worldPosition, worldFaceNormal, g_PushOff);
 
-    float4 irradiance = 0.f;
-    float4 directional = 0.f;
+    float4 irradianceDirect = 0.f, irradianceBrdf = 0.f;
+    float4 directionalDirect = 0.f, directionalBrdf = 0.f;
 
     PathTracingSampler rngState;
     rngState.Init(instanceTexelPos, sampleOffset);
 
-    #if (EMISSIVE_SAMPLING != BRDF_SAMPLING)
-    EstimateMISWeightedIrradianceUsingDirectSampling(dispatchInfo, accelStruct, g_AccelStructInstanceList, origin, worldNormal, g_ReceiveShadows, rngState, irradiance, directional);
+    SampleLightsOptions options;
+    options.isDirect = true;
+    options.receiveShadows = g_ReceiveShadows;
+    options.shadowRayMask = ShadowRayMask();
+    options.lightsRenderingLayerMask = 0xFFFFFFFF;
+    options.numLightCandidates = min(g_LightEvaluations, MAX_LIGHT_EVALUATIONS);
+
+    uint numLightsInCell = GetNumLights(origin);
+    // If there are no lights to sample, continuing is a waste of time.
+    [branch] if (numLightsInCell == 0)
+    {
+        // We still want to write 1 into the alpha channel, as it is used as an occupancy mask for post processing.
+        if (localSampleOffset == 0)
+            g_ExpandedOutput[dispatchInfo.dispatchThreadID.x] = float4(0,0,0,1);
+        return;
+    }
+
+    // Sample a light using direct sampling, weight with MIS.
+    #ifdef LIGHT_SAMPLING_ROUND_ROBIN
+    // If we have already sampled every light in the cell, skip this sample to avoid needing to normalize per-light.
+    [branch] if (g_LightIndexInCell >= numLightsInCell)
+        return;
+
+    LightSample lightSample;
+    EstimateMISWeightedIrradianceForSpecificLightUsingDirectSampling(dispatchInfo, accelStruct, g_AccelStructInstanceList, origin, worldNormal, options, g_LightIndexInCell, rngState, irradianceDirect, directionalDirect, lightSample);
+    #else
+    LightSample lightSample;
+    EstimateMISWeightedIrradianceUsingDirectSampling(dispatchInfo, accelStruct, g_AccelStructInstanceList, origin, worldNormal, options, rngState, irradianceDirect, directionalDirect, lightSample);
     #endif
 
+    // TODO: Decouple BRDF samples from direct light samples in a separate kernel (https://jira.unity3d.com/browse/GFXLIGHT-2107)
+    // Sample a light with BRDF sampling, weight with MIS.
     #if (EMISSIVE_SAMPLING != LIGHT_SAMPLING)
-    float2 rng = rngState.GetSample2D(RAND_DIM_SURF_SCATTER);
-    EstimateMISWeightedIrradianceUsingCosineSampling(dispatchInfo, accelStruct, g_AccelStructInstanceList, origin, worldNormal, rng, irradiance, directional);
+    EstimateMISWeightedIrradianceUsingCosineSampling(dispatchInfo, accelStruct, g_AccelStructInstanceList, origin, worldNormal, rngState, irradianceBrdf, directionalBrdf);
     #endif
 
-    // store new accumulated irradiance
-    g_ExpandedOutput[dispatchInfo.dispatchThreadID.x] += float4(irradiance.rgb, 1.0f);
+    // Store new accumulated irradiance
+    g_ExpandedOutput[dispatchInfo.dispatchThreadID.x] += float4(irradianceDirect.rgb + irradianceBrdf.rgb, 1.0f);
     if (g_AccumulateDirectional > 0)
-        g_ExpandedDirectional[dispatchInfo.dispatchThreadID.x] += directional;
+        g_ExpandedDirectional[dispatchInfo.dispatchThreadID.x] += directionalDirect + directionalBrdf;
 }
 
diff --git a/Packages/com.unity.render-pipelines.core/Runtime/PathTracing/Shaders/LightmapShadowMaskIntegration.urtshader b/Packages/com.unity.render-pipelines.core/Runtime/PathTracing/Shaders/LightmapShadowMaskIntegration.urtshader
index afbeb64c8ea..443ac85ad60 100644
--- a/Packages/com.unity.render-pipelines.core/Runtime/PathTracing/Shaders/LightmapShadowMaskIntegration.urtshader
+++ b/Packages/com.unity.render-pipelines.core/Runtime/PathTracing/Shaders/LightmapShadowMaskIntegration.urtshader
@@ -41,13 +41,12 @@ void AccumulateInternal(UnifiedRT::DispatchInfo dispatchInfo)
             continue;
         if (light.type == EMISSIVE_MESH || light.type == ENVIRONMENT_LIGHT) // Shadowmask only makes sense for punctual lights
             continue;
-        uint dimsUsed = 0;
 
         float3 origin = OffsetRayOrigin(worldPosition, worldFaceNormal, g_PushOff);
 
         float3 attenuation = 1.0f;
-        float isVisible = IsLightVisibleFromPoint(dispatchInfo, accelStruct, g_AccelStructInstanceList, ShadowRayMask(), origin, rngState, dimsOffset, dimsUsed, light, g_ReceiveShadows, attenuation) ? dot(float3(1.0f, 1.0f, 1.0f), attenuation)/3.0f : 0.0f;
-        dimsOffset += dimsUsed;
+        float isVisible = IsLightVisibleFromPoint(dispatchInfo, accelStruct, g_AccelStructInstanceList, ShadowRayMask(), origin, rngState, dimsOffset, light, g_ReceiveShadows, attenuation) ? dot(float3(1.0f, 1.0f, 1.0f), attenuation)/3.0f : 0.0f;
+        dimsOffset += 3; // 2 dimensions for sampling the light, 1 dimension for jittering the shadow ray
         if (light.shadowMaskChannel < 0 || light.shadowMaskChannel >= 4)
             continue;
         visibility[light.shadowMaskChannel] += isVisible;
diff --git a/Packages/com.unity.render-pipelines.core/Runtime/PathTracing/Shaders/Lightmapping/ChartRasterizerSoftware.shader b/Packages/com.unity.render-pipelines.core/Runtime/PathTracing/Shaders/Lightmapping/ChartRasterizerSoftware.shader
index d4a3af9887e..c4f95b542c3 100644
--- a/Packages/com.unity.render-pipelines.core/Runtime/PathTracing/Shaders/Lightmapping/ChartRasterizerSoftware.shader
+++ b/Packages/com.unity.render-pipelines.core/Runtime/PathTracing/Shaders/Lightmapping/ChartRasterizerSoftware.shader
@@ -11,6 +11,8 @@ Shader "Hidden/ChartRasterizerSoftware"
             #pragma fragment frag
             #include "GeometryUtils.hlsl"
 
+            #define PARALLEL_EPS    1e-6f
+
             struct v2f
             {
                 float4 vertex : SV_POSITION;
@@ -34,7 +36,7 @@ Shader "Hidden/ChartRasterizerSoftware"
                 uint2 resolution = uint2(g_Width, g_Height);
                 float2 tri[3];
                 ReadParentTriangle(g_VertexBuffer, vertexId, g_ScaleAndOffset, tri);
-                ExpandTriangleForConservativeRasterization(resolution, tri, vertexId, o.aabb, o.vertex);
+                ExpandTriangleForConservativeRasterization(resolution, tri, vertexId, o.aabb, o.vertex, PARALLEL_EPS);
 
                 // Get the chart index.
                 uint originalVertexId = g_VertexToOriginalVertex[vertexId];
diff --git a/Packages/com.unity.render-pipelines.core/Runtime/PathTracing/Shaders/Lightmapping/GeometryUtils.hlsl b/Packages/com.unity.render-pipelines.core/Runtime/PathTracing/Shaders/Lightmapping/GeometryUtils.hlsl
index a152f042ee2..06da9d25b62 100644
--- a/Packages/com.unity.render-pipelines.core/Runtime/PathTracing/Shaders/Lightmapping/GeometryUtils.hlsl
+++ b/Packages/com.unity.render-pipelines.core/Runtime/PathTracing/Shaders/Lightmapping/GeometryUtils.hlsl
@@ -16,7 +16,7 @@ void OffsetEdge(float2 v1, float2 v2, float2 pixelSize, out float2 v1Offset, out
 }
 
 // Given 2 lines defined by 2 points each, find the intersection point.
-float2 LineIntersect(float2 p1, float2 p2, float2 p3, float2 p4)
+float2 LineIntersect(float2 p1, float2 p2, float2 p3, float2 p4, float eps = 0.0f)
 {
     // Line p1p2 represented as a1x + b1y = c1
     float a1 = p2.y - p1.y;
@@ -29,7 +29,7 @@ float2 LineIntersect(float2 p1, float2 p2, float2 p3, float2 p4)
     float c2 = a2 * p3.x + b2 * p3.y;
 
     float determinant = a1 * b2 - a2 * b1;
-    if (determinant == 0) // Parallel lines - return any valid point.
+    if (abs(determinant) <= eps) // Parallel lines - return any valid point.
         return p1;
 
     float x = b2 * c1 - b1 * c2;
@@ -46,7 +46,7 @@ bool IsInside(float2 p, float2 cp1, float2 cp2, float eps = 0.0f)
 
 // Clip a polygon with a line defined by two points, in place.
 // https://en.wikipedia.org/wiki/Sutherland-Hodgman_algorithm
-void ClipPolygonWithLine(inout float2 polygon[6], inout uint polygonLength, float2 cp1, float2 cp2)
+void ClipPolygonWithLine(inout float2 polygon[6], inout uint polygonLength, float2 cp1, float2 cp2, float inside_eps = 0.0f, float parallel_eps = 0.0f)
 {
     float2 result[6];
     uint resultLength = 0;
@@ -56,19 +56,19 @@ void ClipPolygonWithLine(inout float2 polygon[6], inout uint polygonLength, floa
         float2 s = polygon[i];
         float2 e = polygon[(i + 1) % polygonLength];
 
-        if (IsInside(e, cp1, cp2)) // At least one endpoint is inside
+        if (IsInside(e, cp1, cp2, inside_eps)) // At least one endpoint is inside
         {
-            if (!IsInside(s, cp1, cp2)) // Only the end point is inside, add the intersection
+            if (!IsInside(s, cp1, cp2, inside_eps)) // Only the end point is inside, add the intersection
             {
-                result[resultLength] = LineIntersect(cp1, cp2, s, e);
+                result[resultLength] = LineIntersect(cp1, cp2, s, e, parallel_eps);
                 resultLength++;
             }
             result[resultLength] = e;
             resultLength++;
         }
-        else if (IsInside(s, cp1, cp2)) // Only the start point is inside, add the intersection
+        else if (IsInside(s, cp1, cp2, inside_eps)) // Only the start point is inside, add the intersection
         {
-            result[resultLength] = LineIntersect(cp1, cp2, s, e);
+            result[resultLength] = LineIntersect(cp1, cp2, s, e, parallel_eps);
             resultLength++;
         }
     }
@@ -79,7 +79,7 @@ void ClipPolygonWithLine(inout float2 polygon[6], inout uint polygonLength, floa
 }
 
 // Clip a polygon to the bounding box of a texel at the given position
-bool ClipPolygonWithTexel(float2 texelPosition, inout float2 polygon[6], inout uint polygonLength)
+bool ClipPolygonWithTexel(float2 texelPosition, inout float2 polygon[6], inout uint polygonLength, float inside_eps = 0.0f, float parallel_eps = 0.0f)
 {
     // Get the bounding box of the texel to clip with.
     float2 clipPolygon[4] =
@@ -93,7 +93,7 @@ bool ClipPolygonWithTexel(float2 texelPosition, inout float2 polygon[6], inout u
     // Clip to each edge of the quad
     for (uint edge = 0; edge < 4; edge++)
     {
-        ClipPolygonWithLine(polygon, polygonLength, clipPolygon[edge], clipPolygon[(edge + 1) % 4]);
+        ClipPolygonWithLine(polygon, polygonLength, clipPolygon[edge], clipPolygon[(edge + 1) % 4], inside_eps, parallel_eps);
     }
 
     return polygonLength > 0;
@@ -128,7 +128,8 @@ void ExpandTriangleForConservativeRasterization(
     float2 tri[3],
     uint vertexId,
     out float4 triangleAABB,
-    out float4 vertex)
+    out float4 vertex,
+    float eps = 0.0f)
 {
     float2 pixelSize = (1.0 / resolution);
 
@@ -146,9 +147,9 @@ void ExpandTriangleForConservativeRasterization(
     OffsetEdge(tri[2], tri[0], pixelSize, v3Off3, v1Off3);
 
     // Find their intersections. This is the new triangle
-    tri[0] = LineIntersect(v1Off1, v2Off1, v3Off3, v1Off3);
-    tri[1] = LineIntersect(v2Off2, v3Off2, v1Off1, v2Off1);
-    tri[2] = LineIntersect(v3Off3, v1Off3, v2Off2, v3Off2);
+    tri[0] = LineIntersect(v1Off1, v2Off1, v3Off3, v1Off3, eps);
+    tri[1] = LineIntersect(v2Off2, v3Off2, v1Off1, v2Off1, eps);
+    tri[2] = LineIntersect(v3Off3, v1Off3, v2Off2, v3Off2, eps);
     vertex = float4(tri[vertexId % 3]*2-1, 0, 1);
     #if UNITY_UV_STARTS_AT_TOP
     vertex.y = -vertex.y;
diff --git a/Packages/com.unity.render-pipelines.core/Runtime/PathTracing/Shaders/Lightmapping/UVFallbackBufferGeneration.shader b/Packages/com.unity.render-pipelines.core/Runtime/PathTracing/Shaders/Lightmapping/UVFallbackBufferGeneration.shader
index 0d66d5ce48c..863bcb4420c 100644
--- a/Packages/com.unity.render-pipelines.core/Runtime/PathTracing/Shaders/Lightmapping/UVFallbackBufferGeneration.shader
+++ b/Packages/com.unity.render-pipelines.core/Runtime/PathTracing/Shaders/Lightmapping/UVFallbackBufferGeneration.shader
@@ -12,6 +12,10 @@ Shader "Hidden/UVFallbackBufferGeneration"
             #pragma target 5.0
             #include "GeometryUtils.hlsl"
 
+            #define INSIDE_EPS      0.01f   // Epsilon chosen to be 1 order of magnitude larger than the maximum
+                                            // distance between subsequent floats in range [0; 8192]
+            #define PARALLEL_EPS    1e-6f
+
             struct v2f
             {
                 float4 vertex : SV_POSITION;
@@ -32,8 +36,9 @@ Shader "Hidden/UVFallbackBufferGeneration"
                 uint2 resolution = uint2(g_Width, g_Height);
                 float2 tri[3];
                 float4 unusedAABB;
+                const float eps = 0.01f;
                 ReadParentTriangle(g_VertexBuffer, vertexId, float4(g_WidthScale, g_HeightScale, 0, 0), tri);
-                ExpandTriangleForConservativeRasterization(resolution, tri, vertexId, unusedAABB, o.vertex);
+                ExpandTriangleForConservativeRasterization(resolution, tri, vertexId, unusedAABB, o.vertex, PARALLEL_EPS);
 
                 // Scale the triangle to screen coordinates, pass it to fragment shader.
                 o.vertices[0] = tri[0] * resolution;
@@ -54,8 +59,7 @@ Shader "Hidden/UVFallbackBufferGeneration"
                 // as our intersector cannot handle such points. Epsilon chosen to be 1 order of magnitude larger than the maximum
                 // distance between subsequent floats in range [0; 8192]
                 float2 texelCenter = i.vertex.xy;
-                const float eps = 0.01f;
-                if (IsInside(texelCenter, c, b, eps) && IsInside(texelCenter, b, a, eps) && IsInside(texelCenter, a, c, eps))
+                if (IsInside(texelCenter, c, b, INSIDE_EPS) && IsInside(texelCenter, b, a, INSIDE_EPS) && IsInside(texelCenter, a, c, INSIDE_EPS))
                 {
                     #if UNITY_REVERSED_Z
                     depth = 1.0;
@@ -70,7 +74,7 @@ Shader "Hidden/UVFallbackBufferGeneration"
                 uint resultSize = 3;
 
                 // Clip to the texel.
-                ClipPolygonWithTexel(texelCenter, result, resultSize);
+                ClipPolygonWithTexel(texelCenter, result, resultSize, INSIDE_EPS, PARALLEL_EPS);
 
                 // Discard removed triangles.
                 if (resultSize <= 0)
diff --git a/Packages/com.unity.render-pipelines.core/Runtime/PathTracing/Shaders/PathTracing.hlsl b/Packages/com.unity.render-pipelines.core/Runtime/PathTracing/Shaders/PathTracing.hlsl
index d12f681fd20..e1765e6674e 100644
--- a/Packages/com.unity.render-pipelines.core/Runtime/PathTracing/Shaders/PathTracing.hlsl
+++ b/Packages/com.unity.render-pipelines.core/Runtime/PathTracing/Shaders/PathTracing.hlsl
@@ -78,16 +78,6 @@ float ComputeEmissiveTriangleDensity(StructuredBuffer<UnifiedRT::InstanceData> i
     return weight;
 }
 
-float ComputeMeshLightDensity(StructuredBuffer<UnifiedRT::InstanceData> instanceList, PTHitGeom hitGeom, int instanceIndex, float3 rayOrigin)
-{
-    float weight = ComputeEmissiveTriangleDensity(instanceList, hitGeom, instanceIndex, rayOrigin);
-
-    // pdf to select the light source
-    weight /= g_NumLights;
-
-    return weight;
-}
-
 bool ShouldTreatAsBackface(UnifiedRT::Hit hitResult, MaterialProperties material)
 {
     // Have we hit something that is considered a backface when double sided GI is taken into account?
@@ -201,7 +191,7 @@ void AddEnvironmentRadiance(inout PathIterator iterator, bool applyIndirectScale
     float envPdf;
     if (GetEnvironmentLightEmissionAndDensity(iterator.ray.direction, envRadiance, envPdf))
     {
-        envPdf /= g_NumLights;
+        envPdf /= GetNumLights(iterator.ray.origin);
 
         if (applyIndirectScale)
             envRadiance *= g_IndirectScale;
@@ -213,7 +203,9 @@ void AddEnvironmentRadiance(inout PathIterator iterator, bool applyIndirectScale
 // Add radiance due to a hit emissive surface.
 void AddEmissionRadiance(inout PathIterator iterator, UnifiedRT::RayTracingAccelStruct accelStruct, StructuredBuffer<UnifiedRT::InstanceData> instanceList, bool applyIndirectScale)
 {
-    float lightDensity = ComputeMeshLightDensity(instanceList, iterator.hitGeo, iterator.hitResult.instanceID, iterator.ray.origin);
+    float lightDensity = ComputeEmissiveTriangleDensity(instanceList, iterator.hitGeo, iterator.hitResult.instanceID, iterator.ray.origin);
+    lightDensity /= GetNumLights(iterator.ray.origin);
+
     float3 emission = iterator.material.emissive;
     if (applyIndirectScale)
         emission *= g_IndirectScale;
diff --git a/Packages/com.unity.render-pipelines.core/Runtime/PathTracing/Shaders/PathTracingCommon.hlsl b/Packages/com.unity.render-pipelines.core/Runtime/PathTracing/Shaders/PathTracingCommon.hlsl
index 0359a63a081..9b5428bd068 100644
--- a/Packages/com.unity.render-pipelines.core/Runtime/PathTracing/Shaders/PathTracingCommon.hlsl
+++ b/Packages/com.unity.render-pipelines.core/Runtime/PathTracing/Shaders/PathTracingCommon.hlsl
@@ -26,7 +26,8 @@
 #define POINT_LIGHT 2
 #define RECTANGULAR_LIGHT 3
 #define DISC_LIGHT 4
-#define BOX_LIGHT 5
+#define PYRAMID_LIGHT 5
+#define BOX_LIGHT 6
 #define EMISSIVE_MESH 8 // Must match the variable in UnityEngine.PathTracing.Core.World
 #define ENVIRONMENT_LIGHT 9 // Must match the variable in UnityEngine.PathTracing.Core.World
 
diff --git a/Packages/com.unity.render-pipelines.core/Runtime/PathTracing/Shaders/PathTracingRandom.hlsl b/Packages/com.unity.render-pipelines.core/Runtime/PathTracing/Shaders/PathTracingRandom.hlsl
index b355e73ab05..7585b1370d4 100644
--- a/Packages/com.unity.render-pipelines.core/Runtime/PathTracing/Shaders/PathTracingRandom.hlsl
+++ b/Packages/com.unity.render-pipelines.core/Runtime/PathTracing/Shaders/PathTracingRandom.hlsl
@@ -22,6 +22,24 @@
 
 // The number of dimensions used per bounce (depends on the number of light evaluations)
 #define QRNG_SAMPLES_PER_BOUNCE (RAND_DIM_LIGHT_SELECTION + RAND_SAMPLES_PER_LIGHT * MAX_LIGHT_EVALUATIONS)
+
+// Which RNG to use for most of our path tracing code.
 #define QRNG_METHOD_SOBOL
 #define QRNG_SOBOL_02
+
+// Define an alias for the RNG type we have chosen.
+#if defined(QRNG_METHOD_SOBOL)
+    #define QRNG_TYPE QrngSobol2D
+#elif defined(QRNG_METHOD_SOBOL_BLUE_NOISE)
+    #define QRNG_TYPE QrngSobolBlueNoise2D
+#elif defined(QRNG_METHOD_GLOBAL_SOBOL_BLUE_NOISE)
+    #define QRNG_TYPE QrngGlobalSobolBlueNoise2D
+#elif defined(QRNG_METHOD_KRONECKER)
+    #define QRNG_TYPE QrngKronecker2D
+#elif defined(QRNG_METHOD_RANDOM_XOR_SHIFT)
+    #define QRNG_TYPE QrngXorShift
+#elif defined(QRNG_METHOD_RANDOM_PCG_4D)
+    #define QRNG_TYPE QrngPcg4D
+#endif
+
 #include "PathTracingSampler.hlsl"
diff --git a/Packages/com.unity.render-pipelines.core/Runtime/PathTracing/Shaders/PathTracingSampler.hlsl b/Packages/com.unity.render-pipelines.core/Runtime/PathTracing/Shaders/PathTracingSampler.hlsl
index 8a2f77c4bdc..c54ea82acca 100644
--- a/Packages/com.unity.render-pipelines.core/Runtime/PathTracing/Shaders/PathTracingSampler.hlsl
+++ b/Packages/com.unity.render-pipelines.core/Runtime/PathTracing/Shaders/PathTracingSampler.hlsl
@@ -18,28 +18,20 @@
 
 struct PathTracingSampler
 {
-    #if defined(QRNG_METHOD_SOBOL)
-        QrngSobol2D generator;
-    #elif defined(QRNG_METHOD_SOBOL_BLUE_NOISE)
-        QrngSobolBlueNoise2D generator;
-    #elif defined(QRNG_METHOD_GLOBAL_SOBOL_BLUE_NOISE)
-        QrngGlobalSobolBlueNoise2D generator;
-    #elif defined(QRNG_METHOD_KRONECKER)
-        QrngKronecker2D generator;
-    #elif defined(QRNG_METHOD_RANDOM_XOR_SHIFT)
-        QrngXorShift generator;
-    #elif defined(QRNG_METHOD_RANDOM_PCG_4D)
-        QrngPcg4D generator;
-    #endif
+    QRNG_TYPE generator;
+    int pathIndex;
     int bounceIndex;
+    uint2 pixelCoord;
 
-    void Init(uint2 pixelCoord, uint startPathIndex, uint perPixelPathCount = 256)
+    void Init(uint2 startPixelCoord, uint startPathIndex, uint perPixelPathCount = 256)
     {
         #if defined(QRNG_METHOD_GLOBAL_SOBOL_BLUE_NOISE)
-            generator.Init(pixelCoord, startPathIndex, perPixelPathCount);
+            generator.Init(startPixelCoord, startPathIndex, perPixelPathCount);
         #else
-            generator.Init(pixelCoord, startPathIndex);
+            generator.Init(startPixelCoord, startPathIndex);
         #endif
+        pixelCoord = startPixelCoord;
+        pathIndex = startPathIndex;
         bounceIndex = 0;
     }
 
diff --git a/Packages/com.unity.render-pipelines.core/Runtime/PathTracing/Shaders/ProbeIntegrationDirect.urtshader b/Packages/com.unity.render-pipelines.core/Runtime/PathTracing/Shaders/ProbeIntegrationDirect.urtshader
index af5e0fc2687..c5c83203256 100644
--- a/Packages/com.unity.render-pipelines.core/Runtime/PathTracing/Shaders/ProbeIntegrationDirect.urtshader
+++ b/Packages/com.unity.render-pipelines.core/Runtime/PathTracing/Shaders/ProbeIntegrationDirect.urtshader
@@ -5,9 +5,13 @@
 
 #include "Packages/com.unity.render-pipelines.core/Runtime/UnifiedRayTracing/FetchGeometry.hlsl"
 
+#define RESAMPLED_IMPORTANCE_SAMPLING
+#define LIGHT_SAMPLING_ROUND_ROBIN
+
 #include "PathTracing.hlsl"
 #include "SphericalHarmonicsUtils.hlsl"
 
+uint g_LightIndexInCell;
 RWStructuredBuffer<float3> g_Positions;
 RWStructuredBuffer<float> g_RadianceShl2;
 uint g_PositionsOffset;
@@ -42,8 +46,21 @@ void IntegrateDirectRadiance(UnifiedRT::DispatchInfo dispatchInfo)
     options.lightsRenderingLayerMask = 0xFFFFFFFF;
     options.numLightCandidates = min(g_LightEvaluations, MAX_LIGHT_EVALUATIONS);
 
+    uint numLightsInCell = GetNumLights(worldPosition);
+	// If there are no lights to sample, continuing is a waste of time.
+	[branch] if (numLightsInCell == 0)
+	    return;
+
     LightSample lightSample = (LightSample)0;
+    #ifdef LIGHT_SAMPLING_ROUND_ROBIN
+    [branch] if (g_LightIndexInCell >= numLightsInCell)
+        return;
+
+    PTLight light = GetLightInCell(worldPosition, g_LightIndexInCell);
+    if (SampleLightRadiance(dispatchInfo, accelStruct, g_AccelStructInstanceList, worldPosition, 0.0f, options, light, rngState, lightSample))
+    #else
     if (SampleLightsRadiance(dispatchInfo, accelStruct, g_AccelStructInstanceList, worldPosition, 0.0f, options, rngState, lightSample))
+    #endif
     {
         // Project into SH.
         accumulatedRadianceSH[0] += lightSample.radiance * SHL0();
@@ -58,12 +75,16 @@ void IntegrateDirectRadiance(UnifiedRT::DispatchInfo dispatchInfo)
         accumulatedRadianceSH[8] += lightSample.radiance * SHL22(lightSample.direction);
     }
 
+    #ifdef LIGHT_SAMPLING_ROUND_ROBIN
+    const float monteCarloNormalization = 1.0f / (float)g_SampleCount / (float)numLightsInCell;
+    #else
     const float monteCarloNormalization = 1.0f / (float)g_SampleCount;
+    #endif
     for (uint channel = 0; channel < SH_COLOR_CHANNELS; ++channel)
     {
         for (uint i = 0; i < SH_COEFFICIENTS_PER_CHANNEL; ++i)
         {
-            g_RadianceShl2[SHIndex(outProbeIdx, channel, i)] = accumulatedRadianceSH[i][channel] * monteCarloNormalization;
+            g_RadianceShl2[SHIndex(outProbeIdx, channel, i)] += accumulatedRadianceSH[i][channel] * monteCarloNormalization;
         }
     }
 }
diff --git a/Packages/com.unity.render-pipelines.core/Runtime/PathTracing/Shaders/ProbeIntegrationOcclusion.urtshader b/Packages/com.unity.render-pipelines.core/Runtime/PathTracing/Shaders/ProbeIntegrationOcclusion.urtshader
index c94cb8bedbb..9e10280c7b2 100644
--- a/Packages/com.unity.render-pipelines.core/Runtime/PathTracing/Shaders/ProbeIntegrationOcclusion.urtshader
+++ b/Packages/com.unity.render-pipelines.core/Runtime/PathTracing/Shaders/ProbeIntegrationOcclusion.urtshader
@@ -30,6 +30,7 @@ void IntegrateOcclusion(UnifiedRT::DispatchInfo dispatchInfo)
     // Which probe in the expanded g_Occlusion buffer are we in?
     const uint outProbeIdx = inProbeIdx * g_SampleCount + inProbeSampleIdx;
 
+    uint dimsOffset = 0;
     for (uint indirectLightIndex = 0; indirectLightIndex < g_MaxLightsPerProbe; indirectLightIndex++)
     {
         // Which light in the expanded g_Occlusion buffer are we in?
@@ -48,10 +49,9 @@ void IntegrateOcclusion(UnifiedRT::DispatchInfo dispatchInfo)
             PTLight light = FetchLight(lightIndex);
             if (light.type == SPOT_LIGHT || light.type == POINT_LIGHT || light.type == DIRECTIONAL_LIGHT)
             {
-                uint dimsOffset = 0;
-                uint dimsUsed = 0;
                 float3 attenuation = 1.0f;
-                bool isVisible = IsLightVisibleFromPoint(dispatchInfo, accelStruct, g_AccelStructInstanceList, SHADOW_RAY_VIS_MASK, worldPosition, rngState, dimsOffset, dimsUsed, light, true, attenuation);
+                bool isVisible = IsLightVisibleFromPoint(dispatchInfo, accelStruct, g_AccelStructInstanceList, SHADOW_RAY_VIS_MASK, worldPosition, rngState, dimsOffset, light, true, attenuation);
+                dimsOffset += 3; // 2 dimensions for sampling the light, 1 dimension for jittering the shadow ray
                 if (isVisible)
                 {
                     g_Occlusion[outOcclusionValueIdx] = 1.0f / g_SampleCount;
diff --git a/Packages/com.unity.render-pipelines.core/Runtime/PathTracing/UnityComputeProbeIntegrator.cs b/Packages/com.unity.render-pipelines.core/Runtime/PathTracing/UnityComputeProbeIntegrator.cs
index a8c64fd083c..412ea7b72ac 100644
--- a/Packages/com.unity.render-pipelines.core/Runtime/PathTracing/UnityComputeProbeIntegrator.cs
+++ b/Packages/com.unity.render-pipelines.core/Runtime/PathTracing/UnityComputeProbeIntegrator.cs
@@ -15,8 +15,8 @@ internal class UnityComputeProbeIntegrator : IProbeIntegrator
         private readonly ProbeIntegrator _probeIntegrator;
         private UnityComputeWorld _world;
         private uint _bounceCount;
-        private uint _directLightingEvaluationCount;
-        private uint _numIndirectLightingEvaluations;
+        private uint _directRISCandidateCount = 4;
+        private uint _indirectRISCandidateCount = 1;
         private uint _basePositionsOffset;
 
         private static class ShaderProperties
@@ -66,7 +66,8 @@ public IProbeIntegrator.Result IntegrateDirectRadiance(IDeviceContext context, i
                 (uint)positionCount,
                 sampleOffset,
                 (uint)sampleCount,
-                _directLightingEvaluationCount,
+                _directRISCandidateCount,
+                (uint)_world.PathTracingWorld.MaxLightsInAnyCell,
                 ignoreEnvironment,
                 unifiedContext.GetComputeBuffer(radianceEstimateOut.Id),
                 (uint)radianceEstimateOut.Offset,
@@ -96,7 +97,8 @@ public IProbeIntegrator.Result IntegrateIndirectRadiance(IDeviceContext context,
                 _bounceCount,
                 sampleOffset,
                 (uint)sampleCount,
-                _numIndirectLightingEvaluations,
+                _indirectRISCandidateCount,
+                (uint)_world.PathTracingWorld.MaxLightsInAnyCell,
                 ignoreEnvironment,
                 unifiedContext.GetComputeBuffer(radianceEstimateOut.Id),
                 (uint)radianceEstimateOut.Offset,
@@ -191,11 +193,14 @@ public IProbeIntegrator.Result IntegrateOcclusion(IDeviceContext context, int po
             return new IProbeIntegrator.Result(IProbeIntegrator.ResultType.Success, string.Empty);
         }
 
-        public void Prepare(IDeviceContext context, IWorld world, BufferSlice<Vector3> positions, float pushoff, int bounceCount)
+        public void Prepare(
+            IDeviceContext context,
+            IWorld world,
+            BufferSlice<Vector3> positions,
+            float pushoff,
+            int bounceCount)
         {
             _bounceCount = (uint)bounceCount;
-            _directLightingEvaluationCount = 4;
-            _numIndirectLightingEvaluations = 1;
 
             _world = world as UnityComputeWorld;
             Debug.Assert(world != null);
diff --git a/Packages/com.unity.render-pipelines.core/Runtime/PathTracing/World.cs b/Packages/com.unity.render-pipelines.core/Runtime/PathTracing/World.cs
index 6dca1ab0704..bea71940939 100644
--- a/Packages/com.unity.render-pipelines.core/Runtime/PathTracing/World.cs
+++ b/Packages/com.unity.render-pipelines.core/Runtime/PathTracing/World.cs
@@ -276,6 +276,18 @@ public LightPickingMethod lightPickingMethod
         public int NonMeshLightCount => _lightState.LightHandleToLightListEntry.Count;
         public int MeshLightCount => _lightState.MeshLights.Count;
         public int EnvLightCount => _lightState.HasEnvironmentLight ? 1 : 0;
+        public int MaxLightsInAnyCell
+        {
+            get
+            {
+                switch (_lightState.lightPickingMethod)
+                {
+                    case LightPickingMethod.LightGrid: return _conservativeLightGrid.MaxLightsInAnyCell;
+                    case LightPickingMethod.Regir: return _reservoirGrid.MaxLightsInAnyCell;
+                    default: return LightCount;
+                }
+            }
+        }
 
         public List<PTLight> LightList => _lightState.LightList;
         public Dictionary<LightHandle, int> LightHandleToLightListIndex => _lightState.LightHandleToLightListIndex;
@@ -829,7 +841,7 @@ public void UpdateLights(LightHandle[] lightHandles, Span<LightDescriptor> light
                     newLight.height = frustumHeight;
                 }
 
-                if (light.Type == LightType.Spot || light.Type == LightType.Point)
+                if (light.Type == LightType.Spot || light.Type == LightType.Point || light.Type == LightType.Pyramid)
                 {
                     Debug.Assert(light.FalloffType != Experimental.GlobalIllumination.FalloffType.Undefined);
 
diff --git a/Packages/com.unity.render-pipelines.core/Runtime/RenderGraph/RenderGraphDefaultResources.cs b/Packages/com.unity.render-pipelines.core/Runtime/RenderGraph/RenderGraphDefaultResources.cs
index f3e9b8a7f82..10e22610c76 100644
--- a/Packages/com.unity.render-pipelines.core/Runtime/RenderGraph/RenderGraphDefaultResources.cs
+++ b/Packages/com.unity.render-pipelines.core/Runtime/RenderGraph/RenderGraphDefaultResources.cs
@@ -80,6 +80,8 @@ internal void InitializeForRendering(RenderGraph renderGraph)
             whiteTexture = renderGraph.ImportTexture(m_WhiteTexture2D, true);
             defaultShadowTexture = renderGraph.ImportTexture(m_ShadowTexture2D, true);
 
+            if (!TextureXR.initialized)
+                return;
             clearTextureXR = renderGraph.ImportTexture(TextureXR.GetClearTexture(), true);
             magentaTextureXR = renderGraph.ImportTexture(TextureXR.GetMagentaTexture(), true);
             blackTextureXR = renderGraph.ImportTexture(TextureXR.GetBlackTexture(), true);
diff --git a/Packages/com.unity.render-pipelines.core/Runtime/RenderPipelineResources/GPUDriven/DebugOccluder.shader b/Packages/com.unity.render-pipelines.core/Runtime/RenderPipelineResources/GPUDriven/DebugOccluder.shader
index 24149a67fb8..7f9be9f2e66 100644
--- a/Packages/com.unity.render-pipelines.core/Runtime/RenderPipelineResources/GPUDriven/DebugOccluder.shader
+++ b/Packages/com.unity.render-pipelines.core/Runtime/RenderPipelineResources/GPUDriven/DebugOccluder.shader
@@ -3,7 +3,7 @@ Shader "Hidden/Core/DebugOccluder"
     HLSLINCLUDE
         #pragma target 4.5
         #pragma only_renderers d3d11 playstation xboxone xboxseries vulkan metal switch switch2 webgpu
-        //#pragma enable_d3d11_debug_symbols
+        //#pragma enable_debug_symbols
 
         #include "Packages/com.unity.render-pipelines.core/ShaderLibrary/Common.hlsl"
 
@@ -29,7 +29,7 @@ Shader "Hidden/Core/DebugOccluder"
             return output;
         }
 
-        float GetOutputColor(float occluderValue)
+        float4 GetOutputColor(float occluderValue)
         {
             float value = saturate((occluderValue - _ValidRange.x) * _ValidRange.y);
             return float4(value.xxx, 1);
diff --git a/Packages/com.unity.render-pipelines.core/Runtime/RenderPipelineResources/GPUDriven/DebugOcclusionTest.shader b/Packages/com.unity.render-pipelines.core/Runtime/RenderPipelineResources/GPUDriven/DebugOcclusionTest.shader
index cc0112dc306..ba037287d47 100644
--- a/Packages/com.unity.render-pipelines.core/Runtime/RenderPipelineResources/GPUDriven/DebugOcclusionTest.shader
+++ b/Packages/com.unity.render-pipelines.core/Runtime/RenderPipelineResources/GPUDriven/DebugOcclusionTest.shader
@@ -16,7 +16,7 @@ Shader "Hidden/Core/DebugOcclusionTest"
 
             #pragma vertex Vert
             #pragma fragment Frag
-            //#pragma enable_d3d11_debug_symbols
+            //#pragma enable_debug_symbols
 
             #include "Packages/com.unity.render-pipelines.core/ShaderLibrary/Common.hlsl"
             #include "Packages/com.unity.render-pipelines.core/ShaderLibrary/Debug.hlsl"
diff --git a/Packages/com.unity.render-pipelines.core/Runtime/Sampling/PseudoRandom.hlsl b/Packages/com.unity.render-pipelines.core/Runtime/Sampling/PseudoRandom.hlsl
index a5becfdf4f8..12a1a1cacdb 100644
--- a/Packages/com.unity.render-pipelines.core/Runtime/Sampling/PseudoRandom.hlsl
+++ b/Packages/com.unity.render-pipelines.core/Runtime/Sampling/PseudoRandom.hlsl
@@ -19,7 +19,7 @@ struct QrngXorShift
         state = seed;
     }
 
-    float PrivateGetFloat()
+    float GetSample()
     {
         state = XorShift32(state);
         return UintToFloat01(state);
@@ -27,7 +27,7 @@ struct QrngXorShift
 
     float2 GetSample(uint dimension)
     {
-        return float2(PrivateGetFloat(), PrivateGetFloat());
+        return float2(GetSample(), GetSample());
     }
 
     void NextSample()
@@ -51,7 +51,7 @@ struct QrngPcg4D
         state = uint4(seed, 1, startSampleIndex, 0);
     }
 
-    float PrivateGetFloat()
+    float GetSample()
     {
         state.w++;
         return UintToFloat01(Pcg4d(state).x);
@@ -59,7 +59,7 @@ struct QrngPcg4D
 
     float2 GetSample(uint dimension)
     {
-        return float2(PrivateGetFloat(), PrivateGetFloat());
+        return float2(GetSample(), GetSample());
     }
 
     void NextSample()
diff --git a/Packages/com.unity.render-pipelines.core/Runtime/Sampling/QuasiRandom.hlsl b/Packages/com.unity.render-pipelines.core/Runtime/Sampling/QuasiRandom.hlsl
index 6c555c3f191..fb88fe71731 100644
--- a/Packages/com.unity.render-pipelines.core/Runtime/Sampling/QuasiRandom.hlsl
+++ b/Packages/com.unity.render-pipelines.core/Runtime/Sampling/QuasiRandom.hlsl
@@ -147,9 +147,8 @@ struct QrngKronecker2D
 
     void Init(uint seed, uint startSampleIndex)
     {
-        uint hash = seed;
-        cranleyPattersonSeed = hash;
-        uint shuffledStartIndex = (startSampleIndex + hash) % (1 << 20);
+        cranleyPattersonSeed = seed;
+        uint shuffledStartIndex = (startSampleIndex + seed) % (1 << 20);
         shuffledSampleIndex = shuffledStartIndex;
 #ifdef QRNG_KRONECKER_ENHANCED_QUALITY
         sampleIndex = startSampleIndex+1;
diff --git a/Packages/com.unity.render-pipelines.core/Runtime/Textures/TextureXR.cs b/Packages/com.unity.render-pipelines.core/Runtime/Textures/TextureXR.cs
index 5f152480802..19b440378bb 100644
--- a/Packages/com.unity.render-pipelines.core/Runtime/Textures/TextureXR.cs
+++ b/Packages/com.unity.render-pipelines.core/Runtime/Textures/TextureXR.cs
@@ -8,7 +8,7 @@ namespace UnityEngine.Rendering
     public static class TextureXR
     {
         // Property set by XRSystem
-        private static int m_MaxViews = 1;
+        private static int s_MaxViews = 1;
         /// <summary>
         /// Maximum number of views handled by the XR system.
         /// </summary>
@@ -16,7 +16,7 @@ public static int maxViews
         {
             set
             {
-                m_MaxViews = value;
+                s_MaxViews = value;
             }
         }
 
@@ -24,7 +24,7 @@ public static int maxViews
         /// <summary>
         /// Number of slices used by the XR system.
         /// </summary>
-        public static int slices { get => m_MaxViews; }
+        public static int slices { get => s_MaxViews; }
 
         // Must be in sync with shader define in TextureXR.hlsl
         /// <summary>
@@ -65,66 +65,71 @@ public static TextureDimension dimension
         }
 
         // Need to keep both the Texture and the RTHandle in order to be able to track lifetime properly.
-        static Texture m_BlackUIntTexture2DArray;
-        static Texture m_BlackUIntTexture;
-        static RTHandle m_BlackUIntTexture2DArrayRTH;
-        static RTHandle m_BlackUIntTextureRTH;
+        static Texture s_BlackUIntTexture2DArray;
+        static Texture s_BlackUIntTexture;
+        static RTHandle s_BlackUIntTexture2DArrayRTH;
+        static RTHandle s_BlackUIntTextureRTH;
         /// <summary>
         /// Default black unsigned integer texture.
         /// </summary>
         /// <returns>The default black unsigned integer texture.</returns>
-        public static RTHandle GetBlackUIntTexture() { return useTexArray ? m_BlackUIntTexture2DArrayRTH : m_BlackUIntTextureRTH; }
+        public static RTHandle GetBlackUIntTexture() { return useTexArray ? s_BlackUIntTexture2DArrayRTH : s_BlackUIntTextureRTH; }
 
-        static Texture2DArray m_ClearTexture2DArray;
-        static Texture2D m_ClearTexture;
-        static RTHandle m_ClearTexture2DArrayRTH;
-        static RTHandle m_ClearTextureRTH;
+        static Texture2DArray s_ClearTexture2DArray;
+        static Texture2D s_ClearTexture;
+        static RTHandle s_ClearTexture2DArrayRTH;
+        static RTHandle s_ClearTextureRTH;
         /// <summary>
         /// Default clear color (0, 0, 0, 1) texture.
         /// </summary>
         /// <returns>The default clear color texture.</returns>
-        public static RTHandle GetClearTexture() { return useTexArray ? m_ClearTexture2DArrayRTH : m_ClearTextureRTH; }
+        public static RTHandle GetClearTexture() { return useTexArray ? s_ClearTexture2DArrayRTH : s_ClearTextureRTH; }
 
-        static Texture2DArray m_MagentaTexture2DArray;
-        static Texture2D m_MagentaTexture;
-        static RTHandle m_MagentaTexture2DArrayRTH;
-        static RTHandle m_MagentaTextureRTH;
+        static Texture2DArray s_MagentaTexture2DArray;
+        static Texture2D s_MagentaTexture;
+        static RTHandle s_MagentaTexture2DArrayRTH;
+        static RTHandle s_MagentaTextureRTH;
         /// <summary>
         /// Default magenta texture.
         /// </summary>
         /// <returns>The default magenta texture.</returns>
-        public static RTHandle GetMagentaTexture() { return useTexArray ? m_MagentaTexture2DArrayRTH : m_MagentaTextureRTH; }
-
-        static Texture2D m_BlackTexture;
-        static Texture3D m_BlackTexture3D;
-        static Texture2DArray m_BlackTexture2DArray;
-        static RTHandle m_BlackTexture2DArrayRTH;
-        static RTHandle m_BlackTextureRTH;
-        static RTHandle m_BlackTexture3DRTH;
+        public static RTHandle GetMagentaTexture() { return useTexArray ? s_MagentaTexture2DArrayRTH : s_MagentaTextureRTH; }
+
+        static Texture2D s_BlackTexture;
+        static Texture3D s_BlackTexture3D;
+        static Texture2DArray s_BlackTexture2DArray;
+        static RTHandle s_BlackTexture2DArrayRTH;
+        static RTHandle s_BlackTextureRTH;
+        static RTHandle s_BlackTexture3DRTH;
         /// <summary>
         /// Default black texture.
         /// </summary>
         /// <returns>The default black texture.</returns>
-        public static RTHandle GetBlackTexture() { return useTexArray ? m_BlackTexture2DArrayRTH : m_BlackTextureRTH; }
+        public static RTHandle GetBlackTexture() { return useTexArray ? s_BlackTexture2DArrayRTH : s_BlackTextureRTH; }
         /// <summary>
         /// Default black texture array.
         /// </summary>
         /// <returns>The default black texture array.</returns>
-        public static RTHandle GetBlackTextureArray() { return m_BlackTexture2DArrayRTH; }
+        public static RTHandle GetBlackTextureArray() { return s_BlackTexture2DArrayRTH; }
         /// <summary>
         /// Default black texture 3D.
         /// </summary>
         /// <returns>The default black texture 3D.</returns>
-        public static RTHandle GetBlackTexture3D() { return m_BlackTexture3DRTH; }
+        public static RTHandle GetBlackTexture3D() { return s_BlackTexture3DRTH; }
 
-        static Texture2DArray m_WhiteTexture2DArray;
-        static RTHandle m_WhiteTexture2DArrayRTH;
-        static RTHandle m_WhiteTextureRTH;
+        static Texture2DArray s_WhiteTexture2DArray;
+        static RTHandle s_WhiteTexture2DArrayRTH;
+        static RTHandle s_WhiteTextureRTH;
         /// <summary>
         /// Default white texture.
         /// </summary>
         /// <returns>The default white texture.</returns>
-        public static RTHandle GetWhiteTexture() { return useTexArray ? m_WhiteTexture2DArrayRTH : m_WhiteTextureRTH; }
+        public static RTHandle GetWhiteTexture() { return useTexArray ? s_WhiteTexture2DArrayRTH : s_WhiteTextureRTH; }
+
+        /// <summary>
+        /// Is TextureXR initialized?
+        /// </summary>
+        public static bool initialized => s_BlackUIntTexture2DArray != null; // We assume that everything is valid if one is valid.
 
         /// <summary>
         /// Initialize XR textures. Must be called at least once.
@@ -133,56 +138,89 @@ public static TextureDimension dimension
         /// <param name="clearR32_UIntShader">Compute shader used to intitialize unsigned integer textures.</param>
         public static void Initialize(CommandBuffer cmd, ComputeShader clearR32_UIntShader)
         {
-            if (m_BlackUIntTexture2DArray == null) // We assume that everything is invalid if one is invalid.
-            {
-                // Black UINT
-                RTHandles.Release(m_BlackUIntTexture2DArrayRTH);
-                m_BlackUIntTexture2DArray = CreateBlackUIntTextureArray(cmd, clearR32_UIntShader);
-                m_BlackUIntTexture2DArrayRTH = RTHandles.Alloc(m_BlackUIntTexture2DArray);
-                RTHandles.Release(m_BlackUIntTextureRTH);
-                m_BlackUIntTexture = CreateBlackUintTexture(cmd, clearR32_UIntShader);
-                m_BlackUIntTextureRTH = RTHandles.Alloc(m_BlackUIntTexture);
-
-                // Clear
-                RTHandles.Release(m_ClearTextureRTH);
-                m_ClearTexture = new Texture2D(1, 1, GraphicsFormat.R8G8B8A8_SRGB, TextureCreationFlags.None) { name = "Clear Texture" };
-                m_ClearTexture.SetPixel(0, 0, Color.clear);
-                m_ClearTexture.Apply();
-                m_ClearTextureRTH = RTHandles.Alloc(m_ClearTexture);
-                RTHandles.Release(m_ClearTexture2DArrayRTH);
-                m_ClearTexture2DArray = CreateTexture2DArrayFromTexture2D(m_ClearTexture, "Clear Texture2DArray");
-                m_ClearTexture2DArrayRTH = RTHandles.Alloc(m_ClearTexture2DArray);
-
-                // Magenta
-                RTHandles.Release(m_MagentaTextureRTH);
-                m_MagentaTexture = new Texture2D(1, 1, GraphicsFormat.R8G8B8A8_SRGB, TextureCreationFlags.None) { name = "Magenta Texture" };
-                m_MagentaTexture.SetPixel(0, 0, Color.magenta);
-                m_MagentaTexture.Apply();
-                m_MagentaTextureRTH = RTHandles.Alloc(m_MagentaTexture);
-                RTHandles.Release(m_MagentaTexture2DArrayRTH);
-                m_MagentaTexture2DArray = CreateTexture2DArrayFromTexture2D(m_MagentaTexture, "Magenta Texture2DArray");
-                m_MagentaTexture2DArrayRTH = RTHandles.Alloc(m_MagentaTexture2DArray);
-
-                // Black
-                RTHandles.Release(m_BlackTextureRTH);
-                m_BlackTexture = new Texture2D(1, 1, GraphicsFormat.R8G8B8A8_SRGB, TextureCreationFlags.None) { name = "Black Texture" };
-                m_BlackTexture.SetPixel(0, 0, Color.black);
-                m_BlackTexture.Apply();
-                m_BlackTextureRTH = RTHandles.Alloc(m_BlackTexture);
-                RTHandles.Release(m_BlackTexture2DArrayRTH);
-                m_BlackTexture2DArray = CreateTexture2DArrayFromTexture2D(m_BlackTexture, "Black Texture2DArray");
-                m_BlackTexture2DArrayRTH = RTHandles.Alloc(m_BlackTexture2DArray);
-                RTHandles.Release(m_BlackTexture3DRTH);
-                m_BlackTexture3D = CreateBlackTexture3D("Black Texture3D");
-                m_BlackTexture3DRTH = RTHandles.Alloc(m_BlackTexture3D);
-
-                // White
-                RTHandles.Release(m_WhiteTextureRTH);
-                m_WhiteTextureRTH = RTHandles.Alloc(Texture2D.whiteTexture);
-                RTHandles.Release(m_WhiteTexture2DArrayRTH);
-                m_WhiteTexture2DArray = CreateTexture2DArrayFromTexture2D(Texture2D.whiteTexture, "White Texture2DArray");
-                m_WhiteTexture2DArrayRTH = RTHandles.Alloc(m_WhiteTexture2DArray);
-            }
+            if (initialized)
+                return;
+            
+            // Black UINT
+            s_BlackUIntTexture2DArray = CreateBlackUIntTextureArray(cmd, clearR32_UIntShader);
+            s_BlackUIntTexture2DArrayRTH = RTHandles.Alloc(s_BlackUIntTexture2DArray);
+            s_BlackUIntTexture = CreateBlackUintTexture(cmd, clearR32_UIntShader);
+            s_BlackUIntTextureRTH = RTHandles.Alloc(s_BlackUIntTexture);
+
+            // Clear
+            s_ClearTexture = new Texture2D(1, 1, GraphicsFormat.R8G8B8A8_SRGB, TextureCreationFlags.None) { name = "Clear Texture" };
+            s_ClearTexture.SetPixel(0, 0, Color.clear);
+            s_ClearTexture.Apply();
+            s_ClearTextureRTH = RTHandles.Alloc(s_ClearTexture);
+            s_ClearTexture2DArray = CreateTexture2DArrayFromTexture2D(s_ClearTexture, "Clear Texture2DArray");
+            s_ClearTexture2DArrayRTH = RTHandles.Alloc(s_ClearTexture2DArray);
+
+            // Magenta
+            s_MagentaTexture = new Texture2D(1, 1, GraphicsFormat.R8G8B8A8_SRGB, TextureCreationFlags.None) { name = "Magenta Texture" };
+            s_MagentaTexture.SetPixel(0, 0, Color.magenta);
+            s_MagentaTexture.Apply();
+            s_MagentaTextureRTH = RTHandles.Alloc(s_MagentaTexture);
+            s_MagentaTexture2DArray = CreateTexture2DArrayFromTexture2D(s_MagentaTexture, "Magenta Texture2DArray");
+            s_MagentaTexture2DArrayRTH = RTHandles.Alloc(s_MagentaTexture2DArray);
+
+            // Black
+            s_BlackTexture = new Texture2D(1, 1, GraphicsFormat.R8G8B8A8_SRGB, TextureCreationFlags.None) { name = "Black Texture" };
+            s_BlackTexture.SetPixel(0, 0, Color.black);
+            s_BlackTexture.Apply();
+            s_BlackTextureRTH = RTHandles.Alloc(s_BlackTexture);
+            s_BlackTexture2DArray = CreateTexture2DArrayFromTexture2D(s_BlackTexture, "Black Texture2DArray");
+            s_BlackTexture2DArrayRTH = RTHandles.Alloc(s_BlackTexture2DArray);
+            s_BlackTexture3D = CreateBlackTexture3D("Black Texture3D");
+            s_BlackTexture3DRTH = RTHandles.Alloc(s_BlackTexture3D);
+
+            // White
+            s_WhiteTextureRTH = RTHandles.Alloc(Texture2D.whiteTexture);
+            s_WhiteTexture2DArray = CreateTexture2DArrayFromTexture2D(Texture2D.whiteTexture, "White Texture2DArray");
+            s_WhiteTexture2DArrayRTH = RTHandles.Alloc(s_WhiteTexture2DArray);
+
+            //Auto cleanup if pipeline type is changed as all pipelines may not rely on TextureXR
+            //By time PipelineChange is raised though, it may be too late. So do it at each pipeline disposal instead.
+            RenderPipelineManager.activeRenderPipelineDisposed += Cleanup; 
+        }
+
+        static void Cleanup()
+        {
+            if (!initialized)
+                return;
+            
+            // Black UINT
+            RTHandles.Release(s_BlackUIntTexture2DArrayRTH);
+            s_BlackUIntTexture2DArray = null;
+            RTHandles.Release(s_BlackUIntTextureRTH);
+            s_BlackUIntTexture = null;
+            
+            // Clear
+            RTHandles.Release(s_ClearTextureRTH);
+            s_ClearTexture = null;
+            RTHandles.Release(s_ClearTexture2DArrayRTH);
+            s_ClearTexture2DArray = null;
+            
+            // Magenta
+            RTHandles.Release(s_MagentaTextureRTH);
+            s_MagentaTexture = null;
+            RTHandles.Release(s_MagentaTexture2DArrayRTH);
+            s_MagentaTexture2DArray = null;
+            
+            // Black
+            RTHandles.Release(s_BlackTextureRTH);
+            s_BlackTexture = null;
+            RTHandles.Release(s_BlackTexture2DArrayRTH);
+            s_BlackTexture2DArray = null;
+            RTHandles.Release(s_BlackTexture3DRTH);
+            s_BlackTexture3D = null;
+            
+            // White
+            RTHandles.Release(s_WhiteTextureRTH);
+            s_WhiteTextureRTH = null;
+            RTHandles.Release(s_WhiteTexture2DArrayRTH);
+            s_WhiteTexture2DArray = null;
+
+            RenderPipelineManager.activeRenderPipelineDisposed -= Cleanup;
         }
 
         static Texture2DArray CreateTexture2DArrayFromTexture2D(Texture2D source, string name)
diff --git a/Packages/com.unity.render-pipelines.core/Runtime/Utilities/.buginfo b/Packages/com.unity.render-pipelines.core/Runtime/Utilities/.buginfo
index 0f536f6e290..5ff71313356 100644
--- a/Packages/com.unity.render-pipelines.core/Runtime/Utilities/.buginfo
+++ b/Packages/com.unity.render-pipelines.core/Runtime/Utilities/.buginfo
@@ -15,7 +15,7 @@ xr:
   when:
     path:
       - ^.*XRUtils?.*$
-  area: SRP XR
+  area: Graphics XR
 
 camera:
   when:
diff --git a/Packages/com.unity.render-pipelines.core/Runtime/Volume/VolumeParameter.cs b/Packages/com.unity.render-pipelines.core/Runtime/Volume/VolumeParameter.cs
index 51a2e0110ab..b67e674c5b7 100644
--- a/Packages/com.unity.render-pipelines.core/Runtime/Volume/VolumeParameter.cs
+++ b/Packages/com.unity.render-pipelines.core/Runtime/Volume/VolumeParameter.cs
@@ -27,6 +27,7 @@ namespace UnityEngine.Rendering
     /// <seealso cref="VolumeParameter{T}"/>
     /// <seealso cref="ICloneable"/>
     /// <seealso cref="VolumeStack"/>
+    [Serializable]
     public abstract class VolumeParameter : ICloneable
     {
 #if UNITY_EDITOR || DEVELOPMENT_BUILD
diff --git a/Packages/com.unity.render-pipelines.core/Runtime/Vrs/Shaders/VrsVisualization.shader b/Packages/com.unity.render-pipelines.core/Runtime/Vrs/Shaders/VrsVisualization.shader
index a00e2cc6327..f701f926303 100644
--- a/Packages/com.unity.render-pipelines.core/Runtime/Vrs/Shaders/VrsVisualization.shader
+++ b/Packages/com.unity.render-pipelines.core/Runtime/Vrs/Shaders/VrsVisualization.shader
@@ -10,7 +10,7 @@ Shader "Hidden/Core/VrsVisualization"
             Cull Off
 
             HLSLPROGRAM
-            //#pragma enable_d3d11_debug_symbols
+            //#pragma enable_debug_symbols
 
             #pragma exclude_renderers glcore gles3
 
diff --git a/Packages/com.unity.render-pipelines.core/Runtime/XR/.buginfo b/Packages/com.unity.render-pipelines.core/Runtime/XR/.buginfo
index 701b4cbc25d..f6d9eecbd20 100644
--- a/Packages/com.unity.render-pipelines.core/Runtime/XR/.buginfo
+++ b/Packages/com.unity.render-pipelines.core/Runtime/XR/.buginfo
@@ -1 +1 @@
-area: SRP XR
+area: Graphics XR
diff --git a/Packages/com.unity.render-pipelines.core/ShaderLibrary/GeometricTools.hlsl b/Packages/com.unity.render-pipelines.core/ShaderLibrary/GeometricTools.hlsl
index 6e1ce918de1..1fbdc60371c 100644
--- a/Packages/com.unity.render-pipelines.core/ShaderLibrary/GeometricTools.hlsl
+++ b/Packages/com.unity.render-pipelines.core/ShaderLibrary/GeometricTools.hlsl
@@ -207,6 +207,72 @@ bool IntersectSphereAABB(float3 position, float radius, float3 aabbMin, float3 a
   return distance2 < radius * radius;
 }
 
+bool IntersectFrustumPlanesAABB(float4 frustumPlanes[6], float3 aabbCenter, float3 aabbExtent)
+{
+    float3 m = aabbCenter;
+    float3 extent = aabbExtent;
+
+    for (int i = 0; i < 6; ++i)
+    {
+        float4 p = frustumPlanes[i];
+        float3 normal = p.xyz;
+        float dist = dot(normal, m) + p.w;
+        float radius = dot(extent, abs(normal));
+
+        if (dist + radius < 0)
+            return false; // AABB completely outside of half-space delimited by current frustum plane
+    }
+
+    return true; // AABB intersects frustum
+}
+
+// Spherical cone VS Sphere Intersection test. https://www.desmos.com/calculator/hmtevaudpn
+// The core idea is to compute the direction and angle of the spherical sector that is spanned by the sphere. (https://en.wikipedia.org/wiki/Spherical_sector)
+// It can then easily be intersected against the cone's spherical sector.
+bool IntersectSphericalConeWithSphere(float3 coneOrigin, float3 coneForward, float coneRange, float coneCosHalfAngle, float coneSinHalfAngle, float4 sphere)
+{
+    const float Cr = coneRange;
+    const float Sr = sphere.w;
+    const float Cr2 = Cr * Cr;
+    const float Sr2 = Sr * Sr;
+    const float3 V = sphere.xyz - coneOrigin;
+    const float d2 = dot(V, V);
+
+    // Sphere outside of cone's bounding sphere
+    if (d2 >= (Cr + Sr) * (Cr + Sr))
+        return false;
+
+    // Cone center is inside the sphere
+    if (d2 < Sr2)
+        return true;
+
+    // Compute the half angle β of the spherical sector that is spanned by the sphere
+    float cosBetaMultD, sinBetaMultD;
+    if (d2 < Sr2 + Cr2)
+    {
+        // Sphere is close to the cone's origin, the spherical sector encompasses the whole sphere
+        sinBetaMultD = Sr;
+        cosBetaMultD = sqrt(d2 - sinBetaMultD * sinBetaMultD);
+    }
+    else
+    {
+        // The sphere is further away, the sector is defined by the sphere-sphere intersection between the the sphere and the cone bounding's sphere
+        // (https ://mathworld.wolfram.com/Sphere-SphereIntersection.html)
+        cosBetaMultD = (d2 - Sr2 + Cr2) * 0.5f / Cr;
+        sinBetaMultD = sqrt(d2 - cosBetaMultD * cosBetaMultD);
+    }
+
+    const float cosGammaMultD = dot(V, coneForward); // Angle γ between the sphere direction and the cone direction
+    const float cosAlpha = coneCosHalfAngle;
+    const float sinAlpha = coneSinHalfAngle;
+
+    // The spherical sectors intersect if:
+    // (α + β) > γ
+    // d.cos(α + β) < d.cos(γ)
+    // cos(α)cos(β)d - sin(α)sin(β)d < cos(γ)d
+    return (cosAlpha * cosBetaMultD - sinAlpha * sinBetaMultD) < cosGammaMultD;
+}
+
 //-----------------------------------------------------------------------------
 // Miscellaneous functions
 //-----------------------------------------------------------------------------
diff --git a/Packages/com.unity.render-pipelines.core/Tests/Editor/CoreLightingSearchSelectorsTests.cs b/Packages/com.unity.render-pipelines.core/Tests/Editor/CoreLightingSearchSelectorsTests.cs
new file mode 100644
index 00000000000..3f2879ac27a
--- /dev/null
+++ b/Packages/com.unity.render-pipelines.core/Tests/Editor/CoreLightingSearchSelectorsTests.cs
@@ -0,0 +1,349 @@
+using NUnit.Framework;
+using UnityEditor.Lighting;
+using UnityEditor.Search;
+using UnityEngine;
+using UnityEngine.Rendering;
+using UnityEngine.UIElements;
+
+namespace UnityEditor.Rendering.Tests
+{
+    [TestFixture]
+    class CoreLightingSearchSelectorsTests
+    {
+        GameObject m_TestGameObject;
+        Volume m_Volume;
+        ProbeVolumeBakingSet m_BakingSet;
+
+        [SetUp]
+        public void Setup()
+        {
+            m_TestGameObject = new GameObject("TestCoreLightingObject");
+            m_Volume = m_TestGameObject.AddComponent<Volume>();
+            m_BakingSet = ScriptableObject.CreateInstance<ProbeVolumeBakingSet>();
+        }
+
+        [TearDown]
+        public void TearDown()
+        {
+            if (m_TestGameObject != null)
+            {
+                Object.DestroyImmediate(m_TestGameObject);
+            }
+
+            if (m_BakingSet != null)
+            {
+                Object.DestroyImmediate(m_BakingSet);
+            }
+        }
+
+        #region Baking Set Tests
+
+        [Test]
+        public void BakingMode_Column_CellCreator_CreatesValidElement()
+        {
+            var column = new SearchColumn("test", "test", "test");
+            CoreLightingSearchSelectors.BakingModeSearchColumnProvider(column);
+
+            var element = column.cellCreator(column);
+            Assert.IsNotNull(element, "Cell creator should return a valid element");
+            Assert.IsInstanceOf<UnityEngine.UIElements.DropdownField>(element, "Should create a DropdownField");
+
+            var dropdown = (UnityEngine.UIElements.DropdownField)element;
+            Assert.AreEqual(2, dropdown.choices.Count, "Dropdown should have 2 choices");
+            Assert.Contains("Baking Set", dropdown.choices);
+            Assert.Contains("Single Scene", dropdown.choices);
+        }
+
+        [Test]
+        public void SkyOcclusionBakingSamples_Column_CellCreator_CreatesValidElement()
+        {
+            var column = new SearchColumn("test", "test", "test");
+            CoreLightingSearchSelectors.SkyOcclusionBakingSamplesSearchColumnProvider(column);
+
+            var element = column.cellCreator(column);
+            Assert.IsNotNull(element, "Cell creator should return a valid element");
+            Assert.IsInstanceOf<UnityEngine.UIElements.VisualElement>(element, "Should create a VisualElement");
+
+            var container = (UnityEngine.UIElements.VisualElement)element;
+            var slider = container.Q<UnityEngine.UIElements.SliderInt>();
+            var intField = container.Q<UnityEngine.UIElements.IntegerField>();
+            Assert.IsNotNull(slider, "Container should have a SliderInt");
+            Assert.IsNotNull(intField, "Container should have an IntegerField");
+        }
+
+        #endregion
+
+        #region Volume Tests
+
+        [Test]
+        public void VolumeMode_Column_SetterAndGetter_WorkCorrectly()
+        {
+            m_Volume.isGlobal = true;
+
+            var sceneProvider = UnityEditor.Search.SearchService.GetProvider("scene");
+            var context = UnityEditor.Search.SearchService.CreateContext("scene");
+            var searchItem = sceneProvider.CreateItem(context, $"scene:{m_TestGameObject.GetEntityId().ToString()}");
+            searchItem.data = m_TestGameObject;
+
+            var column = new SearchColumn("test", "test", "scene");
+            CoreLightingSearchSelectors.VolumeModeSearchColumnProvider(column);
+
+            var searchColumnEventArgs = new SearchColumnEventArgs(searchItem, context, column);
+            var getterResult = column.getter(searchColumnEventArgs);
+            Assert.IsNotNull(getterResult, "Getter should return a value");
+            Assert.AreEqual("Global", getterResult, "Getter should return 'Global'");
+
+            var setterArgs = new SearchColumnEventArgs(searchItem, context, column);
+            setterArgs.value = "Local";
+            column.setter(setterArgs);
+            Assert.IsFalse(m_Volume.isGlobal, "Volume should be local after setting");
+
+            setterArgs.value = "Global";
+            column.setter(setterArgs);
+            Assert.IsTrue(m_Volume.isGlobal, "Volume should be global after setting");
+        }
+
+        [Test]
+        public void VolumeMode_Column_CellCreator_CreatesValidElement()
+        {
+            var column = new SearchColumn("test", "test", "test");
+            CoreLightingSearchSelectors.VolumeModeSearchColumnProvider(column);
+
+            var element = column.cellCreator(column);
+            Assert.IsNotNull(element, "Cell creator should return a valid element");
+            Assert.IsInstanceOf<UnityEngine.UIElements.DropdownField>(element, "Should create a DropdownField");
+
+            var dropdown = (UnityEngine.UIElements.DropdownField)element;
+            Assert.AreEqual(2, dropdown.choices.Count, "Dropdown should have 2 choices");
+            Assert.Contains("Global", dropdown.choices);
+            Assert.Contains("Local", dropdown.choices);
+        }
+
+        [Test]
+        public void VolumeProfile_Column_SetterAndGetter_WorkCorrectly()
+        {
+            var testProfile = ScriptableObject.CreateInstance<VolumeProfile>();
+
+            var sceneProvider = UnityEditor.Search.SearchService.GetProvider("scene");
+            var context = UnityEditor.Search.SearchService.CreateContext("scene");
+            var searchItem = sceneProvider.CreateItem(context, $"scene:{m_TestGameObject.GetEntityId().ToString()}");
+            searchItem.data = m_TestGameObject;
+
+            var column = new SearchColumn("test", "test", "scene");
+            CoreLightingSearchSelectors.VolumeProfileSearchColumnProvider(column);
+
+            var searchColumnEventArgs = new SearchColumnEventArgs(searchItem, context, column);
+
+            var setterArgs = new SearchColumnEventArgs(searchItem, context, column);
+            setterArgs.value = testProfile;
+            column.setter(setterArgs);
+
+            var getterResult = column.getter(searchColumnEventArgs);
+            Assert.IsNotNull(getterResult, "Getter should return a value");
+            Assert.AreEqual(testProfile, getterResult, "Getter should return the VolumeProfile that was set");
+
+            Object.DestroyImmediate(testProfile);
+        }
+
+        [Test]
+        public void VolumeProfile_Column_CellCreator_CreatesValidElement()
+        {
+            var column = new SearchColumn("test", "test", "test");
+            CoreLightingSearchSelectors.VolumeProfileSearchColumnProvider(column);
+
+            var element = column.cellCreator(column);
+            Assert.IsNotNull(element, "Cell creator should return a valid element");
+            Assert.IsInstanceOf<UnityEditor.UIElements.ObjectField>(element, "Should create an ObjectField");
+
+            var objectField = (UnityEditor.UIElements.ObjectField)element;
+            Assert.AreEqual(typeof(VolumeProfile), objectField.objectType, "ObjectField should be configured for VolumeProfile type");
+            Assert.IsTrue(objectField.ClassListContains("core-lighting-search-volume-profile"), "Should have USS class applied");
+        }
+
+        #endregion
+
+        #region Light Shape Tests
+
+        [Test]
+        public void LightShape_Column_Getter_ReturnsValue()
+        {
+            var light = m_TestGameObject.AddComponent<Light>();
+            light.type = LightType.Rectangle;
+
+            var sceneProvider = UnityEditor.Search.SearchService.GetProvider("scene");
+            var context = UnityEditor.Search.SearchService.CreateContext("scene");
+            var searchItem = sceneProvider.CreateItem(context, $"scene:{m_TestGameObject.GetEntityId().ToString()}");
+            searchItem.data = m_TestGameObject;
+
+            var column = new SearchColumn("test", CoreLightingSearchSelectors.k_LightShapePath, "scene");
+            var searchColumnEventArgs = new SearchColumnEventArgs(searchItem, context, column);
+            CoreLightingSearchSelectors.LightShapeSearchColumnProvider(column);
+            var getterResult = column.getter(searchColumnEventArgs);
+            Assert.IsNotNull(getterResult, "Getter should return a value");
+            Assert.AreEqual(LightType.Rectangle, getterResult, "Getter should return Rectangle");
+        }
+
+        [Test]
+        public void LightShape_Column_Getter_WithoutLight_ReturnsNull()
+        {
+            var sceneProvider = UnityEditor.Search.SearchService.GetProvider("scene");
+            var context = UnityEditor.Search.SearchService.CreateContext("scene");
+            var searchItem = sceneProvider.CreateItem(context, $"scene:{m_TestGameObject.GetEntityId().ToString()}");
+            searchItem.data = m_TestGameObject;
+
+            var column = new SearchColumn("test", CoreLightingSearchSelectors.k_LightShapePath, "scene");
+            var searchColumnEventArgs = new SearchColumnEventArgs(searchItem, context, column);
+            CoreLightingSearchSelectors.LightShapeSearchColumnProvider(column);
+            var getterResult = column.getter(searchColumnEventArgs);
+            Assert.IsNull(getterResult, "Getter should return null for GameObject without Light component");
+        }
+
+        [Test]
+        public void LightShape_Column_Setter_UpdatesAreaLightValue()
+        {
+            var light = m_TestGameObject.AddComponent<Light>();
+            light.type = LightType.Point;
+
+            var sceneProvider = UnityEditor.Search.SearchService.GetProvider("scene");
+            var context = UnityEditor.Search.SearchService.CreateContext("scene");
+            var searchItem = sceneProvider.CreateItem(context, $"scene:{m_TestGameObject.GetEntityId().ToString()}");
+            searchItem.data = m_TestGameObject;
+
+            var column = new SearchColumn("test", CoreLightingSearchSelectors.k_LightShapePath, "scene");
+            CoreLightingSearchSelectors.LightShapeSearchColumnProvider(column);
+
+            var setterArgs = new SearchColumnEventArgs(searchItem, context, column);
+            setterArgs.value = LightType.Rectangle;
+            column.setter(setterArgs);
+            Assert.AreEqual(LightType.Rectangle, light.type, "Light should have type Rectangle after setting");
+        }
+
+        [Test]
+        public void LightShape_Column_Setter_RejectsNonApplicableLightTypes()
+        {
+            var light = m_TestGameObject.AddComponent<Light>();
+            light.type = LightType.Rectangle;
+
+            var sceneProvider = UnityEditor.Search.SearchService.GetProvider("scene");
+            var context = UnityEditor.Search.SearchService.CreateContext("scene");
+            var searchItem = sceneProvider.CreateItem(context, $"scene:{m_TestGameObject.GetEntityId().ToString()}");
+            searchItem.data = m_TestGameObject;
+
+            var column = new SearchColumn("test", CoreLightingSearchSelectors.k_LightShapePath, "scene");
+            CoreLightingSearchSelectors.LightShapeSearchColumnProvider(column);
+
+            var setterArgs = new SearchColumnEventArgs(searchItem, context, column);
+            setterArgs.value = LightType.Spot;
+            column.setter(setterArgs);
+            Assert.AreEqual(LightType.Rectangle, light.type, "Light type should not change when setting non-applicable type");
+        }
+
+        [Test]
+        public void LightShape_Column_CellCreator_CreatesValidElement()
+        {
+            var column = new SearchColumn("test", CoreLightingSearchSelectors.k_LightShapePath, "test");
+            CoreLightingSearchSelectors.LightShapeSearchColumnProvider(column);
+
+            var element = column.cellCreator(column);
+            Assert.IsNotNull(element, "Cell creator should return a valid element");
+            Assert.IsInstanceOf<UnityEngine.UIElements.VisualElement>(element, "Should create a VisualElement");
+        }
+
+        [Test]
+        public void LightShape_Column_Binder_HandlesApplicableLightTypes()
+        {
+            var light = m_TestGameObject.AddComponent<Light>();
+            light.type = LightType.Rectangle;
+
+            var sceneProvider = UnityEditor.Search.SearchService.GetProvider("scene");
+            var context = UnityEditor.Search.SearchService.CreateContext("scene");
+            var searchItem = sceneProvider.CreateItem(context, $"scene:{m_TestGameObject.GetEntityId().ToString()}");
+            searchItem.data = m_TestGameObject;
+
+            var column = new SearchColumn("test", CoreLightingSearchSelectors.k_LightShapePath, "scene");
+            CoreLightingSearchSelectors.LightShapeSearchColumnProvider(column);
+
+            var searchColumnEventArgs = new SearchColumnEventArgs(searchItem, context, column);
+            var getterResult = column.getter(searchColumnEventArgs);
+
+            var element = column.cellCreator(column);
+            var binderArgs = new SearchColumnEventArgs(searchItem, context, column) { value = getterResult };
+            Assert.DoesNotThrow(() => column.binder(binderArgs, element), "Binder should not throw for applicable light types");
+        }
+
+        [Test]
+        public void LightShape_Column_Binder_HidesNonApplicableLightTypes()
+        {
+            var light = m_TestGameObject.AddComponent<Light>();
+            light.type = LightType.Spot;
+
+            var sceneProvider = UnityEditor.Search.SearchService.GetProvider("scene");
+            var context = UnityEditor.Search.SearchService.CreateContext("scene");
+            var searchItem = sceneProvider.CreateItem(context, $"scene:{m_TestGameObject.GetEntityId().ToString()}");
+            searchItem.data = m_TestGameObject;
+
+            var column = new SearchColumn("test", CoreLightingSearchSelectors.k_LightShapePath, "scene");
+            CoreLightingSearchSelectors.LightShapeSearchColumnProvider(column);
+
+            var searchColumnEventArgs = new SearchColumnEventArgs(searchItem, context, column);
+            var getterResult = column.getter(searchColumnEventArgs);
+
+            var element = column.cellCreator(column);
+            var binderArgs = new SearchColumnEventArgs(searchItem, context, column) { value = getterResult };
+            column.binder(binderArgs, element);
+
+            Assert.IsFalse(element.visible, "Element should be hidden for non-applicable light types (Spot)");
+        }
+
+        #endregion
+
+        #region Integration Tests
+
+        [Test]
+        public void AllCoreColumns_HaveValidConfiguration()
+        {
+            var columnTypes = new[]
+            {
+                CoreLightingSearchSelectors.k_BakingModePath,
+                CoreLightingSearchSelectors.k_SkyOcclusionBakingSamplesPath,
+                CoreLightingSearchSelectors.k_VolumeModePath,
+                CoreLightingSearchSelectors.k_VolumeProfilePath,
+                CoreLightingSearchSelectors.k_LightShapePath
+            };
+
+            foreach (var columnType in columnTypes)
+            {
+                var column = new SearchColumn("test", columnType, "test");
+
+                Assert.DoesNotThrow(() =>
+                {
+                    switch (columnType)
+                    {
+                        case "BakingSets/BakingMode":
+                            CoreLightingSearchSelectors.BakingModeSearchColumnProvider(column);
+                            break;
+                        case "BakingSets/SkyOcclusionBakingSamples":
+                            CoreLightingSearchSelectors.SkyOcclusionBakingSamplesSearchColumnProvider(column);
+                            break;
+                        case "Volume/Mode":
+                            CoreLightingSearchSelectors.VolumeModeSearchColumnProvider(column);
+                            break;
+                        case "Volume/Profile":
+                            CoreLightingSearchSelectors.VolumeProfileSearchColumnProvider(column);
+                            break;
+                        case "Light/Shape":
+                            CoreLightingSearchSelectors.LightShapeSearchColumnProvider(column);
+                            break;
+                    }
+                }, $"Column initialization for {columnType} should not throw");
+
+                Assert.IsNotNull(column.getter, $"Column {columnType} should have a getter");
+                Assert.IsNotNull(column.setter, $"Column {columnType} should have a setter");
+                Assert.IsNotNull(column.cellCreator, $"Column {columnType} should have a cell creator");
+                Assert.IsNotNull(column.binder, $"Column {columnType} should have a binder");
+            }
+        }
+
+        #endregion
+    }
+}
diff --git a/Packages/com.unity.render-pipelines.core/Tests/Editor/CoreLightingSearchSelectorsTests.cs.meta b/Packages/com.unity.render-pipelines.core/Tests/Editor/CoreLightingSearchSelectorsTests.cs.meta
new file mode 100644
index 00000000000..2f0d7173bf6
--- /dev/null
+++ b/Packages/com.unity.render-pipelines.core/Tests/Editor/CoreLightingSearchSelectorsTests.cs.meta
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: 31fbdf2532dda4bee96be95759cd3e19
\ No newline at end of file
diff --git a/Packages/com.unity.render-pipelines.core/Tests/Editor/Debugging/DebugPanelRenderingDebuggerTests.cs b/Packages/com.unity.render-pipelines.core/Tests/Editor/Debugging/DebugPanelRenderingDebuggerTests.cs
index 0cef6ae8b03..9b66202afe2 100644
--- a/Packages/com.unity.render-pipelines.core/Tests/Editor/Debugging/DebugPanelRenderingDebuggerTests.cs
+++ b/Packages/com.unity.render-pipelines.core/Tests/Editor/Debugging/DebugPanelRenderingDebuggerTests.cs
@@ -191,8 +191,6 @@ private void CheckWidgetCreatesVisualElement(DebugUI.Widget widget, DebugUI.Cont
             Assert.IsNotNull(visualElement, $"{widgetName} should create non-null VisualElement");
         }
 
-        #region Value Get/Set Tests
-
         static TestCaseData[] GetSetFieldTestCases()
         {
             var testData = new DebugPanelDisplaySettings.DebugPanelDisplaySettingsData();
@@ -389,10 +387,6 @@ private void AssertEqual<T>(T expected, T actual, string message)
             }
         }
 
-        #endregion
-
-        #region isHiddenCallback Tests
-
         [Test]
         public void NumberHiddenFields_ShouldBeHidden_WhenBothConditionsAreMet()
         {
@@ -456,7 +450,199 @@ public void EnumHiddenFields_ShouldBeHidden_WhenEnumIsNone()
             data.enumField = EnumValues.TypeC;
             Assert.IsFalse(widget.isHiddenCallback(), "Container should be visible when enumField is TypeC");
         }
-        #endregion
+
+        [Test]
+        public void SearchFilter_MatchesBasicText()
+        {
+            var widget = WidgetFactory.CreateIntField(data);
+            widget.displayName = "Test Widget";
+
+            var visualElement = widget.ToVisualElement(DebugUI.Context.Editor);
+            var textElements = visualElement.Query<TextElement>(className: "debug-window-search-filter-target").ToList();
+
+            var cache = new Dictionary<DebugUI.Widget, WidgetSearchData>
+            {
+                [widget] = new WidgetSearchData(textElements, string.Empty)
+            };
+
+            DebugWindow.PerformSearch(cache, "test", hideRootElementIfNoMatch: true);
+
+            Assert.IsFalse(widget.m_IsHiddenBySearchFilter);
+            Assert.IsTrue(textElements[0].text.Contains("<mark="));
+        }
+
+        [Test]
+        public void SearchFilter_HidesNonMatchingWidget()
+        {
+            var widget = WidgetFactory.CreateIntField(data);
+            widget.displayName = "Alpha";
+
+            var visualElement = widget.ToVisualElement(DebugUI.Context.Editor);
+            var textElements = visualElement.Query<TextElement>(className: "debug-window-search-filter-target").ToList();
+
+            var cache = new Dictionary<DebugUI.Widget, WidgetSearchData>
+            {
+                [widget] = new WidgetSearchData(textElements, string.Empty)
+            };
+
+            DebugWindow.PerformSearch(cache, "beta", hideRootElementIfNoMatch: true);
+
+            Assert.IsTrue(widget.m_IsHiddenBySearchFilter);
+            Assert.IsFalse(textElements[0].text.Contains("<mark="));
+        }
+
+        [Test]
+        public void SearchFilter_MatchesAdditionalSearchText()
+        {
+            var widget = WidgetFactory.CreateEnumField(data);
+            widget.displayName = "Mode";
+
+            var visualElement = widget.ToVisualElement(DebugUI.Context.Editor);
+            var textElements = visualElement.Query<TextElement>(className: "debug-window-search-filter-target").ToList();
+            string aggregatedText = DebugWindow.CollectAggregatedAdditionalSearchText(widget);
+
+            var cache = new Dictionary<DebugUI.Widget, WidgetSearchData>
+            {
+                [widget] = new WidgetSearchData(textElements, aggregatedText)
+            };
+
+            DebugWindow.PerformSearch(cache, "Type A", hideRootElementIfNoMatch: true);
+
+            Assert.IsFalse(widget.m_IsHiddenBySearchFilter);
+        }
+
+        [Test]
+        public void SearchFilter_ContainerVisibilityWithMatchingChild()
+        {
+            var container = new DebugUI.Foldout { displayName = "Container" };
+            var child = WidgetFactory.CreateIntField(data);
+            child.displayName = "Matching Child";
+            container.children.Add(child);
+
+            var containerVisualElement = container.ToVisualElement(DebugUI.Context.Editor);
+            var childVisualElement = child.ToVisualElement(DebugUI.Context.Editor);
+
+            var containerTextElements = containerVisualElement.Query<TextElement>(className: "debug-window-search-filter-target").ToList();
+            var childTextElements = childVisualElement.Query<TextElement>(className: "debug-window-search-filter-target").ToList();
+
+            var cache = new Dictionary<DebugUI.Widget, WidgetSearchData>
+            {
+                [container] = new WidgetSearchData(containerTextElements, DebugWindow.CollectAggregatedAdditionalSearchText(container)),
+                [child] = new WidgetSearchData(childTextElements, DebugWindow.CollectAggregatedAdditionalSearchText(child))
+            };
+
+            DebugWindow.PerformSearch(cache, "Matching", hideRootElementIfNoMatch: true);
+
+            Assert.IsFalse(container.m_IsHiddenBySearchFilter);
+            Assert.IsFalse(child.m_IsHiddenBySearchFilter);
+        }
+
+        [Test]
+        public void SearchFilter_ChildVisibleWhenParentDoesntMatch()
+        {
+            var container = new DebugUI.Foldout { displayName = "Container" };
+            var child = WidgetFactory.CreateIntField(data);
+            child.displayName = "MatchingChild";
+            container.children.Add(child);
+
+            var containerVisualElement = container.ToVisualElement(DebugUI.Context.Editor);
+            var childVisualElement = child.ToVisualElement(DebugUI.Context.Editor);
+
+            var containerTextElements = containerVisualElement.Query<TextElement>(className: "debug-window-search-filter-target").ToList();
+            var childTextElements = childVisualElement.Query<TextElement>(className: "debug-window-search-filter-target").ToList();
+
+            var cache = new Dictionary<DebugUI.Widget, WidgetSearchData>
+            {
+                [container] = new WidgetSearchData(containerTextElements, DebugWindow.CollectAggregatedAdditionalSearchText(container)),
+                [child] = new WidgetSearchData(childTextElements, DebugWindow.CollectAggregatedAdditionalSearchText(child))
+            };
+
+            DebugWindow.PerformSearch(cache, "MatchingChild", hideRootElementIfNoMatch: true);
+
+            Assert.IsFalse(child.m_IsHiddenBySearchFilter);
+            Assert.IsFalse(container.m_IsHiddenBySearchFilter);
+        }
+
+        [Test]
+        public void SearchFilter_ChildVisibleViaAdditionalTextWhenParentDoesntMatch()
+        {
+            var container = new DebugUI.Foldout { displayName = "Container" };
+            var child = WidgetFactory.CreateEnumField(data);
+            child.displayName = "EnumMode";
+            container.children.Add(child);
+
+            var containerVisualElement = container.ToVisualElement(DebugUI.Context.Editor);
+            var childVisualElement = child.ToVisualElement(DebugUI.Context.Editor);
+
+            var containerTextElements = containerVisualElement.Query<TextElement>(className: "debug-window-search-filter-target").ToList();
+            var childTextElements = childVisualElement.Query<TextElement>(className: "debug-window-search-filter-target").ToList();
+
+            var cache = new Dictionary<DebugUI.Widget, WidgetSearchData>
+            {
+                [container] = new WidgetSearchData(containerTextElements, DebugWindow.CollectAggregatedAdditionalSearchText(container)),
+                [child] = new WidgetSearchData(childTextElements, DebugWindow.CollectAggregatedAdditionalSearchText(child))
+            };
+
+            DebugWindow.PerformSearch(cache, "Type B", hideRootElementIfNoMatch: true);
+
+            Assert.IsFalse(child.m_IsHiddenBySearchFilter);
+            Assert.IsFalse(container.m_IsHiddenBySearchFilter);
+        }
+
+        [Test]
+        public void SearchFilter_CaseInsensitiveMatching()
+        {
+            var widget = WidgetFactory.CreateIntField(data);
+            widget.displayName = "TestWidget";
+
+            var visualElement = widget.ToVisualElement(DebugUI.Context.Editor);
+            var textElements = visualElement.Query<TextElement>(className: "debug-window-search-filter-target").ToList();
+
+            var cache = new Dictionary<DebugUI.Widget, WidgetSearchData>
+            {
+                [widget] = new WidgetSearchData(textElements, string.Empty)
+            };
+
+            string[] searchStrings = { "testwidget", "TESTWIDGET", "TeStWiDgEt" };
+
+            foreach (var searchString in searchStrings)
+            {
+                widget.m_IsHiddenBySearchFilter = false;
+                DebugWindow.PerformSearch(cache, searchString, hideRootElementIfNoMatch: true);
+                Assert.IsFalse(widget.m_IsHiddenBySearchFilter);
+            }
+        }
+
+        [Test]
+        public void SearchFilter_EmptySearchShowsAll()
+        {
+            var widget1 = WidgetFactory.CreateIntField(data);
+            widget1.displayName = "Alpha";
+            var widget2 = WidgetFactory.CreateIntField(data);
+            widget2.displayName = "Beta";
+
+            var visualElement1 = widget1.ToVisualElement(DebugUI.Context.Editor);
+            var visualElement2 = widget2.ToVisualElement(DebugUI.Context.Editor);
+
+            var textElements1 = visualElement1.Query<TextElement>(className: "debug-window-search-filter-target").ToList();
+            var textElements2 = visualElement2.Query<TextElement>(className: "debug-window-search-filter-target").ToList();
+
+            var cache = new Dictionary<DebugUI.Widget, WidgetSearchData>
+            {
+                [widget1] = new WidgetSearchData(textElements1, string.Empty),
+                [widget2] = new WidgetSearchData(textElements2, string.Empty)
+            };
+
+            DebugWindow.PerformSearch(cache, "Alpha", hideRootElementIfNoMatch: true);
+
+            Assert.IsFalse(widget1.m_IsHiddenBySearchFilter);
+            Assert.IsTrue(widget2.m_IsHiddenBySearchFilter);
+
+            DebugWindow.PerformSearch(cache, "", hideRootElementIfNoMatch: true);
+
+            Assert.IsFalse(widget1.m_IsHiddenBySearchFilter);
+            Assert.IsFalse(widget2.m_IsHiddenBySearchFilter);
+        }
     }
 }
 #endif
diff --git a/Packages/com.unity.render-pipelines.core/Tests/Editor/Debugging/PanelNameAndOrderTests.cs b/Packages/com.unity.render-pipelines.core/Tests/Editor/Debugging/PanelNameAndOrderTests.cs
index 09514e0ac4e..dd714946cb1 100644
--- a/Packages/com.unity.render-pipelines.core/Tests/Editor/Debugging/PanelNameAndOrderTests.cs
+++ b/Packages/com.unity.render-pipelines.core/Tests/Editor/Debugging/PanelNameAndOrderTests.cs
@@ -112,6 +112,7 @@ public void TestOrderAndPanelName()
         {
             var debugDisplaySettingsUI = new DebugDisplaySettingsUI();
             debugDisplaySettingsUI.RegisterDebug(TestDebugDisplaySettings.Instance);
+            debugDisplaySettingsUI.InitializeDebugUI();
 
             var panelTest1Index = DebugManager.instance.PanelIndex("Test 1");
             Assert.IsTrue(panelTest1Index >= 0);
diff --git a/Packages/com.unity.render-pipelines.core/Tests/Editor/EditorExampleTest.cs b/Packages/com.unity.render-pipelines.core/Tests/Editor/EditorExampleTest.cs
deleted file mode 100644
index a2d55421ede..00000000000
--- a/Packages/com.unity.render-pipelines.core/Tests/Editor/EditorExampleTest.cs
+++ /dev/null
@@ -1,24 +0,0 @@
-using UnityEngine;
-using UnityEditor;
-using UnityEngine.TestTools;
-using NUnit.Framework;
-using System.Collections;
-
-class EditorExampleTest
-{
-    [Test]
-    public void EditorSampleTestSimplePasses()
-    {
-        // Use the Assert class to test conditions.
-    }
-
-    // A UnityTest behaves like a coroutine in PlayMode
-    // and allows you to yield null to skip a frame in EditMode
-    [UnityTest]
-    public IEnumerator EditorSampleTestWithEnumeratorPasses()
-    {
-        // Use the Assert class to test conditions.
-        // yield to skip a frame
-        yield return null;
-    }
-}
diff --git a/Packages/com.unity.render-pipelines.core/Tests/Editor/EditorExampleTest.cs.meta b/Packages/com.unity.render-pipelines.core/Tests/Editor/EditorExampleTest.cs.meta
deleted file mode 100644
index 1e470ae9a25..00000000000
--- a/Packages/com.unity.render-pipelines.core/Tests/Editor/EditorExampleTest.cs.meta
+++ /dev/null
@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: 87e6389ce577ca74aa755fb446fe8ca0
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/Packages/com.unity.render-pipelines.core/Tests/Editor/GPUDriven/GPUDrivenRenderingTests.cs b/Packages/com.unity.render-pipelines.core/Tests/Editor/GPUDriven/GPUDrivenRenderingTests.cs
index ce4acbc4464..8a46a30d4f7 100644
--- a/Packages/com.unity.render-pipelines.core/Tests/Editor/GPUDriven/GPUDrivenRenderingTests.cs
+++ b/Packages/com.unity.render-pipelines.core/Tests/Editor/GPUDriven/GPUDrivenRenderingTests.cs
@@ -522,6 +522,7 @@ public void TestCPULODSelection()
         }
 
         [Test, ConditionalIgnore("IgnoreGfxAPI", "Graphics API Not Supported.")]
+        [Ignore("Unstable - see https://jira.unity3d.com/browse/UUM-134437")]
         public void TestCPULODCrossfade()
         {
             if (Coverage.enabled)
@@ -672,6 +673,7 @@ public void TestCPULODCrossfade()
         }
 
         [Test, ConditionalIgnore("IgnoreGfxAPI", "Graphics API Not Supported.")]
+        [Ignore("Unstable - see https://jira.unity3d.com/browse/UUM-134437")]
         public void TestGpuDrivenSmallMeshCulling()
         {
             if (Coverage.enabled)
diff --git a/Packages/com.unity.render-pipelines.core/Tests/Editor/PathTracing/UVFallbackBufferTests.cs b/Packages/com.unity.render-pipelines.core/Tests/Editor/PathTracing/UVFallbackBufferTests.cs
index c4f6fddc894..29c33e1413c 100644
--- a/Packages/com.unity.render-pipelines.core/Tests/Editor/PathTracing/UVFallbackBufferTests.cs
+++ b/Packages/com.unity.render-pipelines.core/Tests/Editor/PathTracing/UVFallbackBufferTests.cs
@@ -422,9 +422,9 @@ public void Build_QuadWithNonSquareUVs_AllCoveredTexelsAreOccupied([ValueSource(
             mesh.uv = new[]
             {
                 new Vector2(0, 0),
-                new Vector2(0.501f, 0), // Cover the 2 rightmost texels by only a tiny amount
+                new Vector2(0.51f, 0), // Cover the 2 rightmost texels by only a tiny amount (must exceed INSIDE_EPS in screen-space units)
                 new Vector2(0, 1),
-                new Vector2(0.501f, 1)
+                new Vector2(0.51f, 1)
             };
 
             UVFallbackBufferResources.GetUVFallbackBuffer(_resources, mesh, buildFlags, width, height, out Color[] fallbackData);
diff --git a/Packages/com.unity.render-pipelines.core/Tests/Editor/RenderGraphViewerTests.cs b/Packages/com.unity.render-pipelines.core/Tests/Editor/RenderGraphViewerTests.cs
index 2d9da40b799..f28d746bdb2 100644
--- a/Packages/com.unity.render-pipelines.core/Tests/Editor/RenderGraphViewerTests.cs
+++ b/Packages/com.unity.render-pipelines.core/Tests/Editor/RenderGraphViewerTests.cs
@@ -83,7 +83,7 @@ static IEnumerable<TestCaseData> SearchFilterTestCases()
         {
             // To simplify the test, we use square brackets "[]" to indicate search match highlight.
             string FormatWithSearchTag(string str) =>
-                str.Replace("[", RenderGraphViewer.k_SelectionColorBeginTag).Replace("]", RenderGraphViewer.k_SelectionColorEndTag);
+                str.Replace("[", UIElementSearchFilter.k_SelectionColorBeginTag).Replace("]", UIElementSearchFilter.k_SelectionColorEndTag);
 
             TestCaseData MakeTestCase(string content, string searchString, string result, bool isMatch)
             {
diff --git a/Packages/com.unity.render-pipelines.core/Tests/Editor/UnifiedRayTracing/TraceRays.urtshader b/Packages/com.unity.render-pipelines.core/Tests/Editor/UnifiedRayTracing/TraceRays.urtshader
index 3db863cbcf5..4f17278e468 100644
--- a/Packages/com.unity.render-pipelines.core/Tests/Editor/UnifiedRayTracing/TraceRays.urtshader
+++ b/Packages/com.unity.render-pipelines.core/Tests/Editor/UnifiedRayTracing/TraceRays.urtshader
@@ -1,6 +1,7 @@
 #define UNIFIED_RT_GROUP_SIZE_X 16
 #define UNIFIED_RT_GROUP_SIZE_Y 8
 #include "Packages/com.unity.render-pipelines.core/Runtime/UnifiedRayTracing/TraceRayAndQueryHit.hlsl"
+#pragma exclude_renderers webgpu
 
 UNIFIED_RT_DECLARE_ACCEL_STRUCT(_AccelStruct);
 
diff --git a/Packages/com.unity.render-pipelines.core/Tests/Editor/UnifiedRayTracing/TraceRaysAndFetchAttributes.urtshader b/Packages/com.unity.render-pipelines.core/Tests/Editor/UnifiedRayTracing/TraceRaysAndFetchAttributes.urtshader
index f02b22e9f87..1099b1e88ad 100644
--- a/Packages/com.unity.render-pipelines.core/Tests/Editor/UnifiedRayTracing/TraceRaysAndFetchAttributes.urtshader
+++ b/Packages/com.unity.render-pipelines.core/Tests/Editor/UnifiedRayTracing/TraceRaysAndFetchAttributes.urtshader
@@ -2,6 +2,7 @@
 #define UNIFIED_RT_GROUP_SIZE_Y 8
 #include "Packages/com.unity.render-pipelines.core/Runtime/UnifiedRayTracing/FetchGeometry.hlsl"
 #include "Packages/com.unity.render-pipelines.core/Runtime/UnifiedRayTracing/TraceRayAndQueryHit.hlsl"
+#pragma exclude_renderers webgpu
 
 UNIFIED_RT_DECLARE_ACCEL_STRUCT(_AccelStruct);
 
diff --git a/Packages/com.unity.render-pipelines.core/Tests/Editor/UnifiedRayTracing/TraceTransparentRays.urtshader b/Packages/com.unity.render-pipelines.core/Tests/Editor/UnifiedRayTracing/TraceTransparentRays.urtshader
index e48955c6954..f834bc9347f 100644
--- a/Packages/com.unity.render-pipelines.core/Tests/Editor/UnifiedRayTracing/TraceTransparentRays.urtshader
+++ b/Packages/com.unity.render-pipelines.core/Tests/Editor/UnifiedRayTracing/TraceTransparentRays.urtshader
@@ -5,6 +5,7 @@
 #define UNIFIED_RT_RAYGEN_FUNC RayGenExecute
 #define UNIFIED_RT_CLOSESTHIT_FUNC ClosestHitExecute
 #define UNIFIED_RT_ANYHIT_FUNC AnyHitExecute
+#pragma exclude_renderers webgpu
 
 struct RayPayload
 {
diff --git a/Packages/com.unity.render-pipelines.core/Tests/Runtime/.buginfo b/Packages/com.unity.render-pipelines.core/Tests/Runtime/.buginfo
index c0979152f33..c8ea5a54281 100644
--- a/Packages/com.unity.render-pipelines.core/Tests/Runtime/.buginfo
+++ b/Packages/com.unity.render-pipelines.core/Tests/Runtime/.buginfo
@@ -17,4 +17,4 @@ xr:
   when:
     path:
       - ^.*XRSubsystem.*$
-  area: SRP XR
+  area: Graphics XR
diff --git a/Packages/com.unity.render-pipelines.core/Tests/Runtime/PathTracing/PathIteratorTest.urtshader b/Packages/com.unity.render-pipelines.core/Tests/Runtime/PathTracing/PathIteratorTest.urtshader
index 2793f3d1053..66cbb6b18cc 100644
--- a/Packages/com.unity.render-pipelines.core/Tests/Runtime/PathTracing/PathIteratorTest.urtshader
+++ b/Packages/com.unity.render-pipelines.core/Tests/Runtime/PathTracing/PathIteratorTest.urtshader
@@ -4,7 +4,7 @@
 
 #include "Packages/com.unity.render-pipelines.core/Runtime/PathTracing/Shaders/PathTracing.hlsl"
 
-#pragma exclude_renderers switch switch2
+#pragma exclude_renderers switch switch2 webgpu
 
 uint g_SampleCount;
 
diff --git a/Packages/com.unity.render-pipelines.core/Tests/Runtime/PathTracing/PathIteratorTests.cs b/Packages/com.unity.render-pipelines.core/Tests/Runtime/PathTracing/PathIteratorTests.cs
index f56cfc0fbbb..6a3ba0a4e15 100644
--- a/Packages/com.unity.render-pipelines.core/Tests/Runtime/PathTracing/PathIteratorTests.cs
+++ b/Packages/com.unity.render-pipelines.core/Tests/Runtime/PathTracing/PathIteratorTests.cs
@@ -118,6 +118,7 @@ public void TearDown()
         [TestCase(10, 20, 30, 8u)]
         [TestCase(0, 42, 0, 1u)]
         [TestCase(0, 42, 0, 8u)]
+        [Ignore("Unstable: https://jira.unity3d.com/browse/UUM-134752")]
         public void EmptyWorldWithEnvironmentLight_ShouldOutputEnvironmentLight(float envRed, float envGreen, float envBlue, uint sampleCount)
         {
             using var deviceInputBuffer = new GraphicsBuffer(GraphicsBuffer.Target.Structured, 1, Marshal.SizeOf<TestRay>());
diff --git a/Packages/com.unity.render-pipelines.core/Tests/Runtime/RuntimeExampleTest.cs b/Packages/com.unity.render-pipelines.core/Tests/Runtime/RuntimeExampleTest.cs
deleted file mode 100644
index a697d48d3ce..00000000000
--- a/Packages/com.unity.render-pipelines.core/Tests/Runtime/RuntimeExampleTest.cs
+++ /dev/null
@@ -1,24 +0,0 @@
-using UnityEngine;
-using UnityEngine.TestTools;
-using NUnit.Framework;
-using System.Collections;
-
-class RuntimeExampleTest
-{
-    [Test]
-    public void PlayModeSampleTestSimplePasses()
-    {
-        // Use the Assert class to test conditions.
-    }
-
-    // A UnityTest behaves like a coroutine in PlayMode
-    // and allows you to yield null to skip a frame in EditMode
-    [UnityTest]
-    [Ignore("Unstable: https://jira.unity3d.com/browse/UUM-102848")]
-    public IEnumerator PlayModeSampleTestWithEnumeratorPasses()
-    {
-        // Use the Assert class to test conditions.
-        // yield to skip a frame
-        yield return null;
-    }
-}
diff --git a/Packages/com.unity.render-pipelines.core/Tests/Runtime/RuntimeExampleTest.cs.meta b/Packages/com.unity.render-pipelines.core/Tests/Runtime/RuntimeExampleTest.cs.meta
deleted file mode 100644
index 2e4eb1b9fe1..00000000000
--- a/Packages/com.unity.render-pipelines.core/Tests/Runtime/RuntimeExampleTest.cs.meta
+++ /dev/null
@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: 4a99028421222694897393dabe2744fb
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/Packages/com.unity.render-pipelines.core/Tests/Runtime/RuntimeProfilerTests.cs b/Packages/com.unity.render-pipelines.core/Tests/Runtime/RuntimeProfilerTests.cs
index 3470f0a2e2f..15d093325f1 100644
--- a/Packages/com.unity.render-pipelines.core/Tests/Runtime/RuntimeProfilerTests.cs
+++ b/Packages/com.unity.render-pipelines.core/Tests/Runtime/RuntimeProfilerTests.cs
@@ -54,7 +54,7 @@ protected IEnumerator Warmup()
     // Fails on WebGL, Oculus Quest and Switch.
     // Unfortunately, there is no good way to exclude Oculus Quest from the test without excluding all Android devices.
     // https://jira.unity3d.com/browse/GFXFOUND-559
-    [UnityPlatform(exclude = new RuntimePlatform[] { RuntimePlatform.WebGLPlayer, RuntimePlatform.Android, RuntimePlatform.Switch })]
+    [UnityPlatform(exclude = new RuntimePlatform[] { RuntimePlatform.WebGLPlayer, RuntimePlatform.Android, RuntimePlatform.Switch, RuntimePlatform.WindowsEditor })] // Unstable on WindowsEditor: https://jira.unity3d.com/browse/UUM-135231
     class RuntimeProfilerTests : RuntimeProfilerTestBase
     {
         [UnityTest]
diff --git a/Packages/com.unity.render-pipelines.core/package.json b/Packages/com.unity.render-pipelines.core/package.json
index 3eb42c61025..af9ac05947e 100644
--- a/Packages/com.unity.render-pipelines.core/package.json
+++ b/Packages/com.unity.render-pipelines.core/package.json
@@ -1,8 +1,8 @@
 {
   "name": "com.unity.render-pipelines.core",
   "description": "SRP Core makes it easier to create or customize a Scriptable Render Pipeline (SRP). SRP Core contains reusable code, including boilerplate code for working with platform-specific graphics APIs, utility functions for common rendering operations, and  shader libraries. The code in SRP Core is use by the High Definition Render Pipeline (HDRP) and Universal Render Pipeline (URP). If you are creating a custom SRP from scratch or customizing a prebuilt SRP, using SRP Core will save you time.",
-  "version": "17.5.0",
-  "unity": "6000.5",
+  "version": "17.6.0",
+  "unity": "6000.6",
   "displayName": "Scriptable Render Pipeline Core",
   "dependencies": {
     "com.unity.burst": "1.8.14",
diff --git a/Packages/com.unity.render-pipelines.high-definition-config/CHANGELOG.md b/Packages/com.unity.render-pipelines.high-definition-config/CHANGELOG.md
index 13be9527103..61741b6ad10 100644
--- a/Packages/com.unity.render-pipelines.high-definition-config/CHANGELOG.md
+++ b/Packages/com.unity.render-pipelines.high-definition-config/CHANGELOG.md
@@ -10,6 +10,12 @@ 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.
 
+## [17.5.0] - 2026-02-18
+
+This version is compatible with Unity 6000.6.0a7.
+
+For the release notes, refer to the [Unity download archive](https://unity.com/releases/editor/archive)
+
 ## [17.4.0] - 2025-10-22
 
 This version is compatible with Unity 6000.4.0a4.
diff --git a/Packages/com.unity.render-pipelines.high-definition-config/Runtime/ShaderConfig.cs b/Packages/com.unity.render-pipelines.high-definition-config/Runtime/ShaderConfig.cs
index 06755730135..2d607830bcf 100644
--- a/Packages/com.unity.render-pipelines.high-definition-config/Runtime/ShaderConfig.cs
+++ b/Packages/com.unity.render-pipelines.high-definition-config/Runtime/ShaderConfig.cs
@@ -28,7 +28,7 @@ internal enum PathTracingLightListSizes
     /// Project-wide shader configuration options.
     /// </summary>
     /// <remarks>This enum will generate the proper shader defines.</remarks>
-    ///<seealso cref="ShaderConfig"/>
+    /// <seealso cref="ShaderConfig"/>
     [GenerateHLSL(PackingRules.Exact)]
     public enum ShaderOptions
     {
diff --git a/Packages/com.unity.render-pipelines.high-definition-config/package.json b/Packages/com.unity.render-pipelines.high-definition-config/package.json
index 8678506ac1f..a195f1e6bd4 100644
--- a/Packages/com.unity.render-pipelines.high-definition-config/package.json
+++ b/Packages/com.unity.render-pipelines.high-definition-config/package.json
@@ -1,10 +1,10 @@
 {
   "name": "com.unity.render-pipelines.high-definition-config",
   "description": "Configuration files for the High Definition Render Pipeline.",
-  "version": "17.5.0",
-  "unity": "6000.5",
+  "version": "17.6.0",
+  "unity": "6000.6",
   "displayName": "High Definition Render Pipeline Config",
   "dependencies": {
-    "com.unity.render-pipelines.core": "17.5.0"
+    "com.unity.render-pipelines.core": "17.6.0"
   }
 }
\ No newline at end of file
diff --git a/Packages/com.unity.render-pipelines.high-definition/CHANGELOG.md b/Packages/com.unity.render-pipelines.high-definition/CHANGELOG.md
index ce77ad0dd96..61a74ca5d88 100644
--- a/Packages/com.unity.render-pipelines.high-definition/CHANGELOG.md
+++ b/Packages/com.unity.render-pipelines.high-definition/CHANGELOG.md
@@ -10,6 +10,12 @@ 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.
 
+## [17.5.0] - 2026-02-18
+
+This version is compatible with Unity 6000.6.0a7.
+
+For the release notes, refer to the [Unity download archive](https://unity.com/releases/editor/archive).
+
 ## [17.4.0] - 2025-10-22
 
 This version is compatible with Unity 6000.4.0a4.
diff --git a/Packages/com.unity.render-pipelines.high-definition/Documentation~/Images/TerrainPaintHoles.PNG b/Packages/com.unity.render-pipelines.high-definition/Documentation~/Images/TerrainPaintHoles.png
similarity index 100%
rename from Packages/com.unity.render-pipelines.high-definition/Documentation~/Images/TerrainPaintHoles.PNG
rename to Packages/com.unity.render-pipelines.high-definition/Documentation~/Images/TerrainPaintHoles.png
diff --git a/Packages/com.unity.render-pipelines.high-definition/Documentation~/Images/WaterMask_ExempleRender.PNG b/Packages/com.unity.render-pipelines.high-definition/Documentation~/Images/WaterMask_ExempleRender.png
similarity index 100%
rename from Packages/com.unity.render-pipelines.high-definition/Documentation~/Images/WaterMask_ExempleRender.PNG
rename to Packages/com.unity.render-pipelines.high-definition/Documentation~/Images/WaterMask_ExempleRender.png
diff --git a/Packages/com.unity.render-pipelines.high-definition/Documentation~/Images/WhatsNew16_pathtraceddecals.PNG b/Packages/com.unity.render-pipelines.high-definition/Documentation~/Images/WhatsNew16_pathtraceddecals.png
similarity index 100%
rename from Packages/com.unity.render-pipelines.high-definition/Documentation~/Images/WhatsNew16_pathtraceddecals.PNG
rename to Packages/com.unity.render-pipelines.high-definition/Documentation~/Images/WhatsNew16_pathtraceddecals.png
diff --git a/Packages/com.unity.render-pipelines.high-definition/Documentation~/Images/hair-kajiya.PNG b/Packages/com.unity.render-pipelines.high-definition/Documentation~/Images/hair-kajiya.png
similarity index 100%
rename from Packages/com.unity.render-pipelines.high-definition/Documentation~/Images/hair-kajiya.PNG
rename to Packages/com.unity.render-pipelines.high-definition/Documentation~/Images/hair-kajiya.png
diff --git a/Packages/com.unity.render-pipelines.high-definition/Documentation~/Images/hair-marschner.PNG b/Packages/com.unity.render-pipelines.high-definition/Documentation~/Images/hair-marschner.png
similarity index 100%
rename from Packages/com.unity.render-pipelines.high-definition/Documentation~/Images/hair-marschner.PNG
rename to Packages/com.unity.render-pipelines.high-definition/Documentation~/Images/hair-marschner.png
diff --git a/Packages/com.unity.render-pipelines.high-definition/Documentation~/Images/probevolumes-debug-displayprobebricks1.PNG b/Packages/com.unity.render-pipelines.high-definition/Documentation~/Images/probevolumes-debug-displayprobebricks1.png
similarity index 100%
rename from Packages/com.unity.render-pipelines.high-definition/Documentation~/Images/probevolumes-debug-displayprobebricks1.PNG
rename to Packages/com.unity.render-pipelines.high-definition/Documentation~/Images/probevolumes-debug-displayprobebricks1.png
diff --git a/Packages/com.unity.render-pipelines.high-definition/Documentation~/Images/probevolumes-debug-displayprobecells.PNG b/Packages/com.unity.render-pipelines.high-definition/Documentation~/Images/probevolumes-debug-displayprobecells.png
similarity index 100%
rename from Packages/com.unity.render-pipelines.high-definition/Documentation~/Images/probevolumes-debug-displayprobecells.PNG
rename to Packages/com.unity.render-pipelines.high-definition/Documentation~/Images/probevolumes-debug-displayprobecells.png
diff --git a/Packages/com.unity.render-pipelines.high-definition/Documentation~/Images/probevolumes-debug-displayprobes.PNG b/Packages/com.unity.render-pipelines.high-definition/Documentation~/Images/probevolumes-debug-displayprobes.png
similarity index 100%
rename from Packages/com.unity.render-pipelines.high-definition/Documentation~/Images/probevolumes-debug-displayprobes.PNG
rename to Packages/com.unity.render-pipelines.high-definition/Documentation~/Images/probevolumes-debug-displayprobes.png
diff --git a/Packages/com.unity.render-pipelines.high-definition/Documentation~/Images/probevolumes-lightleak.JPG b/Packages/com.unity.render-pipelines.high-definition/Documentation~/Images/probevolumes-lightleak.jpg
similarity index 100%
rename from Packages/com.unity.render-pipelines.high-definition/Documentation~/Images/probevolumes-lightleak.JPG
rename to Packages/com.unity.render-pipelines.high-definition/Documentation~/Images/probevolumes-lightleak.jpg
diff --git a/Packages/com.unity.render-pipelines.high-definition/Documentation~/Images/probevolumes-seams.JPG b/Packages/com.unity.render-pipelines.high-definition/Documentation~/Images/probevolumes-seams.jpg
similarity index 100%
rename from Packages/com.unity.render-pipelines.high-definition/Documentation~/Images/probevolumes-seams.JPG
rename to Packages/com.unity.render-pipelines.high-definition/Documentation~/Images/probevolumes-seams.jpg
diff --git a/Packages/com.unity.render-pipelines.high-definition/Documentation~/Images/watersystem-directlighttip.JPG b/Packages/com.unity.render-pipelines.high-definition/Documentation~/Images/watersystem-directlighttip.jpg
similarity index 100%
rename from Packages/com.unity.render-pipelines.high-definition/Documentation~/Images/watersystem-directlighttip.JPG
rename to Packages/com.unity.render-pipelines.high-definition/Documentation~/Images/watersystem-directlighttip.jpg
diff --git a/Packages/com.unity.render-pipelines.high-definition/Documentation~/deep-learning-super-sampling-in-hdrp.md b/Packages/com.unity.render-pipelines.high-definition/Documentation~/deep-learning-super-sampling-in-hdrp.md
index 0b4b54c3c2c..15565a39b90 100644
--- a/Packages/com.unity.render-pipelines.high-definition/Documentation~/deep-learning-super-sampling-in-hdrp.md
+++ b/Packages/com.unity.render-pipelines.high-definition/Documentation~/deep-learning-super-sampling-in-hdrp.md
@@ -1,6 +1,6 @@
 # Deep learning super sampling (DLSS)
 
-[NVIDIA Deep Learning Super Sampling (DLSS)](https://www.nvidia.com/en-us/geforce/technologies/dlss/) is a rendering technology that uses artificial intelligence to increase graphics performance. The High Definition Render Pipeline (HDRP) natively supports DLSS 4 Super Resolution.
+[NVIDIA Deep Learning Super Sampling (DLSS)](https://www.nvidia.com/en-us/geforce/technologies/dlss/) is a rendering technology that uses artificial intelligence to increase graphics performance. The High Definition Render Pipeline (HDRP) natively supports DLSS 4.5 Super Resolution.
 
 ## Requirements and compatibility
 
@@ -82,18 +82,20 @@ Available presets are marked as '1' in the table below.
 
 | Render Preset | Maximum Quality | Balanced | Maximum Performance | Ultra Performance | DLAA | Explanation | AI Model |
 |- |- |- |- |- |- |- |- |
-| Preset F |   |   |  | 1 | 1 | Provides the highest image stability. Default value for UltraPerformance. | CNN |
-| Preset J | 1 | 1 | 1|   | 1 | Slightly lowers ghosting but increases flickering.<br/>NVIDIA recommends using **Preset K** instead of **Preset J**. | Transformer |
-| Preset K | 1 | 1 | 1|   | 1 |  Provides the highest image quality. | Transformer |
+| Preset F |   |   |  | 1 | 1 | Marked for deprecation in upcoming DLSS releases. Don't use for new projects. | CNN |
+| Preset J | 1 | 1 | 1| 1 | 1 | Slightly lowers ghosting but increases flickering.<br/>NVIDIA recommends using **Preset K** instead of **Preset J**. | Transformer |
+| Preset K | 1 | 1 | 1| 1 | 1 | Default preset for DLAA/Balanced/Quality modes. Requires fewer resources than Preset L. | Transformer |
+| Preset L |   |   |  | 1 |   | Delivers a sharper, more stable image with less ghosting than Preset J, K, but lowers performance. Recommended for RTX 40 Series GPUs and above. | Transformer Gen 2 |
+Provides about the same image quality as **Preset L**. This preset is slower than presets **J** and **K**, but faster than preset **L**. Recommended for RTX 40 Series GPUs and above.
 
 The defaults for each quality mode are:
 
 | **Quality mode** | **Default render preset** |
 |- |- |
-| **Maximum Quality** | Preset K 
-| **Balanced** | Preset K 
-| **Maximum Performance** | Preset K 
-| **Ultra Performance** | Preset F 
+| **Maximum Quality** | Preset K |
+| **Balanced** | Preset K |
+| **Maximum Performance** | Preset M |
+| **Ultra Performance** | Preset L |
 | **DLAA** | Preset K |
 
 DLSS render presets are project-specific. Presets are available only from the HDRP Asset settings. You can't override presets on a per-camera basis.
diff --git a/Packages/com.unity.render-pipelines.high-definition/Documentation~/getting-started-in-hdrp.md b/Packages/com.unity.render-pipelines.high-definition/Documentation~/getting-started-in-hdrp.md
index 036be6fb1f3..c026620fec1 100644
--- a/Packages/com.unity.render-pipelines.high-definition/Documentation~/getting-started-in-hdrp.md
+++ b/Packages/com.unity.render-pipelines.high-definition/Documentation~/getting-started-in-hdrp.md
@@ -10,4 +10,3 @@ Set up a project to use the High Definition Render Pipeline (HDRP), and use Volu
 ## Additional resources
 
 - [HDRP overview](HDRP-Features.md)
-- [Achieving High Fidelity Graphics for Games with HDRP](https://resources.unity.com/unitenow/onlinesessions/achieving-high-fidelity-graphics-for-games-with-hdrp)
diff --git a/Packages/com.unity.render-pipelines.high-definition/Documentation~/rendering-debugger-window-reference.md b/Packages/com.unity.render-pipelines.high-definition/Documentation~/rendering-debugger-window-reference.md
index 7d0b7a84802..5dac5258889 100644
--- a/Packages/com.unity.render-pipelines.high-definition/Documentation~/rendering-debugger-window-reference.md
+++ b/Packages/com.unity.render-pipelines.high-definition/Documentation~/rendering-debugger-window-reference.md
@@ -92,10 +92,11 @@ The Detailed Stats section displays the amount of time in milliseconds that each
 
 | **Property**                     | **Description**                                                                                                                                            |
 |----------------------------------|------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| Update every second with average | Calculate average values over one second and update every second.                                                                                          |
-| Hide empty scopes                | Hide profiling scopes that use 0.00ms of processing time on the CPU and GPU.                                                                               |
-| Count Rays                       | Count the number of traced rays for each effect (in MRays / frame). This mode only appears when you enable ray tracing.                                    |
-| Debug XR Layout                  | Enable to display debug information for [XR](https://docs.unity3d.com/Manual/XR.html) passes. This mode only appears in the editor and development builds. |
+| **Update every second with average** | Calculates the average values over one second and updates every second.                                                                                          |
+| **Hide empty scopes**                | Hides any profiling scopes that use 0.00 ms of processing time on the CPU and GPU.                                                                               |
+| **Count Rays**                       | Counts the number of traced rays for each effect (in MRays / frame). This mode only appears when you enable ray tracing.                                    |
+| **Debug XR Layout**                  | Displays debug information for [XR](https://docs.unity3d.com/Manual/XR.html) passes. This mode only appears in the Editor and development builds. |
+| **Profiling Scopes**                 | Displays each rendering step and the amount of milliseconds it takes to execute on the following:<ul><li>**CPU**: CPU time for executing command buffers on the render thread.</li><li>**CPUInline**: CPU time for code executed immediately on the main thread.</li><li>**GPU**: GPU execution time.</li></ul>|
 
 <a name="MaterialPanel"></a>
 
diff --git a/Packages/com.unity.render-pipelines.high-definition/Editor/AssetProcessors/HDIESImporterEditor.cs b/Packages/com.unity.render-pipelines.high-definition/Editor/AssetProcessors/HDIESImporterEditor.cs
index ad63777a84e..70c3261f4c4 100644
--- a/Packages/com.unity.render-pipelines.high-definition/Editor/AssetProcessors/HDIESImporterEditor.cs
+++ b/Packages/com.unity.render-pipelines.high-definition/Editor/AssetProcessors/HDIESImporterEditor.cs
@@ -16,7 +16,7 @@ public partial class HDIESImporterEditor : ScriptedImporterEditor
         /// <summary>
         /// IES Importer Editor, common to Core and HDRP
         /// </summary>
-        public UnityEditor.Rendering.IESImporterEditor iesImporterEditor = new UnityEditor.Rendering.IESImporterEditor();
+        public UnityEditor.Rendering.IESImporterEditor iesImporterEditor { get; set; } = new UnityEditor.Rendering.IESImporterEditor();
 
         internal void SetupRenderPipelinePreviewCamera(Camera camera)
         {
diff --git a/Packages/com.unity.render-pipelines.high-definition/Editor/BuildProcessors/HDRPPreprocessBuild.cs b/Packages/com.unity.render-pipelines.high-definition/Editor/BuildProcessors/HDRPPreprocessBuild.cs
index 5a9a93713c7..6c42e4d5da7 100644
--- a/Packages/com.unity.render-pipelines.high-definition/Editor/BuildProcessors/HDRPPreprocessBuild.cs
+++ b/Packages/com.unity.render-pipelines.high-definition/Editor/BuildProcessors/HDRPPreprocessBuild.cs
@@ -43,10 +43,72 @@ public void OnPreprocessBuild(BuildReport report)
 
                 LogIncludedAssets(m_BuildData.renderPipelineAssets);
 
+                if (!IsConfigurationValid())
+                {
+                    if(!ProceedWithBuild())
+                        throw new BuildFailedException("Build canceled by user due to HDRP configuration issues.");
+                }
+                    
+
                 GatherShaderFeatures();
             }
         }
 
+        private static bool IsConfigurationValid()
+        {
+            // Validate the configuration of the HDRP assets for the current build target. We want to make sure that users are aware of potential performance issues or unsupported features before building.
+            // We still want to build the player even if the configuration is not optimal, but we log warnings to inform users about potential issues.
+            // Note that we validate the configuration of all HDRP assets included in the build, not just the one assigned in Graphics Settings.
+            // This is because users can have multiple HDRP assets in their project and switch between them at runtime, so we want to make sure that all of them are correctly configured for the target platform.
+
+            // We must log all the warnings, and avoid doing validConfiguration &= ValidationXXX, that will avoid logging all the warnings, and only log the first one that fails.
+            // This way users will have a complete overview of all the potential issues with their configuration, and can fix them all at once, instead of having to go through multiple build iterations to fix each issue one by one.
+            // So be carefull when you edit this code, and make sure to log all the warnings, even if one of the validation fails.
+            bool validConfiguration = true;
+
+            {
+                bool config = ValidateRayTracingConfiguration(m_BuildData.renderPipelineAssets);
+                validConfiguration &= config;
+            }
+
+            {
+                bool config = ValidateSubsurfaceScatteringConfiguration(m_BuildData.renderPipelineAssets);
+                validConfiguration &= config;
+            }
+
+            {
+                bool config = ValidateFilmGrainConfiguration(m_BuildData.renderPipelineAssets);
+                validConfiguration &= config;
+            }
+
+            return validConfiguration;
+        }
+
+        internal static string k_DialogKey = $"{nameof(UnityEditor)}.{nameof(Rendering)}.{nameof(HighDefinition)}.{nameof(HDRPPreprocessBuild)}.{nameof(ProceedWithBuild)}";
+
+        private bool ProceedWithBuild()
+        {
+            if(HDEditorUtils.IsInTestSuiteOrBatchMode())
+                return true;
+
+            var title = "Build Configuration Issues Detected";
+            var body = new StringBuilder();
+
+            body.AppendLine("HDRP identified settings that may impact performance or enable unsupported features for the current build target.");
+            body.AppendLine("Review the Console for details (look for messages tagged 'HDRP Build Validation').");
+            body.AppendLine();
+            body.Append("Do you want to continue building?");
+
+            return EditorUtility.DisplayDialog(
+                title,
+                body.ToString(),
+                "Proceed",
+                "Cancel",
+                DialogOptOutDecisionType.ForThisMachine,
+                k_DialogKey
+            );
+        }
+
         internal static void LogIncludedAssets(List<HDRenderPipelineAsset> assetsList)
         {
             using (GenericPool<StringBuilder>.Get(out var assetsIncluded))
@@ -64,6 +126,104 @@ internal static void LogIncludedAssets(List<HDRenderPipelineAsset> assetsList)
             }
         }
 
+        internal static bool ValidateRayTracingConfiguration(List<HDRenderPipelineAsset> assetsList)
+        {
+            // Check if any asset has ray tracing enabled
+            bool anyAssetHasRayTracingEnabled = false;
+            foreach (var hdrpAsset in assetsList)
+            {
+                if (hdrpAsset != null && hdrpAsset.currentPlatformRenderPipelineSettings.supportRayTracing)
+                {
+                    anyAssetHasRayTracingEnabled = true;
+                    break;
+                }
+            }
+
+            if (!anyAssetHasRayTracingEnabled)
+                return true; // No ray tracing enabled, skip validation
+
+            var currentBuildTarget = EditorUserBuildSettings.activeBuildTarget;
+            if (HDRenderPipeline.PlatformHasRaytracingIssues(currentBuildTarget, out var warning))
+            {
+                Debug.LogWarning($"HDRP Build Validation - Ray Tracing:{warning}");
+                return false;
+            }
+
+            return true;
+        }
+
+        internal static bool ValidateSubsurfaceScatteringConfiguration(List<HDRenderPipelineAsset> assetsList)
+        {
+            var currentBuildTarget = EditorUserBuildSettings.activeBuildTarget;
+
+            // Only validate for Switch 2
+            if (currentBuildTarget != BuildTarget.Switch2)
+                return true;
+
+            // Check if any asset has Subsurface Scattering enabled
+            bool anyAssetHasSSSEnabled = false;
+            foreach (var hdrpAsset in assetsList)
+            {
+                if (hdrpAsset != null && hdrpAsset.currentPlatformRenderPipelineSettings.supportSubsurfaceScattering)
+                {
+                    anyAssetHasSSSEnabled = true;
+                    break;
+                }
+            }
+
+            if (!anyAssetHasSSSEnabled)
+                return true; // No SSS enabled, skip validation
+
+            var activeBuildTargetGroup = BuildPipeline.GetBuildTargetGroup(BuildTarget.Switch2);
+            var namedBuildTarget = NamedBuildTarget.FromBuildTargetGroup(activeBuildTargetGroup);
+            Debug.LogWarning($"HDRP Build Validation - Subsurface Scattering: Subsurface Scattering is enabled for {namedBuildTarget.TargetName}. For optimal performance, set the Downsample Level to the maximum value (2) for this platform.");
+            return false;
+        }
+
+        internal static bool ValidateFilmGrainConfiguration(List<HDRenderPipelineAsset> assetsList)
+        {
+            var currentBuildTarget = EditorUserBuildSettings.activeBuildTarget;
+
+            // Only validate for Switch 2
+            if (currentBuildTarget != BuildTarget.Switch2)
+                return true;
+
+            // Check default volume profile from HDRP Global Settings
+            bool foundFilmGrain = false;
+            var defaultVolumeProfileSettings = GraphicsSettings.GetRenderPipelineSettings<HDRPDefaultVolumeProfileSettings>();
+            if (defaultVolumeProfileSettings?.volumeProfile != null)
+            {
+                if (defaultVolumeProfileSettings.volumeProfile.TryGet<FilmGrain>(out var filmGrain) && filmGrain.intensity.value > 0)
+                {
+                    foundFilmGrain = true;
+                }
+            }
+
+            // Check volume profiles in each HDRP asset
+            if (!foundFilmGrain)
+            {
+                foreach (var hdrpAsset in assetsList)
+                {
+                    if (hdrpAsset != null && hdrpAsset.volumeProfile != null)
+                    {
+                        if (hdrpAsset.volumeProfile.TryGet<FilmGrain>(out var filmGrain) && filmGrain.intensity.value > 0)
+                        {
+                            foundFilmGrain = true;
+                            break;
+                        }
+                    }
+                }
+            }
+
+            if (!foundFilmGrain)
+                return true; // No Film Grain with intensity > 0, skip validation
+
+            var activeBuildTargetGroup = BuildPipeline.GetBuildTargetGroup(BuildTarget.Switch2);
+            var namedBuildTarget = NamedBuildTarget.FromBuildTargetGroup(activeBuildTargetGroup);
+            Debug.LogWarning($"HDRP Build Validation - Film Grain: Film Grain is enabled for {namedBuildTarget.TargetName}. This may significantly impact performance and should be disabled for this platform.");
+            return false;
+        }
+
         internal static void ConfigureMinimumMaxLoDValueForAllQualitySettings()
         {
             int GetMinimumMaxLoDValue(HDRenderPipelineAsset asset)
diff --git a/Packages/com.unity.render-pipelines.high-definition/Editor/Lighting/HDLightEditor.cs b/Packages/com.unity.render-pipelines.high-definition/Editor/Lighting/HDLightEditor.cs
index 517a2e41035..b6e901ee890 100644
--- a/Packages/com.unity.render-pipelines.high-definition/Editor/Lighting/HDLightEditor.cs
+++ b/Packages/com.unity.render-pipelines.high-definition/Editor/Lighting/HDLightEditor.cs
@@ -13,7 +13,7 @@ namespace UnityEditor.Rendering.HighDefinition
     [SupportedOnRenderPipeline(typeof(HDRenderPipelineAsset))]
     sealed partial class HDLightEditor : LightEditor
     {
-        public SerializedHDLight m_SerializedHDLight;
+        public SerializedHDLight m_SerializedHDLight { get; set; }
 
         HDAdditionalLightData[] m_AdditionalLightDatas;
 
diff --git a/Packages/com.unity.render-pipelines.high-definition/Editor/Lighting/HDLightingSearchSelectors.cs b/Packages/com.unity.render-pipelines.high-definition/Editor/Lighting/HDLightingSearchSelectors.cs
new file mode 100644
index 00000000000..a34bd747095
--- /dev/null
+++ b/Packages/com.unity.render-pipelines.high-definition/Editor/Lighting/HDLightingSearchSelectors.cs
@@ -0,0 +1,833 @@
+using System;
+using UnityEditor.Search;
+using UnityEngine;
+using UnityEngine.Rendering;
+using UnityEngine.UIElements;
+using UnityEngine.Rendering.HighDefinition;
+
+namespace UnityEditor.Rendering.HighDefinition
+{
+    static class HDLightingSearchSelectors
+    {
+        internal const string k_SceneProvider = "scene";
+        internal const string k_LightPath = "Light/";
+        internal const string k_LightShapePath = k_LightPath + "Shape";
+        internal const string k_LightIntensityPath = k_LightPath + "Intensity";
+        internal const string k_LightIntensityUnitPath = k_LightPath + "IntensityUnit";
+        internal const string k_ContactShadowsPath = k_LightPath + "ContactShadows";
+        internal const string k_ShadowResolutionPath = k_LightPath + "ShadowResolution";
+        internal const string k_ReflectionProbePath = "ReflectionProbe/";
+        internal const string k_ReflectionProbeResolutionPath = k_ReflectionProbePath + "Resolution";
+        internal const string k_MeshRendererPath = "Renderer/MeshRenderer/";
+        internal const string k_RayTracingModeFilter = "RayTracingMode";
+        internal const string k_RayTracingModePath = k_MeshRendererPath + "RayTracingMode";
+
+        const string k_StyleSheetPath = "StyleSheets/HDLightingSearchSelectors.uss";
+        const float k_FlexGrowDefault = 1f;
+        const float k_ImguiContainerHeight = 20f;
+        const float k_RectLeftWidthRatio = 0.3f;
+        const float k_RectRightWidthRatio = 0.7f;
+        const float k_ToggleWidth = 18f;
+        static StyleSheet s_StyleSheet;
+
+        static StyleSheet LoadStyleSheet()
+        {
+            if (s_StyleSheet == null)
+            {
+                s_StyleSheet = EditorGUIUtility.Load(k_StyleSheetPath) as StyleSheet;
+            }
+            return s_StyleSheet;
+        }
+
+        internal enum DirectionalLightUnit
+        {
+            Lux = LightUnit.Lux,
+        }
+
+        internal enum AreaLightUnit
+        {
+            Lumen = LightUnit.Lumen,
+            Nits = LightUnit.Nits,
+            Ev100 = LightUnit.Ev100,
+        }
+
+        internal enum PunctualLightUnit
+        {
+            Lumen = LightUnit.Lumen,
+            Candela = LightUnit.Candela,
+            Lux = LightUnit.Lux,
+            Ev100 = LightUnit.Ev100
+        }
+
+        internal enum ShadowResolutionOption
+        {
+            Low,
+            Medium,
+            High,
+            Custom
+        }
+
+        [SearchColumnProvider(k_LightIntensityPath)]
+        public static void LightIntensitySearchColumnProvider(SearchColumn column)
+        {
+            column.getter = args =>
+            {
+                var go = args.item.data as GameObject ?? args.item.ToObject<GameObject>();
+                if (go == null || !go.TryGetComponent<Light>(out var light))
+                    return null;
+
+                return HDLightingSearchDataAccessors.GetLightIntensity(go);
+            };
+            column.setter = args =>
+            {
+                if (args.value is not float intensity)
+                    return;
+
+                var go = args.item.data as GameObject ?? args.item.ToObject<GameObject>();
+                if (go == null)
+                    return;
+
+                HDLightingSearchDataAccessors.SetLightIntensity(go, intensity);
+            };
+            column.cellCreator = _ =>
+            {
+                var field = new FloatField { label = "\u2022" };
+                field.style.flexGrow = k_FlexGrowDefault;
+                field.labelElement.style.minWidth = StyleKeyword.Auto;
+                field.labelElement.style.marginRight = 5;
+                field.labelElement.style.paddingRight = 0;
+                field.labelElement.style.marginTop = -1;
+
+                var dragger = new FieldMouseDragger<float>(field);
+                dragger.SetDragZone(field.labelElement);
+
+                var textInput = field.Q("unity-text-input");
+                if (textInput != null)
+                    textInput.style.unityTextAlign = TextAnchor.MiddleRight;
+
+                return field;
+            };
+            column.binder = (args, ve) =>
+            {
+                var field = (FloatField)ve;
+                var go = args.item.data as GameObject ?? args.item.ToObject<GameObject>();
+
+                if (go == null || !go.TryGetComponent<Light>(out _))
+                {
+                    field.visible = false;
+                    return;
+                }
+
+                field.visible = true;
+
+                if (args.value is float intensity)
+                {
+                    field.SetValueWithoutNotify(intensity);
+                }
+            };
+        }
+
+        [SearchColumnProvider(k_LightIntensityUnitPath)]
+        public static void LightIntensityUnitSearchColumnProvider(SearchColumn column)
+        {
+            column.getter = args =>
+            {
+                var go = args.item.data as GameObject ?? args.item.ToObject<GameObject>();
+                if (go == null)
+                    return null;
+
+                return HDLightingSearchDataAccessors.GetLightIntensityUnit(go);
+            };
+            column.setter = args =>
+            {
+                if (args.value == null || !args.value.GetType().IsEnum)
+                    return;
+
+                var go = args.item.data as GameObject ?? args.item.ToObject<GameObject>();
+                if (go == null)
+                    return;
+
+                HDLightingSearchDataAccessors.SetLightIntensityUnit(go, (LightUnit)args.value);
+            };
+            column.cellCreator = _ => new EnumField() { style = { flexGrow = k_FlexGrowDefault } };
+            column.binder = (args, ve) =>
+            {
+                var field = (EnumField)ve;
+                var go = args.item.data as GameObject ?? args.item.ToObject<GameObject>();
+
+                if (go == null || !go.TryGetComponent<Light>(out var light))
+                {
+                    field.visible = false;
+                    return;
+                }
+
+                field.visible = true;
+
+                if (args.value is LightUnit lightUnit)
+                {
+                    LightType lightType = light.type;
+                    LightUnit validUnit = LightUnitUtils.IsLightUnitSupported(lightType, lightUnit)
+                        ? lightUnit
+                        : LightUnitUtils.GetNativeLightUnit(lightType);
+
+                    if (lightType == LightType.Directional)
+                    {
+                        field.Init(DirectionalLightUnit.Lux);
+                        field.SetValueWithoutNotify((DirectionalLightUnit)validUnit);
+                    }
+                    else if (lightType == LightType.Rectangle || lightType == LightType.Disc || lightType == LightType.Tube)
+                    {
+                        field.Init(AreaLightUnit.Lumen);
+                        field.SetValueWithoutNotify((AreaLightUnit)validUnit);
+                    }
+                    else
+                    {
+                        field.Init(PunctualLightUnit.Lumen);
+                        field.SetValueWithoutNotify((PunctualLightUnit)validUnit);
+                    }
+                }
+            };
+        }
+
+        [SearchSelector(k_RayTracingModePath, provider: k_SceneProvider, priority: 99)]
+        static object RayTracingModeSearchSelector(SearchSelectorArgs args)
+        {
+            var go = args.current.ToObject<GameObject>();
+            if (go == null)
+                return null;
+
+            return HDLightingSearchDataAccessors.GetRayTracingMode(go);
+        }
+
+        [SearchColumnProvider(k_RayTracingModePath)]
+        public static void RayTracingModeSearchColumnProvider(SearchColumn column)
+        {
+            column.getter = args =>
+            {
+                var go = args.item.data as GameObject ?? args.item.ToObject<GameObject>();
+                if (go == null)
+                    return null;
+
+                if (!go.TryGetComponent<MeshRenderer>(out var meshRenderer))
+                    return null;
+
+                return HDLightingSearchDataAccessors.GetRayTracingMode(go);
+            };
+            column.setter = args =>
+            {
+                if (args.value == null || !args.value.GetType().IsEnum)
+                    return;
+
+                var go = args.item.data as GameObject ?? args.item.ToObject<GameObject>();
+                if (go == null)
+                    return;
+
+                HDLightingSearchDataAccessors.SetRayTracingMode(go, (UnityEngine.Experimental.Rendering.RayTracingMode)args.value);
+            };
+            column.cellCreator = _ => new EnumField(null, UnityEngine.Experimental.Rendering.RayTracingMode.Off) { style = { flexGrow = k_FlexGrowDefault } };
+            column.binder = (args, ve) =>
+            {
+                var field = (EnumField)ve;
+                if (args.value != null)
+                {
+                    field.visible = true;
+                    field.SetValueWithoutNotify((UnityEngine.Experimental.Rendering.RayTracingMode)args.value);
+                }
+                else
+                {
+                    field.visible = false;
+                }
+            };
+        }
+
+        [SearchColumnProvider(k_ReflectionProbeResolutionPath)]
+        public static void ReflectionProbeResolutionSearchColumnProvider(SearchColumn column)
+        {
+            column.getter = args =>
+            {
+                var go = args.item.data as GameObject ?? args.item.ToObject<GameObject>();
+                if (go == null || !go.TryGetComponent<HDProbe>(out _))
+                    return null;
+
+                return HDLightingSearchDataAccessors.GetReflectionProbeResolution(go);
+            };
+
+            column.setter = args =>
+            {
+                if (args.value is not HDLightingSearchDataAccessors.ReflectionProbeResolutionData data)
+                    return;
+
+                var go = args.item.data as GameObject ?? args.item.ToObject<GameObject>();
+                if (go == null)
+                    return;
+
+                HDLightingSearchDataAccessors.SetReflectionProbeResolution(go, data);
+            };
+
+            column.cellCreator = _ => CreateImguiContainer();
+            column.binder = (args, ve) =>
+            {
+                var go = args.item.data as GameObject ?? args.item.ToObject<GameObject>();
+                if (go == null || !go.TryGetComponent<HDProbe>(out var hdProbe))
+                {
+                    ve.visible = false;
+                    return;
+                }
+
+                var reflectionProbeResolutionData = (HDLightingSearchDataAccessors.ReflectionProbeResolutionData)args.value;
+
+                var imguiContainer = ve.Q<IMGUIContainer>();
+                switch (hdProbe.type)
+                {
+                    case ProbeSettings.ProbeType.ReflectionProbe:
+                        imguiContainer.onGUIHandler = () =>
+                        {
+                            var rect = EditorGUILayout.GetControlRect(false, k_ImguiContainerHeight);
+                            var leftRect = new Rect(rect.x, rect.y, rect.width * k_RectLeftWidthRatio, rect.height);
+                            var rightRect = new Rect(rect.x + rect.width * k_RectLeftWidthRatio, rect.y, rect.width * k_RectRightWidthRatio, rect.height);
+
+                            GUILayout.BeginHorizontal("box", GUILayout.ExpandWidth(true));
+
+                            EditorGUI.BeginChangeCheck();
+                            var (level, useOverride) =  SerializedScalableSettingValueUI.LevelFieldGUI(leftRect, GUIContent.none, ScalableSettingSchema.GetSchemaOrNull(ScalableSettingSchemaId.With3Levels), reflectionProbeResolutionData.level, reflectionProbeResolutionData.useOverride);
+
+                            Enum overrideLevel;
+                            if (reflectionProbeResolutionData.useOverride)
+                            {
+                                overrideLevel = EditorGUI.EnumPopup(rightRect, reflectionProbeResolutionData.overrideLevel);
+                            }
+                            else
+                            {
+                                using (new EditorGUI.DisabledScope(true))
+                                {
+                                    overrideLevel = EditorGUI.EnumFlagsField(rightRect, reflectionProbeResolutionData.overrideLevel);
+                                }
+                            }
+                            if(EditorGUI.EndChangeCheck())
+                            {
+                                reflectionProbeResolutionData.level = level;
+                                reflectionProbeResolutionData.useOverride = useOverride;
+                                reflectionProbeResolutionData.overrideLevel = (CubeReflectionResolution)overrideLevel;
+                                column.setter?.Invoke(new SearchColumnEventArgs(args.item, args.context, column) { value = reflectionProbeResolutionData });
+                            }
+
+                            GUILayout.EndHorizontal();
+                        };
+                        break;
+                    case ProbeSettings.ProbeType.PlanarProbe:
+                    default:
+                        imguiContainer.onGUIHandler = () =>
+                        {
+                            var rect = EditorGUILayout.GetControlRect(false, k_ImguiContainerHeight);
+                            var leftRect = new Rect(rect.x, rect.y, rect.width * k_RectLeftWidthRatio, rect.height);
+                            var rightRect = new Rect(rect.x + rect.width * k_RectLeftWidthRatio, rect.y, rect.width * k_RectRightWidthRatio, rect.height);
+
+                            GUILayout.BeginHorizontal("box", GUILayout.ExpandWidth(true));
+
+                            EditorGUI.BeginChangeCheck();
+                            var (level, useOverride) = SerializedScalableSettingValueUI.LevelFieldGUI(leftRect, GUIContent.none, ScalableSettingSchema.GetSchemaOrNull(ScalableSettingSchemaId.With3Levels), reflectionProbeResolutionData.level, reflectionProbeResolutionData.useOverride);
+
+                            Enum overrideLevel;
+                            if (reflectionProbeResolutionData.useOverride)
+                            {
+                                overrideLevel = EditorGUI.EnumPopup(rightRect, reflectionProbeResolutionData.overrideLevel);
+                            }
+                            else
+                            {
+                                using (new EditorGUI.DisabledScope(true))
+                                {
+                                    overrideLevel = EditorGUI.EnumFlagsField(rightRect, reflectionProbeResolutionData.overrideLevel);
+                                }
+                            }
+                            if (EditorGUI.EndChangeCheck())
+                            {
+                                reflectionProbeResolutionData.level = level;
+                                reflectionProbeResolutionData.useOverride = useOverride;
+                                reflectionProbeResolutionData.overrideLevel = (CubeReflectionResolution)overrideLevel;
+                                column.setter?.Invoke(new SearchColumnEventArgs(args.item, args.context, column) { value = reflectionProbeResolutionData });
+                            }
+
+                            GUILayout.EndHorizontal();
+                        };
+                        break;
+                }
+            };
+        }
+
+        [SearchColumnProvider(k_ContactShadowsPath)]
+        public static void ContactShadowsSearchColumnProvider(SearchColumn column)
+        {
+            column.getter = args =>
+            {
+                var go = args.item.data as GameObject ?? args.item.ToObject<GameObject>();
+                if (go == null || !go.TryGetComponent<HDAdditionalLightData>(out _))
+                    return null;
+
+                return HDLightingSearchDataAccessors.GetContactShadowsData(go);
+            };
+
+            column.setter = args =>
+            {
+                if (args.value is not HDLightingSearchDataAccessors.ContactShadowsData data)
+                    return;
+
+                var go = args.item.data as GameObject ?? args.item.ToObject<GameObject>();
+                if (go == null)
+                    return;
+
+                HDLightingSearchDataAccessors.SetContactShadowsData(go, data);
+            };
+
+            column.cellCreator = _ => CreateImguiContainer();
+            column.binder = (args, ve) =>
+            {
+                var go = args.item.data as GameObject ?? args.item.ToObject<GameObject>();
+                if (go == null || !go.TryGetComponent<HDAdditionalLightData>(out _))
+                {
+                    ve.visible = false;
+                    return;
+                }
+
+                ve.visible = true;
+                var contactShadowsData = (HDLightingSearchDataAccessors.ContactShadowsData)args.value;
+                var imguiContainer = ve.Q<IMGUIContainer>();
+                imguiContainer.onGUIHandler = () =>
+                {
+                    var rect = EditorGUILayout.GetControlRect(false, k_ImguiContainerHeight);
+                    var leftRect = new Rect(rect.x, rect.y, rect.width - k_ToggleWidth - 4f, rect.height);
+                    var rightRect = new Rect(rect.xMax - k_ToggleWidth, rect.y, k_ToggleWidth, rect.height);
+
+                    EditorGUI.BeginChangeCheck();
+                    var (level, useOverride) = SerializedScalableSettingValueUI.LevelFieldGUI(
+                        leftRect,
+                        GUIContent.none,
+                        ScalableSettingSchema.GetSchemaOrNull(ScalableSettingSchemaId.With3Levels),
+                        contactShadowsData.level,
+                        contactShadowsData.useOverride);
+
+                    contactShadowsData.level = level;
+                    contactShadowsData.useOverride = useOverride;
+
+                    if (contactShadowsData.useOverride)
+                    {
+                        contactShadowsData.overrideValue = EditorGUI.Toggle(rightRect, contactShadowsData.overrideValue);
+                    }
+                    else
+                    {
+                        var hdrp = HDRenderPipeline.currentAsset;
+                        var defaultValue = HDAdditionalLightData.ScalableSettings.UseContactShadow(hdrp);
+                        using (new EditorGUI.DisabledScope(true))
+                        {
+                            contactShadowsData.overrideValue = EditorGUI.Toggle(rightRect, defaultValue[contactShadowsData.level]);
+                        }
+                    }
+
+                    if (EditorGUI.EndChangeCheck())
+                    {
+                        column.setter?.Invoke(new SearchColumnEventArgs(args.item, args.context, column) { value = contactShadowsData });
+                    }
+                };
+            };
+        }
+
+        [SearchColumnProvider(k_ShadowResolutionPath)]
+        public static void ShadowResolutionSearchColumnProvider(SearchColumn column)
+        {
+            column.getter = args =>
+            {
+                var go = args.item.data as GameObject ?? args.item.ToObject<GameObject>();
+                if (go == null || !go.TryGetComponent<HDAdditionalLightData>(out _))
+                    return null;
+
+                return HDLightingSearchDataAccessors.GetShadowResolutionData(go);
+            };
+
+            column.setter = args =>
+            {
+                if (args.value is not HDLightingSearchDataAccessors.ShadowResolutionData data)
+                    return;
+
+                var go = args.item.data as GameObject ?? args.item.ToObject<GameObject>();
+                if (go == null)
+                    return;
+
+                HDLightingSearchDataAccessors.SetShadowResolutionData(go, data);
+            };
+
+            column.cellCreator = _ => CreateImguiContainer();
+            column.binder = (args, ve) =>
+            {
+                var go = args.item.data as GameObject ?? args.item.ToObject<GameObject>();
+                if (go == null || !go.TryGetComponent<HDAdditionalLightData>(out _))
+                {
+                    ve.visible = false;
+                    return;
+                }
+
+                ve.visible = true;
+                var shadowResolutionData = (HDLightingSearchDataAccessors.ShadowResolutionData)args.value;
+                var imguiContainer = ve.Q<IMGUIContainer>();
+                imguiContainer.onGUIHandler = () =>
+                {
+                    var rect = EditorGUILayout.GetControlRect(false, 20);
+                    var currentOption = shadowResolutionData.useOverride
+                        ? ShadowResolutionOption.Custom
+                        : shadowResolutionData.level switch
+                        {
+                            <= 0 => ShadowResolutionOption.Low,
+                            1 => ShadowResolutionOption.Medium,
+                            _ => ShadowResolutionOption.High
+                        };
+
+                    EditorGUI.BeginChangeCheck();
+                    var newOption = (ShadowResolutionOption)EditorGUI.EnumPopup(rect, currentOption);
+                    if (EditorGUI.EndChangeCheck())
+                    {
+                        if (newOption == ShadowResolutionOption.Custom)
+                        {
+                            shadowResolutionData.useOverride = true;
+                        }
+                        else
+                        {
+                            shadowResolutionData.useOverride = false;
+                            shadowResolutionData.level = (int)newOption;
+                        }
+
+                        column.setter?.Invoke(new SearchColumnEventArgs(args.item, args.context, column) { value = shadowResolutionData });
+                    }
+                };
+            };
+        }
+
+        [SearchColumnProvider(k_LightShapePath)]
+        public static void LightShapeSearchColumnProvider(SearchColumn column)
+        {
+            column.getter = args =>
+            {
+                var go = args.item.data as GameObject ?? args.item.ToObject<GameObject>();
+                if (go == null)
+                    return null;
+
+                if (!go.TryGetComponent<Light>(out var light))
+                    return null;
+
+                return HDLightingSearchDataAccessors.GetLightShape(go);
+            };
+            column.setter = args =>
+            {
+                if (args.value == null || !args.value.GetType().IsEnum)
+                    return;
+
+                var go = args.item.data as GameObject ?? args.item.ToObject<GameObject>();
+                if (go == null)
+                    return;
+
+                HDLightingSearchDataAccessors.SetLightShape(go, (LightType)args.value);
+            };
+            column.cellCreator = _ => new HDLightShapeField();
+            column.binder = (args, ve) =>
+            {
+                var field = (HDLightShapeField)ve;
+                if (args.value is LightType lightType)
+                {
+                    if (HDLightingSearchDataAccessors.IsLightShapeApplicable(lightType))
+                    {
+                        field.visible = true;
+                        field.SetValueWithoutNotify(lightType);
+                    }
+                    else
+                    {
+                        field.visible = false;
+                    }
+                }
+                else
+                {
+                    field.visible = false;
+                }
+            };
+        }
+
+        static VisualElement CreateImguiContainer()
+        {
+            var visualElement = new VisualElement() { style = { height = k_ImguiContainerHeight } };
+            visualElement.Add(new IMGUIContainer() { style = { height = k_ImguiContainerHeight } });
+            return visualElement;
+        }
+
+        static class HDLightingSearchDataAccessors
+        {
+            internal struct ReflectionProbeResolutionData
+            {
+                public int level;
+                public bool useOverride;
+                public CubeReflectionResolution overrideLevel;
+            }
+
+            internal struct ContactShadowsData
+            {
+                public int level;
+                public bool useOverride;
+                public bool overrideValue;
+            }
+
+            internal struct ShadowResolutionData
+            {
+                public int level;
+                public bool useOverride;
+            }
+
+            internal static float GetLightIntensity(GameObject go)
+            {
+                if (!go.TryGetComponent<Light>(out var light))
+                    return 0f;
+
+                LightType lightType = light.type;
+                LightUnit nativeUnit = LightUnitUtils.GetNativeLightUnit(lightType);
+                LightUnit lightUnit = light.lightUnit;
+                float nativeIntensity = light.intensity;
+
+                lightUnit = LightUnitUtils.IsLightUnitSupported(lightType, lightUnit) ? lightUnit : nativeUnit;
+
+                return LightUnitUtils.ConvertIntensity(light, nativeIntensity, nativeUnit, lightUnit);
+            }
+
+            internal static void SetLightIntensity(GameObject go, float intensity)
+            {
+                if (!go.TryGetComponent<Light>(out var light))
+                    return;
+
+                LightType lightType = light.type;
+                LightUnit nativeUnit = LightUnitUtils.GetNativeLightUnit(lightType);
+                LightUnit lightUnit = light.lightUnit;
+
+                if (!LightUnitUtils.IsLightUnitSupported(lightType, lightUnit))
+                    return;
+
+                light.intensity = LightUnitUtils.ConvertIntensity(light, intensity, lightUnit, nativeUnit);
+            }
+
+            internal static LightUnit GetLightIntensityUnit(GameObject go)
+            {
+                if (!go.TryGetComponent<Light>(out var light))
+                    return LightUnit.Lumen;
+
+                return light.lightUnit;
+            }
+
+            internal static void SetLightIntensityUnit(GameObject go, LightUnit unit)
+            {
+                if (!go.TryGetComponent<Light>(out var light))
+                    return;
+
+                if (!LightUnitUtils.IsLightUnitSupported(light.type, unit))
+                    return;
+
+                light.lightUnit = unit;
+
+                // Mark the light component as dirty so Unity's change detection system
+                // notifies all views (including Search) that this object changed.
+                // This triggers the intensity column to rebind and show the converted value.
+                EditorUtility.SetDirty(light);
+            }
+
+            internal static ReflectionProbeResolutionData GetReflectionProbeResolution(GameObject go)
+            {
+                var reflectionProbeResolutionData = new ReflectionProbeResolutionData();
+
+                if (!go.TryGetComponent<HDProbe>(out var hdProbe))
+                    return reflectionProbeResolutionData;
+
+                switch (hdProbe.type)
+                {
+                    case ProbeSettings.ProbeType.ReflectionProbe:
+                        reflectionProbeResolutionData.useOverride = hdProbe.settingsRaw.cubeResolution.useOverride;
+                        reflectionProbeResolutionData.level = hdProbe.settingsRaw.cubeResolution.level;
+                        reflectionProbeResolutionData.overrideLevel = hdProbe.settingsRaw.cubeResolution.@override;
+                        break;
+                    case ProbeSettings.ProbeType.PlanarProbe:
+                    default:
+                        reflectionProbeResolutionData.useOverride = hdProbe.settingsRaw.resolutionScalable.useOverride;
+                        reflectionProbeResolutionData.level = hdProbe.settingsRaw.resolutionScalable.level;
+                        reflectionProbeResolutionData.overrideLevel = (CubeReflectionResolution)hdProbe.settingsRaw.resolutionScalable.@override;
+                        break;
+                }
+
+                return reflectionProbeResolutionData;
+            }
+
+            internal static ContactShadowsData GetContactShadowsData(GameObject go)
+            {
+                var contactShadowsData = new ContactShadowsData();
+                if (!go.TryGetComponent<HDAdditionalLightData>(out var lightData))
+                    return contactShadowsData;
+
+                contactShadowsData.level = lightData.useContactShadow.level;
+                contactShadowsData.useOverride = lightData.useContactShadow.useOverride;
+                contactShadowsData.overrideValue = lightData.useContactShadow.@override;
+                return contactShadowsData;
+            }
+
+            internal static ShadowResolutionData GetShadowResolutionData(GameObject go)
+            {
+                var shadowResolutionData = new ShadowResolutionData();
+                if (!go.TryGetComponent<HDAdditionalLightData>(out var lightData))
+                    return shadowResolutionData;
+
+                shadowResolutionData.level = lightData.shadowResolution.level;
+                shadowResolutionData.useOverride = lightData.shadowResolution.useOverride;
+                return shadowResolutionData;
+            }
+
+            internal static void SetReflectionProbeResolution(GameObject go, ReflectionProbeResolutionData reflectionProbeResolutionData)
+            {
+                if (!go.TryGetComponent<HDProbe>(out var hdProbe))
+                    return;
+
+                switch (hdProbe.type)
+                {
+                    case ProbeSettings.ProbeType.ReflectionProbe:
+                        hdProbe.settingsRaw.cubeResolution.useOverride = reflectionProbeResolutionData.useOverride;
+                        hdProbe.settingsRaw.cubeResolution.level = reflectionProbeResolutionData.level;
+                        hdProbe.settingsRaw.cubeResolution.@override = reflectionProbeResolutionData.overrideLevel;
+                        break;
+                    case ProbeSettings.ProbeType.PlanarProbe:
+                    default:
+                        hdProbe.settingsRaw.resolutionScalable.useOverride = reflectionProbeResolutionData.useOverride;
+                        hdProbe.settingsRaw.resolutionScalable.level = reflectionProbeResolutionData.level;
+                        hdProbe.settingsRaw.resolutionScalable.@override = (PlanarReflectionAtlasResolution)reflectionProbeResolutionData.overrideLevel;
+                        break;
+                }
+            }
+
+            internal static void SetContactShadowsData(GameObject go, ContactShadowsData contactShadowsData)
+            {
+                if (!go.TryGetComponent<HDAdditionalLightData>(out var lightData))
+                    return;
+
+                lightData.useContactShadow.level = contactShadowsData.level;
+                lightData.useContactShadow.useOverride = contactShadowsData.useOverride;
+                lightData.useContactShadow.@override = contactShadowsData.overrideValue;
+            }
+
+            internal static void SetShadowResolutionData(GameObject go, ShadowResolutionData shadowResolutionData)
+            {
+                if (!go.TryGetComponent<HDAdditionalLightData>(out var lightData))
+                    return;
+
+                lightData.shadowResolution.level = shadowResolutionData.level;
+                lightData.shadowResolution.useOverride = shadowResolutionData.useOverride;
+                lightData.RefreshCachedShadow();
+            }
+
+            internal static UnityEngine.Experimental.Rendering.RayTracingMode GetRayTracingMode(GameObject go)
+            {
+                if (!go.TryGetComponent<MeshRenderer>(out var meshRenderer))
+                    return UnityEngine.Experimental.Rendering.RayTracingMode.Off;
+
+                return meshRenderer.rayTracingMode;
+            }
+
+            internal static void SetRayTracingMode(GameObject go, UnityEngine.Experimental.Rendering.RayTracingMode value)
+            {
+                if (!go.TryGetComponent<MeshRenderer>(out var meshRenderer))
+                    return;
+
+                meshRenderer.rayTracingMode = value;
+            }
+
+            internal static LightType? GetLightShape(GameObject go)
+            {
+                if (!go.TryGetComponent<Light>(out var light))
+                    return null;
+
+                return light.type;
+            }
+
+            internal static void SetLightShape(GameObject go, LightType value)
+            {
+                if (!go.TryGetComponent<Light>(out var light))
+                    return;
+
+                if (IsLightShapeApplicable(value))
+                {
+                    light.type = value;
+
+                    if (!LightUnitUtils.IsLightUnitSupported(value, light.lightUnit))
+                    {
+                        light.lightUnit = LightUnitUtils.GetNativeLightUnit(value);
+                    }
+
+                    // Mark the light component as dirty so the intensity and unit columns refresh
+                    // when the light type changes.
+                    EditorUtility.SetDirty(light);
+                }
+            }
+
+            internal static bool IsLightShapeApplicable(LightType lightType)
+            {
+                return IsAreaLight(lightType) || IsSpotLight(lightType);
+            }
+
+            internal static bool IsSpotLight(LightType lightType)
+            {
+                return lightType is LightType.Spot or LightType.Pyramid or LightType.Box;
+            }
+
+            internal static bool IsAreaLight(LightType lightType)
+            {
+                return lightType is LightType.Rectangle or LightType.Disc or LightType.Tube;
+            }
+        }
+
+        enum SpotLightShape
+        {
+            Cone = LightType.Spot,
+            Pyramid = LightType.Pyramid,
+            Box = LightType.Box
+        }
+
+        enum AreaLightShape
+        {
+            Rectangle = LightType.Rectangle,
+            Disc = LightType.Disc,
+            Tube = LightType.Tube
+        }
+
+        class HDLightShapeField : EnumField
+        {
+            LightType m_Value;
+
+            public HDLightShapeField() : base(SpotLightShape.Cone)
+            {
+                m_Value = LightType.Spot;
+
+                AddToClassList("hdrp-lighting-search-light-shape");
+
+                var styleSheet = LoadStyleSheet();
+                if (styleSheet != null)
+                    styleSheets.Add(styleSheet);
+            }
+
+            public void SetValueWithoutNotify(LightType newValue)
+            {
+                if (m_Value == newValue)
+                    return;
+
+                m_Value = newValue;
+                UpdateEnumField();
+            }
+
+            void UpdateEnumField()
+            {
+                if (HDLightingSearchDataAccessors.IsSpotLight(m_Value))
+                {
+                    Init((SpotLightShape)m_Value);
+                }
+                else
+                {
+                    Init((AreaLightShape)m_Value);
+                }
+            }
+        }
+    }
+}
diff --git a/Packages/com.unity.render-pipelines.high-definition/Editor/Lighting/HDLightingSearchSelectors.cs.meta b/Packages/com.unity.render-pipelines.high-definition/Editor/Lighting/HDLightingSearchSelectors.cs.meta
new file mode 100644
index 00000000000..41c913f92d3
--- /dev/null
+++ b/Packages/com.unity.render-pipelines.high-definition/Editor/Lighting/HDLightingSearchSelectors.cs.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 450652a0de85411fa5ea383806643b3a
+timeCreated: 1755625717
\ No newline at end of file
diff --git a/Packages/com.unity.render-pipelines.high-definition/Editor/Material/BRGPicking.shader b/Packages/com.unity.render-pipelines.high-definition/Editor/Material/BRGPicking.shader
index f166edf3b29..b80974fef1e 100644
--- a/Packages/com.unity.render-pipelines.high-definition/Editor/Material/BRGPicking.shader
+++ b/Packages/com.unity.render-pipelines.high-definition/Editor/Material/BRGPicking.shader
@@ -8,7 +8,7 @@ Shader "Hidden/HDRP/BRGPicking"
     #pragma only_renderers d3d11 playstation xboxone xboxseries vulkan metal switch switch2 
     #pragma editor_sync_compilation
     #pragma multi_compile DOTS_INSTANCING_ON
-    //#pragma enable_d3d11_debug_symbols
+    //#pragma enable_debug_symbols
 
     ENDHLSL
 
diff --git a/Packages/com.unity.render-pipelines.high-definition/Editor/PostProcessing/FilmGrainEditor.cs b/Packages/com.unity.render-pipelines.high-definition/Editor/PostProcessing/FilmGrainEditor.cs
index edeec55e89d..f456b6d6f2b 100644
--- a/Packages/com.unity.render-pipelines.high-definition/Editor/PostProcessing/FilmGrainEditor.cs
+++ b/Packages/com.unity.render-pipelines.high-definition/Editor/PostProcessing/FilmGrainEditor.cs
@@ -1,4 +1,3 @@
-using UnityEditor.Rendering;
 using UnityEngine;
 using UnityEngine.Rendering.HighDefinition;
 
@@ -26,6 +25,9 @@ public override void OnInspectorGUI()
         {
             HDEditorUtils.EnsureFrameSetting(FrameSettingsField.FilmGrain);
 
+            if (m_Intensity.value.floatValue > 0)
+                HDEditorUtils.ShowPlatformPerformanceWarning(BuildTarget.Switch2, "Film Grain");
+
             PropertyField(m_Type);
 
             if (m_Type.value.intValue == (int)FilmGrainLookup.Custom)
diff --git a/Packages/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/Camera/HDAdditionalSceneViewSettings.cs b/Packages/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/Camera/HDAdditionalSceneViewSettings.cs
new file mode 100644
index 00000000000..aeb02397b2c
--- /dev/null
+++ b/Packages/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/Camera/HDAdditionalSceneViewSettings.cs
@@ -0,0 +1,199 @@
+using System;
+using UnityEditor.Experimental;
+using UnityEngine;
+using UnityEngine.Assertions;
+using UnityEngine.Rendering;
+using UnityEngine.Rendering.HighDefinition;
+using UnityEngine.UIElements;
+using AntialiasingMode = UnityEngine.Rendering.HighDefinition.HDAdditionalCameraData.AntialiasingMode;
+
+namespace UnityEditor.Rendering.HighDefinition
+{
+    [InitializeOnLoad]
+    static class HDAdditionalSceneViewSettings
+    {
+        const string k_UXMLResourcePath = "Packages/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/Camera/HDAdditionalSceneViewSettings.uxml";
+
+        [Serializable]
+        class HDAdditionalData : SceneView.AdditionalSettings<HDRenderPipelineAsset, HDAdditionalCameraData>
+        {
+            [SerializeField] AntialiasingMode m_Antialiasing;
+            [SerializeField] bool m_StopNaNs;
+            [SerializeField] bool m_OverrideExposure;
+            [SerializeField] float m_Exposure;
+
+            public AntialiasingMode antialiasing
+            {
+                get => m_Antialiasing;
+                set
+                {
+                    m_Antialiasing = value;
+                    linkedComponent.antialiasing = value;
+                }
+            }
+
+            public bool stopNaNs
+            {
+                get => m_StopNaNs;
+                set
+                {
+                    m_StopNaNs = value;
+                    linkedComponent.stopNaNs = value;
+                }
+            }
+
+            public bool overrideExposure
+            {
+                get => m_OverrideExposure;
+                set
+                {
+                    m_OverrideExposure = value;
+                    linkedComponent.doesSceneViewOverrideExposure = value;
+                }
+            }
+
+            public float exposure
+            {
+                get => m_Exposure;
+                set
+                {
+                    m_Exposure = value;
+                    linkedComponent.sceneViewOverrideExposureValue = value;
+                }
+            }
+
+            public HDAdditionalData(HDAdditionalCameraData component)
+            {
+                Reset();
+                SetLinkedComponent(component);
+                Apply();
+            }
+
+            internal void SetLinkedComponent(HDAdditionalCameraData component)
+                => linkedComponent = component;
+            
+            public override void Apply()
+            {
+                linkedComponent.antialiasing = m_Antialiasing;
+                linkedComponent.stopNaNs = m_StopNaNs;
+                linkedComponent.doesSceneViewOverrideExposure = m_OverrideExposure;
+                linkedComponent.sceneViewOverrideExposureValue = m_Exposure;
+            }
+
+            public override void Reset()
+            {
+                m_Antialiasing = AntialiasingMode.None;
+                m_StopNaNs = false;
+                m_OverrideExposure = false;
+                m_Exposure = 10;
+            }
+        }
+
+        static HDAdditionalSceneViewSettings()
+        {
+            SceneView.onCameraCreated += EnsureAdditionalData;
+            RenderPipelineManager.activeRenderPipelineCreated += AddHooks;
+        }
+        
+        static HDAdditionalData GetSettings(SceneView sceneView) 
+            => sceneView.GetAdditionalSettings<HDAdditionalData>();
+        
+        static void EnsureAdditionalData(SceneView sceneView)
+        {
+            if (!sceneView.camera.TryGetComponent(out HDAdditionalCameraData hdAdditionalCameraData))
+                hdAdditionalCameraData = sceneView.camera.gameObject.AddComponent<HDAdditionalCameraData>();
+
+            HDAdditionalData additionalData = sceneView.GetAdditionalSettings<HDAdditionalData>();
+            if (additionalData == null)
+            {
+                additionalData = new HDAdditionalData(hdAdditionalCameraData);
+                sceneView.AddAdditionalSettings(additionalData);
+            }
+
+            additionalData.SetLinkedComponent(hdAdditionalCameraData);
+            additionalData.Apply();
+        }
+
+        static void AddHooks()
+        {
+            if (GraphicsSettings.currentRenderPipelineAssetType != typeof(HDRenderPipelineAsset))
+                return;
+            SceneViewCameraWindow.createAdditionalSettingsGUI += CreateGUI;
+            SceneViewCameraWindow.bindAdditionalSettings += Bind;
+            RenderPipelineManager.activeRenderPipelineDisposed += RemoveHooks;
+        }
+
+        public static void RemoveHooks()
+        {
+            SceneViewCameraWindow.createAdditionalSettingsGUI -= CreateGUI;
+            SceneViewCameraWindow.bindAdditionalSettings -= Bind;
+            RenderPipelineManager.activeRenderPipelineDisposed -= RemoveHooks;
+        }
+
+        static VisualElement CreateGUI(SceneView sceneView)
+        {
+            var root = new VisualElement();
+            var visualTreeAsset = (VisualTreeAsset)EditorResources.Load<UnityEngine.Object>(k_UXMLResourcePath, isRequired: true);
+            visualTreeAsset.CloneTree(root);
+
+            var antiAliasing = root.Q<EnumField>("AntiAliasing");
+            Assert.IsNotNull(antiAliasing);
+            var taaWarning = root.Q<HelpBox>("TAAWarning");
+            Assert.IsNotNull(taaWarning);
+            var stopNaNs = root.Q<Toggle>("StopNaNs");
+            Assert.IsNotNull(stopNaNs);
+            var overrideExposure = root.Q<Toggle>("OverrideExposure");
+            Assert.IsNotNull(overrideExposure);
+            var exposureValue = root.Q<Slider>("ExposureValue");
+            Assert.IsNotNull(exposureValue);
+            
+            // Links between VisualElement and callbacks
+            antiAliasing.RegisterValueChangedCallback(evt =>
+            {
+                AntialiasingMode newValue = (AntialiasingMode)evt.newValue;
+                GetSettings(sceneView).antialiasing = newValue;
+                taaWarning.style.display = newValue == AntialiasingMode.TemporalAntialiasing ? DisplayStyle.Flex : DisplayStyle.None;
+                sceneView.Repaint();
+            });
+            
+            stopNaNs.RegisterValueChangedCallback(evt =>
+            {
+                GetSettings(sceneView).stopNaNs = evt.newValue;
+                sceneView.Repaint();
+            });
+            
+            overrideExposure.RegisterValueChangedCallback(evt =>
+            {
+                GetSettings(sceneView).overrideExposure = evt.newValue;
+                exposureValue.SetEnabled(evt.newValue);
+                sceneView.Repaint();
+            });
+            
+            exposureValue.RegisterValueChangedCallback(evt =>
+            {
+                GetSettings(sceneView).exposure = evt.newValue;
+                sceneView.Repaint();
+            });
+            
+            return root;
+        }
+
+        static void Bind(SceneView sceneView, VisualElement root)
+        {
+            var antiAliasing = root.Q<EnumField>("AntiAliasing");
+            var taaWarning = root.Q<HelpBox>("TAAWarning");
+            var stopNaNs = root.Q<Toggle>("StopNaNs");
+            var overrideExposure = root.Q<Toggle>("OverrideExposure");
+            var exposureValue = root.Q<Slider>("ExposureValue");
+
+            var settings = GetSettings(sceneView);
+            taaWarning.style.display = settings.antialiasing == AntialiasingMode.TemporalAntialiasing ? DisplayStyle.Flex : DisplayStyle.None;
+            exposureValue.SetEnabled(settings.overrideExposure);
+
+            antiAliasing.SetValueWithoutNotify(settings.antialiasing);
+            stopNaNs.SetValueWithoutNotify(settings.stopNaNs);
+            overrideExposure.SetValueWithoutNotify(settings.overrideExposure);
+            exposureValue.SetValueWithoutNotify(settings.exposure);
+        }
+    }
+}
\ No newline at end of file
diff --git a/Packages/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/Camera/HDAdditionalSceneViewSettings.cs.meta b/Packages/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/Camera/HDAdditionalSceneViewSettings.cs.meta
new file mode 100644
index 00000000000..88c53f20adb
--- /dev/null
+++ b/Packages/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/Camera/HDAdditionalSceneViewSettings.cs.meta
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: c194d2b5bdd2c744c8207030f0241c80
\ No newline at end of file
diff --git a/Packages/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/Camera/HDAdditionalSceneViewSettings.uxml b/Packages/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/Camera/HDAdditionalSceneViewSettings.uxml
new file mode 100644
index 00000000000..88774457826
--- /dev/null
+++ b/Packages/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/Camera/HDAdditionalSceneViewSettings.uxml
@@ -0,0 +1,8 @@
+<ui:UXML xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ui="UnityEngine.UIElements" xmlns:uie="UnityEditor.UIElements" noNamespaceSchemaLocation="../../../../../UIElementsSchema/UIElements.xsd" editor-extension-mode="False">
+    <ui:Label text="Rendering (HD Render Pipeline)" class="header"/>
+    <ui:EnumField name="AntiAliasing" label="Anti-aliasing" tooltip="The anti-aliasing mode used by the Scene View camera." type="UnityEngine.Rendering.HighDefinition.HDAdditionalCameraData+AntialiasingMode, Unity.RenderPipelines.HighDefinition.Runtime" />
+    <ui:HelpBox name="TAAWarning" text="Temporal anti-aliasing in the Scene View is only supported when Always Refresh is enabled." message-type="Info"/>
+    <ui:Toggle name="StopNaNs" label="Stop NaNs" tooltip="When enabled, any NaNs in the Scene View camera’s color buffer are suppressed."/>
+    <ui:Toggle name="OverrideExposure" label="Override Exposure" tooltip="When enabled, the Scene View exposure is overridden with the selected value."/>
+    <ui:Slider name="ExposureValue" label="Scene Exposure" tooltip="The value of the overridden exposure." high-value="16" low-value="-11" class="indent"/>
+</ui:UXML>
diff --git a/Packages/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/Camera/HDAdditionalSceneViewSettings.uxml.meta b/Packages/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/Camera/HDAdditionalSceneViewSettings.uxml.meta
new file mode 100644
index 00000000000..dd083466e21
--- /dev/null
+++ b/Packages/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/Camera/HDAdditionalSceneViewSettings.uxml.meta
@@ -0,0 +1,10 @@
+fileFormatVersion: 2
+guid: a8169af877b64244f98ea13d12c8b7cd
+ScriptedImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 2
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+  script: {fileID: 13804, guid: 0000000000000000e000000000000000, type: 0}
diff --git a/Packages/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/HDEditorUtils.cs b/Packages/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/HDEditorUtils.cs
index 1d41f660866..7f11a0e6aba 100644
--- a/Packages/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/HDEditorUtils.cs
+++ b/Packages/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/HDEditorUtils.cs
@@ -2,12 +2,12 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
+using UnityEditor.Build;
 using UnityEditor.Inspector.GraphicsSettingsInspectors;
 using UnityEngine;
+using UnityEngine.Rendering;
 using UnityEngine.Rendering.HighDefinition;
 using UnityEngine.UIElements;
-using RenderingLayerMask = UnityEngine.RenderingLayerMask;
-using UnityEngine.Rendering;
 
 namespace UnityEditor.Rendering.HighDefinition
 {
@@ -436,6 +436,41 @@ internal static bool EnsureVolume<T>(Func<T, string> volumeValidator) where T :
 
             return true;
         }
+
+        /// <summary>
+        /// Shows a platform-specific performance warning help box for a given feature.
+        /// </summary>
+        /// <param name="targetPlatform">The build target platform to check and display</param>
+        /// <param name="featureName">The name of the feature (e.g., "Ray Tracing", "Film Grain")</param>
+        /// <param name="recommendation">Optional recommendation text. If null, uses default "is not recommended for this platform"</param>
+        internal static void ShowPlatformPerformanceWarning(BuildTarget targetPlatform, string featureName, string recommendation = null)
+        {
+            if (EditorUserBuildSettings.activeBuildTarget != targetPlatform)
+                return;
+
+            var activeBuildTargetGroup = BuildPipeline.GetBuildTargetGroup(targetPlatform);
+            var namedBuildTarget = NamedBuildTarget.FromBuildTargetGroup(activeBuildTargetGroup);
+
+            string message = $"{featureName} is enabled for {namedBuildTarget.TargetName}. ";
+
+            if (!string.IsNullOrEmpty(recommendation))
+            {
+                message += recommendation;
+            }
+            else
+            {
+                message += "This may significantly impact performance and is not recommended for this platform.";
+            }
+
+            EditorGUILayout.HelpBox(message, MessageType.Warning, wide: true);
+        }
+
+        internal static bool IsInTestSuiteOrBatchMode()
+        {
+            string commandLineOptions = System.Environment.CommandLine;
+            bool inTestSuite = commandLineOptions.Contains("-testResults");
+            return inTestSuite || Application.isBatchMode;
+        }
     }
 
     // Due to a UI bug/limitation, we have to do it this way to support bold labels
diff --git a/Packages/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/HDRenderPipelineUI.Skin.cs b/Packages/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/HDRenderPipelineUI.Skin.cs
index 3b997464002..11e218b2163 100644
--- a/Packages/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/HDRenderPipelineUI.Skin.cs
+++ b/Packages/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/HDRenderPipelineUI.Skin.cs
@@ -185,7 +185,8 @@ public class Styles
             public static readonly GUIContent supportRaytracing = EditorGUIUtility.TrTextContent("Realtime Raytracing");
             public static readonly GUIContent supportedRayTracingMode = EditorGUIUtility.TrTextContent("Supported Ray Tracing Mode");
             public static readonly GUIContent supportVFXRayTracing = EditorGUIUtility.TrTextContent("Visual Effects Ray Tracing", "When enabled, Visual Effects Outputs which have Enable Ray Tracing on will be accounted for in Ray-traced effects.");
-            public static readonly GUIContent rayTracingRestrictionOnlyWarning = EditorGUIUtility.TrTextContent("Ray tracing is currently only supported on DX12, Playstation 5 and Xbox Series X.", null, CoreEditorStyles.iconWarn);
+            public static readonly GUIContent rayTracingRestrictionOnlyWarning = EditorGUIUtility.TrTextContent("Ray tracing requires DX12 on Windows. Disable Auto Graphics API and set Direct3D 12 as the first Graphics API in Player Settings. You can use the HDRP Wizard to configure these settings.", null, CoreEditorStyles.iconWarn);
+            public static string rayTracingNotSupportedBuildTarget = L10n.Tr("The {0} does not support Ray tracing. Consider disabling it or switch to a platform that supports it.");
             public static readonly GUIContent rayTracingMSAAUnsupported = EditorGUIUtility.TrTextContent("When Ray tracing is enabled in asset, MSAA is not supported. Please refer to the documentation.");
             public static readonly GUIContent waterMSAAUnsupported = EditorGUIUtility.TrTextContent("When Water is enabled in asset, MSAA is not supported. Please refer to the documentation.");
             public static readonly GUIContent maximumLODLevel = EditorGUIUtility.TrTextContent("Maximum LOD Level");
@@ -315,7 +316,7 @@ int CountBits(uint bitMask) // System.Numerics.BitOperations not available
                     {
                         if (preset == UnityEngine.NVIDIA.DLSSPreset.Preset_Default)
                         {
-                            labels[(int)quality][iWrite++] = "Default Preset";
+                            labels[(int)quality][iWrite++] = "Default Preset" + " - " + UnityEngine.NVIDIA.GraphicsDevice.GetDLSSPresetExplanation(preset);
                             continue;
                         }
 
diff --git a/Packages/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/HDRenderPipelineUI.cs b/Packages/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/HDRenderPipelineUI.cs
index 611809a4234..eb87c47467e 100644
--- a/Packages/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/HDRenderPipelineUI.cs
+++ b/Packages/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/HDRenderPipelineUI.cs
@@ -1,12 +1,12 @@
 using System;
 using System.Collections.Generic;
 using System.Text;
-using UnityEngine;
 using Unity.Mathematics;
+using UnityEditorInternal;
+using UnityEngine;
 using UnityEngine.Experimental.Rendering;
 using UnityEngine.Rendering;
 using UnityEngine.Rendering.HighDefinition;
-using UnityEditorInternal;
 using static UnityEngine.Rendering.HighDefinition.RenderPipelineSettings;
 
 namespace UnityEditor.Rendering.HighDefinition
@@ -1442,12 +1442,11 @@ static void DrawSSGIQualitySetting(SerializedHDRenderPipelineAsset serialized, i
 
         internal static void DisplayRayTracingSupportBox()
         {
-            CoreEditorUtils.DrawFixMeBox(Styles.rayTracingRestrictionOnlyWarning, "Open", () =>
+            var currentBuildTarget = EditorUserBuildSettings.activeBuildTarget;
+            if (HDRenderPipeline.PlatformHasRaytracingIssues(currentBuildTarget, out var warning))
             {
-                HDUserSettings.SetOpen(InclusiveMode.DXROptional, true); // Make sure DXR is open
-                HDWizard.OpenWindow();
-            });
-
+                EditorGUILayout.HelpBox(warning, MessageType.Warning);
+            }
         }
 
         static void Drawer_SectionRenderingUnsorted(SerializedHDRenderPipelineAsset serialized, Editor owner)
@@ -1509,19 +1508,18 @@ static void Drawer_SectionRenderingUnsorted(SerializedHDRenderPipelineAsset seri
 
             EditorGUILayout.PropertyField(serialized.renderPipelineSettings.supportRayTracing, Styles.supportRaytracing);
 
+            // If ray tracing is enabled by the asset but the current system does not support it display a warning
+            if (serialized.renderPipelineSettings.supportRayTracing.boolValue)
+            {
+                DisplayRayTracingSupportBox();
+            }
+
             using (new EditorGUI.DisabledScope(!serialized.renderPipelineSettings.supportRayTracing.boolValue))
             {
                 ++EditorGUI.indentLevel;
                 EditorGUILayout.PropertyField(serialized.renderPipelineSettings.supportedRayTracingMode, Styles.supportedRayTracingMode);
                 EditorGUILayout.PropertyField(serialized.renderPipelineSettings.supportVFXRayTracing,
                     Styles.supportVFXRayTracing);
-
-                // If ray tracing is enabled by the asset but the current system does not support it display a warning
-                if (!HDRenderPipeline.currentSystemSupportsRayTracing)
-                {
-                    if (serialized.renderPipelineSettings.supportRayTracing.boolValue)
-                        DisplayRayTracingSupportBox();
-                }
                 --EditorGUI.indentLevel;
             }
 
@@ -1601,6 +1599,9 @@ static void Drawer_SectionMaterialUnsorted(SerializedHDRenderPipelineAsset seria
             EditorGUILayout.PropertyField(serialized.renderPipelineSettings.supportDistortion, Styles.supportDistortion);
 
             EditorGUILayout.PropertyField(serialized.renderPipelineSettings.supportSubsurfaceScattering, Styles.supportedSSSContent);
+            if (serialized.renderPipelineSettings.supportSubsurfaceScattering.boolValue)
+                HDEditorUtils.ShowPlatformPerformanceWarning(BuildTarget.Switch2, "Subsurface Scattering");
+
             using (new EditorGUI.DisabledScope(serialized.renderPipelineSettings.supportSubsurfaceScattering.hasMultipleDifferentValues
                 || !serialized.renderPipelineSettings.supportSubsurfaceScattering.boolValue))
             {
diff --git a/Packages/com.unity.render-pipelines.universal/Editor/2D/Shadows/ShadowProvider.meta b/Packages/com.unity.render-pipelines.high-definition/Editor/StyleSheets.meta
similarity index 77%
rename from Packages/com.unity.render-pipelines.universal/Editor/2D/Shadows/ShadowProvider.meta
rename to Packages/com.unity.render-pipelines.high-definition/Editor/StyleSheets.meta
index acb09b762ff..397c61fa216 100644
--- a/Packages/com.unity.render-pipelines.universal/Editor/2D/Shadows/ShadowProvider.meta
+++ b/Packages/com.unity.render-pipelines.high-definition/Editor/StyleSheets.meta
@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 6f2ac257a477638438d93937e28e4e34
+guid: 2a4796d5720e5413993abf7d017f508e
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}
diff --git a/Packages/com.unity.render-pipelines.high-definition/Editor/StyleSheets/HDLightingSearchSelectors.uss b/Packages/com.unity.render-pipelines.high-definition/Editor/StyleSheets/HDLightingSearchSelectors.uss
new file mode 100644
index 00000000000..0cb0ba07cd4
--- /dev/null
+++ b/Packages/com.unity.render-pipelines.high-definition/Editor/StyleSheets/HDLightingSearchSelectors.uss
@@ -0,0 +1,6 @@
+/* HDRP Lighting Search Selectors Styles */
+
+/* Light Shape Field */
+.hdrp-lighting-search-light-shape {
+    flex-grow: 1;
+}
diff --git a/Packages/com.unity.render-pipelines.high-definition/Editor/StyleSheets/HDLightingSearchSelectors.uss.meta b/Packages/com.unity.render-pipelines.high-definition/Editor/StyleSheets/HDLightingSearchSelectors.uss.meta
new file mode 100644
index 00000000000..2302e7583d3
--- /dev/null
+++ b/Packages/com.unity.render-pipelines.high-definition/Editor/StyleSheets/HDLightingSearchSelectors.uss.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: a5ab35ca444c4f199f594959243c84c5
+ScriptedImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 2
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+  script: {fileID: 12385, guid: 0000000000000000e000000000000000, type: 0}
+  disableValidation: 0
diff --git a/Packages/com.unity.render-pipelines.high-definition/Editor/VFXGraph/Shaders/Templates/Hexahedron/PassForward.template b/Packages/com.unity.render-pipelines.high-definition/Editor/VFXGraph/Shaders/Templates/Hexahedron/PassForward.template
index 2564b6ae8e9..e73a1bf44a8 100644
--- a/Packages/com.unity.render-pipelines.high-definition/Editor/VFXGraph/Shaders/Templates/Hexahedron/PassForward.template
+++ b/Packages/com.unity.render-pipelines.high-definition/Editor/VFXGraph/Shaders/Templates/Hexahedron/PassForward.template
@@ -10,7 +10,11 @@ Pass
 	#define UNITY_MATERIAL_LIT
 	#define LIGHTLOOP_TILE_PASS
 	${VFXHDRPForwardDefines}
-	#pragma multi_compile USE_FPTL_LIGHTLIST USE_CLUSTERED_LIGHTLIST
+    #if IS_TRANSPARENT_PARTICLE
+        #define USE_CLUSTERED_LIGHTLIST // There is not FPTL lighting when using transparent
+    #else
+	    #pragma multi_compile USE_FPTL_LIGHTLIST USE_CLUSTERED_LIGHTLIST
+    #endif
 	#pragma multi_compile_fragment PUNCTUAL_SHADOW_LOW PUNCTUAL_SHADOW_MEDIUM PUNCTUAL_SHADOW_HIGH
 	#pragma multi_compile_fragment DIRECTIONAL_SHADOW_LOW DIRECTIONAL_SHADOW_MEDIUM DIRECTIONAL_SHADOW_HIGH
 	#pragma multi_compile_fragment AREA_SHADOW_MEDIUM AREA_SHADOW_HIGH
diff --git a/Packages/com.unity.render-pipelines.high-definition/Editor/VFXGraph/Shaders/Templates/Mesh/PassForward.template b/Packages/com.unity.render-pipelines.high-definition/Editor/VFXGraph/Shaders/Templates/Mesh/PassForward.template
index f10abbe1b74..96f73903d53 100644
--- a/Packages/com.unity.render-pipelines.high-definition/Editor/VFXGraph/Shaders/Templates/Mesh/PassForward.template
+++ b/Packages/com.unity.render-pipelines.high-definition/Editor/VFXGraph/Shaders/Templates/Mesh/PassForward.template
@@ -10,7 +10,11 @@ Pass
 
 	#define UNITY_MATERIAL_LIT
 	${VFXHDRPForwardDefines}
-	#pragma multi_compile USE_FPTL_LIGHTLIST USE_CLUSTERED_LIGHTLIST
+    #if IS_TRANSPARENT_PARTICLE
+        #define USE_CLUSTERED_LIGHTLIST // There is not FPTL lighting when using transparent
+    #else
+	    #pragma multi_compile USE_FPTL_LIGHTLIST USE_CLUSTERED_LIGHTLIST
+    #endif
 	#pragma multi_compile_fragment PUNCTUAL_SHADOW_LOW PUNCTUAL_SHADOW_MEDIUM PUNCTUAL_SHADOW_HIGH
 	#pragma multi_compile_fragment DIRECTIONAL_SHADOW_LOW DIRECTIONAL_SHADOW_MEDIUM DIRECTIONAL_SHADOW_HIGH
 	#pragma multi_compile_fragment AREA_SHADOW_MEDIUM AREA_SHADOW_HIGH
diff --git a/Packages/com.unity.render-pipelines.high-definition/Editor/VFXGraph/Shaders/Templates/PlanarPrimitive/PassForward.template b/Packages/com.unity.render-pipelines.high-definition/Editor/VFXGraph/Shaders/Templates/PlanarPrimitive/PassForward.template
index 565d670870e..a2ba0c203b9 100644
--- a/Packages/com.unity.render-pipelines.high-definition/Editor/VFXGraph/Shaders/Templates/PlanarPrimitive/PassForward.template
+++ b/Packages/com.unity.render-pipelines.high-definition/Editor/VFXGraph/Shaders/Templates/PlanarPrimitive/PassForward.template
@@ -11,7 +11,11 @@ Pass
 
 	#define UNITY_MATERIAL_LIT
 	${VFXHDRPForwardDefines}
-	#pragma multi_compile USE_FPTL_LIGHTLIST USE_CLUSTERED_LIGHTLIST
+    #if IS_TRANSPARENT_PARTICLE
+        #define USE_CLUSTERED_LIGHTLIST // There is not FPTL lighting when using transparent
+    #else
+	    #pragma multi_compile USE_FPTL_LIGHTLIST USE_CLUSTERED_LIGHTLIST
+    #endif
 	#pragma multi_compile_fragment PUNCTUAL_SHADOW_LOW PUNCTUAL_SHADOW_MEDIUM PUNCTUAL_SHADOW_HIGH
 	#pragma multi_compile_fragment DIRECTIONAL_SHADOW_LOW DIRECTIONAL_SHADOW_MEDIUM DIRECTIONAL_SHADOW_HIGH
 	#pragma multi_compile_fragment AREA_SHADOW_MEDIUM AREA_SHADOW_HIGH
diff --git a/Packages/com.unity.render-pipelines.high-definition/Editor/VFXGraph/Shaders/Templates/Sphere/PassForward.template b/Packages/com.unity.render-pipelines.high-definition/Editor/VFXGraph/Shaders/Templates/Sphere/PassForward.template
index a9c636741a8..be7e105b065 100644
--- a/Packages/com.unity.render-pipelines.high-definition/Editor/VFXGraph/Shaders/Templates/Sphere/PassForward.template
+++ b/Packages/com.unity.render-pipelines.high-definition/Editor/VFXGraph/Shaders/Templates/Sphere/PassForward.template
@@ -12,7 +12,11 @@ Pass
 	#define LIGHTLOOP_TILE_PASS
 
 	${VFXHDRPForwardDefines}
-	#pragma multi_compile USE_FPTL_LIGHTLIST USE_CLUSTERED_LIGHTLIST
+    #if IS_TRANSPARENT_PARTICLE
+        #define USE_CLUSTERED_LIGHTLIST // There is not FPTL lighting when using transparent
+    #else
+	    #pragma multi_compile USE_FPTL_LIGHTLIST USE_CLUSTERED_LIGHTLIST
+    #endif
 	#pragma multi_compile_fragment PUNCTUAL_SHADOW_LOW PUNCTUAL_SHADOW_MEDIUM PUNCTUAL_SHADOW_HIGH
 	#pragma multi_compile_fragment DIRECTIONAL_SHADOW_LOW DIRECTIONAL_SHADOW_MEDIUM DIRECTIONAL_SHADOW_HIGH
 	#pragma multi_compile_fragment AREA_SHADOW_MEDIUM AREA_SHADOW_HIGH
diff --git a/Packages/com.unity.render-pipelines.high-definition/Editor/VFXGraph/VFXHDRPBinder.cs b/Packages/com.unity.render-pipelines.high-definition/Editor/VFXGraph/VFXHDRPBinder.cs
index bb7d574c7ec..d27a19b564a 100644
--- a/Packages/com.unity.render-pipelines.high-definition/Editor/VFXGraph/VFXHDRPBinder.cs
+++ b/Packages/com.unity.render-pipelines.high-definition/Editor/VFXGraph/VFXHDRPBinder.cs
@@ -214,6 +214,19 @@ private static readonly (Type, string)[] s_UnsupportedHDRPShaderPropertyTypes =
 
         public override ShaderGraphBinder GetShaderGraphDescriptor(VFXContext context, VFXTaskCompiledData data)
         {
+            var output = context as VFXAbstractComposedParticleOutput;
+            List<(KeywordDescriptor oldDesc, int value)> keywordsToDefines = new List<(KeywordDescriptor oldDesc, int value)>();
+            if (output != null)
+            {
+                keywordsToDefines.Add((CoreKeywordDescriptors.Lightmap, 0));
+                keywordsToDefines.Add((CoreKeywordDescriptors.DynamicLightmap, 0));
+                keywordsToDefines.Add((CoreKeywordDescriptors.DirectionalLightmapCombined, 0));
+                keywordsToDefines.Add((CoreKeywordDescriptors.UseLegacyLightmaps, 0));
+                keywordsToDefines.Add((CoreKeywordDescriptors.LightmapBicubicSampling, 0));
+                if(!output.isBlendModeOpaque)
+                    keywordsToDefines.Add((CoreKeywordDescriptors.LightList, 1)); // 1 is the entry for USE_CLUSTERED_LIGHTLIST
+            }
+
             return new ShaderGraphBinder
             {
                 baseStructs = new StructCollection
@@ -225,9 +238,30 @@ public override ShaderGraphBinder GetShaderGraphDescriptor(VFXContext context, V
 
                 varyingsAdditionalFields = VaryingsAdditionalFields,
                 fieldDependencies = ElementSpaceDependencies,
-                useFragInputs = true
+                useFragInputs = true,
+                keywordsToDefines = keywordsToDefines.ToArray(),
             };
         }
+        public override List<PassCollection.Item> FilterOutPasses(PassCollection passes, VFXContext context)
+        {
+            List<PassCollection.Item> filteredPasses = new List<PassCollection.Item>(passes.Count());
+            var outputContext = context as VFXAbstractParticleOutput;
+            bool hasMotionVector =  outputContext.hasMotionVector;
+            bool hasShadowCasting = outputContext.hasShadowCasting;
+            bool isOpaque = outputContext.isBlendModeOpaque;
+            foreach (PassCollection.Item item in passes)
+            {
+                bool skipPass = false;
+                skipPass |= item.descriptor.lightMode == "META";
+                skipPass |= (!hasMotionVector && item.descriptor.lightMode == "MotionVectors");
+                skipPass |= (!hasShadowCasting && item.descriptor.lightMode == "ShadowCaster");
+                skipPass |= (!isOpaque && item.descriptor.lightMode is "GBuffer" or "DepthOnly");
+                skipPass |= (isOpaque && item.descriptor.lightMode is "TransparentDepthPrepass" or "TransparentBackface" or "TransparentDepthPostpass");
+                if(!skipPass)
+                    filteredPasses.Add(item);
+            }
+            return filteredPasses;
+        }
 
         public override IEnumerable<GraphicsDeviceType> GetSupportedGraphicDevices()
         {
diff --git a/Packages/com.unity.render-pipelines.high-definition/Editor/VFXGraph/VFXHDRPSubOutput.cs b/Packages/com.unity.render-pipelines.high-definition/Editor/VFXGraph/VFXHDRPSubOutput.cs
index 62cc7192d01..15c9b9b271f 100644
--- a/Packages/com.unity.render-pipelines.high-definition/Editor/VFXGraph/VFXHDRPSubOutput.cs
+++ b/Packages/com.unity.render-pipelines.high-definition/Editor/VFXGraph/VFXHDRPSubOutput.cs
@@ -149,6 +149,10 @@ private int GetRenderQueueOffset()
                 HDRenderQueue.Clamps(k_RenderQueue_AllOpaque, ChangeType(renderQueueType, 0, owner.hasAlphaClipping) + materialSortingPriority) :
                 ChangeType(renderQueueType, materialSortingPriority, owner.hasAlphaClipping);
         }
+        public override string GetRenderPipelineTagStr()
+        {
+            return HDRenderPipeline.k_ShaderTagName;
+        }
 
         private int GetMaterialSortingPriority()
         {
diff --git a/Packages/com.unity.render-pipelines.high-definition/Editor/Wizard/HDWizard.Configuration.cs b/Packages/com.unity.render-pipelines.high-definition/Editor/Wizard/HDWizard.Configuration.cs
index c4190743c74..4347852d751 100644
--- a/Packages/com.unity.render-pipelines.high-definition/Editor/Wizard/HDWizard.Configuration.cs
+++ b/Packages/com.unity.render-pipelines.high-definition/Editor/Wizard/HDWizard.Configuration.cs
@@ -204,7 +204,7 @@ Entry[] BuildEntryList()
             });
 
             var currentBuildTarget = CalculateSelectedBuildTarget();
-            if ((currentBuildTarget == BuildTarget.PS5) || (currentBuildTarget == BuildTarget.GameCoreXboxSeries))
+            if ((currentBuildTarget == BuildTarget.PS5) || (currentBuildTarget == BuildTarget.GameCoreXboxSeries) || (currentBuildTarget == BuildTarget.Switch2))
             {
                 entryList.AddRange(new[]
                 {
diff --git a/Packages/com.unity.render-pipelines.high-definition/Runtime/Compositor/CompositionLayer.cs b/Packages/com.unity.render-pipelines.high-definition/Runtime/Compositor/CompositionLayer.cs
index 5e2e61e2809..156a1dd7d87 100644
--- a/Packages/com.unity.render-pipelines.high-definition/Runtime/Compositor/CompositionLayer.cs
+++ b/Packages/com.unity.render-pipelines.high-definition/Runtime/Compositor/CompositionLayer.cs
@@ -86,7 +86,7 @@ public enum ResolutionScale
         // AOVs
         [SerializeField] MaterialSharedProperty m_AOVBitmask = 0;
 
-        [SerializeField] Dictionary<string, int> m_AOVMap;
+        Dictionary<string, int> m_AOVMap;
 
         List<RTHandle> m_AOVHandles;
 
@@ -96,7 +96,7 @@ public enum ResolutionScale
 
         [SerializeField] RenderTexture m_RenderTarget;
 
-        [SerializeField] RTHandle m_AOVTmpRTHandle;
+        RTHandle m_AOVTmpRTHandle;
 
         public bool clearsBackGround
         {
diff --git a/Packages/com.unity.render-pipelines.high-definition/Runtime/Core/Textures/Texture2DAtlasDynamic.cs b/Packages/com.unity.render-pipelines.high-definition/Runtime/Core/Textures/Texture2DAtlasDynamic.cs
index 2e3247346f1..2bb8ea8229f 100644
--- a/Packages/com.unity.render-pipelines.high-definition/Runtime/Core/Textures/Texture2DAtlasDynamic.cs
+++ b/Packages/com.unity.render-pipelines.high-definition/Runtime/Core/Textures/Texture2DAtlasDynamic.cs
@@ -250,7 +250,7 @@ public bool IsMergeNeeded(AtlasNodePool pool)
         private int m_Height;
         private AtlasNodePool m_Pool;
         private Int16 m_Root;
-        private Dictionary<int, Int16> m_NodeFromID;
+        private Dictionary<TextureId, Int16> m_NodeFromID;
 
         public AtlasAllocatorDynamic(int width, int height, int capacityAllocations)
         {
@@ -259,7 +259,7 @@ public AtlasAllocatorDynamic(int width, int height, int capacityAllocations)
             Debug.Assert(capacityNodes < (1 << 16), "Error: AtlasAllocatorDynamic: Attempted to allocate a capacity of " + capacityNodes + ", which is greater than our 16-bit indices can support. Please request a capacity <=" + (1 << 16));
             m_Pool = new AtlasNodePool((Int16)capacityNodes);
 
-            m_NodeFromID = new Dictionary<int, Int16>(capacityAllocations);
+            m_NodeFromID = new Dictionary<TextureId, Int16>(capacityAllocations);
 
             Int16 rootParent = -1;
             m_Root = m_Pool.AtlasNodeCreate(rootParent);
@@ -272,7 +272,7 @@ public AtlasAllocatorDynamic(int width, int height, int capacityAllocations)
             // Debug.Log("Allocating atlas = " + debug);
         }
 
-        public bool Allocate(out Vector4 result, int key, int width, int height)
+        public bool Allocate(out Vector4 result, TextureId key, int width, int height)
         {
             Int16 node = m_Pool.m_Nodes[m_Root].Allocate(m_Pool, width, height);
             if (node >= 0)
@@ -288,7 +288,7 @@ public bool Allocate(out Vector4 result, int key, int width, int height)
             }
         }
 
-        public void Release(int key)
+        public void Release(TextureId key)
         {
             if (m_NodeFromID.TryGetValue(key, out Int16 node))
             {
@@ -333,6 +333,35 @@ private void DebugStringFromNode(ref string res, Int16 n, int depthCurrent = 0,
         }
     }
 
+
+
+    struct TextureId : IEquatable<TextureId>
+    {
+        EntityId m_EntityId;
+        int m_TextureSize;
+
+        public TextureId(EntityId entityId, int textureSize)
+        {
+            this.m_EntityId = entityId;
+            this.m_TextureSize = textureSize;
+        }
+
+        public bool Equals(TextureId other)
+        {
+            return m_EntityId.Equals(other.m_EntityId) && m_TextureSize == other.m_TextureSize;
+        }
+
+        public override bool Equals(object obj)
+        {
+            return obj is TextureId other && Equals(other);
+        }
+
+        public override int GetHashCode()
+        {
+            return HashCode.Combine(m_EntityId, m_TextureSize);
+        }
+    }
+
     /// <summary>
     /// A generic Atlas texture of 2D textures.
     /// An atlas texture is a texture collection that collects multiple sub-textures into a single big texture.
@@ -340,13 +369,14 @@ private void DebugStringFromNode(ref string res, Int16 n, int depthCurrent = 0,
     /// </summary>
     internal class Texture2DAtlasDynamic
     {
+
         private RTHandle m_AtlasTexture = null;
         private bool isAtlasTextureOwner = false;
         private int m_Width;
         private int m_Height;
         private GraphicsFormat m_Format;
         private AtlasAllocatorDynamic m_AtlasAllocator = null;
-        private Dictionary<int, Vector4> m_AllocationCache;
+        private Dictionary<TextureId, Vector4> m_AllocationCache;
 
         /// <summary>
         /// Handle to the texture of the atlas.
@@ -393,7 +423,7 @@ public Texture2DAtlasDynamic(int width, int height, int capacity, GraphicsFormat
             isAtlasTextureOwner = true;
 
             m_AtlasAllocator = new AtlasAllocatorDynamic(width, height, capacity);
-            m_AllocationCache = new Dictionary<int, Vector4>(capacity);
+            m_AllocationCache = new Dictionary<TextureId, Vector4>(capacity);
         }
 
         /// <summary>
@@ -412,7 +442,7 @@ public Texture2DAtlasDynamic(int width, int height, int capacity, RTHandle atlas
             isAtlasTextureOwner = false;
 
             m_AtlasAllocator = new AtlasAllocatorDynamic(width, height, capacity);
-            m_AllocationCache = new Dictionary<int, Vector4>(capacity);
+            m_AllocationCache = new Dictionary<TextureId, Vector4>(capacity);
         }
 
         /// <summary>
@@ -442,9 +472,7 @@ public void ResetAllocator()
         /// <returns>Returns True if Unity successfully adds the texture.</returns>
         public bool AddTexture(CommandBuffer cmd, out Vector4 scaleOffset, Texture texture)
         {
-#pragma warning disable 618 // Todo(@daniel.andersen): Potentially use GetRawData or sometin'
-            int key = texture.GetEntityId();
-#pragma warning restore 618
+            TextureId key = new TextureId(texture.GetEntityId(),texture.width);
             if (!m_AllocationCache.TryGetValue(key, out scaleOffset))
             {
                 int width = texture.width;
@@ -474,7 +502,7 @@ public bool AddTexture(CommandBuffer cmd, out Vector4 scaleOffset, Texture textu
         /// <param name="scaleOffset">The texture rectangle coordinates in the atlas.</param>
         /// <param name="key">The key that identifies the texture.</param>
         /// <returns>Returns True if the texture is cached.</returns>
-        public bool IsCached(out Vector4 scaleOffset, int key)
+        public bool IsCached(out Vector4 scaleOffset, TextureId key)
         {
             return m_AllocationCache.TryGetValue(key, out scaleOffset);
         }
@@ -488,7 +516,7 @@ public bool IsCached(out Vector4 scaleOffset, int key)
         /// <param name="width">Width of the texture.</param>
         /// <param name="height">Height of the texture.</param>
         /// <returns>Returns True if Unity successfully allocates the slot.</returns>
-        public bool EnsureTextureSlot(out bool isUploadNeeded, out Vector4 scaleOffset, int key, int width, int height)
+        public bool EnsureTextureSlot(out bool isUploadNeeded, out Vector4 scaleOffset, TextureId key, int width, int height)
         {
             isUploadNeeded = false;
             if (m_AllocationCache.TryGetValue(key, out scaleOffset)) { return true; }
@@ -507,7 +535,7 @@ public bool EnsureTextureSlot(out bool isUploadNeeded, out Vector4 scaleOffset,
         /// Release allocated space from the atlas.
         /// </summary>
         /// <param name="key">The key that identifies the texture.</param>
-        public void ReleaseTextureSlot(int key)
+        public void ReleaseTextureSlot(TextureId key)
         {
             m_AtlasAllocator.Release(key);
             m_AllocationCache.Remove(key);
diff --git a/Packages/com.unity.render-pipelines.high-definition/Runtime/Debug/DebugDisplay.cs b/Packages/com.unity.render-pipelines.high-definition/Runtime/Debug/DebugDisplay.cs
index b1442f1052a..b93f9e8f5b9 100644
--- a/Packages/com.unity.render-pipelines.high-definition/Runtime/Debug/DebugDisplay.cs
+++ b/Packages/com.unity.render-pipelines.high-definition/Runtime/Debug/DebugDisplay.cs
@@ -329,7 +329,7 @@ public partial class DebugData
             public DecalsDebugSettings decalsDebugSettings;
 
             /// <summary>Current transparency debug settings.</summary>
-            public TransparencyDebugSettings transparencyDebugSettings = new TransparencyDebugSettings();
+            public TransparencyDebugSettings transparencyDebugSettings { get; set; }= new TransparencyDebugSettings();
             /// <summary>Index of screen space shadow to display.</summary>
             public uint screenSpaceShadowIndex = 0;
             /// <summary>Max quad cost for quad overdraw display.</summary>
@@ -2114,7 +2114,7 @@ void UnregisterRenderingDebug()
         internal void RegisterDebug()
         {
             InitializeDebugEnums();
-            
+
             RegisterMaterialDebug();
             RegisterLightingDebug();
             RegisterRenderingDebug();
diff --git a/Packages/com.unity.render-pipelines.high-definition/Runtime/Lighting/AtmosphericScattering/OpaqueAtmosphericScattering.shader b/Packages/com.unity.render-pipelines.high-definition/Runtime/Lighting/AtmosphericScattering/OpaqueAtmosphericScattering.shader
index b41a909660f..aad1c48c5b4 100644
--- a/Packages/com.unity.render-pipelines.high-definition/Runtime/Lighting/AtmosphericScattering/OpaqueAtmosphericScattering.shader
+++ b/Packages/com.unity.render-pipelines.high-definition/Runtime/Lighting/AtmosphericScattering/OpaqueAtmosphericScattering.shader
@@ -4,7 +4,7 @@ Shader "Hidden/HDRP/OpaqueAtmosphericScattering"
         #pragma target 4.5
         #pragma editor_sync_compilation
         #pragma only_renderers d3d11 playstation xboxone xboxseries vulkan metal switch switch2
-        //#pragma enable_d3d11_debug_symbols
+        //#pragma enable_debug_symbols
 
         #pragma multi_compile_fragment _ DEBUG_DISPLAY
         #pragma multi_compile_fragment _ OUTPUT_TRANSMITTANCE_BUFFER
diff --git a/Packages/com.unity.render-pipelines.high-definition/Runtime/Lighting/Reflection/ReflectionProbeTextureCache.cs b/Packages/com.unity.render-pipelines.high-definition/Runtime/Lighting/Reflection/ReflectionProbeTextureCache.cs
index d4ba0df255a..64df32734bb 100644
--- a/Packages/com.unity.render-pipelines.high-definition/Runtime/Lighting/Reflection/ReflectionProbeTextureCache.cs
+++ b/Packages/com.unity.render-pipelines.high-definition/Runtime/Lighting/Reflection/ReflectionProbeTextureCache.cs
@@ -29,8 +29,8 @@ class ReflectionProbeTextureCache
         int m_CubeFrameFetchIndex;
         int m_PlanarFrameFetchIndex;
 
-        Dictionary<int, (uint, uint)> m_TextureLRUAndHash = new Dictionary<int, (uint, uint)>();
-        List<(int, uint)> m_TextureLRUSorted = new List<(int, uint)>();
+        Dictionary<TextureId, (uint, uint)> m_TextureLRUAndHash = new Dictionary<TextureId, (uint, uint)>();
+        List<(TextureId, uint)> m_TextureLRUSorted = new List<(TextureId, uint)>();
 
         Material m_ConvertTextureMaterial;
         MaterialPropertyBlock m_ConvertTexturePropertyBlock = new MaterialPropertyBlock();
@@ -104,22 +104,17 @@ public ReflectionProbeTextureCache(
             m_ConvertTextureMaterial = CoreUtils.CreateEngineMaterial(renderPipeline.runtimeShaders.blitCubeTextureFacePS);
         }
 
-        private static int GetTextureID(HDProbe probe)
+        private static TextureId GetTextureID(HDProbe probe)
         {
             return GetTextureIDAndSize(probe, out int _);
         }
 
-        private static int GetTextureIDAndSize(HDProbe probe, out int textureSize)
+        private static TextureId GetTextureIDAndSize(HDProbe probe, out int textureSize)
         {
             textureSize = GetTextureSizeInAtlas(probe);
+            TextureId textureId = new TextureId(probe.texture.GetEntityId(),  textureSize);
 
-            int textureHash = probe.texture.GetEntityId().GetHashCode();
-
-            // Include texture size in ID using simple hash
-            const int kPrime = 31;
-            textureHash = kPrime * textureHash + textureSize;
-
-            return textureHash;
+            return textureId;
         }
 
         private static int GetTextureSizeInAtlas(HDProbe probe)
@@ -202,16 +197,16 @@ private void LogErrorNoMoreSpaceOnce()
             Debug.LogError("No more space in Reflection Probe Atlas. To solve this issue, increase the size of the Reflection Probe Atlas in the HDRP settings.");
         }
 
-        private bool NeedsUpdate(int textureId, uint textureHash, ref Vector4 scaleOffset)
+        private bool NeedsUpdate(TextureId textureTextureId, uint textureHash, ref Vector4 scaleOffset)
         {
             bool needsUpdate = false;
 
-            if (!m_Atlas.IsCached(out scaleOffset, textureId))
+            if (!m_Atlas.IsCached(out scaleOffset, textureTextureId))
                 needsUpdate = true;
-            else if (!m_TextureLRUAndHash.TryGetValue(textureId, out (uint, uint hash) entry) || entry.hash != textureHash)
+            else if (!m_TextureLRUAndHash.TryGetValue(textureTextureId, out (uint, uint hash) entry) || entry.hash != textureHash)
                 needsUpdate = true;
 
-            m_TextureLRUAndHash[textureId] = (m_CurrentRender, textureHash);
+            m_TextureLRUAndHash[textureTextureId] = (m_CurrentRender, textureHash);
 
             return needsUpdate;
         }
@@ -400,7 +395,7 @@ private void BlitTexture2D(CommandBuffer cmd, Vector4 scaleOffset, Vector4 sourc
 
         private bool RelayoutTextureAtlas()
         {
-            using (ListPool<(int textureId, Vector4 scaleOffset)>.Get(out var atlasEntries))
+            using (ListPool<(TextureId textureId, Vector4 scaleOffset)>.Get(out var atlasEntries))
             {
                 atlasEntries.Capacity = m_TextureLRUAndHash.Count;
 
@@ -448,14 +443,14 @@ private bool RelayoutTextureAtlas()
             }
         }
 
-        private bool TryAllocateTexture(int textureId, int textureSize, ref Vector4 scaleOffset)
+        private bool TryAllocateTexture(TextureId textureTextureId, int textureSize, ref Vector4 scaleOffset)
         {
             Assert.IsTrue(Mathf.IsPowerOfTwo(textureSize));
-            Assert.IsTrue(!m_Atlas.IsCached(out _, textureId));
+            Assert.IsTrue(!m_Atlas.IsCached(out _, textureTextureId));
 
             // 1.
             // The first direct attempt to find space.
-            if (m_Atlas.EnsureTextureSlot(out _, out scaleOffset, textureId, textureSize, textureSize))
+            if (m_Atlas.EnsureTextureSlot(out _, out scaleOffset, textureTextureId, textureSize, textureSize))
                 return true;
 
             // 2.
@@ -473,7 +468,7 @@ private bool TryAllocateTexture(int textureId, int textureSize, ref Vector4 scal
                     m_TextureLRUAndHash.Remove(textureLRU.Item1);
                     m_TextureLRUSorted.RemoveAt(textureIndex);
 
-                    if (m_Atlas.EnsureTextureSlot(out _, out scaleOffset, textureId, textureSize, textureSize))
+                    if (m_Atlas.EnsureTextureSlot(out _, out scaleOffset, textureTextureId, textureSize, textureSize))
                         return true;
                 }
                 else
@@ -486,11 +481,11 @@ private bool TryAllocateTexture(int textureId, int textureSize, ref Vector4 scal
             // Try to downscale texture and find space.
             if (m_DecreaseResToFit)
             {
-                if (m_Atlas.EnsureTextureSlot(out _, out scaleOffset, textureId, textureSize / 2, textureSize / 2))
+                if (m_Atlas.EnsureTextureSlot(out _, out scaleOffset, textureTextureId, textureSize / 2, textureSize / 2))
                     return true;
             }
 
-            m_TextureLRUAndHash.Remove(textureId);
+            m_TextureLRUAndHash.Remove(textureTextureId);
 
             return false;
         }
@@ -501,7 +496,7 @@ private bool UpdateTexture(CommandBuffer cmd, HDProbe probe, ref Vector4 scaleOf
             {
                 Texture texture = probe.texture;
 
-                int textureId = GetTextureIDAndSize(probe, out int textureSize);
+                TextureId textureId = GetTextureIDAndSize(probe, out int textureSize);
 
                 if (!m_Atlas.IsCached(out scaleOffset, textureId))
                 {
@@ -527,7 +522,7 @@ private bool UpdateTexture(CommandBuffer cmd, HDProbe probe, ref IBLFilterBSDF.P
             {
                 Texture texture = probe.texture;
 
-                int textureId = GetTextureIDAndSize(probe, out int textureSize);
+                TextureId textureId = GetTextureIDAndSize(probe, out int textureSize);
 
                 if (!m_Atlas.IsCached(out scaleOffset, textureId))
                 {
@@ -606,7 +601,7 @@ public Vector4 FetchCubeReflectionProbe(CommandBuffer cmd, HDProbe probe, out in
 
             Vector4 scaleOffset = Vector4.zero;
 
-            int textureId = GetTextureID(probe);
+            TextureId textureId = GetTextureID(probe);
 
             if (NeedsUpdate(textureId, probe.GetTextureHash(), ref scaleOffset))
             {
@@ -627,7 +622,7 @@ public Vector4 FetchPlanarReflectionProbe(CommandBuffer cmd, HDProbe probe, ref
 
             Vector4 scaleOffset = Vector4.zero;
 
-            int textureId = GetTextureID(probe);
+            TextureId textureId = GetTextureID(probe);
 
             if (NeedsUpdate(textureId, probe.GetTextureHash(), ref scaleOffset))
             {
@@ -644,7 +639,7 @@ public void ReserveReflectionProbeSlot(HDProbe probe)
             Assert.IsTrue(texture.width == texture.height, "Reflection probe should be a square texture. Check the import settings of the texture, or your Texture Importer presets");
             Assert.IsTrue(texture.dimension == TextureDimension.Tex2D || texture.dimension == TextureDimension.Cube, "Reflection probe should be a 2D or Cube texture. Check the import settings of the texture, or your Texture Importer presets");
 
-            int textureId = GetTextureIDAndSize(probe, out int textureSize);
+            TextureId textureId = GetTextureIDAndSize(probe, out int textureSize);
 
             if (!m_Atlas.IsCached(out _, textureId))
             {
diff --git a/Packages/com.unity.render-pipelines.high-definition/Runtime/Lighting/ScreenSpaceLighting/BilateralUpsample.hlsl b/Packages/com.unity.render-pipelines.high-definition/Runtime/Lighting/ScreenSpaceLighting/BilateralUpsample.hlsl
index 2bb3d1c340c..1bdffcc9c14 100644
--- a/Packages/com.unity.render-pipelines.high-definition/Runtime/Lighting/ScreenSpaceLighting/BilateralUpsample.hlsl
+++ b/Packages/com.unity.render-pipelines.high-definition/Runtime/Lighting/ScreenSpaceLighting/BilateralUpsample.hlsl
@@ -124,7 +124,8 @@ void BilUpColor3x3(float highDepth, in NeighborhoodUpsampleData3x3 data, out flo
 
     float TotalWeight = combinedWeightsA.x + combinedWeightsA.y + combinedWeightsA.z + combinedWeightsA.w
                     + combinedWeightsB.x + combinedWeightsB.y + combinedWeightsB.z + combinedWeightsB.w
-                    + combinedWeightsC;
+                    + combinedWeightsC
+                    + _NoiseFilterStrength;
 
     float4 WeightedSum = data.lowValue0 * combinedWeightsA.x
                         + data.lowValue1 * combinedWeightsA.y
@@ -134,25 +135,15 @@ void BilUpColor3x3(float highDepth, in NeighborhoodUpsampleData3x3 data, out flo
                         + data.lowValue5 * combinedWeightsB.y
                         + data.lowValue6 * combinedWeightsB.z
                         + data.lowValue7 * combinedWeightsB.w
-                        + data.lowValue8 * combinedWeightsC
-                        + float4(_NoiseFilterStrength.xxx, 0.0f);
+                        + data.lowValue8 * combinedWeightsC;
 
     float WeightedDepth = dot(data.lowDepthValueA, combinedWeightsA)
                         + dot(data.lowDepthValueB, combinedWeightsB)
                         + data.lowDepthValueC * combinedWeightsC
                         + _NoiseFilterStrength;
 
-    // This branch shouldn't be needed if we do the neighbor analysis mentionned in BuildRay
-    if (TotalWeight == 0.0f)
-    {
-        outColor = float4(0, 0, 0, 1);
-        outDepth = UNITY_NEAR_CLIP_VALUE;
-    }
-    else
-    {
-        outColor = WeightedSum / (TotalWeight + _NoiseFilterStrength);
-        outDepth = WeightedDepth / (TotalWeight + _NoiseFilterStrength);
-    }
+    outColor = WeightedSum / TotalWeight;
+    outDepth = WeightedDepth / TotalWeight;
 }
 
 // Due to compiler issues, it is not possible to use arrays to store the neighborhood values, we then store them in this structure
diff --git a/Packages/com.unity.render-pipelines.high-definition/Runtime/Lighting/VolumetricClouds/VolumetricClouds.compute b/Packages/com.unity.render-pipelines.high-definition/Runtime/Lighting/VolumetricClouds/VolumetricClouds.compute
index 80b8c9e3e49..9e44c083f7c 100644
--- a/Packages/com.unity.render-pipelines.high-definition/Runtime/Lighting/VolumetricClouds/VolumetricClouds.compute
+++ b/Packages/com.unity.render-pipelines.high-definition/Runtime/Lighting/VolumetricClouds/VolumetricClouds.compute
@@ -96,22 +96,41 @@ void REPROJECT_CLOUDS(uint3 dispatchThreadId : SV_DispatchThreadID,
         float validityFactor = 1.0;
 
         #ifdef WITH_REJECTION
+        
+        bool currentIsSky = currentSceneDepth == UNITY_RAW_FAR_CLIP_VALUE;
+
         float4 lightingMin = float4(FLT_MAX, FLT_MAX, FLT_MAX, 1.0);
         float4 lightingMax = float4(0, 0, 0, 0.0);
-        for (int y = -1; y <= 1; ++y)
+
+        int skySampleCount = 0;
+        if(currentIsSky)
         {
-            for (int x = -1; x <= 1; ++x)
+            for (int y = -1; y <= 1; ++y)
             {
-                CloudReprojectionData data = GetCloudReprojectionDataSample(threadCoord, int2(x, y));
-                if ((data.pixelDepth == UNITY_RAW_FAR_CLIP_VALUE) == (currentSceneDepth == UNITY_RAW_FAR_CLIP_VALUE))
+                for (int x = -1; x <= 1; ++x)
                 {
-                    lightingMin = min(lightingMin, data.cloudLighting);
-                    lightingMax = max(lightingMax, data.cloudLighting);
+                    CloudReprojectionData data = GetCloudReprojectionDataSample(threadCoord, int2(x, y));
+                    bool sampleIsSky = data.pixelDepth == UNITY_RAW_FAR_CLIP_VALUE;
+
+                    if (sampleIsSky)
+                    {
+                        lightingMin = min(lightingMin, data.cloudLighting);
+                        lightingMax = max(lightingMax, data.cloudLighting);
+                        skySampleCount++;
+                    }
                 }
             }
+
+            // Only apply clamping if we have enough sky samples (at least 5 out of 9)
+            if (skySampleCount >= 5)
+            {
+                // Modulate validity factor based on sky sample ratio, the more samples are sky, the more ghosting reduction
+                float skyRatio = skySampleCount / 9.0;
+                previousColor = ClipCloudsToRegion(previousColor, lightingMin, lightingMax, skyRatio);
+                validityFactor *= skyRatio;
+            }
         }
 
-        previousColor = ClipCloudsToRegion(previousColor, lightingMin, lightingMax, validityFactor);
         #endif
 
         if (validTracing)
diff --git a/Packages/com.unity.render-pipelines.high-definition/Runtime/Lighting/VolumetricClouds/VolumetricCloudsCombine.shader b/Packages/com.unity.render-pipelines.high-definition/Runtime/Lighting/VolumetricClouds/VolumetricCloudsCombine.shader
index 32954c82e6b..23f756c7e9c 100644
--- a/Packages/com.unity.render-pipelines.high-definition/Runtime/Lighting/VolumetricClouds/VolumetricCloudsCombine.shader
+++ b/Packages/com.unity.render-pipelines.high-definition/Runtime/Lighting/VolumetricClouds/VolumetricCloudsCombine.shader
@@ -7,7 +7,7 @@ Shader "Hidden/HDRP/VolumetricCloudsCombine"
         HLSLINCLUDE
         #pragma target 4.5
         #pragma only_renderers d3d11 playstation xboxone xboxseries vulkan metal switch switch2
-        //#pragma enable_d3d11_debug_symbols
+        //#pragma enable_debug_symbols
 
         #pragma vertex Vert
         #pragma fragment Frag
diff --git a/Packages/com.unity.render-pipelines.high-definition/Runtime/Lighting/VolumetricLighting/LocalVolumetricFog.cs.meta b/Packages/com.unity.render-pipelines.high-definition/Runtime/Lighting/VolumetricLighting/LocalVolumetricFog.cs.meta
index f03ddda2af1..177c9533c47 100644
--- a/Packages/com.unity.render-pipelines.high-definition/Runtime/Lighting/VolumetricLighting/LocalVolumetricFog.cs.meta
+++ b/Packages/com.unity.render-pipelines.high-definition/Runtime/Lighting/VolumetricLighting/LocalVolumetricFog.cs.meta
@@ -5,6 +5,7 @@ MonoImporter:
   serializedVersion: 2
   defaultReferences: []
   executionOrder: 0
+  icon: {fileID: 2800000, guid: a51c08ea4f8a47641a38f14eff7be3db, type: 2}
   userData: 
   assetBundleName: 
   assetBundleVariant: 
diff --git a/Packages/com.unity.render-pipelines.high-definition/Runtime/Lighting/VolumetricLighting/VolumetricLightingFiltering.compute b/Packages/com.unity.render-pipelines.high-definition/Runtime/Lighting/VolumetricLighting/VolumetricLightingFiltering.compute
index 468e2e781a3..a1ae3df1ecc 100644
--- a/Packages/com.unity.render-pipelines.high-definition/Runtime/Lighting/VolumetricLighting/VolumetricLightingFiltering.compute
+++ b/Packages/com.unity.render-pipelines.high-definition/Runtime/Lighting/VolumetricLighting/VolumetricLightingFiltering.compute
@@ -29,52 +29,65 @@ RW_TEXTURE3D(float4, _VBufferLightingFiltered);
 RW_TEXTURE3D(float4, _VBufferLighting);
 #endif
 
-#define GAUSSIAN_SIGMA 1.0
-#define GROUP_SIZE_1D_XY 8
-#define GROUP_SIZE_1D_Z 1
+#define GAUSSIAN_SIGMA      1.0
+#define GROUP_SIZE_1D_XY    8
+#define GROUP_SIZE_1D_Z     1
+#define NR_THREADS          (GROUP_SIZE_1D_XY * GROUP_SIZE_1D_XY * GROUP_SIZE_1D_Z)
 
-#define FILTER_SIZE_1D (GROUP_SIZE_1D_XY + 2) // With a 8x8 group, we have a 10x10 working area
-#define LDS_SIZE FILTER_SIZE_1D * FILTER_SIZE_1D
+// Some platforms benefit from not using the split cache
+#define USE_SPLIT_CACHE     (!defined(SHADER_API_SWITCH) && !defined(SHADER_API_SWITCH2))
+
+#define FILTER_SIZE_1D      (GROUP_SIZE_1D_XY + 2) // With a 8x8 group, we have a 10x10 working area
+#define LDS_SIZE            FILTER_SIZE_1D * FILTER_SIZE_1D
+
+#define DIV_ROUND_UP(N, D)  (((N) + ((D) - 1)) / (D)) // No division by 0 checks
 
 // TODO: May use 1 uint for 2 pixels
+#if USE_SPLIT_CACHE
 groupshared float gs_cacheR[LDS_SIZE];
 groupshared float gs_cacheG[LDS_SIZE];
 groupshared float gs_cacheB[LDS_SIZE];
 groupshared float gs_cacheA[LDS_SIZE];
+#else
+groupshared float4 gs_cache[LDS_SIZE];
+#endif // USE_SPLIT_CACHE
 
 float4 GetSample(uint index)
 {
     float4 outVal;
+#if USE_SPLIT_CACHE
     outVal.r = gs_cacheR[index];
     outVal.g = gs_cacheG[index];
     outVal.b = gs_cacheB[index];
     outVal.a = gs_cacheA[index];
-
+#else
+    outVal = gs_cache[index];
+#endif // USE_SPLIT_CACHE
     return outVal;
 }
 
-void PrefetchData(uint groupIndex, uint2 groupOrigin, uint sliceIndex)
+void PrefetchData(uint sampleID, uint2 groupOrigin, uint sliceIndex)
 {
-    int2 originXY = groupOrigin - int2(1, 1);
+    int2 originXY = int2(groupOrigin) - 1;
 
-    for (int i = 0; i < 2; ++i)
-    {
-        uint sampleID = i + (groupIndex * 2);
-        int offsetX = sampleID % FILTER_SIZE_1D;
-        int offsetY = sampleID / FILTER_SIZE_1D;
+    int offsetX = sampleID % FILTER_SIZE_1D;
+    int offsetY = sampleID / FILTER_SIZE_1D;
 
-        int3 sampleCoord = int3(clamp(originXY.x + offsetX, 0, _VBufferViewportSize.x - 1),
-                                clamp(originXY.y + offsetY, 0, _VBufferViewportSize.y - 1),
-                                sliceIndex);
+    uint3 sampleCoord = uint3(clamp(originXY.x + offsetX, 0, max(0, _VBufferViewportSize.x - 1)),
+                              clamp(originXY.y + offsetY, 0, max(0, _VBufferViewportSize.y - 1)),
+                              sliceIndex);
 
-        float4 sampleVal = _VBufferLighting[sampleCoord];
+    float4 sampleVal = _VBufferLighting[sampleCoord];
 
-        int LDSIndex = offsetX + offsetY * FILTER_SIZE_1D;
-        gs_cacheR[LDSIndex] = sampleVal.r;
-        gs_cacheG[LDSIndex] = sampleVal.g;
-        gs_cacheB[LDSIndex] = sampleVal.b;
-        gs_cacheA[LDSIndex] = sampleVal.a;
-    }
+    uint LDSIndex = offsetX + offsetY * FILTER_SIZE_1D;
+#if USE_SPLIT_CACHE
+    gs_cacheR[LDSIndex] = sampleVal.r;
+    gs_cacheG[LDSIndex] = sampleVal.g;
+    gs_cacheB[LDSIndex] = sampleVal.b;
+    gs_cacheA[LDSIndex] = sampleVal.a;
+#else
+    gs_cache[LDSIndex] = sampleVal;
+#endif // USE_SPLIT_CACHE
 }
 
 void WriteOutput(uint3 voxelCoord, float4 value)
@@ -94,9 +107,9 @@ float Gaussian(float radius, float sigma)
 
 [numthreads(GROUP_SIZE_1D_XY, GROUP_SIZE_1D_XY, GROUP_SIZE_1D_Z)]
 void FilterVolumetricLighting(uint3 dispatchThreadId : SV_DispatchThreadID,
-                                int   groupIndex       : SV_GroupIndex,
-                                uint2 groupId          : SV_GroupID,
-                                uint2 groupThreadId    : SV_GroupThreadID)
+                              uint  groupIndex       : SV_GroupIndex,
+                              uint2 groupId          : SV_GroupID,
+                              uint2 groupThreadId    : SV_GroupThreadID)
 {
     // Compute the coordinate that this thread needs to process
     uint2 currentCoord  = groupId * GROUP_SIZE_1D_XY + groupThreadId;
@@ -105,10 +118,11 @@ void FilterVolumetricLighting(uint3 dispatchThreadId : SV_DispatchThreadID,
     // Compute the output voxel coordinate
     uint3 voxelCoord = uint3(currentCoord, currentSlice);
 
-    if (groupIndex < 50)
+    // Preload data
+    UNITY_UNROLLX(DIV_ROUND_UP(LDS_SIZE, NR_THREADS))
+    for (uint i = groupIndex; i < LDS_SIZE; i += NR_THREADS)
     {
-        // Load 2 values per thread.
-        PrefetchData(groupIndex, groupId * GROUP_SIZE_1D_XY, voxelCoord.z);
+        PrefetchData(i, groupId * GROUP_SIZE_1D_XY, voxelCoord.z);
     }
 
     // Make sure all values are loaded in LDS by now.
@@ -120,15 +134,14 @@ void FilterVolumetricLighting(uint3 dispatchThreadId : SV_DispatchThreadID,
 
     const int radius = 1;
 
+    UNITY_UNROLL
     for (int idx = -radius; idx <= radius; ++idx)
     {
+        UNITY_UNROLL
         for (int idx2 = -radius; idx2 <= radius; ++idx2)
         {
-            // Compute the next tapping coordinate
-            const int3 tapCoord = int3(voxelCoord.x, voxelCoord.y, voxelCoord.z) + int3(idx2, idx, 0);
-
             // Tap from LDS
-            int2 tapAddress = (groupThreadId + 1) + int2(idx2, idx);
+            int2 tapAddress = (int2(groupThreadId) + 1) + int2(idx2, idx);
             uint ldsTapAddress = uint(tapAddress.x) % FILTER_SIZE_1D + tapAddress.y * FILTER_SIZE_1D;
             float4 currentValue = GetSample(ldsTapAddress);
 
@@ -139,7 +152,6 @@ void FilterVolumetricLighting(uint3 dispatchThreadId : SV_DispatchThreadID,
             value += currentValue * weight;
             sumW += weight;
         }
-
     }
 
     WriteOutput(voxelCoord, value / sumW);
diff --git a/Packages/com.unity.render-pipelines.high-definition/Runtime/Material/Arnold/ArnoldStandardSurface.ShaderGraph b/Packages/com.unity.render-pipelines.high-definition/Runtime/Material/Arnold/ArnoldStandardSurface.shadergraph
similarity index 100%
rename from Packages/com.unity.render-pipelines.high-definition/Runtime/Material/Arnold/ArnoldStandardSurface.ShaderGraph
rename to Packages/com.unity.render-pipelines.high-definition/Runtime/Material/Arnold/ArnoldStandardSurface.shadergraph
diff --git a/Packages/com.unity.render-pipelines.high-definition/Runtime/Material/Arnold/ArnoldStandardSurface.ShaderGraph.meta b/Packages/com.unity.render-pipelines.high-definition/Runtime/Material/Arnold/ArnoldStandardSurface.shadergraph.meta
similarity index 100%
rename from Packages/com.unity.render-pipelines.high-definition/Runtime/Material/Arnold/ArnoldStandardSurface.ShaderGraph.meta
rename to Packages/com.unity.render-pipelines.high-definition/Runtime/Material/Arnold/ArnoldStandardSurface.shadergraph.meta
diff --git a/Packages/com.unity.render-pipelines.high-definition/Runtime/Material/Decal/Decal.shader b/Packages/com.unity.render-pipelines.high-definition/Runtime/Material/Decal/Decal.shader
index 1987b545629..75a05ee131f 100644
--- a/Packages/com.unity.render-pipelines.high-definition/Runtime/Material/Decal/Decal.shader
+++ b/Packages/com.unity.render-pipelines.high-definition/Runtime/Material/Decal/Decal.shader
@@ -66,7 +66,7 @@ Shader "HDRP/Decal"
 
     #pragma target 4.5
     #pragma only_renderers d3d11 playstation xboxone xboxseries vulkan metal switch switch2
-    //#pragma enable_d3d11_debug_symbols
+    //#pragma enable_debug_symbols
 
     //-------------------------------------------------------------------------------------
     // Variant
diff --git a/Packages/com.unity.render-pipelines.high-definition/Runtime/Material/Decal/DecalProjector.cs.meta b/Packages/com.unity.render-pipelines.high-definition/Runtime/Material/Decal/DecalProjector.cs.meta
index 369590cb415..292a4bcd018 100644
--- a/Packages/com.unity.render-pipelines.high-definition/Runtime/Material/Decal/DecalProjector.cs.meta
+++ b/Packages/com.unity.render-pipelines.high-definition/Runtime/Material/Decal/DecalProjector.cs.meta
@@ -5,6 +5,7 @@ MonoImporter:
   serializedVersion: 2
   defaultReferences: []
   executionOrder: 0
+  icon: {fileID: 2800000, guid: 340b2e8f8761e254d8ee52bc663cedbd, type: 2}
   userData: 
   assetBundleName: 
   assetBundleVariant: 
diff --git a/Packages/com.unity.render-pipelines.high-definition/Runtime/Material/Lit/Lit.shader b/Packages/com.unity.render-pipelines.high-definition/Runtime/Material/Lit/Lit.shader
index 82d63c22218..9f8401e815a 100644
--- a/Packages/com.unity.render-pipelines.high-definition/Runtime/Material/Lit/Lit.shader
+++ b/Packages/com.unity.render-pipelines.high-definition/Runtime/Material/Lit/Lit.shader
@@ -225,7 +225,7 @@ Shader "HDRP/Lit"
     HLSLINCLUDE
 
     #pragma target 4.5
-    //#pragma enable_d3d11_debug_symbols
+    //#pragma enable_debug_symbols
 
     //-------------------------------------------------------------------------------------
     // Variant
@@ -912,7 +912,7 @@ Shader "HDRP/Lit"
             #pragma shader_feature_local _DISABLE_SSR_TRANSPARENT
             #pragma shader_feature_local_fragment _ _REFRACTION_PLANE _REFRACTION_SPHERE _REFRACTION_THIN
 
-            #pragma switch2_extended_structured_buffer_bindings
+            #pragma extended_structured_buffer_bindings
 
             #ifndef SHADER_STAGE_FRAGMENT
             #define SHADOW_LOW
@@ -1046,7 +1046,7 @@ Shader "HDRP/Lit"
 
             #pragma shader_feature_local _ADD_PRECOMPUTED_VELOCITY
 
-            #pragma switch2_extended_structured_buffer_bindings
+            #pragma extended_structured_buffer_bindings
 
             #ifndef SHADER_STAGE_FRAGMENT
             #define SHADOW_LOW
diff --git a/Packages/com.unity.render-pipelines.high-definition/Runtime/Material/PhysicalMaterial3DsMax/PhysicalMaterial3DsMax.ShaderGraph b/Packages/com.unity.render-pipelines.high-definition/Runtime/Material/PhysicalMaterial3DsMax/PhysicalMaterial3DsMax.shadergraph
similarity index 100%
rename from Packages/com.unity.render-pipelines.high-definition/Runtime/Material/PhysicalMaterial3DsMax/PhysicalMaterial3DsMax.ShaderGraph
rename to Packages/com.unity.render-pipelines.high-definition/Runtime/Material/PhysicalMaterial3DsMax/PhysicalMaterial3DsMax.shadergraph
diff --git a/Packages/com.unity.render-pipelines.high-definition/Runtime/Material/PhysicalMaterial3DsMax/PhysicalMaterial3DsMax.ShaderGraph.meta b/Packages/com.unity.render-pipelines.high-definition/Runtime/Material/PhysicalMaterial3DsMax/PhysicalMaterial3DsMax.shadergraph.meta
similarity index 100%
rename from Packages/com.unity.render-pipelines.high-definition/Runtime/Material/PhysicalMaterial3DsMax/PhysicalMaterial3DsMax.ShaderGraph.meta
rename to Packages/com.unity.render-pipelines.high-definition/Runtime/Material/PhysicalMaterial3DsMax/PhysicalMaterial3DsMax.shadergraph.meta
diff --git a/Packages/com.unity.render-pipelines.high-definition/Runtime/Material/SubsurfaceScattering/CombineLighting.shader b/Packages/com.unity.render-pipelines.high-definition/Runtime/Material/SubsurfaceScattering/CombineLighting.shader
index 459d6859f23..59b48da6625 100644
--- a/Packages/com.unity.render-pipelines.high-definition/Runtime/Material/SubsurfaceScattering/CombineLighting.shader
+++ b/Packages/com.unity.render-pipelines.high-definition/Runtime/Material/SubsurfaceScattering/CombineLighting.shader
@@ -11,7 +11,7 @@ Shader "Hidden/HDRP/CombineLighting"
         HLSLINCLUDE
         #pragma target 4.5
         #pragma only_renderers d3d11 playstation xboxone xboxseries vulkan metal switch switch2
-        // #pragma enable_d3d11_debug_symbols
+        // #pragma enable_debug_symbols
 
         #pragma vertex Vert
         #pragma fragment Frag
diff --git a/Packages/com.unity.render-pipelines.high-definition/Runtime/PostProcessing/Shaders/TemporalAntiAliasing.shader b/Packages/com.unity.render-pipelines.high-definition/Runtime/PostProcessing/Shaders/TemporalAntiAliasing.shader
index 4f74a5785cb..4badf2e1ac5 100644
--- a/Packages/com.unity.render-pipelines.high-definition/Runtime/PostProcessing/Shaders/TemporalAntiAliasing.shader
+++ b/Packages/com.unity.render-pipelines.high-definition/Runtime/PostProcessing/Shaders/TemporalAntiAliasing.shader
@@ -18,7 +18,7 @@ Shader "Hidden/HDRP/TemporalAA"
         #pragma multi_compile_local_fragment LOW_QUALITY MEDIUM_QUALITY HIGH_QUALITY TAA_UPSAMPLE POST_DOF
 
         #pragma editor_sync_compilation
-       // #pragma enable_d3d11_debug_symbols
+       // #pragma enable_debug_symbols
 
         #pragma only_renderers d3d11 playstation xboxone xboxseries vulkan metal switch switch2
         #include "Packages/com.unity.render-pipelines.core/ShaderLibrary/Common.hlsl"
diff --git a/Packages/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Camera/HDAdditionalCameraData.cs b/Packages/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Camera/HDAdditionalCameraData.cs
index 261764a7a59..03e0de7b986 100644
--- a/Packages/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Camera/HDAdditionalCameraData.cs
+++ b/Packages/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Camera/HDAdditionalCameraData.cs
@@ -818,5 +818,12 @@ public RTHandle GetGraphicsBuffer(BufferAccessType type)
             else
                 return null;
         }
+
+#if UNITY_EDITOR
+        [NonSerialized, ExcludeCopy]
+        internal bool doesSceneViewOverrideExposure = false;
+        [NonSerialized, ExcludeCopy]
+        internal float sceneViewOverrideExposureValue = 10f;
+#endif
     }
 }
diff --git a/Packages/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Camera/HDCamera.cs b/Packages/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Camera/HDCamera.cs
index 8e1e44ff34a..558dc822239 100644
--- a/Packages/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Camera/HDCamera.cs
+++ b/Packages/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Camera/HDCamera.cs
@@ -1937,6 +1937,19 @@ internal void SetRayTracingCullingOverride(bool allow)
         {
             allowRayTracingCullingOverride = allow;
         }
+
+#if UNITY_EDITOR
+        internal bool isSceneViewCameraWithExposureOverride
+            => camera.cameraType == CameraType.SceneView
+            && m_AdditionalCameraData != null
+            && m_AdditionalCameraData.doesSceneViewOverrideExposure;
+
+        internal float sceneViewExposureOverride
+            => m_AdditionalCameraData == null 
+            ? 10f 
+            : m_AdditionalCameraData.sceneViewOverrideExposureValue;
+#endif
+
         #endregion
 
 
@@ -1999,7 +2012,7 @@ void UpdateAntialiasing()
 #if UNITY_EDITOR
                 else if (camera.cameraType == CameraType.SceneView)
                 {
-                    var mode = HDAdditionalSceneViewSettings.sceneViewAntialiasing;
+                    var mode = m_AdditionalCameraData?.antialiasing ?? AntialiasingMode.None;
 
                     if (mode == AntialiasingMode.TemporalAntialiasing && !animateMaterials)
                         antialiasing = AntialiasingMode.None;
diff --git a/Packages/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.PostProcess.cs b/Packages/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.PostProcess.cs
index b11ad5c0012..0ca62d8964c 100644
--- a/Packages/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.PostProcess.cs
+++ b/Packages/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.PostProcess.cs
@@ -1,10 +1,8 @@
 using System;
-using System.Collections.Generic;
 using System.Runtime.CompilerServices;
 using UnityEngine.Assertions;
 using UnityEngine.Experimental.Rendering;
 using UnityEngine.Rendering.RenderGraphModule;
-using UnityEngine.Rendering.HighDefinition.Compositor;
 
 namespace UnityEngine.Rendering.HighDefinition
 {
@@ -1219,11 +1217,9 @@ TextureHandle StopNaNsPass(RenderGraph renderGraph, HDCamera hdCamera, in Textur
         {
             // Optional NaN killer before post-processing kicks in
             bool stopNaNs = hdCamera.stopNaNs && m_StopNaNFS;
-
 #if UNITY_EDITOR
-            bool isSceneView = hdCamera.camera.cameraType == CameraType.SceneView;
-            if (isSceneView)
-                stopNaNs = HDAdditionalSceneViewSettings.sceneViewStopNaNs;
+            if (hdCamera.camera.cameraType == CameraType.SceneView)
+                stopNaNs = hdCamera.stopNaNs; //no PP / FS check for SceneView Camera
 #endif
             if (stopNaNs)
             {
@@ -1272,7 +1268,7 @@ internal static void SetExposureTextureToEmpty(RTHandle exposureTexture)
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         bool IsExposureFixed(HDCamera camera) => m_Exposure.mode.value == ExposureMode.Fixed || m_Exposure.mode.value == ExposureMode.UsePhysicalCamera
 #if UNITY_EDITOR
-        || (camera.camera.cameraType == CameraType.SceneView && HDAdditionalSceneViewSettings.sceneExposureOverriden)
+        || camera.isSceneViewCameraWithExposureOverride
         || (UnityEditor.SceneView.lastActiveSceneView != null && UnityEditor.SceneView.lastActiveSceneView.isUsingSceneFiltering)
 #endif
         ;
@@ -1381,16 +1377,16 @@ void DoFixedExposure(HDCamera hdCamera, CommandBuffer cmd)
             Vector4 exposureParams2 = new Vector4(0.0f, 0.0f, ColorUtils.lensImperfectionExposureScale, ColorUtils.s_LightMeterCalibrationConstant);
             if (m_Exposure.mode.value == ExposureMode.Fixed
 #if UNITY_EDITOR
-                || HDAdditionalSceneViewSettings.sceneExposureOverriden && hdCamera.camera.cameraType == CameraType.SceneView
+                || hdCamera.isSceneViewCameraWithExposureOverride
 #endif
             )
             {
                 kernel = cs.FindKernel("KFixedExposure");
                 exposureParams = new Vector4(m_Exposure.compensation.value + m_DebugExposureCompensation, m_Exposure.fixedExposure.value, 0f, 0f);
 #if UNITY_EDITOR
-                if (HDAdditionalSceneViewSettings.sceneExposureOverriden && hdCamera.camera.cameraType == CameraType.SceneView)
+                if (hdCamera.isSceneViewCameraWithExposureOverride)
                 {
-                    exposureParams = new Vector4(0.0f, HDAdditionalSceneViewSettings.sceneExposure, 0f, 0f);
+                    exposureParams = new Vector4(0.0f, hdCamera.sceneViewExposureOverride, 0f, 0f);
                 }
 #endif
             }
diff --git a/Packages/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/LineRendering/Core/LineRendering.Data.cs b/Packages/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/LineRendering/Core/LineRendering.Data.cs
index 0342391c6d0..c8787570393 100644
--- a/Packages/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/LineRendering/Core/LineRendering.Data.cs
+++ b/Packages/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/LineRendering/Core/LineRendering.Data.cs
@@ -103,7 +103,7 @@ public struct RendererData
             /// <summary>Offscreen shading pass index.</summary>
             public int offscreenShadingPass;
             /// <summary>Handle to the line topology's index buffer resource.</summary>
-            public BufferHandle indexBuffer;
+            public BufferHandle indexBuffer { get; set; }
             /// <summary>Distance to camera for sorting purposes.</summary>
             public float distanceToCamera;
             /// <summary>The number of lines in the mesh.</summary>
@@ -111,7 +111,7 @@ public struct RendererData
             /// <summary>The number of segments-per-line.</summary>
             public int segmentsPerLine;
             /// <summary>Handle to a buffer for computing level of detail.</summary>
-            public BufferHandle lodBuffer;
+            public BufferHandle lodBuffer { get; set; }
             /// <summary>Level of detail mode.</summary>
             public RendererLODMode lodMode;
             /// <summary>Percentage of strands to render.</summary>
diff --git a/Packages/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Raytracing/HDRaytracingManager.cs b/Packages/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Raytracing/HDRaytracingManager.cs
index b45b8e8b191..3b9e55c7b89 100644
--- a/Packages/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Raytracing/HDRaytracingManager.cs
+++ b/Packages/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Raytracing/HDRaytracingManager.cs
@@ -1,9 +1,13 @@
-using System;
 using System.Collections.Generic;
 using UnityEngine.Experimental.Rendering;
 using UnityEngine.Rendering.RenderGraphModule;
 using UnityEngine.VFX;
 
+#if UNITY_EDITOR
+using UnityEditor;
+using UnityEditor.Build;
+#endif
+
 namespace UnityEngine.Rendering.HighDefinition
 {
     [GenerateHLSL]
@@ -907,16 +911,84 @@ internal HDRaytracingLightCluster RequestLightCluster()
 
         // Ray Tracing is supported if the asset setting supports it and the platform supports it
         static internal bool PipelineSupportsRayTracing(RenderPipelineSettings rpSetting)
-            => rpSetting.supportRayTracing && currentSystemSupportsRayTracing;
+            => rpSetting.supportRayTracing && IsSupportedRayTracingTarget();
 
-        static internal bool currentSystemSupportsRayTracing => SystemInfo.supportsRayTracing
+        static internal bool IsSupportedRayTracingTarget()
+        {
+            bool supported = SystemInfo.supportsRayTracing;
 #if UNITY_EDITOR
-            && (UnityEditor.EditorUserBuildSettings.activeBuildTarget == UnityEditor.BuildTarget.StandaloneWindows64
-                || UnityEditor.EditorUserBuildSettings.activeBuildTarget == UnityEditor.BuildTarget.StandaloneWindows
-                || UnityEditor.EditorUserBuildSettings.activeBuildTarget == UnityEditor.BuildTarget.GameCoreXboxSeries
-                || UnityEditor.EditorUserBuildSettings.activeBuildTarget == UnityEditor.BuildTarget.PS5);
-#else
-            ;
+            supported &= IsSupportedRayTracingTarget(EditorUserBuildSettings.activeBuildTarget);
+#endif
+            return supported;
+        }
+
+#if UNITY_EDITOR
+        static internal bool IsSupportedRayTracingTarget(BuildTarget buildTarget)
+        {
+            switch (buildTarget)
+            {
+                case BuildTarget.StandaloneWindows64:
+                case BuildTarget.StandaloneWindows:
+                case BuildTarget.GameCoreXboxSeries:
+                case BuildTarget.PS5:
+                case BuildTarget.Switch2:
+                    return true;
+            }
+
+            return false;
+        }
+
+        static internal bool PlatformHasRaytracingIssues(BuildTarget buildTarget, out string message)
+        {
+            message = string.Empty;
+
+            var currentBuildTarget = EditorUserBuildSettings.activeBuildTarget;
+
+            // PS5 and Xbox Series fully support ray tracing - no warning needed
+            if (currentBuildTarget == BuildTarget.PS5 || currentBuildTarget == BuildTarget.GameCoreXboxSeries)
+                return false;
+
+            // Check if platform supports ray tracing
+            if (!IsSupportedRayTracingTarget(currentBuildTarget))
+            {
+                var activeBuildTargetGroup = BuildPipeline.GetBuildTargetGroup(currentBuildTarget);
+                var namedBuildTarget = NamedBuildTarget.FromBuildTargetGroup(activeBuildTargetGroup);
+                message = $"The {namedBuildTarget.TargetName} platform does not support Ray Tracing. Consider disabling it or switch to a platform that supports it.";
+                return true;
+            }
+
+            // Switch 2 supports ray tracing but with performance impact - show performance warning
+            if (currentBuildTarget == BuildTarget.Switch2)
+            {
+                var activeBuildTargetGroup = BuildPipeline.GetBuildTargetGroup(BuildTarget.Switch2);
+                var namedBuildTarget = NamedBuildTarget.FromBuildTargetGroup(activeBuildTargetGroup);
+                message = $"Ray Tracing is enabled for {namedBuildTarget.TargetName}. This may significantly impact performance and is not recommended for this platform.";
+                return true;
+            }
+
+            // Windows Standalone: Check auto graphics API and DX12
+            bool autoGraphicsAPIEnabled = PlayerSettings.GetUseDefaultGraphicsAPIs(currentBuildTarget);
+            bool dx12IsFirst = false;
+
+            if (!autoGraphicsAPIEnabled)
+            {
+                var graphicsAPIs = PlayerSettings.GetGraphicsAPIs(currentBuildTarget);
+                dx12IsFirst = graphicsAPIs.Length > 0 && graphicsAPIs[0] == GraphicsDeviceType.Direct3D12;
+            }
+
+            if (autoGraphicsAPIEnabled)
+            {
+                message = "Ray tracing requires DX12 on Windows. Auto Graphics API is enabled. Disable Auto Graphics API and set Direct3D 12 as the first Graphics API in Player Settings.";
+                return true;
+            }
+            else if (!dx12IsFirst)
+            {
+                message = "Ray tracing requires DX12 on Windows. Direct3D 12 is not the first Graphics API. Set Direct3D 12 as the first Graphics API in Player Settings.";
+                return true;
+            }
+
+            return false;
+        }
 #endif
 
         internal BlueNoise GetBlueNoiseManager()
diff --git a/Packages/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/RenderPass/CustomPass/CustomPass.cs b/Packages/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/RenderPass/CustomPass/CustomPass.cs
index a0a82bf4cc1..ffb4289aecb 100644
--- a/Packages/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/RenderPass/CustomPass/CustomPass.cs
+++ b/Packages/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/RenderPass/CustomPass/CustomPass.cs
@@ -227,7 +227,7 @@ RenderTargets ReadRenderTargets(in IUnsafeRenderGraphBuilder builder, in RenderT
                 output.colorBufferRG = targets.colorBufferRG;
                 builder.UseTexture(output.colorBufferRG, AccessFlags.ReadWrite);
             }
-            if (targets.nonMSAAColorBufferRG.IsValid())
+            if (targets.nonMSAAColorBufferRG.IsValid() && targets.nonMSAAColorBufferRG != targets.colorBufferRG)
             {
                 output.nonMSAAColorBufferRG = targets.nonMSAAColorBufferRG;
                 builder.UseTexture(output.nonMSAAColorBufferRG, AccessFlags.ReadWrite);
diff --git a/Packages/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/RenderPass/CustomPass/CustomPassRenderersUtils.shader b/Packages/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/RenderPass/CustomPass/CustomPassRenderersUtils.shader
index 22b83db62bc..f1d7fe2e226 100644
--- a/Packages/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/RenderPass/CustomPass/CustomPassRenderersUtils.shader
+++ b/Packages/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/RenderPass/CustomPass/CustomPassRenderersUtils.shader
@@ -9,7 +9,7 @@ Shader "Hidden/HDRP/CustomPassRenderersUtils"
     #pragma target 4.5
     #pragma only_renderers d3d11 playstation xboxone xboxseries vulkan metal switch switch2
 
-    // #pragma enable_d3d11_debug_symbols
+    // #pragma enable_debug_symbols
 
     //enable GPU instancing support
     #pragma multi_compile_instancing
diff --git a/Packages/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/RenderPass/CustomPass/CustomPassUtils.shader b/Packages/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/RenderPass/CustomPass/CustomPassUtils.shader
index 046e335b826..f59b52a3965 100644
--- a/Packages/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/RenderPass/CustomPass/CustomPassUtils.shader
+++ b/Packages/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/RenderPass/CustomPass/CustomPassUtils.shader
@@ -6,7 +6,7 @@ Shader "Hidden/HDRP/CustomPassUtils"
 
     #pragma target 4.5
     #pragma only_renderers d3d11 playstation xboxone xboxseries vulkan metal switch switch2
-    // #pragma enable_d3d11_debug_symbols
+    // #pragma enable_debug_symbols
 
     #include "Packages/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/RenderPass/CustomPass/CustomPassCommon.hlsl"
 
diff --git a/Packages/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/RenderPass/DLSSPass.cs b/Packages/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/RenderPass/DLSSPass.cs
index 89b93bc27ab..adf939a5990 100644
--- a/Packages/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/RenderPass/DLSSPass.cs
+++ b/Packages/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/RenderPass/DLSSPass.cs
@@ -183,7 +183,7 @@ private bool ShouldUseAutomaticSettings()
 
             static NVIDIA.DLSSPreset Uint2Preset(uint preset)
             {
-                if (preset >= (uint)NVIDIA.DLSSPreset.Preset_Default && preset <= (uint)NVIDIA.DLSSPreset.Preset_K)
+                if (preset >= (uint)NVIDIA.DLSSPreset.Preset_Default && preset <= (uint)NVIDIA.DLSSPreset.Preset_M)
                     return (NVIDIA.DLSSPreset)preset;
                 Debug.LogWarningFormat("Unknown DLSS Preset value {0}, using default value.", preset);
                 return NVIDIA.DLSSPreset.Preset_Default;
diff --git a/Packages/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/RenderPass/MSAA/AmbientOcclusionResolve.shader b/Packages/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/RenderPass/MSAA/AmbientOcclusionResolve.shader
index ea6218b3e2f..5a25d3b39d3 100644
--- a/Packages/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/RenderPass/MSAA/AmbientOcclusionResolve.shader
+++ b/Packages/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/RenderPass/MSAA/AmbientOcclusionResolve.shader
@@ -5,7 +5,7 @@ Shader "Hidden/HDRP/AOResolve"
         #pragma only_renderers d3d11 playstation xboxone xboxseries vulkan metal switch switch2
         #include "Packages/com.unity.render-pipelines.core/ShaderLibrary/Common.hlsl"
         #include "Packages/com.unity.render-pipelines.high-definition/Runtime/ShaderLibrary/ShaderVariables.hlsl"
-        //#pragma enable_d3d11_debug_symbols
+        //#pragma enable_debug_symbols
 
         // Target multivalues textures
         TEXTURE2D_X(_DepthValuesTexture);
diff --git a/Packages/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/RenderPass/MSAA/ColorResolve.shader b/Packages/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/RenderPass/MSAA/ColorResolve.shader
index f7cf351414b..b03d54277c6 100644
--- a/Packages/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/RenderPass/MSAA/ColorResolve.shader
+++ b/Packages/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/RenderPass/MSAA/ColorResolve.shader
@@ -6,7 +6,7 @@ Shader "Hidden/HDRP/ColorResolve"
         #include "Packages/com.unity.render-pipelines.core/ShaderLibrary/Common.hlsl"
         #include "Packages/com.unity.render-pipelines.core/ShaderLibrary/Color.hlsl"
         #include "Packages/com.unity.render-pipelines.high-definition/Runtime/ShaderLibrary/ShaderVariables.hlsl"
-        //#pragma enable_d3d11_debug_symbols
+        //#pragma enable_debug_symbols
 
         TEXTURE2D_X_MSAA(float4, _ColorTextureMS);
 
diff --git a/Packages/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/RenderPass/MSAA/DepthValues.shader b/Packages/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/RenderPass/MSAA/DepthValues.shader
index 34239d2a2c4..58b67dba31e 100644
--- a/Packages/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/RenderPass/MSAA/DepthValues.shader
+++ b/Packages/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/RenderPass/MSAA/DepthValues.shader
@@ -7,7 +7,7 @@ Shader "Hidden/HDRP/DepthValues"
 
         #include "Packages/com.unity.render-pipelines.core/ShaderLibrary/Common.hlsl"
         #include "Packages/com.unity.render-pipelines.high-definition/Runtime/ShaderLibrary/ShaderVariables.hlsl"
-        // #pragma enable_d3d11_debug_symbols
+        // #pragma enable_debug_symbols
 
         // Target multisampling textures
         TEXTURE2D_X_MSAA(float, _DepthTextureMS);
diff --git a/Packages/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/RenderPass/MSAA/MotionVecResolve.shader b/Packages/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/RenderPass/MSAA/MotionVecResolve.shader
index 3a20ae10dc7..a09bfe2bddd 100644
--- a/Packages/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/RenderPass/MSAA/MotionVecResolve.shader
+++ b/Packages/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/RenderPass/MSAA/MotionVecResolve.shader
@@ -6,7 +6,7 @@ Shader "Hidden/HDRP/MotionVecResolve"
 
         #include "Packages/com.unity.render-pipelines.core/ShaderLibrary/Common.hlsl"
         #include "Packages/com.unity.render-pipelines.high-definition/Runtime/ShaderLibrary/ShaderVariables.hlsl"
-        // #pragma enable_d3d11_debug_symbols
+        // #pragma enable_debug_symbols
 
         // Target multisampling textures
         TEXTURE2D_X_MSAA(float2, _MotionVectorTextureMS);
diff --git a/Packages/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Utility/HDUtils.cs b/Packages/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Utility/HDUtils.cs
index c4938b62d64..19f71d4057e 100644
--- a/Packages/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Utility/HDUtils.cs
+++ b/Packages/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Utility/HDUtils.cs
@@ -810,9 +810,6 @@ internal static bool IsSupportedGraphicDevice(GraphicsDeviceType graphicDevice)
             if (graphicDevice == GraphicsDeviceType.Switch) // Switch support only enabled when forced by env variable for CI
                 return Environment.GetEnvironmentVariable("ENABLE_HDRP_SWITCH_SUPPORT") != null || Application.platform == RuntimePlatform.Switch;
 
-            if (graphicDevice == GraphicsDeviceType.Switch2) // Switch2 support only enabled when forced by env variable for CI
-                return Environment.GetEnvironmentVariable("ENABLE_HDRP_SWITCH2_SUPPORT") != null || Application.platform == RuntimePlatform.Switch2;
-
             return (graphicDevice == GraphicsDeviceType.Direct3D11 ||
                 graphicDevice == GraphicsDeviceType.Direct3D12 ||
                 graphicDevice == GraphicsDeviceType.PlayStation4 ||
@@ -823,8 +820,8 @@ internal static bool IsSupportedGraphicDevice(GraphicsDeviceType graphicDevice)
                 graphicDevice == GraphicsDeviceType.GameCoreXboxOne ||
                 graphicDevice == GraphicsDeviceType.GameCoreXboxSeries ||
                 graphicDevice == GraphicsDeviceType.Metal ||
-                graphicDevice == GraphicsDeviceType.Vulkan
-                // || graphicDevice == GraphicsDeviceType.Switch2
+                graphicDevice == GraphicsDeviceType.Vulkan ||
+                graphicDevice == GraphicsDeviceType.Switch2
                 );
         }
 
@@ -843,8 +840,7 @@ internal static bool IsSupportedBuildTarget(UnityEditor.BuildTarget buildTarget)
         {
             if (buildTarget == UnityEditor.BuildTarget.Switch) // Switch support only enabled when forced by env variable for CI
                 return Environment.GetEnvironmentVariable("ENABLE_HDRP_SWITCH_SUPPORT") != null;
-            if (buildTarget == UnityEditor.BuildTarget.Switch2) // Switch2 support only enabled when forced by env variable for CI
-                return Environment.GetEnvironmentVariable("ENABLE_HDRP_SWITCH2_SUPPORT") != null;
+
             return (buildTarget == UnityEditor.BuildTarget.StandaloneWindows ||
                 buildTarget == UnityEditor.BuildTarget.StandaloneWindows64 ||
                 buildTarget == UnityEditor.BuildTarget.StandaloneLinux64 ||
@@ -1277,18 +1273,6 @@ internal static string GetUnsupportedAPIMessage(string graphicAPI)
             else
             {
                 msg = "Platform " + currentPlatform + " is not supported with HDRP";
-
-#if UNITY_EDITOR
-                if (buildTarget == UnityEditor.BuildTarget.Switch2)
-                {
-                    msg += ". (For testing purpose only, un-hide by defining environment variable ENABLE_HDRP_SWITCH2_SUPPORT)";
-                }
-#else
-                if (currentPlatform == "Switch2 OS")
-                {
-                    msg += ". (For testing purpose only, un-hide by defining environment variable ENABLE_HDRP_SWITCH2_SUPPORT)";
-                }
-#endif
             }
 
             // Display more information to the users when it should have use Metal instead of OpenGL
diff --git a/Packages/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/XR/.buginfo b/Packages/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/XR/.buginfo
index 701b4cbc25d..f6d9eecbd20 100644
--- a/Packages/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/XR/.buginfo
+++ b/Packages/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/XR/.buginfo
@@ -1 +1 @@
-area: SRP XR
+area: Graphics XR
diff --git a/Packages/com.unity.render-pipelines.high-definition/Runtime/RenderPipelineResources/ShaderGraph/AutodeskInteractive.ShaderGraph b/Packages/com.unity.render-pipelines.high-definition/Runtime/RenderPipelineResources/ShaderGraph/AutodeskInteractive.shadergraph
similarity index 100%
rename from Packages/com.unity.render-pipelines.high-definition/Runtime/RenderPipelineResources/ShaderGraph/AutodeskInteractive.ShaderGraph
rename to Packages/com.unity.render-pipelines.high-definition/Runtime/RenderPipelineResources/ShaderGraph/AutodeskInteractive.shadergraph
diff --git a/Packages/com.unity.render-pipelines.high-definition/Runtime/RenderPipelineResources/ShaderGraph/AutodeskInteractive.ShaderGraph.meta b/Packages/com.unity.render-pipelines.high-definition/Runtime/RenderPipelineResources/ShaderGraph/AutodeskInteractive.shadergraph.meta
similarity index 100%
rename from Packages/com.unity.render-pipelines.high-definition/Runtime/RenderPipelineResources/ShaderGraph/AutodeskInteractive.ShaderGraph.meta
rename to Packages/com.unity.render-pipelines.high-definition/Runtime/RenderPipelineResources/ShaderGraph/AutodeskInteractive.shadergraph.meta
diff --git a/Packages/com.unity.render-pipelines.high-definition/Runtime/RenderPipelineResources/ShaderGraph/AutodeskInteractiveMasked.ShaderGraph b/Packages/com.unity.render-pipelines.high-definition/Runtime/RenderPipelineResources/ShaderGraph/AutodeskInteractiveMasked.shadergraph
similarity index 100%
rename from Packages/com.unity.render-pipelines.high-definition/Runtime/RenderPipelineResources/ShaderGraph/AutodeskInteractiveMasked.ShaderGraph
rename to Packages/com.unity.render-pipelines.high-definition/Runtime/RenderPipelineResources/ShaderGraph/AutodeskInteractiveMasked.shadergraph
diff --git a/Packages/com.unity.render-pipelines.high-definition/Runtime/RenderPipelineResources/ShaderGraph/AutodeskInteractiveMasked.ShaderGraph.meta b/Packages/com.unity.render-pipelines.high-definition/Runtime/RenderPipelineResources/ShaderGraph/AutodeskInteractiveMasked.shadergraph.meta
similarity index 100%
rename from Packages/com.unity.render-pipelines.high-definition/Runtime/RenderPipelineResources/ShaderGraph/AutodeskInteractiveMasked.ShaderGraph.meta
rename to Packages/com.unity.render-pipelines.high-definition/Runtime/RenderPipelineResources/ShaderGraph/AutodeskInteractiveMasked.shadergraph.meta
diff --git a/Packages/com.unity.render-pipelines.high-definition/Runtime/RenderPipelineResources/ShaderGraph/AutodeskInteractiveTransparent.ShaderGraph b/Packages/com.unity.render-pipelines.high-definition/Runtime/RenderPipelineResources/ShaderGraph/AutodeskInteractiveTransparent.shadergraph
similarity index 100%
rename from Packages/com.unity.render-pipelines.high-definition/Runtime/RenderPipelineResources/ShaderGraph/AutodeskInteractiveTransparent.ShaderGraph
rename to Packages/com.unity.render-pipelines.high-definition/Runtime/RenderPipelineResources/ShaderGraph/AutodeskInteractiveTransparent.shadergraph
diff --git a/Packages/com.unity.render-pipelines.high-definition/Runtime/RenderPipelineResources/ShaderGraph/AutodeskInteractiveTransparent.ShaderGraph.meta b/Packages/com.unity.render-pipelines.high-definition/Runtime/RenderPipelineResources/ShaderGraph/AutodeskInteractiveTransparent.shadergraph.meta
similarity index 100%
rename from Packages/com.unity.render-pipelines.high-definition/Runtime/RenderPipelineResources/ShaderGraph/AutodeskInteractiveTransparent.ShaderGraph.meta
rename to Packages/com.unity.render-pipelines.high-definition/Runtime/RenderPipelineResources/ShaderGraph/AutodeskInteractiveTransparent.shadergraph.meta
diff --git a/Packages/com.unity.render-pipelines.high-definition/Runtime/RenderPipelineResources/ShaderGraph/Fabric CottonWool.ShaderGraph b/Packages/com.unity.render-pipelines.high-definition/Runtime/RenderPipelineResources/ShaderGraph/Fabric CottonWool.shadergraph
similarity index 100%
rename from Packages/com.unity.render-pipelines.high-definition/Runtime/RenderPipelineResources/ShaderGraph/Fabric CottonWool.ShaderGraph
rename to Packages/com.unity.render-pipelines.high-definition/Runtime/RenderPipelineResources/ShaderGraph/Fabric CottonWool.shadergraph
diff --git a/Packages/com.unity.render-pipelines.high-definition/Runtime/RenderPipelineResources/ShaderGraph/Fabric CottonWool.ShaderGraph.meta b/Packages/com.unity.render-pipelines.high-definition/Runtime/RenderPipelineResources/ShaderGraph/Fabric CottonWool.shadergraph.meta
similarity index 100%
rename from Packages/com.unity.render-pipelines.high-definition/Runtime/RenderPipelineResources/ShaderGraph/Fabric CottonWool.ShaderGraph.meta
rename to Packages/com.unity.render-pipelines.high-definition/Runtime/RenderPipelineResources/ShaderGraph/Fabric CottonWool.shadergraph.meta
diff --git a/Packages/com.unity.render-pipelines.high-definition/Runtime/RenderPipelineResources/ShaderGraph/Fabric Silk.ShaderGraph b/Packages/com.unity.render-pipelines.high-definition/Runtime/RenderPipelineResources/ShaderGraph/Fabric Silk.shadergraph
similarity index 100%
rename from Packages/com.unity.render-pipelines.high-definition/Runtime/RenderPipelineResources/ShaderGraph/Fabric Silk.ShaderGraph
rename to Packages/com.unity.render-pipelines.high-definition/Runtime/RenderPipelineResources/ShaderGraph/Fabric Silk.shadergraph
diff --git a/Packages/com.unity.render-pipelines.high-definition/Runtime/RenderPipelineResources/ShaderGraph/Fabric Silk.ShaderGraph.meta b/Packages/com.unity.render-pipelines.high-definition/Runtime/RenderPipelineResources/ShaderGraph/Fabric Silk.shadergraph.meta
similarity index 100%
rename from Packages/com.unity.render-pipelines.high-definition/Runtime/RenderPipelineResources/ShaderGraph/Fabric Silk.ShaderGraph.meta
rename to Packages/com.unity.render-pipelines.high-definition/Runtime/RenderPipelineResources/ShaderGraph/Fabric Silk.shadergraph.meta
diff --git a/Packages/com.unity.render-pipelines.high-definition/Runtime/ShaderLibrary/CopyDepthBuffer.shader b/Packages/com.unity.render-pipelines.high-definition/Runtime/ShaderLibrary/CopyDepthBuffer.shader
index 6450e147eeb..b96ec9a4c50 100644
--- a/Packages/com.unity.render-pipelines.high-definition/Runtime/ShaderLibrary/CopyDepthBuffer.shader
+++ b/Packages/com.unity.render-pipelines.high-definition/Runtime/ShaderLibrary/CopyDepthBuffer.shader
@@ -30,7 +30,7 @@ Shader "Hidden/HDRP/CopyDepthBuffer"
             #pragma only_renderers d3d11 playstation xboxone xboxseries vulkan metal switch switch2
             #pragma fragment Frag
             #pragma vertex Vert
-            //#pragma enable_d3d11_debug_symbols
+            //#pragma enable_debug_symbols
 
             #include "Packages/com.unity.render-pipelines.core/ShaderLibrary/Common.hlsl"
             #include "Packages/com.unity.render-pipelines.high-definition/Runtime/ShaderLibrary/ShaderVariables.hlsl"
diff --git a/Packages/com.unity.render-pipelines.high-definition/Runtime/ShaderLibrary/CopyStencilBuffer.shader b/Packages/com.unity.render-pipelines.high-definition/Runtime/ShaderLibrary/CopyStencilBuffer.shader
index 38e4322f74c..6b8dc53497e 100644
--- a/Packages/com.unity.render-pipelines.high-definition/Runtime/ShaderLibrary/CopyStencilBuffer.shader
+++ b/Packages/com.unity.render-pipelines.high-definition/Runtime/ShaderLibrary/CopyStencilBuffer.shader
@@ -10,7 +10,7 @@ Shader "Hidden/HDRP/CopyStencilBuffer"
 
     #pragma target 4.5
     #pragma only_renderers d3d11 playstation xboxone xboxseries vulkan metal switch switch2
-    // #pragma enable_d3d11_debug_symbols
+    // #pragma enable_debug_symbols
 
     #include "Packages/com.unity.render-pipelines.core/ShaderLibrary/Common.hlsl"
     #include "Packages/com.unity.render-pipelines.core/ShaderLibrary/Packing.hlsl"
diff --git a/Packages/com.unity.render-pipelines.high-definition/Runtime/Sky/CloudSystem/CloudLayer/CloudLayer.shader b/Packages/com.unity.render-pipelines.high-definition/Runtime/Sky/CloudSystem/CloudLayer/CloudLayer.shader
index 4e98777c971..97a2090a4b8 100644
--- a/Packages/com.unity.render-pipelines.high-definition/Runtime/Sky/CloudSystem/CloudLayer/CloudLayer.shader
+++ b/Packages/com.unity.render-pipelines.high-definition/Runtime/Sky/CloudSystem/CloudLayer/CloudLayer.shader
@@ -7,7 +7,7 @@ Shader "Hidden/HDRP/Sky/CloudLayer"
     #pragma editor_sync_compilation
     #pragma target 4.5
     #pragma only_renderers d3d11 playstation xboxone xboxseries vulkan metal switch switch2
-    //#pragma enable_d3d11_debug_symbols
+    //#pragma enable_debug_symbols
 
     #pragma multi_compile_local LAYER1_STATIC LAYER1_PROCEDURAL LAYER1_FLOWMAP
     #pragma multi_compile_local LAYER2_OFF LAYER2_STATIC LAYER2_PROCEDURAL LAYER2_FLOWMAP
diff --git a/Packages/com.unity.render-pipelines.high-definition/Runtime/Sky/PhysicallyBasedSky/PhysicallyBasedSky.shader b/Packages/com.unity.render-pipelines.high-definition/Runtime/Sky/PhysicallyBasedSky/PhysicallyBasedSky.shader
index 7d2d9d756aa..9d8277d0457 100644
--- a/Packages/com.unity.render-pipelines.high-definition/Runtime/Sky/PhysicallyBasedSky/PhysicallyBasedSky.shader
+++ b/Packages/com.unity.render-pipelines.high-definition/Runtime/Sky/PhysicallyBasedSky/PhysicallyBasedSky.shader
@@ -4,7 +4,7 @@ Shader "Hidden/HDRP/Sky/PbrSky"
 
     #pragma vertex Vert
 
-    // #pragma enable_d3d11_debug_symbols
+    // #pragma enable_debug_symbols
     #pragma editor_sync_compilation
     #pragma target 4.5
     #pragma only_renderers d3d11 playstation xboxone xboxseries vulkan metal switch switch2
diff --git a/Packages/com.unity.render-pipelines.high-definition/Runtime/Utilities/HDAdditionalSceneViewSettings.cs b/Packages/com.unity.render-pipelines.high-definition/Runtime/Utilities/HDAdditionalSceneViewSettings.cs
deleted file mode 100644
index cec3c5aa7f5..00000000000
--- a/Packages/com.unity.render-pipelines.high-definition/Runtime/Utilities/HDAdditionalSceneViewSettings.cs
+++ /dev/null
@@ -1,144 +0,0 @@
-namespace UnityEngine.Rendering.HighDefinition
-{
-#if UNITY_EDITOR
-    using UnityEditor;
-    using AntialiasingMode = HDAdditionalCameraData.AntialiasingMode;
-
-    [InitializeOnLoad]
-    static class HDAdditionalSceneViewSettings
-    {
-        static class Styles
-        {
-            public static readonly GUIContent AAMode = EditorGUIUtility.TrTextContent("Camera Anti-aliasing", "The anti-alising mode that will be used in the scene view camera.");
-            public static readonly GUIContent StopNaNs = EditorGUIUtility.TrTextContent("Camera Stop NaNs", "When enabled, any NaNs in the color buffer of the scene view camera will be suppressed.");
-            public static readonly GUIContent OverrideExposure = EditorGUIUtility.TrTextContent("Override Exposure", "When enabled, the scene exposure is overridden with the selected value.");
-            public static readonly GUIContent OverriddenExposure = EditorGUIUtility.TrTextContent("Scene Exposure", "The value for the overridden exposure.");
-            public static readonly string HelpBox = "Temporal Anti - aliasing in the Scene View is only supported when Always Refresh is enabled.";
-        }
-
-        // Helper class to manage editor preferences with local caching.
-        // Only supports bools, floats and ints/enums, so we keep it local for now.
-        class CachedEditorPref<T>
-        {
-            T m_Storage;
-            string m_Key;
-
-            public T value
-            {
-                // We update the Editor prefs only when writing. Reading goes through the cached local var to ensure that reads have no overhead.
-                get => m_Storage;
-                set
-                {
-                    m_Storage = value;
-                    SetPref(value);
-                }
-            }
-
-            // Creates a cached editor preference using the specified key and default value
-            public CachedEditorPref(string key, T dafaultValue)
-            {
-                m_Key = key;
-                m_Storage = GetOrCreatePref(dafaultValue);
-            }
-
-            T GetOrCreatePref(T defaultValue)
-            {
-                if (EditorPrefs.HasKey(m_Key))
-                {
-                    if (typeof(T) == typeof(bool))
-                    {
-                        return (T)(object)EditorPrefs.GetBool(m_Key);
-                    }
-                    else if (typeof(T) == typeof(float))
-                    {
-                        return (T)(object)EditorPrefs.GetFloat(m_Key);
-                    }
-                    return (T)(object)EditorPrefs.GetInt(m_Key);
-                }
-                else
-                {
-                    if (typeof(T) == typeof(bool))
-                    {
-                        EditorPrefs.SetBool(m_Key, (bool)(object)defaultValue);
-                    }
-                    else if (typeof(T) == typeof(float))
-                    {
-                        EditorPrefs.SetFloat(m_Key, (float)(object)defaultValue);
-                    }
-                    else
-                    {
-                        EditorPrefs.SetInt(m_Key, (int)(object)defaultValue);
-                    }
-                    return defaultValue;
-                }
-            }
-
-            void SetPref(T value)
-            {
-                if (typeof(T) == typeof(bool))
-                    EditorPrefs.SetBool(m_Key, (bool)(object)value);
-                else if (typeof(T) == typeof(float))
-                    EditorPrefs.SetFloat(m_Key, (float)(object)value);
-                else
-                    EditorPrefs.SetInt(m_Key, (int)(object)value);
-            }
-        }
-
-        static CachedEditorPref<AntialiasingMode> s_SceneViewAntialiasing = new CachedEditorPref<AntialiasingMode>("HDRP:SceneViewCamera:Antialiasing", AntialiasingMode.None);
-
-        public static AntialiasingMode sceneViewAntialiasing
-        {
-            get => s_SceneViewAntialiasing.value;
-            set => s_SceneViewAntialiasing.value = value;
-        }
-
-        static CachedEditorPref<bool> s_SceneViewStopNaNs = new CachedEditorPref<bool>("HDRP:SceneViewCamera:StopNaNs", false);
-
-        public static bool sceneViewStopNaNs
-        {
-            get => s_SceneViewStopNaNs.value;
-            set => s_SceneViewStopNaNs.value = value;
-        }
-
-        static CachedEditorPref<bool> s_SceneExposureOverride = new CachedEditorPref<bool>("HDRP:SceneViewCamera:OverrideExposure", false);
-
-        public static bool sceneExposureOverriden
-        {
-            get => s_SceneExposureOverride.value;
-            set => s_SceneExposureOverride.value = value;
-        }
-
-        static CachedEditorPref<float> s_SceneExposure = new CachedEditorPref<float>("HDRP:SceneViewCamera:Exposure", 10.0f);
-
-        public static float sceneExposure
-        {
-            get => s_SceneExposure.value;
-            set => s_SceneExposure.value = value;
-        }
-        static HDAdditionalSceneViewSettings()
-        {
-            SceneViewCameraWindow.additionalSettingsGui += DoAdditionalSettings;
-        }
-
-        static void DoAdditionalSettings(SceneView sceneView)
-        {
-            EditorGUILayout.Space();
-            EditorGUILayout.LabelField("HD Render Pipeline", EditorStyles.boldLabel);
-            sceneViewAntialiasing = (AntialiasingMode)EditorGUILayout.EnumPopup(Styles.AAMode, sceneViewAntialiasing);
-            if (sceneViewAntialiasing == AntialiasingMode.TemporalAntialiasing)
-                EditorGUILayout.HelpBox(Styles.HelpBox, MessageType.Info);
-
-            sceneViewStopNaNs = EditorGUILayout.Toggle(Styles.StopNaNs, sceneViewStopNaNs);
-
-            EditorGUI.BeginChangeCheck();
-            sceneExposureOverriden = EditorGUILayout.Toggle(Styles.OverrideExposure, sceneExposureOverriden);
-            if (sceneExposureOverriden)
-                sceneExposure = EditorGUILayout.Slider(Styles.OverriddenExposure, sceneExposure, -11.0f, 16.0f);
-            if (EditorGUI.EndChangeCheck())
-            {
-                SceneView.RepaintAll();
-            }
-        }
-    }
-#endif
-}
diff --git a/Packages/com.unity.render-pipelines.high-definition/Runtime/Utilities/HDAdditionalSceneViewSettings.cs.meta b/Packages/com.unity.render-pipelines.high-definition/Runtime/Utilities/HDAdditionalSceneViewSettings.cs.meta
deleted file mode 100644
index 27faf403248..00000000000
--- a/Packages/com.unity.render-pipelines.high-definition/Runtime/Utilities/HDAdditionalSceneViewSettings.cs.meta
+++ /dev/null
@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: 6b35404f0872b6444b8669bb00132cfa
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/Packages/com.unity.render-pipelines.high-definition/Runtime/Water/Shaders/WaterCaustics.shader b/Packages/com.unity.render-pipelines.high-definition/Runtime/Water/Shaders/WaterCaustics.shader
index 68178cc1c35..6f11d9c8a5f 100644
--- a/Packages/com.unity.render-pipelines.high-definition/Runtime/Water/Shaders/WaterCaustics.shader
+++ b/Packages/com.unity.render-pipelines.high-definition/Runtime/Water/Shaders/WaterCaustics.shader
@@ -6,7 +6,7 @@ Shader "Hidden/HDRP/WaterCaustics"
     #pragma target 4.5
     #pragma only_renderers d3d11 playstation xboxone xboxseries vulkan metal switch switch2
 
-    //#pragma enable_d3d11_debug_symbols
+    //#pragma enable_debug_symbols
 
     #pragma vertex Vert
     #pragma fragment Frag
diff --git a/Packages/com.unity.render-pipelines.high-definition/Runtime/Water/Shaders/WaterDecal.shader b/Packages/com.unity.render-pipelines.high-definition/Runtime/Water/Shaders/WaterDecal.shader
index 9ce151d6cb4..6ecad4ec774 100644
--- a/Packages/com.unity.render-pipelines.high-definition/Runtime/Water/Shaders/WaterDecal.shader
+++ b/Packages/com.unity.render-pipelines.high-definition/Runtime/Water/Shaders/WaterDecal.shader
@@ -6,7 +6,7 @@ Shader "Hidden/HDRP/WaterDecal"
     #pragma target 4.5
     #pragma only_renderers d3d11 playstation xboxone xboxseries vulkan metal switch switch2
 
-    //#pragma enable_d3d11_debug_symbols
+    //#pragma enable_debug_symbols
 
     #pragma vertex Vert
     #pragma fragment Frag
diff --git a/Packages/com.unity.render-pipelines.high-definition/Runtime/Water/Shaders/WaterExclusion.shader b/Packages/com.unity.render-pipelines.high-definition/Runtime/Water/Shaders/WaterExclusion.shader
index 15a1952199e..9411261567e 100644
--- a/Packages/com.unity.render-pipelines.high-definition/Runtime/Water/Shaders/WaterExclusion.shader
+++ b/Packages/com.unity.render-pipelines.high-definition/Runtime/Water/Shaders/WaterExclusion.shader
@@ -28,7 +28,7 @@ Shader "Hidden/HDRP/WaterExclusion"
             #pragma only_renderers d3d11 playstation xboxone xboxseries vulkan metal switch switch2
             #pragma multi_compile _ DOTS_INSTANCING_ON
 
-            // #pragma enable_d3d11_debug_symbols
+            // #pragma enable_debug_symbols
 
             #pragma vertex Vert
             #pragma fragment Frag
diff --git a/Packages/com.unity.render-pipelines.high-definition/Runtime/Water/WaterDecal/Legacy/WaterDeformer.cs.meta b/Packages/com.unity.render-pipelines.high-definition/Runtime/Water/WaterDecal/Legacy/WaterDeformer.cs.meta
index 97092193dfc..f2bc3d8db89 100644
--- a/Packages/com.unity.render-pipelines.high-definition/Runtime/Water/WaterDecal/Legacy/WaterDeformer.cs.meta
+++ b/Packages/com.unity.render-pipelines.high-definition/Runtime/Water/WaterDecal/Legacy/WaterDeformer.cs.meta
@@ -5,7 +5,7 @@ MonoImporter:
   serializedVersion: 2
   defaultReferences: []
   executionOrder: 0
-  icon: {fileID: 2800000, guid: b057b73ec5a603e4aa80ccf4b34db0d3, type: 3}
+  icon: {fileID: 2800000, guid: 340b2e8f8761e254d8ee52bc663cedbd, type: 2}
   userData: 
   assetBundleName: 
   assetBundleVariant: 
diff --git a/Packages/com.unity.render-pipelines.high-definition/Runtime/Water/WaterDecal/Legacy/WaterFoamGenerator.cs.meta b/Packages/com.unity.render-pipelines.high-definition/Runtime/Water/WaterDecal/Legacy/WaterFoamGenerator.cs.meta
index 7e8cc867259..da48c021a3c 100644
--- a/Packages/com.unity.render-pipelines.high-definition/Runtime/Water/WaterDecal/Legacy/WaterFoamGenerator.cs.meta
+++ b/Packages/com.unity.render-pipelines.high-definition/Runtime/Water/WaterDecal/Legacy/WaterFoamGenerator.cs.meta
@@ -5,7 +5,7 @@ MonoImporter:
   serializedVersion: 2
   defaultReferences: []
   executionOrder: 0
-  icon: {fileID: 2800000, guid: b057b73ec5a603e4aa80ccf4b34db0d3, type: 3}
+  icon: {fileID: 2800000, guid: 340b2e8f8761e254d8ee52bc663cedbd, type: 2}
   userData: 
   assetBundleName: 
   assetBundleVariant: 
diff --git a/Packages/com.unity.render-pipelines.high-definition/Runtime/Water/WaterDecal/WaterDecal.cs b/Packages/com.unity.render-pipelines.high-definition/Runtime/Water/WaterDecal/WaterDecal.cs
index c40e463a9aa..c60fba01840 100644
--- a/Packages/com.unity.render-pipelines.high-definition/Runtime/Water/WaterDecal/WaterDecal.cs
+++ b/Packages/com.unity.render-pipelines.high-definition/Runtime/Water/WaterDecal/WaterDecal.cs
@@ -8,6 +8,7 @@ namespace UnityEngine.Rendering.HighDefinition
     /// </summary>
     [HDRPHelpURL("water-decals-and-masking-in-the-water-system")]
     [ExecuteInEditMode]
+    [Icon("Packages/com.unity.render-pipelines.core/Editor/Icons/Processed/DecalProjector Icon.asset")]
     public partial class WaterDecal : MonoBehaviour
     {
         internal enum PassType
diff --git a/Packages/com.unity.render-pipelines.high-definition/Runtime/Water/WaterDecal/WaterDecal.cs.meta b/Packages/com.unity.render-pipelines.high-definition/Runtime/Water/WaterDecal/WaterDecal.cs.meta
index bd89e58cab4..87978e31764 100644
--- a/Packages/com.unity.render-pipelines.high-definition/Runtime/Water/WaterDecal/WaterDecal.cs.meta
+++ b/Packages/com.unity.render-pipelines.high-definition/Runtime/Water/WaterDecal/WaterDecal.cs.meta
@@ -5,7 +5,7 @@ MonoImporter:
   serializedVersion: 2
   defaultReferences: []
   executionOrder: 0
-  icon: {fileID: 2800000, guid: b057b73ec5a603e4aa80ccf4b34db0d3, type: 3}
+  icon: {fileID: 2800000, guid: 340b2e8f8761e254d8ee52bc663cedbd, type: 2}
   userData: 
   assetBundleName: 
-  assetBundleVariant: 
\ No newline at end of file
+  assetBundleVariant: 
diff --git a/Packages/com.unity.render-pipelines.high-definition/Samples~/MaterialSamples/Shadergraphs/SG_Decal_WaterPuddle.ShaderGraph b/Packages/com.unity.render-pipelines.high-definition/Samples~/MaterialSamples/Shadergraphs/SG_Decal_WaterPuddle.shadergraph
similarity index 100%
rename from Packages/com.unity.render-pipelines.high-definition/Samples~/MaterialSamples/Shadergraphs/SG_Decal_WaterPuddle.ShaderGraph
rename to Packages/com.unity.render-pipelines.high-definition/Samples~/MaterialSamples/Shadergraphs/SG_Decal_WaterPuddle.shadergraph
diff --git a/Packages/com.unity.render-pipelines.high-definition/Samples~/MaterialSamples/Shadergraphs/SG_Decal_WaterPuddle.ShaderGraph.meta b/Packages/com.unity.render-pipelines.high-definition/Samples~/MaterialSamples/Shadergraphs/SG_Decal_WaterPuddle.shadergraph.meta
similarity index 100%
rename from Packages/com.unity.render-pipelines.high-definition/Samples~/MaterialSamples/Shadergraphs/SG_Decal_WaterPuddle.ShaderGraph.meta
rename to Packages/com.unity.render-pipelines.high-definition/Samples~/MaterialSamples/Shadergraphs/SG_Decal_WaterPuddle.shadergraph.meta
diff --git a/Packages/com.unity.render-pipelines.high-definition/Samples~/VolumetricSamples/.sample.json b/Packages/com.unity.render-pipelines.high-definition/Samples~/VolumetricSamples/.sample.json
index 7359a9430b1..59c185d4533 100644
--- a/Packages/com.unity.render-pipelines.high-definition/Samples~/VolumetricSamples/.sample.json
+++ b/Packages/com.unity.render-pipelines.high-definition/Samples~/VolumetricSamples/.sample.json
@@ -1,5 +1,5 @@
 {
     "displayName":"Volumetric Samples",
-    "description": "Adds a set of 3D texture, procedural noises and Fog Volume Shadergraph to your project. You can assign them to the local Volumetric Fog's Mask input."
+    "description": "Adds a set of 3D texture, procedural noises and Fog Volume Shadergraph to your project. You can assign them to the local Volumetric Fog's Mask input.",
     "createSeparatePackage": false
 }
diff --git a/Packages/com.unity.render-pipelines.high-definition/Tests/Editor/HDLightingSearchSelectorsTests.cs b/Packages/com.unity.render-pipelines.high-definition/Tests/Editor/HDLightingSearchSelectorsTests.cs
new file mode 100644
index 00000000000..cb98126adc7
--- /dev/null
+++ b/Packages/com.unity.render-pipelines.high-definition/Tests/Editor/HDLightingSearchSelectorsTests.cs
@@ -0,0 +1,714 @@
+using NUnit.Framework;
+using UnityEditor;
+using UnityEditor.Rendering.HighDefinition;
+using UnityEditor.Search;
+using UnityEngine;
+using UnityEngine.Rendering;
+using UnityEngine.Rendering.HighDefinition;
+using UnityEngine.UIElements;
+
+namespace UnityEditor.Rendering.HighDefinition.Tests
+{
+    [TestFixture]
+    class HDLightingSearchSelectorsTests
+    {
+        GameObject m_TestGameObject;
+        Light m_Light;
+        MeshRenderer m_MeshRenderer;
+        HDAdditionalLightData m_HDLightData;
+
+        [SetUp]
+        public void Setup()
+        {
+            m_TestGameObject = new GameObject("TestHDLightingObject");
+            m_Light = m_TestGameObject.AddComponent<Light>();
+            m_Light.type = LightType.Point;
+            m_HDLightData = m_TestGameObject.AddComponent<HDAdditionalLightData>();
+            var meshFilter = m_TestGameObject.AddComponent<MeshFilter>();
+            meshFilter.mesh = Resources.GetBuiltinResource<Mesh>("Quad.fbx");
+            m_MeshRenderer = m_TestGameObject.AddComponent<MeshRenderer>();
+            m_MeshRenderer.material = new Material(Shader.Find("Standard"));
+        }
+
+        [TearDown]
+        public void TearDown()
+        {
+            if (m_TestGameObject != null)
+            {
+                Object.DestroyImmediate(m_TestGameObject);
+            }
+        }
+
+        #region Light Intensity Tests
+
+        [Test]
+        public void LightIntensity_Column_SetterAndGetter_WorkCorrectly()
+        {
+            m_Light.type = LightType.Point;
+            m_Light.lightUnit = LightUnit.Lumen;
+            m_Light.intensity = LightUnitUtils.ConvertIntensity(m_Light, 1000f, LightUnit.Lumen, LightUnit.Candela);
+
+            var sceneProvider = UnityEditor.Search.SearchService.GetProvider("scene");
+            var context = UnityEditor.Search.SearchService.CreateContext("scene");
+            var searchItem = sceneProvider.CreateItem(context, $"scene:{m_TestGameObject.GetEntityId().ToString()}");
+            searchItem.data = m_TestGameObject;
+
+            var column = new SearchColumn("test", "test", "scene");
+            HDLightingSearchSelectors.LightIntensitySearchColumnProvider(column);
+
+            var searchColumnEventArgs = new SearchColumnEventArgs(searchItem, context, column);
+            var getterResult = column.getter(searchColumnEventArgs);
+            Assert.IsNotNull(getterResult, "Getter should return a value");
+            Assert.IsInstanceOf<float>(getterResult, "Getter should return a float");
+
+            float intensity = (float)getterResult;
+            Assert.AreEqual(1000f, intensity, 0.01f, "Getter should return intensity in UI unit (Lumen)");
+
+            var setterArgs = new SearchColumnEventArgs(searchItem, context, column);
+            setterArgs.value = 2000f;
+            column.setter(setterArgs);
+
+            float expectedNativeIntensity = LightUnitUtils.ConvertIntensity(m_Light, 2000f, LightUnit.Lumen, LightUnit.Candela);
+            Assert.AreEqual(expectedNativeIntensity, m_Light.intensity, 0.01f, "Light intensity should be updated in native unit");
+        }
+
+        [Test]
+        public void LightIntensity_Column_HandlesUnitConversion_Directional()
+        {
+            m_Light.type = LightType.Directional;
+            m_Light.lightUnit = LightUnit.Lux;
+            m_Light.intensity = 100f;
+
+            var sceneProvider = UnityEditor.Search.SearchService.GetProvider("scene");
+            var context = UnityEditor.Search.SearchService.CreateContext("scene");
+            var searchItem = sceneProvider.CreateItem(context, $"scene:{m_TestGameObject.GetEntityId().ToString()}");
+            searchItem.data = m_TestGameObject;
+
+            var column = new SearchColumn("test", "test", "scene");
+            HDLightingSearchSelectors.LightIntensitySearchColumnProvider(column);
+
+            var searchColumnEventArgs = new SearchColumnEventArgs(searchItem, context, column);
+            var getterResult = column.getter(searchColumnEventArgs);
+            Assert.IsInstanceOf<float>(getterResult, "Getter should return a float");
+
+            float intensity = (float)getterResult;
+            Assert.AreEqual(100f, intensity, 0.01f, "Directional light intensity should match (Lux is native unit)");
+        }
+
+        [Test]
+        public void LightIntensity_Column_HandlesUnitConversion_Area()
+        {
+            m_Light.type = LightType.Rectangle;
+            m_Light.areaSize = new Vector2(1f, 1f);
+            m_Light.lightUnit = LightUnit.Lumen;
+            float nativeIntensity = LightUnitUtils.ConvertIntensity(m_Light, 500f, LightUnit.Lumen, LightUnit.Nits);
+            m_Light.intensity = nativeIntensity;
+
+            var sceneProvider = UnityEditor.Search.SearchService.GetProvider("scene");
+            var context = UnityEditor.Search.SearchService.CreateContext("scene");
+            var searchItem = sceneProvider.CreateItem(context, $"scene:{m_TestGameObject.GetEntityId().ToString()}");
+            searchItem.data = m_TestGameObject;
+
+            var column = new SearchColumn("test", "test", "scene");
+            HDLightingSearchSelectors.LightIntensitySearchColumnProvider(column);
+
+            var searchColumnEventArgs = new SearchColumnEventArgs(searchItem, context, column);
+            var getterResult = column.getter(searchColumnEventArgs);
+            Assert.IsInstanceOf<float>(getterResult, "Getter should return a float");
+
+            float intensity = (float)getterResult;
+            Assert.AreEqual(500f, intensity, 0.01f, "Area light intensity should be converted to Lumen for UI");
+        }
+
+        [Test]
+        public void LightIntensity_Column_UnitChangeConvertsDisplay()
+        {
+            m_Light.type = LightType.Point;
+            m_Light.lightUnit = LightUnit.Lumen;
+            m_Light.intensity = LightUnitUtils.ConvertIntensity(m_Light, 1000f, LightUnit.Lumen, LightUnit.Candela);
+
+            var sceneProvider = UnityEditor.Search.SearchService.GetProvider("scene");
+            var context = UnityEditor.Search.SearchService.CreateContext("scene");
+            var searchItem = sceneProvider.CreateItem(context, $"scene:{m_TestGameObject.GetEntityId().ToString()}");
+            searchItem.data = m_TestGameObject;
+
+            var column = new SearchColumn("test", "test", "scene");
+            HDLightingSearchSelectors.LightIntensitySearchColumnProvider(column);
+
+            var args = new SearchColumnEventArgs(searchItem, context, column);
+            var initialData = column.getter(args);
+            Assert.IsInstanceOf<float>(initialData, "Getter should return a float");
+
+            float initialIntensity = (float)initialData;
+            Assert.AreEqual(1000f, initialIntensity, 0.01f, "Initial intensity should be 1000 Lumen");
+
+            m_Light.lightUnit = LightUnit.Candela;
+
+            var updatedData = column.getter(args);
+            Assert.IsInstanceOf<float>(updatedData, "Getter should return a float");
+
+            float updatedIntensity = (float)updatedData;
+            Assert.AreEqual(m_Light.intensity, updatedIntensity, 0.01f, "Intensity should now be displayed in native unit (Candela)");
+        }
+
+        #endregion
+
+        #region Light Intensity Unit Tests
+
+        [Test]
+        public void LightIntensityUnit_Column_SetterAndGetter_WorkCorrectly()
+        {
+            m_Light.lightUnit = LightUnit.Lumen;
+
+            var sceneProvider = UnityEditor.Search.SearchService.GetProvider("scene");
+            var context = UnityEditor.Search.SearchService.CreateContext("scene");
+            var searchItem = sceneProvider.CreateItem(context, $"scene:{m_TestGameObject.GetEntityId().ToString()}");
+            searchItem.data = m_TestGameObject;
+
+            var column = new SearchColumn("test", "test", "scene");
+            HDLightingSearchSelectors.LightIntensityUnitSearchColumnProvider(column);
+
+            var getterResult = column.getter(new SearchColumnEventArgs(searchItem, context, column));
+            Assert.AreEqual(LightUnit.Lumen, getterResult, "Getter should return the light unit");
+
+            var setterArgs = new SearchColumnEventArgs(searchItem, context, column);
+            setterArgs.value = LightUnit.Lux;
+            column.setter(setterArgs);
+
+            Assert.AreEqual(LightUnit.Lux, m_Light.lightUnit, "Setter should update light unit");
+        }
+
+        [Test]
+        public void LightIntensityUnit_Column_CellCreator_CreatesValidElement()
+        {
+            var column = new SearchColumn("test", "test", "test");
+            HDLightingSearchSelectors.LightIntensityUnitSearchColumnProvider(column);
+
+            var element = column.cellCreator(column);
+            Assert.IsNotNull(element, "Cell creator should return a valid element");
+            Assert.IsInstanceOf<EnumField>(element, "Should create an EnumField");
+        }
+
+        [Test]
+        public void LightIntensityUnit_Column_HandlesInvalidSetter()
+        {
+            var sceneProvider = UnityEditor.Search.SearchService.GetProvider("scene");
+            var context = UnityEditor.Search.SearchService.CreateContext("scene");
+            var searchItem = sceneProvider.CreateItem(context, $"scene:{m_TestGameObject.GetEntityId().ToString()}");
+            searchItem.data = m_TestGameObject;
+
+            var column = new SearchColumn("test", "test", "scene");
+            HDLightingSearchSelectors.LightIntensityUnitSearchColumnProvider(column);
+
+            var initialUnit = m_Light.lightUnit;
+
+            var setterArgs = new SearchColumnEventArgs(searchItem, context, column);
+            setterArgs.value = null;
+            column.setter(setterArgs);
+
+            Assert.AreEqual(initialUnit, m_Light.lightUnit, "Light unit should not change when setting null");
+
+            setterArgs.value = "invalid";
+            column.setter(setterArgs);
+            Assert.AreEqual(initialUnit, m_Light.lightUnit, "Light unit should not change when setting invalid value");
+        }
+
+        [Test]
+        public void LightIntensityUnit_Column_Binder_HandlesDiscLight()
+        {
+            m_Light.type = LightType.Disc;
+
+            var sceneProvider = UnityEditor.Search.SearchService.GetProvider("scene");
+            var context = UnityEditor.Search.SearchService.CreateContext("scene");
+            var searchItem = sceneProvider.CreateItem(context, $"scene:{m_TestGameObject.GetEntityId().ToString()}");
+            searchItem.data = m_TestGameObject;
+
+            var column = new SearchColumn("test", "test", "scene");
+            HDLightingSearchSelectors.LightIntensityUnitSearchColumnProvider(column);
+
+            var searchColumnEventArgs = new SearchColumnEventArgs(searchItem, context, column);
+            var getterResult = column.getter(searchColumnEventArgs);
+
+            var element = column.cellCreator(column);
+            var binderArgs = new SearchColumnEventArgs(searchItem, context, column) { value = getterResult };
+            Assert.DoesNotThrow(() => column.binder(binderArgs, element), "Binder should not throw for Disc lights");
+
+            var enumField = (EnumField)element;
+            Assert.IsTrue(enumField.visible, "EnumField should be visible for Disc lights");
+        }
+
+        [Test]
+        public void LightIntensityUnit_Column_Binder_HandlesTubeLight()
+        {
+            m_Light.type = LightType.Tube;
+
+            var sceneProvider = UnityEditor.Search.SearchService.GetProvider("scene");
+            var context = UnityEditor.Search.SearchService.CreateContext("scene");
+            var searchItem = sceneProvider.CreateItem(context, $"scene:{m_TestGameObject.GetEntityId().ToString()}");
+            searchItem.data = m_TestGameObject;
+
+            var column = new SearchColumn("test", "test", "scene");
+            HDLightingSearchSelectors.LightIntensityUnitSearchColumnProvider(column);
+
+            var searchColumnEventArgs = new SearchColumnEventArgs(searchItem, context, column);
+            var getterResult = column.getter(searchColumnEventArgs);
+
+            var element = column.cellCreator(column);
+            var binderArgs = new SearchColumnEventArgs(searchItem, context, column) { value = getterResult };
+            Assert.DoesNotThrow(() => column.binder(binderArgs, element), "Binder should not throw for Tube lights");
+
+            var enumField = (EnumField)element;
+            Assert.IsTrue(enumField.visible, "EnumField should be visible for Tube lights");
+        }
+
+        [Test]
+        public void LightIntensityUnit_Column_Binder_HandlesRectangleLight()
+        {
+            m_Light.type = LightType.Rectangle;
+
+            var sceneProvider = UnityEditor.Search.SearchService.GetProvider("scene");
+            var context = UnityEditor.Search.SearchService.CreateContext("scene");
+            var searchItem = sceneProvider.CreateItem(context, $"scene:{m_TestGameObject.GetEntityId().ToString()}");
+            searchItem.data = m_TestGameObject;
+
+            var column = new SearchColumn("test", "test", "scene");
+            HDLightingSearchSelectors.LightIntensityUnitSearchColumnProvider(column);
+
+            var searchColumnEventArgs = new SearchColumnEventArgs(searchItem, context, column);
+            var getterResult = column.getter(searchColumnEventArgs);
+
+            var element = column.cellCreator(column);
+            var binderArgs = new SearchColumnEventArgs(searchItem, context, column) { value = getterResult };
+            Assert.DoesNotThrow(() => column.binder(binderArgs, element), "Binder should not throw for Rectangle lights");
+
+            var enumField = (EnumField)element;
+            Assert.IsTrue(enumField.visible, "EnumField should be visible for Rectangle lights");
+        }
+
+        [Test]
+        public void LightIntensityUnit_Column_Binder_HandlesDirectionalLight()
+        {
+            m_Light.type = LightType.Directional;
+
+            var sceneProvider = UnityEditor.Search.SearchService.GetProvider("scene");
+            var context = UnityEditor.Search.SearchService.CreateContext("scene");
+            var searchItem = sceneProvider.CreateItem(context, $"scene:{m_TestGameObject.GetEntityId().ToString()}");
+            searchItem.data = m_TestGameObject;
+
+            var column = new SearchColumn("test", "test", "scene");
+            HDLightingSearchSelectors.LightIntensityUnitSearchColumnProvider(column);
+
+            var searchColumnEventArgs = new SearchColumnEventArgs(searchItem, context, column);
+            var getterResult = column.getter(searchColumnEventArgs);
+
+            var element = column.cellCreator(column);
+            var binderArgs = new SearchColumnEventArgs(searchItem, context, column) { value = getterResult };
+            Assert.DoesNotThrow(() => column.binder(binderArgs, element), "Binder should not throw for Directional lights");
+
+            var enumField = (EnumField)element;
+            Assert.IsTrue(enumField.visible, "EnumField should be visible for Directional lights");
+        }
+
+        [Test]
+        public void LightIntensityUnit_Column_Binder_HandlesPunctualLights()
+        {
+            var punctualTypes = new[] { LightType.Point, LightType.Spot };
+
+            foreach (var lightType in punctualTypes)
+            {
+                m_Light.type = lightType;
+
+                var sceneProvider = UnityEditor.Search.SearchService.GetProvider("scene");
+                var context = UnityEditor.Search.SearchService.CreateContext("scene");
+                var searchItem = sceneProvider.CreateItem(context, $"scene:{m_TestGameObject.GetEntityId().ToString()}");
+                searchItem.data = m_TestGameObject;
+
+                var column = new SearchColumn("test", "test", "scene");
+                HDLightingSearchSelectors.LightIntensityUnitSearchColumnProvider(column);
+
+                var searchColumnEventArgs = new SearchColumnEventArgs(searchItem, context, column);
+                var getterResult = column.getter(searchColumnEventArgs);
+
+                var element = column.cellCreator(column);
+                var binderArgs = new SearchColumnEventArgs(searchItem, context, column) { value = getterResult };
+                Assert.DoesNotThrow(() => column.binder(binderArgs, element), $"Binder should not throw for {lightType} lights");
+
+                var enumField = (EnumField)element;
+                Assert.IsTrue(enumField.visible, $"EnumField should be visible for {lightType} lights");
+            }
+        }
+
+        #endregion
+
+        #region Light Shape Tests
+
+        [Test]
+        public void LightShape_Column_Configuration_IsValid()
+        {
+            m_Light.type = LightType.Rectangle;
+
+            var column = new SearchColumn("test", HDLightingSearchSelectors.k_LightShapePath, "scene");
+            HDLightingSearchSelectors.LightShapeSearchColumnProvider(column);
+
+            Assert.IsNotNull(column.getter, "Column should have a getter");
+            Assert.IsNotNull(column.setter, "Column should have a setter");
+            Assert.IsNotNull(column.cellCreator, "Column should have a cell creator");
+            Assert.IsNotNull(column.binder, "Column should have a binder");
+        }
+
+        #endregion
+
+        #region Contact Shadows Tests
+
+        [Test]
+        public void ContactShadows_Column_Getter_ReturnsContactShadowsData()
+        {
+            m_HDLightData.useContactShadow.useOverride = true;
+            m_HDLightData.useContactShadow.@override = true;
+
+            var sceneProvider = UnityEditor.Search.SearchService.GetProvider("scene");
+            var context = UnityEditor.Search.SearchService.CreateContext("scene");
+            var searchItem = sceneProvider.CreateItem(context, $"scene:{m_TestGameObject.GetEntityId().ToString()}");
+            searchItem.data = m_TestGameObject;
+
+            var column = new SearchColumn("test", "test", "scene");
+            HDLightingSearchSelectors.ContactShadowsSearchColumnProvider(column);
+
+            var searchColumnEventArgs = new SearchColumnEventArgs(searchItem, context, column);
+            var getterResult = column.getter(searchColumnEventArgs);
+            Assert.IsNotNull(getterResult, "Getter should return a value");
+            Assert.IsTrue(getterResult.GetType().Name.Contains("ContactShadowsData"), "Getter should return ContactShadowsData");
+        }
+
+        #endregion
+
+        #region Ray Tracing Mode Tests
+
+        [Test]
+        public void RayTracingMode_Column_SetterAndGetter_WorkCorrectly()
+        {
+            m_MeshRenderer.rayTracingMode = UnityEngine.Experimental.Rendering.RayTracingMode.Static;
+
+            var sceneProvider = UnityEditor.Search.SearchService.GetProvider("scene");
+            var context = UnityEditor.Search.SearchService.CreateContext("scene");
+            var searchItem = sceneProvider.CreateItem(context, $"scene:{m_TestGameObject.GetEntityId().ToString()}");
+            searchItem.data = m_TestGameObject;
+
+            var column = new SearchColumn("test", "test", "scene");
+            HDLightingSearchSelectors.RayTracingModeSearchColumnProvider(column);
+
+            var searchColumnEventArgs = new SearchColumnEventArgs(searchItem, context, column);
+            var getterResult = column.getter(searchColumnEventArgs);
+            Assert.IsNotNull(getterResult, "Getter should return a value");
+            Assert.AreEqual(UnityEngine.Experimental.Rendering.RayTracingMode.Static, getterResult, "Getter should return Static");
+
+            var setterArgs = new SearchColumnEventArgs(searchItem, context, column);
+            setterArgs.value = UnityEngine.Experimental.Rendering.RayTracingMode.Off;
+            column.setter(setterArgs);
+            Assert.AreEqual(UnityEngine.Experimental.Rendering.RayTracingMode.Off, m_MeshRenderer.rayTracingMode, "RayTracingMode should be Off after setting");
+        }
+
+        [Test]
+        public void RayTracingMode_Column_CellCreator_CreatesValidElement()
+        {
+            var column = new SearchColumn("test", "test", "test");
+            HDLightingSearchSelectors.RayTracingModeSearchColumnProvider(column);
+
+            var element = column.cellCreator(column);
+            Assert.IsNotNull(element, "Cell creator should return a valid element");
+            Assert.IsInstanceOf<UnityEngine.UIElements.EnumField>(element, "Should create an EnumField");
+        }
+
+        #endregion
+
+        #region Reflection Probe Resolution Tests
+
+        [Test]
+        public void ReflectionProbeResolution_Column_Getter_WithHDProbe_ReturnsResolutionData()
+        {
+            m_TestGameObject.AddComponent<ReflectionProbe>();
+            m_TestGameObject.AddComponent<HDAdditionalReflectionData>();
+
+            var sceneProvider = UnityEditor.Search.SearchService.GetProvider("scene");
+            var context = UnityEditor.Search.SearchService.CreateContext("scene");
+            var searchItem = sceneProvider.CreateItem(context, $"scene:{m_TestGameObject.GetEntityId().ToString()}");
+            searchItem.data = m_TestGameObject;
+
+            var column = new SearchColumn("test", HDLightingSearchSelectors.k_ReflectionProbeResolutionPath, "scene");
+            HDLightingSearchSelectors.ReflectionProbeResolutionSearchColumnProvider(column);
+
+            var searchColumnEventArgs = new SearchColumnEventArgs(searchItem, context, column);
+            var getterResult = column.getter(searchColumnEventArgs);
+
+            Assert.IsNotNull(getterResult, "Getter should return a value");
+            Assert.IsTrue(getterResult.GetType().Name.Contains("ReflectionProbeResolutionData"), "Getter should return ReflectionProbeResolutionData");
+        }
+
+        [Test]
+        public void ReflectionProbeResolution_Column_Getter_WithoutHDProbe_ReturnsNull()
+        {
+            var testObj = new GameObject("TestReflectionProbeOnly");
+            try
+            {
+                testObj.AddComponent<ReflectionProbe>();
+
+                var sceneProvider = UnityEditor.Search.SearchService.GetProvider("scene");
+                var context = UnityEditor.Search.SearchService.CreateContext("scene");
+                var searchItem = sceneProvider.CreateItem(context, $"scene:{testObj.GetEntityId().ToString()}");
+                searchItem.data = testObj;
+
+                var column = new SearchColumn("test", HDLightingSearchSelectors.k_ReflectionProbeResolutionPath, "scene");
+                HDLightingSearchSelectors.ReflectionProbeResolutionSearchColumnProvider(column);
+
+                var searchColumnEventArgs = new SearchColumnEventArgs(searchItem, context, column);
+                var getterResult = column.getter(searchColumnEventArgs);
+
+                Assert.IsNull(getterResult, "Getter should return null without HDProbe component");
+            }
+            finally
+            {
+                Object.DestroyImmediate(testObj);
+            }
+        }
+
+        #endregion
+
+        #region Shadow Resolution Tests
+
+        [Test]
+        public void ShadowResolution_Column_Getter_ReturnsShadowResolutionData()
+        {
+            m_HDLightData.shadowResolution.useOverride = true;
+            m_HDLightData.shadowResolution.level = 2;
+
+            var sceneProvider = UnityEditor.Search.SearchService.GetProvider("scene");
+            var context = UnityEditor.Search.SearchService.CreateContext("scene");
+            var searchItem = sceneProvider.CreateItem(context, $"scene:{m_TestGameObject.GetEntityId().ToString()}");
+            searchItem.data = m_TestGameObject;
+
+            var column = new SearchColumn("test", "test", "scene");
+            HDLightingSearchSelectors.ShadowResolutionSearchColumnProvider(column);
+
+            var searchColumnEventArgs = new SearchColumnEventArgs(searchItem, context, column);
+            var getterResult = column.getter(searchColumnEventArgs);
+            Assert.IsNotNull(getterResult, "Getter should return a value");
+            Assert.IsTrue(getterResult.GetType().Name.Contains("ShadowResolutionData"), "Getter should return ShadowResolutionData");
+        }
+
+        #endregion
+
+        #region Light Shape Tests
+
+        [Test]
+        public void LightShape_Column_Getter_ReturnsValue()
+        {
+            m_Light.type = LightType.Spot;
+
+            var sceneProvider = UnityEditor.Search.SearchService.GetProvider("scene");
+            var context = UnityEditor.Search.SearchService.CreateContext("scene");
+            var searchItem = sceneProvider.CreateItem(context, $"scene:{m_TestGameObject.GetEntityId().ToString()}");
+            searchItem.data = m_TestGameObject;
+
+            var column = new SearchColumn("test", "test", "scene");
+            HDLightingSearchSelectors.LightShapeSearchColumnProvider(column);
+
+            var searchColumnEventArgs = new SearchColumnEventArgs(searchItem, context, column);
+            var getterResult = column.getter(searchColumnEventArgs);
+            Assert.IsNotNull(getterResult, "Getter should return a value");
+        }
+
+        [Test]
+        public void LightShape_Column_Getter_WithoutLight_ReturnsNull()
+        {
+            var testObj = new GameObject("TestNoLight");
+            try
+            {
+                var sceneProvider = UnityEditor.Search.SearchService.GetProvider("scene");
+                var context = UnityEditor.Search.SearchService.CreateContext("scene");
+                var searchItem = sceneProvider.CreateItem(context, $"scene:{testObj.GetEntityId().ToString()}");
+                searchItem.data = testObj;
+
+                var column = new SearchColumn("test", "test", "scene");
+                HDLightingSearchSelectors.LightShapeSearchColumnProvider(column);
+
+                var searchColumnEventArgs = new SearchColumnEventArgs(searchItem, context, column);
+                var getterResult = column.getter(searchColumnEventArgs);
+                Assert.IsNull(getterResult, "Getter should return null for GameObject without Light component");
+            }
+            finally
+            {
+                Object.DestroyImmediate(testObj);
+            }
+        }
+
+        [Test]
+        public void LightShape_Column_Setter_UpdatesSpotLightValue()
+        {
+            m_Light.type = LightType.Point;
+
+            var sceneProvider = UnityEditor.Search.SearchService.GetProvider("scene");
+            var context = UnityEditor.Search.SearchService.CreateContext("scene");
+            var searchItem = sceneProvider.CreateItem(context, $"scene:{m_TestGameObject.GetEntityId().ToString()}");
+            searchItem.data = m_TestGameObject;
+
+            var column = new SearchColumn("test", "test", "scene");
+            HDLightingSearchSelectors.LightShapeSearchColumnProvider(column);
+
+            var setterArgs = new SearchColumnEventArgs(searchItem, context, column);
+            setterArgs.value = LightType.Spot;
+            column.setter(setterArgs);
+
+            Assert.AreEqual(LightType.Spot, m_Light.type, "Light should have type Spot after setting");
+        }
+
+        [Test]
+        public void LightShape_Column_Setter_UpdatesAreaLightValue()
+        {
+            m_Light.type = LightType.Point;
+
+            var sceneProvider = UnityEditor.Search.SearchService.GetProvider("scene");
+            var context = UnityEditor.Search.SearchService.CreateContext("scene");
+            var searchItem = sceneProvider.CreateItem(context, $"scene:{m_TestGameObject.GetEntityId().ToString()}");
+            searchItem.data = m_TestGameObject;
+
+            var column = new SearchColumn("test", "test", "scene");
+            HDLightingSearchSelectors.LightShapeSearchColumnProvider(column);
+
+            var setterArgs = new SearchColumnEventArgs(searchItem, context, column);
+            setterArgs.value = LightType.Rectangle;
+            column.setter(setterArgs);
+            Assert.AreEqual(LightType.Rectangle, m_Light.type, "Light should have type Rectangle after setting");
+        }
+
+        [Test]
+        public void LightShape_Column_Setter_RejectsNonApplicableLightTypes()
+        {
+            m_Light.type = LightType.Spot;
+
+            var sceneProvider = UnityEditor.Search.SearchService.GetProvider("scene");
+            var context = UnityEditor.Search.SearchService.CreateContext("scene");
+            var searchItem = sceneProvider.CreateItem(context, $"scene:{m_TestGameObject.GetEntityId().ToString()}");
+            searchItem.data = m_TestGameObject;
+
+            var column = new SearchColumn("test", "test", "scene");
+            HDLightingSearchSelectors.LightShapeSearchColumnProvider(column);
+
+            var setterArgs = new SearchColumnEventArgs(searchItem, context, column);
+            setterArgs.value = LightType.Point;
+            column.setter(setterArgs);
+            Assert.AreEqual(LightType.Spot, m_Light.type, "Light type should not change when setting non-applicable type");
+        }
+
+        [Test]
+        public void LightShape_Column_CellCreator_CreatesValidElement()
+        {
+            var column = new SearchColumn("test", "test", "test");
+            HDLightingSearchSelectors.LightShapeSearchColumnProvider(column);
+
+            var element = column.cellCreator(column);
+            Assert.IsNotNull(element, "Cell creator should return a valid element");
+            Assert.IsInstanceOf<UnityEngine.UIElements.VisualElement>(element, "Should create a VisualElement");
+        }
+
+        [Test]
+        public void LightShape_Column_Binder_HandlesSpotLights()
+        {
+            m_Light.type = LightType.Spot;
+
+            var sceneProvider = UnityEditor.Search.SearchService.GetProvider("scene");
+            var context = UnityEditor.Search.SearchService.CreateContext("scene");
+            var searchItem = sceneProvider.CreateItem(context, $"scene:{m_TestGameObject.GetEntityId().ToString()}");
+            searchItem.data = m_TestGameObject;
+
+            var column = new SearchColumn("test", "test", "scene");
+            HDLightingSearchSelectors.LightShapeSearchColumnProvider(column);
+
+            var searchColumnEventArgs = new SearchColumnEventArgs(searchItem, context, column);
+            var getterResult = column.getter(searchColumnEventArgs);
+
+            var element = column.cellCreator(column);
+            var binderArgs = new SearchColumnEventArgs(searchItem, context, column) { value = getterResult };
+            Assert.DoesNotThrow(() => column.binder(binderArgs, element), "Binder should not throw for spot lights");
+        }
+
+        [Test]
+        public void LightShape_Column_Binder_HandlesAreaLights()
+        {
+            m_Light.type = LightType.Rectangle;
+
+            var sceneProvider = UnityEditor.Search.SearchService.GetProvider("scene");
+            var context = UnityEditor.Search.SearchService.CreateContext("scene");
+            var searchItem = sceneProvider.CreateItem(context, $"scene:{m_TestGameObject.GetEntityId().ToString()}");
+            searchItem.data = m_TestGameObject;
+
+            var column = new SearchColumn("test", "test", "scene");
+            HDLightingSearchSelectors.LightShapeSearchColumnProvider(column);
+
+            var searchColumnEventArgs = new SearchColumnEventArgs(searchItem, context, column);
+            var getterResult = column.getter(searchColumnEventArgs);
+
+            var element = column.cellCreator(column);
+            var binderArgs = new SearchColumnEventArgs(searchItem, context, column) { value = getterResult };
+            Assert.DoesNotThrow(() => column.binder(binderArgs, element), "Binder should not throw for area lights");
+        }
+
+        #endregion
+
+        #region Integration Tests
+
+        [Test]
+        public void AllHDRPColumns_HaveValidConfiguration()
+        {
+            var columnTypes = new[]
+            {
+                HDLightingSearchSelectors.k_LightIntensityPath,
+                HDLightingSearchSelectors.k_LightIntensityUnitPath,
+                HDLightingSearchSelectors.k_ContactShadowsPath,
+                HDLightingSearchSelectors.k_RayTracingModePath,
+                HDLightingSearchSelectors.k_ReflectionProbeResolutionPath,
+                HDLightingSearchSelectors.k_ShadowResolutionPath,
+                HDLightingSearchSelectors.k_LightShapePath
+            };
+
+            foreach (var columnType in columnTypes)
+            {
+                var column = new SearchColumn("test", columnType, "test");
+
+                Assert.DoesNotThrow(() =>
+                {
+                    switch (columnType)
+                    {
+                        case "Light/Intensity":
+                            HDLightingSearchSelectors.LightIntensitySearchColumnProvider(column);
+                            break;
+                        case "Light/IntensityUnit":
+                            HDLightingSearchSelectors.LightIntensityUnitSearchColumnProvider(column);
+                            break;
+                        case "Light/ContactShadows":
+                            HDLightingSearchSelectors.ContactShadowsSearchColumnProvider(column);
+                            break;
+                        case "Renderer/MeshRenderer/RayTracingMode":
+                            HDLightingSearchSelectors.RayTracingModeSearchColumnProvider(column);
+                            break;
+                        case "ReflectionProbe/Resolution":
+                            HDLightingSearchSelectors.ReflectionProbeResolutionSearchColumnProvider(column);
+                            break;
+                        case "Light/ShadowResolution":
+                            HDLightingSearchSelectors.ShadowResolutionSearchColumnProvider(column);
+                            break;
+                        case "Light/Shape":
+                            HDLightingSearchSelectors.LightShapeSearchColumnProvider(column);
+                            break;
+                    }
+                }, $"Column initialization for {columnType} should not throw");
+
+                Assert.IsNotNull(column.getter, $"Column {columnType} should have a getter");
+                Assert.IsNotNull(column.cellCreator, $"Column {columnType} should have a cell creator");
+                Assert.IsNotNull(column.binder, $"Column {columnType} should have a binder");
+                Assert.IsNotNull(column.setter, $"Column {columnType} should have a setter");
+            }
+        }
+
+        #endregion
+    }
+}
diff --git a/Packages/com.unity.render-pipelines.high-definition/Tests/Editor/HDLightingSearchSelectorsTests.cs.meta b/Packages/com.unity.render-pipelines.high-definition/Tests/Editor/HDLightingSearchSelectorsTests.cs.meta
new file mode 100644
index 00000000000..b2479647fc5
--- /dev/null
+++ b/Packages/com.unity.render-pipelines.high-definition/Tests/Editor/HDLightingSearchSelectorsTests.cs.meta
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: 503a929537e5247999f0a8f5743d1905
\ No newline at end of file
diff --git a/Packages/com.unity.render-pipelines.high-definition/Tests/Runtime/RuntimeExampleTest.cs b/Packages/com.unity.render-pipelines.high-definition/Tests/Runtime/RuntimeExampleTest.cs
deleted file mode 100644
index a697d48d3ce..00000000000
--- a/Packages/com.unity.render-pipelines.high-definition/Tests/Runtime/RuntimeExampleTest.cs
+++ /dev/null
@@ -1,24 +0,0 @@
-using UnityEngine;
-using UnityEngine.TestTools;
-using NUnit.Framework;
-using System.Collections;
-
-class RuntimeExampleTest
-{
-    [Test]
-    public void PlayModeSampleTestSimplePasses()
-    {
-        // Use the Assert class to test conditions.
-    }
-
-    // A UnityTest behaves like a coroutine in PlayMode
-    // and allows you to yield null to skip a frame in EditMode
-    [UnityTest]
-    [Ignore("Unstable: https://jira.unity3d.com/browse/UUM-102848")]
-    public IEnumerator PlayModeSampleTestWithEnumeratorPasses()
-    {
-        // Use the Assert class to test conditions.
-        // yield to skip a frame
-        yield return null;
-    }
-}
diff --git a/Packages/com.unity.render-pipelines.high-definition/Tests/Runtime/RuntimeExampleTest.cs.meta b/Packages/com.unity.render-pipelines.high-definition/Tests/Runtime/RuntimeExampleTest.cs.meta
deleted file mode 100644
index 63ca08abea9..00000000000
--- a/Packages/com.unity.render-pipelines.high-definition/Tests/Runtime/RuntimeExampleTest.cs.meta
+++ /dev/null
@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: de715b4a054ac6146818ca5781e55be1
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/Packages/com.unity.render-pipelines.high-definition/package.json b/Packages/com.unity.render-pipelines.high-definition/package.json
index 35cd21dc42a..f3480357c02 100644
--- a/Packages/com.unity.render-pipelines.high-definition/package.json
+++ b/Packages/com.unity.render-pipelines.high-definition/package.json
@@ -1,18 +1,18 @@
 {
   "name": "com.unity.render-pipelines.high-definition",
   "description": "The High Definition Render Pipeline (HDRP) is a high-fidelity Scriptable Render Pipeline built by Unity to target modern (Compute Shader compatible) platforms. HDRP utilizes Physically-Based Lighting techniques, linear lighting, HDR lighting, and a configurable hybrid Tile/Cluster deferred/Forward lighting architecture and gives you the tools you need to create games, technical demos, animations, and more to a high graphical standard.",
-  "version": "17.5.0",
-  "unity": "6000.5",
+  "version": "17.6.0",
+  "unity": "6000.6",
   "displayName": "High Definition Render Pipeline",
   "dependencies": {
     "com.unity.modules.video": "1.0.0",
     "com.unity.modules.animation": "1.0.0",
     "com.unity.modules.imageconversion": "1.0.0",
     "com.unity.modules.physics": "1.0.0",
-    "com.unity.render-pipelines.core": "17.5.0",
-    "com.unity.shadergraph": "17.5.0",
-    "com.unity.visualeffectgraph": "17.5.0",
-    "com.unity.render-pipelines.high-definition-config": "17.5.0"
+    "com.unity.render-pipelines.core": "17.6.0",
+    "com.unity.shadergraph": "17.6.0",
+    "com.unity.visualeffectgraph": "17.6.0",
+    "com.unity.render-pipelines.high-definition-config": "17.6.0"
   },
   "keywords": [
     "graphics",
diff --git a/Packages/com.unity.render-pipelines.universal-config/CHANGELOG.md b/Packages/com.unity.render-pipelines.universal-config/CHANGELOG.md
index 0e1d216c338..32aee14b6eb 100644
--- a/Packages/com.unity.render-pipelines.universal-config/CHANGELOG.md
+++ b/Packages/com.unity.render-pipelines.universal-config/CHANGELOG.md
@@ -10,6 +10,12 @@ 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.
 
+## [17.5.0] - 2026-02-18
+
+This version is compatible with Unity 6000.6.0a7.
+
+For the release notes, refer to the [Unity download archive](https://unity.com/releases/editor/archive).
+
 ## [17.4.0] - 2025-10-22
 
 This version is compatible with Unity 6000.4.0a4.
diff --git a/Packages/com.unity.render-pipelines.universal-config/package.json b/Packages/com.unity.render-pipelines.universal-config/package.json
index 8d25bb093f8..0b878eca0f2 100644
--- a/Packages/com.unity.render-pipelines.universal-config/package.json
+++ b/Packages/com.unity.render-pipelines.universal-config/package.json
@@ -1,10 +1,10 @@
 {
   "name": "com.unity.render-pipelines.universal-config",
   "description": "Configuration files for the Universal Render Pipeline.",
-  "version": "17.5.0",
-  "unity": "6000.5",
+  "version": "17.6.0",
+  "unity": "6000.6",
   "displayName": "Universal Render Pipeline Config",
   "dependencies": {
-    "com.unity.render-pipelines.core": "17.5.0"
+    "com.unity.render-pipelines.core": "17.6.0"
   }
 }
\ No newline at end of file
diff --git a/Packages/com.unity.render-pipelines.universal/CHANGELOG.md b/Packages/com.unity.render-pipelines.universal/CHANGELOG.md
index 36ead0bc7ba..edf9b879a17 100644
--- a/Packages/com.unity.render-pipelines.universal/CHANGELOG.md
+++ b/Packages/com.unity.render-pipelines.universal/CHANGELOG.md
@@ -4,12 +4,17 @@ uid: urp-changelog
 
 # Changelog
 
-
 ## [Unreleased]
 
 Version Updated
 The version number for this package has increased due to a version update of a related graphics package.
 
+## [17.5.0] - 2026-02-18
+
+This version is compatible with Unity 6000.6.0a7.
+
+For the release notes, refer to the [Unity download archive](https://unity.com/releases/editor/archive).
+
 ## [17.4.0] - 2025-10-22
 
 This version is compatible with Unity 6000.4.0a4.
diff --git a/Packages/com.unity.render-pipelines.universal/Editor/2D/Converter/BuiltInAndURP3DTo2DMaterialUpgrader.cs b/Packages/com.unity.render-pipelines.universal/Editor/2D/Converter/BuiltInAndURP3DTo2DMaterialUpgrader.cs
index c715cffc05d..373b2a9a30f 100644
--- a/Packages/com.unity.render-pipelines.universal/Editor/2D/Converter/BuiltInAndURP3DTo2DMaterialUpgrader.cs
+++ b/Packages/com.unity.render-pipelines.universal/Editor/2D/Converter/BuiltInAndURP3DTo2DMaterialUpgrader.cs
@@ -8,6 +8,7 @@ namespace UnityEditor.Rendering.Universal
 {
     [Serializable]
     [PipelineTools]
+    [BatchModeConverterClassInfo("UpgradeURP2DAssets", "URPToReadonlyMaterial2D")]
     [ElementInfo(Name = "Convert Built-in and URP ( Universal Renderer ) Materials to Mesh2D-Lit-Default",
                  Order = 300,
                  Description = "This will upgrade/crossgrade all 3D materials and 3D material references for URP 2D.")]
diff --git a/Packages/com.unity.render-pipelines.universal/Editor/2D/Converter/BuiltInToURP2DReadonlyMaterialConverter.cs b/Packages/com.unity.render-pipelines.universal/Editor/2D/Converter/BuiltInToURP2DReadonlyMaterialConverter.cs
index 8d804a82a16..c59e9ccfe2c 100644
--- a/Packages/com.unity.render-pipelines.universal/Editor/2D/Converter/BuiltInToURP2DReadonlyMaterialConverter.cs
+++ b/Packages/com.unity.render-pipelines.universal/Editor/2D/Converter/BuiltInToURP2DReadonlyMaterialConverter.cs
@@ -10,6 +10,7 @@ namespace UnityEditor.Rendering.Universal
 {
     [Serializable]
     [PipelineConverter("Built-in", "Universal Render Pipeline (2D Renderer)")]
+    [BatchModeConverterClassInfo("BuiltInToURP2D", "ReadonlyMaterial2D")]
     [ElementInfo(Name = "Material Reference Converter",
                  Order = 100,
                  Description = "Converts references to Built-In readonly materials to URP (2D) readonly materials.")]
diff --git a/Packages/com.unity.render-pipelines.universal/Editor/2D/Converter/BuiltInToURP2DRenderSettingsConverter.cs b/Packages/com.unity.render-pipelines.universal/Editor/2D/Converter/BuiltInToURP2DRenderSettingsConverter.cs
index dc95826c388..75c33a1dd7e 100644
--- a/Packages/com.unity.render-pipelines.universal/Editor/2D/Converter/BuiltInToURP2DRenderSettingsConverter.cs
+++ b/Packages/com.unity.render-pipelines.universal/Editor/2D/Converter/BuiltInToURP2DRenderSettingsConverter.cs
@@ -9,6 +9,7 @@ namespace UnityEditor.Rendering.Universal
 {
     [Serializable]
     [PipelineConverter("Built-in", "Universal Render Pipeline (2D Renderer)")]
+    [BatchModeConverterClassInfo("BuiltInToURP2D", "RenderSettings2D")]
     [ElementInfo(Name = "Rendering Settings",
                  Order = int.MinValue,
                  Description = "This converter creates Universal Render Pipeline (URP) assets and corresponding Renderer assets, configuring their settings to match the equivalent settings from the Built-in Render Pipeline.")]
diff --git a/Packages/com.unity.render-pipelines.universal/Editor/2D/Converter/ParametricToFreeformLightUpgrader.cs b/Packages/com.unity.render-pipelines.universal/Editor/2D/Converter/ParametricToFreeformLightUpgrader.cs
index 90995d02ede..9ef67901770 100644
--- a/Packages/com.unity.render-pipelines.universal/Editor/2D/Converter/ParametricToFreeformLightUpgrader.cs
+++ b/Packages/com.unity.render-pipelines.universal/Editor/2D/Converter/ParametricToFreeformLightUpgrader.cs
@@ -27,6 +27,7 @@ public ParametricToFreeformLightUpgraderItem(GlobalObjectId gid, string assetPat
 
     [Serializable]
     [PipelineTools]
+    [BatchModeConverterClassInfo("UpgradeURP2DAssets", "ParametricToFreeformLight")]
     [ElementInfo(Name = "Parametric to Freeform Light Upgrade",
              Order = 100,
              Description = "This will upgrade all parametric lights to freeform lights.")]
diff --git a/Packages/com.unity.render-pipelines.universal/Editor/2D/Light2DEditor.cs b/Packages/com.unity.render-pipelines.universal/Editor/2D/Light2DEditor.cs
index ca965fa570f..3fd06d99105 100644
--- a/Packages/com.unity.render-pipelines.universal/Editor/2D/Light2DEditor.cs
+++ b/Packages/com.unity.render-pipelines.universal/Editor/2D/Light2DEditor.cs
@@ -3,6 +3,8 @@
 using UnityEditor.EditorTools;
 using UnityEngine;
 using UnityEngine.Rendering.Universal;
+using UnityEditor.VersionControl;
+
 
 #if USING_2DCOMMON
 using UnityEditor.U2D.Common.Path;
@@ -59,7 +61,7 @@ protected override void SetShape(ScriptablePath shapeEditor, SerializedObject se
                 // This is untracked right now...
                 serializedObject.ApplyModifiedProperties();
             }
-    }
+        }
 
 #endif
 
@@ -139,7 +141,7 @@ private static class Styles
         const float k_RangeCapSize = 0.025f * k_GlobalLightGizmoSize;
         const float k_InnerRangeCapSize = 0.08f * k_GlobalLightGizmoSize;
 
-        SerializedProperty m_LightType;
+        
         SerializedProperty m_LightColor;
         SerializedProperty m_LightIntensity;
         SerializedProperty m_UseNormalMap;
@@ -159,6 +161,10 @@ private static class Styles
         SerializedProperty m_LightOrder;
         SerializedProperty m_OverlapOperation;
 
+        SerializedProperty m_Provider2DLightType;
+        SerializedProperty m_LightType;
+        SerializedProperty m_Light2DProvider;
+
         // Point Light Properties
         SerializedProperty m_PointInnerAngle;
         SerializedProperty m_PointOuterAngle;
@@ -172,12 +178,15 @@ private static class Styles
         SerializedProperty m_ShapeLightParametricSides;
         SerializedProperty m_ShapeLightSprite;
 
+        SerializedProperty m_SelectionSources;
+        
+
         SavedBool m_BlendingSettingsFoldout;
+        SavedBool m_ProviderFoldout;
         SavedBool m_ShadowsSettingsFoldout;
         SavedBool m_VolumetricSettingsFoldout;
         SavedBool m_NormalMapsSettingsFoldout;
 
-
         int[] m_BlendStyleIndices;
         GUIContent[] m_BlendStyleNames;
         bool m_AnyBlendStyleEnabled = false;
@@ -202,34 +211,6 @@ private void AnalyticsTrackChanges(SerializedObject serializedObject)
             }
         }
 
-        private void DrawHeaderFoldoutWithToggle(GUIContent title, SavedBool foldoutState, SerializedProperty toggleState, string documentationURL = "")
-        {
-            const float height = 17f;
-            var backgroundRect = GUILayoutUtility.GetRect(0, 0);
-            float xMin = backgroundRect.xMin;
-
-            var labelRect = backgroundRect;
-            labelRect.yMax += height;
-            labelRect.xMin += 16f;
-            labelRect.xMax -= 20f;
-
-            var labelRect_toggle = labelRect;
-            labelRect_toggle.width = labelRect.height;
-
-            bool newToggleState = GUI.Toggle(labelRect_toggle, toggleState.boolValue, " ");  // Needs a space because the checkbox won't have a proper outline if we don't make a space here
-            bool newFoldoutState = CoreEditorUtils.DrawHeaderFoldout("", foldoutState.value);
-
-            if (newToggleState != toggleState.boolValue)
-                toggleState.boolValue = newToggleState;
-
-            if (newFoldoutState != foldoutState.value)
-                foldoutState.value = newFoldoutState;
-
-
-            labelRect.xMin += 20;
-            EditorGUI.LabelField(labelRect, title, EditorStyles.boldLabel);
-        }
-
         void OnEnable()
         {
             m_Analytics = Analytics.Renderer2DAnalytics.instance;
@@ -240,8 +221,9 @@ void OnEnable()
             m_ShadowsSettingsFoldout = new SavedBool($"{target.GetType()}.2DURPShadowsSettingsFoldout", false);
             m_VolumetricSettingsFoldout = new SavedBool($"{target.GetType()}.2DURPVolumetricSettingsFoldout", false);
             m_NormalMapsSettingsFoldout = new SavedBool($"{target.GetType()}.2DURPNormalMapsSettingsFoldout", false);
+            m_ProviderFoldout = new SavedBool($"{target.GetType()}.2DURPLight2DProviderFoldout", false);
+
 
-            m_LightType = serializedObject.FindProperty("m_LightType");
             m_LightColor = serializedObject.FindProperty("m_Color");
             m_LightIntensity = serializedObject.FindProperty("m_Intensity");
             m_UseNormalMap = serializedObject.FindProperty("m_UseNormalMap");
@@ -261,6 +243,8 @@ void OnEnable()
             m_LightOrder = serializedObject.FindProperty("m_LightOrder");
             m_OverlapOperation = serializedObject.FindProperty("m_OverlapOperation");
 
+            m_LightType = serializedObject.FindProperty("m_LightType");
+
             // Point Light
             m_PointInnerAngle = serializedObject.FindProperty("m_PointLightInnerAngle");
             m_PointOuterAngle = serializedObject.FindProperty("m_PointLightOuterAngle");
@@ -274,6 +258,9 @@ void OnEnable()
             m_ShapeLightParametricSides = serializedObject.FindProperty("m_ShapeLightParametricSides");
             m_ShapeLightSprite = serializedObject.FindProperty("m_LightCookieSprite");
 
+            m_SelectionSources = serializedObject.FindProperty("m_SelectionSources");
+
+            
             m_AnyBlendStyleEnabled = false;
             var blendStyleIndices = new List<int>();
             var blendStyleNames = new List<string>();
@@ -354,7 +341,7 @@ void DrawShadowsGroup()
         {
             CoreEditorUtils.DrawSplitter(false);
 
-            DrawHeaderFoldoutWithToggle(Styles.shadowsSettingsFoldout, m_ShadowsSettingsFoldout, m_ShadowsEnabled);
+            Light2DEditorUtility.DrawHeaderFoldoutWithToggle(Styles.shadowsSettingsFoldout, m_ShadowsSettingsFoldout, m_ShadowsEnabled);
 
             if (m_ShadowsSettingsFoldout.value)
             {
@@ -362,7 +349,7 @@ void DrawShadowsGroup()
                 EditorGUI.BeginDisabledGroup(!m_ShadowsEnabled.boolValue);
                 EditorGUILayout.PropertyField(m_ShadowIntensity, Styles.generalShadowIntensity);
                 EditorGUILayout.PropertyField(m_ShadowSoftness, Styles.generalShadowSoftness);
-                EditorGUILayout.PropertyField(m_ShadowSoftnessFalloffIntensity,Styles.generalShadowSoftnessFalloffIntensity);
+                EditorGUILayout.PropertyField(m_ShadowSoftnessFalloffIntensity, Styles.generalShadowSoftnessFalloffIntensity);
                 EditorGUI.EndDisabledGroup();
                 EditorGUI.indentLevel--;
             }
@@ -372,7 +359,7 @@ void DrawVolumetricGroup()
         {
             CoreEditorUtils.DrawSplitter(false);
 
-            DrawHeaderFoldoutWithToggle(Styles.volumetricSettingsFoldout, m_VolumetricSettingsFoldout, m_VolumetricEnabled);
+            Light2DEditorUtility.DrawHeaderFoldoutWithToggle(Styles.volumetricSettingsFoldout, m_VolumetricSettingsFoldout, m_VolumetricEnabled);
 
             if (m_VolumetricSettingsFoldout.value)
             {
@@ -530,10 +517,33 @@ public void DrawInnerAndOuterSpotAngle(SerializedProperty minProperty, Serialize
 
         void DrawGlobalLight(SerializedObject serializedObject)
         {
-            m_SortingLayerDropDown.OnTargetSortingLayers(serializedObject, targets, Styles.generalSortingLayerPrefixLabel, AnalyticsTrackChanges);
             DrawBlendingGroup();
         }
 
+        void DrawProviderLight(SerializedObject serializedObject)
+        {
+            bool foldoutState = CoreEditorUtils.DrawHeaderFoldout("Provider", m_ProviderFoldout.value);
+            if (foldoutState != m_ProviderFoldout.value)
+                m_ProviderFoldout.value = foldoutState;
+
+            serializedObject.Update();
+
+            if (m_ProviderFoldout.value)
+            {
+                // We have to get this because it may have changed in this editor redraw already
+                SerializedProperty provider = serializedObject.FindProperty("m_Light2DProvider");
+                Light2DProvider lightProvider = provider.boxedValue as Light2DProvider;
+                if (lightProvider != null)
+                {
+                    Light2DProviderSources.DrawSelectedSourceUI(m_SelectionSources);
+                }
+            }
+
+            serializedObject.ApplyModifiedProperties();
+
+            DrawFoldouts();
+        }
+
         void DrawParametricDeprecated(SerializedObject serializedObject)
         {
             GUIContent buttonText = targets.Length > 1 ? Styles.deprecatedParametricLightButtonMulti : Styles.deprecatedParametricLightButtonSingle;
@@ -561,19 +571,37 @@ void DrawParametricDeprecated(SerializedObject serializedObject)
             EditorGUILayout.HelpBox(Styles.deprecatedParametricLightInstructions);
         }
 
+        int GetSelectedValue(Light2DProvider light2DProvider)
+        {
+            int selectedValue = m_LightType.intValue;
+            if (selectedValue == (int)Light2D.LightType.Provider)
+            {
+                if (light2DProvider != null)
+                {
+                    selectedValue = light2DProvider.GetType().GetHashCode();
+                }
+            }
+
+            return selectedValue;
+        }
+
         bool DrawLightCommon()
         {
             var meshChanged = false;
-            Rect lightTypeRect = EditorGUILayout.GetControlRect();
-            EditorGUI.BeginProperty(lightTypeRect, GUIContent.none, m_LightType);
-            EditorGUI.BeginChangeCheck();
-            int newLightType = EditorGUI.Popup(lightTypeRect, Styles.generalLightType, m_LightType.intValue - 1, Styles.lightTypeOptions);  // -1 is a bit hacky its to support compatibiltiy. We need something better.
-            if (EditorGUI.EndChangeCheck())
+
+            List<SelectionSource> additionalSources = new List<SelectionSource>
             {
-                m_LightType.intValue = newLightType + 1; // -1 is a bit hacky its to support compatibiltiy. We need something better.
-                meshChanged = true;
-            }
-            EditorGUI.EndProperty();
+                new Light2DSource_BuiltIn(Styles.lightTypePoint, Light2D.LightType.Point, 0),
+                new Light2DSource_BuiltIn(Styles.lightTypeFreeform, Light2D.LightType.Freeform, 0),
+                new Light2DSource_BuiltIn(Styles.lightTypeSprite, Light2D.LightType.Sprite, 0),
+                new Light2DSource_BuiltIn(Styles.lightTypeGlobal, Light2D.LightType.Global, 0),
+            }; 
+            
+            Light2DProviderSources.SetAdditionalSources(m_SelectionSources, additionalSources);
+            EditorGUILayout.PropertyField(m_SelectionSources, Styles.generalLightType);  // This should call serializedObject.ApplyModifiedProperties();
+            Light2DProviderSources.SetSourceType(m_SelectionSources);
+
+            serializedObject.Update();
 
             // Color and intensity
             EditorGUILayout.PropertyField(m_LightColor, Styles.generalLightColor);
@@ -582,53 +610,74 @@ bool DrawLightCommon()
             if (EditorGUI.EndChangeCheck())
                 m_LightIntensity.floatValue = Mathf.Max(m_LightIntensity.floatValue, 0);
 
+            m_SortingLayerDropDown.OnTargetSortingLayers(serializedObject, targets, Styles.generalSortingLayerPrefixLabel, AnalyticsTrackChanges);
+
+            serializedObject.ApplyModifiedProperties();
+
+
             return meshChanged;
         }
 
         void DrawSpotLight(SerializedObject serializedObject)
         {
-            DrawRadiusProperties(Styles.pointLightRadius, m_PointInnerRadius, Styles.pointLightInner, m_PointOuterRadius, Styles.pointLightOuter);
-            DrawInnerAndOuterSpotAngle(m_PointInnerAngle, m_PointOuterAngle, Styles.InnerOuterSpotAngle);
-            EditorGUILayout.Slider(m_FalloffIntensity, 0, 1, Styles.generalFalloffIntensity);
+            bool foldoutState = CoreEditorUtils.DrawHeaderFoldout("Spot", m_ProviderFoldout.value);
+            if (foldoutState != m_ProviderFoldout.value)
+                m_ProviderFoldout.value = foldoutState;
 
-            if (m_DeprecatedPointLightSprite.objectReferenceValue != null)
-                EditorGUILayout.PropertyField(m_DeprecatedPointLightSprite, Styles.pointLightSprite);
+            if (m_ProviderFoldout.value)
+            {
+                DrawRadiusProperties(Styles.pointLightRadius, m_PointInnerRadius, Styles.pointLightInner, m_PointOuterRadius, Styles.pointLightOuter);
+                DrawInnerAndOuterSpotAngle(m_PointInnerAngle, m_PointOuterAngle, Styles.InnerOuterSpotAngle);
+                EditorGUILayout.Slider(m_FalloffIntensity, 0, 1, Styles.generalFalloffIntensity);
+
+                if (m_DeprecatedPointLightSprite.objectReferenceValue != null)
+                    EditorGUILayout.PropertyField(m_DeprecatedPointLightSprite, Styles.pointLightSprite);
+            }
 
-            m_SortingLayerDropDown.OnTargetSortingLayers(serializedObject, targets, Styles.generalSortingLayerPrefixLabel, AnalyticsTrackChanges);
 
             DrawFoldouts();
         }
 
         void DrawSpriteLight(SerializedObject serializedObject)
         {
-            EditorGUILayout.PropertyField(m_ShapeLightSprite, Styles.shapeLightSprite);
+            bool foldoutState = CoreEditorUtils.DrawHeaderFoldout("Sprite", m_ProviderFoldout.value);
+            if (foldoutState != m_ProviderFoldout.value)
+                m_ProviderFoldout.value = foldoutState;
+
+            if (m_ProviderFoldout.value)
+                EditorGUILayout.PropertyField(m_ShapeLightSprite, Styles.shapeLightSprite);
 
-            m_SortingLayerDropDown.OnTargetSortingLayers(serializedObject, targets, Styles.generalSortingLayerPrefixLabel, AnalyticsTrackChanges);
             DrawFoldouts();
         }
 
         void DrawShapeLight(SerializedObject serializedObject)
         {
-            EditorGUILayout.PropertyField(m_ShapeLightFalloffSize, Styles.generalFalloffSize);
-            if (m_ShapeLightFalloffSize.floatValue < 0)
-                m_ShapeLightFalloffSize.floatValue = 0;
+            bool foldoutState = CoreEditorUtils.DrawHeaderFoldout("Freeform", m_ProviderFoldout.value);
+            if (foldoutState != m_ProviderFoldout.value)
+                m_ProviderFoldout.value = foldoutState;
 
-            EditorGUILayout.Slider(m_FalloffIntensity, 0, 1, Styles.generalFalloffIntensity);
+            if (m_ProviderFoldout.value)
+            {
 
-            m_SortingLayerDropDown.OnTargetSortingLayers(serializedObject, targets, Styles.generalSortingLayerPrefixLabel, AnalyticsTrackChanges);
+                EditorGUILayout.PropertyField(m_ShapeLightFalloffSize, Styles.generalFalloffSize);
+                if (m_ShapeLightFalloffSize.floatValue < 0)
+                    m_ShapeLightFalloffSize.floatValue = 0;
 
-            if (m_LightType.intValue == (int)Light2D.LightType.Freeform)
-            {
+                EditorGUILayout.Slider(m_FalloffIntensity, 0, 1, Styles.generalFalloffIntensity);
+
+                if (m_LightType.intValue == (int)Light2D.LightType.Freeform)
+                {
 #if USING_2DCOMMON
-                DoEditButton<FreeformShapeTool>(PathEditorToolContents.icon, "Edit Shape");
-                DoPathInspector<FreeformShapeTool>();
+                    DoEditButton<FreeformShapeTool>(PathEditorToolContents.icon, "Edit Shape");
+                    DoPathInspector<FreeformShapeTool>();
 #else
-                var clicked = GUILayout.Button(Styles.buttonText);
-                if (clicked)
-                    URP2DConverterUtility.InstallPackage("com.unity.2d.common");
-                else
-                    EditorGUILayout.HelpBox(Styles.helpBox.text, MessageType.Info);
+                    var clicked = GUILayout.Button(Styles.buttonText);
+                    if (clicked)
+                        URP2DConverterUtility.InstallPackage("com.unity.2d.common");
+                    else
+                        EditorGUILayout.HelpBox(Styles.helpBox.text, MessageType.Info);
 #endif
+                }
             }
 
             DrawFoldouts();
@@ -844,6 +893,7 @@ public override void OnInspectorGUI()
 
             serializedObject.Update();
 
+
             UniversalRenderPipelineAsset asset = UniversalRenderPipeline.asset;
             if (asset != null)
             {
@@ -883,6 +933,12 @@ public override void OnInspectorGUI()
                             DrawParametricDeprecated(serializedObject);
                         }
                         break;
+                        case (int)Light2D.LightType.Provider:
+                        {
+                            Light2D light = target as Light2D;
+                            DrawProviderLight(serializedObject);
+                        }
+                        break;
                     }
 
                     AnalyticsTrackChanges(serializedObject);
diff --git a/Packages/com.unity.render-pipelines.universal/Editor/2D/Light2DEditorUtility.cs b/Packages/com.unity.render-pipelines.universal/Editor/2D/Light2DEditorUtility.cs
index 82fde669b49..a5babb6c3f7 100644
--- a/Packages/com.unity.render-pipelines.universal/Editor/2D/Light2DEditorUtility.cs
+++ b/Packages/com.unity.render-pipelines.universal/Editor/2D/Light2DEditorUtility.cs
@@ -1,3 +1,4 @@
+using System.Reflection;
 using UnityEngine;
 using UnityEngine.Rendering;
 using UnityEngine.Rendering.Universal;
@@ -10,6 +11,39 @@ internal static class Light2DEditorUtility
         static Mesh k_MeshQuad_Cache;
         static Mesh k_MeshQuad => k_MeshQuad_Cache == null || k_MeshQuad_Cache.Equals(null) ? (k_MeshQuad_Cache = Resources.GetBuiltinResource<Mesh>("Quad.fbx")) : k_MeshQuad_Cache;
 
+        static internal bool ContainsVisibleInspectorProperites(Provider2D provider)
+        {
+            Debug.Assert(provider != null);
+            var type = provider.GetType();
+            return type.GetFields(BindingFlags.Instance | BindingFlags.Public).Length > 0;
+        }
+
+        static internal void DrawHeaderFoldoutWithToggle(GUIContent title, SavedBool foldoutState, SerializedProperty toggleState, string documentationURL = "")
+        {
+            const float height = 17f;
+            var backgroundRect = GUILayoutUtility.GetRect(0, 0);
+            float xMin = backgroundRect.xMin;
+
+            var labelRect = backgroundRect;
+            labelRect.yMax += height;
+            labelRect.xMin += 16f;
+            labelRect.xMax -= 20f;
+
+            bool newToggleState = GUI.Toggle(labelRect, toggleState.boolValue, " ");  // Needs a space because the checkbox won't have a proper outline if we don't make a space here
+            bool newFoldoutState = CoreEditorUtils.DrawHeaderFoldout("", foldoutState.value);
+
+            if (newToggleState != toggleState.boolValue)
+                toggleState.boolValue = newToggleState;
+
+            if (newFoldoutState != foldoutState.value)
+                foldoutState.value = newFoldoutState;
+
+
+            labelRect.xMin += 20;
+            EditorGUI.LabelField(labelRect, title, EditorStyles.boldLabel);
+        }
+
+
         static internal void GUITextureCap(int controlID, Texture texture, Vector3 position, Quaternion rotation, float size, EventType eventType, bool isAngleHandle)
         {
             switch (eventType)
diff --git a/Packages/com.unity.render-pipelines.universal/Editor/2D/LightBatchingDebugger/LightBatchingDebugger.cs b/Packages/com.unity.render-pipelines.universal/Editor/2D/LightBatchingDebugger/LightBatchingDebugger.cs
index 5d2abf1da88..835c9b2fb17 100644
--- a/Packages/com.unity.render-pipelines.universal/Editor/2D/LightBatchingDebugger/LightBatchingDebugger.cs
+++ b/Packages/com.unity.render-pipelines.universal/Editor/2D/LightBatchingDebugger/LightBatchingDebugger.cs
@@ -43,9 +43,11 @@ public static void ShowExample()
         // Variables used for refresh view
         private bool doRefresh;
         private SceneHandle cachedSceneHandle;
+        private Vector3 cachedCamPos;
         private int totalLightCount;
         private int totalShadowCount;
-        private Vector3 cachedCamPos;
+        private string[] cachedLightNames;
+        private string[] cachedShadowCasterNames;
 
         ILight2DCullResult lightCullResult
         {
@@ -118,6 +120,9 @@ private VisualElement MakePill(UnityEngine.Object obj)
             var bubble = new Button();
             bubble.AddToClassList("Pill");
             bubble.text = obj.name;
+            bubble.style.maxWidth = 200;
+            bubble.style.overflow = Overflow.Hidden;
+            bubble.style.textOverflow = TextOverflow.Ellipsis;
 
             bubble.clicked += () =>
             {
@@ -469,8 +474,20 @@ private bool IsDirty()
 
             if (lightCullResult.IsGameView())
             {
+                var visibleShadows = lightCullResult.visibleShadows.SelectMany(x => x.GetShadowCasters()).ToList();
+
                 isDirty |= totalLightCount != lightCullResult.visibleLights.Count();
-                isDirty |= totalShadowCount != lightCullResult.visibleShadows.Count();
+                isDirty |= totalShadowCount != visibleShadows.Count();
+
+                // Account for name changes
+                if (!isDirty)
+                {
+                    for (int i = 0; i < totalLightCount; ++i)
+                        isDirty |= !lightCullResult.visibleLights.Exists(x => x != null && x.name == cachedLightNames[i]);
+
+                    for (int i = 0; i < totalShadowCount; ++i)
+                        isDirty |= !visibleShadows.Exists(x => x != null && x.name == cachedShadowCasterNames[i]);
+                }
             }
 
             return isDirty;
@@ -485,8 +502,27 @@ private void ResetDirty()
 
             if (lightCullResult != null)
             {
+                var visibleShadows = lightCullResult.visibleShadows.SelectMany(x => x.GetShadowCasters());
+
                 totalLightCount = lightCullResult.visibleLights.Count();
-                totalShadowCount = lightCullResult.visibleShadows.Count();
+                totalShadowCount = visibleShadows.Count();
+
+                cachedLightNames = new string[totalLightCount];
+                cachedShadowCasterNames = new string[totalShadowCount];
+
+                for (int i = 0; i < totalLightCount; ++i)
+                {
+                    var light = lightCullResult.visibleLights[i];
+                    if (light != null)
+                        cachedLightNames[i] = light.name;
+                }
+
+                for (int i = 0; i < totalShadowCount; ++i)
+                {
+                    var shadowCaster = visibleShadows.ElementAt(i);
+                    if (shadowCaster != null)
+                        cachedShadowCasterNames[i] = shadowCaster.name;
+                }
             }
 
             doRefresh = false;
diff --git a/Packages/com.unity.render-pipelines.universal/Runtime/2D/Shadows/ShadowProvider.meta b/Packages/com.unity.render-pipelines.universal/Editor/2D/Provider2D.meta
similarity index 77%
rename from Packages/com.unity.render-pipelines.universal/Runtime/2D/Shadows/ShadowProvider.meta
rename to Packages/com.unity.render-pipelines.universal/Editor/2D/Provider2D.meta
index 822b978c606..27c53ae4c3f 100644
--- a/Packages/com.unity.render-pipelines.universal/Runtime/2D/Shadows/ShadowProvider.meta
+++ b/Packages/com.unity.render-pipelines.universal/Editor/2D/Provider2D.meta
@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: ef3fc151f42f1ee4fba8b7729b3237c7
+guid: 920b587f96837464facf6b8036b2c9e6
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}
diff --git a/Packages/com.unity.render-pipelines.universal/Editor/2D/Provider2D/Light2DSources_PropertyDrawer.cs b/Packages/com.unity.render-pipelines.universal/Editor/2D/Provider2D/Light2DSources_PropertyDrawer.cs
new file mode 100644
index 00000000000..1e403903cfb
--- /dev/null
+++ b/Packages/com.unity.render-pipelines.universal/Editor/2D/Provider2D/Light2DSources_PropertyDrawer.cs
@@ -0,0 +1,14 @@
+using System;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEditor;
+using UnityEngine.Rendering.Universal;
+
+namespace UnityEditor.Rendering.Universal
+{
+    [CustomPropertyDrawer(typeof(Light2DProviderSources))]
+    internal class Light2DProviderSources_PropertyDrawer : Provider2DSources_PropertyDrawer<Light2DProvider, Light2DProviderSource>
+    {
+        public override int GetProviderType() { return (int)Light2D.LightType.Provider; }
+    }
+}
diff --git a/Packages/com.unity.render-pipelines.universal/Editor/2D/Provider2D/Light2DSources_PropertyDrawer.cs.meta b/Packages/com.unity.render-pipelines.universal/Editor/2D/Provider2D/Light2DSources_PropertyDrawer.cs.meta
new file mode 100644
index 00000000000..09d3e271cf0
--- /dev/null
+++ b/Packages/com.unity.render-pipelines.universal/Editor/2D/Provider2D/Light2DSources_PropertyDrawer.cs.meta
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: 66b4b23f47b6c384494dd701081a4f81
\ No newline at end of file
diff --git a/Packages/com.unity.render-pipelines.universal/Editor/2D/Provider2D/Provider2DSources_PropertyDrawer.cs b/Packages/com.unity.render-pipelines.universal/Editor/2D/Provider2D/Provider2DSources_PropertyDrawer.cs
new file mode 100644
index 00000000000..8826c4c539d
--- /dev/null
+++ b/Packages/com.unity.render-pipelines.universal/Editor/2D/Provider2D/Provider2DSources_PropertyDrawer.cs
@@ -0,0 +1,56 @@
+using System;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEditor;
+using UnityEngine.Rendering.Universal;
+
+namespace UnityEditor.Rendering.Universal
+{
+    internal abstract class Provider2DSources_PropertyDrawer<T, U> : PropertyDrawer where T : Provider2D where U : Provider2DSource
+    {
+        public abstract int GetProviderType();
+
+        public int DrawDropdown(Rect popupRect, GUIContent label, int selectedIndex, GUIContent[] menuOptions)
+        {
+            if (menuOptions == null || menuOptions.Length == 0)
+                menuOptions = new GUIContent[1] { new GUIContent("null") };
+
+            return EditorGUI.Popup(popupRect, label, selectedIndex, menuOptions);   // Will not deal well with duplicates.
+        }
+
+        public override void OnGUI(Rect position, SerializedProperty property, GUIContent label)
+        {
+            EditorGUI.BeginProperty(position, label, property);
+            position.height = EditorGUIUtility.singleLineHeight;
+
+            property.serializedObject.Update();
+            
+
+            Component component = property.serializedObject.targetObject as Component;
+            IProvider2DSources providerSources = property.boxedValue as IProvider2DSources;
+            if (providerSources != null)
+            {
+                bool forceUpdate = false;
+                int prevSourceIndex = Provider2DSources<T, U>.RefreshSources(providerSources, component.gameObject, GetProviderType());
+
+                // If we didn't have a previously selected source
+                if(prevSourceIndex < 0)
+                {
+                    forceUpdate = true;
+                    prevSourceIndex = 0;  // This needs to be 0 so its it correctly shown in the dropdown.
+                }
+
+                int newSourceIndex = DrawDropdown(position, label, prevSourceIndex, providerSources.GetSourceNames());
+
+                if ((prevSourceIndex != newSourceIndex) || forceUpdate)
+                {
+                    Provider2DSources<T, U>.UpdateSelectionFromIndex(providerSources, newSourceIndex);
+                    property.boxedValue = providerSources;
+                    property.serializedObject.ApplyModifiedProperties();
+                }
+            }
+
+            EditorGUI.EndProperty();
+        }
+    }
+}
diff --git a/Packages/com.unity.render-pipelines.universal/Editor/2D/Provider2D/Provider2DSources_PropertyDrawer.cs.meta b/Packages/com.unity.render-pipelines.universal/Editor/2D/Provider2D/Provider2DSources_PropertyDrawer.cs.meta
new file mode 100644
index 00000000000..d329e671377
--- /dev/null
+++ b/Packages/com.unity.render-pipelines.universal/Editor/2D/Provider2D/Provider2DSources_PropertyDrawer.cs.meta
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: bde473d70341e914d94eb75dadeae951
\ No newline at end of file
diff --git a/Packages/com.unity.render-pipelines.universal/Editor/2D/Provider2D/Provider2D_ProperyDrawer.cs b/Packages/com.unity.render-pipelines.universal/Editor/2D/Provider2D/Provider2D_ProperyDrawer.cs
new file mode 100644
index 00000000000..1674625e79f
--- /dev/null
+++ b/Packages/com.unity.render-pipelines.universal/Editor/2D/Provider2D/Provider2D_ProperyDrawer.cs
@@ -0,0 +1,93 @@
+using System;
+using System.Reflection;
+using UnityEngine;
+using UnityEditor;
+using UnityEngine.Rendering.Universal;
+
+namespace UnityEditor.Rendering.Universal
+{
+
+    /// <summary>
+    /// Class <c>Provider2D_ProperyDrawer</c> is the default property drawer for all shadow providers and will render the providers serialized properties
+    /// </summary>
+    /// 
+    [CustomPropertyDrawer(typeof(Provider2D), true)]
+    public class Provider2D_ProperyDrawer : PropertyDrawer
+    {
+        delegate void ProcessChild(SerializedProperty child);
+
+        bool IsChildVisible(Type parentType, SerializedProperty child)
+        {
+            // Check to see if the child is public and not hidden in the inspector
+            FieldInfo fieldInfoPublic = parentType.GetField(child.name, BindingFlags.Public | BindingFlags.Instance);
+            bool publicAndVisible = fieldInfoPublic != null && ((fieldInfoPublic.GetCustomAttribute<HideInInspector>() == null) || (fieldInfoPublic.GetCustomAttribute<NonSerializedAttribute>() == null));
+
+            bool privateButVisible = false;
+            if (fieldInfoPublic == null)
+            {
+                // Check to see if the child is a private m
+                FieldInfo fieldInfoNonPublic = parentType.GetField(child.name, BindingFlags.NonPublic | BindingFlags.Instance);
+                privateButVisible = fieldInfoNonPublic != null && (fieldInfoNonPublic.GetCustomAttribute<SerializeField>() != null);
+            }
+
+            return publicAndVisible || privateButVisible;
+        }
+
+        void ProcessProviderChildren(SerializedProperty parentProperty, ProcessChild onProcessChild)
+        {
+            if (parentProperty == null)
+                return;
+
+            // 1. Get the type and the starting depth
+            Type parentType = parentProperty.boxedValue?.GetType();
+            SerializedProperty iterator = parentProperty.Copy();
+            int rootDepth = iterator.depth;
+
+            // 2. The loop condition: 
+            // - NextVisible(true) moves to the next property (descending into children)
+            // - iterator.depth > rootDepth ensures we haven't climbed back out to a sibling
+            while (iterator.NextVisible(true) && iterator.depth > rootDepth)
+            {
+                if (IsChildVisible(parentType, iterator))
+                {
+                    onProcessChild(iterator);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets the name to be listed in the <c>ShadowCaster2D</c> Casting Option drop down.
+        /// </summary>
+        /// <param name="rect"> Rectangle on the screen to use for the property GUI. </param>
+        /// <param name="property"> The SerializedProperty to make the custom GUI for. </param>
+        /// <param name="label"> The label of this property. </param>
+        public override void OnGUI(Rect rect, SerializedProperty property, GUIContent label)
+        {
+            ProcessProviderChildren(property, (SerializedProperty child) =>
+            {
+                rect.height = EditorGUIUtility.singleLineHeight;
+                EditorGUI.PropertyField(rect, child, true);
+                float height = EditorGUI.GetPropertyHeight(child, includeChildren: true);
+                rect.y += EditorGUIUtility.standardVerticalSpacing + height;
+            });
+        }
+
+        /// <summary>
+        /// Gets the name to be listed in the <c>ShadowCaster2D</c> Casting Option drop down.
+        /// </summary>
+        /// <param name="property"> The SerializedProperty to make the custom GUI for. </param>
+        /// <param name="label"> The label of this property. </param>
+        /// <returns> The float height in pixels. </returns>
+        public override float GetPropertyHeight(SerializedProperty property, GUIContent label)
+        {
+            float height = 0;
+            ProcessProviderChildren(property, (SerializedProperty child) =>
+            {
+                float propHeight = EditorGUI.GetPropertyHeight(child, includeChildren: true);
+                height += EditorGUIUtility.standardVerticalSpacing + propHeight;
+            });
+
+            return height;
+        }
+    }
+}
diff --git a/Packages/com.unity.render-pipelines.universal/Editor/2D/Shadows/ShadowProvider/ShadowShape2DProvider_ProperyDrawer.cs.meta b/Packages/com.unity.render-pipelines.universal/Editor/2D/Provider2D/Provider2D_ProperyDrawer.cs.meta
similarity index 100%
rename from Packages/com.unity.render-pipelines.universal/Editor/2D/Shadows/ShadowProvider/ShadowShape2DProvider_ProperyDrawer.cs.meta
rename to Packages/com.unity.render-pipelines.universal/Editor/2D/Provider2D/Provider2D_ProperyDrawer.cs.meta
diff --git a/Packages/com.unity.render-pipelines.universal/Editor/2D/Provider2D/Shadow2DSources_PropertyDrawer.cs b/Packages/com.unity.render-pipelines.universal/Editor/2D/Provider2D/Shadow2DSources_PropertyDrawer.cs
new file mode 100644
index 00000000000..1d090a25ae9
--- /dev/null
+++ b/Packages/com.unity.render-pipelines.universal/Editor/2D/Provider2D/Shadow2DSources_PropertyDrawer.cs
@@ -0,0 +1,14 @@
+using System;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEditor;
+using UnityEngine.Rendering.Universal;
+
+namespace UnityEditor.Rendering.Universal
+{
+    [CustomPropertyDrawer(typeof(Shadow2DProviderSources))]
+    internal class Shadow2DProviderSources_PropertyDrawer : Provider2DSources_PropertyDrawer<ShadowCaster2DProvider, Shadow2DProviderSource>
+    {
+        public override int GetProviderType() { return (int)ShadowCaster2D.ShadowCastingSources.ShapeProvider; }
+    }
+}
diff --git a/Packages/com.unity.render-pipelines.universal/Editor/2D/Provider2D/Shadow2DSources_PropertyDrawer.cs.meta b/Packages/com.unity.render-pipelines.universal/Editor/2D/Provider2D/Shadow2DSources_PropertyDrawer.cs.meta
new file mode 100644
index 00000000000..d2969bd524c
--- /dev/null
+++ b/Packages/com.unity.render-pipelines.universal/Editor/2D/Provider2D/Shadow2DSources_PropertyDrawer.cs.meta
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: a34b888dc08a0694b8008696310812fd
\ No newline at end of file
diff --git a/Packages/com.unity.render-pipelines.universal/Editor/2D/Shadows/ShadowProvider/ShadowShape2DProvider_SpriteSkin_PropertyDrawer.cs b/Packages/com.unity.render-pipelines.universal/Editor/2D/Provider2D/ShadowShape2DProvider_SpriteSkin_PropertyDrawer.cs
similarity index 78%
rename from Packages/com.unity.render-pipelines.universal/Editor/2D/Shadows/ShadowProvider/ShadowShape2DProvider_SpriteSkin_PropertyDrawer.cs
rename to Packages/com.unity.render-pipelines.universal/Editor/2D/Provider2D/ShadowShape2DProvider_SpriteSkin_PropertyDrawer.cs
index 69e45a3a040..aaa5e5cdc44 100644
--- a/Packages/com.unity.render-pipelines.universal/Editor/2D/Shadows/ShadowProvider/ShadowShape2DProvider_SpriteSkin_PropertyDrawer.cs
+++ b/Packages/com.unity.render-pipelines.universal/Editor/2D/Provider2D/ShadowShape2DProvider_SpriteSkin_PropertyDrawer.cs
@@ -7,14 +7,14 @@
 
 namespace UnityEditor.Rendering.Universal
 {
-    [CustomPropertyDrawer(typeof(ShadowShape2DProvider_SpriteSkin))]
-    internal class ShadowShape2DProvider_SpriteSkin_PropertyDrawer : ShadowShape2DProvider_ProperyDrawer
+    [CustomPropertyDrawer(typeof(ShadowCaster2DProvider_SpriteSkin))]
+    internal class ShadowShape2DProvider_SpriteSkin_PropertyDrawer : Provider2D_ProperyDrawer
     {
         public static string k_GPUSkinningError = "Shadow Caster 2D is not compatible with GPU skinning.";
 
         public override void OnGUI(Rect position, SerializedProperty property, GUIContent label)
         {
-            ShadowShape2DProvider_SpriteSkin provider = property.managedReferenceValue as ShadowShape2DProvider_SpriteSkin;
+            ShadowCaster2DProvider_SpriteSkin provider = property.managedReferenceValue as ShadowCaster2DProvider_SpriteSkin;
             base.OnGUI(position, property, label);
 
             if (PlayerSettings.gpuSkinning)
diff --git a/Packages/com.unity.render-pipelines.universal/Editor/2D/Shadows/ShadowProvider/ShadowShape2DProvider_SpriteSkin_PropertyDrawer.cs.meta b/Packages/com.unity.render-pipelines.universal/Editor/2D/Provider2D/ShadowShape2DProvider_SpriteSkin_PropertyDrawer.cs.meta
similarity index 100%
rename from Packages/com.unity.render-pipelines.universal/Editor/2D/Shadows/ShadowProvider/ShadowShape2DProvider_SpriteSkin_PropertyDrawer.cs.meta
rename to Packages/com.unity.render-pipelines.universal/Editor/2D/Provider2D/ShadowShape2DProvider_SpriteSkin_PropertyDrawer.cs.meta
diff --git a/Packages/com.unity.render-pipelines.universal/Editor/2D/ShaderGraph/Includes/SpriteNormalPass.hlsl b/Packages/com.unity.render-pipelines.universal/Editor/2D/ShaderGraph/Includes/SpriteNormalPass.hlsl
index dc7e96bf0c3..4be61625120 100644
--- a/Packages/com.unity.render-pipelines.universal/Editor/2D/ShaderGraph/Includes/SpriteNormalPass.hlsl
+++ b/Packages/com.unity.render-pipelines.universal/Editor/2D/ShaderGraph/Includes/SpriteNormalPass.hlsl
@@ -19,6 +19,8 @@ half4 frag(PackedVaryings packedInput) : SV_TARGET
     UNITY_SETUP_INSTANCE_ID(unpacked);
     UNITY_SETUP_STEREO_EYE_INDEX_POST_VERTEX(unpacked);
 
+    SetUpSpriteInstanceProperties();
+    
     SurfaceDescription surfaceDescription = BuildSurfaceDescription(unpacked);
 
 #ifdef UNIVERSAL_USELEGACYSPRITEBLOCKS
diff --git a/Packages/com.unity.render-pipelines.universal/Editor/2D/Shadows/CastingSourceDropDown.cs b/Packages/com.unity.render-pipelines.universal/Editor/2D/Shadows/CastingSourceDropDown.cs
deleted file mode 100644
index fcf644ccfdc..00000000000
--- a/Packages/com.unity.render-pipelines.universal/Editor/2D/Shadows/CastingSourceDropDown.cs
+++ /dev/null
@@ -1,155 +0,0 @@
-using System;
-using UnityEngine;
-using UnityEngine.Rendering.Universal;
-using System.Collections.Generic;
-
-namespace UnityEditor.Rendering.Universal
-{
-    internal class CastingSourceDropDown
-    {
-        public struct ShadowShapeProviderData
-        {
-            public Component component;
-            public ShadowShape2DProvider provider;
-
-            public ShadowShapeProviderData(Component inComponent, ShadowShape2DProvider inProvider)
-            {
-                component = inComponent;
-                provider = inProvider;
-            }
-        }
-
-        class SelectionData
-        {
-            public SerializedObject         shadowCaster;
-            public ShadowShape2DProvider    newShadowShapeProvider;
-            public Component                newShadowShapeComponent;
-            public int                      newCastingSource;
-
-            public SelectionData(int inNewCastingSource, ShadowShape2DProvider inNewShapeProvider, Component inNewShadowShapeComponent, SerializedObject inShadowCaster)
-            {
-                shadowCaster = inShadowCaster;
-                newShadowShapeProvider = inNewShapeProvider;
-                newShadowShapeComponent = inNewShadowShapeComponent;
-                newCastingSource = inNewCastingSource;
-            }
-        }
-
-        struct ProviderComparer : IComparer<ShadowShapeProviderData>
-        {
-            public int Compare(ShadowShapeProviderData a, ShadowShapeProviderData b)
-            {
-                return b.provider.Priority() - a.provider.Priority();
-            }
-        }
-
-        static public List<ShadowShapeProviderData> GetShadowShapeProviders(GameObject go)
-        {
-            // Create some providers to check against.
-            var providerTypes = TypeCache.GetTypesDerivedFrom<ShadowShape2DProvider>();
-            var providers = new List<ShadowShape2DProvider>(providerTypes.Count);
-            foreach (Type providerType in providerTypes)
-            {
-                if (providerType.IsAbstract)
-                    continue;
-
-                providers.Add(Activator.CreateInstance(providerType) as ShadowShape2DProvider);
-            }
-
-            // Fetch the components to check.
-            var components = go.GetComponents<Component>();
-
-            var results = new List<ShadowShapeProviderData>();
-            foreach (var component in components)
-            {
-                // check each component to see if it is a valid provider
-                foreach (var provider in providers)
-                {
-                    if (provider.IsShapeSource(component))
-                    {
-                        results.Add(new ShadowShapeProviderData(component, Activator.CreateInstance(provider.GetType()) as ShadowShape2DProvider));
-                    }
-                }
-            }
-
-            return results;
-        }
-
-        void OnMenuOptionSelected(object layerSelectionDataObject)
-        {
-            SelectionData selectionData = (SelectionData)layerSelectionDataObject;
-
-            SerializedProperty shapeProvider = selectionData.shadowCaster.FindProperty("m_ShadowShape2DProvider");
-            SerializedProperty shapeComponent = selectionData.shadowCaster.FindProperty("m_ShadowShape2DComponent");
-            SerializedProperty castingSource = selectionData.shadowCaster.FindProperty("m_ShadowCastingSource");
-
-            selectionData.shadowCaster.Update();
-            castingSource.intValue  = selectionData.newCastingSource;
-            shapeProvider.managedReferenceValue = selectionData.newShadowShapeProvider;
-            shapeComponent.objectReferenceValue = selectionData.newShadowShapeComponent;
-            selectionData.shadowCaster.ApplyModifiedProperties();
-        }
-
-        string GetCompactTypeName(Component component)
-        {
-            string type = component.GetType().ToString();
-            int lastIndex = type.LastIndexOf('.');
-            string compactTypeName = lastIndex < 0 ? type : type.Substring(lastIndex + 1);
-
-            return ObjectNames.NicifyVariableName(compactTypeName);
-        }
-
-        public void OnCastingSource(SerializedObject serializedObject, UnityEngine.Object[] targets, GUIContent labelContent)
-        {
-            Rect totalPosition = EditorGUILayout.GetControlRect();
-            Rect position = EditorGUI.PrefixLabel(totalPosition, labelContent);
-            if (targets.Length <= 1)
-            {
-                ShadowCaster2D shadowCaster = targets[0] as ShadowCaster2D;
-
-                // Check for the current value
-                GUIContent selected = new GUIContent("None");
-                if (shadowCaster.shadowCastingSource == ShadowCaster2D.ShadowCastingSources.ShapeEditor)
-                    selected = new GUIContent("ShapeEditor");
-                else if (shadowCaster.shadowCastingSource == ShadowCaster2D.ShadowCastingSources.ShapeProvider && shadowCaster.shadowShape2DProvider != null)
-                {
-                    if (shadowCaster.shadowShape2DComponent != null)
-                        selected = new GUIContent(shadowCaster.shadowShape2DProvider.ProviderName(GetCompactTypeName(shadowCaster.shadowShape2DComponent)));
-                    else
-                        selected = new GUIContent("None");
-                }
-
-                // Draw the drop down menu
-                if (EditorGUI.DropdownButton(position, selected, FocusType.Keyboard, EditorStyles.popup))
-                {
-                    GenericMenu menu = new GenericMenu();
-                    menu.allowDuplicateNames = true;
-
-                    ProviderComparer providerComparer = new ProviderComparer();
-                    List<ShadowShapeProviderData> castingSources = GetShadowShapeProviders(shadowCaster.gameObject);
-                    castingSources.Sort(providerComparer);
-
-                    for (int i = 0; i < castingSources.Count; i++)
-                    {
-                        string menuName = castingSources[i].provider.ProviderName(GetCompactTypeName(castingSources[i].component));
-                        menu.AddItem(new GUIContent(menuName), false, OnMenuOptionSelected, new SelectionData((int)ShadowCaster2D.ShadowCastingSources.ShapeProvider, castingSources[i].provider, castingSources[i].component, serializedObject));
-                    }
-
-
-                    menu.AddItem(new GUIContent("Shape Editor"), false, OnMenuOptionSelected, new SelectionData((int)ShadowCaster2D.ShadowCastingSources.ShapeEditor, null, null, serializedObject));
-                    menu.AddItem(new GUIContent("None"), false, OnMenuOptionSelected, new SelectionData((int)ShadowCaster2D.ShadowCastingSources.None, null, null, serializedObject));
-
-
-                    menu.DropDown(position);
-                }
-            }
-            else
-            {
-                EditorGUI.showMixedValue = true;
-                EditorGUI.BeginDisabledGroup(true);
-                EditorGUI.DropdownButton(position, new GUIContent(""), FocusType.Keyboard, EditorStyles.popup);
-                EditorGUI.EndDisabledGroup();
-            }
-        }
-    }
-}
diff --git a/Packages/com.unity.render-pipelines.universal/Editor/2D/Shadows/CastingSourceDropDown.cs.meta b/Packages/com.unity.render-pipelines.universal/Editor/2D/Shadows/CastingSourceDropDown.cs.meta
deleted file mode 100644
index 6ac75f6893d..00000000000
--- a/Packages/com.unity.render-pipelines.universal/Editor/2D/Shadows/CastingSourceDropDown.cs.meta
+++ /dev/null
@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: 10bdda0121d2ddc4c83369d5c5585e4c
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/Packages/com.unity.render-pipelines.universal/Editor/2D/Shadows/ShadowCaster2DEditor.cs b/Packages/com.unity.render-pipelines.universal/Editor/2D/Shadows/ShadowCaster2DEditor.cs
index 62d1e9ea0af..0991089a0e6 100644
--- a/Packages/com.unity.render-pipelines.universal/Editor/2D/Shadows/ShadowCaster2DEditor.cs
+++ b/Packages/com.unity.render-pipelines.universal/Editor/2D/Shadows/ShadowCaster2DEditor.cs
@@ -1,6 +1,11 @@
+using NUnit.Framework;
 using UnityEditor.EditorTools;
 using UnityEngine;
 using UnityEngine.Rendering.Universal;
+using System.Collections.Generic;
+using static UnityEngine.Rendering.DebugUI;
+
+
 
 #if USING_2DCOMMON
 using UnityEditor.U2D.Common.Path;
@@ -8,9 +13,7 @@
 
 namespace UnityEditor.Rendering.Universal
 {
-
 #if USING_2DCOMMON
-
     internal class ShadowCasterPath : ScriptablePath
     {
         internal Bounds GetBounds()
@@ -57,7 +60,7 @@ internal class ShadowCaster2DEditor
 
 #if USING_2DCOMMON
         [EditorTool("Edit Shadow Caster Shape", typeof(ShadowCaster2D))]
-        class ShadowCaster2DShadowCasterShapeTool : ShadowCaster2DShapeTool {};
+        class ShadowCaster2DShadowCasterShapeTool : ShadowCaster2DShapeTool { };
 
 #endif
 
@@ -73,6 +76,9 @@ private static class Styles
             public static readonly GUIContent castingSource = EditorGUIUtility.TrTextContent("Casting Source", "Specifies the source of the shape used for projected shadows");
             public static readonly GUIContent buttonText = EditorGUIUtility.TrTextContent("Install 2D Common Package");
             public static readonly GUIContent helpBox = EditorGUIUtility.TrTextContent("2D Common Package is required to edit ShadowCaster 2D Shape. Please install it by clicking button above");
+            public static readonly GUIContent none = EditorGUIUtility.TrTextContent("None");
+            public static readonly GUIContent providerFoldoutLabel = EditorGUIUtility.TrTextContent("Provider");
+            public static readonly GUIContent shapeEditor = EditorGUIUtility.TrTextContent("Shape Editor");
         }
 
         SerializedProperty m_CastingOption;
@@ -83,7 +89,11 @@ private static class Styles
         SerializedProperty m_AlphaCutoff;
         SerializedProperty m_ShadowShape2DProvider;
         SortingLayerDropDown m_SortingLayerDropDown;
-        CastingSourceDropDown m_CastingSourceDropDown;
+        SerializedProperty m_SelectedMenuItemID;
+        SerializedProperty m_SelectionSources;
+
+        SavedBool m_ProviderSettingsFoldout;
+
 
         public void OnEnable()
         {
@@ -94,11 +104,12 @@ public void OnEnable()
             m_AlphaCutoff = serializedObject.FindProperty("m_AlphaCutoff");
             m_TrimEdge = m_ShadowMesh.FindPropertyRelative("m_TrimEdge");
             m_ShadowShape2DProvider = serializedObject.FindProperty("m_ShadowShape2DProvider");
-
+            m_SelectedMenuItemID = serializedObject.FindProperty("m_SelectedMenuItemID");
+            m_SelectionSources = serializedObject.FindProperty("m_SelectionSources");
             m_SortingLayerDropDown = new SortingLayerDropDown();
             m_SortingLayerDropDown.OnEnable(serializedObject, "m_ApplyToSortingLayers");
 
-            m_CastingSourceDropDown = new CastingSourceDropDown();
+            m_ProviderSettingsFoldout = new SavedBool($"{target.GetType()}.2DURPProviderSettingsFoldout", true);
         }
 
         public void ShadowCaster2DSceneGUI()
@@ -123,14 +134,61 @@ public void OnSceneGUI()
                 ShadowCaster2DSceneGUI();
         }
 
+        public void SetCastingSourceSelection(Provider2D provider, Component component) 
+        {
+            serializedObject.Update();
+            SerializedProperty providerProp = serializedObject.FindProperty("m_ShadowShape2DProvider");
+            SerializedProperty componentProp = serializedObject.FindProperty("m_ShadowShape2DComponent");
+
+            if (providerProp != null)
+                providerProp.managedReferenceValue = provider;
+
+            if (componentProp != null)
+                componentProp.objectReferenceValue = component;
+
+            serializedObject.ApplyModifiedProperties();
+        }
+
+#if USING_2DCOMMON
+        public void RestorePreviousTool()
+        {
+            if (EditorToolManager.IsActiveTool<ShadowCaster2DShadowCasterShapeTool>())
+                ToolManager.RestorePreviousTool();
+        }
+
+        public void DrawShapeTool()
+        {
+            ShadowCaster2DInspectorGUI<ShadowCaster2DShadowCasterShapeTool>();
+        }
+#else
+        public void DrawShapeTool()
+        {
+            var clicked = GUILayout.Button(Styles.buttonText);
+            if (clicked)
+                URP2DConverterUtility.InstallPackage("com.unity.2d.common");
+            else
+                EditorGUILayout.HelpBox(Styles.helpBox.text, MessageType.Info);
+        }
+
+        public void RestorePreviousTool()
+        {
+        }
+#endif
+
         public override void OnInspectorGUI()
         {
             serializedObject.Update();
 
-            m_CastingSourceDropDown.OnCastingSource(serializedObject, targets, Styles.castingSourcePrefixLabel);
+            List<SelectionSource> additionalSources = new List<SelectionSource>
+            {
+                new Shadow2DSource_ShapeEditor(Styles.shapeEditor, int.MinValue),
+            };
 
-            EditorGUILayout.PropertyField(m_CastingOption, Styles.castingOption);
+            Shadow2DProviderSources.SetAdditionalSources(m_SelectionSources, additionalSources);
+            EditorGUILayout.PropertyField(m_SelectionSources, Styles.castingSourcePrefixLabel);
+            Shadow2DProviderSources.SetSourceType(m_SelectionSources);
 
+            EditorGUILayout.PropertyField(m_CastingOption, Styles.castingOption);
             m_SortingLayerDropDown.OnTargetSortingLayers(serializedObject, targets, Styles.sortingLayerPrefixLabel, null);
 
             bool usingShapeProvider = m_CastingSource.intValue == (int)ShadowCaster2D.ShadowCastingSources.ShapeProvider;
@@ -143,6 +201,8 @@ public override void OnInspectorGUI()
                 EditorGUILayout.PropertyField(m_AlphaCutoff, Styles.alphaCutoff);
             }
 
+            serializedObject.ApplyModifiedProperties();
+
 #if USING_2DCOMMON
             if ((ShadowCaster2D.ShadowCastingSources)m_CastingSource.intValue == ShadowCaster2D.ShadowCastingSources.ShapeEditor)
                 ShadowCaster2DInspectorGUI<ShadowCaster2DShadowCasterShapeTool>();
@@ -156,9 +216,21 @@ public override void OnInspectorGUI()
                 EditorGUILayout.HelpBox(Styles.helpBox.text, MessageType.Info);
 #endif
 
-            if (m_ShadowShape2DProvider != null)
-                EditorGUILayout.PropertyField(m_ShadowShape2DProvider, Styles.shadowShape2DProvider, true);
-
+            ShadowCaster2D shadowCaster2D = target as ShadowCaster2D;
+            ShadowCaster2DProvider provider = m_ShadowShape2DProvider.boxedValue as ShadowCaster2DProvider;
+            if (provider != null && shadowCaster2D.shadowCastingSource == ShadowCaster2D.ShadowCastingSources.ShapeProvider)
+            {
+                // Draw the fold out for non
+                if (Light2DEditorUtility.ContainsVisibleInspectorProperites(provider))
+                {
+                    bool value = CoreEditorUtils.DrawHeaderFoldout(Styles.providerFoldoutLabel, m_ProviderSettingsFoldout.value);
+                    if (value)
+                        Shadow2DProviderSources.DrawSelectedSourceUI(m_SelectionSources);
+
+                    if (value != m_ProviderSettingsFoldout.value)
+                        m_ProviderSettingsFoldout.value = value;
+                }
+            }
 
             serializedObject.ApplyModifiedProperties();
         }
diff --git a/Packages/com.unity.render-pipelines.universal/Editor/2D/Shadows/ShadowProvider/ShadowShape2DProvider_ProperyDrawer.cs b/Packages/com.unity.render-pipelines.universal/Editor/2D/Shadows/ShadowProvider/ShadowShape2DProvider_ProperyDrawer.cs
deleted file mode 100644
index e6b3fa4d411..00000000000
--- a/Packages/com.unity.render-pipelines.universal/Editor/2D/Shadows/ShadowProvider/ShadowShape2DProvider_ProperyDrawer.cs
+++ /dev/null
@@ -1,82 +0,0 @@
-using System;
-using System.Reflection;
-using UnityEngine;
-using UnityEditor;
-using UnityEngine.Rendering.Universal;
-
-namespace UnityEditor.Rendering.Universal
-{
-
-    /// <summary>
-    /// Class <c>ShadowShape2DProvider_ProperyDrawer</c> is the default property drawer for all shadow providers and will render the providers serialized properties
-    /// </summary>
-    [CustomPropertyDrawer(typeof(ShadowShape2DProvider), true)]
-    public class ShadowShape2DProvider_ProperyDrawer : PropertyDrawer
-    {
-        delegate void ProcessChild(SerializedProperty child);
-
-        bool IsChildVisible(Type parentType, SerializedProperty child)
-        {
-            // Check to see if the child is public and not hidden in the inspector
-            FieldInfo fieldInfo = parentType.GetField(child.name, BindingFlags.Public | BindingFlags.Instance);
-            HideInInspector hideInInspector = parentType.GetCustomAttribute<HideInInspector>();
-            return fieldInfo != null && hideInInspector == null;
-        }
-
-        void ProcessChildren(SerializedProperty parentProperty, ProcessChild onProcessChild)
-        {
-            if (parentProperty == null)
-                return;
-
-            var enumerator = parentProperty.GetEnumerator();
-            if (enumerator.Current == null)
-                return;
-
-            object parentObj = parentProperty.managedReferenceValue;
-            Type parentType = parentObj.GetType();
-
-            while (enumerator.MoveNext())
-            {
-                SerializedProperty child =  enumerator.Current as SerializedProperty;
-                if (child != null && IsChildVisible(parentType, child))
-                {
-                    onProcessChild(child);
-                }
-            }
-        }
-
-
-        /// <summary>
-        /// Gets the name to be listed in the <c>ShadowCaster2D</c> Casting Option drop down.
-        /// </summary>
-        /// <param name="rect"> Rectangle on the screen to use for the property GUI. </param>
-        /// <param name="property"> The SerializedProperty to make the custom GUI for. </param>
-        /// <param name="label"> The label of this property. </param>
-        public override void OnGUI(Rect rect, SerializedProperty property, GUIContent label)
-        {
-            ProcessChildren(property, (SerializedProperty child) =>
-            {
-                rect.height = EditorGUIUtility.singleLineHeight;
-                EditorGUI.PropertyField(rect, child);
-                rect.y += EditorGUIUtility.standardVerticalSpacing + EditorGUIUtility.singleLineHeight;
-            });
-        }
-
-        /// <summary>
-        /// Gets the name to be listed in the <c>ShadowCaster2D</c> Casting Option drop down.
-        /// </summary>
-        /// <param name="property"> The SerializedProperty to make the custom GUI for. </param>
-        /// <param name="label"> The label of this property. </param>
-        /// <returns> The float height in pixels. </returns>
-        public override float GetPropertyHeight(SerializedProperty property, GUIContent label)
-        {
-            float height = 0;
-            ProcessChildren(property, (SerializedProperty child) =>
-            {
-                height += EditorGUIUtility.standardVerticalSpacing + EditorGUIUtility.singleLineHeight;
-            });
-
-            return height;
-        }
-    }
-}
diff --git a/Packages/com.unity.render-pipelines.universal/Editor/BuildProcessors/GraphicsSettingsStrippers/SurfaceCacheGlobalIlluminationStripper.cs b/Packages/com.unity.render-pipelines.universal/Editor/BuildProcessors/GraphicsSettingsStrippers/SurfaceCacheGIStripper.cs
similarity index 96%
rename from Packages/com.unity.render-pipelines.universal/Editor/BuildProcessors/GraphicsSettingsStrippers/SurfaceCacheGlobalIlluminationStripper.cs
rename to Packages/com.unity.render-pipelines.universal/Editor/BuildProcessors/GraphicsSettingsStrippers/SurfaceCacheGIStripper.cs
index b5c46fad60e..52dc4618735 100644
--- a/Packages/com.unity.render-pipelines.universal/Editor/BuildProcessors/GraphicsSettingsStrippers/SurfaceCacheGlobalIlluminationStripper.cs
+++ b/Packages/com.unity.render-pipelines.universal/Editor/BuildProcessors/GraphicsSettingsStrippers/SurfaceCacheGIStripper.cs
@@ -21,7 +21,7 @@ static bool IsSurfaceCacheEnabled(List<UniversalRenderPipelineAsset> urpAssets)
 
                     foreach (var rendererFeature in rendererData.rendererFeatures)
                     {
-                        if (rendererFeature is SurfaceCacheGlobalIlluminationRendererFeature { isActive: true })
+                        if (rendererFeature is SurfaceCacheGIRendererFeature { isActive: true })
                             return true;
                     }
                 }
diff --git a/Packages/com.unity.render-pipelines.universal/Editor/BuildProcessors/GraphicsSettingsStrippers/SurfaceCacheGlobalIlluminationStripper.cs.meta b/Packages/com.unity.render-pipelines.universal/Editor/BuildProcessors/GraphicsSettingsStrippers/SurfaceCacheGIStripper.cs.meta
similarity index 100%
rename from Packages/com.unity.render-pipelines.universal/Editor/BuildProcessors/GraphicsSettingsStrippers/SurfaceCacheGlobalIlluminationStripper.cs.meta
rename to Packages/com.unity.render-pipelines.universal/Editor/BuildProcessors/GraphicsSettingsStrippers/SurfaceCacheGIStripper.cs.meta
diff --git a/Packages/com.unity.render-pipelines.universal/Editor/Camera/UniversalAdditionalSceneViewSettings.cs b/Packages/com.unity.render-pipelines.universal/Editor/Camera/UniversalAdditionalSceneViewSettings.cs
new file mode 100644
index 00000000000..eed59348365
--- /dev/null
+++ b/Packages/com.unity.render-pipelines.universal/Editor/Camera/UniversalAdditionalSceneViewSettings.cs
@@ -0,0 +1,22 @@
+using UnityEditor.Experimental;
+using UnityEngine.Rendering;
+using UnityEngine.Rendering.Universal;
+using UnityEngine.UIElements;
+
+namespace UnityEditor.Rendering.Universal
+{
+    [InitializeOnLoad]
+    static class UniversalAdditionalSceneViewSettings
+    {
+        static UniversalAdditionalSceneViewSettings()
+        {
+            SceneView.onCameraCreated += EnsureAdditionalData;
+        }
+        
+        static void EnsureAdditionalData(SceneView sceneView)
+        {
+            if (!sceneView.camera.TryGetComponent(out UniversalAdditionalCameraData hdAdditionalCameraData))
+                hdAdditionalCameraData = sceneView.camera.gameObject.AddComponent<UniversalAdditionalCameraData>();
+        }
+    }
+}
\ No newline at end of file
diff --git a/Packages/com.unity.render-pipelines.universal/Editor/Camera/UniversalAdditionalSceneViewSettings.cs.meta b/Packages/com.unity.render-pipelines.universal/Editor/Camera/UniversalAdditionalSceneViewSettings.cs.meta
new file mode 100644
index 00000000000..04ffcbaee87
--- /dev/null
+++ b/Packages/com.unity.render-pipelines.universal/Editor/Camera/UniversalAdditionalSceneViewSettings.cs.meta
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: abcad45687bfae74da54b83b9ac8b9e5
\ No newline at end of file
diff --git a/Packages/com.unity.render-pipelines.universal/Editor/Converter/Converters.cs b/Packages/com.unity.render-pipelines.universal/Editor/Converter/Converters.cs
index a4c2551c2dc..220668f307e 100644
--- a/Packages/com.unity.render-pipelines.universal/Editor/Converter/Converters.cs
+++ b/Packages/com.unity.render-pipelines.universal/Editor/Converter/Converters.cs
@@ -4,212 +4,268 @@
 using System.Text;
 using UnityEditor.Rendering.Converter;
 using UnityEngine;
+using UnityEngine.Rendering;
 
 namespace UnityEditor.Rendering.Universal
 {
-    /// <summary>
-    /// Filter for the list of converters used in batch mode.
-    /// </summary>
-    /// <seealso cref="Converters.RunInBatchMode(UnityEditor.Rendering.Universal.ConverterContainerId, List{UnityEditor.Rendering.Universal.ConverterId}, UnityEditor.Rendering.Universal.ConverterFilter)"/>
-    public enum ConverterFilter
+    [AttributeUsage(AttributeTargets.Class, AllowMultiple = false)]
+    internal class BatchModeConverterClassInfo : Attribute
     {
-        /// <summary>
-        /// Use this to include converters matching the filter.
-        /// </summary>
-        Inclusive,
+        public string converterType { get; }
+        public string containerName { get; }
 
-        /// <summary>
-        /// Use this to exclude converters matching the filter.
-        /// </summary>
-        Exclusive
+        public BatchModeConverterClassInfo(string containerName, string converterType)
+        {
+            this.converterType = converterType;
+            this.containerName = containerName;
+        }
     }
 
     /// <summary>
-    /// The container to run in batch mode.
+    /// Class for the converter framework.
     /// </summary>
-    /// <seealso cref="Converters.RunInBatchMode(UnityEditor.Rendering.Universal.ConverterContainerId)"/>
-    public enum ConverterContainerId
+    public static partial class Converters
     {
-        /// <summary>
-        /// Use this for Built-in to URP converter.
-        /// </summary>
-        BuiltInToURP,
+        // Commands
+        const string k_BatchmodeCommand = "-batchmode";
+        const string k_HelpCommand = "--help";
+        const string k_ListCommand = "--list";
+        const string k_ContainerCommand = "-container";
+        const string k_TypesFilterCommand = "-typesFilter";
+        const string k_InclusiveFlag = "--inclusive";
+        const string k_ExclusiveFlag = "--exclusive";
+
+        // List all available containers
+        static void ListAvailableConverters()
+        {
+            // Get all converters and group them by container
+            var containersDict = DictionaryPool<string,List<string>>.Get();
+            foreach (var container in TypeCache.GetTypesWithAttribute<BatchModeConverterClassInfo>())
+            {
+                if (container.IsAbstract || container.IsInterface)
+                    continue;
 
-        /// <summary>
-        /// Use this for Built-in to 2D (URP) converter.
-        /// </summary>
-        BuiltInToURP2D,
+                var info = container.GetCustomAttribute<BatchModeConverterClassInfo>();
+                if (!containersDict.ContainsKey(info.containerName))
+                {
+                    containersDict[info.containerName] = new List<string>();
+                }
 
-        /// <summary>
-        /// Use this for Built-in and 3D URP to 2D (URP) converter.
-        /// </summary>
-        BuiltInAndURPToURP2D,
+                containersDict[info.containerName].Add(info.converterType);
+            }
 
-        /// <summary>
-        /// Use this to upgrade 2D (URP) assets.
-        /// </summary>
-        UpgradeURP2DAssets,
-    }
+            // Organize the information
+            StringBuilder convertersMessage = StringBuilderPool.Get();
+            foreach (var converter in containersDict)
+            {
+                convertersMessage.AppendLine($"Container: {converter.Key}");
+                convertersMessage.AppendLine("Available converter types:");
+                convertersMessage.AppendLine(String.Join($"\n\t- ", converter.Value));
+                convertersMessage.AppendLine("\n");
+            }
 
-    [AttributeUsage(AttributeTargets.Field, AllowMultiple = false)]
-    internal class BatchModeConverterInfo : Attribute
-    {
-        public Type converterType { get; }
-        public ConverterContainerId containerName {get;}
+            Debug.Log($"Available containers and their converter types\n{convertersMessage}");
+        }
 
-        public BatchModeConverterInfo(ConverterContainerId containerName, Type converterType)
+        static void LogHelp()
         {
-            this.converterType = converterType;
-            this.containerName = containerName;
+            StringBuilder helpMessage = StringBuilderPool.Get();
+
+            // Description
+            helpMessage.AppendLine("\n");
+            helpMessage.AppendLine( "The batchmode converter is a tool to help you upgrade your projects from one scriptable render pipeline\n" +
+                                   "to another. Using this API can lead to incomplete or unpredictable conversion outcomes.\n" +
+                                   "For reliable results, please perform the conversion via the dedicated window: Window > Rendering > Render Pipeline Converter.");
+            helpMessage.AppendLine("\n");
+
+            // Usage
+            helpMessage.AppendLine($"usage: \t<path to Unity executable> -projectPath <project path> {k_BatchmodeCommand} -executeMethod UnityEditor.Rendering.Universal.Converters.RunInBatchModeCmdLine\n" +
+                                   $"\t \t[{k_HelpCommand}] [{k_ListCommand}]\n" +
+                                   $"\t \t[{k_ContainerCommand} <name of container>] [{k_TypesFilterCommand} <types to include or exclude>] [{k_InclusiveFlag}|{k_ExclusiveFlag}]");
+            helpMessage.AppendLine("\n");
+
+            // Commands
+            helpMessage.AppendLine("Commands");
+            helpMessage.AppendLine($"\t{k_HelpCommand} \t \t Show this help and exit.");
+            helpMessage.AppendLine($"\t{k_ListCommand} \t \t List all available converters and exit.");
+            helpMessage.AppendLine("\n");
+
+            // Options
+            helpMessage.AppendLine("Options");
+            helpMessage.AppendLine($"\t{k_ContainerCommand} <name of container> \t \t \t The name of the container which will be batched (required).");
+            helpMessage.AppendLine($"\t{k_TypesFilterCommand} <types to include or exclude> \t The list of converters types that will be either included or excluded from batching. These converters need to be part of the passed in container for them to run.");
+            helpMessage.AppendLine($"\t{k_InclusiveFlag}|{k_ExclusiveFlag} \t \t \t Whether the list of converters specified with {k_TypesFilterCommand} will be included or excluded when batching.");
+            helpMessage.AppendLine("\n");
+
+            helpMessage.AppendLine("Notes");
+            helpMessage.AppendLine($"\t Use either {k_InclusiveFlag} or {k_ExclusiveFlag}, not both.");
+            helpMessage.AppendLine($"\t When using {k_InclusiveFlag}, you must specify values for {k_TypesFilterCommand}.");
+            helpMessage.AppendLine($"\t Values for {k_TypesFilterCommand} must be provided as a space-separated list: {k_TypesFilterCommand} typeA typeB typeC");
+            helpMessage.AppendLine("\nOnline documentation: https://docs.unity3d.com/6000.5/Documentation/Manual/urp/convert-assets-to-urp.html\n");
+
+            Debug.Log(helpMessage);
         }
-    }
 
-    /// <summary>
-    /// The converter to run in batch mode.
-    /// </summary>
-    /// <seealso cref="Converters.RunInBatchMode(UnityEditor.Rendering.Universal.ConverterContainerId, List{UnityEditor.Rendering.Universal.ConverterId}, UnityEditor.Rendering.Universal.ConverterFilter)"/>
-    public enum ConverterId
-    {
-        /// <summary>
-        /// Use this for the material converters.
-        /// </summary>
-        [BatchModeConverterInfo(ConverterContainerId.BuiltInToURP,typeof(BuiltInToURP3DMaterialUpgrader))]
-        Material,
+        internal static void SuggestUpdatedCommand(string container, List<string> converters, bool isInclusive)
+        {
+            var containerParameter = $" {k_ContainerCommand} {container}";
+            var converterParameter = converters.Count == 0 ? "" : $" {k_TypesFilterCommand} {string.Join(" ", converters)}";
+            var filterModeFlag = isInclusive ? $" {k_InclusiveFlag}" : $" {k_ExclusiveFlag}";
+            Debug.Log("The method you're trying to use is deprecated. Try running the following command in the command line:\n" +
+                      $"<path to Unity> -projectPath <path to project> {k_BatchmodeCommand} -executeMethod UnityEditor.Rendering.Universal.Converters.RunInBatchModeCmdLine{filterModeFlag}{containerParameter}{converterParameter}");
+        }
 
-        /// <summary>
-        /// Use this for the render settings converters.
-        /// </summary>
-        [BatchModeConverterInfo(ConverterContainerId.BuiltInToURP, typeof(BuiltInToURP3DRenderSettingsConverter))]
-        RenderSettings,
+        // Return all converters we will be running
+        internal static List<Type> FilterConverters(string containerName, List<string> convertedTypesFilter, bool isInclusive = false)
+        {
+            var allConverters = TypeCache.GetTypesWithAttribute<BatchModeConverterClassInfo>();
+            var filteredList = new List<Type>(allConverters.Count);
 
-        /// <summary>
-        /// Use this for the animation clip converters.
-        /// </summary>
-        [BatchModeConverterInfo(ConverterContainerId.BuiltInToURP, typeof(AnimationClipConverter))]
-        AnimationClip,
+            // early return
+            if (isInclusive && convertedTypesFilter.Count == 0)
+                return filteredList; // nothing included in the list
 
-        /// <summary>
-        /// Use this for readonly material converters.
-        /// </summary>
-        [BatchModeConverterInfo(ConverterContainerId.BuiltInToURP, typeof(BuiltInToURP3DReadonlyMaterialConverter))]
-        ReadonlyMaterial,
+            foreach (var converterType in allConverters)
+            {
+                var converterInfo = converterType.GetCustomAttribute<BatchModeConverterClassInfo>();
+                if (containerName != converterInfo.containerName)
+                    continue;
 
-        /// <summary>
-        /// Use this for 2D material conversion
-        /// </summary>
-        [BatchModeConverterInfo(ConverterContainerId.BuiltInToURP2D, typeof(BuiltInToURP2DReadonlyMaterialConverter))]
-        ReadonlyMaterial2D,
+                var isTypeInFilteredList = convertedTypesFilter.Contains(converterInfo.converterType);
 
-        /// <summary>
-        /// Use this for 2D material conversion
-        /// </summary>
-        [BatchModeConverterInfo(ConverterContainerId.BuiltInToURP2D, typeof(BuiltInToURP2DRenderSettingsConverter))]
-        RenderSettings2D,
+                // add if inclusive and in the included list, add if exclusive and not in the excluded list
+                if (isInclusive == isTypeInFilteredList)
+                    filteredList.Add(converterType);
+            }
 
-        /// <summary>
-        /// Use this for 3D URP material conversion
-        /// </summary>
-        [BatchModeConverterInfo(ConverterContainerId.UpgradeURP2DAssets, typeof(BuiltInAndURP3DTo2DMaterialUpgrader))]
-        URPToReadonlyMaterial2D,
+            return filteredList;
+        }
 
-#if PPV2_EXISTS
-        /// <summary>
-        /// Use this for post processing V2 converters.
-        /// </summary>
-        [BatchModeConverterInfo(ConverterContainerId.BuiltInToURP, typeof(PPv2Converter))]
-        PPv2,
-#endif
+        internal static Dictionary<string, List<string>> ParseArgs(string[] rawArgs)
+        {
+            int batchmodeArgIndex = Array.FindIndex(rawArgs, arg => arg == k_BatchmodeCommand);
+            if (batchmodeArgIndex == -1)
+                throw new ArgumentException($"No {k_BatchmodeCommand} argument found. Exiting.");
 
-        /// <summary>
-        /// Use this for parametric to freeform light converters.
-        /// </summary>
-        [BatchModeConverterInfo(ConverterContainerId.UpgradeURP2DAssets, typeof(ParametricToFreeformLightUpgrader))]
-        ParametricToFreeformLight,
-    }
+            var parsedArgs = DictionaryPool<string,List<string>>.Get();
+            parsedArgs["Flags"] = new List<string>();
 
-    /// <summary>
-    /// Class for the converter framework.
-    /// </summary>
-    public static class Converters
-    {
-        private static void DumpAvailableConverters()
-        {
-            StringBuilder sb = new();
-            foreach (var converter in TypeCache.GetTypesDerivedFrom<IRenderPipelineConverter>())
+            string currentKey = null; // are we collecting values for a key?
+
+            for(int i = batchmodeArgIndex + 1; i < rawArgs.Length; i++)
             {
-                if (converter.IsAbstract || converter.IsInterface)
-                    continue;
+                if (rawArgs[i].StartsWith("--")) // new flag
+                {
+                    parsedArgs["Flags"].Add(rawArgs[i]);
+                    currentKey = "";
+                }
+                else if (rawArgs[i].StartsWith("-")) // new argument
+                {
+                    parsedArgs.Add(rawArgs[i], new List<string>());
+                    currentKey = rawArgs[i];
+                }
+                else // adding to the last argument
+                {
+                    if (String.IsNullOrEmpty(currentKey))
+                    {
+                        throw new ArgumentException($"Unrecognized argument: {rawArgs[i]}");
+                    }
 
-                sb.AppendLine(converter.AssemblyQualifiedName);
+                    parsedArgs[currentKey].Add(rawArgs[i]);
+                }
             }
 
-            Debug.Log(sb.ToString());
+            return parsedArgs;
         }
 
         /// <summary>
         /// Call this method to run all the converters in a specific container in batch mode.
         /// </summary>
         /// <param name="containerName">The name of the container which will be batched. All Converters in this Container will run if prerequisites are met.</param>
-        public static void RunInBatchMode(ConverterContainerId containerName)
+        public static void RunInBatchMode(string containerName)
         {
-            RunInBatchMode(containerName, new List<ConverterId>() { }, ConverterFilter.Exclusive);
-        }
-
-        internal static bool TryGetTypeInContainer(ConverterId value, ConverterContainerId containerName, out Type type)
-        {
-            type = null;
-            var memberInfo = typeof(ConverterId).GetMember(value.ToString());
-            if (memberInfo.Length > 0)
-            {
-                var attr = memberInfo[0].GetCustomAttribute<BatchModeConverterInfo>();
-                if (attr != null)
-                {
-                    if(attr.containerName == containerName)
-                        type = attr.converterType;
-                }   
-            }
-            return type != null;
+             RunInBatchMode(containerName, null, isInclusive: false);
         }
 
         /// <summary>
         /// Call this method to run a specific list of converters in a specific container in batch mode.
         /// </summary>
         /// <param name="containerName">The name of the container which will be batched.</param>
-        /// <param name="converterList">The list of converters that will be either included or excluded from batching. These converters need to be part of the passed in container for them to run.</param>
-        /// <param name="converterFilter">The enum that decide if the list of converters will be included or excluded when batching.</param>
-        public static void RunInBatchMode(ConverterContainerId containerName, List<ConverterId> converterList, ConverterFilter converterFilter)
+        /// <param name="convertedTypes">The list of converters that will be either included or excluded from batching. These converters need to be part of the passed in container for them to run.</param>
+        /// <param name="isInclusive">Whether the list of converters will be included or excluded when batching.</param>
+        public static void RunInBatchMode(string containerName, List<string> convertedTypes, bool isInclusive)
         {
-            var types = FilterConverters(containerName, converterList, converterFilter);
+            var types = FilterConverters(containerName, convertedTypes, isInclusive);
             RunInBatchMode(types);
         }
 
-        internal static List<Type> FilterConverters(ConverterContainerId containerName, List<ConverterId> converterList, ConverterFilter converterFilter)
+        /// <summary>
+        /// Call this method to run a specific list of converters in a specific container in batch mode.
+        /// Entry point for: -executeMethod UnityEditor.Rendering.Universal.Converters.RunInBatchModeCmdLine
+        /// </summary>
+        public static void RunInBatchModeCmdLine()
         {
-            Array converters = Enum.GetValues(typeof(ConverterId));
-
-            List<Type> converterTypes = new();
-            foreach (object value in converters)
+            Debug.Log("BATCH MODE COMMAND LINE\n");
+            var exitCode = 0;
+            try
             {
-                var converterEnum = (ConverterId)value;
-                if (TryGetTypeInContainer(converterEnum, containerName, out var type))
+                var args = ParseArgs(Environment.GetCommandLineArgs());
+                // If help requested, print and exit
+                if (args["Flags"].Contains(k_HelpCommand))
                 {
-                    bool inFilter = converterList.Contains(converterEnum);
-                    if ((converterFilter == ConverterFilter.Inclusive) ^ !inFilter)
-                        converterTypes.Add(type);
+                    LogHelp();
+                    EditorApplication.Exit(0);
+                    return;
                 }
-            }
 
-            return converterTypes;
+                if (args["Flags"].Contains(k_ListCommand))
+                {
+                    ListAvailableConverters();
+                    EditorApplication.Exit(0);
+                    return;
+                }
+
+                // ContainerType -----
+                if (!args.TryGetValue(k_ContainerCommand, out var converter))
+                    throw new ArgumentException($"Missing required {k_ContainerCommand} <name of container>. Use {k_ListCommand} to see available converter.");
+                if(converter.Count != 1)
+                    throw new ArgumentException($"Please specify only one container. Use {k_ListCommand} to see available converters.");
+
+                // Filter + Include/Exclude ------
+                var hasInclusive = args["Flags"].Contains(k_InclusiveFlag);
+                var hasExclusive = args["Flags"].Contains(k_ExclusiveFlag);
+                var hasTypesFilter = args.TryGetValue(k_TypesFilterCommand, out var filteredTypes);
+
+                if (hasTypesFilter && hasExclusive == hasInclusive)
+                {
+                    throw new ArgumentException($"When using {k_TypesFilterCommand}, please specify exactly one of {k_InclusiveFlag} or {k_ExclusiveFlag}. Use {k_HelpCommand} for usage.");
+                }
+
+                if (hasInclusive && !hasTypesFilter)
+                    throw new ArgumentException($"When using {k_InclusiveFlag} mode, please specify types to include using {k_TypesFilterCommand} otherwise nothing will be converted. " +
+                                                $"Use {k_ListCommand} to see available types.");
+
+                RunInBatchMode(converter[0], filteredTypes, hasInclusive);
+            }
+            catch (Exception ex)
+            {
+                Debug.LogError($"ConverterCli failed: {ex.Message}\n{ex}");
+                exitCode = 1;
+            }
+            finally
+            {
+                EditorApplication.Exit(exitCode);
+            }
         }
 
-        /// <summary>
+         /// <summary>
         /// Call this method to run a specific list of converters in batch mode.
         /// </summary>
         /// <param name="converterTypes">The list of converters to run</param>
         /// <returns>False if there were errors.</returns>
         internal static bool RunInBatchMode(List<Type> converterTypes)
         {
-            Debug.LogWarning("Using this API can lead to incomplete or unpredictable conversion outcomes. For reliable results, please perform the conversion via the dedicated window: Window > Rendering > Render Pipeline Converter.");
+            Debug.LogWarning($"Using this API can lead to incomplete or unpredictable conversion outcomes. For reliable results, please perform the conversion via the dedicated window: Window > Rendering > Render Pipeline Converter.");
 
             List<IRenderPipelineConverter> convertersToExecute = new();
 
@@ -237,7 +293,7 @@ internal static bool RunInBatchMode(List<Type> converterTypes)
             if (errors)
             {
                 Debug.LogWarning($"Please use any of the given Converter Types.");
-                DumpAvailableConverters();
+                ListAvailableConverters();
             }
 
             BatchConverters(convertersToExecute);
@@ -245,11 +301,11 @@ internal static bool RunInBatchMode(List<Type> converterTypes)
             return !errors;
         }
 
-        internal static void BatchConverters(List<IRenderPipelineConverter> converters)
+        static void BatchConverters(List<IRenderPipelineConverter> converters)
         {
             foreach (var converter in converters)
             {
-                var sb = new StringBuilder();
+                var sb = StringBuilderPool.Get();
 
                 converter.Scan(OnConverterCompleteDataCollection);
 
@@ -270,7 +326,6 @@ void OnConverterCompleteDataCollection(List<IRenderPipelineConverterItem> items)
                             case Status.Success:
                             {
                                 sb.AppendLine($"- {item.name} ({status})");
-                                message = "Conversion successful!";
                             }
                             break;
                         }
diff --git a/Packages/com.unity.render-pipelines.universal/Editor/Converter/Converters.cs.meta b/Packages/com.unity.render-pipelines.universal/Editor/Converter/Converters.cs.meta
index 5713c676a85..6dafa388ff7 100644
--- a/Packages/com.unity.render-pipelines.universal/Editor/Converter/Converters.cs.meta
+++ b/Packages/com.unity.render-pipelines.universal/Editor/Converter/Converters.cs.meta
@@ -1,11 +1,3 @@
 fileFormatVersion: 2
-guid: 3b0b271613f343246a84ba7a171df9dc
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
+guid: df92998552b941e79fe2ceca76b5288f
+timeCreated: 1769617671
\ No newline at end of file
diff --git a/Packages/com.unity.render-pipelines.universal/Editor/Deprecated.cs b/Packages/com.unity.render-pipelines.universal/Editor/Deprecated.cs
index 9caa83f6f82..6addc6dd95f 100644
--- a/Packages/com.unity.render-pipelines.universal/Editor/Deprecated.cs
+++ b/Packages/com.unity.render-pipelines.universal/Editor/Deprecated.cs
@@ -1,4 +1,9 @@
 using System;
+using System.Collections.Generic;
+using System.Reflection;
+using System.Text;
+using UnityEditor.Rendering.Converter;
+using UnityEngine;
 
 namespace UnityEditor.Rendering.Universal
 {
@@ -18,4 +23,195 @@ public override void OnInspectorGUI()
     static partial class EditorUtils
     {
     }
+
+    /// <summary>
+    /// Filter for the list of converters used in batch mode.
+    /// </summary>
+    /// <seealso cref="Converters.RunInBatchMode(UnityEditor.Rendering.Universal.ConverterContainerId, List{UnityEditor.Rendering.Universal.ConverterId}, UnityEditor.Rendering.Universal.ConverterFilter)"/>
+    [Obsolete("ConverterFilter has been deprecated.", false)]
+
+    public enum ConverterFilter
+    {
+        /// <summary>
+        /// Use this to include converters matching the filter.
+        /// </summary>
+        Inclusive,
+
+        /// <summary>
+        /// Use this to exclude converters matching the filter.
+        /// </summary>
+        Exclusive
+    }
+
+    /// <summary>
+    /// The container to run in batch mode.
+    /// </summary>
+    /// <seealso cref="Converters.RunInBatchMode(UnityEditor.Rendering.Universal.ConverterContainerId)"/>
+    [Obsolete("ConverterContainerId has been deprecated.", false)]
+    public enum ConverterContainerId
+    {
+        /// <summary>
+        /// Use this for Built-in to URP converter.
+        /// </summary>
+        BuiltInToURP,
+
+        /// <summary>
+        /// Use this for Built-in to 2D (URP) converter.
+        /// </summary>
+        BuiltInToURP2D,
+
+        /// <summary>
+        /// Use this for Built-in and 3D URP to 2D (URP) converter.
+        /// </summary>
+        BuiltInAndURPToURP2D,
+
+        /// <summary>
+        /// Use this to upgrade 2D (URP) assets.
+        /// </summary>
+        UpgradeURP2DAssets,
+    }
+
+    [AttributeUsage(AttributeTargets.Field, AllowMultiple = false)]
+    [Obsolete("BatchModeConverterInfo has been deprecated. Please use BatchModeConverterClassInfo or upgrade using UnityEditor.Rendering.Universal.Converters.RunInBatchModeCmdLine instead.", false)]
+    internal class BatchModeConverterInfo : Attribute
+    {
+        public Type converterType { get; }
+        public ConverterContainerId containerName { get; }
+
+        public BatchModeConverterInfo(ConverterContainerId containerName, Type converterType)
+        {
+            this.converterType = converterType;
+            this.containerName = containerName;
+        }
+    }
+
+    /// <summary>
+    /// The converter to run in batch mode.
+    /// </summary>
+    /// <seealso cref="Converters.RunInBatchMode(UnityEditor.Rendering.Universal.ConverterContainerId, List{UnityEditor.Rendering.Universal.ConverterId}, UnityEditor.Rendering.Universal.ConverterFilter)"/>
+    [Obsolete("ConverterId has been deprecated. Please upgrade using UnityEditor.Rendering.Universal.Converters.RunInBatchModeCmdLine instead.", false)]
+    public enum ConverterId
+    {
+        /// <summary>
+        /// Use this for the material converters.
+        /// </summary>
+        [BatchModeConverterInfo(ConverterContainerId.BuiltInToURP, typeof(BuiltInToURP3DMaterialUpgrader))]
+        Material,
+
+        /// <summary>
+        /// Use this for the render settings converters.
+        /// </summary>
+        [BatchModeConverterInfo(ConverterContainerId.BuiltInToURP, typeof(BuiltInToURP3DRenderSettingsConverter))]
+        RenderSettings,
+
+        /// <summary>
+        /// Use this for the animation clip converters.
+        /// </summary>
+        [BatchModeConverterInfo(ConverterContainerId.BuiltInToURP, typeof(AnimationClipConverter))]
+        AnimationClip,
+
+        /// <summary>
+        /// Use this for readonly material converters.
+        /// </summary>
+        [BatchModeConverterInfo(ConverterContainerId.BuiltInToURP, typeof(BuiltInToURP3DReadonlyMaterialConverter))]
+        ReadonlyMaterial,
+
+        /// <summary>
+        /// Use this for 2D material conversion
+        /// </summary>
+        [BatchModeConverterInfo(ConverterContainerId.BuiltInToURP2D,
+            typeof(BuiltInToURP2DReadonlyMaterialConverter))]
+        ReadonlyMaterial2D,
+
+        /// <summary>
+        /// Use this for 2D material conversion
+        /// </summary>
+        [BatchModeConverterInfo(ConverterContainerId.BuiltInToURP2D, typeof(BuiltInToURP2DRenderSettingsConverter))]
+        RenderSettings2D,
+
+        /// <summary>
+        /// Use this for 3D URP material conversion
+        /// </summary>
+        [BatchModeConverterInfo(ConverterContainerId.UpgradeURP2DAssets,
+            typeof(BuiltInAndURP3DTo2DMaterialUpgrader))]
+        URPToReadonlyMaterial2D,
+
+#if PPV2_EXISTS
+            /// <summary>
+            /// Use this for post processing V2 converters.
+            /// </summary>
+            [BatchModeConverterInfo(ConverterContainerId.BuiltInToURP, typeof(PPv2Converter))]
+            PPv2,
+#endif
+
+        /// <summary>
+        /// Use this for parametric to freeform light converters.
+        /// </summary>
+        [BatchModeConverterInfo(ConverterContainerId.UpgradeURP2DAssets, typeof(ParametricToFreeformLightUpgrader))]
+        ParametricToFreeformLight,
+    }
+
+    public static partial class Converters
+    {
+        /// <summary>
+        /// Call this method to run all the converters in a specific container in batch mode.
+        /// </summary>
+        /// <param name="containerName">The name of the container which will be batched. All Converters in this Container will run if prerequisites are met.</param>
+        [Obsolete("RunInBatchMode(ConverterContainerId) has been deprecated. Please use RunInBatchMode(string) or upgrade using UnityEditor.Rendering.Universal.Converters.RunInBatchModeCmdLine instead.", false)]
+        public static void RunInBatchMode(ConverterContainerId containerName)
+        {
+            RunInBatchMode(containerName, new List<ConverterId>() { }, ConverterFilter.Exclusive);
+        }
+
+        [Obsolete("TryGetTypeInContainer has been deprecated. Please upgrade using UnityEditor.Rendering.Universal.Converters.RunInBatchModeCmdLine instead.", false)]
+        static bool TryGetTypeInContainer(ConverterId value, ConverterContainerId containerName, out Type type)
+        {
+            type = null;
+            var memberInfo = typeof(ConverterId).GetMember(value.ToString());
+            if (memberInfo.Length > 0)
+            {
+                var attr = memberInfo[0].GetCustomAttribute<BatchModeConverterInfo>();
+                if (attr != null)
+                {
+                    if(attr.containerName == containerName)
+                        type = attr.converterType;
+                }
+            }
+            return type != null;
+        }
+
+        /// <summary>
+        /// Call this method to run a specific list of converters in a specific container in batch mode.
+        /// </summary>
+        /// <param name="containerName">The name of the container which will be batched.</param>
+        /// <param name="converterList">The list of converters that will be either included or excluded from batching. These converters need to be part of the passed in container for them to run.</param>
+        /// <param name="converterFilter">The enum that decide if the list of converters will be included or excluded when batching.</param>
+        [Obsolete("RunInBatchMode(ConverterContainerId, List<ConverterId>, ConverterFilter) has been deprecated. Please use RunInBatchMode(string, List<string>, bool) or upgrade using UnityEditor.Rendering.Universal.Converters.RunInBatchModeCmdLine instead.", false)]
+        public static void RunInBatchMode(ConverterContainerId containerName, List<ConverterId> converterList, ConverterFilter converterFilter)
+        {
+            var types = FilterConverters(containerName, converterList, converterFilter);
+            SuggestUpdatedCommand(containerName.ToString(), converterList.ConvertAll(id => id.ToString()), converterFilter == ConverterFilter.Inclusive);
+            RunInBatchMode(types);
+        }
+
+        [Obsolete("FilterConverters(ConverterContainerId, List<ConverterId>, ConverterFilter) has been deprecated. Please use FilterConverters(string, List<string>, bool) instead.", false)]
+        internal static List<Type> FilterConverters(ConverterContainerId containerName, List<ConverterId> converterList, ConverterFilter converterFilter)
+        {
+            Array converters = Enum.GetValues(typeof(ConverterId));
+
+            List<Type> converterTypes = new();
+            foreach (object value in converters)
+            {
+                var converterEnum = (ConverterId)value;
+                if (TryGetTypeInContainer(converterEnum, containerName, out var type))
+                {
+                    bool inFilter = converterList.Contains(converterEnum);
+                    if ((converterFilter == ConverterFilter.Inclusive) ^ !inFilter)
+                        converterTypes.Add(type);
+                }
+            }
+
+            return converterTypes;
+        }
+    }
 }
diff --git a/Packages/com.unity.render-pipelines.universal/Editor/Lighting/UniversalRenderPipelineLightUI.Drawers.cs b/Packages/com.unity.render-pipelines.universal/Editor/Lighting/UniversalRenderPipelineLightUI.Drawers.cs
index 425d9f544ff..de592cf0f24 100644
--- a/Packages/com.unity.render-pipelines.universal/Editor/Lighting/UniversalRenderPipelineLightUI.Drawers.cs
+++ b/Packages/com.unity.render-pipelines.universal/Editor/Lighting/UniversalRenderPipelineLightUI.Drawers.cs
@@ -272,13 +272,21 @@ static void DrawRenderingContent(UniversalRenderPipelineSerializedLight serializ
             {
                 EditorGUI.BeginChangeCheck();
                 GUI.enabled = UniversalRenderPipeline.asset.useRenderingLayers;
-                EditorGUILayout.PropertyField(serializedLight.renderingLayers, UniversalRenderPipeline.asset.useRenderingLayers ? Styles.RenderingLayers : Styles.RenderingLayersDisabled);
+                EditorGUILayout.PropertyField(serializedLight.renderingLayers, Styles.RenderingLayers);
                 GUI.enabled = true;
                 if (EditorGUI.EndChangeCheck())
                 {
                     if (!serializedLight.customShadowLayers.boolValue)
                         SyncLightAndShadowLayers(serializedLight, serializedLight.renderingLayers);
                 }
+                if (!UniversalRenderPipeline.asset.useRenderingLayers)
+                {
+                    CoreEditorUtils.DrawFixMeBox(Styles.RenderingLayersHelpBox, () =>
+                    {
+                        UniversalRenderPipeline.asset.useRenderingLayers = true;
+                        EditorUtility.SetDirty(UniversalRenderPipeline.asset);
+                    });
+                }
             }
 
             EditorGUILayout.PropertyField(serializedLight.settings.cullingMask, Styles.CullingMask);
diff --git a/Packages/com.unity.render-pipelines.universal/Editor/Lighting/UniversalRenderPipelineLightUI.Skin.cs b/Packages/com.unity.render-pipelines.universal/Editor/Lighting/UniversalRenderPipelineLightUI.Skin.cs
index 8ec562c50a1..4734cd58744 100644
--- a/Packages/com.unity.render-pipelines.universal/Editor/Lighting/UniversalRenderPipelineLightUI.Skin.cs
+++ b/Packages/com.unity.render-pipelines.universal/Editor/Lighting/UniversalRenderPipelineLightUI.Skin.cs
@@ -59,14 +59,14 @@ private static class Styles
                 EditorGUIUtility.TrTextContent("Use settings from Render Pipeline Asset")
             };
 
-            public static readonly GUIContent customShadowLayers = EditorGUIUtility.TrTextContent("Custom Shadow Layers", "When enabled, you can use the Layer property below to specify the layers for shadows seperately to lighting. When disabled, the Light Layer property in the General section specifies the layers for both lighting and for shadows.");
+            public static readonly GUIContent customShadowLayers = EditorGUIUtility.TrTextContent("Custom Shadow Layers", "When enabled, you can use the Layer property below to specify the layers for shadows separately to lighting. When disabled, the Light Layer property in the General section specifies the layers for both lighting and for shadows.");
             public static readonly GUIContent ShadowLayer = EditorGUIUtility.TrTextContent("Layer", "Specifies the light layer to use for shadows.");
 
             public static readonly GUIContent LightCookieSize = EditorGUIUtility.TrTextContent("Cookie Size", "Controls the size of the cookie mask currently assigned to the light.");
             public static readonly GUIContent LightCookieOffset = EditorGUIUtility.TrTextContent("Cookie Offset", "Controls the offset of the cookie mask currently assigned to the light.");
             /// <summary>Title with "Rendering Layer"</summary>
             public static readonly GUIContent RenderingLayers = EditorGUIUtility.TrTextContent("Rendering Layers", "Select the Rendering Layers that the Light affects. This Light affects objects where at least one Rendering Layer value matches.");
-            public static readonly GUIContent RenderingLayersDisabled = EditorGUIUtility.TrTextContent("Rendering Layers", "Rendering Layers are disabled because they have a small GPU performance cost. To enable this setting, go to the active Universal Render Pipeline Asset, and enable Lighting -> Use Rendering Layers.");
+            public static readonly GUIContent RenderingLayersHelpBox = EditorGUIUtility.TrTextContentWithIcon($"Rendering Layers are disabled by default because they have a small GPU performance cost. Enable them in the active Universal Render Pipeline Asset, under Lighting -> Use Rendering Layers.", CoreEditorStyles.GetMessageTypeIcon(MessageType.Info));
         }
     }
 }
diff --git a/Packages/com.unity.render-pipelines.universal/Editor/RendererFeatures/DecalRendererFeatureEditor.cs b/Packages/com.unity.render-pipelines.universal/Editor/RendererFeatures/DecalRendererFeatureEditor.cs
index ba16ae93864..5e8ac49fbdf 100644
--- a/Packages/com.unity.render-pipelines.universal/Editor/RendererFeatures/DecalRendererFeatureEditor.cs
+++ b/Packages/com.unity.render-pipelines.universal/Editor/RendererFeatures/DecalRendererFeatureEditor.cs
@@ -14,6 +14,7 @@ private struct Styles
             public static GUIContent UseRenderingLayers = EditorGUIUtility.TrTextContent("Use Rendering Layers", "When enabled, you can configure specific Decal Projectors to affect only specific objects. The number of Rendering Layers affects the performance.");
             public static GUIContent SurfaceData = EditorGUIUtility.TrTextContent("Surface Data", "Allows specifying which decals surface data should be blended with surfaces.");
             public static GUIContent NormalBlend = EditorGUIUtility.TrTextContent("Normal Blend", "Controls the quality of normal reconstruction. The higher the value the more accurate normal reconstruction and the cost on performance.");
+            public static readonly GUIContent OpenGlSupportWarning = EditorGUIUtility.TrTextContentWithIcon("Rendering Layers are not supported on OpenGL.", "This feature is incompatible with OpenGL. Disable 'Auto Graphics API' in Player Settings and remove OpenGL from the list.", MessageType.Warning);
         }
 
         private SerializedProperty m_Technique;
@@ -45,7 +46,18 @@ public override void OnInspectorGUI()
         {
             Init();
 
-            var isGLDevice = SystemInfo.graphicsDeviceType == GraphicsDeviceType.OpenGLES3 || SystemInfo.graphicsDeviceType == GraphicsDeviceType.OpenGLCore;
+            var gfxTypes = PlayerSettings.GetGraphicsAPIs(EditorUserBuildSettings.activeBuildTarget);
+
+            var isGLDevice = false;
+
+            foreach (var type in gfxTypes)
+            {
+                if (type == GraphicsDeviceType.OpenGLES3 || type == GraphicsDeviceType.OpenGLCore)
+                {
+                    isGLDevice = true;
+                    break;
+                }
+            }
 
             EditorGUILayout.PropertyField(m_Technique, Styles.Technique);
 
@@ -89,7 +101,7 @@ public override void OnInspectorGUI()
             if (isGLDevice)
             {
                 GUI.enabled = true;
-                EditorGUILayout.HelpBox("Rendering Layers are not supported on OpenGL.", MessageType.Warning);
+                EditorGUILayout.HelpBox(Styles.OpenGlSupportWarning);
             }
         }
     }
diff --git a/Packages/com.unity.render-pipelines.universal/Editor/RendererFeatures/SurfaceCacheGlobalIlluminationEditor.cs b/Packages/com.unity.render-pipelines.universal/Editor/RendererFeatures/SurfaceCacheGIEditor.cs
similarity index 98%
rename from Packages/com.unity.render-pipelines.universal/Editor/RendererFeatures/SurfaceCacheGlobalIlluminationEditor.cs
rename to Packages/com.unity.render-pipelines.universal/Editor/RendererFeatures/SurfaceCacheGIEditor.cs
index 0afb8877dbf..60a5439b9e7 100644
--- a/Packages/com.unity.render-pipelines.universal/Editor/RendererFeatures/SurfaceCacheGlobalIlluminationEditor.cs
+++ b/Packages/com.unity.render-pipelines.universal/Editor/RendererFeatures/SurfaceCacheGIEditor.cs
@@ -6,8 +6,8 @@
 
 namespace UnityEditor.Rendering.Universal
 {
-    [CustomEditor(typeof(SurfaceCacheGlobalIlluminationRendererFeature))]
-    internal class SurfaceCacheGlobalIlluminationEditor : Editor
+    [CustomEditor(typeof(SurfaceCacheGIRendererFeature))]
+    internal class SurfaceCacheGIEditor : Editor
     {
         private bool m_IsInitialized;
 
diff --git a/Packages/com.unity.render-pipelines.universal/Editor/RendererFeatures/SurfaceCacheGlobalIlluminationEditor.cs.meta b/Packages/com.unity.render-pipelines.universal/Editor/RendererFeatures/SurfaceCacheGIEditor.cs.meta
similarity index 100%
rename from Packages/com.unity.render-pipelines.universal/Editor/RendererFeatures/SurfaceCacheGlobalIlluminationEditor.cs.meta
rename to Packages/com.unity.render-pipelines.universal/Editor/RendererFeatures/SurfaceCacheGIEditor.cs.meta
diff --git a/Packages/com.unity.render-pipelines.universal/Editor/ShaderBuildPreprocessor.cs b/Packages/com.unity.render-pipelines.universal/Editor/ShaderBuildPreprocessor.cs
index e0b82806b1f..294b8f8a9c7 100644
--- a/Packages/com.unity.render-pipelines.universal/Editor/ShaderBuildPreprocessor.cs
+++ b/Packages/com.unity.render-pipelines.universal/Editor/ShaderBuildPreprocessor.cs
@@ -867,7 +867,7 @@ internal static ShaderFeatures GetSupportedShaderFeaturesFromRendererFeatures(re
 
 #if SURFACE_CACHE
                 // Surface Cache GI...
-                SurfaceCacheGlobalIlluminationRendererFeature surfaceCacheFeature = rendererFeature as SurfaceCacheGlobalIlluminationRendererFeature;
+                SurfaceCacheGIRendererFeature surfaceCacheFeature = rendererFeature as SurfaceCacheGIRendererFeature;
                 if(surfaceCacheFeature != null)
                 {
                     shaderFeatures |= ShaderFeatures.SurfaceCache;
diff --git a/Packages/com.unity.render-pipelines.universal/Editor/ShaderGraph/Includes/UITKPass.hlsl b/Packages/com.unity.render-pipelines.universal/Editor/ShaderGraph/Includes/UITKPass.hlsl
index e1f5bcf34dc..03f675a2799 100644
--- a/Packages/com.unity.render-pipelines.universal/Editor/ShaderGraph/Includes/UITKPass.hlsl
+++ b/Packages/com.unity.render-pipelines.universal/Editor/ShaderGraph/Includes/UITKPass.hlsl
@@ -2,9 +2,6 @@
 #error SHADERPASS_CUSTOM_UI_is_not_correctly_defined
 #endif
 
-
-#define UIE_NOINTERPOLATION nointerpolation
-
 PackedVaryings uie_custom_vert(Attributes input)
 {
     appdata_t uieInput = (appdata_t)0;
diff --git a/Packages/com.unity.render-pipelines.universal/Editor/Tools/Converters/AnimationClipConverter/AnimationClipConverter.cs b/Packages/com.unity.render-pipelines.universal/Editor/Tools/Converters/AnimationClipConverter/AnimationClipConverter.cs
index ee98fc7f4a1..d2474e9b732 100644
--- a/Packages/com.unity.render-pipelines.universal/Editor/Tools/Converters/AnimationClipConverter/AnimationClipConverter.cs
+++ b/Packages/com.unity.render-pipelines.universal/Editor/Tools/Converters/AnimationClipConverter/AnimationClipConverter.cs
@@ -40,6 +40,7 @@ public AnimationClipConverterItem(GlobalObjectId gid, string assetPath)
     [Serializable]
     [URPHelpURL("features/rp-converter")]
     [PipelineConverter("Built-in", "Universal Render Pipeline (Universal Renderer)")]
+    [BatchModeConverterClassInfo("BuiltInToURP", "AnimationClip")]
     [ElementInfo(Name = "Animation Clip",
                  Order = 110,
                  Description = "Updates animation clips that reference material properties to work with URP shaders.\nEnsures material animations continue working after converting Materials from Built-in RP to URP.")]
diff --git a/Packages/com.unity.render-pipelines.universal/Editor/Tools/Converters/BuiltInToURP3DMaterialUpgrader.cs b/Packages/com.unity.render-pipelines.universal/Editor/Tools/Converters/BuiltInToURP3DMaterialUpgrader.cs
index be461dacc50..0e97e287d06 100644
--- a/Packages/com.unity.render-pipelines.universal/Editor/Tools/Converters/BuiltInToURP3DMaterialUpgrader.cs
+++ b/Packages/com.unity.render-pipelines.universal/Editor/Tools/Converters/BuiltInToURP3DMaterialUpgrader.cs
@@ -8,6 +8,7 @@ namespace UnityEditor.Rendering.Universal
 {
     [Serializable]
     [PipelineConverter("Built-in", "Universal Render Pipeline (Universal Renderer)")]
+    [BatchModeConverterClassInfo("BuiltInToURP", "Material")]
     [ElementInfo(Name = "Material Shader Converter",
                  Order = 100,
                  Description = "This converter scans all materials that reference Built-in shaders and upgrades them to use Universal Render Pipeline (URP) shaders.")]
diff --git a/Packages/com.unity.render-pipelines.universal/Editor/Tools/Converters/BuiltInToURP3DReadonlyMaterialConverter.cs b/Packages/com.unity.render-pipelines.universal/Editor/Tools/Converters/BuiltInToURP3DReadonlyMaterialConverter.cs
index 31d5adbf405..14cf7070182 100644
--- a/Packages/com.unity.render-pipelines.universal/Editor/Tools/Converters/BuiltInToURP3DReadonlyMaterialConverter.cs
+++ b/Packages/com.unity.render-pipelines.universal/Editor/Tools/Converters/BuiltInToURP3DReadonlyMaterialConverter.cs
@@ -10,6 +10,7 @@ namespace UnityEditor.Rendering.Universal
 {
     [Serializable]
     [PipelineConverter("Built-in", "Universal Render Pipeline (Universal Renderer)")]
+    [BatchModeConverterClassInfo("BuiltInToURP", "ReadonlyMaterial")]
     [ElementInfo(Name = "Material Reference Converter",
                  Order = 100,
                  Description = "Converts references to Built-In readonly materials to URP readonly materials.")]
diff --git a/Packages/com.unity.render-pipelines.universal/Editor/Tools/Converters/BuiltInToURP3DRenderSettingsConverter.cs b/Packages/com.unity.render-pipelines.universal/Editor/Tools/Converters/BuiltInToURP3DRenderSettingsConverter.cs
index e5e6a25ad3b..0991ece7369 100644
--- a/Packages/com.unity.render-pipelines.universal/Editor/Tools/Converters/BuiltInToURP3DRenderSettingsConverter.cs
+++ b/Packages/com.unity.render-pipelines.universal/Editor/Tools/Converters/BuiltInToURP3DRenderSettingsConverter.cs
@@ -11,6 +11,7 @@ namespace UnityEditor.Rendering.Universal
     [Serializable]
     [URPHelpURL("features/rp-converter")]
     [PipelineConverter("Built-in", "Universal Render Pipeline (Universal Renderer)")]
+    [BatchModeConverterClassInfo("BuiltInToURP", "RenderSettings")]
     [ElementInfo(Name = "Rendering Settings",
                  Order = int.MinValue,
                  Description = "This converter creates Universal Render Pipeline (URP) assets and corresponding Renderer assets, configuring their settings to match the equivalent settings from the Built-in Render Pipeline.")]
diff --git a/Packages/com.unity.render-pipelines.universal/Editor/Tools/Converters/PPv2/PPv2Converter.cs b/Packages/com.unity.render-pipelines.universal/Editor/Tools/Converters/PPv2/PPv2Converter.cs
index 6c859eb0ed3..094c8f94d97 100644
--- a/Packages/com.unity.render-pipelines.universal/Editor/Tools/Converters/PPv2/PPv2Converter.cs
+++ b/Packages/com.unity.render-pipelines.universal/Editor/Tools/Converters/PPv2/PPv2Converter.cs
@@ -21,6 +21,7 @@ namespace UnityEditor.Rendering.Universal
     [URPHelpURL("features/rp-converter")]
     [Serializable]
     [PipelineConverter("Built-in", "Universal Render Pipeline (Universal Renderer)")]
+    [BatchModeConverterClassInfo("BuiltInToURP", "PPv2")]
     [ElementInfo(Name = "Post-Processing Stack v2",
                  Order = int.MaxValue,
                  Description = "This converter creates Universal Render Pipeline (URP) assets and corresponding Renderer assets, configuring their settings to match the equivalent settings from the Built-in Render Pipeline.")]
diff --git a/Packages/com.unity.render-pipelines.universal/Editor/UniversalRenderPipelineAsset/UniversalRenderPipelineAssetUI.Skin.cs b/Packages/com.unity.render-pipelines.universal/Editor/UniversalRenderPipelineAsset/UniversalRenderPipelineAssetUI.Skin.cs
index b5557ee9c28..fbb1672aac1 100644
--- a/Packages/com.unity.render-pipelines.universal/Editor/UniversalRenderPipelineAsset/UniversalRenderPipelineAssetUI.Skin.cs
+++ b/Packages/com.unity.render-pipelines.universal/Editor/UniversalRenderPipelineAsset/UniversalRenderPipelineAssetUI.Skin.cs
@@ -51,8 +51,8 @@ internal static class Styles
             public static readonly GUIContent lightProbeSystemContent = EditorGUIUtility.TrTextContent("Light Probe System", "What system to use for Light Probes.");
             public static readonly GUIContent probeVolumeMemoryBudget = EditorGUIUtility.TrTextContent("Memory Budget", "Determines the width and height of the 3D textures used to store lighting data from probes. Depth is fixed.");
             public static readonly GUIContent probeVolumeBlendingMemoryBudget = EditorGUIUtility.TrTextContent("Blending Memory Budget", "Determines the width and height of the 3D textures used to store light scenario blending data from probes. Depth is fixed.");
-            public static readonly GUIContent supportProbeVolumeGPUStreaming = EditorGUIUtility.TrTextContent("Enable GPU Streaming", "Enable steaming of Cells for Adaptive Probe Volumes.");
-            public static readonly GUIContent supportProbeVolumeDiskStreaming = EditorGUIUtility.TrTextContent("Enable Disk Streaming", "Enable steaming of Cells from disk for Adaptive Probe Volumes.");
+            public static readonly GUIContent supportProbeVolumeGPUStreaming = EditorGUIUtility.TrTextContent("Enable GPU Streaming", "Enable streaming of Cells for Adaptive Probe Volumes.");
+            public static readonly GUIContent supportProbeVolumeDiskStreaming = EditorGUIUtility.TrTextContent("Enable Disk Streaming", "Enable streaming of Cells from disk for Adaptive Probe Volumes.");
             public static readonly GUIContent supportProbeVolumeScenarios = EditorGUIUtility.TrTextContent("Enable Lighting Scenarios", "Enable Lighting Scenario Baking for Adaptive Probe Volumes.");
             public static readonly GUIContent supportProbeVolumeScenarioBlending = EditorGUIUtility.TrTextContent("Enable Lighting Scenario Blending", "Enable Lighting Scenario Blending for Adaptive Probe Volumes.\nNote: Lighting Scenario Blending requires Compute Shader support.");
             public static readonly GUIContent probeVolumeSHBands = EditorGUIUtility.TrTextContent("SH Bands", "The number of Spherical Harmonic bands used by Adaptive Probe Volumes to store lighting data. Choosing L2 provides better quality but with higher memory and runtime costs.");
diff --git a/Packages/com.unity.render-pipelines.universal/Editor/VFXGraph/Shaders/Templates/ParticleHexahedron/PassForward2D.template b/Packages/com.unity.render-pipelines.universal/Editor/VFXGraph/Shaders/Templates/ParticleHexahedron/PassForward2D.template
index fda24b2399e..fda2da0d640 100644
--- a/Packages/com.unity.render-pipelines.universal/Editor/VFXGraph/Shaders/Templates/ParticleHexahedron/PassForward2D.template
+++ b/Packages/com.unity.render-pipelines.universal/Editor/VFXGraph/Shaders/Templates/ParticleHexahedron/PassForward2D.template
@@ -1,10 +1,11 @@
 // 2D Pass
 Pass
-{		
+{
+    Name ${VFXPassForward2D}
 	Tags { "LightMode"=${VFXPassForward2D} }
-	
+
 	HLSLPROGRAM
-	#pragma target 4.5	
+	#pragma target 4.5
 	${VFXInclude("Shaders/ParticleHexahedron/PassBasicForwardCommon.template")}
 	ENDHLSL
 }
diff --git a/Packages/com.unity.render-pipelines.universal/Editor/VFXGraph/Shaders/Templates/ParticleLines/PassForward2D.template b/Packages/com.unity.render-pipelines.universal/Editor/VFXGraph/Shaders/Templates/ParticleLines/PassForward2D.template
index f65f116f946..a9444c16d8b 100644
--- a/Packages/com.unity.render-pipelines.universal/Editor/VFXGraph/Shaders/Templates/ParticleLines/PassForward2D.template
+++ b/Packages/com.unity.render-pipelines.universal/Editor/VFXGraph/Shaders/Templates/ParticleLines/PassForward2D.template
@@ -1,8 +1,9 @@
 // 2D Pass
 Pass
-{		
+{
+    Name ${VFXPassForward2D}
 	Tags { "LightMode"=${VFXPassForward2D} }
-	
+
 	HLSLPROGRAM
 	#pragma target 4.5
 	${VFXInclude("Shaders/ParticleLines/PassForwardCommon.template")}
diff --git a/Packages/com.unity.render-pipelines.universal/Editor/VFXGraph/Shaders/Templates/ParticleLinesSW/PassForward2D.template b/Packages/com.unity.render-pipelines.universal/Editor/VFXGraph/Shaders/Templates/ParticleLinesSW/PassForward2D.template
index 922153d13bd..d418a4e2819 100644
--- a/Packages/com.unity.render-pipelines.universal/Editor/VFXGraph/Shaders/Templates/ParticleLinesSW/PassForward2D.template
+++ b/Packages/com.unity.render-pipelines.universal/Editor/VFXGraph/Shaders/Templates/ParticleLinesSW/PassForward2D.template
@@ -1,8 +1,9 @@
 // 2D pass
 Pass
-{		
+{
+    Name ${VFXPassForward2D}
 	Tags { "LightMode"=${VFXPassForward2D} }
-	
+
 	HLSLPROGRAM
 	#pragma target 4.5
 	${VFXInclude("Shaders/ParticleLinesSW/PassForwardCommon.template")}
diff --git a/Packages/com.unity.render-pipelines.universal/Editor/VFXGraph/Shaders/Templates/ParticleMeshes/PassForward2D.template b/Packages/com.unity.render-pipelines.universal/Editor/VFXGraph/Shaders/Templates/ParticleMeshes/PassForward2D.template
index 690885dc5f9..c257559c336 100644
--- a/Packages/com.unity.render-pipelines.universal/Editor/VFXGraph/Shaders/Templates/ParticleMeshes/PassForward2D.template
+++ b/Packages/com.unity.render-pipelines.universal/Editor/VFXGraph/Shaders/Templates/ParticleMeshes/PassForward2D.template
@@ -1,8 +1,9 @@
 // Forward pass
 Pass
-{		
+{
+    Name ${VFXPassForward2D}
 	Tags { "LightMode"=${VFXPassForward2D} }
-	
+
 	HLSLPROGRAM
 	#pragma target 4.5
 	${VFXInclude("Shaders/ParticleMeshes/PassForwardCommon.template")}
diff --git a/Packages/com.unity.render-pipelines.universal/Editor/VFXGraph/Shaders/Templates/ParticleMeshesLit/PassDepth.template b/Packages/com.unity.render-pipelines.universal/Editor/VFXGraph/Shaders/Templates/ParticleMeshesLit/PassDepth.template
index fac07ddcd3d..6649e53e788 100644
--- a/Packages/com.unity.render-pipelines.universal/Editor/VFXGraph/Shaders/Templates/ParticleMeshesLit/PassDepth.template
+++ b/Packages/com.unity.render-pipelines.universal/Editor/VFXGraph/Shaders/Templates/ParticleMeshesLit/PassDepth.template
@@ -1,10 +1,11 @@
 Pass
 {
+    Name "DepthOnly"
     Tags { "LightMode"="DepthOnly" }
 
     ZWrite On
     Blend Off
-    
+
     HLSLPROGRAM
     #define VFX_PASSDEPTH VFX_PASSDEPTH_ACTUAL
     ${VFXPassDepthAdditionalPragma}
diff --git a/Packages/com.unity.render-pipelines.universal/Editor/VFXGraph/Shaders/Templates/ParticleMeshesLit/PassDepthNormal.template b/Packages/com.unity.render-pipelines.universal/Editor/VFXGraph/Shaders/Templates/ParticleMeshesLit/PassDepthNormal.template
index 5d0388fe731..490f03abfdf 100644
--- a/Packages/com.unity.render-pipelines.universal/Editor/VFXGraph/Shaders/Templates/ParticleMeshesLit/PassDepthNormal.template
+++ b/Packages/com.unity.render-pipelines.universal/Editor/VFXGraph/Shaders/Templates/ParticleMeshesLit/PassDepthNormal.template
@@ -1,10 +1,11 @@
 Pass
 {
+    Name "DepthNormals"
     Tags { "LightMode"="DepthNormals" }
 
     ZWrite On
     Blend Off
-    
+
     HLSLPROGRAM
     #define VFX_PASSDEPTH VFX_PASSDEPTH_ACTUAL
     #define WRITE_NORMAL_BUFFER
diff --git a/Packages/com.unity.render-pipelines.universal/Editor/VFXGraph/Shaders/Templates/ParticleMeshesLit/PassForward.template b/Packages/com.unity.render-pipelines.universal/Editor/VFXGraph/Shaders/Templates/ParticleMeshesLit/PassForward.template
index d56870e6ead..77e04773168 100644
--- a/Packages/com.unity.render-pipelines.universal/Editor/VFXGraph/Shaders/Templates/ParticleMeshesLit/PassForward.template
+++ b/Packages/com.unity.render-pipelines.universal/Editor/VFXGraph/Shaders/Templates/ParticleMeshesLit/PassForward.template
@@ -1,7 +1,8 @@
 // Forward pass
 Pass
 {
-    Tags { "LightMode"="${VFXURPForwardPassName}" }
+    Name "ForwardLit"
+    Tags { "LightMode"="${VFXURPForwardPassLightMode}" }
 
     ${VFXStencilForward}
 
diff --git a/Packages/com.unity.render-pipelines.universal/Editor/VFXGraph/Shaders/Templates/ParticleMeshesLit/PassGBuffer.template b/Packages/com.unity.render-pipelines.universal/Editor/VFXGraph/Shaders/Templates/ParticleMeshesLit/PassGBuffer.template
index 07c5913825a..eebac5d8f99 100644
--- a/Packages/com.unity.render-pipelines.universal/Editor/VFXGraph/Shaders/Templates/ParticleMeshesLit/PassGBuffer.template
+++ b/Packages/com.unity.render-pipelines.universal/Editor/VFXGraph/Shaders/Templates/ParticleMeshesLit/PassGBuffer.template
@@ -1,5 +1,6 @@
 Pass
 {
+    Name "GBuffer"
     Tags { "LightMode"="UniversalGBuffer" }
 
     ${VFXStencilGBuffer}
diff --git a/Packages/com.unity.render-pipelines.universal/Editor/VFXGraph/Shaders/Templates/ParticleMeshesLit/PassSelection.template b/Packages/com.unity.render-pipelines.universal/Editor/VFXGraph/Shaders/Templates/ParticleMeshesLit/PassSelection.template
index 252b17d4b81..f3b2cc6646a 100644
--- a/Packages/com.unity.render-pipelines.universal/Editor/VFXGraph/Shaders/Templates/ParticleMeshesLit/PassSelection.template
+++ b/Packages/com.unity.render-pipelines.universal/Editor/VFXGraph/Shaders/Templates/ParticleMeshesLit/PassSelection.template
@@ -1,5 +1,6 @@
 Pass
 {
+    Name "SceneSelectionPass"
     Tags { "LightMode"="SceneSelectionPass" }
 
     ZWrite On
@@ -14,6 +15,7 @@ Pass
 
 Pass
 {
+    Name "Picking"
     Tags { "LightMode"="Picking" }
 
     ZWrite On
diff --git a/Packages/com.unity.render-pipelines.universal/Editor/VFXGraph/Shaders/Templates/ParticleMeshesLit/PassShadowCaster.template b/Packages/com.unity.render-pipelines.universal/Editor/VFXGraph/Shaders/Templates/ParticleMeshesLit/PassShadowCaster.template
index 465938f251f..73b754b566b 100644
--- a/Packages/com.unity.render-pipelines.universal/Editor/VFXGraph/Shaders/Templates/ParticleMeshesLit/PassShadowCaster.template
+++ b/Packages/com.unity.render-pipelines.universal/Editor/VFXGraph/Shaders/Templates/ParticleMeshesLit/PassShadowCaster.template
@@ -1,6 +1,7 @@
 // Shadow pass
 Pass
 {
+    Name ${VFXPassShadow}
     Tags { "LightMode"=${VFXPassShadow} }
 
     ZClip [_ZClip]
diff --git a/Packages/com.unity.render-pipelines.universal/Editor/VFXGraph/Shaders/Templates/ParticleMeshesLit/PassVelocity.template b/Packages/com.unity.render-pipelines.universal/Editor/VFXGraph/Shaders/Templates/ParticleMeshesLit/PassVelocity.template
index 72b4c0b23b3..0b0bf3e4311 100644
--- a/Packages/com.unity.render-pipelines.universal/Editor/VFXGraph/Shaders/Templates/ParticleMeshesLit/PassVelocity.template
+++ b/Packages/com.unity.render-pipelines.universal/Editor/VFXGraph/Shaders/Templates/ParticleMeshesLit/PassVelocity.template
@@ -1,5 +1,6 @@
 Pass
 {
+    Name "MotionVectors"
     Tags { "LightMode"="MotionVectors" }
 
     ZWrite On
diff --git a/Packages/com.unity.render-pipelines.universal/Editor/VFXGraph/Shaders/Templates/ParticlePlanarPrimitives/PassForward2D.template b/Packages/com.unity.render-pipelines.universal/Editor/VFXGraph/Shaders/Templates/ParticlePlanarPrimitives/PassForward2D.template
index 5155b80bde5..76381a4d20e 100644
--- a/Packages/com.unity.render-pipelines.universal/Editor/VFXGraph/Shaders/Templates/ParticlePlanarPrimitives/PassForward2D.template
+++ b/Packages/com.unity.render-pipelines.universal/Editor/VFXGraph/Shaders/Templates/ParticlePlanarPrimitives/PassForward2D.template
@@ -1,6 +1,7 @@
 // Forward pass
 Pass
-{		
+{
+    Name ${VFXPassForward2D}
 	Tags { "LightMode"=${VFXPassForward2D} }
 	
 	HLSLPROGRAM
diff --git a/Packages/com.unity.render-pipelines.universal/Editor/VFXGraph/Shaders/Templates/ParticlePlanarPrimitivesLit/PassDepth.template b/Packages/com.unity.render-pipelines.universal/Editor/VFXGraph/Shaders/Templates/ParticlePlanarPrimitivesLit/PassDepth.template
index 308c18fb023..6000acf4009 100644
--- a/Packages/com.unity.render-pipelines.universal/Editor/VFXGraph/Shaders/Templates/ParticlePlanarPrimitivesLit/PassDepth.template
+++ b/Packages/com.unity.render-pipelines.universal/Editor/VFXGraph/Shaders/Templates/ParticlePlanarPrimitivesLit/PassDepth.template
@@ -1,5 +1,6 @@
 Pass
 {
+    Name "DepthOnly"
     Tags { "LightMode"="DepthOnly" }
 
     ZWrite On
diff --git a/Packages/com.unity.render-pipelines.universal/Editor/VFXGraph/Shaders/Templates/ParticlePlanarPrimitivesLit/PassDepthNormal.template b/Packages/com.unity.render-pipelines.universal/Editor/VFXGraph/Shaders/Templates/ParticlePlanarPrimitivesLit/PassDepthNormal.template
index 8d67897a475..76c5a699223 100644
--- a/Packages/com.unity.render-pipelines.universal/Editor/VFXGraph/Shaders/Templates/ParticlePlanarPrimitivesLit/PassDepthNormal.template
+++ b/Packages/com.unity.render-pipelines.universal/Editor/VFXGraph/Shaders/Templates/ParticlePlanarPrimitivesLit/PassDepthNormal.template
@@ -1,5 +1,6 @@
 Pass
 {
+    Name "DepthNormals"
     Tags { "LightMode"="DepthNormals" }
 
     ZWrite On
diff --git a/Packages/com.unity.render-pipelines.universal/Editor/VFXGraph/Shaders/Templates/ParticlePlanarPrimitivesLit/PassForward.template b/Packages/com.unity.render-pipelines.universal/Editor/VFXGraph/Shaders/Templates/ParticlePlanarPrimitivesLit/PassForward.template
index ba22a764ce8..5e2f13adc4c 100644
--- a/Packages/com.unity.render-pipelines.universal/Editor/VFXGraph/Shaders/Templates/ParticlePlanarPrimitivesLit/PassForward.template
+++ b/Packages/com.unity.render-pipelines.universal/Editor/VFXGraph/Shaders/Templates/ParticlePlanarPrimitivesLit/PassForward.template
@@ -1,7 +1,8 @@
 // Forward pass
 Pass
 {
-    Tags { "LightMode"="${VFXURPForwardPassName}"}
+    Name "ForwardLit"
+    Tags { "LightMode"="${VFXURPForwardPassLightMode}"}
 
     ${VFXStencilForward}
 
diff --git a/Packages/com.unity.render-pipelines.universal/Editor/VFXGraph/Shaders/Templates/ParticlePlanarPrimitivesLit/PassGBuffer.template b/Packages/com.unity.render-pipelines.universal/Editor/VFXGraph/Shaders/Templates/ParticlePlanarPrimitivesLit/PassGBuffer.template
index 672a98bb3f1..877995b8e86 100644
--- a/Packages/com.unity.render-pipelines.universal/Editor/VFXGraph/Shaders/Templates/ParticlePlanarPrimitivesLit/PassGBuffer.template
+++ b/Packages/com.unity.render-pipelines.universal/Editor/VFXGraph/Shaders/Templates/ParticlePlanarPrimitivesLit/PassGBuffer.template
@@ -1,5 +1,6 @@
 Pass
 {
+    Name "GBuffer"
     Tags { "LightMode"="UniversalGBuffer" }
 
     ${VFXStencilGBuffer}
diff --git a/Packages/com.unity.render-pipelines.universal/Editor/VFXGraph/Shaders/Templates/ParticlePlanarPrimitivesLit/PassSelection.template b/Packages/com.unity.render-pipelines.universal/Editor/VFXGraph/Shaders/Templates/ParticlePlanarPrimitivesLit/PassSelection.template
index 3b0004b5807..ed351f19159 100644
--- a/Packages/com.unity.render-pipelines.universal/Editor/VFXGraph/Shaders/Templates/ParticlePlanarPrimitivesLit/PassSelection.template
+++ b/Packages/com.unity.render-pipelines.universal/Editor/VFXGraph/Shaders/Templates/ParticlePlanarPrimitivesLit/PassSelection.template
@@ -1,5 +1,6 @@
 Pass
 {
+    Name "SceneSelectionPass"
     Tags { "LightMode"="SceneSelectionPass" }
 
     ZWrite On
@@ -13,6 +14,7 @@ Pass
 
 Pass
 {
+    Name "SceneSelectionPass"
     Tags { "LightMode"="Picking" }
 
     ZWrite On
diff --git a/Packages/com.unity.render-pipelines.universal/Editor/VFXGraph/Shaders/Templates/ParticlePlanarPrimitivesLit/PassShadowCaster.template b/Packages/com.unity.render-pipelines.universal/Editor/VFXGraph/Shaders/Templates/ParticlePlanarPrimitivesLit/PassShadowCaster.template
index 89a4f04731e..b938b72c13c 100644
--- a/Packages/com.unity.render-pipelines.universal/Editor/VFXGraph/Shaders/Templates/ParticlePlanarPrimitivesLit/PassShadowCaster.template
+++ b/Packages/com.unity.render-pipelines.universal/Editor/VFXGraph/Shaders/Templates/ParticlePlanarPrimitivesLit/PassShadowCaster.template
@@ -1,5 +1,6 @@
 Pass
 {
+    Name ${VFXPassShadow}
     Tags { "LightMode"=${VFXPassShadow} }
 
     ZClip [_ZClip]
diff --git a/Packages/com.unity.render-pipelines.universal/Editor/VFXGraph/Shaders/Templates/ParticlePlanarPrimitivesLit/PassVelocity.template b/Packages/com.unity.render-pipelines.universal/Editor/VFXGraph/Shaders/Templates/ParticlePlanarPrimitivesLit/PassVelocity.template
index 6904d8aaa8d..743a63c81a2 100644
--- a/Packages/com.unity.render-pipelines.universal/Editor/VFXGraph/Shaders/Templates/ParticlePlanarPrimitivesLit/PassVelocity.template
+++ b/Packages/com.unity.render-pipelines.universal/Editor/VFXGraph/Shaders/Templates/ParticlePlanarPrimitivesLit/PassVelocity.template
@@ -1,5 +1,6 @@
 Pass
 {
+    Name "MotionVectors"
     Tags { "LightMode"="MotionVectors" }
 
     ZWrite On
diff --git a/Packages/com.unity.render-pipelines.universal/Editor/VFXGraph/Shaders/Templates/ParticlePoints/PassForward2D.template b/Packages/com.unity.render-pipelines.universal/Editor/VFXGraph/Shaders/Templates/ParticlePoints/PassForward2D.template
index 137fe4aa3e7..f210575af90 100644
--- a/Packages/com.unity.render-pipelines.universal/Editor/VFXGraph/Shaders/Templates/ParticlePoints/PassForward2D.template
+++ b/Packages/com.unity.render-pipelines.universal/Editor/VFXGraph/Shaders/Templates/ParticlePoints/PassForward2D.template
@@ -1,6 +1,7 @@
 // Forward pass
 Pass
-{		
+{
+    Name ${VFXPassForward2D}
 	Tags { "LightMode"=${VFXPassForward2D} }
 	
 	HLSLPROGRAM
diff --git a/Packages/com.unity.render-pipelines.universal/Editor/VFXGraph/Shaders/VFXPasses.template b/Packages/com.unity.render-pipelines.universal/Editor/VFXGraph/Shaders/VFXPasses.template
index 4877874c36d..79d9ba2795d 100644
--- a/Packages/com.unity.render-pipelines.universal/Editor/VFXGraph/Shaders/VFXPasses.template
+++ b/Packages/com.unity.render-pipelines.universal/Editor/VFXGraph/Shaders/VFXPasses.template
@@ -27,7 +27,7 @@ ${VFXEnd}
 
 ${VFXBegin:VFXPassForwardLitAdditionalPragma}
 #pragma multi_compile _ _MAIN_LIGHT_SHADOWS _MAIN_LIGHT_SHADOWS_CASCADE _MAIN_LIGHT_SHADOWS_SCREEN
-#pragma multi_compile _ _ADDITIONAL_LIGHTS
+#pragma multi_compile _ _ADDITIONAL_LIGHTS_VERTEX _ADDITIONAL_LIGHTS
 #pragma multi_compile_fragment _ _ADDITIONAL_LIGHT_SHADOWS
 #pragma multi_compile_fragment _ _REFLECTION_PROBE_BLENDING
 #pragma multi_compile_fragment _ _REFLECTION_PROBE_BOX_PROJECTION
diff --git a/Packages/com.unity.render-pipelines.universal/Editor/VFXGraph/VFXAbstractParticleURPLitOutput.cs b/Packages/com.unity.render-pipelines.universal/Editor/VFXGraph/VFXAbstractParticleURPLitOutput.cs
index 5c5db03b541..83c3fd2fabf 100644
--- a/Packages/com.unity.render-pipelines.universal/Editor/VFXGraph/VFXAbstractParticleURPLitOutput.cs
+++ b/Packages/com.unity.render-pipelines.universal/Editor/VFXGraph/VFXAbstractParticleURPLitOutput.cs
@@ -775,9 +775,9 @@ public override IEnumerable<KeyValuePair<string, VFXShaderWriter>> additionalRep
                     gbufferDefines.Write("#define _SPECULAR_SETUP");
                 yield return new KeyValuePair<string, VFXShaderWriter>("${VFXURPGBufferDefines}", gbufferDefines);
 
-                var forwardPassName = new VFXShaderWriter();
-                forwardPassName.Write(materialType == MaterialType.SixWaySmokeLit ? "UniversalForwardOnly" : "UniversalForward");
-                yield return new KeyValuePair<string, VFXShaderWriter>("${VFXURPForwardPassName}", forwardPassName);
+                var forwardPassLightMode = new VFXShaderWriter();
+                forwardPassLightMode.Write(materialType == MaterialType.SixWaySmokeLit ? "UniversalForwardOnly" : "UniversalForward");
+                yield return new KeyValuePair<string, VFXShaderWriter>("${VFXURPForwardPassLightMode}", forwardPassLightMode);
             }
         }
     }
diff --git a/Packages/com.unity.render-pipelines.universal/Editor/VFXGraph/VFXURPBinder.cs b/Packages/com.unity.render-pipelines.universal/Editor/VFXGraph/VFXURPBinder.cs
index 1d46437c03b..5c4e1074d2f 100644
--- a/Packages/com.unity.render-pipelines.universal/Editor/VFXGraph/VFXURPBinder.cs
+++ b/Packages/com.unity.render-pipelines.universal/Editor/VFXGraph/VFXURPBinder.cs
@@ -308,6 +308,19 @@ public override ShaderGraphBinder GetShaderGraphDescriptor(VFXContext context, V
                 populateWithCustomInterpolators = true,
                 fields = GenerateSurfaceDescriptionInput(context, data).ToArray()
             };
+
+            var output = context as VFXAbstractRenderedOutput;
+            List<(KeywordDescriptor oldDesc, int value)> keywordsToDefines = new List<(KeywordDescriptor oldDesc, int value)>();
+            if (output != null)
+            {
+                keywordsToDefines.Add((CoreKeywordDescriptors.StaticLightmap, 0));
+                keywordsToDefines.Add((CoreKeywordDescriptors.DirectionalLightmapCombined, 0));
+                keywordsToDefines.Add((CoreKeywordDescriptors.UseLegacyLightmaps, 0));
+                keywordsToDefines.Add((CoreKeywordDescriptors.LightmapBicubicSampling, 0));
+                keywordsToDefines.Add((CoreKeywordDescriptors.LightmapShadowMixing, 0));
+                keywordsToDefines.Add((CoreKeywordDescriptors.DynamicLightmap, 0));
+            }
+
             return new ShaderGraphBinder()
             {
                 baseStructs = new StructCollection
@@ -329,9 +342,32 @@ public override ShaderGraphBinder GetShaderGraphDescriptor(VFXContext context, V
                     ( Pragma.Target(ShaderModel.Target35), Pragma.Target(ShaderModel.Target45) ),
                     ( Pragma.Target(ShaderModel.Target40), Pragma.Target(ShaderModel.Target45) ),
                 },
-                useFragInputs = false
+                useFragInputs = false,
+                keywordsToDefines = keywordsToDefines.ToArray()
             };
         }
+
+        public override List<PassCollection.Item> FilterOutPasses(PassCollection passes, VFXContext context)
+        {
+            List<PassCollection.Item> filteredPasses = new List<PassCollection.Item>(passes.Count());
+            var outputContext = context as VFXAbstractParticleOutput;
+            bool hasMotionVector =  outputContext.hasMotionVector;
+            bool hasShadowCasting = outputContext.hasShadowCasting;
+            bool isOpaque = outputContext.isBlendModeOpaque;
+
+            foreach (PassCollection.Item item in passes)
+            {
+                bool skipPass = false;
+                skipPass |= item.descriptor.lightMode == "Meta";
+                skipPass |= item.descriptor.lightMode == "XRMotionVectors";
+                skipPass |= (!hasMotionVector && item.descriptor.lightMode == "MotionVectors");
+                skipPass |= (!hasShadowCasting && item.descriptor.lightMode == "ShadowCaster");
+                skipPass |= (!isOpaque && item.descriptor.lightMode is "UniversalGBuffer" or "DepthOnly" or "DepthNormals");
+                if(!skipPass)
+                    filteredPasses.Add(item);
+            }
+            return filteredPasses;
+        }
     }
 
     class VFXLWRPBinder : VFXURPBinder
diff --git a/Packages/com.unity.render-pipelines.universal/Editor/VFXGraph/VFXURPSubOutput.cs b/Packages/com.unity.render-pipelines.universal/Editor/VFXGraph/VFXURPSubOutput.cs
index e72efd65498..02359b812b0 100644
--- a/Packages/com.unity.render-pipelines.universal/Editor/VFXGraph/VFXURPSubOutput.cs
+++ b/Packages/com.unity.render-pipelines.universal/Editor/VFXGraph/VFXURPSubOutput.cs
@@ -1,3 +1,5 @@
+using UnityEngine.Rendering.Universal;
+
 #if HAS_VFX_GRAPH
 
 namespace UnityEditor.VFX.URP
@@ -6,6 +8,10 @@ class VFXURPSubOutput : VFXSRPSubOutput
     {
         //URP only support motion vector on opaque geometry (with or without ShaderGraph)
         public override bool supportsMotionVector => owner.isBlendModeOpaque;
+        public override string GetRenderPipelineTagStr()
+        {
+            return UniversalRenderPipeline.k_ShaderTagName;
+        }
     }
 }
 #endif
diff --git a/Packages/com.unity.shadergraph/Samples~/UGUIShaders/ShaderGraphExtensions.meta b/Packages/com.unity.render-pipelines.universal/Runtime/2D/Lights.meta
similarity index 77%
rename from Packages/com.unity.shadergraph/Samples~/UGUIShaders/ShaderGraphExtensions.meta
rename to Packages/com.unity.render-pipelines.universal/Runtime/2D/Lights.meta
index f5600a00876..800d4bcdbe8 100644
--- a/Packages/com.unity.shadergraph/Samples~/UGUIShaders/ShaderGraphExtensions.meta
+++ b/Packages/com.unity.render-pipelines.universal/Runtime/2D/Lights.meta
@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 3abc42b06d7732f46b578995c39faba9
+guid: 2e4bcb6764ed4a7439184ab357aa4fb2
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}
diff --git a/Packages/com.unity.render-pipelines.universal/Runtime/2D/Light2D.cs b/Packages/com.unity.render-pipelines.universal/Runtime/2D/Lights/Light2D.cs
similarity index 82%
rename from Packages/com.unity.render-pipelines.universal/Runtime/2D/Light2D.cs
rename to Packages/com.unity.render-pipelines.universal/Runtime/2D/Lights/Light2D.cs
index 235ffb585d8..e9f2e6a643b 100644
--- a/Packages/com.unity.render-pipelines.universal/Runtime/2D/Light2D.cs
+++ b/Packages/com.unity.render-pipelines.universal/Runtime/2D/Lights/Light2D.cs
@@ -4,6 +4,8 @@
 using UnityEngine.U2D;
 using UnityEngine.Rendering.RenderGraphModule;
 using System.Collections.Generic;
+using UnityEditor;
+
 #if UNITY_EDITOR
 using System.Linq;
 #endif
@@ -55,7 +57,11 @@ public enum LightType
             /// <summary>
             /// Shapeless light that affects the entire screen.
             /// </summary>
-            Global = 4
+            Global = 4,
+            /// <summary>
+            /// Light completely supplied by a provider
+            /// </summary>
+            Provider = 5,
         }
 
         /// <summary>
@@ -96,12 +102,14 @@ private enum ComponentVersions
         {
             Version_Unserialized = 0,
             Version_1 = 1,
-            Version_2 = 2
+            Version_2 = 2,
+            Version_3 = 3
         }
 
-        const ComponentVersions k_CurrentComponentVersion = ComponentVersions.Version_2;
+        const ComponentVersions k_CurrentComponentVersion = ComponentVersions.Version_3;
         [SerializeField] ComponentVersions m_ComponentVersion = ComponentVersions.Version_Unserialized;
 
+        static Bounds kEmptyBounds = new Bounds(Vector3.zero, Vector3.zero);
 
 #if USING_ANIMATION_MODULE
         [UnityEngine.Animations.NotKeyable]
@@ -110,6 +118,12 @@ private enum ComponentVersions
         [SerializeField, FormerlySerializedAs("m_LightOperationIndex")]
         int m_BlendStyleIndex = 0;
 
+        [SerializeReference] Light2DProvider m_Light2DProvider;
+
+#if UNITY_EDITOR
+        [SerializeReference] Light2DProviderSources m_SelectionSources = new Light2DProviderSources();
+#endif
+
         [SerializeField] float m_FalloffIntensity = 0.5f;
 
         [ColorUsage(true)]
@@ -212,17 +226,27 @@ internal Mesh lightMesh
         /// </summary>
         public LightType lightType
         {
-            get => m_LightType;
+            get { return (LightType)m_LightType; }
             set
             {
-                if (m_LightType != value)
-                    UpdateMesh();
-
                 m_LightType = value;
-                Light2DManager.ErrorIfDuplicateGlobalLight(this);
+
+#if UNITY_EDITOR
+                if((int)m_LightType != (int)LightType.Provider)
+                    m_SelectionSources.selectedHashCode = (int)m_LightType;
+#endif
             }
         }
 
+        /// <summary>
+        /// Gets or sets the current light2DProvider
+        /// </summary>
+        public Light2DProvider light2DProvider
+        {
+            get { return m_Light2DProvider; }
+            set { m_Light2DProvider = value; }
+        }
+
         /// <summary>
         /// The lights current operation index
         /// </summary>
@@ -294,7 +318,7 @@ public LightType lightType
         /// <summary>
         /// The Sprite that's used by the Sprite Light type to control the shape light
         /// </summary>
-        public Sprite lightCookieSprite { get { return m_LightType != LightType.Point ? m_LightCookieSprite : m_DeprecatedPointLightCookieSprite; } set => m_LightCookieSprite = value; }
+        public Sprite lightCookieSprite { get { return lightType != LightType.Point ? m_LightCookieSprite : m_DeprecatedPointLightCookieSprite; } set => m_LightCookieSprite = value; }
 
         /// <summary>
         /// Controls the brightness and distance of the fall off (edge) of the light
@@ -485,6 +509,16 @@ internal bool NeedsColorIndexBaking()
             return false;
         }
 
+        internal Bounds UpdateProviderMesh()
+        {
+            m_Mesh = light2DProvider.GetMesh();
+
+            if (m_Mesh != null)
+                return m_Mesh.bounds;
+            else
+                return kEmptyBounds;
+        }
+        
         internal void UpdateCookieSpriteTexture()
         {
             m_CookieSpriteTexture?.Release();
@@ -496,40 +530,61 @@ internal void UpdateCookieSpriteTexture()
 
         internal void UpdateMesh(bool forceUpdate = false)
         {
-            var shapePathHash = LightUtility.GetShapePathHash(shapePath);
-            var fallOffSizeChanged = LightUtility.CheckForChange(m_ShapeLightFalloffSize, ref m_PreviousShapeLightFalloffSize);
-            var parametricRadiusChanged = LightUtility.CheckForChange(m_ShapeLightParametricRadius, ref m_PreviousShapeLightParametricRadius);
-            var parametricSidesChanged = LightUtility.CheckForChange(m_ShapeLightParametricSides, ref m_PreviousShapeLightParametricSides);
-            var parametricAngleOffsetChanged = LightUtility.CheckForChange(m_ShapeLightParametricAngleOffset, ref m_PreviousShapeLightParametricAngleOffset);
-            var spriteInstanceChanged = LightUtility.CheckForChange(lightCookieSpriteEntityId, ref m_PreviousLightCookieSprite);
-            var shapePathHashChanged = LightUtility.CheckForChange(shapePathHash, ref m_PreviousShapePathHash);
-            var lightTypeChanged = LightUtility.CheckForChange(m_LightType, ref m_PreviousLightType);
-            var hashChanged = fallOffSizeChanged || parametricRadiusChanged || parametricSidesChanged ||
-                parametricAngleOffsetChanged || spriteInstanceChanged || shapePathHashChanged || lightTypeChanged || NeedsColorIndexBaking();
-
-            // Mesh Rebuilding
-            if (hashChanged || forceUpdate)
+            var lightTypeChanged = LightUtility.CheckForChange(lightType, ref m_PreviousLightType);
+
+            if (lightType != LightType.Provider)
             {
-                var batchChannelColor = LightBatch.GetBatchColor();
 
-                switch (m_LightType)
+                var shapePathHash = LightUtility.GetShapePathHash(shapePath);
+                var fallOffSizeChanged = LightUtility.CheckForChange(m_ShapeLightFalloffSize, ref m_PreviousShapeLightFalloffSize);
+                var parametricRadiusChanged = LightUtility.CheckForChange(m_ShapeLightParametricRadius, ref m_PreviousShapeLightParametricRadius);
+                var parametricSidesChanged = LightUtility.CheckForChange(m_ShapeLightParametricSides, ref m_PreviousShapeLightParametricSides);
+                var parametricAngleOffsetChanged = LightUtility.CheckForChange(m_ShapeLightParametricAngleOffset, ref m_PreviousShapeLightParametricAngleOffset);
+                var spriteInstanceChanged = LightUtility.CheckForChange(lightCookieSpriteEntityId, ref m_PreviousLightCookieSprite);
+                var shapePathHashChanged = LightUtility.CheckForChange(shapePathHash, ref m_PreviousShapePathHash);
+                var hashChanged = fallOffSizeChanged || parametricRadiusChanged || parametricSidesChanged ||
+                    parametricAngleOffsetChanged || spriteInstanceChanged || shapePathHashChanged || lightTypeChanged || NeedsColorIndexBaking();
+
+                // Mesh Rebuilding
+                if (hashChanged || forceUpdate)
                 {
-                    case LightType.Freeform:
-                        m_LocalBounds = LightUtility.GenerateShapeMesh(this, m_ShapePath, m_ShapeLightFalloffSize, batchChannelColor);
-                        break;
-                    case LightType.Parametric:
-                        m_LocalBounds = LightUtility.GenerateParametricMesh(this, m_ShapeLightParametricRadius, m_ShapeLightFalloffSize, m_ShapeLightParametricAngleOffset, m_ShapeLightParametricSides, batchChannelColor);
-                        break;
-                    case LightType.Sprite:
-                        m_LocalBounds = UpdateSpriteMesh();
-                        break;
-                    case LightType.Point:
-                        m_LocalBounds = LightUtility.GenerateParametricMesh(this, 1.412135f, 0, 0, 4, batchChannelColor);
-                        break;
-                }
+                    var batchChannelColor = LightBatch.GetBatchColor();
 
-                UpdateCookieSpriteTexture();
-                UpdateBatchSlotIndex();
+                    switch (lightType)
+                    {
+                        case LightType.Freeform:
+                            m_LocalBounds = LightUtility.GenerateShapeMesh(this, m_ShapePath, m_ShapeLightFalloffSize, batchChannelColor);
+                            break;
+                        case LightType.Parametric:
+                            m_LocalBounds = LightUtility.GenerateParametricMesh(this, m_ShapeLightParametricRadius, m_ShapeLightFalloffSize, m_ShapeLightParametricAngleOffset, m_ShapeLightParametricSides, batchChannelColor);
+                            break;
+                        case LightType.Sprite:
+                            m_LocalBounds = UpdateSpriteMesh();
+                            break;
+                        case LightType.Point:
+                            m_LocalBounds = LightUtility.GenerateParametricMesh(this, 1.412135f, 0, 0, 4, batchChannelColor);
+                            break;
+                    }
+
+                    UpdateCookieSpriteTexture();
+                    UpdateBatchSlotIndex();
+                }
+            }
+            else
+            {
+                if (light2DProvider != null)
+                {
+                    if (m_Mesh != null)
+                    {
+                        m_Mesh = light2DProvider.GetMesh();
+                        m_LocalBounds = m_Mesh.bounds;
+                    }
+                }
+                else
+                {
+                    m_Mesh.Clear();
+                    m_LocalBounds = kEmptyBounds;
+                }
             }
         }
 
@@ -608,7 +663,7 @@ private void OnDisable()
 
         private void LateUpdate()
         {
-            if (m_LightType == LightType.Global)
+            if (lightType == LightType.Global)
                 return;
 
             UpdateMesh(forceUpdate);
@@ -657,6 +712,15 @@ public void OnAfterDeserialize()
             {
                 m_ShadowSoftness = 0;
             }
+
+
+            if(m_ComponentVersion < ComponentVersions.Version_3)
+            {
+#if UNITY_EDITOR
+                m_SelectionSources.selectedHashCode = (int)m_LightType;
+#endif 
+            }
         }
     }
+
 }
diff --git a/Packages/com.unity.render-pipelines.universal/Runtime/2D/Light2D.cs.meta b/Packages/com.unity.render-pipelines.universal/Runtime/2D/Lights/Light2D.cs.meta
similarity index 100%
rename from Packages/com.unity.render-pipelines.universal/Runtime/2D/Light2D.cs.meta
rename to Packages/com.unity.render-pipelines.universal/Runtime/2D/Lights/Light2D.cs.meta
diff --git a/Packages/com.unity.render-pipelines.universal/Runtime/2D/Light2DAuthoring.cs b/Packages/com.unity.render-pipelines.universal/Runtime/2D/Lights/Light2DAuthoring.cs
similarity index 73%
rename from Packages/com.unity.render-pipelines.universal/Runtime/2D/Light2DAuthoring.cs
rename to Packages/com.unity.render-pipelines.universal/Runtime/2D/Lights/Light2DAuthoring.cs
index 44b94d6d8e8..92a0d237640 100644
--- a/Packages/com.unity.render-pipelines.universal/Runtime/2D/Light2DAuthoring.cs
+++ b/Packages/com.unity.render-pipelines.universal/Runtime/2D/Lights/Light2DAuthoring.cs
@@ -17,8 +17,15 @@ public sealed partial class Light2D
 
         private void OnDrawGizmos()
         {
-            Gizmos.color = Color.blue;
-            Gizmos.DrawIcon(transform.position, s_IconsPath + s_LightIconFileNames[(int)m_LightType], true);
+            if (lightType != LightType.Provider)
+            {
+                Gizmos.color = Color.blue;
+                Gizmos.DrawIcon(transform.position, s_IconsPath + s_LightIconFileNames[(int)lightType], true);
+            }
+            else
+            {
+                light2DProvider.OnDrawGizmos(transform);
+            }
         }
 
         void Reset()
diff --git a/Packages/com.unity.render-pipelines.universal/Runtime/2D/Light2DAuthoring.cs.meta b/Packages/com.unity.render-pipelines.universal/Runtime/2D/Lights/Light2DAuthoring.cs.meta
similarity index 100%
rename from Packages/com.unity.render-pipelines.universal/Runtime/2D/Light2DAuthoring.cs.meta
rename to Packages/com.unity.render-pipelines.universal/Runtime/2D/Lights/Light2DAuthoring.cs.meta
diff --git a/Packages/com.unity.render-pipelines.universal/Runtime/2D/Light2DBlendStyle.cs b/Packages/com.unity.render-pipelines.universal/Runtime/2D/Lights/Light2DBlendStyle.cs
similarity index 100%
rename from Packages/com.unity.render-pipelines.universal/Runtime/2D/Light2DBlendStyle.cs
rename to Packages/com.unity.render-pipelines.universal/Runtime/2D/Lights/Light2DBlendStyle.cs
diff --git a/Packages/com.unity.render-pipelines.universal/Runtime/2D/Light2DBlendStyle.cs.meta b/Packages/com.unity.render-pipelines.universal/Runtime/2D/Lights/Light2DBlendStyle.cs.meta
similarity index 100%
rename from Packages/com.unity.render-pipelines.universal/Runtime/2D/Light2DBlendStyle.cs.meta
rename to Packages/com.unity.render-pipelines.universal/Runtime/2D/Lights/Light2DBlendStyle.cs.meta
diff --git a/Packages/com.unity.render-pipelines.universal/Runtime/2D/Light2DCullResult.cs b/Packages/com.unity.render-pipelines.universal/Runtime/2D/Lights/Light2DCullResult.cs
similarity index 100%
rename from Packages/com.unity.render-pipelines.universal/Runtime/2D/Light2DCullResult.cs
rename to Packages/com.unity.render-pipelines.universal/Runtime/2D/Lights/Light2DCullResult.cs
diff --git a/Packages/com.unity.render-pipelines.universal/Runtime/2D/Light2DCullResult.cs.meta b/Packages/com.unity.render-pipelines.universal/Runtime/2D/Lights/Light2DCullResult.cs.meta
similarity index 100%
rename from Packages/com.unity.render-pipelines.universal/Runtime/2D/Light2DCullResult.cs.meta
rename to Packages/com.unity.render-pipelines.universal/Runtime/2D/Lights/Light2DCullResult.cs.meta
diff --git a/Packages/com.unity.render-pipelines.universal/Runtime/2D/Light2DManager.cs b/Packages/com.unity.render-pipelines.universal/Runtime/2D/Lights/Light2DManager.cs
similarity index 100%
rename from Packages/com.unity.render-pipelines.universal/Runtime/2D/Light2DManager.cs
rename to Packages/com.unity.render-pipelines.universal/Runtime/2D/Lights/Light2DManager.cs
diff --git a/Packages/com.unity.render-pipelines.universal/Runtime/2D/Light2DManager.cs.meta b/Packages/com.unity.render-pipelines.universal/Runtime/2D/Lights/Light2DManager.cs.meta
similarity index 100%
rename from Packages/com.unity.render-pipelines.universal/Runtime/2D/Light2DManager.cs.meta
rename to Packages/com.unity.render-pipelines.universal/Runtime/2D/Lights/Light2DManager.cs.meta
diff --git a/Packages/com.unity.render-pipelines.universal/Runtime/2D/Light2DPoint.cs b/Packages/com.unity.render-pipelines.universal/Runtime/2D/Lights/Light2DPoint.cs
similarity index 97%
rename from Packages/com.unity.render-pipelines.universal/Runtime/2D/Light2DPoint.cs
rename to Packages/com.unity.render-pipelines.universal/Runtime/2D/Lights/Light2DPoint.cs
index 829b7574af1..da5cb8184e4 100644
--- a/Packages/com.unity.render-pipelines.universal/Runtime/2D/Light2DPoint.cs
+++ b/Packages/com.unity.render-pipelines.universal/Runtime/2D/Lights/Light2DPoint.cs
@@ -63,6 +63,6 @@ public float pointLightOuterRadius
         [Obsolete("pointLightQuality has been changed to normalMapQuality #from(2021.1) #breakingFrom(2021.1)", true)]
         public NormalMapQuality pointLightQuality => m_NormalMapQuality;
 
-        internal bool isPointLight => m_LightType == LightType.Point;
+        internal bool isPointLight => lightType == LightType.Point;
     }
 }
diff --git a/Packages/com.unity.render-pipelines.universal/Runtime/2D/Light2DPoint.cs.meta b/Packages/com.unity.render-pipelines.universal/Runtime/2D/Lights/Light2DPoint.cs.meta
similarity index 100%
rename from Packages/com.unity.render-pipelines.universal/Runtime/2D/Light2DPoint.cs.meta
rename to Packages/com.unity.render-pipelines.universal/Runtime/2D/Lights/Light2DPoint.cs.meta
diff --git a/Packages/com.unity.render-pipelines.universal/Runtime/2D/Light2DShape.cs b/Packages/com.unity.render-pipelines.universal/Runtime/2D/Lights/Light2DShape.cs
similarity index 100%
rename from Packages/com.unity.render-pipelines.universal/Runtime/2D/Light2DShape.cs
rename to Packages/com.unity.render-pipelines.universal/Runtime/2D/Lights/Light2DShape.cs
diff --git a/Packages/com.unity.render-pipelines.universal/Runtime/2D/Light2DShape.cs.meta b/Packages/com.unity.render-pipelines.universal/Runtime/2D/Lights/Light2DShape.cs.meta
similarity index 100%
rename from Packages/com.unity.render-pipelines.universal/Runtime/2D/Light2DShape.cs.meta
rename to Packages/com.unity.render-pipelines.universal/Runtime/2D/Lights/Light2DShape.cs.meta
diff --git a/Packages/com.unity.render-pipelines.universal/Runtime/2D/LightUtility.cs b/Packages/com.unity.render-pipelines.universal/Runtime/2D/Lights/LightUtility.cs
similarity index 98%
rename from Packages/com.unity.render-pipelines.universal/Runtime/2D/LightUtility.cs
rename to Packages/com.unity.render-pipelines.universal/Runtime/2D/Lights/LightUtility.cs
index 6693bea85a7..5be3f5b309f 100644
--- a/Packages/com.unity.render-pipelines.universal/Runtime/2D/LightUtility.cs
+++ b/Packages/com.unity.render-pipelines.universal/Runtime/2D/Lights/LightUtility.cs
@@ -28,6 +28,20 @@ struct PerLight2D
 
     internal static class LightUtility
     {
+
+        public static int ProviderToHash(Provider2D provider, Component component)
+        {
+            if (provider != null && component != null)
+                return StringToHash(provider.GetType().Name + component.GetType().Name);
+            else
+                return 0;
+        }
+
+        public static int StringToHash(string str)
+        {
+            return (int)URP2D_Crc32.Compute(str);
+        }
+
         public static bool CheckForChange(Light2D.LightType a, ref Light2D.LightType b)
         {
             var changed = a != b;
diff --git a/Packages/com.unity.render-pipelines.universal/Runtime/2D/LightUtility.cs.meta b/Packages/com.unity.render-pipelines.universal/Runtime/2D/Lights/LightUtility.cs.meta
similarity index 100%
rename from Packages/com.unity.render-pipelines.universal/Runtime/2D/LightUtility.cs.meta
rename to Packages/com.unity.render-pipelines.universal/Runtime/2D/Lights/LightUtility.cs.meta
diff --git a/Packages/com.unity.render-pipelines.universal/Runtime/2D/Shadows/ShadowProvider/Providers.meta b/Packages/com.unity.render-pipelines.universal/Runtime/2D/Lights/Providers.meta
similarity index 77%
rename from Packages/com.unity.render-pipelines.universal/Runtime/2D/Shadows/ShadowProvider/Providers.meta
rename to Packages/com.unity.render-pipelines.universal/Runtime/2D/Lights/Providers.meta
index 7bc0c32f70b..ce70d7a6b71 100644
--- a/Packages/com.unity.render-pipelines.universal/Runtime/2D/Shadows/ShadowProvider/Providers.meta
+++ b/Packages/com.unity.render-pipelines.universal/Runtime/2D/Lights/Providers.meta
@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: b5fa04dc74317394bb31c148b76a585e
+guid: d9f6628807013a2458d91f3c291f75aa
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}
diff --git a/Packages/com.unity.render-pipelines.universal/Runtime/2D/Lights/Providers/Light2DProvider.cs b/Packages/com.unity.render-pipelines.universal/Runtime/2D/Lights/Providers/Light2DProvider.cs
new file mode 100644
index 00000000000..f9471ba1452
--- /dev/null
+++ b/Packages/com.unity.render-pipelines.universal/Runtime/2D/Lights/Providers/Light2DProvider.cs
@@ -0,0 +1,31 @@
+using System;
+using System.Collections.Generic;
+using Unity.Collections;
+using UnityEngine;
+
+namespace UnityEngine.Rendering.Universal
+{
+    /// <summary>
+    /// Class <c>Light2DProvider</c> has methods called in URP 2D which can be used to create custom lights.
+    /// </summary>
+    [Serializable]
+    public class Light2DProvider : Provider2D
+    {
+        /// <summary>
+        /// Returns the display name shown in the Light Type dropdown of the Light2D component.
+        /// </summary>
+        /// <returns>The GUIContent used in the Light2D Light Type dropdown.</returns>
+        public virtual GUIContent ProviderName() { return new GUIContent("Custom Light Provider", "Implemented by " + this.GetType().Name); }
+
+        /// <summary>
+        /// Returns the mesh used to render the Light2D.
+        /// </summary>
+        /// <returns>The mesh used for rendering.</returns>
+        public virtual Mesh GetMesh() { return null; }
+
+        /// <summary>
+        /// Internal entry point used by the rendering pipeline to retrieve the provider name.
+        /// </summary>
+        internal override GUIContent Internal_ProviderName(string componentName) { return ProviderName(); }
+    }
+}
diff --git a/Packages/com.unity.render-pipelines.universal/Runtime/2D/Lights/Providers/Light2DProvider.cs.meta b/Packages/com.unity.render-pipelines.universal/Runtime/2D/Lights/Providers/Light2DProvider.cs.meta
new file mode 100644
index 00000000000..3f5466825f8
--- /dev/null
+++ b/Packages/com.unity.render-pipelines.universal/Runtime/2D/Lights/Providers/Light2DProvider.cs.meta
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: fbffb490ff4824544a472e97ee0a6679
\ No newline at end of file
diff --git a/Packages/com.unity.render-pipelines.universal/Runtime/2D/Passes/Utility/LightBatch.cs b/Packages/com.unity.render-pipelines.universal/Runtime/2D/Passes/Utility/LightBatch.cs
index ad4760eb931..327cabefe5d 100644
--- a/Packages/com.unity.render-pipelines.universal/Runtime/2D/Passes/Utility/LightBatch.cs
+++ b/Packages/com.unity.render-pipelines.universal/Runtime/2D/Passes/Utility/LightBatch.cs
@@ -194,6 +194,12 @@ internal void Reset()
 
         internal bool CanBatch(Light2D light, Material material, int index, out int lightHash)
         {
+            if (material == null || light.lightMesh == null)
+            {
+                lightHash = 0;
+                return false;
+            }
+
             lightHash = Hash(light, material);
             hashCode = (hashCode == 0) ? lightHash : hashCode;
             if (batchCount == 0)
diff --git a/Packages/com.unity.render-pipelines.universal/Runtime/2D/Provider2D.cs b/Packages/com.unity.render-pipelines.universal/Runtime/2D/Provider2D.cs
new file mode 100644
index 00000000000..fcd191e8e27
--- /dev/null
+++ b/Packages/com.unity.render-pipelines.universal/Runtime/2D/Provider2D.cs
@@ -0,0 +1,36 @@
+using System;
+
+namespace UnityEngine.Rendering.Universal
+{
+    /// <summary>
+    /// Base class for 2D shadow shape providers.
+    /// </summary>
+    [Serializable]
+    public abstract class Provider2D
+    {
+        /// <summary>
+        /// Returns the priority used to order this provider in the ShadowCaster2D Casting Option dropdown.
+        /// </summary>
+        /// <returns>The menu priority for this provider.</returns>
+        public virtual int MenuPriority() { return 0; }
+
+        /// <summary>
+        /// Indicates whether this provider reads data from a component on the GameObject.
+        /// </summary>
+        /// <returns>True if the provider uses component data; otherwise, false.</returns>
+        public virtual bool UsesComponentData() { return true; }
+
+        /// <summary>
+        /// Called when the provider is initialized.
+        /// </summary>
+        public virtual void OnAwake() { }
+
+#if UNITY_EDITOR
+        public virtual void OnSelected() { }
+        public virtual void OnDrawGizmos(Transform transform) {}
+#endif
+
+        internal abstract GUIContent Internal_ProviderName(string componentName);
+        internal virtual bool Internal_IsRequiredComponentData(Component sourceComponent) { return sourceComponent is Transform; }
+    }
+}
diff --git a/Packages/com.unity.render-pipelines.universal/Runtime/2D/Provider2D.cs.meta b/Packages/com.unity.render-pipelines.universal/Runtime/2D/Provider2D.cs.meta
new file mode 100644
index 00000000000..99d94f25e57
--- /dev/null
+++ b/Packages/com.unity.render-pipelines.universal/Runtime/2D/Provider2D.cs.meta
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: 445455d37e7bc0048801afd5048170e8
\ No newline at end of file
diff --git a/Packages/com.unity.render-pipelines.universal/Runtime/2D/Rendergraph/DrawLight2DPass.cs b/Packages/com.unity.render-pipelines.universal/Runtime/2D/Rendergraph/DrawLight2DPass.cs
index 0e57d261dd9..14adaf366f5 100644
--- a/Packages/com.unity.render-pipelines.universal/Runtime/2D/Rendergraph/DrawLight2DPass.cs
+++ b/Packages/com.unity.render-pipelines.universal/Runtime/2D/Rendergraph/DrawLight2DPass.cs
@@ -108,6 +108,7 @@ private static void Execute(RasterCommandBuffer cmd, PassData passData, LayerBat
 
                 if (LightBatch.isBatchingSupported)
                 {
+
                     RendererLighting.lightBatch.AddBatch(light, lightMaterial, light.GetMatrix(), lightMesh, 0, lightHash, index);
                     RendererLighting.lightBatch.Flush(cmd);
                 }
diff --git a/Packages/com.unity.render-pipelines.universal/Runtime/2D/Rendergraph/DrawShadow2DPass.cs b/Packages/com.unity.render-pipelines.universal/Runtime/2D/Rendergraph/DrawShadow2DPass.cs
index 5d985a8ebe9..6fc8ded1de0 100644
--- a/Packages/com.unity.render-pipelines.universal/Runtime/2D/Rendergraph/DrawShadow2DPass.cs
+++ b/Packages/com.unity.render-pipelines.universal/Runtime/2D/Rendergraph/DrawShadow2DPass.cs
@@ -76,7 +76,7 @@ public void Render(RenderGraph graph, ContextContainer frameData, int batchIndex
                         ExecuteShadowPass(cmd, data, light, i);
                     }
                 });
-            }
+            }                                                                                                                                                                                                                                                                                                                                                       
         }
     }
 }
diff --git a/Packages/com.unity.render-pipelines.universal/Runtime/2D/Shadows/Providers.meta b/Packages/com.unity.render-pipelines.universal/Runtime/2D/Shadows/Providers.meta
new file mode 100644
index 00000000000..abf51fe3b71
--- /dev/null
+++ b/Packages/com.unity.render-pipelines.universal/Runtime/2D/Shadows/Providers.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 964353991afb13346a30f35dc459a9be
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Packages/com.unity.render-pipelines.universal/Runtime/2D/Shadows/ShadowProvider/ShadowShape2DProvider.cs b/Packages/com.unity.render-pipelines.universal/Runtime/2D/Shadows/Providers/ShadowShape2DProvider.cs
similarity index 69%
rename from Packages/com.unity.render-pipelines.universal/Runtime/2D/Shadows/ShadowProvider/ShadowShape2DProvider.cs
rename to Packages/com.unity.render-pipelines.universal/Runtime/2D/Shadows/Providers/ShadowShape2DProvider.cs
index 85c2eb639c1..0b7cc71583c 100644
--- a/Packages/com.unity.render-pipelines.universal/Runtime/2D/Shadows/ShadowProvider/ShadowShape2DProvider.cs
+++ b/Packages/com.unity.render-pipelines.universal/Runtime/2D/Shadows/Providers/ShadowShape2DProvider.cs
@@ -2,6 +2,7 @@
 using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
+using UnityEngine.Scripting.APIUpdating;
 
 #if UNITY_EDITOR
 using UnityEditor;
@@ -9,30 +10,30 @@
 
 namespace UnityEngine.Rendering.Universal
 {
-    /// <summary>
-    /// Class <c>ShadowShape2DProvider</c> has methods called by a <c>ShadowCaster2D</c> to determine if it should be listed as a Casting Option, and to provide geometry if it is the active <c>ShadowShape2DProvider</c>
-    /// </summary>
+
+    [System.Obsolete("Use ShadowCaster2DProvider instead.")]
+    public abstract class ShadowShape2DProvider : ShadowCaster2DProvider { }
+
+        /// <summary>
+        /// Class <c>ShadowShape2DProvider</c> has methods called by a <c>ShadowCaster2D</c> to determine if it should be listed as a Casting Option, and to provide geometry if it is the active <c>ShadowShape2DProvider</c>
+        /// </summary>
     [Serializable]
-    public abstract class ShadowShape2DProvider
+    [MovedFrom(true, "UnityEngine.Rendering.Universal", "Unity.RenderPipelines.Universal.2D.Runtime", "ShadowShape2DProvider")]
+    public abstract class ShadowCaster2DProvider : Provider2D
     {
         /// <summary>
         /// Gets the name to be listed in the <c>ShadowCaster2D</c> Casting Option drop down.
         /// </summary>
         /// <param name="componentName">The name of component associated with the provider.</param>
         /// <returns>The string to be listed in the <c>ShadowCaster2D</c> Casting Option drop down.</returns>
-        public virtual string ProviderName(string componentName) { return componentName; }
+        public virtual GUIContent ProviderName(string componentName) { return new GUIContent(componentName, "Implemented by " + this.GetType().Name); }
 
-        /// <summary>
-        /// Gets the priority to be listed in the <c>ShadowCaster2D</c> Casting Option drop down.
-        /// </summary>
-        /// <returns>The priority to be listed in the <c>ShadowCaster2D</c> Casting Option drop down.</returns>
-        public virtual int    Priority() { return 0; }
 
         /// <summary>
         /// Called for the active <c>ShadowShape2DProvider</c> when the <c>ShadowCaster2D</c> becomes enabled
         /// </summary>
         /// <param name="sourceComponent">The component associated with the provider</param>
-        /// <param name="persistantShadowShape">An instance of <c>ShadowShape2D</c> that is used by the <c>ShadowCaster2D</c></param>                
+        /// <param name="persistantShadowShape">An instance of <c>ShadowShape2D</c> that is used by the <c>ShadowCaster2D</c></param>        
         public virtual void   Enabled(Component sourceComponent, ShadowShape2D persistantShadowShape) {}
         
         /// <summary>
@@ -42,19 +43,12 @@ public virtual void   Enabled(Component sourceComponent, ShadowShape2D persistan
         /// <param name="persistantShadowShape">An instance of <c>ShadowShape2D</c> that is used by the <c>ShadowCaster2D</c></param>        
         public virtual void   Disabled(Component sourceComponent, ShadowShape2D persistantShadowShape) {}
 
-        /// <summary>
-        /// Called for each component on a <c>ShadowCaster2D's</c> <c>GameObject</c>. Returns true if the provided component is the data source of the <c>ShadowShapeProvider</c>.
-        /// </summary>
-        /// <param name="sourceComponent">The component to test as a source</param>
-        /// <returns>Returns true if sourceComponent is the data source of the <c>ShadowShapeProvider</c>.</returns>
-        public abstract bool  IsShapeSource(Component sourceComponent);
-
         /// <summary>
         /// Called when the <c>ShadowShape2DProvider</c> is selected as the active Casting Option.
         /// </summary>
         /// <param name="sourceComponent">The component associated with the provider</param>
         /// <param name="persistantShadowShape">An instance of <c>ShadowShape2D</c> that is used by the <c>ShadowCaster2D</c></param>
-        public virtual void OnPersistantDataCreated(Component sourceComponent, ShadowShape2D persistantShadowShape) { }
+        public virtual void OnInitialized(Component sourceComponent, ShadowShape2D persistantShadowShape) { }
 
         /// <summary>
         /// Called before 2D lighting is rendered each frame
@@ -63,5 +57,16 @@ public virtual void OnPersistantDataCreated(Component sourceComponent, ShadowSha
         /// <param name="worldCullingBounds">The bounds enclosing the region of the view frustum and all visible lights</param>
         /// <param name="persistantShadowShape">An instance of <c>ShadowShape2D</c> that is used by the <c>ShadowCaster2D</c></param>
         public virtual void OnBeforeRender(Component sourceComponent, Bounds worldCullingBounds, ShadowShape2D persistantShadowShape) { }
+
+        /// <summary>
+        /// Called for each component on a <c>ShadowCaster2D's</c> <c>GameObject</c>. Returns true if the provided component is the data source of the <c>ShadowShapeProvider</c>.
+        /// </summary>
+        /// <param name="sourceComponent">The component to test as a source</param>
+        /// <returns>Returns true if sourceComponent is the data source of the <c>ShadowShapeProvider</c>.</returns> 
+        public abstract bool IsRequiredComponentData(Component sourceComponent);
+
+
+        internal override GUIContent Internal_ProviderName(string componentName) { return ProviderName(componentName); }
+        internal override bool Internal_IsRequiredComponentData(Component sourceComponent) { return IsRequiredComponentData(sourceComponent); }
     }
 }
diff --git a/Packages/com.unity.render-pipelines.universal/Runtime/2D/Shadows/ShadowProvider/ShadowShape2DProvider.cs.meta b/Packages/com.unity.render-pipelines.universal/Runtime/2D/Shadows/Providers/ShadowShape2DProvider.cs.meta
similarity index 100%
rename from Packages/com.unity.render-pipelines.universal/Runtime/2D/Shadows/ShadowProvider/ShadowShape2DProvider.cs.meta
rename to Packages/com.unity.render-pipelines.universal/Runtime/2D/Shadows/Providers/ShadowShape2DProvider.cs.meta
diff --git a/Packages/com.unity.render-pipelines.universal/Runtime/2D/Shadows/ShadowProvider/Providers/ShadowShape2DProvider_Collider.cs b/Packages/com.unity.render-pipelines.universal/Runtime/2D/Shadows/Providers/ShadowShape2DProvider_Collider.cs
similarity index 97%
rename from Packages/com.unity.render-pipelines.universal/Runtime/2D/Shadows/ShadowProvider/Providers/ShadowShape2DProvider_Collider.cs
rename to Packages/com.unity.render-pipelines.universal/Runtime/2D/Shadows/Providers/ShadowShape2DProvider_Collider.cs
index 2565b080a5e..31616b94ac5 100644
--- a/Packages/com.unity.render-pipelines.universal/Runtime/2D/Shadows/ShadowProvider/Providers/ShadowShape2DProvider_Collider.cs
+++ b/Packages/com.unity.render-pipelines.universal/Runtime/2D/Shadows/Providers/ShadowShape2DProvider_Collider.cs
@@ -3,11 +3,13 @@
 using System.Collections.Generic;
 using System.Runtime.CompilerServices;
 using Unity.Collections;
+using UnityEngine.Scripting.APIUpdating;
 
 namespace UnityEngine.Rendering.Universal
 {
     [Serializable]
-    class ShadowShape2DProvider_Collider2D : ShadowShape2DProvider
+    [MovedFrom(true, "UnityEngine.Rendering.Universal", "Unity.RenderPipelines.Universal.2D.Runtime", "ShadowShape2DProvider_Collider2D")]
+    class ShadowCaster2DProvider_Collider2D : ShadowCaster2DProvider
     {
         const float k_InitialTrim = 0.05f;
 
@@ -345,9 +347,9 @@ private void CalculateShadows(Collider2D collider, ShadowShape2D persistantShape
         //============================================================================================================
         //                                                  Public
         //============================================================================================================
-        public override bool IsShapeSource(Component sourceComponent) { return sourceComponent is Collider2D; }
+        public override bool IsRequiredComponentData(Component sourceComponent) { return sourceComponent is Collider2D; }
 
-        public override void OnPersistantDataCreated(Component sourceComponent, ShadowShape2D persistantShadowShapeData)
+        public override void OnInitialized(Component sourceComponent, ShadowShape2D persistantShadowShapeData)
         {
             m_ShadowStateHash = default;
             m_ShadowCombinedShapeMinMaxBounds = default;
diff --git a/Packages/com.unity.render-pipelines.universal/Runtime/2D/Shadows/ShadowProvider/Providers/ShadowShape2DProvider_Collider.cs.meta b/Packages/com.unity.render-pipelines.universal/Runtime/2D/Shadows/Providers/ShadowShape2DProvider_Collider.cs.meta
similarity index 100%
rename from Packages/com.unity.render-pipelines.universal/Runtime/2D/Shadows/ShadowProvider/Providers/ShadowShape2DProvider_Collider.cs.meta
rename to Packages/com.unity.render-pipelines.universal/Runtime/2D/Shadows/Providers/ShadowShape2DProvider_Collider.cs.meta
diff --git a/Packages/com.unity.render-pipelines.universal/Runtime/2D/Shadows/ShadowProvider/Providers/ShadowShape2DProvider_SpriteRenderer.cs b/Packages/com.unity.render-pipelines.universal/Runtime/2D/Shadows/Providers/ShadowShape2DProvider_SpriteRenderer.cs
similarity index 90%
rename from Packages/com.unity.render-pipelines.universal/Runtime/2D/Shadows/ShadowProvider/Providers/ShadowShape2DProvider_SpriteRenderer.cs
rename to Packages/com.unity.render-pipelines.universal/Runtime/2D/Shadows/Providers/ShadowShape2DProvider_SpriteRenderer.cs
index 0a95d24f37c..5ad118ea0e3 100644
--- a/Packages/com.unity.render-pipelines.universal/Runtime/2D/Shadows/ShadowProvider/Providers/ShadowShape2DProvider_SpriteRenderer.cs
+++ b/Packages/com.unity.render-pipelines.universal/Runtime/2D/Shadows/Providers/ShadowShape2DProvider_SpriteRenderer.cs
@@ -4,13 +4,15 @@
 using Unity.Collections;
 using Unity.Collections.LowLevel.Unsafe;
 using UnityEngine;
+using UnityEngine.Scripting.APIUpdating;
 using UnityEngine.U2D;
 
 
 namespace UnityEngine.Rendering.Universal
 {
     [Serializable]
-    class ShadowShape2DProvider_SpriteRenderer : ShadowShape2DProvider
+    [MovedFrom(true, "UnityEngine.Rendering.Universal", "Unity.RenderPipelines.Universal.2D.Runtime", "ShadowShape2DProvider_SpriteRenderer")]
+    class ShadowCaster2DProvider_SpriteRenderer : ShadowCaster2DProvider
     {
         const float k_InitialTrim = 0.05f;
 
@@ -104,10 +106,10 @@ void UpdatePersistantShapeData(SpriteRenderer spriteRenderer)
         //============================================================================================================
         //                                                  Public
         //============================================================================================================
-        public override int Priority() { return 1; }  // give higher than default menu priority
-        public override bool IsShapeSource(Component sourceComponent) { return sourceComponent is SpriteRenderer; }
+        public override int MenuPriority() { return 1; }  // give higher than default menu priority
+        public override bool IsRequiredComponentData(Component sourceComponent) { return sourceComponent is SpriteRenderer; }
 
-        public override void OnPersistantDataCreated(Component sourceComponent, ShadowShape2D persistantShadowShape)
+        public override void OnInitialized(Component sourceComponent, ShadowShape2D persistantShadowShape)
         {
             SpriteRenderer spriteRenderer = (SpriteRenderer)sourceComponent;
 
diff --git a/Packages/com.unity.render-pipelines.universal/Runtime/2D/Shadows/ShadowProvider/Providers/ShadowShape2DProvider_SpriteRenderer.cs.meta b/Packages/com.unity.render-pipelines.universal/Runtime/2D/Shadows/Providers/ShadowShape2DProvider_SpriteRenderer.cs.meta
similarity index 100%
rename from Packages/com.unity.render-pipelines.universal/Runtime/2D/Shadows/ShadowProvider/Providers/ShadowShape2DProvider_SpriteRenderer.cs.meta
rename to Packages/com.unity.render-pipelines.universal/Runtime/2D/Shadows/Providers/ShadowShape2DProvider_SpriteRenderer.cs.meta
diff --git a/Packages/com.unity.render-pipelines.universal/Runtime/2D/Shadows/ShadowProvider/Providers/ShadowShape2DProvider_SpriteShape.cs b/Packages/com.unity.render-pipelines.universal/Runtime/2D/Shadows/Providers/ShadowShape2DProvider_SpriteShape.cs
similarity index 86%
rename from Packages/com.unity.render-pipelines.universal/Runtime/2D/Shadows/ShadowProvider/Providers/ShadowShape2DProvider_SpriteShape.cs
rename to Packages/com.unity.render-pipelines.universal/Runtime/2D/Shadows/Providers/ShadowShape2DProvider_SpriteShape.cs
index c9220148a3f..4ef2b34105c 100644
--- a/Packages/com.unity.render-pipelines.universal/Runtime/2D/Shadows/ShadowProvider/Providers/ShadowShape2DProvider_SpriteShape.cs
+++ b/Packages/com.unity.render-pipelines.universal/Runtime/2D/Shadows/Providers/ShadowShape2DProvider_SpriteShape.cs
@@ -7,6 +7,8 @@
 using Unity.Collections.LowLevel.Unsafe;
 using UnityEngine.U2D;
 using Unity.Mathematics;
+using UnityEngine.Scripting.APIUpdating;
+
 
 #if UNITY_EDITOR
 using UnityEditor;
@@ -15,7 +17,8 @@
 namespace UnityEngine.Rendering.Universal
 {
     [Serializable]
-    internal class ShadowShape2DProvider_SpriteShape : ShadowShape2DProvider
+    [MovedFrom(true, "UnityEngine.Rendering.Universal", "Unity.RenderPipelines.Universal", "ShadowShape2DProvider_SpriteShape")]
+    internal class ShadowCaster2DProvider_SpriteShape : ShadowCaster2DProvider
     {
         const float k_InitialTrim = 0.02f;
 
@@ -63,7 +66,7 @@ internal void UpdateShadows(SpriteShapeController spriteShapeController, ShadowS
             shadowData.Dispose();
         }
 
-        public override int Priority() { return 10; }  // give higher than default menu priority
+        public override int MenuPriority() { return 10; }  // give higher than default menu priority
 
         public override void Enabled(Component sourceComponent, ShadowShape2D persistantShadowShape)
         {
@@ -75,12 +78,12 @@ public override void Disabled(Component sourceComponent, ShadowShape2D persistan
             ((SpriteShapeController)sourceComponent).ForceShadowShapeUpdate(false);
         }
 
-        public override bool IsShapeSource(Component sourceComponent)
+        public override bool IsRequiredComponentData(Component sourceComponent)
         {
             return sourceComponent as SpriteShapeController;
         }
 
-        public override void OnPersistantDataCreated(Component sourceComponent, ShadowShape2D persistantShadowShape)
+        public override void OnInitialized(Component sourceComponent, ShadowShape2D persistantShadowShape)
         {
             SpriteShapeController spriteShapeController = (SpriteShapeController)sourceComponent;
             SpriteShapeRenderer spriteShapeRenderer;
diff --git a/Packages/com.unity.render-pipelines.universal/Runtime/2D/Shadows/ShadowProvider/Providers/ShadowShape2DProvider_SpriteShape.cs.meta b/Packages/com.unity.render-pipelines.universal/Runtime/2D/Shadows/Providers/ShadowShape2DProvider_SpriteShape.cs.meta
similarity index 100%
rename from Packages/com.unity.render-pipelines.universal/Runtime/2D/Shadows/ShadowProvider/Providers/ShadowShape2DProvider_SpriteShape.cs.meta
rename to Packages/com.unity.render-pipelines.universal/Runtime/2D/Shadows/Providers/ShadowShape2DProvider_SpriteShape.cs.meta
diff --git a/Packages/com.unity.render-pipelines.universal/Runtime/2D/Shadows/ShadowProvider/Providers/ShadowShape2DProvider_SpriteSkin.cs b/Packages/com.unity.render-pipelines.universal/Runtime/2D/Shadows/Providers/ShadowShape2DProvider_SpriteSkin.cs
similarity index 84%
rename from Packages/com.unity.render-pipelines.universal/Runtime/2D/Shadows/ShadowProvider/Providers/ShadowShape2DProvider_SpriteSkin.cs
rename to Packages/com.unity.render-pipelines.universal/Runtime/2D/Shadows/Providers/ShadowShape2DProvider_SpriteSkin.cs
index 3c779178e7b..445c1f821ad 100644
--- a/Packages/com.unity.render-pipelines.universal/Runtime/2D/Shadows/ShadowProvider/Providers/ShadowShape2DProvider_SpriteSkin.cs
+++ b/Packages/com.unity.render-pipelines.universal/Runtime/2D/Shadows/Providers/ShadowShape2DProvider_SpriteSkin.cs
@@ -5,13 +5,15 @@
 using Unity.Collections;
 using Unity.Collections.LowLevel.Unsafe;
 using UnityEngine;
+using UnityEngine.Scripting.APIUpdating;
 using UnityEngine.U2D;
 using UnityEngine.U2D.Animation;
 
 namespace UnityEngine.Rendering.Universal
 {
     [Serializable]
-    class ShadowShape2DProvider_SpriteSkin : ShadowShape2DProvider
+    [MovedFrom(true, "UnityEngine.Rendering.Universal", "Unity.RenderPipelines.Universal.2D.Runtime", "ShadowShape2DProvider_SpriteSkin")]
+    class ShadowCaster2DProvider_SpriteSkin : ShadowCaster2DProvider
     {
         const float k_InitialTrim = 0.05f;
 
@@ -37,8 +39,8 @@ void UpdatePersistantShapeData(SpriteRenderer spriteRenderer)
         //============================================================================================================
         //                                                  Public
         //============================================================================================================
-        public override int Priority() { return 10; }  // give higher than default menu priority
-        public override bool IsShapeSource(Component sourceComponent) { return sourceComponent is SpriteSkin; }
+        public override int MenuPriority() { return 10; }  // give higher than default menu priority
+        public override bool IsRequiredComponentData(Component sourceComponent) { return sourceComponent is SpriteSkin; }
 
 #if USING_2DANIMATION_13_0_1_OR_ABOVE
         public override void Enabled(Component sourceComponent, ShadowShape2D persistantShadowShape)
@@ -57,7 +59,7 @@ public override void Disabled(Component sourceComponent, ShadowShape2D persistan
             }
         }
 #endif
-        public override void OnPersistantDataCreated(Component sourceComponent, ShadowShape2D persistantShadowShape)
+        public override void OnInitialized(Component sourceComponent, ShadowShape2D persistantShadowShape)
         {
             SpriteSkin spriteSkin = (SpriteSkin)sourceComponent;
             SpriteRenderer spriteRenderer;
diff --git a/Packages/com.unity.render-pipelines.universal/Runtime/2D/Shadows/ShadowProvider/Providers/ShadowShape2DProvider_SpriteSkin.cs.meta b/Packages/com.unity.render-pipelines.universal/Runtime/2D/Shadows/Providers/ShadowShape2DProvider_SpriteSkin.cs.meta
similarity index 100%
rename from Packages/com.unity.render-pipelines.universal/Runtime/2D/Shadows/ShadowProvider/Providers/ShadowShape2DProvider_SpriteSkin.cs.meta
rename to Packages/com.unity.render-pipelines.universal/Runtime/2D/Shadows/Providers/ShadowShape2DProvider_SpriteSkin.cs.meta
diff --git a/Packages/com.unity.render-pipelines.universal/Runtime/2D/Shadows/ShadowProvider/Providers/ShadowShapeProvider2D_Utility.cs b/Packages/com.unity.render-pipelines.universal/Runtime/2D/Shadows/Providers/ShadowShapeProvider2D_Utility.cs
similarity index 100%
rename from Packages/com.unity.render-pipelines.universal/Runtime/2D/Shadows/ShadowProvider/Providers/ShadowShapeProvider2D_Utility.cs
rename to Packages/com.unity.render-pipelines.universal/Runtime/2D/Shadows/Providers/ShadowShapeProvider2D_Utility.cs
diff --git a/Packages/com.unity.render-pipelines.universal/Runtime/2D/Shadows/ShadowProvider/Providers/ShadowShapeProvider2D_Utility.cs.meta b/Packages/com.unity.render-pipelines.universal/Runtime/2D/Shadows/Providers/ShadowShapeProvider2D_Utility.cs.meta
similarity index 100%
rename from Packages/com.unity.render-pipelines.universal/Runtime/2D/Shadows/ShadowProvider/Providers/ShadowShapeProvider2D_Utility.cs.meta
rename to Packages/com.unity.render-pipelines.universal/Runtime/2D/Shadows/Providers/ShadowShapeProvider2D_Utility.cs.meta
diff --git a/Packages/com.unity.render-pipelines.universal/Runtime/2D/Shadows/Shadow Provider Utility.meta b/Packages/com.unity.render-pipelines.universal/Runtime/2D/Shadows/Shadow Provider Utility.meta
new file mode 100644
index 00000000000..8adae89c606
--- /dev/null
+++ b/Packages/com.unity.render-pipelines.universal/Runtime/2D/Shadows/Shadow Provider Utility.meta	
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 1fd29b02cf863634796f4fa1d42ab58d
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Packages/com.unity.render-pipelines.universal/Runtime/2D/Shadows/ShadowProvider/EdgeDictionary.cs b/Packages/com.unity.render-pipelines.universal/Runtime/2D/Shadows/Shadow Provider Utility/EdgeDictionary.cs
similarity index 100%
rename from Packages/com.unity.render-pipelines.universal/Runtime/2D/Shadows/ShadowProvider/EdgeDictionary.cs
rename to Packages/com.unity.render-pipelines.universal/Runtime/2D/Shadows/Shadow Provider Utility/EdgeDictionary.cs
diff --git a/Packages/com.unity.render-pipelines.universal/Runtime/2D/Shadows/ShadowProvider/EdgeDictionary.cs.meta b/Packages/com.unity.render-pipelines.universal/Runtime/2D/Shadows/Shadow Provider Utility/EdgeDictionary.cs.meta
similarity index 100%
rename from Packages/com.unity.render-pipelines.universal/Runtime/2D/Shadows/ShadowProvider/EdgeDictionary.cs.meta
rename to Packages/com.unity.render-pipelines.universal/Runtime/2D/Shadows/Shadow Provider Utility/EdgeDictionary.cs.meta
diff --git a/Packages/com.unity.render-pipelines.universal/Runtime/2D/Shadows/ShadowProvider/IEdgeStore.cs b/Packages/com.unity.render-pipelines.universal/Runtime/2D/Shadows/Shadow Provider Utility/IEdgeStore.cs
similarity index 100%
rename from Packages/com.unity.render-pipelines.universal/Runtime/2D/Shadows/ShadowProvider/IEdgeStore.cs
rename to Packages/com.unity.render-pipelines.universal/Runtime/2D/Shadows/Shadow Provider Utility/IEdgeStore.cs
diff --git a/Packages/com.unity.render-pipelines.universal/Runtime/2D/Shadows/ShadowProvider/IEdgeStore.cs.meta b/Packages/com.unity.render-pipelines.universal/Runtime/2D/Shadows/Shadow Provider Utility/IEdgeStore.cs.meta
similarity index 100%
rename from Packages/com.unity.render-pipelines.universal/Runtime/2D/Shadows/ShadowProvider/IEdgeStore.cs.meta
rename to Packages/com.unity.render-pipelines.universal/Runtime/2D/Shadows/Shadow Provider Utility/IEdgeStore.cs.meta
diff --git a/Packages/com.unity.render-pipelines.universal/Runtime/2D/Shadows/ShadowProvider/ShadowEdge.cs b/Packages/com.unity.render-pipelines.universal/Runtime/2D/Shadows/Shadow Provider Utility/ShadowEdge.cs
similarity index 100%
rename from Packages/com.unity.render-pipelines.universal/Runtime/2D/Shadows/ShadowProvider/ShadowEdge.cs
rename to Packages/com.unity.render-pipelines.universal/Runtime/2D/Shadows/Shadow Provider Utility/ShadowEdge.cs
diff --git a/Packages/com.unity.render-pipelines.universal/Runtime/2D/Shadows/ShadowProvider/ShadowEdge.cs.meta b/Packages/com.unity.render-pipelines.universal/Runtime/2D/Shadows/Shadow Provider Utility/ShadowEdge.cs.meta
similarity index 100%
rename from Packages/com.unity.render-pipelines.universal/Runtime/2D/Shadows/ShadowProvider/ShadowEdge.cs.meta
rename to Packages/com.unity.render-pipelines.universal/Runtime/2D/Shadows/Shadow Provider Utility/ShadowEdge.cs.meta
diff --git a/Packages/com.unity.render-pipelines.universal/Runtime/2D/Shadows/ShadowProvider/ShadowMesh2D.cs b/Packages/com.unity.render-pipelines.universal/Runtime/2D/Shadows/Shadow Provider Utility/ShadowMesh2D.cs
similarity index 83%
rename from Packages/com.unity.render-pipelines.universal/Runtime/2D/Shadows/ShadowProvider/ShadowMesh2D.cs
rename to Packages/com.unity.render-pipelines.universal/Runtime/2D/Shadows/Shadow Provider Utility/ShadowMesh2D.cs
index 2ff85eca9ee..4e817edee75 100644
--- a/Packages/com.unity.render-pipelines.universal/Runtime/2D/Shadows/ShadowProvider/ShadowMesh2D.cs
+++ b/Packages/com.unity.render-pipelines.universal/Runtime/2D/Shadows/Shadow Provider Utility/ShadowMesh2D.cs	
@@ -1,9 +1,6 @@
- using System.Collections.Generic;
-using System.Collections.Specialized;
-using Unity.Collections;
-using UnityEngine;
-using UnityEngine.U2D;
 using System;
+using Unity.Collections;
+using static UnityEngine.Rendering.Universal.ShadowUtility;
 
 namespace UnityEngine.Rendering.Universal
 {
@@ -19,7 +16,15 @@ public enum EdgeProcessing
             Clipping,
         }
 
-        [SerializeField] Mesh m_Mesh;
+        [NonSerialized]  Mesh               m_Mesh;
+        [NonSerialized]  bool               m_IsDirty;
+        [SerializeField] ShadowMeshVertex[] m_Vertices;
+        [SerializeField] int[]              m_Indices;
+
+        NativeArray<ShadowMeshVertex>       m_NativeVertices;
+        NativeArray<int>                    m_NativeIndices;
+
+
         [SerializeField] Bounds m_LocalBounds;
         [SerializeField] EdgeProcessing m_EdgeProcessing = EdgeProcessing.Clipping;
         [SerializeField] float m_TrimEdge = k_TrimEdgeUninitialized;
@@ -27,7 +32,23 @@ public enum EdgeProcessing
         [SerializeField] bool  m_FlipY;
         [SerializeField] float m_InitialTrim = 0;
 
-        public  Mesh mesh { get => m_Mesh; }
+        public  Mesh mesh
+        {
+            get
+            {
+                if(m_Mesh == null || m_Mesh.vertexCount == 0 || m_IsDirty)
+                    GenerateShadowMesh(ref m_Mesh, m_NativeVertices, m_NativeIndices);
+
+                return m_Mesh;
+            }
+        }
+
+        public void Clear()
+        {
+            m_Vertices = null;
+            m_Indices = null;
+        }
+
         public  BoundingSphere boundingSphere { get => m_BoundingSphere; }
         internal BoundingSphere m_BoundingSphere;   // update to world space
         public EdgeProcessing edgeProcessing { get { return m_EdgeProcessing; } set { m_EdgeProcessing = value; } }
@@ -48,13 +69,36 @@ static internal void DuplicateShadowMesh(Mesh source, out Mesh dest)
             }
         }
 
+        internal void OnBeforeSerialize()
+        {
+            if(m_NativeVertices.IsCreated)
+                m_Vertices = m_NativeVertices.ToArray();
+
+            if (m_NativeIndices.IsCreated)
+                m_Indices = m_NativeIndices.ToArray();
+        }
+
+        internal void OnAfterDeserialize()
+        {
+            if(m_NativeVertices.IsCreated)
+                m_NativeVertices.Dispose();
+            m_NativeVertices = new NativeArray<ShadowMeshVertex>(m_Vertices, Allocator.Persistent);
+
+            if(m_NativeIndices.IsCreated)
+                m_NativeIndices.Dispose();
+            m_NativeIndices = new NativeArray<int>(m_Indices, Allocator.Persistent);
+        }
+
         internal void CopyFrom(ShadowMesh2D source)
         {
             // This is not gc tested as this generates garbage (calls DuplicateShadowMesh)
-            DuplicateShadowMesh(source.m_Mesh, out m_Mesh);
+            //DuplicateShadowMesh(source.m_Mesh, out m_Mesh);
             m_TrimEdge = source.trimEdge;
             m_LocalBounds = source.m_LocalBounds;
             m_EdgeProcessing = source.edgeProcessing;
+            m_Vertices.CopyTo(source.m_Vertices, 0);
+            m_Indices.CopyTo(source.m_Indices,0);
+            GenerateShadowMesh(ref m_Mesh, m_NativeVertices, m_NativeIndices);
         }
 
         internal void AddCircle(Vector3 center, float r, NativeArray<Vector3> generatedVertices, NativeArray<int> generatedIndices, bool reverseWindingOrder, ref int vertexWritePos, ref int indexWritePos)
@@ -183,12 +227,9 @@ public override void SetShape(NativeArray<Vector3> vertices, NativeArray<int> in
             if (m_TrimEdge == k_TrimEdgeUninitialized)
                 m_TrimEdge = m_InitialTrim;
 
-            if (m_Mesh == null)
-                m_Mesh = new Mesh();
-
             if (indices.Length == 0)
             {
-                m_Mesh.Clear();
+                Clear();
                 return;
             }
 
@@ -273,11 +314,14 @@ public override void SetShape(NativeArray<Vector3> vertices, NativeArray<int> in
                 ShadowUtility.ClipEdges(ref generatedVertices, ref calculatedEdges, ref calculatedStartingEdges, ref calculatedIsClosedArray, trimEdge, out clippedVertices, out clippedEdges, out clippedStartingIndices);
 
                 if (clippedStartingIndices.Length > 0)
-                    m_LocalBounds = ShadowUtility.GenerateShadowMesh(m_Mesh, clippedVertices, clippedEdges, clippedStartingIndices, calculatedIsClosedArray, true, createInteriorGeometry, ShadowShape2D.OutlineTopology.Lines);
+                {
+                    m_LocalBounds = ShadowUtility.GenerateShadowGeometry(ref m_NativeVertices, ref m_NativeIndices, clippedVertices, clippedEdges, clippedStartingIndices, calculatedIsClosedArray, true, createInteriorGeometry, ShadowShape2D.OutlineTopology.Lines);
+                    m_IsDirty = true;
+                }
                 else
                 {
                     m_LocalBounds = new Bounds();
-                    m_Mesh.Clear();
+                    Clear();
                 }
 
                 clippedVertices.Dispose();
@@ -286,7 +330,8 @@ public override void SetShape(NativeArray<Vector3> vertices, NativeArray<int> in
             }
             else
             {
-                m_LocalBounds = ShadowUtility.GenerateShadowMesh(m_Mesh, generatedVertices, calculatedEdges, calculatedStartingEdges, calculatedIsClosedArray, true, createInteriorGeometry, ShadowShape2D.OutlineTopology.Lines);
+                m_LocalBounds = ShadowUtility.GenerateShadowGeometry(ref m_NativeVertices, ref m_NativeIndices, generatedVertices, calculatedEdges, calculatedStartingEdges, calculatedIsClosedArray, true, createInteriorGeometry, ShadowShape2D.OutlineTopology.Lines);
+                m_IsDirty = true;
             }
 
             generatedVertices.Dispose();
@@ -320,7 +365,7 @@ public override void SetShape(NativeArray<Vector3> vertices, NativeArray<int> in
         {
             if (AreDegenerateVertices(vertices) || indices == null || indices.Length == 0)
             {
-                m_Mesh?.Clear();
+                Clear();
                 return;
             }
 
@@ -333,9 +378,6 @@ public override void SetShape(NativeArray<Vector3> vertices, NativeArray<int> in
             NativeArray<int> shapeStartingIndices;
             NativeArray<bool> shapeIsClosedArray;
 
-            if (m_Mesh == null)
-                m_Mesh = new Mesh();
-
             if (outlineTopology == ShadowShape2D.OutlineTopology.Triangles)
             {
                 NativeArray<Vector3> newVertices;
@@ -361,7 +403,8 @@ public override void SetShape(NativeArray<Vector3> vertices, NativeArray<int> in
 
                 ShadowUtility.ClipEdges(ref vertices, ref edges, ref shapeStartingIndices, ref shapeIsClosedArray, trimEdge, out clippedVertices, out clippedEdges, out clippedStartingIndices);
 
-                m_LocalBounds = ShadowUtility.GenerateShadowMesh(m_Mesh, clippedVertices, clippedEdges, clippedStartingIndices, shapeIsClosedArray, allowTrimming, createInteriorGeometry, outlineTopology);
+                m_LocalBounds = ShadowUtility.GenerateShadowGeometry(ref m_NativeVertices, ref m_NativeIndices, clippedVertices, clippedEdges, clippedStartingIndices, shapeIsClosedArray, allowTrimming, createInteriorGeometry, outlineTopology);
+                m_IsDirty = true;
 
                 clippedVertices.Dispose();
                 clippedEdges.Dispose();
@@ -369,9 +412,15 @@ public override void SetShape(NativeArray<Vector3> vertices, NativeArray<int> in
             }
             else
             {
-                m_LocalBounds = ShadowUtility.GenerateShadowMesh(m_Mesh, vertices, edges, shapeStartingIndices, shapeIsClosedArray, allowTrimming, createInteriorGeometry, outlineTopology);
+                m_LocalBounds = ShadowUtility.GenerateShadowGeometry(ref m_NativeVertices, ref m_NativeIndices, vertices, edges, shapeStartingIndices, shapeIsClosedArray, allowTrimming, createInteriorGeometry, outlineTopology);
+                m_IsDirty = true;
             }
 
+            if (m_Mesh == null)
+                m_Mesh = new Mesh();
+
+            ShadowUtility.GenerateShadowMesh(ref m_Mesh, m_NativeVertices, m_NativeIndices);
+
             if(disposeVertices)
                 vertices.Dispose();
 
@@ -412,5 +461,14 @@ public void UpdateBoundingSphere(Transform transform)
 
             m_BoundingSphere = new BoundingSphere(center, radius);
         }
+
+        ~ShadowMesh2D()
+        {
+            if(m_NativeIndices.IsCreated)
+                m_NativeIndices.Dispose();
+
+            if(m_NativeVertices.IsCreated)
+                m_NativeVertices.Dispose();
+        }
     }
 }
diff --git a/Packages/com.unity.render-pipelines.universal/Runtime/2D/Shadows/ShadowProvider/ShadowMesh2D.cs.meta b/Packages/com.unity.render-pipelines.universal/Runtime/2D/Shadows/Shadow Provider Utility/ShadowMesh2D.cs.meta
similarity index 100%
rename from Packages/com.unity.render-pipelines.universal/Runtime/2D/Shadows/ShadowProvider/ShadowMesh2D.cs.meta
rename to Packages/com.unity.render-pipelines.universal/Runtime/2D/Shadows/Shadow Provider Utility/ShadowMesh2D.cs.meta
diff --git a/Packages/com.unity.render-pipelines.universal/Runtime/2D/Shadows/ShadowProvider/ShadowShape2D.cs b/Packages/com.unity.render-pipelines.universal/Runtime/2D/Shadows/Shadow Provider Utility/ShadowShape2D.cs
similarity index 99%
rename from Packages/com.unity.render-pipelines.universal/Runtime/2D/Shadows/ShadowProvider/ShadowShape2D.cs
rename to Packages/com.unity.render-pipelines.universal/Runtime/2D/Shadows/Shadow Provider Utility/ShadowShape2D.cs
index 80396a410cf..acd18889cc0 100644
--- a/Packages/com.unity.render-pipelines.universal/Runtime/2D/Shadows/ShadowProvider/ShadowShape2D.cs
+++ b/Packages/com.unity.render-pipelines.universal/Runtime/2D/Shadows/Shadow Provider Utility/ShadowShape2D.cs	
@@ -8,6 +8,7 @@ namespace UnityEngine.Rendering.Universal
     /// <summary>
     /// Class <c>ShadowShape2D</c> stores outline geometry for use with a shadow caster.
     /// </summary>
+    [Serializable]
     public abstract class ShadowShape2D
     {
         /// <summary>
diff --git a/Packages/com.unity.render-pipelines.universal/Runtime/2D/Shadows/ShadowProvider/ShadowShape2D.cs.meta b/Packages/com.unity.render-pipelines.universal/Runtime/2D/Shadows/Shadow Provider Utility/ShadowShape2D.cs.meta
similarity index 100%
rename from Packages/com.unity.render-pipelines.universal/Runtime/2D/Shadows/ShadowProvider/ShadowShape2D.cs.meta
rename to Packages/com.unity.render-pipelines.universal/Runtime/2D/Shadows/Shadow Provider Utility/ShadowShape2D.cs.meta
diff --git a/Packages/com.unity.render-pipelines.universal/Runtime/2D/Shadows/ShadowProvider/ShadowUtility.cs b/Packages/com.unity.render-pipelines.universal/Runtime/2D/Shadows/Shadow Provider Utility/ShadowUtility.cs
similarity index 96%
rename from Packages/com.unity.render-pipelines.universal/Runtime/2D/Shadows/ShadowProvider/ShadowUtility.cs
rename to Packages/com.unity.render-pipelines.universal/Runtime/2D/Shadows/Shadow Provider Utility/ShadowUtility.cs
index b4e74f5853b..c2c0173be0d 100644
--- a/Packages/com.unity.render-pipelines.universal/Runtime/2D/Shadows/ShadowProvider/ShadowUtility.cs
+++ b/Packages/com.unity.render-pipelines.universal/Runtime/2D/Shadows/Shadow Provider Utility/ShadowUtility.cs	
@@ -32,11 +32,12 @@ public enum ProjectionType
             ProjectionSoftRight =  3,
         }
 
+        [Serializable]
         [StructLayout(LayoutKind.Sequential)]
         internal struct ShadowMeshVertex
         {
-            internal Vector3 position;   // stores: xy: position           z: projection type    w: soft shadow value (0 is fully shadowed)
-            internal Vector4 tangent;    // stores: xy: contraction dir    zw: other edge position
+            [SerializeField] internal Vector3 position;   // stores: xy: position           z: projection type    w: soft shadow value (0 is fully shadowed)
+            [SerializeField] internal Vector4 tangent;    // stores: xy: contraction dir    zw: other edge position
 
             internal ShadowMeshVertex(ProjectionType inProjectionType, Vector2 inEdgePosition0, Vector2 inEdgePosition1)
             {
@@ -371,8 +372,31 @@ static void GenerateInteriorMesh(ref NativeArray<ShadowMeshVertex> inVertices, r
             tessOutEdges.Dispose();
         }
 
+        static public void GenerateShadowMesh(ref Mesh mesh, NativeArray<ShadowMeshVertex> inVertices, NativeArray<int> inIndices)
+        {
+            if(mesh == null)
+                mesh = new Mesh();
+
+            if (inVertices.IsCreated && inIndices.IsCreated)
+            {
+                // Set the mesh data
+                mesh.SetVertexBufferParams(inVertices.Length, m_VertexLayout);
+                mesh.SetVertexBufferData<ShadowMeshVertex>(inVertices, 0, 0, inVertices.Length);
+                mesh.SetIndexBufferParams(inIndices.Length, IndexFormat.UInt32);
+                mesh.SetIndexBufferData<int>(inIndices, 0, 0, inIndices.Length);
+                mesh.SetSubMesh(0, new SubMeshDescriptor(0, inIndices.Length));
+                mesh.subMeshCount = 1;
+            }
+            else
+            {
+                mesh.Clear();
+            }
+        }
+
         //inEdges is expected to be contiguous
-        static public Bounds GenerateShadowMesh(Mesh mesh, NativeArray<Vector3> inVertices, NativeArray<ShadowEdge> inEdges, NativeArray<int> inShapeStartingEdge, NativeArray<bool> inShapeIsClosedArray, bool allowContraction, bool fill, ShadowShape2D.OutlineTopology topology)
+
+
+        static public Bounds GenerateShadowGeometry(ref NativeArray<ShadowMeshVertex> outVertices, ref NativeArray<int> outIndices, NativeArray<Vector3> inVertices, NativeArray<ShadowEdge> inEdges, NativeArray<int> inShapeStartingEdge, NativeArray<bool> inShapeIsClosedArray, bool allowContraction, bool fill, ShadowShape2D.OutlineTopology topology)
         {
             // Setup our buffers
             int meshVertexCount = inVertices.Length + k_AdditionalVerticesPerEdge * inEdges.Length;                       // Each vertex will have a duplicate that can be extruded.
@@ -403,18 +427,15 @@ static public Bounds GenerateShadowMesh(Mesh mesh, NativeArray<Vector3> inVertic
                 finalIndices = meshIndices;
             }
 
-            // Set the mesh data
-            mesh.SetVertexBufferParams(finalVertices.Length, m_VertexLayout);
-            mesh.SetVertexBufferData<ShadowMeshVertex>(finalVertices, 0, 0, finalVertices.Length);
-            mesh.SetIndexBufferParams(finalIndices.Length, IndexFormat.UInt32);
-            mesh.SetIndexBufferData<int>(finalIndices, 0, 0, finalIndices.Length);
+            if (outIndices != null)
+                outIndices.Dispose();
+            if (outVertices != null)
+                outVertices.Dispose();
 
-            mesh.SetSubMesh(0, new SubMeshDescriptor(0, finalIndices.Length));
-            mesh.subMeshCount = 1;
+            outVertices = finalVertices;
+            outIndices = finalIndices;
 
             meshProjectionInfo.Dispose();
-            finalVertices.Dispose();
-            finalIndices.Dispose();
 
             CalculateLocalBounds(ref inVertices, out Bounds retLocalBound);
             return retLocalBound;
diff --git a/Packages/com.unity.render-pipelines.universal/Runtime/2D/Shadows/ShadowProvider/ShadowUtility.cs.meta b/Packages/com.unity.render-pipelines.universal/Runtime/2D/Shadows/Shadow Provider Utility/ShadowUtility.cs.meta
similarity index 100%
rename from Packages/com.unity.render-pipelines.universal/Runtime/2D/Shadows/ShadowProvider/ShadowUtility.cs.meta
rename to Packages/com.unity.render-pipelines.universal/Runtime/2D/Shadows/Shadow Provider Utility/ShadowUtility.cs.meta
diff --git a/Packages/com.unity.render-pipelines.universal/Runtime/2D/Shadows/ShadowProvider/ShapeProviderUtility.cs b/Packages/com.unity.render-pipelines.universal/Runtime/2D/Shadows/Shadow Provider Utility/ShapeProviderUtility.cs
similarity index 67%
rename from Packages/com.unity.render-pipelines.universal/Runtime/2D/Shadows/ShadowProvider/ShapeProviderUtility.cs
rename to Packages/com.unity.render-pipelines.universal/Runtime/2D/Shadows/Shadow Provider Utility/ShapeProviderUtility.cs
index 0a46bf18b3b..98eb1d5b87f 100644
--- a/Packages/com.unity.render-pipelines.universal/Runtime/2D/Shadows/ShadowProvider/ShapeProviderUtility.cs
+++ b/Packages/com.unity.render-pipelines.universal/Runtime/2D/Shadows/Shadow Provider Utility/ShapeProviderUtility.cs	
@@ -11,7 +11,7 @@ namespace UnityEngine.Rendering.Universal
 {
     internal class ShapeProviderUtility
     {
-        static public void CallOnBeforeRender(ShadowShape2DProvider shapeProvider, Component component, ShadowMesh2D shadowMesh, Bounds bounds)
+        static public void CallOnBeforeRender(ShadowCaster2DProvider shapeProvider, Component component, ShadowMesh2D shadowMesh, Bounds bounds)
         {
             if (component != null)
             {
@@ -24,47 +24,47 @@ static public void CallOnBeforeRender(ShadowShape2DProvider shapeProvider, Compo
             }
         }
 
-        static public void PersistantDataCreated(ShadowShape2DProvider shapeProvider, Component component, ShadowMesh2D shadowMesh)
+        static public void PersistantDataCreated(ShadowCaster2DProvider shapeProvider, Component component, ShadowMesh2D shadowMesh)
         {
             if (component != null)
             {
                 if (shapeProvider != null)
-                    shapeProvider.OnPersistantDataCreated(component, shadowMesh);
+                    shapeProvider.OnInitialized(component, shadowMesh);
             }
         }
 
 #if UNITY_EDITOR
-        static public void TryGetDefaultShadowShapeProviderSource(GameObject go, out Component outSource, out ShadowShape2DProvider outProvider)
+        static public void TryGetDefaultShadowShapeProviderSource(GameObject go, out Component outSource, out ShadowCaster2DProvider outProvider)
         {
             outSource = null;
             outProvider = null;
 
             // Create some providers to check against.
-            var providerTypes = TypeCache.GetTypesDerivedFrom<ShadowShape2DProvider>();
-            var providers = new List<ShadowShape2DProvider>(providerTypes.Count);
+            var providerTypes = TypeCache.GetTypesDerivedFrom<ShadowCaster2DProvider>();
+            var providers = new List<ShadowCaster2DProvider>(providerTypes.Count);
             foreach (Type providerType in providerTypes)
             {
                 if (providerType.IsAbstract)
                     continue;
 
-                providers.Add(Activator.CreateInstance(providerType) as ShadowShape2DProvider);
+                providers.Add(Activator.CreateInstance(providerType) as ShadowCaster2DProvider);
             }
 
             // Fetch the components to check.
             var components = go.GetComponents<Component>();
 
-            var currentPriority = int.MinValue;
+            var currentMenuPriority = int.MinValue;
             foreach (var component in components)
             {
                 // check each component to see if it is a valid provider
                 foreach (var provider in providers)
                 {
-                    if (provider.IsShapeSource(component))
+                    if (provider.IsRequiredComponentData(component))
                     {
-                        var menuPriority = provider.Priority();
-                        if (menuPriority > currentPriority)
+                        var menuPriority = provider.MenuPriority();
+                        if (menuPriority > currentMenuPriority)
                         {
-                            currentPriority = menuPriority;
+                            currentMenuPriority = menuPriority;
                             outSource = component;
                             outProvider = provider;
                         }
diff --git a/Packages/com.unity.render-pipelines.universal/Runtime/2D/Shadows/ShadowProvider/ShapeProviderUtility.cs.meta b/Packages/com.unity.render-pipelines.universal/Runtime/2D/Shadows/Shadow Provider Utility/ShapeProviderUtility.cs.meta
similarity index 100%
rename from Packages/com.unity.render-pipelines.universal/Runtime/2D/Shadows/ShadowProvider/ShapeProviderUtility.cs.meta
rename to Packages/com.unity.render-pipelines.universal/Runtime/2D/Shadows/Shadow Provider Utility/ShapeProviderUtility.cs.meta
diff --git a/Packages/com.unity.render-pipelines.universal/Runtime/2D/Shadows/ShadowProvider/VertexDictionary.cs b/Packages/com.unity.render-pipelines.universal/Runtime/2D/Shadows/Shadow Provider Utility/VertexDictionary.cs
similarity index 100%
rename from Packages/com.unity.render-pipelines.universal/Runtime/2D/Shadows/ShadowProvider/VertexDictionary.cs
rename to Packages/com.unity.render-pipelines.universal/Runtime/2D/Shadows/Shadow Provider Utility/VertexDictionary.cs
diff --git a/Packages/com.unity.render-pipelines.universal/Runtime/2D/Shadows/ShadowProvider/VertexDictionary.cs.meta b/Packages/com.unity.render-pipelines.universal/Runtime/2D/Shadows/Shadow Provider Utility/VertexDictionary.cs.meta
similarity index 100%
rename from Packages/com.unity.render-pipelines.universal/Runtime/2D/Shadows/ShadowProvider/VertexDictionary.cs.meta
rename to Packages/com.unity.render-pipelines.universal/Runtime/2D/Shadows/Shadow Provider Utility/VertexDictionary.cs.meta
diff --git a/Packages/com.unity.render-pipelines.universal/Runtime/2D/Shadows/ShadowCaster2D.cs b/Packages/com.unity.render-pipelines.universal/Runtime/2D/Shadows/ShadowCaster2D.cs
index d95a61bf0e9..4e74a9d288b 100644
--- a/Packages/com.unity.render-pipelines.universal/Runtime/2D/Shadows/ShadowCaster2D.cs
+++ b/Packages/com.unity.render-pipelines.universal/Runtime/2D/Shadows/ShadowCaster2D.cs
@@ -33,10 +33,11 @@ internal enum ComponentVersions
             Version_2 = 2,
             Version_3 = 3,
             Version_4 = 4,
-            Version_5 = 5
+            Version_5 = 5,
+            Version_6 = 6,
         }
 
-        const ComponentVersions k_CurrentComponentVersion = ComponentVersions.Version_5;
+        const ComponentVersions k_CurrentComponentVersion = ComponentVersions.Version_6;
         [SerializeField] ComponentVersions m_ComponentVersion = ComponentVersions.Version_Unserialized;
 
         internal enum ShadowCastingSources
@@ -91,10 +92,10 @@ internal enum EdgeProcessing
 
         [SerializeField] int m_InstanceId;
         [SerializeField] Component m_ShadowShape2DComponent;
-        [SerializeReference] ShadowShape2DProvider m_ShadowShape2DProvider;
+        [SerializeReference] ShadowCaster2DProvider m_ShadowShape2DProvider;
         [SerializeField] ShadowCastingSources m_ShadowCastingSource = (ShadowCastingSources)(-1);
 
-        [SerializeField] internal ShadowMesh2D m_ShadowMesh;
+        [SerializeReference] internal ShadowMesh2D m_ShadowMesh;
         [SerializeField] ShadowCastingOptions m_CastingOption = ShadowCastingOptions.CastShadow;
 
         [SerializeField] internal float m_PreviousTrimEdge = 0;
@@ -102,6 +103,10 @@ internal enum EdgeProcessing
         [SerializeField] internal int m_PreviousShadowCastingSource;
         [SerializeField] internal Component m_PreviousShadowShape2DSource = null;
 
+#if UNITY_EDITOR
+        [SerializeReference] internal Shadow2DProviderSources m_SelectionSources = new Shadow2DProviderSources();
+#endif
+
         internal ShadowCasterGroup2D m_ShadowCasterGroup = null;
         internal ShadowCasterGroup2D m_PreviousShadowCasterGroup = null;
 
@@ -153,7 +158,7 @@ public float alphaCutoff
 
         // Make this public if possible...
         internal Component shadowShape2DComponent { get { return m_ShadowShape2DComponent; } set { m_ShadowShape2DComponent = value; } }
-        internal ShadowShape2DProvider shadowShape2DProvider { get { return m_ShadowShape2DProvider; } set { m_ShadowShape2DProvider = value; } }
+        internal ShadowCaster2DProvider shadowShape2DProvider { get { return m_ShadowShape2DProvider; } set { m_ShadowShape2DProvider = value; } }
 
         int m_PreviousShadowGroup = 0;
         bool m_PreviousCastsShadows = true;
@@ -379,15 +384,7 @@ private void Awake()
                 SetShadowShape(newShadowMesh);
                 m_ShadowMesh = newShadowMesh;
             }
-#if UNITY_EDITOR
-            // This step is required in case of copy/pasting an object with a shadow caster.
-            else
-            {
-                ShadowMesh2D newShadowMesh = new ShadowMesh2D();
-                newShadowMesh.CopyFrom(m_ShadowMesh);
-                m_ShadowMesh = newShadowMesh;
-            }
-#endif
+
 
 #if USING_PHYSICS2D_MODULE
             else
@@ -404,7 +401,7 @@ private void Awake()
         /// </summary>
         protected void OnEnable()
         {
-            if (m_ShadowShape2DProvider != null)
+            if (m_ShadowShape2DProvider != null && m_ShadowShape2DComponent != null)
                 m_ShadowShape2DProvider.Enabled(m_ShadowShape2DComponent, m_ShadowMesh);
 
             m_ShadowCasterGroup = null;
@@ -422,7 +419,7 @@ protected void OnDisable()
         {
             ShadowCasterGroup2DManager.RemoveFromShadowCasterGroup(this, m_ShadowCasterGroup);
 
-            if (m_ShadowShape2DProvider != null)
+            if (m_ShadowShape2DProvider != null && m_ShadowShape2DComponent != null)
                 m_ShadowShape2DProvider.Disabled(m_ShadowShape2DComponent, m_ShadowMesh);
 
 #if UNITY_EDITOR
@@ -589,10 +586,14 @@ private void OnSortingLayerRemoved(SortingLayer layer)
         }
 #endif
 
+
         /// <inheritdoc/>
         public void OnBeforeSerialize()
         {
             m_ComponentVersion = k_CurrentComponentVersion;
+
+            if (m_ShadowMesh != null)
+                m_ShadowMesh.OnBeforeSerialize();
         }
 
         /// <inheritdoc/>
@@ -617,11 +618,24 @@ public void OnAfterDeserialize()
                 else
                     m_CastingOption = ShadowCastingOptions.NoShadow;
             }
-            if(m_ComponentVersion < ComponentVersions.Version_3)
+            if (m_ComponentVersion < ComponentVersions.Version_3)
             {
                 m_ShadowMesh = null;
                 m_ForceShadowMeshRebuild = true;
             }
+
+            if (m_ComponentVersion < ComponentVersions.Version_6)
+            {
+#if UNITY_EDITOR
+                if (m_ShadowCastingSource == ShadowCastingSources.ShapeProvider)
+                    m_SelectionSources.selectedHashCode = LightUtility.ProviderToHash(shadowShape2DProvider, shadowShape2DComponent);
+                else
+                    m_SelectionSources.selectedHashCode = (int)m_ShadowCastingSource;
+#endif
+            }
+
+            if(m_ShadowMesh != null)
+                m_ShadowMesh.OnAfterDeserialize();
         }
     }
 }
diff --git a/Packages/com.unity.render-pipelines.universal/Runtime/2D/Sources.meta b/Packages/com.unity.render-pipelines.universal/Runtime/2D/Sources.meta
new file mode 100644
index 00000000000..3845ed016be
--- /dev/null
+++ b/Packages/com.unity.render-pipelines.universal/Runtime/2D/Sources.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 38624cfc8c8a65c4b813394a99363b54
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Packages/com.unity.render-pipelines.universal/Runtime/2D/Sources/IProvider2DCache.cs b/Packages/com.unity.render-pipelines.universal/Runtime/2D/Sources/IProvider2DCache.cs
new file mode 100644
index 00000000000..b5fd234956c
--- /dev/null
+++ b/Packages/com.unity.render-pipelines.universal/Runtime/2D/Sources/IProvider2DCache.cs
@@ -0,0 +1,13 @@
+using System;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEngine.Rendering.Universal;
+
+namespace UnityEngine.Rendering.Universal
+{
+    internal interface IProvider2DCache
+    {
+        public IEnumerable<Provider2DKVPair> Cache { get; }
+        public void UpdateCache(GameObject gameObj);
+    }
+}
diff --git a/Packages/com.unity.render-pipelines.universal/Runtime/2D/Sources/IProvider2DCache.cs.meta b/Packages/com.unity.render-pipelines.universal/Runtime/2D/Sources/IProvider2DCache.cs.meta
new file mode 100644
index 00000000000..370158d4bf9
--- /dev/null
+++ b/Packages/com.unity.render-pipelines.universal/Runtime/2D/Sources/IProvider2DCache.cs.meta
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: 50e4c5766b2736d46b3bef6188fc4d3f
\ No newline at end of file
diff --git a/Packages/com.unity.render-pipelines.universal/Runtime/2D/Sources/IProvider2DSources.cs b/Packages/com.unity.render-pipelines.universal/Runtime/2D/Sources/IProvider2DSources.cs
new file mode 100644
index 00000000000..61f01217083
--- /dev/null
+++ b/Packages/com.unity.render-pipelines.universal/Runtime/2D/Sources/IProvider2DSources.cs
@@ -0,0 +1,12 @@
+#if UNITY_EDITOR
+using System.Collections.Generic;
+
+namespace UnityEngine.Rendering.Universal
+{
+    internal interface IProvider2DSources
+    {
+        List<SelectionSource> GetAdditionalSources();
+        GUIContent[] GetSourceNames();
+    }
+}
+#endif
diff --git a/Packages/com.unity.render-pipelines.universal/Runtime/2D/Sources/IProvider2DSources.cs.meta b/Packages/com.unity.render-pipelines.universal/Runtime/2D/Sources/IProvider2DSources.cs.meta
new file mode 100644
index 00000000000..dc577935948
--- /dev/null
+++ b/Packages/com.unity.render-pipelines.universal/Runtime/2D/Sources/IProvider2DSources.cs.meta
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: 968d592865a36d64abb3a8de86ddbc91
\ No newline at end of file
diff --git a/Packages/com.unity.render-pipelines.universal/Runtime/2D/Sources/Light2DProviderSource.cs b/Packages/com.unity.render-pipelines.universal/Runtime/2D/Sources/Light2DProviderSource.cs
new file mode 100644
index 00000000000..833d794cc9d
--- /dev/null
+++ b/Packages/com.unity.render-pipelines.universal/Runtime/2D/Sources/Light2DProviderSource.cs
@@ -0,0 +1,23 @@
+#if UNITY_EDITOR
+using System;
+using UnityEditor;
+
+namespace UnityEngine.Rendering.Universal
+{
+    [Serializable]
+    internal class Light2DProviderSource : Provider2DSource
+    {
+        public override void SetSourceType(SerializedObject serializedObject)
+        {
+            serializedObject.Update();
+            SerializedProperty lightType = serializedObject.FindProperty("m_LightType");
+            SerializedProperty provider = serializedObject.FindProperty("m_Light2DProvider");
+
+            lightType.intValue = m_SourceType;
+            provider.boxedValue = m_Provider;
+            m_Provider.OnSelected();
+            serializedObject.ApplyModifiedProperties();
+        }
+    }
+}
+#endif
diff --git a/Packages/com.unity.render-pipelines.universal/Runtime/2D/Sources/Light2DProviderSource.cs.meta b/Packages/com.unity.render-pipelines.universal/Runtime/2D/Sources/Light2DProviderSource.cs.meta
new file mode 100644
index 00000000000..80f29bd10d5
--- /dev/null
+++ b/Packages/com.unity.render-pipelines.universal/Runtime/2D/Sources/Light2DProviderSource.cs.meta
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: 1d7f8ba4f5bcca541bb11360a0dc18b8
\ No newline at end of file
diff --git a/Packages/com.unity.render-pipelines.universal/Runtime/2D/Sources/Light2DProviderSources.cs b/Packages/com.unity.render-pipelines.universal/Runtime/2D/Sources/Light2DProviderSources.cs
new file mode 100644
index 00000000000..580c35d52a7
--- /dev/null
+++ b/Packages/com.unity.render-pipelines.universal/Runtime/2D/Sources/Light2DProviderSources.cs
@@ -0,0 +1,28 @@
+#if UNITY_EDITOR
+using System;
+using UnityEditor;
+
+namespace UnityEngine.Rendering.Universal
+{
+    [Serializable]
+    internal class Light2DProviderSources : Provider2DSources<Light2DProvider, Light2DProviderSource>
+    {
+
+        static void SetSourceType(SerializedObject serializedObject, SerializedProperty selectionSources)
+        {
+            SetSourceType(selectionSources);
+
+            Provider2DSource providerSource = selectionSources.FindPropertyRelative("m_SelectedSource")?.boxedValue as Provider2DSource;
+            if (providerSource != null)
+            {
+                Object[] targets = serializedObject.targetObjects;
+                for (int i = 0; i < targets.Length; i++)
+                {
+                    Light2D light = targets[i] as Light2D;
+                    light.light2DProvider = providerSource.m_Provider as Light2DProvider;
+                }
+            }
+        }
+    }
+}
+#endif
diff --git a/Packages/com.unity.render-pipelines.universal/Runtime/2D/Sources/Light2DProviderSources.cs.meta b/Packages/com.unity.render-pipelines.universal/Runtime/2D/Sources/Light2DProviderSources.cs.meta
new file mode 100644
index 00000000000..96271bc33ca
--- /dev/null
+++ b/Packages/com.unity.render-pipelines.universal/Runtime/2D/Sources/Light2DProviderSources.cs.meta
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: 56d99b71230e8854aa450311b2cc4e85
\ No newline at end of file
diff --git a/Packages/com.unity.render-pipelines.universal/Runtime/2D/Sources/Light2DSource_BuiltIn.cs b/Packages/com.unity.render-pipelines.universal/Runtime/2D/Sources/Light2DSource_BuiltIn.cs
new file mode 100644
index 00000000000..3ffbc6bb85a
--- /dev/null
+++ b/Packages/com.unity.render-pipelines.universal/Runtime/2D/Sources/Light2DSource_BuiltIn.cs
@@ -0,0 +1,35 @@
+#if UNITY_EDITOR
+using System;
+using UnityEditor;
+
+namespace UnityEngine.Rendering.Universal
+{
+    [Serializable]
+    class Light2DSource_BuiltIn : SelectionSource
+    {
+        public override void SetSourceType(SerializedObject serializedObject)
+        {
+            SerializedProperty lightType = serializedObject.FindProperty("m_LightType");
+            lightType.intValue = m_SourceType;
+        }
+
+        public override void DrawUI(SerializedProperty property, SerializedObject serializedObject, UnityEngine.Object[] targets)
+        {
+        }
+
+        public override int GetHashCode()
+        {
+            return m_SourceType;
+        }
+
+        public Light2DSource_BuiltIn(GUIContent menuName, Light2D.LightType sourceType, int priority)
+        {
+            m_SourceType = (int)sourceType;
+            m_MenuName = menuName;
+            m_MenuPriority = priority;
+            m_HashCode = (int)Light2D.LightType.Global;
+        }
+
+    }
+}
+#endif
diff --git a/Packages/com.unity.render-pipelines.universal/Runtime/2D/Sources/Light2DSource_BuiltIn.cs.meta b/Packages/com.unity.render-pipelines.universal/Runtime/2D/Sources/Light2DSource_BuiltIn.cs.meta
new file mode 100644
index 00000000000..5b8fbaba9e6
--- /dev/null
+++ b/Packages/com.unity.render-pipelines.universal/Runtime/2D/Sources/Light2DSource_BuiltIn.cs.meta
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: 36f159460b6b00648afabd8225abd962
\ No newline at end of file
diff --git a/Packages/com.unity.render-pipelines.universal/Runtime/2D/Sources/Provider2DCache.cs b/Packages/com.unity.render-pipelines.universal/Runtime/2D/Sources/Provider2DCache.cs
new file mode 100644
index 00000000000..5dee12b88ee
--- /dev/null
+++ b/Packages/com.unity.render-pipelines.universal/Runtime/2D/Sources/Provider2DCache.cs
@@ -0,0 +1,105 @@
+#if UNITY_EDITOR
+using System;
+using System.Collections.Generic;
+using UnityEditor;
+
+namespace UnityEngine.Rendering.Universal
+{
+    [Serializable]
+    internal class Provider2DCache<T> : IProvider2DCache where T : Provider2D
+    {
+        [SerializeField] private List<Provider2DKVPair> m_Cache = new List<Provider2DKVPair>();
+
+        public IEnumerable<Provider2DKVPair> Cache
+        {
+            get
+            {
+                foreach (var kvp in m_Cache)
+                {
+                    // Only return if the Value (T) is not null
+                    if (kvp.m_Value.m_Provider != null)
+                    {
+                        yield return kvp;
+                    }
+                }
+            }
+        }
+
+        static int CacheContainsKeyAt(List<Provider2DKVPair> cache, Provider2DInfo key)
+        {
+            for(int i=0;i < cache.Count; i++)
+            {
+                Provider2DKVPair pair  = cache[i];
+                if (IsProviderInfoEqual(key, pair.m_Key))
+                    return i;
+            }
+
+            return -1;
+        }
+
+        internal static bool AreProviderCachesEqual(Provider2DCache<T> a, Provider2DCache<T> b, Action<string> onNotEqual)
+        {
+            if(a.m_Cache.Count != b.m_Cache.Count)     { onNotEqual("Cache sizes are Different Sizes"); return false; }
+
+            for(int i = 0; i < a.m_Cache.Count; i++)
+            { 
+                if(!IsProviderInfoEqual(a.m_Cache[i].m_Key, b.m_Cache[i].m_Key)) { onNotEqual("Key info is different"); return false; }
+
+                Provider2D aT = a.m_Cache[i].m_Value.m_Provider;
+                Provider2D bT = b.m_Cache[i].m_Value.m_Provider;
+
+                if (aT == null || bT == null) { onNotEqual("Value info is null"); return false; }
+            }
+
+            return true;
+        }
+
+        static bool IsProviderInfoEqual(Provider2DInfo a, Provider2DInfo b)
+        {
+            if(a.m_Component == null || b.m_Component == null)
+                return a.m_TypeName == b.m_TypeName && a.m_Component == b.m_Component;
+            else
+                return a.m_TypeName == b.m_TypeName && a.m_Component.GetType().Name == b.m_Component.GetType().Name;
+        }
+
+        public void UpdateCache(GameObject gameObj)
+        {
+            var providerTypes = TypeCache.GetTypesDerivedFrom<T>();
+            var activeProviders = new List<Provider2DKVPair>();
+
+            foreach (Type providerType in providerTypes)
+            {
+                if (providerType.IsAbstract)
+                    continue;
+
+                T provider = Activator.CreateInstance(providerType) as T;
+
+                Component[] components = gameObj.GetComponents<Component>();
+                foreach (var component in components)
+                {
+                    if (provider.Internal_IsRequiredComponentData(component))
+                    {
+                        Provider2DInfo info = new Provider2DInfo(providerType, component);
+                        int keyIndex = CacheContainsKeyAt(m_Cache, info);
+                        if (keyIndex >= 0)
+                        {
+                            activeProviders.Add(m_Cache[keyIndex]);
+                        }
+                        else
+                        {
+                            provider.OnAwake();
+                            activeProviders.Add(new Provider2DKVPair(info, new Provider2DRef(provider)));
+                        }
+                    }
+                }
+            }
+
+            // We need to clear any deleted providers from our cache without deleting data we have cached.
+            m_Cache.Clear();
+            for (int i = 0; i < activeProviders.Count; i++)
+                m_Cache.Add(activeProviders[i]);
+
+        }
+    }
+}
+#endif
diff --git a/Packages/com.unity.render-pipelines.universal/Runtime/2D/Sources/Provider2DCache.cs.meta b/Packages/com.unity.render-pipelines.universal/Runtime/2D/Sources/Provider2DCache.cs.meta
new file mode 100644
index 00000000000..6f14ef98a88
--- /dev/null
+++ b/Packages/com.unity.render-pipelines.universal/Runtime/2D/Sources/Provider2DCache.cs.meta
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: 96fe41ee3d39d724e8c066e89c73ee4d
\ No newline at end of file
diff --git a/Packages/com.unity.render-pipelines.universal/Runtime/2D/Sources/Provider2DInfo.cs b/Packages/com.unity.render-pipelines.universal/Runtime/2D/Sources/Provider2DInfo.cs
new file mode 100644
index 00000000000..a823488e5d2
--- /dev/null
+++ b/Packages/com.unity.render-pipelines.universal/Runtime/2D/Sources/Provider2DInfo.cs
@@ -0,0 +1,17 @@
+using System;
+using UnityEngine;
+
+[Serializable]
+internal struct Provider2DInfo
+{
+    public string m_TypeName;
+    public Component m_Component;
+    public bool m_UsesComponent;   // if the component is deleted this is invalid info
+
+    public Provider2DInfo(Type type, Component component)
+    {
+        m_TypeName = type.Name;
+        m_UsesComponent = component != null;
+        m_Component = component;
+    }
+}
diff --git a/Packages/com.unity.render-pipelines.universal/Runtime/2D/Sources/Provider2DInfo.cs.meta b/Packages/com.unity.render-pipelines.universal/Runtime/2D/Sources/Provider2DInfo.cs.meta
new file mode 100644
index 00000000000..918a1f5deb0
--- /dev/null
+++ b/Packages/com.unity.render-pipelines.universal/Runtime/2D/Sources/Provider2DInfo.cs.meta
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: 2485e47eef604b74ab3897c10c266891
\ No newline at end of file
diff --git a/Packages/com.unity.render-pipelines.universal/Runtime/2D/Sources/Provider2DKVPair.cs b/Packages/com.unity.render-pipelines.universal/Runtime/2D/Sources/Provider2DKVPair.cs
new file mode 100644
index 00000000000..ed783f27ff9
--- /dev/null
+++ b/Packages/com.unity.render-pipelines.universal/Runtime/2D/Sources/Provider2DKVPair.cs
@@ -0,0 +1,21 @@
+
+using System;
+
+
+namespace UnityEngine.Rendering.Universal
+{
+
+
+    [Serializable]
+    internal struct Provider2DKVPair
+    {
+        public Provider2DInfo m_Key;
+        public Provider2DRef m_Value;
+
+        public Provider2DKVPair(Provider2DInfo key, Provider2DRef value)
+        {
+            m_Key = key;
+            m_Value = value;
+        }
+    }
+}
diff --git a/Packages/com.unity.render-pipelines.universal/Runtime/2D/Sources/Provider2DKVPair.cs.meta b/Packages/com.unity.render-pipelines.universal/Runtime/2D/Sources/Provider2DKVPair.cs.meta
new file mode 100644
index 00000000000..4f1f5dee081
--- /dev/null
+++ b/Packages/com.unity.render-pipelines.universal/Runtime/2D/Sources/Provider2DKVPair.cs.meta
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: 65a21829bcfc0a7458e8ae05cf1e6291
\ No newline at end of file
diff --git a/Packages/com.unity.render-pipelines.universal/Runtime/2D/Sources/Provider2DRef.cs b/Packages/com.unity.render-pipelines.universal/Runtime/2D/Sources/Provider2DRef.cs
new file mode 100644
index 00000000000..96b37b7e377
--- /dev/null
+++ b/Packages/com.unity.render-pipelines.universal/Runtime/2D/Sources/Provider2DRef.cs
@@ -0,0 +1,17 @@
+using System;
+
+
+namespace UnityEngine.Rendering.Universal
+{
+
+    [Serializable]
+    internal struct Provider2DRef
+    {
+        [SerializeReference] public Provider2D m_Provider;
+
+        public Provider2DRef(Provider2D provider)
+        {
+            m_Provider = provider;
+        }
+    }
+}
diff --git a/Packages/com.unity.render-pipelines.universal/Runtime/2D/Sources/Provider2DRef.cs.meta b/Packages/com.unity.render-pipelines.universal/Runtime/2D/Sources/Provider2DRef.cs.meta
new file mode 100644
index 00000000000..ffd52694122
--- /dev/null
+++ b/Packages/com.unity.render-pipelines.universal/Runtime/2D/Sources/Provider2DRef.cs.meta
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: 64d01acbbe3ff8d4d9b89e2064405103
\ No newline at end of file
diff --git a/Packages/com.unity.render-pipelines.universal/Runtime/2D/Sources/Provider2DSource.cs b/Packages/com.unity.render-pipelines.universal/Runtime/2D/Sources/Provider2DSource.cs
new file mode 100644
index 00000000000..b1c9165c15b
--- /dev/null
+++ b/Packages/com.unity.render-pipelines.universal/Runtime/2D/Sources/Provider2DSource.cs
@@ -0,0 +1,29 @@
+#if UNITY_EDITOR
+using System;
+using UnityEditor;
+
+namespace UnityEngine.Rendering.Universal
+{
+    [Serializable]
+    internal class Provider2DSource : SelectionSource
+    {
+        [SerializeReference] public Provider2D m_Provider;
+
+        public virtual void Initialize(Provider2D provider, Component component, int providerType)
+        {
+            m_SourceType = providerType;
+            m_MenuName = provider.Internal_ProviderName(component.GetType().Name);
+            m_MenuPriority = provider.MenuPriority();
+            m_HashCode = LightUtility.ProviderToHash(provider, component);
+            m_Provider = provider;
+        }
+
+        public override void DrawUI(SerializedProperty property, SerializedObject serializedObject, UnityEngine.Object[] targets)
+        {
+            SerializedProperty source = property.FindPropertyRelative("m_SelectedSource");
+            SerializedProperty provideProperty = source.FindPropertyRelative("m_Provider");
+            EditorGUILayout.PropertyField(provideProperty);
+        }
+    }
+}
+#endif
diff --git a/Packages/com.unity.render-pipelines.universal/Runtime/2D/Sources/Provider2DSource.cs.meta b/Packages/com.unity.render-pipelines.universal/Runtime/2D/Sources/Provider2DSource.cs.meta
new file mode 100644
index 00000000000..97f635dab96
--- /dev/null
+++ b/Packages/com.unity.render-pipelines.universal/Runtime/2D/Sources/Provider2DSource.cs.meta
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: 3fce2db4cb62a33459ea6809881ae780
\ No newline at end of file
diff --git a/Packages/com.unity.render-pipelines.universal/Runtime/2D/Sources/Provider2DSources.cs b/Packages/com.unity.render-pipelines.universal/Runtime/2D/Sources/Provider2DSources.cs
new file mode 100644
index 00000000000..d9700722d2b
--- /dev/null
+++ b/Packages/com.unity.render-pipelines.universal/Runtime/2D/Sources/Provider2DSources.cs
@@ -0,0 +1,195 @@
+#if UNITY_EDITOR
+using System;
+using System.Collections.Generic;
+using UnityEditor;
+
+namespace UnityEngine.Rendering.Universal
+{
+    [Serializable]
+    internal class Provider2DSources<T, U> : IProvider2DSources where T : Provider2D where U : Provider2DSource
+    {
+
+        //Editor 
+        [SerializeField] int                    m_SelectedHashCode;
+        [SerializeReference] SelectionSource    m_SelectedSource;
+        [SerializeReference] IProvider2DCache   m_Provider2DCache;
+        List<SelectionSource>                   m_Sources = new List<SelectionSource>();
+        List<SelectionSource>                   m_AdditionalSources = new List<SelectionSource>();
+
+        private static int GetSelectedSourceIndexFromId(Provider2DSources<T, U> provider2DSources)
+        {
+            int hashCode = provider2DSources.m_SelectedHashCode;
+            for (int i = 0; i < provider2DSources.m_Sources.Count; i++)
+            {
+                int sourceHashCode = provider2DSources.m_Sources[i].GetHashCode();
+                if (hashCode == sourceHashCode)
+                {
+                    return i;
+                }
+            }
+
+            return -1;
+        }
+
+
+        static void DeconflictNames(List<SelectionSource> selectionSources)
+        {
+            Dictionary<string, List<SelectionSource>> selectionSourcesByName = new Dictionary<string, List<SelectionSource>>();
+
+            // Add all the names to the dictionary
+            foreach (var selection in selectionSources)
+            {
+                string name = selection.GetSourceName()?.text?.Trim(); ;
+
+                List<SelectionSource> sourceList;
+                if(selectionSourcesByName.ContainsKey(name))
+                {
+                    sourceList = selectionSourcesByName[name];
+                }
+                else
+                {
+                    sourceList = new List<SelectionSource>();
+                    selectionSourcesByName.Add(name, sourceList);
+                }
+
+                sourceList.Add(selection);
+            }
+
+
+            // Look for any repeats
+            foreach(var sourceList in selectionSourcesByName.Values)
+            {
+                // If there is more than one source with the same name renumber it
+                if(sourceList.Count > 1)
+                {
+                    for(int i=0;i<sourceList.Count;i++)
+                    {
+                        if(i > 0)
+                            sourceList[i].m_MenuName.text = sourceList[i].m_MenuName.text + " (" + i + ")";
+                    }
+                }
+            }
+        }
+
+
+        static void AddAddtionalSources(Provider2DSources<T, U> provider2DSources)
+        {
+            List<SelectionSource> additionalSources = provider2DSources.m_AdditionalSources;
+            if (additionalSources != null)
+            {
+                foreach (SelectionSource additionalSource in additionalSources)
+                {
+                    provider2DSources.m_Sources.Add(additionalSource);
+                }
+            }
+        }
+
+        // This must be called.
+        public static int RefreshSources(IProvider2DSources sources, GameObject gameObj, int providerType)
+        {
+            Provider2DSources<T, U> provider2DSources = sources as Provider2DSources<T, U>;
+            Debug.Assert(provider2DSources != null);
+
+            provider2DSources.m_Sources.Clear();
+
+            if (provider2DSources.m_Provider2DCache == null)
+                provider2DSources.m_Provider2DCache = new Provider2DCache<T>();
+
+            provider2DSources.m_Provider2DCache.UpdateCache(gameObj);
+                
+            // Combine additional sources with ones from the cache.
+            foreach (var kvp in provider2DSources.m_Provider2DCache.Cache)
+            {
+                if (kvp.m_Key.m_Component != null)
+                {
+                    U source = (U)Activator.CreateInstance(typeof(U));
+                    source.Initialize(kvp.m_Value.m_Provider, kvp.m_Key.m_Component, providerType);
+                    provider2DSources.m_Sources.Add(source);
+                }
+            }
+
+            AddAddtionalSources(provider2DSources);
+
+            DeconflictNames(provider2DSources.m_Sources); // This has to be done because unfortunately the dropdown which supports GUIContent lacks the robustness to handle duplicate names.
+
+            provider2DSources.m_Sources.Sort((a, b) => b.m_MenuPriority.CompareTo(a.m_MenuPriority));
+
+            // Set the current source index
+            return GetSelectedSourceIndexFromId(provider2DSources);
+        }
+
+        public static void UpdateSelectionFromIndex(IProvider2DSources sources, int index)
+        {
+            Provider2DSources<T, U> provider2DSources = sources as Provider2DSources<T, U>;
+            Debug.Assert(provider2DSources != null);
+
+            if (index >= 0)
+            {
+                provider2DSources.m_SelectedSource = provider2DSources.m_Sources[index];
+                provider2DSources.m_SelectedHashCode = provider2DSources.m_Sources[index].GetHashCode();
+            }
+            else
+            {
+                provider2DSources.m_SelectedSource = null;
+                provider2DSources.m_SelectedHashCode = 0;
+            }
+        }
+
+        public GUIContent[] GetSourceNames()
+        {
+            GUIContent[] content = new GUIContent[m_Sources.Count];
+            for(int i = 0; i < content.Length; i++)
+            {
+                content[i] = m_Sources[i].GetSourceName();
+            }
+            return content;
+        }
+
+        public List<SelectionSource> GetAdditionalSources()
+        {
+            return m_AdditionalSources;
+        }
+
+         public int selectedHashCode
+        {
+            get { return m_SelectedHashCode; }
+            set { m_SelectedHashCode = value; }
+        }
+
+        static public void SetAdditionalSources(SerializedProperty property, List<SelectionSource> additionalSources)
+        {
+            Provider2DSources<T, U> sources = property.boxedValue as Provider2DSources<T, U>;
+            if (sources.m_Sources != null)
+            {
+                sources.m_AdditionalSources.Clear();
+                foreach (var additionalSource in additionalSources)
+                    sources.m_AdditionalSources.Add(additionalSource);
+            }
+
+            property.boxedValue = sources;
+            property.serializedObject.ApplyModifiedProperties();
+        }
+
+        static public void SetSourceType(SerializedProperty property)
+        {
+            property.serializedObject.Update();
+
+            Provider2DSources<T, U> sources = property.boxedValue as Provider2DSources<T, U>;
+            if (sources.m_SelectedSource != null)
+                sources.m_SelectedSource.SetSourceType(property.serializedObject);
+
+            property.serializedObject.ApplyModifiedProperties();
+        }
+        public static void DrawSelectedSourceUI(SerializedProperty property)
+        {
+            property.serializedObject.Update();
+
+            Provider2DSources<T, U> sources = property.boxedValue as Provider2DSources<T, U>;
+            if (sources.m_SelectedSource != null)
+                sources.m_SelectedSource.DrawUI(property, property.serializedObject, property.serializedObject.targetObjects);
+
+            property.serializedObject.ApplyModifiedProperties();
+        }
+    }
+}
+#endif
diff --git a/Packages/com.unity.render-pipelines.universal/Runtime/2D/Sources/Provider2DSources.cs.meta b/Packages/com.unity.render-pipelines.universal/Runtime/2D/Sources/Provider2DSources.cs.meta
new file mode 100644
index 00000000000..2d55cd11e58
--- /dev/null
+++ b/Packages/com.unity.render-pipelines.universal/Runtime/2D/Sources/Provider2DSources.cs.meta
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: 6fb6d1c3ff6b1434aa8c4affe8313171
\ No newline at end of file
diff --git a/Packages/com.unity.render-pipelines.universal/Runtime/2D/Sources/SelectionSource2D.cs b/Packages/com.unity.render-pipelines.universal/Runtime/2D/Sources/SelectionSource2D.cs
new file mode 100644
index 00000000000..38f34b5d40a
--- /dev/null
+++ b/Packages/com.unity.render-pipelines.universal/Runtime/2D/Sources/SelectionSource2D.cs
@@ -0,0 +1,28 @@
+#if UNITY_EDITOR
+using System;
+using UnityEditor;
+
+namespace UnityEngine.Rendering.Universal
+{
+    [Serializable]
+    internal class SelectionSource
+    {
+        [SerializeField] public int        m_HashCode;
+        [SerializeField] public int        m_SourceType;
+        [SerializeField] public int        m_MenuPriority;
+        [SerializeField] public GUIContent m_MenuName;
+
+        public override int GetHashCode()
+        {
+            Debug.Assert(m_HashCode != 0, "m_HashCode was not set");
+            return m_HashCode;
+        }
+
+        public GUIContent GetSourceName() { return m_MenuName; }
+
+        public virtual void SetSourceType(SerializedObject serializedObject) { }
+
+        public virtual void DrawUI(SerializedProperty property, SerializedObject serializedObject, UnityEngine.Object[] targets) { }
+    }
+}
+#endif
diff --git a/Packages/com.unity.render-pipelines.universal/Runtime/2D/Sources/SelectionSource2D.cs.meta b/Packages/com.unity.render-pipelines.universal/Runtime/2D/Sources/SelectionSource2D.cs.meta
new file mode 100644
index 00000000000..15a39163a1a
--- /dev/null
+++ b/Packages/com.unity.render-pipelines.universal/Runtime/2D/Sources/SelectionSource2D.cs.meta
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: 6ee6184a87bccad4fae55f17c7456ac3
\ No newline at end of file
diff --git a/Packages/com.unity.render-pipelines.universal/Runtime/2D/Sources/Shadow2DProviderSource.cs b/Packages/com.unity.render-pipelines.universal/Runtime/2D/Sources/Shadow2DProviderSource.cs
new file mode 100644
index 00000000000..aeff15ec81e
--- /dev/null
+++ b/Packages/com.unity.render-pipelines.universal/Runtime/2D/Sources/Shadow2DProviderSource.cs
@@ -0,0 +1,38 @@
+#if UNITY_EDITOR
+using System;
+using UnityEditor;
+
+namespace UnityEngine.Rendering.Universal
+{
+    [Serializable]
+    internal class Shadow2DProviderSource : Provider2DSource
+    {
+        [SerializeField] Component m_Component;
+
+        public override void Initialize(Provider2D provider, Component component, int providerType) 
+        {
+            base.Initialize(provider, component, providerType);
+            m_Component = component;
+        }
+
+        public override int GetHashCode()
+        {
+            return LightUtility.ProviderToHash(m_Provider, m_Component);
+        }
+
+        public override void SetSourceType(SerializedObject serializedObject)
+        {
+            serializedObject.Update();
+            SerializedProperty lightType = serializedObject.FindProperty("m_ShadowCastingSource");
+            SerializedProperty provider = serializedObject.FindProperty("m_ShadowShape2DProvider");
+            SerializedProperty component = serializedObject.FindProperty("m_ShadowShape2DComponent");
+            lightType.intValue = m_SourceType;
+            provider.boxedValue = m_Provider;
+            component.boxedValue = m_Component;
+
+            m_Provider.OnSelected();
+            serializedObject.ApplyModifiedProperties();
+        }
+    }
+}
+#endif
diff --git a/Packages/com.unity.render-pipelines.universal/Runtime/2D/Sources/Shadow2DProviderSource.cs.meta b/Packages/com.unity.render-pipelines.universal/Runtime/2D/Sources/Shadow2DProviderSource.cs.meta
new file mode 100644
index 00000000000..246867b24d1
--- /dev/null
+++ b/Packages/com.unity.render-pipelines.universal/Runtime/2D/Sources/Shadow2DProviderSource.cs.meta
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: fc978838bb481b649b885c2d6bbbbb4f
\ No newline at end of file
diff --git a/Packages/com.unity.render-pipelines.universal/Runtime/2D/Sources/Shadow2DProviderSources.cs b/Packages/com.unity.render-pipelines.universal/Runtime/2D/Sources/Shadow2DProviderSources.cs
new file mode 100644
index 00000000000..61d40e787e8
--- /dev/null
+++ b/Packages/com.unity.render-pipelines.universal/Runtime/2D/Sources/Shadow2DProviderSources.cs
@@ -0,0 +1,16 @@
+#if UNITY_EDITOR
+using System;
+
+namespace UnityEngine.Rendering.Universal
+{
+    [Serializable]
+    internal class Shadow2DProviderSources : Provider2DSources<ShadowCaster2DProvider, Shadow2DProviderSource>
+    {
+
+        void SetSelectedHashCode(Provider2D provider, Component component)
+        {
+            
+        }
+    }
+}
+#endif
diff --git a/Packages/com.unity.render-pipelines.universal/Runtime/2D/Sources/Shadow2DProviderSources.cs.meta b/Packages/com.unity.render-pipelines.universal/Runtime/2D/Sources/Shadow2DProviderSources.cs.meta
new file mode 100644
index 00000000000..04744c4009c
--- /dev/null
+++ b/Packages/com.unity.render-pipelines.universal/Runtime/2D/Sources/Shadow2DProviderSources.cs.meta
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: d9b7ea2602695214b8674204f5127c20
\ No newline at end of file
diff --git a/Packages/com.unity.render-pipelines.universal/Runtime/2D/Sources/Shadow2DSource_ShapeEditor.cs b/Packages/com.unity.render-pipelines.universal/Runtime/2D/Sources/Shadow2DSource_ShapeEditor.cs
new file mode 100644
index 00000000000..98ebcf68af5
--- /dev/null
+++ b/Packages/com.unity.render-pipelines.universal/Runtime/2D/Sources/Shadow2DSource_ShapeEditor.cs
@@ -0,0 +1,32 @@
+#if UNITY_EDITOR
+using System;
+using UnityEditor;
+
+namespace UnityEngine.Rendering.Universal
+{
+    [Serializable]
+    internal class Shadow2DSource_ShapeEditor : SelectionSource
+    {
+        public Shadow2DSource_ShapeEditor(GUIContent menuName, int priority)
+        {
+            m_MenuName = menuName;
+            m_MenuPriority = priority;
+        }
+
+        public override int GetHashCode()
+        {
+            return (int)ShadowCaster2D.ShadowCastingSources.ShapeEditor;
+        }
+
+        public override void SetSourceType(SerializedObject serializedObject)
+        {
+            serializedObject.Update();
+
+            SerializedProperty shadowCastingSource = serializedObject.FindProperty("m_ShadowCastingSource");
+            shadowCastingSource.intValue = (int)ShadowCaster2D.ShadowCastingSources.ShapeEditor;
+
+            serializedObject.ApplyModifiedProperties();
+        }
+    }
+}
+#endif
diff --git a/Packages/com.unity.render-pipelines.universal/Runtime/2D/Sources/Shadow2DSource_ShapeEditor.cs.meta b/Packages/com.unity.render-pipelines.universal/Runtime/2D/Sources/Shadow2DSource_ShapeEditor.cs.meta
new file mode 100644
index 00000000000..53ebcfc5280
--- /dev/null
+++ b/Packages/com.unity.render-pipelines.universal/Runtime/2D/Sources/Shadow2DSource_ShapeEditor.cs.meta
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: 013fd020dbca2ff4aa86ad4cf51ab0ef
\ No newline at end of file
diff --git a/Packages/com.unity.render-pipelines.universal/Runtime/2D/URP2D_CRC32.cs b/Packages/com.unity.render-pipelines.universal/Runtime/2D/URP2D_CRC32.cs
new file mode 100644
index 00000000000..e758ad2330b
--- /dev/null
+++ b/Packages/com.unity.render-pipelines.universal/Runtime/2D/URP2D_CRC32.cs
@@ -0,0 +1,86 @@
+using System;
+using System.Text;
+using System.Runtime.InteropServices;
+
+namespace UnityEngine.Rendering.Universal
+{
+    internal static class URP2D_Crc32
+    {
+        // 8 tables of 256 uints each
+        private static readonly uint[][] Tables;
+
+        static URP2D_Crc32()
+        {
+            Tables = new uint[8][];
+            for (int i = 0; i < 8; i++) Tables[i] = new uint[256];
+
+            uint polynomial = 0xEDB88320;
+            // Fill Table 0
+            for (uint i = 0; i < 256; i++)
+            {
+                uint entry = i;
+                for (int j = 0; j < 8; j++)
+                    entry = (entry & 1) == 1 ? (entry >> 1) ^ polynomial : (entry >> 1);
+                Tables[0][i] = entry;
+            }
+
+            // Fill Tables 1 through 7
+            for (int t = 1; t < 8; t++)
+            {
+                for (int i = 0; i < 256; i++)
+                {
+                    uint prev = Tables[t - 1][i];
+                    Tables[t][i] = (prev >> 8) ^ Tables[0][prev & 0xFF];
+                }
+            }
+        }
+
+        public static uint Compute(ReadOnlySpan<byte> data)
+        {
+            uint crc = 0xFFFFFFFF;
+            int i = 0;
+            int length = data.Length;
+
+            // Pull tables into local variables to help the JIT optimize register usage
+            uint[] t0 = Tables[0];
+            uint[] t1 = Tables[1];
+            uint[] t2 = Tables[2];
+            uint[] t3 = Tables[3];
+            uint[] t4 = Tables[4];
+            uint[] t5 = Tables[5];
+            uint[] t6 = Tables[6];
+            uint[] t7 = Tables[7];
+
+            // Process 8 bytes at a time
+            while (length - i >= 8)
+            {
+                // We use bitwise logic to extract the 4 bytes of the current CRC
+                // and combine them with the next 4 bytes of data.
+                uint step1 = data[i] ^ (crc & 0xFF);
+                uint step2 = data[i + 1] ^ ((crc >> 8) & 0xFF);
+                uint step3 = data[i + 2] ^ ((crc >> 16) & 0xFF);
+                uint step4 = data[i + 3] ^ (crc >> 24);
+
+                crc = t7[step1] ^ t6[step2] ^ t5[step3] ^ t4[step4] ^
+                      t3[data[i + 4]] ^ t2[data[i + 5]] ^ t1[data[i + 6]] ^ t0[data[i + 7]];
+                i += 8;
+            }
+
+            // Remaining bytes
+            while (i < length)
+            {
+                crc = (crc >> 8) ^ t0[(crc ^ data[i++]) & 0xFF];
+            }
+
+            return ~crc;
+        }
+
+        public static uint Compute(string input)
+        {
+            if (string.IsNullOrEmpty(input)) return 0;
+            // Use the most efficient way to get bytes without huge allocations
+            return Compute(Encoding.UTF8.GetBytes(input));
+        }
+
+    }
+}
diff --git a/Packages/com.unity.render-pipelines.universal/Runtime/2D/URP2D_CRC32.cs.meta b/Packages/com.unity.render-pipelines.universal/Runtime/2D/URP2D_CRC32.cs.meta
new file mode 100644
index 00000000000..04c0fdd72e6
--- /dev/null
+++ b/Packages/com.unity.render-pipelines.universal/Runtime/2D/URP2D_CRC32.cs.meta
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: d35eb1420d1c3fa4586e6f55dfcc21fe
\ No newline at end of file
diff --git a/Packages/com.unity.render-pipelines.universal/Runtime/AssemblyInfo.cs b/Packages/com.unity.render-pipelines.universal/Runtime/AssemblyInfo.cs
index a03e991ba4a..45b528a0ea8 100644
--- a/Packages/com.unity.render-pipelines.universal/Runtime/AssemblyInfo.cs
+++ b/Packages/com.unity.render-pipelines.universal/Runtime/AssemblyInfo.cs
@@ -2,6 +2,7 @@
 
 [assembly: InternalsVisibleTo("UniversalGraphicsTests")]
 [assembly: InternalsVisibleTo("Universal2DGraphicsTests")]
+[assembly: InternalsVisibleTo("Universal2DEditorTests")]
 [assembly: InternalsVisibleTo("Unity.RenderPipelines.Universal.2D.Runtime")]
 [assembly: InternalsVisibleTo("Unity.RenderPipelines.Universal.Editor")]
 [assembly: InternalsVisibleTo("Unity.RenderPipelines.Universal.Editor.Tests")]
diff --git a/Packages/com.unity.render-pipelines.universal/Runtime/Data/PostProcessData.cs b/Packages/com.unity.render-pipelines.universal/Runtime/Data/PostProcessData.cs
index efcb98af8c7..e42fecbd724 100644
--- a/Packages/com.unity.render-pipelines.universal/Runtime/Data/PostProcessData.cs
+++ b/Packages/com.unity.render-pipelines.universal/Runtime/Data/PostProcessData.cs
@@ -233,7 +233,7 @@ public sealed class TextureResources : IRenderPipelineResources
             /// <summary>
             /// Pre-baked Blue noise textures.
             /// </summary>
-            // [ResourceFormattedPaths("Textures/BlueNoise16/L/LDR_LLL1_{0}.png", 0, 32)]
+            [ResourceFormattedPaths("Textures/BlueNoise16/L/LDR_LLL1_{0}.png", 0, 32)]
             public Texture2D[] blueNoise16LTex;
 
             /// <summary>
diff --git a/Packages/com.unity.render-pipelines.universal/Runtime/Data/UniversalRenderPipelineAsset.cs b/Packages/com.unity.render-pipelines.universal/Runtime/Data/UniversalRenderPipelineAsset.cs
index ba3e04305e6..11f09275984 100644
--- a/Packages/com.unity.render-pipelines.universal/Runtime/Data/UniversalRenderPipelineAsset.cs
+++ b/Packages/com.unity.render-pipelines.universal/Runtime/Data/UniversalRenderPipelineAsset.cs
@@ -1589,7 +1589,11 @@ public bool supportsDynamicBatching
         /// <summary>
         /// Returns true if the Render Pipeline Asset supports rendering layers for lights, false otherwise.
         /// </summary>
-        public bool useRenderingLayers => m_SupportsLightLayers;
+        public bool useRenderingLayers
+        {
+            get => m_SupportsLightLayers;
+            internal set => m_SupportsLightLayers = value;
+        }
 
         /// <summary>
         /// Returns the selected update mode for volumes.
diff --git a/Packages/com.unity.render-pipelines.universal/Runtime/Debug/DebugDisplaySettingsRendering.cs b/Packages/com.unity.render-pipelines.universal/Runtime/Debug/DebugDisplaySettingsRendering.cs
index 8f6360fea04..4fbafd82804 100644
--- a/Packages/com.unity.render-pipelines.universal/Runtime/Debug/DebugDisplaySettingsRendering.cs
+++ b/Packages/com.unity.render-pipelines.universal/Runtime/Debug/DebugDisplaySettingsRendering.cs
@@ -195,6 +195,20 @@ public enum TaaDebugMode
         /// </summary>
         public TaaDebugMode taaDebugMode { get; set; } = TaaDebugMode.None;
 
+        /// <summary>
+        /// Whether to block the Reflection Probe Atlas overlay display. Returns true when the relevant overlay is selected
+        /// but the main camera's rendering mode doesn't support displaying the Reflection Probe Atlas.
+        /// </summary>
+        internal bool blockReflectionProbeAtlasOverlay
+        {
+            get
+            {
+                var camera = Camera.main;
+                return camera == null ? false :
+                    (fullScreenDebugMode == DebugFullScreenMode.ReflectionProbeAtlas && !(camera.GetUniversalAdditionalCameraData().scriptableRenderer as UniversalRenderer).usesClusterLightLoop);
+            }
+        }
+
         /// <summary>
         /// Whether to block the STP overlay display. Returns true when STP debug mode is selected
         /// but the Universal Render Pipeline's upscaling filter is not set to STP.
@@ -232,6 +246,7 @@ static class Strings
             public const string RangeValidationSettingsContainerName = "Pixel Range Settings";
 
             public static readonly NameAndTooltip MapOverlays = new() { name = "Map Overlays", tooltip = "Overlays render pipeline textures to validate the scene." };
+            public static readonly NameAndTooltip ReflectionProbeAtlasDebugWarning = new() { name = "Warning: Reflection Probe Atlas visualization not supported for the current rendering path. Switch to Forward+ or Deferred+ to use this debug view.", tooltip = "Switch to Forward+ or Deferred+ in the main camera's Universal Renderer Data asset to use this debug overlay." };
             public static readonly NameAndTooltip StpDebugWarning = new() { name = "Warning: STP Overlay Not Active. Enable STP upscaling filter in the render pipeline asset to use these debug view.", tooltip = "Enable STP upscaling filter in the render pipeline asset to use these debug views." };
             public static readonly NameAndTooltip StpDebugViews = new() { name = "STP Debug Views", tooltip = "Debug visualizations provided by STP." };
             public static readonly NameAndTooltip MapSize = new() { name = "Map Size", tooltip = "Set the size of the render pipeline texture in the scene." };
@@ -300,9 +315,16 @@ internal static class WidgetFactory
             {
                 children =
                 {
+                    new DebugUI.MessageBox
+                    {
+                        nameAndTooltip = Strings.ReflectionProbeAtlasDebugWarning,
+                        style = DebugUI.MessageBox.Style.Warning,
+                        isHiddenCallback = () => !data.blockReflectionProbeAtlasOverlay,
+                    },
                     new DebugUI.IntField
                     {
                         nameAndTooltip = Strings.MapSize,
+                        isHiddenCallback = () => data.blockReflectionProbeAtlasOverlay,
                         getter = () => data.fullScreenDebugModeOutputSizeScreenPercent,
                         setter = value => data.fullScreenDebugModeOutputSizeScreenPercent = value,
                         incStep = 10,
diff --git a/Packages/com.unity.render-pipelines.universal/Runtime/Decal/DecalProjector.cs b/Packages/com.unity.render-pipelines.universal/Runtime/Decal/DecalProjector.cs
index 97ba722c212..b136f041e9d 100644
--- a/Packages/com.unity.render-pipelines.universal/Runtime/Decal/DecalProjector.cs
+++ b/Packages/com.unity.render-pipelines.universal/Runtime/Decal/DecalProjector.cs
@@ -23,6 +23,7 @@ public enum DecalScaleMode
     [CanEditMultipleObjects]
 #endif
     [AddComponentMenu("Rendering/URP Decal Projector")]
+    [Icon("Packages/com.unity.render-pipelines.core/Editor/Icons/Processed/DecalProjector Icon.asset")]
     public partial class DecalProjector : MonoBehaviour, ISerializationCallbackReceiver
     {
         internal delegate void DecalProjectorAction(DecalProjector decalProjector);
diff --git a/Packages/com.unity.render-pipelines.universal/Runtime/Decal/DecalProjector.cs.meta b/Packages/com.unity.render-pipelines.universal/Runtime/Decal/DecalProjector.cs.meta
index 664d9b5ed37..ac0b996ac82 100644
--- a/Packages/com.unity.render-pipelines.universal/Runtime/Decal/DecalProjector.cs.meta
+++ b/Packages/com.unity.render-pipelines.universal/Runtime/Decal/DecalProjector.cs.meta
@@ -5,7 +5,7 @@ MonoImporter:
   serializedVersion: 2
   defaultReferences: []
   executionOrder: 0
-  icon: {fileID: 2800000, guid: 9ba98ca4f0fc0754caca09e38af0cc0a, type: 3}
+  icon: {fileID: 2800000, guid: 340b2e8f8761e254d8ee52bc663cedbd, type: 2}
   userData: 
   assetBundleName: 
   assetBundleVariant: 
diff --git a/Packages/com.unity.render-pipelines.universal/Runtime/RendererFeatures/DecalRendererFeature.cs b/Packages/com.unity.render-pipelines.universal/Runtime/RendererFeatures/DecalRendererFeature.cs
index 6b3214d976f..1d4cf6f903a 100644
--- a/Packages/com.unity.render-pipelines.universal/Runtime/RendererFeatures/DecalRendererFeature.cs
+++ b/Packages/com.unity.render-pipelines.universal/Runtime/RendererFeatures/DecalRendererFeature.cs
@@ -179,6 +179,7 @@ private void OnDecalMaterialChange(DecalProjector decalProjector)
     [DisallowMultipleRendererFeature("Decal")]
     [Tooltip("With this Renderer Feature, Unity can project specific Materials (decals) onto other objects in the Scene.")]
     [URPHelpURL("renderer-feature-decal")]
+    [Icon("Packages/com.unity.render-pipelines.core/Editor/Icons/Processed/DecalProjector Icon.asset")]
     public partial class DecalRendererFeature : ScriptableRendererFeature
     {
         private static SharedDecalEntityManager sharedDecalEntityManager { get; } = new SharedDecalEntityManager();
diff --git a/Packages/com.unity.render-pipelines.universal/Runtime/RendererFeatures/DecalRendererFeature.cs.meta b/Packages/com.unity.render-pipelines.universal/Runtime/RendererFeatures/DecalRendererFeature.cs.meta
index d7eb64cb212..c2a1d425131 100644
--- a/Packages/com.unity.render-pipelines.universal/Runtime/RendererFeatures/DecalRendererFeature.cs.meta
+++ b/Packages/com.unity.render-pipelines.universal/Runtime/RendererFeatures/DecalRendererFeature.cs.meta
@@ -5,7 +5,7 @@ MonoImporter:
   serializedVersion: 2
   defaultReferences: []
   executionOrder: 0
-  icon: {fileID: 2800000, guid: 9ba98ca4f0fc0754caca09e38af0cc0a, type: 3}
+  icon: {fileID: 2800000, guid: 340b2e8f8761e254d8ee52bc663cedbd, type: 2}
   userData: 
   assetBundleName: 
   assetBundleVariant: 
diff --git a/Packages/com.unity.render-pipelines.universal/Runtime/RendererFeatures/OnTileUberPost.shader b/Packages/com.unity.render-pipelines.universal/Runtime/RendererFeatures/OnTileUberPost.shader
index c26184b25ab..4b3eb37127f 100644
--- a/Packages/com.unity.render-pipelines.universal/Runtime/RendererFeatures/OnTileUberPost.shader
+++ b/Packages/com.unity.render-pipelines.universal/Runtime/RendererFeatures/OnTileUberPost.shader
@@ -207,7 +207,7 @@ Shader "OnTileUberPost"
                 #pragma vertex Vert
                 #pragma fragment FragUberPostTextureReadVersion
                 #pragma target 5.0
-                #pragma enable_d3d11_debug_symbols
+                #pragma enable_debug_symbols
                 #pragma debug
 
                 // Fallback shader to use when we can't keep things on tile, so usually in the editor when dealing with
diff --git a/Packages/com.unity.render-pipelines.universal/Runtime/RendererFeatures/SurfaceCacheGlobalIlluminationRendererFeature.meta b/Packages/com.unity.render-pipelines.universal/Runtime/RendererFeatures/SurfaceCacheGIRendererFeature.meta
similarity index 100%
rename from Packages/com.unity.render-pipelines.universal/Runtime/RendererFeatures/SurfaceCacheGlobalIlluminationRendererFeature.meta
rename to Packages/com.unity.render-pipelines.universal/Runtime/RendererFeatures/SurfaceCacheGIRendererFeature.meta
diff --git a/Packages/com.unity.render-pipelines.universal/Runtime/RendererFeatures/SurfaceCacheGlobalIlluminationRendererFeature/Debug.compute b/Packages/com.unity.render-pipelines.universal/Runtime/RendererFeatures/SurfaceCacheGIRendererFeature/Debug.compute
similarity index 100%
rename from Packages/com.unity.render-pipelines.universal/Runtime/RendererFeatures/SurfaceCacheGlobalIlluminationRendererFeature/Debug.compute
rename to Packages/com.unity.render-pipelines.universal/Runtime/RendererFeatures/SurfaceCacheGIRendererFeature/Debug.compute
diff --git a/Packages/com.unity.render-pipelines.universal/Runtime/RendererFeatures/SurfaceCacheGlobalIlluminationRendererFeature/Debug.compute.meta b/Packages/com.unity.render-pipelines.universal/Runtime/RendererFeatures/SurfaceCacheGIRendererFeature/Debug.compute.meta
similarity index 100%
rename from Packages/com.unity.render-pipelines.universal/Runtime/RendererFeatures/SurfaceCacheGlobalIlluminationRendererFeature/Debug.compute.meta
rename to Packages/com.unity.render-pipelines.universal/Runtime/RendererFeatures/SurfaceCacheGIRendererFeature/Debug.compute.meta
diff --git a/Packages/com.unity.render-pipelines.universal/Runtime/RendererFeatures/SurfaceCacheGlobalIlluminationRendererFeature/FallbackMaterial.mat b/Packages/com.unity.render-pipelines.universal/Runtime/RendererFeatures/SurfaceCacheGIRendererFeature/FallbackMaterial.mat
similarity index 100%
rename from Packages/com.unity.render-pipelines.universal/Runtime/RendererFeatures/SurfaceCacheGlobalIlluminationRendererFeature/FallbackMaterial.mat
rename to Packages/com.unity.render-pipelines.universal/Runtime/RendererFeatures/SurfaceCacheGIRendererFeature/FallbackMaterial.mat
diff --git a/Packages/com.unity.render-pipelines.universal/Runtime/RendererFeatures/SurfaceCacheGlobalIlluminationRendererFeature/FallbackMaterial.mat.meta b/Packages/com.unity.render-pipelines.universal/Runtime/RendererFeatures/SurfaceCacheGIRendererFeature/FallbackMaterial.mat.meta
similarity index 100%
rename from Packages/com.unity.render-pipelines.universal/Runtime/RendererFeatures/SurfaceCacheGlobalIlluminationRendererFeature/FallbackMaterial.mat.meta
rename to Packages/com.unity.render-pipelines.universal/Runtime/RendererFeatures/SurfaceCacheGIRendererFeature/FallbackMaterial.mat.meta
diff --git a/Packages/com.unity.render-pipelines.universal/Runtime/RendererFeatures/SurfaceCacheGlobalIlluminationRendererFeature/FallbackMaterial.shader b/Packages/com.unity.render-pipelines.universal/Runtime/RendererFeatures/SurfaceCacheGIRendererFeature/FallbackMaterial.shader
similarity index 100%
rename from Packages/com.unity.render-pipelines.universal/Runtime/RendererFeatures/SurfaceCacheGlobalIlluminationRendererFeature/FallbackMaterial.shader
rename to Packages/com.unity.render-pipelines.universal/Runtime/RendererFeatures/SurfaceCacheGIRendererFeature/FallbackMaterial.shader
diff --git a/Packages/com.unity.render-pipelines.universal/Runtime/RendererFeatures/SurfaceCacheGlobalIlluminationRendererFeature/FallbackMaterial.shader.meta b/Packages/com.unity.render-pipelines.universal/Runtime/RendererFeatures/SurfaceCacheGIRendererFeature/FallbackMaterial.shader.meta
similarity index 100%
rename from Packages/com.unity.render-pipelines.universal/Runtime/RendererFeatures/SurfaceCacheGlobalIlluminationRendererFeature/FallbackMaterial.shader.meta
rename to Packages/com.unity.render-pipelines.universal/Runtime/RendererFeatures/SurfaceCacheGIRendererFeature/FallbackMaterial.shader.meta
diff --git a/Packages/com.unity.render-pipelines.universal/Runtime/RendererFeatures/SurfaceCacheGlobalIlluminationRendererFeature/FlatNormalResolution.compute b/Packages/com.unity.render-pipelines.universal/Runtime/RendererFeatures/SurfaceCacheGIRendererFeature/FlatNormalResolution.compute
similarity index 100%
rename from Packages/com.unity.render-pipelines.universal/Runtime/RendererFeatures/SurfaceCacheGlobalIlluminationRendererFeature/FlatNormalResolution.compute
rename to Packages/com.unity.render-pipelines.universal/Runtime/RendererFeatures/SurfaceCacheGIRendererFeature/FlatNormalResolution.compute
diff --git a/Packages/com.unity.render-pipelines.universal/Runtime/RendererFeatures/SurfaceCacheGlobalIlluminationRendererFeature/FlatNormalResolution.compute.meta b/Packages/com.unity.render-pipelines.universal/Runtime/RendererFeatures/SurfaceCacheGIRendererFeature/FlatNormalResolution.compute.meta
similarity index 100%
rename from Packages/com.unity.render-pipelines.universal/Runtime/RendererFeatures/SurfaceCacheGlobalIlluminationRendererFeature/FlatNormalResolution.compute.meta
rename to Packages/com.unity.render-pipelines.universal/Runtime/RendererFeatures/SurfaceCacheGIRendererFeature/FlatNormalResolution.compute.meta
diff --git a/Packages/com.unity.render-pipelines.universal/Runtime/RendererFeatures/SurfaceCacheGlobalIlluminationRendererFeature/PatchAllocation.compute b/Packages/com.unity.render-pipelines.universal/Runtime/RendererFeatures/SurfaceCacheGIRendererFeature/PatchAllocation.compute
similarity index 100%
rename from Packages/com.unity.render-pipelines.universal/Runtime/RendererFeatures/SurfaceCacheGlobalIlluminationRendererFeature/PatchAllocation.compute
rename to Packages/com.unity.render-pipelines.universal/Runtime/RendererFeatures/SurfaceCacheGIRendererFeature/PatchAllocation.compute
diff --git a/Packages/com.unity.render-pipelines.universal/Runtime/RendererFeatures/SurfaceCacheGlobalIlluminationRendererFeature/PatchAllocation.compute.meta b/Packages/com.unity.render-pipelines.universal/Runtime/RendererFeatures/SurfaceCacheGIRendererFeature/PatchAllocation.compute.meta
similarity index 100%
rename from Packages/com.unity.render-pipelines.universal/Runtime/RendererFeatures/SurfaceCacheGlobalIlluminationRendererFeature/PatchAllocation.compute.meta
rename to Packages/com.unity.render-pipelines.universal/Runtime/RendererFeatures/SurfaceCacheGIRendererFeature/PatchAllocation.compute.meta
diff --git a/Packages/com.unity.render-pipelines.universal/Runtime/RendererFeatures/SurfaceCacheGlobalIlluminationRendererFeature/ScreenResolveLookup.compute b/Packages/com.unity.render-pipelines.universal/Runtime/RendererFeatures/SurfaceCacheGIRendererFeature/ScreenResolveLookup.compute
similarity index 96%
rename from Packages/com.unity.render-pipelines.universal/Runtime/RendererFeatures/SurfaceCacheGlobalIlluminationRendererFeature/ScreenResolveLookup.compute
rename to Packages/com.unity.render-pipelines.universal/Runtime/RendererFeatures/SurfaceCacheGIRendererFeature/ScreenResolveLookup.compute
index 0ec75b670bb..49ce17f0c60 100644
--- a/Packages/com.unity.render-pipelines.universal/Runtime/RendererFeatures/SurfaceCacheGlobalIlluminationRendererFeature/ScreenResolveLookup.compute
+++ b/Packages/com.unity.render-pipelines.universal/Runtime/RendererFeatures/SurfaceCacheGIRendererFeature/ScreenResolveLookup.compute
@@ -55,7 +55,7 @@ void Lookup(uint2 lowResPixelPos : SV_DispatchThreadID)
     const float3 worldPos = ComputeWorldSpacePosition(uv, ndcDepth, _ClipToWorldTransform);
     const float3 worldNormal = _ScreenFlatNormals[fullResPixelPos];
 
-    QrngKronecker rng;
+    QrngKronecker2D rng;
     rng.Init(lowResPixelPos, 0);
 
     const int cascadeResolution = PatchUtil::ResolveCascadeIndex(_VolumeTargetPos, worldPos, _VolumeSpatialResolution, _CascadeCount, _VolumeVoxelMinSize);
@@ -77,10 +77,10 @@ void Lookup(uint2 lowResPixelPos : SV_DispatchThreadID)
     const float3x3 orthoBasis = OrthoBasisFromVector(worldNormal);
     for (uint sampleIdx = 0; sampleIdx < _SampleCount; ++sampleIdx)
     {
-        float2 jitter = float2(rng.GetFloat(0), rng.GetFloat(1)) * 2.0f - 1.0f;
+        float2 jitter = rng.GetSample(0) * 2.0f - 1.0f;
         const float3 jitteredWorldPos = worldPos + (orthoBasis[0] * jitter.x + orthoBasis[1] * jitter.y) * voxelSize;
 
-        jitter = float2(rng.GetFloat(2), rng.GetFloat(3));
+        jitter = rng.GetSample(1);
         const float cosSpread = 0.9f; // This constant was empirically determined.
         const float3 localJitteredDirection = SampleConeUniform(jitter.x, jitter.y, cosSpread);
         const float3 jitteredWorldDir = mul(orthoBasis, localJitteredDirection);
diff --git a/Packages/com.unity.render-pipelines.universal/Runtime/RendererFeatures/SurfaceCacheGlobalIlluminationRendererFeature/ScreenResolveLookup.compute.meta b/Packages/com.unity.render-pipelines.universal/Runtime/RendererFeatures/SurfaceCacheGIRendererFeature/ScreenResolveLookup.compute.meta
similarity index 100%
rename from Packages/com.unity.render-pipelines.universal/Runtime/RendererFeatures/SurfaceCacheGlobalIlluminationRendererFeature/ScreenResolveLookup.compute.meta
rename to Packages/com.unity.render-pipelines.universal/Runtime/RendererFeatures/SurfaceCacheGIRendererFeature/ScreenResolveLookup.compute.meta
diff --git a/Packages/com.unity.render-pipelines.universal/Runtime/RendererFeatures/SurfaceCacheGlobalIlluminationRendererFeature/ScreenResolveUpsampling.compute b/Packages/com.unity.render-pipelines.universal/Runtime/RendererFeatures/SurfaceCacheGIRendererFeature/ScreenResolveUpsampling.compute
similarity index 97%
rename from Packages/com.unity.render-pipelines.universal/Runtime/RendererFeatures/SurfaceCacheGlobalIlluminationRendererFeature/ScreenResolveUpsampling.compute
rename to Packages/com.unity.render-pipelines.universal/Runtime/RendererFeatures/SurfaceCacheGIRendererFeature/ScreenResolveUpsampling.compute
index 68f8509562e..e8a0fc45ee6 100644
--- a/Packages/com.unity.render-pipelines.universal/Runtime/RendererFeatures/SurfaceCacheGlobalIlluminationRendererFeature/ScreenResolveUpsampling.compute
+++ b/Packages/com.unity.render-pipelines.universal/Runtime/RendererFeatures/SurfaceCacheGIRendererFeature/ScreenResolveUpsampling.compute
@@ -32,7 +32,7 @@ void Upsample(uint2 targetPixelPos : SV_DispatchThreadID)
     if (any(targetPixelPos >= fullRes))
         return;
 
-    QrngKronecker rng;
+    QrngKronecker2D rng;
     rng.Init(targetPixelPos, 0);
 
     const float ndcDepth = LoadNdcDepth(_FullResDepths, targetPixelPos);
@@ -52,7 +52,7 @@ void Upsample(uint2 targetPixelPos : SV_DispatchThreadID)
     {
         const float goldenAngle = 2.39996323f;
         const float kernelExponent = 0.5f;
-        const float angle = TWO_PI * rng.GetFloat(0) + goldenAngle * sampleIdx;
+        const float angle = TWO_PI * rng.GetSample(0).x + goldenAngle * sampleIdx;
         const float radius = pow(float(sampleIdx + 1) * reciprocalSampleCount, kernelExponent) * _FilterRadius;
 
         float2 sinCos;
diff --git a/Packages/com.unity.render-pipelines.universal/Runtime/RendererFeatures/SurfaceCacheGlobalIlluminationRendererFeature/ScreenResolveUpsampling.compute.meta b/Packages/com.unity.render-pipelines.universal/Runtime/RendererFeatures/SurfaceCacheGIRendererFeature/ScreenResolveUpsampling.compute.meta
similarity index 100%
rename from Packages/com.unity.render-pipelines.universal/Runtime/RendererFeatures/SurfaceCacheGlobalIlluminationRendererFeature/ScreenResolveUpsampling.compute.meta
rename to Packages/com.unity.render-pipelines.universal/Runtime/RendererFeatures/SurfaceCacheGIRendererFeature/ScreenResolveUpsampling.compute.meta
diff --git a/Packages/com.unity.render-pipelines.universal/Runtime/RendererFeatures/SurfaceCacheGlobalIlluminationRendererFeature/SurfaceCacheGlobalIlluminationRendererFeature.cs b/Packages/com.unity.render-pipelines.universal/Runtime/RendererFeatures/SurfaceCacheGIRendererFeature/SurfaceCacheGIRendererFeature.cs
similarity index 98%
rename from Packages/com.unity.render-pipelines.universal/Runtime/RendererFeatures/SurfaceCacheGlobalIlluminationRendererFeature/SurfaceCacheGlobalIlluminationRendererFeature.cs
rename to Packages/com.unity.render-pipelines.universal/Runtime/RendererFeatures/SurfaceCacheGIRendererFeature/SurfaceCacheGIRendererFeature.cs
index b4f77fb7107..96b9c419577 100644
--- a/Packages/com.unity.render-pipelines.universal/Runtime/RendererFeatures/SurfaceCacheGlobalIlluminationRendererFeature/SurfaceCacheGlobalIlluminationRendererFeature.cs
+++ b/Packages/com.unity.render-pipelines.universal/Runtime/RendererFeatures/SurfaceCacheGIRendererFeature/SurfaceCacheGIRendererFeature.cs
@@ -24,22 +24,22 @@ sealed class SurfaceCacheRenderPipelineResourceSet : IRenderPipelineResources
 
         int IRenderPipelineGraphicsSettings.version => m_Version;
 
-        [ResourcePath("Runtime/RendererFeatures/SurfaceCacheGlobalIlluminationRendererFeature/FallbackMaterial.mat")]
+        [ResourcePath("Runtime/RendererFeatures/SurfaceCacheGIRendererFeature/FallbackMaterial.mat")]
         public Material m_FallbackMaterial;
 
-        [ResourcePath("Runtime/RendererFeatures/SurfaceCacheGlobalIlluminationRendererFeature/PatchAllocation.compute")]
+        [ResourcePath("Runtime/RendererFeatures/SurfaceCacheGIRendererFeature/PatchAllocation.compute")]
         public ComputeShader m_AllocationShader;
 
-        [ResourcePath("Runtime/RendererFeatures/SurfaceCacheGlobalIlluminationRendererFeature/ScreenResolveLookup.compute")]
+        [ResourcePath("Runtime/RendererFeatures/SurfaceCacheGIRendererFeature/ScreenResolveLookup.compute")]
         public ComputeShader m_ScreenResolveLookupShader;
 
-        [ResourcePath("Runtime/RendererFeatures/SurfaceCacheGlobalIlluminationRendererFeature/ScreenResolveUpsampling.compute")]
+        [ResourcePath("Runtime/RendererFeatures/SurfaceCacheGIRendererFeature/ScreenResolveUpsampling.compute")]
         public ComputeShader m_ScreenResolveUpsamplingShader;
 
-        [ResourcePath("Runtime/RendererFeatures/SurfaceCacheGlobalIlluminationRendererFeature/Debug.compute")]
+        [ResourcePath("Runtime/RendererFeatures/SurfaceCacheGIRendererFeature/Debug.compute")]
         public ComputeShader m_DebugShader;
 
-        [ResourcePath("Runtime/RendererFeatures/SurfaceCacheGlobalIlluminationRendererFeature/FlatNormalResolution.compute")]
+        [ResourcePath("Runtime/RendererFeatures/SurfaceCacheGIRendererFeature/FlatNormalResolution.compute")]
         public ComputeShader m_FlatNormalResolutionShader;
 
         public Material fallbackMaterial
@@ -80,7 +80,7 @@ public ComputeShader flatNormalResolutionShader
     }
 
     [DisallowMultipleRendererFeature("Surface Cache Global Illumination")]
-    public class SurfaceCacheGlobalIlluminationRendererFeature : ScriptableRendererFeature
+    public class SurfaceCacheGIRendererFeature : ScriptableRendererFeature
     {
         public enum DebugViewMode_
         {
diff --git a/Packages/com.unity.render-pipelines.universal/Runtime/RendererFeatures/SurfaceCacheGlobalIlluminationRendererFeature/SurfaceCacheGlobalIlluminationRendererFeature.cs.meta b/Packages/com.unity.render-pipelines.universal/Runtime/RendererFeatures/SurfaceCacheGIRendererFeature/SurfaceCacheGIRendererFeature.cs.meta
similarity index 100%
rename from Packages/com.unity.render-pipelines.universal/Runtime/RendererFeatures/SurfaceCacheGlobalIlluminationRendererFeature/SurfaceCacheGlobalIlluminationRendererFeature.cs.meta
rename to Packages/com.unity.render-pipelines.universal/Runtime/RendererFeatures/SurfaceCacheGIRendererFeature/SurfaceCacheGIRendererFeature.cs.meta
diff --git a/Packages/com.unity.render-pipelines.universal/Runtime/Settings/URPReflectionProbeSettings.cs b/Packages/com.unity.render-pipelines.universal/Runtime/Settings/URPReflectionProbeSettings.cs
index 4f16a3aa5ad..47677c29327 100644
--- a/Packages/com.unity.render-pipelines.universal/Runtime/Settings/URPReflectionProbeSettings.cs
+++ b/Packages/com.unity.render-pipelines.universal/Runtime/Settings/URPReflectionProbeSettings.cs
@@ -18,6 +18,7 @@ public class URPReflectionProbeSettings : IRenderPipelineGraphicsSettings
         [SerializeField, HideInInspector] private int version = 1;
 
         int IRenderPipelineGraphicsSettings.version => version;
+        bool IRenderPipelineGraphicsSettings.isAvailableInPlayerBuild => true;
 
         [SerializeField, Tooltip("Use ReflectionProbe rotation. Enabling this will improve the appearance of reflections when the ReflectionProbe isn't axis aligned, but may worsen performance on lower end platforms.")]
         private bool useReflectionProbeRotation = true;
diff --git a/Packages/com.unity.render-pipelines.universal/Runtime/UniversalAdditionalCameraData.cs b/Packages/com.unity.render-pipelines.universal/Runtime/UniversalAdditionalCameraData.cs
index 55250043579..0d0adaae4ce 100644
--- a/Packages/com.unity.render-pipelines.universal/Runtime/UniversalAdditionalCameraData.cs
+++ b/Packages/com.unity.render-pipelines.universal/Runtime/UniversalAdditionalCameraData.cs
@@ -330,12 +330,7 @@ internal static void GetVolumeLayerMaskAndTrigger(this Camera camera, UniversalA
             layerMask = 1; // "Default"
             trigger = camera.transform;
 
-            if (cameraData != null)
-            {
-                layerMask = cameraData.volumeLayerMask;
-                trigger = (cameraData.volumeTrigger != null) ? cameraData.volumeTrigger : trigger;
-            }
-            else if (camera.cameraType == CameraType.SceneView)
+            if (camera.cameraType == CameraType.SceneView)
             {
                 // Try to mirror the MainCamera volume layer mask for the scene view - do not mirror the target
                 var mainCamera = Camera.main;
@@ -348,6 +343,11 @@ internal static void GetVolumeLayerMaskAndTrigger(this Camera camera, UniversalA
 
                 trigger = (mainAdditionalCameraData != null && mainAdditionalCameraData.volumeTrigger != null) ? mainAdditionalCameraData.volumeTrigger : trigger;
             }
+            else if (cameraData != null)
+            {
+                layerMask = cameraData.volumeLayerMask;
+                trigger = (cameraData.volumeTrigger != null) ? cameraData.volumeTrigger : trigger;
+            }
         }
     }
 
diff --git a/Packages/com.unity.render-pipelines.universal/Runtime/UniversalRenderPipelineCore.cs b/Packages/com.unity.render-pipelines.universal/Runtime/UniversalRenderPipelineCore.cs
index aae9af67a78..46975110ee8 100644
--- a/Packages/com.unity.render-pipelines.universal/Runtime/UniversalRenderPipelineCore.cs
+++ b/Packages/com.unity.render-pipelines.universal/Runtime/UniversalRenderPipelineCore.cs
@@ -987,6 +987,7 @@ internal static class ShaderGlobalKeywords
 #if (UNITY_META_QUEST)
         public static GlobalKeyword META_QUEST_ORTHO_PROJ;
         public static GlobalKeyword META_QUEST_LIGHTUNROLL;
+        public static GlobalKeyword META_QUEST_NO_SPOTLIGHTS_LIGHT_LOOP;
 #endif
 
         // TODO: Move following keywords to Local keywords?
@@ -1105,6 +1106,7 @@ public static void InitializeShaderGlobalKeywords()
 #if (UNITY_META_QUEST)
             ShaderGlobalKeywords.META_QUEST_ORTHO_PROJ = GlobalKeyword.Create(ShaderKeywordStrings.META_QUEST_ORTHO_PROJ);
             ShaderGlobalKeywords.META_QUEST_LIGHTUNROLL = GlobalKeyword.Create(ShaderKeywordStrings.META_QUEST_LIGHTUNROLL);
+            ShaderGlobalKeywords.META_QUEST_NO_SPOTLIGHTS_LIGHT_LOOP = GlobalKeyword.Create(ShaderKeywordStrings.META_QUEST_NO_SPOTLIGHTS_LIGHT_LOOP);            
 #endif
 
         }
@@ -1440,11 +1442,14 @@ public static class ShaderKeywordStrings
         internal const string ForwardPlus = "_FORWARD_PLUS"; // Backward compatibility. Deprecated in 6.1.
 
 #if (UNITY_META_QUEST)
-        /// <summary> Used to statically branch when checking for projection type on Meta Quest device . </summary>
+        /// <summary> Used to statically branch when checking for projection type on Meta Quest device. </summary>
         internal const string META_QUEST_ORTHO_PROJ = "META_QUEST_ORTHO_PROJ";
 
-        /// <summary> Unroll light loop if there is only one additional light on Meta Quest device . </summary>
+        /// <summary> Unroll light loop if there is only one additional light on Meta Quest device. </summary>
         internal const string META_QUEST_LIGHTUNROLL = "META_QUEST_LIGHTUNROLL";
+
+        /// <summary> Use light loop optimized for point lights only on Meta Quest device, the evaluation of whether this optimization can be enabled is performed per batch. </summary>
+        internal const string META_QUEST_NO_SPOTLIGHTS_LIGHT_LOOP = "META_QUEST_NO_SPOTLIGHTS_LIGHT_LOOP";
 #endif
 
         /// <summary> Keyword used for Multi Sampling Anti-Aliasing (MSAA) with 2 per pixel sample count. </summary>
@@ -1994,21 +1999,39 @@ internal enum URPProfileId
     internal static class PlatformAutoDetect
     {
         /// <summary>
-        /// Detect and cache runtime platform information. This function should only be called once when creating the URP.
+        /// Detect and cache runtime platform information.
+        /// Lazy initialized for situations where platform detection is required before URP is initialized (UUM-134298)
         /// </summary>
-        internal static void Initialize()
+        private sealed class PlatformDetectionCache
         {
-            bool isRunningMobile = false;
-            #if ENABLE_VR && ENABLE_XR_MODULE
-                #if PLATFORM_WINRT || PLATFORM_ANDROID
-                    isRunningMobile = IsRunningXRMobile();
+            public readonly bool isXRMobile;
+            public readonly bool isShaderAPIMobileDefined;
+            public readonly bool isSwitch;
+            public readonly bool isSwitch2;
+            public readonly bool isRunningOnPowerVRGPU;
+
+            public PlatformDetectionCache()
+            {
+                bool isRunningMobile = false;
+                #if ENABLE_VR && ENABLE_XR_MODULE
+                    #if PLATFORM_WINRT || PLATFORM_ANDROID
+                        isRunningMobile = IsRunningXRMobile();
+                    #endif
                 #endif
-            #endif
 
-            isXRMobile = isRunningMobile;
-            isShaderAPIMobileDefined = GraphicsSettings.HasShaderDefine(BuiltinShaderDefine.SHADER_API_MOBILE);
-            isSwitch = Application.platform == RuntimePlatform.Switch;
-            isSwitch2 = Application.platform == RuntimePlatform.Switch2;
+                isXRMobile = isRunningMobile;
+                isShaderAPIMobileDefined = GraphicsSettings.HasShaderDefine(BuiltinShaderDefine.SHADER_API_MOBILE);
+                isSwitch = Application.platform == RuntimePlatform.Switch;
+                isSwitch2 = Application.platform == RuntimePlatform.Switch2;
+                isRunningOnPowerVRGPU = SystemInfo.graphicsDeviceName.Contains("PowerVR");
+            }
+        }
+
+        private static readonly Lazy<PlatformDetectionCache> platformCache = new(() => new PlatformDetectionCache(), true);
+
+        internal static void Initialize()
+        {
+            _ = platformCache.Value;
         }
 
 #if ENABLE_VR && ENABLE_XR_MODULE
@@ -2037,19 +2060,21 @@ private static bool IsRunningXRMobile()
         /// <summary>
         /// If true, the runtime platform is an XR mobile platform.
         /// </summary>
-        internal static bool isXRMobile { get; private set; } = false;
+        internal static bool isXRMobile => platformCache.Value.isXRMobile;
 
         /// <summary>
         /// If true, then SHADER_API_MOBILE has been defined in URP Shaders.
         /// </summary>
-        internal static bool isShaderAPIMobileDefined { get; private set; } = false;
+        internal static bool isShaderAPIMobileDefined => platformCache.Value.isShaderAPIMobileDefined;
 
         /// <summary>
         /// If true, then the runtime platform is set to Switch.
         /// </summary>
-        internal static bool isSwitch { get; private set; } = false;
+        internal static bool isSwitch => platformCache.Value.isSwitch;
+
+        internal static bool isSwitch2 => platformCache.Value.isSwitch2;
 
-        internal static bool isSwitch2 { get; private set; } = false;
+        internal static bool isRunningOnPowerVRGPU => platformCache.Value.isRunningOnPowerVRGPU;
 
         /// <summary>
         /// Gives the SH evaluation mode when set to automatically detect.
@@ -2068,7 +2093,5 @@ internal static ShEvalMode ShAutoDetect(ShEvalMode mode)
 
             return mode;
         }
-
-        internal static bool isRunningOnPowerVRGPU = SystemInfo.graphicsDeviceName.Contains("PowerVR");
     }
 }
diff --git a/Packages/com.unity.render-pipelines.universal/Runtime/UniversalRendererDebug.cs b/Packages/com.unity.render-pipelines.universal/Runtime/UniversalRendererDebug.cs
index 882a26bc82e..8adbfc4a441 100644
--- a/Packages/com.unity.render-pipelines.universal/Runtime/UniversalRendererDebug.cs
+++ b/Packages/com.unity.render-pipelines.universal/Runtime/UniversalRendererDebug.cs
@@ -38,15 +38,6 @@ private Rect CalculateUVRect(UniversalCameraData cameraData, float width, float
             return new Rect(1 - normalizedSizeX, 1 - normalizedSizeY, normalizedSizeX, normalizedSizeY);
         }
 
-        private Rect CalculateUVRect(UniversalCameraData cameraData, int textureHeightPercent)
-        {
-            var relativeSize = Mathf.Clamp01(textureHeightPercent / 100f);
-            var width = relativeSize * cameraData.pixelWidth;
-            var height = relativeSize * cameraData.pixelHeight;
-
-            return CalculateUVRect(cameraData, width, height);
-        }
-
         private void CorrectForTextureAspectRatio(ref float width, ref float height, float sourceWidth, float sourceHeight)
         {
             if (sourceWidth != 0 && sourceHeight != 0)
@@ -72,9 +63,20 @@ private void SetupRenderGraphFinalPassDebug(RenderGraph renderGraph, ContextCont
             if ((DebugHandler != null) && DebugHandler.IsActiveForCamera(cameraData.isPreviewCamera))
             {
                 if (DebugHandler.TryGetFullscreenDebugMode(out DebugFullScreenMode fullScreenDebugMode, out int textureHeightPercent) &&
-                    (fullScreenDebugMode != DebugFullScreenMode.ReflectionProbeAtlas || usesClusterLightLoop) &&
-                    (fullScreenDebugMode != DebugFullScreenMode.STP))
+                    (fullScreenDebugMode != DebugFullScreenMode.ReflectionProbeAtlas || usesClusterLightLoop))
                 {
+                    // if we want to visualize RG internal resources, we need to create an RTHandle external to RG and copy to it the textures to visualize
+                    // this is required because the lifetime of these resources is limited to the RenderGraph execution, and we cannot access the actual resources here
+
+                    // we also copy external resources into the debug texture below to make them "read only". CreateDebugTexture() can lead to (external) texture reallocation.
+
+                    var debugDescriptor = cameraData.cameraTargetDescriptor;
+                    // Ensure target can hold all source values. Source can be signed for example.
+                    if (SystemInfo.IsFormatSupported(GraphicsFormat.R16G16B16A16_SFloat, GraphicsFormatUsage.Linear | GraphicsFormatUsage.Render))
+                        debugDescriptor.graphicsFormat = GraphicsFormat.R16G16B16A16_SFloat;
+
+                    CreateDebugTexture(debugDescriptor);
+
                     float screenWidth = cameraData.pixelWidth;
                     float screenHeight = cameraData.pixelHeight;
 
@@ -85,107 +87,98 @@ private void SetupRenderGraphFinalPassDebug(RenderGraph renderGraph, ContextCont
                     bool supportsStereo = false;
                     Vector4 dataRangeRemap = Vector4.zero; // zero = off, .x = old min, .y = old max, .z = new min, .w = new max
 
-                    // visualize RG internal resources
+                    // The debug texture for STP is filled later during post-process rendering so we cannot assign the resource now or it will be invalid
+                    if (fullScreenDebugMode != DebugFullScreenMode.STP)
                     {
-                        // if we want to visualize RG internal resources, we need to create an RTHandle external to RG and copy to it the textures to visualize
-                        // this is required because the lifetime of these resources is limited to the RenderGraph execution, and we cannot access the actual resources here
-
-                        // we also copy external resources to make them "read only". CreateDebugTexture() can lead to (external) texture reallocation.
-
-                        var debugDescriptor = cameraData.cameraTargetDescriptor;
-                        // Ensure target can hold all source values. Source can be signed for example.
-                        if(SystemInfo.IsFormatSupported(GraphicsFormat.R16G16B16A16_SFloat, GraphicsFormatUsage.Linear | GraphicsFormatUsage.Render))
-                            debugDescriptor.graphicsFormat = GraphicsFormat.R16G16B16A16_SFloat;
-
-                        CreateDebugTexture(debugDescriptor);
-
-                        ImportResourceParams importParams = new ImportResourceParams();
-                        importParams.clearOnFirstUse = false;
-                        importParams.discardOnLastUse = false;
-                        TextureHandle debugTexture = renderGraph.ImportTexture(s_RenderGraphDebugTextureHandle, importParams);
+                        // Render into the debug texture
+                        {
+                            ImportResourceParams importParams = new ImportResourceParams();
+                            importParams.clearOnFirstUse = false;
+                            importParams.discardOnLastUse = false;
+                            TextureHandle debugTexture = renderGraph.ImportTexture(s_RenderGraphDebugTextureHandle, importParams);
 
 
-                        switch (fullScreenDebugMode)
-                        {
-                            case DebugFullScreenMode.Depth:
-                            {
-                                BlitToDebugTexture(renderGraph, resourceData.cameraDepthTexture, debugTexture);
-                                supportsStereo = true;
-                                break;
-                            }
-                            case DebugFullScreenMode.MotionVector:
-                            {
-                                BlitToDebugTexture(renderGraph, resourceData.motionVectorColor, debugTexture, isSourceTextureColor: true);
-                                supportsStereo = true;
-                                // Motion vectors are in signed UV space, zoom in and normalize for visualization. (note: maybe add an option to use (angle, mag) visualization)
-                                const float zoom = 0.01f;
-                                dataRangeRemap.x = -zoom;
-                                dataRangeRemap.y = zoom;
-                                dataRangeRemap.z = 0;
-                                dataRangeRemap.w = 1.0f;
-                                break;
-                            }
-                            case DebugFullScreenMode.AdditionalLightsShadowMap:
-                            {
-                                BlitToDebugTexture(renderGraph, resourceData.additionalShadowsTexture, debugTexture);
-                                break;
-                            }
-                            case DebugFullScreenMode.MainLightShadowMap:
-                            {
-                                BlitToDebugTexture(renderGraph, resourceData.mainShadowsTexture, debugTexture);
-                                break;
-                            }
-                            case DebugFullScreenMode.AdditionalLightsCookieAtlas:
+                            switch (fullScreenDebugMode)
                             {
-                                // Copy atlas texture to make it "readonly". Direct reference (debug=atlas) can lead to handle->texture reallocation.
-                                var textureHandle =
-                                    m_LightCookieManager is { AdditionalLightsCookieAtlasTexture: not null }
-                                        ? renderGraph.ImportTexture(m_LightCookieManager
-                                            .AdditionalLightsCookieAtlasTexture)
-                                        : TextureHandle.nullHandle;
-
-                                BlitToDebugTexture(renderGraph, textureHandle, debugTexture);
-                                break;
+                                case DebugFullScreenMode.Depth:
+                                {
+                                    BlitToDebugTexture(renderGraph, resourceData.cameraDepthTexture, debugTexture);
+                                    supportsStereo = true;
+                                    break;
+                                }
+                                case DebugFullScreenMode.MotionVector:
+                                {
+                                    BlitToDebugTexture(renderGraph, resourceData.motionVectorColor, debugTexture, isSourceTextureColor: true);
+                                    supportsStereo = true;
+                                    // Motion vectors are in signed UV space, zoom in and normalize for visualization. (note: maybe add an option to use (angle, mag) visualization)
+                                    const float zoom = 0.01f;
+                                    dataRangeRemap.x = -zoom;
+                                    dataRangeRemap.y = zoom;
+                                    dataRangeRemap.z = 0;
+                                    dataRangeRemap.w = 1.0f;
+                                    break;
+                                }
+                                case DebugFullScreenMode.AdditionalLightsShadowMap:
+                                {
+                                    BlitToDebugTexture(renderGraph, resourceData.additionalShadowsTexture, debugTexture);
+                                    break;
+                                }
+                                case DebugFullScreenMode.MainLightShadowMap:
+                                {
+                                    BlitToDebugTexture(renderGraph, resourceData.mainShadowsTexture, debugTexture);
+                                    break;
+                                }
+                                case DebugFullScreenMode.AdditionalLightsCookieAtlas:
+                                {
+                                    // Copy atlas texture to make it "readonly". Direct reference (debug=atlas) can lead to handle->texture reallocation.
+                                    var textureHandle =
+                                        m_LightCookieManager is { AdditionalLightsCookieAtlasTexture: not null }
+                                            ? renderGraph.ImportTexture(m_LightCookieManager
+                                                .AdditionalLightsCookieAtlasTexture)
+                                            : TextureHandle.nullHandle;
+
+                                    BlitToDebugTexture(renderGraph, textureHandle, debugTexture);
+                                    break;
+                                }
+
+                                case DebugFullScreenMode.ReflectionProbeAtlas:
+                                {
+                                    // Copy atlas texture to make it "readonly". Direct reference (debug=atlas) can lead to handle->texture reallocation.
+                                    var textureHandle =
+                                        m_ForwardLights.reflectionProbeManager.atlasRT != null
+                                            ? renderGraph.ImportTexture(RTHandles.Alloc(
+                                                m_ForwardLights.reflectionProbeManager.atlasRT, transferOwnership: true))
+                                            : TextureHandle.nullHandle;
+
+                                    BlitToDebugTexture(renderGraph, textureHandle, debugTexture);
+                                    break;
+                                }
+                                default:
+                                {
+                                    break;
+                                }
                             }
+                        }
 
-                            case DebugFullScreenMode.ReflectionProbeAtlas:
-                            {
-                                // Copy atlas texture to make it "readonly". Direct reference (debug=atlas) can lead to handle->texture reallocation.
-                                var textureHandle =
-                                    m_ForwardLights.reflectionProbeManager.atlasRT != null
-                                        ? renderGraph.ImportTexture(RTHandles.Alloc(
-                                            m_ForwardLights.reflectionProbeManager.atlasRT, transferOwnership: true))
-                                        : TextureHandle.nullHandle;
-
-                                BlitToDebugTexture(renderGraph, textureHandle, debugTexture);
-                                break;
-                            }
-                            default:
+                        // Textures that are not in screen aspect ratio need to be corrected
+                        {
+                            RenderTexture source = null;
+                            switch (fullScreenDebugMode)
                             {
-                                break;
+                                case DebugFullScreenMode.AdditionalLightsShadowMap: source = m_AdditionalLightsShadowCasterPass?.m_AdditionalLightsShadowmapHandle?.rt; break;
+                                case DebugFullScreenMode.MainLightShadowMap: source = m_MainLightShadowCasterPass?.m_MainLightShadowmapTexture?.rt; break;
+                                case DebugFullScreenMode.AdditionalLightsCookieAtlas: source = m_LightCookieManager?.AdditionalLightsCookieAtlasTexture?.rt; break;
+                                case DebugFullScreenMode.ReflectionProbeAtlas: source = m_ForwardLights?.reflectionProbeManager.atlasRT; break;
+                                default:
+                                    break;
                             }
-                        }
-                    }
 
-                    // Textures that are not in screen aspect ratio need to be corrected
-                    {
-                        RenderTexture source = null;
-                        switch (fullScreenDebugMode)
-                        {
-                            case DebugFullScreenMode.AdditionalLightsShadowMap: source = m_AdditionalLightsShadowCasterPass?.m_AdditionalLightsShadowmapHandle?.rt; break;
-                            case DebugFullScreenMode.MainLightShadowMap: source = m_MainLightShadowCasterPass?.m_MainLightShadowmapTexture?.rt; break;
-                            case DebugFullScreenMode.AdditionalLightsCookieAtlas: source = m_LightCookieManager?.AdditionalLightsCookieAtlasTexture?.rt; break;
-                            case DebugFullScreenMode.ReflectionProbeAtlas: source = m_ForwardLights?.reflectionProbeManager.atlasRT; break;
-                            default:
-                                break;
+                            // Ensure that atlas is not stretched, but doesn't take up more than the percentage in any dimension.
+                            if (source != null)
+                                CorrectForTextureAspectRatio(ref width, ref height, source.width, source.height);
                         }
-
-                        // Ensure that atlas is not stretched, but doesn't take up more than the percentage in any dimension.
-                        if (source != null)
-                            CorrectForTextureAspectRatio(ref width, ref height, source.width, source.height);
                     }
 
-
                     Rect uvRect = CalculateUVRect(cameraData, width, height);
                     DebugHandler.SetDebugRenderTarget(s_RenderGraphDebugTextureHandle, uvRect, supportsStereo, dataRangeRemap);
                 }
@@ -221,17 +214,11 @@ private void SetupAfterPostRenderGraphFinalPassDebug(RenderGraph renderGraph, Co
                 if (DebugHandler.TryGetFullscreenDebugMode(out var debugFullscreenMode, out int textureHeightPercent) &&
                     (debugFullscreenMode == DebugFullScreenMode.STP))
                 {
-                    CreateDebugTexture(cameraData.cameraTargetDescriptor);
-
                     ImportResourceParams importParams = new ImportResourceParams();
                     importParams.clearOnFirstUse = false;
                     importParams.discardOnLastUse = false;
                     TextureHandle debugTexture = renderGraph.ImportTexture(s_RenderGraphDebugTextureHandle, importParams);
                     BlitToDebugTexture(renderGraph, resourceData.stpDebugView, debugTexture);
-
-                    Rect uvRect = CalculateUVRect(cameraData, textureHeightPercent);
-                    Vector4 rangeRemap = Vector4.zero; // Off
-                    DebugHandler.SetDebugRenderTarget(s_RenderGraphDebugTextureHandle, uvRect, true, rangeRemap);
                 }
             }
         }
diff --git a/Packages/com.unity.render-pipelines.universal/Runtime/XR/.buginfo b/Packages/com.unity.render-pipelines.universal/Runtime/XR/.buginfo
index 701b4cbc25d..f6d9eecbd20 100644
--- a/Packages/com.unity.render-pipelines.universal/Runtime/XR/.buginfo
+++ b/Packages/com.unity.render-pipelines.universal/Runtime/XR/.buginfo
@@ -1 +1 @@
-area: SRP XR
+area: Graphics XR
diff --git a/Packages/com.unity.render-pipelines.universal/ShaderLibrary/RealtimeLights.hlsl b/Packages/com.unity.render-pipelines.universal/ShaderLibrary/RealtimeLights.hlsl
index 0d3d396377f..ddf734664e3 100644
--- a/Packages/com.unity.render-pipelines.universal/ShaderLibrary/RealtimeLights.hlsl
+++ b/Packages/com.unity.render-pipelines.universal/ShaderLibrary/RealtimeLights.hlsl
@@ -166,8 +166,12 @@ Light GetAdditionalPerObjectLight(int perObjectLightIndex, float3 positionWS)
 
     half3 lightDirection = half3(lightVector * rsqrt(distanceSqr));
     // full-float precision required on some platforms
+#if (META_QUEST_NO_SPOTLIGHTS_LIGHT_LOOP)
+    float attenuation = DistanceAttenuation(distanceSqr, distanceAndSpotAttenuation.xy);
+#else
     float attenuation = DistanceAttenuation(distanceSqr, distanceAndSpotAttenuation.xy) * AngleAttenuation(spotDirection.xyz, lightDirection, distanceAndSpotAttenuation.zw);
-
+#endif
+    
     Light light;
     light.direction = lightDirection;
     light.distanceAttenuation = attenuation;
diff --git a/Packages/com.unity.render-pipelines.universal/ShaderLibrary/ShaderVariablesFunctions.hlsl b/Packages/com.unity.render-pipelines.universal/ShaderLibrary/ShaderVariablesFunctions.hlsl
index c8351755102..acaf24018fe 100644
--- a/Packages/com.unity.render-pipelines.universal/ShaderLibrary/ShaderVariablesFunctions.hlsl
+++ b/Packages/com.unity.render-pipelines.universal/ShaderLibrary/ShaderVariablesFunctions.hlsl
@@ -615,7 +615,8 @@ uint Select4(uint4 v, uint i)
         (((v.y & mask0) | (v.x & ~mask0)) & ~mask1);
 }
 
-#if SHADER_TARGET < 45
+#if SHADER_TARGET < 45 && !defined UNITY_COMPILER_DXC
+// Workaround is only technically required for GL Core <4.0 and GLES <3.1
 uint URP_FirstBitLow(uint m)
 {
     // http://graphics.stanford.edu/~seander/bithacks.html#ZerosOnRightFloatCast
diff --git a/Packages/com.unity.render-pipelines.universal/Shaders/2D/Light2D.shader b/Packages/com.unity.render-pipelines.universal/Shaders/2D/Light2D.shader
index e2dcc198273..c0d3d988160 100644
--- a/Packages/com.unity.render-pipelines.universal/Shaders/2D/Light2D.shader
+++ b/Packages/com.unity.render-pipelines.universal/Shaders/2D/Light2D.shader
@@ -71,32 +71,46 @@ Shader "Hidden/Light2D"
 
             half _InverseHDREmulationScale;
 
-            Varyings vert_shape(Attributes a, PerLight2D light)
+            Varyings vert_shape_shared(float3 position, Attributes a)
             {
                 Varyings o = (Varyings)0;
-                float3 positionOS = a.positionOS;
 
-                positionOS.x = positionOS.x + _L2D_FALLOFF_DISTANCE * a.color.r;
-                positionOS.y = positionOS.y + _L2D_FALLOFF_DISTANCE * a.color.g;
-
-                o.positionCS = TransformObjectToHClip(positionOS);
+                o.positionCS = TransformObjectToHClip(position);
                 o.color = _L2D_COLOR * _InverseHDREmulationScale;
                 o.color.a = a.color.a;
 #if USE_VOLUMETRIC
                 o.color.a = _L2D_COLOR.a * _L2D_VOLUME_OPACITY;
 #endif
-
                 // If Sprite use UV.
                 o.uv = (_L2D_LIGHT_TYPE == 2) ? a.uv : float2(a.color.a, _L2D_FALLOFF_INTENSITY);
 
                 float4 worldSpacePos;
-                worldSpacePos.xyz = TransformObjectToWorld(positionOS);
+                worldSpacePos.xyz = TransformObjectToWorld(position);
                 worldSpacePos.w = 1;
                 TRANSFER_NORMALS_LIGHTING(o, worldSpacePos, _L2D_POSITION.xyz, _L2D_POSITION.w)
                 TRANSFER_SHADOWS(o)
+
                 return o;
             }
 
+
+            Varyings vert_provider(Attributes a, PerLight2D light)
+            {
+                return vert_shape_shared(a.positionOS, a);
+            }
+
+
+            Varyings vert_shape(Attributes a, PerLight2D light)
+            {
+                Varyings o = (Varyings)0;
+                float3 positionOS = a.positionOS;
+
+                positionOS.x = positionOS.x + _L2D_FALLOFF_DISTANCE * a.color.r;
+                positionOS.y = positionOS.y + _L2D_FALLOFF_DISTANCE * a.color.g;
+
+                return vert_shape_shared(positionOS, a);
+            }
+
             Varyings vert_point(Attributes a, PerLight2D light)
             {
                 Varyings output = (Varyings)0;
@@ -141,6 +155,14 @@ Shader "Hidden/Light2D"
                         v.lightOffset = attributes.color;
                         return v;
                     }
+                    break;
+                    case 5:
+                    {
+                        Varyings v = vert_provider(attributes, light);
+                        v.lightOffset = attributes.color;
+                        return v;
+                    }
+
                 }
 
                 Varyings v = (Varyings)0;
@@ -238,6 +260,7 @@ Shader "Hidden/Light2D"
                     case 0:
                     case 1:
                     case 2:
+                    case 5:
                     {
                         FragmentOutput output = frag_shape(i, light);
                         return output;
diff --git a/Packages/com.unity.render-pipelines.universal/Shaders/2D/Sprite-Lit-Default.shader b/Packages/com.unity.render-pipelines.universal/Shaders/2D/Sprite-Lit-Default.shader
index 26449110ef0..f4b0e8284e5 100644
--- a/Packages/com.unity.render-pipelines.universal/Shaders/2D/Sprite-Lit-Default.shader
+++ b/Packages/com.unity.render-pipelines.universal/Shaders/2D/Sprite-Lit-Default.shader
@@ -126,6 +126,9 @@ Shader "Universal Render Pipeline/2D/Sprite-Lit-Default"
 
             half4 NormalsRenderingFragment(Varyings input) : SV_Target
             {
+                // Setup instancing for SpriteFlip is used in NormalsRenderingShared
+                SetUpSpriteInstanceProperties();
+
                 return CommonNormalsFragment(input, input.color);
             }
             ENDHLSL
diff --git a/Packages/com.unity.render-pipelines.universal/Shaders/ComplexLit.shader b/Packages/com.unity.render-pipelines.universal/Shaders/ComplexLit.shader
index f7ec19eada2..4803b9211d0 100644
--- a/Packages/com.unity.render-pipelines.universal/Shaders/ComplexLit.shader
+++ b/Packages/com.unity.render-pipelines.universal/Shaders/ComplexLit.shader
@@ -145,6 +145,7 @@ Shader "Universal Render Pipeline/Complex Lit"
             #pragma multi_compile _ _CLUSTER_LIGHT_LOOP
 #if defined(UNITY_PLATFORM_META_QUEST)
             #pragma multi_compile _ META_QUEST_ORTHO_PROJ
+            #pragma multi_compile _ META_QUEST_NO_SPOTLIGHTS_LIGHT_LOOP
 #endif
             #pragma multi_compile_fragment _ _ADDITIONAL_LIGHT_SHADOWS
             #pragma multi_compile_fragment _ _REFLECTION_PROBE_BLENDING
diff --git a/Packages/com.unity.render-pipelines.universal/Shaders/Lit.shader b/Packages/com.unity.render-pipelines.universal/Shaders/Lit.shader
index 1b5eb802ffd..71fdd29999d 100644
--- a/Packages/com.unity.render-pipelines.universal/Shaders/Lit.shader
+++ b/Packages/com.unity.render-pipelines.universal/Shaders/Lit.shader
@@ -154,6 +154,7 @@ Shader "Universal Render Pipeline/Lit"
             #pragma multi_compile _ _CLUSTER_LIGHT_LOOP
 #if defined(UNITY_PLATFORM_META_QUEST)
             #pragma multi_compile _ META_QUEST_ORTHO_PROJ
+            #pragma multi_compile _ META_QUEST_NO_SPOTLIGHTS_LIGHT_LOOP
 #endif
             #include_with_pragmas "Packages/com.unity.render-pipelines.core/ShaderLibrary/FoveatedRenderingKeywords.hlsl"
             #include_with_pragmas "Packages/com.unity.render-pipelines.universal/ShaderLibrary/RenderingLayers.hlsl"
diff --git a/Packages/com.unity.render-pipelines.universal/Shaders/Particles/ParticlesLit.shader b/Packages/com.unity.render-pipelines.universal/Shaders/Particles/ParticlesLit.shader
index 9d82a9f6f3c..e5d17589efd 100644
--- a/Packages/com.unity.render-pipelines.universal/Shaders/Particles/ParticlesLit.shader
+++ b/Packages/com.unity.render-pipelines.universal/Shaders/Particles/ParticlesLit.shader
@@ -143,14 +143,17 @@ Shader "Universal Render Pipeline/Particles/Lit"
             #pragma multi_compile_fragment _ _SHADOWS_SOFT _SHADOWS_SOFT_LOW _SHADOWS_SOFT_MEDIUM _SHADOWS_SOFT_HIGH
             #pragma multi_compile_fragment _ _SCREEN_SPACE_OCCLUSION
             #pragma multi_compile_fragment _ _LIGHT_COOKIES
+            #pragma multi_compile _ _LIGHT_LAYERS
             #pragma multi_compile _ _CLUSTER_LIGHT_LOOP
             #pragma multi_compile _ EVALUATE_SH_MIXED EVALUATE_SH_VERTEX
 #if defined(UNITY_PLATFORM_META_QUEST)
             #pragma multi_compile _ META_QUEST_ORTHO_PROJ
+            #pragma multi_compile _ META_QUEST_NO_SPOTLIGHTS_LIGHT_LOOP
 #endif
             #include_with_pragmas "Packages/com.unity.render-pipelines.core/ShaderLibrary/FoveatedRenderingKeywords.hlsl"
             #include_with_pragmas "Packages/com.unity.render-pipelines.universal/ShaderLibrary/Fog.hlsl"
             #include_with_pragmas "Packages/com.unity.render-pipelines.universal/ShaderLibrary/ProbeVolumeVariants.hlsl"
+            #include_with_pragmas "Packages/com.unity.render-pipelines.universal/ShaderLibrary/RenderingLayers.hlsl"
 
             // -------------------------------------
             // Unity defined keywords
diff --git a/Packages/com.unity.render-pipelines.universal/Shaders/Particles/ParticlesSimpleLit.shader b/Packages/com.unity.render-pipelines.universal/Shaders/Particles/ParticlesSimpleLit.shader
index e2d7663e586..ee3139c9efd 100644
--- a/Packages/com.unity.render-pipelines.universal/Shaders/Particles/ParticlesSimpleLit.shader
+++ b/Packages/com.unity.render-pipelines.universal/Shaders/Particles/ParticlesSimpleLit.shader
@@ -143,14 +143,17 @@ Shader "Universal Render Pipeline/Particles/Simple Lit"
             #pragma multi_compile_fragment _ _SHADOWS_SOFT _SHADOWS_SOFT_LOW _SHADOWS_SOFT_MEDIUM _SHADOWS_SOFT_HIGH
             #pragma multi_compile_fragment _ _SCREEN_SPACE_OCCLUSION
             #pragma multi_compile_fragment _ _LIGHT_COOKIES
+			#pragma multi_compile _ _LIGHT_LAYERS
             #pragma multi_compile _ _CLUSTER_LIGHT_LOOP
             #pragma multi_compile _ EVALUATE_SH_MIXED EVALUATE_SH_VERTEX
 #if defined(UNITY_PLATFORM_META_QUEST)
             #pragma multi_compile _ META_QUEST_ORTHO_PROJ
+            #pragma multi_compile _ META_QUEST_NO_SPOTLIGHTS_LIGHT_LOOP
 #endif
             #include_with_pragmas "Packages/com.unity.render-pipelines.core/ShaderLibrary/FoveatedRenderingKeywords.hlsl"
             #include_with_pragmas "Packages/com.unity.render-pipelines.universal/ShaderLibrary/Fog.hlsl"
             #include_with_pragmas "Packages/com.unity.render-pipelines.universal/ShaderLibrary/ProbeVolumeVariants.hlsl"
+            #include_with_pragmas "Packages/com.unity.render-pipelines.universal/ShaderLibrary/RenderingLayers.hlsl"
 
             // -------------------------------------
             // Unity defined keywords
diff --git a/Packages/com.unity.render-pipelines.universal/Shaders/SimpleLit.shader b/Packages/com.unity.render-pipelines.universal/Shaders/SimpleLit.shader
index 572e79676f6..449ee1e027e 100644
--- a/Packages/com.unity.render-pipelines.universal/Shaders/SimpleLit.shader
+++ b/Packages/com.unity.render-pipelines.universal/Shaders/SimpleLit.shader
@@ -112,6 +112,7 @@ Shader "Universal Render Pipeline/Simple Lit"
             #pragma multi_compile _ _CLUSTER_LIGHT_LOOP
 #if defined(UNITY_PLATFORM_META_QUEST)
             #pragma multi_compile _ META_QUEST_ORTHO_PROJ
+            #pragma multi_compile _ META_QUEST_NO_SPOTLIGHTS_LIGHT_LOOP
 #endif
             #pragma multi_compile_fragment _ _ADDITIONAL_LIGHT_SHADOWS
             #pragma multi_compile_fragment _ _SHADOWS_SOFT
diff --git a/Packages/com.unity.render-pipelines.universal/Shaders/Terrain/TerrainLit.shader b/Packages/com.unity.render-pipelines.universal/Shaders/Terrain/TerrainLit.shader
index 49cc10ceca4..b914b8ccc35 100644
--- a/Packages/com.unity.render-pipelines.universal/Shaders/Terrain/TerrainLit.shader
+++ b/Packages/com.unity.render-pipelines.universal/Shaders/Terrain/TerrainLit.shader
@@ -74,6 +74,7 @@ Shader "Universal Render Pipeline/Terrain/Lit"
             #pragma multi_compile _ EVALUATE_SH_MIXED EVALUATE_SH_VERTEX
 #if defined(UNITY_PLATFORM_META_QUEST)
             #pragma multi_compile _ META_QUEST_ORTHO_PROJ
+            #pragma multi_compile _ META_QUEST_NO_SPOTLIGHTS_LIGHT_LOOP
 #endif
             #pragma multi_compile_fragment _ _ADDITIONAL_LIGHT_SHADOWS
             #pragma multi_compile_fragment _ _REFLECTION_PROBE_BLENDING
diff --git a/Packages/com.unity.render-pipelines.universal/Shaders/Terrain/TerrainLitAdd.shader b/Packages/com.unity.render-pipelines.universal/Shaders/Terrain/TerrainLitAdd.shader
index fbe3a75511d..80232b438d8 100644
--- a/Packages/com.unity.render-pipelines.universal/Shaders/Terrain/TerrainLitAdd.shader
+++ b/Packages/com.unity.render-pipelines.universal/Shaders/Terrain/TerrainLitAdd.shader
@@ -68,6 +68,7 @@ Shader "Hidden/Universal Render Pipeline/Terrain/Lit (Add Pass)"
             #pragma multi_compile _ _CLUSTER_LIGHT_LOOP
 #if defined(UNITY_PLATFORM_META_QUEST)
             #pragma multi_compile _ META_QUEST_ORTHO_PROJ
+            #pragma multi_compile _ META_QUEST_NO_SPOTLIGHTS_LIGHT_LOOP
 #endif
             #pragma multi_compile_fragment _ _ADDITIONAL_LIGHT_SHADOWS
             #pragma multi_compile_fragment _ _REFLECTION_PROBE_BLENDING
diff --git a/Packages/com.unity.render-pipelines.universal/Shaders/Terrain/TerrainLitBase.shader b/Packages/com.unity.render-pipelines.universal/Shaders/Terrain/TerrainLitBase.shader
index ee94536f073..1cefc8c4e6d 100644
--- a/Packages/com.unity.render-pipelines.universal/Shaders/Terrain/TerrainLitBase.shader
+++ b/Packages/com.unity.render-pipelines.universal/Shaders/Terrain/TerrainLitBase.shader
@@ -46,6 +46,7 @@ Shader "Hidden/Universal Render Pipeline/Terrain/Lit (Base Pass)"
             #pragma multi_compile _ _CLUSTER_LIGHT_LOOP
 #if defined(UNITY_PLATFORM_META_QUEST)
             #pragma multi_compile _ META_QUEST_ORTHO_PROJ
+            #pragma multi_compile _ META_QUEST_NO_SPOTLIGHTS_LIGHT_LOOP
 #endif
             #pragma multi_compile_fragment _ _ADDITIONAL_LIGHT_SHADOWS
             #pragma multi_compile_fragment _ _REFLECTION_PROBE_BLENDING
diff --git a/Packages/com.unity.render-pipelines.universal/Shaders/Terrain/WavingGrass.shader b/Packages/com.unity.render-pipelines.universal/Shaders/Terrain/WavingGrass.shader
index 0eb3644d176..8c8160709ff 100644
--- a/Packages/com.unity.render-pipelines.universal/Shaders/Terrain/WavingGrass.shader
+++ b/Packages/com.unity.render-pipelines.universal/Shaders/Terrain/WavingGrass.shader
@@ -37,6 +37,7 @@ Shader "Hidden/TerrainEngine/Details/UniversalPipeline/WavingDoublePass"
             #pragma multi_compile _ EVALUATE_SH_MIXED EVALUATE_SH_VERTEX
 #if defined(UNITY_PLATFORM_META_QUEST)
             #pragma multi_compile _ META_QUEST_ORTHO_PROJ
+            #pragma multi_compile _ META_QUEST_NO_SPOTLIGHTS_LIGHT_LOOP
 #endif
             #pragma multi_compile_fragment _ _ADDITIONAL_LIGHT_SHADOWS
             #pragma multi_compile_fragment _ _SHADOWS_SOFT _SHADOWS_SOFT_LOW _SHADOWS_SOFT_MEDIUM _SHADOWS_SOFT_HIGH
diff --git a/Packages/com.unity.render-pipelines.universal/Shaders/Terrain/WavingGrassBillboard.shader b/Packages/com.unity.render-pipelines.universal/Shaders/Terrain/WavingGrassBillboard.shader
index b3ff35c24b8..2225d078fb1 100644
--- a/Packages/com.unity.render-pipelines.universal/Shaders/Terrain/WavingGrassBillboard.shader
+++ b/Packages/com.unity.render-pipelines.universal/Shaders/Terrain/WavingGrassBillboard.shader
@@ -37,6 +37,7 @@ Shader "Hidden/TerrainEngine/Details/UniversalPipeline/BillboardWavingDoublePass
             #pragma multi_compile _ _CLUSTER_LIGHT_LOOP
 #if defined(UNITY_PLATFORM_META_QUEST)
             #pragma multi_compile _ META_QUEST_ORTHO_PROJ
+            #pragma multi_compile _ META_QUEST_NO_SPOTLIGHTS_LIGHT_LOOP
 #endif
             #pragma multi_compile_fragment _ _SCREEN_SPACE_IRRADIANCE
             #include_with_pragmas "Packages/com.unity.render-pipelines.core/ShaderLibrary/FoveatedRenderingKeywords.hlsl"
diff --git a/Packages/com.unity.render-pipelines.universal/Tests/Editor/PostProcessDataTests/1.shader b/Packages/com.unity.render-pipelines.universal/Tests/Editor/PostProcessDataTests/1.shader
index ff5d916c45f..86b9da13c16 100644
--- a/Packages/com.unity.render-pipelines.universal/Tests/Editor/PostProcessDataTests/1.shader
+++ b/Packages/com.unity.render-pipelines.universal/Tests/Editor/PostProcessDataTests/1.shader
@@ -1,4 +1,4 @@
-Shader "Custom/Test Shader"
+Shader "Hidden/Custom/Test Shader"
 {
     Properties
     {
diff --git a/Packages/com.unity.render-pipelines.universal/Tests/Editor/PostProcessDataTests/2.shader b/Packages/com.unity.render-pipelines.universal/Tests/Editor/PostProcessDataTests/2.shader
index ff5d916c45f..86b9da13c16 100644
--- a/Packages/com.unity.render-pipelines.universal/Tests/Editor/PostProcessDataTests/2.shader
+++ b/Packages/com.unity.render-pipelines.universal/Tests/Editor/PostProcessDataTests/2.shader
@@ -1,4 +1,4 @@
-Shader "Custom/Test Shader"
+Shader "Hidden/Custom/Test Shader"
 {
     Properties
     {
diff --git a/Packages/com.unity.render-pipelines.universal/Tests/Editor/ShaderBuildPreprocessorTests.cs b/Packages/com.unity.render-pipelines.universal/Tests/Editor/ShaderBuildPreprocessorTests.cs
index 002e78c441b..9301d8d5300 100644
--- a/Packages/com.unity.render-pipelines.universal/Tests/Editor/ShaderBuildPreprocessorTests.cs
+++ b/Packages/com.unity.render-pipelines.universal/Tests/Editor/ShaderBuildPreprocessorTests.cs
@@ -916,9 +916,9 @@ public void TestGetSupportedShaderFeaturesFromRendererFeatures_SSAO()
 #if SURFACE_CACHE
         // Surface Cache Global Illumination...
         [Test]
-        public void TestGetSupportedShaderFeaturesFromRendererFeatures_SurfaceCacheGlobalIllumination()
+        public void TestGetSupportedShaderFeaturesFromRendererFeatures_SurfaceCacheGI()
         {
-            SurfaceCacheGlobalIlluminationRendererFeature surfaceCacheFeature = ScriptableObject.CreateInstance<SurfaceCacheGlobalIlluminationRendererFeature>();
+            SurfaceCacheGIRendererFeature surfaceCacheFeature = ScriptableObject.CreateInstance<SurfaceCacheGIRendererFeature>();
             m_TestHelper.rendererFeatures.Add(surfaceCacheFeature);
 
             // Enabled feature
diff --git a/Packages/com.unity.render-pipelines.universal/Tests/Editor/Tools/Converters/ConvertersTests.cs b/Packages/com.unity.render-pipelines.universal/Tests/Editor/Tools/Converters/ConvertersTests.cs
index 17fa8e4ea24..c265e56398d 100644
--- a/Packages/com.unity.render-pipelines.universal/Tests/Editor/Tools/Converters/ConvertersTests.cs
+++ b/Packages/com.unity.render-pipelines.universal/Tests/Editor/Tools/Converters/ConvertersTests.cs
@@ -64,8 +64,124 @@ public void RunInBatchMode_LogsUsageWarning()
             bool _ = Converters.RunInBatchMode(new List<Type>() {});
         }
 
-#pragma warning disable CS0618 // Type or member is obsolete
         public static IEnumerable<TestCaseData> TestCases()
+        {
+            yield return new TestCaseData(
+                "BuiltInToURP",
+                new List<string> { "Material" },
+                true,
+                new List<Type> { typeof(BuiltInToURP3DMaterialUpgrader) }
+            ).SetName("When Using Inclusive filter with Material in the correct category. The Filter only returns that converter");
+            yield return new TestCaseData(
+                "BuiltInToURP",
+                new List<string> { "ParametricToFreeformLight" },
+                true,
+                new List<Type>()
+            ).SetName("When Using Inclusive filter with Light in the wrong category. The Filter returns nothing");
+
+            yield return new TestCaseData(
+                "BuiltInToURP",
+                new List<string>
+                {
+                    "RenderSettings",
+#if PPV2_EXISTS
+                    "PPv2"
+#endif
+                },
+                false,
+                new List<Type>
+                {
+                    typeof(AnimationClipConverter),
+                    typeof(BuiltInToURP3DMaterialUpgrader),
+                    typeof(BuiltInToURP3DReadonlyMaterialConverter),
+                }
+            ).SetName("When Using Exclusive filter. The filter returns everything except the given ids");
+
+            yield return new TestCaseData(
+                "BuiltInToURP",
+                new List<string>(),
+                true,
+                new List<Type>() // No converters match
+            ).SetName("When Using Inclusive filter with no converters. The filter returns nothing");
+
+            yield return new TestCaseData(
+                "BuiltInToURP",
+                new List<string>(),
+                false,
+                 new List<Type>
+                 {
+#if PPV2_EXISTS
+                    typeof(PPv2Converter),
+#endif
+                    typeof(BuiltInToURP3DRenderSettingsConverter),
+                    typeof(AnimationClipConverter),
+                    typeof(BuiltInToURP3DMaterialUpgrader),
+                    typeof(BuiltInToURP3DReadonlyMaterialConverter),
+                 }
+            ).SetName("BuiltInToURP - When Using Exclusive filter with no converters. The filter returns everything");
+
+            yield return new TestCaseData(
+                "BuiltInToURP2D",
+                new List<string>(),
+                false,
+                 new List<Type>
+                 {
+                    typeof(BuiltInToURP2DRenderSettingsConverter),
+                    typeof(BuiltInToURP2DReadonlyMaterialConverter),
+                 }
+            ).SetName("BuiltInToURP2D - When Using Exclusive filter with no converters. The filter returns everything");
+
+            yield return new TestCaseData(
+                "UpgradeURP2DAssets",
+                new List<string>(),
+                false,
+                new List<Type>
+                {
+                    typeof(BuiltInAndURP3DTo2DMaterialUpgrader),
+                    typeof(ParametricToFreeformLightUpgrader)
+                }
+            ).SetName("UpgradeURP2DAssets - When Using Exclusive filter with no converters. The filter returns everything");
+        }
+
+        [TestCaseSource(nameof(TestCases))]
+        public void FilterConverters_ShouldReturnExpectedConverters(
+            string containerName,
+            List<string> filterList,
+            bool filterModeIsInclusive,
+            List<Type> expectedTypes)
+        {
+            var actualTypes = Converters.FilterConverters(containerName, filterList, filterModeIsInclusive);
+            CollectionAssert.AreEquivalent(expectedTypes, actualTypes);
+        }
+
+        [Test]
+        public void CommandLine_ArgumentsParsedProperly()
+        {
+            // case 1 - working command
+            var dummyArgs = "-batchmode -executeMethod UnityEditor.Rendering.Universal.Converters.RunInBatchModeCmdLine --flagA -paramA 1 2 3 --flagB --flagC -paramB --flagD";
+            var actualArgs = Converters.ParseArgs(dummyArgs.Split(' '));
+            Dictionary<string, List<string>> expectedArgs = new()
+            {
+                { "-executeMethod", new List<string> {"UnityEditor.Rendering.Universal.Converters.RunInBatchModeCmdLine"} },
+                { "-paramA", new List<string> {"1", "2", "3"} },
+                { "-paramB", new List<string> {} },
+                { "Flags", new List<string> {"--flagA", "--flagB", "--flagC", "--flagD"} }
+            };
+            CollectionAssert.AreEquivalent(expectedArgs, actualArgs);
+
+            // case 2 - Error: No -batchmode flag
+            dummyArgs = "-executeMethod UnityEditor.Rendering.Universal.Converters.RunInBatchModeCmdLine --flagA -paramA 1 2 3";
+            var exception = Assert.Throws<ArgumentException>(() => Converters.ParseArgs(dummyArgs.Split(' ')));
+            Assert.That(exception.Message, Is.EqualTo("No -batchmode argument found. Exiting."));
+
+            // case 3 - Error: Adding values without a key
+            dummyArgs = "-batchmode -executeMethod UnityEditor.Rendering.Universal.Converters.RunInBatchModeCmdLine --flagA wrongArgument";
+            exception = Assert.Throws<ArgumentException>(() => Converters.ParseArgs(dummyArgs.Split(' ')));
+            Assert.That(exception.Message, Is.EqualTo("Unrecognized argument: wrongArgument"));
+        }
+
+#pragma warning disable CS0618 // Type or member is obsolete
+        public static IEnumerable<TestCaseData> TestCasesDeprecated()
         {
             yield return new TestCaseData(
                 ConverterContainerId.BuiltInToURP,
@@ -144,8 +260,8 @@ public static IEnumerable<TestCaseData> TestCases()
             ).SetName("UpgradeURP2DAssets - When Using Exclusive filter with no converters. The filter returns everything");
         }
 
-        [TestCaseSource(nameof(TestCases))]
-        public void FilterConverters_ShouldReturnExpectedConverters(
+        [TestCaseSource(nameof(TestCasesDeprecated))]
+        public void FilterConverters_ShouldReturnExpectedConverters_DeprecatedAPI(
                 ConverterContainerId containerId,
                 List<ConverterId> filterList,
                 ConverterFilter filterMode,
@@ -155,6 +271,26 @@ public void FilterConverters_ShouldReturnExpectedConverters(
             CollectionAssert.AreEquivalent(expectedTypes, actualTypes);
         }
 
+        [Test]
+        public void CommandLine_SuggestCorrectCommands()
+        {
+            var expectedOutputTemplate = "The method you're trying to use is deprecated. Try running the following command in the command line:\n{0}";
+
+            // case 1
+            var containerID = ConverterContainerId.BuiltInToURP;
+            var filterList = new List<ConverterId> { ConverterId.Material, ConverterId.RenderSettings };
+            Converters.SuggestUpdatedCommand(containerID.ToString(), filterList.ConvertAll(id => id.ToString()), true);
+            var suggestedCommand = "<path to Unity> -projectPath <path to project> -batchmode -executeMethod UnityEditor.Rendering.Universal.Converters.RunInBatchModeCmdLine --inclusive -container BuiltInToURP -typesFilter Material RenderSettings";
+            LogAssert.Expect(LogType.Log, String.Format(expectedOutputTemplate, suggestedCommand));
+
+            // case 2
+            containerID = ConverterContainerId.BuiltInToURP2D;
+            filterList = new List<ConverterId> { };
+            Converters.SuggestUpdatedCommand(containerID.ToString(), filterList.ConvertAll(id => id.ToString()), false);
+            suggestedCommand = "<path to Unity> -projectPath <path to project> -batchmode -executeMethod UnityEditor.Rendering.Universal.Converters.RunInBatchModeCmdLine --exclusive -container BuiltInToURP2D";
+            LogAssert.Expect(LogType.Log, String.Format(expectedOutputTemplate, suggestedCommand));
+        }
+
 #pragma warning restore CS0618 // Type or member is obsolete
     }
 
diff --git a/Packages/com.unity.render-pipelines.universal/Tests/Runtime/ShadowCaster2DTests.cs b/Packages/com.unity.render-pipelines.universal/Tests/Runtime/ShadowCaster2DTests.cs
index da84421001e..c43269eeb8e 100644
--- a/Packages/com.unity.render-pipelines.universal/Tests/Runtime/ShadowCaster2DTests.cs
+++ b/Packages/com.unity.render-pipelines.universal/Tests/Runtime/ShadowCaster2DTests.cs
@@ -29,7 +29,7 @@ public void AddShadowCaster2DWithSpriteSkin()
 
 // ShadowCaster2D.shadowShape2DProvider is always null on Standalone.
 #if UNITY_EDITOR
-            Assert.That(shadowCaster2D.shadowShape2DProvider, Is.TypeOf(typeof(ShadowShape2DProvider_SpriteSkin)));
+            Assert.That(shadowCaster2D.shadowShape2DProvider, Is.TypeOf(typeof(ShadowCaster2DProvider_SpriteSkin)));
 #else
             Assert.That(shadowCaster2D.shadowShape2DProvider, Is.Null);
 #endif
@@ -46,7 +46,7 @@ public void AddShadowCaster2DWithSpriteSkinWhenInactive()
             m_Obj.SetActive(true);
 // ShadowCaster2D.shadowShape2DProvider is always null on Standalone.
 #if UNITY_EDITOR
-            Assert.That(shadowCaster2D.shadowShape2DProvider, Is.TypeOf(typeof(ShadowShape2DProvider_SpriteSkin)));
+            Assert.That(shadowCaster2D.shadowShape2DProvider, Is.TypeOf(typeof(ShadowCaster2DProvider_SpriteSkin)));
 #else
             Assert.That(shadowCaster2D.shadowShape2DProvider, Is.Null);
 #endif
diff --git a/Packages/com.unity.render-pipelines.universal/ValidationExceptions.json b/Packages/com.unity.render-pipelines.universal/ValidationExceptions.json
index 9fb62857cac..ae25c596aea 100644
--- a/Packages/com.unity.render-pipelines.universal/ValidationExceptions.json
+++ b/Packages/com.unity.render-pipelines.universal/ValidationExceptions.json
@@ -2,7 +2,7 @@
   "Exceptions": [
     {
       "ValidationTest": "API Updater Configuration Validation",
-      "PackageVersion": "17.5.0"
+      "PackageVersion": "17.6.0"
     }
   ]
 }
\ No newline at end of file
diff --git a/Packages/com.unity.render-pipelines.universal/package.json b/Packages/com.unity.render-pipelines.universal/package.json
index 68824e7b6f4..f04ee6ccc97 100644
--- a/Packages/com.unity.render-pipelines.universal/package.json
+++ b/Packages/com.unity.render-pipelines.universal/package.json
@@ -1,13 +1,13 @@
 {
   "name": "com.unity.render-pipelines.universal",
   "description": "The Universal Render Pipeline (URP) is a prebuilt Scriptable Render Pipeline, made by Unity. URP provides artist-friendly workflows that let you quickly and easily create optimized graphics across a range of platforms, from mobile to high-end consoles and PCs.",
-  "version": "17.5.0",
-  "unity": "6000.5",
+  "version": "17.6.0",
+  "unity": "6000.6",
   "displayName": "Universal Render Pipeline",
   "dependencies": {
-    "com.unity.render-pipelines.core": "17.5.0",
-    "com.unity.shadergraph": "17.5.0",
-    "com.unity.render-pipelines.universal-config": "17.5.0"
+    "com.unity.render-pipelines.core": "17.6.0",
+    "com.unity.shadergraph": "17.6.0",
+    "com.unity.render-pipelines.universal-config": "17.6.0"
   },
   "keywords": [
     "graphics",
diff --git a/Packages/com.unity.shaderanalysis/Editor/API/ShaderBuildReport.cs b/Packages/com.unity.shaderanalysis/Editor/API/ShaderBuildReport.cs
index b94c61cd6bb..53866fdb5f4 100644
--- a/Packages/com.unity.shaderanalysis/Editor/API/ShaderBuildReport.cs
+++ b/Packages/com.unity.shaderanalysis/Editor/API/ShaderBuildReport.cs
@@ -315,7 +315,6 @@ public static ProgramPerformanceMetrics Diff(ProgramPerformanceMetrics l, Progra
         [SerializeField]
         List<PerformanceUnit> m_PerformanceUnit = new List<PerformanceUnit>();
 
-        [SerializeField]
         Dictionary<int, string> m_SkippedPasses = new Dictionary<int, string>();
 
         Dictionary<int, Dictionary<int, int>> m_ProgramCompileUnits = new Dictionary<int, Dictionary<int, int>>();
diff --git a/Packages/com.unity.shadergraph/CHANGELOG.md b/Packages/com.unity.shadergraph/CHANGELOG.md
index b74c6d51365..a913628dac7 100644
--- a/Packages/com.unity.shadergraph/CHANGELOG.md
+++ b/Packages/com.unity.shadergraph/CHANGELOG.md
@@ -10,6 +10,12 @@ 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.
 
+## [17.5.0] - 2026-02-18
+
+This version is compatible with Unity 6000.6.0a7.
+
+For the release notes, refer to the [Unity download archive](https://unity.com/releases/editor/archive).
+
 ### Changed
 
 - Deprecated Reflection Probe node as its behavior can be incompatible with specific render paths.
diff --git a/Packages/com.unity.shadergraph/Documentation~/Blackboard.md b/Packages/com.unity.shadergraph/Documentation~/Blackboard.md
index 6e66c3d15d3..22dc6a2c704 100644
--- a/Packages/com.unity.shadergraph/Documentation~/Blackboard.md
+++ b/Packages/com.unity.shadergraph/Documentation~/Blackboard.md
@@ -3,7 +3,7 @@
 ## Description
 You can use the Blackboard to define, order, and categorize the [Properties](Property-Types.md) and [Keywords](Keywords.md) in a graph. From the Blackboard, you can also edit the path for the selected Shader Graph Asset or Sub Graph.
 
-![image](images/blackboardcategories1.png)
+![The blackboard layout with properties, keywords, and categories.](images/blackboardcategories1.png)
 
 ## Accessing the Blackboard
 The Blackboard is visible by default, and you cannot drag it off the graph and lose it. However, you are able to position it anywhere in the [Shader Graph Window](Shader-Graph-Window.md). It always maintains the same distance from the nearest corner, even if you resize the window.
@@ -42,8 +42,6 @@ To make the properties in your shader more discoverable, organize them into cate
 ### Adding, removing, and reordering properties and keywords
 * To add a property or keyword to a category, expand the category with the foldout (⌄) symbol, then drag and drop the property or keyword onto the expanded category.
 
-![image](images/blackboardcategories2.png)
-
 * To remove a property or keyword, select it and press **Delete**, or right-click and select **Delete**.
 * To re-order properties or keywords, drag and drop them within a category or move them into other categories.
 
@@ -66,9 +64,6 @@ To copy a specific set of properties:
 ### Using categories in the Material Inspector
 To modify a material you have created with a Shader Graph, you can adjust specific property or keyword values in the Material Inspector, or edit the graph itself.
 
-![image](images/blackboardcategories3.png)
-
-
 #### Working with Streaming Virtual Textures
 [Streaming Virtual Texture Properties](https://docs.unity3d.com/Documentation/Manual/svt-use-in-shader-graph.html) sample texture layers. To access these layers in the Material Inspector, expand the relevant **Virtual Texture** section with the ⌄ symbol next to its name. You can add and remove layers via the Inspector.
 
diff --git a/Packages/com.unity.shadergraph/Documentation~/Block-Node.md b/Packages/com.unity.shadergraph/Documentation~/Block-Node.md
index 0b8090b83b7..b98826160a4 100644
--- a/Packages/com.unity.shadergraph/Documentation~/Block-Node.md
+++ b/Packages/com.unity.shadergraph/Documentation~/Block-Node.md
@@ -26,6 +26,4 @@ If you disable **Automatically Add or Remove Blocks**, Shader Graph doesn't auto
 
 Active Block nodes are Blocks that contribute to the final shader. Inactive Block nodes are Blocks that are present in the Shader Graph, but don't contribute to the final shader.
 
-![image](images/Active-Inactive-Blocks.png)
-
 When you change the graph settings, certain Blocks might become active or inactive. Inactive Block nodes and any node streams that are connected only to Inactive Block nodes appear grayed out.
diff --git a/Packages/com.unity.shadergraph/Documentation~/Boolean-Node.md b/Packages/com.unity.shadergraph/Documentation~/Boolean-Node.md
index 2ff09735709..40196324ee1 100644
--- a/Packages/com.unity.shadergraph/Documentation~/Boolean-Node.md
+++ b/Packages/com.unity.shadergraph/Documentation~/Boolean-Node.md
@@ -6,15 +6,15 @@ Defines a constant **Boolean** value in the [Shader Graph](index.md), although i
 
 ## Ports
 
-| Name        | Direction           | Type  | Binding | Description |
-|:------------ |:-------------|:-----|:---|:---|
-| Out | Output      |    Boolean | None | Output value |
+| Name | Direction | Type | Binding | Description |
+|:--- |:---|:---|:---|:---|
+| Out | Output | Boolean | None | Output value |
 
 ## Controls
 
-| Name        | Type           | Options  | Description |
-|:------------ |:-------------|:-----|:---|
-|       | Toggle |  | Defines the output value. |
+| Control | Description |
+|:---|:---|
+| (Checkbox) | Defines the output value. |
 
 ## Generated Code Example
 
diff --git a/Packages/com.unity.shadergraph/Documentation~/Channel-Mixer-Node.md b/Packages/com.unity.shadergraph/Documentation~/Channel-Mixer-Node.md
index 5fba552c278..d45d90c2953 100644
--- a/Packages/com.unity.shadergraph/Documentation~/Channel-Mixer-Node.md
+++ b/Packages/com.unity.shadergraph/Documentation~/Channel-Mixer-Node.md
@@ -6,19 +6,19 @@ Controls the amount each of the channels of input **In** contribute to each of t
 
 ## Ports
 
-| Name        | Direction           | Type  | Binding | Description |
-|:------------ |:-------------|:-----|:---|:---|
-| In      | Input | Vector 3 | None | Input value |
-| Out | Output      |    Vector 3 | None | Output value |
+| Name | Direction | Type | Binding | Description |
+|:---|:---|:---|:---|:---|
+| In | Input | Vector 3 | None | Input value |
+| Out | Output | Vector 3 | None | Output value |
 
 ## Controls
 
-| Name        | Type           | Options  | Description |
-|:------------ |:-------------|:-----|:---|
-|       | Toggle Button Array | R, G, B | Selects the output channel to edit. |
-| R      | Slider |  | Controls contribution of input red channel to selected output channel. |
-| G      | Slider |  | Controls contribution of input green channel to selected output channel. |
-| B      | Slider |  | Controls contribution of input blue channel to selected output channel. |
+| Control | Description |
+|:---|:---|
+| **R**, **G**, **B** (toggle buttons) | Selects the output channel to edit with the sliders. |
+| **R** (slider) | Controls the contribution of the input red channel to the selected output channel. |
+| **G** (slider) | Controls the contribution of the input green channel to the selected output channel. |
+| **B** (slider) | Controls the contribution of the input blue channel to the selected output channel. |
 
 ## Shader Function
 
diff --git a/Packages/com.unity.shadergraph/Documentation~/Color-Node.md b/Packages/com.unity.shadergraph/Documentation~/Color-Node.md
index 5405913ea97..ba9dcb722d4 100644
--- a/Packages/com.unity.shadergraph/Documentation~/Color-Node.md
+++ b/Packages/com.unity.shadergraph/Documentation~/Color-Node.md
@@ -8,16 +8,16 @@ NOTE: In versions prior to 10.0, Shader Graph assumed that HDR colors from the C
 
 ## Ports
 
-| Name        | Direction           | Type  | Binding | Description |
-|:------------ |:-------------|:-----|:---|:---|
-| Out | Output      |    Vector 4 | None | Output value |
+| Name | Direction | Type | Binding | Description |
+|:--- |:---|:---|:---|:---|
+| Out | Output | Vector 4 | None | Output value |
 
 ## Controls
 
-| Name        | Type           | Options  | Description |
-|:------------ |:-------------|:-----|:---|
-|       | Color |  | Defines the output value. |
-| Mode  | Dropdown | Default, HDR | Sets properties of the Color field |
+| Control | Description |
+|:---|:---|
+| (Color) | Defines the output value. |
+| **Mode** | Sets properties of the Color field. The options are:<ul><li>**Default**</li><li>**HDR**</li></ul> |
 
 ## Generated Code Example
 
diff --git a/Packages/com.unity.shadergraph/Documentation~/Comparison-Node.md b/Packages/com.unity.shadergraph/Documentation~/Comparison-Node.md
index e0424ea5ac4..34a352b124e 100644
--- a/Packages/com.unity.shadergraph/Documentation~/Comparison-Node.md
+++ b/Packages/com.unity.shadergraph/Documentation~/Comparison-Node.md
@@ -6,17 +6,17 @@ Compares the two input values **A** and **B** based on the condition selected on
 
 ## Ports
 
-| Name        | Direction           | Type  | Binding | Description |
-|:------------ |:-------------|:-----|:---|:---|
-| A      | Input | Float    | None | First input value |
-| B      | Input | Float    | None | Second input value |
-| Out  | Output  | Boolean  | None | Output value |
+| Name | Direction | Type | Binding | Description |
+|:--- |:---|:---|:---|:---|
+| A | Input | Float | None | First input value |
+| B | Input | Float | None | Second input value |
+| Out | Output | Boolean | None | Output value |
 
 ## Controls
 
-| Name        | Type           | Options  | Description |
-|:------------ |:-------------|:-----|:---|
-|      | Dropdown | Equal, NotEqual, Less, LessOrEqual, Greater, GreaterOrEqual | Condition for comparison |
+| Control | Description |
+|:---|:---|
+| (Dropdown) | Select the condition for comparison between A and B. The options are:<ul><li>**Equal**</li><li>**NotEqual**</li><li>**Less**</li><li>**LessOrEqual**</li><li>**Greater**</li><li>**GreaterOrEqual**</li></ul> |
 
 ## Generated Code Example
 
diff --git a/Packages/com.unity.shadergraph/Documentation~/Cubemap-Asset-Node.md b/Packages/com.unity.shadergraph/Documentation~/Cubemap-Asset-Node.md
index 7afa17f55f2..1b8a40870a6 100644
--- a/Packages/com.unity.shadergraph/Documentation~/Cubemap-Asset-Node.md
+++ b/Packages/com.unity.shadergraph/Documentation~/Cubemap-Asset-Node.md
@@ -6,12 +6,12 @@ Defines a constant **Cubemap Asset** for use in the shader. To sample the **Cube
 
 ## Ports
 
-| Name        | Direction           | Type  | Binding | Description |
-|:------------ |:-------------|:-----|:---|:---|
-| Out | Output      |    Cubemap | None | Output value |
+| Name | Direction | Type | Binding | Description |
+|:--- |:---|:---|:---|:---|
+| Out | Output | Cubemap | None | Output value |
 
 ## Controls
 
-| Name        | Type           | Options  | Description |
-|:------------ |:-------------|:-----|:---|
-|       | Object Field (Cubemap) | | Defines the cubemap asset from the project. |
+| Control | Description |
+|:--- |:---|
+| (Cubemap)| Defines the cubemap asset from the project. |
diff --git a/Packages/com.unity.shadergraph/Documentation~/Dielectric-Specular-Node.md b/Packages/com.unity.shadergraph/Documentation~/Dielectric-Specular-Node.md
index ab06b823c35..969c297fd12 100644
--- a/Packages/com.unity.shadergraph/Documentation~/Dielectric-Specular-Node.md
+++ b/Packages/com.unity.shadergraph/Documentation~/Dielectric-Specular-Node.md
@@ -10,17 +10,17 @@ You can use **Custom** material type to define your own physically based materia
 
 ## Ports
 
-| Name        | Direction           | Type  | Binding | Description |
-|:------------ |:-------------|:-----|:---|:---|
-| Out | Output      |    Float    | None | Output value |
+| Name | Direction | Type | Binding | Description |
+|:--- |:---|:---|:---|:---|
+| Out | Output | Float | None | Output value |
 
 ## Controls
 
-| Name        | Type           | Options  | Description |
-|:------------ |:-------------|:-----|:---|
-| Material | Dropdown | Common, RustedMetal, Water, Ice, Glass, Custom | Selects the material value to output. |
-| Range    | Slider |  | Controls output value for **Common** material type. |
-| IOR      | Slider |  | Controls index of refraction for **Custom** material type. |
+| Control | Description |
+|:---|:---|
+| **Material** | Selects the material value to output. The options are:<ul><li>**Common**</li><li>**RustedMetal**</li><li>**Water**</li><li>**Ice**</li><li>**Glass**</li><li>**Custom**</li></ul> |
+| **Range** | Controls the output value for a **Common** material type. |
+| **IOR** | Controls the index of refraction for a **Custom** material type. |
 
 ## Generated Code Example
 
diff --git a/Packages/com.unity.shadergraph/Documentation~/Fresnel-Equation-Node.md b/Packages/com.unity.shadergraph/Documentation~/Fresnel-Equation-Node.md
index e6ed9badb8c..d5aeeefed59 100644
--- a/Packages/com.unity.shadergraph/Documentation~/Fresnel-Equation-Node.md
+++ b/Packages/com.unity.shadergraph/Documentation~/Fresnel-Equation-Node.md
@@ -35,9 +35,9 @@ You can find Numerical values of refractive indices at [refractiveindex.info](ht
 
 ## Controls
 
-| Name        | Type           | Options  | Description |
-|:------------ |:-------------|:-----|:---|
-| Mode      | Dropdown | &#8226; **Schlick**: This mode produces an approximation based on [Schlick's Approximation](https://en.wikipedia.org/wiki/Schlick%27s_approximation). Use the Schlick mode for interactions between air and dielectric materials. <br/>&#8226; **Dielectric**: Use this mode for interactions between two dielectric Materials. For example, air to glass, glass to water, or water to air.<br/>&#8226; **DielectricGeneric**: This mode computes a [Fresnel equation](https://seblagarde.wordpress.com/2013/04/29/memo-on-fresnel-equations) for interactions between a dielectric and a metal. For example, clear-coat- to metal, glass to metal, or water to metal. <br/>**Note:** if the **IORMediumK** value is 0, **DielectricGeneric** behaves in the same way as the **Dielectric** mode. ||
+| Control | Description |
+|:---|:---|
+| **Mode** | Select an equation mode to affect Material interactions to the Fresnel Component. The options are:<ul><li>**Schlick**: This mode produces an approximation based on [Schlick's Approximation](https://en.wikipedia.org/wiki/Schlick%27s_approximation). Use the Schlick mode for interactions between air and dielectric materials.</li><li>**Dielectric**: Use this mode for interactions between two dielectric Materials. For example, air to glass, glass to water, or water to air.</li><li>**DielectricGeneric**: This mode computes a [Fresnel equation](https://seblagarde.wordpress.com/2013/04/29/memo-on-fresnel-equations) for interactions between a dielectric and a metal. For example, clear-coat- to metal, glass to metal, or water to metal.</li></ul>**Note:** if the **IORMediumK** value is 0, **DielectricGeneric** behaves in the same way as the **Dielectric** mode. |
 
 ## Generated Code Example
 
diff --git a/Packages/com.unity.shadergraph/Documentation~/Gradient-Node.md b/Packages/com.unity.shadergraph/Documentation~/Gradient-Node.md
index 5e0f92d1a7b..1c1ab010eaa 100644
--- a/Packages/com.unity.shadergraph/Documentation~/Gradient-Node.md
+++ b/Packages/com.unity.shadergraph/Documentation~/Gradient-Node.md
@@ -6,15 +6,15 @@ Defines a constant **Gradient** for use in [Shader Graph](index.md), although in
 
 ## Ports
 
-| Name        | Direction           | Type  | Description |
-|:------------ |:-------------|:-----|:---|
-| Out | Output      |    Gradient | Output value |
+| Name | Direction | Type | Description |
+|:--- |:---|:---|:---|
+| Out | Output | Gradient | Output value |
 
 ## Controls
 
-| Name        | Type           | Options  | Description |
-|:------------ |:-------------|:-----|:---|
-|      | Gradient Field |  | Defines the gradient. |
+| Control | Description |
+|:---|:---|
+| (Gradient Field) | Defines the gradient. |
 
 ## Generated Code Example
 
diff --git a/Packages/com.unity.shadergraph/Documentation~/Graph-Target.md b/Packages/com.unity.shadergraph/Documentation~/Graph-Target.md
index 05e4feb18b6..d843d493b6f 100644
--- a/Packages/com.unity.shadergraph/Documentation~/Graph-Target.md
+++ b/Packages/com.unity.shadergraph/Documentation~/Graph-Target.md
@@ -2,8 +2,6 @@
 
 A Target determines the end point compatibility of a shader you generate using Shader Graph. You can select Targets for each Shader Graph asset, and use the [Graph Settings Menu](Graph-Settings-Tab.md) to change the Targets.
 
-![image](images/GraphSettings_Menu.png)
-
 Targets hold information such as the required generation format, and variables that allow compatibility with different render pipelines or integration features like [Visual Effect Graph](https://docs.unity3d.com/Packages/com.unity.visualeffectgraph@latest). You can select any number of Targets for each Shader Graph asset. If a Target you select isn't compatible with other Targets you've already selected, an error message that explains the problem appears.
 
 Target Settings are specific to each Target, and can vary between assets depending on which Targets you've selected. Be aware that Universal Render Pipeline (URP) Target Settings and High Definition Render Pipeline (HDRP) Target Settings might change in future versions.
diff --git a/Packages/com.unity.shadergraph/Documentation~/Integer-Node.md b/Packages/com.unity.shadergraph/Documentation~/Integer-Node.md
index 017eacec8d6..e4a5dbff735 100644
--- a/Packages/com.unity.shadergraph/Documentation~/Integer-Node.md
+++ b/Packages/com.unity.shadergraph/Documentation~/Integer-Node.md
@@ -6,15 +6,15 @@ Defines a constant **Float** value in the shader using an **Integer** field. Can
 
 ## Ports
 
-| Name        | Direction           | Type  | Binding | Description |
-|:------------ |:-------------|:-----|:---|:---|
-| Out | Output      |    Float    | None | Output value |
+| Name | Direction | Type | Binding | Description |
+|:--- |:---|:---|:---|:---|
+| Out | Output | Float | None | Output value |
 
 ## Controls
 
-| Name        | Type           | Options  | Description |
-|:------------ |:-------------|:-----|:---|
-|       | Integer |  | Defines the output value. |
+| Control | Description |
+|:---|:---|
+| (Integer) | Defines the output value. |
 
 ## Generated Code Example
 
diff --git a/Packages/com.unity.shadergraph/Documentation~/Internal-Inspector.md b/Packages/com.unity.shadergraph/Documentation~/Internal-Inspector.md
index afd823e5887..54f4c97a9d6 100644
--- a/Packages/com.unity.shadergraph/Documentation~/Internal-Inspector.md
+++ b/Packages/com.unity.shadergraph/Documentation~/Internal-Inspector.md
@@ -10,29 +10,29 @@ When you open a Shader Graph, the **Graph Inspector** displays the **[Graph Sett
 
 Select a node in the graph to display settings available for that node in the **Graph Inspector**. Settings available for that node appear in the **Node Settings** tab of the Graph Inspector. For example, if you select a Property node either in the graph or the [Blackboard](Blackboard.md), the **Node Settings** tab displays attributes of the Property that you can edit.
 
-![](images/InternalInspectorBlackboardProperty.png)
+![The Blackboard with a property selected, and the Graph Inspector showing the property settings.](images/InternalInspectorBlackboardProperty.png)
 
 Graph elements that currently work with the Graph Inspector:
 
 - [Properties](https://docs.unity3d.com/Manual/SL-Properties.html)
 
-    ![](images/InternalInspectorGraphProperty.png)
+    ![A property selected in the workspace, and the Graph Inspector showing the property settings.](images/InternalInspectorGraphProperty.png)
 
 - [Keywords](Keywords.md)
 
-    ![](images/keywords_enum.png)
+    ![The Blackboard with a keyword selected, and the Graph Inspector showing the keyword settings.](images/keywords_enum.png)
 
 - [Custom Function nodes](Custom-Function-Node.md)
 
-    ![](images/Custom-Function-Node-File.png)
+    ![A Custom Function node selected in the workspace, and the Graph Inspector showing the node settings.](images/Custom-Function-Node-File.png)
 
 - [Subgraph Output nodes](Sub-graph.md)
 
-    ![](images/Inspector-SubgraphOutput.png)
+    ![A subgraph output node selected in the workspace, and the Graph Inspector showing the node settings.](images/Inspector-SubgraphOutput.png)
 
 - [Per-node precision](Precision-Modes.md)
 
-    ![](images/Inspector-PerNodePrecision.png)
+    ![A node selected in the workspace, and the Graph Inspector showing the Precision setting.](images/Inspector-PerNodePrecision.png)
 
 
 Graph elements that currently do not work with the Graph Inspector:
@@ -44,7 +44,3 @@ Graph elements that currently do not work with the Graph Inspector:
 ## Material Override
 
 Enabling the [Allow Material Override](surface-options.md) option in the Graph Settings makes it possible for you to override certain graph properties via the Material Inspector.
-
-![](images/materialoverride1.PNG)
-
-![](images/materialoverride2.PNG)
diff --git a/Packages/com.unity.shadergraph/Documentation~/Master-Stack.md b/Packages/com.unity.shadergraph/Documentation~/Master-Stack.md
index b0ffbb52f4f..442f31fa5e8 100644
--- a/Packages/com.unity.shadergraph/Documentation~/Master-Stack.md
+++ b/Packages/com.unity.shadergraph/Documentation~/Master-Stack.md
@@ -4,12 +4,10 @@
 
 The Master Stack is the end point of a Shader Graph that defines the final surface appearance of a shader. Your Shader Graph should always contain only one Master Stack.
 
-![image](images/MasterStack_Populated.png)
-
 The content of the Master Stack might change depending on the [Graph Settings](Graph-Settings-Tab.md) you select. The Master Stack is made up of Contexts, which contain [Block nodes](Block-Node.md).
 
-## Contexts
+![The Master Stack display, showing the Vertex and Fragment contexts populated with Block nodes.](images/MasterStack_Populated.png)
 
-![image](images/MasterStack_Empty.png)
+## Contexts
 
 The Master Stack contains two Contexts: Vertex and Fragment. These represent the two stages of a shader. Nodes that you connect to Blocks in the Vertex Context become part of the final shader's vertex function. Nodes that you connect to Blocks in the Fragment Context become part of the final shader's fragment (or pixel) function. If you connect any nodes to both Contexts, they are executed twice, once in the vertex function and then again in the fragment function. You can't cut, copy, or paste Contexts.
diff --git a/Packages/com.unity.shadergraph/Documentation~/Matrix-2x2-Node.md b/Packages/com.unity.shadergraph/Documentation~/Matrix-2x2-Node.md
index e796a580c14..b5fed26f801 100644
--- a/Packages/com.unity.shadergraph/Documentation~/Matrix-2x2-Node.md
+++ b/Packages/com.unity.shadergraph/Documentation~/Matrix-2x2-Node.md
@@ -6,15 +6,15 @@ Defines a constant **Matrix 2x2** value in the shader.
 
 ## Ports
 
-| Name        | Direction           | Type  | Binding | Description |
-|:------------ |:-------------|:-----|:---|:---|
-| Out | Output      |    Matrix 2 | None | Output value |
+| Name | Direction | Type | Binding | Description |
+|:--- |:---|:---|:---|:---|
+| Out | Output | Matrix 2 | None | Output value |
 
 ## Controls
 
-| Name        | Type           | Options  | Description |
-|:------------ |:-------------|:-----|:---|
-|  | Matrix 2x2 |  | Sets output value |
+| Control | Description |
+|:---|:---|
+| (Matrix 2x2) | Sets the matrix 2x2 output value. |
 
 ## Generated Code Example
 
diff --git a/Packages/com.unity.shadergraph/Documentation~/Matrix-3x3-Node.md b/Packages/com.unity.shadergraph/Documentation~/Matrix-3x3-Node.md
index 03284e6b3f4..071fd6ac21b 100644
--- a/Packages/com.unity.shadergraph/Documentation~/Matrix-3x3-Node.md
+++ b/Packages/com.unity.shadergraph/Documentation~/Matrix-3x3-Node.md
@@ -6,15 +6,15 @@ Defines a constant **Matrix 3x3** value in the shader.
 
 ## Ports
 
-| Name        | Direction           | Type  | Binding | Description |
-|:------------ |:-------------|:-----|:---|:---|
-| Out | Output      |    Matrix 3 | None | Output value |
+| Name | Direction | Type | Binding | Description |
+|:--- |:---|:---|:---|:---|
+| Out | Output | Matrix 3 | None | Output value |
 
 ## Controls
 
-| Name        | Type           | Options  | Description |
-|:------------ |:-------------|:-----|:---|
-|  | Matrix 3x3 |  | Sets output value |
+| Control | Description |
+|:---|:---|
+| (Matrix 3x3) | Sets the matrix 3x3 output value. |
 
 ## Generated Code Example
 
diff --git a/Packages/com.unity.shadergraph/Documentation~/Matrix-4x4-Node.md b/Packages/com.unity.shadergraph/Documentation~/Matrix-4x4-Node.md
index cd33295a17c..4d1ba1d3766 100644
--- a/Packages/com.unity.shadergraph/Documentation~/Matrix-4x4-Node.md
+++ b/Packages/com.unity.shadergraph/Documentation~/Matrix-4x4-Node.md
@@ -6,15 +6,15 @@ Defines a constant **Matrix 4x4** value in the shader.
 
 ## Ports
 
-| Name        | Direction           | Type  | Binding | Description |
-|:------------ |:-------------|:-----|:---|:---|
-| Out | Output      |    Matrix 4 | None | Output value |
+| Name | Direction | Type | Binding | Description |
+|:--- |:---|:---|:---|:---|
+| Out | Output | Matrix 4 | None | Output value |
 
 ## Controls
 
-| Name        | Type           | Options  | Description |
-|:------------ |:-------------|:-----|:---|
-|  | Matrix 4x4 |  | Sets output value |
+| Control | Description |
+|:---|:---|
+| (Matrix 4x4) | Sets the matrix 4x4 output value. |
 
 ## Generated Code Example
 
diff --git a/Packages/com.unity.shadergraph/Documentation~/Matrix-Construction-Node.md b/Packages/com.unity.shadergraph/Documentation~/Matrix-Construction-Node.md
index b7a639342e2..42b2e7403fe 100644
--- a/Packages/com.unity.shadergraph/Documentation~/Matrix-Construction-Node.md
+++ b/Packages/com.unity.shadergraph/Documentation~/Matrix-Construction-Node.md
@@ -15,21 +15,21 @@ For example, connecting **Vector 2** type values to inputs **M0** and **M1** wil
 
 ## Ports
 
-| Name        | Direction           | Type  | Description |
-|:------------ |:-------------|:-----|:---|
-| M0      | Input | Vector 4 | First row or column |
-| M1      | Input | Vector 4 | Second row or column |
-| M2      | Input | Vector 4 | Third row or column |
-| M3      | Input | Vector 4 | Fourth row or column |
-| 4x4 | Output      |    Matrix 4x4 | Output as Matrix 4x4 |
-| 3x3 | Output      |    Matrix 3x3 | Output as Matrix 3x3 |
-| 2x2 | Output      |    Matrix 2x2 | Output as Matrix 2x2 |
+| Name | Direction | Type | Description |
+|:--- |:---|:---|:---|
+| M0 | Input | Vector 4 | First row or column |
+| M1 | Input | Vector 4 | Second row or column |
+| M2 | Input | Vector 4 | Third row or column |
+| M3 | Input | Vector 4 | Fourth row or column |
+| 4x4 | Output | Matrix 4x4 | Output as Matrix 4x4 |
+| 3x3 | Output | Matrix 3x3 | Output as Matrix 3x3 |
+| 2x2 | Output | Matrix 2x2 | Output as Matrix 2x2 |
 
 ## Controls
 
-| Name        | Type           | Options  | Description |
-|:------------ |:-------------|:-----|:---|
-|      | Dropdown | Row, Column | Selects how the output matrix should be filled |
+| Control | Description |
+|:---|:---|
+| (Dropdown) | Selects how the output matrix should be filled. The options are:<ul><li>**Row**: Input vectors specify matrix rows from top to bottom.</li><li>**Column**: Input vectors specify matrix columns from left to right.</li></ul> |
 
 ## Generated Code Example
 
diff --git a/Packages/com.unity.shadergraph/Documentation~/Matrix-Split-Node.md b/Packages/com.unity.shadergraph/Documentation~/Matrix-Split-Node.md
index a0836b235d6..d0b82c8a50b 100644
--- a/Packages/com.unity.shadergraph/Documentation~/Matrix-Split-Node.md
+++ b/Packages/com.unity.shadergraph/Documentation~/Matrix-Split-Node.md
@@ -15,19 +15,19 @@ For example, connecting **Matrix 2x2** type to input **In** will return the corr
 
 ## Ports
 
-| Name        | Direction           | Type  | Description |
-|:------------ |:-------------|:-----|:---|
-| In      | Input | Dynamic Matrix | Input value |
-| M0 | Output      |    Dynamic Vector | First row or column |
-| M1 | Output      |    Dynamic Vector | Second row or column |
-| M2 | Output      |    Dynamic Vector | Third row or column |
-| M3 | Output      |    Dynamic Vector | Fourth row or column |
+| Name | Direction | Type | Description |
+|:--- |:---|:---|:---|
+| In | Input | Dynamic Matrix | Input value |
+| M0 | Output | Dynamic Vector | First row or column |
+| M1 | Output | Dynamic Vector | Second row or column |
+| M2 | Output | Dynamic Vector | Third row or column |
+| M3 | Output | Dynamic Vector | Fourth row or column |
 
 ## Controls
 
-| Name        | Type           | Options  | Description |
-|:------------ |:-------------|:-----|:---|
-|      | Dropdown | Row, Column | Selects how the output vectors should be filled |
+| Control | Description |
+|:---|:---|
+| (Dropdown) | Selects how the output vectors should be filled. The options are:<ul><li>**Row**: Output vectors are composed of matrix rows from top to bottom.</li><li>**Column**: Output vectors are composed of matrix columns from left to right.</li></ul> |
 
 ## Generated Code Example
 
diff --git a/Packages/com.unity.shadergraph/Documentation~/Port-Bindings.md b/Packages/com.unity.shadergraph/Documentation~/Port-Bindings.md
index c441a319273..7f48676d22f 100644
--- a/Packages/com.unity.shadergraph/Documentation~/Port-Bindings.md
+++ b/Packages/com.unity.shadergraph/Documentation~/Port-Bindings.md
@@ -8,15 +8,15 @@ In practice this means that if no [Edge](Edge.md) is connected to the [Port](Por
 
 ## Port Bindings List
 
-| Name        | Data Type | Options           | Description |
-|:------------|:----------|:------------------|:------------|
-| Bitangent | Vector 3 |  | Vertex or fragment bitangent, label describes expected transform space |
-| Color | Vector 4 |  |RGBA Color picker |
-| ColorRGB | Vector 3 |  | RGB Color picker |
-| Normal | Vector 3 |  | Vertex or fragment normal vector, label describes expected transform space |
-| Position | Vector 3 |  | Vertex or fragment position, label describes expected transform space |
-| Screen Position | Vector 4 |  | Default, Raw, Center, Tiled | Vertex or fragment position in screen space. Dropdown selects mode. See [Screen Position Node](Screen-Position-Node.md) for details |
-| Tangent | Vector 3 |  | Vertex or fragment tangent vector, label describes expected transform space |
-| UV | Vector 2 |  | UV0, UV1, UV2, UV3 | Mesh UV coordinates. Dropdown selects UV channel. |
-| Vertex Color | Vector 4 |  | RGBA vertex color value. |
-| View Direction | Vector 3 |  | Vertex or fragment view direction vector, label describes expected transform space |
+| Name | Data Type | Description |
+|:---|:---|:---|
+| Bitangent | Vector 3 | Vertex or fragment bitangent, label describes expected transform space |
+| Color | Vector 4 |RGBA Color picker |
+| ColorRGB | Vector 3 | RGB Color picker |
+| Normal | Vector 3 | Vertex or fragment normal vector, label describes expected transform space |
+| Position | Vector 3 | Vertex or fragment position, label describes expected transform space |
+| Screen Position | Vector 4 | Default, Raw, Center, Tiled | Vertex or fragment position in screen space. Dropdown selects mode. See [Screen Position Node](Screen-Position-Node.md) for details |
+| Tangent | Vector 3 | Vertex or fragment tangent vector, label describes expected transform space |
+| UV | Vector 2 | UV0, UV1, UV2, UV3 | Mesh UV coordinates. Dropdown selects UV channel. |
+| Vertex Color | Vector 4 | RGBA vertex color value. |
+| View Direction | Vector 3 | Vertex or fragment view direction vector, label describes expected transform space |
diff --git a/Packages/com.unity.shadergraph/Documentation~/Precision-Modes.md b/Packages/com.unity.shadergraph/Documentation~/Precision-Modes.md
index 88a30a7003c..50cc3676d9c 100644
--- a/Packages/com.unity.shadergraph/Documentation~/Precision-Modes.md
+++ b/Packages/com.unity.shadergraph/Documentation~/Precision-Modes.md
@@ -23,7 +23,7 @@ To visualize data precision in a graph, set the [**Color Mode**](Color-Modes.md)
 * **Half** nodes are red
 * **Switchable** nodes are Green.
 
-![](images/Color-Mode-Precision.png)
+![A graph showing nodes with different colors according to their data precision.](images/Color-Mode-Precision.png)
 
 ### Setting graph Precision
 To set the default precision for the entire graph to **Single** or **Half**, open the **Graph Settings** and set the Precision property. Newly-created nodes in a graph default to the **Inherit** precision mode, and inherit the graph's precision.
@@ -51,7 +51,7 @@ Simple inheritance refers to the inheritance behaviour of a node with only one p
 
 In the figure below, Node A has the **Inherit** mode. Because it has no incoming edge, it takes the **Graph Precision**, which is **Half**. Node B also has the **Inherit** mode, so it inherits the **Half** precision mode from Node A.
 
-![](images/precisionmodes1.png)
+![Diagram showing a simple precision inheritance.](images/precisionmodes1.png)
 
 #### Complex inheritance
 
@@ -61,7 +61,7 @@ A node reads precision settings from each input port. If you connect a node to s
 
 In the figure below, node D has the **Inherit** mode. It receives input from the adjacent edges via inputs 1 and 2. Node B passes the **Half** mode through input 1. Node C passes the **Single** mode through input 2. Because **Single** is 32-bit and **Half** only 16-bit, **Single** takes precedence, so Node D uses **Single** precision.
 
-![](images/precisionmodes2.png)
+![Diagram showing a complex precision inheritance.](images/precisionmodes2.png)
 
 #### Mixed inheritance
 
@@ -69,13 +69,13 @@ Mixed inheritance refers to the inheritance behaviour on a node with both simple
 
 Nodes with no input ports, such as [Input nodes](Input-Nodes.md), inherit the **Graph Precision**. However, complex inheritance rules still affect other nodes in the same group, as illustrated in the figure below.
 
-![](images/precisionmodes3.png)
+![Diagram showing a mixed precision inheritance.](images/precisionmodes3.png)
 
 ### Switchable precision
 
 The **Switchable** mode overrides **Half** mode but not **Single**.
 
-![](images/precisionmodes4.png)
+![Diagram showing precision inheritance with the Switchable mode.](images/precisionmodes4.png)
 
 
 ### Sub Graph precision
diff --git a/Packages/com.unity.shadergraph/Documentation~/Preview-Mode-Control.md b/Packages/com.unity.shadergraph/Documentation~/Preview-Mode-Control.md
index a84d8c4d489..bf896cfda4f 100644
--- a/Packages/com.unity.shadergraph/Documentation~/Preview-Mode-Control.md
+++ b/Packages/com.unity.shadergraph/Documentation~/Preview-Mode-Control.md
@@ -13,16 +13,16 @@ This mode control functionality also applies to Sub Graph previews. See [Graph S
 ## How to use
 
 For nodes:
+
 1. Add a node which includes a preview.
 2. Select the node.
 3. In the Graph Inspector or Node Settings, find the Preview control.
 4. Select an option.
 
-
 For SubGraphs:
+
 * Select a mode in the [Sub Graph](Sub-graph.md) [Graph Settings](Graph-Settings-Tab.md) menu.
 
-![](images/previewmodecontrol.png)
+## Additional resources
 
-Related
-[Preview node](Preview-Node.md)
+* [Preview node](Preview-Node.md)
diff --git a/Packages/com.unity.shadergraph/Documentation~/Rectangle-Node.md b/Packages/com.unity.shadergraph/Documentation~/Rectangle-Node.md
index 08ae33abe4d..b453bd94122 100644
--- a/Packages/com.unity.shadergraph/Documentation~/Rectangle-Node.md
+++ b/Packages/com.unity.shadergraph/Documentation~/Rectangle-Node.md
@@ -8,18 +8,18 @@ NOTE: This [Node](Node.md) can only be used in the **Fragment** [Shader Stage](S
 
 ## Ports
 
-| Name        | Direction           | Type  | Binding | Description |
-|:------------ |:-------------|:-----|:---|:---|
-| UV      | Input | Vector 2 | UV | Input UV value |
-| Width      | Input | Float    | None | Rectangle width |
-| Height      | Input | Float    | None | Rectangle height |
-| Out | Output      |    Float    | None | Output value |
+| Name | Direction | Type | Binding | Description |
+|:--- |:---|:---|:---|:---|
+| UV | Input | Vector 2 | UV | Input UV value |
+| Width | Input | Float | None | Rectangle width |
+| Height | Input | Float | None | Rectangle height |
+| Out | Output | Float | None | Output value |
 
 ## Controls
 
-| Name        | Type           | Options  | Description |
-|:------------ |:-------------|:-----|:---|
-|      | Dropdown | Fastest, Nicest | Robustness of computation |
+| Control | Description |
+|:---|:---|
+| (Dropdown) | Select the robustness of computation. The options are:<ul><li>**Fastest**</li><li>**Nicest**</li></ul> |
 
 ## Generated Code Example
 
diff --git a/Packages/com.unity.shadergraph/Documentation~/Refract-Node.md b/Packages/com.unity.shadergraph/Documentation~/Refract-Node.md
index 8cb41cadb4d..f39b0b57576 100644
--- a/Packages/com.unity.shadergraph/Documentation~/Refract-Node.md
+++ b/Packages/com.unity.shadergraph/Documentation~/Refract-Node.md
@@ -25,9 +25,9 @@ The Refract node uses the principles described in [Snell's Law](https://en.wikip
 
 ## Controls
 
-| Name        | Type           | Options  | Description |
-|:------------ |:-------------|:-----|:---|
-| Mode      | Dropdown | &#8226; **Safe:** Returns a null vector result instead of a NaN result at the point of critical angle refraction. <br/>&#8226; **CriticalAngle:** Avoids the **Safe** check for a potential NaN result. ||
+| Control | Description |
+|:---|:---|
+| **Mode** | Select a mode to handle results at the point of critical angle refraction. The options are: <ul><li>**Safe:** Returns a null vector result instead of a NaN result at the point of critical angle refraction.</li><li>**CriticalAngle:** Avoids the **Safe** check for a potential NaN result.</li></ul>|
 
 ## Generated Code Example
 
diff --git a/Packages/com.unity.shadergraph/Documentation~/Shader-Graph-Window.md b/Packages/com.unity.shadergraph/Documentation~/Shader-Graph-Window.md
index d49036d4740..c4f124860b7 100644
--- a/Packages/com.unity.shadergraph/Documentation~/Shader-Graph-Window.md
+++ b/Packages/com.unity.shadergraph/Documentation~/Shader-Graph-Window.md
@@ -21,18 +21,16 @@ To access the **Shader Graph Window**, you must first create a [Shader Graph Ass
 
 Use the **Shader Graph Window** toolbar to manage the shader graph asset, display elements in the window, and more.
 
-| Icon                | Item                | Description |
-|:--------------------|:--------------------|:------------|
-| ![Image](images/sg-save-icon.png) | **Save Asset**      | Save the graph to update the [Shader Graph Asset](index.md). |
-| ![Image](images/sg-dropdown-icon.png) | **Save As**         | Save the [Shader Graph Asset](index.md) under a new name. |
-| | **Show In Project** | Highlight the [Shader Graph Asset](index.md) in the [Project Window](https://docs.unity3d.com/Manual/ProjectView.html). |
-| | **Check Out**       | If version control is enabled, check out the [Shader Graph Asset](index.md) from the source control provider. |
-| ![Image](images/sg-color-mode-selector.png) | **Color Mode Selector**      | Select a [Color Mode](Color-Modes.md) for the graph. |
-| ![Image](images/sg-blackboard-icon.png) | **Blackboard**      | Toggle the visibility of the [Blackboard](Blackboard.md). |
-| ![Image](images/sg-graph-inspector-icon.png) | **Graph Inspector** | Toggle the visibility of the [Graph Inspector](Internal-Inspector.md). |
-| ![Image](images/sg-main-preview-icon.png) | **Main Preview**    | Toggle the visibility of the [Main Preview](Main-Preview.md). |
-| ![Image](images/sg-help_icon.png) | **Help**     | Open the Shader Graph documentation in the browser. |
-| ![Image](images/sg-dropdown-icon.png) | **Resources** | Contains links to Shader Graph resources (like samples and User forums). |
+| Icon | Item                | Description |
+|:---|:---|:---|
+| ![The Save Asset icon](images/sg-save-icon.png) | **Save Asset** | Save the graph to update the [Shader Graph Asset](index.md). |
+| ![The asset file management icon](images/sg-dropdown-icon.png) | **Asset file management** | Use additional options to manage the graph asset file. The options are:<ul><li>**Save As**: Save the [Shader Graph Asset](index.md) under a new name.</li><li>**Show In Project**: Highlight the [Shader Graph Asset](index.md) in the [Project Window](https://docs.unity3d.com/Manual/ProjectView.html).</li><li>**Check Out**: If version control is enabled, check out the [Shader Graph Asset](index.md) from the source control provider.</li></ul> |
+| ![The Color Mode Selector icon](images/sg-color-mode-selector.png) | **Color Mode Selector**      | Select a [Color Mode](Color-Modes.md) for the graph. |
+| ![The Blackboard icon](images/sg-blackboard-icon.png) | **Blackboard**      | Toggle the visibility of the [Blackboard](Blackboard.md). |
+| ![The Graph Inspector icon](images/sg-graph-inspector-icon.png) | **Graph Inspector** | Toggle the visibility of the [Graph Inspector](Internal-Inspector.md). |
+| ![The Main Preview icon](images/sg-main-preview-icon.png) | **Main Preview**    | Toggle the visibility of the [Main Preview](Main-Preview.md). |
+| ![The Help icon](images/sg-help_icon.png) | **Help**     | Open the Shader Graph documentation in the browser. |
+| ![The Resources icon](images/sg-dropdown-icon.png) | **Resources** | Contains links to Shader Graph resources (like samples and User forums). |
 
 ## Workspace
 
diff --git a/Packages/com.unity.shadergraph/Documentation~/ShaderGraph-Samples.md b/Packages/com.unity.shadergraph/Documentation~/ShaderGraph-Samples.md
index 430755a769c..7dc00155b2d 100644
--- a/Packages/com.unity.shadergraph/Documentation~/ShaderGraph-Samples.md
+++ b/Packages/com.unity.shadergraph/Documentation~/ShaderGraph-Samples.md
@@ -22,41 +22,41 @@ The following samples are currently available for Shader Graph.
 
 | Procedural Patterns |
 |:--------------------|
-|![](images/Patterns_Page.png) |
+|![A visual overview of Procedural Patterns](images/Patterns_Page.png) |
 | This collection of Assets showcases various procedural techniques possible with Shader Graph. Use them directly in your Project, or edit them to create other procedural patterns. The patterns in this collection are: Bacteria, Brick, Dots, Grid, Herringbone, Hex Lattice, Houndstooth, Smooth Wave, Spiral, Stripes, Truchet, Whirl, Zig Zag. |
 
 
 | Node Reference |
 |:--------------------|
-|![](images/NodeReferenceSamples.png) |
+|![A visual overview of Node Reference](images/NodeReferenceSamples.png) |
 | This set of Shader Graph assets provides reference material for the nodes available in the Shader Graph node library. Each graph contains a description for a specific node, examples of how it can be used, and useful tips. Some example assets also show a break-down of the math that the node is doing. You can use these samples along with the documentation to learn more about the behavior of individual nodes. |
 
 | [Feature Examples](Shader-Graph-Sample-Feature-Examples.md) |
 |:--------------------|
-|![](images/FeatureExamplesSample.png) |
+|![A visual overview of Feature Examples](images/FeatureExamplesSample.png) |
 | This is a collection of over 30 Shader Graph files.  Each file demonstrates a specific shader technique such as angle blending, triplanar projection, parallax mapping, and custom lighting. While you won’t use these shaders directly in your project, you can use them to quickly learn and understand the various techniques, and recreate them into your own work. Each file contains notes that describe what the shader is doing, and most of the shaders are set up with the core functionality contained in a subgraph that’s easy to copy and paste directly into your own shader. The sample also has extensive documentation describing each of the samples to help you learn.
 
 | [Production Ready Shaders](Shader-Graph-Sample-Production-Ready.md) |
 |:--------------------|
-|![](images/ProductionReadySample.png) |
+|![A visual example of Production Ready Shaders](images/ProductionReadySample.png) |
 | The Shader Graph Production Ready Shaders sample is a collection of Shader Graph shader assets that are ready to be used out of the box or modified to suit your needs.  You can take them apart and learn from them, or just drop them directly into your project and use them as they are. The sample includes the Shader Graph versions of the HDRP and URP Lit shaders. It also includes a step-by-step tutorial for how to combine several of the shaders to create a forest stream environment.
 
 | [UGUI Shaders](Shader-Graph-Sample-UGUI-Shaders.md) |
 |:--------------------|
-|![](images/UIToolsSample.png) |
+|![A visual example of UGUI Shaders](images/UIToolsSample.png) |
 | The Shader Graph UGUI Shaders sample is a collection of Shader Graph subgraphs that you can use to build user interface elements. They speed up the process of building widgets, buttons, and backgrounds for the user interface of your project.  With these tools, you can build dynamic, procedural UI elements that don’t require any texture memory and scale correctly for any resolution screen. In addition to the subgraphs, the sample also includes example buttons, indicators, and backgrounds built with the subgraphs.  The examples show how the subgraphs function in context and help you learn how to use them.
 
 | Custom Material Property Drawers |
 |:--------------------|
-|![](images/CustomMaterialPropertySample.png) |
+|![An example result of Custom Material Property Drawers in a material's Inspector](images/CustomMaterialPropertySample.png) |
 | This sample contains an example of a Custom Material Property Drawer that allows using a Min/Max Slider to control a Vector2 x and y values, often used for range remapping. It comes with a documented Shader Graph example. |
 
 | [Custom Lighting](Shader-Graph-Sample-Custom-Lighting.md) |
 |:--------------------|
-|![](images/CustomLightingSample.png) |
+|![A visual example of Custom Lighting](images/CustomLightingSample.png) |
 | The Shader Graph Custom Lighting sample shows how you can create your own custom lighting model in Shader Graph and provides dozens of example templates, shaders, and subgraphs to help you get started with your own custom lighting.
 
 | [Terrain Shaders](Shader-Graph-Sample-Terrain-Shaders.md) |
 |:--------------------|
-|![](images/TerrainSample.png) |
+|![A visual overview of Terrain Shaders](images/TerrainSample.png) |
 | The Shader Graph Terrain Sample provides example shaders to learn from and subgraphs that you can use to build your own terrain shaders. Custom terrain shaders can use more advanced features like hexagon tile break-up, parallax occlusion mapping, or triplanar projection. Or you can use techniques like array texture sampling or alternate texture packing methods to make the shader cheaper to render than the default one. Whether you're making faster or more advanced terrain shaders, this sample will help you get the results you're looking for. |
diff --git a/Packages/com.unity.shadergraph/Documentation~/Slider-Node.md b/Packages/com.unity.shadergraph/Documentation~/Slider-Node.md
index 593c76aebad..7cd0030551c 100644
--- a/Packages/com.unity.shadergraph/Documentation~/Slider-Node.md
+++ b/Packages/com.unity.shadergraph/Documentation~/Slider-Node.md
@@ -6,17 +6,17 @@ Defines a constant **Float** value in the shader using a **Slider** field. Can b
 
 ## Ports
 
-| Name        | Direction           | Type  | Binding | Description |
-|:------------ |:-------------|:-----|:---|:---|
-| Out | Output      |    Float    | None | Output value |
+| Name | Direction | Type | Binding | Description |
+|:--- |:---|:---|:---|:---|
+| Out | Output | Float | None | Output value |
 
 ## Controls
 
-| Name        | Type           | Options  | Description |
-|:------------ |:-------------|:-----|:---|
-|       | Slider |  | Defines the output value. |
-| Min   | Float    |  | Defines the slider parameter's minimum value. |
-| Max   | Float    |  | Defines the slider parameter's maximum value. |
+| Name | Type | Options | Description |
+|:--- |:---|:---|:---|
+| | Slider | | Defines the output value. |
+| Min | Float | | Defines the slider parameter's minimum value. |
+| Max | Float | | Defines the slider parameter's maximum value. |
 
 ## Generated Code Example
 
diff --git a/Packages/com.unity.shadergraph/Documentation~/Split-Texture-Transform-Node.md b/Packages/com.unity.shadergraph/Documentation~/Split-Texture-Transform-Node.md
index e63a7294c5c..6a619f89c58 100644
--- a/Packages/com.unity.shadergraph/Documentation~/Split-Texture-Transform-Node.md
+++ b/Packages/com.unity.shadergraph/Documentation~/Split-Texture-Transform-Node.md
@@ -7,7 +7,7 @@ This node outputs the texture with its tiling set to (0,0) and scale set to (1,1
 
 Another term you may hear for tiling in this context is scale. Both terms refer to the size of the texture tiles.
 
-![](images/node-splittexturetransform.png)
+![The Split Texture Transform node](images/node-splittexturetransform.png)
 
 ### Ports
 
diff --git a/Packages/com.unity.shadergraph/Documentation~/Sticky-Notes.md b/Packages/com.unity.shadergraph/Documentation~/Sticky-Notes.md
index bb391f76915..ab0f3ffb3f2 100644
--- a/Packages/com.unity.shadergraph/Documentation~/Sticky-Notes.md
+++ b/Packages/com.unity.shadergraph/Documentation~/Sticky-Notes.md
@@ -13,8 +13,6 @@ To create a Sticky Note, right-click an empty space in the graph view and, in th
 * **Title**: The text area at the top of the Sticky Note is the title. You can use it to concisely describe what information the Sticky Note contains.
 * **Body**: The larger text area below the title area is the body. You can write the full contents of the note here.
 
-![](images/StickyNote.png)
-
 ### Editing text
 
 To edit text on a Sticky Note, double-click on a text area. This also selects the entire text area, so be sure to move the cursor before you edit the text.
diff --git a/Packages/com.unity.shadergraph/Documentation~/TableOfContents.md b/Packages/com.unity.shadergraph/Documentation~/TableOfContents.md
index 819d2079080..0d7951780ae 100644
--- a/Packages/com.unity.shadergraph/Documentation~/TableOfContents.md
+++ b/Packages/com.unity.shadergraph/Documentation~/TableOfContents.md
@@ -121,7 +121,7 @@
             * [Gradient](Gradient-Node.md)
             * [Sample Gradient](Sample-Gradient-Node.md)
         * High Definition Render Pipeline
-            * [Custom Color Buffer](HD-Custom-Color-Node.md)
+            * [Custom Color Buffer](Custom-Color-Buffer-Node.md)
             * [Custom Depth Buffer](HD-Custom-Depth-Node.md)
             * [Diffusion Profile](Diffusion-Profile-Node.md)
             * [Exposure](Exposure-Node.md)
diff --git a/Packages/com.unity.shadergraph/Documentation~/Texture-2D-Array-Asset-Node.md b/Packages/com.unity.shadergraph/Documentation~/Texture-2D-Array-Asset-Node.md
index 37120cce91a..b9eda3a25ff 100644
--- a/Packages/com.unity.shadergraph/Documentation~/Texture-2D-Array-Asset-Node.md
+++ b/Packages/com.unity.shadergraph/Documentation~/Texture-2D-Array-Asset-Node.md
@@ -6,15 +6,15 @@ Defines a constant **Texture 2D Array Asset** for use in the shader. To sample t
 
 ## Ports
 
-| Name        | Direction           | Type  | Description |
-|:------------ |:-------------|:-----|:---|
-| Out | Output      |    Texture 2D Array | Output value |
+| Name | Direction | Type | Description |
+|:--- |:---|:---|:---|
+| Out | Output | Texture 2D Array | Output value |
 
 ## Controls
 
-| Name        | Type           | Options  | Description |
-|:------------ |:-------------|:-----|:---|
-|      | Object Field (Texture 2D Array) |  | Defines the texture 2D array asset from the project. |
+| Control | Description |
+|:--- |:---|
+| (Texture 2D Array) | Defines the texture 2D array asset from the project. |
 
 ## Generated Code Example
 
diff --git a/Packages/com.unity.shadergraph/Documentation~/Texture-2D-Asset-Node.md b/Packages/com.unity.shadergraph/Documentation~/Texture-2D-Asset-Node.md
index 76f924e8b40..8868ed3c05b 100644
--- a/Packages/com.unity.shadergraph/Documentation~/Texture-2D-Asset-Node.md
+++ b/Packages/com.unity.shadergraph/Documentation~/Texture-2D-Asset-Node.md
@@ -6,15 +6,15 @@ Defines a constant **Texture 2D Asset** for use in the shader. To sample the **T
 
 ## Ports
 
-| Name        | Direction           | Type  | Description |
-|:------------ |:-------------|:-----|:---|
-| Out | Output      |    Texture 2D | Output value |
+| Name | Direction | Type | Description |
+|:--- |:---|:---|:---|
+| Out | Output | Texture 2D | Output value |
 
 ## Controls
 
-| Name        | Type           | Options  | Description |
-|:------------ |:-------------|:-----|:---|
-|      | Object Field (Texture) |  | Defines the texture 3D asset from the project. |
+| Control |  Description |
+|:--- |:---|
+| (Texture) | Defines the texture 3D asset from the project. |
 
 ## Generated Code Example
 
diff --git a/Packages/com.unity.shadergraph/Documentation~/Texture-3D-Asset-Node.md b/Packages/com.unity.shadergraph/Documentation~/Texture-3D-Asset-Node.md
index 82bbddd03b9..efa5a10b0b7 100644
--- a/Packages/com.unity.shadergraph/Documentation~/Texture-3D-Asset-Node.md
+++ b/Packages/com.unity.shadergraph/Documentation~/Texture-3D-Asset-Node.md
@@ -6,15 +6,15 @@ Defines a constant **Texture 3D Asset** for use in the shader. To sample the **T
 
 ## Ports
 
-| Name        | Direction           | Type  | Description |
-|:------------ |:-------------|:-----|:---|
-| Out | Output      |    Texture 3D | Output value |
+| Name | Direction | Type | Description |
+|:--- |:---|:---|:---|
+| Out | Output | Texture 3D | Output value |
 
 ## Controls
 
-| Name        | Type           | Options  | Description |
-|:------------ |:-------------|:-----|:---|
-|      | Object Field (Texture 3D) |  | Defines the texture 3D asset from the project. |
+| Control | Description |
+|:--- |:---|
+| (Texture 3D) | Defines the texture 3D asset from the project. |
 
 ## Generated Code Example
 
diff --git a/Packages/com.unity.shadergraph/Documentation~/ThreadMapDetail-Node.md b/Packages/com.unity.shadergraph/Documentation~/ThreadMapDetail-Node.md
index 2594ce32ebf..c765cd3af94 100644
--- a/Packages/com.unity.shadergraph/Documentation~/ThreadMapDetail-Node.md
+++ b/Packages/com.unity.shadergraph/Documentation~/ThreadMapDetail-Node.md
@@ -26,131 +26,30 @@ The ThreadMapDetail node is under the **Utility** &gt; **High Definition Render
 
 [!include[nodes-inputs](./snippets/nodes-inputs.md)]
 
-<table>
-    <thead>
-        <tr>
-            <th><strong>Name</strong></th>
-            <th><strong>Type</strong></th>
-            <th><strong>Binding</strong></th>
-            <th><strong>Description</strong></th>
-         </tr>
-    </thead>
-    <tbody>
-        <tr>
-            <td><strong>Use Thread Map</strong></td>
-            <td>Boolean</td>
-            <td>None</td>
-            <td>Use the port's default input to enable or disable the ThreadMapDetail node. You can also connect a node that outputs a Boolean to choose when to enable or disable the thread map.</td>
-        </tr>
-        <tr>
-            <td><strong>ThreadMap</strong></td>
-            <td>Texture 2D</td>
-            <td>None</td>
-            <td>The texture that contains the detailed information of a fabric's thread pattern. The texture should contain 4 channels:
-                <ul>
-                    <li>R - The ambient occlusion</li>
-                    <li>G - The normal Y-axis</li>
-                    <li>B - The smoothness</li>
-                    <li>A - The normal X-axis</li>
-                </ul>
-            </td>
-        </tr>
-        <tr>
-            <td><strong>UV</strong></td>
-            <td>Vector 2</td>
-            <td>UV</td>
-            <td>The UV coordinates the ThreadMapDetail node should use to map the ThreadMap texture on the geometry.</td>
-        </tr>
-        <tr>
-            <td><strong>Normals</strong></td>
-            <td>Vector 3</td>
-            <td>None</td>
-            <td>The base normal map that you want your Shader Graph to apply to the geometry before it applies the thread map.</td>
-    </tr>
-    <tr>
-        <td><strong>Smoothness</strong></td>
-        <td>Float</td>
-        <td>None</td>
-        <td>The base smoothness value that you want your Shader Graph to apply to the geometry before it applies the thread map.</td>
-    </tr>
-    <tr>
-<td><strong>Alpha</strong></td>
-<td>Float</td>
-<td>None</td>
-<td>The base alpha value that you want your Shader Graph to apply to the geometry before it applies the thread map.</td>
-</tr>
-<tr>
-<td><strong>Ambient Occlusion</strong></td>
-<td>Float</td>
-<td>None</td>
-<td>The base ambient occlusion value that you want your Shader Graph to apply to the geometry before it applies the thread map.</td>
-</tr>
-<tr>
-<td><strong>Thread AO Strength</strong></td>
-<td>Float</td>
-<td>None</td>
-<td>Specify a value of <code>0</code> or <code>1</code> to determine how the <strong>ThreadMap</strong>'s ambient occlusion should impact the final shader result:
-<ul>
-<li>If you provide a value of <code>0</code>, the <strong>ThreadMap</strong>'s ambient occlusion has no effect on the final output of the shader.</li>
-<li>If you provide a value of <code>1</code>, Shader Graph multiplies your base <strong>Ambient Occlusion</strong> value by the ambient occlusion value specified in your <strong>ThreadMap</strong> to determine the final output of the shader.</li></ul></td>
-</tr>
-<tr>
-<td><strong>Thread Normal Strength</strong></td>
-<td>Float</td>
-<td>None</td>
-<td>Specify a value of <code>0</code> or <code>1</code> to determine how the <strong>ThreadMap</strong>'s normal should impact the final shader result:
-<ul>
-<li>If you provide a value of <code>0</code>, the <strong>ThreadMap</strong>'s normal has no effect on the final output of the shader.</li>
-<li>If you provide a value of <code>1</code>, Shader Graph blends the values from your base <strong>Normals</strong> with the normal specified in your <strong>ThreadMap</strong> to determine the final output of the shader.</li></ul></td>
-</tr>
-<tr>
-<td><strong>Thread Smoothness Strength</strong></td>
-<td>Float</td>
-<td>None</td>
-<td>Specify a value of <code>0</code> or <code>1</code> to determine how the <strong>ThreadMap</strong>'s smoothness should impact the final shader result:
-<ul>
-<li>If you provide a value of <code>0</code>, the <strong>ThreadMap</strong>'s smoothness value has no effect on the final output of the shader.</li>
-<li>If you provide a value of <code>1</code>, Shader Graph adds the smoothness value specified in your <strong>ThreadMap</strong> to your base <strong>Smoothness</strong> value to determine the final output of the shader. For this calculation, Shader Graph remaps the value of your <strong>ThreadMap</strong>'s smoothness from (0,1) to (-1, 1).</li></ul></td>
-</tr>
-</tbody>
-</table>
+| **Name** | **Type** | **Binding** | **Description** |
+| :--- | :--- | :--- | :--- |
+| **Use Thread Map** | Boolean | None | Use the port's default input to enable or disable the ThreadMapDetail node. You can also connect a node that outputs a Boolean to choose when to enable or disable the thread map. |
+| **ThreadMap** | Texture 2D | None | The texture that contains the detailed information of a fabric's thread pattern. The texture should contain 4 channels:<ul><li>R - The ambient occlusion</li><li>G - The normal Y-axis</li><li>B - The smoothness</li><li>A - The normal X-axis |
+| **UV** | Vector 2 | UV  | The UV coordinates the ThreadMapDetail node should use to map the ThreadMap texture on the geometry. |
+| **Normals** | Vector 3 | None | The base normal map that you want your Shader Graph to apply to the geometry before it applies the thread map. |
+| **Smoothness** | Float | None | The base smoothness value that you want your Shader Graph to apply to the geometry before it applies the thread map. |
+| **Alpha** | Float | None | The base alpha value that you want your Shader Graph to apply to the geometry before it applies the thread map. |
+| **Ambient Occlusion** | Float | None | The base ambient occlusion value that you want your Shader Graph to apply to the geometry before it applies the thread map. |
+| **Thread AO Strength** | Float | None | Specify a value of `0` or `1` to determine how the **ThreadMap**'s ambient occlusion should impact the final shader result:<ul><li>If you provide a value of `0`, the **ThreadMap**'s ambient occlusion has no effect on the final output of the shader.</li><li>If you provide a value of `1`, Shader Graph multiplies your base **Ambient Occlusion** value by the ambient occlusion value specified in your **ThreadMap** to determine the final output of the shader.</li></ul> |
+| **Thread Normal Strength** | Float | None | Specify a value of `0` or `1` to determine how the **ThreadMap**'s normal should impact the final shader result:<ul><li>If you provide a value of `0`, the **ThreadMap**'s normal has no effect on the final output of the shader.</li><li>If you provide a value of `1`, Shader Graph blends the values from your base **Normals** with the normal specified in your **ThreadMap** to determine the final output of the shader.</li></ul> |
+| **Thread Smoothness Strength** | Float | None | Specify a value of `0` or `1` to determine how the **ThreadMap**'s smoothness should impact the final shader result:<ul><li>If you provide a value of `0`, the **ThreadMap**'s smoothness value has no effect on the final output of the shader.</li><li>If you provide a value of `1`, Shader Graph adds the smoothness value specified in your **ThreadMap** to your base **Smoothness** value to determine the final output of the shader. For this calculation, Shader Graph remaps the value of your **ThreadMap**'s smoothness from (0,1) to (-1, 1).</li></ul> |
+
 
 ## Outputs
 
 [!include[nodes-outputs](./snippets/nodes-outputs.md)]
 
-<table>
-<thead>
-<tr>
-<th><strong>Name</strong></th>
-<th><strong>Type</strong></th>
-<th><strong>Description</strong></th>
-</tr>
-</thead>
-<tbody>
-<tr>
-<td><strong>Normal</strong></td>
-<td>Vector 3</td>
-<td>The final normal output of the thread map.</td>
-</tr>
-<tr>
-<td><strong>Smoothness</strong></td>
-<td>Float</td>
-<td>The final smoothness output of the thread map.</td>
-</tr>
-<tr>
-<td><strong>Ambient Occlusion</strong></td>
-<td>Float</td>
-<td>The final ambient occlusion output of the thread map.</td>
-</tr>
-<tr>
-<td><strong>Alpha</strong></td>
-<td>Float</td>
-<td>The final alpha output of the thread map. Shader Graph calculates this alpha value by multiplying the input <strong>Alpha</strong> value by the <strong>Thread AO Strength</strong> value.</td>
-</tr>
-</tbody>
-</table>
-
+| **Name** | **Type** | **Description** |
+| :--- | :--- | :--- |
+| **Normal** | Vector 3 | The final normal output of the thread map. |
+| **Smoothness** | Float | The final smoothness output of the thread map. |
+| **Ambient Occlusion** | Float | The final ambient occlusion output of the thread map. |
+| **Alpha** | Float | The final alpha output of the thread map. Shader Graph calculates this alpha value by multiplying the input **Alpha** value by the **Thread AO Strength** value. |
 
 ## Example graph usage
 
diff --git a/Packages/com.unity.shadergraph/Documentation~/Transformation-Matrix-Node.md b/Packages/com.unity.shadergraph/Documentation~/Transformation-Matrix-Node.md
index ee997ec2e0c..6031cfed947 100644
--- a/Packages/com.unity.shadergraph/Documentation~/Transformation-Matrix-Node.md
+++ b/Packages/com.unity.shadergraph/Documentation~/Transformation-Matrix-Node.md
@@ -9,15 +9,15 @@ Two output value options for this node, **Inverse Projection** and **Inverse Vie
 
 ## Ports
 
-| Name        | Direction           | Type  | Binding | Description |
-|:------------ |:-------------|:-----|:---|:---|
-| Out | Output      |    Matrix 4 | None | Output value |
+| Name | Direction | Type | Binding | Description |
+|:--- |:---|:---|:---|:---|
+| Out | Output | Matrix 4 | None | Output value |
 
 ## Controls
 
-| Name        | Type           | Options  | Description |
-|:------------ |:-------------|:-----|:---|
-|  | Dropdown | Model, InverseModel, View, InverseView, Projection, InverseProjection, ViewProjection, InverseViewProjection | Sets output value |
+| Control | Description |
+|:--- |:---|
+| (Dropdown) | Sets the output value. The options are: <ul><li>**Model**</li><li>**InverseModel**</li><li>**View**</li><li>**InverseView**</li><li>**Projection**</li><li>**InverseProjection**</li><li>**ViewProjection**</li><li>**InverseViewProjection**</li></ul> |
 
 ## Generated Code Example
 
diff --git a/Packages/com.unity.shadergraph/Documentation~/UVCombine-Node.md b/Packages/com.unity.shadergraph/Documentation~/UVCombine-Node.md
index 2765c04641e..0382d1ecc90 100644
--- a/Packages/com.unity.shadergraph/Documentation~/UVCombine-Node.md
+++ b/Packages/com.unity.shadergraph/Documentation~/UVCombine-Node.md
@@ -22,63 +22,18 @@ The UVCombine node is under the **Utility** &gt; **High Definition Render Pipeli
 
 [!include[nodes-inputs](./snippets/nodes-inputs.md)]
 
-<table>
-<thead>
-<tr>
-<th><strong>Name</strong></th>
-<th><strong>Type</strong></th>
-<th><strong>Description</strong></th>
-</tr>
-</thead>
-<tbody>
-<tr>
-<td><strong>UV Channel Mask</strong></td>
-<td>Vector 4</td>
-<td>Select which UV channel you want to use for your UV coordinates by entering a <code>1</code> in the corresponding default input on the port:
-<ul>
-<li><strong>X</strong>: UV channel 0</li>
-<li><strong>Y</strong>: UV channel 1</li>
-<li><strong>Z</strong>: UV channel 2</li>
-<li><strong>W</strong>: UV channel 3</li>
-</ul>
-Set all other default inputs to <code>0</code>. You can also connect a node that outputs a Vector 4.</td>
-</tr>
-<tr>
-<td><strong>UV Tile and Offset</strong></td>
-<td>Vector 4</td>
-<td>Use the port's default input to specify the amount of offset or tiling that you want to apply to your shader's UV coordinates:
-<ul>
-<li>Use <strong>X</strong> and <strong>Y</strong> to specify the tiling.</li>
-<li>Use <strong>W</strong> and <strong>Z</strong> to specify the offset.</li>
-</ul>
-You can also connect a node that outputs a Vector 4.</td>
-</tr>
-</tbody>
-</table>
-
+| **Name** | **Type** | **Description** |
+| :--- | :--- | :--- |
+| **UV Channel Mask** | Vector 4 | Select which UV channel you want to use for your UV coordinates by entering a `1` in the corresponding default input on the port:<ul><li>**X**: UV channel 0</li><li>**Y**: UV channel 1</li><li>**Z**: UV channel 2</li><li>**W**: UV channel 3</li></ul>Set all other default inputs to `0`. You can also connect a node that outputs a Vector 4. |
+| **UV Tile and Offset** | Vector 4 | Use the port's default input to specify the amount of offset or tiling that you want to apply to your shader's UV coordinates:<ul><li>Use **X** and **Y** to specify the tiling.</li><li>Use **W** and **Z** to specify the offset.</li></ul>You can also connect a node that outputs a Vector 4. |
 
 ## Outputs
 
 [!include[nodes-single-output](./snippets/nodes-single-output.md)] <!-- SINGLE OUTPUT PORT INCLUDE -->
 
-<table>
-<thead>
-<tr>
-<th><strong>Name</strong></th>
-<th><strong>Type</strong></th>
-<th><strong>Binding</strong></th>
-<th><strong>Description</strong></th>
-</tr>
-</thead>
-<tbody>
-<tr>
-<td><strong>UV</strong></td>
-<td>Vector 2</td>
-<td>UV</td>
-<td>The final UV output, after selecting a UV channel and, if specified, any tiling or offset.</td>
-</tr>
-</tbody>
-</table>
+| **Name** | **Type** | **Binding** | **Description** |
+| :--- | :--- | :--- | :--- |
+| **UV** | Vector 2 | UV  | The final UV output, after selecting a UV channel and, if specified, any tiling or offset. |
 
 ## Example graph usage
 
diff --git a/Packages/com.unity.shadergraph/Documentation~/Upgrade-Guide-10-0-x.md b/Packages/com.unity.shadergraph/Documentation~/Upgrade-Guide-10-0-x.md
index 279ad68de72..58970b742a8 100644
--- a/Packages/com.unity.shadergraph/Documentation~/Upgrade-Guide-10-0-x.md
+++ b/Packages/com.unity.shadergraph/Documentation~/Upgrade-Guide-10-0-x.md
@@ -47,7 +47,7 @@ In HDRP, settings from the PBR and Unlit Master Nodes are not the same as the HD
 
 Previously, you could right-click the Master Node to bring up a context menu, and select **View Generated Shader** to preview the generated shader. In 10.0, you must now use the Unity Inspector, and click the **View Generated Shader** button on the Shader Graph asset.
 
-![image](images/GeneratedShaderButton.png)
+![The Inspector window showing the View Generated Shader button among other options.](images/GeneratedShaderButton.png)
 
 ## Settings in Graph Inspector
 
@@ -89,14 +89,14 @@ Previously, some nodes and properties such as the [Color Node](Color-Node.md) di
 
 For deprecated nodes, **(Deprecated)** appears after the node title in the main graph view.
 
-![image](images/DeprecatedColorNode.png)
+![The deprecated Color node, as an example.](images/DeprecatedColorNode.png)
 
 For deprecated properties, **(Deprecated)** appears after the property name in the [Blackboard](Blackboard.md).
 
-![image](images/DeprecatedColorProperty.png)
+![The deprecated Color property in the blackboard, as an example.](images/DeprecatedColorProperty.png)
 
-When you select a deprecated node or property, a warning appears in the [Internal Inspector](Internal-Inspector.md) along with an **Update** button that allows you to upgrade the selection. You can use undo/redo to reverse this upgrade process.
+When you select a deprecated node or property, a warning appears in the [Graph Inspector](Internal-Inspector.md) along with an **Update** button that allows you to upgrade the selection. You can use undo/redo to reverse this upgrade process.
 
-![image](images/DeprecatedWarning.png)
+![The deprecation message as it appears in the Graph Inspector.](images/DeprecatedWarning.png)
 
 If you enable **Allow Deprecated Behaviors** in [Shader Graph Preferences](Shader-Graph-Preferences.md), Shader Graph displays the version of the deprecated node or property, and doesn't display any warnings even though the **Update** button appears. You can also use the Blackboard or Searcher to create deprecated nodes and properties.
diff --git a/Packages/com.unity.shadergraph/Documentation~/filter.yml b/Packages/com.unity.shadergraph/Documentation~/filter.yml
index 3ac4bbb0de0..a5a6ad3bd4b 100644
--- a/Packages/com.unity.shadergraph/Documentation~/filter.yml
+++ b/Packages/com.unity.shadergraph/Documentation~/filter.yml
@@ -2,3 +2,6 @@ apiRules:
   - exclude:
       uidRegex: ^UnityEditor\.ShaderGraph\.Internal\.UVChannel$
       type: Enum
+  - exclude:
+      uidRegex: ^UnityEditor\.ShaderGraph\.Internal\.PropertyType$
+      type: Enum
\ No newline at end of file
diff --git a/Packages/com.unity.shadergraph/Documentation~/images/Active-Inactive-Blocks.PNG b/Packages/com.unity.shadergraph/Documentation~/images/Active-Inactive-Blocks.png
similarity index 100%
rename from Packages/com.unity.shadergraph/Documentation~/images/Active-Inactive-Blocks.PNG
rename to Packages/com.unity.shadergraph/Documentation~/images/Active-Inactive-Blocks.png
diff --git a/Packages/com.unity.shadergraph/Documentation~/images/MasterStack_Empty.png b/Packages/com.unity.shadergraph/Documentation~/images/MasterStack_Empty.png
deleted file mode 100644
index 499a568793b..00000000000
Binary files a/Packages/com.unity.shadergraph/Documentation~/images/MasterStack_Empty.png and /dev/null differ
diff --git a/Packages/com.unity.shadergraph/Documentation~/images/ParallaxMappingNodeThumb.PNG b/Packages/com.unity.shadergraph/Documentation~/images/ParallaxMappingNodeThumb.png
similarity index 100%
rename from Packages/com.unity.shadergraph/Documentation~/images/ParallaxMappingNodeThumb.PNG
rename to Packages/com.unity.shadergraph/Documentation~/images/ParallaxMappingNodeThumb.png
diff --git a/Packages/com.unity.shadergraph/Documentation~/images/ParallaxOcclusionMappingNodeThumb.PNG b/Packages/com.unity.shadergraph/Documentation~/images/ParallaxOcclusionMappingNodeThumb.png
similarity index 100%
rename from Packages/com.unity.shadergraph/Documentation~/images/ParallaxOcclusionMappingNodeThumb.PNG
rename to Packages/com.unity.shadergraph/Documentation~/images/ParallaxOcclusionMappingNodeThumb.png
diff --git a/Packages/com.unity.shadergraph/Documentation~/images/StickyNote.png b/Packages/com.unity.shadergraph/Documentation~/images/StickyNote.png
deleted file mode 100644
index 6a875d27f3b..00000000000
Binary files a/Packages/com.unity.shadergraph/Documentation~/images/StickyNote.png and /dev/null differ
diff --git a/Packages/com.unity.shadergraph/Documentation~/images/blackboardcategories2.png b/Packages/com.unity.shadergraph/Documentation~/images/blackboardcategories2.png
deleted file mode 100644
index 75b2c782696..00000000000
Binary files a/Packages/com.unity.shadergraph/Documentation~/images/blackboardcategories2.png and /dev/null differ
diff --git a/Packages/com.unity.shadergraph/Documentation~/images/blackboardcategories3.png b/Packages/com.unity.shadergraph/Documentation~/images/blackboardcategories3.png
deleted file mode 100644
index e98f64db601..00000000000
Binary files a/Packages/com.unity.shadergraph/Documentation~/images/blackboardcategories3.png and /dev/null differ
diff --git a/Packages/com.unity.shadergraph/Documentation~/images/materialoverride1.PNG b/Packages/com.unity.shadergraph/Documentation~/images/materialoverride1.png
similarity index 100%
rename from Packages/com.unity.shadergraph/Documentation~/images/materialoverride1.PNG
rename to Packages/com.unity.shadergraph/Documentation~/images/materialoverride1.png
diff --git a/Packages/com.unity.shadergraph/Documentation~/images/materialoverride2.PNG b/Packages/com.unity.shadergraph/Documentation~/images/materialoverride2.png
similarity index 100%
rename from Packages/com.unity.shadergraph/Documentation~/images/materialoverride2.PNG
rename to Packages/com.unity.shadergraph/Documentation~/images/materialoverride2.png
diff --git a/Packages/com.unity.shadergraph/Documentation~/images/precisionmodes1.PNG b/Packages/com.unity.shadergraph/Documentation~/images/precisionmodes1.png
similarity index 100%
rename from Packages/com.unity.shadergraph/Documentation~/images/precisionmodes1.PNG
rename to Packages/com.unity.shadergraph/Documentation~/images/precisionmodes1.png
diff --git a/Packages/com.unity.shadergraph/Documentation~/images/precisionmodes2.PNG b/Packages/com.unity.shadergraph/Documentation~/images/precisionmodes2.png
similarity index 100%
rename from Packages/com.unity.shadergraph/Documentation~/images/precisionmodes2.PNG
rename to Packages/com.unity.shadergraph/Documentation~/images/precisionmodes2.png
diff --git a/Packages/com.unity.shadergraph/Documentation~/images/precisionmodes3.PNG b/Packages/com.unity.shadergraph/Documentation~/images/precisionmodes3.png
similarity index 100%
rename from Packages/com.unity.shadergraph/Documentation~/images/precisionmodes3.PNG
rename to Packages/com.unity.shadergraph/Documentation~/images/precisionmodes3.png
diff --git a/Packages/com.unity.shadergraph/Documentation~/images/precisionmodes4.PNG b/Packages/com.unity.shadergraph/Documentation~/images/precisionmodes4.png
similarity index 100%
rename from Packages/com.unity.shadergraph/Documentation~/images/precisionmodes4.PNG
rename to Packages/com.unity.shadergraph/Documentation~/images/precisionmodes4.png
diff --git a/Packages/com.unity.shadergraph/Documentation~/images/previewmodecontrol.png b/Packages/com.unity.shadergraph/Documentation~/images/previewmodecontrol.png
deleted file mode 100644
index 8c26980f2ac..00000000000
Binary files a/Packages/com.unity.shadergraph/Documentation~/images/previewmodecontrol.png and /dev/null differ
diff --git a/Packages/com.unity.shadergraph/Documentation~/node-parallaxocclusionmapping.PNG b/Packages/com.unity.shadergraph/Documentation~/node-parallaxocclusionmapping.png
similarity index 100%
rename from Packages/com.unity.shadergraph/Documentation~/node-parallaxocclusionmapping.PNG
rename to Packages/com.unity.shadergraph/Documentation~/node-parallaxocclusionmapping.png
diff --git a/Packages/com.unity.shadergraph/Documentation~/snippets/nodes-compatibility-hdrp.md b/Packages/com.unity.shadergraph/Documentation~/snippets/nodes-compatibility-hdrp.md
index c184ee0ce72..0bbeaad507d 100644
--- a/Packages/com.unity.shadergraph/Documentation~/snippets/nodes-compatibility-hdrp.md
+++ b/Packages/com.unity.shadergraph/Documentation~/snippets/nodes-compatibility-hdrp.md
@@ -4,19 +4,6 @@ title: nodes-compatibility-hdrp
 
 node is supported on the following render pipelines:
 
-<table>
-<thead>
-<tr>
-<th><strong>Built-in Render Pipeline</strong></th>
-<th><strong>Universal Render Pipeline (URP)</strong></th>
-<th><strong>High Definition Render Pipeline (HDRP)</strong></th>
-</tr>
-</thead>
-<tbody>
-<tr>
-<td>No</td>
-<td>No</td>
-<td>Yes</td>
-</tr>
-</tbody>
-</table>
+| **Built-in Render Pipeline** | **Universal Render Pipeline (URP)** | **High Definition Render Pipeline (HDRP)** |
+| :--- | :--- | :--- |
+| No  | No  | Yes |
diff --git a/Packages/com.unity.shadergraph/Documentation~/surface-options.md b/Packages/com.unity.shadergraph/Documentation~/surface-options.md
index e1df7e53e70..6c668cef842 100644
--- a/Packages/com.unity.shadergraph/Documentation~/surface-options.md
+++ b/Packages/com.unity.shadergraph/Documentation~/surface-options.md
@@ -4,56 +4,17 @@
 
 Enable **Allow Material Override** to modify a specific set of properties for Universal Render Pipeline Lit and Unlit Shader Graphs and for Built-In Render Pipeline Shader Graphs in the Material Inspector.
 
-
-
-<table>
-<tr><td><b>Property</b></td><td><b>URP Lit</b></td><td><b>URP Unlit</b></td><td><b>Built-In Render Pipeline</b></td></tr>
-
-<tr><td><b>Workflow Mode</b></td><td rowspan="2">See the URP documentation for the <a href="https://docs.unity3d.com/Manual/urp/lit-shader">Lit</a> URP Shader.</td><td rowspan="2">Not applicable.</td><td rowspan="2">Not applicable.</td></tr>
-<tr><td><b>Receive Shadows</td> </tr>
-
-<tr><td><b>Cast Shadows</b></td><td colspan="2">This property is only exposed if <b>Allow Material Override</b> is enabled for this Shader Graph. Enable this property to make it possible for a GameObject using this shader to cast shadows onto itself and other GameObjects. This corresponds to the <a href="https://docs.unity3d.com/Manual/SL-SubShaderTags.html">SubShader Tag</a> <a href="https://docs.unity3d.com/Manual/SL-SubShaderTags.html">ForceNoShadowCasting</a>.</td><td>Not applicable.</td></tr>
-
-<tr><td><b>Surface Type</b></td><td colspan="2" rowspan="3">See the URP documentation for the <a href="https://docs.unity3d.com/Manual/urp/lit-shader.html">Lit</a> and <a href="https://docs.unity3d.com/Manual/urp/unlit-shader.html">Unlit Shaders</a>.</td><td>In the Built-In Render Pipeline, this feature has the same behavior as in URP. Consult the URP documentation.</td></tr>
-
-<tr><td><b>Render Face</b></td><td>In the Built-In Render Pipeline, this feature has the same behavior as in URP. Consult the URP documentation.</td></tr>
-
-
-<tr><td><b>Alpha Clipping</b></td><td>In the Built-In Render Pipeline, this feature has the same behavior as in URP. Consult the URP documentation.</td></tr>
-
-
-
-
-<tr><td><b>Depth Write</b></td><td colspan="3">
-This property is only exposed if Allow Material Override is enabled for this Shader Graph. <br/>
-Use this property to determine whether the GPU writes pixels to the <a href="https://en.wikipedia.org/wiki/Z-buffering">depth buffer</a> when it uses this shader to render geometry.  <br/><br>
-Options: <br/>
-<ul>
-<li><b>Auto</b> (default): Unity writes pixels to the depth buffer for opaque materials, but not for transparent materials. </li>
-<li><b>Force Enabled</b> Unity always writes pixels to the depth buffer.</li>
-<li><b>Force Disabled</b> Unity never writes pixels to the depth buffer.</li> </ul>
-This option's functionality corresponds to the command <a href="https://docs.unity3d.com/Manual/SL-ZWrite.html">ZWrite</a> in <a href="https://docs.unity3d.com/Manual/SL-Reference.html">ShaderLab</a>.  To override this setting in a <a href="https://docs.unity3d.com/ScriptReference/Rendering.RenderStateBlock.html">RenderStateBlock</a>, set the <a href="https://docs.unity3d.com/ScriptReference/Rendering.RenderStateBlock-depthState.html">depthState</a>.
-</td></tr>
-
-<tr><td><b>Depth Test</b></td><td colspan="3">This property is only exposed if <b>Allow Material Override</b> is enabled for this Shader Graph. <br/>Use this property to set the conditions under which pixels pass or fail depth testing. The GPU does not draw pixels that fail a depth test.  If you choose anything other than <b>LEqual</b> (the default setting for this property), consider also changing the rendering order of this material.  <br/> <br/>Options:
-<ul>
-<li><b>LEqual</b> (default): Unity draws the pixel, if its depth value is less than or equal to the value on the depth texture. Less: Unity draws pixels of the affected surface if their coordinates are less than the current depth buffer value.  </li>
-<li><b>Never</b>: Unity never draws the pixels of the affected surface. </li>
-<li><b>Less</b>: Unity draws pixels of the affected surface if their coordinates are less than the current depth buffer value. </li>
-<li><b>Greater</b>: Unity draws pixels of the affected surface if their coordinates are greater than the current depth buffer value. </li>
-<li><b>GEqual</b>: Unity draws pixels of the affected surface if their coordinates are greater than or equal to the current depth buffer value. </li>
-<li><b>Equal</b>: Unity draws pixels of the affected surface if their coordinates are equal to the current depth buffer value. </li>
-<li><b>NotEqual</b>: Unity draws pixels of the affected surface if their coordinates are not the same as the current depth buffer value. </li>
-<li><b>Always</b>: Unity draws this surface to your screen regardless of its z-coordinate. </li> </ul>
-This option's functionality corresponds to the command <a href="https://docs.unity3d.com/Manual/SL-ZTest.html">ZTest</a> in <a href="https://docs.unity3d.com/Manual/SL-Reference.html">ShaderLab</a>.  To override this setting in a <a href="https://docs.unity3d.com/ScriptReference/Rendering.RenderStateBlock.html">RenderStateBlock</a>, set the <a href="https://docs.unity3d.com/ScriptReference/Rendering.RenderStateBlock-depthState.html">depthState</a> property.</li>
-</td></tr>
-
-
-<tr><td><b>Support VFX Graph</b></td><td colspan="2">This property is only available if the <a href="https://docs.unity3d.com/Packages/com.unity.visualeffectgraph@12.0/manual/">Visual Effect Graph package</a> is installed. Indicates whether this Shader Graph supports the Visual Effect Graph. If you enable this property, output contexts can use this Shader Graph to render particles. The internal setup that Shader Graph does to support visual effects happens when Unity imports the Shader Graph. This means that if you enable this property, but don't use the Shader Graph in a visual effect, there is no impact on performance. It only affects the Shader Graph import time.</td><td>Not applicable.</td></tr>
-
-
-</table>
-
+| Property | Behavior | 
+| :--- | :--- |
+| **Workflow Mode** | Refer to the URP documentation for the [Lit URP](https://docs.unity3d.com/Manual/urp/lit-shader) Shader. <br/>**Note**: Not applicable to URP Unlit and the Built-In Render Pipeline. |
+| **Receive Shadows** | Refer to the URP documentation for the [Lit URP](https://docs.unity3d.com/Manual/urp/lit-shader) Shader. <br/>**Note**: Not applicable to URP Unlit and the Built-In Render Pipeline. |
+| **Cast Shadows** | This property is only exposed if **Allow Material Override** is enabled for this Shader Graph. Enable this property to make it possible for a GameObject using this shader to cast shadows onto itself and other GameObjects. This corresponds to the [SubShader Tag ForceNoShadowCasting](https://docs.unity3d.com/Manual/SL-SubShaderTags.html).<br/>**Note**: Not applicable to the Built-In Render Pipeline. |
+| **Surface Type** | Refer to the URP documentation for the [Lit URP](https://docs.unity3d.com/Manual/urp/lit-shader.html) and [Unlit URP](https://docs.unity3d.com/Manual/urp/unlit-shader.html) shaders. <br/>**Note**: In the Built-In Render Pipeline, this feature has the same behavior as in URP. |
+| **Render Face** | Refer to the URP documentation for the [Lit URP](https://docs.unity3d.com/Manual/urp/lit-shader.html) and [Unlit URP](https://docs.unity3d.com/Manual/urp/unlit-shader.html) shaders. <br/>**Note**: In the Built-In Render Pipeline, this feature has the same behavior as in URP. |
+| **Alpha Clipping** | Refer to the URP documentation for the [Lit URP](https://docs.unity3d.com/Manual/urp/lit-shader.html) and [Unlit URP](https://docs.unity3d.com/Manual/urp/unlit-shader.html) shaders. <br/>**Note**: In the Built-In Render Pipeline, this feature has the same behavior as in URP. |
+| **Depth Write** | This property is only exposed if **Allow Material Override** is enabled for this Shader Graph. <br/>Use this property to determine whether the GPU writes pixels to the [depth buffer](https://en.wikipedia.org/wiki/Z-buffering) when it uses this shader to render geometry. The options are:<ul><li>**Auto** (default): Unity writes pixels to the depth buffer for opaque materials, but not for transparent materials.</li><li>**Force Enabled** Unity always writes pixels to the depth buffer.</li><li>**Force Disabled** Unity never writes pixels to the depth buffer.</li></ul>This option's functionality corresponds to the command [ZWrite](https://docs.unity3d.com/Manual/SL-ZWrite.html) in [ShaderLab](https://docs.unity3d.com/Manual/SL-Reference.html). To override this setting in a [RenderStateBlock](https://docs.unity3d.com/ScriptReference/Rendering.RenderStateBlock.html), set the [depthState](https://docs.unity3d.com/ScriptReference/Rendering.RenderStateBlock-depthState.html). |
+| **Depth Test** | This property is only exposed if **Allow Material Override** is enabled for this Shader Graph. <br/>Use this property to set the conditions under which pixels pass or fail depth testing. The GPU does not draw pixels that fail a depth test.  If you choose anything other than **LEqual** (the default setting for this property), consider also changing the rendering order of this material. The options are:<ul><li>**LEqual** (default): Unity draws the pixel, if its depth value is less than or equal to the value on the depth texture. Less: Unity draws pixels of the affected surface if their coordinates are less than the current depth buffer value.</li><li>**Never**: Unity never draws the pixels of the affected surface.</li><li>**Less**: Unity draws pixels of the affected surface if their coordinates are less than the current depth buffer value.</li><li>**Greater**: Unity draws pixels of the affected surface if their coordinates are greater than the current depth buffer value.</li><li>**GEqual**: Unity draws pixels of the affected surface if their coordinates are greater than or equal to the current depth buffer value.</li><li>**Equal**: Unity draws pixels of the affected surface if their coordinates are equal to the current depth buffer value.</li><li>**NotEqual**: Unity draws pixels of the affected surface if their coordinates are not the same as the current depth buffer value.</li><li>**Always**: Unity draws this surface to your screen regardless of its z-coordinate.</li></ul>This option's functionality corresponds to the command [ZTest](https://docs.unity3d.com/Manual/SL-ZTest.html) in [ShaderLab](https://docs.unity3d.com/Manual/SL-Reference.html). To override this setting in a [RenderStateBlock](https://docs.unity3d.com/ScriptReference/Rendering.RenderStateBlock.html), set the [depthState](https://docs.unity3d.com/ScriptReference/Rendering.RenderStateBlock-depthState.html) property. |
+| **Support VFX Graph** | This property is only available if the [Visual Effect Graph package](https://docs.unity3d.com/Packages/com.unity.visualeffectgraph@latest) is installed.<br/>Indicates whether this Shader Graph supports the Visual Effect Graph. If you enable this property, output contexts can use this Shader Graph to render particles. The internal setup that Shader Graph does to support visual effects happens when Unity imports the Shader Graph. This means that if you enable this property, but don't use the Shader Graph in a visual effect, there is no impact on performance. It only affects the Shader Graph import time.<br/>**Note**: Not applicable to the Built-In Render Pipeline. |
 
 ## How to use
 
diff --git a/Packages/com.unity.shadergraph/Editor/Data/Graphs/ColorRGBMaterialSlot.cs b/Packages/com.unity.shadergraph/Editor/Data/Graphs/ColorRGBMaterialSlot.cs
index f934c613be3..dbebd598120 100644
--- a/Packages/com.unity.shadergraph/Editor/Data/Graphs/ColorRGBMaterialSlot.cs
+++ b/Packages/com.unity.shadergraph/Editor/Data/Graphs/ColorRGBMaterialSlot.cs
@@ -34,6 +34,8 @@ public ColorRGBMaterialSlot(
             m_DefaultColor = value;
         }
 
+        internal override bool canHideConnector => true;
+
         public ColorMode colorMode
         {
             get { return m_ColorMode; }
diff --git a/Packages/com.unity.shadergraph/Editor/Data/Graphs/MaterialSlot.cs b/Packages/com.unity.shadergraph/Editor/Data/Graphs/MaterialSlot.cs
index 896f03e0d56..5de12e31da4 100644
--- a/Packages/com.unity.shadergraph/Editor/Data/Graphs/MaterialSlot.cs
+++ b/Packages/com.unity.shadergraph/Editor/Data/Graphs/MaterialSlot.cs
@@ -231,6 +231,8 @@ public static MaterialSlot CreateMaterialSlot(
                     return new BooleanMaterialSlot(slotId, displayName, shaderOutputName, slotType, false, shaderStageCapability, hidden);
                 case SlotValueType.PropertyConnectionState:
                     return new PropertyConnectionStateMaterialSlot(slotId, displayName, shaderOutputName, slotType, shaderStageCapability, hidden);
+                case SlotValueType.External:
+                    return new ProviderSystem.ExternalMaterialSlot(slotId, displayName, shaderOutputName, "ERROR_TYPE", slotType);
             }
 
             throw new ArgumentOutOfRangeException("type", type, null);
@@ -352,6 +354,11 @@ public bool IsCompatibleWith(MaterialSlot otherSlot, out bool requiresLiteralMod
                 res = this is IMaterialSlotSupportsLiteralMode { LiteralMode: true };
             }
             requiresLiteralMode = !res;
+
+            if (res && (this is ProviderSystem.INeedsExplicitCompatibilityTest || otherSlot is ProviderSystem.INeedsExplicitCompatibilityTest))
+            {
+                res = ProviderSystem.INeedsExplicitCompatibilityTest.TestExplicitCompatibility(this, otherSlot);
+            }
             return res;
         }
 
diff --git a/Packages/com.unity.shadergraph/Editor/Data/Graphs/SerializableVirtualTexture.cs b/Packages/com.unity.shadergraph/Editor/Data/Graphs/SerializableVirtualTexture.cs
index 5fa9638e0d4..272ed482874 100644
--- a/Packages/com.unity.shadergraph/Editor/Data/Graphs/SerializableVirtualTexture.cs
+++ b/Packages/com.unity.shadergraph/Editor/Data/Graphs/SerializableVirtualTexture.cs
@@ -18,7 +18,6 @@ internal class SerializableVirtualTextureLayer
         public string layerRefName;
         public SerializableTexture layerTexture;
         public LayerTextureType layerTextureType;
-        [SerializeField]
         private Guid guid;
 
         public SerializableVirtualTextureLayer(string name, string refName, SerializableTexture texture)
diff --git a/Packages/com.unity.shadergraph/Editor/Data/Graphs/ShaderGraphRequirements.cs b/Packages/com.unity.shadergraph/Editor/Data/Graphs/ShaderGraphRequirements.cs
index b9ef355121d..2bb1efa905b 100644
--- a/Packages/com.unity.shadergraph/Editor/Data/Graphs/ShaderGraphRequirements.cs
+++ b/Packages/com.unity.shadergraph/Editor/Data/Graphs/ShaderGraphRequirements.cs
@@ -8,7 +8,7 @@ namespace UnityEditor.ShaderGraph.Internal
     [Serializable]
     public struct ShaderGraphRequirements
     {
-        [SerializeField] List<NeededTransform> m_RequiresTransforms;
+        List<NeededTransform> m_RequiresTransforms;
         [SerializeField] NeededCoordinateSpace m_RequiresNormal;
         [SerializeField] NeededCoordinateSpace m_RequiresBitangent;
         [SerializeField] NeededCoordinateSpace m_RequiresTangent;
diff --git a/Packages/com.unity.shadergraph/Editor/Data/Graphs/ShaderInput.cs b/Packages/com.unity.shadergraph/Editor/Data/Graphs/ShaderInput.cs
index 943815a1cc0..affbc22ee40 100644
--- a/Packages/com.unity.shadergraph/Editor/Data/Graphs/ShaderInput.cs
+++ b/Packages/com.unity.shadergraph/Editor/Data/Graphs/ShaderInput.cs
@@ -8,6 +8,7 @@
 
 namespace UnityEditor.ShaderGraph.Internal
 {
+    [Serializable]
     public abstract class ShaderInput : JsonObject
     {
         [SerializeField]
diff --git a/Packages/com.unity.shadergraph/Editor/Data/Graphs/Vector1MaterialEnumSlot.cs b/Packages/com.unity.shadergraph/Editor/Data/Graphs/Vector1MaterialEnumSlot.cs
index 13912f3330c..61255e09051 100644
--- a/Packages/com.unity.shadergraph/Editor/Data/Graphs/Vector1MaterialEnumSlot.cs
+++ b/Packages/com.unity.shadergraph/Editor/Data/Graphs/Vector1MaterialEnumSlot.cs
@@ -20,6 +20,23 @@ class Vector1MaterialEnumSlot : Vector1MaterialSlot
 
         internal Vector1MaterialEnumSlot() { }
 
+        public Vector1MaterialEnumSlot(
+            int slotId,
+            string displayName,
+            string shaderOutputName,
+            SlotType slotType,
+            IEnumerable<string> options,
+            float value, // should match a value in the options.
+            ShaderStageCapability stageCapability = ShaderStageCapability.All,
+            bool hidden = false)
+            : base(slotId, displayName, shaderOutputName, slotType, value, stageCapability: stageCapability, hidden: hidden)
+        {
+            this.options = new(options);
+            this.values = new();
+            for (int i = 0; i < this.options.Count; ++i)
+                values.Add(i);
+        }
+
         internal Vector1MaterialEnumSlot(int slotId, Vector1ShaderProperty fromProperty)
             : base(slotId, fromProperty)
         {
@@ -50,9 +67,13 @@ public EnumSlotControlView(Vector1MaterialEnumSlot slot)
             {
                 m_Slot = slot;
 
+                int idx = m_Slot.values.FindIndex(e => e == (int)slot.value);
+                if (idx < 0 || idx >= slot.options.Count)
+                    idx = 0;
+
                 var dropdownField = slot.hideConnector
-                    ? new DropdownField(slot.RawDisplayName(), slot.options, 0)
-                    : new DropdownField(slot.options, 0);
+                    ? new DropdownField(slot.RawDisplayName(), slot.options, idx)
+                    : new DropdownField(slot.options, idx);
 
                 dropdownField.RegisterValueChangedCallback(OnValueChange);
                 Add(dropdownField);
diff --git a/Packages/com.unity.shadergraph/Editor/Data/Graphs/Vector1MaterialIntegerSlot.cs b/Packages/com.unity.shadergraph/Editor/Data/Graphs/Vector1MaterialIntegerSlot.cs
index 974031ad947..90e5d8c191c 100644
--- a/Packages/com.unity.shadergraph/Editor/Data/Graphs/Vector1MaterialIntegerSlot.cs
+++ b/Packages/com.unity.shadergraph/Editor/Data/Graphs/Vector1MaterialIntegerSlot.cs
@@ -15,6 +15,23 @@ internal Vector1MaterialIntegerSlot() { }
 
         internal Vector1MaterialIntegerSlot(int slotId, Vector1ShaderProperty property) : base(slotId, property) { }
 
+        [SerializeField]
+        bool m_unsigned = false;
+
+        public Vector1MaterialIntegerSlot(
+            int slotId,
+            string displayName,
+            string shaderOutputName,
+            SlotType slotType,
+            float value,
+            ShaderStageCapability stageCapability = ShaderStageCapability.All,
+            bool hidden = false,
+            bool unsigned = false)
+            : base(slotId, displayName, shaderOutputName, slotType, value, stageCapability: stageCapability, hidden: hidden)
+        {
+            m_unsigned = unsigned;
+        }
+
         public override VisualElement InstantiateControl()
         {
             return new IntegerSlotControlView(this);
@@ -47,7 +64,7 @@ void OnValueChange(ChangeEvent<int> evt)
                 if (evt.newValue != m_Slot.value)
                 {
                     m_Slot.owner.owner.owner.RegisterCompleteObjectUndo("Integer Change");
-                    m_Slot.value = evt.newValue;
+                    m_Slot.value = m_Slot.m_unsigned ? (uint)evt.newValue : (int)evt.newValue;
                     m_Slot.owner.Dirty(ModificationScope.Node);
                 }
             }
diff --git a/Packages/com.unity.shadergraph/Editor/Data/Graphs/Vector1MaterialRangeSlot.cs b/Packages/com.unity.shadergraph/Editor/Data/Graphs/Vector1MaterialRangeSlot.cs
index e6dd500c8e3..239128f4d1f 100644
--- a/Packages/com.unity.shadergraph/Editor/Data/Graphs/Vector1MaterialRangeSlot.cs
+++ b/Packages/com.unity.shadergraph/Editor/Data/Graphs/Vector1MaterialRangeSlot.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using UnityEditor.Graphing;
 using UnityEditor.ShaderGraph.Internal;
 using UnityEngine;
@@ -20,6 +21,21 @@ class Vector1MaterialRangeSlot : Vector1MaterialSlot
 
         internal Vector1MaterialRangeSlot() { }
 
+        public Vector1MaterialRangeSlot(
+            int slotId,
+            string displayName,
+            string shaderOutputName,
+            SlotType slotType,
+            float value,
+            Vector2 range,
+            ShaderStageCapability stageCapability = ShaderStageCapability.All,
+            bool hidden = false)
+            : base(slotId, displayName, shaderOutputName, slotType, value, stageCapability: stageCapability, hidden: hidden)
+        {
+            this.m_sliderRange = range;
+        }
+
+
         internal Vector1MaterialRangeSlot(int slotId, Vector1ShaderProperty fromProperty)
             : base(slotId, fromProperty)
         {
@@ -56,6 +72,8 @@ public SliderSlotControlView(Vector1MaterialRangeSlot slot)
                     ? new Slider(m_Slot.RawDisplayName(), m_Slot.m_sliderRange.x, m_Slot.m_sliderRange.y)
                     : new Slider(m_Slot.m_sliderRange.x, m_Slot.m_sliderRange.y);
 
+                sliderField.value = slot.value;
+
                 sliderField.RegisterValueChangedCallback(OnValueChange);
 
                 
diff --git a/Packages/com.unity.shadergraph/Editor/Data/Implementation/IHasDependencies.cs b/Packages/com.unity.shadergraph/Editor/Data/Implementation/IHasDependencies.cs
index fd13982ff73..c1f2c014c0f 100644
--- a/Packages/com.unity.shadergraph/Editor/Data/Implementation/IHasDependencies.cs
+++ b/Packages/com.unity.shadergraph/Editor/Data/Implementation/IHasDependencies.cs
@@ -6,4 +6,12 @@ interface IHasDependencies
     {
         void GetSourceAssetDependencies(AssetCollection assetCollection);
     }
+
+    interface IHasAssetDependencies
+    {
+        // Returns true if the implementing object needed to reload.
+        // This allows the owning model to escalate whether the node
+        // should be updated or not.
+        bool Reload(HashSet<string> changedAssetGuids);
+    }
 }
diff --git a/Packages/com.unity.shadergraph/Editor/Data/Nodes/AbstractMaterialNode.cs b/Packages/com.unity.shadergraph/Editor/Data/Nodes/AbstractMaterialNode.cs
index f9ffad3bb46..557850adac1 100644
--- a/Packages/com.unity.shadergraph/Editor/Data/Nodes/AbstractMaterialNode.cs
+++ b/Packages/com.unity.shadergraph/Editor/Data/Nodes/AbstractMaterialNode.cs
@@ -904,14 +904,24 @@ public MaterialSlot AddSlot(MaterialSlot slot, bool attemptToModifyExistingInsta
             if (slot == foundSlot)
                 return foundSlot;
 
+            // cache the known outgoing edges for this slot, incase downstream dynamic slots
+            // need updating or downstream on-connect events need to retrigger.
+            List<IEdge> downstream = new();
+            if (foundSlot is not null && foundSlot.isOutputSlot && foundSlot.isConnected)
+                owner.GetEdges(foundSlot, downstream);
+
             // Try to keep the existing instance to avoid unnecessary changes to file
             if (attemptToModifyExistingInstance && foundSlot != null && slot.GetType() == foundSlot.GetType())
             {
-                foundSlot.displayName = slot.RawDisplayName();
+                if (foundSlot.RawDisplayName() != slot.RawDisplayName())
+                {
+                    foundSlot.displayName = slot.RawDisplayName();
+                    this.Dirty(ModificationScope.Topological);
+                }
                 foundSlot.CopyDefaultValue(slot);
                 if (foundSlot.hideConnector != slot.hideConnector)
                 {
-                    foundSlot.hideConnector = slot.hideConnector; // MARK DIRTY
+                    foundSlot.hideConnector = slot.hideConnector;
                     this.Dirty(ModificationScope.Topological);
 
                     if (foundSlot.hideConnector && foundSlot.isConnected)
@@ -949,6 +959,17 @@ public MaterialSlot AddSlot(MaterialSlot slot, bool attemptToModifyExistingInsta
             slot.CopyValuesFrom(foundSlot);
             foundSlot.owner = null;
 
+
+            // If the new slot is a different type, the downstream slots/nodes may need to be notified;
+            // we can do this by treating them as a new connection.
+            // Connect is expensive because it triggers graph validation, but this case is rare.
+            // If it is a problem, we should add a 'ValidationScope' to GraphData,
+            // which doesn't trigger validation until the scope ends.
+            foreach (var edge in downstream)
+            {
+                owner.Connect(slot.slotReference, edge.inputSlot);
+            }
+
             return slot;
         }
 
diff --git a/Packages/com.unity.shadergraph/Editor/Data/Nodes/Artistic/Filter/DitherNode.cs b/Packages/com.unity.shadergraph/Editor/Data/Nodes/Artistic/Filter/DitherNode.cs
index 6d1b8b95524..c82a8a4c263 100644
--- a/Packages/com.unity.shadergraph/Editor/Data/Nodes/Artistic/Filter/DitherNode.cs
+++ b/Packages/com.unity.shadergraph/Editor/Data/Nodes/Artistic/Filter/DitherNode.cs
@@ -27,7 +27,7 @@ static string Unity_Dither(
 @"
 {
     $precision2 uv = ScreenPosition.xy * _ScreenParams.xy;
-    $precision DITHER_THRESHOLDS[16] =
+    static const $precision DITHER_THRESHOLDS[16] =
     {
         1.0 / 17.0,  9.0 / 17.0,  3.0 / 17.0, 11.0 / 17.0,
         13.0 / 17.0,  5.0 / 17.0, 15.0 / 17.0,  7.0 / 17.0,
diff --git a/Packages/com.unity.shadergraph/Editor/Data/Nodes/Channel/SwizzleNode.cs b/Packages/com.unity.shadergraph/Editor/Data/Nodes/Channel/SwizzleNode.cs
index 210b7c7604a..ba02cc7ff4a 100644
--- a/Packages/com.unity.shadergraph/Editor/Data/Nodes/Channel/SwizzleNode.cs
+++ b/Packages/com.unity.shadergraph/Editor/Data/Nodes/Channel/SwizzleNode.cs
@@ -36,7 +36,7 @@ public string maskInput
             get { return _maskInput; }
             set
             {
-                if (_maskInput.Equals(value))
+                if (value == null || _maskInput.Equals(value))
                     return;
                 _maskInput = value;
                 UpdateNodeAfterDeserialization();
diff --git a/Packages/com.unity.shadergraph/Editor/Data/Nodes/SlotValue.cs b/Packages/com.unity.shadergraph/Editor/Data/Nodes/SlotValue.cs
index 5a1d31e6ae3..4df345424cb 100644
--- a/Packages/com.unity.shadergraph/Editor/Data/Nodes/SlotValue.cs
+++ b/Packages/com.unity.shadergraph/Editor/Data/Nodes/SlotValue.cs
@@ -26,6 +26,7 @@ enum SlotValueType
         Boolean,
         VirtualTexture,
         PropertyConnectionState,
+        External
     }
 
     enum ConcreteSlotValueType
@@ -45,7 +46,8 @@ enum ConcreteSlotValueType
         Vector1,
         Boolean,
         VirtualTexture,
-        PropertyConnectionState
+        PropertyConnectionState,
+        External
     }
 
     // This enum must match ConcreteSlotValueType enum and is used to give friendly name in the enum popup used for custom function
@@ -221,6 +223,7 @@ public static bool AreCompatible(SlotValueType inputType, ConcreteSlotValueType
                     {ConcreteSlotValueType.SamplerState, new List<SlotValueType>() {SlotValueType.SamplerState}},
                     {ConcreteSlotValueType.Gradient, new List<SlotValueType>() {SlotValueType.Gradient}},
                     {ConcreteSlotValueType.VirtualTexture, new List<SlotValueType>() {SlotValueType.VirtualTexture}},
+                    {ConcreteSlotValueType.External, new List<SlotValueType>() {SlotValueType.External}},
                 };
             }
 
diff --git a/Packages/com.unity.shadergraph/Editor/Data/Nodes/UI/SampleElementTextureNode.cs b/Packages/com.unity.shadergraph/Editor/Data/Nodes/UI/SampleElementTextureNode.cs
index bde8e644819..24f2be454ac 100644
--- a/Packages/com.unity.shadergraph/Editor/Data/Nodes/UI/SampleElementTextureNode.cs
+++ b/Packages/com.unity.shadergraph/Editor/Data/Nodes/UI/SampleElementTextureNode.cs
@@ -1,3 +1,4 @@
+using System;
 using UnityEditor.Graphing;
 using UnityEditor.Rendering.UITK.ShaderGraph;
 using UnityEngine;
@@ -6,7 +7,7 @@ namespace UnityEditor.ShaderGraph
 {
     [Title("UI", "Sample Element Texture")]
     [SubTargetFilter(typeof(IUISubTarget))]
-    class SampleElementTextureNode : AbstractMaterialNode, IGeneratesBodyCode, IMayRequireUITK
+    class SampleElementTextureNode : AbstractMaterialNode, IGeneratesFunction, IGeneratesBodyCode, IMayRequireUITK
     {
 
         public const int UV0Id = 0;
@@ -61,6 +62,24 @@ public override void UpdateNodeAfterDeserialization()
             });
         }
 
+        public void GenerateNodeFunction(FunctionRegistry registry, GenerationMode generationMode)
+        {
+            registry.ProvideFunction("UIE_SAMPLE4", sb =>
+            {
+                sb.AppendLine(@"#define UIE_SAMPLE4(index) \");
+                sb.AppendLine(@"    c0 = UNITY_SAMPLE_TEX2D(_Texture##index, uv0); \");
+                sb.AppendLine(@"    c1 = UNITY_SAMPLE_TEX2D(_Texture##index, uv1); \");
+                sb.AppendLine(@"    c2 = UNITY_SAMPLE_TEX2D(_Texture##index, uv2); \");
+                sb.AppendLine(@"    c3 = UNITY_SAMPLE_TEX2D(_Texture##index, uv3);");
+                sb.AppendLine("");
+                sb.AppendLine("void SampleTextureSlot4(half index, float2 uv0, float2 uv1, float2 uv2, float2 uv3, out float4 c0, out float4 c1, out float4 c2, out float4 c3)");
+                using (sb.BlockScope())
+                {
+                    sb.AppendLine("UIE_BRANCH(UIE_SAMPLE4)");
+                }
+            });
+        }
+
         public void GenerateNodeCode(ShaderStringBuilder sb, GenerationMode generationMode)
         {
             sb.AppendLine("$precision4 {0};", GetVariableNameForSlot(Color0SlotId));
@@ -68,15 +87,19 @@ public void GenerateNodeCode(ShaderStringBuilder sb, GenerationMode generationMo
             sb.AppendLine("$precision4 {0};", GetVariableNameForSlot(Color2SlotId));
             sb.AppendLine("$precision4 {0};", GetVariableNameForSlot(Color3SlotId));
 
-            sb.Append("#define UIE_SAMPLEX(index) ");
-            sb.Append("{0} = UNITY_SAMPLE_TEX2D(_Texture##index, {1});", GetVariableNameForSlot(Color0SlotId), GetSlotValue(UV0Id, generationMode));
-            sb.Append("{0} = UNITY_SAMPLE_TEX2D(_Texture##index, {1});", GetVariableNameForSlot(Color1SlotId), GetSlotValue(UV1Id, generationMode));
-            sb.Append("{0} = UNITY_SAMPLE_TEX2D(_Texture##index, {1});", GetVariableNameForSlot(Color2SlotId), GetSlotValue(UV2Id, generationMode));
-            sb.Append("{0} = UNITY_SAMPLE_TEX2D(_Texture##index, {1});", GetVariableNameForSlot(Color3SlotId), GetSlotValue(UV3Id, generationMode));
-            sb.AppendLine("");
-
-            sb.AppendLine("half index = IN.typeTexSettings.y;");
-            sb.AppendLine("UIE_BRANCH(UIE_SAMPLEX)");
+            using (sb.BlockScope())
+            {
+                sb.AppendLine("half Unity_UIE_TextureSlotIndex = IN.typeTexSettings.y;");
+                sb.AppendLine("SampleTextureSlot4(Unity_UIE_TextureSlotIndex, {0}, {1}, {2}, {3}, {4}, {5}, {6}, {7});",
+                    GetSlotValue(UV0Id, generationMode),
+                    GetSlotValue(UV1Id, generationMode),
+                    GetSlotValue(UV2Id, generationMode),
+                    GetSlotValue(UV3Id, generationMode),
+                    GetVariableNameForSlot(Color0SlotId),
+                    GetVariableNameForSlot(Color1SlotId),
+                    GetVariableNameForSlot(Color2SlotId),
+                    GetVariableNameForSlot(Color3SlotId));
+            }
         }
 
         public bool RequiresUITK(ShaderStageCapability stageCapability)
diff --git a/Packages/com.unity.shadergraph/Editor/Data/Nodes/Utility/CustomFunctionNode.cs b/Packages/com.unity.shadergraph/Editor/Data/Nodes/Utility/CustomFunctionNode.cs
index 5b1d223cffa..77236515a48 100644
--- a/Packages/com.unity.shadergraph/Editor/Data/Nodes/Utility/CustomFunctionNode.cs
+++ b/Packages/com.unity.shadergraph/Editor/Data/Nodes/Utility/CustomFunctionNode.cs
@@ -13,7 +13,7 @@ namespace UnityEditor.ShaderGraph
 {
     [HasDependencies(typeof(MinimalCustomFunctionNode))]
     [Title("Utility", "Custom Function")]
-    class CustomFunctionNode : AbstractMaterialNode, IGeneratesBodyCode, IGeneratesFunction, IMayRequireTransform
+    class CustomFunctionNode : AbstractMaterialNode, IGeneratesBodyCode, IGeneratesFunction, IMayRequireTransform, IHasAssetDependencies
     {
         // 0 original version
         // 1 differentiate between struct-based UnityTexture2D and bare Texture2D resources (for all texture and samplerstate resources)
diff --git a/Packages/com.unity.shadergraph/Editor/Data/Nodes/Utility/KeywordNode.cs b/Packages/com.unity.shadergraph/Editor/Data/Nodes/Utility/KeywordNode.cs
index b1d7a4e873e..f3810ccf737 100644
--- a/Packages/com.unity.shadergraph/Editor/Data/Nodes/Utility/KeywordNode.cs
+++ b/Packages/com.unity.shadergraph/Editor/Data/Nodes/Utility/KeywordNode.cs
@@ -154,8 +154,9 @@ public void GenerateNodeCode(ShaderStringBuilder sb, GenerationMode generationMo
                         sb.AppendLine(string.Format($"{outputSlot.concreteValueType.ToShaderString()} {GetVariableNameForSlot(OutputSlotId)};"));
                         for(int i = 0; i < keyword.entries.Count; ++i)
                         {
-                            string keywordName = $"{keyword.referenceName}_{keyword.entries[i].referenceName}";
-                            var value = GetSlotValue(i + 1, generationMode);
+                            var keywordEntry = keyword.entries[i];
+                            string keywordName = $"{keyword.referenceName}_{keywordEntry.referenceName}";
+                            var value = GetSlotValue(keywordEntry.id, generationMode);
                             sb.AppendLine(string.Format($"{(i != 0 ? "else" : "")} if({keywordName}) {GetVariableNameForSlot(OutputSlotId)} = {value};"));
                         }
                         break;
diff --git a/Packages/com.unity.shadergraph/Editor/Data/Nodes/Utility/RedirectNodeView.cs b/Packages/com.unity.shadergraph/Editor/Data/Nodes/Utility/RedirectNodeView.cs
index d495c88ca16..0159928d54b 100644
--- a/Packages/com.unity.shadergraph/Editor/Data/Nodes/Utility/RedirectNodeView.cs
+++ b/Packages/com.unity.shadergraph/Editor/Data/Nodes/Utility/RedirectNodeView.cs
@@ -141,8 +141,7 @@ public bool FindPort(SlotReference slot, out ShaderPort port)
         public void AttachMessage(string errString, ShaderCompilerMessageSeverity severity)
         {
             ClearMessage();
-            IconBadge badge;
-            badge = IconBadge.CreateComment(errString);
+            IconBadge badge = InternalBridge.IconBadge.CreateComment(errString);
 
             Add(badge);
             badge.AttachTo(outputContainer, SpriteAlignment.RightCenter);
diff --git a/Packages/com.unity.shadergraph/Editor/Data/Nodes/Utility/SubGraphNode.cs b/Packages/com.unity.shadergraph/Editor/Data/Nodes/Utility/SubGraphNode.cs
index 7c4f7623d5d..28f5e7f0055 100644
--- a/Packages/com.unity.shadergraph/Editor/Data/Nodes/Utility/SubGraphNode.cs
+++ b/Packages/com.unity.shadergraph/Editor/Data/Nodes/Utility/SubGraphNode.cs
@@ -14,6 +14,7 @@ class SubGraphNode : AbstractMaterialNode
         , IGeneratesBodyCode
         , IOnAssetEnabled
         , IGeneratesFunction
+        , IHasAssetDependencies
         , IMayRequireNormal
         , IMayRequireTangent
         , IMayRequireBitangent
diff --git a/Packages/com.unity.shadergraph/Editor/Data/Util/SlotValueTypeUtil.cs b/Packages/com.unity.shadergraph/Editor/Data/Util/SlotValueTypeUtil.cs
index 1d27e68472d..f33e9ba6c22 100644
--- a/Packages/com.unity.shadergraph/Editor/Data/Util/SlotValueTypeUtil.cs
+++ b/Packages/com.unity.shadergraph/Editor/Data/Util/SlotValueTypeUtil.cs
@@ -42,6 +42,8 @@ public static SlotValueType ToSlotValueType(this ConcreteSlotValueType concreteV
                     return SlotValueType.VirtualTexture;
                 case ConcreteSlotValueType.PropertyConnectionState:
                     return SlotValueType.PropertyConnectionState;
+                case ConcreteSlotValueType.External:
+                    return SlotValueType.External;
                 default:
                     throw new ArgumentOutOfRangeException();
             }
@@ -124,6 +126,8 @@ public static PropertyType ToPropertyType(this ConcreteSlotValueType concreteVal
                     return PropertyType.VirtualTexture;
                 case ConcreteSlotValueType.PropertyConnectionState:
                     return PropertyType.PropertyConnectionState;
+                case ConcreteSlotValueType.External:
+                    return PropertyType.External;
                 default:
                     throw new ArgumentOutOfRangeException();
             }
@@ -196,7 +200,8 @@ public static string ToClassName(this ConcreteSlotValueType type)
             "typeFloat1",
             "typeBoolean",
             "typeVirtualTexture",
-            "typePropertyConnectionState"
+            "typePropertyConnectionState",
+            "typeExternal"
         };
     }
 }
diff --git a/Packages/com.unity.shadergraph/Editor/Drawing/Controls/TextControl.cs b/Packages/com.unity.shadergraph/Editor/Drawing/Controls/TextControl.cs
index 753f2720f7d..1e2770f136f 100644
--- a/Packages/com.unity.shadergraph/Editor/Drawing/Controls/TextControl.cs
+++ b/Packages/com.unity.shadergraph/Editor/Drawing/Controls/TextControl.cs
@@ -12,16 +12,18 @@ namespace UnityEditor.ShaderGraph.Drawing.Controls
     class TextControlAttribute : Attribute, IControlAttribute
     {
         string m_Label;
-        public TextControlAttribute(string label = null)
+        bool m_hideLabel;
+        public TextControlAttribute(string label = null, bool hideLabel = false)
         {
             m_Label = label;
+            m_hideLabel = hideLabel;
         }
 
         public VisualElement InstantiateControl(AbstractMaterialNode node, PropertyInfo propertyInfo)
         {
             if (!TextControlView.validTypes.Contains(propertyInfo.PropertyType))
                 return null;
-            return new TextControlView(m_Label, node, propertyInfo);
+            return new TextControlView(m_Label, node, propertyInfo, m_hideLabel);
         }
     }
 
@@ -32,15 +34,19 @@ class TextControlView : VisualElement
         PropertyInfo m_PropertyInfo;
         string m_Value;
         int m_UndoGroup = -1;
-        public TextControlView(string label, AbstractMaterialNode node, PropertyInfo propertyInfo)
+        public TextControlView(string label, AbstractMaterialNode node, PropertyInfo propertyInfo, bool hideLabel = false)
         {
             styleSheets.Add(Resources.Load<StyleSheet>("Styles/Controls/TextControlView"));
             m_Node = node;
             m_PropertyInfo = propertyInfo;
-            label = label ?? ObjectNames.NicifyVariableName(propertyInfo.Name);
+
             var container = new VisualElement { name = "container" };
-            var thisLabel = new Label(label);
-            container.Add(thisLabel);
+            if (!hideLabel)
+            {
+                label = label ?? ObjectNames.NicifyVariableName(propertyInfo.Name);
+                var thisLabel = new Label(label);
+                container.Add(thisLabel);
+            }
             m_Value = GetValue();
             string value = null;
             var field = new TextField { value = m_Value };
diff --git a/Packages/com.unity.shadergraph/Editor/Drawing/Inspector/PropertyDrawers/ShaderInputPropertyDrawer.cs b/Packages/com.unity.shadergraph/Editor/Drawing/Inspector/PropertyDrawers/ShaderInputPropertyDrawer.cs
index f341bee9fa7..fdd036d609e 100644
--- a/Packages/com.unity.shadergraph/Editor/Drawing/Inspector/PropertyDrawers/ShaderInputPropertyDrawer.cs
+++ b/Packages/com.unity.shadergraph/Editor/Drawing/Inspector/PropertyDrawers/ShaderInputPropertyDrawer.cs
@@ -1707,7 +1707,8 @@ void BuildKeywordFields(PropertySheet propertySheet, ShaderInput shaderInput)
                         return;
                     keyword.keywordDefinition = (KeywordDefinition)newValue;
                     UpdateEnableState();
-                    this._postChangeValueCallback(true, ModificationScope.Nothing);
+                    this._postChangeValueCallback(true);
+                    this._keywordChangedCallback();
                 },
                 keyword.keywordDefinition,
                 "Definition",
@@ -2071,6 +2072,7 @@ void KeywordAddCallbacks()
                         keyword.entries[index] = new KeywordEntry(entry.id, displayName, referenceName);
 
                     this._postChangeValueCallback(true);
+                    this._keywordChangedCallback();
                 }
             };
 
@@ -2177,6 +2179,8 @@ void KeywordReorderEntries(ReorderableList list)
         {
             this._preChangeValueCallback("Reorder Keyword Entry");
             this._postChangeValueCallback(true);
+            this._keywordChangedCallback();
+
         }
 
         public string GetDuplicateSafeEnumDisplayName(int id, string name)
diff --git a/Packages/com.unity.shadergraph/Editor/Drawing/MaterialGraphEditWindow.cs b/Packages/com.unity.shadergraph/Editor/Drawing/MaterialGraphEditWindow.cs
index e94e9860915..f1c641c2a53 100644
--- a/Packages/com.unity.shadergraph/Editor/Drawing/MaterialGraphEditWindow.cs
+++ b/Packages/com.unity.shadergraph/Editor/Drawing/MaterialGraphEditWindow.cs
@@ -323,12 +323,14 @@ void Update()
                         }
                     }
 
-                    var subGraphNodes = graphObject.graph.GetNodes<SubGraphNode>();
-                    foreach (var subGraphNode in subGraphNodes)
+                    var nodesWithDependencies = graphObject.graph.GetNodes<IHasAssetDependencies>();
+                    foreach (var node in nodesWithDependencies)
                     {
-                        var reloaded = subGraphNode.Reload(m_ChangedFileDependencyGUIDs);
+                        var reloaded = node.Reload(m_ChangedFileDependencyGUIDs);
                         reloadedSomething |= reloaded;
                     }
+
+                    var subGraphNodes = graphObject.graph.GetNodes<SubGraphNode>();
                     if (subGraphNodes.Count() > 0)
                     {
                         // Keywords always need to be updated to test against variant limit
@@ -339,11 +341,6 @@ void Update()
                         UpdateDropdownEntries();
                         materialGraph.OnDropdownChanged();
                     }
-                    foreach (var customFunctionNode in graphObject.graph.GetNodes<CustomFunctionNode>())
-                    {
-                        var reloaded = customFunctionNode.Reload(m_ChangedFileDependencyGUIDs);
-                        reloadedSomething |= reloaded;
-                    }
 
                     // reloading files may change serialization
                     if (reloadedSomething)
@@ -404,6 +401,12 @@ public void ReloadSubGraphsOnNextUpdate(List<string> changedFileGUIDs)
             }
         }
 
+        public void NotifyDependencyUpdated(IEnumerable<GUID> guids)
+        {
+            foreach (var guid in guids)
+                m_ChangedFileDependencyGUIDs.Add(guid.ToString());
+        }
+
         void UpdateDropdownEntries()
         {
             var subGraphNodes = graphObject.graph.GetNodes<SubGraphNode>();
diff --git a/Packages/com.unity.shadergraph/Editor/Drawing/PreviewManager.cs b/Packages/com.unity.shadergraph/Editor/Drawing/PreviewManager.cs
index 5528667d9c6..19780d548b0 100644
--- a/Packages/com.unity.shadergraph/Editor/Drawing/PreviewManager.cs
+++ b/Packages/com.unity.shadergraph/Editor/Drawing/PreviewManager.cs
@@ -933,7 +933,7 @@ void KickOffShaderCompilations()
                     Assert.IsNotNull(node);
                     Assert.IsFalse(node is BlockNode);
 
-                    if (node.hasPreview && node.previewExpanded && !m_PreviewsCompiling.Contains(preview))
+                    if (node.hasPreview && node.previewExpanded && !m_PreviewsCompiling.Contains(preview) && MaterialNodeView.IsPreviewable(node))
                     {
                         previewsToCompile.Add(preview);
                     }
diff --git a/Packages/com.unity.shadergraph/Editor/Drawing/SearchWindowProvider.cs b/Packages/com.unity.shadergraph/Editor/Drawing/SearchWindowProvider.cs
index 91edeaed698..cdcff291fb8 100644
--- a/Packages/com.unity.shadergraph/Editor/Drawing/SearchWindowProvider.cs
+++ b/Packages/com.unity.shadergraph/Editor/Drawing/SearchWindowProvider.cs
@@ -1,17 +1,16 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using UnityEditor.Graphing;
 using UnityEditor.Graphing.Util;
 using UnityEngine;
-using UnityEditor.UIElements;
 using UnityEditor.Experimental.GraphView;
 using UnityEngine.UIElements;
 using UnityEditor.Searcher;
 using UnityEngine.Profiling;
 using UnityEngine.Pool;
 using Object = UnityEngine.Object;
+using UnityEditor.ShaderGraph.ProviderSystem;
 
 namespace UnityEditor.ShaderGraph.Drawing
 {
@@ -205,6 +204,28 @@ public void GenerateNodeEntries()
             }
             Profiler.EndSample();
 
+            Profiler.BeginSample("SearchWindowProvider.GenerateNodeEntries.IterateProviders");
+            HashSet<string> providerCollisions = new();
+            foreach (var provider in ProviderLibrary.Instance.AllProvidersByType<IShaderFunction>())
+            {
+                if (!ProviderTypeCache.TryCreateModel(provider.ProviderKey, out var model) || model is not ProviderNode node)
+                    node = new ProviderNode();
+
+                node.InitializeFromProvider(provider);
+                var header = node.Header;
+
+                string rawTitle = $"{header.category}/{header.uniqueName}";
+
+                int orderFound = 0;
+                while (providerCollisions.Contains(rawTitle))
+                    rawTitle += $", ({++orderFound})";
+
+                providerCollisions.Add(rawTitle);
+
+                var title = new List<string>(rawTitle.Split('/'));
+                AddEntries(node, title.ToArray(), nodeEntries);
+            }
+            Profiler.EndSample();
 
             Profiler.BeginSample("SearchWindowProvider.GenerateNodeEntries.IterateGraphInputs");
             foreach (var property in m_Graph.properties)
@@ -455,6 +476,10 @@ public AbstractMaterialNode CopyNodeForGraph(AbstractMaterialNode oldNode)
             {
                 newNode.ChangeVersion(oldNode.sgVersion);
             }
+            if (newNode is ProviderNode providerNode)
+            {
+                providerNode.InitializeFromProvider(((ProviderNode)oldNode).Provider);
+            }
             if (newNode is SubGraphNode subgraphNode)
             {
                 subgraphNode.asset = ((SubGraphNode)oldNode).asset;
diff --git a/Packages/com.unity.shadergraph/Editor/Drawing/Views/MaterialGraphView.cs b/Packages/com.unity.shadergraph/Editor/Drawing/Views/MaterialGraphView.cs
index 1175f117473..af1ca07c061 100644
--- a/Packages/com.unity.shadergraph/Editor/Drawing/Views/MaterialGraphView.cs
+++ b/Packages/com.unity.shadergraph/Editor/Drawing/Views/MaterialGraphView.cs
@@ -337,6 +337,21 @@ public override void BuildContextualMenu(ContextualMenuPopulateEvent evt)
                     evt.menu.AppendSeparator();
                     evt.menu.AppendAction("Open Sub Graph", OpenSubGraph, (a) => DropdownMenuAction.Status.Normal);
                 }
+                if (selection.OfType<IShaderNodeView>().Count() == 1
+                    && selection.OfType<IShaderNodeView>().First().node is ProviderSystem.ProviderNode providerNode
+                    && providerNode.isValid
+                    && (providerNode.Provider?.IsValid ?? false)
+                    && providerNode.Provider.AssetID != default)
+                {
+                    evt.menu.AppendSeparator();
+
+                    void PingSource(DropdownMenuAction action)
+                    {
+                        var asset = AssetDatabase.LoadAssetByGUID<Object>(providerNode.Provider.AssetID);
+                        EditorGUIUtility.PingObject(asset);
+                    }
+                    evt.menu.AppendAction("Show Source in Project", PingSource, (a) => DropdownMenuAction.Status.Normal);
+                }
             }
             evt.menu.AppendSeparator();
             if (evt.target is StickyNote)
diff --git a/Packages/com.unity.shadergraph/Editor/Drawing/Views/MaterialNodeView.cs b/Packages/com.unity.shadergraph/Editor/Drawing/Views/MaterialNodeView.cs
index 731a2941a75..fa97974a540 100644
--- a/Packages/com.unity.shadergraph/Editor/Drawing/Views/MaterialNodeView.cs
+++ b/Packages/com.unity.shadergraph/Editor/Drawing/Views/MaterialNodeView.cs
@@ -6,13 +6,10 @@
 using UnityEditor.Graphing;
 using UnityEditor.Graphing.Util;
 using UnityEditor.ShaderGraph.Drawing.Controls;
-using UnityEngine.Rendering;
 using UnityEditor.Experimental.GraphView;
 using UnityEditor.Rendering;
 using UnityEditor.ShaderGraph.Drawing.Inspector.PropertyDrawers;
-using UnityEditor.ShaderGraph.Internal;
 using UnityEngine.UIElements;
-using UnityEditor.UIElements;
 using Node = UnityEditor.Experimental.GraphView.Node;
 
 namespace UnityEditor.ShaderGraph.Drawing
@@ -73,7 +70,7 @@ public void Initialize(AbstractMaterialNode inNode, PreviewManager previewManage
                     foreach (IControlAttribute attribute in propertyInfo.GetCustomAttributes(typeof(IControlAttribute), false))
                         m_ControlItems.Add(attribute.InstantiateControl(node, propertyInfo));
             }
-            if (m_ControlItems.childCount > 0 || inNode is SubGraphNode)
+            if (m_ControlItems.childCount > 0 || inNode is SubGraphNode || inNode is ProviderSystem.ProviderNode)
                 contents.Add(controlsContainer);
 
             // Add dropdowns container
@@ -91,7 +88,7 @@ public void Initialize(AbstractMaterialNode inNode, PreviewManager previewManage
                 contents.Add(dropdownContainer);
             }
 
-            if (node.hasPreview && IsPreviewable(node))
+            if (node.hasPreview)
             {
                 // Add actual preview which floats on top of the node
                 m_PreviewContainer = new VisualElement
@@ -153,6 +150,10 @@ public void Initialize(AbstractMaterialNode inNode, PreviewManager previewManage
                     RegisterCallback<MouseDownEvent>(OnSubGraphDoubleClick);
                     m_UnregisterAll += () => { UnregisterCallback<MouseDownEvent>(OnSubGraphDoubleClick); };
                     break;
+                case ProviderSystem.ProviderNode:
+                    RegisterCallback<MouseDownEvent>(OnProviderDoubleClick);
+                    m_UnregisterAll += () => { UnregisterCallback<MouseDownEvent>(OnProviderDoubleClick); };
+                    break;
             }
 
             m_TitleContainer = this.Q("title");
@@ -195,11 +196,11 @@ public void AttachMessage(string errString, ShaderCompilerMessageSeverity severi
             IconBadge badge;
             if (severity == ShaderCompilerMessageSeverity.Error)
             {
-                badge = IconBadge.CreateError(errString);
+                badge = InternalBridge.IconBadge.CreateError(errString);
             }
             else
             {
-                badge = IconBadge.CreateComment(errString);
+                badge = InternalBridge.IconBadge.CreateComment(errString);
             }
 
             Add(badge);
@@ -340,6 +341,21 @@ void OnSubGraphDoubleClick(MouseDownEvent evt)
             }
         }
 
+        void OnProviderDoubleClick(MouseDownEvent evt)
+        {
+            if (evt.clickCount == 2 && evt.button == 0)
+            {
+                var providerNode = node as ProviderSystem.ProviderNode;
+                if (providerNode.Provider.IsValid && providerNode.Provider.AssetID != default)
+                {
+                    var path = AssetDatabase.GUIDToAssetPath(providerNode.Provider.AssetID);
+                    GraphUtil.OpenFile(path);
+                }
+                // Stop the double click event from starting a drag action on the node
+                evt.StopImmediatePropagation();
+            }
+        }
+
         public Node gvNode => this;
 
         [Inspectable("Node", null)]
@@ -485,7 +501,7 @@ public bool CanToggleNodeExpanded()
             return !(node is BlockNode) && m_CollapseButton.enabledInHierarchy;
         }
 
-        static bool IsPreviewable(AbstractMaterialNode node)
+        internal static bool IsPreviewable(AbstractMaterialNode node)
         {
             // only the first output slot is considered.
             foreach (var slot in node.GetOutputSlots<MaterialSlot>())
diff --git a/Packages/com.unity.shadergraph/Editor/Drawing/Views/PropertyNodeView.cs b/Packages/com.unity.shadergraph/Editor/Drawing/Views/PropertyNodeView.cs
index dcfd38e5ab8..8a0a2a2d1e1 100644
--- a/Packages/com.unity.shadergraph/Editor/Drawing/Views/PropertyNodeView.cs
+++ b/Packages/com.unity.shadergraph/Editor/Drawing/Views/PropertyNodeView.cs
@@ -326,11 +326,11 @@ public void AttachMessage(string errString, ShaderCompilerMessageSeverity severi
             IconBadge badge;
             if (severity == ShaderCompilerMessageSeverity.Error)
             {
-                badge = IconBadge.CreateError(errString);
+                badge = InternalBridge.IconBadge.CreateError(errString);
             }
             else
             {
-                badge = IconBadge.CreateComment(errString);
+                badge = InternalBridge.IconBadge.CreateComment(errString);
             }
 
             Add(badge);
diff --git a/Packages/com.unity.shadergraph/Editor/Drawing/Views/Slots/ColorRGBSlotControlView.cs b/Packages/com.unity.shadergraph/Editor/Drawing/Views/Slots/ColorRGBSlotControlView.cs
index f47522c2ee7..e34f7e02567 100644
--- a/Packages/com.unity.shadergraph/Editor/Drawing/Views/Slots/ColorRGBSlotControlView.cs
+++ b/Packages/com.unity.shadergraph/Editor/Drawing/Views/Slots/ColorRGBSlotControlView.cs
@@ -13,7 +13,10 @@ class ColorRGBSlotControlView : VisualElement
 
         public ColorRGBSlotControlView(ColorRGBMaterialSlot slot)
         {
-            styleSheets.Add(Resources.Load<StyleSheet>("Styles/Controls/ColorRGBSlotControlView"));
+            if (!slot.hideConnector)
+                styleSheets.Add(Resources.Load<StyleSheet>("Styles/Controls/ColorRGBSlotControlView"));
+            else styleSheets.Add(Resources.Load<StyleSheet>("Styles/Controls/ColorControlView"));
+
             m_Slot = slot;
             var colorField = new ColorField
             {
@@ -22,6 +25,10 @@ public ColorRGBSlotControlView(ColorRGBMaterialSlot slot)
                 showAlpha = false,
                 hdr = (slot.colorMode == ColorMode.HDR)
             };
+
+            if (slot.hideConnector)
+                colorField.label = slot.RawDisplayName();
+
             colorField.RegisterValueChangedCallback(OnValueChanged);
             Add(colorField);
         }
diff --git a/Packages/com.unity.shadergraph/Editor/Generation/Enumerations/PropertyType.cs b/Packages/com.unity.shadergraph/Editor/Generation/Enumerations/PropertyType.cs
index 023dc664de8..e09fd2dcc30 100644
--- a/Packages/com.unity.shadergraph/Editor/Generation/Enumerations/PropertyType.cs
+++ b/Packages/com.unity.shadergraph/Editor/Generation/Enumerations/PropertyType.cs
@@ -19,6 +19,7 @@ public enum PropertyType
         Matrix4,
         SamplerState,
         VirtualTexture,
-        PropertyConnectionState
+        PropertyConnectionState,
+        External
     }
 }
diff --git a/Packages/com.unity.shadergraph/Editor/Generation/Processors/Generator.cs b/Packages/com.unity.shadergraph/Editor/Generation/Processors/Generator.cs
index 993e5fd3ad7..fb9d8db6aaf 100644
--- a/Packages/com.unity.shadergraph/Editor/Generation/Processors/Generator.cs
+++ b/Packages/com.unity.shadergraph/Editor/Generation/Processors/Generator.cs
@@ -34,27 +34,28 @@ struct GeneratedShader
     class Generator
     {
         #region ProfileMarkers
-        static readonly ProfilerMarker s_profileGenerateShaderPass = new ProfilerMarker("GenerateShaderPass");
-        static readonly ProfilerMarker s_profileCollectShaderKeywords = new ProfilerMarker("CollectShaderKeywords");
-        static readonly ProfilerMarker s_profileGetCurrentTargetActiveBlocks = new ProfilerMarker("GetCurrentTargetActiveBlocks");
-        static readonly ProfilerMarker s_profileProcessStackForPass = new ProfilerMarker("ProcessStackForPass");
-        static readonly ProfilerMarker s_profileGetActiveFieldsFromUpstreamNodes = new ProfilerMarker("GetActiveFieldsFromUpstreamNodes");
-        static readonly ProfilerMarker s_profileGetActiveFieldsFromPass = new ProfilerMarker("GetActiveFieldsFromPass");
-        static readonly ProfilerMarker s_profilePropagateActiveFieldReqs = new ProfilerMarker("PropagateActiveFieldReqs");
-        static readonly ProfilerMarker s_profileRenderState = new ProfilerMarker("RenderState");
-        static readonly ProfilerMarker s_profilePragmas = new ProfilerMarker("Pragmas");
-        static readonly ProfilerMarker s_profileKeywords = new ProfilerMarker("Keywords");
-        static readonly ProfilerMarker s_profileStructsAndPacking = new ProfilerMarker("StructsAndPacking");
-        static readonly ProfilerMarker s_profileStructTypes = new ProfilerMarker("StructTypes");
-        static readonly ProfilerMarker s_profileGraphVertex = new ProfilerMarker("GraphVertex");
-        static readonly ProfilerMarker s_profileGenerateVertexDescriptionStruct = new ProfilerMarker("GenerateVertexDescriptionStruct");
-        static readonly ProfilerMarker s_profileGenerateVertexDescriptionFunction = new ProfilerMarker("GenerateVertexDescriptionFunction");
-        static readonly ProfilerMarker s_profileGraphPixel = new ProfilerMarker("GraphPixel");
-        static readonly ProfilerMarker s_profileGraphFunctions = new ProfilerMarker("GraphFunctions");
-        static readonly ProfilerMarker s_profileGraphKeywords = new ProfilerMarker("GraphKeywords");
-        static readonly ProfilerMarker s_profileGraphProperties = new ProfilerMarker("GraphProperties");
-        static readonly ProfilerMarker s_profileGraphDefines = new ProfilerMarker("GraphDefines");
-        static readonly ProfilerMarker s_profileProcessTemplate = new ProfilerMarker("ProcessTemplate");
+        //UUM-117133;
+        //static readonly ProfilerMarker s_profileGenerateShaderPass = new ProfilerMarker("GenerateShaderPass");
+        //static readonly ProfilerMarker s_profileCollectShaderKeywords = new ProfilerMarker("CollectShaderKeywords");
+        //static readonly ProfilerMarker s_profileGetCurrentTargetActiveBlocks = new ProfilerMarker("GetCurrentTargetActiveBlocks");
+        //static readonly ProfilerMarker s_profileProcessStackForPass = new ProfilerMarker("ProcessStackForPass");
+        //static readonly ProfilerMarker s_profileGetActiveFieldsFromUpstreamNodes = new ProfilerMarker("GetActiveFieldsFromUpstreamNodes");
+        //static readonly ProfilerMarker s_profileGetActiveFieldsFromPass = new ProfilerMarker("GetActiveFieldsFromPass");
+        //static readonly ProfilerMarker s_profilePropagateActiveFieldReqs = new ProfilerMarker("PropagateActiveFieldReqs");
+        //static readonly ProfilerMarker s_profileRenderState = new ProfilerMarker("RenderState");
+        //static readonly ProfilerMarker s_profilePragmas = new ProfilerMarker("Pragmas");
+        //static readonly ProfilerMarker s_profileKeywords = new ProfilerMarker("Keywords");
+        //static readonly ProfilerMarker s_profileStructsAndPacking = new ProfilerMarker("StructsAndPacking");
+        //static readonly ProfilerMarker s_profileStructTypes = new ProfilerMarker("StructTypes");
+        //static readonly ProfilerMarker s_profileGraphVertex = new ProfilerMarker("GraphVertex");
+        //static readonly ProfilerMarker s_profileGenerateVertexDescriptionStruct = new ProfilerMarker("GenerateVertexDescriptionStruct");
+        //static readonly ProfilerMarker s_profileGenerateVertexDescriptionFunction = new ProfilerMarker("GenerateVertexDescriptionFunction");
+        //static readonly ProfilerMarker s_profileGraphPixel = new ProfilerMarker("GraphPixel");
+        //static readonly ProfilerMarker s_profileGraphFunctions = new ProfilerMarker("GraphFunctions");
+        //static readonly ProfilerMarker s_profileGraphKeywords = new ProfilerMarker("GraphKeywords");
+        //static readonly ProfilerMarker s_profileGraphProperties = new ProfilerMarker("GraphProperties");
+        //static readonly ProfilerMarker s_profileGraphDefines = new ProfilerMarker("GraphDefines");
+        //static readonly ProfilerMarker s_profileProcessTemplate = new ProfilerMarker("ProcessTemplate");
         #endregion
 
 
@@ -567,7 +568,8 @@ void GenerateShaderPass(int targetIndex, PassDescriptor pass, ActiveFields activ
             if (m_Mode == GenerationMode.Preview && !pass.useInPreview)
                 return;
 
-            using (s_profileGenerateShaderPass.Auto()) {
+            // using (s_profileGenerateShaderPass.Auto())
+            {
 
             // --------------------------------------------------
             // Debug
@@ -596,7 +598,7 @@ void GenerateShaderPass(int targetIndex, PassDescriptor pass, ActiveFields activ
             // Initialize Collectors
             var propertyCollector = new PropertyCollector();
             var keywordCollector = new KeywordCollector();
-            using (s_profileCollectShaderKeywords.Auto())
+            // using (s_profileCollectShaderKeywords.Auto())
                 m_GraphData.CollectShaderKeywords(keywordCollector, m_Mode);
 
             // Get upstream nodes from ShaderPass port mask
@@ -611,7 +613,7 @@ void GenerateShaderPass(int targetIndex, PassDescriptor pass, ActiveFields activ
             {
                 // Update supported block list for current target implementation
                 var activeBlockContext = new TargetActiveBlockContext(currentBlockDescriptors, pass);
-                using (s_profileGetCurrentTargetActiveBlocks.Auto())
+                // using (s_profileGetCurrentTargetActiveBlocks.Auto())
                     m_Targets[targetIndex].GetActiveBlocks(ref activeBlockContext);
 
                 void ProcessStackForPass(ContextData contextData, BlockFieldDescriptor[] passBlockMask,
@@ -622,7 +624,7 @@ void ProcessStackForPass(ContextData contextData, BlockFieldDescriptor[] passBlo
                         return;
                     }
 
-                    using (s_profileProcessStackForPass.Auto())
+                    // using (s_profileProcessStackForPass.Auto())
                     foreach (var blockFieldDescriptor in passBlockMask)
                     {
                         // Mask blocks on active state
@@ -692,7 +694,7 @@ void ProcessStackForPass(ContextData contextData, BlockFieldDescriptor[] passBlo
 
             // Get active fields from upstream Node requirements
             ShaderGraphRequirementsPerKeyword graphRequirements;
-            using(s_profileGetActiveFieldsFromUpstreamNodes.Auto())
+            // using(s_profileGetActiveFieldsFromUpstreamNodes.Auto())
                 GenerationUtils.GetActiveFieldsAndPermutationsForNodes(pass, keywordCollector, vertexNodes, pixelNodes, new bool[ShaderGeneratorNames.UVCount], vertexNodePermutations, pixelNodePermutations, activeFields, out graphRequirements);
 
             // Moved this up so that we can reuse the information to figure out which struct Descriptors
@@ -706,7 +708,7 @@ void ProcessStackForPass(ContextData contextData, BlockFieldDescriptor[] passBlo
             passStructs = customInterpSubGen.CopyModifyExistingPassStructs(passStructs, activeFields.baseInstance);
 
             // Get active fields from ShaderPass
-            using (s_profileGetActiveFieldsFromPass.Auto())
+            // using (s_profileGetActiveFieldsFromPass.Auto())
                 GenerationUtils.AddRequiredFields(pass.requiredFields, activeFields.baseInstance);
 
             // Function Registry
@@ -729,7 +731,7 @@ void ProcessStackForPass(ContextData contextData, BlockFieldDescriptor[] passBlo
 
             // Propagate active field requirements using dependencies
             // Must be executed before types are built
-            using(s_profilePropagateActiveFieldReqs.Auto())
+            // using(s_profilePropagateActiveFieldReqs.Auto())
             foreach (var instance in activeFields.all.instances)
             {
                 GenerationUtils.ApplyFieldDependencies(instance, pass.fieldDependencies);
@@ -762,7 +764,7 @@ void ProcessStackForPass(ContextData contextData, BlockFieldDescriptor[] passBlo
             // Pass Code
 
             // Render State
-            using (s_profileRenderState.Auto())
+            // using (s_profileRenderState.Auto())
             using (var renderStateBuilder = new ShaderStringBuilder(humanReadable: m_HumanReadable))
             {
                 // Render states need to be separated by RenderState.Type
@@ -791,7 +793,7 @@ void ProcessStackForPass(ContextData contextData, BlockFieldDescriptor[] passBlo
                 spliceCommands.Add("RenderState", command);
             }
             // Pragmas
-            using (s_profilePragmas.Auto())
+            // using (s_profilePragmas.Auto())
             using (var passPragmaBuilder = new ShaderStringBuilder(humanReadable: m_HumanReadable))
             {
                 if (pass.pragmas != null)
@@ -814,7 +816,7 @@ void ProcessStackForPass(ContextData contextData, BlockFieldDescriptor[] passBlo
                 spliceCommands.Add("PassPragmas", command);
             }
             // Keywords
-            using (s_profileKeywords.Auto())
+            // using (s_profileKeywords.Auto())
             using (var passKeywordBuilder = new ShaderStringBuilder(humanReadable: m_HumanReadable))
             {
                 if (pass.keywords != null)
@@ -841,7 +843,8 @@ void ProcessStackForPass(ContextData contextData, BlockFieldDescriptor[] passBlo
             // -----------------------------
             // Generated structs and Packing code
             var interpolatorBuilder = new ShaderStringBuilder(humanReadable: m_HumanReadable);
-            using (s_profileStructsAndPacking.Auto()) {
+            // using (s_profileStructsAndPacking.Auto())
+            {
             if (passStructs != null)
             {
                 var packedStructs = new List<StructDescriptor>();
@@ -906,7 +909,8 @@ void ProcessStackForPass(ContextData contextData, BlockFieldDescriptor[] passBlo
 
             // Generated String Builders for all struct types            
             var passStructBuilder = new ShaderStringBuilder(humanReadable: m_HumanReadable);
-            using (s_profileStructTypes.Auto()) {
+            // using (s_profileStructTypes.Auto())
+            {
             if (passStructs != null)
             {
                 var structBuilder = new ShaderStringBuilder(humanReadable: m_HumanReadable);
@@ -930,7 +934,8 @@ void ProcessStackForPass(ContextData contextData, BlockFieldDescriptor[] passBlo
             var vertexBuilder = new ShaderStringBuilder(humanReadable: m_HumanReadable);
 
             // If vertex modification enabled
-            using (s_profileGraphVertex.Auto()) {
+            // using (s_profileGraphVertex.Auto())
+            {
             if (activeFields.baseInstance.Contains(Fields.GraphVertex) && vertexSlots != null)
                 {
                     // Setup
@@ -942,11 +947,11 @@ void ProcessStackForPass(ContextData contextData, BlockFieldDescriptor[] passBlo
 
                     // Build vertex graph outputs
                     // Add struct fields to active fields
-                    using(s_profileGenerateVertexDescriptionStruct.Auto())
+                    // using(s_profileGenerateVertexDescriptionStruct.Auto())
                     GenerationUtils.GenerateVertexDescriptionStruct(vertexGraphOutputBuilder, vertexSlots, vertexGraphOutputName, activeFields.baseInstance);
 
                     // Build vertex graph functions from ShaderPass vertex port mask
-                    using(s_profileGenerateVertexDescriptionFunction.Auto())
+                    // using(s_profileGenerateVertexDescriptionFunction.Auto())
                     GenerationUtils.GenerateVertexDescriptionFunction(
                         m_GraphData,
                         vertexGraphFunctionBuilder,
@@ -991,7 +996,8 @@ void ProcessStackForPass(ContextData contextData, BlockFieldDescriptor[] passBlo
             string pixelGraphFunctionName = "SurfaceDescriptionFunction";
             var pixelGraphOutputBuilder = new ShaderStringBuilder(humanReadable: m_HumanReadable);
             var pixelGraphFunctionBuilder = new ShaderStringBuilder(humanReadable: m_HumanReadable);
-            using (s_profileGraphPixel.Auto()) {
+            // using (s_profileGraphPixel.Auto())
+            {
             // Build pixel graph outputs
             // Add struct fields to active fields
             GenerationUtils.GenerateSurfaceDescriptionStruct(pixelGraphOutputBuilder, pixelSlots, pixelGraphOutputName, activeFields.baseInstance, m_OutputNode is SubGraphOutputNode, pass.virtualTextureFeedback);
@@ -1030,14 +1036,15 @@ void ProcessStackForPass(ContextData contextData, BlockFieldDescriptor[] passBlo
 
             // --------------------------------------------------
             // Graph Functions
-            using (s_profileGraphFunctions.Auto()) {
+            // using (s_profileGraphFunctions.Auto())
+            {
             if (functionBuilder.length == 0)
                 functionBuilder.AppendLine("// GraphFunctions: <None>");
             spliceCommands.Add("GraphFunctions", functionBuilder.ToCodeBlock());
             }
             // --------------------------------------------------
             // Graph Keywords
-            using (s_profileGraphKeywords.Auto())
+            // using (s_profileGraphKeywords.Auto())
             using (var keywordBuilder = new ShaderStringBuilder(humanReadable: m_HumanReadable))
             {
                 keywordCollector.GetKeywordsDeclaration(keywordBuilder, m_Mode);
@@ -1048,7 +1055,7 @@ void ProcessStackForPass(ContextData contextData, BlockFieldDescriptor[] passBlo
 
             // --------------------------------------------------
             // Graph Properties
-            using (s_profileGraphProperties.Auto())
+            // using (s_profileGraphProperties.Auto())
             using (var propertyBuilder = new ShaderStringBuilder(humanReadable: m_HumanReadable))
             {
                 subShaderProperties.GetPropertiesDeclaration(propertyBuilder, m_Mode, m_GraphData.graphDefaultConcretePrecision);
@@ -1074,7 +1081,7 @@ void ProcessStackForPass(ContextData contextData, BlockFieldDescriptor[] passBlo
 
             // --------------------------------------------------
             // Graph Defines
-            using(s_profileGraphDefines.Auto())
+            // using(s_profileGraphDefines.Auto())
             using (var graphDefines = new ShaderStringBuilder(humanReadable: m_HumanReadable))
             {
                 graphDefines.AppendLine("#define SHADERPASS {0}", pass.referenceName);
@@ -1246,7 +1253,7 @@ void ProcessStackForPass(ContextData contextData, BlockFieldDescriptor[] passBlo
             // Process Template
             var templatePreprocessor = new ShaderSpliceUtil.TemplatePreprocessor(activeFields, spliceCommands,
                 isDebug, sharedTemplateDirectories, m_AssetCollection, m_HumanReadable, m_IncludeCache);
-            using (s_profileProcessTemplate.Auto())
+            // using (s_profileProcessTemplate.Auto())
                 templatePreprocessor.ProcessTemplateFile(passTemplatePath);
             m_Builder.Concat(templatePreprocessor.GetShaderCode());
 
diff --git a/Packages/com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/ShaderLibrary/Shadows.hlsl b/Packages/com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/ShaderLibrary/Shadows.hlsl
index 7ed9e206705..6ac285ffcc4 100644
--- a/Packages/com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/ShaderLibrary/Shadows.hlsl
+++ b/Packages/com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/ShaderLibrary/Shadows.hlsl
@@ -218,8 +218,8 @@ real SampleShadowmapFiltered(TEXTURE2D_SHADOW_PARAM(ShadowMap, sampler_ShadowMap
     attenuation4.w = SAMPLE_TEXTURE2D_SHADOW(ShadowMap, sampler_ShadowMap, shadowCoord.xyz + samplingData.shadowOffset3.xyz);
     attenuation = dot(attenuation4, 0.25);
 #else
-    float fetchesWeights[9];
-    float2 fetchesUV[9];
+    real fetchesWeights[9];
+    real2 fetchesUV[9];
     SampleShadow_ComputeSamples_Tent_5x5(samplingData.shadowmapSize, shadowCoord.xy, fetchesWeights, fetchesUV);
 
     attenuation = fetchesWeights[0] * SAMPLE_TEXTURE2D_SHADOW(ShadowMap, sampler_ShadowMap, float3(fetchesUV[0].xy, shadowCoord.z));
diff --git a/Packages/com.unity.shadergraph/Editor/Importers/ShaderGraphImporterEditor.cs b/Packages/com.unity.shadergraph/Editor/Importers/ShaderGraphImporterEditor.cs
index f16a0d85771..f383ea34bbc 100644
--- a/Packages/com.unity.shadergraph/Editor/Importers/ShaderGraphImporterEditor.cs
+++ b/Packages/com.unity.shadergraph/Editor/Importers/ShaderGraphImporterEditor.cs
@@ -25,6 +25,9 @@ class ShaderGraphImporterEditor : ScriptedImporterEditor
 
         public override void OnInspectorGUI()
         {
+            var hasFocus = EditorWindow.focusedWindow is InspectorWindow;
+
+            serializedObject.Update();
             GraphData GetGraphData(AssetImporter importer)
             {
                 var textGraph = File.ReadAllText(importer.assetPath, Encoding.UTF8);
@@ -140,7 +143,7 @@ GraphData GetGraphData(AssetImporter importer)
             EditorGUILayout.Space();
             EditorGUI.BeginChangeCheck();
             EditorGUILayout.PropertyField(serializedObject.FindProperty(ShaderGraphImporter.UseAsTemplateFieldName));
-            needsReimport |= EditorGUI.EndChangeCheck();
+            needsSaveMetaFile |= EditorGUI.EndChangeCheck();
             using (new EditorGUI.IndentLevelScope(1))
             using (new EditorGUI.DisabledScope(!(target as ShaderGraphImporter)?.UseAsTemplate ?? true))
             {
@@ -153,8 +156,6 @@ GraphData GetGraphData(AssetImporter importer)
                 needsSaveMetaFile |= EditorGUI.EndChangeCheck();
             }
 
-            ApplyRevertGUI();
-
             if (materialEditor)
             {
                 EditorGUILayout.Space();
@@ -162,28 +163,18 @@ GraphData GetGraphData(AssetImporter importer)
                 using (new EditorGUI.DisabledGroupScope(true))
                     materialEditor.OnInspectorGUI();
             }
-        }
 
-        protected override void Apply()
-        {
-            base.Apply();
-            var importer = (AssetImporter)target;
-            if (needsSaveMetaFile)
+            serializedObject.ApplyModifiedProperties();
+            if (!hasFocus)
             {
-                AssetDatabase.ForceReserializeAssets(new []{ importer.assetPath }, ForceReserializeAssetsOptions.ReserializeMetadata);
+                ApplyChanges();
             }
-            if (needsReimport)
-            {
-                AssetDatabase.ImportAsset(importer.assetPath);
-            }
-            needsSaveMetaFile = false;
-            needsReimport = false;
         }
 
         public override void OnEnable()
         {
             base.OnEnable();
-            AssetImporter importer = target as AssetImporter;
+            AssetImporter importer = (AssetImporter)target;
             var material = AssetDatabase.LoadAssetAtPath<Material>(importer.assetPath);
             if (material)
                 materialEditor = (MaterialEditor)CreateEditor(material);
@@ -232,5 +223,20 @@ public static bool OnOpenAsset(EntityId entityId, int line)
             var path = AssetDatabase.GetAssetPath(entityId);
             return ShowGraphEditWindow(path);
         }
+
+        void ApplyChanges()
+        {
+            var importer = (AssetImporter)target;
+            if (needsSaveMetaFile)
+            {
+                AssetDatabase.ForceReserializeAssets(new []{ importer.assetPath }, ForceReserializeAssetsOptions.ReserializeMetadata);
+            }
+            if (needsReimport || needsSaveMetaFile)
+            {
+                AssetDatabase.ImportAsset(importer.assetPath);
+            }
+            needsSaveMetaFile = false;
+            needsReimport = false;
+        }
     }
 }
diff --git a/Packages/com.unity.shadergraph/Editor/InternalBridge/IconBadge.cs b/Packages/com.unity.shadergraph/Editor/InternalBridge/IconBadge.cs
new file mode 100644
index 00000000000..1e442d850b9
--- /dev/null
+++ b/Packages/com.unity.shadergraph/Editor/InternalBridge/IconBadge.cs
@@ -0,0 +1,24 @@
+using GraphViewIconBadge = UnityEditor.Experimental.GraphView.IconBadge;
+
+namespace UnityEditor.ShaderGraph.InternalBridge
+{
+    // Wrapper class for internal access to GraphView's IconBadge.
+    // Allows for creation of badges which don't manually layout their label's dimensions. Works around
+    // a GraphView bug.
+    internal static class IconBadge
+    {
+        public static GraphViewIconBadge CreateError(string message)
+        {
+            var result = GraphViewIconBadge.CreateError(message);
+            result.m_ComputeTextBoundingBox = false;
+            return result;
+        }
+
+        public static GraphViewIconBadge CreateComment(string message)
+        {
+            var result = GraphViewIconBadge.CreateComment(message);
+            result.m_ComputeTextBoundingBox = false;
+            return result;
+        }
+    }
+}
diff --git a/Packages/com.unity.shadergraph/Editor/InternalBridge/IconBadge.cs.meta b/Packages/com.unity.shadergraph/Editor/InternalBridge/IconBadge.cs.meta
new file mode 100644
index 00000000000..c1cc195fd6a
--- /dev/null
+++ b/Packages/com.unity.shadergraph/Editor/InternalBridge/IconBadge.cs.meta
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: 5c787299c2fabe242bc0bd089105b90e
\ No newline at end of file
diff --git a/Packages/com.unity.shadergraph/Editor/ProviderSystem.meta b/Packages/com.unity.shadergraph/Editor/ProviderSystem.meta
new file mode 100644
index 00000000000..a0fcb5ee341
--- /dev/null
+++ b/Packages/com.unity.shadergraph/Editor/ProviderSystem.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: a732a096a67254fb5a6d30afa8148e42
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Packages/com.unity.shadergraph/Editor/ProviderSystem/CommonShaderObjects.cs b/Packages/com.unity.shadergraph/Editor/ProviderSystem/CommonShaderObjects.cs
new file mode 100644
index 00000000000..a5bc838e3cf
--- /dev/null
+++ b/Packages/com.unity.shadergraph/Editor/ProviderSystem/CommonShaderObjects.cs
@@ -0,0 +1,61 @@
+
+using System.Collections.Immutable;
+using System.Collections.Generic;
+
+namespace UnityEditor.ShaderGraph.ProviderSystem
+{
+    internal struct ShaderType : IShaderType
+    {
+        public bool IsValid { get; private set; }
+        public string Name { get; private set; }
+        internal ShaderType(string name)
+        {
+            IsValid = true;
+            Name = name;
+        }
+    }
+
+    internal struct ShaderField : IShaderField
+    {
+        public bool IsValid { get; private set; }
+        public string Name { get; private set; }
+        public bool IsInput { get; private set; }
+        public bool IsOutput { get; private set; }
+        public IShaderType ShaderType { get; private set; }
+        public IReadOnlyDictionary<string, string> Hints { get; private set; }
+
+
+        internal ShaderField(string name, bool isInput, bool isOutput, IShaderType shaderType, IReadOnlyDictionary<string, string> hints)
+        {
+            IsValid = true;
+            Name = name;
+            IsInput = isInput;
+            IsOutput = isOutput;
+            ShaderType = shaderType;
+            Hints = hints ?? ImmutableDictionary<string, string>.Empty;
+        }
+    }
+
+    internal struct ShaderFunction : IShaderFunction
+    {
+        public bool IsValid { get; private set; }
+        public string Name { get; private set; }
+        public IShaderType ReturnType { get; private set; }
+        public string FunctionBody { get; private set; }
+        public IEnumerable<string> Namespace { get; private set; }
+        public IEnumerable<IShaderField> Parameters { get; private set; }
+        public IReadOnlyDictionary<string, string> Hints { get; private set; }
+
+        internal ShaderFunction(string name, IEnumerable<string> namespaces, IEnumerable<IShaderField> parameters, IShaderType returnType, string functionBody, IReadOnlyDictionary<string, string> hints)
+        {
+            IsValid = true;
+            Name = name;
+            ReturnType = returnType;
+            FunctionBody = functionBody;
+
+            Parameters = parameters ?? ImmutableArray<IShaderField>.Empty;
+            Namespace = namespaces ?? ImmutableArray<string>.Empty;
+            Hints = hints ?? ImmutableDictionary<string, string>.Empty;
+        }
+    }
+}
diff --git a/Packages/com.unity.shadergraph/Editor/ProviderSystem/CommonShaderObjects.cs.meta b/Packages/com.unity.shadergraph/Editor/ProviderSystem/CommonShaderObjects.cs.meta
new file mode 100644
index 00000000000..32e5ef34f63
--- /dev/null
+++ b/Packages/com.unity.shadergraph/Editor/ProviderSystem/CommonShaderObjects.cs.meta
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: 6c992aa7356b6d242ad431b5ab535c19
\ No newline at end of file
diff --git a/Packages/com.unity.shadergraph/Editor/ProviderSystem/IDefinitionProvider.cs b/Packages/com.unity.shadergraph/Editor/ProviderSystem/IDefinitionProvider.cs
new file mode 100644
index 00000000000..b87a4738e38
--- /dev/null
+++ b/Packages/com.unity.shadergraph/Editor/ProviderSystem/IDefinitionProvider.cs
@@ -0,0 +1,52 @@
+using System.Collections.Generic;
+using System.Collections.Immutable;
+using UnityEngine;
+
+namespace UnityEditor.ShaderGraph.ProviderSystem
+{
+    // Data needed to represent a valid shader object and supplemental information
+    // on how this object might be presented in different contexts.
+    // Shader Object itself is Context and Domain agnostic.
+    internal interface IShaderObject
+    {
+        bool IsValid { get; }
+        string Name { get; }
+        IEnumerable<string> Namespace => ImmutableArray<string>.Empty;
+        IReadOnlyDictionary<string, string> Hints => ImmutableDictionary<string, string>.Empty;
+    }
+
+    internal interface IShaderType : IShaderObject { }
+
+    internal interface IShaderField : IShaderObject
+    {
+        bool IsInput { get; }
+        bool IsOutput { get; }
+        IShaderType ShaderType { get; }
+    }
+
+    internal interface IShaderFunction : IShaderObject
+    {
+        IShaderType ReturnType { get; }
+        string FunctionBody { get; }
+        IEnumerable<IShaderField> Parameters { get; }
+    }
+
+    // Abstracts how or where an IShaderObject may be defined,
+    // allowing for various Domains to use IShaderObjects in a
+    // context free manner.
+    internal interface IProvider
+    {
+        string ProviderKey { get; }
+        GUID AssetID { get; }
+        bool IsValid { get; }
+
+        void Reload() { }
+        IProvider Clone();
+    }
+
+    internal interface IProvider<T> : IProvider where T : IShaderObject
+    {
+        T Definition { get; }
+        bool IProvider.IsValid => Definition?.IsValid ?? false;
+    }
+}
diff --git a/Packages/com.unity.shadergraph/Editor/ProviderSystem/IDefinitionProvider.cs.meta b/Packages/com.unity.shadergraph/Editor/ProviderSystem/IDefinitionProvider.cs.meta
new file mode 100644
index 00000000000..bb94e110337
--- /dev/null
+++ b/Packages/com.unity.shadergraph/Editor/ProviderSystem/IDefinitionProvider.cs.meta
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: 8fdab7687958d874e92d2679b0b758da
\ No newline at end of file
diff --git a/Packages/com.unity.shadergraph/Editor/ProviderSystem/Model.meta b/Packages/com.unity.shadergraph/Editor/ProviderSystem/Model.meta
new file mode 100644
index 00000000000..749fb2a7a12
--- /dev/null
+++ b/Packages/com.unity.shadergraph/Editor/ProviderSystem/Model.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: ea92addb84cbc48fdb625329928f7b2c
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Packages/com.unity.shadergraph/Editor/ProviderSystem/Model/ExpressionNode.cs b/Packages/com.unity.shadergraph/Editor/ProviderSystem/Model/ExpressionNode.cs
new file mode 100644
index 00000000000..de978ed7b1e
--- /dev/null
+++ b/Packages/com.unity.shadergraph/Editor/ProviderSystem/Model/ExpressionNode.cs
@@ -0,0 +1,71 @@
+
+using System;
+using UnityEditor.ShaderGraph.Drawing.Controls;
+using UnityEditor.ShaderGraph.Internal;
+using UnityEngine;
+
+namespace UnityEditor.ShaderGraph.ProviderSystem
+{
+    [Serializable]
+    [ProviderModel(ExpressionProvider.kExpressionProviderKey)]
+    internal class ExpressionNode : ProviderNode
+    {
+        ExpressionProvider TypedProvider => Provider as ExpressionProvider;
+
+        string hlslFunctionName => $"ExpressionNode_{this.objectId}";
+
+        enum SupportedTypes { Vector1, Vector2, Vector3, Vector4 }
+
+        [EnumControl("Type")]
+        SupportedTypes SelectedType {
+            get => FromTypeName(TypedProvider.ShaderType);
+            set
+            {
+                string typeName = ToTypeName(value);
+                TypedProvider.UpdateExpression(hlslFunctionName, Expression, typeName);
+                Refresh();
+            }
+        }
+
+        internal override bool requiresGeneration => true;
+
+        [TextControl(null, true)]
+        internal string Expression
+        {
+            get => TypedProvider.Expression;
+            set
+            {
+                if (value == null) // Text control can misbehave in undo redo scenarios; we'll need to visit that separately.
+                    return;
+                TypedProvider.UpdateExpression(hlslFunctionName, value, TypedProvider.ShaderType);
+                Refresh();
+            }
+        }
+
+        public ExpressionNode() { }
+
+        static SupportedTypes FromTypeName(string stype)
+        {
+            switch (stype)
+            {
+                default:
+                case "float": return SupportedTypes.Vector1;
+                case "float2": return SupportedTypes.Vector2;
+                case "float3": return SupportedTypes.Vector3;
+                case "float4": return SupportedTypes.Vector4;
+            }
+        }
+
+        static string ToTypeName(SupportedTypes etype)
+        {
+            switch (etype)
+            {
+                default:
+                case SupportedTypes.Vector1: return "float";
+                case SupportedTypes.Vector2: return "float2";
+                case SupportedTypes.Vector3: return "float3";
+                case SupportedTypes.Vector4: return "float4";
+            }
+        }
+    }
+}
diff --git a/Packages/com.unity.shadergraph/Editor/ProviderSystem/Model/ExpressionNode.cs.meta b/Packages/com.unity.shadergraph/Editor/ProviderSystem/Model/ExpressionNode.cs.meta
new file mode 100644
index 00000000000..0cd335aa868
--- /dev/null
+++ b/Packages/com.unity.shadergraph/Editor/ProviderSystem/Model/ExpressionNode.cs.meta
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: de4ff50ed93d84498b2e949adfb6a307
\ No newline at end of file
diff --git a/Packages/com.unity.shadergraph/Editor/ProviderSystem/Model/ExpressionProvider.cs b/Packages/com.unity.shadergraph/Editor/ProviderSystem/Model/ExpressionProvider.cs
new file mode 100644
index 00000000000..2a284bd23fe
--- /dev/null
+++ b/Packages/com.unity.shadergraph/Editor/ProviderSystem/Model/ExpressionProvider.cs
@@ -0,0 +1,128 @@
+using System;
+using System.Collections.Generic;
+using System.Text.RegularExpressions;
+using UnityEditor.Graphing;
+using UnityEngine;
+
+namespace UnityEditor.ShaderGraph.ProviderSystem
+{
+    [Serializable]
+    [ScriptedProvider]
+    internal class ExpressionProvider : IProvider<IShaderFunction>
+    {
+        internal const string kExpressionProviderKey = "unity:shadergraph:scripted:Expression";
+        public string ProviderKey => kExpressionProviderKey;
+        public GUID AssetID => default;
+        public bool RequiresGeneration => true;
+        private static readonly string[] kNamespace = { "unity", "shadergraph", "expression" };
+
+        internal string Expression => m_expression;
+        internal string ShaderType => m_type;
+
+        public IShaderFunction Definition
+        {
+            get
+            {
+                if (m_definition == null || !m_definition.IsValid)
+                {
+                    UpdateExpression(m_name, m_expression, m_type);
+                }
+                return m_definition;
+            }
+        }
+
+        [SerializeField]
+        string m_name;
+
+        [SerializeField]
+        string m_expression;
+
+        [SerializeField]
+        string m_type;
+
+        [NonSerialized]
+        IShaderFunction m_definition;
+
+        internal ExpressionProvider() : this("Expression", "", "float") { }
+
+        internal ExpressionProvider(string name, string expression, string type)
+        {
+            UpdateExpression(name, expression, type);
+        }
+
+        public void Reload()
+        {
+            m_definition = ExpressionToShaderFunction(m_name, m_expression, m_type, out _);
+        }
+
+        static IReadOnlyDictionary<string, string> StandardHints = new Dictionary<string, string>()
+        {
+            { Hints.Common.kDisplayName, "Expression" },
+            { Hints.Func.kProviderKey,  kExpressionProviderKey },
+            { Hints.Func.kSearchName, "Expression" },
+            { Hints.Func.kCategory, "Utility" },
+            { Hints.Func.kSearchTerms, "equation, calculation, inline, code" }
+        };
+
+        internal void UpdateExpression(string name, string expression, string type)
+        {
+            m_name = name;
+            m_type = type;
+            m_expression = expression;
+            Reload();
+        }
+
+        public IProvider Clone()
+            => new ExpressionProvider(m_name, m_expression, m_type);
+
+        internal static IShaderFunction ExpressionToShaderFunction(string name, string expression, string type, out string finalExpression)
+        {
+            // don't create fields from comments
+            const string kCommentRegex = @"(\/\*.*?\*\/)|(\/\/.*)";
+
+            // pattern for getting valid identifiers that aren't functions or members,
+            // included expanded european character set.
+            const string kIdentifierRegex = @"(?<!\.)\b[a-zA-ZŽžÀ-ÿ_][a-zA-ZŽžÀ-ÿ0-9_]*\b(?!\s*[\(])";
+
+            List<string> orderedNames = new();
+            HashSet<string> usedNames = new();
+
+            // gather the list of identifiers, deduplicate them, and ignore if they are reserved keywords.
+            string HandleName(string name)
+            {
+                if (!usedNames.Contains(name) && !IsReserved(name))
+                {
+                    usedNames.Add(name);
+                    orderedNames.Add(name);
+                }
+                return name;
+            }
+
+            // clean out comments.
+            expression = Regex.Replace(expression, kCommentRegex, "");
+
+            // process identifiers.
+            expression = Regex.Replace(expression, kIdentifierRegex, e => HandleName(e.Value));
+
+            finalExpression = expression;
+
+            // default initialize if there is no expression left.
+            if (string.IsNullOrWhiteSpace(expression))
+                expression = $"({type})0";
+
+            IShaderType shaderType = new ShaderType(type);
+
+            List<IShaderField> parameters = new();
+            foreach (var paramName in orderedNames)
+                parameters.Add(new ShaderField(paramName, true, false, shaderType, null));
+
+            // trust that the name and type is valid.
+            return new ShaderFunction(name, kNamespace, parameters, shaderType, $"return {expression};", StandardHints);
+        }
+
+        private static bool IsReserved(string name)
+        {
+            return NodeUtils.IsShaderLabKeyWord(name) || NodeUtils.IsShaderGraphKeyWord(name) || NodeUtils.IsHLSLKeyword(name);
+        }
+    }
+}
diff --git a/Packages/com.unity.shadergraph/Editor/ProviderSystem/Model/ExpressionProvider.cs.meta b/Packages/com.unity.shadergraph/Editor/ProviderSystem/Model/ExpressionProvider.cs.meta
new file mode 100644
index 00000000000..425f937b003
--- /dev/null
+++ b/Packages/com.unity.shadergraph/Editor/ProviderSystem/Model/ExpressionProvider.cs.meta
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: 854d9d5b7499b4de8b33efe89dc97d2e
\ No newline at end of file
diff --git a/Packages/com.unity.shadergraph/Editor/ProviderSystem/Model/ExternalMaterialSlot.cs b/Packages/com.unity.shadergraph/Editor/ProviderSystem/Model/ExternalMaterialSlot.cs
new file mode 100644
index 00000000000..1633a20f8eb
--- /dev/null
+++ b/Packages/com.unity.shadergraph/Editor/ProviderSystem/Model/ExternalMaterialSlot.cs
@@ -0,0 +1,69 @@
+using System;
+using UnityEngine;
+using UnityEditor.Graphing;
+
+namespace UnityEditor.ShaderGraph.ProviderSystem
+{
+    interface INeedsExplicitCompatibilityTest
+    {
+        bool HasExplicitCompatibility(MaterialSlot other);
+
+        static bool TestExplicitCompatibility(MaterialSlot a, MaterialSlot b)
+        {
+            return a is INeedsExplicitCompatibilityTest atester
+                && b is INeedsExplicitCompatibilityTest btester
+                && atester.HasExplicitCompatibility(b)
+                && btester.HasExplicitCompatibility(a);
+        }
+    }
+
+    [Serializable]
+    internal class ExternalMaterialSlot : MaterialSlot, INeedsExplicitCompatibilityTest
+    {
+        public string TypeName => m_typeName;
+
+        [SerializeField]
+        string m_typeName;
+
+        [SerializeField]
+        string m_rawDefaultValueString;
+
+        public override bool isDefaultValue => throw new System.NotImplementedException();
+
+        public override SlotValueType valueType => SlotValueType.External;
+
+        public override ConcreteSlotValueType concreteValueType => ConcreteSlotValueType.External;
+
+        public ExternalMaterialSlot() : base()
+        {
+
+        }
+
+        public ExternalMaterialSlot(
+            int slotId,
+            string displayName,
+            string shaderOutputName,
+            string typeName,
+            SlotType slotType,
+            string rawDefaultValue = null,
+            ShaderStageCapability stageCapability = ShaderStageCapability.All,
+            bool hidden = false)
+        : base(slotId, displayName, shaderOutputName, slotType, stageCapability, hidden)
+        {
+            m_typeName = typeName;
+            m_rawDefaultValueString = rawDefaultValue ?? "0";
+        }
+
+        public override void AddDefaultProperty(PropertyCollector properties, GenerationMode generationMode) { }
+
+        public override void CopyValuesFrom(MaterialSlot foundSlot) { }
+
+        public override string GetDefaultValue(GenerationMode generationMode)
+        {
+            return $"({TypeName})({m_rawDefaultValueString})";
+        }
+
+        public bool HasExplicitCompatibility(MaterialSlot other)
+            => other is ExternalMaterialSlot externalSlot && externalSlot.TypeName == this.TypeName;
+    }
+}
diff --git a/Packages/com.unity.shadergraph/Editor/ProviderSystem/Model/ExternalMaterialSlot.cs.meta b/Packages/com.unity.shadergraph/Editor/ProviderSystem/Model/ExternalMaterialSlot.cs.meta
new file mode 100644
index 00000000000..d5f341888d2
--- /dev/null
+++ b/Packages/com.unity.shadergraph/Editor/ProviderSystem/Model/ExternalMaterialSlot.cs.meta
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: 7372d18840093464cb19d9432af6b71f
\ No newline at end of file
diff --git a/Packages/com.unity.shadergraph/Editor/ProviderSystem/Model/FunctionHeader.cs b/Packages/com.unity.shadergraph/Editor/ProviderSystem/Model/FunctionHeader.cs
new file mode 100644
index 00000000000..999c0c495aa
--- /dev/null
+++ b/Packages/com.unity.shadergraph/Editor/ProviderSystem/Model/FunctionHeader.cs
@@ -0,0 +1,80 @@
+
+namespace UnityEditor.ShaderGraph.ProviderSystem
+{
+    // A "Header" object is an abstraction layer that interprets domain/context-free
+    // information from a ShaderObject (in this case a function) and translates it into
+    // domain specific information-- in this case, the Shader Graph tooling and conventions.
+    internal struct FunctionHeader
+    {
+        readonly internal bool isValid;
+
+        readonly internal string referenceName;
+        readonly internal string displayName;
+        readonly internal string uniqueName;
+        readonly internal string tooltip;
+
+        readonly internal IShaderType returnType;
+        internal bool hasReturnType => returnType.Name != "void";
+        readonly internal string returnDisplayName;
+
+        readonly internal string category;
+
+        readonly internal string[] searchTerms;
+
+        internal FunctionHeader(IProvider<IShaderFunction> provider)
+        {
+            referenceName = null;
+            returnType = null;
+            displayName = null;
+            category = null;
+            searchTerms = null;
+            returnDisplayName = null;
+            uniqueName = null;
+            tooltip = null;
+
+            isValid = provider != null && provider.Definition != null;
+
+            if (!isValid)
+                return;
+            
+            var func = provider.Definition;
+            var path = AssetDatabase.GUIDToAssetPath(provider.AssetID);
+
+            referenceName = func.Name;
+            returnType = func.ReturnType;
+
+            if (!func.Hints.TryGetValue(Hints.Common.kDisplayName, out displayName))
+                displayName = ObjectNames.NicifyVariableName(referenceName);
+
+            if (!func.Hints.TryGetValue(Hints.Func.kSearchName, out uniqueName))
+                uniqueName = ShaderObjectUtils.QualifySignature(func, false, true);
+
+
+            if (!func.Hints.TryGetValue(Hints.Func.kCategory, out category))
+            {
+                // try to use a namespace if a user didn't provide a category.
+                bool hasNamespace = false;
+                foreach (var name in func.Namespace)
+                {
+                    if (!hasNamespace)
+                        category = "Reflected by Namespace";
+                    hasNamespace = true;
+                    category += $"/{name}";
+                }
+                // if there was no namespace, use the file path instead.
+                if (!hasNamespace)
+                {
+                    category = $"Reflected by Path/{path}";
+                }
+
+            }
+
+            if (func.Hints.TryGetValue(Hints.Func.kSearchName, out var terms))
+                searchTerms = HeaderUtils.LazyTokenString(terms);
+            else searchTerms = new[] { referenceName };
+
+            if (!func.Hints.TryGetValue(Hints.Func.kReturnDisplayName, out returnDisplayName))
+                returnDisplayName = "Out";
+        }
+    }
+}
diff --git a/Packages/com.unity.shadergraph/Editor/ProviderSystem/Model/FunctionHeader.cs.meta b/Packages/com.unity.shadergraph/Editor/ProviderSystem/Model/FunctionHeader.cs.meta
new file mode 100644
index 00000000000..6546dea4fda
--- /dev/null
+++ b/Packages/com.unity.shadergraph/Editor/ProviderSystem/Model/FunctionHeader.cs.meta
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: a49239ad21003d64db1f49d00da3f871
\ No newline at end of file
diff --git a/Packages/com.unity.shadergraph/Editor/ProviderSystem/Model/HeaderUtils.cs b/Packages/com.unity.shadergraph/Editor/ProviderSystem/Model/HeaderUtils.cs
new file mode 100644
index 00000000000..61d8e620104
--- /dev/null
+++ b/Packages/com.unity.shadergraph/Editor/ProviderSystem/Model/HeaderUtils.cs
@@ -0,0 +1,322 @@
+using UnityEngine;
+using UnityEditor.Graphing;
+using System.Collections.Generic;
+
+namespace UnityEditor.ShaderGraph.ProviderSystem
+{
+    internal static class Hints
+    {
+        internal static class Common
+        {
+            internal const string kDisplayName = "sg:DisplayName";
+
+            // Not yet implemented.
+            internal const string kTooltip = "sg:Tooltip"; // SG doesn't have tooltips
+        }
+        internal static class Func
+        {
+            internal const string kProviderKey = "sg:ProviderKey";
+
+            internal const string kReturnDisplayName = "sg:ReturnDisplayName";
+
+            internal const string kSearchTerms = "sg:SearchTerms";
+            internal const string kSearchName = "sg:SearchName";
+            internal const string kCategory = "sg:SearchCategory";
+
+            // Not yet implemented.
+            internal const string kGroupKey = "sg:GroupKey";
+            internal const string kReturnTooltip = "sg:ReturnTooltip";
+            internal const string kDocumentationLink = "sg:HelpURL";
+
+            // ProviderKey associated hints, Not yet implemented.
+            internal const string kDeprecated = "sg:Deprecated";
+            internal const string kObsolete = "sg:Obsolete";
+            internal const string kVersion = "sg:Version";
+        }
+
+        internal static class Param
+        {
+            internal const string kStatic = "sg:Static";
+            internal const string kLocal = "sg:Local";
+            internal const string kLiteral = "sg:Literal";
+            internal const string kColor = "sg:Color";
+            internal const string kRange = "sg:Range";
+            internal const string kDropdown = "sg:Dropdown";
+            internal const string kDefault = "sg:Default";
+
+            // Not yet implemented.
+            internal const string kSetting = "sg:Setting";
+            internal const string kLinkage = "sg:Linkage";
+            internal const string kPrecision = "sg:Precision";
+            internal const string kDynamic = "sg:Dynamic";
+            internal const string kReferable = "sg:Referable";
+            internal const string kExternal = "sg:External";
+
+            // Hard coded referables, not yet implemented.
+            internal const string kUV = "sg:ref:UV";
+            internal const string kPosition = "sg:ref:Position";
+            internal const string kNormal = "sg:ref:Normal";
+            internal const string kBitangent = "sg:ref:Bitangent";
+            internal const string kTangent = "sg:ref:Tangent";
+            internal const string kViewDirection = "sg:ref:ViewDirection";
+            internal const string kScreenPosition = "sg:ref:ScreenPosition";
+            internal const string kVertexColor = "sg:VertexColor";
+        }
+    }
+
+    internal static class HeaderUtils
+    {
+        internal static string ToShaderType(this MaterialSlot slot)
+        {
+            if (slot is ExternalMaterialSlot eslot)
+                return eslot.TypeName;
+
+            return slot.concreteValueType.ToShaderString();
+        }
+
+        internal static bool IsNumeric(string typeName)
+        {
+            return TryParseTypeInfo(typeName, out _, out _, out _, out _, out _, out _, out _);
+        }
+
+        internal static bool TryParseTypeInfo(
+            string type,
+            out string prim,
+            out bool isScalar,
+            out bool isVector,
+            out bool isMatrix,
+            out int rows,
+            out int cols,
+            out int length)
+        {
+            prim = null;
+            isScalar = false;
+            isVector = false;
+            isMatrix = false;
+            rows = -1;
+            cols = -1;
+            length = -1;
+
+            // TODO: Array support isn't established yet, if we support multidim this wouldn't work.
+            if (type.Contains('['))
+                return false;
+
+
+            if (type.StartsWith("uint")) prim = "uint";
+            if (type.StartsWith("int")) prim = "int";
+            if (type.StartsWith("bool")) prim = "bool";
+            if (type.StartsWith("half")) prim = "half";
+            if (type.StartsWith("float")) prim = "float";
+
+            if (prim == null)
+                return false;
+
+            if (type == prim)
+                return isScalar = true;
+
+            var remainder = type.Substring(prim.Length);
+
+            if (remainder.Length == 1)
+            {
+                return isVector = int.TryParse(remainder, out rows) && rows >= 1 && rows <= 4;
+            }
+            if (remainder.Length == 3)
+            {
+                return isMatrix
+                    = int.TryParse(remainder.Substring(0, 1), out rows) && rows >= 1 && rows <= 4
+                    && int.TryParse(remainder.Substring(2, 1), out cols) && cols >= 1 && cols <= 4;
+            }
+            return false;
+        }
+
+        internal static bool TryCast<T>(string shaderType, float[] values, out T value, T fallback = default)
+        {
+            try
+            {
+                return Cast<T>(shaderType, values, out value, fallback);
+            }
+            catch
+            {
+                value = default;
+                return false;
+            }
+        }
+
+        private static bool Cast<T>(string shaderType, float[] values, out T value, T fallback = default)
+        {
+            object obj = default;
+            value = fallback;
+
+            if (values == null || values.Length == 0)
+                return false;
+
+            float[] v = new float[16];
+            for (int i = 0; i < values.Length; ++i)
+                v[i] = values[i];
+
+            if (!TryParseTypeInfo(shaderType, out string prim, out bool isScalar, out bool isVector, out bool isMatrix, out int rows, out int cols, out int length))
+                return false;
+
+            if (isScalar || isVector && rows == 1 || isMatrix && rows == 1 && cols == 1)
+            {
+                var fv = v[0];
+
+                switch (prim)
+                {
+                    case "bool": obj = fv != 0; break;
+                    case "uint": obj = fv; break;
+                    case "int": obj = fv; break;
+                    case "float":
+                    case "half": obj = fv; break;
+                    default: return false;
+                }
+            }
+            if (isVector)
+            {
+                switch (rows)
+                {
+                    case 2: obj = new Vector2(v[0], v[1]); break;
+                    case 3: obj = new Vector3(v[0], v[1], v[2]); break;
+                    case 4: obj = new Vector4(v[0], v[1], v[2], v[3]); break;
+                    default: return false;
+                }
+
+            }
+            if (isMatrix)
+            {
+                Matrix4x4 m = new();
+                for (int i = 0; i < cols * rows; ++i)
+                {
+                    // TODO: Validate with GTK
+                    m[i % rows + rows * (i / rows)] = v[i];
+                }
+            }
+
+            value = (T)obj;
+            return true;
+        }
+
+        internal static MaterialSlot MakeSlotFromParameter(ParameterHeader header, int slotId, SlotType dir)
+        {
+            MaterialSlot slot;
+
+            if (header.isDropdown)
+            {
+                HeaderUtils.TryCast<float>(header.typeName, header.defaultValue, out var asIdx, 0.0f);
+                slot = new Vector1MaterialEnumSlot(slotId, header.displayName, header.referenceName, dir, header.options, asIdx);
+            }
+            else if (header.isSlider)
+            {
+                HeaderUtils.TryCast<float>(header.typeName, header.defaultValue, out var asRng, 0);
+                slot = new Vector1MaterialRangeSlot(slotId, header.displayName, header.referenceName, dir, asRng, new Vector2(header.sliderMin, header.sliderMax));
+            }
+            else switch (header.typeName)
+                {
+                    case "uint1":
+                    case "uint":
+                        HeaderUtils.TryCast<float>(header.typeName, header.defaultValue, out var asUint, 0u);
+                        slot = new Vector1MaterialIntegerSlot(slotId, header.displayName, header.referenceName, dir, asUint, unsigned: true); break;
+                    case "int1":
+                    case "int":
+                        HeaderUtils.TryCast<float>(header.typeName, header.defaultValue, out var asInt, 0);
+                        slot = new Vector1MaterialIntegerSlot(slotId, header.displayName, header.referenceName, dir, asInt); break;
+                    case "half":
+                    case "half1":
+                    case "float1":
+                    case "float":
+                        HeaderUtils.TryCast<float>(header.typeName, header.defaultValue, out var asFloat, 0.0f);
+                        slot = new Vector1MaterialSlot(slotId, header.displayName, header.referenceName, dir, asFloat); break;
+                    case "bool1":
+                    case "bool":
+                        HeaderUtils.TryCast<bool>(header.typeName, header.defaultValue, out var asBool, false);
+                        slot = new BooleanMaterialSlot(slotId, header.displayName, header.referenceName, dir, asBool); break;
+                    case "half2":
+                    case "float2":
+                        HeaderUtils.TryCast<Vector2>(header.typeName, header.defaultValue, out var asV2, Vector2.zero);
+                        slot = new Vector2MaterialSlot(slotId, header.displayName, header.referenceName, dir, asV2); break;
+                    case "half3":
+                    case "float3":
+                        HeaderUtils.TryCast<Vector3>(header.typeName, header.defaultValue, out var asV3, Vector3.zero);
+                        slot = !header.isColor
+                            ? new Vector3MaterialSlot(slotId, header.displayName, header.referenceName, dir, asV3)
+                            : new ColorRGBMaterialSlot(slotId, header.displayName, header.referenceName, dir, new Vector4(asV3.x, asV3.y, asV3.z, 1), Internal.ColorMode.Default);
+                        break;
+                    case "half4":
+                    case "float4":
+                        HeaderUtils.TryCast<Vector4>(header.typeName, header.defaultValue, out var asV4, header.isColor ? new Vector4(0, 0, 0, 1) : Vector4.zero);
+
+                        slot = header.isColor
+                            ? new ColorRGBAMaterialSlot(slotId, header.displayName, header.referenceName, dir, asV4)
+                            : new Vector4MaterialSlot(slotId, header.displayName, header.referenceName, dir, asV4);
+
+                        break;
+                    case "half2x2":
+                    case "float2x2": slot = new Matrix2MaterialSlot(slotId, header.displayName, header.referenceName, dir); break;
+                    case "half3x3":
+                    case "float3x3": slot = new Matrix3MaterialSlot(slotId, header.displayName, header.referenceName, dir); break;
+                    case "half4x4":
+                    case "float4x4": slot = new Matrix4MaterialSlot(slotId, header.displayName, header.referenceName, dir); break;
+
+                    case "SamplerState":
+                    case "UnitySamplerState": slot = new SamplerStateMaterialSlot(slotId, header.displayName, header.referenceName, dir); break;
+                    case "Texture2D":
+                    case "UnityTexture2D":
+                        slot = dir == SlotType.Input
+                                ? new Texture2DInputMaterialSlot(slotId, header.displayName, header.referenceName)
+                                : new Texture2DMaterialSlot(slotId, header.displayName, header.referenceName, dir);
+                        break;
+                    case "Texture2DArray":
+                    case "UnityTexture2DArray":
+                        slot = dir == SlotType.Input
+                                ? new Texture2DArrayInputMaterialSlot(slotId, header.displayName, header.referenceName)
+                                : new Texture2DArrayMaterialSlot(slotId, header.displayName, header.referenceName, dir); break;
+                    case "TextureCube":
+                    case "UnityTextureCube":
+                        slot = dir == SlotType.Input
+                                ? new CubemapInputMaterialSlot(slotId, header.displayName, header.referenceName)
+                                : new CubemapMaterialSlot(slotId, header.displayName, header.referenceName, dir); break;
+                    case "Texture3D":
+                    case "UnityTexture3D":
+                        slot = dir == SlotType.Input
+                                ? new Texture3DInputMaterialSlot(slotId, header.displayName, header.referenceName)
+                                : new Texture3DMaterialSlot(slotId, header.displayName, header.referenceName, dir); break;
+                    default:
+                        slot = new ExternalMaterialSlot(slotId, header.displayName, header.referenceName, header.externalQualifiedTypeName, dir, header.defaultString);
+                        break;
+                }
+
+            slot.hideConnector = header.isStatic && header.isInput;
+            slot.hidden = header.isLocal;
+            slot.bareResource = header.isBareResource;
+            return slot;
+        }
+
+        internal static float[] LazyTokenFloat(string arg)
+        {
+            var tokens = LazyTokenize(arg);
+            List<float> asfloat = new();
+
+            foreach (var token in tokens)
+                if (float.TryParse(token, out float r))
+                    asfloat.Add(r);
+
+            return asfloat.ToArray();
+        }
+
+        internal static string[] LazyTokenString(string arg)
+        {
+            List<string> tokens = new(LazyTokenize(arg));
+            return tokens.ToArray();
+        }
+
+        private static IEnumerable<string> LazyTokenize(string arg)
+        {
+            foreach (var e in arg.Split(','))
+            {
+                var result = e.Trim();
+                if (!string.IsNullOrWhiteSpace(result))
+                    yield return e.Trim();
+            }
+        }
+    }
+}
diff --git a/Packages/com.unity.shadergraph/Editor/ProviderSystem/Model/HeaderUtils.cs.meta b/Packages/com.unity.shadergraph/Editor/ProviderSystem/Model/HeaderUtils.cs.meta
new file mode 100644
index 00000000000..832c0d858df
--- /dev/null
+++ b/Packages/com.unity.shadergraph/Editor/ProviderSystem/Model/HeaderUtils.cs.meta
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: 03da3bc1b8aa9064ea9e97a5eec5f074
\ No newline at end of file
diff --git a/Packages/com.unity.shadergraph/Editor/ProviderSystem/Model/ParameterHeader.cs b/Packages/com.unity.shadergraph/Editor/ProviderSystem/Model/ParameterHeader.cs
new file mode 100644
index 00000000000..dfaab6b39fc
--- /dev/null
+++ b/Packages/com.unity.shadergraph/Editor/ProviderSystem/Model/ParameterHeader.cs
@@ -0,0 +1,220 @@
+
+using System.Collections.Generic;
+using System.Text;
+
+namespace UnityEditor.ShaderGraph.ProviderSystem
+{
+    internal struct ParameterHeader
+    {
+        readonly internal bool isValid;
+
+        readonly internal string referenceName;
+        readonly internal IShaderType shaderType;
+        readonly internal string typeName => shaderType.Name;
+
+        readonly internal string displayName;
+        readonly internal string tooltip;
+
+        readonly internal bool isInput;
+        readonly internal bool isOutput;
+
+        readonly internal bool isColor;
+
+        readonly internal bool isStatic;
+        readonly internal bool isLocal;
+
+        readonly internal bool isDropdown;
+        readonly internal string[] options;
+
+        readonly internal bool isSlider;
+        readonly internal float sliderMin;
+        readonly internal float sliderMax;
+
+        readonly internal float[] defaultValue;
+        readonly internal string defaultString;
+
+        readonly internal string externalQualifiedTypeName;
+
+        readonly internal bool isNumeric;
+        readonly internal bool isTexture;
+        readonly internal bool isSampler;
+        readonly internal bool isStruct;
+        readonly internal bool isReference;
+        readonly internal bool isLiteral;
+
+        readonly internal string referable;
+
+        readonly internal bool isBareResource;
+
+        readonly internal string knownIssue;
+
+        private ParameterHeader(int a)
+        {
+            referenceName = null;
+            displayName = null;
+            shaderType = null;
+            tooltip = null;
+            isOutput = true;
+            isInput = false;
+            isColor = false;
+            defaultValue = null;
+            isStatic = false;
+            isDropdown = false;
+            options = null;
+            isSlider = false;
+            sliderMin = 0;
+            sliderMax = 1;
+            isBareResource = false;
+            isLocal = false;
+            isReference = false;
+            isLiteral = false;
+            isTexture = false;
+            isSampler = false;
+            isNumeric = false;
+            isStruct = false;
+            referable = null;
+            defaultString = null;
+            knownIssue = null;
+            externalQualifiedTypeName = null;
+
+            isValid = false;
+        }
+
+        // this is for return types.
+        internal ParameterHeader(string referenceName, IShaderType shaderType, string tooltip = null) : this(0)
+        {
+            if (string.IsNullOrWhiteSpace(referenceName) || string.IsNullOrWhiteSpace(shaderType.Name))
+            {
+                isValid = false;
+                return;
+            }
+
+            this.shaderType = shaderType;
+            this.externalQualifiedTypeName = shaderType.Name;
+            this.referenceName = referenceName;
+            this.displayName = referenceName;
+            this.tooltip = tooltip;
+
+            string typeTest = shaderType.Name.ToLowerInvariant();
+
+            isNumeric = HeaderUtils.TryParseTypeInfo(typeName, out _, out _, out _, out _, out _, out _, out _);
+            isSampler = typeTest.Contains("sampler");
+            isTexture = typeTest.Contains("texture");
+            isBareResource = !typeTest.Contains("unity") && (isSampler || isTexture); // special handling case.            
+            isStruct = !isTexture && !isSampler && !isNumeric;
+            isValid = true;
+        }
+
+        internal ParameterHeader(IShaderField param, IShaderFunction owner) : this(param?.Name, param?.ShaderType)
+        {
+            if (!isValid || param == null)
+                return;
+
+            isOutput = isInput = false;
+            isInput = param.IsInput;
+            isOutput = param.IsOutput;
+
+            if (!param.Hints.TryGetValue(Hints.Common.kDisplayName, out displayName))
+                displayName = ObjectNames.NicifyVariableName(referenceName);
+
+            HeaderUtils.TryParseTypeInfo(typeName, out string prim, out bool isScalar, out bool isVector, out bool isMatrix, out int rows, out int cols, out _);
+            List<string> editorHintsUsed = new();
+
+
+            isLiteral = param.Hints.TryGetValue(Hints.Param.kLiteral, out _); // TODO: Only relevant for int, float, half, uint
+
+            if (param.Hints.TryGetValue(Hints.Param.kExternal, out externalQualifiedTypeName))
+                externalQualifiedTypeName += $"::{typeName}";
+            else externalQualifiedTypeName = typeName;
+
+            if (param.Hints.TryGetValue(Hints.Param.kColor, out _))
+            {
+                editorHintsUsed.Add(Hints.Param.kColor);
+                if (rows != 3 && rows != 4 && !isVector)
+                {
+                    knownIssue = $"'Color' hint on '{referenceName}' is not supported for '{typeName}'.";
+                }
+                else isColor = true;
+            }
+
+            if (param.Hints.TryGetValue(Hints.Param.kStatic, out _))
+            {
+                if (isOutput)
+                {
+                    knownIssue = $"'Static' hint on '{referenceName}' is not supported for 'out' parameters.";
+                }
+                else if (!isScalar && !isColor)
+                {
+                    knownIssue = $"'Static' hint on '{referenceName}' is not supported for '{typeName}'.";
+                }
+                else isStatic = true;
+            }
+
+            if (param.Hints.TryGetValue(Hints.Param.kLocal, out _))
+            {
+                editorHintsUsed.Add(Hints.Param.kLocal);
+                if (isStatic) // All Access Modifier style hints would conflict with each other, but we currently only have Local and Static
+                {
+                    knownIssue = $"'Local' hint on '{referenceName}' conflicts with found 'Static' hint.";
+                }
+                else isLocal = true;
+            }
+
+            if (param.Hints.TryGetValue(Hints.Param.kDropdown, out var dropdownString))
+            {
+                editorHintsUsed.Add(Hints.Param.kDropdown);
+                options = HeaderUtils.LazyTokenString(dropdownString);
+                if (!isScalar || prim == "bool")
+                {
+                    knownIssue = $"'Dropdown' hint on '{referenceName}' is not supported for '{typeName}'.";
+                }
+                else if (options.Length == 0)
+                {
+                    knownIssue = $"'Dropdown' hint on '{referenceName}' has no options.";
+                }
+                else isDropdown = true;
+            }
+
+            if (param.Hints.TryGetValue(Hints.Param.kRange, out var rangeValues))
+            {
+                editorHintsUsed.Add(Hints.Param.kRange);
+                var values = HeaderUtils.LazyTokenFloat(rangeValues);
+
+                if (!isScalar || prim == "bool")
+                {
+                    knownIssue = $"'Range' hint on '{referenceName}' is not supported for '{typeName}'.";
+                }
+                else if (values.Length != 2 || values[0] == values[1])
+                {
+                    knownIssue = $"'Range' hint on '{referenceName}' expects two arguments of different values.";
+                }
+                else
+                {
+                    sliderMin = values[0] < values[1] ? values[0] : values[1];
+                    sliderMax = values[0] > values[1] ? values[0] : values[1];
+                    isSlider = true;
+                }
+            }
+
+            if (param.Hints.TryGetValue(Hints.Param.kDefault, out defaultString))
+            {
+                defaultValue = HeaderUtils.LazyTokenFloat(defaultString);
+            }
+
+            if(editorHintsUsed.Count > 1)
+            {
+                StringBuilder sb = new();
+                bool first = true;
+                foreach(var hintName in editorHintsUsed)
+                {
+                    if (!first)
+                        sb.Append(", ");
+                    first = false;
+                    sb.Append($"{hintName}");
+                }
+
+                knownIssue = $"Found multiple conflicting editor hints on '{referenceName}': '{sb.ToString()}'.";
+            }
+        }
+    }
+}
diff --git a/Packages/com.unity.shadergraph/Editor/ProviderSystem/Model/ParameterHeader.cs.meta b/Packages/com.unity.shadergraph/Editor/ProviderSystem/Model/ParameterHeader.cs.meta
new file mode 100644
index 00000000000..1b207f7b1b7
--- /dev/null
+++ b/Packages/com.unity.shadergraph/Editor/ProviderSystem/Model/ParameterHeader.cs.meta
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: df1b66f5ce54910438e02c0d87921c4f
\ No newline at end of file
diff --git a/Packages/com.unity.shadergraph/Editor/ProviderSystem/Model/ProviderAttribute.cs b/Packages/com.unity.shadergraph/Editor/ProviderSystem/Model/ProviderAttribute.cs
new file mode 100644
index 00000000000..2885493f1fa
--- /dev/null
+++ b/Packages/com.unity.shadergraph/Editor/ProviderSystem/Model/ProviderAttribute.cs
@@ -0,0 +1,67 @@
+
+using System;
+using System.Collections.Generic;
+using System.Reflection;
+using UnityEngine;
+
+namespace UnityEditor.ShaderGraph.ProviderSystem
+{
+    // This allows any model in a domain to be mapped to a provider.
+    internal class ProviderModelAttribute : Attribute
+    {
+        public readonly string ProviderKey;
+        public ProviderModelAttribute(string providerKey) { ProviderKey = providerKey; }
+    }
+
+    // This marks a provider to be included in the ProviderLibrary
+    internal class ScriptedProviderAttribute : Attribute { }
+
+    internal static class ProviderTypeCache
+    {
+        static Dictionary<string, Type> s_providerModels = null;
+        static List<Type> s_scriptedProviders = null;
+
+        private static void BuildCache()
+        {
+            if (s_providerModels == null && s_scriptedProviders == null)
+            {
+                s_providerModels = new();
+                s_scriptedProviders = new();
+
+                foreach (Assembly assembly in AppDomain.CurrentDomain.GetAssemblies())
+                {
+                    foreach (Type type in assembly.GetTypes())
+                    {
+                        var providerKey = type.GetCustomAttribute<ProviderModelAttribute>()?.ProviderKey ?? null;
+                        if (providerKey != null)
+                            if (!s_providerModels.TryAdd(providerKey, type))
+                                Debug.LogError($"Attempted to register '{type.Name}' with provider key '{providerKey}', but key is already registered to '{s_providerModels[providerKey]}'.");
+
+                        if (type.GetCustomAttribute<ScriptedProviderAttribute>() != null)
+                            s_scriptedProviders.Add(type);
+                    }
+                }
+            }
+        }
+
+        internal static IEnumerable<Type> GetScriptedProviderTypes()
+        {
+            BuildCache();
+
+            return s_scriptedProviders;
+        }
+
+        internal static bool TryCreateModel(string key, out object model)
+        {
+            BuildCache();
+
+            if (s_providerModels.TryGetValue(key, out Type type))
+            {
+                model = Activator.CreateInstance(type, true);
+                return true;
+            }
+            model = null;
+            return false;
+        }
+    }
+}
\ No newline at end of file
diff --git a/Packages/com.unity.shadergraph/Editor/ProviderSystem/Model/ProviderAttribute.cs.meta b/Packages/com.unity.shadergraph/Editor/ProviderSystem/Model/ProviderAttribute.cs.meta
new file mode 100644
index 00000000000..93ecad7ef00
--- /dev/null
+++ b/Packages/com.unity.shadergraph/Editor/ProviderSystem/Model/ProviderAttribute.cs.meta
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: 83c57d0908748409ba9167606f577a92
\ No newline at end of file
diff --git a/Packages/com.unity.shadergraph/Editor/ProviderSystem/Model/ProviderNode.cs b/Packages/com.unity.shadergraph/Editor/ProviderSystem/Model/ProviderNode.cs
new file mode 100644
index 00000000000..3c93e82c8cf
--- /dev/null
+++ b/Packages/com.unity.shadergraph/Editor/ProviderSystem/Model/ProviderNode.cs
@@ -0,0 +1,301 @@
+using UnityEngine;
+using System.Collections.Generic;
+using UnityEditor.Graphing;
+using System;
+
+namespace UnityEditor.ShaderGraph.ProviderSystem
+{
+    // A Base Node serving as the entry point for Provider based function definitions.
+    // This Model object can work with any sort of function provider, interpret the function definition,
+    // and generate a valid model representation of that object. This abstracts the need for node definitions
+    // to be aware of how the model functions.
+    [Serializable]
+    [HasDependencies(typeof(MinimalProviderNode))]
+    internal class ProviderNode : AbstractMaterialNode, IHasAssetDependencies, IGeneratesBodyCode, IGeneratesFunction
+    {
+        [Serializable]
+        internal class MinimalProviderNode : IHasDependencies
+        {
+            [SerializeReference]
+            IProvider<IShaderFunction> m_provider;
+
+            public void GetSourceAssetDependencies(AssetCollection assetCollection)
+            {
+                if (m_provider?.AssetID != default)
+                    assetCollection.AddAssetDependency(m_provider.AssetID,
+                        AssetCollection.Flags.SourceDependency
+                        | AssetCollection.Flags.ArtifactDependency
+                        | AssetCollection.Flags.IncludeInExportPackage);
+            }
+        }
+
+        [SerializeReference]
+        IProvider<IShaderFunction> m_provider;
+
+        internal FunctionHeader Header { get; private set; }
+
+        internal IProvider<IShaderFunction> Provider => m_provider;
+
+        const int kReservedOutputSlot = 0;
+
+        public override bool hasPreview => true;
+
+        public override bool canSetPrecision => false;
+
+        internal override bool ExposeToSearcher => false;
+
+        internal virtual bool requiresGeneration => false;
+
+        public ProviderNode()
+        {
+            name = "Provider Based Node";
+        }
+
+        internal void InitializeFromProvider(IProvider<IShaderFunction> provider)
+        {
+            this.m_provider = (IProvider<IShaderFunction>)provider.Clone();
+            UpdateModel();
+        }
+
+        public override void UpdateNodeAfterDeserialization()
+        {
+            base.UpdateNodeAfterDeserialization();
+            Refresh();
+        }
+
+        public override void Concretize()
+        {
+            UpdateModel();
+            base.Concretize();
+        }
+
+        public bool Reload(HashSet<string> changedAssetGuids)
+        {
+            if (changedAssetGuids.Contains(Provider.AssetID.ToString()))
+            {
+                Refresh();
+                return true;
+            }
+            return false;
+        }
+
+        protected void Refresh()
+        {
+            Provider?.Reload();
+            UpdateModel();
+            ValidateNode();
+            Dirty(ModificationScope.Graph);
+        }
+
+        internal void UpdateModel()
+        {
+            if (Provider == null || Provider.Definition == null)
+                return;
+
+            Header = new FunctionHeader(Provider);
+            var header = Header;
+            this.name = header.displayName;
+            this.synonyms = header.searchTerms;
+            var parameters = Provider.Definition.Parameters;
+
+            List<MaterialSlot> previousSlots = new();
+            GetSlots(previousSlots);
+
+            Dictionary<string, (int inputId, int outputId)> oldSlotMap = new();
+            HashSet<int> usedSlotIds = new();
+
+            // build a map of parameter names to old slot ids (tuple is to support inout params).
+            foreach (var oldSlot in previousSlots)
+            {
+                if (!oldSlotMap.TryGetValue(oldSlot.shaderOutputName, out var idTuple))
+                    idTuple = (-1, -1);
+
+                if (oldSlot.isInputSlot) idTuple.inputId = oldSlot.id;
+                if (oldSlot.isOutputSlot) idTuple.outputId = oldSlot.id;
+
+                oldSlotMap[oldSlot.shaderOutputName] = idTuple;
+            }
+
+            List<ParameterHeader> paramHeaders = new();
+            List<int> desiredSlotOrder = new();
+
+            // return type is a special case, because it has no parameter but still needs a slot
+            // we reserve the 0 slotId for this and always make sure it's added first/at the top.
+            if (header.hasReturnType)
+            {
+                var returnParam = new ParameterHeader(header.returnDisplayName, header.returnType, header.tooltip);
+                usedSlotIds.Add(kReservedOutputSlot);
+                desiredSlotOrder.Add(kReservedOutputSlot);
+                AddSlotFromParameter(returnParam, kReservedOutputSlot, SlotType.Output);
+            }
+
+            // build the header data for our parameters and mark which slot ids are being reused.
+            foreach(var param in parameters)
+            {
+                paramHeaders.Add(new ParameterHeader(param, Provider.Definition));
+                if (oldSlotMap.TryGetValue(param.Name, out var idTuple))
+                {
+                    if (idTuple.inputId > -1) usedSlotIds.Add(idTuple.inputId);
+                    if (idTuple.outputId > -1) usedSlotIds.Add(idTuple.outputId);
+                }
+            }
+
+            // walk through our header data and build the actual slots.
+            int nextSlot = kReservedOutputSlot;
+            foreach (var paramHeader in paramHeaders)
+            {
+                if (!oldSlotMap.TryGetValue(paramHeader.referenceName, out var idTuple))
+                    idTuple = (-1, -1);
+
+                void DoSlot(int slotId, SlotType dir)
+                {
+                    if (slotId == -1)
+                    {
+                        while (usedSlotIds.Contains(++nextSlot));
+                        usedSlotIds.Add(nextSlot);
+                        slotId = nextSlot;
+                    }
+                    AddSlotFromParameter(paramHeader, slotId, dir);
+                    desiredSlotOrder.Add(slotId);
+                }
+
+                if (paramHeader.isInput)
+                    DoSlot(idTuple.inputId, SlotType.Input);
+                if (paramHeader.isOutput)
+                    DoSlot(idTuple.outputId, SlotType.Output);
+            }
+            RemoveSlotsNameNotMatching(usedSlotIds, true);
+            SetSlotOrder(desiredSlotOrder);
+        }
+
+        void AddSlotFromParameter(ParameterHeader header, int slotId, SlotType dir)
+        {
+            var slot = HeaderUtils.MakeSlotFromParameter(header, slotId, dir);
+            if (slot != null)
+                AddSlot(slot);
+        }
+
+        public void GenerateNodeCode(ShaderStringBuilder sb, GenerationMode generationMode)
+        {
+            if (this.Provider == null || this.Provider.Definition == null)
+                return;
+
+            using (var slots = PooledList<MaterialSlot>.Get())
+            {
+                GetSlots<MaterialSlot>(slots);
+                Dictionary<string, (MaterialSlot input, MaterialSlot output)> paramSlotMap = new();
+                MaterialSlot returnSlot = null;
+
+                // for various reasons, slots won't match one-to-one with parameters;
+                // we'll need to make sure slots are matched to parameters in the order expected
+                // while also accounting for inout duplicity.
+                foreach (var slot in slots)
+                {
+                    if (slot.id == kReservedOutputSlot)
+                        returnSlot = slot;
+                    else
+                    {
+                        paramSlotMap.TryGetValue(slot.shaderOutputName, out var tup);
+                        if (slot.isInputSlot) tup.input = slot;
+                        if (slot.isOutputSlot) tup.output = slot;
+                        paramSlotMap[slot.shaderOutputName] = tup;
+                    }
+                }
+
+                ShaderStringBuilder call = new(); // for the callsite.
+                ShaderStringBuilder args = new(); // for building up the argument list.
+
+                // The return result is an output slot, but will instead get initialized by the function call.
+                if (returnSlot != null)
+                {
+                    call.Append($"{HeaderUtils.ToShaderType(returnSlot)} {GetVariableNameForSlot(returnSlot.id)} = ");
+                }
+
+                bool first = true;
+                foreach (var param in Provider.Definition.Parameters)
+                {
+                    var inputSlot = paramSlotMap[param.Name].input;
+                    var outputSlot = paramSlotMap[param.Name].output;
+
+                    var typeString = outputSlot != null ? HeaderUtils.ToShaderType(outputSlot) : HeaderUtils.ToShaderType(inputSlot);
+
+                    var variableName = outputSlot != null ? GetVariableNameForSlot(outputSlot.id) : null;
+                    var valueString = inputSlot != null ? GetSlotValue(inputSlot.id, generationMode) : null;
+
+                    if (inputSlot != null && inputSlot.bareResource) // Texture/Sampler slots are normally 'Unity' wrapper structures
+                        valueString += inputSlot is SamplerStateMaterialSlot ? ".samplerstate" : ".tex";
+
+                    var argument = valueString; // assume it's an input, in which case the arg will be the upstream value/connection.
+
+                    if (outputSlot != null)
+                    {
+                        // inout and out define a variable to be used as the argument.
+                        // but only inout gets initialized by the value.
+                        argument = variableName;
+                        sb.AddLine($"{typeString} {variableName}{(inputSlot != null ? $" = {valueString}" : "")};");
+                    }
+
+                    if (!first)
+                        args.Append(", ");
+                    first = false;
+
+                    args.Append(argument);
+                }
+
+                foreach (var name in Provider.Definition.Namespace)
+                    call.Append($"{name}::");
+                call.Append(Provider.Definition.Name);
+                call.Append("(");
+                call.Append(args.ToString());
+                call.Append(");");
+
+
+                sb.AddLine(call.ToString());
+            }
+        }
+
+        public void GenerateNodeFunction(FunctionRegistry registry, GenerationMode generationMode)
+        {
+            if (Provider.AssetID != default)
+            {
+                var includePath = AssetDatabase.GUIDToAssetPath(Provider.AssetID);
+                registry.RequiresIncludePath(includePath, false);
+            }
+
+            if (requiresGeneration)
+            {
+                var func = Provider.Definition;
+                string code = ShaderObjectUtils.GenerateCode(func, false, false);
+                registry.ProvideFunction(func.Name, s => s.AppendLine(code));
+            }
+        }
+
+        public override void ValidateNode()
+        {
+            base.ValidateNode();
+            if (Provider == null)
+            {
+                owner.AddSetupError(this.objectId, "Node is in an invalid state and cannot recover.");
+                return;
+            }
+            else if (Provider.AssetID != default && (Provider.Definition == null || !Provider.Definition.IsValid))
+            {
+                var path = AssetDatabase.GUIDToAssetPath(Provider.AssetID);
+                owner.AddSetupError(this.objectId, $"Data for '{Provider.ProviderKey}' expected in '{path}'.");
+                return;
+            }
+            else
+            {
+                foreach(var param in Provider.Definition.Parameters)
+                {
+                    var header = new ParameterHeader(param, Provider.Definition);
+                    if (!string.IsNullOrWhiteSpace(header.knownIssue))
+                    {
+                        owner.AddValidationError(this.objectId, header.knownIssue, Rendering.ShaderCompilerMessageSeverity.Warning);
+                        break; // We can only show one error badge at a time.
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/Packages/com.unity.shadergraph/Editor/ProviderSystem/Model/ProviderNode.cs.meta b/Packages/com.unity.shadergraph/Editor/ProviderSystem/Model/ProviderNode.cs.meta
new file mode 100644
index 00000000000..14dcf978ff8
--- /dev/null
+++ b/Packages/com.unity.shadergraph/Editor/ProviderSystem/Model/ProviderNode.cs.meta
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: 5f258658ff6f1c842b38d746f69fa370
\ No newline at end of file
diff --git a/Packages/com.unity.shadergraph/Editor/ProviderSystem/Model/ProviderNodePropertyDrawer.cs b/Packages/com.unity.shadergraph/Editor/ProviderSystem/Model/ProviderNodePropertyDrawer.cs
new file mode 100644
index 00000000000..1fe1ef32bdf
--- /dev/null
+++ b/Packages/com.unity.shadergraph/Editor/ProviderSystem/Model/ProviderNodePropertyDrawer.cs
@@ -0,0 +1,51 @@
+using System;
+using UnityEngine.UIElements;
+using UnityEditor.ShaderGraph.ProviderSystem;
+using UnityEngine;
+
+namespace UnityEditor.ShaderGraph.Drawing.Inspector.PropertyDrawers
+{
+    [SGPropertyDrawer(typeof(ProviderNode))]
+    class ProviderNodeNodePropertyDrawer : AbstractMaterialNodePropertyDrawer
+    {
+        private ProviderNode node;
+
+        internal override void AddCustomNodeProperties(VisualElement parentElement, AbstractMaterialNode nodeBase, Action setNodesAsDirtyCallback, Action updateNodeViewsCallback)
+        {
+            node = nodeBase as ProviderNode;
+            var provider = node.Provider;
+            var definition = node.Provider.Definition;
+            string sourcePath = AssetDatabase.GUIDToAssetPath(node.Provider.AssetID);
+
+            string providerKey = provider.ProviderKey;
+            string qualifiedSignature = ShaderObjectUtils.QualifySignature(node.Provider.Definition, true, true);
+            bool hasProviderKey = definition?.Hints?.ContainsKey(Hints.Func.kProviderKey) ?? false;
+
+            if (provider == null)
+            {
+                parentElement.Add(new HelpBoxRow("Provider node is in an invalid and irrecoverable state.", MessageType.Error));
+                return;
+            }
+
+            bool isAnAsset = provider.AssetID != default;
+
+            if (!isAnAsset)
+                return;
+
+            else if (!provider.IsValid)
+            {
+                parentElement.Add(new HelpBoxRow($"Could not find '{providerKey}' in '{sourcePath}'.", MessageType.Error));
+            }
+            else if (!hasProviderKey)
+            {
+                parentElement.Add(new HelpBoxRow($"'{providerKey}' in '{sourcePath}' does not have a 'ProviderKey' hint. If the namespace, name, or parameter list changes- this node instance will become invalidated.", MessageType.Warning));
+            }
+            else
+            {
+                parentElement.Add(new HelpBoxRow($"Provider Key '{providerKey}' for \n" +
+                                                 $"Function Signature '{qualifiedSignature}' found in \n" +
+                                                 $"File Path '{sourcePath}'.", MessageType.Info));
+            }
+        }
+    }
+}
diff --git a/Packages/com.unity.shadergraph/Editor/ProviderSystem/Model/ProviderNodePropertyDrawer.cs.meta b/Packages/com.unity.shadergraph/Editor/ProviderSystem/Model/ProviderNodePropertyDrawer.cs.meta
new file mode 100644
index 00000000000..376cc39adc1
--- /dev/null
+++ b/Packages/com.unity.shadergraph/Editor/ProviderSystem/Model/ProviderNodePropertyDrawer.cs.meta
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: 46fe9e42c0090d24391ef04f22ea4514
\ No newline at end of file
diff --git a/Packages/com.unity.shadergraph/Editor/ProviderSystem/ProviderLibrary.cs b/Packages/com.unity.shadergraph/Editor/ProviderSystem/ProviderLibrary.cs
new file mode 100644
index 00000000000..009dc71b23f
--- /dev/null
+++ b/Packages/com.unity.shadergraph/Editor/ProviderSystem/ProviderLibrary.cs
@@ -0,0 +1,112 @@
+using System;
+using System.Collections.Generic;
+using UnityEngine;
+
+namespace UnityEditor.ShaderGraph.ProviderSystem
+{
+    internal class ProviderLibrary
+    {
+        static ProviderLibrary s_instance;
+
+        internal static bool IsInstanceInitialized => s_instance != null;
+        internal static ProviderLibrary Instance
+        {
+            get
+            {
+                if (s_instance is null)
+                {
+                    s_instance = new();
+                    s_instance.PopulateFromFiles();
+                    s_instance.PopulateFromScripts();
+                }
+                return s_instance;
+            }
+        }
+
+        Dictionary<string, IProvider> providers = new();
+        Dictionary<GUID, HashSet<string>> lookup = new();
+
+        internal IEnumerable<IProvider> AllProviders() => providers.Values;
+
+        internal IEnumerable<IProvider<T>> AllProvidersByType<T>() where T : IShaderObject
+        {
+            foreach(var provider in providers.Values)
+            {
+                if (provider is IProvider<T> typedProvider)
+                    yield return typedProvider;
+            }
+        }
+
+        internal void Clear(GUID assetID)
+        {
+            if (!lookup.TryGetValue(assetID, out var providerNames))
+                return;
+
+            foreach (var providerName in providerNames)
+                providers.Remove(providerName);
+
+            lookup.Remove(assetID);
+        }
+
+        internal bool TryAdd(IProvider provider)
+        {
+            if (!providers.TryAdd(provider.ProviderKey, provider))
+                return false;
+
+            if (!lookup.TryAdd(provider.AssetID, new() { provider.ProviderKey }))
+                lookup[provider.AssetID].Add(provider.ProviderKey);
+
+            return true;
+        }
+
+        internal bool TryFind(string name, out IProvider provider)
+            => providers.TryGetValue(name, out provider);
+
+        internal void PopulateFromFiles()
+        {
+            var results = AssetDatabase.FindAssetGUIDs("t: ShaderInclude");
+
+            foreach (var result in results)
+            {
+                AnalyzeFile(result);
+            }
+        }
+
+        internal void PopulateFromScripts()
+        {
+            foreach (var type in ProviderTypeCache.GetScriptedProviderTypes())
+            {
+                var provider = Activator.CreateInstance(type, true) as IProvider;
+                if (provider != null)
+                    TryAdd(provider);
+            }
+        }
+
+        internal bool AnalyzeFile(GUID assetID)
+        {
+            Clear(assetID);
+
+            var shaderInclude = AssetDatabase.LoadAssetByGUID<ShaderInclude>(assetID);
+            if (shaderInclude == null)
+                return false;
+
+            var reflection = shaderInclude.Reflection;
+            if (reflection == null)
+                return false;
+
+            foreach (var func in reflection.ReflectedFunctions)
+            {
+                var candidateProvider = new ReflectedFunctionProvider(assetID, func);
+                if (!TryAdd(candidateProvider))
+                {
+                    TryFind(candidateProvider.ProviderKey, out var provider);
+
+                    string path = AssetDatabase.GUIDToAssetPath(assetID);
+                    string foundPath = AssetDatabase.GUIDToAssetPath(provider.AssetID);
+                    Debug.LogError($"Attempted to register '{candidateProvider.ProviderKey}' found in '{path}', but was already registered from '{foundPath}'.", shaderInclude);
+                }
+            }
+            return true;
+        }
+    }
+}
diff --git a/Packages/com.unity.shadergraph/Editor/ProviderSystem/ProviderLibrary.cs.meta b/Packages/com.unity.shadergraph/Editor/ProviderSystem/ProviderLibrary.cs.meta
new file mode 100644
index 00000000000..b9123d1a21e
--- /dev/null
+++ b/Packages/com.unity.shadergraph/Editor/ProviderSystem/ProviderLibrary.cs.meta
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: 41ba38f685080e84082aa51986c2c973
\ No newline at end of file
diff --git a/Packages/com.unity.shadergraph/Editor/ProviderSystem/Reflection.meta b/Packages/com.unity.shadergraph/Editor/ProviderSystem/Reflection.meta
new file mode 100644
index 00000000000..a1ce12a7002
--- /dev/null
+++ b/Packages/com.unity.shadergraph/Editor/ProviderSystem/Reflection.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 93caa1d2f03b541cd96c60c1fa44b1ba
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Packages/com.unity.shadergraph/Editor/ProviderSystem/Reflection/ReflectedFunctionProvider.cs b/Packages/com.unity.shadergraph/Editor/ProviderSystem/Reflection/ReflectedFunctionProvider.cs
new file mode 100644
index 00000000000..fad32e29bc5
--- /dev/null
+++ b/Packages/com.unity.shadergraph/Editor/ProviderSystem/Reflection/ReflectedFunctionProvider.cs
@@ -0,0 +1,62 @@
+
+using System;
+using UnityEditor.ShaderApiReflection;
+using UnityEngine;
+
+namespace UnityEditor.ShaderGraph.ProviderSystem
+{
+    [Serializable]
+    internal class ReflectedFunctionProvider : IProvider<IShaderFunction>
+    {
+        public string ProviderKey => m_providerKey;
+        public GUID AssetID => m_sourceAssetId;
+        public bool RequiresGeneration => false; // TODO: Becomes true with dynamic/precision.
+
+        public IShaderFunction Definition
+        {
+            get
+            {
+                if (m_definition == null || !m_definition.IsValid)
+                    Reload();
+                return m_definition;
+            }
+        }
+
+        [SerializeField]
+        string m_providerKey;
+
+        [SerializeField]
+        GUID m_sourceAssetId;
+
+        [NonSerialized]
+        IShaderFunction m_definition;
+
+        internal ReflectedFunctionProvider(GUID assetId, IShaderFunction definition)
+        {
+            m_sourceAssetId = assetId;
+            m_definition = definition;
+
+            if (definition.IsValid)
+            {
+                m_providerKey = ShaderObjectUtils.EvaluateProviderKey(definition);
+            }
+        }
+
+        internal ReflectedFunctionProvider(GUID assetId, ReflectedFunction function)
+            : this(assetId, ShaderReflectionUtils.ToShaderFunction(function))
+        {
+        }
+
+        // Should be called during hot reload
+        public void Reload()
+        {
+            if (ShaderReflectionUtils.TryResolve(m_providerKey, m_sourceAssetId, out var function))
+                m_definition = ShaderReflectionUtils.ToShaderFunction(function);
+            else m_definition = null;
+        }
+
+        public IProvider Clone()
+            => new ReflectedFunctionProvider(this.AssetID, this.Definition);
+        
+    }
+}
diff --git a/Packages/com.unity.shadergraph/Editor/ProviderSystem/Reflection/ReflectedFunctionProvider.cs.meta b/Packages/com.unity.shadergraph/Editor/ProviderSystem/Reflection/ReflectedFunctionProvider.cs.meta
new file mode 100644
index 00000000000..51e22478b3d
--- /dev/null
+++ b/Packages/com.unity.shadergraph/Editor/ProviderSystem/Reflection/ReflectedFunctionProvider.cs.meta
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: 038ab7ce009192243b6d1d84f54a250b
\ No newline at end of file
diff --git a/Packages/com.unity.shadergraph/Editor/ProviderSystem/Reflection/ShaderReflectionAssetPostProcessor.cs b/Packages/com.unity.shadergraph/Editor/ProviderSystem/Reflection/ShaderReflectionAssetPostProcessor.cs
new file mode 100644
index 00000000000..376d9db1cfb
--- /dev/null
+++ b/Packages/com.unity.shadergraph/Editor/ProviderSystem/Reflection/ShaderReflectionAssetPostProcessor.cs
@@ -0,0 +1,42 @@
+using UnityEngine;
+using UnityEditor.ShaderApiReflection;
+using System.Collections.Generic;
+using UnityEditor.ShaderGraph.Drawing;
+using System.IO;
+
+namespace UnityEditor.ShaderGraph.ProviderSystem
+{
+    internal class ShaderReflectionAssetPostProcessor : AssetPostprocessor
+    {
+        static void OnPostprocessAllAssets(string[] importedAssets, string[] deletedAssets, string[] movedAssets, string[] movedFromAssetPaths, bool didDomainReload)
+        {
+            if (!ProviderLibrary.IsInstanceInitialized)
+                return;
+
+            List<GUID> modifiedFiles = new();
+            foreach (string path in importedAssets)
+            {
+                if (Path.GetExtension(path).ToLower() != ".hlsl")
+                    continue;
+
+                var assetID = AssetDatabase.GUIDFromAssetPath(path);
+                if (ProviderLibrary.Instance.AnalyzeFile(assetID))
+                {
+                    modifiedFiles.Add(assetID);
+                }
+            }
+
+            if (modifiedFiles.Count > 0)
+                NotifyAll(modifiedFiles);
+        }
+
+        internal static void NotifyAll(IEnumerable<GUID> modifiedFiles)
+        {
+            var editors = Resources.FindObjectsOfTypeAll<MaterialGraphEditWindow>();
+            foreach(var editor in editors)
+            {
+                editor.NotifyDependencyUpdated(modifiedFiles);
+            }
+        }
+    }
+}
diff --git a/Packages/com.unity.shadergraph/Editor/ProviderSystem/Reflection/ShaderReflectionAssetPostProcessor.cs.meta b/Packages/com.unity.shadergraph/Editor/ProviderSystem/Reflection/ShaderReflectionAssetPostProcessor.cs.meta
new file mode 100644
index 00000000000..50ddd490a45
--- /dev/null
+++ b/Packages/com.unity.shadergraph/Editor/ProviderSystem/Reflection/ShaderReflectionAssetPostProcessor.cs.meta
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: 74b504aa51af0344f97e1591851f6256
\ No newline at end of file
diff --git a/Packages/com.unity.shadergraph/Editor/ProviderSystem/Reflection/ShaderReflectionUtils.cs b/Packages/com.unity.shadergraph/Editor/ProviderSystem/Reflection/ShaderReflectionUtils.cs
new file mode 100644
index 00000000000..b3352e9f647
--- /dev/null
+++ b/Packages/com.unity.shadergraph/Editor/ProviderSystem/Reflection/ShaderReflectionUtils.cs
@@ -0,0 +1,56 @@
+
+using System.Collections.Generic;
+using System.Text;
+using UnityEditor.ShaderApiReflection;
+using UnityEngine;
+
+namespace UnityEditor.ShaderGraph.ProviderSystem
+{
+    internal static class ShaderReflectionUtils
+    {
+        internal static bool TryResolve(string providerKey, GUID assetId, out ReflectedFunction function)
+        {
+            var source = AssetDatabase.LoadAssetByGUID<ShaderInclude>(assetId)?.Reflection;
+
+            function = default;
+            if (source == null)
+                return false;
+
+            foreach (var func in source.ReflectedFunctions)
+            {
+                var otherProviderKey = ShaderObjectUtils.EvaluateProviderKey(ToShaderFunction(func));
+                if (providerKey == otherProviderKey)
+                {
+                    function = func;
+                    return true;
+                }
+            }
+
+            return false;
+        }
+
+        internal static IShaderType ToShaderType(string typeName)
+        {
+            return new ShaderType(typeName);
+        }
+
+        internal static IShaderField ToShaderField(ReflectedParameter refParam)
+        {
+            var type = ToShaderType(refParam.TypeName);
+            bool isInput = refParam.DirectionFlags == ReflectedParameter.Direction.In || refParam.DirectionFlags == ReflectedParameter.Direction.InOut;
+            bool isOutput = refParam.DirectionFlags == ReflectedParameter.Direction.Out || refParam.DirectionFlags == ReflectedParameter.Direction.InOut;
+            return new ShaderField(refParam.Name, isInput, isOutput, type, refParam.Hints);
+        }
+
+        internal static IShaderFunction ToShaderFunction(ReflectedFunction refFunc)
+        {
+            var returnType = ToShaderType(refFunc.ReturnTypeName);
+            List<IShaderField> fields = new();
+            foreach (var param in refFunc.Parameters)
+            {
+                fields.Add(ToShaderField(param));
+            }            
+            return new ShaderFunction(refFunc.Name, refFunc.EnclosingNamespace, fields, returnType, refFunc.BodyText, refFunc.Hints);
+        }
+    }
+}
diff --git a/Packages/com.unity.shadergraph/Editor/ProviderSystem/Reflection/ShaderReflectionUtils.cs.meta b/Packages/com.unity.shadergraph/Editor/ProviderSystem/Reflection/ShaderReflectionUtils.cs.meta
new file mode 100644
index 00000000000..4218a3c23e9
--- /dev/null
+++ b/Packages/com.unity.shadergraph/Editor/ProviderSystem/Reflection/ShaderReflectionUtils.cs.meta
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: 606cfb4ddecb1c7488927f55fd68944d
\ No newline at end of file
diff --git a/Packages/com.unity.shadergraph/Editor/ProviderSystem/ShaderObjectUtils.cs b/Packages/com.unity.shadergraph/Editor/ProviderSystem/ShaderObjectUtils.cs
new file mode 100644
index 00000000000..ff2fce58b8e
--- /dev/null
+++ b/Packages/com.unity.shadergraph/Editor/ProviderSystem/ShaderObjectUtils.cs
@@ -0,0 +1,139 @@
+
+using System.Collections.Generic;
+using System.Text;
+
+namespace UnityEditor.ShaderGraph.ProviderSystem
+{
+    internal static class ShaderObjectUtils
+    {
+        internal static string QualifyName(IShaderObject obj, string separator = "::", bool includeName = true)
+        {
+            if (obj == null || !obj.IsValid)
+                return null;
+
+            StringBuilder builder = new();
+
+            if (obj.Namespace != null)
+                foreach (var name in obj.Namespace)
+                    builder.Append($"{name}{separator}");
+
+            builder.Append(obj.Name);
+            return builder.ToString();
+        }
+
+        internal static string QualifySignature(IShaderFunction obj, bool includeNamespace = true, bool forDisplay = false)
+        {
+            if (obj == null || !obj.IsValid)
+                return null;
+
+            StringBuilder builder = new();
+            builder.Append(includeNamespace ? QualifyName(obj) : obj.Name);
+            builder.Append(forDisplay ? " (" : "(");
+
+            bool first = true;
+            if (obj.Parameters != null)
+            {
+                foreach (var param in obj.Parameters)
+                {
+                    if (!first) builder.Append(forDisplay ? ", " : ",");
+                    first = false;
+                    builder.Append(QualifyName(param.ShaderType));
+                }
+            }
+            builder.Append(")");
+
+            return builder.ToString();
+        }
+
+        internal static string EvaluateProviderKey(IShaderFunction obj, string fromHint = Hints.Func.kProviderKey)
+        {
+            string result = null;
+            if (obj?.IsValid ?? false)
+            {
+                if (obj.Hints == null || !obj.Hints.TryGetValue(fromHint, out result))
+                    result = QualifySignature(obj);
+            }
+            return result;
+        }
+
+        private static (string typeName, string arraySpec) SplitTypeName(string typeName)
+        {
+            int i = typeName.IndexOf('[');
+            return i == -1 ? (typeName, "") : (typeName.Substring(0, i - 1), typeName.Substring(i));
+        }
+
+        private static string DeclareField(IShaderField a)
+        {
+            (string typeName, string arraySpec) SplitTypeName(string typeName)
+            {
+                int i = typeName.IndexOf('[');
+                return i == -1 ? (typeName, "") : (typeName.Substring(0, i - 1), typeName.Substring(i));
+            }
+
+            var t = SplitTypeName(a.ShaderType.Name);
+            return $"{t.typeName} {a.Name}{t.arraySpec}";
+        }
+
+        private static string GenerateHints(string closure, IReadOnlyDictionary<string, string> hints, string name = null)
+        {
+            ShaderStringBuilder sb = new();
+
+            if (name != null)
+                sb.AppendLine($"/// <{closure} name = \"{name}\">");
+            else sb.AppendLine($"/// <{closure}>");
+
+            foreach (var hint in hints)
+                sb.AppendLine($"///\t <{hint.Key}>{hint.Value}</{hint.Key}>");
+
+            sb.AppendLine($"/// </{closure}>");
+            return sb.ToString();
+        }
+
+        internal static string GenerateCode(IShaderFunction func, bool generateHints = true, bool export = true, bool generateNamespace = true)
+        {
+            ShaderStringBuilder sb = new();
+
+            if (generateNamespace)
+                foreach (var name in func.Namespace)
+                    sb.Append($"namespace {name}{{");
+
+            sb.AppendNewLine();
+            sb.IncreaseIndent();
+
+            if (generateHints)
+            {
+                if (func.Hints.Count > 0)
+                    sb.Append(GenerateHints("funchints", func.Hints));
+
+                foreach (var param in func.Parameters)
+                    if (param.Hints.Count > 0)
+                        sb.Append(GenerateHints("paramhints", param.Hints, param.Name));
+            }
+
+            sb.Append($"{(export ? "UNITY_EXPORT_REFLECTION" : "")} {func.ReturnType.Name} {func.Name}(");
+
+            bool first = true;
+
+            foreach (var param in func.Parameters)
+            {
+                if (!first)
+                    sb.Append(", ");
+                first = false;
+                sb.Append(DeclareField(param));
+            }
+            sb.AppendLine(")");
+            sb.AppendLine("{");
+            sb.IncreaseIndent();
+            sb.AppendLine(func.FunctionBody);
+            sb.DecreaseIndent();
+            sb.AppendLine("}");
+            sb.DecreaseIndent();
+
+            if (generateNamespace)
+                foreach (var name in func.Namespace)
+                    sb.Append($"}} /*{name}*/");
+
+            return sb.ToString();
+        }
+    }
+}
diff --git a/Packages/com.unity.shadergraph/Editor/ProviderSystem/ShaderObjectUtils.cs.meta b/Packages/com.unity.shadergraph/Editor/ProviderSystem/ShaderObjectUtils.cs.meta
new file mode 100644
index 00000000000..7c7e3b238e3
--- /dev/null
+++ b/Packages/com.unity.shadergraph/Editor/ProviderSystem/ShaderObjectUtils.cs.meta
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: 3567c810dd85b9b4a9c617ae8e5310e4
\ No newline at end of file
diff --git a/Packages/com.unity.shadergraph/Editor/Resources/Styles/Controls/MultiFloatControlView.uss b/Packages/com.unity.shadergraph/Editor/Resources/Styles/Controls/MultiFloatControlView.uss
index f3bc0a75a82..a7d25350758 100644
--- a/Packages/com.unity.shadergraph/Editor/Resources/Styles/Controls/MultiFloatControlView.uss
+++ b/Packages/com.unity.shadergraph/Editor/Resources/Styles/Controls/MultiFloatControlView.uss
@@ -14,8 +14,7 @@ MultiFloatControlView > #dummy > Label {
 
 
 .unity-base-field {
-    min-width: 30px;
-    flex-grow: 1;
+    width: 30px;
     margin-top: 1px;
     margin-bottom: 1px;
     margin-left: 0;
diff --git a/Packages/com.unity.shadergraph/Editor/Resources/Styles/Controls/TextControlView.uss b/Packages/com.unity.shadergraph/Editor/Resources/Styles/Controls/TextControlView.uss
index c84d11bad03..339e5b95dcb 100644
--- a/Packages/com.unity.shadergraph/Editor/Resources/Styles/Controls/TextControlView.uss
+++ b/Packages/com.unity.shadergraph/Editor/Resources/Styles/Controls/TextControlView.uss
@@ -22,9 +22,10 @@ TextCotrolView > #container > Label {
 .unity-base-field {
     width: 60px;
     flex-grow: 1;
-    margin-left: 20%;
+    flex-shrink: 0;
+    margin-left: 0;
     margin-right: 0;
-    padding-right: 10;
+    padding-right: 0;
 }
 
 .unity-base-field__input {
diff --git a/Packages/com.unity.shadergraph/Editor/Resources/Styles/MaterialNodeView.uss b/Packages/com.unity.shadergraph/Editor/Resources/Styles/MaterialNodeView.uss
index 61fd43930c3..4d9c8d83077 100644
--- a/Packages/com.unity.shadergraph/Editor/Resources/Styles/MaterialNodeView.uss
+++ b/Packages/com.unity.shadergraph/Editor/Resources/Styles/MaterialNodeView.uss
@@ -41,6 +41,11 @@ MaterialNodeView #controls > #items {
     padding-bottom: 4px;
 }
 
+/* Stop dropdown properties from overflowing the node's container */
+MaterialNodeView PropertyRow > #container > #label {
+    min-width: 92px;
+}
+
 MaterialNodeView #title {
     padding-top: 8px;
     border-bottom-width: 8px;
diff --git a/Packages/com.unity.shadergraph/Editor/ShaderGraphPreferences.cs b/Packages/com.unity.shadergraph/Editor/ShaderGraphPreferences.cs
index 85ecf506b75..7742d3a3ea8 100644
--- a/Packages/com.unity.shadergraph/Editor/ShaderGraphPreferences.cs
+++ b/Packages/com.unity.shadergraph/Editor/ShaderGraphPreferences.cs
@@ -35,6 +35,22 @@ static class Keys
             internal const string newNodesPreview = "UnityEditor.ShaderGraph.NewNodesPreview";
         }
 
+        // Note that GUIContent in this class is used to generate search keywords for the preferences window
+        class Labels
+        {
+            public static GUIContent previewVariantLimit = new GUIContent("Preview Variant Limit");
+            public static GUIContent autoAddRemoveBlocks = new GUIContent("Automatically Add and Remove Block Nodes");
+            public static GUIContent allowDeprecatedBehaviors = new GUIContent("Enable Deprecated Nodes");
+            public static GUIContent zoomStepSize = new GUIContent("Zoom Step Size", "Default is 0.5");
+            public static GUIContent graphTemplateWorkflow = new GUIContent("Graph Template Workflow",
+                "When creating a new Shadergraph asset from specific menu items, determine if a reference should use a"
+                + " variant of the newly created material sub-asset or the shader itself.");
+            public static GUIContent openNewGraphOnCreation = new GUIContent("Open new Shader Graphs automatically",
+                "Choose whether new ShaderGraph assets should automatically open for editing.");
+            public static GUIContent newNodesPreview = new GUIContent("Expand Node Preview on Node creation",
+                "Choose whether newly added Nodes' Previews should be expanded.");
+        }
+
         static bool m_Loaded = false;
         internal delegate void PreferenceChangedDelegate();
 
@@ -142,7 +158,8 @@ static SettingsProvider PreferenceGUI()
         {
             return new SettingsProvider("Preferences/Shader Graph", SettingsScope.User)
             {
-                guiHandler = searchContext => OpenGUI()
+                guiHandler = searchContext => OpenGUI(),
+                keywords = SettingsProvider.GetSearchKeywordsFromGUIContentProperties<Labels>(),
             };
         }
 
@@ -159,8 +176,8 @@ static void OpenGUI()
                 var willPreviewVariantBeIgnored = ShaderGraphPreferences.previewVariantLimit > actualLimit || ShaderGraphProjectSettings.instance.overrideShaderVariantLimit;
 
                 var variantLimitLabel = willPreviewVariantBeIgnored
-                    ? new GUIContent("Preview Variant Limit", EditorGUIUtility.IconContent("console.infoicon").image, $"The Preview Variant Limit is higher than the Shader Variant Limit in Project Settings: {actualLimit}. The Preview Variant Limit will be ignored.")
-                    : new GUIContent("Preview Variant Limit");
+                    ? new GUIContent(Labels.previewVariantLimit.text, EditorGUIUtility.IconContent("console.infoicon").image, $"The Preview Variant Limit is higher than the Shader Variant Limit in Project Settings: {actualLimit}. The Preview Variant Limit will be ignored.")
+                    : Labels.previewVariantLimit;
 
                 EditorGUI.BeginChangeCheck();
                 var variantLimitValue = EditorGUILayout.DelayedIntField(variantLimitLabel, previewVariantLimit);
@@ -171,42 +188,42 @@ static void OpenGUI()
                 }
 
                 EditorGUI.BeginChangeCheck();
-                var autoAddRemoveBlocksValue = EditorGUILayout.Toggle("Automatically Add and Remove Block Nodes", autoAddRemoveBlocks);
+                var autoAddRemoveBlocksValue = EditorGUILayout.Toggle(Labels.autoAddRemoveBlocks, autoAddRemoveBlocks);
                 if (EditorGUI.EndChangeCheck())
                 {
                     autoAddRemoveBlocks = autoAddRemoveBlocksValue;
                 }
 
                 EditorGUI.BeginChangeCheck();
-                var allowDeprecatedBehaviorsValue = EditorGUILayout.Toggle("Enable Deprecated Nodes", allowDeprecatedBehaviors);
+                var allowDeprecatedBehaviorsValue = EditorGUILayout.Toggle(Labels.allowDeprecatedBehaviors, allowDeprecatedBehaviors);
                 if (EditorGUI.EndChangeCheck())
                 {
                     allowDeprecatedBehaviors = allowDeprecatedBehaviorsValue;
                 }
 
                 EditorGUI.BeginChangeCheck();
-                var zoomStepSizeValue = EditorGUILayout.Slider(new GUIContent("Zoom Step Size", $"Default is 0.5"), zoomStepSize, 0.0f, 1f);
+                var zoomStepSizeValue = EditorGUILayout.Slider(Labels.zoomStepSize.text, zoomStepSize, 0.0f, 1f);
                 if (EditorGUI.EndChangeCheck())
                 {
                     zoomStepSize = zoomStepSizeValue;
                 }
 
                 EditorGUI.BeginChangeCheck();
-                var graphTemplateWorkflowValue = EditorGUILayout.EnumPopup(new GUIContent("Graph Template Workflow", "When creating a new Shadergraph asset from specific menu items, determine if a reference should use a variant of the newly created material sub-asset or the shader itself."), graphTemplateWorkflow);
+                var graphTemplateWorkflowValue = EditorGUILayout.EnumPopup(Labels.graphTemplateWorkflow, graphTemplateWorkflow);
                 if (EditorGUI.EndChangeCheck())
                 {
                     graphTemplateWorkflow = (GraphTemplateWorkflow)graphTemplateWorkflowValue;
                 }
 
                 EditorGUI.BeginChangeCheck();
-                var openNewGraphOnCreationValue = EditorGUILayout.Toggle(new GUIContent("Open new Shader Graphs automatically", "Choose whether new ShaderGraph assets should automatically open for editing."), openNewGraphOnCreation);
+                var openNewGraphOnCreationValue = EditorGUILayout.Toggle(Labels.openNewGraphOnCreation, openNewGraphOnCreation);
                 if (EditorGUI.EndChangeCheck())
                 {
                     openNewGraphOnCreation = openNewGraphOnCreationValue;
                 }
 
                 EditorGUI.BeginChangeCheck();
-                var newNodesPreviewValue = EditorGUILayout.Toggle(new GUIContent("Expand Node Preview on Node creation", "Choose whether newly added Nodes' Previews should be expanded."), newNodesPreview);
+                var newNodesPreviewValue = EditorGUILayout.Toggle(Labels.newNodesPreview, newNodesPreview);
                 if (EditorGUI.EndChangeCheck())
                 {
                     newNodesPreview = newNodesPreviewValue;
diff --git a/Packages/com.unity.shadergraph/Samples~/Common/Meshes/Billboard/NegativeX.FBX b/Packages/com.unity.shadergraph/Samples~/Common/Meshes/Billboard/NegativeX.fbx
similarity index 100%
rename from Packages/com.unity.shadergraph/Samples~/Common/Meshes/Billboard/NegativeX.FBX
rename to Packages/com.unity.shadergraph/Samples~/Common/Meshes/Billboard/NegativeX.fbx
diff --git a/Packages/com.unity.shadergraph/Samples~/Common/Meshes/Billboard/NegativeY.FBX b/Packages/com.unity.shadergraph/Samples~/Common/Meshes/Billboard/NegativeY.fbx
similarity index 100%
rename from Packages/com.unity.shadergraph/Samples~/Common/Meshes/Billboard/NegativeY.FBX
rename to Packages/com.unity.shadergraph/Samples~/Common/Meshes/Billboard/NegativeY.fbx
diff --git a/Packages/com.unity.shadergraph/Samples~/Common/Meshes/Billboard/NegativeZ.FBX b/Packages/com.unity.shadergraph/Samples~/Common/Meshes/Billboard/NegativeZ.fbx
similarity index 100%
rename from Packages/com.unity.shadergraph/Samples~/Common/Meshes/Billboard/NegativeZ.FBX
rename to Packages/com.unity.shadergraph/Samples~/Common/Meshes/Billboard/NegativeZ.fbx
diff --git a/Packages/com.unity.shadergraph/Samples~/Common/Meshes/Billboard/PositiveX.FBX b/Packages/com.unity.shadergraph/Samples~/Common/Meshes/Billboard/PositiveX.fbx
similarity index 100%
rename from Packages/com.unity.shadergraph/Samples~/Common/Meshes/Billboard/PositiveX.FBX
rename to Packages/com.unity.shadergraph/Samples~/Common/Meshes/Billboard/PositiveX.fbx
diff --git a/Packages/com.unity.shadergraph/Samples~/Common/Meshes/Billboard/PositiveY.FBX b/Packages/com.unity.shadergraph/Samples~/Common/Meshes/Billboard/PositiveY.fbx
similarity index 100%
rename from Packages/com.unity.shadergraph/Samples~/Common/Meshes/Billboard/PositiveY.FBX
rename to Packages/com.unity.shadergraph/Samples~/Common/Meshes/Billboard/PositiveY.fbx
diff --git a/Packages/com.unity.shadergraph/Samples~/Common/Meshes/Billboard/PositiveZ.FBX b/Packages/com.unity.shadergraph/Samples~/Common/Meshes/Billboard/PositiveZ.fbx
similarity index 100%
rename from Packages/com.unity.shadergraph/Samples~/Common/Meshes/Billboard/PositiveZ.FBX
rename to Packages/com.unity.shadergraph/Samples~/Common/Meshes/Billboard/PositiveZ.fbx
diff --git a/Packages/com.unity.shadergraph/Samples~/Common/Meshes/Particles/ParticleStack100.FBX b/Packages/com.unity.shadergraph/Samples~/Common/Meshes/Particles/ParticleStack100.fbx
similarity index 100%
rename from Packages/com.unity.shadergraph/Samples~/Common/Meshes/Particles/ParticleStack100.FBX
rename to Packages/com.unity.shadergraph/Samples~/Common/Meshes/Particles/ParticleStack100.fbx
diff --git a/Packages/com.unity.shadergraph/Samples~/Common/Meshes/Particles/ParticleStack25.FBX b/Packages/com.unity.shadergraph/Samples~/Common/Meshes/Particles/ParticleStack25.fbx
similarity index 100%
rename from Packages/com.unity.shadergraph/Samples~/Common/Meshes/Particles/ParticleStack25.FBX
rename to Packages/com.unity.shadergraph/Samples~/Common/Meshes/Particles/ParticleStack25.fbx
diff --git a/Packages/com.unity.shadergraph/Samples~/Common/Meshes/Particles/ParticleStack50.FBX b/Packages/com.unity.shadergraph/Samples~/Common/Meshes/Particles/ParticleStack50.fbx
similarity index 100%
rename from Packages/com.unity.shadergraph/Samples~/Common/Meshes/Particles/ParticleStack50.FBX
rename to Packages/com.unity.shadergraph/Samples~/Common/Meshes/Particles/ParticleStack50.fbx
diff --git a/Packages/com.unity.shadergraph/Samples~/Common/Meshes/grass_bladeNoLOD10.FBX b/Packages/com.unity.shadergraph/Samples~/Common/Meshes/grass_bladeNoLOD10.fbx
similarity index 100%
rename from Packages/com.unity.shadergraph/Samples~/Common/Meshes/grass_bladeNoLOD10.FBX
rename to Packages/com.unity.shadergraph/Samples~/Common/Meshes/grass_bladeNoLOD10.fbx
diff --git a/Packages/com.unity.shadergraph/Samples~/ProceduralPatterns/Bacteria.ShaderSubGraph b/Packages/com.unity.shadergraph/Samples~/ProceduralPatterns/Bacteria.shadersubgraph
similarity index 100%
rename from Packages/com.unity.shadergraph/Samples~/ProceduralPatterns/Bacteria.ShaderSubGraph
rename to Packages/com.unity.shadergraph/Samples~/ProceduralPatterns/Bacteria.shadersubgraph
diff --git a/Packages/com.unity.shadergraph/Samples~/ProceduralPatterns/Brick.ShaderSubGraph b/Packages/com.unity.shadergraph/Samples~/ProceduralPatterns/Brick.shadersubgraph
similarity index 100%
rename from Packages/com.unity.shadergraph/Samples~/ProceduralPatterns/Brick.ShaderSubGraph
rename to Packages/com.unity.shadergraph/Samples~/ProceduralPatterns/Brick.shadersubgraph
diff --git a/Packages/com.unity.shadergraph/Samples~/ProceduralPatterns/Dots.ShaderSubGraph b/Packages/com.unity.shadergraph/Samples~/ProceduralPatterns/Dots.shadersubgraph
similarity index 100%
rename from Packages/com.unity.shadergraph/Samples~/ProceduralPatterns/Dots.ShaderSubGraph
rename to Packages/com.unity.shadergraph/Samples~/ProceduralPatterns/Dots.shadersubgraph
diff --git a/Packages/com.unity.shadergraph/Samples~/ProceduralPatterns/Grid.ShaderSubGraph b/Packages/com.unity.shadergraph/Samples~/ProceduralPatterns/Grid.shadersubgraph
similarity index 100%
rename from Packages/com.unity.shadergraph/Samples~/ProceduralPatterns/Grid.ShaderSubGraph
rename to Packages/com.unity.shadergraph/Samples~/ProceduralPatterns/Grid.shadersubgraph
diff --git a/Packages/com.unity.shadergraph/Samples~/ProceduralPatterns/Herringbone.ShaderSubGraph b/Packages/com.unity.shadergraph/Samples~/ProceduralPatterns/Herringbone.shadersubgraph
similarity index 100%
rename from Packages/com.unity.shadergraph/Samples~/ProceduralPatterns/Herringbone.ShaderSubGraph
rename to Packages/com.unity.shadergraph/Samples~/ProceduralPatterns/Herringbone.shadersubgraph
diff --git a/Packages/com.unity.shadergraph/Samples~/ProceduralPatterns/Hex Lattice.ShaderSubGraph b/Packages/com.unity.shadergraph/Samples~/ProceduralPatterns/Hex Lattice.shadersubgraph
similarity index 100%
rename from Packages/com.unity.shadergraph/Samples~/ProceduralPatterns/Hex Lattice.ShaderSubGraph
rename to Packages/com.unity.shadergraph/Samples~/ProceduralPatterns/Hex Lattice.shadersubgraph
diff --git a/Packages/com.unity.shadergraph/Samples~/ProceduralPatterns/Houndstooth.ShaderSubGraph b/Packages/com.unity.shadergraph/Samples~/ProceduralPatterns/Houndstooth.shadersubgraph
similarity index 100%
rename from Packages/com.unity.shadergraph/Samples~/ProceduralPatterns/Houndstooth.ShaderSubGraph
rename to Packages/com.unity.shadergraph/Samples~/ProceduralPatterns/Houndstooth.shadersubgraph
diff --git a/Packages/com.unity.shadergraph/Samples~/ProceduralPatterns/Smooth Wave.ShaderSubGraph b/Packages/com.unity.shadergraph/Samples~/ProceduralPatterns/Smooth Wave.shadersubgraph
similarity index 100%
rename from Packages/com.unity.shadergraph/Samples~/ProceduralPatterns/Smooth Wave.ShaderSubGraph
rename to Packages/com.unity.shadergraph/Samples~/ProceduralPatterns/Smooth Wave.shadersubgraph
diff --git a/Packages/com.unity.shadergraph/Samples~/ProceduralPatterns/Spiral.ShaderSubGraph b/Packages/com.unity.shadergraph/Samples~/ProceduralPatterns/Spiral.shadersubgraph
similarity index 100%
rename from Packages/com.unity.shadergraph/Samples~/ProceduralPatterns/Spiral.ShaderSubGraph
rename to Packages/com.unity.shadergraph/Samples~/ProceduralPatterns/Spiral.shadersubgraph
diff --git a/Packages/com.unity.shadergraph/Samples~/ProceduralPatterns/Stripes.ShaderSubGraph b/Packages/com.unity.shadergraph/Samples~/ProceduralPatterns/Stripes.shadersubgraph
similarity index 100%
rename from Packages/com.unity.shadergraph/Samples~/ProceduralPatterns/Stripes.ShaderSubGraph
rename to Packages/com.unity.shadergraph/Samples~/ProceduralPatterns/Stripes.shadersubgraph
diff --git a/Packages/com.unity.shadergraph/Samples~/ProceduralPatterns/Truchet.ShaderSubGraph b/Packages/com.unity.shadergraph/Samples~/ProceduralPatterns/Truchet.shadersubgraph
similarity index 100%
rename from Packages/com.unity.shadergraph/Samples~/ProceduralPatterns/Truchet.ShaderSubGraph
rename to Packages/com.unity.shadergraph/Samples~/ProceduralPatterns/Truchet.shadersubgraph
diff --git a/Packages/com.unity.shadergraph/Samples~/ProceduralPatterns/Whirl.ShaderSubGraph b/Packages/com.unity.shadergraph/Samples~/ProceduralPatterns/Whirl.shadersubgraph
similarity index 100%
rename from Packages/com.unity.shadergraph/Samples~/ProceduralPatterns/Whirl.ShaderSubGraph
rename to Packages/com.unity.shadergraph/Samples~/ProceduralPatterns/Whirl.shadersubgraph
diff --git a/Packages/com.unity.shadergraph/Samples~/ProceduralPatterns/Zig Zag.ShaderSubGraph b/Packages/com.unity.shadergraph/Samples~/ProceduralPatterns/Zig Zag.shadersubgraph
similarity index 100%
rename from Packages/com.unity.shadergraph/Samples~/ProceduralPatterns/Zig Zag.ShaderSubGraph
rename to Packages/com.unity.shadergraph/Samples~/ProceduralPatterns/Zig Zag.shadersubgraph
diff --git a/Packages/com.unity.shadergraph/Samples~/ProductionReady/Environment/Details/Grass/grass_bladeNoLOD10.FBX b/Packages/com.unity.shadergraph/Samples~/ProductionReady/Environment/Details/Grass/grass_bladeNoLOD10.fbx
similarity index 100%
rename from Packages/com.unity.shadergraph/Samples~/ProductionReady/Environment/Details/Grass/grass_bladeNoLOD10.FBX
rename to Packages/com.unity.shadergraph/Samples~/ProductionReady/Environment/Details/Grass/grass_bladeNoLOD10.fbx
diff --git a/Packages/com.unity.shadergraph/Samples~/ProductionReady/Environment/Details/Grass/grass_bladeNoLOD15.FBX b/Packages/com.unity.shadergraph/Samples~/ProductionReady/Environment/Details/Grass/grass_bladeNoLOD15.fbx
similarity index 100%
rename from Packages/com.unity.shadergraph/Samples~/ProductionReady/Environment/Details/Grass/grass_bladeNoLOD15.FBX
rename to Packages/com.unity.shadergraph/Samples~/ProductionReady/Environment/Details/Grass/grass_bladeNoLOD15.fbx
diff --git a/Packages/com.unity.shadergraph/Samples~/ProductionReady/Environment/Details/Grass/grass_bladeNoLOD30.FBX b/Packages/com.unity.shadergraph/Samples~/ProductionReady/Environment/Details/Grass/grass_bladeNoLOD30.fbx
similarity index 100%
rename from Packages/com.unity.shadergraph/Samples~/ProductionReady/Environment/Details/Grass/grass_bladeNoLOD30.FBX
rename to Packages/com.unity.shadergraph/Samples~/ProductionReady/Environment/Details/Grass/grass_bladeNoLOD30.fbx
diff --git a/Packages/com.unity.shadergraph/Samples~/ProductionReady/Environment/Details/Pebbles/pebbles.FBX b/Packages/com.unity.shadergraph/Samples~/ProductionReady/Environment/Details/Pebbles/pebbles.fbx
similarity index 100%
rename from Packages/com.unity.shadergraph/Samples~/ProductionReady/Environment/Details/Pebbles/pebbles.FBX
rename to Packages/com.unity.shadergraph/Samples~/ProductionReady/Environment/Details/Pebbles/pebbles.fbx
diff --git a/Packages/com.unity.shadergraph/Samples~/ProductionReady/Environment/Details/clover/clover.FBX b/Packages/com.unity.shadergraph/Samples~/ProductionReady/Environment/Details/clover/clover.fbx
similarity index 100%
rename from Packages/com.unity.shadergraph/Samples~/ProductionReady/Environment/Details/clover/clover.FBX
rename to Packages/com.unity.shadergraph/Samples~/ProductionReady/Environment/Details/clover/clover.fbx
diff --git a/Packages/com.unity.shadergraph/Samples~/ProductionReady/Environment/Water/WaterFall.FBX b/Packages/com.unity.shadergraph/Samples~/ProductionReady/Environment/Water/WaterFall.fbx
similarity index 100%
rename from Packages/com.unity.shadergraph/Samples~/ProductionReady/Environment/Water/WaterFall.FBX
rename to Packages/com.unity.shadergraph/Samples~/ProductionReady/Environment/Water/WaterFall.fbx
diff --git a/Packages/com.unity.shadergraph/Samples~/ProductionReady/Environment/Water/WaterPlane.FBX b/Packages/com.unity.shadergraph/Samples~/ProductionReady/Environment/Water/WaterPlane.fbx
similarity index 100%
rename from Packages/com.unity.shadergraph/Samples~/ProductionReady/Environment/Water/WaterPlane.FBX
rename to Packages/com.unity.shadergraph/Samples~/ProductionReady/Environment/Water/WaterPlane.fbx
diff --git a/Packages/com.unity.shadergraph/Samples~/UGUIShaders/Default Materials/Button Material.shadergraph b/Packages/com.unity.shadergraph/Samples~/UGUIShaders/Default Materials/Button Material.shadergraph
index dab6f1966ab..9bbeb5eb9e5 100644
--- a/Packages/com.unity.shadergraph/Samples~/UGUIShaders/Default Materials/Button Material.shadergraph	
+++ b/Packages/com.unity.shadergraph/Samples~/UGUIShaders/Default Materials/Button Material.shadergraph	
@@ -33,9 +33,6 @@
         {
             "m_Id": "a910581aca9a40b68b5d824cd47b0e29"
         },
-        {
-            "m_Id": "5d98c0a28e8944afa985b0f9af55636f"
-        },
         {
             "m_Id": "fe253a8df1154738b73f269b31880dc9"
         },
@@ -52,50 +49,66 @@
             "m_Id": "cc3cd7e9e6ef4792a7da7583ebfe4845"
         },
         {
-            "m_Id": "6cde5b8807e347348989e5c0ebff1912"
+            "m_Id": "184c838d2bea4d74914bf1114be04ac1"
         },
         {
-            "m_Id": "0e920138592249bda21166cf1925230f"
+            "m_Id": "d082c09bb0224a49a30fa581434a464c"
         },
         {
-            "m_Id": "4bd5f4f62d78496488cca016f246f9e9"
+            "m_Id": "49e1f6ca722943738549602287aa8894"
         },
         {
-            "m_Id": "c716af712ac24585a2ba8536af3f530e"
+            "m_Id": "629edfb5e0b742e282733b637b94fbd1"
         },
         {
-            "m_Id": "184c838d2bea4d74914bf1114be04ac1"
+            "m_Id": "a3305e924f664bb890447b9d2bf847a5"
+        },
+        {
+            "m_Id": "1b9589ef73ed42d297af3e74d6087b20"
         }
     ],
     "m_GroupDatas": [],
-    "m_StickyNoteDatas": [],
+    "m_StickyNoteDatas": [
+        {
+            "m_Id": "86e69ed9453341389b57b3624b335cb3"
+        },
+        {
+            "m_Id": "ced045f01b494c32854cf68908ded4f9"
+        },
+        {
+            "m_Id": "e6b5c99a92ba46a6b58dcd7d9344f06a"
+        },
+        {
+            "m_Id": "4bd4931d50b54b6582e92e79a1289468"
+        }
+    ],
     "m_Edges": [
         {
             "m_OutputSlot": {
                 "m_Node": {
-                    "m_Id": "0e920138592249bda21166cf1925230f"
+                    "m_Id": "184c838d2bea4d74914bf1114be04ac1"
                 },
-                "m_SlotId": 0
+                "m_SlotId": 2
             },
             "m_InputSlot": {
                 "m_Node": {
-                    "m_Id": "1ff2775323a14c418ac415e1a2526504"
+                    "m_Id": "9cceade6ef6747debf426a2410454fb2"
                 },
-                "m_SlotId": 1786236159
+                "m_SlotId": 0
             }
         },
         {
             "m_OutputSlot": {
                 "m_Node": {
-                    "m_Id": "184c838d2bea4d74914bf1114be04ac1"
+                    "m_Id": "1b9589ef73ed42d297af3e74d6087b20"
                 },
-                "m_SlotId": 2
+                "m_SlotId": 1
             },
             "m_InputSlot": {
                 "m_Node": {
-                    "m_Id": "9cceade6ef6747debf426a2410454fb2"
+                    "m_Id": "184c838d2bea4d74914bf1114be04ac1"
                 },
-                "m_SlotId": 0
+                "m_SlotId": 1
             }
         },
         {
@@ -121,23 +134,23 @@
             },
             "m_InputSlot": {
                 "m_Node": {
-                    "m_Id": "c716af712ac24585a2ba8536af3f530e"
+                    "m_Id": "49e1f6ca722943738549602287aa8894"
                 },
-                "m_SlotId": 4
+                "m_SlotId": 6
             }
         },
         {
             "m_OutputSlot": {
                 "m_Node": {
-                    "m_Id": "4bd5f4f62d78496488cca016f246f9e9"
+                    "m_Id": "49e1f6ca722943738549602287aa8894"
                 },
-                "m_SlotId": 6
+                "m_SlotId": 2
             },
             "m_InputSlot": {
                 "m_Node": {
-                    "m_Id": "1ff2775323a14c418ac415e1a2526504"
+                    "m_Id": "1b9589ef73ed42d297af3e74d6087b20"
                 },
-                "m_SlotId": -591484606
+                "m_SlotId": 0
             }
         },
         {
@@ -149,21 +162,21 @@
             },
             "m_InputSlot": {
                 "m_Node": {
-                    "m_Id": "c716af712ac24585a2ba8536af3f530e"
+                    "m_Id": "49e1f6ca722943738549602287aa8894"
                 },
-                "m_SlotId": 2
+                "m_SlotId": 4
             }
         },
         {
             "m_OutputSlot": {
                 "m_Node": {
-                    "m_Id": "5d98c0a28e8944afa985b0f9af55636f"
+                    "m_Id": "5f81ec1d167a453cab3066af1c237c7c"
                 },
                 "m_SlotId": 1
             },
             "m_InputSlot": {
                 "m_Node": {
-                    "m_Id": "4bd5f4f62d78496488cca016f246f9e9"
+                    "m_Id": "184c838d2bea4d74914bf1114be04ac1"
                 },
                 "m_SlotId": 0
             }
@@ -171,55 +184,69 @@
         {
             "m_OutputSlot": {
                 "m_Node": {
-                    "m_Id": "5d98c0a28e8944afa985b0f9af55636f"
+                    "m_Id": "629edfb5e0b742e282733b637b94fbd1"
                 },
-                "m_SlotId": 1
+                "m_SlotId": 2
             },
             "m_InputSlot": {
                 "m_Node": {
-                    "m_Id": "c716af712ac24585a2ba8536af3f530e"
+                    "m_Id": "1ff2775323a14c418ac415e1a2526504"
                 },
-                "m_SlotId": 0
+                "m_SlotId": -591484606
             }
         },
         {
             "m_OutputSlot": {
                 "m_Node": {
-                    "m_Id": "5f81ec1d167a453cab3066af1c237c7c"
+                    "m_Id": "a3305e924f664bb890447b9d2bf847a5"
                 },
                 "m_SlotId": 1
             },
             "m_InputSlot": {
                 "m_Node": {
-                    "m_Id": "184c838d2bea4d74914bf1114be04ac1"
+                    "m_Id": "1ff2775323a14c418ac415e1a2526504"
+                },
+                "m_SlotId": 1786236159
+            }
+        },
+        {
+            "m_OutputSlot": {
+                "m_Node": {
+                    "m_Id": "a62561c62c7e40fc897c55ec74f97206"
                 },
                 "m_SlotId": 0
+            },
+            "m_InputSlot": {
+                "m_Node": {
+                    "m_Id": "49e1f6ca722943738549602287aa8894"
+                },
+                "m_SlotId": 5
             }
         },
         {
             "m_OutputSlot": {
                 "m_Node": {
-                    "m_Id": "6cde5b8807e347348989e5c0ebff1912"
+                    "m_Id": "a910581aca9a40b68b5d824cd47b0e29"
                 },
                 "m_SlotId": 0
             },
             "m_InputSlot": {
                 "m_Node": {
-                    "m_Id": "5d98c0a28e8944afa985b0f9af55636f"
+                    "m_Id": "629edfb5e0b742e282733b637b94fbd1"
                 },
-                "m_SlotId": 830530724
+                "m_SlotId": 1
             }
         },
         {
             "m_OutputSlot": {
                 "m_Node": {
-                    "m_Id": "a62561c62c7e40fc897c55ec74f97206"
+                    "m_Id": "a910581aca9a40b68b5d824cd47b0e29"
                 },
                 "m_SlotId": 0
             },
             "m_InputSlot": {
                 "m_Node": {
-                    "m_Id": "c716af712ac24585a2ba8536af3f530e"
+                    "m_Id": "629edfb5e0b742e282733b637b94fbd1"
                 },
                 "m_SlotId": 3
             }
@@ -233,9 +260,9 @@
             },
             "m_InputSlot": {
                 "m_Node": {
-                    "m_Id": "4bd5f4f62d78496488cca016f246f9e9"
+                    "m_Id": "629edfb5e0b742e282733b637b94fbd1"
                 },
-                "m_SlotId": 1
+                "m_SlotId": 6
             }
         },
         {
@@ -247,51 +274,65 @@
             },
             "m_InputSlot": {
                 "m_Node": {
-                    "m_Id": "4bd5f4f62d78496488cca016f246f9e9"
+                    "m_Id": "629edfb5e0b742e282733b637b94fbd1"
                 },
-                "m_SlotId": 4
+                "m_SlotId": 7
             }
         },
         {
             "m_OutputSlot": {
                 "m_Node": {
-                    "m_Id": "a910581aca9a40b68b5d824cd47b0e29"
+                    "m_Id": "cc3cd7e9e6ef4792a7da7583ebfe4845"
                 },
                 "m_SlotId": 0
             },
             "m_InputSlot": {
                 "m_Node": {
-                    "m_Id": "4bd5f4f62d78496488cca016f246f9e9"
+                    "m_Id": "49e1f6ca722943738549602287aa8894"
                 },
-                "m_SlotId": 5
+                "m_SlotId": 7
             }
         },
         {
             "m_OutputSlot": {
                 "m_Node": {
-                    "m_Id": "c716af712ac24585a2ba8536af3f530e"
+                    "m_Id": "d082c09bb0224a49a30fa581434a464c"
                 },
-                "m_SlotId": 6
+                "m_SlotId": 1
             },
             "m_InputSlot": {
                 "m_Node": {
-                    "m_Id": "184c838d2bea4d74914bf1114be04ac1"
+                    "m_Id": "49e1f6ca722943738549602287aa8894"
+                },
+                "m_SlotId": 0
+            }
+        },
+        {
+            "m_OutputSlot": {
+                "m_Node": {
+                    "m_Id": "d082c09bb0224a49a30fa581434a464c"
                 },
                 "m_SlotId": 1
+            },
+            "m_InputSlot": {
+                "m_Node": {
+                    "m_Id": "629edfb5e0b742e282733b637b94fbd1"
+                },
+                "m_SlotId": 0
             }
         },
         {
             "m_OutputSlot": {
                 "m_Node": {
-                    "m_Id": "cc3cd7e9e6ef4792a7da7583ebfe4845"
+                    "m_Id": "fe253a8df1154738b73f269b31880dc9"
                 },
                 "m_SlotId": 0
             },
             "m_InputSlot": {
                 "m_Node": {
-                    "m_Id": "c716af712ac24585a2ba8536af3f530e"
+                    "m_Id": "49e1f6ca722943738549602287aa8894"
                 },
-                "m_SlotId": 5
+                "m_SlotId": 1
             }
         },
         {
@@ -303,9 +344,9 @@
             },
             "m_InputSlot": {
                 "m_Node": {
-                    "m_Id": "c716af712ac24585a2ba8536af3f530e"
+                    "m_Id": "49e1f6ca722943738549602287aa8894"
                 },
-                "m_SlotId": 1
+                "m_SlotId": 3
             }
         }
     ],
@@ -363,30 +404,6 @@
     "m_ObjectId": "015b1dc950ee4828a9f0125673a9eaa8"
 }
 
-{
-    "m_SGVersion": 0,
-    "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot",
-    "m_ObjectId": "064acc65e5d6423dbb2bf22d4d81cc14",
-    "m_Id": 6,
-    "m_DisplayName": "Out",
-    "m_SlotType": 1,
-    "m_Hidden": false,
-    "m_ShaderOutputName": "Out",
-    "m_StageCapability": 3,
-    "m_Value": {
-        "x": 0.0,
-        "y": 0.0,
-        "z": 0.0,
-        "w": 0.0
-    },
-    "m_DefaultValue": {
-        "x": 0.0,
-        "y": 0.0,
-        "z": 0.0,
-        "w": 0.0
-    }
-}
-
 {
     "m_SGVersion": 0,
     "m_Type": "UnityEditor.ShaderGraph.Vector4MaterialSlot",
@@ -395,6 +412,7 @@
     "m_DisplayName": "Out",
     "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "Out",
     "m_StageCapability": 3,
     "m_Value": {
@@ -446,30 +464,6 @@
     "m_SerializedDescriptor": "SurfaceDescription.Emission"
 }
 
-{
-    "m_SGVersion": 0,
-    "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot",
-    "m_ObjectId": "085a354175494e10b74d61912fee5720",
-    "m_Id": 4,
-    "m_DisplayName": "Selected",
-    "m_SlotType": 0,
-    "m_Hidden": false,
-    "m_ShaderOutputName": "Selected",
-    "m_StageCapability": 3,
-    "m_Value": {
-        "x": 0.0,
-        "y": 0.0,
-        "z": 0.0,
-        "w": 0.0
-    },
-    "m_DefaultValue": {
-        "x": 0.0,
-        "y": 0.0,
-        "z": 0.0,
-        "w": 0.0
-    }
-}
-
 {
     "m_SGVersion": 0,
     "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
@@ -478,11 +472,13 @@
     "m_DisplayName": "Stroke",
     "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "Stroke",
     "m_StageCapability": 3,
     "m_Value": 0.0,
     "m_DefaultValue": 0.0,
-    "m_Labels": []
+    "m_Labels": [],
+    "m_LiteralMode": false
 }
 
 {
@@ -493,6 +489,7 @@
     "m_DisplayName": "Width Height",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "_Width_Height",
     "m_StageCapability": 3,
     "m_Value": {
@@ -506,39 +503,6 @@
     "m_Labels": []
 }
 
-{
-    "m_SGVersion": 0,
-    "m_Type": "UnityEditor.ShaderGraph.RectTransformSizeNode",
-    "m_ObjectId": "0e920138592249bda21166cf1925230f",
-    "m_Group": {
-        "m_Id": ""
-    },
-    "m_Name": "RectTransform Size",
-    "m_DrawState": {
-        "m_Expanded": true,
-        "m_Position": {
-            "serializedVersion": "2",
-            "x": -553.9999389648438,
-            "y": 1026.9998779296875,
-            "width": 156.99996948242188,
-            "height": 77.0
-        }
-    },
-    "m_Slots": [
-        {
-            "m_Id": "71952465802c411388f381e39bd9c470"
-        }
-    ],
-    "synonyms": [],
-    "m_Precision": 0,
-    "m_PreviewExpanded": true,
-    "m_DismissedVersion": 0,
-    "m_PreviewMode": 0,
-    "m_CustomColors": {
-        "m_SerializableColors": []
-    }
-}
-
 {
     "m_SGVersion": 0,
     "m_Type": "UnityEditor.ShaderGraph.Vector4MaterialSlot",
@@ -547,6 +511,7 @@
     "m_DisplayName": "Corner Radii",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "_Corner_Radii",
     "m_StageCapability": 3,
     "m_Value": {
@@ -607,6 +572,32 @@
     }
 }
 
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot",
+    "m_ObjectId": "188e49b71f564e1599ffcb0c4cabe3aa",
+    "m_Id": 0,
+    "m_DisplayName": "",
+    "m_SlotType": 0,
+    "m_Hidden": false,
+    "m_HideConnector": false,
+    "m_ShaderOutputName": "",
+    "m_StageCapability": 3,
+    "m_Value": {
+        "x": 0.0,
+        "y": 0.0,
+        "z": 0.0,
+        "w": 0.0
+    },
+    "m_DefaultValue": {
+        "x": 0.0,
+        "y": 0.0,
+        "z": 0.0,
+        "w": 0.0
+    },
+    "m_LiteralMode": false
+}
+
 {
     "m_SGVersion": 0,
     "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDTarget",
@@ -630,51 +621,117 @@
 {
     "m_SGVersion": 0,
     "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot",
-    "m_ObjectId": "1b019706aea44c1088dfc19dbdceb953",
+    "m_ObjectId": "1b7fca16d6824e52ac141eb4a76af29c",
     "m_Id": 1,
-    "m_DisplayName": "Normal",
+    "m_DisplayName": "Fallback",
     "m_SlotType": 0,
     "m_Hidden": false,
-    "m_ShaderOutputName": "Normal",
+    "m_HideConnector": false,
+    "m_ShaderOutputName": "Fallback",
     "m_StageCapability": 3,
     "m_Value": {
-        "x": 1.0,
-        "y": 1.0,
-        "z": 1.0,
-        "w": 1.0
+        "x": 0.0,
+        "y": 0.0,
+        "z": 0.0,
+        "w": 0.0
     },
     "m_DefaultValue": {
         "x": 0.0,
         "y": 0.0,
         "z": 0.0,
         "w": 0.0
-    }
+    },
+    "m_LiteralMode": false
 }
 
 {
     "m_SGVersion": 0,
     "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot",
-    "m_ObjectId": "1d7dc0ed544c4945a120ff4a35ca9e30",
+    "m_ObjectId": "1b8a965082fc4b9ea63fabcab0054943",
     "m_Id": 1,
-    "m_DisplayName": "Normal",
+    "m_DisplayName": "Fallback",
     "m_SlotType": 0,
     "m_Hidden": false,
-    "m_ShaderOutputName": "Normal",
+    "m_HideConnector": false,
+    "m_ShaderOutputName": "Fallback",
     "m_StageCapability": 3,
     "m_Value": {
-        "x": 1.0,
-        "y": 1.0,
-        "z": 1.0,
-        "w": 1.0
+        "x": 0.0,
+        "y": 0.0,
+        "z": 0.0,
+        "w": 0.0
     },
     "m_DefaultValue": {
         "x": 0.0,
         "y": 0.0,
         "z": 0.0,
         "w": 0.0
+    },
+    "m_LiteralMode": false
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.RedirectNodeData",
+    "m_ObjectId": "1b9589ef73ed42d297af3e74d6087b20",
+    "m_Group": {
+        "m_Id": ""
+    },
+    "m_Name": "Redirect Node",
+    "m_DrawState": {
+        "m_Expanded": true,
+        "m_Position": {
+            "serializedVersion": "2",
+            "x": -468.0,
+            "y": 269.0000305175781,
+            "width": 56.0,
+            "height": 23.999969482421876
+        }
+    },
+    "m_Slots": [
+        {
+            "m_Id": "188e49b71f564e1599ffcb0c4cabe3aa"
+        },
+        {
+            "m_Id": "4523e437616849fe812af0f9ee1729ff"
+        }
+    ],
+    "synonyms": [],
+    "m_Precision": 0,
+    "m_PreviewExpanded": false,
+    "m_DismissedVersion": 0,
+    "m_PreviewMode": 0,
+    "m_CustomColors": {
+        "m_SerializableColors": []
     }
 }
 
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot",
+    "m_ObjectId": "1f1ba8b3556e45bcad02a9abc91d23e7",
+    "m_Id": 5,
+    "m_DisplayName": "C",
+    "m_SlotType": 0,
+    "m_Hidden": false,
+    "m_HideConnector": false,
+    "m_ShaderOutputName": "case_C",
+    "m_StageCapability": 3,
+    "m_Value": {
+        "x": 0.0,
+        "y": 0.0,
+        "z": 0.0,
+        "w": 0.0
+    },
+    "m_DefaultValue": {
+        "x": 0.0,
+        "y": 0.0,
+        "z": 0.0,
+        "w": 0.0
+    },
+    "m_LiteralMode": false
+}
+
 {
     "m_SGVersion": 0,
     "m_Type": "UnityEditor.ShaderGraph.SubGraphNode",
@@ -687,10 +744,10 @@
         "m_Expanded": true,
         "m_Position": {
             "serializedVersion": "2",
-            "x": -307.0,
-            "y": 679.0,
-            "width": 291.0,
-            "height": 307.0
+            "x": -304.0,
+            "y": 376.0000305175781,
+            "width": 291.0000305175781,
+            "height": 314.9999694824219
         }
     },
     "m_Slots": [
@@ -781,6 +838,7 @@
     "m_DisplayName": "Out",
     "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "Out",
     "m_StageCapability": 3,
     "m_Value": {
@@ -805,18 +863,44 @@
 }
 
 {
-    "m_SGVersion": 1,
-    "m_Type": "UnityEditor.Rendering.Universal.ShaderGraph.UniversalTarget",
-    "m_ObjectId": "2917369ffe6448a8a9f346c18965192f",
-    "m_Datas": [
-        {
-            "m_Id": "25f114ec5f474c00a18dc9125734cb91"
-        },
-        {
-            "m_Id": "9b015d8d152e4a71b4037614f266224b"
-        },
-        {
-            "m_Id": "f13e80f457874d488e444f6bf3d3012e"
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot",
+    "m_ObjectId": "26d39e29d1e44c7bb1c533718d34e195",
+    "m_Id": 3,
+    "m_DisplayName": "A",
+    "m_SlotType": 0,
+    "m_Hidden": false,
+    "m_HideConnector": false,
+    "m_ShaderOutputName": "case_A",
+    "m_StageCapability": 3,
+    "m_Value": {
+        "x": 0.0,
+        "y": 0.0,
+        "z": 0.0,
+        "w": 0.0
+    },
+    "m_DefaultValue": {
+        "x": 0.0,
+        "y": 0.0,
+        "z": 0.0,
+        "w": 0.0
+    },
+    "m_LiteralMode": false
+}
+
+{
+    "m_SGVersion": 1,
+    "m_Type": "UnityEditor.Rendering.Universal.ShaderGraph.UniversalTarget",
+    "m_ObjectId": "2917369ffe6448a8a9f346c18965192f",
+    "m_Datas": [
+        {
+            "m_Id": "25f114ec5f474c00a18dc9125734cb91"
+        },
+        {
+            "m_Id": "9b015d8d152e4a71b4037614f266224b"
+        },
+        {
+            "m_Id": "f13e80f457874d488e444f6bf3d3012e"
         }
     ],
     "m_ActiveSubTarget": {
@@ -832,6 +916,7 @@
     "m_CastShadows": true,
     "m_ReceiveShadows": true,
     "m_DisableTint": false,
+    "m_Sort3DAs2DCompatible": false,
     "m_AdditionalMotionVectorMode": 0,
     "m_AlembicMotionVectors": false,
     "m_SupportsLODCrossFade": false,
@@ -847,11 +932,13 @@
     "m_DisplayName": "Radius",
     "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "Out",
     "m_StageCapability": 3,
     "m_Value": 0.0,
     "m_DefaultValue": 0.0,
-    "m_Labels": []
+    "m_Labels": [],
+    "m_LiteralMode": false
 }
 
 {
@@ -862,44 +949,47 @@
     "m_DisplayName": "SDFStroke",
     "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "SDFStroke",
     "m_StageCapability": 3,
     "m_Value": 0.0,
     "m_DefaultValue": 0.0,
-    "m_Labels": []
-}
-
-{
-    "m_SGVersion": 0,
-    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasData",
-    "m_ObjectId": "3a5dd64a4ddd45a3ac6b88dd547d80b3",
-    "supportsMotionVectors": false
+    "m_Labels": [],
+    "m_LiteralMode": false
 }
 
 {
     "m_SGVersion": 0,
-    "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
-    "m_ObjectId": "3aee54da479849fc971a5a48e9cfcde3",
-    "m_Id": 0,
-    "m_DisplayName": "State",
-    "m_SlotType": 0,
+    "m_Type": "UnityEditor.ShaderGraph.Vector2MaterialSlot",
+    "m_ObjectId": "3571ff0120954d42b4eb78ce46d7317c",
+    "m_Id": 1,
+    "m_DisplayName": "Size",
+    "m_SlotType": 1,
     "m_Hidden": false,
-    "m_ShaderOutputName": "State",
+    "m_HideConnector": false,
+    "m_ShaderOutputName": "Size",
     "m_StageCapability": 3,
-    "m_Value": 0.0,
-    "m_DefaultValue": 0.0,
+    "m_Value": {
+        "x": 0.0,
+        "y": 0.0
+    },
+    "m_DefaultValue": {
+        "x": 0.0,
+        "y": 0.0
+    },
     "m_Labels": []
 }
 
 {
     "m_SGVersion": 0,
     "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot",
-    "m_ObjectId": "3e9170dc20bc4f85b68c5048e0d327dd",
-    "m_Id": 3,
-    "m_DisplayName": "Pressed",
+    "m_ObjectId": "38e138e5ec7746d4827fcdb2fd17c83b",
+    "m_Id": 7,
+    "m_DisplayName": "E",
     "m_SlotType": 0,
     "m_Hidden": false,
-    "m_ShaderOutputName": "Pressed",
+    "m_HideConnector": false,
+    "m_ShaderOutputName": "case_E",
     "m_StageCapability": 3,
     "m_Value": {
         "x": 0.0,
@@ -912,7 +1002,32 @@
         "y": 0.0,
         "z": 0.0,
         "w": 0.0
-    }
+    },
+    "m_LiteralMode": false
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasData",
+    "m_ObjectId": "3a5dd64a4ddd45a3ac6b88dd547d80b3",
+    "supportsMotionVectors": false
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
+    "m_ObjectId": "3efa6345fc6f4c14a15df2bc57c443f2",
+    "m_Id": 3,
+    "m_DisplayName": "Pixel_Per_Unit",
+    "m_SlotType": 1,
+    "m_Hidden": false,
+    "m_HideConnector": false,
+    "m_ShaderOutputName": "Pixel_Per_Unit",
+    "m_StageCapability": 3,
+    "m_Value": 0.0,
+    "m_DefaultValue": 0.0,
+    "m_Labels": [],
+    "m_LiteralMode": false
 }
 
 {
@@ -959,6 +1074,32 @@
     }
 }
 
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot",
+    "m_ObjectId": "4523e437616849fe812af0f9ee1729ff",
+    "m_Id": 1,
+    "m_DisplayName": "",
+    "m_SlotType": 1,
+    "m_Hidden": false,
+    "m_HideConnector": false,
+    "m_ShaderOutputName": "",
+    "m_StageCapability": 3,
+    "m_Value": {
+        "x": 0.0,
+        "y": 0.0,
+        "z": 0.0,
+        "w": 0.0
+    },
+    "m_DefaultValue": {
+        "x": 0.0,
+        "y": 0.0,
+        "z": 0.0,
+        "w": 0.0
+    },
+    "m_LiteralMode": false
+}
+
 {
     "m_SGVersion": 0,
     "m_Type": "UnityEditor.ShaderGraph.DynamicValueMaterialSlot",
@@ -967,6 +1108,7 @@
     "m_DisplayName": "B",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "B",
     "m_StageCapability": 3,
     "m_Value": {
@@ -1009,80 +1151,50 @@
 
 {
     "m_SGVersion": 0,
-    "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot",
-    "m_ObjectId": "4b289be77ea046b09d2b393a243c0636",
-    "m_Id": 2,
-    "m_DisplayName": "Highlighted",
-    "m_SlotType": 0,
-    "m_Hidden": false,
-    "m_ShaderOutputName": "Highlighted",
-    "m_StageCapability": 3,
-    "m_Value": {
-        "x": 0.0,
-        "y": 0.0,
-        "z": 0.0,
-        "w": 0.0
-    },
-    "m_DefaultValue": {
-        "x": 0.0,
-        "y": 0.0,
-        "z": 0.0,
-        "w": 0.0
-    }
-}
-
-{
-    "m_SGVersion": 0,
-    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasData",
-    "m_ObjectId": "4ba0dd954dc440568b38c0936b9b8c82",
-    "supportsMotionVectors": false
-}
-
-{
-    "m_SGVersion": 0,
-    "m_Type": "UnityEditor.ShaderGraph.SelectableBranchNode",
-    "m_ObjectId": "4bd5f4f62d78496488cca016f246f9e9",
+    "m_Type": "UnityEditor.ShaderGraph.SwitchNode",
+    "m_ObjectId": "49e1f6ca722943738549602287aa8894",
     "m_Group": {
         "m_Id": ""
     },
-    "m_Name": "Selectable State Switch",
+    "m_Name": "Switch",
     "m_DrawState": {
         "m_Expanded": true,
         "m_Position": {
             "serializedVersion": "2",
-            "x": -807.0000610351563,
-            "y": 771.9999389648438,
-            "width": 181.00006103515626,
-            "height": 213.99993896484376
+            "x": -667.0,
+            "y": 77.0,
+            "width": 170.0,
+            "height": 238.0
         }
     },
     "m_Slots": [
         {
-            "m_Id": "c8aabff79f954cb799da938f0fd69fef"
+            "m_Id": "fc81185340344d3692b30b9d1df9834f"
+        },
+        {
+            "m_Id": "1b7fca16d6824e52ac141eb4a76af29c"
         },
         {
-            "m_Id": "1d7dc0ed544c4945a120ff4a35ca9e30"
+            "m_Id": "a3603d4619c440cb9bf9b73745431783"
         },
         {
-            "m_Id": "4b289be77ea046b09d2b393a243c0636"
+            "m_Id": "26d39e29d1e44c7bb1c533718d34e195"
         },
         {
-            "m_Id": "3e9170dc20bc4f85b68c5048e0d327dd"
+            "m_Id": "efd53d2d1b104765b2e4e2f9a92a7f5c"
         },
         {
-            "m_Id": "d055239714134cb492a9bdd9835af8d8"
+            "m_Id": "1f1ba8b3556e45bcad02a9abc91d23e7"
         },
         {
-            "m_Id": "eace7ae887eb44c491143b7683ac7521"
+            "m_Id": "bb908b32372a446cba2b6ef4070c39f0"
         },
         {
-            "m_Id": "064acc65e5d6423dbb2bf22d4d81cc14"
+            "m_Id": "38e138e5ec7746d4827fcdb2fd17c83b"
         }
     ],
     "synonyms": [
-        "switch",
-        "ui",
-        "selectable"
+        "switch"
     ],
     "m_Precision": 0,
     "m_PreviewExpanded": false,
@@ -1090,6 +1202,63 @@
     "m_PreviewMode": 0,
     "m_CustomColors": {
         "m_SerializableColors": []
+    },
+    "m_floorPredicate": true,
+    "m_cases": [
+        {
+            "name": "",
+            "comparisonType": 0,
+            "threshold": 0.0
+        },
+        {
+            "name": "",
+            "comparisonType": 0,
+            "threshold": 1.0
+        },
+        {
+            "name": "",
+            "comparisonType": 0,
+            "threshold": 2.0
+        },
+        {
+            "name": "",
+            "comparisonType": 0,
+            "threshold": 3.0
+        },
+        {
+            "name": "",
+            "comparisonType": 0,
+            "threshold": 4.0
+        }
+    ],
+    "m_useProperty": false,
+    "m_casesFromUpstreamEnumProperty": []
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasData",
+    "m_ObjectId": "4ba0dd954dc440568b38c0936b9b8c82",
+    "supportsMotionVectors": false
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.StickyNoteData",
+    "m_ObjectId": "4bd4931d50b54b6582e92e79a1289468",
+    "m_Title": "Graphic Color",
+    "m_Content": "A Subgraph using a Custom Function to convert Color Space if required, based on the Canvas Color Space.\n\nDisable Color Tint from the Graph Settings not to tint the final output.",
+    "m_TextSize": 0,
+    "m_Theme": 1,
+    "m_Position": {
+        "serializedVersion": "2",
+        "x": -392.0,
+        "y": -9.0,
+        "width": 170.0,
+        "height": 151.0
+    },
+    "m_Group": {
+        "m_Id": ""
     }
 }
 
@@ -1137,6 +1306,32 @@
     }
 }
 
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot",
+    "m_ObjectId": "51de6fd333cb4d1a855d995e5874a4ed",
+    "m_Id": 4,
+    "m_DisplayName": "B",
+    "m_SlotType": 0,
+    "m_Hidden": false,
+    "m_HideConnector": false,
+    "m_ShaderOutputName": "case_B",
+    "m_StageCapability": 3,
+    "m_Value": {
+        "x": 0.0,
+        "y": 0.0,
+        "z": 0.0,
+        "w": 0.0
+    },
+    "m_DefaultValue": {
+        "x": 0.0,
+        "y": 0.0,
+        "z": 0.0,
+        "w": 0.0
+    },
+    "m_LiteralMode": false
+}
+
 {
     "m_SGVersion": 0,
     "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
@@ -1145,60 +1340,30 @@
     "m_DisplayName": "Fill",
     "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "Fill",
     "m_StageCapability": 3,
     "m_Value": 0.0,
     "m_DefaultValue": 0.0,
-    "m_Labels": []
+    "m_Labels": [],
+    "m_LiteralMode": false
 }
 
 {
     "m_SGVersion": 0,
-    "m_Type": "UnityEditor.ShaderGraph.SubGraphNode",
-    "m_ObjectId": "5d98c0a28e8944afa985b0f9af55636f",
-    "m_Group": {
-        "m_Id": ""
-    },
-    "m_Name": "Selectable State Preview",
-    "m_DrawState": {
-        "m_Expanded": true,
-        "m_Position": {
-            "serializedVersion": "2",
-            "x": -1198.9998779296875,
-            "y": 86.99999237060547,
-            "width": 283.99993896484377,
-            "height": 298.9999694824219
-        }
-    },
-    "m_Slots": [
-        {
-            "m_Id": "d42d812b5ac243939dc31d7dfef21aec"
-        },
-        {
-            "m_Id": "b8c7110c125643048ff965d1a40f7d4f"
-        }
-    ],
-    "synonyms": [],
-    "m_Precision": 0,
-    "m_PreviewExpanded": false,
-    "m_DismissedVersion": 0,
-    "m_PreviewMode": 0,
-    "m_CustomColors": {
-        "m_SerializableColors": []
-    },
-    "m_SerializedSubGraph": "{\n    \"subGraph\": {\n        \"fileID\": -5475051401550479605,\n        \"guid\": \"b278edaff18e35342890339c5f0d2945\",\n        \"type\": 3\n    }\n}",
-    "m_PropertyGuids": [
-        "9c4cb347-e674-4393-bb26-07702c97589e"
-    ],
-    "m_PropertyIds": [
-        830530724
-    ],
-    "m_Dropdowns": [
-        "_Preview"
-    ],
-    "m_DropdownSelectedEntries": [
-        "Normal"
-    ]
+    "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
+    "m_ObjectId": "5de88961f0f444f6a75dbd907d9a539e",
+    "m_Id": -181240572,
+    "m_DisplayName": "PreviewWidth",
+    "m_SlotType": 0,
+    "m_Hidden": false,
+    "m_HideConnector": true,
+    "m_ShaderOutputName": "_PreviewWidth",
+    "m_StageCapability": 3,
+    "m_Value": 100.0,
+    "m_DefaultValue": 100.0,
+    "m_Labels": [],
+    "m_LiteralMode": false
 }
 
 {
@@ -1213,10 +1378,10 @@
         "m_Expanded": true,
         "m_Position": {
             "serializedVersion": "2",
-            "x": -362.0,
-            "y": 200.0,
+            "x": -345.0,
+            "y": 148.0,
             "width": 122.0,
-            "height": 95.0
+            "height": 104.0
         }
     },
     "m_Slots": [
@@ -1241,63 +1406,95 @@
 
 {
     "m_SGVersion": 0,
-    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasData",
-    "m_ObjectId": "6a7fd486d34146b2a3e3a449114f4255",
-    "supportsMotionVectors": false
-}
-
-{
-    "m_SGVersion": 0,
-    "m_Type": "UnityEditor.ShaderGraph.SelectableStateNode",
-    "m_ObjectId": "6cde5b8807e347348989e5c0ebff1912",
+    "m_Type": "UnityEditor.ShaderGraph.SwitchNode",
+    "m_ObjectId": "629edfb5e0b742e282733b637b94fbd1",
     "m_Group": {
         "m_Id": ""
     },
-    "m_Name": "Selectable State",
+    "m_Name": "Switch",
     "m_DrawState": {
         "m_Expanded": true,
         "m_Position": {
             "serializedVersion": "2",
-            "x": -1339.0,
-            "y": 87.0,
-            "width": 140.0,
-            "height": 77.0
+            "x": -751.0000610351563,
+            "y": 474.0,
+            "width": 168.00006103515626,
+            "height": 238.00006103515626
         }
     },
     "m_Slots": [
         {
-            "m_Id": "acf2fa34930f4ff194625d6169443e32"
+            "m_Id": "c0ff8065b5b446b092c3cb583e6b5e7f"
+        },
+        {
+            "m_Id": "1b8a965082fc4b9ea63fabcab0054943"
+        },
+        {
+            "m_Id": "f0a7ccd8d0564912972e337fbdc1c548"
+        },
+        {
+            "m_Id": "aafaf32289e844a7883376afaf824da8"
+        },
+        {
+            "m_Id": "51de6fd333cb4d1a855d995e5874a4ed"
+        },
+        {
+            "m_Id": "9a1644f654b84b84a570c68635455d27"
+        },
+        {
+            "m_Id": "cd51beaa0d0c405f9b97d3b1cc05a640"
+        },
+        {
+            "m_Id": "794173fa9f6849dcadff740075b03a8f"
         }
     ],
-    "synonyms": [],
+    "synonyms": [
+        "switch"
+    ],
     "m_Precision": 0,
-    "m_PreviewExpanded": true,
+    "m_PreviewExpanded": false,
     "m_DismissedVersion": 0,
     "m_PreviewMode": 0,
     "m_CustomColors": {
         "m_SerializableColors": []
-    }
+    },
+    "m_floorPredicate": true,
+    "m_cases": [
+        {
+            "name": "",
+            "comparisonType": 0,
+            "threshold": 0.0
+        },
+        {
+            "name": "",
+            "comparisonType": 0,
+            "threshold": 1.0
+        },
+        {
+            "name": "",
+            "comparisonType": 0,
+            "threshold": 2.0
+        },
+        {
+            "name": "",
+            "comparisonType": 0,
+            "threshold": 3.0
+        },
+        {
+            "name": "",
+            "comparisonType": 0,
+            "threshold": 4.0
+        }
+    ],
+    "m_useProperty": false,
+    "m_casesFromUpstreamEnumProperty": []
 }
 
 {
     "m_SGVersion": 0,
-    "m_Type": "UnityEditor.ShaderGraph.Vector2MaterialSlot",
-    "m_ObjectId": "71952465802c411388f381e39bd9c470",
-    "m_Id": 0,
-    "m_DisplayName": "Size",
-    "m_SlotType": 1,
-    "m_Hidden": false,
-    "m_ShaderOutputName": "_RectTransformSize",
-    "m_StageCapability": 3,
-    "m_Value": {
-        "x": 1.0,
-        "y": 1.0
-    },
-    "m_DefaultValue": {
-        "x": 1.0,
-        "y": 1.0
-    },
-    "m_Labels": []
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasData",
+    "m_ObjectId": "6a7fd486d34146b2a3e3a449114f4255",
+    "supportsMotionVectors": false
 }
 
 {
@@ -1308,6 +1505,7 @@
     "m_DisplayName": "Out",
     "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "Out",
     "m_StageCapability": 3,
     "m_Value": {
@@ -1385,12 +1583,13 @@
 {
     "m_SGVersion": 0,
     "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot",
-    "m_ObjectId": "843ef85b2c6140168eff6af8ad2edb0f",
-    "m_Id": 5,
-    "m_DisplayName": "Disabled",
+    "m_ObjectId": "794173fa9f6849dcadff740075b03a8f",
+    "m_Id": 7,
+    "m_DisplayName": "E",
     "m_SlotType": 0,
     "m_Hidden": false,
-    "m_ShaderOutputName": "Disabled",
+    "m_HideConnector": false,
+    "m_ShaderOutputName": "case_E",
     "m_StageCapability": 3,
     "m_Value": {
         "x": 0.0,
@@ -1403,9 +1602,64 @@
         "y": 0.0,
         "z": 0.0,
         "w": 0.0
+    },
+    "m_LiteralMode": false
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
+    "m_ObjectId": "848e9b98980b4f45b8dbe1130da10d92",
+    "m_Id": 716604351,
+    "m_DisplayName": "PreviewHeight",
+    "m_SlotType": 0,
+    "m_Hidden": false,
+    "m_HideConnector": true,
+    "m_ShaderOutputName": "_PreviewHeight",
+    "m_StageCapability": 3,
+    "m_Value": 100.0,
+    "m_DefaultValue": 100.0,
+    "m_Labels": [],
+    "m_LiteralMode": false
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.StickyNoteData",
+    "m_ObjectId": "86e69ed9453341389b57b3624b335cb3",
+    "m_Title": "RectTransform Size",
+    "m_Content": "This subgraph promotes a hidden \"_RectTransformSize\" Vector4 property and allows changing the preview value with a slider.\n\nUse with the RectTransform Size component from the Samples.\nSize = RectTransform's Size in Canvas space.\nScale Factor = Canvas Scale Factor\nPixel Per Unit = Canvas PPU",
+    "m_TextSize": 0,
+    "m_Theme": 1,
+    "m_Position": {
+        "serializedVersion": "2",
+        "x": -710.0,
+        "y": 801.0,
+        "width": 312.0,
+        "height": 159.0
+    },
+    "m_Group": {
+        "m_Id": ""
     }
 }
 
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
+    "m_ObjectId": "8bd9359f91c445ab833fbbdb3ff4038a",
+    "m_Id": 1,
+    "m_DisplayName": "State",
+    "m_SlotType": 1,
+    "m_Hidden": false,
+    "m_HideConnector": false,
+    "m_ShaderOutputName": "State",
+    "m_StageCapability": 3,
+    "m_Value": 0.0,
+    "m_DefaultValue": 0.0,
+    "m_Labels": [],
+    "m_LiteralMode": false
+}
+
 {
     "m_SGVersion": 0,
     "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
@@ -1414,11 +1668,13 @@
     "m_DisplayName": "Stroke Thickness",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "_Stroke_Thickness",
     "m_StageCapability": 3,
     "m_Value": 0.10000000149011612,
-    "m_DefaultValue": 0.0,
-    "m_Labels": []
+    "m_DefaultValue": 0.10000000149011612,
+    "m_Labels": [],
+    "m_LiteralMode": false
 }
 
 {
@@ -1429,6 +1685,7 @@
     "m_DisplayName": "Out",
     "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "Out",
     "m_StageCapability": 3,
     "m_Value": {
@@ -1454,6 +1711,7 @@
     "m_DisplayName": "UV",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "_UV",
     "m_StageCapability": 3,
     "m_Value": {
@@ -1467,6 +1725,32 @@
     "m_Labels": []
 }
 
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot",
+    "m_ObjectId": "9a1644f654b84b84a570c68635455d27",
+    "m_Id": 5,
+    "m_DisplayName": "C",
+    "m_SlotType": 0,
+    "m_Hidden": false,
+    "m_HideConnector": false,
+    "m_ShaderOutputName": "case_C",
+    "m_StageCapability": 3,
+    "m_Value": {
+        "x": 0.0,
+        "y": 0.0,
+        "z": 0.0,
+        "w": 0.0
+    },
+    "m_DefaultValue": {
+        "x": 0.0,
+        "y": 0.0,
+        "z": 0.0,
+        "w": 0.0
+    },
+    "m_LiteralMode": false
+}
+
 {
     "m_SGVersion": 0,
     "m_Type": "UnityEditor.ShaderGraph.BlockNode",
@@ -1501,6 +1785,98 @@
     "m_SerializedDescriptor": "SurfaceDescription.BaseColor"
 }
 
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.SubGraphNode",
+    "m_ObjectId": "a3305e924f664bb890447b9d2bf847a5",
+    "m_Group": {
+        "m_Id": ""
+    },
+    "m_Name": "Rect Transform Size",
+    "m_DrawState": {
+        "m_Expanded": true,
+        "m_Position": {
+            "serializedVersion": "2",
+            "x": -559.0,
+            "y": 569.0,
+            "width": 165.0,
+            "height": 228.00006103515626
+        }
+    },
+    "m_Slots": [
+        {
+            "m_Id": "5de88961f0f444f6a75dbd907d9a539e"
+        },
+        {
+            "m_Id": "848e9b98980b4f45b8dbe1130da10d92"
+        },
+        {
+            "m_Id": "c25f586434cb4aeeb4a476b7caed935c"
+        },
+        {
+            "m_Id": "fde634ca9dc54afab654b72391471055"
+        },
+        {
+            "m_Id": "3571ff0120954d42b4eb78ce46d7317c"
+        },
+        {
+            "m_Id": "feb996b5e4c94ba6abdea65f247e50d2"
+        },
+        {
+            "m_Id": "3efa6345fc6f4c14a15df2bc57c443f2"
+        }
+    ],
+    "synonyms": [],
+    "m_Precision": 0,
+    "m_PreviewExpanded": false,
+    "m_DismissedVersion": 0,
+    "m_PreviewMode": 0,
+    "m_CustomColors": {
+        "m_SerializableColors": []
+    },
+    "m_SerializedSubGraph": "{\n    \"subGraph\": {\n        \"fileID\": -5475051401550479605,\n        \"guid\": \"aa041986c041b4dc1b5bf0b2cd2d86e8\",\n        \"type\": 3\n    }\n}",
+    "m_PropertyGuids": [
+        "975f2db3-e792-46e7-9bf8-3a4cbe4fb068",
+        "373c703c-395b-43d3-91ba-78b9497021e7",
+        "2747a643-8db3-4ffc-9923-55aa70fb2549",
+        "451bbdf7-6136-4a6e-a5c8-4918d2ea4b95"
+    ],
+    "m_PropertyIds": [
+        -181240572,
+        716604351,
+        -1949568231,
+        -2106065226
+    ],
+    "m_Dropdowns": [],
+    "m_DropdownSelectedEntries": []
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot",
+    "m_ObjectId": "a3603d4619c440cb9bf9b73745431783",
+    "m_Id": 2,
+    "m_DisplayName": "Out",
+    "m_SlotType": 1,
+    "m_Hidden": false,
+    "m_HideConnector": false,
+    "m_ShaderOutputName": "Out",
+    "m_StageCapability": 3,
+    "m_Value": {
+        "x": 0.0,
+        "y": 0.0,
+        "z": 0.0,
+        "w": 0.0
+    },
+    "m_DefaultValue": {
+        "x": 0.0,
+        "y": 0.0,
+        "z": 0.0,
+        "w": 0.0
+    },
+    "m_LiteralMode": false
+}
+
 {
     "m_SGVersion": 1,
     "m_Type": "UnityEditor.ShaderGraph.ColorNode",
@@ -1553,6 +1929,7 @@
     "m_DisplayName": "Emission",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "Emission",
     "m_StageCapability": 2,
     "m_Value": {
@@ -1575,30 +1952,6 @@
     }
 }
 
-{
-    "m_SGVersion": 0,
-    "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot",
-    "m_ObjectId": "a788b65102354a37b47d536f67efc23a",
-    "m_Id": 3,
-    "m_DisplayName": "Pressed",
-    "m_SlotType": 0,
-    "m_Hidden": false,
-    "m_ShaderOutputName": "Pressed",
-    "m_StageCapability": 3,
-    "m_Value": {
-        "x": 0.0,
-        "y": 0.0,
-        "z": 0.0,
-        "w": 0.0
-    },
-    "m_DefaultValue": {
-        "x": 0.0,
-        "y": 0.0,
-        "z": 0.0,
-        "w": 0.0
-    }
-}
-
 {
     "m_SGVersion": 0,
     "m_Type": "UnityEditor.ShaderGraph.PropertyNode",
@@ -1611,8 +1964,8 @@
         "m_Expanded": true,
         "m_Position": {
             "serializedVersion": "2",
-            "x": -1123.0,
-            "y": 879.0,
+            "x": -751.0000610351563,
+            "y": 440.0,
             "width": 110.0,
             "height": 34.0
         }
@@ -1635,6 +1988,32 @@
     }
 }
 
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot",
+    "m_ObjectId": "aafaf32289e844a7883376afaf824da8",
+    "m_Id": 3,
+    "m_DisplayName": "A",
+    "m_SlotType": 0,
+    "m_Hidden": false,
+    "m_HideConnector": false,
+    "m_ShaderOutputName": "case_A",
+    "m_StageCapability": 3,
+    "m_Value": {
+        "x": 0.0,
+        "y": 0.0,
+        "z": 0.0,
+        "w": 0.0
+    },
+    "m_DefaultValue": {
+        "x": 0.0,
+        "y": 0.0,
+        "z": 0.0,
+        "w": 0.0
+    },
+    "m_LiteralMode": false
+}
+
 {
     "m_SGVersion": 0,
     "m_Type": "UnityEditor.ShaderGraph.Vector4MaterialSlot",
@@ -1643,6 +2022,7 @@
     "m_DisplayName": "Out",
     "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "Out",
     "m_StageCapability": 3,
     "m_Value": {
@@ -1668,27 +2048,13 @@
     "m_DisplayName": "Keep Aspect Ratio",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "_Keep_Aspect_Ratio",
     "m_StageCapability": 3,
     "m_Value": true,
     "m_DefaultValue": false
 }
 
-{
-    "m_SGVersion": 0,
-    "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
-    "m_ObjectId": "acf2fa34930f4ff194625d6169443e32",
-    "m_Id": 0,
-    "m_DisplayName": "State",
-    "m_SlotType": 1,
-    "m_Hidden": false,
-    "m_ShaderOutputName": "_State",
-    "m_StageCapability": 3,
-    "m_Value": 0.0,
-    "m_DefaultValue": 0.0,
-    "m_Labels": []
-}
-
 {
     "m_SGVersion": 0,
     "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
@@ -1697,26 +2063,39 @@
     "m_DisplayName": "Edge Max",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "_Edge_Max",
     "m_StageCapability": 3,
     "m_Value": 0.009999999776482582,
-    "m_DefaultValue": 0.0,
-    "m_Labels": []
+    "m_DefaultValue": 0.009999999776482582,
+    "m_Labels": [],
+    "m_LiteralMode": false
 }
 
 {
     "m_SGVersion": 0,
-    "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
-    "m_ObjectId": "b8c7110c125643048ff965d1a40f7d4f",
-    "m_Id": 1,
-    "m_DisplayName": "State",
-    "m_SlotType": 1,
+    "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot",
+    "m_ObjectId": "bb908b32372a446cba2b6ef4070c39f0",
+    "m_Id": 6,
+    "m_DisplayName": "D",
+    "m_SlotType": 0,
     "m_Hidden": false,
-    "m_ShaderOutputName": "State",
+    "m_HideConnector": false,
+    "m_ShaderOutputName": "case_D",
     "m_StageCapability": 3,
-    "m_Value": 0.0,
-    "m_DefaultValue": 0.0,
-    "m_Labels": []
+    "m_Value": {
+        "x": 0.0,
+        "y": 0.0,
+        "z": 0.0,
+        "w": 0.0
+    },
+    "m_DefaultValue": {
+        "x": 0.0,
+        "y": 0.0,
+        "z": 0.0,
+        "w": 0.0
+    },
+    "m_LiteralMode": false
 }
 
 {
@@ -1727,6 +2106,7 @@
     "m_DisplayName": "Base Color",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "BaseColor",
     "m_StageCapability": 2,
     "m_Value": {
@@ -1751,120 +2131,36 @@
 
 {
     "m_SGVersion": 0,
-    "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot",
-    "m_ObjectId": "bcdf2f1b41024735b59bef32cc1b37cc",
-    "m_Id": 2,
-    "m_DisplayName": "Highlighted",
+    "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
+    "m_ObjectId": "c0ff8065b5b446b092c3cb583e6b5e7f",
+    "m_Id": 0,
+    "m_DisplayName": "Predicate",
     "m_SlotType": 0,
     "m_Hidden": false,
-    "m_ShaderOutputName": "Highlighted",
-    "m_StageCapability": 3,
-    "m_Value": {
-        "x": 0.0,
-        "y": 0.0,
-        "z": 0.0,
-        "w": 0.0
-    },
-    "m_DefaultValue": {
-        "x": 0.0,
-        "y": 0.0,
-        "z": 0.0,
-        "w": 0.0
-    }
-}
-
-{
-    "m_SGVersion": 0,
-    "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot",
-    "m_ObjectId": "c019e5eb639f43f5adb8dca2308c2790",
-    "m_Id": 6,
-    "m_DisplayName": "Out",
-    "m_SlotType": 1,
-    "m_Hidden": false,
-    "m_ShaderOutputName": "Out",
+    "m_HideConnector": false,
+    "m_ShaderOutputName": "Predicate",
     "m_StageCapability": 3,
-    "m_Value": {
-        "x": 0.0,
-        "y": 0.0,
-        "z": 0.0,
-        "w": 0.0
-    },
-    "m_DefaultValue": {
-        "x": 0.0,
-        "y": 0.0,
-        "z": 0.0,
-        "w": 0.0
-    }
-}
-
-{
-    "m_SGVersion": 0,
-    "m_Type": "UnityEditor.ShaderGraph.SelectableBranchNode",
-    "m_ObjectId": "c716af712ac24585a2ba8536af3f530e",
-    "m_Group": {
-        "m_Id": ""
-    },
-    "m_Name": "Selectable State Switch",
-    "m_DrawState": {
-        "m_Expanded": true,
-        "m_Position": {
-            "serializedVersion": "2",
-            "x": -420.9999694824219,
-            "y": 295.0,
-            "width": 181.99998474121095,
-            "height": 214.00003051757813
-        }
-    },
-    "m_Slots": [
-        {
-            "m_Id": "3aee54da479849fc971a5a48e9cfcde3"
-        },
-        {
-            "m_Id": "1b019706aea44c1088dfc19dbdceb953"
-        },
-        {
-            "m_Id": "bcdf2f1b41024735b59bef32cc1b37cc"
-        },
-        {
-            "m_Id": "a788b65102354a37b47d536f67efc23a"
-        },
-        {
-            "m_Id": "085a354175494e10b74d61912fee5720"
-        },
-        {
-            "m_Id": "843ef85b2c6140168eff6af8ad2edb0f"
-        },
-        {
-            "m_Id": "c019e5eb639f43f5adb8dca2308c2790"
-        }
-    ],
-    "synonyms": [
-        "switch",
-        "ui",
-        "selectable"
-    ],
-    "m_Precision": 0,
-    "m_PreviewExpanded": false,
-    "m_DismissedVersion": 0,
-    "m_PreviewMode": 0,
-    "m_CustomColors": {
-        "m_SerializableColors": []
-    }
+    "m_Value": 0.0,
+    "m_DefaultValue": 0.0,
+    "m_Labels": [],
+    "m_LiteralMode": false
 }
 
 {
     "m_SGVersion": 0,
     "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
-    "m_ObjectId": "c8aabff79f954cb799da938f0fd69fef",
-    "m_Id": 0,
-    "m_DisplayName": "State",
+    "m_ObjectId": "c25f586434cb4aeeb4a476b7caed935c",
+    "m_Id": -1949568231,
+    "m_DisplayName": "PreviewScaleFactor",
     "m_SlotType": 0,
     "m_Hidden": false,
-    "m_ShaderOutputName": "State",
+    "m_HideConnector": true,
+    "m_ShaderOutputName": "_PreviewScaleFactor",
     "m_StageCapability": 3,
-    "m_Value": 0.0,
-    "m_DefaultValue": 0.0,
-    "m_Labels": []
+    "m_Value": 1.0,
+    "m_DefaultValue": 1.0,
+    "m_Labels": [],
+    "m_LiteralMode": false
 }
 
 {
@@ -1875,6 +2171,7 @@
     "m_DisplayName": "Size",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "_Size",
     "m_StageCapability": 3,
     "m_Value": {
@@ -1896,11 +2193,13 @@
     "m_DisplayName": "Alpha",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "Alpha",
     "m_StageCapability": 2,
     "m_Value": 1.0,
     "m_DefaultValue": 1.0,
-    "m_Labels": []
+    "m_Labels": [],
+    "m_LiteralMode": false
 }
 
 {
@@ -1950,12 +2249,13 @@
 {
     "m_SGVersion": 0,
     "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot",
-    "m_ObjectId": "d055239714134cb492a9bdd9835af8d8",
-    "m_Id": 4,
-    "m_DisplayName": "Selected",
+    "m_ObjectId": "cd51beaa0d0c405f9b97d3b1cc05a640",
+    "m_Id": 6,
+    "m_DisplayName": "D",
     "m_SlotType": 0,
     "m_Hidden": false,
-    "m_ShaderOutputName": "Selected",
+    "m_HideConnector": false,
+    "m_ShaderOutputName": "case_D",
     "m_StageCapability": 3,
     "m_Value": {
         "x": 0.0,
@@ -1968,9 +2268,72 @@
         "y": 0.0,
         "z": 0.0,
         "w": 0.0
+    },
+    "m_LiteralMode": false
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.StickyNoteData",
+    "m_ObjectId": "ced045f01b494c32854cf68908ded4f9",
+    "m_Title": "Selectable State",
+    "m_Content": "This subgraph promotes a hidden \"_State\" float property and allows changing the preview value with a dropdown.\n\nUse with one of the Sample Components, like Button, Toggle, Slider.\n0 = Normal\n1 = Highlighted\n2 = Pressed\n3 = Selected\n4 = Disabled",
+    "m_TextSize": 0,
+    "m_Theme": 1,
+    "m_Position": {
+        "serializedVersion": "2",
+        "x": -1479.0,
+        "y": 82.0,
+        "width": 303.0,
+        "height": 189.0
+    },
+    "m_Group": {
+        "m_Id": ""
     }
 }
 
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.SubGraphNode",
+    "m_ObjectId": "d082c09bb0224a49a30fa581434a464c",
+    "m_Group": {
+        "m_Id": ""
+    },
+    "m_Name": "Selectable State",
+    "m_DrawState": {
+        "m_Expanded": true,
+        "m_Position": {
+            "serializedVersion": "2",
+            "x": -1170.9998779296875,
+            "y": 77.0,
+            "width": 256.0,
+            "height": 123.0
+        }
+    },
+    "m_Slots": [
+        {
+            "m_Id": "8bd9359f91c445ab833fbbdb3ff4038a"
+        }
+    ],
+    "synonyms": [],
+    "m_Precision": 0,
+    "m_PreviewExpanded": false,
+    "m_DismissedVersion": 0,
+    "m_PreviewMode": 0,
+    "m_CustomColors": {
+        "m_SerializableColors": []
+    },
+    "m_SerializedSubGraph": "{\n    \"subGraph\": {\n        \"fileID\": -5475051401550479605,\n        \"guid\": \"9cc8eedec3988455885bdb12866a33d6\",\n        \"type\": 3\n    }\n}",
+    "m_PropertyGuids": [],
+    "m_PropertyIds": [],
+    "m_Dropdowns": [
+        "_Preview"
+    ],
+    "m_DropdownSelectedEntries": [
+        "Normal"
+    ]
+}
+
 {
     "m_SGVersion": 1,
     "m_Type": "UnityEditor.ShaderGraph.Internal.Vector1ShaderProperty",
@@ -1978,6 +2341,9 @@
     "m_Guid": {
         "m_GuidSerialized": "80eae158-d435-45a9-8a66-566a6fd6f432"
     },
+    "promotedFromAssetID": "",
+    "promotedFromCategoryName": "",
+    "promotedOrdering": -1,
     "m_Name": "Radius",
     "m_DefaultRefNameVersion": 1,
     "m_RefNameGeneratedByDisplayName": "Radius",
@@ -1990,28 +2356,27 @@
     "m_Precision": 0,
     "overrideHLSLDeclaration": false,
     "hlslDeclarationOverride": 0,
+    "hideConnector": false,
     "m_Hidden": false,
+    "m_PerRendererData": false,
+    "m_customAttributes": [],
     "m_Value": 0.20000000298023225,
     "m_FloatType": 0,
+    "m_LiteralFloatMode": false,
     "m_RangeValues": {
         "x": 0.0,
         "y": 1.0
-    }
-}
-
-{
-    "m_SGVersion": 0,
-    "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
-    "m_ObjectId": "d42d812b5ac243939dc31d7dfef21aec",
-    "m_Id": 830530724,
-    "m_DisplayName": "State",
-    "m_SlotType": 0,
-    "m_Hidden": false,
-    "m_ShaderOutputName": "_State",
-    "m_StageCapability": 3,
-    "m_Value": 0.0,
-    "m_DefaultValue": 0.0,
-    "m_Labels": []
+    },
+    "m_SliderType": 0,
+    "m_SliderPower": 3.0,
+    "m_EnumType": 0,
+    "m_CSharpEnumString": "",
+    "m_EnumNames": [
+        "Default"
+    ],
+    "m_EnumValues": [
+        0
+    ]
 }
 
 {
@@ -2022,6 +2387,7 @@
     "m_DisplayName": "Stroke Thickness Relative",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "_Stroke_Thickness_Relative",
     "m_StageCapability": 3,
     "m_Value": true,
@@ -2036,6 +2402,7 @@
     "m_DisplayName": "Out",
     "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "Out",
     "m_StageCapability": 3,
     "m_Value": {
@@ -2061,11 +2428,13 @@
     "m_DisplayName": "Edge Min",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "_Edge_Min",
     "m_StageCapability": 3,
     "m_Value": 0.0,
     "m_DefaultValue": 0.0,
-    "m_Labels": []
+    "m_Labels": [],
+    "m_LiteralMode": false
 }
 
 {
@@ -2076,25 +2445,21 @@
 
 {
     "m_SGVersion": 0,
-    "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot",
-    "m_ObjectId": "eace7ae887eb44c491143b7683ac7521",
-    "m_Id": 5,
-    "m_DisplayName": "Disabled",
-    "m_SlotType": 0,
-    "m_Hidden": false,
-    "m_ShaderOutputName": "Disabled",
-    "m_StageCapability": 3,
-    "m_Value": {
-        "x": 0.0,
-        "y": 0.0,
-        "z": 0.0,
-        "w": 0.0
+    "m_Type": "UnityEditor.ShaderGraph.StickyNoteData",
+    "m_ObjectId": "e6b5c99a92ba46a6b58dcd7d9344f06a",
+    "m_Title": "Selectable State Switch",
+    "m_Content": "This uses a Switch Node to set different values based on the Selectable State.",
+    "m_TextSize": 0,
+    "m_Theme": 1,
+    "m_Position": {
+        "serializedVersion": "2",
+        "x": -721.0,
+        "y": -36.0,
+        "width": 248.0,
+        "height": 100.0
     },
-    "m_DefaultValue": {
-        "x": 0.0,
-        "y": 0.0,
-        "z": 0.0,
-        "w": 0.0
+    "m_Group": {
+        "m_Id": ""
     }
 }
 
@@ -2118,11 +2483,65 @@
     "m_DisplayName": "SDF",
     "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "SDF",
     "m_StageCapability": 3,
     "m_Value": 0.0,
     "m_DefaultValue": 0.0,
-    "m_Labels": []
+    "m_Labels": [],
+    "m_LiteralMode": false
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot",
+    "m_ObjectId": "efd53d2d1b104765b2e4e2f9a92a7f5c",
+    "m_Id": 4,
+    "m_DisplayName": "B",
+    "m_SlotType": 0,
+    "m_Hidden": false,
+    "m_HideConnector": false,
+    "m_ShaderOutputName": "case_B",
+    "m_StageCapability": 3,
+    "m_Value": {
+        "x": 0.0,
+        "y": 0.0,
+        "z": 0.0,
+        "w": 0.0
+    },
+    "m_DefaultValue": {
+        "x": 0.0,
+        "y": 0.0,
+        "z": 0.0,
+        "w": 0.0
+    },
+    "m_LiteralMode": false
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot",
+    "m_ObjectId": "f0a7ccd8d0564912972e337fbdc1c548",
+    "m_Id": 2,
+    "m_DisplayName": "Out",
+    "m_SlotType": 1,
+    "m_Hidden": false,
+    "m_HideConnector": false,
+    "m_ShaderOutputName": "Out",
+    "m_StageCapability": 3,
+    "m_Value": {
+        "x": 0.0,
+        "y": 0.0,
+        "z": 0.0,
+        "w": 0.0
+    },
+    "m_DefaultValue": {
+        "x": 0.0,
+        "y": 0.0,
+        "z": 0.0,
+        "w": 0.0
+    },
+    "m_LiteralMode": false
 }
 
 {
@@ -2148,6 +2567,7 @@
     "m_DisplayName": "A",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "A",
     "m_StageCapability": 3,
     "m_Value": {
@@ -2196,6 +2616,7 @@
     "m_DisplayName": "Out",
     "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "Out",
     "m_StageCapability": 3,
     "m_Value": {
@@ -2213,6 +2634,40 @@
     "m_Labels": []
 }
 
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
+    "m_ObjectId": "fc81185340344d3692b30b9d1df9834f",
+    "m_Id": 0,
+    "m_DisplayName": "Predicate",
+    "m_SlotType": 0,
+    "m_Hidden": false,
+    "m_HideConnector": false,
+    "m_ShaderOutputName": "Predicate",
+    "m_StageCapability": 3,
+    "m_Value": 0.0,
+    "m_DefaultValue": 0.0,
+    "m_Labels": [],
+    "m_LiteralMode": false
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
+    "m_ObjectId": "fde634ca9dc54afab654b72391471055",
+    "m_Id": -2106065226,
+    "m_DisplayName": "PreviewPPU",
+    "m_SlotType": 0,
+    "m_Hidden": false,
+    "m_HideConnector": true,
+    "m_ShaderOutputName": "_PreviewPPU",
+    "m_StageCapability": 3,
+    "m_Value": 100.0,
+    "m_DefaultValue": 100.0,
+    "m_Labels": [],
+    "m_LiteralMode": false
+}
+
 {
     "m_SGVersion": 1,
     "m_Type": "UnityEditor.ShaderGraph.ColorNode",
@@ -2257,3 +2712,20 @@
     }
 }
 
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
+    "m_ObjectId": "feb996b5e4c94ba6abdea65f247e50d2",
+    "m_Id": 2,
+    "m_DisplayName": "Scale_Factor",
+    "m_SlotType": 1,
+    "m_Hidden": false,
+    "m_HideConnector": false,
+    "m_ShaderOutputName": "Scale_Factor",
+    "m_StageCapability": 3,
+    "m_Value": 0.0,
+    "m_DefaultValue": 0.0,
+    "m_Labels": [],
+    "m_LiteralMode": false
+}
+
diff --git a/Packages/com.unity.shadergraph/Samples~/UGUIShaders/Default Materials/Meter Simple Fill.shadergraph b/Packages/com.unity.shadergraph/Samples~/UGUIShaders/Default Materials/Meter Simple Fill.shadergraph
index 4999fb7ea9b..59efb1a3b49 100644
--- a/Packages/com.unity.shadergraph/Samples~/UGUIShaders/Default Materials/Meter Simple Fill.shadergraph	
+++ b/Packages/com.unity.shadergraph/Samples~/UGUIShaders/Default Materials/Meter Simple Fill.shadergraph	
@@ -42,12 +42,6 @@
         {
             "m_Id": "c6abc3ebea76454fac809456d8ce8986"
         },
-        {
-            "m_Id": "b45b4c175dbf4dd7932559b8e49dfc6a"
-        },
-        {
-            "m_Id": "e6aa7632eedd48bc9fd0c3379dc66316"
-        },
         {
             "m_Id": "e34a7dd225d246c8b3fd0fb06017fa63"
         },
@@ -65,18 +59,24 @@
         },
         {
             "m_Id": "72e5e2cdba7442718133c7ee226fc7d3"
+        },
+        {
+            "m_Id": "eef93d75814143d49c69e2de356bc375"
+        },
+        {
+            "m_Id": "e57057b20f9b4be394b2e08b490ce4e0"
         }
     ],
     "m_GroupDatas": [],
     "m_StickyNoteDatas": [
-        {
-            "m_Id": "3cf6c9caa44f45608ba46f9f5f27402c"
-        },
         {
             "m_Id": "0f3aa19c3c444418bb7e3bc9a85b08fb"
         },
         {
             "m_Id": "791698d8fe074d4b8d28d652baa1c192"
+        },
+        {
+            "m_Id": "2b5036938f844bd9b3fd1f5734b1baed"
         }
     ],
     "m_Edges": [
@@ -220,20 +220,6 @@
                 "m_SlotId": -591484606
             }
         },
-        {
-            "m_OutputSlot": {
-                "m_Node": {
-                    "m_Id": "b45b4c175dbf4dd7932559b8e49dfc6a"
-                },
-                "m_SlotId": 0
-            },
-            "m_InputSlot": {
-                "m_Node": {
-                    "m_Id": "1ff2775323a14c418ac415e1a2526504"
-                },
-                "m_SlotId": 1786236159
-            }
-        },
         {
             "m_OutputSlot": {
                 "m_Node": {
@@ -279,9 +265,23 @@
         {
             "m_OutputSlot": {
                 "m_Node": {
-                    "m_Id": "e6aa7632eedd48bc9fd0c3379dc66316"
+                    "m_Id": "e57057b20f9b4be394b2e08b490ce4e0"
                 },
-                "m_SlotId": 0
+                "m_SlotId": 1
+            },
+            "m_InputSlot": {
+                "m_Node": {
+                    "m_Id": "1ff2775323a14c418ac415e1a2526504"
+                },
+                "m_SlotId": 1786236159
+            }
+        },
+        {
+            "m_OutputSlot": {
+                "m_Node": {
+                    "m_Id": "eef93d75814143d49c69e2de356bc375"
+                },
+                "m_SlotId": 1
             },
             "m_InputSlot": {
                 "m_Node": {
@@ -387,11 +387,13 @@
     "m_DisplayName": "Stroke",
     "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "Stroke",
     "m_StageCapability": 3,
     "m_Value": 0.0,
     "m_DefaultValue": 0.0,
-    "m_Labels": []
+    "m_Labels": [],
+    "m_LiteralMode": false
 }
 
 {
@@ -402,6 +404,7 @@
     "m_DisplayName": "Out",
     "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "Out",
     "m_StageCapability": 3,
     "m_Value": {
@@ -415,7 +418,8 @@
         "y": 0.0,
         "z": 0.0,
         "w": 0.0
-    }
+    },
+    "m_LiteralMode": false
 }
 
 {
@@ -426,6 +430,7 @@
     "m_DisplayName": "Width Height",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "_Width_Height",
     "m_StageCapability": 3,
     "m_Value": {
@@ -444,15 +449,15 @@
     "m_Type": "UnityEditor.ShaderGraph.StickyNoteData",
     "m_ObjectId": "0f3aa19c3c444418bb7e3bc9a85b08fb",
     "m_Title": "RectTransform Size",
-    "m_Content": "A custom Node automatically adding a hidden local Vector2 \"_RectTransformSize\" property to the Material, even when in a Subgraph, and providing its value.\nUse with the ImageSize component from the Samples.\nSize = RectTransform's Size in Canvas space.",
+    "m_Content": "This subgraph promotes a hidden \"_RectTransformSize\" Vector4 property and allows changing the preview value with a slider.\n\nUse with the RectTransform Size component from the Samples.\nSize = RectTransform's Size in Canvas space.\nScale Factor = Canvas Scale Factor\nPixel Per Unit = Canvas PPU",
     "m_TextSize": 0,
     "m_Theme": 1,
     "m_Position": {
         "serializedVersion": "2",
         "x": -1013.0,
         "y": 753.0,
-        "width": 260.0,
-        "height": 134.0
+        "width": 311.9952392578125,
+        "height": 159.0
     },
     "m_Group": {
         "m_Id": ""
@@ -467,6 +472,7 @@
     "m_DisplayName": "A",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "A",
     "m_StageCapability": 3,
     "m_Value": {
@@ -480,7 +486,8 @@
         "y": 0.0,
         "z": 0.0,
         "w": 0.0
-    }
+    },
+    "m_LiteralMode": false
 }
 
 {
@@ -491,6 +498,7 @@
     "m_DisplayName": "Corner Radii",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "_Corner_Radii",
     "m_StageCapability": 3,
     "m_Value": {
@@ -620,6 +628,7 @@
     "m_DisplayName": "In",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "In",
     "m_StageCapability": 3,
     "m_Value": {
@@ -633,7 +642,8 @@
         "y": 0.0,
         "z": 0.0,
         "w": 0.0
-    }
+    },
+    "m_LiteralMode": false
 }
 
 {
@@ -667,6 +677,7 @@
     "m_CastShadows": true,
     "m_ReceiveShadows": true,
     "m_DisableTint": false,
+    "m_Sort3DAs2DCompatible": false,
     "m_AdditionalMotionVectorMode": 0,
     "m_AlembicMotionVectors": false,
     "m_SupportsLODCrossFade": false,
@@ -674,6 +685,26 @@
     "m_SupportVFX": false
 }
 
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.StickyNoteData",
+    "m_ObjectId": "2b5036938f844bd9b3fd1f5734b1baed",
+    "m_Title": "Meter Value",
+    "m_Content": "This subgraph promotes a hidden \"_MeterValue\" float property and allows changing the preview value with a slider.\n\nUse with the Sample Meter Component.",
+    "m_TextSize": 0,
+    "m_Theme": 1,
+    "m_Position": {
+        "serializedVersion": "2",
+        "x": -1442.0,
+        "y": 443.0,
+        "width": 235.0,
+        "height": 115.38861083984375
+    },
+    "m_Group": {
+        "m_Id": ""
+    }
+}
+
 {
     "m_SGVersion": 0,
     "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
@@ -682,11 +713,13 @@
     "m_DisplayName": "Radius",
     "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "Out",
     "m_StageCapability": 3,
     "m_Value": 0.0,
     "m_DefaultValue": 0.0,
-    "m_Labels": []
+    "m_Labels": [],
+    "m_LiteralMode": false
 }
 
 {
@@ -697,11 +730,13 @@
     "m_DisplayName": "SDFStroke",
     "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "SDFStroke",
     "m_StageCapability": 3,
     "m_Value": 0.0,
     "m_DefaultValue": 0.0,
-    "m_Labels": []
+    "m_Labels": [],
+    "m_LiteralMode": false
 }
 
 {
@@ -724,7 +759,7 @@
     },
     "m_Slots": [
         {
-            "m_Id": "e5f1738d86cf43878a25bfa513ec7e2a"
+            "m_Id": "95317f3fee19452596e4df960db00a52"
         },
         {
             "m_Id": "f41cdff6475e43a19472c28ccfc7a4d0"
@@ -766,7 +801,7 @@
     },
     "m_Slots": [
         {
-            "m_Id": "50b141c3256c43809caaf6f0d5a1b329"
+            "m_Id": "a582c4acf533428898ba7f0ba79757b6"
         },
         {
             "m_Id": "b816c6b2afb74d1b8a71bf58202ff517"
@@ -795,26 +830,6 @@
     "supportsMotionVectors": false
 }
 
-{
-    "m_SGVersion": 0,
-    "m_Type": "UnityEditor.ShaderGraph.StickyNoteData",
-    "m_ObjectId": "3cf6c9caa44f45608ba46f9f5f27402c",
-    "m_Title": "Meter Value",
-    "m_Content": "A custom Node automatically adding a hidden local float \"_MeterValue\" property to the Material, even when in a Subgraph, and providing its value.\nUse with the Sample Meter Component.",
-    "m_TextSize": 0,
-    "m_Theme": 1,
-    "m_Position": {
-        "serializedVersion": "2",
-        "x": -1334.0,
-        "y": 433.0,
-        "width": 197.0,
-        "height": 135.0
-    },
-    "m_Group": {
-        "m_Id": ""
-    }
-}
-
 {
     "m_SGVersion": 0,
     "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
@@ -823,11 +838,30 @@
     "m_DisplayName": "Gradient",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "_Gradient",
     "m_StageCapability": 2,
     "m_Value": 0.0,
     "m_DefaultValue": 0.0,
-    "m_Labels": []
+    "m_Labels": [],
+    "m_LiteralMode": false
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
+    "m_ObjectId": "4adacb9cbd9d494aaa19727914c991e1",
+    "m_Id": 1,
+    "m_DisplayName": "Out",
+    "m_SlotType": 1,
+    "m_Hidden": false,
+    "m_HideConnector": false,
+    "m_ShaderOutputName": "Out",
+    "m_StageCapability": 3,
+    "m_Value": 0.0,
+    "m_DefaultValue": 0.0,
+    "m_Labels": [],
+    "m_LiteralMode": false
 }
 
 {
@@ -837,6 +871,23 @@
     "supportsMotionVectors": false
 }
 
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
+    "m_ObjectId": "4da0e7a6b8504ef081a42d0ee727ba49",
+    "m_Id": 716604351,
+    "m_DisplayName": "PreviewHeight",
+    "m_SlotType": 0,
+    "m_Hidden": false,
+    "m_HideConnector": true,
+    "m_ShaderOutputName": "_PreviewHeight",
+    "m_StageCapability": 3,
+    "m_Value": 100.0,
+    "m_DefaultValue": 100.0,
+    "m_Labels": [],
+    "m_LiteralMode": false
+}
+
 {
     "m_SGVersion": 0,
     "m_Type": "UnityEditor.ShaderGraph.MaximumNode",
@@ -876,30 +927,6 @@
     }
 }
 
-{
-    "m_SGVersion": 0,
-    "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot",
-    "m_ObjectId": "50b141c3256c43809caaf6f0d5a1b329",
-    "m_Id": 0,
-    "m_DisplayName": "In",
-    "m_SlotType": 0,
-    "m_Hidden": false,
-    "m_ShaderOutputName": "In",
-    "m_StageCapability": 3,
-    "m_Value": {
-        "x": 0.0,
-        "y": 0.0,
-        "z": 0.0,
-        "w": 0.0
-    },
-    "m_DefaultValue": {
-        "x": 0.0,
-        "y": 0.0,
-        "z": 0.0,
-        "w": 0.0
-    }
-}
-
 {
     "m_SGVersion": 0,
     "m_Type": "UnityEditor.ShaderGraph.OneMinusNode",
@@ -940,6 +967,23 @@
     }
 }
 
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
+    "m_ObjectId": "53276e076425496d86175105a9fa38a4",
+    "m_Id": 3,
+    "m_DisplayName": "Pixel_Per_Unit",
+    "m_SlotType": 1,
+    "m_Hidden": false,
+    "m_HideConnector": false,
+    "m_ShaderOutputName": "Pixel_Per_Unit",
+    "m_StageCapability": 3,
+    "m_Value": 0.0,
+    "m_DefaultValue": 0.0,
+    "m_Labels": [],
+    "m_LiteralMode": false
+}
+
 {
     "m_SGVersion": 0,
     "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot",
@@ -948,6 +992,7 @@
     "m_DisplayName": "A",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "A",
     "m_StageCapability": 3,
     "m_Value": {
@@ -961,7 +1006,8 @@
         "y": 0.0,
         "z": 0.0,
         "w": 0.0
-    }
+    },
+    "m_LiteralMode": false
 }
 
 {
@@ -972,11 +1018,30 @@
     "m_DisplayName": "Fill",
     "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "Fill",
     "m_StageCapability": 3,
     "m_Value": 0.0,
     "m_DefaultValue": 0.0,
-    "m_Labels": []
+    "m_Labels": [],
+    "m_LiteralMode": false
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
+    "m_ObjectId": "5c432167d32f45cda2ddd1e5d0d9f097",
+    "m_Id": -181240572,
+    "m_DisplayName": "PreviewWidth",
+    "m_SlotType": 0,
+    "m_Hidden": false,
+    "m_HideConnector": true,
+    "m_ShaderOutputName": "_PreviewWidth",
+    "m_StageCapability": 3,
+    "m_Value": 100.0,
+    "m_DefaultValue": 100.0,
+    "m_Labels": [],
+    "m_LiteralMode": false
 }
 
 {
@@ -1017,6 +1082,23 @@
     "m_DropdownSelectedEntries": []
 }
 
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
+    "m_ObjectId": "63fbb08199094b7bb09fad45e04fed5a",
+    "m_Id": -1949568231,
+    "m_DisplayName": "PreviewScaleFactor",
+    "m_SlotType": 0,
+    "m_Hidden": false,
+    "m_HideConnector": true,
+    "m_ShaderOutputName": "_PreviewScaleFactor",
+    "m_StageCapability": 3,
+    "m_Value": 1.0,
+    "m_DefaultValue": 1.0,
+    "m_Labels": [],
+    "m_LiteralMode": false
+}
+
 {
     "m_SGVersion": 0,
     "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasData",
@@ -1024,6 +1106,23 @@
     "supportsMotionVectors": false
 }
 
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
+    "m_ObjectId": "725a7009e1dd44f4af6129d72e202fff",
+    "m_Id": -2106065226,
+    "m_DisplayName": "PreviewPPU",
+    "m_SlotType": 0,
+    "m_Hidden": false,
+    "m_HideConnector": true,
+    "m_ShaderOutputName": "_PreviewPPU",
+    "m_StageCapability": 3,
+    "m_Value": 100.0,
+    "m_DefaultValue": 100.0,
+    "m_Labels": [],
+    "m_LiteralMode": false
+}
+
 {
     "m_SGVersion": 0,
     "m_Type": "UnityEditor.ShaderGraph.MultiplyNode",
@@ -1109,11 +1208,13 @@
     "m_DisplayName": "Out",
     "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "Out",
     "m_StageCapability": 3,
     "m_Value": 0.0,
     "m_DefaultValue": 0.0,
-    "m_Labels": []
+    "m_Labels": [],
+    "m_LiteralMode": true
 }
 
 {
@@ -1144,51 +1245,59 @@
     "m_DisplayName": "Stroke Thickness",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "_Stroke_Thickness",
     "m_StageCapability": 3,
     "m_Value": 0.10000000149011612,
-    "m_DefaultValue": 0.0,
-    "m_Labels": []
+    "m_DefaultValue": 0.10000000149011612,
+    "m_Labels": [],
+    "m_LiteralMode": false
 }
 
 {
     "m_SGVersion": 0,
     "m_Type": "UnityEditor.ShaderGraph.Vector2MaterialSlot",
-    "m_ObjectId": "8e0575d444f840e1b20424f825941848",
-    "m_Id": 0,
-    "m_DisplayName": "Size",
-    "m_SlotType": 1,
+    "m_ObjectId": "928ed94fdef54bfaa4a47d0b65d58b5d",
+    "m_Id": -1312023481,
+    "m_DisplayName": "UV",
+    "m_SlotType": 0,
     "m_Hidden": false,
-    "m_ShaderOutputName": "_RectTransformSize",
+    "m_HideConnector": false,
+    "m_ShaderOutputName": "_UV",
     "m_StageCapability": 3,
     "m_Value": {
-        "x": 1.0,
-        "y": 1.0
+        "x": 0.0,
+        "y": 0.0
     },
     "m_DefaultValue": {
-        "x": 1.0,
-        "y": 1.0
+        "x": 0.0,
+        "y": 0.0
     },
     "m_Labels": []
 }
 
 {
     "m_SGVersion": 0,
-    "m_Type": "UnityEditor.ShaderGraph.Vector2MaterialSlot",
-    "m_ObjectId": "928ed94fdef54bfaa4a47d0b65d58b5d",
-    "m_Id": -1312023481,
-    "m_DisplayName": "UV",
+    "m_Type": "UnityEditor.ShaderGraph.Vector4MaterialSlot",
+    "m_ObjectId": "95317f3fee19452596e4df960db00a52",
+    "m_Id": 0,
+    "m_DisplayName": "In",
     "m_SlotType": 0,
     "m_Hidden": false,
-    "m_ShaderOutputName": "_UV",
+    "m_HideConnector": false,
+    "m_ShaderOutputName": "In",
     "m_StageCapability": 3,
     "m_Value": {
         "x": 0.0,
-        "y": 0.0
+        "y": 0.0,
+        "z": 0.0,
+        "w": 0.0
     },
     "m_DefaultValue": {
         "x": 0.0,
-        "y": 0.0
+        "y": 0.0,
+        "z": 0.0,
+        "w": 0.0
     },
     "m_Labels": []
 }
@@ -1201,10 +1310,34 @@
     "m_DisplayName": "X",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "X",
     "m_StageCapability": 3,
     "m_Value": 0.20000000298023225,
     "m_DefaultValue": 0.0,
+    "m_Labels": [],
+    "m_LiteralMode": false
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.Vector2MaterialSlot",
+    "m_ObjectId": "95ca7c9404fd443dbba689e59caf4938",
+    "m_Id": 1,
+    "m_DisplayName": "Size",
+    "m_SlotType": 1,
+    "m_Hidden": false,
+    "m_HideConnector": false,
+    "m_ShaderOutputName": "Size",
+    "m_StageCapability": 3,
+    "m_Value": {
+        "x": 0.0,
+        "y": 0.0
+    },
+    "m_DefaultValue": {
+        "x": 0.0,
+        "y": 0.0
+    },
     "m_Labels": []
 }
 
@@ -1242,6 +1375,23 @@
     "m_SerializedDescriptor": "SurfaceDescription.BaseColor"
 }
 
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
+    "m_ObjectId": "9d8199b8f1244e7a84a2e4229f2b5746",
+    "m_Id": 2,
+    "m_DisplayName": "Scale_Factor",
+    "m_SlotType": 1,
+    "m_Hidden": false,
+    "m_HideConnector": false,
+    "m_ShaderOutputName": "Scale_Factor",
+    "m_StageCapability": 3,
+    "m_Value": 0.0,
+    "m_DefaultValue": 0.0,
+    "m_Labels": [],
+    "m_LiteralMode": false
+}
+
 {
     "m_SGVersion": 0,
     "m_Type": "UnityEditor.ShaderGraph.DynamicValueMaterialSlot",
@@ -1250,6 +1400,7 @@
     "m_DisplayName": "Out",
     "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "Out",
     "m_StageCapability": 3,
     "m_Value": {
@@ -1298,6 +1449,7 @@
     "m_DisplayName": "Out",
     "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "Out",
     "m_StageCapability": 3,
     "m_Value": {
@@ -1311,7 +1463,8 @@
         "y": 0.0,
         "z": 0.0,
         "w": 0.0
-    }
+    },
+    "m_LiteralMode": false
 }
 
 {
@@ -1364,6 +1517,28 @@
     "m_DropdownSelectedEntries": []
 }
 
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.Vector2MaterialSlot",
+    "m_ObjectId": "a582c4acf533428898ba7f0ba79757b6",
+    "m_Id": 0,
+    "m_DisplayName": "In",
+    "m_SlotType": 0,
+    "m_Hidden": false,
+    "m_HideConnector": false,
+    "m_ShaderOutputName": "In",
+    "m_StageCapability": 3,
+    "m_Value": {
+        "x": 0.0,
+        "y": 0.0
+    },
+    "m_DefaultValue": {
+        "x": 0.0,
+        "y": 0.0
+    },
+    "m_Labels": []
+}
+
 {
     "m_SGVersion": 0,
     "m_Type": "UnityEditor.ShaderGraph.ColorRGBMaterialSlot",
@@ -1372,6 +1547,7 @@
     "m_DisplayName": "Emission",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "Emission",
     "m_StageCapability": 2,
     "m_Value": {
@@ -1438,11 +1614,13 @@
     "m_DisplayName": "Out",
     "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "Out",
     "m_StageCapability": 2,
     "m_Value": 0.0,
     "m_DefaultValue": 0.0,
-    "m_Labels": []
+    "m_Labels": [],
+    "m_LiteralMode": false
 }
 
 {
@@ -1453,6 +1631,7 @@
     "m_DisplayName": "Keep Aspect Ratio",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "_Keep_Aspect_Ratio",
     "m_StageCapability": 3,
     "m_Value": true,
@@ -1467,11 +1646,13 @@
     "m_DisplayName": "Cutoff",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "_Cutoff",
     "m_StageCapability": 2,
     "m_Value": 0.5,
-    "m_DefaultValue": 0.0,
-    "m_Labels": []
+    "m_DefaultValue": 0.5,
+    "m_Labels": [],
+    "m_LiteralMode": false
 }
 
 {
@@ -1511,44 +1692,13 @@
     "m_DisplayName": "Edge Max",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "_Edge_Max",
     "m_StageCapability": 3,
     "m_Value": 0.009999999776482582,
-    "m_DefaultValue": 0.0,
-    "m_Labels": []
-}
-
-{
-    "m_SGVersion": 0,
-    "m_Type": "UnityEditor.ShaderGraph.RectTransformSizeNode",
-    "m_ObjectId": "b45b4c175dbf4dd7932559b8e49dfc6a",
-    "m_Group": {
-        "m_Id": ""
-    },
-    "m_Name": "RectTransform Size",
-    "m_DrawState": {
-        "m_Expanded": true,
-        "m_Position": {
-            "serializedVersion": "2",
-            "x": -965.9998779296875,
-            "y": 670.9999389648438,
-            "width": 157.0,
-            "height": 77.0
-        }
-    },
-    "m_Slots": [
-        {
-            "m_Id": "8e0575d444f840e1b20424f825941848"
-        }
-    ],
-    "synonyms": [],
-    "m_Precision": 0,
-    "m_PreviewExpanded": true,
-    "m_DismissedVersion": 0,
-    "m_PreviewMode": 0,
-    "m_CustomColors": {
-        "m_SerializableColors": []
-    }
+    "m_DefaultValue": 0.009999999776482582,
+    "m_Labels": [],
+    "m_LiteralMode": false
 }
 
 {
@@ -1559,11 +1709,13 @@
     "m_DisplayName": "Out",
     "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "Out",
     "m_StageCapability": 3,
     "m_Value": 0.0,
     "m_DefaultValue": 0.0,
-    "m_Labels": []
+    "m_Labels": [],
+    "m_LiteralMode": false
 }
 
 {
@@ -1574,6 +1726,7 @@
     "m_DisplayName": "A",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "A",
     "m_StageCapability": 3,
     "m_Value": {
@@ -1622,6 +1775,7 @@
     "m_DisplayName": "Base Color",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "BaseColor",
     "m_StageCapability": 2,
     "m_Value": {
@@ -1652,6 +1806,7 @@
     "m_DisplayName": "Out",
     "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "Out",
     "m_StageCapability": 3,
     "m_Value": {
@@ -1677,6 +1832,7 @@
     "m_DisplayName": "Out",
     "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "Out",
     "m_StageCapability": 3,
     "m_Value": {
@@ -1690,7 +1846,8 @@
         "y": 0.0,
         "z": 0.0,
         "w": 0.0
-    }
+    },
+    "m_LiteralMode": false
 }
 
 {
@@ -1733,7 +1890,8 @@
     "m_CustomColors": {
         "m_SerializableColors": []
     },
-    "m_Value": 0.0
+    "m_Value": 0.0,
+    "m_ConstIntMode": false
 }
 
 {
@@ -1783,6 +1941,7 @@
     "m_DisplayName": "Size",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "_Size",
     "m_StageCapability": 3,
     "m_Value": {
@@ -1804,11 +1963,13 @@
     "m_DisplayName": "Alpha",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "Alpha",
     "m_StageCapability": 2,
     "m_Value": 1.0,
     "m_DefaultValue": 1.0,
-    "m_Labels": []
+    "m_Labels": [],
+    "m_LiteralMode": false
 }
 
 {
@@ -1818,6 +1979,9 @@
     "m_Guid": {
         "m_GuidSerialized": "80eae158-d435-45a9-8a66-566a6fd6f432"
     },
+    "promotedFromAssetID": "",
+    "promotedFromCategoryName": "",
+    "promotedOrdering": -1,
     "m_Name": "Radius",
     "m_DefaultRefNameVersion": 1,
     "m_RefNameGeneratedByDisplayName": "Radius",
@@ -1830,28 +1994,50 @@
     "m_Precision": 0,
     "overrideHLSLDeclaration": false,
     "hlslDeclarationOverride": 0,
+    "hideConnector": false,
     "m_Hidden": false,
+    "m_PerRendererData": false,
+    "m_customAttributes": [],
     "m_Value": 0.20000000298023225,
     "m_FloatType": 0,
+    "m_LiteralFloatMode": false,
     "m_RangeValues": {
         "x": 0.0,
         "y": 1.0
-    }
+    },
+    "m_SliderType": 0,
+    "m_SliderPower": 3.0,
+    "m_EnumType": 0,
+    "m_CSharpEnumString": "",
+    "m_EnumNames": [
+        "Default"
+    ],
+    "m_EnumValues": [
+        0
+    ]
 }
 
 {
     "m_SGVersion": 0,
-    "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
-    "m_ObjectId": "d382d737ca85444d908000cf58fa2159",
-    "m_Id": 0,
-    "m_DisplayName": "Value",
-    "m_SlotType": 1,
+    "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialRangeSlot",
+    "m_ObjectId": "d35f634f4d814687aa9f09fdbd7c52eb",
+    "m_Id": -2019249102,
+    "m_DisplayName": "Preview Value",
+    "m_SlotType": 0,
     "m_Hidden": false,
-    "m_ShaderOutputName": "_MeterValue",
+    "m_HideConnector": true,
+    "m_ShaderOutputName": "_Preview_Value",
     "m_StageCapability": 3,
-    "m_Value": 0.0,
-    "m_DefaultValue": 0.0,
-    "m_Labels": []
+    "m_Value": 0.5299999713897705,
+    "m_DefaultValue": 0.5,
+    "m_Labels": [],
+    "m_LiteralMode": false,
+    "m_sliderRange": {
+        "x": 0.0,
+        "y": 1.0
+    },
+    "m_SliderType": 0,
+    "m_SliderPower": 3.0
 }
 
 {
@@ -1862,6 +2048,7 @@
     "m_DisplayName": "Stroke Thickness Relative",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "_Stroke_Thickness_Relative",
     "m_StageCapability": 3,
     "m_Value": true,
@@ -1876,6 +2063,7 @@
     "m_DisplayName": "B",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "B",
     "m_StageCapability": 3,
     "m_Value": {
@@ -1924,6 +2112,7 @@
     "m_DisplayName": "Out",
     "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "Out",
     "m_StageCapability": 3,
     "m_Value": {
@@ -1949,11 +2138,13 @@
     "m_DisplayName": "Edge Min",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "_Edge_Min",
     "m_StageCapability": 3,
     "m_Value": 0.0,
     "m_DefaultValue": 0.0,
-    "m_Labels": []
+    "m_Labels": [],
+    "m_LiteralMode": false
 }
 
 {
@@ -1970,6 +2161,7 @@
     "m_DisplayName": "B",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "B",
     "m_StageCapability": 3,
     "m_Value": {
@@ -1983,7 +2175,8 @@
         "y": 0.0,
         "z": 0.0,
         "w": 0.0
-    }
+    },
+    "m_LiteralMode": false
 }
 
 {
@@ -2026,59 +2219,68 @@
 
 {
     "m_SGVersion": 0,
-    "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot",
-    "m_ObjectId": "e5f1738d86cf43878a25bfa513ec7e2a",
-    "m_Id": 0,
-    "m_DisplayName": "In",
-    "m_SlotType": 0,
-    "m_Hidden": false,
-    "m_ShaderOutputName": "In",
-    "m_StageCapability": 3,
-    "m_Value": {
-        "x": 0.0,
-        "y": 0.0,
-        "z": 0.0,
-        "w": 0.0
-    },
-    "m_DefaultValue": {
-        "x": 0.0,
-        "y": 0.0,
-        "z": 0.0,
-        "w": 0.0
-    }
-}
-
-{
-    "m_SGVersion": 0,
-    "m_Type": "UnityEditor.ShaderGraph.MeterValueNode",
-    "m_ObjectId": "e6aa7632eedd48bc9fd0c3379dc66316",
+    "m_Type": "UnityEditor.ShaderGraph.SubGraphNode",
+    "m_ObjectId": "e57057b20f9b4be394b2e08b490ce4e0",
     "m_Group": {
         "m_Id": ""
     },
-    "m_Name": "Meter Value",
+    "m_Name": "Rect Transform Size",
     "m_DrawState": {
         "m_Expanded": true,
         "m_Position": {
             "serializedVersion": "2",
-            "x": -1136.0,
-            "y": 456.0,
-            "width": 113.99993896484375,
-            "height": 77.0
+            "x": -1196.9998779296875,
+            "y": 670.9999389648438,
+            "width": 165.0,
+            "height": 228.0
         }
     },
     "m_Slots": [
         {
-            "m_Id": "d382d737ca85444d908000cf58fa2159"
+            "m_Id": "5c432167d32f45cda2ddd1e5d0d9f097"
+        },
+        {
+            "m_Id": "4da0e7a6b8504ef081a42d0ee727ba49"
+        },
+        {
+            "m_Id": "63fbb08199094b7bb09fad45e04fed5a"
+        },
+        {
+            "m_Id": "725a7009e1dd44f4af6129d72e202fff"
+        },
+        {
+            "m_Id": "95ca7c9404fd443dbba689e59caf4938"
+        },
+        {
+            "m_Id": "9d8199b8f1244e7a84a2e4229f2b5746"
+        },
+        {
+            "m_Id": "53276e076425496d86175105a9fa38a4"
         }
     ],
     "synonyms": [],
     "m_Precision": 0,
-    "m_PreviewExpanded": true,
+    "m_PreviewExpanded": false,
     "m_DismissedVersion": 0,
     "m_PreviewMode": 0,
     "m_CustomColors": {
         "m_SerializableColors": []
-    }
+    },
+    "m_SerializedSubGraph": "{\n    \"subGraph\": {\n        \"fileID\": -5475051401550479605,\n        \"guid\": \"aa041986c041b4dc1b5bf0b2cd2d86e8\",\n        \"type\": 3\n    }\n}",
+    "m_PropertyGuids": [
+        "975f2db3-e792-46e7-9bf8-3a4cbe4fb068",
+        "373c703c-395b-43d3-91ba-78b9497021e7",
+        "2747a643-8db3-4ffc-9923-55aa70fb2549",
+        "451bbdf7-6136-4a6e-a5c8-4918d2ea4b95"
+    ],
+    "m_PropertyIds": [
+        -181240572,
+        716604351,
+        -1949568231,
+        -2106065226
+    ],
+    "m_Dropdowns": [],
+    "m_DropdownSelectedEntries": []
 }
 
 {
@@ -2101,11 +2303,58 @@
     "m_DisplayName": "SDF",
     "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "SDF",
     "m_StageCapability": 3,
     "m_Value": 0.0,
     "m_DefaultValue": 0.0,
-    "m_Labels": []
+    "m_Labels": [],
+    "m_LiteralMode": false
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.SubGraphNode",
+    "m_ObjectId": "eef93d75814143d49c69e2de356bc375",
+    "m_Group": {
+        "m_Id": ""
+    },
+    "m_Name": "Meter Value",
+    "m_DrawState": {
+        "m_Expanded": true,
+        "m_Position": {
+            "serializedVersion": "2",
+            "x": -1205.9998779296875,
+            "y": 438.9999694824219,
+            "width": 184.0,
+            "height": 121.99996948242188
+        }
+    },
+    "m_Slots": [
+        {
+            "m_Id": "d35f634f4d814687aa9f09fdbd7c52eb"
+        },
+        {
+            "m_Id": "4adacb9cbd9d494aaa19727914c991e1"
+        }
+    ],
+    "synonyms": [],
+    "m_Precision": 0,
+    "m_PreviewExpanded": false,
+    "m_DismissedVersion": 0,
+    "m_PreviewMode": 0,
+    "m_CustomColors": {
+        "m_SerializableColors": []
+    },
+    "m_SerializedSubGraph": "{\n    \"subGraph\": {\n        \"fileID\": -5475051401550479605,\n        \"guid\": \"90192633207f24dc0927e116d7564452\",\n        \"type\": 3\n    }\n}",
+    "m_PropertyGuids": [
+        "3da8ea4d-7749-407b-965b-ab3ca072dcc6"
+    ],
+    "m_PropertyIds": [
+        -2019249102
+    ],
+    "m_Dropdowns": [],
+    "m_DropdownSelectedEntries": []
 }
 
 {
@@ -2122,11 +2371,13 @@
     "m_DisplayName": "Out",
     "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "Out",
     "m_StageCapability": 3,
     "m_Value": 0.0,
     "m_DefaultValue": 0.0,
-    "m_Labels": []
+    "m_Labels": [],
+    "m_LiteralMode": false
 }
 
 {
@@ -2137,6 +2388,7 @@
     "m_DisplayName": "B",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "B",
     "m_StageCapability": 3,
     "m_Value": {
@@ -2150,6 +2402,7 @@
         "y": 0.0,
         "z": 0.0,
         "w": 0.0
-    }
+    },
+    "m_LiteralMode": false
 }
 
diff --git a/Packages/com.unity.shadergraph/Samples~/UGUIShaders/Default Materials/RangeBar Simple Fill.shadergraph b/Packages/com.unity.shadergraph/Samples~/UGUIShaders/Default Materials/RangeBar Simple Fill.shadergraph
index 14082811d05..cd3c900fbba 100644
--- a/Packages/com.unity.shadergraph/Samples~/UGUIShaders/Default Materials/RangeBar Simple Fill.shadergraph	
+++ b/Packages/com.unity.shadergraph/Samples~/UGUIShaders/Default Materials/RangeBar Simple Fill.shadergraph	
@@ -54,12 +54,6 @@
         {
             "m_Id": "c6abc3ebea76454fac809456d8ce8986"
         },
-        {
-            "m_Id": "b45b4c175dbf4dd7932559b8e49dfc6a"
-        },
-        {
-            "m_Id": "27c2060c70ba42d8adfaef2c96867774"
-        },
         {
             "m_Id": "90622f3847c24868a7c228ad5cabf688"
         },
@@ -87,14 +81,17 @@
         {
             "m_Id": "0e0a0e2e9d4a44dc8d04f66361f89781"
         },
-        {
-            "m_Id": "e70bb9e6bbbc4b2b854bd4be2611d644"
-        },
         {
             "m_Id": "cb379f1df7234fdab54d75aac047315a"
         },
         {
             "m_Id": "02b46c5a56c94303983234cfcf968fdc"
+        },
+        {
+            "m_Id": "65e27c985c644c0696a30d2e1e21de8a"
+        },
+        {
+            "m_Id": "d364a204aad64f5d89b87032e7e9ed9d"
         }
     ],
     "m_GroupDatas": [
@@ -107,13 +104,13 @@
     ],
     "m_StickyNoteDatas": [
         {
-            "m_Id": "3cf6c9caa44f45608ba46f9f5f27402c"
+            "m_Id": "791698d8fe074d4b8d28d652baa1c192"
         },
         {
-            "m_Id": "0f3aa19c3c444418bb7e3bc9a85b08fb"
+            "m_Id": "0cc14156c2de49b7bfb83b98b1719b2c"
         },
         {
-            "m_Id": "791698d8fe074d4b8d28d652baa1c192"
+            "m_Id": "ec99a8c4f3bd44a59b0cb6a462a088f7"
         }
     ],
     "m_Edges": [
@@ -201,20 +198,6 @@
                 "m_SlotId": 1
             }
         },
-        {
-            "m_OutputSlot": {
-                "m_Node": {
-                    "m_Id": "27c2060c70ba42d8adfaef2c96867774"
-                },
-                "m_SlotId": 1
-            },
-            "m_InputSlot": {
-                "m_Node": {
-                    "m_Id": "90622f3847c24868a7c228ad5cabf688"
-                },
-                "m_SlotId": -1380945929
-            }
-        },
         {
             "m_OutputSlot": {
                 "m_Node": {
@@ -341,6 +324,48 @@
                 "m_SlotId": 0
             }
         },
+        {
+            "m_OutputSlot": {
+                "m_Node": {
+                    "m_Id": "65e27c985c644c0696a30d2e1e21de8a"
+                },
+                "m_SlotId": 1
+            },
+            "m_InputSlot": {
+                "m_Node": {
+                    "m_Id": "5e7a7b972ef04bb09549e7698e33cb30"
+                },
+                "m_SlotId": 0
+            }
+        },
+        {
+            "m_OutputSlot": {
+                "m_Node": {
+                    "m_Id": "65e27c985c644c0696a30d2e1e21de8a"
+                },
+                "m_SlotId": 2
+            },
+            "m_InputSlot": {
+                "m_Node": {
+                    "m_Id": "0e0a0e2e9d4a44dc8d04f66361f89781"
+                },
+                "m_SlotId": 0
+            }
+        },
+        {
+            "m_OutputSlot": {
+                "m_Node": {
+                    "m_Id": "65e27c985c644c0696a30d2e1e21de8a"
+                },
+                "m_SlotId": 3
+            },
+            "m_InputSlot": {
+                "m_Node": {
+                    "m_Id": "90622f3847c24868a7c228ad5cabf688"
+                },
+                "m_SlotId": -1380945929
+            }
+        },
         {
             "m_OutputSlot": {
                 "m_Node": {
@@ -425,20 +450,6 @@
                 "m_SlotId": -591484606
             }
         },
-        {
-            "m_OutputSlot": {
-                "m_Node": {
-                    "m_Id": "b45b4c175dbf4dd7932559b8e49dfc6a"
-                },
-                "m_SlotId": 0
-            },
-            "m_InputSlot": {
-                "m_Node": {
-                    "m_Id": "1ff2775323a14c418ac415e1a2526504"
-                },
-                "m_SlotId": 1786236159
-            }
-        },
         {
             "m_OutputSlot": {
                 "m_Node": {
@@ -512,43 +523,15 @@
         {
             "m_OutputSlot": {
                 "m_Node": {
-                    "m_Id": "e70bb9e6bbbc4b2b854bd4be2611d644"
-                },
-                "m_SlotId": 0
-            },
-            "m_InputSlot": {
-                "m_Node": {
-                    "m_Id": "5e7a7b972ef04bb09549e7698e33cb30"
-                },
-                "m_SlotId": 0
-            }
-        },
-        {
-            "m_OutputSlot": {
-                "m_Node": {
-                    "m_Id": "e70bb9e6bbbc4b2b854bd4be2611d644"
+                    "m_Id": "d364a204aad64f5d89b87032e7e9ed9d"
                 },
                 "m_SlotId": 1
             },
             "m_InputSlot": {
                 "m_Node": {
-                    "m_Id": "0e0a0e2e9d4a44dc8d04f66361f89781"
-                },
-                "m_SlotId": 0
-            }
-        },
-        {
-            "m_OutputSlot": {
-                "m_Node": {
-                    "m_Id": "e70bb9e6bbbc4b2b854bd4be2611d644"
-                },
-                "m_SlotId": 2
-            },
-            "m_InputSlot": {
-                "m_Node": {
-                    "m_Id": "27c2060c70ba42d8adfaef2c96867774"
+                    "m_Id": "1ff2775323a14c418ac415e1a2526504"
                 },
-                "m_SlotId": -40675165
+                "m_SlotId": 1786236159
             }
         }
     ],
@@ -608,6 +591,7 @@
     "m_DisplayName": "",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "",
     "m_StageCapability": 3,
     "m_Value": {
@@ -621,7 +605,8 @@
         "y": 0.0,
         "z": 0.0,
         "w": 0.0
-    }
+    },
+    "m_LiteralMode": false
 }
 
 {
@@ -630,8 +615,8 @@
     "m_ObjectId": "004020dba81941109ce6b0c19f882aeb",
     "m_Title": "Min/Max",
     "m_Position": {
-        "x": -1435.0001220703125,
-        "y": 254.9999237060547
+        "x": -1435.000244140625,
+        "y": 255.00003051757813
     }
 }
 
@@ -692,6 +677,7 @@
     "m_DisplayName": "In",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "In",
     "m_StageCapability": 3,
     "m_Value": {
@@ -705,7 +691,8 @@
         "y": 0.0,
         "z": 0.0,
         "w": 0.0
-    }
+    },
+    "m_LiteralMode": false
 }
 
 {
@@ -716,6 +703,7 @@
     "m_DisplayName": "LeftToRight",
     "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "LeftToRight",
     "m_StageCapability": 3,
     "m_Value": false,
@@ -764,6 +752,7 @@
     "m_DisplayName": "",
     "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "",
     "m_StageCapability": 3,
     "m_Value": {
@@ -777,7 +766,8 @@
         "y": 0.0,
         "z": 0.0,
         "w": 0.0
-    }
+    },
+    "m_LiteralMode": false
 }
 
 {
@@ -788,11 +778,33 @@
     "m_DisplayName": "Stroke",
     "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "Stroke",
     "m_StageCapability": 3,
     "m_Value": 0.0,
     "m_DefaultValue": 0.0,
-    "m_Labels": []
+    "m_Labels": [],
+    "m_LiteralMode": false
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.StickyNoteData",
+    "m_ObjectId": "0cc14156c2de49b7bfb83b98b1719b2c",
+    "m_Title": "RangeBar Value",
+    "m_Content": "This subgraph promotes a hidden \"_RangeBarValue\" Vector4 property and allows changing the preview value with sliders and a dropdown.\n\nUse with the Sample RangeBar Component.\n\nMin = RangeBar Normalized Min Value\nMax = RangeBar Normalized Max Value\nDirection = RangeBar Normalized Direction Vector",
+    "m_TextSize": 0,
+    "m_Theme": 1,
+    "m_Position": {
+        "serializedVersion": "2",
+        "x": -3160.0,
+        "y": 308.0,
+        "width": 289.49755859375,
+        "height": 195.0
+    },
+    "m_Group": {
+        "m_Id": ""
+    }
 }
 
 {
@@ -803,6 +815,7 @@
     "m_DisplayName": "Width Height",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "_Width_Height",
     "m_StageCapability": 3,
     "m_Value": {
@@ -852,26 +865,6 @@
     }
 }
 
-{
-    "m_SGVersion": 0,
-    "m_Type": "UnityEditor.ShaderGraph.StickyNoteData",
-    "m_ObjectId": "0f3aa19c3c444418bb7e3bc9a85b08fb",
-    "m_Title": "RectTransform Size",
-    "m_Content": "A custom Node automatically adding a hidden local Vector2 \"_RectTransformSize\" property to the Material, even when in a Subgraph, and providing its value.\nUse with the ImageSize component from the Samples.\nSize = RectTransform's Size in Canvas space.",
-    "m_TextSize": 0,
-    "m_Theme": 1,
-    "m_Position": {
-        "serializedVersion": "2",
-        "x": -930.0,
-        "y": 787.0,
-        "width": 260.0,
-        "height": 134.0
-    },
-    "m_Group": {
-        "m_Id": ""
-    }
-}
-
 {
     "m_SGVersion": 0,
     "m_Type": "UnityEditor.ShaderGraph.MinimumNode",
@@ -959,6 +952,7 @@
     "m_DisplayName": "Out",
     "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "Out",
     "m_StageCapability": 3,
     "m_Value": {
@@ -972,7 +966,8 @@
         "y": 0.0,
         "z": 0.0,
         "w": 0.0
-    }
+    },
+    "m_LiteralMode": false
 }
 
 {
@@ -983,6 +978,7 @@
     "m_DisplayName": "A",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "A",
     "m_StageCapability": 3,
     "m_Value": {
@@ -996,7 +992,34 @@
         "y": 0.0,
         "z": 0.0,
         "w": 0.0
-    }
+    },
+    "m_LiteralMode": false
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.Vector4MaterialSlot",
+    "m_ObjectId": "16ea18744a0b453b8d9368e6be98563f",
+    "m_Id": 0,
+    "m_DisplayName": "In",
+    "m_SlotType": 0,
+    "m_Hidden": false,
+    "m_HideConnector": false,
+    "m_ShaderOutputName": "In",
+    "m_StageCapability": 3,
+    "m_Value": {
+        "x": 0.0,
+        "y": 0.0,
+        "z": 0.0,
+        "w": 0.0
+    },
+    "m_DefaultValue": {
+        "x": 0.0,
+        "y": 0.0,
+        "z": 0.0,
+        "w": 0.0
+    },
+    "m_Labels": []
 }
 
 {
@@ -1007,6 +1030,7 @@
     "m_DisplayName": "Corner Radii",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "_Corner_Radii",
     "m_StageCapability": 3,
     "m_Value": {
@@ -1161,27 +1185,6 @@
     ]
 }
 
-{
-    "m_SGVersion": 0,
-    "m_Type": "UnityEditor.ShaderGraph.Vector2MaterialSlot",
-    "m_ObjectId": "205de5c419e0433db95bcd1e3b922e2f",
-    "m_Id": 2,
-    "m_DisplayName": "Direction",
-    "m_SlotType": 1,
-    "m_Hidden": false,
-    "m_ShaderOutputName": "_RangeDirection",
-    "m_StageCapability": 3,
-    "m_Value": {
-        "x": 0.0,
-        "y": 0.0
-    },
-    "m_DefaultValue": {
-        "x": 0.0,
-        "y": 0.0
-    },
-    "m_Labels": []
-}
-
 {
     "m_SGVersion": 0,
     "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot",
@@ -1190,6 +1193,7 @@
     "m_DisplayName": "False",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "False",
     "m_StageCapability": 3,
     "m_Value": {
@@ -1203,7 +1207,8 @@
         "y": 0.0,
         "z": 0.0,
         "w": 0.0
-    }
+    },
+    "m_LiteralMode": false
 }
 
 {
@@ -1220,6 +1225,7 @@
     "m_DisplayName": "Out",
     "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "Out",
     "m_StageCapability": 3,
     "m_Value": {
@@ -1260,30 +1266,6 @@
     }
 }
 
-{
-    "m_SGVersion": 0,
-    "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot",
-    "m_ObjectId": "2601cf9acda44a229b2a0479801d16b7",
-    "m_Id": 0,
-    "m_DisplayName": "In",
-    "m_SlotType": 0,
-    "m_Hidden": false,
-    "m_ShaderOutputName": "In",
-    "m_StageCapability": 3,
-    "m_Value": {
-        "x": 0.0,
-        "y": 0.0,
-        "z": 0.0,
-        "w": 0.0
-    },
-    "m_DefaultValue": {
-        "x": 0.0,
-        "y": 0.0,
-        "z": 0.0,
-        "w": 0.0
-    }
-}
-
 {
     "m_SGVersion": 0,
     "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
@@ -1292,60 +1274,13 @@
     "m_DisplayName": "Out",
     "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "Out",
     "m_StageCapability": 3,
     "m_Value": 0.0,
     "m_DefaultValue": 0.0,
-    "m_Labels": []
-}
-
-{
-    "m_SGVersion": 0,
-    "m_Type": "UnityEditor.ShaderGraph.SubGraphNode",
-    "m_ObjectId": "27c2060c70ba42d8adfaef2c96867774",
-    "m_Group": {
-        "m_Id": "527a815ddcab4c06a3eabac9f496b04b"
-    },
-    "m_Name": "Slider Direction Preview",
-    "m_DrawState": {
-        "m_Expanded": true,
-        "m_Position": {
-            "serializedVersion": "2",
-            "x": -2578.000244140625,
-            "y": 684.0000610351563,
-            "width": 284.000244140625,
-            "height": 115.0
-        }
-    },
-    "m_Slots": [
-        {
-            "m_Id": "844d0c4689e54292bd5d9fee72cdc044"
-        },
-        {
-            "m_Id": "c9a58ed120cf49b0891e7afe74f2e942"
-        }
-    ],
-    "synonyms": [],
-    "m_Precision": 0,
-    "m_PreviewExpanded": false,
-    "m_DismissedVersion": 0,
-    "m_PreviewMode": 0,
-    "m_CustomColors": {
-        "m_SerializableColors": []
-    },
-    "m_SerializedSubGraph": "{\n    \"subGraph\": {\n        \"fileID\": -5475051401550479605,\n        \"guid\": \"b7b97b929f84d4c42ae877064f6d694a\",\n        \"type\": 3\n    }\n}",
-    "m_PropertyGuids": [
-        "68cd7b82-08a0-457e-b8a5-138b398e335b"
-    ],
-    "m_PropertyIds": [
-        -40675165
-    ],
-    "m_Dropdowns": [
-        "_Preview"
-    ],
-    "m_DropdownSelectedEntries": [
-        "Left To Right"
-    ]
+    "m_Labels": [],
+    "m_LiteralMode": false
 }
 
 {
@@ -1379,6 +1314,7 @@
     "m_CastShadows": true,
     "m_ReceiveShadows": true,
     "m_DisableTint": false,
+    "m_Sort3DAs2DCompatible": false,
     "m_AdditionalMotionVectorMode": 0,
     "m_AlembicMotionVectors": false,
     "m_SupportsLODCrossFade": false,
@@ -1432,6 +1368,7 @@
     "m_DisplayName": "",
     "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "",
     "m_StageCapability": 3,
     "m_Value": {
@@ -1445,7 +1382,8 @@
         "y": 0.0,
         "z": 0.0,
         "w": 0.0
-    }
+    },
+    "m_LiteralMode": false
 }
 
 {
@@ -1456,11 +1394,13 @@
     "m_DisplayName": "Radius",
     "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "Out",
     "m_StageCapability": 3,
     "m_Value": 0.0,
     "m_DefaultValue": 0.0,
-    "m_Labels": []
+    "m_Labels": [],
+    "m_LiteralMode": false
 }
 
 {
@@ -1471,6 +1411,7 @@
     "m_DisplayName": "Edge",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "Edge",
     "m_StageCapability": 3,
     "m_Value": {
@@ -1484,22 +1425,8 @@
         "y": 0.0,
         "z": 0.0,
         "w": 0.0
-    }
-}
-
-{
-    "m_SGVersion": 0,
-    "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
-    "m_ObjectId": "2f6f4573698b4ec285a0430a77328fd2",
-    "m_Id": 0,
-    "m_DisplayName": "Min",
-    "m_SlotType": 1,
-    "m_Hidden": false,
-    "m_ShaderOutputName": "_RangeValueMin",
-    "m_StageCapability": 3,
-    "m_Value": 0.0,
-    "m_DefaultValue": 0.0,
-    "m_Labels": []
+    },
+    "m_LiteralMode": false
 }
 
 {
@@ -1510,11 +1437,13 @@
     "m_DisplayName": "SDFStroke",
     "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "SDFStroke",
     "m_StageCapability": 3,
     "m_Value": 0.0,
     "m_DefaultValue": 0.0,
-    "m_Labels": []
+    "m_Labels": [],
+    "m_LiteralMode": false
 }
 
 {
@@ -1525,6 +1454,7 @@
     "m_DisplayName": "Out",
     "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "Out",
     "m_StageCapability": 3,
     "m_Value": {
@@ -1538,7 +1468,8 @@
         "y": 0.0,
         "z": 0.0,
         "w": 0.0
-    }
+    },
+    "m_LiteralMode": false
 }
 
 {
@@ -1548,6 +1479,23 @@
     "supportsMotionVectors": false
 }
 
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
+    "m_ObjectId": "3aa2c25887044d9c8b6fc298f4ec63ac",
+    "m_Id": 716604351,
+    "m_DisplayName": "PreviewHeight",
+    "m_SlotType": 0,
+    "m_Hidden": false,
+    "m_HideConnector": true,
+    "m_ShaderOutputName": "_PreviewHeight",
+    "m_StageCapability": 3,
+    "m_Value": 100.0,
+    "m_DefaultValue": 100.0,
+    "m_Labels": [],
+    "m_LiteralMode": false
+}
+
 {
     "m_SGVersion": 0,
     "m_Type": "UnityEditor.ShaderGraph.RedirectNodeData",
@@ -1584,26 +1532,6 @@
     }
 }
 
-{
-    "m_SGVersion": 0,
-    "m_Type": "UnityEditor.ShaderGraph.StickyNoteData",
-    "m_ObjectId": "3cf6c9caa44f45608ba46f9f5f27402c",
-    "m_Title": "RangeBar Value",
-    "m_Content": "A custom Node automatically adding a hidden local Vector4 \"_RangeBarValue\" property to the Material, even when in a Subgraph, and providing its value.\nUse with the Sample RangeBar Component.\nx = RangeBar Normalized Min Value\ny = RangeBar Normalized Max Value\nzw = RangeBar Direction",
-    "m_TextSize": 0,
-    "m_Theme": 1,
-    "m_Position": {
-        "serializedVersion": "2",
-        "x": -3086.0,
-        "y": 313.0,
-        "width": 303.0,
-        "height": 145.13742065429688
-    },
-    "m_Group": {
-        "m_Id": ""
-    }
-}
-
 {
     "m_SGVersion": 0,
     "m_Type": "UnityEditor.ShaderGraph.DynamicValueMaterialSlot",
@@ -1612,6 +1540,7 @@
     "m_DisplayName": "A",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "A",
     "m_StageCapability": 3,
     "m_Value": {
@@ -1652,6 +1581,67 @@
     }
 }
 
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.Vector2MaterialSlot",
+    "m_ObjectId": "44656a03c6354af5ba0b93614d4d1b8f",
+    "m_Id": 0,
+    "m_DisplayName": "In",
+    "m_SlotType": 0,
+    "m_Hidden": false,
+    "m_HideConnector": false,
+    "m_ShaderOutputName": "In",
+    "m_StageCapability": 3,
+    "m_Value": {
+        "x": 0.0,
+        "y": 0.0
+    },
+    "m_DefaultValue": {
+        "x": 0.0,
+        "y": 0.0
+    },
+    "m_Labels": []
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
+    "m_ObjectId": "45073104654344cf90c4eb0ae0bba34f",
+    "m_Id": -181240572,
+    "m_DisplayName": "PreviewWidth",
+    "m_SlotType": 0,
+    "m_Hidden": false,
+    "m_HideConnector": true,
+    "m_ShaderOutputName": "_PreviewWidth",
+    "m_StageCapability": 3,
+    "m_Value": 100.0,
+    "m_DefaultValue": 100.0,
+    "m_Labels": [],
+    "m_LiteralMode": false
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.Vector2MaterialSlot",
+    "m_ObjectId": "45555fffed814995b62768f276d75a31",
+    "m_Id": 1,
+    "m_DisplayName": "Size",
+    "m_SlotType": 1,
+    "m_Hidden": false,
+    "m_HideConnector": false,
+    "m_ShaderOutputName": "Size",
+    "m_StageCapability": 3,
+    "m_Value": {
+        "x": 0.0,
+        "y": 0.0
+    },
+    "m_DefaultValue": {
+        "x": 0.0,
+        "y": 0.0
+    },
+    "m_Labels": []
+}
+
 {
     "m_SGVersion": 0,
     "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasData",
@@ -1704,8 +1694,8 @@
     "m_ObjectId": "527a815ddcab4c06a3eabac9f496b04b",
     "m_Title": "Direction",
     "m_Position": {
-        "x": -2603.0,
-        "y": 625.0000610351563
+        "x": -2319.000244140625,
+        "y": 625.0
     }
 }
 
@@ -1717,6 +1707,7 @@
     "m_DisplayName": "A",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "A",
     "m_StageCapability": 3,
     "m_Value": {
@@ -1730,7 +1721,8 @@
         "y": 0.0,
         "z": 0.0,
         "w": 0.0
-    }
+    },
+    "m_LiteralMode": false
 }
 
 {
@@ -1741,11 +1733,13 @@
     "m_DisplayName": "Out",
     "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "Out",
     "m_StageCapability": 3,
     "m_Value": 0.0,
     "m_DefaultValue": 0.0,
-    "m_Labels": []
+    "m_Labels": [],
+    "m_LiteralMode": false
 }
 
 {
@@ -1756,11 +1750,13 @@
     "m_DisplayName": "Fill",
     "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "Fill",
     "m_StageCapability": 3,
     "m_Value": 0.0,
     "m_DefaultValue": 0.0,
-    "m_Labels": []
+    "m_Labels": [],
+    "m_LiteralMode": false
 }
 
 {
@@ -1882,26 +1878,83 @@
 
 {
     "m_SGVersion": 0,
-    "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot",
-    "m_ObjectId": "66f6c134489e4dd5afab5a7a9a615ae6",
-    "m_Id": 0,
-    "m_DisplayName": "In",
-    "m_SlotType": 0,
+    "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
+    "m_ObjectId": "5fc34e8d790f4a44985dab3165846ee7",
+    "m_Id": 3,
+    "m_DisplayName": "Pixel_Per_Unit",
+    "m_SlotType": 1,
     "m_Hidden": false,
-    "m_ShaderOutputName": "In",
+    "m_HideConnector": false,
+    "m_ShaderOutputName": "Pixel_Per_Unit",
     "m_StageCapability": 3,
-    "m_Value": {
-        "x": 0.0,
-        "y": 0.0,
-        "z": 0.0,
-        "w": 0.0
+    "m_Value": 0.0,
+    "m_DefaultValue": 0.0,
+    "m_Labels": [],
+    "m_LiteralMode": false
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.SubGraphNode",
+    "m_ObjectId": "65e27c985c644c0696a30d2e1e21de8a",
+    "m_Group": {
+        "m_Id": ""
     },
-    "m_DefaultValue": {
-        "x": 0.0,
-        "y": 0.0,
-        "z": 0.0,
-        "w": 0.0
-    }
+    "m_Name": "Range Bar Value",
+    "m_DrawState": {
+        "m_Expanded": true,
+        "m_Position": {
+            "serializedVersion": "2",
+            "x": -2865.0,
+            "y": 302.0,
+            "width": 256.0,
+            "height": 207.0
+        }
+    },
+    "m_Slots": [
+        {
+            "m_Id": "fe8392b3ead744aa801f0ef8030e1449"
+        },
+        {
+            "m_Id": "dbc6c2de17db49a99a97fd7bf2a8290f"
+        },
+        {
+            "m_Id": "756f6b5ea4b04ba692683d5cab15a0dc"
+        },
+        {
+            "m_Id": "8c3dcf4c6d6644d9a90b5b92fb3f43bb"
+        },
+        {
+            "m_Id": "6e09e41d75574e80b2ff9f1676ba8d0f"
+        }
+    ],
+    "synonyms": [],
+    "m_Precision": 0,
+    "m_PreviewExpanded": false,
+    "m_DismissedVersion": 0,
+    "m_PreviewMode": 0,
+    "m_CustomColors": {
+        "m_SerializableColors": []
+    },
+    "m_SerializedSubGraph": "{\n    \"subGraph\": {\n        \"fileID\": -5475051401550479605,\n        \"guid\": \"41e92803bd4fa4bb29936cc9c1016fb2\",\n        \"type\": 3\n    }\n}",
+    "m_PropertyGuids": [
+        "2747a643-8db3-4ffc-9923-55aa70fb2549",
+        "451bbdf7-6136-4a6e-a5c8-4918d2ea4b95",
+        "7a7a7fe2-0224-45d6-a406-e696b5db0d20"
+    ],
+    "m_PropertyIds": [
+        -1949568231,
+        -2106065226,
+        -1991794473
+    ],
+    "m_Dropdowns": [
+        "_Preview",
+        "_Preview_Direction"
+    ],
+    "m_DropdownSelectedEntries": [
+        "Left To Right",
+        "Left To Right"
+    ]
 }
 
 {
@@ -1919,6 +1972,7 @@
     "m_DisplayName": "Slider Direction",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "_Slider_Direction",
     "m_StageCapability": 3,
     "m_Value": {
@@ -1932,6 +1986,28 @@
     "m_Labels": []
 }
 
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.Vector2MaterialSlot",
+    "m_ObjectId": "6e09e41d75574e80b2ff9f1676ba8d0f",
+    "m_Id": 3,
+    "m_DisplayName": "Direction",
+    "m_SlotType": 1,
+    "m_Hidden": false,
+    "m_HideConnector": false,
+    "m_ShaderOutputName": "Direction",
+    "m_StageCapability": 3,
+    "m_Value": {
+        "x": 0.0,
+        "y": 0.0
+    },
+    "m_DefaultValue": {
+        "x": 0.0,
+        "y": 0.0
+    },
+    "m_Labels": []
+}
+
 {
     "m_SGVersion": 0,
     "m_Type": "UnityEditor.ShaderGraph.DynamicValueMaterialSlot",
@@ -1940,6 +2016,7 @@
     "m_DisplayName": "B",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "B",
     "m_StageCapability": 3,
     "m_Value": {
@@ -1980,6 +2057,23 @@
     }
 }
 
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
+    "m_ObjectId": "756f6b5ea4b04ba692683d5cab15a0dc",
+    "m_Id": 1,
+    "m_DisplayName": "Min",
+    "m_SlotType": 1,
+    "m_Hidden": false,
+    "m_HideConnector": false,
+    "m_ShaderOutputName": "Min",
+    "m_StageCapability": 3,
+    "m_Value": 0.0,
+    "m_DefaultValue": 0.0,
+    "m_Labels": [],
+    "m_LiteralMode": false
+}
+
 {
     "m_SGVersion": 0,
     "m_Type": "UnityEditor.ShaderGraph.BlockNode",
@@ -2022,6 +2116,7 @@
     "m_DisplayName": "Out",
     "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "Out",
     "m_StageCapability": 3,
     "m_Value": {
@@ -2035,7 +2130,8 @@
         "y": 0.0,
         "z": 0.0,
         "w": 0.0
-    }
+    },
+    "m_LiteralMode": false
 }
 
 {
@@ -2046,11 +2142,13 @@
     "m_DisplayName": "Out",
     "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "Out",
     "m_StageCapability": 3,
     "m_Value": 0.0,
     "m_DefaultValue": 0.0,
-    "m_Labels": []
+    "m_Labels": [],
+    "m_LiteralMode": true
 }
 
 {
@@ -2127,6 +2225,7 @@
     "m_DisplayName": "In",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "In",
     "m_StageCapability": 3,
     "m_Value": {
@@ -2140,7 +2239,8 @@
         "y": 0.0,
         "z": 0.0,
         "w": 0.0
-    }
+    },
+    "m_LiteralMode": false
 }
 
 {
@@ -2151,6 +2251,7 @@
     "m_DisplayName": "Out",
     "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "Out",
     "m_StageCapability": 3,
     "m_Value": {
@@ -2168,27 +2269,6 @@
     "m_Labels": []
 }
 
-{
-    "m_SGVersion": 0,
-    "m_Type": "UnityEditor.ShaderGraph.Vector2MaterialSlot",
-    "m_ObjectId": "844d0c4689e54292bd5d9fee72cdc044",
-    "m_Id": -40675165,
-    "m_DisplayName": "Slider Direction",
-    "m_SlotType": 0,
-    "m_Hidden": false,
-    "m_ShaderOutputName": "_Slider_Direction",
-    "m_StageCapability": 3,
-    "m_Value": {
-        "x": 1.0,
-        "y": 0.0
-    },
-    "m_DefaultValue": {
-        "x": 0.0,
-        "y": 0.0
-    },
-    "m_Labels": []
-}
-
 {
     "m_SGVersion": 0,
     "m_Type": "UnityEditor.ShaderGraph.BooleanMaterialSlot",
@@ -2197,6 +2277,7 @@
     "m_DisplayName": "Vertical",
     "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "Vertical",
     "m_StageCapability": 3,
     "m_Value": false,
@@ -2206,37 +2287,35 @@
 {
     "m_SGVersion": 0,
     "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
-    "m_ObjectId": "8c4d530ab98c4d31ad28b3f39316a810",
-    "m_Id": -33893895,
-    "m_DisplayName": "Stroke Thickness",
-    "m_SlotType": 0,
+    "m_ObjectId": "8c3dcf4c6d6644d9a90b5b92fb3f43bb",
+    "m_Id": 2,
+    "m_DisplayName": "Max",
+    "m_SlotType": 1,
     "m_Hidden": false,
-    "m_ShaderOutputName": "_Stroke_Thickness",
+    "m_HideConnector": false,
+    "m_ShaderOutputName": "Max",
     "m_StageCapability": 3,
-    "m_Value": 0.10000000149011612,
+    "m_Value": 0.0,
     "m_DefaultValue": 0.0,
-    "m_Labels": []
+    "m_Labels": [],
+    "m_LiteralMode": false
 }
 
 {
     "m_SGVersion": 0,
-    "m_Type": "UnityEditor.ShaderGraph.Vector2MaterialSlot",
-    "m_ObjectId": "8e0575d444f840e1b20424f825941848",
-    "m_Id": 0,
-    "m_DisplayName": "Size",
-    "m_SlotType": 1,
+    "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
+    "m_ObjectId": "8c4d530ab98c4d31ad28b3f39316a810",
+    "m_Id": -33893895,
+    "m_DisplayName": "Stroke Thickness",
+    "m_SlotType": 0,
     "m_Hidden": false,
-    "m_ShaderOutputName": "_RectTransformSize",
+    "m_HideConnector": false,
+    "m_ShaderOutputName": "_Stroke_Thickness",
     "m_StageCapability": 3,
-    "m_Value": {
-        "x": 1.0,
-        "y": 1.0
-    },
-    "m_DefaultValue": {
-        "x": 1.0,
-        "y": 1.0
-    },
-    "m_Labels": []
+    "m_Value": 0.10000000149011612,
+    "m_DefaultValue": 0.10000000149011612,
+    "m_Labels": [],
+    "m_LiteralMode": false
 }
 
 {
@@ -2305,21 +2384,6 @@
     "m_DropdownSelectedEntries": []
 }
 
-{
-    "m_SGVersion": 0,
-    "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
-    "m_ObjectId": "908001d0f95e473aa4e365216bbaad5c",
-    "m_Id": 1,
-    "m_DisplayName": "Max",
-    "m_SlotType": 1,
-    "m_Hidden": false,
-    "m_ShaderOutputName": "_RangeValueMax",
-    "m_StageCapability": 3,
-    "m_Value": 1.0,
-    "m_DefaultValue": 1.0,
-    "m_Labels": []
-}
-
 {
     "m_SGVersion": 0,
     "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot",
@@ -2328,6 +2392,7 @@
     "m_DisplayName": "A",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "A",
     "m_StageCapability": 3,
     "m_Value": {
@@ -2341,7 +2406,8 @@
         "y": 0.0,
         "z": 0.0,
         "w": 0.0
-    }
+    },
+    "m_LiteralMode": false
 }
 
 {
@@ -2352,6 +2418,7 @@
     "m_DisplayName": "UV",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "_UV",
     "m_StageCapability": 3,
     "m_Value": {
@@ -2365,6 +2432,23 @@
     "m_Labels": []
 }
 
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
+    "m_ObjectId": "9361852f19324cf399a393e321eaca6c",
+    "m_Id": 2,
+    "m_DisplayName": "Scale_Factor",
+    "m_SlotType": 1,
+    "m_Hidden": false,
+    "m_HideConnector": false,
+    "m_ShaderOutputName": "Scale_Factor",
+    "m_StageCapability": 3,
+    "m_Value": 0.0,
+    "m_DefaultValue": 0.0,
+    "m_Labels": [],
+    "m_LiteralMode": false
+}
+
 {
     "m_SGVersion": 0,
     "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
@@ -2373,11 +2457,13 @@
     "m_DisplayName": "X",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "X",
     "m_StageCapability": 3,
     "m_Value": 0.20000000298023225,
     "m_DefaultValue": 0.0,
-    "m_Labels": []
+    "m_Labels": [],
+    "m_LiteralMode": false
 }
 
 {
@@ -2388,6 +2474,7 @@
     "m_DisplayName": "Out",
     "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "Out",
     "m_StageCapability": 3,
     "m_Value": {
@@ -2401,7 +2488,8 @@
         "y": 0.0,
         "z": 0.0,
         "w": 0.0
-    }
+    },
+    "m_LiteralMode": false
 }
 
 {
@@ -2412,6 +2500,7 @@
     "m_DisplayName": "",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "",
     "m_StageCapability": 3,
     "m_Value": {
@@ -2425,7 +2514,8 @@
         "y": 0.0,
         "z": 0.0,
         "w": 0.0
-    }
+    },
+    "m_LiteralMode": false
 }
 
 {
@@ -2436,6 +2526,7 @@
     "m_DisplayName": "False",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "False",
     "m_StageCapability": 3,
     "m_Value": {
@@ -2449,7 +2540,8 @@
         "y": 0.0,
         "z": 0.0,
         "w": 0.0
-    }
+    },
+    "m_LiteralMode": false
 }
 
 {
@@ -2494,6 +2586,7 @@
     "m_DisplayName": "BottomToTop",
     "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "BottomToTop",
     "m_StageCapability": 3,
     "m_Value": false,
@@ -2546,6 +2639,23 @@
     }
 }
 
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
+    "m_ObjectId": "a16cb30815d3475a9c64a7be7b8334bd",
+    "m_Id": -1949568231,
+    "m_DisplayName": "PreviewScaleFactor",
+    "m_SlotType": 0,
+    "m_Hidden": false,
+    "m_HideConnector": true,
+    "m_ShaderOutputName": "_PreviewScaleFactor",
+    "m_StageCapability": 3,
+    "m_Value": 1.0,
+    "m_DefaultValue": 1.0,
+    "m_Labels": [],
+    "m_LiteralMode": false
+}
+
 {
     "m_SGVersion": 0,
     "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot",
@@ -2554,6 +2664,7 @@
     "m_DisplayName": "Out",
     "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "Out",
     "m_StageCapability": 3,
     "m_Value": {
@@ -2567,7 +2678,25 @@
         "y": 0.0,
         "z": 0.0,
         "w": 0.0
-    }
+    },
+    "m_LiteralMode": false
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
+    "m_ObjectId": "a4a9e3ae5bae4d83b07a0417202c28a1",
+    "m_Id": 0,
+    "m_DisplayName": "In",
+    "m_SlotType": 0,
+    "m_Hidden": false,
+    "m_HideConnector": false,
+    "m_ShaderOutputName": "In",
+    "m_StageCapability": 3,
+    "m_Value": 0.0,
+    "m_DefaultValue": 0.0,
+    "m_Labels": [],
+    "m_LiteralMode": false
 }
 
 {
@@ -2578,6 +2707,7 @@
     "m_DisplayName": "Emission",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "Emission",
     "m_StageCapability": 2,
     "m_Value": {
@@ -2608,6 +2738,7 @@
     "m_DisplayName": "True",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "True",
     "m_StageCapability": 3,
     "m_Value": {
@@ -2621,7 +2752,8 @@
         "y": 0.0,
         "z": 0.0,
         "w": 0.0
-    }
+    },
+    "m_LiteralMode": false
 }
 
 {
@@ -2632,6 +2764,7 @@
     "m_DisplayName": "TopToBottom",
     "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "TopToBottom",
     "m_StageCapability": 3,
     "m_Value": false,
@@ -2646,6 +2779,7 @@
     "m_DisplayName": "B",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "B",
     "m_StageCapability": 3,
     "m_Value": {
@@ -2659,7 +2793,8 @@
         "y": 0.0,
         "z": 0.0,
         "w": 0.0
-    }
+    },
+    "m_LiteralMode": false
 }
 
 {
@@ -2706,6 +2841,7 @@
     "m_DisplayName": "Keep Aspect Ratio",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "_Keep_Aspect_Ratio",
     "m_StageCapability": 3,
     "m_Value": true,
@@ -2749,11 +2885,13 @@
     "m_DisplayName": "Edge Max",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "_Edge_Max",
     "m_StageCapability": 3,
     "m_Value": 0.009999999776482582,
-    "m_DefaultValue": 0.0,
-    "m_Labels": []
+    "m_DefaultValue": 0.009999999776482582,
+    "m_Labels": [],
+    "m_LiteralMode": false
 }
 
 {
@@ -2764,6 +2902,7 @@
     "m_DisplayName": "Out",
     "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "Out",
     "m_StageCapability": 3,
     "m_Value": {
@@ -2777,40 +2916,8 @@
         "y": 0.0,
         "z": 0.0,
         "w": 0.0
-    }
-}
-
-{
-    "m_SGVersion": 0,
-    "m_Type": "UnityEditor.ShaderGraph.RectTransformSizeNode",
-    "m_ObjectId": "b45b4c175dbf4dd7932559b8e49dfc6a",
-    "m_Group": {
-        "m_Id": ""
-    },
-    "m_Name": "RectTransform Size",
-    "m_DrawState": {
-        "m_Expanded": true,
-        "m_Position": {
-            "serializedVersion": "2",
-            "x": -882.9999389648438,
-            "y": 705.0,
-            "width": 156.99993896484376,
-            "height": 76.99993896484375
-        }
     },
-    "m_Slots": [
-        {
-            "m_Id": "8e0575d444f840e1b20424f825941848"
-        }
-    ],
-    "synonyms": [],
-    "m_Precision": 0,
-    "m_PreviewExpanded": true,
-    "m_DismissedVersion": 0,
-    "m_PreviewMode": 0,
-    "m_CustomColors": {
-        "m_SerializableColors": []
-    }
+    "m_LiteralMode": false
 }
 
 {
@@ -2821,6 +2928,7 @@
     "m_DisplayName": "Base Color",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "BaseColor",
     "m_StageCapability": 2,
     "m_Value": {
@@ -2851,6 +2959,7 @@
     "m_DisplayName": "True",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "True",
     "m_StageCapability": 3,
     "m_Value": {
@@ -2864,7 +2973,8 @@
         "y": 0.0,
         "z": 0.0,
         "w": 0.0
-    }
+    },
+    "m_LiteralMode": false
 }
 
 {
@@ -2875,6 +2985,7 @@
     "m_DisplayName": "In",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "In",
     "m_StageCapability": 3,
     "m_Value": {
@@ -2888,7 +2999,8 @@
         "y": 0.0,
         "z": 0.0,
         "w": 0.0
-    }
+    },
+    "m_LiteralMode": false
 }
 
 {
@@ -2899,6 +3011,7 @@
     "m_DisplayName": "Out",
     "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "Out",
     "m_StageCapability": 3,
     "m_Value": {
@@ -2912,7 +3025,8 @@
         "y": 0.0,
         "z": 0.0,
         "w": 0.0
-    }
+    },
+    "m_LiteralMode": false
 }
 
 {
@@ -2923,6 +3037,7 @@
     "m_DisplayName": "Predicate",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "Predicate",
     "m_StageCapability": 3,
     "m_Value": false,
@@ -2969,7 +3084,8 @@
     "m_CustomColors": {
         "m_SerializableColors": []
     },
-    "m_Value": 0.0
+    "m_Value": 0.0,
+    "m_ConstIntMode": false
 }
 
 {
@@ -2992,7 +3108,7 @@
     },
     "m_Slots": [
         {
-            "m_Id": "c6e3ab973f2341f5a14798d16b205dcd"
+            "m_Id": "44656a03c6354af5ba0b93614d4d1b8f"
         },
         {
             "m_Id": "f0a90c4fd45c4e6ea0ff8805d3e6b3b9"
@@ -3022,6 +3138,7 @@
     "m_DisplayName": "Horizontal",
     "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "Horizontal",
     "m_StageCapability": 3,
     "m_Value": false,
@@ -3067,30 +3184,6 @@
     }
 }
 
-{
-    "m_SGVersion": 0,
-    "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot",
-    "m_ObjectId": "c6e3ab973f2341f5a14798d16b205dcd",
-    "m_Id": 0,
-    "m_DisplayName": "In",
-    "m_SlotType": 0,
-    "m_Hidden": false,
-    "m_ShaderOutputName": "In",
-    "m_StageCapability": 3,
-    "m_Value": {
-        "x": 0.0,
-        "y": 0.0,
-        "z": 0.0,
-        "w": 0.0
-    },
-    "m_DefaultValue": {
-        "x": 0.0,
-        "y": 0.0,
-        "z": 0.0,
-        "w": 0.0
-    }
-}
-
 {
     "m_SGVersion": 0,
     "m_Type": "UnityEditor.ShaderGraph.BooleanMaterialSlot",
@@ -3099,6 +3192,7 @@
     "m_DisplayName": "Negative",
     "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "Negative",
     "m_StageCapability": 3,
     "m_Value": false,
@@ -3113,33 +3207,13 @@
     "m_DisplayName": "RightToLeft",
     "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "RightToLeft",
     "m_StageCapability": 3,
     "m_Value": false,
     "m_DefaultValue": false
 }
 
-{
-    "m_SGVersion": 0,
-    "m_Type": "UnityEditor.ShaderGraph.Vector2MaterialSlot",
-    "m_ObjectId": "c9a58ed120cf49b0891e7afe74f2e942",
-    "m_Id": 1,
-    "m_DisplayName": "State",
-    "m_SlotType": 1,
-    "m_Hidden": false,
-    "m_ShaderOutputName": "State",
-    "m_StageCapability": 3,
-    "m_Value": {
-        "x": 0.0,
-        "y": 0.0
-    },
-    "m_DefaultValue": {
-        "x": 0.0,
-        "y": 0.0
-    },
-    "m_Labels": []
-}
-
 {
     "m_SGVersion": 0,
     "m_Type": "UnityEditor.ShaderGraph.Vector2MaterialSlot",
@@ -3148,6 +3222,7 @@
     "m_DisplayName": "Size",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "_Size",
     "m_StageCapability": 3,
     "m_Value": {
@@ -3169,11 +3244,13 @@
     "m_DisplayName": "Alpha",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "Alpha",
     "m_StageCapability": 2,
     "m_Value": 1.0,
     "m_DefaultValue": 1.0,
-    "m_Labels": []
+    "m_Labels": [],
+    "m_LiteralMode": false
 }
 
 {
@@ -3184,6 +3261,7 @@
     "m_DisplayName": "Positive",
     "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "Positive",
     "m_StageCapability": 3,
     "m_Value": false,
@@ -3210,7 +3288,7 @@
     },
     "m_Slots": [
         {
-            "m_Id": "66f6c134489e4dd5afab5a7a9a615ae6"
+            "m_Id": "16ea18744a0b453b8d9368e6be98563f"
         },
         {
             "m_Id": "587bf0fc30f94c94b86ff7346152553f"
@@ -3252,7 +3330,7 @@
     },
     "m_Slots": [
         {
-            "m_Id": "2601cf9acda44a229b2a0479801d16b7"
+            "m_Id": "a4a9e3ae5bae4d83b07a0417202c28a1"
         },
         {
             "m_Id": "27b7da4350d44fe0aeecec728512fbb0"
@@ -3282,6 +3360,7 @@
     "m_DisplayName": "Out",
     "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "Out",
     "m_StageCapability": 3,
     "m_Value": {
@@ -3295,7 +3374,8 @@
         "y": 0.0,
         "z": 0.0,
         "w": 0.0
-    }
+    },
+    "m_LiteralMode": false
 }
 
 {
@@ -3305,6 +3385,9 @@
     "m_Guid": {
         "m_GuidSerialized": "80eae158-d435-45a9-8a66-566a6fd6f432"
     },
+    "promotedFromAssetID": "",
+    "promotedFromCategoryName": "",
+    "promotedOrdering": -1,
     "m_Name": "Radius",
     "m_DefaultRefNameVersion": 1,
     "m_RefNameGeneratedByDisplayName": "Radius",
@@ -3317,13 +3400,93 @@
     "m_Precision": 0,
     "overrideHLSLDeclaration": false,
     "hlslDeclarationOverride": 0,
+    "hideConnector": false,
     "m_Hidden": false,
+    "m_PerRendererData": false,
+    "m_customAttributes": [],
     "m_Value": 0.20000000298023225,
     "m_FloatType": 0,
+    "m_LiteralFloatMode": false,
     "m_RangeValues": {
         "x": 0.0,
         "y": 1.0
-    }
+    },
+    "m_SliderType": 0,
+    "m_SliderPower": 3.0,
+    "m_EnumType": 0,
+    "m_CSharpEnumString": "",
+    "m_EnumNames": [
+        "Default"
+    ],
+    "m_EnumValues": [
+        0
+    ]
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.SubGraphNode",
+    "m_ObjectId": "d364a204aad64f5d89b87032e7e9ed9d",
+    "m_Group": {
+        "m_Id": ""
+    },
+    "m_Name": "Rect Transform Size",
+    "m_DrawState": {
+        "m_Expanded": true,
+        "m_Position": {
+            "serializedVersion": "2",
+            "x": -867.0,
+            "y": 705.0,
+            "width": 165.0,
+            "height": 228.0
+        }
+    },
+    "m_Slots": [
+        {
+            "m_Id": "45073104654344cf90c4eb0ae0bba34f"
+        },
+        {
+            "m_Id": "3aa2c25887044d9c8b6fc298f4ec63ac"
+        },
+        {
+            "m_Id": "a16cb30815d3475a9c64a7be7b8334bd"
+        },
+        {
+            "m_Id": "d54b3393d4fc4189b8da13c6f2faef89"
+        },
+        {
+            "m_Id": "45555fffed814995b62768f276d75a31"
+        },
+        {
+            "m_Id": "9361852f19324cf399a393e321eaca6c"
+        },
+        {
+            "m_Id": "5fc34e8d790f4a44985dab3165846ee7"
+        }
+    ],
+    "synonyms": [],
+    "m_Precision": 0,
+    "m_PreviewExpanded": false,
+    "m_DismissedVersion": 0,
+    "m_PreviewMode": 0,
+    "m_CustomColors": {
+        "m_SerializableColors": []
+    },
+    "m_SerializedSubGraph": "{\n    \"subGraph\": {\n        \"fileID\": -5475051401550479605,\n        \"guid\": \"aa041986c041b4dc1b5bf0b2cd2d86e8\",\n        \"type\": 3\n    }\n}",
+    "m_PropertyGuids": [
+        "975f2db3-e792-46e7-9bf8-3a4cbe4fb068",
+        "373c703c-395b-43d3-91ba-78b9497021e7",
+        "2747a643-8db3-4ffc-9923-55aa70fb2549",
+        "451bbdf7-6136-4a6e-a5c8-4918d2ea4b95"
+    ],
+    "m_PropertyIds": [
+        -181240572,
+        716604351,
+        -1949568231,
+        -2106065226
+    ],
+    "m_Dropdowns": [],
+    "m_DropdownSelectedEntries": []
 }
 
 {
@@ -3334,12 +3497,30 @@
     "m_DisplayName": "Stroke Thickness Relative",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "_Stroke_Thickness_Relative",
     "m_StageCapability": 3,
     "m_Value": true,
     "m_DefaultValue": false
 }
 
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
+    "m_ObjectId": "d54b3393d4fc4189b8da13c6f2faef89",
+    "m_Id": -2106065226,
+    "m_DisplayName": "PreviewPPU",
+    "m_SlotType": 0,
+    "m_Hidden": false,
+    "m_HideConnector": true,
+    "m_ShaderOutputName": "_PreviewPPU",
+    "m_StageCapability": 3,
+    "m_Value": 100.0,
+    "m_DefaultValue": 100.0,
+    "m_Labels": [],
+    "m_LiteralMode": false
+}
+
 {
     "m_SGVersion": 0,
     "m_Type": "UnityEditor.ShaderGraph.Vector4MaterialSlot",
@@ -3348,6 +3529,7 @@
     "m_DisplayName": "Out",
     "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "Out",
     "m_StageCapability": 3,
     "m_Value": {
@@ -3365,6 +3547,29 @@
     "m_Labels": []
 }
 
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialRangeSlot",
+    "m_ObjectId": "dbc6c2de17db49a99a97fd7bf2a8290f",
+    "m_Id": -2106065226,
+    "m_DisplayName": "Preview Max",
+    "m_SlotType": 0,
+    "m_Hidden": false,
+    "m_HideConnector": true,
+    "m_ShaderOutputName": "_Preview_Max",
+    "m_StageCapability": 3,
+    "m_Value": 1.0,
+    "m_DefaultValue": 1.0,
+    "m_Labels": [],
+    "m_LiteralMode": false,
+    "m_sliderRange": {
+        "x": 0.0,
+        "y": 1.0
+    },
+    "m_SliderType": 0,
+    "m_SliderPower": 3.0
+}
+
 {
     "m_SGVersion": 0,
     "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
@@ -3373,11 +3578,13 @@
     "m_DisplayName": "Edge Min",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "_Edge_Min",
     "m_StageCapability": 3,
     "m_Value": 0.0,
     "m_DefaultValue": 0.0,
-    "m_Labels": []
+    "m_Labels": [],
+    "m_LiteralMode": false
 }
 
 {
@@ -3388,6 +3595,7 @@
     "m_DisplayName": "Predicate",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "Predicate",
     "m_StageCapability": 3,
     "m_Value": false,
@@ -3408,6 +3616,7 @@
     "m_DisplayName": "B",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "B",
     "m_StageCapability": 3,
     "m_Value": {
@@ -3421,7 +3630,8 @@
         "y": 0.0,
         "z": 0.0,
         "w": 0.0
-    }
+    },
+    "m_LiteralMode": false
 }
 
 {
@@ -3432,6 +3642,7 @@
     "m_DisplayName": "Out",
     "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "Out",
     "m_StageCapability": 3,
     "m_Value": {
@@ -3445,7 +3656,8 @@
         "y": 0.0,
         "z": 0.0,
         "w": 0.0
-    }
+    },
+    "m_LiteralMode": false
 }
 
 {
@@ -3456,6 +3668,7 @@
     "m_DisplayName": "Edge",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "Edge",
     "m_StageCapability": 3,
     "m_Value": {
@@ -3469,46 +3682,8 @@
         "y": 0.0,
         "z": 0.0,
         "w": 0.0
-    }
-}
-
-{
-    "m_SGVersion": 0,
-    "m_Type": "UnityEditor.ShaderGraph.RangeBarNode",
-    "m_ObjectId": "e70bb9e6bbbc4b2b854bd4be2611d644",
-    "m_Group": {
-        "m_Id": ""
-    },
-    "m_Name": "RangeBar",
-    "m_DrawState": {
-        "m_Expanded": true,
-        "m_Position": {
-            "serializedVersion": "2",
-            "x": -2773.999755859375,
-            "y": 312.9999694824219,
-            "width": 102.0,
-            "height": 125.0
-        }
     },
-    "m_Slots": [
-        {
-            "m_Id": "2f6f4573698b4ec285a0430a77328fd2"
-        },
-        {
-            "m_Id": "908001d0f95e473aa4e365216bbaad5c"
-        },
-        {
-            "m_Id": "205de5c419e0433db95bcd1e3b922e2f"
-        }
-    ],
-    "synonyms": [],
-    "m_Precision": 0,
-    "m_PreviewExpanded": true,
-    "m_DismissedVersion": 0,
-    "m_PreviewMode": 0,
-    "m_CustomColors": {
-        "m_SerializableColors": []
-    }
+    "m_LiteralMode": false
 }
 
 {
@@ -3523,6 +3698,26 @@
     ]
 }
 
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.StickyNoteData",
+    "m_ObjectId": "ec99a8c4f3bd44a59b0cb6a462a088f7",
+    "m_Title": "RectTransform Size",
+    "m_Content": "This subgraph promotes a hidden \"_RectTransformSize\" Vector4 property and allows changing the preview value with a slider.\n\nUse with the RectTransform Size component from the Samples.\nSize = RectTransform's Size in Canvas space.\nScale Factor = Canvas Scale Factor\nPixel Per Unit = Canvas PPU",
+    "m_TextSize": 0,
+    "m_Theme": 1,
+    "m_Position": {
+        "serializedVersion": "2",
+        "x": -1185.0,
+        "y": 710.0,
+        "width": 312.0,
+        "height": 159.0
+    },
+    "m_Group": {
+        "m_Id": ""
+    }
+}
+
 {
     "m_SGVersion": 0,
     "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
@@ -3531,11 +3726,13 @@
     "m_DisplayName": "SDF",
     "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "SDF",
     "m_StageCapability": 3,
     "m_Value": 0.0,
     "m_DefaultValue": 0.0,
-    "m_Labels": []
+    "m_Labels": [],
+    "m_LiteralMode": false
 }
 
 {
@@ -3546,11 +3743,13 @@
     "m_DisplayName": "Out",
     "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "Out",
     "m_StageCapability": 3,
     "m_Value": 0.0,
     "m_DefaultValue": 0.0,
-    "m_Labels": []
+    "m_Labels": [],
+    "m_LiteralMode": false
 }
 
 {
@@ -3567,6 +3766,7 @@
     "m_DisplayName": "In",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "In",
     "m_StageCapability": 3,
     "m_Value": {
@@ -3580,7 +3780,8 @@
         "y": 0.0,
         "z": 0.0,
         "w": 0.0
-    }
+    },
+    "m_LiteralMode": false
 }
 
 {
@@ -3591,6 +3792,7 @@
     "m_DisplayName": "B",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "B",
     "m_StageCapability": 3,
     "m_Value": {
@@ -3604,6 +3806,30 @@
         "y": 0.0,
         "z": 0.0,
         "w": 0.0
-    }
+    },
+    "m_LiteralMode": false
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialRangeSlot",
+    "m_ObjectId": "fe8392b3ead744aa801f0ef8030e1449",
+    "m_Id": -1949568231,
+    "m_DisplayName": "Preview Min",
+    "m_SlotType": 0,
+    "m_Hidden": false,
+    "m_HideConnector": true,
+    "m_ShaderOutputName": "_Preview_Min",
+    "m_StageCapability": 3,
+    "m_Value": 0.0,
+    "m_DefaultValue": 0.0,
+    "m_Labels": [],
+    "m_LiteralMode": false,
+    "m_sliderRange": {
+        "x": 0.0,
+        "y": 1.0
+    },
+    "m_SliderType": 0,
+    "m_SliderPower": 3.0
 }
 
diff --git a/Packages/com.unity.shadergraph/Samples~/UGUIShaders/Default Materials/Slider Simple Fill.shadergraph b/Packages/com.unity.shadergraph/Samples~/UGUIShaders/Default Materials/Slider Simple Fill.shadergraph
index 11b0dea65d9..3d9ce36bf1b 100644
--- a/Packages/com.unity.shadergraph/Samples~/UGUIShaders/Default Materials/Slider Simple Fill.shadergraph	
+++ b/Packages/com.unity.shadergraph/Samples~/UGUIShaders/Default Materials/Slider Simple Fill.shadergraph	
@@ -54,21 +54,9 @@
         {
             "m_Id": "c6abc3ebea76454fac809456d8ce8986"
         },
-        {
-            "m_Id": "b45b4c175dbf4dd7932559b8e49dfc6a"
-        },
-        {
-            "m_Id": "fe584360b9ef45feabaf51eaf92b8b39"
-        },
-        {
-            "m_Id": "392f8e18e3104a27ad6cd14ce89f85fe"
-        },
         {
             "m_Id": "3aadff3650b7496190262373aabf2390"
         },
-        {
-            "m_Id": "27c2060c70ba42d8adfaef2c96867774"
-        },
         {
             "m_Id": "90622f3847c24868a7c228ad5cabf688"
         },
@@ -97,10 +85,16 @@
             "m_Id": "0e0a0e2e9d4a44dc8d04f66361f89781"
         },
         {
-            "m_Id": "f69ba2775c854388a21de9912ab9df8e"
+            "m_Id": "c75274c1736d48698a1e0930c6a0b9df"
         },
         {
-            "m_Id": "d204f1fd5baf4150b04b69f552ea4162"
+            "m_Id": "6a6b517bbf1947c0a43ba166922aa718"
+        },
+        {
+            "m_Id": "db78cee151c44f409e8b5871491bd0ee"
+        },
+        {
+            "m_Id": "c7f3198329384623bc8b3a9fa1a8384f"
         }
     ],
     "m_GroupDatas": [
@@ -112,23 +106,20 @@
         }
     ],
     "m_StickyNoteDatas": [
-        {
-            "m_Id": "18b103a6c8d049f1add72824e2f4d52a"
-        },
         {
             "m_Id": "3e137ef378ae430598ec6d7381c3d1c3"
         },
         {
-            "m_Id": "3cf6c9caa44f45608ba46f9f5f27402c"
+            "m_Id": "548a8d20a1a34a45b8dc24f84e596333"
         },
         {
-            "m_Id": "548a8d20a1a34a45b8dc24f84e596333"
+            "m_Id": "791698d8fe074d4b8d28d652baa1c192"
         },
         {
-            "m_Id": "0f3aa19c3c444418bb7e3bc9a85b08fb"
+            "m_Id": "3533cb48fdaf4e6a9db818d6fb09723c"
         },
         {
-            "m_Id": "791698d8fe074d4b8d28d652baa1c192"
+            "m_Id": "a585b14294b64e8aa0dd2480a2303cb7"
         }
     ],
     "m_Edges": [
@@ -202,20 +193,6 @@
                 "m_SlotId": 1
             }
         },
-        {
-            "m_OutputSlot": {
-                "m_Node": {
-                    "m_Id": "27c2060c70ba42d8adfaef2c96867774"
-                },
-                "m_SlotId": 1
-            },
-            "m_InputSlot": {
-                "m_Node": {
-                    "m_Id": "90622f3847c24868a7c228ad5cabf688"
-                },
-                "m_SlotId": -1380945929
-            }
-        },
         {
             "m_OutputSlot": {
                 "m_Node": {
@@ -244,20 +221,6 @@
                 "m_SlotId": 0
             }
         },
-        {
-            "m_OutputSlot": {
-                "m_Node": {
-                    "m_Id": "392f8e18e3104a27ad6cd14ce89f85fe"
-                },
-                "m_SlotId": 1
-            },
-            "m_InputSlot": {
-                "m_Node": {
-                    "m_Id": "f69ba2775c854388a21de9912ab9df8e"
-                },
-                "m_SlotId": 0
-            }
-        },
         {
             "m_OutputSlot": {
                 "m_Node": {
@@ -356,6 +319,20 @@
                 "m_SlotId": 0
             }
         },
+        {
+            "m_OutputSlot": {
+                "m_Node": {
+                    "m_Id": "6a6b517bbf1947c0a43ba166922aa718"
+                },
+                "m_SlotId": 1
+            },
+            "m_InputSlot": {
+                "m_Node": {
+                    "m_Id": "db78cee151c44f409e8b5871491bd0ee"
+                },
+                "m_SlotId": 0
+            }
+        },
         {
             "m_OutputSlot": {
                 "m_Node": {
@@ -440,20 +417,6 @@
                 "m_SlotId": -591484606
             }
         },
-        {
-            "m_OutputSlot": {
-                "m_Node": {
-                    "m_Id": "b45b4c175dbf4dd7932559b8e49dfc6a"
-                },
-                "m_SlotId": 0
-            },
-            "m_InputSlot": {
-                "m_Node": {
-                    "m_Id": "1ff2775323a14c418ac415e1a2526504"
-                },
-                "m_SlotId": 1786236159
-            }
-        },
         {
             "m_OutputSlot": {
                 "m_Node": {
@@ -499,55 +462,55 @@
         {
             "m_OutputSlot": {
                 "m_Node": {
-                    "m_Id": "cd997be15ba444f6bc279a0a44ec3659"
+                    "m_Id": "c75274c1736d48698a1e0930c6a0b9df"
                 },
                 "m_SlotId": 1
             },
             "m_InputSlot": {
                 "m_Node": {
-                    "m_Id": "9d26548d7b554d6db9d836d58a434f5e"
+                    "m_Id": "0e0a0e2e9d4a44dc8d04f66361f89781"
                 },
-                "m_SlotId": 1
+                "m_SlotId": 0
             }
         },
         {
             "m_OutputSlot": {
                 "m_Node": {
-                    "m_Id": "d204f1fd5baf4150b04b69f552ea4162"
+                    "m_Id": "c75274c1736d48698a1e0930c6a0b9df"
                 },
-                "m_SlotId": 0
+                "m_SlotId": 2
             },
             "m_InputSlot": {
                 "m_Node": {
-                    "m_Id": "0e0a0e2e9d4a44dc8d04f66361f89781"
+                    "m_Id": "90622f3847c24868a7c228ad5cabf688"
                 },
-                "m_SlotId": 0
+                "m_SlotId": -1380945929
             }
         },
         {
             "m_OutputSlot": {
                 "m_Node": {
-                    "m_Id": "d204f1fd5baf4150b04b69f552ea4162"
+                    "m_Id": "c7f3198329384623bc8b3a9fa1a8384f"
                 },
                 "m_SlotId": 1
             },
             "m_InputSlot": {
                 "m_Node": {
-                    "m_Id": "27c2060c70ba42d8adfaef2c96867774"
+                    "m_Id": "1ff2775323a14c418ac415e1a2526504"
                 },
-                "m_SlotId": -40675165
+                "m_SlotId": 1786236159
             }
         },
         {
             "m_OutputSlot": {
                 "m_Node": {
-                    "m_Id": "f69ba2775c854388a21de9912ab9df8e"
+                    "m_Id": "cd997be15ba444f6bc279a0a44ec3659"
                 },
-                "m_SlotId": 6
+                "m_SlotId": 1
             },
             "m_InputSlot": {
                 "m_Node": {
-                    "m_Id": "3aadff3650b7496190262373aabf2390"
+                    "m_Id": "9d26548d7b554d6db9d836d58a434f5e"
                 },
                 "m_SlotId": 1
             }
@@ -555,15 +518,15 @@
         {
             "m_OutputSlot": {
                 "m_Node": {
-                    "m_Id": "fe584360b9ef45feabaf51eaf92b8b39"
+                    "m_Id": "db78cee151c44f409e8b5871491bd0ee"
                 },
-                "m_SlotId": 0
+                "m_SlotId": 2
             },
             "m_InputSlot": {
                 "m_Node": {
-                    "m_Id": "392f8e18e3104a27ad6cd14ce89f85fe"
+                    "m_Id": "3aadff3650b7496190262373aabf2390"
                 },
-                "m_SlotId": 830530724
+                "m_SlotId": 1
             }
         }
     ],
@@ -623,6 +586,7 @@
     "m_DisplayName": "",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "",
     "m_StageCapability": 3,
     "m_Value": {
@@ -636,7 +600,8 @@
         "y": 0.0,
         "z": 0.0,
         "w": 0.0
-    }
+    },
+    "m_LiteralMode": false
 }
 
 {
@@ -645,8 +610,8 @@
     "m_ObjectId": "004020dba81941109ce6b0c19f882aeb",
     "m_Title": "Min/Max",
     "m_Position": {
-        "x": -1435.0001220703125,
-        "y": 254.99986267089845
+        "x": -1435.0,
+        "y": 255.0
     }
 }
 
@@ -664,6 +629,7 @@
     "m_DisplayName": "In",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "In",
     "m_StageCapability": 3,
     "m_Value": {
@@ -677,7 +643,8 @@
         "y": 0.0,
         "z": 0.0,
         "w": 0.0
-    }
+    },
+    "m_LiteralMode": false
 }
 
 {
@@ -688,6 +655,7 @@
     "m_DisplayName": "LeftToRight",
     "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "LeftToRight",
     "m_StageCapability": 3,
     "m_Value": false,
@@ -736,6 +704,7 @@
     "m_DisplayName": "",
     "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "",
     "m_StageCapability": 3,
     "m_Value": {
@@ -749,22 +718,25 @@
         "y": 0.0,
         "z": 0.0,
         "w": 0.0
-    }
+    },
+    "m_LiteralMode": false
 }
 
 {
     "m_SGVersion": 0,
     "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
-    "m_ObjectId": "0c2fb0f5cee0484da3ddb0b89e0ed8a3",
-    "m_Id": 0,
-    "m_DisplayName": "State",
-    "m_SlotType": 1,
+    "m_ObjectId": "0a036ef2a691434f9236287f9fa488f9",
+    "m_Id": -181240572,
+    "m_DisplayName": "PreviewWidth",
+    "m_SlotType": 0,
     "m_Hidden": false,
-    "m_ShaderOutputName": "_State",
+    "m_HideConnector": true,
+    "m_ShaderOutputName": "_PreviewWidth",
     "m_StageCapability": 3,
-    "m_Value": 0.0,
-    "m_DefaultValue": 0.0,
-    "m_Labels": []
+    "m_Value": 100.0,
+    "m_DefaultValue": 100.0,
+    "m_Labels": [],
+    "m_LiteralMode": false
 }
 
 {
@@ -775,11 +747,13 @@
     "m_DisplayName": "Stroke",
     "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "Stroke",
     "m_StageCapability": 3,
     "m_Value": 0.0,
     "m_DefaultValue": 0.0,
-    "m_Labels": []
+    "m_Labels": [],
+    "m_LiteralMode": false
 }
 
 {
@@ -790,6 +764,7 @@
     "m_DisplayName": "Width Height",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "_Width_Height",
     "m_StageCapability": 3,
     "m_Value": {
@@ -839,26 +814,6 @@
     }
 }
 
-{
-    "m_SGVersion": 0,
-    "m_Type": "UnityEditor.ShaderGraph.StickyNoteData",
-    "m_ObjectId": "0f3aa19c3c444418bb7e3bc9a85b08fb",
-    "m_Title": "RectTransform Size",
-    "m_Content": "A custom Node automatically adding a hidden local Vector2 \"_RectTransformSize\" property to the Material, even when in a Subgraph, and providing its value.\nUse with the ImageSize component from the Samples.\nSize = RectTransform's Size in Canvas space.",
-    "m_TextSize": 0,
-    "m_Theme": 1,
-    "m_Position": {
-        "serializedVersion": "2",
-        "x": -930.0,
-        "y": 787.0,
-        "width": 260.0,
-        "height": 134.0
-    },
-    "m_Group": {
-        "m_Id": ""
-    }
-}
-
 {
     "m_SGVersion": 0,
     "m_Type": "UnityEditor.ShaderGraph.MinimumNode",
@@ -946,6 +901,7 @@
     "m_DisplayName": "Out",
     "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "Out",
     "m_StageCapability": 3,
     "m_Value": {
@@ -959,7 +915,56 @@
         "y": 0.0,
         "z": 0.0,
         "w": 0.0
-    }
+    },
+    "m_LiteralMode": false
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.Vector2MaterialSlot",
+    "m_ObjectId": "1305292832e44ba3820e8c17b1169eed",
+    "m_Id": 2,
+    "m_DisplayName": "Direction",
+    "m_SlotType": 1,
+    "m_Hidden": false,
+    "m_HideConnector": false,
+    "m_ShaderOutputName": "Direction",
+    "m_StageCapability": 3,
+    "m_Value": {
+        "x": 0.0,
+        "y": 0.0
+    },
+    "m_DefaultValue": {
+        "x": 0.0,
+        "y": 0.0
+    },
+    "m_Labels": []
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot",
+    "m_ObjectId": "13ba548308624159b0563ba4e8a0fa20",
+    "m_Id": 4,
+    "m_DisplayName": "B",
+    "m_SlotType": 0,
+    "m_Hidden": false,
+    "m_HideConnector": false,
+    "m_ShaderOutputName": "case_B",
+    "m_StageCapability": 3,
+    "m_Value": {
+        "x": 1.5,
+        "y": 0.0,
+        "z": 0.0,
+        "w": 0.0
+    },
+    "m_DefaultValue": {
+        "x": 0.0,
+        "y": 0.0,
+        "z": 0.0,
+        "w": 0.0
+    },
+    "m_LiteralMode": false
 }
 
 {
@@ -970,6 +975,7 @@
     "m_DisplayName": "A",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "A",
     "m_StageCapability": 3,
     "m_Value": {
@@ -983,7 +989,8 @@
         "y": 0.0,
         "z": 0.0,
         "w": 0.0
-    }
+    },
+    "m_LiteralMode": false
 }
 
 {
@@ -994,6 +1001,7 @@
     "m_DisplayName": "Corner Radii",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "_Corner_Radii",
     "m_StageCapability": 3,
     "m_Value": {
@@ -1011,26 +1019,6 @@
     "m_Labels": []
 }
 
-{
-    "m_SGVersion": 0,
-    "m_Type": "UnityEditor.ShaderGraph.StickyNoteData",
-    "m_ObjectId": "18b103a6c8d049f1add72824e2f4d52a",
-    "m_Title": "ShaderGraph Preview",
-    "m_Content": "These Subgraphs use a Dropdown and a Custom Function Node to feature a preview of the different outputs while working in the Graph.\nThe final output will always be set to the Input.",
-    "m_TextSize": 0,
-    "m_Theme": 1,
-    "m_Position": {
-        "serializedVersion": "2",
-        "x": -2586.0,
-        "y": 215.0,
-        "width": 303.0,
-        "height": 103.4537353515625
-    },
-    "m_Group": {
-        "m_Id": ""
-    }
-}
-
 {
     "m_SGVersion": 0,
     "m_Type": "UnityEditor.ShaderGraph.StepNode",
@@ -1176,6 +1164,7 @@
     "m_DisplayName": "False",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "False",
     "m_StageCapability": 3,
     "m_Value": {
@@ -1189,37 +1178,31 @@
         "y": 0.0,
         "z": 0.0,
         "w": 0.0
-    }
+    },
+    "m_LiteralMode": false
 }
 
 {
     "m_SGVersion": 0,
-    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasSubTarget",
-    "m_ObjectId": "25c741b9de09410c86e1325014b26dfc"
+    "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
+    "m_ObjectId": "245c64d051ff448fa98e8c4a664b26a3",
+    "m_Id": 1,
+    "m_DisplayName": "Value",
+    "m_SlotType": 1,
+    "m_Hidden": false,
+    "m_HideConnector": false,
+    "m_ShaderOutputName": "Value",
+    "m_StageCapability": 3,
+    "m_Value": 0.0,
+    "m_DefaultValue": 0.0,
+    "m_Labels": [],
+    "m_LiteralMode": false
 }
 
 {
     "m_SGVersion": 0,
-    "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot",
-    "m_ObjectId": "2601cf9acda44a229b2a0479801d16b7",
-    "m_Id": 0,
-    "m_DisplayName": "In",
-    "m_SlotType": 0,
-    "m_Hidden": false,
-    "m_ShaderOutputName": "In",
-    "m_StageCapability": 3,
-    "m_Value": {
-        "x": 0.0,
-        "y": 0.0,
-        "z": 0.0,
-        "w": 0.0
-    },
-    "m_DefaultValue": {
-        "x": 0.0,
-        "y": 0.0,
-        "z": 0.0,
-        "w": 0.0
-    }
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasSubTarget",
+    "m_ObjectId": "25c741b9de09410c86e1325014b26dfc"
 }
 
 {
@@ -1230,60 +1213,13 @@
     "m_DisplayName": "Out",
     "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "Out",
     "m_StageCapability": 3,
     "m_Value": 0.0,
     "m_DefaultValue": 0.0,
-    "m_Labels": []
-}
-
-{
-    "m_SGVersion": 0,
-    "m_Type": "UnityEditor.ShaderGraph.SubGraphNode",
-    "m_ObjectId": "27c2060c70ba42d8adfaef2c96867774",
-    "m_Group": {
-        "m_Id": "527a815ddcab4c06a3eabac9f496b04b"
-    },
-    "m_Name": "Slider Direction Preview",
-    "m_DrawState": {
-        "m_Expanded": true,
-        "m_Position": {
-            "serializedVersion": "2",
-            "x": -2578.000244140625,
-            "y": 684.0000610351563,
-            "width": 284.000244140625,
-            "height": 115.0
-        }
-    },
-    "m_Slots": [
-        {
-            "m_Id": "844d0c4689e54292bd5d9fee72cdc044"
-        },
-        {
-            "m_Id": "c9a58ed120cf49b0891e7afe74f2e942"
-        }
-    ],
-    "synonyms": [],
-    "m_Precision": 0,
-    "m_PreviewExpanded": false,
-    "m_DismissedVersion": 0,
-    "m_PreviewMode": 0,
-    "m_CustomColors": {
-        "m_SerializableColors": []
-    },
-    "m_SerializedSubGraph": "{\n    \"subGraph\": {\n        \"fileID\": -5475051401550479605,\n        \"guid\": \"b7b97b929f84d4c42ae877064f6d694a\",\n        \"type\": 3\n    }\n}",
-    "m_PropertyGuids": [
-        "68cd7b82-08a0-457e-b8a5-138b398e335b"
-    ],
-    "m_PropertyIds": [
-        -40675165
-    ],
-    "m_Dropdowns": [
-        "_Preview"
-    ],
-    "m_DropdownSelectedEntries": [
-        "Left To Right"
-    ]
+    "m_Labels": [],
+    "m_LiteralMode": false
 }
 
 {
@@ -1317,6 +1253,7 @@
     "m_CastShadows": true,
     "m_ReceiveShadows": true,
     "m_DisableTint": false,
+    "m_Sort3DAs2DCompatible": false,
     "m_AdditionalMotionVectorMode": 0,
     "m_AlembicMotionVectors": false,
     "m_SupportsLODCrossFade": false,
@@ -1370,6 +1307,7 @@
     "m_DisplayName": "",
     "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "",
     "m_StageCapability": 3,
     "m_Value": {
@@ -1383,7 +1321,8 @@
         "y": 0.0,
         "z": 0.0,
         "w": 0.0
-    }
+    },
+    "m_LiteralMode": false
 }
 
 {
@@ -1394,11 +1333,13 @@
     "m_DisplayName": "Radius",
     "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "Out",
     "m_StageCapability": 3,
     "m_Value": 0.0,
     "m_DefaultValue": 0.0,
-    "m_Labels": []
+    "m_Labels": [],
+    "m_LiteralMode": false
 }
 
 {
@@ -1409,6 +1350,7 @@
     "m_DisplayName": "Edge",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "Edge",
     "m_StageCapability": 3,
     "m_Value": {
@@ -1422,7 +1364,8 @@
         "y": 0.0,
         "z": 0.0,
         "w": 0.0
-    }
+    },
+    "m_LiteralMode": false
 }
 
 {
@@ -1433,11 +1376,13 @@
     "m_DisplayName": "SDFStroke",
     "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "SDFStroke",
     "m_StageCapability": 3,
     "m_Value": 0.0,
     "m_DefaultValue": 0.0,
-    "m_Labels": []
+    "m_Labels": [],
+    "m_LiteralMode": false
 }
 
 {
@@ -1448,6 +1393,7 @@
     "m_DisplayName": "Out",
     "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "Out",
     "m_StageCapability": 3,
     "m_Value": {
@@ -1461,56 +1407,68 @@
         "y": 0.0,
         "z": 0.0,
         "w": 0.0
-    }
+    },
+    "m_LiteralMode": false
 }
 
 {
     "m_SGVersion": 0,
-    "m_Type": "UnityEditor.ShaderGraph.SubGraphNode",
-    "m_ObjectId": "392f8e18e3104a27ad6cd14ce89f85fe",
-    "m_Group": {
-        "m_Id": ""
-    },
-    "m_Name": "Selectable State Preview",
-    "m_DrawState": {
-        "m_Expanded": true,
-        "m_Position": {
-            "serializedVersion": "2",
-            "x": -2578.000244140625,
-            "y": 90.00003051757813,
-            "width": 284.000244140625,
-            "height": 115.00001525878906
-        }
+    "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialRangeSlot",
+    "m_ObjectId": "350ef6ef26694436bdb2df5a75ba3110",
+    "m_Id": -1691137862,
+    "m_DisplayName": "Preview Value",
+    "m_SlotType": 0,
+    "m_Hidden": false,
+    "m_HideConnector": true,
+    "m_ShaderOutputName": "_Preview_Value",
+    "m_StageCapability": 3,
+    "m_Value": 0.4690000116825104,
+    "m_DefaultValue": 0.5,
+    "m_Labels": [],
+    "m_LiteralMode": false,
+    "m_sliderRange": {
+        "x": 0.0,
+        "y": 1.0
     },
-    "m_Slots": [
-        {
-            "m_Id": "7dfe9b8141a141d1ad9ed3e1ef16c7a2"
-        },
-        {
-            "m_Id": "9ffd04b0d2fb4021a5d64f7a79abfb4e"
-        }
-    ],
-    "synonyms": [],
-    "m_Precision": 0,
-    "m_PreviewExpanded": false,
-    "m_DismissedVersion": 0,
-    "m_PreviewMode": 0,
-    "m_CustomColors": {
-        "m_SerializableColors": []
+    "m_SliderType": 0,
+    "m_SliderPower": 3.0
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.StickyNoteData",
+    "m_ObjectId": "3533cb48fdaf4e6a9db818d6fb09723c",
+    "m_Title": "RectTransform Size",
+    "m_Content": "This subgraph promotes a hidden \"_RectTransformSize\" Vector4 property and allows changing the preview value with a slider.\n\nUse with the RectTransform Size component from the Samples.\nSize = RectTransform's Size in Canvas space.\nScale Factor = Canvas Scale Factor\nPixel Per Unit = Canvas PPU",
+    "m_TextSize": 0,
+    "m_Theme": 1,
+    "m_Position": {
+        "serializedVersion": "2",
+        "x": -1223.0,
+        "y": 711.0,
+        "width": 312.0,
+        "height": 159.0
     },
-    "m_SerializedSubGraph": "{\n    \"subGraph\": {\n        \"fileID\": -5475051401550479605,\n        \"guid\": \"b278edaff18e35342890339c5f0d2945\",\n        \"type\": 3\n    }\n}",
-    "m_PropertyGuids": [
-        "9c4cb347-e674-4393-bb26-07702c97589e"
-    ],
-    "m_PropertyIds": [
-        830530724
-    ],
-    "m_Dropdowns": [
-        "_Preview"
-    ],
-    "m_DropdownSelectedEntries": [
-        "Normal"
-    ]
+    "m_Group": {
+        "m_Id": ""
+    }
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
+    "m_ObjectId": "371bd2477b2549418ffe99ef1865d1f5",
+    "m_Id": 0,
+    "m_DisplayName": "In",
+    "m_SlotType": 0,
+    "m_Hidden": false,
+    "m_HideConnector": false,
+    "m_ShaderOutputName": "In",
+    "m_StageCapability": 3,
+    "m_Value": 0.0,
+    "m_DefaultValue": 0.0,
+    "m_Labels": [],
+    "m_LiteralMode": false
 }
 
 {
@@ -1563,30 +1521,6 @@
     }
 }
 
-{
-    "m_SGVersion": 0,
-    "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot",
-    "m_ObjectId": "3aefd6ade9b2497c935173b9f1286de6",
-    "m_Id": 3,
-    "m_DisplayName": "Pressed",
-    "m_SlotType": 0,
-    "m_Hidden": false,
-    "m_ShaderOutputName": "Pressed",
-    "m_StageCapability": 3,
-    "m_Value": {
-        "x": 1.5,
-        "y": 0.0,
-        "z": 0.0,
-        "w": 0.0
-    },
-    "m_DefaultValue": {
-        "x": 0.0,
-        "y": 0.0,
-        "z": 0.0,
-        "w": 0.0
-    }
-}
-
 {
     "m_SGVersion": 0,
     "m_Type": "UnityEditor.ShaderGraph.RedirectNodeData",
@@ -1623,40 +1557,20 @@
     }
 }
 
-{
-    "m_SGVersion": 0,
-    "m_Type": "UnityEditor.ShaderGraph.StickyNoteData",
-    "m_ObjectId": "3cf6c9caa44f45608ba46f9f5f27402c",
-    "m_Title": "Slider Value",
-    "m_Content": "A custom Node automatically adding a hidden local Vector4 \"_SliderValue\" property to the Material, even when in a Subgraph, and providing its value.\nUse with one of the Sample Components, like ProgressBar, Slider.\nx = Slider Normalized Min Value\ny = Slider Normalized Max Value\nzw = Slider Direction",
-    "m_TextSize": 0,
-    "m_Theme": 1,
-    "m_Position": {
-        "serializedVersion": "2",
-        "x": -3086.0,
-        "y": 313.0,
-        "width": 303.0,
-        "height": 145.13742065429688
-    },
-    "m_Group": {
-        "m_Id": ""
-    }
-}
-
 {
     "m_SGVersion": 0,
     "m_Type": "UnityEditor.ShaderGraph.StickyNoteData",
     "m_ObjectId": "3e137ef378ae430598ec6d7381c3d1c3",
     "m_Title": "Selectable State",
-    "m_Content": "A custom Node automatically adding a hidden local float \"_State\" property to the Material, even when in a Subgraph, and providing its value.\nUse with one of the Sample Components, like Button, Toggle, Slider.\n0 = Normal\n1 = Highlighted\n2 = Pressed\n3 = Selected\n4 = Disabled",
+    "m_Content": "This subgraph promotes a hidden \"_State\" float property and allows changing the preview value with a dropdown.\n\nUse with one of the Sample Components, like Button, Toggle, Slider.\n0 = Normal\n1 = Highlighted\n2 = Pressed\n3 = Selected\n4 = Disabled",
     "m_TextSize": 0,
     "m_Theme": 1,
     "m_Position": {
         "serializedVersion": "2",
-        "x": -3087.0,
-        "y": 92.0,
+        "x": -2882.0,
+        "y": 87.0,
         "width": 303.0,
-        "height": 154.0
+        "height": 189.0
     },
     "m_Group": {
         "m_Id": ""
@@ -1665,26 +1579,19 @@
 
 {
     "m_SGVersion": 0,
-    "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot",
-    "m_ObjectId": "40aaca1e9cba44fdb16ee70318034555",
-    "m_Id": 1,
-    "m_DisplayName": "Normal",
+    "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
+    "m_ObjectId": "47b2362a8b4c452f8545850c6d6f27ac",
+    "m_Id": -2106065226,
+    "m_DisplayName": "PreviewPPU",
     "m_SlotType": 0,
     "m_Hidden": false,
-    "m_ShaderOutputName": "Normal",
+    "m_HideConnector": true,
+    "m_ShaderOutputName": "_PreviewPPU",
     "m_StageCapability": 3,
-    "m_Value": {
-        "x": 1.0,
-        "y": 1.0,
-        "z": 1.0,
-        "w": 1.0
-    },
-    "m_DefaultValue": {
-        "x": 0.0,
-        "y": 0.0,
-        "z": 0.0,
-        "w": 0.0
-    }
+    "m_Value": 100.0,
+    "m_DefaultValue": 100.0,
+    "m_Labels": [],
+    "m_LiteralMode": false
 }
 
 {
@@ -1733,14 +1640,40 @@
     }
 }
 
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot",
+    "m_ObjectId": "52157c5ba8ff4ab985da5623c66af39e",
+    "m_Id": 1,
+    "m_DisplayName": "Fallback",
+    "m_SlotType": 0,
+    "m_Hidden": false,
+    "m_HideConnector": false,
+    "m_ShaderOutputName": "Fallback",
+    "m_StageCapability": 3,
+    "m_Value": {
+        "x": 1.0,
+        "y": 0.0,
+        "z": 0.0,
+        "w": 0.0
+    },
+    "m_DefaultValue": {
+        "x": 0.0,
+        "y": 0.0,
+        "z": 0.0,
+        "w": 0.0
+    },
+    "m_LiteralMode": false
+}
+
 {
     "m_SGVersion": 0,
     "m_Type": "UnityEditor.ShaderGraph.GroupData",
     "m_ObjectId": "527a815ddcab4c06a3eabac9f496b04b",
     "m_Title": "Direction",
     "m_Position": {
-        "x": -2603.0,
-        "y": 625.0
+        "x": -2318.999755859375,
+        "y": 624.999755859375
     }
 }
 
@@ -1749,15 +1682,15 @@
     "m_Type": "UnityEditor.ShaderGraph.StickyNoteData",
     "m_ObjectId": "548a8d20a1a34a45b8dc24f84e596333",
     "m_Title": "Selectable State Switch",
-    "m_Content": "A custom Node to branch based on a Selectable State.\nMade as a custom Node for the benefit of polymorphic inputs.",
+    "m_Content": "This uses a Switch Node to set different values based on the Selectable State.",
     "m_TextSize": 0,
     "m_Theme": 1,
     "m_Position": {
         "serializedVersion": "2",
-        "x": -2171.0,
-        "y": -64.0,
-        "width": 170.0,
-        "height": 136.5537567138672
+        "x": -2251.0,
+        "y": -20.0,
+        "width": 248.0,
+        "height": 100.0
     },
     "m_Group": {
         "m_Id": ""
@@ -1772,6 +1705,7 @@
     "m_DisplayName": "A",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "A",
     "m_StageCapability": 3,
     "m_Value": {
@@ -1785,7 +1719,8 @@
         "y": 0.0,
         "z": 0.0,
         "w": 0.0
-    }
+    },
+    "m_LiteralMode": false
 }
 
 {
@@ -1796,11 +1731,13 @@
     "m_DisplayName": "Fill",
     "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "Fill",
     "m_StageCapability": 3,
     "m_Value": 0.0,
     "m_DefaultValue": 0.0,
-    "m_Labels": []
+    "m_Labels": [],
+    "m_LiteralMode": false
 }
 
 {
@@ -1922,17 +1859,44 @@
 
 {
     "m_SGVersion": 0,
-    "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
-    "m_ObjectId": "603c4f281eaf432394f1789cc6f49347",
-    "m_Id": 0,
-    "m_DisplayName": "Value",
-    "m_SlotType": 1,
-    "m_Hidden": false,
-    "m_ShaderOutputName": "_Value",
-    "m_StageCapability": 3,
-    "m_Value": 0.0,
-    "m_DefaultValue": 0.0,
-    "m_Labels": []
+    "m_Type": "UnityEditor.ShaderGraph.SubGraphNode",
+    "m_ObjectId": "6a6b517bbf1947c0a43ba166922aa718",
+    "m_Group": {
+        "m_Id": ""
+    },
+    "m_Name": "Selectable State",
+    "m_DrawState": {
+        "m_Expanded": true,
+        "m_Position": {
+            "serializedVersion": "2",
+            "x": -2578.0,
+            "y": 83.0,
+            "width": 256.0,
+            "height": 123.0
+        }
+    },
+    "m_Slots": [
+        {
+            "m_Id": "a9061cd60606418e8d1cca7281f512eb"
+        }
+    ],
+    "synonyms": [],
+    "m_Precision": 0,
+    "m_PreviewExpanded": false,
+    "m_DismissedVersion": 0,
+    "m_PreviewMode": 0,
+    "m_CustomColors": {
+        "m_SerializableColors": []
+    },
+    "m_SerializedSubGraph": "{\n    \"subGraph\": {\n        \"fileID\": -5475051401550479605,\n        \"guid\": \"9cc8eedec3988455885bdb12866a33d6\",\n        \"type\": 3\n    }\n}",
+    "m_PropertyGuids": [],
+    "m_PropertyIds": [],
+    "m_Dropdowns": [
+        "_Preview"
+    ],
+    "m_DropdownSelectedEntries": [
+        "Normal"
+    ]
 }
 
 {
@@ -1950,6 +1914,7 @@
     "m_DisplayName": "Slider Direction",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "_Slider_Direction",
     "m_StageCapability": 3,
     "m_Value": {
@@ -1966,15 +1931,16 @@
 {
     "m_SGVersion": 0,
     "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot",
-    "m_ObjectId": "717f0b548eaf4173bdfa6fde3d4cf69c",
-    "m_Id": 2,
-    "m_DisplayName": "Highlighted",
+    "m_ObjectId": "73046a2faef34c018088eb9fff353b62",
+    "m_Id": 7,
+    "m_DisplayName": "E",
     "m_SlotType": 0,
     "m_Hidden": false,
-    "m_ShaderOutputName": "Highlighted",
+    "m_HideConnector": false,
+    "m_ShaderOutputName": "case_E",
     "m_StageCapability": 3,
     "m_Value": {
-        "x": 1.5,
+        "x": 0.20000000298023225,
         "y": 0.0,
         "z": 0.0,
         "w": 0.0
@@ -1984,7 +1950,8 @@
         "y": 0.0,
         "z": 0.0,
         "w": 0.0
-    }
+    },
+    "m_LiteralMode": false
 }
 
 {
@@ -2029,6 +1996,7 @@
     "m_DisplayName": "Out",
     "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "Out",
     "m_StageCapability": 3,
     "m_Value": {
@@ -2042,7 +2010,8 @@
         "y": 0.0,
         "z": 0.0,
         "w": 0.0
-    }
+    },
+    "m_LiteralMode": false
 }
 
 {
@@ -2053,11 +2022,13 @@
     "m_DisplayName": "Out",
     "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "Out",
     "m_StageCapability": 3,
     "m_Value": 0.0,
     "m_DefaultValue": 0.0,
-    "m_Labels": []
+    "m_Labels": [],
+    "m_LiteralMode": true
 }
 
 {
@@ -2080,6 +2051,23 @@
     }
 }
 
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
+    "m_ObjectId": "79f60cd0487c4499b4ae5461c3b820d4",
+    "m_Id": 3,
+    "m_DisplayName": "Pixel_Per_Unit",
+    "m_SlotType": 1,
+    "m_Hidden": false,
+    "m_HideConnector": false,
+    "m_ShaderOutputName": "Pixel_Per_Unit",
+    "m_StageCapability": 3,
+    "m_Value": 0.0,
+    "m_DefaultValue": 0.0,
+    "m_Labels": [],
+    "m_LiteralMode": false
+}
+
 {
     "m_SGVersion": 0,
     "m_Type": "UnityEditor.ShaderGraph.BranchNode",
@@ -2134,6 +2122,7 @@
     "m_DisplayName": "In",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "In",
     "m_StageCapability": 3,
     "m_Value": {
@@ -2147,22 +2136,34 @@
         "y": 0.0,
         "z": 0.0,
         "w": 0.0
-    }
+    },
+    "m_LiteralMode": false
 }
 
 {
     "m_SGVersion": 0,
-    "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
-    "m_ObjectId": "7dfe9b8141a141d1ad9ed3e1ef16c7a2",
-    "m_Id": 830530724,
-    "m_DisplayName": "State",
+    "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot",
+    "m_ObjectId": "7e0f164b4a804fae90d6a0038e00b8b2",
+    "m_Id": 6,
+    "m_DisplayName": "D",
     "m_SlotType": 0,
     "m_Hidden": false,
-    "m_ShaderOutputName": "_State",
+    "m_HideConnector": false,
+    "m_ShaderOutputName": "case_D",
     "m_StageCapability": 3,
-    "m_Value": 0.0,
-    "m_DefaultValue": 0.0,
-    "m_Labels": []
+    "m_Value": {
+        "x": 1.5,
+        "y": 0.0,
+        "z": 0.0,
+        "w": 0.0
+    },
+    "m_DefaultValue": {
+        "x": 0.0,
+        "y": 0.0,
+        "z": 0.0,
+        "w": 0.0
+    },
+    "m_LiteralMode": false
 }
 
 {
@@ -2173,6 +2174,7 @@
     "m_DisplayName": "Out",
     "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "Out",
     "m_StageCapability": 3,
     "m_Value": {
@@ -2192,47 +2194,19 @@
 
 {
     "m_SGVersion": 0,
-    "m_Type": "UnityEditor.ShaderGraph.Vector2MaterialSlot",
-    "m_ObjectId": "844d0c4689e54292bd5d9fee72cdc044",
-    "m_Id": -40675165,
-    "m_DisplayName": "Slider Direction",
+    "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
+    "m_ObjectId": "84df5d9c2c30461593a2dc276df8e421",
+    "m_Id": 716604351,
+    "m_DisplayName": "PreviewHeight",
     "m_SlotType": 0,
     "m_Hidden": false,
-    "m_ShaderOutputName": "_Slider_Direction",
+    "m_HideConnector": true,
+    "m_ShaderOutputName": "_PreviewHeight",
     "m_StageCapability": 3,
-    "m_Value": {
-        "x": 1.0,
-        "y": 0.0
-    },
-    "m_DefaultValue": {
-        "x": 0.0,
-        "y": 0.0
-    },
-    "m_Labels": []
-}
-
-{
-    "m_SGVersion": 0,
-    "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot",
-    "m_ObjectId": "8645b35aea954a51b9ea050618140739",
-    "m_Id": 4,
-    "m_DisplayName": "Selected",
-    "m_SlotType": 0,
-    "m_Hidden": false,
-    "m_ShaderOutputName": "Selected",
-    "m_StageCapability": 3,
-    "m_Value": {
-        "x": 1.5,
-        "y": 0.0,
-        "z": 0.0,
-        "w": 0.0
-    },
-    "m_DefaultValue": {
-        "x": 0.0,
-        "y": 0.0,
-        "z": 0.0,
-        "w": 0.0
-    }
+    "m_Value": 100.0,
+    "m_DefaultValue": 100.0,
+    "m_Labels": [],
+    "m_LiteralMode": false
 }
 
 {
@@ -2243,6 +2217,7 @@
     "m_DisplayName": "Vertical",
     "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "Vertical",
     "m_StageCapability": 3,
     "m_Value": false,
@@ -2257,32 +2232,13 @@
     "m_DisplayName": "Stroke Thickness",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "_Stroke_Thickness",
     "m_StageCapability": 3,
     "m_Value": 0.10000000149011612,
-    "m_DefaultValue": 0.0,
-    "m_Labels": []
-}
-
-{
-    "m_SGVersion": 0,
-    "m_Type": "UnityEditor.ShaderGraph.Vector2MaterialSlot",
-    "m_ObjectId": "8e0575d444f840e1b20424f825941848",
-    "m_Id": 0,
-    "m_DisplayName": "Size",
-    "m_SlotType": 1,
-    "m_Hidden": false,
-    "m_ShaderOutputName": "_RectTransformSize",
-    "m_StageCapability": 3,
-    "m_Value": {
-        "x": 1.0,
-        "y": 1.0
-    },
-    "m_DefaultValue": {
-        "x": 1.0,
-        "y": 1.0
-    },
-    "m_Labels": []
+    "m_DefaultValue": 0.10000000149011612,
+    "m_Labels": [],
+    "m_LiteralMode": false
 }
 
 {
@@ -2359,6 +2315,7 @@
     "m_DisplayName": "A",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "A",
     "m_StageCapability": 3,
     "m_Value": {
@@ -2372,7 +2329,8 @@
         "y": 0.0,
         "z": 0.0,
         "w": 0.0
-    }
+    },
+    "m_LiteralMode": false
 }
 
 {
@@ -2383,6 +2341,7 @@
     "m_DisplayName": "UV",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "_UV",
     "m_StageCapability": 3,
     "m_Value": {
@@ -2404,11 +2363,13 @@
     "m_DisplayName": "X",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "X",
     "m_StageCapability": 3,
     "m_Value": 0.20000000298023225,
     "m_DefaultValue": 0.0,
-    "m_Labels": []
+    "m_Labels": [],
+    "m_LiteralMode": false
 }
 
 {
@@ -2419,6 +2380,7 @@
     "m_DisplayName": "Out",
     "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "Out",
     "m_StageCapability": 3,
     "m_Value": {
@@ -2432,31 +2394,8 @@
         "y": 0.0,
         "z": 0.0,
         "w": 0.0
-    }
-}
-
-{
-    "m_SGVersion": 0,
-    "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot",
-    "m_ObjectId": "96004e2627d34b85911f97b12b2ea9c7",
-    "m_Id": 6,
-    "m_DisplayName": "Out",
-    "m_SlotType": 1,
-    "m_Hidden": false,
-    "m_ShaderOutputName": "Out",
-    "m_StageCapability": 3,
-    "m_Value": {
-        "x": 0.0,
-        "y": 0.0,
-        "z": 0.0,
-        "w": 0.0
     },
-    "m_DefaultValue": {
-        "x": 0.0,
-        "y": 0.0,
-        "z": 0.0,
-        "w": 0.0
-    }
+    "m_LiteralMode": false
 }
 
 {
@@ -2467,6 +2406,7 @@
     "m_DisplayName": "",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "",
     "m_StageCapability": 3,
     "m_Value": {
@@ -2480,7 +2420,8 @@
         "y": 0.0,
         "z": 0.0,
         "w": 0.0
-    }
+    },
+    "m_LiteralMode": false
 }
 
 {
@@ -2491,6 +2432,7 @@
     "m_DisplayName": "False",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "False",
     "m_StageCapability": 3,
     "m_Value": {
@@ -2504,7 +2446,8 @@
         "y": 0.0,
         "z": 0.0,
         "w": 0.0
-    }
+    },
+    "m_LiteralMode": false
 }
 
 {
@@ -2549,6 +2492,7 @@
     "m_DisplayName": "BottomToTop",
     "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "BottomToTop",
     "m_StageCapability": 3,
     "m_Value": false,
@@ -2601,21 +2545,6 @@
     }
 }
 
-{
-    "m_SGVersion": 0,
-    "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
-    "m_ObjectId": "9ffd04b0d2fb4021a5d64f7a79abfb4e",
-    "m_Id": 1,
-    "m_DisplayName": "State",
-    "m_SlotType": 1,
-    "m_Hidden": false,
-    "m_ShaderOutputName": "State",
-    "m_StageCapability": 3,
-    "m_Value": 0.0,
-    "m_DefaultValue": 0.0,
-    "m_Labels": []
-}
-
 {
     "m_SGVersion": 0,
     "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot",
@@ -2624,6 +2553,7 @@
     "m_DisplayName": "Out",
     "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "Out",
     "m_StageCapability": 3,
     "m_Value": {
@@ -2637,6 +2567,27 @@
         "y": 0.0,
         "z": 0.0,
         "w": 0.0
+    },
+    "m_LiteralMode": false
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.StickyNoteData",
+    "m_ObjectId": "a585b14294b64e8aa0dd2480a2303cb7",
+    "m_Title": "Slider Value",
+    "m_Content": "This subgraph promotes a hidden \"_SliderValue\" Vector3 property and allows changing the preview value with sliders and a dropdown.\n\nUse with one of the Sample Components, like ProgressBar, Slider.\n\nValue = Slider Normalized Min Value\nDirection = RangeBar Normalized Direction Vector",
+    "m_TextSize": 0,
+    "m_Theme": 1,
+    "m_Position": {
+        "serializedVersion": "2",
+        "x": -3167.0,
+        "y": 649.0,
+        "width": 290.0,
+        "height": 195.0
+    },
+    "m_Group": {
+        "m_Id": ""
     }
 }
 
@@ -2648,6 +2599,7 @@
     "m_DisplayName": "Emission",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "Emission",
     "m_StageCapability": 2,
     "m_Value": {
@@ -2678,6 +2630,7 @@
     "m_DisplayName": "True",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "True",
     "m_StageCapability": 3,
     "m_Value": {
@@ -2691,7 +2644,8 @@
         "y": 0.0,
         "z": 0.0,
         "w": 0.0
-    }
+    },
+    "m_LiteralMode": false
 }
 
 {
@@ -2702,6 +2656,7 @@
     "m_DisplayName": "TopToBottom",
     "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "TopToBottom",
     "m_StageCapability": 3,
     "m_Value": false,
@@ -2716,6 +2671,7 @@
     "m_DisplayName": "B",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "B",
     "m_StageCapability": 3,
     "m_Value": {
@@ -2729,7 +2685,25 @@
         "y": 0.0,
         "z": 0.0,
         "w": 0.0
-    }
+    },
+    "m_LiteralMode": false
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
+    "m_ObjectId": "a9061cd60606418e8d1cca7281f512eb",
+    "m_Id": 1,
+    "m_DisplayName": "State",
+    "m_SlotType": 1,
+    "m_Hidden": false,
+    "m_HideConnector": false,
+    "m_ShaderOutputName": "State",
+    "m_StageCapability": 3,
+    "m_Value": 0.0,
+    "m_DefaultValue": 0.0,
+    "m_Labels": [],
+    "m_LiteralMode": false
 }
 
 {
@@ -2776,6 +2750,7 @@
     "m_DisplayName": "A",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "A",
     "m_StageCapability": 3,
     "m_Value": {
@@ -2824,6 +2799,7 @@
     "m_DisplayName": "Keep Aspect Ratio",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "_Keep_Aspect_Ratio",
     "m_StageCapability": 3,
     "m_Value": true,
@@ -2859,21 +2835,6 @@
     "m_DisableTint": false
 }
 
-{
-    "m_SGVersion": 0,
-    "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
-    "m_ObjectId": "b052a07bed754982acddcfa963cac32e",
-    "m_Id": 0,
-    "m_DisplayName": "State",
-    "m_SlotType": 0,
-    "m_Hidden": false,
-    "m_ShaderOutputName": "State",
-    "m_StageCapability": 3,
-    "m_Value": 0.0,
-    "m_DefaultValue": 0.0,
-    "m_Labels": []
-}
-
 {
     "m_SGVersion": 0,
     "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
@@ -2882,11 +2843,13 @@
     "m_DisplayName": "Edge Max",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "_Edge_Max",
     "m_StageCapability": 3,
     "m_Value": 0.009999999776482582,
-    "m_DefaultValue": 0.0,
-    "m_Labels": []
+    "m_DefaultValue": 0.009999999776482582,
+    "m_Labels": [],
+    "m_LiteralMode": false
 }
 
 {
@@ -2897,6 +2860,7 @@
     "m_DisplayName": "Out",
     "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "Out",
     "m_StageCapability": 3,
     "m_Value": {
@@ -2910,40 +2874,30 @@
         "y": 0.0,
         "z": 0.0,
         "w": 0.0
-    }
+    },
+    "m_LiteralMode": false
 }
 
 {
     "m_SGVersion": 0,
-    "m_Type": "UnityEditor.ShaderGraph.RectTransformSizeNode",
-    "m_ObjectId": "b45b4c175dbf4dd7932559b8e49dfc6a",
-    "m_Group": {
-        "m_Id": ""
+    "m_Type": "UnityEditor.ShaderGraph.Vector2MaterialSlot",
+    "m_ObjectId": "b62ddd12a0be48dea350f1a21daaec8e",
+    "m_Id": 1,
+    "m_DisplayName": "Size",
+    "m_SlotType": 1,
+    "m_Hidden": false,
+    "m_HideConnector": false,
+    "m_ShaderOutputName": "Size",
+    "m_StageCapability": 3,
+    "m_Value": {
+        "x": 0.0,
+        "y": 0.0
     },
-    "m_Name": "RectTransform Size",
-    "m_DrawState": {
-        "m_Expanded": true,
-        "m_Position": {
-            "serializedVersion": "2",
-            "x": -882.9999389648438,
-            "y": 705.0,
-            "width": 156.99993896484376,
-            "height": 76.99993896484375
-        }
+    "m_DefaultValue": {
+        "x": 0.0,
+        "y": 0.0
     },
-    "m_Slots": [
-        {
-            "m_Id": "8e0575d444f840e1b20424f825941848"
-        }
-    ],
-    "synonyms": [],
-    "m_Precision": 0,
-    "m_PreviewExpanded": true,
-    "m_DismissedVersion": 0,
-    "m_PreviewMode": 0,
-    "m_CustomColors": {
-        "m_SerializableColors": []
-    }
+    "m_Labels": []
 }
 
 {
@@ -2954,6 +2908,7 @@
     "m_DisplayName": "Base Color",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "BaseColor",
     "m_StageCapability": 2,
     "m_Value": {
@@ -2984,6 +2939,7 @@
     "m_DisplayName": "True",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "True",
     "m_StageCapability": 3,
     "m_Value": {
@@ -2997,7 +2953,8 @@
         "y": 0.0,
         "z": 0.0,
         "w": 0.0
-    }
+    },
+    "m_LiteralMode": false
 }
 
 {
@@ -3008,6 +2965,7 @@
     "m_DisplayName": "In",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "In",
     "m_StageCapability": 3,
     "m_Value": {
@@ -3021,7 +2979,8 @@
         "y": 0.0,
         "z": 0.0,
         "w": 0.0
-    }
+    },
+    "m_LiteralMode": false
 }
 
 {
@@ -3032,6 +2991,7 @@
     "m_DisplayName": "Out",
     "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "Out",
     "m_StageCapability": 3,
     "m_Value": {
@@ -3045,7 +3005,8 @@
         "y": 0.0,
         "z": 0.0,
         "w": 0.0
-    }
+    },
+    "m_LiteralMode": false
 }
 
 {
@@ -3056,6 +3017,7 @@
     "m_DisplayName": "Predicate",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "Predicate",
     "m_StageCapability": 3,
     "m_Value": false,
@@ -3102,7 +3064,8 @@
     "m_CustomColors": {
         "m_SerializableColors": []
     },
-    "m_Value": 0.0
+    "m_Value": 0.0,
+    "m_ConstIntMode": false
 }
 
 {
@@ -3125,7 +3088,7 @@
     },
     "m_Slots": [
         {
-            "m_Id": "c6e3ab973f2341f5a14798d16b205dcd"
+            "m_Id": "ef5ac4e1e80b49c3ab93f3f83b701df6"
         },
         {
             "m_Id": "f0a90c4fd45c4e6ea0ff8805d3e6b3b9"
@@ -3155,6 +3118,7 @@
     "m_DisplayName": "Horizontal",
     "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "Horizontal",
     "m_StageCapability": 3,
     "m_Value": false,
@@ -3202,26 +3166,54 @@
 
 {
     "m_SGVersion": 0,
-    "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot",
-    "m_ObjectId": "c6e3ab973f2341f5a14798d16b205dcd",
-    "m_Id": 0,
-    "m_DisplayName": "In",
-    "m_SlotType": 0,
-    "m_Hidden": false,
-    "m_ShaderOutputName": "In",
-    "m_StageCapability": 3,
-    "m_Value": {
-        "x": 0.0,
-        "y": 0.0,
-        "z": 0.0,
-        "w": 0.0
+    "m_Type": "UnityEditor.ShaderGraph.SubGraphNode",
+    "m_ObjectId": "c75274c1736d48698a1e0930c6a0b9df",
+    "m_Group": {
+        "m_Id": ""
     },
-    "m_DefaultValue": {
-        "x": 0.0,
-        "y": 0.0,
-        "z": 0.0,
-        "w": 0.0
-    }
+    "m_Name": "Slider Value",
+    "m_DrawState": {
+        "m_Expanded": true,
+        "m_Position": {
+            "serializedVersion": "2",
+            "x": -2864.0,
+            "y": 660.0,
+            "width": 256.0,
+            "height": 165.0
+        }
+    },
+    "m_Slots": [
+        {
+            "m_Id": "350ef6ef26694436bdb2df5a75ba3110"
+        },
+        {
+            "m_Id": "245c64d051ff448fa98e8c4a664b26a3"
+        },
+        {
+            "m_Id": "1305292832e44ba3820e8c17b1169eed"
+        }
+    ],
+    "synonyms": [],
+    "m_Precision": 0,
+    "m_PreviewExpanded": false,
+    "m_DismissedVersion": 0,
+    "m_PreviewMode": 0,
+    "m_CustomColors": {
+        "m_SerializableColors": []
+    },
+    "m_SerializedSubGraph": "{\n    \"subGraph\": {\n        \"fileID\": -5475051401550479605,\n        \"guid\": \"b674f75227b22477ca93a09e82cd33d2\",\n        \"type\": 3\n    }\n}",
+    "m_PropertyGuids": [
+        "c874690c-9084-423f-9768-5c99a5d92488"
+    ],
+    "m_PropertyIds": [
+        -1691137862
+    ],
+    "m_Dropdowns": [
+        "_Preview_Direction"
+    ],
+    "m_DropdownSelectedEntries": [
+        "Left To Right"
+    ]
 }
 
 {
@@ -3232,6 +3224,7 @@
     "m_DisplayName": "Negative",
     "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "Negative",
     "m_StageCapability": 3,
     "m_Value": false,
@@ -3240,37 +3233,83 @@
 
 {
     "m_SGVersion": 0,
-    "m_Type": "UnityEditor.ShaderGraph.BooleanMaterialSlot",
-    "m_ObjectId": "c8f3f0bdbf1d47f5b176902b0af43d5c",
-    "m_Id": 3,
-    "m_DisplayName": "RightToLeft",
-    "m_SlotType": 1,
-    "m_Hidden": false,
-    "m_ShaderOutputName": "RightToLeft",
-    "m_StageCapability": 3,
-    "m_Value": false,
-    "m_DefaultValue": false
-}
-
-{
-    "m_SGVersion": 0,
-    "m_Type": "UnityEditor.ShaderGraph.Vector2MaterialSlot",
-    "m_ObjectId": "c9a58ed120cf49b0891e7afe74f2e942",
-    "m_Id": 1,
-    "m_DisplayName": "State",
-    "m_SlotType": 1,
-    "m_Hidden": false,
-    "m_ShaderOutputName": "State",
-    "m_StageCapability": 3,
-    "m_Value": {
-        "x": 0.0,
-        "y": 0.0
-    },
-    "m_DefaultValue": {
-        "x": 0.0,
-        "y": 0.0
+    "m_Type": "UnityEditor.ShaderGraph.SubGraphNode",
+    "m_ObjectId": "c7f3198329384623bc8b3a9fa1a8384f",
+    "m_Group": {
+        "m_Id": ""
     },
-    "m_Labels": []
+    "m_Name": "Rect Transform Size",
+    "m_DrawState": {
+        "m_Expanded": true,
+        "m_Position": {
+            "serializedVersion": "2",
+            "x": -905.9998779296875,
+            "y": 703.9999389648438,
+            "width": 165.0,
+            "height": 227.99993896484376
+        }
+    },
+    "m_Slots": [
+        {
+            "m_Id": "0a036ef2a691434f9236287f9fa488f9"
+        },
+        {
+            "m_Id": "84df5d9c2c30461593a2dc276df8e421"
+        },
+        {
+            "m_Id": "e22e52d069f74ed9b0e668370a544c59"
+        },
+        {
+            "m_Id": "47b2362a8b4c452f8545850c6d6f27ac"
+        },
+        {
+            "m_Id": "b62ddd12a0be48dea350f1a21daaec8e"
+        },
+        {
+            "m_Id": "d17fab0f5db34a35a26277ad5ab5805a"
+        },
+        {
+            "m_Id": "79f60cd0487c4499b4ae5461c3b820d4"
+        }
+    ],
+    "synonyms": [],
+    "m_Precision": 0,
+    "m_PreviewExpanded": false,
+    "m_DismissedVersion": 0,
+    "m_PreviewMode": 0,
+    "m_CustomColors": {
+        "m_SerializableColors": []
+    },
+    "m_SerializedSubGraph": "{\n    \"subGraph\": {\n        \"fileID\": -5475051401550479605,\n        \"guid\": \"aa041986c041b4dc1b5bf0b2cd2d86e8\",\n        \"type\": 3\n    }\n}",
+    "m_PropertyGuids": [
+        "975f2db3-e792-46e7-9bf8-3a4cbe4fb068",
+        "373c703c-395b-43d3-91ba-78b9497021e7",
+        "2747a643-8db3-4ffc-9923-55aa70fb2549",
+        "451bbdf7-6136-4a6e-a5c8-4918d2ea4b95"
+    ],
+    "m_PropertyIds": [
+        -181240572,
+        716604351,
+        -1949568231,
+        -2106065226
+    ],
+    "m_Dropdowns": [],
+    "m_DropdownSelectedEntries": []
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.BooleanMaterialSlot",
+    "m_ObjectId": "c8f3f0bdbf1d47f5b176902b0af43d5c",
+    "m_Id": 3,
+    "m_DisplayName": "RightToLeft",
+    "m_SlotType": 1,
+    "m_Hidden": false,
+    "m_HideConnector": false,
+    "m_ShaderOutputName": "RightToLeft",
+    "m_StageCapability": 3,
+    "m_Value": false,
+    "m_DefaultValue": false
 }
 
 {
@@ -3281,6 +3320,7 @@
     "m_DisplayName": "Size",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "_Size",
     "m_StageCapability": 3,
     "m_Value": {
@@ -3302,11 +3342,13 @@
     "m_DisplayName": "Alpha",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "Alpha",
     "m_StageCapability": 2,
     "m_Value": 1.0,
     "m_DefaultValue": 1.0,
-    "m_Labels": []
+    "m_Labels": [],
+    "m_LiteralMode": false
 }
 
 {
@@ -3317,6 +3359,7 @@
     "m_DisplayName": "Positive",
     "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "Positive",
     "m_StageCapability": 3,
     "m_Value": false,
@@ -3343,7 +3386,7 @@
     },
     "m_Slots": [
         {
-            "m_Id": "2601cf9acda44a229b2a0479801d16b7"
+            "m_Id": "371bd2477b2549418ffe99ef1865d1f5"
         },
         {
             "m_Id": "27b7da4350d44fe0aeecec728512fbb0"
@@ -3373,6 +3416,7 @@
     "m_DisplayName": "Out",
     "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "Out",
     "m_StageCapability": 3,
     "m_Value": {
@@ -3386,7 +3430,8 @@
         "y": 0.0,
         "z": 0.0,
         "w": 0.0
-    }
+    },
+    "m_LiteralMode": false
 }
 
 {
@@ -3397,6 +3442,7 @@
     "m_DisplayName": "B",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "B",
     "m_StageCapability": 3,
     "m_Value": {
@@ -3444,6 +3490,9 @@
     "m_Guid": {
         "m_GuidSerialized": "80eae158-d435-45a9-8a66-566a6fd6f432"
     },
+    "promotedFromAssetID": "",
+    "promotedFromCategoryName": "",
+    "promotedOrdering": -1,
     "m_Name": "Radius",
     "m_DefaultRefNameVersion": 1,
     "m_RefNameGeneratedByDisplayName": "Radius",
@@ -3456,49 +3505,44 @@
     "m_Precision": 0,
     "overrideHLSLDeclaration": false,
     "hlslDeclarationOverride": 0,
+    "hideConnector": false,
     "m_Hidden": false,
+    "m_PerRendererData": false,
+    "m_customAttributes": [],
     "m_Value": 0.20000000298023225,
     "m_FloatType": 0,
+    "m_LiteralFloatMode": false,
     "m_RangeValues": {
         "x": 0.0,
         "y": 1.0
-    }
+    },
+    "m_SliderType": 0,
+    "m_SliderPower": 3.0,
+    "m_EnumType": 0,
+    "m_CSharpEnumString": "",
+    "m_EnumNames": [
+        "Default"
+    ],
+    "m_EnumValues": [
+        0
+    ]
 }
 
 {
     "m_SGVersion": 0,
-    "m_Type": "UnityEditor.ShaderGraph.SliderValueNode",
-    "m_ObjectId": "d204f1fd5baf4150b04b69f552ea4162",
-    "m_Group": {
-        "m_Id": ""
-    },
-    "m_Name": "Slider Value",
-    "m_DrawState": {
-        "m_Expanded": true,
-        "m_Position": {
-            "serializedVersion": "2",
-            "x": -2774.0,
-            "y": 439.0,
-            "width": 113.0,
-            "height": 101.00006103515625
-        }
-    },
-    "m_Slots": [
-        {
-            "m_Id": "603c4f281eaf432394f1789cc6f49347"
-        },
-        {
-            "m_Id": "e7f7d04cd3504a428eefdfca5cd4afb0"
-        }
-    ],
-    "synonyms": [],
-    "m_Precision": 0,
-    "m_PreviewExpanded": true,
-    "m_DismissedVersion": 0,
-    "m_PreviewMode": 0,
-    "m_CustomColors": {
-        "m_SerializableColors": []
-    }
+    "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
+    "m_ObjectId": "d17fab0f5db34a35a26277ad5ab5805a",
+    "m_Id": 2,
+    "m_DisplayName": "Scale_Factor",
+    "m_SlotType": 1,
+    "m_Hidden": false,
+    "m_HideConnector": false,
+    "m_ShaderOutputName": "Scale_Factor",
+    "m_StageCapability": 3,
+    "m_Value": 0.0,
+    "m_DefaultValue": 0.0,
+    "m_Labels": [],
+    "m_LiteralMode": false
 }
 
 {
@@ -3509,12 +3553,65 @@
     "m_DisplayName": "Stroke Thickness Relative",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "_Stroke_Thickness_Relative",
     "m_StageCapability": 3,
     "m_Value": true,
     "m_DefaultValue": false
 }
 
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot",
+    "m_ObjectId": "d5d48f9d0a3944baa6e43f8940f31dab",
+    "m_Id": 3,
+    "m_DisplayName": "A",
+    "m_SlotType": 0,
+    "m_Hidden": false,
+    "m_HideConnector": false,
+    "m_ShaderOutputName": "case_A",
+    "m_StageCapability": 3,
+    "m_Value": {
+        "x": 1.0,
+        "y": 0.0,
+        "z": 0.0,
+        "w": 0.0
+    },
+    "m_DefaultValue": {
+        "x": 0.0,
+        "y": 0.0,
+        "z": 0.0,
+        "w": 0.0
+    },
+    "m_LiteralMode": false
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot",
+    "m_ObjectId": "d91718614fd34660bf95e4bade92e989",
+    "m_Id": 2,
+    "m_DisplayName": "Out",
+    "m_SlotType": 1,
+    "m_Hidden": false,
+    "m_HideConnector": false,
+    "m_ShaderOutputName": "Out",
+    "m_StageCapability": 3,
+    "m_Value": {
+        "x": 0.0,
+        "y": 0.0,
+        "z": 0.0,
+        "w": 0.0
+    },
+    "m_DefaultValue": {
+        "x": 0.0,
+        "y": 0.0,
+        "z": 0.0,
+        "w": 0.0
+    },
+    "m_LiteralMode": false
+}
+
 {
     "m_SGVersion": 0,
     "m_Type": "UnityEditor.ShaderGraph.Vector4MaterialSlot",
@@ -3523,6 +3620,7 @@
     "m_DisplayName": "Out",
     "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "Out",
     "m_StageCapability": 3,
     "m_Value": {
@@ -3540,6 +3638,118 @@
     "m_Labels": []
 }
 
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.SwitchNode",
+    "m_ObjectId": "db78cee151c44f409e8b5871491bd0ee",
+    "m_Group": {
+        "m_Id": ""
+    },
+    "m_Name": "Switch",
+    "m_DrawState": {
+        "m_Expanded": true,
+        "m_Position": {
+            "serializedVersion": "2",
+            "x": -2168.000244140625,
+            "y": 83.00000762939453,
+            "width": 168.0001220703125,
+            "height": 238.0
+        }
+    },
+    "m_Slots": [
+        {
+            "m_Id": "ef7bf9ac60014186857640410130bc65"
+        },
+        {
+            "m_Id": "52157c5ba8ff4ab985da5623c66af39e"
+        },
+        {
+            "m_Id": "d91718614fd34660bf95e4bade92e989"
+        },
+        {
+            "m_Id": "d5d48f9d0a3944baa6e43f8940f31dab"
+        },
+        {
+            "m_Id": "13ba548308624159b0563ba4e8a0fa20"
+        },
+        {
+            "m_Id": "dbcba73476c9451b97b8132e01aad114"
+        },
+        {
+            "m_Id": "7e0f164b4a804fae90d6a0038e00b8b2"
+        },
+        {
+            "m_Id": "73046a2faef34c018088eb9fff353b62"
+        }
+    ],
+    "synonyms": [
+        "switch"
+    ],
+    "m_Precision": 0,
+    "m_PreviewExpanded": false,
+    "m_DismissedVersion": 0,
+    "m_PreviewMode": 0,
+    "m_CustomColors": {
+        "m_SerializableColors": []
+    },
+    "m_floorPredicate": true,
+    "m_cases": [
+        {
+            "name": "",
+            "comparisonType": 0,
+            "threshold": 0.0
+        },
+        {
+            "name": "",
+            "comparisonType": 0,
+            "threshold": 1.0
+        },
+        {
+            "name": "",
+            "comparisonType": 0,
+            "threshold": 2.0
+        },
+        {
+            "name": "",
+            "comparisonType": 0,
+            "threshold": 3.0
+        },
+        {
+            "name": "",
+            "comparisonType": 0,
+            "threshold": 4.0
+        }
+    ],
+    "m_useProperty": false,
+    "m_casesFromUpstreamEnumProperty": []
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot",
+    "m_ObjectId": "dbcba73476c9451b97b8132e01aad114",
+    "m_Id": 5,
+    "m_DisplayName": "C",
+    "m_SlotType": 0,
+    "m_Hidden": false,
+    "m_HideConnector": false,
+    "m_ShaderOutputName": "case_C",
+    "m_StageCapability": 3,
+    "m_Value": {
+        "x": 1.5,
+        "y": 0.0,
+        "z": 0.0,
+        "w": 0.0
+    },
+    "m_DefaultValue": {
+        "x": 0.0,
+        "y": 0.0,
+        "z": 0.0,
+        "w": 0.0
+    },
+    "m_LiteralMode": false
+}
+
 {
     "m_SGVersion": 0,
     "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
@@ -3548,11 +3758,13 @@
     "m_DisplayName": "Edge Min",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "_Edge_Min",
     "m_StageCapability": 3,
     "m_Value": 0.0,
     "m_DefaultValue": 0.0,
-    "m_Labels": []
+    "m_Labels": [],
+    "m_LiteralMode": false
 }
 
 {
@@ -3563,6 +3775,7 @@
     "m_DisplayName": "Predicate",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "Predicate",
     "m_StageCapability": 3,
     "m_Value": false,
@@ -3583,6 +3796,7 @@
     "m_DisplayName": "B",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "B",
     "m_StageCapability": 3,
     "m_Value": {
@@ -3596,7 +3810,8 @@
         "y": 0.0,
         "z": 0.0,
         "w": 0.0
-    }
+    },
+    "m_LiteralMode": false
 }
 
 {
@@ -3607,6 +3822,7 @@
     "m_DisplayName": "Out",
     "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "Out",
     "m_StageCapability": 3,
     "m_Value": {
@@ -3620,7 +3836,25 @@
         "y": 0.0,
         "z": 0.0,
         "w": 0.0
-    }
+    },
+    "m_LiteralMode": false
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
+    "m_ObjectId": "e22e52d069f74ed9b0e668370a544c59",
+    "m_Id": -1949568231,
+    "m_DisplayName": "PreviewScaleFactor",
+    "m_SlotType": 0,
+    "m_Hidden": false,
+    "m_HideConnector": true,
+    "m_ShaderOutputName": "_PreviewScaleFactor",
+    "m_StageCapability": 3,
+    "m_Value": 1.0,
+    "m_DefaultValue": 1.0,
+    "m_Labels": [],
+    "m_LiteralMode": false
 }
 
 {
@@ -3631,6 +3865,7 @@
     "m_DisplayName": "Edge",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "Edge",
     "m_StageCapability": 3,
     "m_Value": {
@@ -3644,28 +3879,8 @@
         "y": 0.0,
         "z": 0.0,
         "w": 0.0
-    }
-}
-
-{
-    "m_SGVersion": 0,
-    "m_Type": "UnityEditor.ShaderGraph.Vector2MaterialSlot",
-    "m_ObjectId": "e7f7d04cd3504a428eefdfca5cd4afb0",
-    "m_Id": 1,
-    "m_DisplayName": "Direction",
-    "m_SlotType": 1,
-    "m_Hidden": false,
-    "m_ShaderOutputName": "_Direction",
-    "m_StageCapability": 3,
-    "m_Value": {
-        "x": 0.0,
-        "y": 0.0
     },
-    "m_DefaultValue": {
-        "x": 0.0,
-        "y": 0.0
-    },
-    "m_Labels": []
+    "m_LiteralMode": false
 }
 
 {
@@ -3688,13 +3903,54 @@
     "m_DisplayName": "SDF",
     "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "SDF",
     "m_StageCapability": 3,
     "m_Value": 0.0,
     "m_DefaultValue": 0.0,
+    "m_Labels": [],
+    "m_LiteralMode": false
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.Vector2MaterialSlot",
+    "m_ObjectId": "ef5ac4e1e80b49c3ab93f3f83b701df6",
+    "m_Id": 0,
+    "m_DisplayName": "In",
+    "m_SlotType": 0,
+    "m_Hidden": false,
+    "m_HideConnector": false,
+    "m_ShaderOutputName": "In",
+    "m_StageCapability": 3,
+    "m_Value": {
+        "x": 0.0,
+        "y": 0.0
+    },
+    "m_DefaultValue": {
+        "x": 0.0,
+        "y": 0.0
+    },
     "m_Labels": []
 }
 
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
+    "m_ObjectId": "ef7bf9ac60014186857640410130bc65",
+    "m_Id": 0,
+    "m_DisplayName": "Predicate",
+    "m_SlotType": 0,
+    "m_Hidden": false,
+    "m_HideConnector": false,
+    "m_ShaderOutputName": "Predicate",
+    "m_StageCapability": 3,
+    "m_Value": 0.0,
+    "m_DefaultValue": 0.0,
+    "m_Labels": [],
+    "m_LiteralMode": false
+}
+
 {
     "m_SGVersion": 0,
     "m_Type": "UnityEditor.ShaderGraph.DynamicValueMaterialSlot",
@@ -3703,6 +3959,7 @@
     "m_DisplayName": "Out",
     "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "Out",
     "m_StageCapability": 3,
     "m_Value": {
@@ -3751,11 +4008,13 @@
     "m_DisplayName": "Out",
     "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "Out",
     "m_StageCapability": 3,
     "m_Value": 0.0,
     "m_DefaultValue": 0.0,
-    "m_Labels": []
+    "m_Labels": [],
+    "m_LiteralMode": false
 }
 
 {
@@ -3764,61 +4023,6 @@
     "m_ObjectId": "f310b80bf4aa4ea2a1ce6abc1a76b2d5"
 }
 
-{
-    "m_SGVersion": 0,
-    "m_Type": "UnityEditor.ShaderGraph.SelectableBranchNode",
-    "m_ObjectId": "f69ba2775c854388a21de9912ab9df8e",
-    "m_Group": {
-        "m_Id": ""
-    },
-    "m_Name": "Selectable State Switch",
-    "m_DrawState": {
-        "m_Expanded": true,
-        "m_Position": {
-            "serializedVersion": "2",
-            "x": -2176.999755859375,
-            "y": 89.99998474121094,
-            "width": 180.9998779296875,
-            "height": 213.9999542236328
-        }
-    },
-    "m_Slots": [
-        {
-            "m_Id": "b052a07bed754982acddcfa963cac32e"
-        },
-        {
-            "m_Id": "40aaca1e9cba44fdb16ee70318034555"
-        },
-        {
-            "m_Id": "717f0b548eaf4173bdfa6fde3d4cf69c"
-        },
-        {
-            "m_Id": "3aefd6ade9b2497c935173b9f1286de6"
-        },
-        {
-            "m_Id": "8645b35aea954a51b9ea050618140739"
-        },
-        {
-            "m_Id": "fc99c88fcba94523aac8d621d9ed275f"
-        },
-        {
-            "m_Id": "96004e2627d34b85911f97b12b2ea9c7"
-        }
-    ],
-    "synonyms": [
-        "switch",
-        "ui",
-        "selectable"
-    ],
-    "m_Precision": 0,
-    "m_PreviewExpanded": false,
-    "m_DismissedVersion": 0,
-    "m_PreviewMode": 0,
-    "m_CustomColors": {
-        "m_SerializableColors": []
-    }
-}
-
 {
     "m_SGVersion": 0,
     "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot",
@@ -3827,6 +4031,7 @@
     "m_DisplayName": "In",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "In",
     "m_StageCapability": 3,
     "m_Value": {
@@ -3840,7 +4045,8 @@
         "y": 0.0,
         "z": 0.0,
         "w": 0.0
-    }
+    },
+    "m_LiteralMode": false
 }
 
 {
@@ -3851,6 +4057,7 @@
     "m_DisplayName": "B",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "B",
     "m_StageCapability": 3,
     "m_Value": {
@@ -3864,63 +4071,7 @@
         "y": 0.0,
         "z": 0.0,
         "w": 0.0
-    }
-}
-
-{
-    "m_SGVersion": 0,
-    "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot",
-    "m_ObjectId": "fc99c88fcba94523aac8d621d9ed275f",
-    "m_Id": 5,
-    "m_DisplayName": "Disabled",
-    "m_SlotType": 0,
-    "m_Hidden": false,
-    "m_ShaderOutputName": "Disabled",
-    "m_StageCapability": 3,
-    "m_Value": {
-        "x": 0.20000000298023225,
-        "y": 0.0,
-        "z": 0.0,
-        "w": 0.0
-    },
-    "m_DefaultValue": {
-        "x": 0.0,
-        "y": 0.0,
-        "z": 0.0,
-        "w": 0.0
-    }
-}
-
-{
-    "m_SGVersion": 0,
-    "m_Type": "UnityEditor.ShaderGraph.SelectableStateNode",
-    "m_ObjectId": "fe584360b9ef45feabaf51eaf92b8b39",
-    "m_Group": {
-        "m_Id": ""
-    },
-    "m_Name": "Selectable State",
-    "m_DrawState": {
-        "m_Expanded": true,
-        "m_Position": {
-            "serializedVersion": "2",
-            "x": -2774.000244140625,
-            "y": 90.00003051757813,
-            "width": 140.0,
-            "height": 76.99998474121094
-        }
     },
-    "m_Slots": [
-        {
-            "m_Id": "0c2fb0f5cee0484da3ddb0b89e0ed8a3"
-        }
-    ],
-    "synonyms": [],
-    "m_Precision": 0,
-    "m_PreviewExpanded": true,
-    "m_DismissedVersion": 0,
-    "m_PreviewMode": 0,
-    "m_CustomColors": {
-        "m_SerializableColors": []
-    }
+    "m_LiteralMode": false
 }
 
diff --git a/Packages/com.unity.shadergraph/Samples~/UGUIShaders/Default Materials/Toggle Material.shadergraph b/Packages/com.unity.shadergraph/Samples~/UGUIShaders/Default Materials/Toggle Material.shadergraph
index 60a54656a53..af6b5902533 100644
--- a/Packages/com.unity.shadergraph/Samples~/UGUIShaders/Default Materials/Toggle Material.shadergraph	
+++ b/Packages/com.unity.shadergraph/Samples~/UGUIShaders/Default Materials/Toggle Material.shadergraph	
@@ -54,24 +54,12 @@
         {
             "m_Id": "be62a1b9ea544ceb831b82f9fecd6439"
         },
-        {
-            "m_Id": "d053b21c961d4995a06b47e74b4c2409"
-        },
         {
             "m_Id": "7b8f035eb0aa496fb043bb91e2150295"
         },
-        {
-            "m_Id": "4bbd75861ad348b48471638def1a8136"
-        },
-        {
-            "m_Id": "6e28dc0a731b47a3bd532902ebfeede4"
-        },
         {
             "m_Id": "003b673f1a8847878bf6f3fcac04b226"
         },
-        {
-            "m_Id": "1210e3a0d26c4201a0d38bc4f1cac00f"
-        },
         {
             "m_Id": "3ffb6b911bb84059bdb0e8db330992d1"
         },
@@ -86,6 +74,15 @@
         },
         {
             "m_Id": "2b95bf1610f84cae81ccccd28e0acde7"
+        },
+        {
+            "m_Id": "57b35376f12a42d3bfee8b3884c342c6"
+        },
+        {
+            "m_Id": "950b28e11f404f39814cfab63c53757a"
+        },
+        {
+            "m_Id": "9a5d634ce20340888d72507390df323e"
         }
     ],
     "m_GroupDatas": [
@@ -96,7 +93,17 @@
             "m_Id": "d23ccb49d0e14387b259d3fc88498036"
         }
     ],
-    "m_StickyNoteDatas": [],
+    "m_StickyNoteDatas": [
+        {
+            "m_Id": "908f2998d914462585c13e88ccb02b5a"
+        },
+        {
+            "m_Id": "23f32e5af11b4b0d859abfa3787c2c54"
+        },
+        {
+            "m_Id": "a7f4ae56ae9b476ba8d5cf77d66b1885"
+        }
+    ],
     "m_Edges": [
         {
             "m_OutputSlot": {
@@ -112,20 +119,6 @@
                 "m_SlotId": 0
             }
         },
-        {
-            "m_OutputSlot": {
-                "m_Node": {
-                    "m_Id": "1210e3a0d26c4201a0d38bc4f1cac00f"
-                },
-                "m_SlotId": 1
-            },
-            "m_InputSlot": {
-                "m_Node": {
-                    "m_Id": "7b8f035eb0aa496fb043bb91e2150295"
-                },
-                "m_SlotId": 830530724
-            }
-        },
         {
             "m_OutputSlot": {
                 "m_Node": {
@@ -185,9 +178,9 @@
         {
             "m_OutputSlot": {
                 "m_Node": {
-                    "m_Id": "4bbd75861ad348b48471638def1a8136"
+                    "m_Id": "57b35376f12a42d3bfee8b3884c342c6"
                 },
-                "m_SlotId": 0
+                "m_SlotId": 1
             },
             "m_InputSlot": {
                 "m_Node": {
@@ -224,20 +217,6 @@
                 "m_SlotId": 0
             }
         },
-        {
-            "m_OutputSlot": {
-                "m_Node": {
-                    "m_Id": "6e28dc0a731b47a3bd532902ebfeede4"
-                },
-                "m_SlotId": 0
-            },
-            "m_InputSlot": {
-                "m_Node": {
-                    "m_Id": "e3d2926141e24718af08fb624c643421"
-                },
-                "m_SlotId": 1786236159
-            }
-        },
         {
             "m_OutputSlot": {
                 "m_Node": {
@@ -339,43 +318,57 @@
         {
             "m_OutputSlot": {
                 "m_Node": {
-                    "m_Id": "be62a1b9ea544ceb831b82f9fecd6439"
+                    "m_Id": "950b28e11f404f39814cfab63c53757a"
                 },
-                "m_SlotId": 2
+                "m_SlotId": 1
             },
             "m_InputSlot": {
                 "m_Node": {
-                    "m_Id": "1795d618ff9042e7bf5dcb0540585086"
+                    "m_Id": "7b8f035eb0aa496fb043bb91e2150295"
                 },
-                "m_SlotId": 0
+                "m_SlotId": 830530724
             }
         },
         {
             "m_OutputSlot": {
                 "m_Node": {
-                    "m_Id": "c270b80153a347c1be7d1fbaa1bef245"
+                    "m_Id": "9a5d634ce20340888d72507390df323e"
                 },
                 "m_SlotId": 1
             },
             "m_InputSlot": {
                 "m_Node": {
-                    "m_Id": "6a732194dfc94736a26b063ef92d9622"
+                    "m_Id": "e3d2926141e24718af08fb624c643421"
                 },
-                "m_SlotId": 2
+                "m_SlotId": 1786236159
             }
         },
         {
             "m_OutputSlot": {
                 "m_Node": {
-                    "m_Id": "d053b21c961d4995a06b47e74b4c2409"
+                    "m_Id": "be62a1b9ea544ceb831b82f9fecd6439"
+                },
+                "m_SlotId": 2
+            },
+            "m_InputSlot": {
+                "m_Node": {
+                    "m_Id": "1795d618ff9042e7bf5dcb0540585086"
                 },
                 "m_SlotId": 0
+            }
+        },
+        {
+            "m_OutputSlot": {
+                "m_Node": {
+                    "m_Id": "c270b80153a347c1be7d1fbaa1bef245"
+                },
+                "m_SlotId": 1
             },
             "m_InputSlot": {
                 "m_Node": {
-                    "m_Id": "1210e3a0d26c4201a0d38bc4f1cac00f"
+                    "m_Id": "6a732194dfc94736a26b063ef92d9622"
                 },
-                "m_SlotId": 830530724
+                "m_SlotId": 2
             }
         },
         {
@@ -527,6 +520,7 @@
     "m_DisplayName": "IsHighlighted",
     "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "IsHighlighted",
     "m_StageCapability": 3,
     "m_Value": false,
@@ -541,12 +535,36 @@
     "m_DisplayName": "IsPressed",
     "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "IsPressed",
     "m_StageCapability": 3,
     "m_Value": false,
     "m_DefaultValue": false
 }
 
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
+    "m_ObjectId": "0417a9d3d9da49039322baa40f50637a",
+    "m_Id": 716604351,
+    "m_DisplayName": "PreviewHeight",
+    "m_SlotType": 0,
+    "m_Hidden": false,
+    "m_HideConnector": true,
+    "m_ShaderOutputName": "_PreviewHeight",
+    "m_StageCapability": 3,
+    "m_Value": 100.0,
+    "m_DefaultValue": 100.0,
+    "m_Labels": [],
+    "m_LiteralMode": false
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasSubTarget",
+    "m_ObjectId": "0724948387ed419a8be84dbf40ca769b"
+}
+
 {
     "m_SGVersion": 0,
     "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
@@ -555,11 +573,13 @@
     "m_DisplayName": "SDF",
     "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "SDF",
     "m_StageCapability": 3,
     "m_Value": 0.0,
     "m_DefaultValue": 0.0,
-    "m_Labels": []
+    "m_Labels": [],
+    "m_LiteralMode": false
 }
 
 {
@@ -570,6 +590,7 @@
     "m_DisplayName": "Predicate",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "Predicate",
     "m_StageCapability": 3,
     "m_Value": false,
@@ -618,6 +639,7 @@
     "m_DisplayName": "Out",
     "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "Out",
     "m_StageCapability": 3,
     "m_Value": false,
@@ -626,51 +648,25 @@
 
 {
     "m_SGVersion": 0,
-    "m_Type": "UnityEditor.ShaderGraph.SubGraphNode",
-    "m_ObjectId": "1210e3a0d26c4201a0d38bc4f1cac00f",
-    "m_Group": {
-        "m_Id": ""
-    },
-    "m_Name": "Selectable State Preview",
-    "m_DrawState": {
-        "m_Expanded": true,
-        "m_Position": {
-            "serializedVersion": "2",
-            "x": -2576.0,
-            "y": 200.0,
-            "width": 284.0,
-            "height": 115.0
-        }
-    },
-    "m_Slots": [
-        {
-            "m_Id": "eaca5acb307b4e5cad2b5e2ae96e47e2"
-        },
-        {
-            "m_Id": "7997b9eaed5042adb724726c5ab2b68f"
-        }
-    ],
-    "synonyms": [],
-    "m_Precision": 0,
-    "m_PreviewExpanded": false,
-    "m_DismissedVersion": 0,
-    "m_PreviewMode": 0,
-    "m_CustomColors": {
-        "m_SerializableColors": []
-    },
-    "m_SerializedSubGraph": "{\n    \"subGraph\": {\n        \"fileID\": -5475051401550479605,\n        \"guid\": \"b278edaff18e35342890339c5f0d2945\",\n        \"type\": 3\n    }\n}",
-    "m_PropertyGuids": [
-        "9c4cb347-e674-4393-bb26-07702c97589e"
-    ],
-    "m_PropertyIds": [
-        830530724
-    ],
-    "m_Dropdowns": [
-        "_Preview"
-    ],
-    "m_DropdownSelectedEntries": [
-        "Normal"
-    ]
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasSubTarget",
+    "m_ObjectId": "10c3b5b995fd4d19825cb2a725ffb981"
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
+    "m_ObjectId": "119603bd97394705b6221d021e6bc5ce",
+    "m_Id": 1,
+    "m_DisplayName": "State",
+    "m_SlotType": 1,
+    "m_Hidden": false,
+    "m_HideConnector": false,
+    "m_ShaderOutputName": "State",
+    "m_StageCapability": 3,
+    "m_Value": 0.0,
+    "m_DefaultValue": 0.0,
+    "m_Labels": [],
+    "m_LiteralMode": false
 }
 
 {
@@ -715,11 +711,13 @@
     "m_DisplayName": "Alpha",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "Alpha",
     "m_StageCapability": 2,
     "m_Value": 1.0,
     "m_DefaultValue": 1.0,
-    "m_Labels": []
+    "m_Labels": [],
+    "m_LiteralMode": false
 }
 
 {
@@ -730,6 +728,7 @@
     "m_DisplayName": "Corner Radii",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "_Corner_Radii",
     "m_StageCapability": 3,
     "m_Value": {
@@ -805,11 +804,13 @@
     "m_DisplayName": "State",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "_State",
     "m_StageCapability": 3,
     "m_Value": 0.0,
     "m_DefaultValue": 0.0,
-    "m_Labels": []
+    "m_Labels": [],
+    "m_LiteralMode": false
 }
 
 {
@@ -820,6 +821,7 @@
     "m_DisplayName": "A",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "A",
     "m_StageCapability": 3,
     "m_Value": {
@@ -833,7 +835,8 @@
         "y": 0.0,
         "z": 0.0,
         "w": 0.0
-    }
+    },
+    "m_LiteralMode": false
 }
 
 {
@@ -844,6 +847,7 @@
     "m_DisplayName": "Emission",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "Emission",
     "m_StageCapability": 2,
     "m_Value": {
@@ -874,6 +878,7 @@
     "m_DisplayName": "Out",
     "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "Out",
     "m_StageCapability": 3,
     "m_Value": {
@@ -887,9 +892,43 @@
         "y": 0.0,
         "z": 0.0,
         "w": 0.0
+    },
+    "m_LiteralMode": false
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasData",
+    "m_ObjectId": "23e408b0f1454583bbd5158bd375dc27",
+    "supportsMotionVectors": false
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.StickyNoteData",
+    "m_ObjectId": "23f32e5af11b4b0d859abfa3787c2c54",
+    "m_Title": "Selectable State",
+    "m_Content": "This subgraph promotes a hidden \"_State\" float property and allows changing the preview value with a dropdown.\n\nUse with one of the Sample Components, like Button, Toggle, Slider.\n0 = Normal\n1 = Highlighted\n2 = Pressed\n3 = Selected\n4 = Disabled",
+    "m_TextSize": 0,
+    "m_Theme": 1,
+    "m_Position": {
+        "serializedVersion": "2",
+        "x": -2854.0,
+        "y": 206.0,
+        "width": 303.0,
+        "height": 189.0
+    },
+    "m_Group": {
+        "m_Id": ""
     }
 }
 
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasSubTarget",
+    "m_ObjectId": "247cd01b97fd4baa87c323d78de99850"
+}
+
 {
     "m_SGVersion": 0,
     "m_Type": "UnityEditor.ShaderGraph.BooleanMaterialSlot",
@@ -898,12 +937,20 @@
     "m_DisplayName": "",
     "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "",
     "m_StageCapability": 3,
     "m_Value": false,
     "m_DefaultValue": false
 }
 
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasData",
+    "m_ObjectId": "29880c8660cd4e2297ceaa8b9b783e4c",
+    "supportsMotionVectors": false
+}
+
 {
     "m_SGVersion": 0,
     "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
@@ -912,11 +959,13 @@
     "m_DisplayName": "Out",
     "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "Out",
     "m_StageCapability": 3,
     "m_Value": 0.0,
     "m_DefaultValue": 0.0,
-    "m_Labels": []
+    "m_Labels": [],
+    "m_LiteralMode": false
 }
 
 {
@@ -963,11 +1012,13 @@
     "m_DisplayName": "Out",
     "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "Out",
     "m_StageCapability": 2,
     "m_Value": 0.0,
     "m_DefaultValue": 0.0,
-    "m_Labels": []
+    "m_Labels": [],
+    "m_LiteralMode": false
 }
 
 {
@@ -1030,6 +1081,18 @@
     "m_SupportLineRendering": false
 }
 
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasSubTarget",
+    "m_ObjectId": "32e5213c4b334bfeb1d7aea2f95436e2"
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasSubTarget",
+    "m_ObjectId": "337a68a849fe49b283d7660f082f1726"
+}
+
 {
     "m_SGVersion": 0,
     "m_Type": "UnityEditor.ShaderGraph.BooleanMaterialSlot",
@@ -1038,6 +1101,7 @@
     "m_DisplayName": "",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "",
     "m_StageCapability": 3,
     "m_Value": false,
@@ -1075,6 +1139,7 @@
     "m_CastShadows": true,
     "m_ReceiveShadows": true,
     "m_DisableTint": false,
+    "m_Sort3DAs2DCompatible": false,
     "m_AdditionalMotionVectorMode": 0,
     "m_AlembicMotionVectors": false,
     "m_SupportsLODCrossFade": false,
@@ -1090,6 +1155,7 @@
     "m_DisplayName": "Out",
     "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "Out",
     "m_StageCapability": 3,
     "m_Value": {
@@ -1107,6 +1173,13 @@
     "m_Labels": []
 }
 
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasData",
+    "m_ObjectId": "3d7882455342469badf9b85649b4d809",
+    "supportsMotionVectors": false
+}
+
 {
     "m_SGVersion": 0,
     "m_Type": "UnityEditor.ShaderGraph.MultiplyNode",
@@ -1156,7 +1229,7 @@
     "m_ObjectId": "41865192232b4142b0b2db733500ca91",
     "m_Title": "Color",
     "m_Position": {
-        "x": -986.9999389648438,
+        "x": -987.0,
         "y": -198.0
     }
 }
@@ -1169,6 +1242,7 @@
     "m_DisplayName": "UV",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "_UV",
     "m_StageCapability": 3,
     "m_Value": {
@@ -1184,35 +1258,23 @@
 
 {
     "m_SGVersion": 0,
-    "m_Type": "UnityEditor.ShaderGraph.ToggleStateNode",
-    "m_ObjectId": "4bbd75861ad348b48471638def1a8136",
-    "m_Group": {
-        "m_Id": ""
-    },
-    "m_Name": "Toggle State",
-    "m_DrawState": {
-        "m_Expanded": true,
-        "m_Position": {
-            "serializedVersion": "2",
-            "x": -1794.0,
-            "y": 314.0,
-            "width": 118.0,
-            "height": 77.0
-        }
-    },
-    "m_Slots": [
-        {
-            "m_Id": "f2115f407dec4a39ac4140014414379e"
-        }
-    ],
-    "synonyms": [],
-    "m_Precision": 0,
-    "m_PreviewExpanded": true,
-    "m_DismissedVersion": 0,
-    "m_PreviewMode": 0,
-    "m_CustomColors": {
-        "m_SerializableColors": []
-    }
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasSubTarget",
+    "m_ObjectId": "48f4b1e87a3c4f6885826e7b4fac6a55"
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.BooleanMaterialSlot",
+    "m_ObjectId": "4e76f9981d894e1298be3bdd46122d36",
+    "m_Id": 1,
+    "m_DisplayName": "Out",
+    "m_SlotType": 1,
+    "m_Hidden": false,
+    "m_HideConnector": false,
+    "m_ShaderOutputName": "Out",
+    "m_StageCapability": 3,
+    "m_Value": false,
+    "m_DefaultValue": false
 }
 
 {
@@ -1223,11 +1285,30 @@
     "m_DisplayName": "Gradient",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "_Gradient",
     "m_StageCapability": 2,
     "m_Value": 0.0,
     "m_DefaultValue": 0.0,
-    "m_Labels": []
+    "m_Labels": [],
+    "m_LiteralMode": false
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
+    "m_ObjectId": "52ee1b26ed4f4a09a6e1575f956d92f0",
+    "m_Id": 2,
+    "m_DisplayName": "Scale_Factor",
+    "m_SlotType": 1,
+    "m_Hidden": false,
+    "m_HideConnector": false,
+    "m_ShaderOutputName": "Scale_Factor",
+    "m_StageCapability": 3,
+    "m_Value": 0.0,
+    "m_DefaultValue": 0.0,
+    "m_Labels": [],
+    "m_LiteralMode": false
 }
 
 {
@@ -1238,6 +1319,7 @@
     "m_DisplayName": "",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "",
     "m_StageCapability": 3,
     "m_Value": {
@@ -1251,17 +1333,64 @@
         "y": 0.0,
         "z": 0.0,
         "w": 0.0
-    }
+    },
+    "m_LiteralMode": false
 }
 
 {
     "m_SGVersion": 0,
-    "m_Type": "UnityEditor.ShaderGraph.DynamicValueMaterialSlot",
-    "m_ObjectId": "57f21c12a68740ec92368d6ac84aeef2",
-    "m_Id": 2,
-    "m_DisplayName": "Out",
-    "m_SlotType": 1,
+    "m_Type": "UnityEditor.ShaderGraph.SubGraphNode",
+    "m_ObjectId": "57b35376f12a42d3bfee8b3884c342c6",
+    "m_Group": {
+        "m_Id": ""
+    },
+    "m_Name": "Toggle State",
+    "m_DrawState": {
+        "m_Expanded": true,
+        "m_Position": {
+            "serializedVersion": "2",
+            "x": -1819.0,
+            "y": 329.0000305175781,
+            "width": 150.0,
+            "height": 105.0
+        }
+    },
+    "m_Slots": [
+        {
+            "m_Id": "8e75f227d53b48f88923505a2a65fc0a"
+        },
+        {
+            "m_Id": "4e76f9981d894e1298be3bdd46122d36"
+        }
+    ],
+    "synonyms": [],
+    "m_Precision": 0,
+    "m_PreviewExpanded": false,
+    "m_DismissedVersion": 0,
+    "m_PreviewMode": 0,
+    "m_CustomColors": {
+        "m_SerializableColors": []
+    },
+    "m_SerializedSubGraph": "{\n    \"subGraph\": {\n        \"fileID\": -5475051401550479605,\n        \"guid\": \"4f050eea90ae946c5a5a171b0df1d6a1\",\n        \"type\": 3\n    }\n}",
+    "m_PropertyGuids": [
+        "33920d31-0cc5-4286-b412-4e36a6203057"
+    ],
+    "m_PropertyIds": [
+        275395558
+    ],
+    "m_Dropdowns": [],
+    "m_DropdownSelectedEntries": []
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.DynamicValueMaterialSlot",
+    "m_ObjectId": "57f21c12a68740ec92368d6ac84aeef2",
+    "m_Id": 2,
+    "m_DisplayName": "Out",
+    "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "Out",
     "m_StageCapability": 3,
     "m_Value": {
@@ -1310,11 +1439,13 @@
     "m_DisplayName": "Edge Max",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "_Edge_Max",
     "m_StageCapability": 3,
     "m_Value": 0.009999999776482582,
-    "m_DefaultValue": 0.0,
-    "m_Labels": []
+    "m_DefaultValue": 0.009999999776482582,
+    "m_Labels": [],
+    "m_LiteralMode": false
 }
 
 {
@@ -1325,11 +1456,13 @@
     "m_DisplayName": "Gradient",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "_Gradient",
     "m_StageCapability": 2,
     "m_Value": 0.0,
     "m_DefaultValue": 0.0,
-    "m_Labels": []
+    "m_Labels": [],
+    "m_LiteralMode": false
 }
 
 {
@@ -1358,7 +1491,7 @@
     },
     "m_Slots": [
         {
-            "m_Id": "f2261588d28d47169d7efe8d68ae6ee3"
+            "m_Id": "b1c496298e0d44dd80774b249a75fd2f"
         },
         {
             "m_Id": "2b40c842bade4bedb8356b56bdf43c4b"
@@ -1388,6 +1521,7 @@
     "m_DisplayName": "Out",
     "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "Out",
     "m_StageCapability": 3,
     "m_Value": {
@@ -1447,6 +1581,7 @@
     "m_DisplayName": "Out",
     "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "Out",
     "m_StageCapability": 3,
     "m_Value": {
@@ -1460,7 +1595,8 @@
         "y": 0.0,
         "z": 0.0,
         "w": 0.0
-    }
+    },
+    "m_LiteralMode": true
 }
 
 {
@@ -1471,6 +1607,7 @@
     "m_DisplayName": "Out",
     "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "Out",
     "m_StageCapability": 3,
     "m_Value": {
@@ -1496,6 +1633,7 @@
     "m_DisplayName": "Out",
     "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "Out",
     "m_StageCapability": 3,
     "m_Value": {
@@ -1509,7 +1647,8 @@
         "y": 0.0,
         "z": 0.0,
         "w": 0.0
-    }
+    },
+    "m_LiteralMode": true
 }
 
 {
@@ -1573,11 +1712,13 @@
     "m_DisplayName": "Cutoff",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "_Cutoff",
     "m_StageCapability": 2,
     "m_Value": 0.0,
-    "m_DefaultValue": 0.0,
-    "m_Labels": []
+    "m_DefaultValue": 0.5,
+    "m_Labels": [],
+    "m_LiteralMode": false
 }
 
 {
@@ -1588,6 +1729,7 @@
     "m_DisplayName": "False",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "False",
     "m_StageCapability": 3,
     "m_Value": {
@@ -1601,40 +1743,8 @@
         "y": 0.0,
         "z": 0.0,
         "w": 0.0
-    }
-}
-
-{
-    "m_SGVersion": 0,
-    "m_Type": "UnityEditor.ShaderGraph.RectTransformSizeNode",
-    "m_ObjectId": "6e28dc0a731b47a3bd532902ebfeede4",
-    "m_Group": {
-        "m_Id": ""
-    },
-    "m_Name": "RectTransform Size",
-    "m_DrawState": {
-        "m_Expanded": true,
-        "m_Position": {
-            "serializedVersion": "2",
-            "x": -1112.4998779296875,
-            "y": 693.5,
-            "width": 156.49993896484376,
-            "height": 76.99993896484375
-        }
     },
-    "m_Slots": [
-        {
-            "m_Id": "cd7b17cc88624bdea99850cc2ecf98c0"
-        }
-    ],
-    "synonyms": [],
-    "m_Precision": 0,
-    "m_PreviewExpanded": true,
-    "m_DismissedVersion": 0,
-    "m_PreviewMode": 0,
-    "m_CustomColors": {
-        "m_SerializableColors": []
-    }
+    "m_LiteralMode": false
 }
 
 {
@@ -1645,11 +1755,13 @@
     "m_DisplayName": "Stroke",
     "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "Stroke",
     "m_StageCapability": 3,
     "m_Value": 0.0,
     "m_DefaultValue": 0.0,
-    "m_Labels": []
+    "m_Labels": [],
+    "m_LiteralMode": false
 }
 
 {
@@ -1660,11 +1772,13 @@
     "m_DisplayName": "Out",
     "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "Out",
     "m_StageCapability": 2,
     "m_Value": 0.0,
     "m_DefaultValue": 0.0,
-    "m_Labels": []
+    "m_Labels": [],
+    "m_LiteralMode": false
 }
 
 {
@@ -1675,6 +1789,7 @@
     "m_DisplayName": "True",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "True",
     "m_StageCapability": 3,
     "m_Value": {
@@ -1688,7 +1803,8 @@
         "y": 0.0,
         "z": 0.0,
         "w": 0.0
-    }
+    },
+    "m_LiteralMode": false
 }
 
 {
@@ -1760,17 +1876,15 @@
 
 {
     "m_SGVersion": 0,
-    "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
-    "m_ObjectId": "7997b9eaed5042adb724726c5ab2b68f",
-    "m_Id": 1,
-    "m_DisplayName": "State",
-    "m_SlotType": 1,
-    "m_Hidden": false,
-    "m_ShaderOutputName": "State",
-    "m_StageCapability": 3,
-    "m_Value": 0.0,
-    "m_DefaultValue": 0.0,
-    "m_Labels": []
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasData",
+    "m_ObjectId": "770b75583f6740d3bff3f12c44630008",
+    "supportsMotionVectors": false
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasSubTarget",
+    "m_ObjectId": "786640f9ee3344dbb15a7654dbef302f"
 }
 
 {
@@ -1918,6 +2032,7 @@
     "m_DisplayName": "B",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "B",
     "m_StageCapability": 3,
     "m_Value": {
@@ -1966,11 +2081,13 @@
     "m_DisplayName": "Cutoff",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "_Cutoff",
     "m_StageCapability": 2,
     "m_Value": 0.0,
-    "m_DefaultValue": 0.0,
-    "m_Labels": []
+    "m_DefaultValue": 0.5,
+    "m_Labels": [],
+    "m_LiteralMode": false
 }
 
 {
@@ -1981,6 +2098,7 @@
     "m_DisplayName": "Out",
     "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "Out",
     "m_StageCapability": 3,
     "m_Value": {
@@ -1994,7 +2112,8 @@
         "y": 0.0,
         "z": 0.0,
         "w": 0.0
-    }
+    },
+    "m_LiteralMode": false
 }
 
 {
@@ -2005,11 +2124,65 @@
     "m_DisplayName": "Stroke Thickness",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "_Stroke_Thickness",
     "m_StageCapability": 3,
     "m_Value": 0.05000000074505806,
-    "m_DefaultValue": 0.0,
-    "m_Labels": []
+    "m_DefaultValue": 0.10000000149011612,
+    "m_Labels": [],
+    "m_LiteralMode": false
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.BooleanMaterialSlot",
+    "m_ObjectId": "8e75f227d53b48f88923505a2a65fc0a",
+    "m_Id": 275395558,
+    "m_DisplayName": "Preview Value",
+    "m_SlotType": 0,
+    "m_Hidden": false,
+    "m_HideConnector": true,
+    "m_ShaderOutputName": "_Preview_Value",
+    "m_StageCapability": 3,
+    "m_Value": false,
+    "m_DefaultValue": false
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.StickyNoteData",
+    "m_ObjectId": "908f2998d914462585c13e88ccb02b5a",
+    "m_Title": "RectTransform Size",
+    "m_Content": "This subgraph promotes a hidden \"_RectTransformSize\" Vector4 property and allows changing the preview value with a slider.\n\nUse with the RectTransform Size component from the Samples.\nSize = RectTransform's Size in Canvas space.\nScale Factor = Canvas Scale Factor\nPixel Per Unit = Canvas PPU",
+    "m_TextSize": 0,
+    "m_Theme": 1,
+    "m_Position": {
+        "serializedVersion": "2",
+        "x": -1453.0,
+        "y": 647.0,
+        "width": 312.0,
+        "height": 159.0
+    },
+    "m_Group": {
+        "m_Id": ""
+    }
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
+    "m_ObjectId": "91e753db931642f59c531a58da1f09ff",
+    "m_Id": -181240572,
+    "m_DisplayName": "PreviewWidth",
+    "m_SlotType": 0,
+    "m_Hidden": false,
+    "m_HideConnector": true,
+    "m_ShaderOutputName": "_PreviewWidth",
+    "m_StageCapability": 3,
+    "m_Value": 100.0,
+    "m_DefaultValue": 100.0,
+    "m_Labels": [],
+    "m_LiteralMode": false
 }
 
 {
@@ -2051,6 +2224,12 @@
     }
 }
 
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasSubTarget",
+    "m_ObjectId": "93d4f58b92b34b30a417d57972928aa3"
+}
+
 {
     "m_SGVersion": 0,
     "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
@@ -2059,11 +2238,55 @@
     "m_DisplayName": "Fill",
     "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "Fill",
     "m_StageCapability": 3,
     "m_Value": 0.0,
     "m_DefaultValue": 0.0,
-    "m_Labels": []
+    "m_Labels": [],
+    "m_LiteralMode": false
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.SubGraphNode",
+    "m_ObjectId": "950b28e11f404f39814cfab63c53757a",
+    "m_Group": {
+        "m_Id": ""
+    },
+    "m_Name": "Selectable State",
+    "m_DrawState": {
+        "m_Expanded": true,
+        "m_Position": {
+            "serializedVersion": "2",
+            "x": -2547.999755859375,
+            "y": 200.0,
+            "width": 256.0,
+            "height": 122.99996948242188
+        }
+    },
+    "m_Slots": [
+        {
+            "m_Id": "119603bd97394705b6221d021e6bc5ce"
+        }
+    ],
+    "synonyms": [],
+    "m_Precision": 0,
+    "m_PreviewExpanded": false,
+    "m_DismissedVersion": 0,
+    "m_PreviewMode": 0,
+    "m_CustomColors": {
+        "m_SerializableColors": []
+    },
+    "m_SerializedSubGraph": "{\n    \"subGraph\": {\n        \"fileID\": -5475051401550479605,\n        \"guid\": \"9cc8eedec3988455885bdb12866a33d6\",\n        \"type\": 3\n    }\n}",
+    "m_PropertyGuids": [],
+    "m_PropertyIds": [],
+    "m_Dropdowns": [
+        "_Preview"
+    ],
+    "m_DropdownSelectedEntries": [
+        "Normal"
+    ]
 }
 
 {
@@ -2074,6 +2297,7 @@
     "m_DisplayName": "A",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "A",
     "m_StageCapability": 3,
     "m_Value": {
@@ -2122,13 +2346,103 @@
     "m_DisplayName": "Radius",
     "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "Out",
     "m_StageCapability": 3,
     "m_Value": 0.0,
     "m_DefaultValue": 0.0,
+    "m_Labels": [],
+    "m_LiteralMode": false
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.Vector2MaterialSlot",
+    "m_ObjectId": "9a4f270a2f924d0495245bce51c8fce1",
+    "m_Id": 1,
+    "m_DisplayName": "Size",
+    "m_SlotType": 1,
+    "m_Hidden": false,
+    "m_HideConnector": false,
+    "m_ShaderOutputName": "Size",
+    "m_StageCapability": 3,
+    "m_Value": {
+        "x": 0.0,
+        "y": 0.0
+    },
+    "m_DefaultValue": {
+        "x": 0.0,
+        "y": 0.0
+    },
     "m_Labels": []
 }
 
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.SubGraphNode",
+    "m_ObjectId": "9a5d634ce20340888d72507390df323e",
+    "m_Group": {
+        "m_Id": ""
+    },
+    "m_Name": "Rect Transform Size",
+    "m_DrawState": {
+        "m_Expanded": true,
+        "m_Position": {
+            "serializedVersion": "2",
+            "x": -1139.0,
+            "y": 641.0000610351563,
+            "width": 165.0,
+            "height": 228.0
+        }
+    },
+    "m_Slots": [
+        {
+            "m_Id": "91e753db931642f59c531a58da1f09ff"
+        },
+        {
+            "m_Id": "0417a9d3d9da49039322baa40f50637a"
+        },
+        {
+            "m_Id": "eee233e20a494b61b151bd882cc34bdf"
+        },
+        {
+            "m_Id": "fc259020dbe44e04b9f4feab2a025ce3"
+        },
+        {
+            "m_Id": "9a4f270a2f924d0495245bce51c8fce1"
+        },
+        {
+            "m_Id": "52ee1b26ed4f4a09a6e1575f956d92f0"
+        },
+        {
+            "m_Id": "dc12f7da77014ca2b8317954d81efd61"
+        }
+    ],
+    "synonyms": [],
+    "m_Precision": 0,
+    "m_PreviewExpanded": false,
+    "m_DismissedVersion": 0,
+    "m_PreviewMode": 0,
+    "m_CustomColors": {
+        "m_SerializableColors": []
+    },
+    "m_SerializedSubGraph": "{\n    \"subGraph\": {\n        \"fileID\": -5475051401550479605,\n        \"guid\": \"aa041986c041b4dc1b5bf0b2cd2d86e8\",\n        \"type\": 3\n    }\n}",
+    "m_PropertyGuids": [
+        "975f2db3-e792-46e7-9bf8-3a4cbe4fb068",
+        "373c703c-395b-43d3-91ba-78b9497021e7",
+        "2747a643-8db3-4ffc-9923-55aa70fb2549",
+        "451bbdf7-6136-4a6e-a5c8-4918d2ea4b95"
+    ],
+    "m_PropertyIds": [
+        -181240572,
+        716604351,
+        -1949568231,
+        -2106065226
+    ],
+    "m_Dropdowns": [],
+    "m_DropdownSelectedEntries": []
+}
+
 {
     "m_SGVersion": 0,
     "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
@@ -2137,11 +2451,13 @@
     "m_DisplayName": "SDFStroke",
     "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "SDFStroke",
     "m_StageCapability": 3,
     "m_Value": 0.0,
     "m_DefaultValue": 0.0,
-    "m_Labels": []
+    "m_Labels": [],
+    "m_LiteralMode": false
 }
 
 {
@@ -2152,12 +2468,20 @@
     "m_DisplayName": "B",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "B",
     "m_StageCapability": 3,
     "m_Value": false,
     "m_DefaultValue": false
 }
 
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasData",
+    "m_ObjectId": "9faba2e0409944e4974405ecba3e0d98",
+    "supportsMotionVectors": false
+}
+
 {
     "m_SGVersion": 0,
     "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot",
@@ -2166,6 +2490,7 @@
     "m_DisplayName": "True",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "True",
     "m_StageCapability": 3,
     "m_Value": {
@@ -2179,7 +2504,8 @@
         "y": 0.0,
         "z": 0.0,
         "w": 0.0
-    }
+    },
+    "m_LiteralMode": false
 }
 
 {
@@ -2190,6 +2516,7 @@
     "m_DisplayName": "False",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "False",
     "m_StageCapability": 3,
     "m_Value": {
@@ -2203,7 +2530,8 @@
         "y": 0.0,
         "z": 0.0,
         "w": 0.0
-    }
+    },
+    "m_LiteralMode": false
 }
 
 {
@@ -2214,6 +2542,7 @@
     "m_DisplayName": "Width Height",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "_Width_Height",
     "m_StageCapability": 3,
     "m_Value": {
@@ -2235,12 +2564,39 @@
     "m_DisplayName": "IsNormal",
     "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "IsNormal",
     "m_StageCapability": 3,
     "m_Value": false,
     "m_DefaultValue": false
 }
 
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasSubTarget",
+    "m_ObjectId": "a73a4874f79b46329c1e3f2bad509a45"
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.StickyNoteData",
+    "m_ObjectId": "a7f4ae56ae9b476ba8d5cf77d66b1885",
+    "m_Title": "Toggle State",
+    "m_Content": "This subgraph promotes a hidden \"isOn\" Boolean property and allows changing the preview value with a checkbox.\n\nUse with the Sample Toggle Component.",
+    "m_TextSize": 0,
+    "m_Theme": 1,
+    "m_Position": {
+        "serializedVersion": "2",
+        "x": -1818.0,
+        "y": 440.0,
+        "width": 152.0,
+        "height": 153.0
+    },
+    "m_Group": {
+        "m_Id": ""
+    }
+}
+
 {
     "m_SGVersion": 0,
     "m_Type": "UnityEditor.ShaderGraph.BooleanMaterialSlot",
@@ -2249,12 +2605,19 @@
     "m_DisplayName": "Keep Aspect Ratio",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "_Keep_Aspect_Ratio",
     "m_StageCapability": 3,
     "m_Value": true,
     "m_DefaultValue": false
 }
 
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasSubTarget",
+    "m_ObjectId": "ad0511b594294cf9ba9546e82b5dbf19"
+}
+
 {
     "m_SGVersion": 0,
     "m_Type": "UnityEditor.ShaderGraph.Vector2MaterialSlot",
@@ -2263,6 +2626,7 @@
     "m_DisplayName": "Size",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "_Size",
     "m_StageCapability": 3,
     "m_Value": {
@@ -2276,6 +2640,32 @@
     "m_Labels": []
 }
 
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.Vector4MaterialSlot",
+    "m_ObjectId": "b1c496298e0d44dd80774b249a75fd2f",
+    "m_Id": 0,
+    "m_DisplayName": "In",
+    "m_SlotType": 0,
+    "m_Hidden": false,
+    "m_HideConnector": false,
+    "m_ShaderOutputName": "In",
+    "m_StageCapability": 3,
+    "m_Value": {
+        "x": 0.0,
+        "y": 0.0,
+        "z": 0.0,
+        "w": 0.0
+    },
+    "m_DefaultValue": {
+        "x": 0.0,
+        "y": 0.0,
+        "z": 0.0,
+        "w": 0.0
+    },
+    "m_Labels": []
+}
+
 {
     "m_SGVersion": 0,
     "m_Type": "UnityEditor.ShaderGraph.ColorRGBMaterialSlot",
@@ -2284,6 +2674,7 @@
     "m_DisplayName": "Base Color",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "BaseColor",
     "m_StageCapability": 2,
     "m_Value": {
@@ -2314,6 +2705,7 @@
     "m_DisplayName": "In",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "In",
     "m_StageCapability": 3,
     "m_Value": {
@@ -2327,7 +2719,8 @@
         "y": 0.0,
         "z": 0.0,
         "w": 0.0
-    }
+    },
+    "m_LiteralMode": false
 }
 
 {
@@ -2338,6 +2731,7 @@
     "m_DisplayName": "",
     "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "",
     "m_StageCapability": 3,
     "m_Value": {
@@ -2351,7 +2745,8 @@
         "y": 0.0,
         "z": 0.0,
         "w": 0.0
-    }
+    },
+    "m_LiteralMode": true
 }
 
 {
@@ -2393,6 +2788,13 @@
     }
 }
 
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasData",
+    "m_ObjectId": "c1e7ee39856a45b3ab5d7e007395d447",
+    "supportsMotionVectors": false
+}
+
 {
     "m_SGVersion": 0,
     "m_Type": "UnityEditor.ShaderGraph.SubGraphNode",
@@ -2433,38 +2835,16 @@
 
 {
     "m_SGVersion": 0,
-    "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
-    "m_ObjectId": "c92cdb57714e452c86f5b0738d528c1f",
-    "m_Id": 0,
-    "m_DisplayName": "State",
-    "m_SlotType": 1,
-    "m_Hidden": false,
-    "m_ShaderOutputName": "_State",
-    "m_StageCapability": 3,
-    "m_Value": 0.0,
-    "m_DefaultValue": 0.0,
-    "m_Labels": []
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasData",
+    "m_ObjectId": "c373f1894323494b8c901d0dde2cbffd",
+    "supportsMotionVectors": false
 }
 
 {
     "m_SGVersion": 0,
-    "m_Type": "UnityEditor.ShaderGraph.Vector2MaterialSlot",
-    "m_ObjectId": "cd7b17cc88624bdea99850cc2ecf98c0",
-    "m_Id": 0,
-    "m_DisplayName": "Size",
-    "m_SlotType": 1,
-    "m_Hidden": false,
-    "m_ShaderOutputName": "_RectTransformSize",
-    "m_StageCapability": 3,
-    "m_Value": {
-        "x": 1.0,
-        "y": 1.0
-    },
-    "m_DefaultValue": {
-        "x": 1.0,
-        "y": 1.0
-    },
-    "m_Labels": []
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasData",
+    "m_ObjectId": "cafe4dfb66fa41449a2bbf6804a520f5",
+    "supportsMotionVectors": false
 }
 
 {
@@ -2475,44 +2855,19 @@
     "m_DisplayName": "Edge Min",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "_Edge_Min",
     "m_StageCapability": 3,
     "m_Value": 0.0,
     "m_DefaultValue": 0.0,
-    "m_Labels": []
+    "m_Labels": [],
+    "m_LiteralMode": false
 }
 
 {
     "m_SGVersion": 0,
-    "m_Type": "UnityEditor.ShaderGraph.SelectableStateNode",
-    "m_ObjectId": "d053b21c961d4995a06b47e74b4c2409",
-    "m_Group": {
-        "m_Id": ""
-    },
-    "m_Name": "Selectable State",
-    "m_DrawState": {
-        "m_Expanded": true,
-        "m_Position": {
-            "serializedVersion": "2",
-            "x": -2716.0,
-            "y": 200.0,
-            "width": 140.0,
-            "height": 77.0
-        }
-    },
-    "m_Slots": [
-        {
-            "m_Id": "c92cdb57714e452c86f5b0738d528c1f"
-        }
-    ],
-    "synonyms": [],
-    "m_Precision": 0,
-    "m_PreviewExpanded": true,
-    "m_DismissedVersion": 0,
-    "m_PreviewMode": 0,
-    "m_CustomColors": {
-        "m_SerializableColors": []
-    }
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasSubTarget",
+    "m_ObjectId": "d0a4787e344f48f5a85fe74bb0000b0c"
 }
 
 {
@@ -2521,8 +2876,8 @@
     "m_ObjectId": "d23ccb49d0e14387b259d3fc88498036",
     "m_Title": "Emission",
     "m_Position": {
-        "x": -1453.9998779296875,
-        "y": 41.00002670288086
+        "x": -1454.0,
+        "y": 41.0
     }
 }
 
@@ -2540,6 +2895,7 @@
     "m_DisplayName": "A",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "A",
     "m_StageCapability": 3,
     "m_Value": false,
@@ -2554,12 +2910,37 @@
     "m_DisplayName": "IsSelected",
     "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "IsSelected",
     "m_StageCapability": 3,
     "m_Value": false,
     "m_DefaultValue": false
 }
 
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
+    "m_ObjectId": "dc12f7da77014ca2b8317954d81efd61",
+    "m_Id": 3,
+    "m_DisplayName": "Pixel_Per_Unit",
+    "m_SlotType": 1,
+    "m_Hidden": false,
+    "m_HideConnector": false,
+    "m_ShaderOutputName": "Pixel_Per_Unit",
+    "m_StageCapability": 3,
+    "m_Value": 0.0,
+    "m_DefaultValue": 0.0,
+    "m_Labels": [],
+    "m_LiteralMode": false
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasData",
+    "m_ObjectId": "dd2d0b7f72cd40b5b04a235ffee51a1b",
+    "supportsMotionVectors": false
+}
+
 {
     "m_SGVersion": 0,
     "m_Type": "UnityEditor.ShaderGraph.BooleanMaterialSlot",
@@ -2568,6 +2949,7 @@
     "m_DisplayName": "Stroke Thickness Relative",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "_Stroke_Thickness_Relative",
     "m_StageCapability": 3,
     "m_Value": true,
@@ -2582,6 +2964,7 @@
     "m_DisplayName": "B",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "B",
     "m_StageCapability": 3,
     "m_Value": {
@@ -2595,7 +2978,8 @@
         "y": 0.0,
         "z": 0.0,
         "w": 0.0
-    }
+    },
+    "m_LiteralMode": false
 }
 
 {
@@ -2696,21 +3080,6 @@
     ]
 }
 
-{
-    "m_SGVersion": 0,
-    "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
-    "m_ObjectId": "eaca5acb307b4e5cad2b5e2ae96e47e2",
-    "m_Id": 830530724,
-    "m_DisplayName": "State",
-    "m_SlotType": 0,
-    "m_Hidden": false,
-    "m_ShaderOutputName": "_State",
-    "m_StageCapability": 3,
-    "m_Value": 0.0,
-    "m_DefaultValue": 0.0,
-    "m_Labels": []
-}
-
 {
     "m_SGVersion": 1,
     "m_Type": "UnityEditor.ShaderGraph.Internal.Vector1ShaderProperty",
@@ -2718,6 +3087,9 @@
     "m_Guid": {
         "m_GuidSerialized": "d9416492-7d23-4a82-98ea-7bd9dfffc0da"
     },
+    "promotedFromAssetID": "",
+    "promotedFromCategoryName": "",
+    "promotedOrdering": -1,
     "m_Name": "Radius",
     "m_DefaultRefNameVersion": 1,
     "m_RefNameGeneratedByDisplayName": "Radius",
@@ -2730,13 +3102,58 @@
     "m_Precision": 0,
     "overrideHLSLDeclaration": false,
     "hlslDeclarationOverride": 0,
+    "hideConnector": false,
     "m_Hidden": false,
+    "m_PerRendererData": false,
+    "m_customAttributes": [],
     "m_Value": 0.20000000298023225,
     "m_FloatType": 0,
+    "m_LiteralFloatMode": false,
     "m_RangeValues": {
         "x": 0.0,
         "y": 1.0
-    }
+    },
+    "m_SliderType": 0,
+    "m_SliderPower": 3.0,
+    "m_EnumType": 0,
+    "m_CSharpEnumString": "",
+    "m_EnumNames": [
+        "Default"
+    ],
+    "m_EnumValues": [
+        0
+    ]
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasData",
+    "m_ObjectId": "ec0773b35401476ea81c2e6afc45d427",
+    "supportsMotionVectors": false
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
+    "m_ObjectId": "eee233e20a494b61b151bd882cc34bdf",
+    "m_Id": -1949568231,
+    "m_DisplayName": "PreviewScaleFactor",
+    "m_SlotType": 0,
+    "m_Hidden": false,
+    "m_HideConnector": true,
+    "m_ShaderOutputName": "_PreviewScaleFactor",
+    "m_StageCapability": 3,
+    "m_Value": 1.0,
+    "m_DefaultValue": 1.0,
+    "m_Labels": [],
+    "m_LiteralMode": false
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasData",
+    "m_ObjectId": "ef3ad75715cb4c11b9e3357285c4829f",
+    "supportsMotionVectors": false
 }
 
 {
@@ -2747,6 +3164,7 @@
     "m_DisplayName": "Predicate",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "Predicate",
     "m_StageCapability": 3,
     "m_Value": false,
@@ -2755,40 +3173,32 @@
 
 {
     "m_SGVersion": 0,
-    "m_Type": "UnityEditor.ShaderGraph.BooleanMaterialSlot",
-    "m_ObjectId": "f2115f407dec4a39ac4140014414379e",
-    "m_Id": 0,
-    "m_DisplayName": "State",
-    "m_SlotType": 1,
-    "m_Hidden": false,
-    "m_ShaderOutputName": "_isOn",
-    "m_StageCapability": 3,
-    "m_Value": false,
-    "m_DefaultValue": false
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasData",
+    "m_ObjectId": "f795741071454171a540b0e05ba89099",
+    "supportsMotionVectors": false
 }
 
 {
     "m_SGVersion": 0,
-    "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot",
-    "m_ObjectId": "f2261588d28d47169d7efe8d68ae6ee3",
-    "m_Id": 0,
-    "m_DisplayName": "In",
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasSubTarget",
+    "m_ObjectId": "f84934c605d0438b9d9b65af0e04993e"
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
+    "m_ObjectId": "fc259020dbe44e04b9f4feab2a025ce3",
+    "m_Id": -2106065226,
+    "m_DisplayName": "PreviewPPU",
     "m_SlotType": 0,
     "m_Hidden": false,
-    "m_ShaderOutputName": "In",
+    "m_HideConnector": true,
+    "m_ShaderOutputName": "_PreviewPPU",
     "m_StageCapability": 3,
-    "m_Value": {
-        "x": 0.0,
-        "y": 0.0,
-        "z": 0.0,
-        "w": 0.0
-    },
-    "m_DefaultValue": {
-        "x": 0.0,
-        "y": 0.0,
-        "z": 0.0,
-        "w": 0.0
-    }
+    "m_Value": 100.0,
+    "m_DefaultValue": 100.0,
+    "m_Labels": [],
+    "m_LiteralMode": false
 }
 
 {
@@ -2843,6 +3253,7 @@
     "m_DisplayName": "IsDisabled",
     "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "IsDisabled",
     "m_StageCapability": 3,
     "m_Value": false,
diff --git a/Packages/com.unity.shadergraph/Samples~/UGUIShaders/Examples/Backgrounds/Rounded Rectangle Bubble.shadergraph b/Packages/com.unity.shadergraph/Samples~/UGUIShaders/Examples/Backgrounds/Rounded Rectangle Bubble.shadergraph
index a0e4db51a8e..35c56e2afa0 100644
--- a/Packages/com.unity.shadergraph/Samples~/UGUIShaders/Examples/Backgrounds/Rounded Rectangle Bubble.shadergraph	
+++ b/Packages/com.unity.shadergraph/Samples~/UGUIShaders/Examples/Backgrounds/Rounded Rectangle Bubble.shadergraph	
@@ -142,7 +142,7 @@
             "m_Id": "c9c9ce97e4d84dd6bbf519d07c661f1f"
         },
         {
-            "m_Id": "bd8b9365c5da42d996d49e14a0620014"
+            "m_Id": "fb9876c4bf1947578e5673a1448e7e37"
         }
     ],
     "m_GroupDatas": [
@@ -595,34 +595,6 @@
                 "m_SlotId": 0
             }
         },
-        {
-            "m_OutputSlot": {
-                "m_Node": {
-                    "m_Id": "bd8b9365c5da42d996d49e14a0620014"
-                },
-                "m_SlotId": 0
-            },
-            "m_InputSlot": {
-                "m_Node": {
-                    "m_Id": "1f07aefa5b68404c8d43c8bf46c671e3"
-                },
-                "m_SlotId": 1786236159
-            }
-        },
-        {
-            "m_OutputSlot": {
-                "m_Node": {
-                    "m_Id": "bd8b9365c5da42d996d49e14a0620014"
-                },
-                "m_SlotId": 0
-            },
-            "m_InputSlot": {
-                "m_Node": {
-                    "m_Id": "78cbdf43967c4ab08943f16d22b6add6"
-                },
-                "m_SlotId": 1786236159
-            }
-        },
         {
             "m_OutputSlot": {
                 "m_Node": {
@@ -706,6 +678,34 @@
                 },
                 "m_SlotId": -1312023481
             }
+        },
+        {
+            "m_OutputSlot": {
+                "m_Node": {
+                    "m_Id": "fb9876c4bf1947578e5673a1448e7e37"
+                },
+                "m_SlotId": 1
+            },
+            "m_InputSlot": {
+                "m_Node": {
+                    "m_Id": "1f07aefa5b68404c8d43c8bf46c671e3"
+                },
+                "m_SlotId": 1786236159
+            }
+        },
+        {
+            "m_OutputSlot": {
+                "m_Node": {
+                    "m_Id": "fb9876c4bf1947578e5673a1448e7e37"
+                },
+                "m_SlotId": 1
+            },
+            "m_InputSlot": {
+                "m_Node": {
+                    "m_Id": "78cbdf43967c4ab08943f16d22b6add6"
+                },
+                "m_SlotId": 1786236159
+            }
         }
     ],
     "m_VertexContext": {
@@ -764,6 +764,7 @@
     "m_DisplayName": "Bubble Size",
     "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "Out",
     "m_StageCapability": 3,
     "m_Value": {
@@ -825,6 +826,7 @@
     "m_DisplayName": "UV",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "_UV",
     "m_StageCapability": 3,
     "m_Value": {
@@ -858,7 +860,7 @@
     },
     "m_Slots": [
         {
-            "m_Id": "5cfa5b5451804be184cfc5d03a23dfec"
+            "m_Id": "fd306188a2dc4890b3816d181eaafcb9"
         },
         {
             "m_Id": "a1b2e3d21f784d03be9e4e78a07a9436"
@@ -888,6 +890,7 @@
     "m_DisplayName": "B",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "B",
     "m_StageCapability": 3,
     "m_Value": {
@@ -901,7 +904,8 @@
         "y": 0.0,
         "z": 0.0,
         "w": 0.0
-    }
+    },
+    "m_LiteralMode": false
 }
 
 {
@@ -912,6 +916,7 @@
     "m_DisplayName": "B",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "B",
     "m_StageCapability": 3,
     "m_Value": {
@@ -925,7 +930,8 @@
         "y": 0.0,
         "z": 0.0,
         "w": 0.0
-    }
+    },
+    "m_LiteralMode": false
 }
 
 {
@@ -972,11 +978,13 @@
     "m_DisplayName": "U",
     "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "U",
     "m_StageCapability": 3,
     "m_Value": 0.0,
     "m_DefaultValue": 0.0,
-    "m_Labels": []
+    "m_Labels": [],
+    "m_LiteralMode": false
 }
 
 {
@@ -987,6 +995,7 @@
     "m_DisplayName": "UV",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "_UV",
     "m_StageCapability": 3,
     "m_Value": {
@@ -1008,6 +1017,7 @@
     "m_DisplayName": "In",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "In",
     "m_StageCapability": 3,
     "m_Value": {
@@ -1021,7 +1031,8 @@
         "y": 0.0,
         "z": 0.0,
         "w": 0.0
-    }
+    },
+    "m_LiteralMode": false
 }
 
 {
@@ -1032,6 +1043,7 @@
     "m_DisplayName": "B",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "B",
     "m_StageCapability": 3,
     "m_Value": {
@@ -1045,7 +1057,8 @@
         "y": 0.0,
         "z": 0.0,
         "w": 0.0
-    }
+    },
+    "m_LiteralMode": false
 }
 
 {
@@ -1145,11 +1158,13 @@
     "m_DisplayName": "Bubble Outline Thickness",
     "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "Out",
     "m_StageCapability": 3,
     "m_Value": 0.0,
     "m_DefaultValue": 0.0,
-    "m_Labels": []
+    "m_Labels": [],
+    "m_LiteralMode": false
 }
 
 {
@@ -1160,6 +1175,7 @@
     "m_DisplayName": "UV",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "_UV",
     "m_StageCapability": 3,
     "m_Value": {
@@ -1181,6 +1197,7 @@
     "m_DisplayName": "A",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "A",
     "m_StageCapability": 3,
     "m_Value": {
@@ -1263,8 +1280,8 @@
     "m_ObjectId": "1957720751e0477c83f6df4111bc4ae5",
     "m_Title": "Main Shape and Border",
     "m_Position": {
-        "x": -1272.666748046875,
-        "y": 166.0
+        "x": -1272.0,
+        "y": 166.00001525878907
     }
 }
 
@@ -1276,6 +1293,7 @@
     "m_DisplayName": "Base Color",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "BaseColor",
     "m_StageCapability": 2,
     "m_Value": {
@@ -1306,6 +1324,7 @@
     "m_DisplayName": "Pivot Point",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "_Pivot_Point",
     "m_StageCapability": 3,
     "m_Value": {
@@ -1327,6 +1346,7 @@
     "m_DisplayName": "Emission",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "Emission",
     "m_StageCapability": 2,
     "m_Value": {
@@ -1357,6 +1377,7 @@
     "m_DisplayName": "Size",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "_Size",
     "m_StageCapability": 3,
     "m_Value": {
@@ -1378,11 +1399,13 @@
     "m_DisplayName": "Cutoff",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "_Cutoff",
     "m_StageCapability": 2,
     "m_Value": 0.0,
-    "m_DefaultValue": 0.0,
-    "m_Labels": []
+    "m_DefaultValue": 0.5,
+    "m_Labels": [],
+    "m_LiteralMode": false
 }
 
 {
@@ -1393,6 +1416,7 @@
     "m_DisplayName": "B",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "B",
     "m_StageCapability": 3,
     "m_Value": {
@@ -1406,7 +1430,8 @@
         "y": 0.0,
         "z": 0.0,
         "w": 0.0
-    }
+    },
+    "m_LiteralMode": false
 }
 
 {
@@ -1417,6 +1442,7 @@
     "m_DisplayName": "Out",
     "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "Out",
     "m_StageCapability": 3,
     "m_Value": {
@@ -1430,7 +1456,8 @@
         "y": 0.0,
         "z": 0.0,
         "w": 0.0
-    }
+    },
+    "m_LiteralMode": false
 }
 
 {
@@ -1441,6 +1468,7 @@
     "m_DisplayName": "Transparent Background",
     "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "Out",
     "m_StageCapability": 3,
     "m_Value": false,
@@ -1555,6 +1583,7 @@
     "m_DisplayName": "A",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "A",
     "m_StageCapability": 3,
     "m_Value": {
@@ -1568,7 +1597,8 @@
         "y": 0.0,
         "z": 0.0,
         "w": 0.0
-    }
+    },
+    "m_LiteralMode": false
 }
 
 {
@@ -1579,6 +1609,7 @@
     "m_DisplayName": "Out",
     "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "Out",
     "m_StageCapability": 3,
     "m_Value": {
@@ -1592,7 +1623,8 @@
         "y": 0.0,
         "z": 0.0,
         "w": 0.0
-    }
+    },
+    "m_LiteralMode": false
 }
 
 {
@@ -1603,6 +1635,7 @@
     "m_DisplayName": "",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "",
     "m_StageCapability": 3,
     "m_Value": {
@@ -1616,7 +1649,8 @@
         "y": 0.0,
         "z": 0.0,
         "w": 0.0
-    }
+    },
+    "m_LiteralMode": false
 }
 
 {
@@ -1729,6 +1763,7 @@
     "m_DisplayName": "Size",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "_Size",
     "m_StageCapability": 3,
     "m_Value": {
@@ -1796,11 +1831,13 @@
     "m_DisplayName": "Edge Max",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "_Edge_Max",
     "m_StageCapability": 3,
     "m_Value": 0.001500000013038516,
-    "m_DefaultValue": 0.0,
-    "m_Labels": []
+    "m_DefaultValue": 0.009999999776482582,
+    "m_Labels": [],
+    "m_LiteralMode": false
 }
 
 {
@@ -1811,6 +1848,7 @@
     "m_DisplayName": "T",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "T",
     "m_StageCapability": 3,
     "m_Value": {
@@ -1824,7 +1862,8 @@
         "y": 0.0,
         "z": 0.0,
         "w": 0.0
-    }
+    },
+    "m_LiteralMode": false
 }
 
 {
@@ -1835,6 +1874,7 @@
     "m_DisplayName": "B",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "B",
     "m_StageCapability": 3,
     "m_Value": {
@@ -1911,27 +1951,6 @@
     }
 }
 
-{
-    "m_SGVersion": 0,
-    "m_Type": "UnityEditor.ShaderGraph.Vector2MaterialSlot",
-    "m_ObjectId": "33b75463743e4cc680d93d26e824094a",
-    "m_Id": 0,
-    "m_DisplayName": "Size",
-    "m_SlotType": 1,
-    "m_Hidden": false,
-    "m_ShaderOutputName": "_RectTransformSize",
-    "m_StageCapability": 3,
-    "m_Value": {
-        "x": 1.0,
-        "y": 1.0
-    },
-    "m_DefaultValue": {
-        "x": 100.0,
-        "y": 100.0
-    },
-    "m_Labels": []
-}
-
 {
     "m_SGVersion": 0,
     "m_Type": "UnityEditor.ShaderGraph.BooleanMaterialSlot",
@@ -1940,6 +1959,7 @@
     "m_DisplayName": "Keep Aspect Ratio",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "_Keep_Aspect_Ratio",
     "m_StageCapability": 3,
     "m_Value": true,
@@ -1979,6 +1999,23 @@
     ]
 }
 
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
+    "m_ObjectId": "365fa2001035433983f90f8f4401352a",
+    "m_Id": -2106065226,
+    "m_DisplayName": "PreviewPPU",
+    "m_SlotType": 0,
+    "m_Hidden": false,
+    "m_HideConnector": true,
+    "m_ShaderOutputName": "_PreviewPPU",
+    "m_StageCapability": 3,
+    "m_Value": 100.0,
+    "m_DefaultValue": 100.0,
+    "m_Labels": [],
+    "m_LiteralMode": false
+}
+
 {
     "m_SGVersion": 0,
     "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
@@ -1987,11 +2024,13 @@
     "m_DisplayName": "Gradient",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "_Gradient",
     "m_StageCapability": 2,
     "m_Value": 0.0,
     "m_DefaultValue": 0.0,
-    "m_Labels": []
+    "m_Labels": [],
+    "m_LiteralMode": false
 }
 
 {
@@ -2002,10 +2041,34 @@
     "m_DisplayName": "Stroke Thickness",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "_Stroke_Thickness",
     "m_StageCapability": 3,
     "m_Value": 0.029999999329447748,
-    "m_DefaultValue": 0.0,
+    "m_DefaultValue": 0.10000000149011612,
+    "m_Labels": [],
+    "m_LiteralMode": false
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.Vector2MaterialSlot",
+    "m_ObjectId": "3c6b79004e254fc7a741c0d2812fae0c",
+    "m_Id": 1,
+    "m_DisplayName": "Size",
+    "m_SlotType": 1,
+    "m_Hidden": false,
+    "m_HideConnector": false,
+    "m_ShaderOutputName": "Size",
+    "m_StageCapability": 3,
+    "m_Value": {
+        "x": 0.0,
+        "y": 0.0
+    },
+    "m_DefaultValue": {
+        "x": 0.0,
+        "y": 0.0
+    },
     "m_Labels": []
 }
 
@@ -2053,6 +2116,7 @@
     "m_DisplayName": "UV",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "UV",
     "m_StageCapability": 3,
     "m_Value": {
@@ -2075,6 +2139,7 @@
     "m_DisplayName": "Scale",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "_Scale",
     "m_StageCapability": 3,
     "m_Value": {
@@ -2096,6 +2161,7 @@
     "m_DisplayName": "A",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "A",
     "m_StageCapability": 3,
     "m_Value": {
@@ -2109,7 +2175,25 @@
         "y": 0.0,
         "z": 0.0,
         "w": 0.0
-    }
+    },
+    "m_LiteralMode": false
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
+    "m_ObjectId": "3fedf2b7b0c3467db0a3e28158b64373",
+    "m_Id": 3,
+    "m_DisplayName": "Pixel_Per_Unit",
+    "m_SlotType": 1,
+    "m_Hidden": false,
+    "m_HideConnector": false,
+    "m_ShaderOutputName": "Pixel_Per_Unit",
+    "m_StageCapability": 3,
+    "m_Value": 0.0,
+    "m_DefaultValue": 0.0,
+    "m_Labels": [],
+    "m_LiteralMode": false
 }
 
 {
@@ -2120,6 +2204,7 @@
     "m_DisplayName": "Center",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "Center",
     "m_StageCapability": 3,
     "m_Value": {
@@ -2140,7 +2225,7 @@
     "m_Group": {
         "m_Id": "c6ba68b10c0b4bb9ae6c9b31069da12e"
     },
-    "m_Name": "Scale",
+    "m_Name": "UV Scale",
     "m_DrawState": {
         "m_Expanded": false,
         "m_Position": {
@@ -2196,11 +2281,13 @@
     "m_DisplayName": "SDF",
     "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "SDF",
     "m_StageCapability": 3,
     "m_Value": 0.0,
     "m_DefaultValue": 0.0,
-    "m_Labels": []
+    "m_Labels": [],
+    "m_LiteralMode": false
 }
 
 {
@@ -2287,6 +2374,7 @@
     "m_DisplayName": "In",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "In",
     "m_StageCapability": 3,
     "m_Value": {
@@ -2300,7 +2388,8 @@
         "y": 0.0,
         "z": 0.0,
         "w": 0.0
-    }
+    },
+    "m_LiteralMode": false
 }
 
 {
@@ -2347,6 +2436,7 @@
     "m_DisplayName": "T",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "T",
     "m_StageCapability": 3,
     "m_Value": {
@@ -2360,7 +2450,8 @@
         "y": 0.0,
         "z": 0.0,
         "w": 0.0
-    }
+    },
+    "m_LiteralMode": false
 }
 
 {
@@ -2371,11 +2462,13 @@
     "m_DisplayName": "Alpha",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "Alpha",
     "m_StageCapability": 2,
     "m_Value": 1.0,
     "m_DefaultValue": 1.0,
-    "m_Labels": []
+    "m_Labels": [],
+    "m_LiteralMode": false
 }
 
 {
@@ -2386,6 +2479,7 @@
     "m_DisplayName": "Out",
     "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "Out",
     "m_StageCapability": 3,
     "m_Value": {
@@ -2473,6 +2567,7 @@
     "m_CastShadows": true,
     "m_ReceiveShadows": true,
     "m_DisableTint": false,
+    "m_Sort3DAs2DCompatible": false,
     "m_AdditionalMotionVectorMode": 0,
     "m_AlembicMotionVectors": false,
     "m_SupportsLODCrossFade": false,
@@ -2487,6 +2582,9 @@
     "m_Guid": {
         "m_GuidSerialized": "c4cd3f7c-4509-449f-9b24-84e4700ca551"
     },
+    "promotedFromAssetID": "",
+    "promotedFromCategoryName": "",
+    "promotedOrdering": -1,
     "m_Name": "Bubble Outline Thickness",
     "m_DefaultRefNameVersion": 1,
     "m_RefNameGeneratedByDisplayName": "Bubble Outline Thickness",
@@ -2499,13 +2597,27 @@
     "m_Precision": 0,
     "overrideHLSLDeclaration": false,
     "hlslDeclarationOverride": 0,
+    "hideConnector": false,
     "m_Hidden": false,
+    "m_PerRendererData": false,
+    "m_customAttributes": [],
     "m_Value": 0.014999999664723874,
     "m_FloatType": 0,
+    "m_LiteralFloatMode": false,
     "m_RangeValues": {
         "x": 0.0,
         "y": 1.0
-    }
+    },
+    "m_SliderType": 0,
+    "m_SliderPower": 3.0,
+    "m_EnumType": 0,
+    "m_CSharpEnumString": "",
+    "m_EnumNames": [
+        "Default"
+    ],
+    "m_EnumValues": [
+        0
+    ]
 }
 
 {
@@ -2516,11 +2628,13 @@
     "m_DisplayName": "Edge Max",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "_Edge_Max",
     "m_StageCapability": 3,
     "m_Value": 0.11999999731779099,
-    "m_DefaultValue": 0.0,
-    "m_Labels": []
+    "m_DefaultValue": 0.009999999776482582,
+    "m_Labels": [],
+    "m_LiteralMode": false
 }
 
 {
@@ -2577,36 +2691,13 @@
     "m_DisplayName": "Stroke Thickness Relative",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "_Stroke_Thickness_Relative",
     "m_StageCapability": 3,
     "m_Value": true,
     "m_DefaultValue": false
 }
 
-{
-    "m_SGVersion": 0,
-    "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot",
-    "m_ObjectId": "5cfa5b5451804be184cfc5d03a23dfec",
-    "m_Id": 0,
-    "m_DisplayName": "In",
-    "m_SlotType": 0,
-    "m_Hidden": false,
-    "m_ShaderOutputName": "In",
-    "m_StageCapability": 3,
-    "m_Value": {
-        "x": 0.0,
-        "y": 0.0,
-        "z": 0.0,
-        "w": 0.0
-    },
-    "m_DefaultValue": {
-        "x": 0.0,
-        "y": 0.0,
-        "z": 0.0,
-        "w": 0.0
-    }
-}
-
 {
     "m_SGVersion": 0,
     "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot",
@@ -2615,6 +2706,7 @@
     "m_DisplayName": "B",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "B",
     "m_StageCapability": 3,
     "m_Value": {
@@ -2628,7 +2720,8 @@
         "y": 0.0,
         "z": 0.0,
         "w": 0.0
-    }
+    },
+    "m_LiteralMode": false
 }
 
 {
@@ -2639,6 +2732,7 @@
     "m_DisplayName": "B",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "B",
     "m_StageCapability": 3,
     "m_Value": {
@@ -2652,7 +2746,8 @@
         "y": 0.0,
         "z": 0.0,
         "w": 0.0
-    }
+    },
+    "m_LiteralMode": false
 }
 
 {
@@ -2663,6 +2758,7 @@
     "m_DisplayName": "T",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "T",
     "m_StageCapability": 3,
     "m_Value": {
@@ -2676,7 +2772,8 @@
         "y": 0.0,
         "z": 0.0,
         "w": 0.0
-    }
+    },
+    "m_LiteralMode": false
 }
 
 {
@@ -2687,6 +2784,7 @@
     "m_DisplayName": "UVraw",
     "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "UVraw",
     "m_StageCapability": 3,
     "m_Value": {
@@ -2700,6 +2798,23 @@
     "m_Labels": []
 }
 
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
+    "m_ObjectId": "644f37bafaf5455ba908eb71140b70bd",
+    "m_Id": -1949568231,
+    "m_DisplayName": "PreviewScaleFactor",
+    "m_SlotType": 0,
+    "m_Hidden": false,
+    "m_HideConnector": true,
+    "m_ShaderOutputName": "_PreviewScaleFactor",
+    "m_StageCapability": 3,
+    "m_Value": 1.0,
+    "m_DefaultValue": 1.0,
+    "m_Labels": [],
+    "m_LiteralMode": false
+}
+
 {
     "m_SGVersion": 0,
     "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot",
@@ -2708,6 +2823,7 @@
     "m_DisplayName": "A",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "A",
     "m_StageCapability": 3,
     "m_Value": {
@@ -2721,7 +2837,8 @@
         "y": 0.0,
         "z": 0.0,
         "w": 0.0
-    }
+    },
+    "m_LiteralMode": false
 }
 
 {
@@ -2732,6 +2849,7 @@
     "m_DisplayName": "A",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "A",
     "m_StageCapability": 3,
     "m_Value": {
@@ -2745,7 +2863,8 @@
         "y": 0.0,
         "z": 0.0,
         "w": 0.0
-    }
+    },
+    "m_LiteralMode": false
 }
 
 {
@@ -2756,11 +2875,13 @@
     "m_DisplayName": "Stroke Thickness",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "_Stroke_Thickness",
     "m_StageCapability": 3,
     "m_Value": 0.029999999329447748,
-    "m_DefaultValue": 0.0,
-    "m_Labels": []
+    "m_DefaultValue": 0.10000000149011612,
+    "m_Labels": [],
+    "m_LiteralMode": false
 }
 
 {
@@ -2771,6 +2892,7 @@
     "m_DisplayName": "Out",
     "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "Out",
     "m_StageCapability": 3,
     "m_Value": {
@@ -2784,7 +2906,8 @@
         "y": 0.0,
         "z": 0.0,
         "w": 0.0
-    }
+    },
+    "m_LiteralMode": false
 }
 
 {
@@ -2794,6 +2917,9 @@
     "m_Guid": {
         "m_GuidSerialized": "3dc4e416-f8ec-4d15-a045-dc9bb125dcc2"
     },
+    "promotedFromAssetID": "",
+    "promotedFromCategoryName": "",
+    "promotedOrdering": -1,
     "m_Name": "Radius",
     "m_DefaultRefNameVersion": 1,
     "m_RefNameGeneratedByDisplayName": "Radius",
@@ -2806,13 +2932,27 @@
     "m_Precision": 0,
     "overrideHLSLDeclaration": false,
     "hlslDeclarationOverride": 0,
+    "hideConnector": false,
     "m_Hidden": false,
+    "m_PerRendererData": false,
+    "m_customAttributes": [],
     "m_Value": 0.10000000149011612,
     "m_FloatType": 0,
+    "m_LiteralFloatMode": false,
     "m_RangeValues": {
         "x": 0.0,
         "y": 1.0
-    }
+    },
+    "m_SliderType": 0,
+    "m_SliderPower": 3.0,
+    "m_EnumType": 0,
+    "m_CSharpEnumString": "",
+    "m_EnumNames": [
+        "Default"
+    ],
+    "m_EnumValues": [
+        0
+    ]
 }
 
 {
@@ -2823,6 +2963,7 @@
     "m_DisplayName": "UV",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "_UV",
     "m_StageCapability": 3,
     "m_Value": {
@@ -2880,6 +3021,7 @@
     "m_DisplayName": "",
     "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "",
     "m_StageCapability": 3,
     "m_Value": {
@@ -2893,7 +3035,8 @@
         "y": 0.0,
         "z": 0.0,
         "w": 0.0
-    }
+    },
+    "m_LiteralMode": true
 }
 
 {
@@ -2904,11 +3047,13 @@
     "m_DisplayName": "V",
     "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "V",
     "m_StageCapability": 3,
     "m_Value": 0.0,
     "m_DefaultValue": 0.0,
-    "m_Labels": []
+    "m_Labels": [],
+    "m_LiteralMode": false
 }
 
 {
@@ -3019,11 +3164,13 @@
     "m_DisplayName": "Edge Min",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "_Edge_Min",
     "m_StageCapability": 3,
     "m_Value": 0.0,
     "m_DefaultValue": 0.0,
-    "m_Labels": []
+    "m_Labels": [],
+    "m_LiteralMode": false
 }
 
 {
@@ -3034,11 +3181,13 @@
     "m_DisplayName": "Out",
     "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "Out",
     "m_StageCapability": 2,
     "m_Value": 0.0,
     "m_DefaultValue": 0.0,
-    "m_Labels": []
+    "m_Labels": [],
+    "m_LiteralMode": false
 }
 
 {
@@ -3049,6 +3198,7 @@
     "m_DisplayName": "UVrepeat",
     "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "UVrepeat",
     "m_StageCapability": 3,
     "m_Value": {
@@ -3107,6 +3257,23 @@
     }
 }
 
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
+    "m_ObjectId": "83fce810f8f546d79cd35603c6be8ea2",
+    "m_Id": 2,
+    "m_DisplayName": "Scale_Factor",
+    "m_SlotType": 1,
+    "m_Hidden": false,
+    "m_HideConnector": false,
+    "m_ShaderOutputName": "Scale_Factor",
+    "m_StageCapability": 3,
+    "m_Value": 0.0,
+    "m_DefaultValue": 0.0,
+    "m_Labels": [],
+    "m_LiteralMode": false
+}
+
 {
     "m_SGVersion": 0,
     "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
@@ -3115,11 +3282,13 @@
     "m_DisplayName": "SDFStroke",
     "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "SDFStroke",
     "m_StageCapability": 3,
     "m_Value": 0.0,
     "m_DefaultValue": 0.0,
-    "m_Labels": []
+    "m_Labels": [],
+    "m_LiteralMode": false
 }
 
 {
@@ -3130,11 +3299,13 @@
     "m_DisplayName": "Out",
     "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "Out",
     "m_StageCapability": 2,
     "m_Value": 0.0,
     "m_DefaultValue": 0.0,
-    "m_Labels": []
+    "m_Labels": [],
+    "m_LiteralMode": false
 }
 
 {
@@ -3145,11 +3316,13 @@
     "m_DisplayName": "Out",
     "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "Out",
     "m_StageCapability": 3,
     "m_Value": 0.0,
     "m_DefaultValue": 0.0,
-    "m_Labels": []
+    "m_Labels": [],
+    "m_LiteralMode": false
 }
 
 {
@@ -3194,6 +3367,7 @@
     "m_DisplayName": "Out",
     "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "Out",
     "m_StageCapability": 3,
     "m_Value": {
@@ -3242,6 +3416,7 @@
     "m_DisplayName": "Out",
     "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "Out",
     "m_StageCapability": 3,
     "m_Value": {
@@ -3255,7 +3430,8 @@
         "y": 0.0,
         "z": 0.0,
         "w": 0.0
-    }
+    },
+    "m_LiteralMode": false
 }
 
 {
@@ -3304,6 +3480,7 @@
     "m_DisplayName": "Bubble Outline Color",
     "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "Out",
     "m_StageCapability": 3,
     "m_Value": {
@@ -3329,11 +3506,13 @@
     "m_DisplayName": "Stroke",
     "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "Stroke",
     "m_StageCapability": 3,
     "m_Value": 0.0,
     "m_DefaultValue": 0.0,
-    "m_Labels": []
+    "m_Labels": [],
+    "m_LiteralMode": false
 }
 
 {
@@ -3344,6 +3523,7 @@
     "m_DisplayName": "Corner Radii",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "_Corner_Radii",
     "m_StageCapability": 3,
     "m_Value": {
@@ -3369,6 +3549,7 @@
     "m_DisplayName": "Out",
     "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "Out",
     "m_StageCapability": 3,
     "m_Value": {
@@ -3415,8 +3596,8 @@
     "m_ObjectId": "990b83c366a0414ea8e89d522fef2e6e",
     "m_Title": "Drop Shadow",
     "m_Position": {
-        "x": -1439.33349609375,
-        "y": -198.66668701171876
+        "x": -1439.0,
+        "y": -198.99998474121095
     }
 }
 
@@ -3428,6 +3609,7 @@
     "m_DisplayName": "Width Height",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "_Width_Height",
     "m_StageCapability": 3,
     "m_Value": {
@@ -3448,6 +3630,9 @@
     "m_Guid": {
         "m_GuidSerialized": "180ef127-3b29-4cef-a7d0-7a2924a997a6"
     },
+    "promotedFromAssetID": "",
+    "promotedFromCategoryName": "",
+    "promotedOrdering": -1,
     "m_Name": "Bubble Size",
     "m_DefaultRefNameVersion": 1,
     "m_RefNameGeneratedByDisplayName": "Bubble Size",
@@ -3460,7 +3645,10 @@
     "m_Precision": 0,
     "overrideHLSLDeclaration": false,
     "hlslDeclarationOverride": 0,
+    "hideConnector": false,
     "m_Hidden": false,
+    "m_PerRendererData": false,
+    "m_customAttributes": [],
     "m_Value": {
         "x": 0.8500000238418579,
         "y": 0.8500000238418579,
@@ -3561,11 +3749,13 @@
     "m_DisplayName": "Rotation",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "Rotation",
     "m_StageCapability": 3,
     "m_Value": 45.0,
     "m_DefaultValue": 0.0,
-    "m_Labels": []
+    "m_Labels": [],
+    "m_LiteralMode": false
 }
 
 {
@@ -3576,6 +3766,7 @@
     "m_DisplayName": "Out",
     "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "Out",
     "m_StageCapability": 3,
     "m_Value": {
@@ -3703,6 +3894,7 @@
     "m_DisplayName": "Out",
     "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "Out",
     "m_StageCapability": 3,
     "m_Value": {
@@ -3716,22 +3908,25 @@
         "y": 0.0,
         "z": 0.0,
         "w": 0.0
-    }
+    },
+    "m_LiteralMode": false
 }
 
 {
     "m_SGVersion": 0,
     "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
-    "m_ObjectId": "ab8f8a820ea545b9883094e109a8d816",
-    "m_Id": 1,
-    "m_DisplayName": "Scale Factor",
-    "m_SlotType": 1,
+    "m_ObjectId": "a98a5056f6fc4b89a624a8824b7ffe4b",
+    "m_Id": 716604351,
+    "m_DisplayName": "PreviewHeight",
+    "m_SlotType": 0,
     "m_Hidden": false,
-    "m_ShaderOutputName": "_CanvasScaleFactor",
+    "m_HideConnector": true,
+    "m_ShaderOutputName": "_PreviewHeight",
     "m_StageCapability": 3,
-    "m_Value": 1.0,
-    "m_DefaultValue": 1.0,
-    "m_Labels": []
+    "m_Value": 100.0,
+    "m_DefaultValue": 100.0,
+    "m_Labels": [],
+    "m_LiteralMode": false
 }
 
 {
@@ -3742,11 +3937,13 @@
     "m_DisplayName": "Gradient",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "_Gradient",
     "m_StageCapability": 2,
     "m_Value": 0.0,
     "m_DefaultValue": 0.0,
-    "m_Labels": []
+    "m_Labels": [],
+    "m_LiteralMode": false
 }
 
 {
@@ -3757,11 +3954,13 @@
     "m_DisplayName": "Edge Min",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "_Edge_Min",
     "m_StageCapability": 3,
     "m_Value": 0.0,
     "m_DefaultValue": 0.0,
-    "m_Labels": []
+    "m_Labels": [],
+    "m_LiteralMode": false
 }
 
 {
@@ -3771,6 +3970,9 @@
     "m_Guid": {
         "m_GuidSerialized": "81b885f1-e447-4135-8b37-303bd57b624a"
     },
+    "promotedFromAssetID": "",
+    "promotedFromCategoryName": "",
+    "promotedOrdering": -1,
     "m_Name": "Background Color 2",
     "m_DefaultRefNameVersion": 1,
     "m_RefNameGeneratedByDisplayName": "Background Color 2",
@@ -3783,7 +3985,10 @@
     "m_Precision": 0,
     "overrideHLSLDeclaration": false,
     "hlslDeclarationOverride": 0,
+    "hideConnector": false,
     "m_Hidden": false,
+    "m_PerRendererData": false,
+    "m_customAttributes": [],
     "m_Value": {
         "r": 0.6509804129600525,
         "g": 0.7529412508010864,
@@ -3802,11 +4007,13 @@
     "m_DisplayName": "Radius",
     "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "Out",
     "m_StageCapability": 3,
     "m_Value": 0.0,
     "m_DefaultValue": 0.0,
-    "m_Labels": []
+    "m_Labels": [],
+    "m_LiteralMode": false
 }
 
 {
@@ -3817,6 +4024,7 @@
     "m_DisplayName": "B",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "B",
     "m_StageCapability": 3,
     "m_Value": {
@@ -3915,6 +4123,7 @@
     "m_DisplayName": "Background Color 1",
     "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "Out",
     "m_StageCapability": 3,
     "m_Value": {
@@ -3940,6 +4149,7 @@
     "m_DisplayName": "A",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "A",
     "m_StageCapability": 3,
     "m_Value": {
@@ -3953,7 +4163,8 @@
         "y": 0.0,
         "z": 0.0,
         "w": 0.0
-    }
+    },
+    "m_LiteralMode": false
 }
 
 {
@@ -3990,51 +4201,6 @@
     "m_SerializedDescriptor": "SurfaceDescription.Emission"
 }
 
-{
-    "m_SGVersion": 0,
-    "m_Type": "UnityEditor.ShaderGraph.RectTransformSizeNode",
-    "m_ObjectId": "bd8b9365c5da42d996d49e14a0620014",
-    "m_Group": {
-        "m_Id": ""
-    },
-    "m_Name": "RectTransform Size",
-    "m_DrawState": {
-        "m_Expanded": true,
-        "m_Position": {
-            "serializedVersion": "2",
-            "x": -1470.666748046875,
-            "y": 174.66668701171876,
-            "width": 158.0,
-            "height": 78.66667175292969
-        }
-    },
-    "m_Slots": [
-        {
-            "m_Id": "33b75463743e4cc680d93d26e824094a"
-        },
-        {
-            "m_Id": "ab8f8a820ea545b9883094e109a8d816"
-        },
-        {
-            "m_Id": "ecddda561f91459b9c37d8b689d41deb"
-        }
-    ],
-    "synonyms": [],
-    "m_Precision": 0,
-    "m_PreviewExpanded": true,
-    "m_DismissedVersion": 0,
-    "m_PreviewMode": 0,
-    "m_CustomColors": {
-        "m_SerializableColors": []
-    },
-    "previewSize": {
-        "x": 100.0,
-        "y": 100.0
-    },
-    "previewScaleFactor": 1.0,
-    "previewPixelsPerUnit": 100.0
-}
-
 {
     "m_SGVersion": 0,
     "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
@@ -4043,11 +4209,13 @@
     "m_DisplayName": "Stroke",
     "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "Stroke",
     "m_StageCapability": 3,
     "m_Value": 0.0,
     "m_DefaultValue": 0.0,
-    "m_Labels": []
+    "m_Labels": [],
+    "m_LiteralMode": false
 }
 
 {
@@ -4094,6 +4262,7 @@
     "m_DisplayName": "A",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "A",
     "m_StageCapability": 3,
     "m_Value": {
@@ -4142,11 +4311,13 @@
     "m_DisplayName": "Fill",
     "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "Fill",
     "m_StageCapability": 3,
     "m_Value": 0.0,
     "m_DefaultValue": 0.0,
-    "m_Labels": []
+    "m_Labels": [],
+    "m_LiteralMode": false
 }
 
 {
@@ -4157,6 +4328,7 @@
     "m_DisplayName": "",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "",
     "m_StageCapability": 3,
     "m_Value": {
@@ -4170,7 +4342,8 @@
         "y": 0.0,
         "z": 0.0,
         "w": 0.0
-    }
+    },
+    "m_LiteralMode": false
 }
 
 {
@@ -4181,11 +4354,13 @@
     "m_DisplayName": "Fill",
     "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "Fill",
     "m_StageCapability": 3,
     "m_Value": 0.0,
     "m_DefaultValue": 0.0,
-    "m_Labels": []
+    "m_Labels": [],
+    "m_LiteralMode": false
 }
 
 {
@@ -4196,6 +4371,7 @@
     "m_DisplayName": "UV",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "_UV",
     "m_StageCapability": 3,
     "m_Value": {
@@ -4258,8 +4434,8 @@
     "m_ObjectId": "c6ba68b10c0b4bb9ae6c9b31069da12e",
     "m_Title": "Background Gradient",
     "m_Position": {
-        "x": -1399.33349609375,
-        "y": -660.0
+        "x": -1399.0,
+        "y": -659.9999389648438
     }
 }
 
@@ -4271,6 +4447,7 @@
     "m_DisplayName": "Move",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "_Move",
     "m_StageCapability": 3,
     "m_Value": {
@@ -4335,6 +4512,7 @@
     "m_DisplayName": "Keep Aspect Ratio",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "_Keep_Aspect_Ratio",
     "m_StageCapability": 3,
     "m_Value": true,
@@ -4349,6 +4527,7 @@
     "m_DisplayName": "Out",
     "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "Out",
     "m_StageCapability": 3,
     "m_Value": {
@@ -4370,6 +4549,7 @@
     "m_DisplayName": "Out",
     "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "Out",
     "m_StageCapability": 3,
     "m_Value": {
@@ -4383,7 +4563,25 @@
         "y": 0.0,
         "z": 0.0,
         "w": 0.0
-    }
+    },
+    "m_LiteralMode": false
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
+    "m_ObjectId": "cfcd9d476ff4458dbeb6e78285e111f4",
+    "m_Id": -181240572,
+    "m_DisplayName": "PreviewWidth",
+    "m_SlotType": 0,
+    "m_Hidden": false,
+    "m_HideConnector": true,
+    "m_ShaderOutputName": "_PreviewWidth",
+    "m_StageCapability": 3,
+    "m_Value": 100.0,
+    "m_DefaultValue": 100.0,
+    "m_Labels": [],
+    "m_LiteralMode": false
 }
 
 {
@@ -4394,6 +4592,7 @@
     "m_DisplayName": "Out",
     "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "Out",
     "m_StageCapability": 3,
     "m_Value": {
@@ -4407,7 +4606,8 @@
         "y": 0.0,
         "z": 0.0,
         "w": 0.0
-    }
+    },
+    "m_LiteralMode": false
 }
 
 {
@@ -4417,6 +4617,9 @@
     "m_Guid": {
         "m_GuidSerialized": "5f36f26c-916a-4c21-b15e-3abf5b3d1013"
     },
+    "promotedFromAssetID": "",
+    "promotedFromCategoryName": "",
+    "promotedOrdering": -1,
     "m_Name": "Bubble Outline Color",
     "m_DefaultRefNameVersion": 1,
     "m_RefNameGeneratedByDisplayName": "Bubble Outline Color",
@@ -4429,7 +4632,10 @@
     "m_Precision": 0,
     "overrideHLSLDeclaration": false,
     "hlslDeclarationOverride": 0,
+    "hideConnector": false,
     "m_Hidden": false,
+    "m_PerRendererData": false,
+    "m_customAttributes": [],
     "m_Value": {
         "r": 0.8349056243896484,
         "g": 0.8349056243896484,
@@ -4457,11 +4663,13 @@
     "m_DisplayName": "SDF",
     "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "SDF",
     "m_StageCapability": 3,
     "m_Value": 0.0,
     "m_DefaultValue": 0.0,
-    "m_Labels": []
+    "m_Labels": [],
+    "m_LiteralMode": false
 }
 
 {
@@ -4472,6 +4680,7 @@
     "m_DisplayName": "Width Height",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "_Width_Height",
     "m_StageCapability": 3,
     "m_Value": {
@@ -4493,6 +4702,7 @@
     "m_DisplayName": "A",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "A",
     "m_StageCapability": 3,
     "m_Value": {
@@ -4506,7 +4716,8 @@
         "y": 0.0,
         "z": 0.0,
         "w": 0.0
-    }
+    },
+    "m_LiteralMode": false
 }
 
 {
@@ -4516,6 +4727,9 @@
     "m_Guid": {
         "m_GuidSerialized": "9a7b8a3e-b713-40b9-b9bf-94ea96b301d1"
     },
+    "promotedFromAssetID": "",
+    "promotedFromCategoryName": "",
+    "promotedOrdering": -1,
     "m_Name": "Transparent Background",
     "m_DefaultRefNameVersion": 1,
     "m_RefNameGeneratedByDisplayName": "Transparent Background",
@@ -4528,7 +4742,10 @@
     "m_Precision": 0,
     "overrideHLSLDeclaration": false,
     "hlslDeclarationOverride": 0,
+    "hideConnector": false,
     "m_Hidden": false,
+    "m_PerRendererData": false,
+    "m_customAttributes": [],
     "m_Value": true
 }
 
@@ -4538,8 +4755,8 @@
     "m_ObjectId": "e20483d469654e32a36a1dfd826aa3fd",
     "m_Title": "Alpha",
     "m_Position": {
-        "x": -303.3333740234375,
-        "y": 653.3334350585938
+        "x": -303.0,
+        "y": 653.0001220703125
     }
 }
 
@@ -4551,6 +4768,7 @@
     "m_DisplayName": "Bubble Color",
     "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "Out",
     "m_StageCapability": 3,
     "m_Value": {
@@ -4576,6 +4794,7 @@
     "m_DisplayName": "T",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "T",
     "m_StageCapability": 3,
     "m_Value": {
@@ -4589,7 +4808,8 @@
         "y": 0.0,
         "z": 0.0,
         "w": 0.0
-    }
+    },
+    "m_LiteralMode": false
 }
 
 {
@@ -4600,6 +4820,7 @@
     "m_DisplayName": "",
     "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "",
     "m_StageCapability": 3,
     "m_Value": {
@@ -4613,7 +4834,8 @@
         "y": 0.0,
         "z": 0.0,
         "w": 0.0
-    }
+    },
+    "m_LiteralMode": true
 }
 
 {
@@ -4624,11 +4846,13 @@
     "m_DisplayName": "SDFStroke",
     "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "SDFStroke",
     "m_StageCapability": 3,
     "m_Value": 0.0,
     "m_DefaultValue": 0.0,
-    "m_Labels": []
+    "m_Labels": [],
+    "m_LiteralMode": false
 }
 
 {
@@ -4639,6 +4863,7 @@
     "m_DisplayName": "Invert",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "_Invert",
     "m_StageCapability": 3,
     "m_Value": false,
@@ -4653,6 +4878,7 @@
     "m_DisplayName": "Out",
     "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "Out",
     "m_StageCapability": 3,
     "m_Value": {
@@ -4666,7 +4892,8 @@
         "y": 0.0,
         "z": 0.0,
         "w": 0.0
-    }
+    },
+    "m_LiteralMode": false
 }
 
 {
@@ -4677,6 +4904,7 @@
     "m_DisplayName": "Out",
     "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "Out",
     "m_StageCapability": 3,
     "m_Value": {
@@ -4690,7 +4918,8 @@
         "y": 0.0,
         "z": 0.0,
         "w": 0.0
-    }
+    },
+    "m_LiteralMode": false
 }
 
 {
@@ -4700,6 +4929,9 @@
     "m_Guid": {
         "m_GuidSerialized": "57f8460d-3da9-44e2-9eea-f0194f62ba28"
     },
+    "promotedFromAssetID": "",
+    "promotedFromCategoryName": "",
+    "promotedOrdering": -1,
     "m_Name": "Background Color 1",
     "m_DefaultRefNameVersion": 1,
     "m_RefNameGeneratedByDisplayName": "Background Color 1",
@@ -4712,7 +4944,10 @@
     "m_Precision": 0,
     "overrideHLSLDeclaration": false,
     "hlslDeclarationOverride": 0,
+    "hideConnector": false,
     "m_Hidden": false,
+    "m_PerRendererData": false,
+    "m_customAttributes": [],
     "m_Value": {
         "r": 0.3450980484485626,
         "g": 0.5176470875740051,
@@ -4731,6 +4966,7 @@
     "m_DisplayName": "Bubble Size",
     "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "Out",
     "m_StageCapability": 3,
     "m_Value": {
@@ -4750,21 +4986,6 @@
     "m_ObjectId": "ec81d51e46e04ce6adabd295cd84c4fe"
 }
 
-{
-    "m_SGVersion": 0,
-    "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
-    "m_ObjectId": "ecddda561f91459b9c37d8b689d41deb",
-    "m_Id": 2,
-    "m_DisplayName": "Pixel Per Unit",
-    "m_SlotType": 1,
-    "m_Hidden": false,
-    "m_ShaderOutputName": "_CanvasPixelPerUnit",
-    "m_StageCapability": 3,
-    "m_Value": 100.0,
-    "m_DefaultValue": 100.0,
-    "m_Labels": []
-}
-
 {
     "m_SGVersion": 0,
     "m_Type": "UnityEditor.ShaderGraph.PropertyNode",
@@ -4809,6 +5030,7 @@
     "m_DisplayName": "In",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "In",
     "m_StageCapability": 3,
     "m_Value": {
@@ -4822,7 +5044,8 @@
         "y": 0.0,
         "z": 0.0,
         "w": 0.0
-    }
+    },
+    "m_LiteralMode": false
 }
 
 {
@@ -4922,6 +5145,7 @@
     "m_DisplayName": "Background Color 2",
     "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "Out",
     "m_StageCapability": 3,
     "m_Value": {
@@ -4947,11 +5171,13 @@
     "m_DisplayName": "Cutoff",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "_Cutoff",
     "m_StageCapability": 2,
     "m_Value": 0.0,
-    "m_DefaultValue": 0.0,
-    "m_Labels": []
+    "m_DefaultValue": 0.5,
+    "m_Labels": [],
+    "m_LiteralMode": false
 }
 
 {
@@ -4962,12 +5188,79 @@
     "m_DisplayName": "Stroke Thickness Relative",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "_Stroke_Thickness_Relative",
     "m_StageCapability": 3,
     "m_Value": true,
     "m_DefaultValue": false
 }
 
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.SubGraphNode",
+    "m_ObjectId": "fb9876c4bf1947578e5673a1448e7e37",
+    "m_Group": {
+        "m_Id": ""
+    },
+    "m_Name": "Rect Transform Size",
+    "m_DrawState": {
+        "m_Expanded": true,
+        "m_Position": {
+            "serializedVersion": "2",
+            "x": -1655.9998779296875,
+            "y": 191.99998474121095,
+            "width": 165.0,
+            "height": 227.99998474121095
+        }
+    },
+    "m_Slots": [
+        {
+            "m_Id": "cfcd9d476ff4458dbeb6e78285e111f4"
+        },
+        {
+            "m_Id": "a98a5056f6fc4b89a624a8824b7ffe4b"
+        },
+        {
+            "m_Id": "644f37bafaf5455ba908eb71140b70bd"
+        },
+        {
+            "m_Id": "365fa2001035433983f90f8f4401352a"
+        },
+        {
+            "m_Id": "3c6b79004e254fc7a741c0d2812fae0c"
+        },
+        {
+            "m_Id": "83fce810f8f546d79cd35603c6be8ea2"
+        },
+        {
+            "m_Id": "3fedf2b7b0c3467db0a3e28158b64373"
+        }
+    ],
+    "synonyms": [],
+    "m_Precision": 0,
+    "m_PreviewExpanded": false,
+    "m_DismissedVersion": 0,
+    "m_PreviewMode": 0,
+    "m_CustomColors": {
+        "m_SerializableColors": []
+    },
+    "m_SerializedSubGraph": "{\n    \"subGraph\": {\n        \"fileID\": -5475051401550479605,\n        \"guid\": \"aa041986c041b4dc1b5bf0b2cd2d86e8\",\n        \"type\": 3\n    }\n}",
+    "m_PropertyGuids": [
+        "975f2db3-e792-46e7-9bf8-3a4cbe4fb068",
+        "373c703c-395b-43d3-91ba-78b9497021e7",
+        "2747a643-8db3-4ffc-9923-55aa70fb2549",
+        "451bbdf7-6136-4a6e-a5c8-4918d2ea4b95"
+    ],
+    "m_PropertyIds": [
+        -181240572,
+        716604351,
+        -1949568231,
+        -2106065226
+    ],
+    "m_Dropdowns": [],
+    "m_DropdownSelectedEntries": []
+}
+
 {
     "m_SGVersion": 0,
     "m_Type": "UnityEditor.ShaderGraph.Vector4MaterialSlot",
@@ -4976,6 +5269,7 @@
     "m_DisplayName": "Corner Radii",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "_Corner_Radii",
     "m_StageCapability": 3,
     "m_Value": {
@@ -4993,6 +5287,23 @@
     "m_Labels": []
 }
 
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
+    "m_ObjectId": "fd306188a2dc4890b3816d181eaafcb9",
+    "m_Id": 0,
+    "m_DisplayName": "In",
+    "m_SlotType": 0,
+    "m_Hidden": false,
+    "m_HideConnector": false,
+    "m_ShaderOutputName": "In",
+    "m_StageCapability": 3,
+    "m_Value": 0.0,
+    "m_DefaultValue": 0.0,
+    "m_Labels": [],
+    "m_LiteralMode": false
+}
+
 {
     "m_SGVersion": 3,
     "m_Type": "UnityEditor.ShaderGraph.Internal.ColorShaderProperty",
@@ -5000,6 +5311,9 @@
     "m_Guid": {
         "m_GuidSerialized": "d7067d1c-ce2e-421e-a0a6-6051cc8de0a5"
     },
+    "promotedFromAssetID": "",
+    "promotedFromCategoryName": "",
+    "promotedOrdering": -1,
     "m_Name": "Bubble Color",
     "m_DefaultRefNameVersion": 1,
     "m_RefNameGeneratedByDisplayName": "Bubble Color",
@@ -5012,7 +5326,10 @@
     "m_Precision": 0,
     "overrideHLSLDeclaration": false,
     "hlslDeclarationOverride": 0,
+    "hideConnector": false,
     "m_Hidden": false,
+    "m_PerRendererData": false,
+    "m_customAttributes": [],
     "m_Value": {
         "r": 0.0896226167678833,
         "g": 0.0896226167678833,
diff --git a/Packages/com.unity.shadergraph/Samples~/UGUIShaders/Examples/Buttons/Aqua Button.shadergraph b/Packages/com.unity.shadergraph/Samples~/UGUIShaders/Examples/Buttons/Aqua Button.shadergraph
index bfe98b9f823..87c4218e871 100644
--- a/Packages/com.unity.shadergraph/Samples~/UGUIShaders/Examples/Buttons/Aqua Button.shadergraph	
+++ b/Packages/com.unity.shadergraph/Samples~/UGUIShaders/Examples/Buttons/Aqua Button.shadergraph	
@@ -29,9 +29,6 @@
         {
             "m_Id": "dd6c98800c4c4a1ab998063a5cbcc7e2"
         },
-        {
-            "m_Id": "6721417d3d4d44b0b22a4eb13532fb90"
-        },
         {
             "m_Id": "ac5ff41b9fa5455a81d5783495e5dab0"
         },
@@ -39,26 +36,15 @@
             "m_Id": "fe099bdd3d8440228d921340de7b7af9"
         },
         {
-            "m_Id": "d46e35beb40a458da76c538791821f0a"
+            "m_Id": "e7e308a40d454764901c70db6ff7c3e4"
+        },
+        {
+            "m_Id": "ee07f900555e468682524833575fbddb"
         }
     ],
     "m_GroupDatas": [],
     "m_StickyNoteDatas": [],
     "m_Edges": [
-        {
-            "m_OutputSlot": {
-                "m_Node": {
-                    "m_Id": "6721417d3d4d44b0b22a4eb13532fb90"
-                },
-                "m_SlotId": 0
-            },
-            "m_InputSlot": {
-                "m_Node": {
-                    "m_Id": "dd6c98800c4c4a1ab998063a5cbcc7e2"
-                },
-                "m_SlotId": 830530724
-            }
-        },
         {
             "m_OutputSlot": {
                 "m_Node": {
@@ -101,20 +87,6 @@
                 "m_SlotId": 0
             }
         },
-        {
-            "m_OutputSlot": {
-                "m_Node": {
-                    "m_Id": "d46e35beb40a458da76c538791821f0a"
-                },
-                "m_SlotId": 0
-            },
-            "m_InputSlot": {
-                "m_Node": {
-                    "m_Id": "b1cf5d0c0b6b492db0a0ccc3d369b5cf"
-                },
-                "m_SlotId": 455687272
-            }
-        },
         {
             "m_OutputSlot": {
                 "m_Node": {
@@ -171,6 +143,34 @@
                 "m_SlotId": 0
             }
         },
+        {
+            "m_OutputSlot": {
+                "m_Node": {
+                    "m_Id": "e7e308a40d454764901c70db6ff7c3e4"
+                },
+                "m_SlotId": 1
+            },
+            "m_InputSlot": {
+                "m_Node": {
+                    "m_Id": "b1cf5d0c0b6b492db0a0ccc3d369b5cf"
+                },
+                "m_SlotId": 455687272
+            }
+        },
+        {
+            "m_OutputSlot": {
+                "m_Node": {
+                    "m_Id": "ee07f900555e468682524833575fbddb"
+                },
+                "m_SlotId": 1
+            },
+            "m_InputSlot": {
+                "m_Node": {
+                    "m_Id": "dd6c98800c4c4a1ab998063a5cbcc7e2"
+                },
+                "m_SlotId": 830530724
+            }
+        },
         {
             "m_OutputSlot": {
                 "m_Node": {
@@ -234,6 +234,12 @@
     ]
 }
 
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasSubTarget",
+    "m_ObjectId": "0724948387ed419a8be84dbf40ca769b"
+}
+
 {
     "m_SGVersion": 0,
     "m_Type": "UnityEditor.ShaderGraph.BlockNode",
@@ -306,6 +312,34 @@
     "m_DropdownSelectedEntries": []
 }
 
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasSubTarget",
+    "m_ObjectId": "10c3b5b995fd4d19825cb2a725ffb981"
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.Vector2MaterialSlot",
+    "m_ObjectId": "159227773061489a9152664bdf6d4006",
+    "m_Id": 1,
+    "m_DisplayName": "Size",
+    "m_SlotType": 1,
+    "m_Hidden": false,
+    "m_HideConnector": false,
+    "m_ShaderOutputName": "Size",
+    "m_StageCapability": 3,
+    "m_Value": {
+        "x": 0.0,
+        "y": 0.0
+    },
+    "m_DefaultValue": {
+        "x": 0.0,
+        "y": 0.0
+    },
+    "m_Labels": []
+}
+
 {
     "m_SGVersion": 0,
     "m_Type": "UnityEditor.ShaderGraph.BlockNode",
@@ -348,11 +382,13 @@
     "m_DisplayName": "Alpha",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "Alpha",
     "m_StageCapability": 2,
     "m_Value": 1.0,
     "m_DefaultValue": 1.0,
-    "m_Labels": []
+    "m_Labels": [],
+    "m_LiteralMode": false
 }
 
 {
@@ -363,6 +399,7 @@
     "m_DisplayName": "Width Height",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "_Width_Height",
     "m_StageCapability": 2,
     "m_Value": {
@@ -384,11 +421,13 @@
     "m_DisplayName": "Alpha",
     "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "Alpha",
     "m_StageCapability": 2,
     "m_Value": 0.0,
     "m_DefaultValue": 0.0,
-    "m_Labels": []
+    "m_Labels": [],
+    "m_LiteralMode": false
 }
 
 {
@@ -399,6 +438,7 @@
     "m_DisplayName": "IsDisabled",
     "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "IsDisabled",
     "m_StageCapability": 3,
     "m_Value": false,
@@ -413,6 +453,7 @@
     "m_DisplayName": "In",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "In",
     "m_StageCapability": 3,
     "m_Value": false,
@@ -427,6 +468,7 @@
     "m_DisplayName": "Emission",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "Emission",
     "m_StageCapability": 2,
     "m_Value": {
@@ -449,6 +491,26 @@
     }
 }
 
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasData",
+    "m_ObjectId": "23e408b0f1454583bbd5158bd375dc27",
+    "supportsMotionVectors": false
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasSubTarget",
+    "m_ObjectId": "247cd01b97fd4baa87c323d78de99850"
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasData",
+    "m_ObjectId": "29880c8660cd4e2297ceaa8b9b783e4c",
+    "supportsMotionVectors": false
+}
+
 {
     "m_SGVersion": 0,
     "m_Type": "UnityEditor.ShaderGraph.Vector4MaterialSlot",
@@ -457,6 +519,7 @@
     "m_DisplayName": "Out",
     "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "Out",
     "m_StageCapability": 3,
     "m_Value": {
@@ -474,6 +537,12 @@
     "m_Labels": []
 }
 
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasSubTarget",
+    "m_ObjectId": "32e5213c4b334bfeb1d7aea2f95436e2"
+}
+
 {
     "m_SGVersion": 0,
     "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasSubTarget",
@@ -511,6 +580,7 @@
     "m_CastShadows": true,
     "m_ReceiveShadows": true,
     "m_DisableTint": false,
+    "m_Sort3DAs2DCompatible": false,
     "m_AdditionalMotionVectorMode": 0,
     "m_AlembicMotionVectors": false,
     "m_SupportsLODCrossFade": false,
@@ -520,18 +590,26 @@
 
 {
     "m_SGVersion": 0,
-    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasData",
-    "m_ObjectId": "3d7882455342469badf9b85649b4d809",
-    "supportsMotionVectors": false
+    "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
+    "m_ObjectId": "3bb45b72b14240b0839b5baa8b4919cf",
+    "m_Id": 716604351,
+    "m_DisplayName": "PreviewHeight",
+    "m_SlotType": 0,
+    "m_Hidden": false,
+    "m_HideConnector": true,
+    "m_ShaderOutputName": "_PreviewHeight",
+    "m_StageCapability": 3,
+    "m_Value": 100.0,
+    "m_DefaultValue": 100.0,
+    "m_Labels": [],
+    "m_LiteralMode": false
 }
 
 {
     "m_SGVersion": 0,
-    "m_Type": "UnityEditor.Rendering.Canvas.ShaderGraph.CanvasData",
-    "m_ObjectId": "3e2ca0823c4a4a0ea9e9d46668ccb79d",
-    "m_Version": 0,
-    "m_AlphaClip": false,
-    "m_DisableTint": false
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasData",
+    "m_ObjectId": "3d7882455342469badf9b85649b4d809",
+    "supportsMotionVectors": false
 }
 
 {
@@ -542,6 +620,7 @@
     "m_DisplayName": "IsHighlighted",
     "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "IsHighlighted",
     "m_StageCapability": 3,
     "m_Value": false,
@@ -556,11 +635,19 @@
     "m_DisplayName": "State",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "_State",
     "m_StageCapability": 3,
     "m_Value": 0.0,
     "m_DefaultValue": 0.0,
-    "m_Labels": []
+    "m_Labels": [],
+    "m_LiteralMode": false
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasSubTarget",
+    "m_ObjectId": "48f4b1e87a3c4f6885826e7b4fac6a55"
 }
 
 {
@@ -572,31 +659,6 @@
     "m_DisableTint": false
 }
 
-{
-    "m_SGVersion": 0,
-    "m_Type": "UnityEditor.ShaderGraph.Vector4MaterialSlot",
-    "m_ObjectId": "4c74ca205dfb464e99211be85e785172",
-    "m_Id": -1838511996,
-    "m_DisplayName": "Outline Color",
-    "m_SlotType": 0,
-    "m_Hidden": false,
-    "m_ShaderOutputName": "_Outline_Color",
-    "m_StageCapability": 2,
-    "m_Value": {
-        "x": 0.0,
-        "y": 0.0,
-        "z": 0.0,
-        "w": 0.0
-    },
-    "m_DefaultValue": {
-        "x": 0.0,
-        "y": 0.0,
-        "z": 0.0,
-        "w": 0.0
-    },
-    "m_Labels": []
-}
-
 {
     "m_SGVersion": 0,
     "m_Type": "UnityEditor.ShaderGraph.BooleanMaterialSlot",
@@ -605,6 +667,7 @@
     "m_DisplayName": "Selected",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "_Selected",
     "m_StageCapability": 2,
     "m_Value": false,
@@ -619,6 +682,7 @@
     "m_DisplayName": "UV",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "_UV",
     "m_StageCapability": 2,
     "m_Value": {
@@ -632,6 +696,12 @@
     "m_Labels": []
 }
 
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasSubTarget",
+    "m_ObjectId": "5fdad50a225b41158ea509de8ebd38c6"
+}
+
 {
     "m_SGVersion": 0,
     "m_Type": "UnityEditor.ShaderGraph.BooleanMaterialSlot",
@@ -640,6 +710,7 @@
     "m_DisplayName": "B",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "B",
     "m_StageCapability": 3,
     "m_Value": false,
@@ -682,60 +753,26 @@
 
 {
     "m_SGVersion": 0,
-    "m_Type": "UnityEditor.ShaderGraph.SelectableStateNode",
-    "m_ObjectId": "6721417d3d4d44b0b22a4eb13532fb90",
-    "m_Group": {
-        "m_Id": ""
-    },
-    "m_Name": "Selectable State",
-    "m_DrawState": {
-        "m_Expanded": true,
-        "m_Position": {
-            "serializedVersion": "2",
-            "x": -1309.3333740234375,
-            "y": 400.6666564941406,
-            "width": 140.6666259765625,
-            "height": 78.66668701171875
-        }
-    },
-    "m_Slots": [
-        {
-            "m_Id": "e0813df8996947429774c574432e697e"
-        }
-    ],
-    "synonyms": [],
-    "m_Precision": 0,
-    "m_PreviewExpanded": true,
-    "m_DismissedVersion": 0,
-    "m_PreviewMode": 0,
-    "m_CustomColors": {
-        "m_SerializableColors": []
-    }
+    "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
+    "m_ObjectId": "66b710255e2a4be1a02e4602dce6c291",
+    "m_Id": -2106065226,
+    "m_DisplayName": "PreviewPPU",
+    "m_SlotType": 0,
+    "m_Hidden": false,
+    "m_HideConnector": true,
+    "m_ShaderOutputName": "_PreviewPPU",
+    "m_StageCapability": 3,
+    "m_Value": 100.0,
+    "m_DefaultValue": 100.0,
+    "m_Labels": [],
+    "m_LiteralMode": false
 }
 
 {
     "m_SGVersion": 0,
-    "m_Type": "UnityEditor.ShaderGraph.Vector4MaterialSlot",
-    "m_ObjectId": "6874efe8a1fb477eb9b1e52b6f5c09bf",
-    "m_Id": 121012981,
-    "m_DisplayName": "Button Color",
-    "m_SlotType": 0,
-    "m_Hidden": false,
-    "m_ShaderOutputName": "_Button_Color",
-    "m_StageCapability": 2,
-    "m_Value": {
-        "x": 0.0,
-        "y": 0.48235300183296206,
-        "z": 1.0,
-        "w": 1.0
-    },
-    "m_DefaultValue": {
-        "x": 0.0,
-        "y": 0.0,
-        "z": 0.0,
-        "w": 0.0
-    },
-    "m_Labels": []
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasData",
+    "m_ObjectId": "6a4f7fe7684a4000b7f710774cf6b0bd",
+    "supportsMotionVectors": false
 }
 
 {
@@ -746,6 +783,13 @@
     "m_ChildObjectList": []
 }
 
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasData",
+    "m_ObjectId": "770b75583f6740d3bff3f12c44630008",
+    "supportsMotionVectors": false
+}
+
 {
     "m_SGVersion": 0,
     "m_Type": "UnityEditor.ShaderGraph.BooleanMaterialSlot",
@@ -754,12 +798,19 @@
     "m_DisplayName": "IsSelected",
     "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "IsSelected",
     "m_StageCapability": 3,
     "m_Value": false,
     "m_DefaultValue": false
 }
 
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasSubTarget",
+    "m_ObjectId": "786640f9ee3344dbb15a7654dbef302f"
+}
+
 {
     "m_SGVersion": 0,
     "m_Type": "UnityEditor.ShaderGraph.BooleanMaterialSlot",
@@ -768,27 +819,13 @@
     "m_DisplayName": "Out",
     "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "Out",
     "m_StageCapability": 3,
     "m_Value": false,
     "m_DefaultValue": false
 }
 
-{
-    "m_SGVersion": 0,
-    "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
-    "m_ObjectId": "8dbbdf0773cd4649ac854985c3a3a5b4",
-    "m_Id": 1,
-    "m_DisplayName": "Scale Factor",
-    "m_SlotType": 1,
-    "m_Hidden": false,
-    "m_ShaderOutputName": "_CanvasScaleFactor",
-    "m_StageCapability": 3,
-    "m_Value": 1.0,
-    "m_DefaultValue": 1.0,
-    "m_Labels": []
-}
-
 {
     "m_SGVersion": 0,
     "m_Type": "UnityEditor.ShaderGraph.BooleanMaterialSlot",
@@ -797,12 +834,19 @@
     "m_DisplayName": "IsNormal",
     "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "IsNormal",
     "m_StageCapability": 3,
     "m_Value": false,
     "m_DefaultValue": false
 }
 
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasSubTarget",
+    "m_ObjectId": "93d4f58b92b34b30a417d57972928aa3"
+}
+
 {
     "m_SGVersion": 0,
     "m_Type": "UnityEditor.ShaderGraph.BooleanMaterialSlot",
@@ -811,6 +855,7 @@
     "m_DisplayName": "Out",
     "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "Out",
     "m_StageCapability": 3,
     "m_Value": false,
@@ -819,18 +864,91 @@
 
 {
     "m_SGVersion": 0,
-    "m_Type": "UnityEditor.ShaderGraph.OrNode",
-    "m_ObjectId": "ac5ff41b9fa5455a81d5783495e5dab0",
-    "m_Group": {
-        "m_Id": ""
-    },
-    "m_Name": "Or",
-    "m_DrawState": {
-        "m_Expanded": true,
-        "m_Position": {
-            "serializedVersion": "2",
-            "x": -894.0,
-            "y": 446.6666564941406,
+    "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
+    "m_ObjectId": "952a6a3ccfd74642a43d628f271d2ecb",
+    "m_Id": -181240572,
+    "m_DisplayName": "PreviewWidth",
+    "m_SlotType": 0,
+    "m_Hidden": false,
+    "m_HideConnector": true,
+    "m_ShaderOutputName": "_PreviewWidth",
+    "m_StageCapability": 3,
+    "m_Value": 100.0,
+    "m_DefaultValue": 100.0,
+    "m_Labels": [],
+    "m_LiteralMode": false
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
+    "m_ObjectId": "9984cc0c41a44dc892b6a2018260af9c",
+    "m_Id": -1949568231,
+    "m_DisplayName": "PreviewScaleFactor",
+    "m_SlotType": 0,
+    "m_Hidden": false,
+    "m_HideConnector": true,
+    "m_ShaderOutputName": "_PreviewScaleFactor",
+    "m_StageCapability": 3,
+    "m_Value": 1.0,
+    "m_DefaultValue": 1.0,
+    "m_Labels": [],
+    "m_LiteralMode": false
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasData",
+    "m_ObjectId": "9faba2e0409944e4974405ecba3e0d98",
+    "supportsMotionVectors": false
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.ColorRGBAMaterialSlot",
+    "m_ObjectId": "a37d0c77e76946d981be05ebc8eaa95d",
+    "m_Id": -1838511996,
+    "m_DisplayName": "Outline Color",
+    "m_SlotType": 0,
+    "m_Hidden": false,
+    "m_HideConnector": false,
+    "m_ShaderOutputName": "_Outline_Color",
+    "m_StageCapability": 2,
+    "m_Value": {
+        "x": 0.0,
+        "y": 0.0,
+        "z": 0.0,
+        "w": 0.0
+    },
+    "m_DefaultValue": {
+        "x": 0.0,
+        "y": 0.0,
+        "z": 0.0,
+        "w": 0.0
+    },
+    "m_Labels": []
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasSubTarget",
+    "m_ObjectId": "a73a4874f79b46329c1e3f2bad509a45"
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.OrNode",
+    "m_ObjectId": "ac5ff41b9fa5455a81d5783495e5dab0",
+    "m_Group": {
+        "m_Id": ""
+    },
+    "m_Name": "Or",
+    "m_DrawState": {
+        "m_Expanded": true,
+        "m_Position": {
+            "serializedVersion": "2",
+            "x": -894.0,
+            "y": 446.6666564941406,
             "width": 131.3333740234375,
             "height": 102.66671752929688
         }
@@ -856,6 +974,12 @@
     }
 }
 
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasSubTarget",
+    "m_ObjectId": "ad0511b594294cf9ba9546e82b5dbf19"
+}
+
 {
     "m_SGVersion": 0,
     "m_Type": "UnityEditor.ShaderGraph.SubGraphNode",
@@ -879,10 +1003,10 @@
             "m_Id": "51bea787e49e46ff859d374fad00d126"
         },
         {
-            "m_Id": "6874efe8a1fb477eb9b1e52b6f5c09bf"
+            "m_Id": "b7060a1fe5904f24a0a51694ccd14fc3"
         },
         {
-            "m_Id": "4c74ca205dfb464e99211be85e785172"
+            "m_Id": "a37d0c77e76946d981be05ebc8eaa95d"
         },
         {
             "m_Id": "5089b7f19f1c43dea32fd6a13c810204"
@@ -940,6 +1064,32 @@
     "m_DropdownSelectedEntries": []
 }
 
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.ColorRGBAMaterialSlot",
+    "m_ObjectId": "b7060a1fe5904f24a0a51694ccd14fc3",
+    "m_Id": 121012981,
+    "m_DisplayName": "Button Color",
+    "m_SlotType": 0,
+    "m_Hidden": false,
+    "m_HideConnector": false,
+    "m_ShaderOutputName": "_Button_Color",
+    "m_StageCapability": 2,
+    "m_Value": {
+        "x": 0.0,
+        "y": 0.48235300183296206,
+        "z": 1.0,
+        "w": 1.0
+    },
+    "m_DefaultValue": {
+        "x": 0.0,
+        "y": 0.48235300183296206,
+        "z": 1.0,
+        "w": 1.0
+    },
+    "m_Labels": []
+}
+
 {
     "m_SGVersion": 0,
     "m_Type": "UnityEditor.ShaderGraph.BooleanMaterialSlot",
@@ -948,6 +1098,7 @@
     "m_DisplayName": "Active",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "_Active",
     "m_StageCapability": 2,
     "m_Value": true,
@@ -962,6 +1113,7 @@
     "m_DisplayName": "Base Color",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "BaseColor",
     "m_StageCapability": 2,
     "m_Value": {
@@ -984,6 +1136,20 @@
     }
 }
 
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasData",
+    "m_ObjectId": "c1e7ee39856a45b3ab5d7e007395d447",
+    "supportsMotionVectors": false
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasData",
+    "m_ObjectId": "c373f1894323494b8c901d0dde2cbffd",
+    "supportsMotionVectors": false
+}
+
 {
     "m_SGVersion": 0,
     "m_Type": "UnityEditor.ShaderGraph.BooleanMaterialSlot",
@@ -992,6 +1158,7 @@
     "m_DisplayName": "IsPressed",
     "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "IsPressed",
     "m_StageCapability": 3,
     "m_Value": false,
@@ -1006,6 +1173,7 @@
     "m_DisplayName": "Color",
     "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "Color",
     "m_StageCapability": 2,
     "m_Value": {
@@ -1021,6 +1189,30 @@
     "m_Labels": []
 }
 
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
+    "m_ObjectId": "cadd8283eddd4773be0a67216ccb3003",
+    "m_Id": 1,
+    "m_DisplayName": "State",
+    "m_SlotType": 1,
+    "m_Hidden": false,
+    "m_HideConnector": false,
+    "m_ShaderOutputName": "State",
+    "m_StageCapability": 3,
+    "m_Value": 0.0,
+    "m_DefaultValue": 0.0,
+    "m_Labels": [],
+    "m_LiteralMode": false
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasData",
+    "m_ObjectId": "cafe4dfb66fa41449a2bbf6804a520f5",
+    "supportsMotionVectors": false
+}
+
 {
     "m_SGVersion": 0,
     "m_Type": "UnityEditor.ShaderGraph.BooleanMaterialSlot",
@@ -1029,6 +1221,7 @@
     "m_DisplayName": "A",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "A",
     "m_StageCapability": 3,
     "m_Value": false,
@@ -1037,47 +1230,8 @@
 
 {
     "m_SGVersion": 0,
-    "m_Type": "UnityEditor.ShaderGraph.RectTransformSizeNode",
-    "m_ObjectId": "d46e35beb40a458da76c538791821f0a",
-    "m_Group": {
-        "m_Id": ""
-    },
-    "m_Name": "RectTransform Size",
-    "m_DrawState": {
-        "m_Expanded": true,
-        "m_Position": {
-            "serializedVersion": "2",
-            "x": -921.3333129882813,
-            "y": 626.0,
-            "width": 158.0,
-            "height": 78.66668701171875
-        }
-    },
-    "m_Slots": [
-        {
-            "m_Id": "f778e6a744ae4a2c8db41ba98cc5ad6e"
-        },
-        {
-            "m_Id": "8dbbdf0773cd4649ac854985c3a3a5b4"
-        },
-        {
-            "m_Id": "f9778a9d60e448d3808800d4a4f5ef46"
-        }
-    ],
-    "synonyms": [],
-    "m_Precision": 0,
-    "m_PreviewExpanded": true,
-    "m_DismissedVersion": 0,
-    "m_PreviewMode": 0,
-    "m_CustomColors": {
-        "m_SerializableColors": []
-    },
-    "previewSize": {
-        "x": 100.0,
-        "y": 100.0
-    },
-    "previewScaleFactor": 1.0,
-    "previewPixelsPerUnit": 100.0
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasSubTarget",
+    "m_ObjectId": "d0a4787e344f48f5a85fe74bb0000b0c"
 }
 
 {
@@ -1086,6 +1240,13 @@
     "m_ObjectId": "d4c64a3ec6124e59ab94142d70644f47"
 }
 
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasData",
+    "m_ObjectId": "dd2d0b7f72cd40b5b04a235ffee51a1b",
+    "supportsMotionVectors": false
+}
+
 {
     "m_SGVersion": 0,
     "m_Type": "UnityEditor.ShaderGraph.SubGraphNode",
@@ -1151,26 +1312,30 @@
     "m_DisplayName": "Pressed",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "_Pressed",
     "m_StageCapability": 2,
     "m_Value": 0.0,
     "m_DefaultValue": 0.0,
-    "m_Labels": []
+    "m_Labels": [],
+    "m_LiteralMode": false
 }
 
 {
     "m_SGVersion": 0,
     "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
-    "m_ObjectId": "e0813df8996947429774c574432e697e",
-    "m_Id": 0,
-    "m_DisplayName": "State",
+    "m_ObjectId": "e231af0490a642e1b1d12b957b6c1791",
+    "m_Id": 2,
+    "m_DisplayName": "Scale_Factor",
     "m_SlotType": 1,
     "m_Hidden": false,
-    "m_ShaderOutputName": "_State",
+    "m_HideConnector": false,
+    "m_ShaderOutputName": "Scale_Factor",
     "m_StageCapability": 3,
     "m_Value": 0.0,
     "m_DefaultValue": 0.0,
-    "m_Labels": []
+    "m_Labels": [],
+    "m_LiteralMode": false
 }
 
 {
@@ -1195,38 +1360,154 @@
 
 {
     "m_SGVersion": 0,
-    "m_Type": "UnityEditor.ShaderGraph.Vector2MaterialSlot",
-    "m_ObjectId": "f778e6a744ae4a2c8db41ba98cc5ad6e",
-    "m_Id": 0,
-    "m_DisplayName": "Size",
-    "m_SlotType": 1,
-    "m_Hidden": false,
-    "m_ShaderOutputName": "_RectTransformSize",
-    "m_StageCapability": 3,
-    "m_Value": {
-        "x": 1.0,
-        "y": 1.0
+    "m_Type": "UnityEditor.ShaderGraph.SubGraphNode",
+    "m_ObjectId": "e7e308a40d454764901c70db6ff7c3e4",
+    "m_Group": {
+        "m_Id": ""
     },
-    "m_DefaultValue": {
-        "x": 100.0,
-        "y": 100.0
+    "m_Name": "Rect Transform Size",
+    "m_DrawState": {
+        "m_Expanded": true,
+        "m_Position": {
+            "serializedVersion": "2",
+            "x": -929.0,
+            "y": 624.0,
+            "width": 165.0,
+            "height": 228.0
+        }
     },
-    "m_Labels": []
+    "m_Slots": [
+        {
+            "m_Id": "952a6a3ccfd74642a43d628f271d2ecb"
+        },
+        {
+            "m_Id": "3bb45b72b14240b0839b5baa8b4919cf"
+        },
+        {
+            "m_Id": "9984cc0c41a44dc892b6a2018260af9c"
+        },
+        {
+            "m_Id": "66b710255e2a4be1a02e4602dce6c291"
+        },
+        {
+            "m_Id": "159227773061489a9152664bdf6d4006"
+        },
+        {
+            "m_Id": "e231af0490a642e1b1d12b957b6c1791"
+        },
+        {
+            "m_Id": "fabe74ca5beb4c4cac62c61862b2147f"
+        }
+    ],
+    "synonyms": [],
+    "m_Precision": 0,
+    "m_PreviewExpanded": false,
+    "m_DismissedVersion": 0,
+    "m_PreviewMode": 0,
+    "m_CustomColors": {
+        "m_SerializableColors": []
+    },
+    "m_SerializedSubGraph": "{\n    \"subGraph\": {\n        \"fileID\": -5475051401550479605,\n        \"guid\": \"aa041986c041b4dc1b5bf0b2cd2d86e8\",\n        \"type\": 3\n    }\n}",
+    "m_PropertyGuids": [
+        "975f2db3-e792-46e7-9bf8-3a4cbe4fb068",
+        "373c703c-395b-43d3-91ba-78b9497021e7",
+        "2747a643-8db3-4ffc-9923-55aa70fb2549",
+        "451bbdf7-6136-4a6e-a5c8-4918d2ea4b95"
+    ],
+    "m_PropertyIds": [
+        -181240572,
+        716604351,
+        -1949568231,
+        -2106065226
+    ],
+    "m_Dropdowns": [],
+    "m_DropdownSelectedEntries": []
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasData",
+    "m_ObjectId": "ec0773b35401476ea81c2e6afc45d427",
+    "supportsMotionVectors": false
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.SubGraphNode",
+    "m_ObjectId": "ee07f900555e468682524833575fbddb",
+    "m_Group": {
+        "m_Id": ""
+    },
+    "m_Name": "Selectable State",
+    "m_DrawState": {
+        "m_Expanded": true,
+        "m_Position": {
+            "serializedVersion": "2",
+            "x": -1414.9998779296875,
+            "y": 400.9999694824219,
+            "width": 256.0,
+            "height": 122.99996948242188
+        }
+    },
+    "m_Slots": [
+        {
+            "m_Id": "cadd8283eddd4773be0a67216ccb3003"
+        }
+    ],
+    "synonyms": [],
+    "m_Precision": 0,
+    "m_PreviewExpanded": false,
+    "m_DismissedVersion": 0,
+    "m_PreviewMode": 0,
+    "m_CustomColors": {
+        "m_SerializableColors": []
+    },
+    "m_SerializedSubGraph": "{\n    \"subGraph\": {\n        \"fileID\": -5475051401550479605,\n        \"guid\": \"9cc8eedec3988455885bdb12866a33d6\",\n        \"type\": 3\n    }\n}",
+    "m_PropertyGuids": [],
+    "m_PropertyIds": [],
+    "m_Dropdowns": [
+        "_Preview"
+    ],
+    "m_DropdownSelectedEntries": [
+        "Normal"
+    ]
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasData",
+    "m_ObjectId": "ef3ad75715cb4c11b9e3357285c4829f",
+    "supportsMotionVectors": false
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasData",
+    "m_ObjectId": "f795741071454171a540b0e05ba89099",
+    "supportsMotionVectors": false
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasSubTarget",
+    "m_ObjectId": "f84934c605d0438b9d9b65af0e04993e"
 }
 
 {
     "m_SGVersion": 0,
     "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
-    "m_ObjectId": "f9778a9d60e448d3808800d4a4f5ef46",
-    "m_Id": 2,
-    "m_DisplayName": "Pixel Per Unit",
+    "m_ObjectId": "fabe74ca5beb4c4cac62c61862b2147f",
+    "m_Id": 3,
+    "m_DisplayName": "Pixel_Per_Unit",
     "m_SlotType": 1,
     "m_Hidden": false,
-    "m_ShaderOutputName": "_CanvasPixelPerUnit",
+    "m_HideConnector": false,
+    "m_ShaderOutputName": "Pixel_Per_Unit",
     "m_StageCapability": 3,
-    "m_Value": 100.0,
-    "m_DefaultValue": 100.0,
-    "m_Labels": []
+    "m_Value": 0.0,
+    "m_DefaultValue": 0.0,
+    "m_Labels": [],
+    "m_LiteralMode": false
 }
 
 {
diff --git a/Packages/com.unity.shadergraph/Samples~/UGUIShaders/Examples/Buttons/SciFi Button.shadergraph b/Packages/com.unity.shadergraph/Samples~/UGUIShaders/Examples/Buttons/SciFi Button.shadergraph
index d15304dad18..c3e66a6b34e 100644
--- a/Packages/com.unity.shadergraph/Samples~/UGUIShaders/Examples/Buttons/SciFi Button.shadergraph	
+++ b/Packages/com.unity.shadergraph/Samples~/UGUIShaders/Examples/Buttons/SciFi Button.shadergraph	
@@ -33,14 +33,14 @@
         {
             "m_Id": "03fda5e87e454ccfb7156ab97a3cc18e"
         },
-        {
-            "m_Id": "4541db2c77c04577aa3afdd5e93ed7f8"
-        },
         {
             "m_Id": "569d4efefaf74119b7bc30c00fc29127"
         },
         {
             "m_Id": "1b7e4f18cda743d5884bdf2e3df50b15"
+        },
+        {
+            "m_Id": "d4e341612c29478eb50b3e26a09efa81"
         }
     ],
     "m_GroupDatas": [],
@@ -116,20 +116,6 @@
                 "m_SlotId": -863157454
             }
         },
-        {
-            "m_OutputSlot": {
-                "m_Node": {
-                    "m_Id": "4541db2c77c04577aa3afdd5e93ed7f8"
-                },
-                "m_SlotId": 0
-            },
-            "m_InputSlot": {
-                "m_Node": {
-                    "m_Id": "03fda5e87e454ccfb7156ab97a3cc18e"
-                },
-                "m_SlotId": 830530724
-            }
-        },
         {
             "m_OutputSlot": {
                 "m_Node": {
@@ -171,6 +157,20 @@
                 },
                 "m_SlotId": 72173793
             }
+        },
+        {
+            "m_OutputSlot": {
+                "m_Node": {
+                    "m_Id": "d4e341612c29478eb50b3e26a09efa81"
+                },
+                "m_SlotId": 1
+            },
+            "m_InputSlot": {
+                "m_Node": {
+                    "m_Id": "03fda5e87e454ccfb7156ab97a3cc18e"
+                },
+                "m_SlotId": 830530724
+            }
         }
     ],
     "m_VertexContext": {
@@ -229,11 +229,13 @@
     "m_DisplayName": "State",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "_State",
     "m_StageCapability": 3,
     "m_Value": 0.0,
     "m_DefaultValue": 0.0,
-    "m_Labels": []
+    "m_Labels": [],
+    "m_LiteralMode": false
 }
 
 {
@@ -293,6 +295,12 @@
     "m_DropdownSelectedEntries": []
 }
 
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasSubTarget",
+    "m_ObjectId": "0724948387ed419a8be84dbf40ca769b"
+}
+
 {
     "m_SGVersion": 0,
     "m_Type": "UnityEditor.ShaderGraph.BlockNode",
@@ -335,12 +343,19 @@
     "m_DisplayName": "B",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "B",
     "m_StageCapability": 3,
     "m_Value": false,
     "m_DefaultValue": false
 }
 
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasSubTarget",
+    "m_ObjectId": "10c3b5b995fd4d19825cb2a725ffb981"
+}
+
 {
     "m_SGVersion": 0,
     "m_Type": "UnityEditor.ShaderGraph.BooleanMaterialSlot",
@@ -349,6 +364,7 @@
     "m_DisplayName": "Out",
     "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "Out",
     "m_StageCapability": 3,
     "m_Value": false,
@@ -363,6 +379,7 @@
     "m_DisplayName": "IsDisabled",
     "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "IsDisabled",
     "m_StageCapability": 3,
     "m_Value": false,
@@ -411,11 +428,13 @@
     "m_DisplayName": "Alpha",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "Alpha",
     "m_StageCapability": 2,
     "m_Value": 1.0,
     "m_DefaultValue": 1.0,
-    "m_Labels": []
+    "m_Labels": [],
+    "m_LiteralMode": false
 }
 
 {
@@ -462,6 +481,7 @@
     "m_DisplayName": "Out",
     "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "Out",
     "m_StageCapability": 3,
     "m_Value": false,
@@ -476,6 +496,7 @@
     "m_DisplayName": "Emission",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "Emission",
     "m_StageCapability": 2,
     "m_Value": {
@@ -498,6 +519,19 @@
     }
 }
 
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasData",
+    "m_ObjectId": "23e408b0f1454583bbd5158bd375dc27",
+    "supportsMotionVectors": false
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasSubTarget",
+    "m_ObjectId": "247cd01b97fd4baa87c323d78de99850"
+}
+
 {
     "m_SGVersion": 0,
     "m_Type": "UnityEditor.ShaderGraph.BooleanMaterialSlot",
@@ -506,12 +540,32 @@
     "m_DisplayName": "In",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "In",
     "m_StageCapability": 3,
     "m_Value": false,
     "m_DefaultValue": false
 }
 
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasData",
+    "m_ObjectId": "29880c8660cd4e2297ceaa8b9b783e4c",
+    "supportsMotionVectors": false
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasSubTarget",
+    "m_ObjectId": "32e5213c4b334bfeb1d7aea2f95436e2"
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasSubTarget",
+    "m_ObjectId": "337a68a849fe49b283d7660f082f1726"
+}
+
 {
     "m_SGVersion": 1,
     "m_Type": "UnityEditor.Rendering.Universal.ShaderGraph.UniversalTarget",
@@ -543,6 +597,7 @@
     "m_CastShadows": true,
     "m_ReceiveShadows": true,
     "m_DisableTint": false,
+    "m_Sort3DAs2DCompatible": false,
     "m_AdditionalMotionVectorMode": 0,
     "m_AlembicMotionVectors": false,
     "m_SupportsLODCrossFade": false,
@@ -552,35 +607,9 @@
 
 {
     "m_SGVersion": 0,
-    "m_Type": "UnityEditor.ShaderGraph.SelectableStateNode",
-    "m_ObjectId": "4541db2c77c04577aa3afdd5e93ed7f8",
-    "m_Group": {
-        "m_Id": ""
-    },
-    "m_Name": "Selectable State",
-    "m_DrawState": {
-        "m_Expanded": true,
-        "m_Position": {
-            "serializedVersion": "2",
-            "x": -1026.666748046875,
-            "y": 282.0,
-            "width": 140.66668701171876,
-            "height": 78.66665649414063
-        }
-    },
-    "m_Slots": [
-        {
-            "m_Id": "b57417ee858a4dcab2d2a357a30e1333"
-        }
-    ],
-    "synonyms": [],
-    "m_Precision": 0,
-    "m_PreviewExpanded": true,
-    "m_DismissedVersion": 0,
-    "m_PreviewMode": 0,
-    "m_CustomColors": {
-        "m_SerializableColors": []
-    }
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasData",
+    "m_ObjectId": "3d7882455342469badf9b85649b4d809",
+    "supportsMotionVectors": false
 }
 
 {
@@ -591,12 +620,19 @@
     "m_DisplayName": "IsNormal",
     "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "IsNormal",
     "m_StageCapability": 3,
     "m_Value": false,
     "m_DefaultValue": false
 }
 
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasSubTarget",
+    "m_ObjectId": "48f4b1e87a3c4f6885826e7b4fac6a55"
+}
+
 {
     "m_SGVersion": 0,
     "m_Type": "UnityEditor.ShaderGraph.BooleanMaterialSlot",
@@ -605,37 +641,13 @@
     "m_DisplayName": "Selected",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "_Selected",
     "m_StageCapability": 2,
     "m_Value": true,
     "m_DefaultValue": false
 }
 
-{
-    "m_SGVersion": 0,
-    "m_Type": "UnityEditor.ShaderGraph.Vector4MaterialSlot",
-    "m_ObjectId": "5226181ad74649d9a7378f8990bc3e6c",
-    "m_Id": 72173793,
-    "m_DisplayName": "Button Color",
-    "m_SlotType": 0,
-    "m_Hidden": false,
-    "m_ShaderOutputName": "_Button_Color",
-    "m_StageCapability": 2,
-    "m_Value": {
-        "x": 0.0,
-        "y": 0.250980406999588,
-        "z": 1.0,
-        "w": 0.0
-    },
-    "m_DefaultValue": {
-        "x": 0.0,
-        "y": 0.0,
-        "z": 0.0,
-        "w": 0.0
-    },
-    "m_Labels": []
-}
-
 {
     "m_SGVersion": 0,
     "m_Type": "UnityEditor.ShaderGraph.OrNode",
@@ -683,6 +695,7 @@
     "m_DisplayName": "Color",
     "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "Color",
     "m_StageCapability": 2,
     "m_Value": {
@@ -698,6 +711,12 @@
     "m_Labels": []
 }
 
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasSubTarget",
+    "m_ObjectId": "5fdad50a225b41158ea509de8ebd38c6"
+}
+
 {
     "m_SGVersion": 0,
     "m_Type": "UnityEditor.ShaderGraph.BooleanMaterialSlot",
@@ -706,6 +725,7 @@
     "m_DisplayName": "IsHighlighted",
     "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "IsHighlighted",
     "m_StageCapability": 3,
     "m_Value": false,
@@ -748,11 +768,9 @@
 
 {
     "m_SGVersion": 0,
-    "m_Type": "UnityEditor.Rendering.Canvas.ShaderGraph.CanvasData",
-    "m_ObjectId": "6c72ac960045452fa183f560dd1e9d9d",
-    "m_Version": 0,
-    "m_AlphaClip": false,
-    "m_DisableTint": false
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasData",
+    "m_ObjectId": "6a4f7fe7684a4000b7f710774cf6b0bd",
+    "supportsMotionVectors": false
 }
 
 {
@@ -762,7 +780,7 @@
     "m_Group": {
         "m_Id": ""
     },
-    "m_Name": "SciFi Button",
+    "m_Name": "Sci Fi Button",
     "m_DrawState": {
         "m_Expanded": true,
         "m_Position": {
@@ -778,7 +796,7 @@
             "m_Id": "d3212aa42d724a94b3e96ecec98a1a79"
         },
         {
-            "m_Id": "5226181ad74649d9a7378f8990bc3e6c"
+            "m_Id": "a1fd6a152754400dbe05d7e955eda127"
         },
         {
             "m_Id": "4fb1686175fa48518f6bd7b0cce31b5f"
@@ -837,6 +855,19 @@
     ]
 }
 
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasData",
+    "m_ObjectId": "770b75583f6740d3bff3f12c44630008",
+    "supportsMotionVectors": false
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasSubTarget",
+    "m_ObjectId": "786640f9ee3344dbb15a7654dbef302f"
+}
+
 {
     "m_SGVersion": 0,
     "m_Type": "UnityEditor.Rendering.Canvas.ShaderGraph.CanvasData",
@@ -846,6 +877,12 @@
     "m_DisableTint": false
 }
 
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasSubTarget",
+    "m_ObjectId": "93d4f58b92b34b30a417d57972928aa3"
+}
+
 {
     "m_SGVersion": 0,
     "m_Type": "UnityEditor.ShaderGraph.Vector4MaterialSlot",
@@ -854,6 +891,7 @@
     "m_DisplayName": "Color",
     "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "Out",
     "m_StageCapability": 3,
     "m_Value": {
@@ -879,12 +917,52 @@
     "m_DisplayName": "Pressed",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "_Pressed",
     "m_StageCapability": 2,
     "m_Value": false,
     "m_DefaultValue": false
 }
 
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasData",
+    "m_ObjectId": "9faba2e0409944e4974405ecba3e0d98",
+    "supportsMotionVectors": false
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.ColorRGBAMaterialSlot",
+    "m_ObjectId": "a1fd6a152754400dbe05d7e955eda127",
+    "m_Id": 72173793,
+    "m_DisplayName": "Button Color",
+    "m_SlotType": 0,
+    "m_Hidden": false,
+    "m_HideConnector": false,
+    "m_ShaderOutputName": "_Button_Color",
+    "m_StageCapability": 2,
+    "m_Value": {
+        "x": 0.0,
+        "y": 0.250980406999588,
+        "z": 1.0,
+        "w": 0.0
+    },
+    "m_DefaultValue": {
+        "x": 0.0,
+        "y": 0.250980406999588,
+        "z": 1.0,
+        "w": 0.0
+    },
+    "m_Labels": []
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasSubTarget",
+    "m_ObjectId": "a73a4874f79b46329c1e3f2bad509a45"
+}
+
 {
     "m_SGVersion": 0,
     "m_Type": "UnityEditor.ShaderGraph.BooleanMaterialSlot",
@@ -893,6 +971,7 @@
     "m_DisplayName": "IsPressed",
     "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "IsPressed",
     "m_StageCapability": 3,
     "m_Value": false,
@@ -925,21 +1004,6 @@
     "m_SupportLineRendering": false
 }
 
-{
-    "m_SGVersion": 0,
-    "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
-    "m_ObjectId": "b57417ee858a4dcab2d2a357a30e1333",
-    "m_Id": 0,
-    "m_DisplayName": "State",
-    "m_SlotType": 1,
-    "m_Hidden": false,
-    "m_ShaderOutputName": "_State",
-    "m_StageCapability": 3,
-    "m_Value": 0.0,
-    "m_DefaultValue": 0.0,
-    "m_Labels": []
-}
-
 {
     "m_SGVersion": 0,
     "m_Type": "UnityEditor.ShaderGraph.ColorRGBMaterialSlot",
@@ -948,6 +1012,7 @@
     "m_DisplayName": "Base Color",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "BaseColor",
     "m_StageCapability": 2,
     "m_Value": {
@@ -978,11 +1043,13 @@
     "m_DisplayName": "Alpha",
     "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "Alpha",
     "m_StageCapability": 2,
     "m_Value": 0.0,
     "m_DefaultValue": 0.0,
-    "m_Labels": []
+    "m_Labels": [],
+    "m_LiteralMode": false
 }
 
 {
@@ -993,12 +1060,27 @@
     "m_DisplayName": "Active",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "_Active",
     "m_StageCapability": 2,
     "m_Value": true,
     "m_DefaultValue": false
 }
 
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasData",
+    "m_ObjectId": "c1e7ee39856a45b3ab5d7e007395d447",
+    "supportsMotionVectors": false
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasData",
+    "m_ObjectId": "c373f1894323494b8c901d0dde2cbffd",
+    "supportsMotionVectors": false
+}
+
 {
     "m_SGVersion": 3,
     "m_Type": "UnityEditor.ShaderGraph.Internal.ColorShaderProperty",
@@ -1006,6 +1088,9 @@
     "m_Guid": {
         "m_GuidSerialized": "4237f7ba-73f8-438d-97ee-b8fbcb54d75a"
     },
+    "promotedFromAssetID": "",
+    "promotedFromCategoryName": "",
+    "promotedOrdering": -1,
     "m_Name": "Color",
     "m_DefaultRefNameVersion": 1,
     "m_RefNameGeneratedByDisplayName": "Color",
@@ -1018,7 +1103,10 @@
     "m_Precision": 0,
     "overrideHLSLDeclaration": false,
     "hlslDeclarationOverride": 0,
+    "hideConnector": false,
     "m_Hidden": false,
+    "m_PerRendererData": false,
+    "m_customAttributes": [],
     "m_Value": {
         "r": 0.0,
         "g": 0.250980406999588,
@@ -1029,6 +1117,19 @@
     "m_ColorMode": 0
 }
 
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasData",
+    "m_ObjectId": "cafe4dfb66fa41449a2bbf6804a520f5",
+    "supportsMotionVectors": false
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasSubTarget",
+    "m_ObjectId": "d0a4787e344f48f5a85fe74bb0000b0c"
+}
+
 {
     "m_SGVersion": 0,
     "m_Type": "UnityEditor.ShaderGraph.Vector2MaterialSlot",
@@ -1037,6 +1138,7 @@
     "m_DisplayName": "UV",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "_UV",
     "m_StageCapability": 2,
     "m_Value": {
@@ -1092,6 +1194,48 @@
     "m_ObjectId": "d4c64a3ec6124e59ab94142d70644f47"
 }
 
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.SubGraphNode",
+    "m_ObjectId": "d4e341612c29478eb50b3e26a09efa81",
+    "m_Group": {
+        "m_Id": ""
+    },
+    "m_Name": "Selectable State",
+    "m_DrawState": {
+        "m_Expanded": true,
+        "m_Position": {
+            "serializedVersion": "2",
+            "x": -1131.9998779296875,
+            "y": 281.9999694824219,
+            "width": 255.99993896484376,
+            "height": 123.0
+        }
+    },
+    "m_Slots": [
+        {
+            "m_Id": "f2568eb80f8b464dad3c578bc8dd9d41"
+        }
+    ],
+    "synonyms": [],
+    "m_Precision": 0,
+    "m_PreviewExpanded": false,
+    "m_DismissedVersion": 0,
+    "m_PreviewMode": 0,
+    "m_CustomColors": {
+        "m_SerializableColors": []
+    },
+    "m_SerializedSubGraph": "{\n    \"subGraph\": {\n        \"fileID\": -5475051401550479605,\n        \"guid\": \"9cc8eedec3988455885bdb12866a33d6\",\n        \"type\": 3\n    }\n}",
+    "m_PropertyGuids": [],
+    "m_PropertyIds": [],
+    "m_Dropdowns": [
+        "_Preview"
+    ],
+    "m_DropdownSelectedEntries": [
+        "Normal"
+    ]
+}
+
 {
     "m_SGVersion": 0,
     "m_Type": "UnityEditor.ShaderGraph.BooleanMaterialSlot",
@@ -1100,6 +1244,7 @@
     "m_DisplayName": "A",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "A",
     "m_StageCapability": 3,
     "m_Value": false,
@@ -1114,12 +1259,51 @@
     "m_DisplayName": "IsSelected",
     "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "IsSelected",
     "m_StageCapability": 3,
     "m_Value": false,
     "m_DefaultValue": false
 }
 
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasData",
+    "m_ObjectId": "dd2d0b7f72cd40b5b04a235ffee51a1b",
+    "supportsMotionVectors": false
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasData",
+    "m_ObjectId": "ec0773b35401476ea81c2e6afc45d427",
+    "supportsMotionVectors": false
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasData",
+    "m_ObjectId": "ef3ad75715cb4c11b9e3357285c4829f",
+    "supportsMotionVectors": false
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
+    "m_ObjectId": "f2568eb80f8b464dad3c578bc8dd9d41",
+    "m_Id": 1,
+    "m_DisplayName": "State",
+    "m_SlotType": 1,
+    "m_Hidden": false,
+    "m_HideConnector": false,
+    "m_ShaderOutputName": "State",
+    "m_StageCapability": 3,
+    "m_Value": 0.0,
+    "m_DefaultValue": 0.0,
+    "m_Labels": [],
+    "m_LiteralMode": false
+}
+
 {
     "m_SGVersion": 0,
     "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasData",
@@ -1127,3 +1311,9 @@
     "supportsMotionVectors": false
 }
 
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasSubTarget",
+    "m_ObjectId": "f84934c605d0438b9d9b65af0e04993e"
+}
+
diff --git a/Packages/com.unity.shadergraph/Samples~/UGUIShaders/Examples/Buttons/SciFi2 Button.shadergraph b/Packages/com.unity.shadergraph/Samples~/UGUIShaders/Examples/Buttons/SciFi2 Button.shadergraph
index a854c1068c3..343fdce9802 100644
--- a/Packages/com.unity.shadergraph/Samples~/UGUIShaders/Examples/Buttons/SciFi2 Button.shadergraph	
+++ b/Packages/com.unity.shadergraph/Samples~/UGUIShaders/Examples/Buttons/SciFi2 Button.shadergraph	
@@ -51,9 +51,6 @@
         {
             "m_Id": "e1a639e6226942668350a2cb69d68fd0"
         },
-        {
-            "m_Id": "23987233a40c45ca98773febfea2b921"
-        },
         {
             "m_Id": "7559e4756e424846a1e43fea72321499"
         },
@@ -61,40 +58,15 @@
             "m_Id": "ecc5a368222d4b5e8aece0453d78eed6"
         },
         {
-            "m_Id": "1d126731edab4a069d974c8820801531"
+            "m_Id": "ea745432a88049b99af179d09460be55"
+        },
+        {
+            "m_Id": "8b48d96f040d443eaba1171e560a1c65"
         }
     ],
     "m_GroupDatas": [],
     "m_StickyNoteDatas": [],
     "m_Edges": [
-        {
-            "m_OutputSlot": {
-                "m_Node": {
-                    "m_Id": "1d126731edab4a069d974c8820801531"
-                },
-                "m_SlotId": 0
-            },
-            "m_InputSlot": {
-                "m_Node": {
-                    "m_Id": "7b09a29b2cac430dab227c5e6610c186"
-                },
-                "m_SlotId": -735993035
-            }
-        },
-        {
-            "m_OutputSlot": {
-                "m_Node": {
-                    "m_Id": "23987233a40c45ca98773febfea2b921"
-                },
-                "m_SlotId": 0
-            },
-            "m_InputSlot": {
-                "m_Node": {
-                    "m_Id": "e1a639e6226942668350a2cb69d68fd0"
-                },
-                "m_SlotId": 830530724
-            }
-        },
         {
             "m_OutputSlot": {
                 "m_Node": {
@@ -151,6 +123,20 @@
                 "m_SlotId": -1796699511
             }
         },
+        {
+            "m_OutputSlot": {
+                "m_Node": {
+                    "m_Id": "8b48d96f040d443eaba1171e560a1c65"
+                },
+                "m_SlotId": 1
+            },
+            "m_InputSlot": {
+                "m_Node": {
+                    "m_Id": "7b09a29b2cac430dab227c5e6610c186"
+                },
+                "m_SlotId": -735993035
+            }
+        },
         {
             "m_OutputSlot": {
                 "m_Node": {
@@ -235,6 +221,20 @@
                 "m_SlotId": 0
             }
         },
+        {
+            "m_OutputSlot": {
+                "m_Node": {
+                    "m_Id": "ea745432a88049b99af179d09460be55"
+                },
+                "m_SlotId": 1
+            },
+            "m_InputSlot": {
+                "m_Node": {
+                    "m_Id": "e1a639e6226942668350a2cb69d68fd0"
+                },
+                "m_SlotId": 830530724
+            }
+        },
         {
             "m_OutputSlot": {
                 "m_Node": {
@@ -320,6 +320,7 @@
     "m_DisplayName": "Dimensions",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "_Dimensions",
     "m_StageCapability": 2,
     "m_Value": {
@@ -333,6 +334,23 @@
     "m_Labels": []
 }
 
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
+    "m_ObjectId": "01e5774c02ac4159abeeea9267fbc07d",
+    "m_Id": 716604351,
+    "m_DisplayName": "PreviewHeight",
+    "m_SlotType": 0,
+    "m_Hidden": false,
+    "m_HideConnector": true,
+    "m_ShaderOutputName": "_PreviewHeight",
+    "m_StageCapability": 3,
+    "m_Value": 100.0,
+    "m_DefaultValue": 100.0,
+    "m_Labels": [],
+    "m_LiteralMode": false
+}
+
 {
     "m_SGVersion": 0,
     "m_Type": "UnityEditor.ShaderGraph.Vector3MaterialSlot",
@@ -341,6 +359,7 @@
     "m_DisplayName": "Color",
     "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "Color",
     "m_StageCapability": 2,
     "m_Value": {
@@ -364,6 +383,7 @@
     "m_DisplayName": "In",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "In",
     "m_StageCapability": 3,
     "m_Value": false,
@@ -372,17 +392,8 @@
 
 {
     "m_SGVersion": 0,
-    "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
-    "m_ObjectId": "079a2ec906814fb69d1517a07231dafc",
-    "m_Id": 0,
-    "m_DisplayName": "State",
-    "m_SlotType": 1,
-    "m_Hidden": false,
-    "m_ShaderOutputName": "_State",
-    "m_StageCapability": 3,
-    "m_Value": 0.0,
-    "m_DefaultValue": 0.0,
-    "m_Labels": []
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasSubTarget",
+    "m_ObjectId": "0724948387ed419a8be84dbf40ca769b"
 }
 
 {
@@ -393,6 +404,7 @@
     "m_DisplayName": "IsDisabled",
     "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "IsDisabled",
     "m_StageCapability": 3,
     "m_Value": false,
@@ -436,16 +448,24 @@
 {
     "m_SGVersion": 0,
     "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
-    "m_ObjectId": "14147776c7a5400ca9daa638ecf05017",
-    "m_Id": 2,
-    "m_DisplayName": "Pixel Per Unit",
-    "m_SlotType": 1,
+    "m_ObjectId": "0c08850336834fbc903064f41e39a5df",
+    "m_Id": -2106065226,
+    "m_DisplayName": "PreviewPPU",
+    "m_SlotType": 0,
     "m_Hidden": false,
-    "m_ShaderOutputName": "_CanvasPixelPerUnit",
+    "m_HideConnector": true,
+    "m_ShaderOutputName": "_PreviewPPU",
     "m_StageCapability": 3,
     "m_Value": 100.0,
     "m_DefaultValue": 100.0,
-    "m_Labels": []
+    "m_Labels": [],
+    "m_LiteralMode": false
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasSubTarget",
+    "m_ObjectId": "10c3b5b995fd4d19825cb2a725ffb981"
 }
 
 {
@@ -456,6 +476,7 @@
     "m_DisplayName": "UV",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "_UV",
     "m_StageCapability": 2,
     "m_Value": {
@@ -511,11 +532,13 @@
     "m_DisplayName": "Alpha",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "Alpha",
     "m_StageCapability": 2,
     "m_Value": 1.0,
     "m_DefaultValue": 1.0,
-    "m_Labels": []
+    "m_Labels": [],
+    "m_LiteralMode": false
 }
 
 {
@@ -526,57 +549,13 @@
     "m_DisplayName": "IsSelected",
     "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "IsSelected",
     "m_StageCapability": 3,
     "m_Value": false,
     "m_DefaultValue": false
 }
 
-{
-    "m_SGVersion": 0,
-    "m_Type": "UnityEditor.ShaderGraph.RectTransformSizeNode",
-    "m_ObjectId": "1d126731edab4a069d974c8820801531",
-    "m_Group": {
-        "m_Id": ""
-    },
-    "m_Name": "RectTransform Size",
-    "m_DrawState": {
-        "m_Expanded": true,
-        "m_Position": {
-            "serializedVersion": "2",
-            "x": -638.6666259765625,
-            "y": 520.6666870117188,
-            "width": 158.0,
-            "height": 78.66668701171875
-        }
-    },
-    "m_Slots": [
-        {
-            "m_Id": "57a04bee57834c3f97b72766f3d7076e"
-        },
-        {
-            "m_Id": "a975946757d34196b4ffb63d4cfc4caa"
-        },
-        {
-            "m_Id": "14147776c7a5400ca9daa638ecf05017"
-        }
-    ],
-    "synonyms": [],
-    "m_Precision": 0,
-    "m_PreviewExpanded": true,
-    "m_DismissedVersion": 0,
-    "m_PreviewMode": 0,
-    "m_CustomColors": {
-        "m_SerializableColors": []
-    },
-    "previewSize": {
-        "x": 100.0,
-        "y": 100.0
-    },
-    "previewScaleFactor": 1.0,
-    "previewPixelsPerUnit": 100.0
-}
-
 {
     "m_SGVersion": 0,
     "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
@@ -585,11 +564,13 @@
     "m_DisplayName": "State",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "_State",
     "m_StageCapability": 3,
     "m_Value": 0.0,
     "m_DefaultValue": 0.0,
-    "m_Labels": []
+    "m_Labels": [],
+    "m_LiteralMode": false
 }
 
 {
@@ -600,6 +581,7 @@
     "m_DisplayName": "Emission",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "Emission",
     "m_StageCapability": 2,
     "m_Value": {
@@ -630,44 +612,20 @@
     "m_DisplayName": "Alpha",
     "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "Alpha",
     "m_StageCapability": 2,
     "m_Value": 0.0,
     "m_DefaultValue": 0.0,
-    "m_Labels": []
+    "m_Labels": [],
+    "m_LiteralMode": false
 }
 
 {
     "m_SGVersion": 0,
-    "m_Type": "UnityEditor.ShaderGraph.SelectableStateNode",
-    "m_ObjectId": "23987233a40c45ca98773febfea2b921",
-    "m_Group": {
-        "m_Id": ""
-    },
-    "m_Name": "Selectable State",
-    "m_DrawState": {
-        "m_Expanded": true,
-        "m_Position": {
-            "serializedVersion": "2",
-            "x": -1026.666748046875,
-            "y": 295.33331298828127,
-            "width": 140.66668701171876,
-            "height": 78.66668701171875
-        }
-    },
-    "m_Slots": [
-        {
-            "m_Id": "079a2ec906814fb69d1517a07231dafc"
-        }
-    ],
-    "synonyms": [],
-    "m_Precision": 0,
-    "m_PreviewExpanded": true,
-    "m_DismissedVersion": 0,
-    "m_PreviewMode": 0,
-    "m_CustomColors": {
-        "m_SerializableColors": []
-    }
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasData",
+    "m_ObjectId": "23e408b0f1454583bbd5158bd375dc27",
+    "supportsMotionVectors": false
 }
 
 {
@@ -678,12 +636,55 @@
     "m_DisplayName": "Selected",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "_Selected",
     "m_StageCapability": 2,
     "m_Value": true,
     "m_DefaultValue": false
 }
 
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasSubTarget",
+    "m_ObjectId": "247cd01b97fd4baa87c323d78de99850"
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasData",
+    "m_ObjectId": "29880c8660cd4e2297ceaa8b9b783e4c",
+    "supportsMotionVectors": false
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
+    "m_ObjectId": "3014c04a2c1c4135bb6c78983c2582d3",
+    "m_Id": 3,
+    "m_DisplayName": "Pixel_Per_Unit",
+    "m_SlotType": 1,
+    "m_Hidden": false,
+    "m_HideConnector": false,
+    "m_ShaderOutputName": "Pixel_Per_Unit",
+    "m_StageCapability": 3,
+    "m_Value": 0.0,
+    "m_DefaultValue": 0.0,
+    "m_Labels": [],
+    "m_LiteralMode": false
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasSubTarget",
+    "m_ObjectId": "32e5213c4b334bfeb1d7aea2f95436e2"
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasSubTarget",
+    "m_ObjectId": "337a68a849fe49b283d7660f082f1726"
+}
+
 {
     "m_SGVersion": 1,
     "m_Type": "UnityEditor.Rendering.Universal.ShaderGraph.UniversalTarget",
@@ -715,6 +716,7 @@
     "m_CastShadows": true,
     "m_ReceiveShadows": true,
     "m_DisableTint": false,
+    "m_Sort3DAs2DCompatible": false,
     "m_AdditionalMotionVectorMode": 0,
     "m_AlembicMotionVectors": false,
     "m_SupportsLODCrossFade": false,
@@ -722,6 +724,30 @@
     "m_SupportVFX": false
 }
 
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
+    "m_ObjectId": "3c986bffe42d4437bf33be332a13d10a",
+    "m_Id": -1949568231,
+    "m_DisplayName": "PreviewScaleFactor",
+    "m_SlotType": 0,
+    "m_Hidden": false,
+    "m_HideConnector": true,
+    "m_ShaderOutputName": "_PreviewScaleFactor",
+    "m_StageCapability": 3,
+    "m_Value": 1.0,
+    "m_DefaultValue": 1.0,
+    "m_Labels": [],
+    "m_LiteralMode": false
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasData",
+    "m_ObjectId": "3d7882455342469badf9b85649b4d809",
+    "supportsMotionVectors": false
+}
+
 {
     "m_SGVersion": 0,
     "m_Type": "UnityEditor.Rendering.Canvas.ShaderGraph.CanvasData",
@@ -731,6 +757,12 @@
     "m_DisableTint": false
 }
 
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasSubTarget",
+    "m_ObjectId": "48f4b1e87a3c4f6885826e7b4fac6a55"
+}
+
 {
     "m_SGVersion": 0,
     "m_Type": "UnityEditor.ShaderGraph.BooleanMaterialSlot",
@@ -739,6 +771,7 @@
     "m_DisplayName": "B",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "B",
     "m_StageCapability": 3,
     "m_Value": false,
@@ -753,6 +786,7 @@
     "m_DisplayName": "Pressed",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "_Pressed",
     "m_StageCapability": 2,
     "m_Value": false,
@@ -761,23 +795,25 @@
 
 {
     "m_SGVersion": 0,
-    "m_Type": "UnityEditor.ShaderGraph.Vector2MaterialSlot",
-    "m_ObjectId": "57a04bee57834c3f97b72766f3d7076e",
-    "m_Id": 0,
-    "m_DisplayName": "Size",
+    "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
+    "m_ObjectId": "54403822f861468f9c995d23e69ba48b",
+    "m_Id": 1,
+    "m_DisplayName": "State",
     "m_SlotType": 1,
     "m_Hidden": false,
-    "m_ShaderOutputName": "_RectTransformSize",
+    "m_HideConnector": false,
+    "m_ShaderOutputName": "State",
     "m_StageCapability": 3,
-    "m_Value": {
-        "x": 1.0,
-        "y": 1.0
-    },
-    "m_DefaultValue": {
-        "x": 100.0,
-        "y": 100.0
-    },
-    "m_Labels": []
+    "m_Value": 0.0,
+    "m_DefaultValue": 0.0,
+    "m_Labels": [],
+    "m_LiteralMode": false
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasSubTarget",
+    "m_ObjectId": "5fdad50a225b41158ea509de8ebd38c6"
 }
 
 {
@@ -788,6 +824,7 @@
     "m_DisplayName": "IsHighlighted",
     "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "IsHighlighted",
     "m_StageCapability": 3,
     "m_Value": false,
@@ -828,6 +865,13 @@
     "m_SerializedDescriptor": "SurfaceDescription.BaseColor"
 }
 
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasData",
+    "m_ObjectId": "6a4f7fe7684a4000b7f710774cf6b0bd",
+    "supportsMotionVectors": false
+}
+
 {
     "m_SGVersion": 0,
     "m_Type": "UnityEditor.ShaderGraph.BooleanMaterialSlot",
@@ -836,6 +880,7 @@
     "m_DisplayName": "Out",
     "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "Out",
     "m_StageCapability": 3,
     "m_Value": false,
@@ -870,6 +915,7 @@
     "m_DisplayName": "Width Height",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "_Width_Height",
     "m_StageCapability": 2,
     "m_Value": {
@@ -951,12 +997,20 @@
     "m_DisplayName": "IsPressed",
     "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "IsPressed",
     "m_StageCapability": 3,
     "m_Value": false,
     "m_DefaultValue": false
 }
 
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasData",
+    "m_ObjectId": "770b75583f6740d3bff3f12c44630008",
+    "supportsMotionVectors": false
+}
+
 {
     "m_SGVersion": 0,
     "m_Type": "UnityEditor.ShaderGraph.BooleanMaterialSlot",
@@ -965,12 +1019,19 @@
     "m_DisplayName": "IsNormal",
     "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "IsNormal",
     "m_StageCapability": 3,
     "m_Value": false,
     "m_DefaultValue": false
 }
 
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasSubTarget",
+    "m_ObjectId": "786640f9ee3344dbb15a7654dbef302f"
+}
+
 {
     "m_SGVersion": 0,
     "m_Type": "UnityEditor.ShaderGraph.SubGraphNode",
@@ -978,7 +1039,7 @@
     "m_Group": {
         "m_Id": ""
     },
-    "m_Name": "SciFi Button2",
+    "m_Name": "Sci Fi Button 2",
     "m_DrawState": {
         "m_Expanded": true,
         "m_Position": {
@@ -997,7 +1058,7 @@
             "m_Id": "00b0aef34c6f4cdc86c8228ebda99634"
         },
         {
-            "m_Id": "ce592aa2000c41babacae698e73b87e4"
+            "m_Id": "9b14c6c01a7042e2b17990d869e79953"
         },
         {
             "m_Id": "9f58f1a02027424787a6cb7ab6890bf5"
@@ -1103,6 +1164,7 @@
     "m_DisplayName": "Out",
     "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "Out",
     "m_StageCapability": 3,
     "m_Value": false,
@@ -1111,17 +1173,74 @@
 
 {
     "m_SGVersion": 0,
-    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasSubTarget",
-    "m_ObjectId": "93d4f58b92b34b30a417d57972928aa3"
+    "m_Type": "UnityEditor.ShaderGraph.SubGraphNode",
+    "m_ObjectId": "8b48d96f040d443eaba1171e560a1c65",
+    "m_Group": {
+        "m_Id": ""
+    },
+    "m_Name": "Rect Transform Size",
+    "m_DrawState": {
+        "m_Expanded": true,
+        "m_Position": {
+            "serializedVersion": "2",
+            "x": -644.0,
+            "y": 519.0,
+            "width": 165.0,
+            "height": 228.0
+        }
+    },
+    "m_Slots": [
+        {
+            "m_Id": "cd28addebd39441bbcd5f4515e45cba6"
+        },
+        {
+            "m_Id": "01e5774c02ac4159abeeea9267fbc07d"
+        },
+        {
+            "m_Id": "3c986bffe42d4437bf33be332a13d10a"
+        },
+        {
+            "m_Id": "0c08850336834fbc903064f41e39a5df"
+        },
+        {
+            "m_Id": "cfc6d32e7c83473e94a0204070f0f937"
+        },
+        {
+            "m_Id": "ad2b7c85c6034c778aa196c235886e6f"
+        },
+        {
+            "m_Id": "3014c04a2c1c4135bb6c78983c2582d3"
+        }
+    ],
+    "synonyms": [],
+    "m_Precision": 0,
+    "m_PreviewExpanded": false,
+    "m_DismissedVersion": 0,
+    "m_PreviewMode": 0,
+    "m_CustomColors": {
+        "m_SerializableColors": []
+    },
+    "m_SerializedSubGraph": "{\n    \"subGraph\": {\n        \"fileID\": -5475051401550479605,\n        \"guid\": \"aa041986c041b4dc1b5bf0b2cd2d86e8\",\n        \"type\": 3\n    }\n}",
+    "m_PropertyGuids": [
+        "975f2db3-e792-46e7-9bf8-3a4cbe4fb068",
+        "373c703c-395b-43d3-91ba-78b9497021e7",
+        "2747a643-8db3-4ffc-9923-55aa70fb2549",
+        "451bbdf7-6136-4a6e-a5c8-4918d2ea4b95"
+    ],
+    "m_PropertyIds": [
+        -181240572,
+        716604351,
+        -1949568231,
+        -2106065226
+    ],
+    "m_Dropdowns": [],
+    "m_DropdownSelectedEntries": []
 }
 
 {
     "m_SGVersion": 0,
-    "m_Type": "UnityEditor.Rendering.Canvas.ShaderGraph.CanvasData",
-    "m_ObjectId": "970d4610e4594ec68f43848d80b706d3",
-    "m_Version": 0,
-    "m_AlphaClip": false,
-    "m_DisableTint": false
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasSubTarget",
+    "m_ObjectId": "93d4f58b92b34b30a417d57972928aa3"
 }
 
 {
@@ -1160,6 +1279,32 @@
     }
 }
 
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.ColorRGBAMaterialSlot",
+    "m_ObjectId": "9b14c6c01a7042e2b17990d869e79953",
+    "m_Id": -651097183,
+    "m_DisplayName": "Color",
+    "m_SlotType": 0,
+    "m_Hidden": false,
+    "m_HideConnector": false,
+    "m_ShaderOutputName": "_Color",
+    "m_StageCapability": 2,
+    "m_Value": {
+        "x": 0.0,
+        "y": 0.5,
+        "z": 1.0,
+        "w": 0.0
+    },
+    "m_DefaultValue": {
+        "x": 0.0,
+        "y": 0.5,
+        "z": 1.0,
+        "w": 0.0
+    },
+    "m_Labels": []
+}
+
 {
     "m_SGVersion": 0,
     "m_Type": "UnityEditor.ShaderGraph.Vector4MaterialSlot",
@@ -1168,6 +1313,7 @@
     "m_DisplayName": "Color",
     "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "Out",
     "m_StageCapability": 3,
     "m_Value": {
@@ -1193,26 +1339,49 @@
     "m_DisplayName": "Grid Tiles",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "_Grid_Tiles",
     "m_StageCapability": 2,
     "m_Value": 24.0,
-    "m_DefaultValue": 0.0,
-    "m_Labels": []
+    "m_DefaultValue": 24.0,
+    "m_Labels": [],
+    "m_LiteralMode": false
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasData",
+    "m_ObjectId": "9faba2e0409944e4974405ecba3e0d98",
+    "supportsMotionVectors": false
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasSubTarget",
+    "m_ObjectId": "a73a4874f79b46329c1e3f2bad509a45"
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasSubTarget",
+    "m_ObjectId": "ad0511b594294cf9ba9546e82b5dbf19"
 }
 
 {
     "m_SGVersion": 0,
     "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
-    "m_ObjectId": "a975946757d34196b4ffb63d4cfc4caa",
-    "m_Id": 1,
-    "m_DisplayName": "Scale Factor",
+    "m_ObjectId": "ad2b7c85c6034c778aa196c235886e6f",
+    "m_Id": 2,
+    "m_DisplayName": "Scale_Factor",
     "m_SlotType": 1,
     "m_Hidden": false,
-    "m_ShaderOutputName": "_CanvasScaleFactor",
+    "m_HideConnector": false,
+    "m_ShaderOutputName": "Scale_Factor",
     "m_StageCapability": 3,
-    "m_Value": 1.0,
-    "m_DefaultValue": 1.0,
-    "m_Labels": []
+    "m_Value": 0.0,
+    "m_DefaultValue": 0.0,
+    "m_Labels": [],
+    "m_LiteralMode": false
 }
 
 {
@@ -1223,6 +1392,7 @@
     "m_DisplayName": "Active",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "_Active",
     "m_StageCapability": 2,
     "m_Value": true,
@@ -1236,6 +1406,9 @@
     "m_Guid": {
         "m_GuidSerialized": "93b2b055-9543-4915-8691-1b0754ff87bc"
     },
+    "promotedFromAssetID": "",
+    "promotedFromCategoryName": "",
+    "promotedOrdering": -1,
     "m_Name": "Dimensions",
     "m_DefaultRefNameVersion": 1,
     "m_RefNameGeneratedByDisplayName": "Dimensions",
@@ -1248,7 +1421,10 @@
     "m_Precision": 0,
     "overrideHLSLDeclaration": false,
     "hlslDeclarationOverride": 0,
+    "hideConnector": false,
     "m_Hidden": false,
+    "m_PerRendererData": false,
+    "m_customAttributes": [],
     "m_Value": {
         "x": 0.800000011920929,
         "y": 0.6000000238418579,
@@ -1264,6 +1440,9 @@
     "m_Guid": {
         "m_GuidSerialized": "a69fe8a4-3f6a-4327-869a-7e3dfd992980"
     },
+    "promotedFromAssetID": "",
+    "promotedFromCategoryName": "",
+    "promotedOrdering": -1,
     "m_Name": "Tilt",
     "m_DefaultRefNameVersion": 1,
     "m_RefNameGeneratedByDisplayName": "Tilt",
@@ -1276,13 +1455,27 @@
     "m_Precision": 0,
     "overrideHLSLDeclaration": false,
     "hlslDeclarationOverride": 0,
+    "hideConnector": false,
     "m_Hidden": false,
+    "m_PerRendererData": false,
+    "m_customAttributes": [],
     "m_Value": -0.30000001192092898,
     "m_FloatType": 0,
+    "m_LiteralFloatMode": false,
     "m_RangeValues": {
         "x": 0.0,
         "y": 1.0
-    }
+    },
+    "m_SliderType": 0,
+    "m_SliderPower": 3.0,
+    "m_EnumType": 0,
+    "m_CSharpEnumString": "",
+    "m_EnumNames": [
+        "Default"
+    ],
+    "m_EnumValues": [
+        0
+    ]
 }
 
 {
@@ -1293,6 +1486,7 @@
     "m_DisplayName": "Base Color",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "BaseColor",
     "m_StageCapability": 2,
     "m_Value": {
@@ -1323,11 +1517,13 @@
     "m_DisplayName": "Grid Tiles",
     "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "Out",
     "m_StageCapability": 3,
     "m_Value": 0.0,
     "m_DefaultValue": 0.0,
-    "m_Labels": []
+    "m_Labels": [],
+    "m_LiteralMode": false
 }
 
 {
@@ -1337,6 +1533,9 @@
     "m_Guid": {
         "m_GuidSerialized": "295482e6-0ccd-4663-811d-334cf62c7860"
     },
+    "promotedFromAssetID": "",
+    "promotedFromCategoryName": "",
+    "promotedOrdering": -1,
     "m_Name": "Grid Tiles",
     "m_DefaultRefNameVersion": 1,
     "m_RefNameGeneratedByDisplayName": "Grid Tiles",
@@ -1349,13 +1548,41 @@
     "m_Precision": 0,
     "overrideHLSLDeclaration": false,
     "hlslDeclarationOverride": 0,
+    "hideConnector": false,
     "m_Hidden": false,
+    "m_PerRendererData": false,
+    "m_customAttributes": [],
     "m_Value": 24.0,
     "m_FloatType": 0,
+    "m_LiteralFloatMode": false,
     "m_RangeValues": {
         "x": 0.0,
         "y": 1.0
-    }
+    },
+    "m_SliderType": 0,
+    "m_SliderPower": 3.0,
+    "m_EnumType": 0,
+    "m_CSharpEnumString": "",
+    "m_EnumNames": [
+        "Default"
+    ],
+    "m_EnumValues": [
+        0
+    ]
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasData",
+    "m_ObjectId": "c1e7ee39856a45b3ab5d7e007395d447",
+    "supportsMotionVectors": false
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasData",
+    "m_ObjectId": "c373f1894323494b8c901d0dde2cbffd",
+    "supportsMotionVectors": false
 }
 
 {
@@ -1365,6 +1592,9 @@
     "m_Guid": {
         "m_GuidSerialized": "4237f7ba-73f8-438d-97ee-b8fbcb54d75a"
     },
+    "promotedFromAssetID": "",
+    "promotedFromCategoryName": "",
+    "promotedOrdering": -1,
     "m_Name": "Color",
     "m_DefaultRefNameVersion": 1,
     "m_RefNameGeneratedByDisplayName": "Color",
@@ -1377,7 +1607,10 @@
     "m_Precision": 0,
     "overrideHLSLDeclaration": false,
     "hlslDeclarationOverride": 0,
+    "hideConnector": false,
     "m_Hidden": false,
+    "m_PerRendererData": false,
+    "m_customAttributes": [],
     "m_Value": {
         "r": 0.0,
         "g": 0.250980406999588,
@@ -1390,29 +1623,56 @@
 
 {
     "m_SGVersion": 0,
-    "m_Type": "UnityEditor.ShaderGraph.Vector4MaterialSlot",
-    "m_ObjectId": "ce592aa2000c41babacae698e73b87e4",
-    "m_Id": -651097183,
-    "m_DisplayName": "Color",
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasData",
+    "m_ObjectId": "cafe4dfb66fa41449a2bbf6804a520f5",
+    "supportsMotionVectors": false
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
+    "m_ObjectId": "cd28addebd39441bbcd5f4515e45cba6",
+    "m_Id": -181240572,
+    "m_DisplayName": "PreviewWidth",
     "m_SlotType": 0,
     "m_Hidden": false,
-    "m_ShaderOutputName": "_Color",
-    "m_StageCapability": 2,
+    "m_HideConnector": true,
+    "m_ShaderOutputName": "_PreviewWidth",
+    "m_StageCapability": 3,
+    "m_Value": 100.0,
+    "m_DefaultValue": 100.0,
+    "m_Labels": [],
+    "m_LiteralMode": false
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.Vector2MaterialSlot",
+    "m_ObjectId": "cfc6d32e7c83473e94a0204070f0f937",
+    "m_Id": 1,
+    "m_DisplayName": "Size",
+    "m_SlotType": 1,
+    "m_Hidden": false,
+    "m_HideConnector": false,
+    "m_ShaderOutputName": "Size",
+    "m_StageCapability": 3,
     "m_Value": {
         "x": 0.0,
-        "y": 0.5,
-        "z": 1.0,
-        "w": 0.0
+        "y": 0.0
     },
     "m_DefaultValue": {
         "x": 0.0,
-        "y": 0.0,
-        "z": 0.0,
-        "w": 0.0
+        "y": 0.0
     },
     "m_Labels": []
 }
 
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasSubTarget",
+    "m_ObjectId": "d0a4787e344f48f5a85fe74bb0000b0c"
+}
+
 {
     "m_SGVersion": 0,
     "m_Type": "UnityEditor.ShaderGraph.PropertyNode",
@@ -1527,6 +1787,7 @@
     "m_DisplayName": "Dimensions",
     "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "Out",
     "m_StageCapability": 3,
     "m_Value": {
@@ -1548,12 +1809,62 @@
     "m_DisplayName": "A",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "A",
     "m_StageCapability": 3,
     "m_Value": false,
     "m_DefaultValue": false
 }
 
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.SubGraphNode",
+    "m_ObjectId": "ea745432a88049b99af179d09460be55",
+    "m_Group": {
+        "m_Id": ""
+    },
+    "m_Name": "Selectable State",
+    "m_DrawState": {
+        "m_Expanded": true,
+        "m_Position": {
+            "serializedVersion": "2",
+            "x": -1132.0,
+            "y": 295.0,
+            "width": 256.0,
+            "height": 123.0
+        }
+    },
+    "m_Slots": [
+        {
+            "m_Id": "54403822f861468f9c995d23e69ba48b"
+        }
+    ],
+    "synonyms": [],
+    "m_Precision": 0,
+    "m_PreviewExpanded": false,
+    "m_DismissedVersion": 0,
+    "m_PreviewMode": 0,
+    "m_CustomColors": {
+        "m_SerializableColors": []
+    },
+    "m_SerializedSubGraph": "{\n    \"subGraph\": {\n        \"fileID\": -5475051401550479605,\n        \"guid\": \"9cc8eedec3988455885bdb12866a33d6\",\n        \"type\": 3\n    }\n}",
+    "m_PropertyGuids": [],
+    "m_PropertyIds": [],
+    "m_Dropdowns": [
+        "_Preview"
+    ],
+    "m_DropdownSelectedEntries": [
+        "Normal"
+    ]
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasData",
+    "m_ObjectId": "ec0773b35401476ea81c2e6afc45d427",
+    "supportsMotionVectors": false
+}
+
 {
     "m_SGVersion": 0,
     "m_Type": "UnityEditor.ShaderGraph.NotNode",
@@ -1590,6 +1901,13 @@
     }
 }
 
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasData",
+    "m_ObjectId": "ef3ad75715cb4c11b9e3357285c4829f",
+    "supportsMotionVectors": false
+}
+
 {
     "m_SGVersion": 0,
     "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
@@ -1598,11 +1916,26 @@
     "m_DisplayName": "Tilt",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "_Tilt",
     "m_StageCapability": 2,
     "m_Value": -0.30000001192092898,
-    "m_DefaultValue": 0.0,
-    "m_Labels": []
+    "m_DefaultValue": -0.30000001192092898,
+    "m_Labels": [],
+    "m_LiteralMode": false
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasData",
+    "m_ObjectId": "f795741071454171a540b0e05ba89099",
+    "supportsMotionVectors": false
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasSubTarget",
+    "m_ObjectId": "f84934c605d0438b9d9b65af0e04993e"
 }
 
 {
@@ -1613,11 +1946,13 @@
     "m_DisplayName": "Tilt",
     "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "Out",
     "m_StageCapability": 3,
     "m_Value": 0.0,
     "m_DefaultValue": 0.0,
-    "m_Labels": []
+    "m_Labels": [],
+    "m_LiteralMode": false
 }
 
 {
diff --git a/Packages/com.unity.shadergraph/Samples~/UGUIShaders/Examples/Buttons/Simple Button.shadergraph b/Packages/com.unity.shadergraph/Samples~/UGUIShaders/Examples/Buttons/Simple Button.shadergraph
index 492c0205ed5..84ae77820e0 100644
--- a/Packages/com.unity.shadergraph/Samples~/UGUIShaders/Examples/Buttons/Simple Button.shadergraph	
+++ b/Packages/com.unity.shadergraph/Samples~/UGUIShaders/Examples/Buttons/Simple Button.shadergraph	
@@ -48,9 +48,6 @@
         {
             "m_Id": "b74e9cd4d2f0494ea83f6bfdaa09d6c3"
         },
-        {
-            "m_Id": "4549eed32a87435296704b617c8548f0"
-        },
         {
             "m_Id": "a97d257f7c124a029d3b6369312e77a7"
         },
@@ -58,7 +55,10 @@
             "m_Id": "b0d95578231445df920506e3bdeeb72c"
         },
         {
-            "m_Id": "ff7b5b122f604bb38fe99cba37173fb1"
+            "m_Id": "776badfa9ca342d3acc199dad6c6efdf"
+        },
+        {
+            "m_Id": "8f4a439017db48d181831840cfe793c9"
         }
     ],
     "m_GroupDatas": [],
@@ -67,29 +67,29 @@
         {
             "m_OutputSlot": {
                 "m_Node": {
-                    "m_Id": "4549eed32a87435296704b617c8548f0"
+                    "m_Id": "6a42117ea0d7470f8147a0b3453c56ef"
                 },
                 "m_SlotId": 0
             },
             "m_InputSlot": {
                 "m_Node": {
-                    "m_Id": "b74e9cd4d2f0494ea83f6bfdaa09d6c3"
+                    "m_Id": "c09e13c7a25e4bd2b07dc8935fe48dd4"
                 },
-                "m_SlotId": 830530724
+                "m_SlotId": -1749604838
             }
         },
         {
             "m_OutputSlot": {
                 "m_Node": {
-                    "m_Id": "6a42117ea0d7470f8147a0b3453c56ef"
+                    "m_Id": "776badfa9ca342d3acc199dad6c6efdf"
                 },
-                "m_SlotId": 0
+                "m_SlotId": 1
             },
             "m_InputSlot": {
                 "m_Node": {
                     "m_Id": "c09e13c7a25e4bd2b07dc8935fe48dd4"
                 },
-                "m_SlotId": -1749604838
+                "m_SlotId": 979381028
             }
         },
         {
@@ -106,6 +106,20 @@
                 "m_SlotId": -296304831
             }
         },
+        {
+            "m_OutputSlot": {
+                "m_Node": {
+                    "m_Id": "8f4a439017db48d181831840cfe793c9"
+                },
+                "m_SlotId": 1
+            },
+            "m_InputSlot": {
+                "m_Node": {
+                    "m_Id": "b74e9cd4d2f0494ea83f6bfdaa09d6c3"
+                },
+                "m_SlotId": 830530724
+            }
+        },
         {
             "m_OutputSlot": {
                 "m_Node": {
@@ -245,20 +259,6 @@
                 },
                 "m_SlotId": 1894984711
             }
-        },
-        {
-            "m_OutputSlot": {
-                "m_Node": {
-                    "m_Id": "ff7b5b122f604bb38fe99cba37173fb1"
-                },
-                "m_SlotId": 0
-            },
-            "m_InputSlot": {
-                "m_Node": {
-                    "m_Id": "c09e13c7a25e4bd2b07dc8935fe48dd4"
-                },
-                "m_SlotId": 979381028
-            }
         }
     ],
     "m_VertexContext": {
@@ -317,6 +317,7 @@
     "m_DisplayName": "IsDisabled",
     "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "IsDisabled",
     "m_StageCapability": 3,
     "m_Value": false,
@@ -331,6 +332,7 @@
     "m_DisplayName": "UV",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "_UV",
     "m_StageCapability": 2,
     "m_Value": {
@@ -344,6 +346,29 @@
     "m_Labels": []
 }
 
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
+    "m_ObjectId": "05f540ef79b44f0da1b00107fdb0e68c",
+    "m_Id": 1,
+    "m_DisplayName": "State",
+    "m_SlotType": 1,
+    "m_Hidden": false,
+    "m_HideConnector": false,
+    "m_ShaderOutputName": "State",
+    "m_StageCapability": 3,
+    "m_Value": 0.0,
+    "m_DefaultValue": 0.0,
+    "m_Labels": [],
+    "m_LiteralMode": false
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasSubTarget",
+    "m_ObjectId": "0724948387ed419a8be84dbf40ca769b"
+}
+
 {
     "m_SGVersion": 0,
     "m_Type": "UnityEditor.ShaderGraph.BlockNode",
@@ -380,23 +405,8 @@
 
 {
     "m_SGVersion": 0,
-    "m_Type": "UnityEditor.ShaderGraph.Vector2MaterialSlot",
-    "m_ObjectId": "0c171418ecca4d1e8c1be3127efdfa45",
-    "m_Id": 0,
-    "m_DisplayName": "Size",
-    "m_SlotType": 1,
-    "m_Hidden": false,
-    "m_ShaderOutputName": "_RectTransformSize",
-    "m_StageCapability": 3,
-    "m_Value": {
-        "x": 1.0,
-        "y": 1.0
-    },
-    "m_DefaultValue": {
-        "x": 100.0,
-        "y": 100.0
-    },
-    "m_Labels": []
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasSubTarget",
+    "m_ObjectId": "10c3b5b995fd4d19825cb2a725ffb981"
 }
 
 {
@@ -441,11 +451,13 @@
     "m_DisplayName": "Alpha",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "Alpha",
     "m_StageCapability": 2,
     "m_Value": 1.0,
     "m_DefaultValue": 1.0,
-    "m_Labels": []
+    "m_Labels": [],
+    "m_LiteralMode": false
 }
 
 {
@@ -456,6 +468,7 @@
     "m_DisplayName": "IsNormal",
     "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "IsNormal",
     "m_StageCapability": 3,
     "m_Value": false,
@@ -470,6 +483,7 @@
     "m_DisplayName": "Emission",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "Emission",
     "m_StageCapability": 2,
     "m_Value": {
@@ -514,61 +528,56 @@
 
 {
     "m_SGVersion": 0,
-    "m_Type": "UnityEditor.ShaderGraph.Vector4MaterialSlot",
-    "m_ObjectId": "225fab28ed40406c821450daec2ac327",
-    "m_Id": -296304831,
-    "m_DisplayName": "Shadow Color",
-    "m_SlotType": 0,
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasData",
+    "m_ObjectId": "23e408b0f1454583bbd5158bd375dc27",
+    "supportsMotionVectors": false
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasSubTarget",
+    "m_ObjectId": "247cd01b97fd4baa87c323d78de99850"
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.Vector2MaterialSlot",
+    "m_ObjectId": "26bc515f9fb242b7bd2c2eb8e9088d45",
+    "m_Id": 1,
+    "m_DisplayName": "Size",
+    "m_SlotType": 1,
     "m_Hidden": false,
-    "m_ShaderOutputName": "_Shadow_Color",
-    "m_StageCapability": 2,
+    "m_HideConnector": false,
+    "m_ShaderOutputName": "Size",
+    "m_StageCapability": 3,
     "m_Value": {
         "x": 0.0,
-        "y": 0.0,
-        "z": 0.0,
-        "w": 0.0
+        "y": 0.0
     },
     "m_DefaultValue": {
         "x": 0.0,
-        "y": 0.0,
-        "z": 0.0,
-        "w": 0.0
+        "y": 0.0
     },
     "m_Labels": []
 }
 
 {
     "m_SGVersion": 0,
-    "m_Type": "UnityEditor.ShaderGraph.Vector4MaterialSlot",
-    "m_ObjectId": "270566e1a441496cb2af90614c55bccd",
-    "m_Id": 1894984711,
-    "m_DisplayName": "Button Color",
-    "m_SlotType": 0,
-    "m_Hidden": false,
-    "m_ShaderOutputName": "_Button_Color",
-    "m_StageCapability": 2,
-    "m_Value": {
-        "x": 0.5,
-        "y": 0.7275326251983643,
-        "z": 1.0,
-        "w": 0.0
-    },
-    "m_DefaultValue": {
-        "x": 0.0,
-        "y": 0.0,
-        "z": 0.0,
-        "w": 0.0
-    },
-    "m_Labels": []
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasData",
+    "m_ObjectId": "29880c8660cd4e2297ceaa8b9b783e4c",
+    "supportsMotionVectors": false
 }
 
 {
     "m_SGVersion": 0,
-    "m_Type": "UnityEditor.Rendering.Canvas.ShaderGraph.CanvasData",
-    "m_ObjectId": "333bdb8c230940d0842b515f99366f28",
-    "m_Version": 0,
-    "m_AlphaClip": false,
-    "m_DisableTint": true
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasSubTarget",
+    "m_ObjectId": "32e5213c4b334bfeb1d7aea2f95436e2"
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasSubTarget",
+    "m_ObjectId": "337a68a849fe49b283d7660f082f1726"
 }
 
 {
@@ -579,6 +588,7 @@
     "m_DisplayName": "Out",
     "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "Out",
     "m_StageCapability": 3,
     "m_Value": false,
@@ -593,6 +603,7 @@
     "m_DisplayName": "Width Height",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "_Width_Height",
     "m_StageCapability": 2,
     "m_Value": {
@@ -637,6 +648,7 @@
     "m_CastShadows": true,
     "m_ReceiveShadows": true,
     "m_DisableTint": false,
+    "m_Sort3DAs2DCompatible": false,
     "m_AdditionalMotionVectorMode": 0,
     "m_AlembicMotionVectors": false,
     "m_SupportsLODCrossFade": false,
@@ -646,56 +658,41 @@
 
 {
     "m_SGVersion": 0,
-    "m_Type": "UnityEditor.ShaderGraph.SelectableStateNode",
-    "m_ObjectId": "4549eed32a87435296704b617c8548f0",
-    "m_Group": {
-        "m_Id": ""
-    },
-    "m_Name": "Selectable State",
-    "m_DrawState": {
-        "m_Expanded": true,
-        "m_Position": {
-            "serializedVersion": "2",
-            "x": -1064.666748046875,
-            "y": 370.0,
-            "width": 140.66668701171876,
-            "height": 78.66665649414063
-        }
-    },
-    "m_Slots": [
-        {
-            "m_Id": "b6220f94610540a889ad69a03949e1d6"
-        }
-    ],
-    "synonyms": [],
-    "m_Precision": 0,
-    "m_PreviewExpanded": true,
-    "m_DismissedVersion": 0,
-    "m_PreviewMode": 0,
-    "m_CustomColors": {
-        "m_SerializableColors": []
-    }
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasData",
+    "m_ObjectId": "3d7882455342469badf9b85649b4d809",
+    "supportsMotionVectors": false
 }
 
 {
     "m_SGVersion": 0,
-    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasSubTarget",
-    "m_ObjectId": "48f4b1e87a3c4f6885826e7b4fac6a55"
+    "m_Type": "UnityEditor.ShaderGraph.ColorRGBAMaterialSlot",
+    "m_ObjectId": "42cb74489f3a4d1f96d903ffd48ab998",
+    "m_Id": 1894984711,
+    "m_DisplayName": "Button Color",
+    "m_SlotType": 0,
+    "m_Hidden": false,
+    "m_HideConnector": false,
+    "m_ShaderOutputName": "_Button_Color",
+    "m_StageCapability": 2,
+    "m_Value": {
+        "x": 0.5,
+        "y": 0.7275326251983643,
+        "z": 1.0,
+        "w": 0.0
+    },
+    "m_DefaultValue": {
+        "x": 0.5,
+        "y": 0.7275326251983643,
+        "z": 1.0,
+        "w": 0.0
+    },
+    "m_Labels": []
 }
 
 {
     "m_SGVersion": 0,
-    "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
-    "m_ObjectId": "51befb7aba874d029a41e86a6f08d4a3",
-    "m_Id": 2,
-    "m_DisplayName": "Pixel Per Unit",
-    "m_SlotType": 1,
-    "m_Hidden": false,
-    "m_ShaderOutputName": "_CanvasPixelPerUnit",
-    "m_StageCapability": 3,
-    "m_Value": 100.0,
-    "m_DefaultValue": 100.0,
-    "m_Labels": []
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasSubTarget",
+    "m_ObjectId": "48f4b1e87a3c4f6885826e7b4fac6a55"
 }
 
 {
@@ -705,6 +702,9 @@
     "m_Guid": {
         "m_GuidSerialized": "fe86ef10-3da6-4a77-b309-8cb504f00e6f"
     },
+    "promotedFromAssetID": "",
+    "promotedFromCategoryName": "",
+    "promotedOrdering": -1,
     "m_Name": "Shadow Color",
     "m_DefaultRefNameVersion": 1,
     "m_RefNameGeneratedByDisplayName": "Shadow Color",
@@ -717,7 +717,10 @@
     "m_Precision": 0,
     "overrideHLSLDeclaration": false,
     "hlslDeclarationOverride": 0,
+    "hideConnector": false,
     "m_Hidden": false,
+    "m_PerRendererData": false,
+    "m_customAttributes": [],
     "m_Value": {
         "r": 0.0,
         "g": 0.0,
@@ -728,6 +731,12 @@
     "m_ColorMode": 0
 }
 
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasSubTarget",
+    "m_ObjectId": "5fdad50a225b41158ea509de8ebd38c6"
+}
+
 {
     "m_SGVersion": 0,
     "m_Type": "UnityEditor.ShaderGraph.BooleanMaterialSlot",
@@ -736,12 +745,30 @@
     "m_DisplayName": "Pressed",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "_Pressed",
     "m_StageCapability": 2,
     "m_Value": false,
     "m_DefaultValue": false
 }
 
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
+    "m_ObjectId": "6184b216f11149d7a20b799b4b384134",
+    "m_Id": -2106065226,
+    "m_DisplayName": "PreviewPPU",
+    "m_SlotType": 0,
+    "m_Hidden": false,
+    "m_HideConnector": true,
+    "m_ShaderOutputName": "_PreviewPPU",
+    "m_StageCapability": 3,
+    "m_Value": 100.0,
+    "m_DefaultValue": 100.0,
+    "m_Labels": [],
+    "m_LiteralMode": false
+}
+
 {
     "m_SGVersion": 0,
     "m_Type": "UnityEditor.ShaderGraph.Vector4MaterialSlot",
@@ -750,6 +777,7 @@
     "m_DisplayName": "Out",
     "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "Out",
     "m_StageCapability": 3,
     "m_Value": {
@@ -775,11 +803,13 @@
     "m_DisplayName": "State",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "_State",
     "m_StageCapability": 3,
     "m_Value": 0.0,
     "m_DefaultValue": 0.0,
-    "m_Labels": []
+    "m_Labels": [],
+    "m_LiteralMode": false
 }
 
 {
@@ -816,6 +846,23 @@
     "m_SerializedDescriptor": "SurfaceDescription.BaseColor"
 }
 
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
+    "m_ObjectId": "696240077fb54480930dde758a7c8621",
+    "m_Id": -1949568231,
+    "m_DisplayName": "PreviewScaleFactor",
+    "m_SlotType": 0,
+    "m_Hidden": false,
+    "m_HideConnector": true,
+    "m_ShaderOutputName": "_PreviewScaleFactor",
+    "m_StageCapability": 3,
+    "m_Value": 1.0,
+    "m_DefaultValue": 1.0,
+    "m_Labels": [],
+    "m_LiteralMode": false
+}
+
 {
     "m_SGVersion": 0,
     "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
@@ -824,11 +871,13 @@
     "m_DisplayName": "Alpha",
     "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "Alpha",
     "m_StageCapability": 2,
     "m_Value": 0.0,
     "m_DefaultValue": 0.0,
-    "m_Labels": []
+    "m_Labels": [],
+    "m_LiteralMode": false
 }
 
 {
@@ -867,6 +916,13 @@
     }
 }
 
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasData",
+    "m_ObjectId": "6a4f7fe7684a4000b7f710774cf6b0bd",
+    "supportsMotionVectors": false
+}
+
 {
     "m_SGVersion": 0,
     "m_Type": "UnityEditor.ShaderGraph.Vector4MaterialSlot",
@@ -875,6 +931,7 @@
     "m_DisplayName": "Shadow Color",
     "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "Out",
     "m_StageCapability": 3,
     "m_Value": {
@@ -911,31 +968,116 @@
 }
 
 {
-    "m_SGVersion": 1,
-    "m_Type": "UnityEditor.ShaderGraph.Internal.Vector2ShaderProperty",
-    "m_ObjectId": "795b867b584d486b87d7748170b4c5c4",
-    "m_Guid": {
-        "m_GuidSerialized": "2cb8f96a-441c-400d-ac9e-da801ef00ad9"
-    },
-    "m_Name": "Dimensions",
-    "m_DefaultRefNameVersion": 1,
-    "m_RefNameGeneratedByDisplayName": "Dimensions",
-    "m_DefaultReferenceName": "_Dimensions",
-    "m_OverrideReferenceName": "",
-    "m_GeneratePropertyBlock": true,
-    "m_UseCustomSlotLabel": false,
-    "m_CustomSlotLabel": "",
-    "m_DismissedVersion": 0,
-    "m_Precision": 0,
-    "overrideHLSLDeclaration": false,
-    "hlslDeclarationOverride": 0,
-    "m_Hidden": false,
-    "m_Value": {
-        "x": 0.8999999761581421,
-        "y": 0.8999999761581421,
-        "z": 0.0,
-        "w": 0.0
-    }
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasData",
+    "m_ObjectId": "770b75583f6740d3bff3f12c44630008",
+    "supportsMotionVectors": false
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.SubGraphNode",
+    "m_ObjectId": "776badfa9ca342d3acc199dad6c6efdf",
+    "m_Group": {
+        "m_Id": ""
+    },
+    "m_Name": "Rect Transform Size",
+    "m_DrawState": {
+        "m_Expanded": true,
+        "m_Position": {
+            "serializedVersion": "2",
+            "x": -683.9999389648438,
+            "y": 593.9999389648438,
+            "width": 165.0,
+            "height": 228.00006103515626
+        }
+    },
+    "m_Slots": [
+        {
+            "m_Id": "968f73683c154c2f9cf09f02a6050fc1"
+        },
+        {
+            "m_Id": "ac572184a11244e1af5f4dd3339c2bf8"
+        },
+        {
+            "m_Id": "696240077fb54480930dde758a7c8621"
+        },
+        {
+            "m_Id": "6184b216f11149d7a20b799b4b384134"
+        },
+        {
+            "m_Id": "26bc515f9fb242b7bd2c2eb8e9088d45"
+        },
+        {
+            "m_Id": "b56cd1f3cf3047f2930433251b851eae"
+        },
+        {
+            "m_Id": "8eb89a9e1fff41a1a9b493f7c8210d06"
+        }
+    ],
+    "synonyms": [],
+    "m_Precision": 0,
+    "m_PreviewExpanded": false,
+    "m_DismissedVersion": 0,
+    "m_PreviewMode": 0,
+    "m_CustomColors": {
+        "m_SerializableColors": []
+    },
+    "m_SerializedSubGraph": "{\n    \"subGraph\": {\n        \"fileID\": -5475051401550479605,\n        \"guid\": \"aa041986c041b4dc1b5bf0b2cd2d86e8\",\n        \"type\": 3\n    }\n}",
+    "m_PropertyGuids": [
+        "975f2db3-e792-46e7-9bf8-3a4cbe4fb068",
+        "373c703c-395b-43d3-91ba-78b9497021e7",
+        "2747a643-8db3-4ffc-9923-55aa70fb2549",
+        "451bbdf7-6136-4a6e-a5c8-4918d2ea4b95"
+    ],
+    "m_PropertyIds": [
+        -181240572,
+        716604351,
+        -1949568231,
+        -2106065226
+    ],
+    "m_Dropdowns": [],
+    "m_DropdownSelectedEntries": []
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasSubTarget",
+    "m_ObjectId": "786640f9ee3344dbb15a7654dbef302f"
+}
+
+{
+    "m_SGVersion": 1,
+    "m_Type": "UnityEditor.ShaderGraph.Internal.Vector2ShaderProperty",
+    "m_ObjectId": "795b867b584d486b87d7748170b4c5c4",
+    "m_Guid": {
+        "m_GuidSerialized": "2cb8f96a-441c-400d-ac9e-da801ef00ad9"
+    },
+    "promotedFromAssetID": "",
+    "promotedFromCategoryName": "",
+    "promotedOrdering": -1,
+    "m_Name": "Dimensions",
+    "m_DefaultRefNameVersion": 1,
+    "m_RefNameGeneratedByDisplayName": "Dimensions",
+    "m_DefaultReferenceName": "_Dimensions",
+    "m_OverrideReferenceName": "",
+    "m_GeneratePropertyBlock": true,
+    "m_UseCustomSlotLabel": false,
+    "m_CustomSlotLabel": "",
+    "m_DismissedVersion": 0,
+    "m_Precision": 0,
+    "overrideHLSLDeclaration": false,
+    "hlslDeclarationOverride": 0,
+    "hideConnector": false,
+    "m_Hidden": false,
+    "m_PerRendererData": false,
+    "m_customAttributes": [],
+    "m_Value": {
+        "x": 0.8999999761581421,
+        "y": 0.8999999761581421,
+        "z": 0.0,
+        "w": 0.0
+    }
 }
 
 {
@@ -955,6 +1097,7 @@
     "m_DisplayName": "Color",
     "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "Color",
     "m_StageCapability": 2,
     "m_Value": {
@@ -978,6 +1121,7 @@
     "m_DisplayName": "Out",
     "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "Out",
     "m_StageCapability": 3,
     "m_Value": false,
@@ -992,6 +1136,7 @@
     "m_DisplayName": "IsHighlighted",
     "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "IsHighlighted",
     "m_StageCapability": 3,
     "m_Value": false,
@@ -1042,12 +1187,72 @@
     "m_DisplayName": "In",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "In",
     "m_StageCapability": 3,
     "m_Value": false,
     "m_DefaultValue": false
 }
 
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
+    "m_ObjectId": "8eb89a9e1fff41a1a9b493f7c8210d06",
+    "m_Id": 3,
+    "m_DisplayName": "Pixel_Per_Unit",
+    "m_SlotType": 1,
+    "m_Hidden": false,
+    "m_HideConnector": false,
+    "m_ShaderOutputName": "Pixel_Per_Unit",
+    "m_StageCapability": 3,
+    "m_Value": 0.0,
+    "m_DefaultValue": 0.0,
+    "m_Labels": [],
+    "m_LiteralMode": false
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.SubGraphNode",
+    "m_ObjectId": "8f4a439017db48d181831840cfe793c9",
+    "m_Group": {
+        "m_Id": ""
+    },
+    "m_Name": "Selectable State",
+    "m_DrawState": {
+        "m_Expanded": true,
+        "m_Position": {
+            "serializedVersion": "2",
+            "x": -1169.9998779296875,
+            "y": 370.9999694824219,
+            "width": 256.0,
+            "height": 122.99996948242188
+        }
+    },
+    "m_Slots": [
+        {
+            "m_Id": "05f540ef79b44f0da1b00107fdb0e68c"
+        }
+    ],
+    "synonyms": [],
+    "m_Precision": 0,
+    "m_PreviewExpanded": false,
+    "m_DismissedVersion": 0,
+    "m_PreviewMode": 0,
+    "m_CustomColors": {
+        "m_SerializableColors": []
+    },
+    "m_SerializedSubGraph": "{\n    \"subGraph\": {\n        \"fileID\": -5475051401550479605,\n        \"guid\": \"9cc8eedec3988455885bdb12866a33d6\",\n        \"type\": 3\n    }\n}",
+    "m_PropertyGuids": [],
+    "m_PropertyIds": [],
+    "m_Dropdowns": [
+        "_Preview"
+    ],
+    "m_DropdownSelectedEntries": [
+        "Normal"
+    ]
+}
+
 {
     "m_SGVersion": 0,
     "m_Type": "UnityEditor.ShaderGraph.BooleanMaterialSlot",
@@ -1056,12 +1261,62 @@
     "m_DisplayName": "Selected",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "_Selected",
     "m_StageCapability": 2,
     "m_Value": true,
     "m_DefaultValue": false
 }
 
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.ColorRGBAMaterialSlot",
+    "m_ObjectId": "9335d82b00e54084a0e0bb2867f93976",
+    "m_Id": -1522646159,
+    "m_DisplayName": "Outline Color",
+    "m_SlotType": 0,
+    "m_Hidden": false,
+    "m_HideConnector": false,
+    "m_ShaderOutputName": "_Outline_Color",
+    "m_StageCapability": 2,
+    "m_Value": {
+        "x": 0.0,
+        "y": 0.17251551151275636,
+        "z": 0.34433960914611819,
+        "w": 0.0
+    },
+    "m_DefaultValue": {
+        "x": 0.0,
+        "y": 0.17251551151275636,
+        "z": 0.34433960914611819,
+        "w": 0.0
+    },
+    "m_Labels": []
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasSubTarget",
+    "m_ObjectId": "93d4f58b92b34b30a417d57972928aa3"
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
+    "m_ObjectId": "968f73683c154c2f9cf09f02a6050fc1",
+    "m_Id": -181240572,
+    "m_DisplayName": "PreviewWidth",
+    "m_SlotType": 0,
+    "m_Hidden": false,
+    "m_HideConnector": true,
+    "m_ShaderOutputName": "_PreviewWidth",
+    "m_StageCapability": 3,
+    "m_Value": 100.0,
+    "m_DefaultValue": 100.0,
+    "m_Labels": [],
+    "m_LiteralMode": false
+}
+
 {
     "m_SGVersion": 0,
     "m_Type": "UnityEditor.ShaderGraph.BooleanMaterialSlot",
@@ -1070,6 +1325,7 @@
     "m_DisplayName": "Active",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "_Active",
     "m_StageCapability": 2,
     "m_Value": true,
@@ -1078,17 +1334,15 @@
 
 {
     "m_SGVersion": 0,
-    "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
-    "m_ObjectId": "9d7fc24eac24402db71e3a2a1de93a7b",
-    "m_Id": 1,
-    "m_DisplayName": "Scale Factor",
-    "m_SlotType": 1,
-    "m_Hidden": false,
-    "m_ShaderOutputName": "_CanvasScaleFactor",
-    "m_StageCapability": 3,
-    "m_Value": 1.0,
-    "m_DefaultValue": 1.0,
-    "m_Labels": []
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasData",
+    "m_ObjectId": "9faba2e0409944e4974405ecba3e0d98",
+    "supportsMotionVectors": false
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasSubTarget",
+    "m_ObjectId": "a73a4874f79b46329c1e3f2bad509a45"
 }
 
 {
@@ -1138,6 +1392,7 @@
     "m_DisplayName": "A",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "A",
     "m_StageCapability": 3,
     "m_Value": false,
@@ -1152,6 +1407,7 @@
     "m_DisplayName": "Dimensions",
     "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "Out",
     "m_StageCapability": 3,
     "m_Value": {
@@ -1165,6 +1421,29 @@
     "m_Labels": []
 }
 
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
+    "m_ObjectId": "ac572184a11244e1af5f4dd3339c2bf8",
+    "m_Id": 716604351,
+    "m_DisplayName": "PreviewHeight",
+    "m_SlotType": 0,
+    "m_Hidden": false,
+    "m_HideConnector": true,
+    "m_ShaderOutputName": "_PreviewHeight",
+    "m_StageCapability": 3,
+    "m_Value": 100.0,
+    "m_DefaultValue": 100.0,
+    "m_Labels": [],
+    "m_LiteralMode": false
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasSubTarget",
+    "m_ObjectId": "ad0511b594294cf9ba9546e82b5dbf19"
+}
+
 {
     "m_SGVersion": 0,
     "m_Type": "UnityEditor.ShaderGraph.NotNode",
@@ -1209,6 +1488,7 @@
     "m_DisplayName": "IsSelected",
     "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "IsSelected",
     "m_StageCapability": 3,
     "m_Value": false,
@@ -1218,16 +1498,18 @@
 {
     "m_SGVersion": 0,
     "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
-    "m_ObjectId": "b6220f94610540a889ad69a03949e1d6",
-    "m_Id": 0,
-    "m_DisplayName": "State",
+    "m_ObjectId": "b56cd1f3cf3047f2930433251b851eae",
+    "m_Id": 2,
+    "m_DisplayName": "Scale_Factor",
     "m_SlotType": 1,
     "m_Hidden": false,
-    "m_ShaderOutputName": "_State",
+    "m_HideConnector": false,
+    "m_ShaderOutputName": "Scale_Factor",
     "m_StageCapability": 3,
     "m_Value": 0.0,
     "m_DefaultValue": 0.0,
-    "m_Labels": []
+    "m_Labels": [],
+    "m_LiteralMode": false
 }
 
 {
@@ -1295,6 +1577,7 @@
     "m_DisplayName": "Base Color",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "BaseColor",
     "m_StageCapability": 2,
     "m_Value": {
@@ -1379,13 +1662,13 @@
             "m_Id": "ce5a902541d64509a069b582dd03f51d"
         },
         {
-            "m_Id": "270566e1a441496cb2af90614c55bccd"
+            "m_Id": "42cb74489f3a4d1f96d903ffd48ab998"
         },
         {
-            "m_Id": "ff1ca364aecf475687c08e5967acf27a"
+            "m_Id": "9335d82b00e54084a0e0bb2867f93976"
         },
         {
-            "m_Id": "225fab28ed40406c821450daec2ac327"
+            "m_Id": "dadd6e02666c47a69893fadc46e06148"
         },
         {
             "m_Id": "8fa53e2e78684fea9042ff67874e5e7e"
@@ -1449,6 +1732,7 @@
     "m_DisplayName": "Outline Color",
     "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "Out",
     "m_StageCapability": 3,
     "m_Value": {
@@ -1511,6 +1795,20 @@
     "m_DropdownSelectedEntries": []
 }
 
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasData",
+    "m_ObjectId": "c373f1894323494b8c901d0dde2cbffd",
+    "supportsMotionVectors": false
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasData",
+    "m_ObjectId": "cafe4dfb66fa41449a2bbf6804a520f5",
+    "supportsMotionVectors": false
+}
+
 {
     "m_SGVersion": 0,
     "m_Type": "UnityEditor.ShaderGraph.Vector2MaterialSlot",
@@ -1519,6 +1817,7 @@
     "m_DisplayName": "Dimensions",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "_Dimensions",
     "m_StageCapability": 2,
     "m_Value": {
@@ -1532,6 +1831,12 @@
     "m_Labels": []
 }
 
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasSubTarget",
+    "m_ObjectId": "d0a4787e344f48f5a85fe74bb0000b0c"
+}
+
 {
     "m_SGVersion": 0,
     "m_Type": "UnityEditor.Rendering.Universal.ShaderGraph.UniversalCanvasSubTarget",
@@ -1545,6 +1850,9 @@
     "m_Guid": {
         "m_GuidSerialized": "2b469c4f-d9f6-4e42-8229-205cd8fe41a1"
     },
+    "promotedFromAssetID": "",
+    "promotedFromCategoryName": "",
+    "promotedOrdering": -1,
     "m_Name": "Outline Color",
     "m_DefaultRefNameVersion": 1,
     "m_RefNameGeneratedByDisplayName": "Outline Color",
@@ -1557,7 +1865,10 @@
     "m_Precision": 0,
     "overrideHLSLDeclaration": false,
     "hlslDeclarationOverride": 0,
+    "hideConnector": false,
     "m_Hidden": false,
+    "m_PerRendererData": false,
+    "m_customAttributes": [],
     "m_Value": {
         "r": 0.0236275065690279,
         "g": 0.0,
@@ -1568,6 +1879,32 @@
     "m_ColorMode": 0
 }
 
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.ColorRGBAMaterialSlot",
+    "m_ObjectId": "dadd6e02666c47a69893fadc46e06148",
+    "m_Id": -296304831,
+    "m_DisplayName": "Shadow Color",
+    "m_SlotType": 0,
+    "m_Hidden": false,
+    "m_HideConnector": false,
+    "m_ShaderOutputName": "_Shadow_Color",
+    "m_StageCapability": 2,
+    "m_Value": {
+        "x": 0.0,
+        "y": 0.0,
+        "z": 0.0,
+        "w": 0.0
+    },
+    "m_DefaultValue": {
+        "x": 0.0,
+        "y": 0.0,
+        "z": 0.0,
+        "w": 0.0
+    },
+    "m_Labels": []
+}
+
 {
     "m_SGVersion": 0,
     "m_Type": "UnityEditor.ShaderGraph.BooleanMaterialSlot",
@@ -1576,12 +1913,47 @@
     "m_DisplayName": "IsPressed",
     "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "IsPressed",
     "m_StageCapability": 3,
     "m_Value": false,
     "m_DefaultValue": false
 }
 
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasData",
+    "m_ObjectId": "dd2d0b7f72cd40b5b04a235ffee51a1b",
+    "supportsMotionVectors": false
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasData",
+    "m_ObjectId": "ec0773b35401476ea81c2e6afc45d427",
+    "supportsMotionVectors": false
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasData",
+    "m_ObjectId": "ef3ad75715cb4c11b9e3357285c4829f",
+    "supportsMotionVectors": false
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasData",
+    "m_ObjectId": "f795741071454171a540b0e05ba89099",
+    "supportsMotionVectors": false
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasSubTarget",
+    "m_ObjectId": "f84934c605d0438b9d9b65af0e04993e"
+}
+
 {
     "m_SGVersion": 0,
     "m_Type": "UnityEditor.ShaderGraph.BooleanMaterialSlot",
@@ -1590,79 +1962,10 @@
     "m_DisplayName": "B",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "B",
     "m_StageCapability": 3,
     "m_Value": false,
     "m_DefaultValue": false
 }
 
-{
-    "m_SGVersion": 0,
-    "m_Type": "UnityEditor.ShaderGraph.Vector4MaterialSlot",
-    "m_ObjectId": "ff1ca364aecf475687c08e5967acf27a",
-    "m_Id": -1522646159,
-    "m_DisplayName": "Outline Color",
-    "m_SlotType": 0,
-    "m_Hidden": false,
-    "m_ShaderOutputName": "_Outline_Color",
-    "m_StageCapability": 2,
-    "m_Value": {
-        "x": 0.0,
-        "y": 0.17251551151275636,
-        "z": 0.34433960914611819,
-        "w": 0.0
-    },
-    "m_DefaultValue": {
-        "x": 0.0,
-        "y": 0.0,
-        "z": 0.0,
-        "w": 0.0
-    },
-    "m_Labels": []
-}
-
-{
-    "m_SGVersion": 0,
-    "m_Type": "UnityEditor.ShaderGraph.RectTransformSizeNode",
-    "m_ObjectId": "ff7b5b122f604bb38fe99cba37173fb1",
-    "m_Group": {
-        "m_Id": ""
-    },
-    "m_Name": "RectTransform Size",
-    "m_DrawState": {
-        "m_Expanded": true,
-        "m_Position": {
-            "serializedVersion": "2",
-            "x": -676.6666259765625,
-            "y": 595.3333740234375,
-            "width": 158.0,
-            "height": 78.6666259765625
-        }
-    },
-    "m_Slots": [
-        {
-            "m_Id": "0c171418ecca4d1e8c1be3127efdfa45"
-        },
-        {
-            "m_Id": "9d7fc24eac24402db71e3a2a1de93a7b"
-        },
-        {
-            "m_Id": "51befb7aba874d029a41e86a6f08d4a3"
-        }
-    ],
-    "synonyms": [],
-    "m_Precision": 0,
-    "m_PreviewExpanded": true,
-    "m_DismissedVersion": 0,
-    "m_PreviewMode": 0,
-    "m_CustomColors": {
-        "m_SerializableColors": []
-    },
-    "previewSize": {
-        "x": 100.0,
-        "y": 100.0
-    },
-    "previewScaleFactor": 1.0,
-    "previewPixelsPerUnit": 100.0
-}
-
diff --git a/Packages/com.unity.shadergraph/Samples~/UGUIShaders/Examples/Indicators/Aqua Meter.shadergraph b/Packages/com.unity.shadergraph/Samples~/UGUIShaders/Examples/Indicators/Aqua Meter.shadergraph
index bd837fde6cb..55082cc24e2 100644
--- a/Packages/com.unity.shadergraph/Samples~/UGUIShaders/Examples/Indicators/Aqua Meter.shadergraph	
+++ b/Packages/com.unity.shadergraph/Samples~/UGUIShaders/Examples/Indicators/Aqua Meter.shadergraph	
@@ -24,13 +24,13 @@
             "m_Id": "ddd143dc72c24c0eb8b1f8430e83e755"
         },
         {
-            "m_Id": "11bd352cd2d4409bb930e262e1e177f7"
+            "m_Id": "21bbd6e87573488bbaeaf1e0ff74c2bf"
         },
         {
-            "m_Id": "cbbd6141db8340f4a8c3319db3b7d0a6"
+            "m_Id": "c3ae39b9b9af4effaf3399be53ed98da"
         },
         {
-            "m_Id": "21bbd6e87573488bbaeaf1e0ff74c2bf"
+            "m_Id": "288b3647e8f44bbd898797e278033b02"
         }
     ],
     "m_GroupDatas": [],
@@ -39,21 +39,21 @@
         {
             "m_OutputSlot": {
                 "m_Node": {
-                    "m_Id": "11bd352cd2d4409bb930e262e1e177f7"
+                    "m_Id": "21bbd6e87573488bbaeaf1e0ff74c2bf"
                 },
-                "m_SlotId": 0
+                "m_SlotId": 1
             },
             "m_InputSlot": {
                 "m_Node": {
                     "m_Id": "ddd143dc72c24c0eb8b1f8430e83e755"
                 },
-                "m_SlotId": -1396438865
+                "m_SlotId": 121012981
             }
         },
         {
             "m_OutputSlot": {
                 "m_Node": {
-                    "m_Id": "21bbd6e87573488bbaeaf1e0ff74c2bf"
+                    "m_Id": "288b3647e8f44bbd898797e278033b02"
                 },
                 "m_SlotId": 1
             },
@@ -61,21 +61,21 @@
                 "m_Node": {
                     "m_Id": "ddd143dc72c24c0eb8b1f8430e83e755"
                 },
-                "m_SlotId": 121012981
+                "m_SlotId": 16794435
             }
         },
         {
             "m_OutputSlot": {
                 "m_Node": {
-                    "m_Id": "cbbd6141db8340f4a8c3319db3b7d0a6"
+                    "m_Id": "c3ae39b9b9af4effaf3399be53ed98da"
                 },
-                "m_SlotId": 0
+                "m_SlotId": 1
             },
             "m_InputSlot": {
                 "m_Node": {
                     "m_Id": "ddd143dc72c24c0eb8b1f8430e83e755"
                 },
-                "m_SlotId": 16794435
+                "m_SlotId": -1396438865
             }
         },
         {
@@ -160,17 +160,31 @@
 
 {
     "m_SGVersion": 0,
-    "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
-    "m_ObjectId": "093e6eb6e01b41cf943705a2b24c12ad",
-    "m_Id": 2,
-    "m_DisplayName": "Pixel Per Unit",
-    "m_SlotType": 1,
+    "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialRangeSlot",
+    "m_ObjectId": "04adcab2a3ae438f8a4b9d7a99800176",
+    "m_Id": -1691137862,
+    "m_DisplayName": "Preview Value",
+    "m_SlotType": 0,
     "m_Hidden": false,
-    "m_ShaderOutputName": "_CanvasPixelPerUnit",
+    "m_HideConnector": true,
+    "m_ShaderOutputName": "_Preview_Value",
     "m_StageCapability": 3,
-    "m_Value": 100.0,
-    "m_DefaultValue": 100.0,
-    "m_Labels": []
+    "m_Value": 0.414000004529953,
+    "m_DefaultValue": 0.5,
+    "m_Labels": [],
+    "m_LiteralMode": false,
+    "m_sliderRange": {
+        "x": 0.0,
+        "y": 1.0
+    },
+    "m_SliderType": 0,
+    "m_SliderPower": 3.0
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasSubTarget",
+    "m_ObjectId": "0724948387ed419a8be84dbf40ca769b"
 }
 
 {
@@ -209,62 +223,25 @@
 
 {
     "m_SGVersion": 0,
-    "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
-    "m_ObjectId": "0ee2529eb1a14c2fba5a1379f09bf5ab",
-    "m_Id": 1,
-    "m_DisplayName": "Scale Factor",
-    "m_SlotType": 1,
-    "m_Hidden": false,
-    "m_ShaderOutputName": "_CanvasScaleFactor",
-    "m_StageCapability": 3,
-    "m_Value": 1.0,
-    "m_DefaultValue": 1.0,
-    "m_Labels": []
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasSubTarget",
+    "m_ObjectId": "10c3b5b995fd4d19825cb2a725ffb981"
 }
 
 {
     "m_SGVersion": 0,
-    "m_Type": "UnityEditor.ShaderGraph.RectTransformSizeNode",
-    "m_ObjectId": "11bd352cd2d4409bb930e262e1e177f7",
-    "m_Group": {
-        "m_Id": ""
-    },
-    "m_Name": "RectTransform Size",
-    "m_DrawState": {
-        "m_Expanded": true,
-        "m_Position": {
-            "serializedVersion": "2",
-            "x": -799.5000610351563,
-            "y": 426.0000305175781,
-            "width": 156.5,
-            "height": 76.99996948242188
-        }
-    },
-    "m_Slots": [
-        {
-            "m_Id": "430976b1ede24348bdf75cd6109b9b84"
-        },
-        {
-            "m_Id": "0ee2529eb1a14c2fba5a1379f09bf5ab"
-        },
-        {
-            "m_Id": "093e6eb6e01b41cf943705a2b24c12ad"
-        }
-    ],
-    "synonyms": [],
-    "m_Precision": 0,
-    "m_PreviewExpanded": true,
-    "m_DismissedVersion": 0,
-    "m_PreviewMode": 0,
-    "m_CustomColors": {
-        "m_SerializableColors": []
-    },
-    "previewSize": {
-        "x": 100.0,
-        "y": 100.0
-    },
-    "previewScaleFactor": 1.0,
-    "previewPixelsPerUnit": 100.0
+    "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
+    "m_ObjectId": "176972d9fd474c1c933bfdb0504333a8",
+    "m_Id": -2106065226,
+    "m_DisplayName": "PreviewPPU",
+    "m_SlotType": 0,
+    "m_Hidden": false,
+    "m_HideConnector": true,
+    "m_ShaderOutputName": "_PreviewPPU",
+    "m_StageCapability": 3,
+    "m_Value": 100.0,
+    "m_DefaultValue": 100.0,
+    "m_Labels": [],
+    "m_LiteralMode": false
 }
 
 {
@@ -309,26 +286,13 @@
     "m_DisplayName": "Alpha",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "Alpha",
     "m_StageCapability": 2,
     "m_Value": 1.0,
     "m_DefaultValue": 1.0,
-    "m_Labels": []
-}
-
-{
-    "m_SGVersion": 0,
-    "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
-    "m_ObjectId": "1de28863ad154a1eb74dcc255c3487b8",
-    "m_Id": 0,
-    "m_DisplayName": "Value",
-    "m_SlotType": 1,
-    "m_Hidden": false,
-    "m_ShaderOutputName": "_Value",
-    "m_StageCapability": 3,
-    "m_Value": 0.0,
-    "m_DefaultValue": 0.0,
-    "m_Labels": []
+    "m_Labels": [],
+    "m_LiteralMode": false
 }
 
 {
@@ -339,6 +303,7 @@
     "m_DisplayName": "Emission",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "Emission",
     "m_StageCapability": 2,
     "m_Value": {
@@ -399,6 +364,13 @@
     "m_DropdownSelectedEntries": []
 }
 
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasData",
+    "m_ObjectId": "23e408b0f1454583bbd5158bd375dc27",
+    "supportsMotionVectors": false
+}
+
 {
     "m_SGVersion": 0,
     "m_Type": "UnityEditor.Rendering.Canvas.ShaderGraph.CanvasData",
@@ -414,6 +386,65 @@
     "m_ObjectId": "247cd01b97fd4baa87c323d78de99850"
 }
 
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.SubGraphNode",
+    "m_ObjectId": "288b3647e8f44bbd898797e278033b02",
+    "m_Group": {
+        "m_Id": ""
+    },
+    "m_Name": "Slider Value",
+    "m_DrawState": {
+        "m_Expanded": true,
+        "m_Position": {
+            "serializedVersion": "2",
+            "x": -1045.0001220703125,
+            "y": 246.0,
+            "width": 256.00006103515627,
+            "height": 165.00003051757813
+        }
+    },
+    "m_Slots": [
+        {
+            "m_Id": "04adcab2a3ae438f8a4b9d7a99800176"
+        },
+        {
+            "m_Id": "f418744a42834538b03206ba3d8b34d4"
+        },
+        {
+            "m_Id": "d1f248bc8750423d897b7daaef4632b6"
+        }
+    ],
+    "synonyms": [],
+    "m_Precision": 0,
+    "m_PreviewExpanded": false,
+    "m_DismissedVersion": 0,
+    "m_PreviewMode": 0,
+    "m_CustomColors": {
+        "m_SerializableColors": []
+    },
+    "m_SerializedSubGraph": "{\n    \"subGraph\": {\n        \"fileID\": -5475051401550479605,\n        \"guid\": \"b674f75227b22477ca93a09e82cd33d2\",\n        \"type\": 3\n    }\n}",
+    "m_PropertyGuids": [
+        "c874690c-9084-423f-9768-5c99a5d92488"
+    ],
+    "m_PropertyIds": [
+        -1691137862
+    ],
+    "m_Dropdowns": [
+        "_Preview_Direction"
+    ],
+    "m_DropdownSelectedEntries": [
+        "Left To Right"
+    ]
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasData",
+    "m_ObjectId": "29880c8660cd4e2297ceaa8b9b783e4c",
+    "supportsMotionVectors": false
+}
+
 {
     "m_SGVersion": 0,
     "m_Type": "UnityEditor.ShaderGraph.Vector3MaterialSlot",
@@ -422,6 +453,7 @@
     "m_DisplayName": "Color",
     "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "Color",
     "m_StageCapability": 2,
     "m_Value": {
@@ -445,6 +477,7 @@
     "m_DisplayName": "Out",
     "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "Out",
     "m_StageCapability": 3,
     "m_Value": {
@@ -464,11 +497,14 @@
 
 {
     "m_SGVersion": 0,
-    "m_Type": "UnityEditor.Rendering.Canvas.ShaderGraph.CanvasData",
-    "m_ObjectId": "32f2b60776394c5d828c061776098c4c",
-    "m_Version": 0,
-    "m_AlphaClip": false,
-    "m_DisableTint": true
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasSubTarget",
+    "m_ObjectId": "32e5213c4b334bfeb1d7aea2f95436e2"
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasSubTarget",
+    "m_ObjectId": "337a68a849fe49b283d7660f082f1726"
 }
 
 {
@@ -479,11 +515,30 @@
     "m_DisplayName": "Health",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "_Health",
     "m_StageCapability": 2,
     "m_Value": 0.5,
-    "m_DefaultValue": 0.0,
-    "m_Labels": []
+    "m_DefaultValue": 0.5,
+    "m_Labels": [],
+    "m_LiteralMode": false
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
+    "m_ObjectId": "3a8a055537ae4024a4b90c1069e52670",
+    "m_Id": -1949568231,
+    "m_DisplayName": "PreviewScaleFactor",
+    "m_SlotType": 0,
+    "m_Hidden": false,
+    "m_HideConnector": true,
+    "m_ShaderOutputName": "_PreviewScaleFactor",
+    "m_StageCapability": 3,
+    "m_Value": 1.0,
+    "m_DefaultValue": 1.0,
+    "m_Labels": [],
+    "m_LiteralMode": false
 }
 
 {
@@ -517,6 +572,7 @@
     "m_CastShadows": true,
     "m_ReceiveShadows": true,
     "m_DisableTint": false,
+    "m_Sort3DAs2DCompatible": false,
     "m_AdditionalMotionVectorMode": 0,
     "m_AlembicMotionVectors": false,
     "m_SupportsLODCrossFade": false,
@@ -524,6 +580,13 @@
     "m_SupportVFX": false
 }
 
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasData",
+    "m_ObjectId": "3d7882455342469badf9b85649b4d809",
+    "supportsMotionVectors": false
+}
+
 {
     "m_SGVersion": 0,
     "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDTarget",
@@ -552,23 +615,8 @@
 
 {
     "m_SGVersion": 0,
-    "m_Type": "UnityEditor.ShaderGraph.Vector2MaterialSlot",
-    "m_ObjectId": "430976b1ede24348bdf75cd6109b9b84",
-    "m_Id": 0,
-    "m_DisplayName": "Size",
-    "m_SlotType": 1,
-    "m_Hidden": false,
-    "m_ShaderOutputName": "_RectTransformSize",
-    "m_StageCapability": 3,
-    "m_Value": {
-        "x": 1.0,
-        "y": 1.0
-    },
-    "m_DefaultValue": {
-        "x": 100.0,
-        "y": 100.0
-    },
-    "m_Labels": []
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasSubTarget",
+    "m_ObjectId": "48f4b1e87a3c4f6885826e7b4fac6a55"
 }
 
 {
@@ -579,6 +627,7 @@
     "m_DisplayName": "UV",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "_UV",
     "m_StageCapability": 2,
     "m_Value": {
@@ -592,6 +641,23 @@
     "m_Labels": []
 }
 
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
+    "m_ObjectId": "5880f83c81d84553826860ac8a13a641",
+    "m_Id": 716604351,
+    "m_DisplayName": "PreviewHeight",
+    "m_SlotType": 0,
+    "m_Hidden": false,
+    "m_HideConnector": true,
+    "m_ShaderOutputName": "_PreviewHeight",
+    "m_StageCapability": 3,
+    "m_Value": 100.0,
+    "m_DefaultValue": 100.0,
+    "m_Labels": [],
+    "m_LiteralMode": false
+}
+
 {
     "m_SGVersion": 0,
     "m_Type": "UnityEditor.ShaderGraph.Vector2MaterialSlot",
@@ -600,6 +666,7 @@
     "m_DisplayName": "Width Height",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "_Width_Height",
     "m_StageCapability": 2,
     "m_Value": {
@@ -613,6 +680,12 @@
     "m_Labels": []
 }
 
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasSubTarget",
+    "m_ObjectId": "5fdad50a225b41158ea509de8ebd38c6"
+}
+
 {
     "m_SGVersion": 0,
     "m_Type": "UnityEditor.ShaderGraph.BlockNode",
@@ -655,11 +728,20 @@
     "m_DisplayName": "Alpha",
     "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "Alpha",
     "m_StageCapability": 2,
     "m_Value": 0.0,
     "m_DefaultValue": 0.0,
-    "m_Labels": []
+    "m_Labels": [],
+    "m_LiteralMode": false
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasData",
+    "m_ObjectId": "6a4f7fe7684a4000b7f710774cf6b0bd",
+    "supportsMotionVectors": false
 }
 
 {
@@ -670,15 +752,61 @@
     "m_ChildObjectList": []
 }
 
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasData",
+    "m_ObjectId": "770b75583f6740d3bff3f12c44630008",
+    "supportsMotionVectors": false
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasSubTarget",
+    "m_ObjectId": "786640f9ee3344dbb15a7654dbef302f"
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
+    "m_ObjectId": "8dfc3658e32348efbe216065e5e59136",
+    "m_Id": 2,
+    "m_DisplayName": "Scale_Factor",
+    "m_SlotType": 1,
+    "m_Hidden": false,
+    "m_HideConnector": false,
+    "m_ShaderOutputName": "Scale_Factor",
+    "m_StageCapability": 3,
+    "m_Value": 0.0,
+    "m_DefaultValue": 0.0,
+    "m_Labels": [],
+    "m_LiteralMode": false
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasSubTarget",
+    "m_ObjectId": "93d4f58b92b34b30a417d57972928aa3"
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.Rendering.Canvas.ShaderGraph.CanvasData",
+    "m_ObjectId": "94b27c5715bc422a85b2ebe2aaed60bf",
+    "m_Version": 0,
+    "m_AlphaClip": false,
+    "m_DisableTint": true
+}
+
 {
     "m_SGVersion": 0,
     "m_Type": "UnityEditor.ShaderGraph.Vector2MaterialSlot",
-    "m_ObjectId": "849dbbed0cf44f9a9059680c4876d88b",
+    "m_ObjectId": "998578946cb04cec9eb39c00dd89a341",
     "m_Id": 1,
-    "m_DisplayName": "Direction",
+    "m_DisplayName": "Size",
     "m_SlotType": 1,
     "m_Hidden": false,
-    "m_ShaderOutputName": "_Direction",
+    "m_HideConnector": false,
+    "m_ShaderOutputName": "Size",
     "m_StageCapability": 3,
     "m_Value": {
         "x": 0.0,
@@ -693,18 +821,47 @@
 
 {
     "m_SGVersion": 0,
-    "m_Type": "UnityEditor.Rendering.Canvas.ShaderGraph.CanvasData",
-    "m_ObjectId": "94b27c5715bc422a85b2ebe2aaed60bf",
-    "m_Version": 0,
-    "m_AlphaClip": false,
-    "m_DisableTint": true
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasData",
+    "m_ObjectId": "9faba2e0409944e4974405ecba3e0d98",
+    "supportsMotionVectors": false
 }
 
 {
     "m_SGVersion": 0,
-    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasData",
-    "m_ObjectId": "9faba2e0409944e4974405ecba3e0d98",
-    "supportsMotionVectors": false
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasSubTarget",
+    "m_ObjectId": "a73a4874f79b46329c1e3f2bad509a45"
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasSubTarget",
+    "m_ObjectId": "ad0511b594294cf9ba9546e82b5dbf19"
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.ColorRGBAMaterialSlot",
+    "m_ObjectId": "b4f60557da984146959131d3b88e2c16",
+    "m_Id": 121012981,
+    "m_DisplayName": "Color",
+    "m_SlotType": 0,
+    "m_Hidden": false,
+    "m_HideConnector": false,
+    "m_ShaderOutputName": "_Color",
+    "m_StageCapability": 2,
+    "m_Value": {
+        "x": 0.0,
+        "y": 0.48235300183296206,
+        "z": 1.0,
+        "w": 1.0
+    },
+    "m_DefaultValue": {
+        "x": 0.0,
+        "y": 0.48235300183296206,
+        "z": 1.0,
+        "w": 1.0
+    },
+    "m_Labels": []
 }
 
 {
@@ -737,6 +894,7 @@
     "m_DisplayName": "Base Color",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "BaseColor",
     "m_StageCapability": 2,
     "m_Value": {
@@ -761,38 +919,117 @@
 
 {
     "m_SGVersion": 0,
-    "m_Type": "UnityEditor.ShaderGraph.SliderValueNode",
-    "m_ObjectId": "cbbd6141db8340f4a8c3319db3b7d0a6",
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasData",
+    "m_ObjectId": "c1e7ee39856a45b3ab5d7e007395d447",
+    "supportsMotionVectors": false
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasData",
+    "m_ObjectId": "c373f1894323494b8c901d0dde2cbffd",
+    "supportsMotionVectors": false
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.SubGraphNode",
+    "m_ObjectId": "c3ae39b9b9af4effaf3399be53ed98da",
     "m_Group": {
         "m_Id": ""
     },
-    "m_Name": "Slider Value",
+    "m_Name": "Rect Transform Size",
     "m_DrawState": {
         "m_Expanded": true,
         "m_Position": {
             "serializedVersion": "2",
-            "x": -776.5000610351563,
-            "y": 289.0000305175781,
-            "width": 113.0,
-            "height": 101.0
+            "x": -779.0000610351563,
+            "y": 327.0,
+            "width": 165.0,
+            "height": 228.0
         }
     },
     "m_Slots": [
         {
-            "m_Id": "1de28863ad154a1eb74dcc255c3487b8"
+            "m_Id": "e0b570e0dd6f4064ba1e0b7e7cfd9b17"
+        },
+        {
+            "m_Id": "5880f83c81d84553826860ac8a13a641"
+        },
+        {
+            "m_Id": "3a8a055537ae4024a4b90c1069e52670"
+        },
+        {
+            "m_Id": "176972d9fd474c1c933bfdb0504333a8"
+        },
+        {
+            "m_Id": "998578946cb04cec9eb39c00dd89a341"
+        },
+        {
+            "m_Id": "8dfc3658e32348efbe216065e5e59136"
         },
         {
-            "m_Id": "849dbbed0cf44f9a9059680c4876d88b"
+            "m_Id": "f59f1b866b2d444ab91670a1ab4fd7cc"
         }
     ],
     "synonyms": [],
     "m_Precision": 0,
-    "m_PreviewExpanded": true,
+    "m_PreviewExpanded": false,
     "m_DismissedVersion": 0,
     "m_PreviewMode": 0,
     "m_CustomColors": {
         "m_SerializableColors": []
-    }
+    },
+    "m_SerializedSubGraph": "{\n    \"subGraph\": {\n        \"fileID\": -5475051401550479605,\n        \"guid\": \"aa041986c041b4dc1b5bf0b2cd2d86e8\",\n        \"type\": 3\n    }\n}",
+    "m_PropertyGuids": [
+        "975f2db3-e792-46e7-9bf8-3a4cbe4fb068",
+        "373c703c-395b-43d3-91ba-78b9497021e7",
+        "2747a643-8db3-4ffc-9923-55aa70fb2549",
+        "451bbdf7-6136-4a6e-a5c8-4918d2ea4b95"
+    ],
+    "m_PropertyIds": [
+        -181240572,
+        716604351,
+        -1949568231,
+        -2106065226
+    ],
+    "m_Dropdowns": [],
+    "m_DropdownSelectedEntries": []
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasData",
+    "m_ObjectId": "cafe4dfb66fa41449a2bbf6804a520f5",
+    "supportsMotionVectors": false
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasSubTarget",
+    "m_ObjectId": "d0a4787e344f48f5a85fe74bb0000b0c"
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.Vector2MaterialSlot",
+    "m_ObjectId": "d1f248bc8750423d897b7daaef4632b6",
+    "m_Id": 2,
+    "m_DisplayName": "Direction",
+    "m_SlotType": 1,
+    "m_Hidden": false,
+    "m_HideConnector": false,
+    "m_ShaderOutputName": "Direction",
+    "m_StageCapability": 3,
+    "m_Value": {
+        "x": 0.0,
+        "y": 0.0
+    },
+    "m_DefaultValue": {
+        "x": 0.0,
+        "y": 0.0
+    },
+    "m_Labels": []
 }
 
 {
@@ -801,6 +1038,13 @@
     "m_ObjectId": "d4c64a3ec6124e59ab94142d70644f47"
 }
 
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasData",
+    "m_ObjectId": "dd2d0b7f72cd40b5b04a235ffee51a1b",
+    "supportsMotionVectors": false
+}
+
 {
     "m_SGVersion": 0,
     "m_Type": "UnityEditor.ShaderGraph.SubGraphNode",
@@ -824,7 +1068,7 @@
             "m_Id": "55ec786dbd514ee99f2113f1b379f200"
         },
         {
-            "m_Id": "fae642cb44694a679fcc15f7abb31890"
+            "m_Id": "b4f60557da984146959131d3b88e2c16"
         },
         {
             "m_Id": "36149ffbdf1649c4adae076d90406990"
@@ -866,26 +1110,79 @@
 
 {
     "m_SGVersion": 0,
-    "m_Type": "UnityEditor.ShaderGraph.Vector4MaterialSlot",
-    "m_ObjectId": "fae642cb44694a679fcc15f7abb31890",
-    "m_Id": 121012981,
-    "m_DisplayName": "Color",
+    "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
+    "m_ObjectId": "e0b570e0dd6f4064ba1e0b7e7cfd9b17",
+    "m_Id": -181240572,
+    "m_DisplayName": "PreviewWidth",
     "m_SlotType": 0,
     "m_Hidden": false,
-    "m_ShaderOutputName": "_Color",
-    "m_StageCapability": 2,
-    "m_Value": {
-        "x": 0.0,
-        "y": 0.48235300183296206,
-        "z": 1.0,
-        "w": 1.0
-    },
-    "m_DefaultValue": {
-        "x": 0.0,
-        "y": 0.0,
-        "z": 0.0,
-        "w": 0.0
-    },
-    "m_Labels": []
+    "m_HideConnector": true,
+    "m_ShaderOutputName": "_PreviewWidth",
+    "m_StageCapability": 3,
+    "m_Value": 100.0,
+    "m_DefaultValue": 100.0,
+    "m_Labels": [],
+    "m_LiteralMode": false
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasData",
+    "m_ObjectId": "ec0773b35401476ea81c2e6afc45d427",
+    "supportsMotionVectors": false
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasData",
+    "m_ObjectId": "ef3ad75715cb4c11b9e3357285c4829f",
+    "supportsMotionVectors": false
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
+    "m_ObjectId": "f418744a42834538b03206ba3d8b34d4",
+    "m_Id": 1,
+    "m_DisplayName": "Value",
+    "m_SlotType": 1,
+    "m_Hidden": false,
+    "m_HideConnector": false,
+    "m_ShaderOutputName": "Value",
+    "m_StageCapability": 3,
+    "m_Value": 0.0,
+    "m_DefaultValue": 0.0,
+    "m_Labels": [],
+    "m_LiteralMode": false
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
+    "m_ObjectId": "f59f1b866b2d444ab91670a1ab4fd7cc",
+    "m_Id": 3,
+    "m_DisplayName": "Pixel_Per_Unit",
+    "m_SlotType": 1,
+    "m_Hidden": false,
+    "m_HideConnector": false,
+    "m_ShaderOutputName": "Pixel_Per_Unit",
+    "m_StageCapability": 3,
+    "m_Value": 0.0,
+    "m_DefaultValue": 0.0,
+    "m_Labels": [],
+    "m_LiteralMode": false
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasData",
+    "m_ObjectId": "f795741071454171a540b0e05ba89099",
+    "supportsMotionVectors": false
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasSubTarget",
+    "m_ObjectId": "f84934c605d0438b9d9b65af0e04993e"
 }
 
diff --git a/Packages/com.unity.shadergraph/Samples~/UGUIShaders/Examples/Indicators/Dial Meter.shadergraph b/Packages/com.unity.shadergraph/Samples~/UGUIShaders/Examples/Indicators/Dial Meter.shadergraph
index 0f2958225c1..93b7596568b 100644
--- a/Packages/com.unity.shadergraph/Samples~/UGUIShaders/Examples/Indicators/Dial Meter.shadergraph	
+++ b/Packages/com.unity.shadergraph/Samples~/UGUIShaders/Examples/Indicators/Dial Meter.shadergraph	
@@ -31,7 +31,7 @@
             "m_Id": "aabe3789957f4026ac95273b499c40ab"
         },
         {
-            "m_Id": "1371c33d3247472dbbf8f6fcc0904fc8"
+            "m_Id": "dc60fcbde4f0451dbb31625691020b0e"
         }
     ],
     "m_GroupDatas": [],
@@ -40,7 +40,7 @@
         {
             "m_OutputSlot": {
                 "m_Node": {
-                    "m_Id": "1371c33d3247472dbbf8f6fcc0904fc8"
+                    "m_Id": "607f53c4c1f44005969aaa2b5dfcb0f3"
                 },
                 "m_SlotId": 0
             },
@@ -48,21 +48,21 @@
                 "m_Node": {
                     "m_Id": "aabe3789957f4026ac95273b499c40ab"
                 },
-                "m_SlotId": 766222311
+                "m_SlotId": 1887705711
             }
         },
         {
             "m_OutputSlot": {
                 "m_Node": {
-                    "m_Id": "607f53c4c1f44005969aaa2b5dfcb0f3"
+                    "m_Id": "aabe3789957f4026ac95273b499c40ab"
                 },
-                "m_SlotId": 0
+                "m_SlotId": 1
             },
             "m_InputSlot": {
                 "m_Node": {
-                    "m_Id": "aabe3789957f4026ac95273b499c40ab"
+                    "m_Id": "6592898a2b754667869b2cab7e0b95d1"
                 },
-                "m_SlotId": 1887705711
+                "m_SlotId": 0
             }
         },
         {
@@ -70,11 +70,11 @@
                 "m_Node": {
                     "m_Id": "aabe3789957f4026ac95273b499c40ab"
                 },
-                "m_SlotId": 1
+                "m_SlotId": 2
             },
             "m_InputSlot": {
                 "m_Node": {
-                    "m_Id": "6592898a2b754667869b2cab7e0b95d1"
+                    "m_Id": "1795d618ff9042e7bf5dcb0540585086"
                 },
                 "m_SlotId": 0
             }
@@ -82,15 +82,15 @@
         {
             "m_OutputSlot": {
                 "m_Node": {
-                    "m_Id": "aabe3789957f4026ac95273b499c40ab"
+                    "m_Id": "dc60fcbde4f0451dbb31625691020b0e"
                 },
-                "m_SlotId": 2
+                "m_SlotId": 1
             },
             "m_InputSlot": {
                 "m_Node": {
-                    "m_Id": "1795d618ff9042e7bf5dcb0540585086"
+                    "m_Id": "aabe3789957f4026ac95273b499c40ab"
                 },
-                "m_SlotId": 0
+                "m_SlotId": 766222311
             }
         }
     ],
@@ -150,6 +150,7 @@
     "m_DisplayName": "UV",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "_UV",
     "m_StageCapability": 2,
     "m_Value": {
@@ -163,21 +164,6 @@
     "m_Labels": []
 }
 
-{
-    "m_SGVersion": 0,
-    "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
-    "m_ObjectId": "02c8efc145184467a6a9e9c88a298ffc",
-    "m_Id": 0,
-    "m_DisplayName": "Value",
-    "m_SlotType": 1,
-    "m_Hidden": false,
-    "m_ShaderOutputName": "_MeterValue",
-    "m_StageCapability": 3,
-    "m_Value": 0.0,
-    "m_DefaultValue": 0.0,
-    "m_Labels": []
-}
-
 {
     "m_SGVersion": 0,
     "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDTarget",
@@ -198,6 +184,12 @@
     "m_SupportLineRendering": false
 }
 
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasSubTarget",
+    "m_ObjectId": "0724948387ed419a8be84dbf40ca769b"
+}
+
 {
     "m_SGVersion": 0,
     "m_Type": "UnityEditor.ShaderGraph.BlockNode",
@@ -234,35 +226,8 @@
 
 {
     "m_SGVersion": 0,
-    "m_Type": "UnityEditor.ShaderGraph.MeterValueNode",
-    "m_ObjectId": "1371c33d3247472dbbf8f6fcc0904fc8",
-    "m_Group": {
-        "m_Id": ""
-    },
-    "m_Name": "Meter Value",
-    "m_DrawState": {
-        "m_Expanded": true,
-        "m_Position": {
-            "serializedVersion": "2",
-            "x": -599.0,
-            "y": 393.0,
-            "width": 114.0,
-            "height": 77.0
-        }
-    },
-    "m_Slots": [
-        {
-            "m_Id": "02c8efc145184467a6a9e9c88a298ffc"
-        }
-    ],
-    "synonyms": [],
-    "m_Precision": 0,
-    "m_PreviewExpanded": true,
-    "m_DismissedVersion": 0,
-    "m_PreviewMode": 0,
-    "m_CustomColors": {
-        "m_SerializableColors": []
-    }
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasSubTarget",
+    "m_ObjectId": "10c3b5b995fd4d19825cb2a725ffb981"
 }
 
 {
@@ -307,11 +272,30 @@
     "m_DisplayName": "Alpha",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "Alpha",
     "m_StageCapability": 2,
     "m_Value": 1.0,
     "m_DefaultValue": 1.0,
-    "m_Labels": []
+    "m_Labels": [],
+    "m_LiteralMode": false
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
+    "m_ObjectId": "1e781ff7ed594489a683c5cf04a7c1a8",
+    "m_Id": 1,
+    "m_DisplayName": "Out",
+    "m_SlotType": 1,
+    "m_Hidden": false,
+    "m_HideConnector": false,
+    "m_ShaderOutputName": "Out",
+    "m_StageCapability": 3,
+    "m_Value": 0.0,
+    "m_DefaultValue": 0.0,
+    "m_Labels": [],
+    "m_LiteralMode": false
 }
 
 {
@@ -322,6 +306,7 @@
     "m_DisplayName": "Color",
     "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "Out",
     "m_StageCapability": 3,
     "m_Value": {
@@ -347,6 +332,7 @@
     "m_DisplayName": "Emission",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "Emission",
     "m_StageCapability": 2,
     "m_Value": {
@@ -371,11 +357,34 @@
 
 {
     "m_SGVersion": 0,
-    "m_Type": "UnityEditor.Rendering.Canvas.ShaderGraph.CanvasData",
-    "m_ObjectId": "2b3a97c7c4d942ce95605a4a33156029",
-    "m_Version": 0,
-    "m_AlphaClip": false,
-    "m_DisableTint": false
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasData",
+    "m_ObjectId": "23e408b0f1454583bbd5158bd375dc27",
+    "supportsMotionVectors": false
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasSubTarget",
+    "m_ObjectId": "247cd01b97fd4baa87c323d78de99850"
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasData",
+    "m_ObjectId": "29880c8660cd4e2297ceaa8b9b783e4c",
+    "supportsMotionVectors": false
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasSubTarget",
+    "m_ObjectId": "32e5213c4b334bfeb1d7aea2f95436e2"
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasSubTarget",
+    "m_ObjectId": "337a68a849fe49b283d7660f082f1726"
 }
 
 {
@@ -409,6 +418,7 @@
     "m_CastShadows": true,
     "m_ReceiveShadows": true,
     "m_DisableTint": false,
+    "m_Sort3DAs2DCompatible": false,
     "m_AdditionalMotionVectorMode": 0,
     "m_AlembicMotionVectors": false,
     "m_SupportsLODCrossFade": false,
@@ -416,6 +426,68 @@
     "m_SupportVFX": false
 }
 
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasData",
+    "m_ObjectId": "3d7882455342469badf9b85649b4d809",
+    "supportsMotionVectors": false
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialRangeSlot",
+    "m_ObjectId": "446fc2b4d3bf4a50b7606f2a489b1a4d",
+    "m_Id": -2019249102,
+    "m_DisplayName": "Preview Value",
+    "m_SlotType": 0,
+    "m_Hidden": false,
+    "m_HideConnector": true,
+    "m_ShaderOutputName": "_Preview_Value",
+    "m_StageCapability": 3,
+    "m_Value": 0.38999998569488528,
+    "m_DefaultValue": 0.5,
+    "m_Labels": [],
+    "m_LiteralMode": false,
+    "m_sliderRange": {
+        "x": 0.0,
+        "y": 1.0
+    },
+    "m_SliderType": 0,
+    "m_SliderPower": 3.0
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.ColorRGBAMaterialSlot",
+    "m_ObjectId": "482a62f64350439da99d765974d18e22",
+    "m_Id": 1887705711,
+    "m_DisplayName": "Color",
+    "m_SlotType": 0,
+    "m_Hidden": false,
+    "m_HideConnector": false,
+    "m_ShaderOutputName": "_Color",
+    "m_StageCapability": 2,
+    "m_Value": {
+        "x": 0.0,
+        "y": 0.501960813999176,
+        "z": 1.0,
+        "w": 0.0
+    },
+    "m_DefaultValue": {
+        "x": 0.0,
+        "y": 0.501960813999176,
+        "z": 1.0,
+        "w": 0.0
+    },
+    "m_Labels": []
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasSubTarget",
+    "m_ObjectId": "48f4b1e87a3c4f6885826e7b4fac6a55"
+}
+
 {
     "m_SGVersion": 0,
     "m_Type": "UnityEditor.ShaderGraph.Vector3MaterialSlot",
@@ -424,6 +496,7 @@
     "m_DisplayName": "Color",
     "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "Color",
     "m_StageCapability": 2,
     "m_Value": {
@@ -439,6 +512,12 @@
     "m_Labels": []
 }
 
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasSubTarget",
+    "m_ObjectId": "5fdad50a225b41158ea509de8ebd38c6"
+}
+
 {
     "m_SGVersion": 0,
     "m_Type": "UnityEditor.ShaderGraph.PropertyNode",
@@ -509,6 +588,13 @@
     "m_SerializedDescriptor": "SurfaceDescription.BaseColor"
 }
 
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasData",
+    "m_ObjectId": "6a4f7fe7684a4000b7f710774cf6b0bd",
+    "supportsMotionVectors": false
+}
+
 {
     "m_SGVersion": 0,
     "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
@@ -517,11 +603,13 @@
     "m_DisplayName": "Alpha",
     "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "Alpha",
     "m_StageCapability": 2,
     "m_Value": 0.0,
     "m_DefaultValue": 0.0,
-    "m_Labels": []
+    "m_Labels": [],
+    "m_LiteralMode": false
 }
 
 {
@@ -543,6 +631,25 @@
     "supportsMotionVectors": false
 }
 
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasSubTarget",
+    "m_ObjectId": "786640f9ee3344dbb15a7654dbef302f"
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasSubTarget",
+    "m_ObjectId": "93d4f58b92b34b30a417d57972928aa3"
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasData",
+    "m_ObjectId": "9faba2e0409944e4974405ecba3e0d98",
+    "supportsMotionVectors": false
+}
+
 {
     "m_SGVersion": 3,
     "m_Type": "UnityEditor.ShaderGraph.Internal.ColorShaderProperty",
@@ -550,6 +657,9 @@
     "m_Guid": {
         "m_GuidSerialized": "dab423b7-9afd-45d7-932e-cd92329586d3"
     },
+    "promotedFromAssetID": "",
+    "promotedFromCategoryName": "",
+    "promotedOrdering": -1,
     "m_Name": "Color",
     "m_DefaultRefNameVersion": 1,
     "m_RefNameGeneratedByDisplayName": "Color",
@@ -562,7 +672,10 @@
     "m_Precision": 0,
     "overrideHLSLDeclaration": false,
     "hlslDeclarationOverride": 0,
+    "hideConnector": false,
     "m_Hidden": false,
+    "m_PerRendererData": false,
+    "m_customAttributes": [],
     "m_Value": {
         "r": 0.0,
         "g": 0.48235294222831728,
@@ -602,7 +715,7 @@
             "m_Id": "002666bad87e403b9a03edfaa1480d94"
         },
         {
-            "m_Id": "b170c279160b4f15aa1f0cc652ad7f59"
+            "m_Id": "482a62f64350439da99d765974d18e22"
         },
         {
             "m_Id": "cfc976956e1d4ad1a606a13e3c316a56"
@@ -639,27 +752,8 @@
 
 {
     "m_SGVersion": 0,
-    "m_Type": "UnityEditor.ShaderGraph.Vector4MaterialSlot",
-    "m_ObjectId": "b170c279160b4f15aa1f0cc652ad7f59",
-    "m_Id": 1887705711,
-    "m_DisplayName": "Color",
-    "m_SlotType": 0,
-    "m_Hidden": false,
-    "m_ShaderOutputName": "_Color",
-    "m_StageCapability": 2,
-    "m_Value": {
-        "x": 0.0,
-        "y": 0.501960813999176,
-        "z": 1.0,
-        "w": 0.0
-    },
-    "m_DefaultValue": {
-        "x": 0.0,
-        "y": 0.0,
-        "z": 0.0,
-        "w": 0.0
-    },
-    "m_Labels": []
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasSubTarget",
+    "m_ObjectId": "ad0511b594294cf9ba9546e82b5dbf19"
 }
 
 {
@@ -679,6 +773,7 @@
     "m_DisplayName": "Base Color",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "BaseColor",
     "m_StageCapability": 2,
     "m_Value": {
@@ -701,6 +796,27 @@
     }
 }
 
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasData",
+    "m_ObjectId": "c1e7ee39856a45b3ab5d7e007395d447",
+    "supportsMotionVectors": false
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasData",
+    "m_ObjectId": "c373f1894323494b8c901d0dde2cbffd",
+    "supportsMotionVectors": false
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasData",
+    "m_ObjectId": "cafe4dfb66fa41449a2bbf6804a520f5",
+    "supportsMotionVectors": false
+}
+
 {
     "m_SGVersion": 0,
     "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
@@ -709,11 +825,19 @@
     "m_DisplayName": "Health",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "_Health",
     "m_StageCapability": 2,
     "m_Value": 0.5,
-    "m_DefaultValue": 0.0,
-    "m_Labels": []
+    "m_DefaultValue": 0.5,
+    "m_Labels": [],
+    "m_LiteralMode": false
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasSubTarget",
+    "m_ObjectId": "d0a4787e344f48f5a85fe74bb0000b0c"
 }
 
 {
@@ -722,3 +846,82 @@
     "m_ObjectId": "d4c64a3ec6124e59ab94142d70644f47"
 }
 
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.SubGraphNode",
+    "m_ObjectId": "dc60fcbde4f0451dbb31625691020b0e",
+    "m_Group": {
+        "m_Id": ""
+    },
+    "m_Name": "Meter Value",
+    "m_DrawState": {
+        "m_Expanded": true,
+        "m_Position": {
+            "serializedVersion": "2",
+            "x": -707.9999389648438,
+            "y": 355.99993896484377,
+            "width": 184.0,
+            "height": 122.00003051757813
+        }
+    },
+    "m_Slots": [
+        {
+            "m_Id": "446fc2b4d3bf4a50b7606f2a489b1a4d"
+        },
+        {
+            "m_Id": "1e781ff7ed594489a683c5cf04a7c1a8"
+        }
+    ],
+    "synonyms": [],
+    "m_Precision": 0,
+    "m_PreviewExpanded": false,
+    "m_DismissedVersion": 0,
+    "m_PreviewMode": 0,
+    "m_CustomColors": {
+        "m_SerializableColors": []
+    },
+    "m_SerializedSubGraph": "{\n    \"subGraph\": {\n        \"fileID\": -5475051401550479605,\n        \"guid\": \"90192633207f24dc0927e116d7564452\",\n        \"type\": 3\n    }\n}",
+    "m_PropertyGuids": [
+        "3da8ea4d-7749-407b-965b-ab3ca072dcc6"
+    ],
+    "m_PropertyIds": [
+        -2019249102
+    ],
+    "m_Dropdowns": [],
+    "m_DropdownSelectedEntries": []
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasData",
+    "m_ObjectId": "dd2d0b7f72cd40b5b04a235ffee51a1b",
+    "supportsMotionVectors": false
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasData",
+    "m_ObjectId": "ec0773b35401476ea81c2e6afc45d427",
+    "supportsMotionVectors": false
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasData",
+    "m_ObjectId": "ef3ad75715cb4c11b9e3357285c4829f",
+    "supportsMotionVectors": false
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasData",
+    "m_ObjectId": "f795741071454171a540b0e05ba89099",
+    "supportsMotionVectors": false
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasSubTarget",
+    "m_ObjectId": "f84934c605d0438b9d9b65af0e04993e"
+}
+
diff --git a/Packages/com.unity.shadergraph/Samples~/UGUIShaders/Examples/Indicators/Fantasy Meter.shadergraph b/Packages/com.unity.shadergraph/Samples~/UGUIShaders/Examples/Indicators/Fantasy Meter.shadergraph
index 4763a8367e3..68eceaef4e1 100644
--- a/Packages/com.unity.shadergraph/Samples~/UGUIShaders/Examples/Indicators/Fantasy Meter.shadergraph	
+++ b/Packages/com.unity.shadergraph/Samples~/UGUIShaders/Examples/Indicators/Fantasy Meter.shadergraph	
@@ -27,7 +27,7 @@
             "m_Id": "fb55dfb955fc42198212883e6bccba33"
         },
         {
-            "m_Id": "6264980156d044a5a189343ee7b62e7e"
+            "m_Id": "d11abbdb76a74ed6866f1ccd977cba14"
         }
     ],
     "m_GroupDatas": [],
@@ -64,9 +64,9 @@
         {
             "m_OutputSlot": {
                 "m_Node": {
-                    "m_Id": "6264980156d044a5a189343ee7b62e7e"
+                    "m_Id": "d11abbdb76a74ed6866f1ccd977cba14"
                 },
-                "m_SlotId": 0
+                "m_SlotId": 1
             },
             "m_InputSlot": {
                 "m_Node": {
@@ -141,6 +141,12 @@
     ]
 }
 
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasSubTarget",
+    "m_ObjectId": "0724948387ed419a8be84dbf40ca769b"
+}
+
 {
     "m_SGVersion": 0,
     "m_Type": "UnityEditor.ShaderGraph.BlockNode",
@@ -207,7 +213,7 @@
             "m_Id": "9f2e517605c542968908daea074be6c4"
         },
         {
-            "m_Id": "639ed1353f37425895f6f2675d63f182"
+            "m_Id": "24f966d118c0425f84e158287dfbb599"
         },
         {
             "m_Id": "279ac9fa600f44f28a232e8423a2167e"
@@ -243,6 +249,12 @@
     "m_DropdownSelectedEntries": []
 }
 
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasSubTarget",
+    "m_ObjectId": "10c3b5b995fd4d19825cb2a725ffb981"
+}
+
 {
     "m_SGVersion": 0,
     "m_Type": "UnityEditor.ShaderGraph.BlockNode",
@@ -285,11 +297,13 @@
     "m_DisplayName": "Alpha",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "Alpha",
     "m_StageCapability": 2,
     "m_Value": 1.0,
     "m_DefaultValue": 1.0,
-    "m_Labels": []
+    "m_Labels": [],
+    "m_LiteralMode": false
 }
 
 {
@@ -300,6 +314,7 @@
     "m_DisplayName": "Emission",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "Emission",
     "m_StageCapability": 2,
     "m_Value": {
@@ -322,6 +337,45 @@
     }
 }
 
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasData",
+    "m_ObjectId": "23e408b0f1454583bbd5158bd375dc27",
+    "supportsMotionVectors": false
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasSubTarget",
+    "m_ObjectId": "247cd01b97fd4baa87c323d78de99850"
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.ColorRGBAMaterialSlot",
+    "m_ObjectId": "24f966d118c0425f84e158287dfbb599",
+    "m_Id": -770541211,
+    "m_DisplayName": "Liquid Color",
+    "m_SlotType": 0,
+    "m_Hidden": false,
+    "m_HideConnector": false,
+    "m_ShaderOutputName": "_Liquid_Color",
+    "m_StageCapability": 2,
+    "m_Value": {
+        "x": 1.0,
+        "y": 0.0,
+        "z": 0.0,
+        "w": 0.0
+    },
+    "m_DefaultValue": {
+        "x": 1.0,
+        "y": 0.0,
+        "z": 0.0,
+        "w": 0.0
+    },
+    "m_Labels": []
+}
+
 {
     "m_SGVersion": 0,
     "m_Type": "UnityEditor.ShaderGraph.Vector3MaterialSlot",
@@ -330,6 +384,7 @@
     "m_DisplayName": "Color",
     "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "Color",
     "m_StageCapability": 2,
     "m_Value": {
@@ -352,6 +407,18 @@
     "supportsMotionVectors": false
 }
 
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasSubTarget",
+    "m_ObjectId": "32e5213c4b334bfeb1d7aea2f95436e2"
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasSubTarget",
+    "m_ObjectId": "337a68a849fe49b283d7660f082f1726"
+}
+
 {
     "m_SGVersion": 0,
     "m_Type": "UnityEditor.Rendering.BuiltIn.ShaderGraph.BuiltInCanvasSubTarget",
@@ -407,6 +474,7 @@
     "m_CastShadows": true,
     "m_ReceiveShadows": true,
     "m_DisableTint": false,
+    "m_Sort3DAs2DCompatible": false,
     "m_AdditionalMotionVectorMode": 0,
     "m_AlembicMotionVectors": false,
     "m_SupportsLODCrossFade": false,
@@ -416,60 +484,21 @@
 
 {
     "m_SGVersion": 0,
-    "m_Type": "UnityEditor.ShaderGraph.MeterValueNode",
-    "m_ObjectId": "6264980156d044a5a189343ee7b62e7e",
-    "m_Group": {
-        "m_Id": ""
-    },
-    "m_Name": "Meter Value",
-    "m_DrawState": {
-        "m_Expanded": true,
-        "m_Position": {
-            "serializedVersion": "2",
-            "x": -709.0,
-            "y": 219.0,
-            "width": 114.0,
-            "height": 77.0
-        }
-    },
-    "m_Slots": [
-        {
-            "m_Id": "75a738a42aa04552a143b547a9872728"
-        }
-    ],
-    "synonyms": [],
-    "m_Precision": 0,
-    "m_PreviewExpanded": true,
-    "m_DismissedVersion": 0,
-    "m_PreviewMode": 0,
-    "m_CustomColors": {
-        "m_SerializableColors": []
-    }
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasData",
+    "m_ObjectId": "3d7882455342469badf9b85649b4d809",
+    "supportsMotionVectors": false
 }
 
 {
     "m_SGVersion": 0,
-    "m_Type": "UnityEditor.ShaderGraph.Vector4MaterialSlot",
-    "m_ObjectId": "639ed1353f37425895f6f2675d63f182",
-    "m_Id": -770541211,
-    "m_DisplayName": "Liquid Color",
-    "m_SlotType": 0,
-    "m_Hidden": false,
-    "m_ShaderOutputName": "_Liquid_Color",
-    "m_StageCapability": 2,
-    "m_Value": {
-        "x": 1.0,
-        "y": 0.0,
-        "z": 0.0,
-        "w": 0.0
-    },
-    "m_DefaultValue": {
-        "x": 0.0,
-        "y": 0.0,
-        "z": 0.0,
-        "w": 0.0
-    },
-    "m_Labels": []
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasSubTarget",
+    "m_ObjectId": "48f4b1e87a3c4f6885826e7b4fac6a55"
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasSubTarget",
+    "m_ObjectId": "5fdad50a225b41158ea509de8ebd38c6"
 }
 
 {
@@ -506,6 +535,13 @@
     "m_SerializedDescriptor": "SurfaceDescription.BaseColor"
 }
 
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasData",
+    "m_ObjectId": "6a4f7fe7684a4000b7f710774cf6b0bd",
+    "supportsMotionVectors": false
+}
+
 {
     "m_SGVersion": 0,
     "m_Type": "UnityEditor.ShaderGraph.CategoryData",
@@ -516,17 +552,9 @@
 
 {
     "m_SGVersion": 0,
-    "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
-    "m_ObjectId": "75a738a42aa04552a143b547a9872728",
-    "m_Id": 0,
-    "m_DisplayName": "Value",
-    "m_SlotType": 1,
-    "m_Hidden": false,
-    "m_ShaderOutputName": "_MeterValue",
-    "m_StageCapability": 3,
-    "m_Value": 0.0,
-    "m_DefaultValue": 0.0,
-    "m_Labels": []
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasData",
+    "m_ObjectId": "770b75583f6740d3bff3f12c44630008",
+    "supportsMotionVectors": false
 }
 
 {
@@ -555,6 +583,23 @@
     "m_SupportLineRendering": false
 }
 
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
+    "m_ObjectId": "8795c0198a5f4878bb74282f5f4d4f99",
+    "m_Id": 1,
+    "m_DisplayName": "Out",
+    "m_SlotType": 1,
+    "m_Hidden": false,
+    "m_HideConnector": false,
+    "m_ShaderOutputName": "Out",
+    "m_StageCapability": 3,
+    "m_Value": 0.0,
+    "m_DefaultValue": 0.0,
+    "m_Labels": [],
+    "m_LiteralMode": false
+}
+
 {
     "m_SGVersion": 0,
     "m_Type": "UnityEditor.ShaderGraph.Vector4MaterialSlot",
@@ -563,6 +608,7 @@
     "m_DisplayName": "Out",
     "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "Out",
     "m_StageCapability": 3,
     "m_Value": {
@@ -580,6 +626,12 @@
     "m_Labels": []
 }
 
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasSubTarget",
+    "m_ObjectId": "93d4f58b92b34b30a417d57972928aa3"
+}
+
 {
     "m_SGVersion": 0,
     "m_Type": "UnityEditor.Rendering.Canvas.ShaderGraph.CanvasData",
@@ -597,6 +649,7 @@
     "m_DisplayName": "UV",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "_UV",
     "m_StageCapability": 2,
     "m_Value": {
@@ -618,11 +671,43 @@
     "m_DisplayName": "Size",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "_Size",
     "m_StageCapability": 2,
     "m_Value": 0.8999999761581421,
-    "m_DefaultValue": 0.0,
-    "m_Labels": []
+    "m_DefaultValue": 0.8999999761581421,
+    "m_Labels": [],
+    "m_LiteralMode": false
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasData",
+    "m_ObjectId": "9faba2e0409944e4974405ecba3e0d98",
+    "supportsMotionVectors": false
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialRangeSlot",
+    "m_ObjectId": "a01e4d34141a4dcd9b40ec9df8fb843f",
+    "m_Id": -2019249102,
+    "m_DisplayName": "Preview Value",
+    "m_SlotType": 0,
+    "m_Hidden": false,
+    "m_HideConnector": true,
+    "m_ShaderOutputName": "_Preview_Value",
+    "m_StageCapability": 3,
+    "m_Value": 0.4000000059604645,
+    "m_DefaultValue": 0.5,
+    "m_Labels": [],
+    "m_LiteralMode": false,
+    "m_sliderRange": {
+        "x": 0.0,
+        "y": 1.0
+    },
+    "m_SliderType": 0,
+    "m_SliderPower": 3.0
 }
 
 {
@@ -633,6 +718,7 @@
     "m_DisplayName": "Light Direction",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "_Light_Direction",
     "m_StageCapability": 2,
     "m_Value": {
@@ -648,6 +734,18 @@
     "m_Labels": []
 }
 
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasSubTarget",
+    "m_ObjectId": "a73a4874f79b46329c1e3f2bad509a45"
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasSubTarget",
+    "m_ObjectId": "ad0511b594294cf9ba9546e82b5dbf19"
+}
+
 {
     "m_SGVersion": 0,
     "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
@@ -656,11 +754,13 @@
     "m_DisplayName": "Alpha",
     "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "Alpha",
     "m_StageCapability": 2,
     "m_Value": 0.0,
     "m_DefaultValue": 0.0,
-    "m_Labels": []
+    "m_Labels": [],
+    "m_LiteralMode": false
 }
 
 {
@@ -671,6 +771,7 @@
     "m_DisplayName": "Base Color",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "BaseColor",
     "m_StageCapability": 2,
     "m_Value": {
@@ -693,6 +794,20 @@
     }
 }
 
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasData",
+    "m_ObjectId": "c1e7ee39856a45b3ab5d7e007395d447",
+    "supportsMotionVectors": false
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasData",
+    "m_ObjectId": "c373f1894323494b8c901d0dde2cbffd",
+    "supportsMotionVectors": false
+}
+
 {
     "m_SGVersion": 0,
     "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
@@ -701,11 +816,71 @@
     "m_DisplayName": "Health",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "_Health",
     "m_StageCapability": 2,
     "m_Value": 0.5,
-    "m_DefaultValue": 0.0,
-    "m_Labels": []
+    "m_DefaultValue": 0.5,
+    "m_Labels": [],
+    "m_LiteralMode": false
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasData",
+    "m_ObjectId": "cafe4dfb66fa41449a2bbf6804a520f5",
+    "supportsMotionVectors": false
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasSubTarget",
+    "m_ObjectId": "d0a4787e344f48f5a85fe74bb0000b0c"
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.SubGraphNode",
+    "m_ObjectId": "d11abbdb76a74ed6866f1ccd977cba14",
+    "m_Group": {
+        "m_Id": ""
+    },
+    "m_Name": "Meter Value",
+    "m_DrawState": {
+        "m_Expanded": true,
+        "m_Position": {
+            "serializedVersion": "2",
+            "x": -901.0,
+            "y": 225.00001525878907,
+            "width": 184.0,
+            "height": 122.00001525878906
+        }
+    },
+    "m_Slots": [
+        {
+            "m_Id": "a01e4d34141a4dcd9b40ec9df8fb843f"
+        },
+        {
+            "m_Id": "8795c0198a5f4878bb74282f5f4d4f99"
+        }
+    ],
+    "synonyms": [],
+    "m_Precision": 0,
+    "m_PreviewExpanded": false,
+    "m_DismissedVersion": 0,
+    "m_PreviewMode": 0,
+    "m_CustomColors": {
+        "m_SerializableColors": []
+    },
+    "m_SerializedSubGraph": "{\n    \"subGraph\": {\n        \"fileID\": -5475051401550479605,\n        \"guid\": \"90192633207f24dc0927e116d7564452\",\n        \"type\": 3\n    }\n}",
+    "m_PropertyGuids": [
+        "3da8ea4d-7749-407b-965b-ab3ca072dcc6"
+    ],
+    "m_PropertyIds": [
+        -2019249102
+    ],
+    "m_Dropdowns": [],
+    "m_DropdownSelectedEntries": []
 }
 
 {
@@ -714,6 +889,13 @@
     "m_ObjectId": "d4c64a3ec6124e59ab94142d70644f47"
 }
 
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasData",
+    "m_ObjectId": "dd2d0b7f72cd40b5b04a235ffee51a1b",
+    "supportsMotionVectors": false
+}
+
 {
     "m_SGVersion": 2,
     "m_Type": "UnityEditor.Rendering.BuiltIn.ShaderGraph.BuiltInTarget",
@@ -736,6 +918,33 @@
     "m_CustomEditorGUI": ""
 }
 
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasData",
+    "m_ObjectId": "ec0773b35401476ea81c2e6afc45d427",
+    "supportsMotionVectors": false
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasData",
+    "m_ObjectId": "ef3ad75715cb4c11b9e3357285c4829f",
+    "supportsMotionVectors": false
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasData",
+    "m_ObjectId": "f795741071454171a540b0e05ba89099",
+    "supportsMotionVectors": false
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasSubTarget",
+    "m_ObjectId": "f84934c605d0438b9d9b65af0e04993e"
+}
+
 {
     "m_SGVersion": 0,
     "m_Type": "UnityEditor.ShaderGraph.SubGraphNode",
@@ -774,12 +983,3 @@
     "m_DropdownSelectedEntries": []
 }
 
-{
-    "m_SGVersion": 0,
-    "m_Type": "UnityEditor.Rendering.Canvas.ShaderGraph.CanvasData",
-    "m_ObjectId": "ff2141a9305f44f9b9c0219bd77b08bf",
-    "m_Version": 0,
-    "m_AlphaClip": false,
-    "m_DisableTint": true
-}
-
diff --git a/Packages/com.unity.shadergraph/Samples~/UGUIShaders/Examples/Indicators/SciFi Meter.shadergraph b/Packages/com.unity.shadergraph/Samples~/UGUIShaders/Examples/Indicators/SciFi Meter.shadergraph
index 9c68bd42eb3..9c46eabf34b 100644
--- a/Packages/com.unity.shadergraph/Samples~/UGUIShaders/Examples/Indicators/SciFi Meter.shadergraph	
+++ b/Packages/com.unity.shadergraph/Samples~/UGUIShaders/Examples/Indicators/SciFi Meter.shadergraph	
@@ -34,10 +34,10 @@
             "m_Id": "93953ea629fb4883aff3559ac754eab1"
         },
         {
-            "m_Id": "8a3d96abe4534f969827896ed19a2265"
+            "m_Id": "02a65b14e5c049d994bebab041ae8d45"
         },
         {
-            "m_Id": "00ce001b67c14280a5eacede43fa420f"
+            "m_Id": "0d9c0820c1ea4a28ab44df9183ceeecc"
         }
     ],
     "m_GroupDatas": [],
@@ -46,9 +46,9 @@
         {
             "m_OutputSlot": {
                 "m_Node": {
-                    "m_Id": "00ce001b67c14280a5eacede43fa420f"
+                    "m_Id": "02a65b14e5c049d994bebab041ae8d45"
                 },
-                "m_SlotId": 0
+                "m_SlotId": 1
             },
             "m_InputSlot": {
                 "m_Node": {
@@ -60,15 +60,15 @@
         {
             "m_OutputSlot": {
                 "m_Node": {
-                    "m_Id": "74cda5f1afe24c97bed2e6cf5a09f0c6"
+                    "m_Id": "0d9c0820c1ea4a28ab44df9183ceeecc"
                 },
                 "m_SlotId": 1
             },
             "m_InputSlot": {
                 "m_Node": {
-                    "m_Id": "6592898a2b754667869b2cab7e0b95d1"
+                    "m_Id": "74cda5f1afe24c97bed2e6cf5a09f0c6"
                 },
-                "m_SlotId": 0
+                "m_SlotId": -2048319949
             }
         },
         {
@@ -76,11 +76,11 @@
                 "m_Node": {
                     "m_Id": "74cda5f1afe24c97bed2e6cf5a09f0c6"
                 },
-                "m_SlotId": 2
+                "m_SlotId": 1
             },
             "m_InputSlot": {
                 "m_Node": {
-                    "m_Id": "1795d618ff9042e7bf5dcb0540585086"
+                    "m_Id": "6592898a2b754667869b2cab7e0b95d1"
                 },
                 "m_SlotId": 0
             }
@@ -88,15 +88,15 @@
         {
             "m_OutputSlot": {
                 "m_Node": {
-                    "m_Id": "8a3d96abe4534f969827896ed19a2265"
+                    "m_Id": "74cda5f1afe24c97bed2e6cf5a09f0c6"
                 },
-                "m_SlotId": 0
+                "m_SlotId": 2
             },
             "m_InputSlot": {
                 "m_Node": {
-                    "m_Id": "74cda5f1afe24c97bed2e6cf5a09f0c6"
+                    "m_Id": "1795d618ff9042e7bf5dcb0540585086"
                 },
-                "m_SlotId": -2048319949
+                "m_SlotId": 0
             }
         },
         {
@@ -178,71 +178,74 @@
 
 {
     "m_SGVersion": 0,
-    "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
-    "m_ObjectId": "00338a1df08442e6a07249315baa9eaf",
-    "m_Id": 1,
-    "m_DisplayName": "Scale Factor",
-    "m_SlotType": 1,
-    "m_Hidden": false,
-    "m_ShaderOutputName": "_CanvasScaleFactor",
-    "m_StageCapability": 3,
-    "m_Value": 1.0,
-    "m_DefaultValue": 1.0,
-    "m_Labels": []
-}
-
-{
-    "m_SGVersion": 0,
-    "m_Type": "UnityEditor.ShaderGraph.RectTransformSizeNode",
-    "m_ObjectId": "00ce001b67c14280a5eacede43fa420f",
+    "m_Type": "UnityEditor.ShaderGraph.SubGraphNode",
+    "m_ObjectId": "02a65b14e5c049d994bebab041ae8d45",
     "m_Group": {
         "m_Id": ""
     },
-    "m_Name": "RectTransform Size",
+    "m_Name": "Rect Transform Size",
     "m_DrawState": {
         "m_Expanded": true,
         "m_Position": {
             "serializedVersion": "2",
-            "x": -735.0154418945313,
-            "y": 511.015380859375,
-            "width": 0.0,
-            "height": 0.0
+            "x": -750.0,
+            "y": 478.0,
+            "width": 165.0,
+            "height": 228.0
         }
     },
     "m_Slots": [
         {
-            "m_Id": "d485661be0b247abb8edb40848b1486e"
+            "m_Id": "3d97ceb7b7984e9988bb51269fc2738a"
+        },
+        {
+            "m_Id": "46acbd554e6642f0a9526cef83dc2c94"
+        },
+        {
+            "m_Id": "8ab35ea10eb44b0eafff3af7984c29cb"
+        },
+        {
+            "m_Id": "ef3476cd4e2b4a05be284d27709988b0"
         },
         {
-            "m_Id": "00338a1df08442e6a07249315baa9eaf"
+            "m_Id": "7d7cf87305614648918cf6d9bf4eaa18"
         },
         {
-            "m_Id": "e5346b3869a74ba29761ea796e5bc129"
+            "m_Id": "ff1394c31a8b47eb93e53a6c698993c7"
+        },
+        {
+            "m_Id": "8519cdb43aa64088837c11f0210a60f2"
         }
     ],
     "synonyms": [],
     "m_Precision": 0,
-    "m_PreviewExpanded": true,
+    "m_PreviewExpanded": false,
     "m_DismissedVersion": 0,
     "m_PreviewMode": 0,
     "m_CustomColors": {
         "m_SerializableColors": []
     },
-    "previewSize": {
-        "x": 100.0,
-        "y": 100.0
-    },
-    "previewScaleFactor": 1.0,
-    "previewPixelsPerUnit": 100.0
+    "m_SerializedSubGraph": "{\n    \"subGraph\": {\n        \"fileID\": -5475051401550479605,\n        \"guid\": \"aa041986c041b4dc1b5bf0b2cd2d86e8\",\n        \"type\": 3\n    }\n}",
+    "m_PropertyGuids": [
+        "975f2db3-e792-46e7-9bf8-3a4cbe4fb068",
+        "373c703c-395b-43d3-91ba-78b9497021e7",
+        "2747a643-8db3-4ffc-9923-55aa70fb2549",
+        "451bbdf7-6136-4a6e-a5c8-4918d2ea4b95"
+    ],
+    "m_PropertyIds": [
+        -181240572,
+        716604351,
+        -1949568231,
+        -2106065226
+    ],
+    "m_Dropdowns": [],
+    "m_DropdownSelectedEntries": []
 }
 
 {
     "m_SGVersion": 0,
-    "m_Type": "UnityEditor.Rendering.Canvas.ShaderGraph.CanvasData",
-    "m_ObjectId": "00e495abb45644b598a46883f87079e4",
-    "m_Version": 0,
-    "m_AlphaClip": false,
-    "m_DisableTint": false
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasSubTarget",
+    "m_ObjectId": "0724948387ed419a8be84dbf40ca769b"
 }
 
 {
@@ -287,11 +290,13 @@
     "m_DisplayName": "Tilt",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "_Tilt",
     "m_StageCapability": 2,
     "m_Value": -0.25,
-    "m_DefaultValue": 0.0,
-    "m_Labels": []
+    "m_DefaultValue": -0.25,
+    "m_Labels": [],
+    "m_LiteralMode": false
 }
 
 {
@@ -302,6 +307,7 @@
     "m_DisplayName": "Out",
     "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "Out",
     "m_StageCapability": 3,
     "m_Value": {
@@ -319,6 +325,64 @@
     "m_Labels": []
 }
 
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.SubGraphNode",
+    "m_ObjectId": "0d9c0820c1ea4a28ab44df9183ceeecc",
+    "m_Group": {
+        "m_Id": ""
+    },
+    "m_Name": "Slider Value",
+    "m_DrawState": {
+        "m_Expanded": true,
+        "m_Position": {
+            "serializedVersion": "2",
+            "x": -1037.0,
+            "y": 250.0,
+            "width": 256.0,
+            "height": 165.0
+        }
+    },
+    "m_Slots": [
+        {
+            "m_Id": "c641ad790aa249f48887f662f37a7e83"
+        },
+        {
+            "m_Id": "5cc627a8c973431db919820558fa6e51"
+        },
+        {
+            "m_Id": "856424f031254d23abc2d2e48b80af1a"
+        }
+    ],
+    "synonyms": [],
+    "m_Precision": 0,
+    "m_PreviewExpanded": false,
+    "m_DismissedVersion": 0,
+    "m_PreviewMode": 0,
+    "m_CustomColors": {
+        "m_SerializableColors": []
+    },
+    "m_SerializedSubGraph": "{\n    \"subGraph\": {\n        \"fileID\": -5475051401550479605,\n        \"guid\": \"b674f75227b22477ca93a09e82cd33d2\",\n        \"type\": 3\n    }\n}",
+    "m_PropertyGuids": [
+        "c874690c-9084-423f-9768-5c99a5d92488"
+    ],
+    "m_PropertyIds": [
+        -1691137862
+    ],
+    "m_Dropdowns": [
+        "_Preview_Direction"
+    ],
+    "m_DropdownSelectedEntries": [
+        "Left To Right"
+    ]
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasSubTarget",
+    "m_ObjectId": "10c3b5b995fd4d19825cb2a725ffb981"
+}
+
 {
     "m_SGVersion": 0,
     "m_Type": "UnityEditor.ShaderGraph.BlockNode",
@@ -361,11 +425,13 @@
     "m_DisplayName": "Alpha",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "Alpha",
     "m_StageCapability": 2,
     "m_Value": 1.0,
     "m_DefaultValue": 1.0,
-    "m_Labels": []
+    "m_Labels": [],
+    "m_LiteralMode": false
 }
 
 {
@@ -376,6 +442,7 @@
     "m_DisplayName": "Emission",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "Emission",
     "m_StageCapability": 2,
     "m_Value": {
@@ -398,6 +465,26 @@
     }
 }
 
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasData",
+    "m_ObjectId": "23e408b0f1454583bbd5158bd375dc27",
+    "supportsMotionVectors": false
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasSubTarget",
+    "m_ObjectId": "247cd01b97fd4baa87c323d78de99850"
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasData",
+    "m_ObjectId": "29880c8660cd4e2297ceaa8b9b783e4c",
+    "supportsMotionVectors": false
+}
+
 {
     "m_SGVersion": 0,
     "m_Type": "UnityEditor.Rendering.Canvas.ShaderGraph.CanvasData",
@@ -413,6 +500,12 @@
     "m_ObjectId": "32e5213c4b334bfeb1d7aea2f95436e2"
 }
 
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasSubTarget",
+    "m_ObjectId": "337a68a849fe49b283d7660f082f1726"
+}
+
 {
     "m_SGVersion": 1,
     "m_Type": "UnityEditor.Rendering.Universal.ShaderGraph.UniversalTarget",
@@ -444,6 +537,7 @@
     "m_CastShadows": true,
     "m_ReceiveShadows": true,
     "m_DisableTint": false,
+    "m_Sort3DAs2DCompatible": false,
     "m_AdditionalMotionVectorMode": 0,
     "m_AlembicMotionVectors": false,
     "m_SupportsLODCrossFade": false,
@@ -451,6 +545,53 @@
     "m_SupportVFX": false
 }
 
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasData",
+    "m_ObjectId": "3d7882455342469badf9b85649b4d809",
+    "supportsMotionVectors": false
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
+    "m_ObjectId": "3d97ceb7b7984e9988bb51269fc2738a",
+    "m_Id": -181240572,
+    "m_DisplayName": "PreviewWidth",
+    "m_SlotType": 0,
+    "m_Hidden": false,
+    "m_HideConnector": true,
+    "m_ShaderOutputName": "_PreviewWidth",
+    "m_StageCapability": 3,
+    "m_Value": 100.0,
+    "m_DefaultValue": 100.0,
+    "m_Labels": [],
+    "m_LiteralMode": false
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
+    "m_ObjectId": "46acbd554e6642f0a9526cef83dc2c94",
+    "m_Id": 716604351,
+    "m_DisplayName": "PreviewHeight",
+    "m_SlotType": 0,
+    "m_Hidden": false,
+    "m_HideConnector": true,
+    "m_ShaderOutputName": "_PreviewHeight",
+    "m_StageCapability": 3,
+    "m_Value": 100.0,
+    "m_DefaultValue": 100.0,
+    "m_Labels": [],
+    "m_LiteralMode": false
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasSubTarget",
+    "m_ObjectId": "48f4b1e87a3c4f6885826e7b4fac6a55"
+}
+
 {
     "m_SGVersion": 0,
     "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
@@ -459,11 +600,13 @@
     "m_DisplayName": "Segments",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "_Segments",
     "m_StageCapability": 2,
     "m_Value": 32.0,
-    "m_DefaultValue": 0.0,
-    "m_Labels": []
+    "m_DefaultValue": 16.0,
+    "m_Labels": [],
+    "m_LiteralMode": false
 }
 
 {
@@ -474,6 +617,7 @@
     "m_DisplayName": "Width Height",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "_Width_Height",
     "m_StageCapability": 2,
     "m_Value": {
@@ -489,23 +633,25 @@
 
 {
     "m_SGVersion": 0,
-    "m_Type": "UnityEditor.ShaderGraph.Vector2MaterialSlot",
-    "m_ObjectId": "658767c3d5f344ee9315a121d3163e36",
+    "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
+    "m_ObjectId": "5cc627a8c973431db919820558fa6e51",
     "m_Id": 1,
-    "m_DisplayName": "Direction",
+    "m_DisplayName": "Value",
     "m_SlotType": 1,
     "m_Hidden": false,
-    "m_ShaderOutputName": "_Direction",
+    "m_HideConnector": false,
+    "m_ShaderOutputName": "Value",
     "m_StageCapability": 3,
-    "m_Value": {
-        "x": 0.0,
-        "y": 0.0
-    },
-    "m_DefaultValue": {
-        "x": 0.0,
-        "y": 0.0
-    },
-    "m_Labels": []
+    "m_Value": 0.0,
+    "m_DefaultValue": 0.0,
+    "m_Labels": [],
+    "m_LiteralMode": false
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasSubTarget",
+    "m_ObjectId": "5fdad50a225b41158ea509de8ebd38c6"
 }
 
 {
@@ -542,6 +688,13 @@
     "m_SerializedDescriptor": "SurfaceDescription.BaseColor"
 }
 
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasData",
+    "m_ObjectId": "6a4f7fe7684a4000b7f710774cf6b0bd",
+    "supportsMotionVectors": false
+}
+
 {
     "m_SGVersion": 0,
     "m_Type": "UnityEditor.ShaderGraph.CategoryData",
@@ -561,7 +714,7 @@
     "m_Group": {
         "m_Id": ""
     },
-    "m_Name": "SciFi Meter",
+    "m_Name": "Sci Fi Meter",
     "m_DrawState": {
         "m_Expanded": true,
         "m_Position": {
@@ -589,10 +742,10 @@
             "m_Id": "0a802b9c099a434ebc5301295bc54635"
         },
         {
-            "m_Id": "a3cb7943f2f24b1da4d27a3a809e16f4"
+            "m_Id": "fc5387a5b66048468a8830292a4c7bd6"
         },
         {
-            "m_Id": "7f6a06b509cc4c20af4cbd402e78a09a"
+            "m_Id": "f16aaff3894c4f5da250ac9f06e6ccb8"
         },
         {
             "m_Id": "4d28dc8981c44811ab766bb78e419c79"
@@ -639,25 +792,35 @@
 
 {
     "m_SGVersion": 0,
-    "m_Type": "UnityEditor.ShaderGraph.Vector4MaterialSlot",
-    "m_ObjectId": "7f6a06b509cc4c20af4cbd402e78a09a",
-    "m_Id": 253027408,
-    "m_DisplayName": "Low Color",
-    "m_SlotType": 0,
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasData",
+    "m_ObjectId": "770b75583f6740d3bff3f12c44630008",
+    "supportsMotionVectors": false
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasSubTarget",
+    "m_ObjectId": "786640f9ee3344dbb15a7654dbef302f"
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.Vector2MaterialSlot",
+    "m_ObjectId": "7d7cf87305614648918cf6d9bf4eaa18",
+    "m_Id": 1,
+    "m_DisplayName": "Size",
+    "m_SlotType": 1,
     "m_Hidden": false,
-    "m_ShaderOutputName": "_Low_Color",
-    "m_StageCapability": 2,
+    "m_HideConnector": false,
+    "m_ShaderOutputName": "Size",
+    "m_StageCapability": 3,
     "m_Value": {
-        "x": 1.0,
-        "y": 0.0,
-        "z": 0.0,
-        "w": 0.0
+        "x": 0.0,
+        "y": 0.0
     },
     "m_DefaultValue": {
         "x": 0.0,
-        "y": 0.0,
-        "z": 0.0,
-        "w": 0.0
+        "y": 0.0
     },
     "m_Labels": []
 }
@@ -670,6 +833,7 @@
     "m_DisplayName": "LowColor",
     "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "Out",
     "m_StageCapability": 3,
     "m_Value": {
@@ -689,38 +853,58 @@
 
 {
     "m_SGVersion": 0,
-    "m_Type": "UnityEditor.ShaderGraph.SliderValueNode",
-    "m_ObjectId": "8a3d96abe4534f969827896ed19a2265",
-    "m_Group": {
-        "m_Id": ""
+    "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
+    "m_ObjectId": "8519cdb43aa64088837c11f0210a60f2",
+    "m_Id": 3,
+    "m_DisplayName": "Pixel_Per_Unit",
+    "m_SlotType": 1,
+    "m_Hidden": false,
+    "m_HideConnector": false,
+    "m_ShaderOutputName": "Pixel_Per_Unit",
+    "m_StageCapability": 3,
+    "m_Value": 0.0,
+    "m_DefaultValue": 0.0,
+    "m_Labels": [],
+    "m_LiteralMode": false
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.Vector2MaterialSlot",
+    "m_ObjectId": "856424f031254d23abc2d2e48b80af1a",
+    "m_Id": 2,
+    "m_DisplayName": "Direction",
+    "m_SlotType": 1,
+    "m_Hidden": false,
+    "m_HideConnector": false,
+    "m_ShaderOutputName": "Direction",
+    "m_StageCapability": 3,
+    "m_Value": {
+        "x": 0.0,
+        "y": 0.0
     },
-    "m_Name": "Slider Value",
-    "m_DrawState": {
-        "m_Expanded": true,
-        "m_Position": {
-            "serializedVersion": "2",
-            "x": -725.0,
-            "y": 222.0,
-            "width": 113.0,
-            "height": 125.0
-        }
+    "m_DefaultValue": {
+        "x": 0.0,
+        "y": 0.0
     },
-    "m_Slots": [
-        {
-            "m_Id": "c0e397d8f41d45929efdd5d3b2e9504d"
-        },
-        {
-            "m_Id": "658767c3d5f344ee9315a121d3163e36"
-        }
-    ],
-    "synonyms": [],
-    "m_Precision": 0,
-    "m_PreviewExpanded": true,
-    "m_DismissedVersion": 0,
-    "m_PreviewMode": 0,
-    "m_CustomColors": {
-        "m_SerializableColors": []
-    }
+    "m_Labels": []
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
+    "m_ObjectId": "8ab35ea10eb44b0eafff3af7984c29cb",
+    "m_Id": -1949568231,
+    "m_DisplayName": "PreviewScaleFactor",
+    "m_SlotType": 0,
+    "m_Hidden": false,
+    "m_HideConnector": true,
+    "m_ShaderOutputName": "_PreviewScaleFactor",
+    "m_StageCapability": 3,
+    "m_Value": 1.0,
+    "m_DefaultValue": 1.0,
+    "m_Labels": [],
+    "m_LiteralMode": false
 }
 
 {
@@ -731,11 +915,13 @@
     "m_DisplayName": "Alpha",
     "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "Alpha",
     "m_StageCapability": 2,
     "m_Value": 0.0,
     "m_DefaultValue": 0.0,
-    "m_Labels": []
+    "m_Labels": [],
+    "m_LiteralMode": false
 }
 
 {
@@ -794,6 +980,12 @@
     }
 }
 
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasSubTarget",
+    "m_ObjectId": "93d4f58b92b34b30a417d57972928aa3"
+}
+
 {
     "m_SGVersion": 0,
     "m_Type": "UnityEditor.ShaderGraph.Vector2MaterialSlot",
@@ -802,6 +994,7 @@
     "m_DisplayName": "UV",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "_UV",
     "m_StageCapability": 2,
     "m_Value": {
@@ -823,6 +1016,7 @@
     "m_DisplayName": "Color",
     "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "Color",
     "m_StageCapability": 2,
     "m_Value": {
@@ -846,36 +1040,20 @@
     "m_DisplayName": "Health",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "_Health",
     "m_StageCapability": 2,
     "m_Value": 0.5,
-    "m_DefaultValue": 0.0,
-    "m_Labels": []
+    "m_DefaultValue": 0.5,
+    "m_Labels": [],
+    "m_LiteralMode": false
 }
 
 {
     "m_SGVersion": 0,
-    "m_Type": "UnityEditor.ShaderGraph.Vector4MaterialSlot",
-    "m_ObjectId": "a3cb7943f2f24b1da4d27a3a809e16f4",
-    "m_Id": -918491945,
-    "m_DisplayName": "Normal Color",
-    "m_SlotType": 0,
-    "m_Hidden": false,
-    "m_ShaderOutputName": "_Normal_Color",
-    "m_StageCapability": 2,
-    "m_Value": {
-        "x": 0.0,
-        "y": 0.250980406999588,
-        "z": 1.0,
-        "w": 0.0
-    },
-    "m_DefaultValue": {
-        "x": 0.0,
-        "y": 0.0,
-        "z": 0.0,
-        "w": 0.0
-    },
-    "m_Labels": []
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasData",
+    "m_ObjectId": "9faba2e0409944e4974405ecba3e0d98",
+    "supportsMotionVectors": false
 }
 
 {
@@ -885,6 +1063,9 @@
     "m_Guid": {
         "m_GuidSerialized": "dab423b7-9afd-45d7-932e-cd92329586d3"
     },
+    "promotedFromAssetID": "",
+    "promotedFromCategoryName": "",
+    "promotedOrdering": -1,
     "m_Name": "LowColor",
     "m_DefaultRefNameVersion": 1,
     "m_RefNameGeneratedByDisplayName": "LowColor",
@@ -897,7 +1078,10 @@
     "m_Precision": 0,
     "overrideHLSLDeclaration": false,
     "hlslDeclarationOverride": 0,
+    "hideConnector": false,
     "m_Hidden": false,
+    "m_PerRendererData": false,
+    "m_customAttributes": [],
     "m_Value": {
         "r": 1.0,
         "g": 0.0,
@@ -908,6 +1092,18 @@
     "m_ColorMode": 0
 }
 
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasSubTarget",
+    "m_ObjectId": "a73a4874f79b46329c1e3f2bad509a45"
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasSubTarget",
+    "m_ObjectId": "ad0511b594294cf9ba9546e82b5dbf19"
+}
+
 {
     "m_SGVersion": 0,
     "m_Type": "UnityEditor.ShaderGraph.ColorRGBMaterialSlot",
@@ -916,6 +1112,7 @@
     "m_DisplayName": "Base Color",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "BaseColor",
     "m_StageCapability": 2,
     "m_Value": {
@@ -940,45 +1137,52 @@
 
 {
     "m_SGVersion": 0,
-    "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
-    "m_ObjectId": "c0e397d8f41d45929efdd5d3b2e9504d",
-    "m_Id": 0,
-    "m_DisplayName": "Value",
-    "m_SlotType": 1,
-    "m_Hidden": false,
-    "m_ShaderOutputName": "_Value",
-    "m_StageCapability": 3,
-    "m_Value": 0.0,
-    "m_DefaultValue": 0.0,
-    "m_Labels": []
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasData",
+    "m_ObjectId": "c1e7ee39856a45b3ab5d7e007395d447",
+    "supportsMotionVectors": false
 }
 
 {
     "m_SGVersion": 0,
     "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasData",
-    "m_ObjectId": "cafe4dfb66fa41449a2bbf6804a520f5",
+    "m_ObjectId": "c373f1894323494b8c901d0dde2cbffd",
     "supportsMotionVectors": false
 }
 
 {
     "m_SGVersion": 0,
-    "m_Type": "UnityEditor.ShaderGraph.Vector2MaterialSlot",
-    "m_ObjectId": "d485661be0b247abb8edb40848b1486e",
-    "m_Id": 0,
-    "m_DisplayName": "Size",
-    "m_SlotType": 1,
+    "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialRangeSlot",
+    "m_ObjectId": "c641ad790aa249f48887f662f37a7e83",
+    "m_Id": -1691137862,
+    "m_DisplayName": "Preview Value",
+    "m_SlotType": 0,
     "m_Hidden": false,
-    "m_ShaderOutputName": "_RectTransformSize",
+    "m_HideConnector": true,
+    "m_ShaderOutputName": "_Preview_Value",
     "m_StageCapability": 3,
-    "m_Value": {
-        "x": 1.0,
+    "m_Value": 0.5,
+    "m_DefaultValue": 0.5,
+    "m_Labels": [],
+    "m_LiteralMode": false,
+    "m_sliderRange": {
+        "x": 0.0,
         "y": 1.0
     },
-    "m_DefaultValue": {
-        "x": 100.0,
-        "y": 100.0
-    },
-    "m_Labels": []
+    "m_SliderType": 0,
+    "m_SliderPower": 3.0
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasData",
+    "m_ObjectId": "cafe4dfb66fa41449a2bbf6804a520f5",
+    "supportsMotionVectors": false
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasSubTarget",
+    "m_ObjectId": "d0a4787e344f48f5a85fe74bb0000b0c"
 }
 
 {
@@ -995,6 +1199,7 @@
     "m_DisplayName": "Size",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "_Size",
     "m_StageCapability": 2,
     "m_Value": {
@@ -1008,19 +1213,42 @@
     "m_Labels": []
 }
 
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasData",
+    "m_ObjectId": "dd2d0b7f72cd40b5b04a235ffee51a1b",
+    "supportsMotionVectors": false
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasData",
+    "m_ObjectId": "ec0773b35401476ea81c2e6afc45d427",
+    "supportsMotionVectors": false
+}
+
 {
     "m_SGVersion": 0,
     "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
-    "m_ObjectId": "e5346b3869a74ba29761ea796e5bc129",
-    "m_Id": 2,
-    "m_DisplayName": "Pixel Per Unit",
-    "m_SlotType": 1,
+    "m_ObjectId": "ef3476cd4e2b4a05be284d27709988b0",
+    "m_Id": -2106065226,
+    "m_DisplayName": "PreviewPPU",
+    "m_SlotType": 0,
     "m_Hidden": false,
-    "m_ShaderOutputName": "_CanvasPixelPerUnit",
+    "m_HideConnector": true,
+    "m_ShaderOutputName": "_PreviewPPU",
     "m_StageCapability": 3,
     "m_Value": 100.0,
     "m_DefaultValue": 100.0,
-    "m_Labels": []
+    "m_Labels": [],
+    "m_LiteralMode": false
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasData",
+    "m_ObjectId": "ef3ad75715cb4c11b9e3357285c4829f",
+    "supportsMotionVectors": false
 }
 
 {
@@ -1035,10 +1263,10 @@
         "m_Expanded": true,
         "m_Position": {
             "serializedVersion": "2",
-            "x": -938.0,
-            "y": 324.0,
-            "width": 121.0,
-            "height": 95.0
+            "x": -750.0,
+            "y": 321.0000305175781,
+            "width": 122.0,
+            "height": 104.0
         }
     },
     "m_Slots": [
@@ -1061,3 +1289,85 @@
     "m_DropdownSelectedEntries": []
 }
 
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.ColorRGBAMaterialSlot",
+    "m_ObjectId": "f16aaff3894c4f5da250ac9f06e6ccb8",
+    "m_Id": 253027408,
+    "m_DisplayName": "Low Color",
+    "m_SlotType": 0,
+    "m_Hidden": false,
+    "m_HideConnector": false,
+    "m_ShaderOutputName": "_Low_Color",
+    "m_StageCapability": 2,
+    "m_Value": {
+        "x": 1.0,
+        "y": 0.0,
+        "z": 0.0,
+        "w": 0.0
+    },
+    "m_DefaultValue": {
+        "x": 1.0,
+        "y": 0.0,
+        "z": 0.0,
+        "w": 0.0
+    },
+    "m_Labels": []
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasData",
+    "m_ObjectId": "f795741071454171a540b0e05ba89099",
+    "supportsMotionVectors": false
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasSubTarget",
+    "m_ObjectId": "f84934c605d0438b9d9b65af0e04993e"
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.ColorRGBAMaterialSlot",
+    "m_ObjectId": "fc5387a5b66048468a8830292a4c7bd6",
+    "m_Id": -918491945,
+    "m_DisplayName": "Normal Color",
+    "m_SlotType": 0,
+    "m_Hidden": false,
+    "m_HideConnector": false,
+    "m_ShaderOutputName": "_Normal_Color",
+    "m_StageCapability": 2,
+    "m_Value": {
+        "x": 0.0,
+        "y": 0.250980406999588,
+        "z": 1.0,
+        "w": 0.0
+    },
+    "m_DefaultValue": {
+        "x": 0.0,
+        "y": 0.250980406999588,
+        "z": 1.0,
+        "w": 0.0
+    },
+    "m_Labels": []
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
+    "m_ObjectId": "ff1394c31a8b47eb93e53a6c698993c7",
+    "m_Id": 2,
+    "m_DisplayName": "Scale_Factor",
+    "m_SlotType": 1,
+    "m_Hidden": false,
+    "m_HideConnector": false,
+    "m_ShaderOutputName": "Scale_Factor",
+    "m_StageCapability": 3,
+    "m_Value": 0.0,
+    "m_DefaultValue": 0.0,
+    "m_Labels": [],
+    "m_LiteralMode": false
+}
+
diff --git a/Packages/com.unity.shadergraph/Samples~/UGUIShaders/Examples/ProgressBars/Fancy Loading.shadersubgraph b/Packages/com.unity.shadergraph/Samples~/UGUIShaders/Examples/ProgressBars/Fancy Loading.shadersubgraph
index a3fabf6d459..3b5473e0b84 100644
--- a/Packages/com.unity.shadergraph/Samples~/UGUIShaders/Examples/ProgressBars/Fancy Loading.shadersubgraph	
+++ b/Packages/com.unity.shadergraph/Samples~/UGUIShaders/Examples/ProgressBars/Fancy Loading.shadersubgraph	
@@ -51,9 +51,6 @@
         {
             "m_Id": "af598f69845d4322a3fa6f65e57b5d22"
         },
-        {
-            "m_Id": "16f8535027f847949355b78ab41f2dac"
-        },
         {
             "m_Id": "0da18572f8504cfd84b5f52ff40a5928"
         },
@@ -113,6 +110,9 @@
         },
         {
             "m_Id": "afcc5a38abcc456e98bcc58aa7406f79"
+        },
+        {
+            "m_Id": "b9ab5b6eaab84b1b862f4d7475d9f64e"
         }
     ],
     "m_GroupDatas": [
@@ -136,20 +136,6 @@
                 "m_SlotId": 0
             }
         },
-        {
-            "m_OutputSlot": {
-                "m_Node": {
-                    "m_Id": "16f8535027f847949355b78ab41f2dac"
-                },
-                "m_SlotId": 3
-            },
-            "m_InputSlot": {
-                "m_Node": {
-                    "m_Id": "c8bf5d9b74724d6bb41e87a6cbc4f87f"
-                },
-                "m_SlotId": 395448508
-            }
-        },
         {
             "m_OutputSlot": {
                 "m_Node": {
@@ -383,9 +369,9 @@
             },
             "m_InputSlot": {
                 "m_Node": {
-                    "m_Id": "16f8535027f847949355b78ab41f2dac"
+                    "m_Id": "6f377d1621c04ce29156fd4589667310"
                 },
-                "m_SlotId": 2
+                "m_SlotId": 1
             }
         },
         {
@@ -397,9 +383,9 @@
             },
             "m_InputSlot": {
                 "m_Node": {
-                    "m_Id": "6f377d1621c04ce29156fd4589667310"
+                    "m_Id": "b9ab5b6eaab84b1b862f4d7475d9f64e"
                 },
-                "m_SlotId": 1
+                "m_SlotId": 2
             }
         },
         {
@@ -486,6 +472,20 @@
                 "m_SlotId": 1
             }
         },
+        {
+            "m_OutputSlot": {
+                "m_Node": {
+                    "m_Id": "b9ab5b6eaab84b1b862f4d7475d9f64e"
+                },
+                "m_SlotId": 3
+            },
+            "m_InputSlot": {
+                "m_Node": {
+                    "m_Id": "c8bf5d9b74724d6bb41e87a6cbc4f87f"
+                },
+                "m_SlotId": -505402754
+            }
+        },
         {
             "m_OutputSlot": {
                 "m_Node": {
@@ -666,11 +666,13 @@
     "m_DisplayName": "SDFStroke",
     "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "SDFStroke",
     "m_StageCapability": 3,
     "m_Value": 0.0,
     "m_DefaultValue": 0.0,
-    "m_Labels": []
+    "m_Labels": [],
+    "m_LiteralMode": false
 }
 
 {
@@ -681,6 +683,7 @@
     "m_DisplayName": "UV",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "UV",
     "m_StageCapability": 3,
     "m_Value": {
@@ -703,6 +706,7 @@
     "m_DisplayName": "Color",
     "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "Out",
     "m_StageCapability": 3,
     "m_Value": {
@@ -728,6 +732,7 @@
     "m_DisplayName": "Width Height",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "_Width_Height",
     "m_StageCapability": 3,
     "m_Value": {
@@ -749,6 +754,7 @@
     "m_DisplayName": "In",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "In",
     "m_StageCapability": 3,
     "m_Value": {
@@ -762,7 +768,8 @@
         "y": 0.0,
         "z": 0.0,
         "w": 0.0
-    }
+    },
+    "m_LiteralMode": false
 }
 
 {
@@ -773,11 +780,39 @@
     "m_DisplayName": "Warp Direction",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "_Warp_Direction",
     "m_StageCapability": 3,
     "m_Value": 0.0,
     "m_DefaultValue": 0.0,
-    "m_Labels": []
+    "m_Labels": [],
+    "m_LiteralMode": false
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot",
+    "m_ObjectId": "0aa550961ff5431d9a93be2281cbe094",
+    "m_Id": 0,
+    "m_DisplayName": "A",
+    "m_SlotType": 0,
+    "m_Hidden": false,
+    "m_HideConnector": false,
+    "m_ShaderOutputName": "A",
+    "m_StageCapability": 3,
+    "m_Value": {
+        "x": -0.20000000298023225,
+        "y": 0.0,
+        "z": 0.0,
+        "w": 0.0
+    },
+    "m_DefaultValue": {
+        "x": 0.0,
+        "y": 0.0,
+        "z": 0.0,
+        "w": 0.0
+    },
+    "m_LiteralMode": false
 }
 
 {
@@ -788,11 +823,13 @@
     "m_DisplayName": "Loop",
     "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "Loop",
     "m_StageCapability": 3,
     "m_Value": 0.0,
     "m_DefaultValue": 0.0,
-    "m_Labels": []
+    "m_Labels": [],
+    "m_LiteralMode": false
 }
 
 {
@@ -841,6 +878,7 @@
     "m_DisplayName": "B",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "B",
     "m_StageCapability": 3,
     "m_Value": {
@@ -854,7 +892,8 @@
         "y": 0.0,
         "z": 0.0,
         "w": 0.0
-    }
+    },
+    "m_LiteralMode": false
 }
 
 {
@@ -865,6 +904,7 @@
     "m_DisplayName": "In",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "In",
     "m_StageCapability": 3,
     "m_Value": {
@@ -878,7 +918,8 @@
         "y": 0.0,
         "z": 0.0,
         "w": 0.0
-    }
+    },
+    "m_LiteralMode": false
 }
 
 {
@@ -889,6 +930,7 @@
     "m_DisplayName": "Out",
     "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "Out",
     "m_StageCapability": 3,
     "m_Value": {
@@ -929,52 +971,6 @@
     }
 }
 
-{
-    "m_SGVersion": 0,
-    "m_Type": "UnityEditor.ShaderGraph.LerpNode",
-    "m_ObjectId": "16f8535027f847949355b78ab41f2dac",
-    "m_Group": {
-        "m_Id": ""
-    },
-    "m_Name": "Lerp",
-    "m_DrawState": {
-        "m_Expanded": false,
-        "m_Position": {
-            "serializedVersion": "2",
-            "x": -758.0000610351563,
-            "y": 262.0000305175781,
-            "width": 125.50006103515625,
-            "height": 94.0
-        }
-    },
-    "m_Slots": [
-        {
-            "m_Id": "3dcd160c15ee4688aacb164c381c8f11"
-        },
-        {
-            "m_Id": "c2cecac8e43c419f839bddf1ed5a4621"
-        },
-        {
-            "m_Id": "1fa890e753ae4712a4c9ebb2560b070f"
-        },
-        {
-            "m_Id": "9e8abc5f77574269983ef6ef21a25a4c"
-        }
-    ],
-    "synonyms": [
-        "mix",
-        "blend",
-        "linear interpolate"
-    ],
-    "m_Precision": 0,
-    "m_PreviewExpanded": false,
-    "m_DismissedVersion": 0,
-    "m_PreviewMode": 0,
-    "m_CustomColors": {
-        "m_SerializableColors": []
-    }
-}
-
 {
     "m_SGVersion": 0,
     "m_Type": "UnityEditor.ShaderGraph.Vector2MaterialSlot",
@@ -983,6 +979,7 @@
     "m_DisplayName": "Move",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "_Move",
     "m_StageCapability": 3,
     "m_Value": {
@@ -1004,6 +1001,7 @@
     "m_DisplayName": "A",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "A",
     "m_StageCapability": 3,
     "m_Value": {
@@ -1017,7 +1015,8 @@
         "y": 0.0,
         "z": 0.0,
         "w": 0.0
-    }
+    },
+    "m_LiteralMode": false
 }
 
 {
@@ -1028,11 +1027,13 @@
     "m_DisplayName": "Segments",
     "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "Out",
     "m_StageCapability": 3,
     "m_Value": 0.0,
     "m_DefaultValue": 0.0,
-    "m_Labels": []
+    "m_Labels": [],
+    "m_LiteralMode": false
 }
 
 {
@@ -1043,6 +1044,7 @@
     "m_DisplayName": "Pivot Point",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "_Pivot_Point",
     "m_StageCapability": 3,
     "m_Value": {
@@ -1064,11 +1066,13 @@
     "m_DisplayName": "Cutoff",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "_Cutoff",
     "m_StageCapability": 2,
     "m_Value": 0.5,
-    "m_DefaultValue": 0.0,
-    "m_Labels": []
+    "m_DefaultValue": 0.5,
+    "m_Labels": [],
+    "m_LiteralMode": false
 }
 
 {
@@ -1079,11 +1083,13 @@
     "m_DisplayName": "Stroke",
     "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "Stroke",
     "m_StageCapability": 3,
     "m_Value": 0.0,
     "m_DefaultValue": 0.0,
-    "m_Labels": []
+    "m_Labels": [],
+    "m_LiteralMode": false
 }
 
 {
@@ -1094,6 +1100,7 @@
     "m_DisplayName": "PatternUV",
     "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "PatternUV",
     "m_StageCapability": 3,
     "m_Value": {
@@ -1107,30 +1114,6 @@
     "m_Labels": []
 }
 
-{
-    "m_SGVersion": 0,
-    "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot",
-    "m_ObjectId": "1fa890e753ae4712a4c9ebb2560b070f",
-    "m_Id": 2,
-    "m_DisplayName": "T",
-    "m_SlotType": 0,
-    "m_Hidden": false,
-    "m_ShaderOutputName": "T",
-    "m_StageCapability": 3,
-    "m_Value": {
-        "x": 0.0,
-        "y": 0.0,
-        "z": 0.0,
-        "w": 0.0
-    },
-    "m_DefaultValue": {
-        "x": 0.0,
-        "y": 0.0,
-        "z": 0.0,
-        "w": 0.0
-    }
-}
-
 {
     "m_SGVersion": 0,
     "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot",
@@ -1139,6 +1122,7 @@
     "m_DisplayName": "B",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "B",
     "m_StageCapability": 3,
     "m_Value": {
@@ -1152,7 +1136,8 @@
         "y": 0.0,
         "z": 0.0,
         "w": 0.0
-    }
+    },
+    "m_LiteralMode": false
 }
 
 {
@@ -1163,11 +1148,13 @@
     "m_DisplayName": "Length Scale",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "LengthScale",
     "m_StageCapability": 3,
     "m_Value": 1.0,
     "m_DefaultValue": 1.0,
-    "m_Labels": []
+    "m_Labels": [],
+    "m_LiteralMode": false
 }
 
 {
@@ -1178,6 +1165,7 @@
     "m_DisplayName": "T",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "T",
     "m_StageCapability": 3,
     "m_Value": {
@@ -1191,7 +1179,8 @@
         "y": 0.0,
         "z": 0.0,
         "w": 0.0
-    }
+    },
+    "m_LiteralMode": false
 }
 
 {
@@ -1202,11 +1191,13 @@
     "m_DisplayName": "A",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "A",
     "m_StageCapability": 3,
     "m_Value": 0.0,
     "m_DefaultValue": 0.0,
-    "m_Labels": []
+    "m_Labels": [],
+    "m_LiteralMode": false
 }
 
 {
@@ -1263,11 +1254,13 @@
     "m_DisplayName": "Radial Scale",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "RadialScale",
     "m_StageCapability": 3,
     "m_Value": 0.6499999761581421,
     "m_DefaultValue": 1.0,
-    "m_Labels": []
+    "m_Labels": [],
+    "m_LiteralMode": false
 }
 
 {
@@ -1278,6 +1271,7 @@
     "m_DisplayName": "UV",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "_UV",
     "m_StageCapability": 3,
     "m_Value": {
@@ -1299,6 +1293,7 @@
     "m_DisplayName": "In",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "In",
     "m_StageCapability": 3,
     "m_Value": {
@@ -1312,7 +1307,8 @@
         "y": 0.0,
         "z": 0.0,
         "w": 0.0
-    }
+    },
+    "m_LiteralMode": false
 }
 
 {
@@ -1323,6 +1319,7 @@
     "m_DisplayName": "UV",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "_UV",
     "m_StageCapability": 3,
     "m_Value": {
@@ -1344,6 +1341,7 @@
     "m_DisplayName": "UVraw",
     "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "UVraw",
     "m_StageCapability": 3,
     "m_Value": {
@@ -1365,11 +1363,13 @@
     "m_DisplayName": "X",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "X",
     "m_StageCapability": 3,
     "m_Value": 0.11999999731779099,
     "m_DefaultValue": 0.0,
-    "m_Labels": []
+    "m_Labels": [],
+    "m_LiteralMode": false
 }
 
 {
@@ -1380,11 +1380,13 @@
     "m_DisplayName": "Gradient",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "_Gradient",
     "m_StageCapability": 2,
     "m_Value": 0.0,
     "m_DefaultValue": 0.0,
-    "m_Labels": []
+    "m_Labels": [],
+    "m_LiteralMode": false
 }
 
 {
@@ -1395,11 +1397,13 @@
     "m_DisplayName": "B",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "B",
     "m_StageCapability": 3,
     "m_Value": 0.0,
     "m_DefaultValue": 0.0,
-    "m_Labels": []
+    "m_Labels": [],
+    "m_LiteralMode": false
 }
 
 {
@@ -1410,11 +1414,13 @@
     "m_DisplayName": "Switch",
     "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "Switch",
     "m_StageCapability": 3,
     "m_Value": 0.0,
     "m_DefaultValue": 0.0,
-    "m_Labels": []
+    "m_Labels": [],
+    "m_LiteralMode": false
 }
 
 {
@@ -1425,6 +1431,7 @@
     "m_DisplayName": "RGBA",
     "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "RGBA",
     "m_StageCapability": 3,
     "m_Value": {
@@ -1450,11 +1457,13 @@
     "m_DisplayName": "A",
     "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "A",
     "m_StageCapability": 3,
     "m_Value": 0.0,
     "m_DefaultValue": 0.0,
-    "m_Labels": []
+    "m_Labels": [],
+    "m_LiteralMode": false
 }
 
 {
@@ -1465,6 +1474,7 @@
     "m_DisplayName": "T",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "T",
     "m_StageCapability": 3,
     "m_Value": {
@@ -1478,7 +1488,8 @@
         "y": 0.0,
         "z": 0.0,
         "w": 0.0
-    }
+    },
+    "m_LiteralMode": false
 }
 
 {
@@ -1489,6 +1500,7 @@
     "m_DisplayName": "Out",
     "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "Out",
     "m_StageCapability": 3,
     "m_Value": {
@@ -1529,30 +1541,6 @@
     }
 }
 
-{
-    "m_SGVersion": 0,
-    "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot",
-    "m_ObjectId": "3dcd160c15ee4688aacb164c381c8f11",
-    "m_Id": 0,
-    "m_DisplayName": "A",
-    "m_SlotType": 0,
-    "m_Hidden": false,
-    "m_ShaderOutputName": "A",
-    "m_StageCapability": 3,
-    "m_Value": {
-        "x": -0.5,
-        "y": 0.0,
-        "z": 0.0,
-        "w": 0.0
-    },
-    "m_DefaultValue": {
-        "x": 0.0,
-        "y": 0.0,
-        "z": 0.0,
-        "w": 0.0
-    }
-}
-
 {
     "m_SGVersion": 0,
     "m_Type": "UnityEditor.ShaderGraph.Vector2MaterialSlot",
@@ -1561,6 +1549,7 @@
     "m_DisplayName": "Out",
     "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "Out",
     "m_StageCapability": 3,
     "m_Value": {
@@ -1582,6 +1571,7 @@
     "m_DisplayName": "A",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "A",
     "m_StageCapability": 3,
     "m_Value": {
@@ -1628,8 +1618,8 @@
     "m_ObjectId": "4193bac99fe14dd6ac143ae0e13dc3cb",
     "m_Title": "Fake 3D Parallax Movement",
     "m_Position": {
-        "x": -3135.000244140625,
-        "y": 84.49995422363281
+        "x": -3134.999755859375,
+        "y": 83.99998474121094
     }
 }
 
@@ -1723,11 +1713,13 @@
     "m_DisplayName": "B",
     "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "B",
     "m_StageCapability": 3,
     "m_Value": 0.0,
     "m_DefaultValue": 0.0,
-    "m_Labels": []
+    "m_Labels": [],
+    "m_LiteralMode": false
 }
 
 {
@@ -1738,11 +1730,13 @@
     "m_DisplayName": "R",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "R",
     "m_StageCapability": 3,
     "m_Value": 0.0,
     "m_DefaultValue": 0.0,
-    "m_Labels": []
+    "m_Labels": [],
+    "m_LiteralMode": false
 }
 
 {
@@ -1753,6 +1747,7 @@
     "m_DisplayName": "A",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "A",
     "m_StageCapability": 3,
     "m_Value": {
@@ -1766,7 +1761,8 @@
         "y": 0.0,
         "z": 0.0,
         "w": 0.0
-    }
+    },
+    "m_LiteralMode": false
 }
 
 {
@@ -1777,11 +1773,13 @@
     "m_DisplayName": "Out",
     "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "Out",
     "m_StageCapability": 2,
     "m_Value": 0.0,
     "m_DefaultValue": 0.0,
-    "m_Labels": []
+    "m_Labels": [],
+    "m_LiteralMode": false
 }
 
 {
@@ -1791,6 +1789,9 @@
     "m_Guid": {
         "m_GuidSerialized": "971fbf50-1045-4944-816a-52e39cf83695"
     },
+    "promotedFromAssetID": "",
+    "promotedFromCategoryName": "",
+    "promotedOrdering": -1,
     "m_Name": "Speed",
     "m_DefaultRefNameVersion": 1,
     "m_RefNameGeneratedByDisplayName": "Speed",
@@ -1803,13 +1804,27 @@
     "m_Precision": 0,
     "overrideHLSLDeclaration": false,
     "hlslDeclarationOverride": 0,
+    "hideConnector": false,
     "m_Hidden": false,
+    "m_PerRendererData": false,
+    "m_customAttributes": [],
     "m_Value": 0.30000001192092898,
     "m_FloatType": 0,
+    "m_LiteralFloatMode": false,
     "m_RangeValues": {
         "x": 0.0,
         "y": 1.0
-    }
+    },
+    "m_SliderType": 0,
+    "m_SliderPower": 3.0,
+    "m_EnumType": 0,
+    "m_CSharpEnumString": "",
+    "m_EnumNames": [
+        "Default"
+    ],
+    "m_EnumValues": [
+        0
+    ]
 }
 
 {
@@ -1820,6 +1835,7 @@
     "m_DisplayName": "Scale",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "_Scale",
     "m_StageCapability": 3,
     "m_Value": {
@@ -1880,6 +1896,7 @@
     "m_DisplayName": "In",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "In",
     "m_StageCapability": 3,
     "m_Value": {
@@ -1893,7 +1910,8 @@
         "y": 0.0,
         "z": 0.0,
         "w": 0.0
-    }
+    },
+    "m_LiteralMode": false
 }
 
 {
@@ -1904,26 +1922,13 @@
     "m_DisplayName": "In",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "_In",
     "m_StageCapability": 3,
     "m_Value": 0.0,
     "m_DefaultValue": 0.0,
-    "m_Labels": []
-}
-
-{
-    "m_SGVersion": 0,
-    "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
-    "m_ObjectId": "5ef9e0e8700940b288c7f65af21e3154",
-    "m_Id": 1024715749,
-    "m_DisplayName": "Edge Max",
-    "m_SlotType": 0,
-    "m_Hidden": false,
-    "m_ShaderOutputName": "_Edge_Max",
-    "m_StageCapability": 3,
-    "m_Value": 0.6000000238418579,
-    "m_DefaultValue": 0.0,
-    "m_Labels": []
+    "m_Labels": [],
+    "m_LiteralMode": false
 }
 
 {
@@ -1933,7 +1938,7 @@
     "m_Group": {
         "m_Id": ""
     },
-    "m_Name": "Scale",
+    "m_Name": "UV Scale",
     "m_DrawState": {
         "m_Expanded": false,
         "m_Position": {
@@ -1989,6 +1994,7 @@
     "m_DisplayName": "Center",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "Center",
     "m_StageCapability": 3,
     "m_Value": {
@@ -2056,6 +2062,7 @@
     "m_DisplayName": "B",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "B",
     "m_StageCapability": 3,
     "m_Value": {
@@ -2069,7 +2076,8 @@
         "y": 0.0,
         "z": 0.0,
         "w": 0.0
-    }
+    },
+    "m_LiteralMode": false
 }
 
 {
@@ -2080,11 +2088,13 @@
     "m_DisplayName": "Mirror",
     "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "Mirror",
     "m_StageCapability": 3,
     "m_Value": 0.0,
     "m_DefaultValue": 0.0,
-    "m_Labels": []
+    "m_Labels": [],
+    "m_LiteralMode": false
 }
 
 {
@@ -2095,11 +2105,13 @@
     "m_DisplayName": "Speed",
     "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "Out",
     "m_StageCapability": 3,
     "m_Value": 0.0,
     "m_DefaultValue": 0.0,
-    "m_Labels": []
+    "m_Labels": [],
+    "m_LiteralMode": false
 }
 
 {
@@ -2110,6 +2122,7 @@
     "m_DisplayName": "UV",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "_UV",
     "m_StageCapability": 3,
     "m_Value": {
@@ -2149,6 +2162,7 @@
     "m_DisplayName": "In",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "In",
     "m_StageCapability": 3,
     "m_Value": {
@@ -2162,7 +2176,8 @@
         "y": 0.0,
         "z": 0.0,
         "w": 0.0
-    }
+    },
+    "m_LiteralMode": false
 }
 
 {
@@ -2284,11 +2299,13 @@
     "m_DisplayName": "Tile V",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "_Tile_V",
     "m_StageCapability": 3,
     "m_Value": 12.0,
-    "m_DefaultValue": 0.0,
-    "m_Labels": []
+    "m_DefaultValue": 2.0,
+    "m_Labels": [],
+    "m_LiteralMode": false
 }
 
 {
@@ -2299,11 +2316,13 @@
     "m_DisplayName": "Speed",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "_Speed",
     "m_StageCapability": 3,
     "m_Value": -0.30000001192092898,
-    "m_DefaultValue": 0.0,
-    "m_Labels": []
+    "m_DefaultValue": 0.30000001192092898,
+    "m_Labels": [],
+    "m_LiteralMode": false
 }
 
 {
@@ -2314,6 +2333,7 @@
     "m_DisplayName": "A",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "A",
     "m_StageCapability": 3,
     "m_Value": {
@@ -2327,7 +2347,8 @@
         "y": 0.0,
         "z": 0.0,
         "w": 0.0
-    }
+    },
+    "m_LiteralMode": false
 }
 
 {
@@ -2338,11 +2359,13 @@
     "m_DisplayName": "SDF",
     "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "SDF",
     "m_StageCapability": 3,
     "m_Value": 0.0,
     "m_DefaultValue": 0.0,
-    "m_Labels": []
+    "m_Labels": [],
+    "m_LiteralMode": false
 }
 
 {
@@ -2398,6 +2421,7 @@
     "m_DisplayName": "Scale",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "_Scale",
     "m_StageCapability": 3,
     "m_Value": {
@@ -2462,6 +2486,7 @@
     "m_DisplayName": "Out",
     "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "Out",
     "m_StageCapability": 3,
     "m_Value": {
@@ -2483,11 +2508,13 @@
     "m_DisplayName": "G",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "G",
     "m_StageCapability": 3,
     "m_Value": 0.0,
     "m_DefaultValue": 0.0,
-    "m_Labels": []
+    "m_Labels": [],
+    "m_LiteralMode": false
 }
 
 {
@@ -2498,11 +2525,13 @@
     "m_DisplayName": "Segments",
     "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "Out",
     "m_StageCapability": 3,
     "m_Value": 0.0,
     "m_DefaultValue": 0.0,
-    "m_Labels": []
+    "m_Labels": [],
+    "m_LiteralMode": false
 }
 
 {
@@ -2513,6 +2542,7 @@
     "m_DisplayName": "T",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "T",
     "m_StageCapability": 3,
     "m_Value": {
@@ -2526,7 +2556,8 @@
         "y": 0.0,
         "z": 0.0,
         "w": 0.0
-    }
+    },
+    "m_LiteralMode": false
 }
 
 {
@@ -2537,6 +2568,7 @@
     "m_DisplayName": "A",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "A",
     "m_StageCapability": 3,
     "m_Value": {
@@ -2550,7 +2582,8 @@
         "y": 0.0,
         "z": 0.0,
         "w": 0.0
-    }
+    },
+    "m_LiteralMode": false
 }
 
 {
@@ -2561,6 +2594,7 @@
     "m_DisplayName": "Steps",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "Steps",
     "m_StageCapability": 3,
     "m_Value": {
@@ -2574,7 +2608,8 @@
         "y": 0.0,
         "z": 0.0,
         "w": 0.0
-    }
+    },
+    "m_LiteralMode": false
 }
 
 {
@@ -2585,6 +2620,7 @@
     "m_DisplayName": "Out",
     "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "Out",
     "m_StageCapability": 3,
     "m_Value": {
@@ -2606,6 +2642,7 @@
     "m_DisplayName": "Out",
     "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "Out",
     "m_StageCapability": 3,
     "m_Value": {
@@ -2619,7 +2656,8 @@
         "y": 0.0,
         "z": 0.0,
         "w": 0.0
-    }
+    },
+    "m_LiteralMode": false
 }
 
 {
@@ -2630,6 +2668,7 @@
     "m_DisplayName": "Out",
     "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "Out",
     "m_StageCapability": 3,
     "m_Value": {
@@ -2643,7 +2682,8 @@
         "y": 0.0,
         "z": 0.0,
         "w": 0.0
-    }
+    },
+    "m_LiteralMode": false
 }
 
 {
@@ -2654,11 +2694,13 @@
     "m_DisplayName": "Tile U",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "_Tile_U",
     "m_StageCapability": 3,
     "m_Value": 1.0,
-    "m_DefaultValue": 0.0,
-    "m_Labels": []
+    "m_DefaultValue": 2.0,
+    "m_Labels": [],
+    "m_LiteralMode": false
 }
 
 {
@@ -2669,6 +2711,7 @@
     "m_DisplayName": "Out",
     "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "Out",
     "m_StageCapability": 3,
     "m_Value": {
@@ -2682,7 +2725,8 @@
         "y": 0.0,
         "z": 0.0,
         "w": 0.0
-    }
+    },
+    "m_LiteralMode": false
 }
 
 {
@@ -2741,6 +2785,7 @@
     "m_DisplayName": "UVrepeat",
     "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "UVrepeat",
     "m_StageCapability": 3,
     "m_Value": {
@@ -2841,6 +2886,7 @@
     "m_DisplayName": "RawUV",
     "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "RawUV",
     "m_StageCapability": 3,
     "m_Value": {
@@ -2862,11 +2908,13 @@
     "m_DisplayName": "Raw",
     "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "Raw",
     "m_StageCapability": 3,
     "m_Value": 0.0,
     "m_DefaultValue": 0.0,
-    "m_Labels": []
+    "m_Labels": [],
+    "m_LiteralMode": false
 }
 
 {
@@ -3005,6 +3053,7 @@
     "m_DisplayName": "B",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "B",
     "m_StageCapability": 3,
     "m_Value": {
@@ -3048,15 +3097,16 @@
 {
     "m_SGVersion": 0,
     "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot",
-    "m_ObjectId": "9ced7da4dc9d43ccb0f1ff9e43c3bd2c",
-    "m_Id": 0,
-    "m_DisplayName": "A",
+    "m_ObjectId": "973d8ebe90be4f08add8b2d1bf952a60",
+    "m_Id": 2,
+    "m_DisplayName": "T",
     "m_SlotType": 0,
     "m_Hidden": false,
-    "m_ShaderOutputName": "A",
+    "m_HideConnector": false,
+    "m_ShaderOutputName": "T",
     "m_StageCapability": 3,
     "m_Value": {
-        "x": 0.5,
+        "x": 0.0,
         "y": 0.0,
         "z": 0.0,
         "w": 0.0
@@ -3066,21 +3116,23 @@
         "y": 0.0,
         "z": 0.0,
         "w": 0.0
-    }
+    },
+    "m_LiteralMode": false
 }
 
 {
     "m_SGVersion": 0,
     "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot",
-    "m_ObjectId": "9e8abc5f77574269983ef6ef21a25a4c",
-    "m_Id": 3,
-    "m_DisplayName": "Out",
-    "m_SlotType": 1,
+    "m_ObjectId": "9ced7da4dc9d43ccb0f1ff9e43c3bd2c",
+    "m_Id": 0,
+    "m_DisplayName": "A",
+    "m_SlotType": 0,
     "m_Hidden": false,
-    "m_ShaderOutputName": "Out",
+    "m_HideConnector": false,
+    "m_ShaderOutputName": "A",
     "m_StageCapability": 3,
     "m_Value": {
-        "x": 0.0,
+        "x": 0.5,
         "y": 0.0,
         "z": 0.0,
         "w": 0.0
@@ -3090,22 +3142,8 @@
         "y": 0.0,
         "z": 0.0,
         "w": 0.0
-    }
-}
-
-{
-    "m_SGVersion": 0,
-    "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
-    "m_ObjectId": "a055066658e44c1594559c0d9843b190",
-    "m_Id": 395448508,
-    "m_DisplayName": "Size",
-    "m_SlotType": 0,
-    "m_Hidden": false,
-    "m_ShaderOutputName": "_Size",
-    "m_StageCapability": 3,
-    "m_Value": 0.30000001192092898,
-    "m_DefaultValue": 0.0,
-    "m_Labels": []
+    },
+    "m_LiteralMode": false
 }
 
 {
@@ -3116,6 +3154,7 @@
     "m_DisplayName": "Out",
     "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "Out",
     "m_StageCapability": 3,
     "m_Value": {
@@ -3129,7 +3168,8 @@
         "y": 0.0,
         "z": 0.0,
         "w": 0.0
-    }
+    },
+    "m_LiteralMode": false
 }
 
 {
@@ -3140,11 +3180,13 @@
     "m_DisplayName": "Alpha Blur",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "_Alpha_Blur",
     "m_StageCapability": 3,
     "m_Value": 0.019999999552965165,
-    "m_DefaultValue": 0.0,
-    "m_Labels": []
+    "m_DefaultValue": 0.019999999552965165,
+    "m_Labels": [],
+    "m_LiteralMode": false
 }
 
 {
@@ -3155,6 +3197,7 @@
     "m_DisplayName": "ScaledPatternUV",
     "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "ScaledPatternUV",
     "m_StageCapability": 3,
     "m_Value": {
@@ -3176,6 +3219,7 @@
     "m_DisplayName": "Steps",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "Steps",
     "m_StageCapability": 3,
     "m_Value": {
@@ -3189,7 +3233,8 @@
         "y": 0.0,
         "z": 0.0,
         "w": 0.0
-    }
+    },
+    "m_LiteralMode": false
 }
 
 {
@@ -3200,6 +3245,7 @@
     "m_DisplayName": "Out",
     "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "Out",
     "m_StageCapability": 3,
     "m_Value": {
@@ -3213,7 +3259,8 @@
         "y": 0.0,
         "z": 0.0,
         "w": 0.0
-    }
+    },
+    "m_LiteralMode": false
 }
 
 {
@@ -3224,6 +3271,7 @@
     "m_DisplayName": "Out",
     "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "Out",
     "m_StageCapability": 3,
     "m_Value": {
@@ -3245,11 +3293,13 @@
     "m_DisplayName": "Stroke Thickness",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "_Stroke_Thickness",
     "m_StageCapability": 3,
     "m_Value": 0.00800000037997961,
-    "m_DefaultValue": 0.0,
-    "m_Labels": []
+    "m_DefaultValue": 0.10000000149011612,
+    "m_Labels": [],
+    "m_LiteralMode": false
 }
 
 {
@@ -3260,6 +3310,7 @@
     "m_DisplayName": "B",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "B",
     "m_StageCapability": 3,
     "m_Value": {
@@ -3273,7 +3324,8 @@
         "y": 0.0,
         "z": 0.0,
         "w": 0.0
-    }
+    },
+    "m_LiteralMode": false
 }
 
 {
@@ -3284,6 +3336,7 @@
     "m_DisplayName": "UV",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "_UV",
     "m_StageCapability": 3,
     "m_Value": {
@@ -3396,11 +3449,13 @@
     "m_DisplayName": "Alpha",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "Alpha",
     "m_StageCapability": 2,
     "m_Value": 0.0,
     "m_DefaultValue": 0.0,
-    "m_Labels": []
+    "m_Labels": [],
+    "m_LiteralMode": false
 }
 
 {
@@ -3447,11 +3502,13 @@
     "m_DisplayName": "Alpha Threshold",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "_Alpha_Threshold",
     "m_StageCapability": 3,
     "m_Value": 0.0,
     "m_DefaultValue": 0.0,
-    "m_Labels": []
+    "m_Labels": [],
+    "m_LiteralMode": false
 }
 
 {
@@ -3462,6 +3519,7 @@
     "m_DisplayName": "Out",
     "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "Out",
     "m_StageCapability": 3,
     "m_Value": {
@@ -3475,6 +3533,75 @@
         "y": 0.0,
         "z": 0.0,
         "w": 0.0
+    },
+    "m_LiteralMode": false
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.Vector2MaterialSlot",
+    "m_ObjectId": "b9174043493f4cd99e2c39effb5651be",
+    "m_Id": -505402754,
+    "m_DisplayName": "Size",
+    "m_SlotType": 0,
+    "m_Hidden": false,
+    "m_HideConnector": false,
+    "m_ShaderOutputName": "_Size",
+    "m_StageCapability": 3,
+    "m_Value": {
+        "x": 0.5,
+        "y": 0.5
+    },
+    "m_DefaultValue": {
+        "x": 0.0,
+        "y": 0.0
+    },
+    "m_Labels": []
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.LerpNode",
+    "m_ObjectId": "b9ab5b6eaab84b1b862f4d7475d9f64e",
+    "m_Group": {
+        "m_Id": ""
+    },
+    "m_Name": "Lerp",
+    "m_DrawState": {
+        "m_Expanded": false,
+        "m_Position": {
+            "serializedVersion": "2",
+            "x": -788.0000610351563,
+            "y": 309.0,
+            "width": 126.0,
+            "height": 94.0
+        }
+    },
+    "m_Slots": [
+        {
+            "m_Id": "0aa550961ff5431d9a93be2281cbe094"
+        },
+        {
+            "m_Id": "f4033cbee9ae446fad531b0104fd0b01"
+        },
+        {
+            "m_Id": "973d8ebe90be4f08add8b2d1bf952a60"
+        },
+        {
+            "m_Id": "c2755eb0ebb141b0b3a9970ac54f1313"
+        }
+    ],
+    "synonyms": [
+        "mix",
+        "blend",
+        "linear interpolate"
+    ],
+    "m_Precision": 0,
+    "m_PreviewExpanded": false,
+    "m_DismissedVersion": 0,
+    "m_PreviewMode": 0,
+    "m_CustomColors": {
+        "m_SerializableColors": []
     }
 }
 
@@ -3486,6 +3613,7 @@
     "m_DisplayName": "RG",
     "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "RG",
     "m_StageCapability": 3,
     "m_Value": {
@@ -3507,11 +3635,13 @@
     "m_DisplayName": "Warp",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "_Warp",
     "m_StageCapability": 3,
     "m_Value": -1.0,
-    "m_DefaultValue": 0.0,
-    "m_Labels": []
+    "m_DefaultValue": 0.4000000059604645,
+    "m_Labels": [],
+    "m_LiteralMode": false
 }
 
 {
@@ -3522,6 +3652,7 @@
     "m_DisplayName": "Pivot Point",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "_Pivot_Point",
     "m_StageCapability": 3,
     "m_Value": {
@@ -3538,25 +3669,27 @@
 {
     "m_SGVersion": 0,
     "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot",
-    "m_ObjectId": "c2cecac8e43c419f839bddf1ed5a4621",
-    "m_Id": 1,
-    "m_DisplayName": "B",
-    "m_SlotType": 0,
+    "m_ObjectId": "c2755eb0ebb141b0b3a9970ac54f1313",
+    "m_Id": 3,
+    "m_DisplayName": "Out",
+    "m_SlotType": 1,
     "m_Hidden": false,
-    "m_ShaderOutputName": "B",
+    "m_HideConnector": false,
+    "m_ShaderOutputName": "Out",
     "m_StageCapability": 3,
     "m_Value": {
-        "x": 0.5,
-        "y": 0.30000001192092898,
-        "z": 0.30000001192092898,
-        "w": 1.0
+        "x": 0.0,
+        "y": 0.0,
+        "z": 0.0,
+        "w": 0.0
     },
     "m_DefaultValue": {
         "x": 0.0,
         "y": 0.0,
         "z": 0.0,
         "w": 0.0
-    }
+    },
+    "m_LiteralMode": false
 }
 
 {
@@ -3567,6 +3700,7 @@
     "m_DisplayName": "Out",
     "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "Out",
     "m_StageCapability": 3,
     "m_Value": {
@@ -3580,7 +3714,8 @@
         "y": 0.0,
         "z": 0.0,
         "w": 0.0
-    }
+    },
+    "m_LiteralMode": false
 }
 
 {
@@ -3591,11 +3726,13 @@
     "m_DisplayName": "Segments",
     "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "Out",
     "m_StageCapability": 3,
     "m_Value": 0.0,
     "m_DefaultValue": 0.0,
-    "m_Labels": []
+    "m_Labels": [],
+    "m_LiteralMode": false
 }
 
 {
@@ -3700,10 +3837,10 @@
         "m_Expanded": false,
         "m_Position": {
             "serializedVersion": "2",
-            "x": -609.9999389648438,
-            "y": 143.0,
-            "width": 135.50009155273438,
-            "height": 119.0
+            "x": -586.0,
+            "y": 142.99998474121095,
+            "width": 138.00003051757813,
+            "height": 128.00001525878907
         }
     },
     "m_Slots": [
@@ -3711,13 +3848,10 @@
             "m_Id": "aca6a626a141477499a6e0ef687a3891"
         },
         {
-            "m_Id": "a055066658e44c1594559c0d9843b190"
-        },
-        {
-            "m_Id": "ee08c56a92cc410e85ee383f93591908"
+            "m_Id": "b9174043493f4cd99e2c39effb5651be"
         },
         {
-            "m_Id": "5ef9e0e8700940b288c7f65af21e3154"
+            "m_Id": "ee9a570ba03b469b8abe72d8af459242"
         },
         {
             "m_Id": "a9fea0a8d40b4a099502bf7523b0e613"
@@ -3753,7 +3887,9 @@
         "b00cb833-c23a-491d-851f-f34a25e00811",
         "1e104722-91c8-4241-940c-215f9b31633e",
         "d6fb666f-cc12-409c-896b-7637d4c23f5f",
-        "e015c630-94c7-4d37-ba07-d88ff5cc18f7"
+        "e015c630-94c7-4d37-ba07-d88ff5cc18f7",
+        "232e58ed-3874-4127-b883-2b145fc9c297",
+        "a3e09643-9c20-4550-bbff-325ba2da06d6"
     ],
     "m_PropertyIds": [
         -1344339004,
@@ -3761,7 +3897,9 @@
         -1561688663,
         1024715749,
         -30538976,
-        -706569800
+        -706569800,
+        -505402754,
+        1803825018
     ],
     "m_Dropdowns": [],
     "m_DropdownSelectedEntries": []
@@ -3775,6 +3913,7 @@
     "m_DisplayName": "UV",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "_UV",
     "m_StageCapability": 3,
     "m_Value": {
@@ -3796,6 +3935,7 @@
     "m_DisplayName": "Out",
     "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "Out",
     "m_StageCapability": 3,
     "m_Value": {
@@ -3809,7 +3949,8 @@
         "y": 0.0,
         "z": 0.0,
         "w": 0.0
-    }
+    },
+    "m_LiteralMode": false
 }
 
 {
@@ -3922,11 +4063,13 @@
     "m_DisplayName": "Normalized",
     "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "Normalized",
     "m_StageCapability": 3,
     "m_Value": 0.0,
     "m_DefaultValue": 0.0,
-    "m_Labels": []
+    "m_Labels": [],
+    "m_LiteralMode": false
 }
 
 {
@@ -3937,6 +4080,7 @@
     "m_DisplayName": "UV",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "_UV",
     "m_StageCapability": 3,
     "m_Value": {
@@ -3959,13 +4103,13 @@
     },
     "m_Name": "Anti-Aliasing",
     "m_DrawState": {
-        "m_Expanded": true,
+        "m_Expanded": false,
         "m_Position": {
             "serializedVersion": "2",
-            "x": -474.4998474121094,
-            "y": 143.0,
-            "width": 207.99993896484376,
-            "height": 302.9999694824219
+            "x": -447.9999694824219,
+            "y": 142.99998474121095,
+            "width": 163.0,
+            "height": 104.0
         }
     },
     "m_Slots": [
@@ -4008,6 +4152,7 @@
     "m_DisplayName": "A",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "A",
     "m_StageCapability": 3,
     "m_Value": {
@@ -4055,6 +4200,9 @@
     "m_Guid": {
         "m_GuidSerialized": "ac38edfc-2b02-4f69-a8c1-c8c0ce8b9e7f"
     },
+    "promotedFromAssetID": "",
+    "promotedFromCategoryName": "",
+    "promotedOrdering": -1,
     "m_Name": "Segments",
     "m_DefaultRefNameVersion": 1,
     "m_RefNameGeneratedByDisplayName": "Segments",
@@ -4067,13 +4215,27 @@
     "m_Precision": 0,
     "overrideHLSLDeclaration": false,
     "hlslDeclarationOverride": 0,
+    "hideConnector": false,
     "m_Hidden": false,
+    "m_PerRendererData": false,
+    "m_customAttributes": [],
     "m_Value": 20.0,
     "m_FloatType": 0,
+    "m_LiteralFloatMode": false,
     "m_RangeValues": {
         "x": 0.0,
         "y": 1.0
-    }
+    },
+    "m_SliderType": 0,
+    "m_SliderPower": 3.0,
+    "m_EnumType": 0,
+    "m_CSharpEnumString": "",
+    "m_EnumNames": [
+        "Default"
+    ],
+    "m_EnumValues": [
+        0
+    ]
 }
 
 {
@@ -4084,11 +4246,13 @@
     "m_DisplayName": "Fill",
     "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "Fill",
     "m_StageCapability": 3,
     "m_Value": 0.0,
     "m_DefaultValue": 0.0,
-    "m_Labels": []
+    "m_Labels": [],
+    "m_LiteralMode": false
 }
 
 {
@@ -4138,6 +4302,7 @@
     "m_DisplayName": "B",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "B",
     "m_StageCapability": 3,
     "m_Value": {
@@ -4289,11 +4454,13 @@
     "m_DisplayName": "Speed",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "_Speed",
     "m_StageCapability": 3,
     "m_Value": 1.0,
-    "m_DefaultValue": 0.0,
-    "m_Labels": []
+    "m_DefaultValue": 0.20000000298023225,
+    "m_Labels": [],
+    "m_LiteralMode": false
 }
 
 {
@@ -4304,6 +4471,7 @@
     "m_DisplayName": "Stroke Thickness Relative",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "_Stroke_Thickness_Relative",
     "m_StageCapability": 3,
     "m_Value": true,
@@ -4318,6 +4486,7 @@
     "m_DisplayName": "B",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "B",
     "m_StageCapability": 3,
     "m_Value": {
@@ -4331,21 +4500,29 @@
         "y": 0.0,
         "z": 0.0,
         "w": 0.0
-    }
+    },
+    "m_LiteralMode": false
 }
 
 {
     "m_SGVersion": 0,
-    "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
-    "m_ObjectId": "ee08c56a92cc410e85ee383f93591908",
-    "m_Id": -1561688663,
-    "m_DisplayName": "Edge Min",
+    "m_Type": "UnityEditor.ShaderGraph.Vector2MaterialSlot",
+    "m_ObjectId": "ee9a570ba03b469b8abe72d8af459242",
+    "m_Id": 1803825018,
+    "m_DisplayName": "Edge Min Max",
     "m_SlotType": 0,
     "m_Hidden": false,
-    "m_ShaderOutputName": "_Edge_Min",
+    "m_HideConnector": false,
+    "m_ShaderOutputName": "_Edge_Min_Max",
     "m_StageCapability": 3,
-    "m_Value": 0.0,
-    "m_DefaultValue": 0.0,
+    "m_Value": {
+        "x": 0.0,
+        "y": 0.0
+    },
+    "m_DefaultValue": {
+        "x": 0.0,
+        "y": 0.0
+    },
     "m_Labels": []
 }
 
@@ -4357,6 +4534,7 @@
     "m_DisplayName": "Out",
     "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "Out",
     "m_StageCapability": 3,
     "m_Value": {
@@ -4370,7 +4548,8 @@
         "y": 0.0,
         "z": 0.0,
         "w": 0.0
-    }
+    },
+    "m_LiteralMode": false
 }
 
 {
@@ -4381,11 +4560,39 @@
     "m_DisplayName": "G",
     "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "G",
     "m_StageCapability": 3,
     "m_Value": 0.0,
     "m_DefaultValue": 0.0,
-    "m_Labels": []
+    "m_Labels": [],
+    "m_LiteralMode": false
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot",
+    "m_ObjectId": "f4033cbee9ae446fad531b0104fd0b01",
+    "m_Id": 1,
+    "m_DisplayName": "B",
+    "m_SlotType": 0,
+    "m_Hidden": false,
+    "m_HideConnector": false,
+    "m_ShaderOutputName": "B",
+    "m_StageCapability": 3,
+    "m_Value": {
+        "x": 0.5,
+        "y": 1.0,
+        "z": 1.0,
+        "w": 1.0
+    },
+    "m_DefaultValue": {
+        "x": 0.0,
+        "y": 0.0,
+        "z": 0.0,
+        "w": 0.0
+    },
+    "m_LiteralMode": false
 }
 
 {
@@ -4396,11 +4603,13 @@
     "m_DisplayName": "Alpha",
     "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "Alpha",
     "m_StageCapability": 3,
     "m_Value": 0.0,
     "m_DefaultValue": 0.0,
-    "m_Labels": []
+    "m_Labels": [],
+    "m_LiteralMode": false
 }
 
 {
@@ -4411,6 +4620,7 @@
     "m_DisplayName": "RGB",
     "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "RGB",
     "m_StageCapability": 3,
     "m_Value": {
@@ -4434,6 +4644,7 @@
     "m_DisplayName": "Out",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "Out",
     "m_StageCapability": 2,
     "m_Value": {
@@ -4456,7 +4667,7 @@
     "m_Group": {
         "m_Id": "4193bac99fe14dd6ac143ae0e13dc3cb"
     },
-    "m_Name": "Scale",
+    "m_Name": "UV Scale",
     "m_DrawState": {
         "m_Expanded": true,
         "m_Position": {
@@ -4512,13 +4723,15 @@
     "m_DisplayName": "Y",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "Y",
     "m_StageCapability": 3,
     "m_Value": 0.0,
     "m_DefaultValue": 0.0,
     "m_Labels": [
         "Y"
-    ]
+    ],
+    "m_LiteralMode": false
 }
 
 {
@@ -4529,6 +4742,7 @@
     "m_DisplayName": "Out",
     "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "Out",
     "m_StageCapability": 3,
     "m_Value": {
@@ -4549,6 +4763,9 @@
     "m_Guid": {
         "m_GuidSerialized": "88540279-3baf-44d0-b0d8-244f93ef64c1"
     },
+    "promotedFromAssetID": "",
+    "promotedFromCategoryName": "",
+    "promotedOrdering": -1,
     "m_Name": "Color",
     "m_DefaultRefNameVersion": 1,
     "m_RefNameGeneratedByDisplayName": "Color",
@@ -4561,7 +4778,10 @@
     "m_Precision": 0,
     "overrideHLSLDeclaration": false,
     "hlslDeclarationOverride": 0,
+    "hideConnector": false,
     "m_Hidden": false,
+    "m_PerRendererData": false,
+    "m_customAttributes": [],
     "m_Value": {
         "r": 1.0,
         "g": 1.0,
@@ -4580,10 +4800,12 @@
     "m_DisplayName": "R",
     "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "R",
     "m_StageCapability": 3,
     "m_Value": 0.0,
     "m_DefaultValue": 0.0,
-    "m_Labels": []
+    "m_Labels": [],
+    "m_LiteralMode": false
 }
 
diff --git a/Packages/com.unity.shadergraph/Samples~/UGUIShaders/Examples/ProgressBars/Gradient Bar.shadergraph b/Packages/com.unity.shadergraph/Samples~/UGUIShaders/Examples/ProgressBars/Gradient Bar.shadergraph
index 8cfdb397d4c..b345bc577cf 100644
--- a/Packages/com.unity.shadergraph/Samples~/UGUIShaders/Examples/ProgressBars/Gradient Bar.shadergraph	
+++ b/Packages/com.unity.shadergraph/Samples~/UGUIShaders/Examples/ProgressBars/Gradient Bar.shadergraph	
@@ -24,10 +24,10 @@
             "m_Id": "95429b1cde884ae692c102136ca638d7"
         },
         {
-            "m_Id": "62f207aaba804903abeb8c1403fe00b2"
+            "m_Id": "632c5698bb6345d4af171e528ac4d492"
         },
         {
-            "m_Id": "0a03babd593e4a04953603dea07a0eca"
+            "m_Id": "741c20684fe947308111b394a9553a0a"
         }
     ],
     "m_GroupDatas": [],
@@ -36,9 +36,9 @@
         {
             "m_OutputSlot": {
                 "m_Node": {
-                    "m_Id": "0a03babd593e4a04953603dea07a0eca"
+                    "m_Id": "632c5698bb6345d4af171e528ac4d492"
                 },
-                "m_SlotId": 0
+                "m_SlotId": 1
             },
             "m_InputSlot": {
                 "m_Node": {
@@ -50,9 +50,9 @@
         {
             "m_OutputSlot": {
                 "m_Node": {
-                    "m_Id": "62f207aaba804903abeb8c1403fe00b2"
+                    "m_Id": "741c20684fe947308111b394a9553a0a"
                 },
-                "m_SlotId": 0
+                "m_SlotId": 1
             },
             "m_InputSlot": {
                 "m_Node": {
@@ -140,47 +140,8 @@
 
 {
     "m_SGVersion": 0,
-    "m_Type": "UnityEditor.ShaderGraph.RectTransformSizeNode",
-    "m_ObjectId": "0a03babd593e4a04953603dea07a0eca",
-    "m_Group": {
-        "m_Id": ""
-    },
-    "m_Name": "RectTransform Size",
-    "m_DrawState": {
-        "m_Expanded": true,
-        "m_Position": {
-            "serializedVersion": "2",
-            "x": -540.2801513671875,
-            "y": 362.5564270019531,
-            "width": 0.0,
-            "height": 0.0
-        }
-    },
-    "m_Slots": [
-        {
-            "m_Id": "b52f9d2ba3ac4766955dd24fa811e05a"
-        },
-        {
-            "m_Id": "9310a8c24cc74b08ad6bfc8ce4ad5a9c"
-        },
-        {
-            "m_Id": "0be4f0c13b0145a58f78851bfa2f322f"
-        }
-    ],
-    "synonyms": [],
-    "m_Precision": 0,
-    "m_PreviewExpanded": true,
-    "m_DismissedVersion": 0,
-    "m_PreviewMode": 0,
-    "m_CustomColors": {
-        "m_SerializableColors": []
-    },
-    "previewSize": {
-        "x": 100.0,
-        "y": 100.0
-    },
-    "previewScaleFactor": 1.0,
-    "previewPixelsPerUnit": 100.0
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasSubTarget",
+    "m_ObjectId": "0724948387ed419a8be84dbf40ca769b"
 }
 
 {
@@ -220,15 +181,45 @@
 {
     "m_SGVersion": 0,
     "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
-    "m_ObjectId": "0be4f0c13b0145a58f78851bfa2f322f",
+    "m_ObjectId": "0c1e322743534c19b394069623e94cac",
     "m_Id": 2,
-    "m_DisplayName": "Pixel Per Unit",
+    "m_DisplayName": "Scale_Factor",
     "m_SlotType": 1,
     "m_Hidden": false,
-    "m_ShaderOutputName": "_CanvasPixelPerUnit",
+    "m_HideConnector": false,
+    "m_ShaderOutputName": "Scale_Factor",
     "m_StageCapability": 3,
-    "m_Value": 100.0,
-    "m_DefaultValue": 100.0,
+    "m_Value": 0.0,
+    "m_DefaultValue": 0.0,
+    "m_Labels": [],
+    "m_LiteralMode": false
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasSubTarget",
+    "m_ObjectId": "10c3b5b995fd4d19825cb2a725ffb981"
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.Vector2MaterialSlot",
+    "m_ObjectId": "1125218a19f54eb59263de5956ce57f7",
+    "m_Id": 2,
+    "m_DisplayName": "Direction",
+    "m_SlotType": 1,
+    "m_Hidden": false,
+    "m_HideConnector": false,
+    "m_ShaderOutputName": "Direction",
+    "m_StageCapability": 3,
+    "m_Value": {
+        "x": 0.0,
+        "y": 0.0
+    },
+    "m_DefaultValue": {
+        "x": 0.0,
+        "y": 0.0
+    },
     "m_Labels": []
 }
 
@@ -274,11 +265,13 @@
     "m_DisplayName": "Alpha",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "Alpha",
     "m_StageCapability": 2,
     "m_Value": 1.0,
     "m_DefaultValue": 1.0,
-    "m_Labels": []
+    "m_Labels": [],
+    "m_LiteralMode": false
 }
 
 {
@@ -289,6 +282,7 @@
     "m_DisplayName": "Emission",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "Emission",
     "m_StageCapability": 2,
     "m_Value": {
@@ -333,11 +327,22 @@
 
 {
     "m_SGVersion": 0,
-    "m_Type": "UnityEditor.Rendering.Canvas.ShaderGraph.CanvasData",
-    "m_ObjectId": "25c84c3be2784231b19e9acff34d2d1b",
-    "m_Version": 0,
-    "m_AlphaClip": false,
-    "m_DisableTint": false
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasData",
+    "m_ObjectId": "23e408b0f1454583bbd5158bd375dc27",
+    "supportsMotionVectors": false
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasSubTarget",
+    "m_ObjectId": "247cd01b97fd4baa87c323d78de99850"
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasData",
+    "m_ObjectId": "29880c8660cd4e2297ceaa8b9b783e4c",
+    "supportsMotionVectors": false
 }
 
 {
@@ -349,6 +354,18 @@
     "m_DisableTint": false
 }
 
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasSubTarget",
+    "m_ObjectId": "32e5213c4b334bfeb1d7aea2f95436e2"
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasSubTarget",
+    "m_ObjectId": "337a68a849fe49b283d7660f082f1726"
+}
+
 {
     "m_SGVersion": 0,
     "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
@@ -357,11 +374,13 @@
     "m_DisplayName": "Alpha",
     "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "Alpha",
     "m_StageCapability": 2,
     "m_Value": 0.0,
     "m_DefaultValue": 0.0,
-    "m_Labels": []
+    "m_Labels": [],
+    "m_LiteralMode": false
 }
 
 {
@@ -395,6 +414,7 @@
     "m_CastShadows": true,
     "m_ReceiveShadows": true,
     "m_DisableTint": false,
+    "m_Sort3DAs2DCompatible": false,
     "m_AdditionalMotionVectorMode": 0,
     "m_AlembicMotionVectors": false,
     "m_SupportsLODCrossFade": false,
@@ -404,38 +424,121 @@
 
 {
     "m_SGVersion": 0,
-    "m_Type": "UnityEditor.ShaderGraph.SliderValueNode",
-    "m_ObjectId": "62f207aaba804903abeb8c1403fe00b2",
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasData",
+    "m_ObjectId": "3d7882455342469badf9b85649b4d809",
+    "supportsMotionVectors": false
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
+    "m_ObjectId": "3fededbdbfc841d6a99379d19a893e49",
+    "m_Id": -2106065226,
+    "m_DisplayName": "PreviewPPU",
+    "m_SlotType": 0,
+    "m_Hidden": false,
+    "m_HideConnector": true,
+    "m_ShaderOutputName": "_PreviewPPU",
+    "m_StageCapability": 3,
+    "m_Value": 100.0,
+    "m_DefaultValue": 100.0,
+    "m_Labels": [],
+    "m_LiteralMode": false
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
+    "m_ObjectId": "480e2392a94a4defb7289f629f3d9f81",
+    "m_Id": -1949568231,
+    "m_DisplayName": "PreviewScaleFactor",
+    "m_SlotType": 0,
+    "m_Hidden": false,
+    "m_HideConnector": true,
+    "m_ShaderOutputName": "_PreviewScaleFactor",
+    "m_StageCapability": 3,
+    "m_Value": 1.0,
+    "m_DefaultValue": 1.0,
+    "m_Labels": [],
+    "m_LiteralMode": false
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasSubTarget",
+    "m_ObjectId": "48f4b1e87a3c4f6885826e7b4fac6a55"
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasSubTarget",
+    "m_ObjectId": "5fdad50a225b41158ea509de8ebd38c6"
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.SubGraphNode",
+    "m_ObjectId": "632c5698bb6345d4af171e528ac4d492",
     "m_Group": {
         "m_Id": ""
     },
-    "m_Name": "Slider Value",
+    "m_Name": "Rect Transform Size",
     "m_DrawState": {
         "m_Expanded": true,
         "m_Position": {
             "serializedVersion": "2",
-            "x": -679.0,
-            "y": 200.0,
-            "width": 113.0,
-            "height": 125.0
+            "x": -711.0,
+            "y": 320.0,
+            "width": 165.0,
+            "height": 228.0
         }
     },
     "m_Slots": [
         {
-            "m_Id": "dd126bbe4ebf40f9952d045389d749c7"
+            "m_Id": "8c5eccf901c34d8785bd1a557b10595b"
+        },
+        {
+            "m_Id": "dfc5559587ea4a9b98aa28fad859686f"
         },
         {
-            "m_Id": "d036f063d4544c9eb84d5f3f738a0e87"
+            "m_Id": "480e2392a94a4defb7289f629f3d9f81"
+        },
+        {
+            "m_Id": "3fededbdbfc841d6a99379d19a893e49"
+        },
+        {
+            "m_Id": "8a4212575913472bb2b90a342f52d53c"
+        },
+        {
+            "m_Id": "0c1e322743534c19b394069623e94cac"
+        },
+        {
+            "m_Id": "8d007558bc0248d98aeda0d880a8a751"
         }
     ],
     "synonyms": [],
     "m_Precision": 0,
-    "m_PreviewExpanded": true,
+    "m_PreviewExpanded": false,
     "m_DismissedVersion": 0,
     "m_PreviewMode": 0,
     "m_CustomColors": {
         "m_SerializableColors": []
-    }
+    },
+    "m_SerializedSubGraph": "{\n    \"subGraph\": {\n        \"fileID\": -5475051401550479605,\n        \"guid\": \"aa041986c041b4dc1b5bf0b2cd2d86e8\",\n        \"type\": 3\n    }\n}",
+    "m_PropertyGuids": [
+        "975f2db3-e792-46e7-9bf8-3a4cbe4fb068",
+        "373c703c-395b-43d3-91ba-78b9497021e7",
+        "2747a643-8db3-4ffc-9923-55aa70fb2549",
+        "451bbdf7-6136-4a6e-a5c8-4918d2ea4b95"
+    ],
+    "m_PropertyIds": [
+        -181240572,
+        716604351,
+        -1949568231,
+        -2106065226
+    ],
+    "m_Dropdowns": [],
+    "m_DropdownSelectedEntries": []
 }
 
 {
@@ -472,6 +575,36 @@
     "m_SerializedDescriptor": "SurfaceDescription.BaseColor"
 }
 
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialRangeSlot",
+    "m_ObjectId": "695cb855bf3947069d92b13758a462e1",
+    "m_Id": -1691137862,
+    "m_DisplayName": "Preview Value",
+    "m_SlotType": 0,
+    "m_Hidden": false,
+    "m_HideConnector": true,
+    "m_ShaderOutputName": "_Preview_Value",
+    "m_StageCapability": 3,
+    "m_Value": 0.6320000290870667,
+    "m_DefaultValue": 0.5,
+    "m_Labels": [],
+    "m_LiteralMode": false,
+    "m_sliderRange": {
+        "x": 0.0,
+        "y": 1.0
+    },
+    "m_SliderType": 0,
+    "m_SliderPower": 3.0
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasData",
+    "m_ObjectId": "6a4f7fe7684a4000b7f710774cf6b0bd",
+    "supportsMotionVectors": false
+}
+
 {
     "m_SGVersion": 0,
     "m_Type": "UnityEditor.ShaderGraph.CategoryData",
@@ -482,19 +615,131 @@
 
 {
     "m_SGVersion": 0,
-    "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
-    "m_ObjectId": "9310a8c24cc74b08ad6bfc8ce4ad5a9c",
+    "m_Type": "UnityEditor.ShaderGraph.SubGraphNode",
+    "m_ObjectId": "741c20684fe947308111b394a9553a0a",
+    "m_Group": {
+        "m_Id": ""
+    },
+    "m_Name": "Slider Value",
+    "m_DrawState": {
+        "m_Expanded": true,
+        "m_Position": {
+            "serializedVersion": "2",
+            "x": -802.0000610351563,
+            "y": 155.00001525878907,
+            "width": 256.00006103515627,
+            "height": 164.99998474121095
+        }
+    },
+    "m_Slots": [
+        {
+            "m_Id": "695cb855bf3947069d92b13758a462e1"
+        },
+        {
+            "m_Id": "96671c3076a246a78c3c45bf4d943073"
+        },
+        {
+            "m_Id": "1125218a19f54eb59263de5956ce57f7"
+        }
+    ],
+    "synonyms": [],
+    "m_Precision": 0,
+    "m_PreviewExpanded": false,
+    "m_DismissedVersion": 0,
+    "m_PreviewMode": 0,
+    "m_CustomColors": {
+        "m_SerializableColors": []
+    },
+    "m_SerializedSubGraph": "{\n    \"subGraph\": {\n        \"fileID\": -5475051401550479605,\n        \"guid\": \"b674f75227b22477ca93a09e82cd33d2\",\n        \"type\": 3\n    }\n}",
+    "m_PropertyGuids": [
+        "c874690c-9084-423f-9768-5c99a5d92488"
+    ],
+    "m_PropertyIds": [
+        -1691137862
+    ],
+    "m_Dropdowns": [
+        "_Preview_Direction"
+    ],
+    "m_DropdownSelectedEntries": [
+        "Left To Right"
+    ]
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasData",
+    "m_ObjectId": "770b75583f6740d3bff3f12c44630008",
+    "supportsMotionVectors": false
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasSubTarget",
+    "m_ObjectId": "786640f9ee3344dbb15a7654dbef302f"
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.Vector2MaterialSlot",
+    "m_ObjectId": "8a4212575913472bb2b90a342f52d53c",
     "m_Id": 1,
-    "m_DisplayName": "Scale Factor",
+    "m_DisplayName": "Size",
     "m_SlotType": 1,
     "m_Hidden": false,
-    "m_ShaderOutputName": "_CanvasScaleFactor",
+    "m_HideConnector": false,
+    "m_ShaderOutputName": "Size",
     "m_StageCapability": 3,
-    "m_Value": 1.0,
-    "m_DefaultValue": 1.0,
+    "m_Value": {
+        "x": 0.0,
+        "y": 0.0
+    },
+    "m_DefaultValue": {
+        "x": 0.0,
+        "y": 0.0
+    },
     "m_Labels": []
 }
 
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
+    "m_ObjectId": "8c5eccf901c34d8785bd1a557b10595b",
+    "m_Id": -181240572,
+    "m_DisplayName": "PreviewWidth",
+    "m_SlotType": 0,
+    "m_Hidden": false,
+    "m_HideConnector": true,
+    "m_ShaderOutputName": "_PreviewWidth",
+    "m_StageCapability": 3,
+    "m_Value": 100.0,
+    "m_DefaultValue": 100.0,
+    "m_Labels": [],
+    "m_LiteralMode": false
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
+    "m_ObjectId": "8d007558bc0248d98aeda0d880a8a751",
+    "m_Id": 3,
+    "m_DisplayName": "Pixel_Per_Unit",
+    "m_SlotType": 1,
+    "m_Hidden": false,
+    "m_HideConnector": false,
+    "m_ShaderOutputName": "Pixel_Per_Unit",
+    "m_StageCapability": 3,
+    "m_Value": 0.0,
+    "m_DefaultValue": 0.0,
+    "m_Labels": [],
+    "m_LiteralMode": false
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasSubTarget",
+    "m_ObjectId": "93d4f58b92b34b30a417d57972928aa3"
+}
+
 {
     "m_SGVersion": 0,
     "m_Type": "UnityEditor.ShaderGraph.SubGraphNode",
@@ -548,6 +793,23 @@
     "m_DropdownSelectedEntries": []
 }
 
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
+    "m_ObjectId": "96671c3076a246a78c3c45bf4d943073",
+    "m_Id": 1,
+    "m_DisplayName": "Value",
+    "m_SlotType": 1,
+    "m_Hidden": false,
+    "m_HideConnector": false,
+    "m_ShaderOutputName": "Value",
+    "m_StageCapability": 3,
+    "m_Value": 0.0,
+    "m_DefaultValue": 0.0,
+    "m_Labels": [],
+    "m_LiteralMode": false
+}
+
 {
     "m_SGVersion": 0,
     "m_Type": "UnityEditor.ShaderGraph.Vector2MaterialSlot",
@@ -556,6 +818,7 @@
     "m_DisplayName": "Width Height",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "_Width_Height",
     "m_StageCapability": 2,
     "m_Value": {
@@ -571,23 +834,21 @@
 
 {
     "m_SGVersion": 0,
-    "m_Type": "UnityEditor.ShaderGraph.Vector2MaterialSlot",
-    "m_ObjectId": "b52f9d2ba3ac4766955dd24fa811e05a",
-    "m_Id": 0,
-    "m_DisplayName": "Size",
-    "m_SlotType": 1,
-    "m_Hidden": false,
-    "m_ShaderOutputName": "_RectTransformSize",
-    "m_StageCapability": 3,
-    "m_Value": {
-        "x": 1.0,
-        "y": 1.0
-    },
-    "m_DefaultValue": {
-        "x": 100.0,
-        "y": 100.0
-    },
-    "m_Labels": []
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasData",
+    "m_ObjectId": "9faba2e0409944e4974405ecba3e0d98",
+    "supportsMotionVectors": false
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasSubTarget",
+    "m_ObjectId": "a73a4874f79b46329c1e3f2bad509a45"
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasSubTarget",
+    "m_ObjectId": "ad0511b594294cf9ba9546e82b5dbf19"
 }
 
 {
@@ -598,6 +859,7 @@
     "m_DisplayName": "Base Color",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "BaseColor",
     "m_StageCapability": 2,
     "m_Value": {
@@ -628,32 +890,40 @@
     "m_DisplayName": "Progress",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "_Progress",
     "m_StageCapability": 2,
     "m_Value": 0.75,
-    "m_DefaultValue": 0.0,
-    "m_Labels": []
+    "m_DefaultValue": 0.75,
+    "m_Labels": [],
+    "m_LiteralMode": false
 }
 
 {
     "m_SGVersion": 0,
-    "m_Type": "UnityEditor.ShaderGraph.Vector2MaterialSlot",
-    "m_ObjectId": "d036f063d4544c9eb84d5f3f738a0e87",
-    "m_Id": 1,
-    "m_DisplayName": "Direction",
-    "m_SlotType": 1,
-    "m_Hidden": false,
-    "m_ShaderOutputName": "_Direction",
-    "m_StageCapability": 3,
-    "m_Value": {
-        "x": 0.0,
-        "y": 0.0
-    },
-    "m_DefaultValue": {
-        "x": 0.0,
-        "y": 0.0
-    },
-    "m_Labels": []
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasData",
+    "m_ObjectId": "c1e7ee39856a45b3ab5d7e007395d447",
+    "supportsMotionVectors": false
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasData",
+    "m_ObjectId": "c373f1894323494b8c901d0dde2cbffd",
+    "supportsMotionVectors": false
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasData",
+    "m_ObjectId": "cafe4dfb66fa41449a2bbf6804a520f5",
+    "supportsMotionVectors": false
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasSubTarget",
+    "m_ObjectId": "d0a4787e344f48f5a85fe74bb0000b0c"
 }
 
 {
@@ -662,19 +932,28 @@
     "m_ObjectId": "d4c64a3ec6124e59ab94142d70644f47"
 }
 
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasData",
+    "m_ObjectId": "dd2d0b7f72cd40b5b04a235ffee51a1b",
+    "supportsMotionVectors": false
+}
+
 {
     "m_SGVersion": 0,
     "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
-    "m_ObjectId": "dd126bbe4ebf40f9952d045389d749c7",
-    "m_Id": 0,
-    "m_DisplayName": "Value",
-    "m_SlotType": 1,
+    "m_ObjectId": "dfc5559587ea4a9b98aa28fad859686f",
+    "m_Id": 716604351,
+    "m_DisplayName": "PreviewHeight",
+    "m_SlotType": 0,
     "m_Hidden": false,
-    "m_ShaderOutputName": "_Value",
+    "m_HideConnector": true,
+    "m_ShaderOutputName": "_PreviewHeight",
     "m_StageCapability": 3,
-    "m_Value": 0.0,
-    "m_DefaultValue": 0.0,
-    "m_Labels": []
+    "m_Value": 100.0,
+    "m_DefaultValue": 100.0,
+    "m_Labels": [],
+    "m_LiteralMode": false
 }
 
 {
@@ -684,6 +963,13 @@
     "supportsMotionVectors": false
 }
 
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasData",
+    "m_ObjectId": "ef3ad75715cb4c11b9e3357285c4829f",
+    "supportsMotionVectors": false
+}
+
 {
     "m_SGVersion": 0,
     "m_Type": "UnityEditor.ShaderGraph.Vector3MaterialSlot",
@@ -692,6 +978,7 @@
     "m_DisplayName": "Out",
     "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "Out",
     "m_StageCapability": 2,
     "m_Value": {
@@ -707,6 +994,13 @@
     "m_Labels": []
 }
 
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasData",
+    "m_ObjectId": "f795741071454171a540b0e05ba89099",
+    "supportsMotionVectors": false
+}
+
 {
     "m_SGVersion": 0,
     "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasSubTarget",
diff --git a/Packages/com.unity.shadergraph/Samples~/UGUIShaders/Examples/ProgressBars/Progress Circle.shadergraph b/Packages/com.unity.shadergraph/Samples~/UGUIShaders/Examples/ProgressBars/Progress Circle.shadergraph
index 744b30817d8..1942e9083c4 100644
--- a/Packages/com.unity.shadergraph/Samples~/UGUIShaders/Examples/ProgressBars/Progress Circle.shadergraph	
+++ b/Packages/com.unity.shadergraph/Samples~/UGUIShaders/Examples/ProgressBars/Progress Circle.shadergraph	
@@ -43,26 +43,12 @@
             "m_Id": "3c3215696efa41a9abfac0fd5a23bfc6"
         },
         {
-            "m_Id": "268908e8fb6540cf9c8bb1ef828adade"
+            "m_Id": "da84aee87f5445b88e70dfb21a35ce8f"
         }
     ],
     "m_GroupDatas": [],
     "m_StickyNoteDatas": [],
     "m_Edges": [
-        {
-            "m_OutputSlot": {
-                "m_Node": {
-                    "m_Id": "268908e8fb6540cf9c8bb1ef828adade"
-                },
-                "m_SlotId": 0
-            },
-            "m_InputSlot": {
-                "m_Node": {
-                    "m_Id": "b515ff4c1ad94e0786b6629e2c157754"
-                },
-                "m_SlotId": 766222311
-            }
-        },
         {
             "m_OutputSlot": {
                 "m_Node": {
@@ -132,6 +118,20 @@
                 },
                 "m_SlotId": 0
             }
+        },
+        {
+            "m_OutputSlot": {
+                "m_Node": {
+                    "m_Id": "da84aee87f5445b88e70dfb21a35ce8f"
+                },
+                "m_SlotId": 1
+            },
+            "m_InputSlot": {
+                "m_Node": {
+                    "m_Id": "b515ff4c1ad94e0786b6629e2c157754"
+                },
+                "m_SlotId": 766222311
+            }
         }
     ],
     "m_VertexContext": {
@@ -222,6 +222,12 @@
     "m_SerializedDescriptor": "SurfaceDescription.Emission"
 }
 
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasSubTarget",
+    "m_ObjectId": "10c3b5b995fd4d19825cb2a725ffb981"
+}
+
 {
     "m_SGVersion": 0,
     "m_Type": "UnityEditor.ShaderGraph.BlockNode",
@@ -264,11 +270,13 @@
     "m_DisplayName": "Alpha",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "Alpha",
     "m_StageCapability": 2,
     "m_Value": 1.0,
     "m_DefaultValue": 1.0,
-    "m_Labels": []
+    "m_Labels": [],
+    "m_LiteralMode": false
 }
 
 {
@@ -279,11 +287,13 @@
     "m_DisplayName": "Steps",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "_Steps",
     "m_StageCapability": 2,
     "m_Value": 18.0,
-    "m_DefaultValue": 0.0,
-    "m_Labels": []
+    "m_DefaultValue": 18.0,
+    "m_Labels": [],
+    "m_LiteralMode": false
 }
 
 {
@@ -294,6 +304,7 @@
     "m_DisplayName": "Start Color",
     "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "Out",
     "m_StageCapability": 3,
     "m_Value": {
@@ -319,6 +330,7 @@
     "m_DisplayName": "Emission",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "Emission",
     "m_StageCapability": 2,
     "m_Value": {
@@ -343,35 +355,22 @@
 
 {
     "m_SGVersion": 0,
-    "m_Type": "UnityEditor.ShaderGraph.MeterValueNode",
-    "m_ObjectId": "268908e8fb6540cf9c8bb1ef828adade",
-    "m_Group": {
-        "m_Id": ""
-    },
-    "m_Name": "Meter Value",
-    "m_DrawState": {
-        "m_Expanded": true,
-        "m_Position": {
-            "serializedVersion": "2",
-            "x": -554.0,
-            "y": 373.0,
-            "width": 114.0,
-            "height": 77.0
-        }
-    },
-    "m_Slots": [
-        {
-            "m_Id": "a5ee5231172143c8a10087dd5ed920bf"
-        }
-    ],
-    "synonyms": [],
-    "m_Precision": 0,
-    "m_PreviewExpanded": true,
-    "m_DismissedVersion": 0,
-    "m_PreviewMode": 0,
-    "m_CustomColors": {
-        "m_SerializableColors": []
-    }
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasData",
+    "m_ObjectId": "23e408b0f1454583bbd5158bd375dc27",
+    "supportsMotionVectors": false
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasSubTarget",
+    "m_ObjectId": "247cd01b97fd4baa87c323d78de99850"
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasData",
+    "m_ObjectId": "29880c8660cd4e2297ceaa8b9b783e4c",
+    "supportsMotionVectors": false
 }
 
 {
@@ -381,6 +380,9 @@
     "m_Guid": {
         "m_GuidSerialized": "86dbc184-f727-4388-93dc-a3af34b144d2"
     },
+    "promotedFromAssetID": "",
+    "promotedFromCategoryName": "",
+    "promotedOrdering": -1,
     "m_Name": "Steps",
     "m_DefaultRefNameVersion": 1,
     "m_RefNameGeneratedByDisplayName": "Steps",
@@ -393,38 +395,39 @@
     "m_Precision": 0,
     "overrideHLSLDeclaration": false,
     "hlslDeclarationOverride": 0,
+    "hideConnector": false,
     "m_Hidden": false,
+    "m_PerRendererData": false,
+    "m_customAttributes": [],
     "m_Value": 18.0,
     "m_FloatType": 0,
+    "m_LiteralFloatMode": false,
     "m_RangeValues": {
         "x": 0.0,
         "y": 1.0
-    }
+    },
+    "m_SliderType": 0,
+    "m_SliderPower": 3.0,
+    "m_EnumType": 0,
+    "m_CSharpEnumString": "",
+    "m_EnumNames": [
+        "Default"
+    ],
+    "m_EnumValues": [
+        0
+    ]
 }
 
 {
     "m_SGVersion": 0,
-    "m_Type": "UnityEditor.ShaderGraph.Vector4MaterialSlot",
-    "m_ObjectId": "307a9fbdd7a243179c0e632fdd36bcb9",
-    "m_Id": 824807272,
-    "m_DisplayName": "End Color",
-    "m_SlotType": 0,
-    "m_Hidden": false,
-    "m_ShaderOutputName": "_End_Color",
-    "m_StageCapability": 2,
-    "m_Value": {
-        "x": 0.019607843831181527,
-        "y": 0.658823549747467,
-        "z": 0.6823529601097107,
-        "w": 1.0
-    },
-    "m_DefaultValue": {
-        "x": 0.0,
-        "y": 0.0,
-        "z": 0.0,
-        "w": 0.0
-    },
-    "m_Labels": []
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasSubTarget",
+    "m_ObjectId": "32e5213c4b334bfeb1d7aea2f95436e2"
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasSubTarget",
+    "m_ObjectId": "337a68a849fe49b283d7660f082f1726"
 }
 
 {
@@ -458,6 +461,7 @@
     "m_CastShadows": true,
     "m_ReceiveShadows": true,
     "m_DisableTint": false,
+    "m_Sort3DAs2DCompatible": false,
     "m_AdditionalMotionVectorMode": 0,
     "m_AlembicMotionVectors": false,
     "m_SupportsLODCrossFade": false,
@@ -501,6 +505,19 @@
     }
 }
 
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasData",
+    "m_ObjectId": "3d7882455342469badf9b85649b4d809",
+    "supportsMotionVectors": false
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasSubTarget",
+    "m_ObjectId": "48f4b1e87a3c4f6885826e7b4fac6a55"
+}
+
 {
     "m_SGVersion": 0,
     "m_Type": "UnityEditor.ShaderGraph.PropertyNode",
@@ -537,6 +554,23 @@
     }
 }
 
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
+    "m_ObjectId": "50c3c733c73b48609839e0d3ec161a5d",
+    "m_Id": 1,
+    "m_DisplayName": "Out",
+    "m_SlotType": 1,
+    "m_Hidden": false,
+    "m_HideConnector": false,
+    "m_ShaderOutputName": "Out",
+    "m_StageCapability": 3,
+    "m_Value": 0.0,
+    "m_DefaultValue": 0.0,
+    "m_Labels": [],
+    "m_LiteralMode": false
+}
+
 {
     "m_SGVersion": 0,
     "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDTarget",
@@ -565,11 +599,19 @@
     "m_DisplayName": "Steps",
     "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "Out",
     "m_StageCapability": 3,
     "m_Value": 0.0,
     "m_DefaultValue": 0.0,
-    "m_Labels": []
+    "m_Labels": [],
+    "m_LiteralMode": false
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasSubTarget",
+    "m_ObjectId": "5fdad50a225b41158ea509de8ebd38c6"
 }
 
 {
@@ -642,6 +684,13 @@
     "m_SerializedDescriptor": "SurfaceDescription.BaseColor"
 }
 
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasData",
+    "m_ObjectId": "6a4f7fe7684a4000b7f710774cf6b0bd",
+    "supportsMotionVectors": false
+}
+
 {
     "m_SGVersion": 0,
     "m_Type": "UnityEditor.ShaderGraph.CategoryData",
@@ -660,6 +709,19 @@
     ]
 }
 
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasData",
+    "m_ObjectId": "770b75583f6740d3bff3f12c44630008",
+    "supportsMotionVectors": false
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasSubTarget",
+    "m_ObjectId": "786640f9ee3344dbb15a7654dbef302f"
+}
+
 {
     "m_SGVersion": 0,
     "m_Type": "UnityEditor.ShaderGraph.Vector2MaterialSlot",
@@ -668,6 +730,7 @@
     "m_DisplayName": "UV",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "_UV",
     "m_StageCapability": 2,
     "m_Value": {
@@ -681,6 +744,68 @@
     "m_Labels": []
 }
 
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasSubTarget",
+    "m_ObjectId": "93d4f58b92b34b30a417d57972928aa3"
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasData",
+    "m_ObjectId": "9faba2e0409944e4974405ecba3e0d98",
+    "supportsMotionVectors": false
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.ColorRGBAMaterialSlot",
+    "m_ObjectId": "a0fa282209c343bb8b91c99c7446d9f5",
+    "m_Id": 824807272,
+    "m_DisplayName": "End Color",
+    "m_SlotType": 0,
+    "m_Hidden": false,
+    "m_HideConnector": false,
+    "m_ShaderOutputName": "_End_Color",
+    "m_StageCapability": 2,
+    "m_Value": {
+        "x": 0.019607843831181527,
+        "y": 0.658823549747467,
+        "z": 0.6823529601097107,
+        "w": 1.0
+    },
+    "m_DefaultValue": {
+        "x": 0.019607843831181527,
+        "y": 0.658823549747467,
+        "z": 0.6823529601097107,
+        "w": 1.0
+    },
+    "m_Labels": []
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialRangeSlot",
+    "m_ObjectId": "a4fb02d7c5124fe0bc58912b8b2c5d53",
+    "m_Id": -2019249102,
+    "m_DisplayName": "Preview Value",
+    "m_SlotType": 0,
+    "m_Hidden": false,
+    "m_HideConnector": true,
+    "m_ShaderOutputName": "_Preview_Value",
+    "m_StageCapability": 3,
+    "m_Value": 0.5,
+    "m_DefaultValue": 0.5,
+    "m_Labels": [],
+    "m_LiteralMode": false,
+    "m_sliderRange": {
+        "x": 0.0,
+        "y": 1.0
+    },
+    "m_SliderType": 0,
+    "m_SliderPower": 3.0
+}
+
 {
     "m_SGVersion": 3,
     "m_Type": "UnityEditor.ShaderGraph.Internal.ColorShaderProperty",
@@ -688,6 +813,9 @@
     "m_Guid": {
         "m_GuidSerialized": "dab423b7-9afd-45d7-932e-cd92329586d3"
     },
+    "promotedFromAssetID": "",
+    "promotedFromCategoryName": "",
+    "promotedOrdering": -1,
     "m_Name": "Start Color",
     "m_DefaultRefNameVersion": 1,
     "m_RefNameGeneratedByDisplayName": "Start Color",
@@ -700,7 +828,10 @@
     "m_Precision": 0,
     "overrideHLSLDeclaration": false,
     "hlslDeclarationOverride": 0,
+    "hideConnector": false,
     "m_Hidden": false,
+    "m_PerRendererData": false,
+    "m_customAttributes": [],
     "m_Value": {
         "r": 0.24313725531101228,
         "g": 0.0,
@@ -713,17 +844,14 @@
 
 {
     "m_SGVersion": 0,
-    "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
-    "m_ObjectId": "a5ee5231172143c8a10087dd5ed920bf",
-    "m_Id": 0,
-    "m_DisplayName": "Value",
-    "m_SlotType": 1,
-    "m_Hidden": false,
-    "m_ShaderOutputName": "_MeterValue",
-    "m_StageCapability": 3,
-    "m_Value": 0.0,
-    "m_DefaultValue": 0.0,
-    "m_Labels": []
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasSubTarget",
+    "m_ObjectId": "a73a4874f79b46329c1e3f2bad509a45"
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasSubTarget",
+    "m_ObjectId": "ad0511b594294cf9ba9546e82b5dbf19"
 }
 
 {
@@ -734,36 +862,13 @@
     "m_DisplayName": "Progress",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "_Progress",
     "m_StageCapability": 2,
     "m_Value": 0.5,
-    "m_DefaultValue": 0.0,
-    "m_Labels": []
-}
-
-{
-    "m_SGVersion": 0,
-    "m_Type": "UnityEditor.ShaderGraph.Vector4MaterialSlot",
-    "m_ObjectId": "b020268900d5414ebe736181178f425a",
-    "m_Id": 1887705711,
-    "m_DisplayName": "Start Color",
-    "m_SlotType": 0,
-    "m_Hidden": false,
-    "m_ShaderOutputName": "_Start_Color",
-    "m_StageCapability": 2,
-    "m_Value": {
-        "x": 0.8000000715255737,
-        "y": 0.917647123336792,
-        "z": 0.9019608497619629,
-        "w": 1.0
-    },
-    "m_DefaultValue": {
-        "x": 0.0,
-        "y": 0.0,
-        "z": 0.0,
-        "w": 0.0
-    },
-    "m_Labels": []
+    "m_DefaultValue": 0.5,
+    "m_Labels": [],
+    "m_LiteralMode": false
 }
 
 {
@@ -789,10 +894,10 @@
             "m_Id": "78a6b09b5e444e4294ca57baa22cde64"
         },
         {
-            "m_Id": "b020268900d5414ebe736181178f425a"
+            "m_Id": "d47023fc8c4e4e988fcc03842938b1d1"
         },
         {
-            "m_Id": "307a9fbdd7a243179c0e632fdd36bcb9"
+            "m_Id": "a0fa282209c343bb8b91c99c7446d9f5"
         },
         {
             "m_Id": "19fd789ef0e84bb1b2a62db9c6eb3edf"
@@ -842,6 +947,7 @@
     "m_DisplayName": "Base Color",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "BaseColor",
     "m_StageCapability": 2,
     "m_Value": {
@@ -872,11 +978,13 @@
     "m_DisplayName": "Alpha",
     "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "Alpha",
     "m_StageCapability": 2,
     "m_Value": 0.0,
     "m_DefaultValue": 0.0,
-    "m_Labels": []
+    "m_Labels": [],
+    "m_LiteralMode": false
 }
 
 {
@@ -886,6 +994,9 @@
     "m_Guid": {
         "m_GuidSerialized": "5f6f0654-11c1-4cdb-9e7d-f33dfdedf9e3"
     },
+    "promotedFromAssetID": "",
+    "promotedFromCategoryName": "",
+    "promotedOrdering": -1,
     "m_Name": "End Color",
     "m_DefaultRefNameVersion": 1,
     "m_RefNameGeneratedByDisplayName": "End Color",
@@ -898,7 +1009,10 @@
     "m_Precision": 0,
     "overrideHLSLDeclaration": false,
     "hlslDeclarationOverride": 0,
+    "hideConnector": false,
     "m_Hidden": false,
+    "m_PerRendererData": false,
+    "m_customAttributes": [],
     "m_Value": {
         "r": 1.0,
         "g": 0.7568627595901489,
@@ -909,12 +1023,124 @@
     "m_ColorMode": 0
 }
 
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasData",
+    "m_ObjectId": "c1e7ee39856a45b3ab5d7e007395d447",
+    "supportsMotionVectors": false
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasData",
+    "m_ObjectId": "c373f1894323494b8c901d0dde2cbffd",
+    "supportsMotionVectors": false
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasData",
+    "m_ObjectId": "cafe4dfb66fa41449a2bbf6804a520f5",
+    "supportsMotionVectors": false
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasSubTarget",
+    "m_ObjectId": "d0a4787e344f48f5a85fe74bb0000b0c"
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.ColorRGBAMaterialSlot",
+    "m_ObjectId": "d47023fc8c4e4e988fcc03842938b1d1",
+    "m_Id": 1887705711,
+    "m_DisplayName": "Start Color",
+    "m_SlotType": 0,
+    "m_Hidden": false,
+    "m_HideConnector": false,
+    "m_ShaderOutputName": "_Start_Color",
+    "m_StageCapability": 2,
+    "m_Value": {
+        "x": 0.8000000715255737,
+        "y": 0.917647123336792,
+        "z": 0.9019608497619629,
+        "w": 1.0
+    },
+    "m_DefaultValue": {
+        "x": 0.8000000715255737,
+        "y": 0.917647123336792,
+        "z": 0.9019608497619629,
+        "w": 1.0
+    },
+    "m_Labels": []
+}
+
 {
     "m_SGVersion": 0,
     "m_Type": "UnityEditor.Rendering.Universal.ShaderGraph.UniversalCanvasSubTarget",
     "m_ObjectId": "d4c64a3ec6124e59ab94142d70644f47"
 }
 
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.SubGraphNode",
+    "m_ObjectId": "da84aee87f5445b88e70dfb21a35ce8f",
+    "m_Group": {
+        "m_Id": ""
+    },
+    "m_Name": "Meter Value",
+    "m_DrawState": {
+        "m_Expanded": true,
+        "m_Position": {
+            "serializedVersion": "2",
+            "x": -615.0,
+            "y": 393.9999694824219,
+            "width": 184.0,
+            "height": 121.99996948242188
+        }
+    },
+    "m_Slots": [
+        {
+            "m_Id": "a4fb02d7c5124fe0bc58912b8b2c5d53"
+        },
+        {
+            "m_Id": "50c3c733c73b48609839e0d3ec161a5d"
+        }
+    ],
+    "synonyms": [],
+    "m_Precision": 0,
+    "m_PreviewExpanded": false,
+    "m_DismissedVersion": 0,
+    "m_PreviewMode": 0,
+    "m_CustomColors": {
+        "m_SerializableColors": []
+    },
+    "m_SerializedSubGraph": "{\n    \"subGraph\": {\n        \"fileID\": -5475051401550479605,\n        \"guid\": \"90192633207f24dc0927e116d7564452\",\n        \"type\": 3\n    }\n}",
+    "m_PropertyGuids": [
+        "3da8ea4d-7749-407b-965b-ab3ca072dcc6"
+    ],
+    "m_PropertyIds": [
+        -2019249102
+    ],
+    "m_Dropdowns": [],
+    "m_DropdownSelectedEntries": []
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasData",
+    "m_ObjectId": "dd2d0b7f72cd40b5b04a235ffee51a1b",
+    "supportsMotionVectors": false
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasData",
+    "m_ObjectId": "ec0773b35401476ea81c2e6afc45d427",
+    "supportsMotionVectors": false
+}
+
 {
     "m_SGVersion": 0,
     "m_Type": "UnityEditor.ShaderGraph.Vector4MaterialSlot",
@@ -923,6 +1149,7 @@
     "m_DisplayName": "End Color",
     "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "Out",
     "m_StageCapability": 3,
     "m_Value": {
@@ -956,6 +1183,19 @@
     "m_DisableTint": false
 }
 
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasData",
+    "m_ObjectId": "f795741071454171a540b0e05ba89099",
+    "supportsMotionVectors": false
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasSubTarget",
+    "m_ObjectId": "f84934c605d0438b9d9b65af0e04993e"
+}
+
 {
     "m_SGVersion": 0,
     "m_Type": "UnityEditor.ShaderGraph.Vector3MaterialSlot",
@@ -964,6 +1204,7 @@
     "m_DisplayName": "Color",
     "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "Color",
     "m_StageCapability": 2,
     "m_Value": {
@@ -979,12 +1220,3 @@
     "m_Labels": []
 }
 
-{
-    "m_SGVersion": 0,
-    "m_Type": "UnityEditor.Rendering.Canvas.ShaderGraph.CanvasData",
-    "m_ObjectId": "fbd00d6b2ad1477c991c7fd160b2b7b5",
-    "m_Version": 0,
-    "m_AlphaClip": false,
-    "m_DisableTint": false
-}
-
diff --git a/Packages/com.unity.shadergraph/Samples~/UGUIShaders/Examples/TabButton.shadergraph b/Packages/com.unity.shadergraph/Samples~/UGUIShaders/Examples/TabButton.shadergraph
index e6f646f300a..2f917eac602 100644
--- a/Packages/com.unity.shadergraph/Samples~/UGUIShaders/Examples/TabButton.shadergraph
+++ b/Packages/com.unity.shadergraph/Samples~/UGUIShaders/Examples/TabButton.shadergraph
@@ -56,27 +56,15 @@
         {
             "m_Id": "f5b0804ac95e46cf874ba95172a1bbca"
         },
-        {
-            "m_Id": "d053b21c961d4995a06b47e74b4c2409"
-        },
         {
             "m_Id": "7b8f035eb0aa496fb043bb91e2150295"
         },
-        {
-            "m_Id": "4bbd75861ad348b48471638def1a8136"
-        },
-        {
-            "m_Id": "6e28dc0a731b47a3bd532902ebfeede4"
-        },
         {
             "m_Id": "003b673f1a8847878bf6f3fcac04b226"
         },
         {
             "m_Id": "428fea4a721346f8ab46f1c614017ac4"
         },
-        {
-            "m_Id": "1210e3a0d26c4201a0d38bc4f1cac00f"
-        },
         {
             "m_Id": "3ffb6b911bb84059bdb0e8db330992d1"
         },
@@ -88,6 +76,15 @@
         },
         {
             "m_Id": "fdd8d3a4a5cc48879d6998028efe24cd"
+        },
+        {
+            "m_Id": "a150798fce484d34b3e927c0d81685b0"
+        },
+        {
+            "m_Id": "21ee6db55c8848d5aa023eb3c95e1bdd"
+        },
+        {
+            "m_Id": "cba10278e71341cfa711a71ceff9e96c"
         }
     ],
     "m_GroupDatas": [
@@ -98,7 +95,20 @@
             "m_Id": "d23ccb49d0e14387b259d3fc88498036"
         }
     ],
-    "m_StickyNoteDatas": [],
+    "m_StickyNoteDatas": [
+        {
+            "m_Id": "afef8439bd5e4994845594c96b835f97"
+        },
+        {
+            "m_Id": "e044f5bf2e6c43478740e939da2a06d8"
+        },
+        {
+            "m_Id": "15cd5ec1f60740e88eb6ad48756d7c46"
+        },
+        {
+            "m_Id": "22ab1e27de0345d7b359941697c7b8b8"
+        }
+    ],
     "m_Edges": [
         {
             "m_OutputSlot": {
@@ -117,29 +127,29 @@
         {
             "m_OutputSlot": {
                 "m_Node": {
-                    "m_Id": "1210e3a0d26c4201a0d38bc4f1cac00f"
+                    "m_Id": "20172d8a5a334a85a61d2623eaebbdce"
                 },
                 "m_SlotId": 1
             },
             "m_InputSlot": {
                 "m_Node": {
-                    "m_Id": "7b8f035eb0aa496fb043bb91e2150295"
+                    "m_Id": "304bbb644c234c7993d17cf5d9bcc8b9"
                 },
-                "m_SlotId": 830530724
+                "m_SlotId": 0
             }
         },
         {
             "m_OutputSlot": {
                 "m_Node": {
-                    "m_Id": "20172d8a5a334a85a61d2623eaebbdce"
+                    "m_Id": "21ee6db55c8848d5aa023eb3c95e1bdd"
                 },
                 "m_SlotId": 1
             },
             "m_InputSlot": {
                 "m_Node": {
-                    "m_Id": "304bbb644c234c7993d17cf5d9bcc8b9"
+                    "m_Id": "936e17bff0ab49d68d05be04665c8131"
                 },
-                "m_SlotId": 0
+                "m_SlotId": 1
             }
         },
         {
@@ -184,20 +194,6 @@
                 "m_SlotId": 0
             }
         },
-        {
-            "m_OutputSlot": {
-                "m_Node": {
-                    "m_Id": "4bbd75861ad348b48471638def1a8136"
-                },
-                "m_SlotId": 0
-            },
-            "m_InputSlot": {
-                "m_Node": {
-                    "m_Id": "936e17bff0ab49d68d05be04665c8131"
-                },
-                "m_SlotId": 1
-            }
-        },
         {
             "m_OutputSlot": {
                 "m_Node": {
@@ -226,20 +222,6 @@
                 "m_SlotId": 0
             }
         },
-        {
-            "m_OutputSlot": {
-                "m_Node": {
-                    "m_Id": "6e28dc0a731b47a3bd532902ebfeede4"
-                },
-                "m_SlotId": 0
-            },
-            "m_InputSlot": {
-                "m_Node": {
-                    "m_Id": "e3d2926141e24718af08fb624c643421"
-                },
-                "m_SlotId": 1786236159
-            }
-        },
         {
             "m_OutputSlot": {
                 "m_Node": {
@@ -352,6 +334,20 @@
                 "m_SlotId": 0
             }
         },
+        {
+            "m_OutputSlot": {
+                "m_Node": {
+                    "m_Id": "a150798fce484d34b3e927c0d81685b0"
+                },
+                "m_SlotId": 1
+            },
+            "m_InputSlot": {
+                "m_Node": {
+                    "m_Id": "7b8f035eb0aa496fb043bb91e2150295"
+                },
+                "m_SlotId": 830530724
+            }
+        },
         {
             "m_OutputSlot": {
                 "m_Node": {
@@ -383,15 +379,15 @@
         {
             "m_OutputSlot": {
                 "m_Node": {
-                    "m_Id": "d053b21c961d4995a06b47e74b4c2409"
+                    "m_Id": "cba10278e71341cfa711a71ceff9e96c"
                 },
-                "m_SlotId": 0
+                "m_SlotId": 1
             },
             "m_InputSlot": {
                 "m_Node": {
-                    "m_Id": "1210e3a0d26c4201a0d38bc4f1cac00f"
+                    "m_Id": "e3d2926141e24718af08fb624c643421"
                 },
-                "m_SlotId": 830530724
+                "m_SlotId": 1786236159
             }
         },
         {
@@ -571,6 +567,7 @@
     "m_DisplayName": "IsHighlighted",
     "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "IsHighlighted",
     "m_StageCapability": 3,
     "m_Value": false,
@@ -585,12 +582,19 @@
     "m_DisplayName": "IsPressed",
     "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "IsPressed",
     "m_StageCapability": 3,
     "m_Value": false,
     "m_DefaultValue": false
 }
 
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasSubTarget",
+    "m_ObjectId": "0724948387ed419a8be84dbf40ca769b"
+}
+
 {
     "m_SGVersion": 0,
     "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
@@ -599,11 +603,13 @@
     "m_DisplayName": "SDF",
     "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "SDF",
     "m_StageCapability": 3,
     "m_Value": 0.0,
     "m_DefaultValue": 0.0,
-    "m_Labels": []
+    "m_Labels": [],
+    "m_LiteralMode": false
 }
 
 {
@@ -614,6 +620,7 @@
     "m_DisplayName": "Predicate",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "Predicate",
     "m_StageCapability": 3,
     "m_Value": false,
@@ -654,6 +661,23 @@
     "m_SerializedDescriptor": "SurfaceDescription.Emission"
 }
 
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
+    "m_ObjectId": "0a9e22ff1bf245dc981597aa513eecb9",
+    "m_Id": 2,
+    "m_DisplayName": "Scale_Factor",
+    "m_SlotType": 1,
+    "m_Hidden": false,
+    "m_HideConnector": false,
+    "m_ShaderOutputName": "Scale_Factor",
+    "m_StageCapability": 3,
+    "m_Value": 0.0,
+    "m_DefaultValue": 0.0,
+    "m_Labels": [],
+    "m_LiteralMode": false
+}
+
 {
     "m_SGVersion": 0,
     "m_Type": "UnityEditor.ShaderGraph.BooleanMaterialSlot",
@@ -662,6 +686,7 @@
     "m_DisplayName": "Out",
     "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "Out",
     "m_StageCapability": 3,
     "m_Value": false,
@@ -676,6 +701,7 @@
     "m_DisplayName": "",
     "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "",
     "m_StageCapability": 3,
     "m_Value": false,
@@ -684,51 +710,45 @@
 
 {
     "m_SGVersion": 0,
-    "m_Type": "UnityEditor.ShaderGraph.SubGraphNode",
-    "m_ObjectId": "1210e3a0d26c4201a0d38bc4f1cac00f",
+    "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
+    "m_ObjectId": "0f875bffc5c14c63b134e58a86face7a",
+    "m_Id": 1,
+    "m_DisplayName": "State",
+    "m_SlotType": 1,
+    "m_Hidden": false,
+    "m_HideConnector": false,
+    "m_ShaderOutputName": "State",
+    "m_StageCapability": 3,
+    "m_Value": 0.0,
+    "m_DefaultValue": 0.0,
+    "m_Labels": [],
+    "m_LiteralMode": false
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasSubTarget",
+    "m_ObjectId": "10c3b5b995fd4d19825cb2a725ffb981"
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.StickyNoteData",
+    "m_ObjectId": "15cd5ec1f60740e88eb6ad48756d7c46",
+    "m_Title": "Selectable State",
+    "m_Content": "This subgraph promotes a hidden \"_State\" float property and allows changing the preview value with a dropdown.\n\nUse with one of the Sample Components, like Button, Toggle, Slider.\n0 = Normal\n1 = Highlighted\n2 = Pressed\n3 = Selected\n4 = Disabled",
+    "m_TextSize": 0,
+    "m_Theme": 1,
+    "m_Position": {
+        "serializedVersion": "2",
+        "x": -2898.0,
+        "y": 204.0,
+        "width": 303.0,
+        "height": 189.0
+    },
     "m_Group": {
         "m_Id": ""
-    },
-    "m_Name": "Selectable State Preview",
-    "m_DrawState": {
-        "m_Expanded": true,
-        "m_Position": {
-            "serializedVersion": "2",
-            "x": -2576.0,
-            "y": 200.0,
-            "width": 284.0,
-            "height": 115.0
-        }
-    },
-    "m_Slots": [
-        {
-            "m_Id": "eaca5acb307b4e5cad2b5e2ae96e47e2"
-        },
-        {
-            "m_Id": "7997b9eaed5042adb724726c5ab2b68f"
-        }
-    ],
-    "synonyms": [],
-    "m_Precision": 0,
-    "m_PreviewExpanded": false,
-    "m_DismissedVersion": 0,
-    "m_PreviewMode": 0,
-    "m_CustomColors": {
-        "m_SerializableColors": []
-    },
-    "m_SerializedSubGraph": "{\n    \"subGraph\": {\n        \"fileID\": -5475051401550479605,\n        \"guid\": \"b278edaff18e35342890339c5f0d2945\",\n        \"type\": 3\n    }\n}",
-    "m_PropertyGuids": [
-        "9c4cb347-e674-4393-bb26-07702c97589e"
-    ],
-    "m_PropertyIds": [
-        830530724
-    ],
-    "m_Dropdowns": [
-        "_Preview"
-    ],
-    "m_DropdownSelectedEntries": [
-        "Normal"
-    ]
+    }
 }
 
 {
@@ -765,6 +785,28 @@
     "m_SerializedDescriptor": "SurfaceDescription.Alpha"
 }
 
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.Vector2MaterialSlot",
+    "m_ObjectId": "19d0ec887cd94777aa85d6aa1f1ab03d",
+    "m_Id": 1,
+    "m_DisplayName": "Size",
+    "m_SlotType": 1,
+    "m_Hidden": false,
+    "m_HideConnector": false,
+    "m_ShaderOutputName": "Size",
+    "m_StageCapability": 3,
+    "m_Value": {
+        "x": 0.0,
+        "y": 0.0
+    },
+    "m_DefaultValue": {
+        "x": 0.0,
+        "y": 0.0
+    },
+    "m_Labels": []
+}
+
 {
     "m_SGVersion": 0,
     "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
@@ -773,11 +815,47 @@
     "m_DisplayName": "Alpha",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "Alpha",
     "m_StageCapability": 2,
     "m_Value": 1.0,
     "m_DefaultValue": 1.0,
-    "m_Labels": []
+    "m_Labels": [],
+    "m_LiteralMode": false
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
+    "m_ObjectId": "1a0e89db2d1a4800af8c6f950c630976",
+    "m_Id": 716604351,
+    "m_DisplayName": "PreviewHeight",
+    "m_SlotType": 0,
+    "m_Hidden": false,
+    "m_HideConnector": true,
+    "m_ShaderOutputName": "_PreviewHeight",
+    "m_StageCapability": 3,
+    "m_Value": 100.0,
+    "m_DefaultValue": 100.0,
+    "m_Labels": [],
+    "m_LiteralMode": false
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
+    "m_ObjectId": "1b6ed496c51443959f30c26a222a881f",
+    "m_Id": -181240572,
+    "m_DisplayName": "PreviewWidth",
+    "m_SlotType": 0,
+    "m_Hidden": false,
+    "m_HideConnector": true,
+    "m_ShaderOutputName": "_PreviewWidth",
+    "m_StageCapability": 3,
+    "m_Value": 100.0,
+    "m_DefaultValue": 100.0,
+    "m_Labels": [],
+    "m_LiteralMode": false
 }
 
 {
@@ -788,6 +866,7 @@
     "m_DisplayName": "Corner Radii",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "_Corner_Radii",
     "m_StageCapability": 3,
     "m_Value": {
@@ -863,11 +942,13 @@
     "m_DisplayName": "State",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "_State",
     "m_StageCapability": 3,
     "m_Value": 0.0,
     "m_DefaultValue": 0.0,
-    "m_Labels": []
+    "m_Labels": [],
+    "m_LiteralMode": false
 }
 
 {
@@ -878,6 +959,7 @@
     "m_DisplayName": "A",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "A",
     "m_StageCapability": 3,
     "m_Value": {
@@ -891,7 +973,8 @@
         "y": 0.0,
         "z": 0.0,
         "w": 0.0
-    }
+    },
+    "m_LiteralMode": false
 }
 
 {
@@ -902,6 +985,7 @@
     "m_DisplayName": "Emission",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "Emission",
     "m_StageCapability": 2,
     "m_Value": {
@@ -924,6 +1008,51 @@
     }
 }
 
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.SubGraphNode",
+    "m_ObjectId": "21ee6db55c8848d5aa023eb3c95e1bdd",
+    "m_Group": {
+        "m_Id": ""
+    },
+    "m_Name": "Toggle State",
+    "m_DrawState": {
+        "m_Expanded": true,
+        "m_Position": {
+            "serializedVersion": "2",
+            "x": -1819.000244140625,
+            "y": 328.0000305175781,
+            "width": 150.0001220703125,
+            "height": 104.99996948242188
+        }
+    },
+    "m_Slots": [
+        {
+            "m_Id": "45f89a07e5ac41cdb9dd95bfe6073865"
+        },
+        {
+            "m_Id": "28aaf397215749cc9611dd1612c70bd2"
+        }
+    ],
+    "synonyms": [],
+    "m_Precision": 0,
+    "m_PreviewExpanded": false,
+    "m_DismissedVersion": 0,
+    "m_PreviewMode": 0,
+    "m_CustomColors": {
+        "m_SerializableColors": []
+    },
+    "m_SerializedSubGraph": "{\n    \"subGraph\": {\n        \"fileID\": -5475051401550479605,\n        \"guid\": \"4f050eea90ae946c5a5a171b0df1d6a1\",\n        \"type\": 3\n    }\n}",
+    "m_PropertyGuids": [
+        "33920d31-0cc5-4286-b412-4e36a6203057"
+    ],
+    "m_PropertyIds": [
+        275395558
+    ],
+    "m_Dropdowns": [],
+    "m_DropdownSelectedEntries": []
+}
+
 {
     "m_SGVersion": 0,
     "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot",
@@ -932,6 +1061,7 @@
     "m_DisplayName": "Out",
     "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "Out",
     "m_StageCapability": 3,
     "m_Value": {
@@ -945,9 +1075,43 @@
         "y": 0.0,
         "z": 0.0,
         "w": 0.0
+    },
+    "m_LiteralMode": false
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.StickyNoteData",
+    "m_ObjectId": "22ab1e27de0345d7b359941697c7b8b8",
+    "m_Title": "Toggle State",
+    "m_Content": "This subgraph promotes a hidden \"isOn\" Boolean property and allows changing the preview value with a checkbox.\n\nUse with the Sample Toggle Component.",
+    "m_TextSize": 0,
+    "m_Theme": 1,
+    "m_Position": {
+        "serializedVersion": "2",
+        "x": -1822.0,
+        "y": 437.0,
+        "width": 152.0,
+        "height": 153.0
+    },
+    "m_Group": {
+        "m_Id": ""
     }
 }
 
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasData",
+    "m_ObjectId": "23e408b0f1454583bbd5158bd375dc27",
+    "supportsMotionVectors": false
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasSubTarget",
+    "m_ObjectId": "247cd01b97fd4baa87c323d78de99850"
+}
+
 {
     "m_SGVersion": 0,
     "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
@@ -956,13 +1120,15 @@
     "m_DisplayName": "Y",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "Y",
     "m_StageCapability": 3,
     "m_Value": 0.0,
     "m_DefaultValue": 0.0,
     "m_Labels": [
         "Y"
-    ]
+    ],
+    "m_LiteralMode": false
 }
 
 {
@@ -973,12 +1139,35 @@
     "m_DisplayName": "",
     "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "",
     "m_StageCapability": 3,
     "m_Value": false,
     "m_DefaultValue": false
 }
 
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.BooleanMaterialSlot",
+    "m_ObjectId": "28aaf397215749cc9611dd1612c70bd2",
+    "m_Id": 1,
+    "m_DisplayName": "Out",
+    "m_SlotType": 1,
+    "m_Hidden": false,
+    "m_HideConnector": false,
+    "m_ShaderOutputName": "Out",
+    "m_StageCapability": 3,
+    "m_Value": false,
+    "m_DefaultValue": false
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasData",
+    "m_ObjectId": "29880c8660cd4e2297ceaa8b9b783e4c",
+    "supportsMotionVectors": false
+}
+
 {
     "m_SGVersion": 0,
     "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
@@ -987,11 +1176,13 @@
     "m_DisplayName": "Out",
     "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "Out",
     "m_StageCapability": 3,
     "m_Value": 0.0,
     "m_DefaultValue": 0.0,
-    "m_Labels": []
+    "m_Labels": [],
+    "m_LiteralMode": false
 }
 
 {
@@ -1002,11 +1193,13 @@
     "m_DisplayName": "Out",
     "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "Out",
     "m_StageCapability": 2,
     "m_Value": 0.0,
     "m_DefaultValue": 0.0,
-    "m_Labels": []
+    "m_Labels": [],
+    "m_LiteralMode": false
 }
 
 {
@@ -1057,13 +1250,15 @@
     "m_DisplayName": "W",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "W",
     "m_StageCapability": 3,
     "m_Value": 0.0,
     "m_DefaultValue": 0.0,
     "m_Labels": [
         "W"
-    ]
+    ],
+    "m_LiteralMode": false
 }
 
 {
@@ -1074,6 +1269,7 @@
     "m_DisplayName": "Out",
     "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "Out",
     "m_StageCapability": 3,
     "m_Value": {
@@ -1111,6 +1307,18 @@
     "m_SupportLineRendering": false
 }
 
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasSubTarget",
+    "m_ObjectId": "32e5213c4b334bfeb1d7aea2f95436e2"
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasSubTarget",
+    "m_ObjectId": "337a68a849fe49b283d7660f082f1726"
+}
+
 {
     "m_SGVersion": 0,
     "m_Type": "UnityEditor.ShaderGraph.BooleanMaterialSlot",
@@ -1119,12 +1327,30 @@
     "m_DisplayName": "",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "",
     "m_StageCapability": 3,
     "m_Value": false,
     "m_DefaultValue": false
 }
 
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
+    "m_ObjectId": "37878e68159948e3b166c731f742fa40",
+    "m_Id": 3,
+    "m_DisplayName": "Pixel_Per_Unit",
+    "m_SlotType": 1,
+    "m_Hidden": false,
+    "m_HideConnector": false,
+    "m_ShaderOutputName": "Pixel_Per_Unit",
+    "m_StageCapability": 3,
+    "m_Value": 0.0,
+    "m_DefaultValue": 0.0,
+    "m_Labels": [],
+    "m_LiteralMode": false
+}
+
 {
     "m_SGVersion": 1,
     "m_Type": "UnityEditor.Rendering.Universal.ShaderGraph.UniversalTarget",
@@ -1156,6 +1382,7 @@
     "m_CastShadows": true,
     "m_ReceiveShadows": true,
     "m_DisableTint": false,
+    "m_Sort3DAs2DCompatible": false,
     "m_AdditionalMotionVectorMode": 0,
     "m_AlembicMotionVectors": false,
     "m_SupportsLODCrossFade": false,
@@ -1171,6 +1398,7 @@
     "m_DisplayName": "Out",
     "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "Out",
     "m_StageCapability": 3,
     "m_Value": {
@@ -1188,6 +1416,13 @@
     "m_Labels": []
 }
 
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasData",
+    "m_ObjectId": "3d7882455342469badf9b85649b4d809",
+    "supportsMotionVectors": false
+}
+
 {
     "m_SGVersion": 0,
     "m_Type": "UnityEditor.Rendering.Canvas.ShaderGraph.CanvasData",
@@ -1197,6 +1432,23 @@
     "m_DisableTint": false
 }
 
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
+    "m_ObjectId": "3ff640d3b74a4178b36a66cca7147aeb",
+    "m_Id": -1949568231,
+    "m_DisplayName": "PreviewScaleFactor",
+    "m_SlotType": 0,
+    "m_Hidden": false,
+    "m_HideConnector": true,
+    "m_ShaderOutputName": "_PreviewScaleFactor",
+    "m_StageCapability": 3,
+    "m_Value": 1.0,
+    "m_DefaultValue": 1.0,
+    "m_Labels": [],
+    "m_LiteralMode": false
+}
+
 {
     "m_SGVersion": 0,
     "m_Type": "UnityEditor.ShaderGraph.MultiplyNode",
@@ -1246,8 +1498,8 @@
     "m_ObjectId": "41865192232b4142b0b2db733500ca91",
     "m_Title": "Color",
     "m_Position": {
-        "x": -987.333251953125,
-        "y": -197.33331298828126
+        "x": -987.0001220703125,
+        "y": -198.00001525878907
     }
 }
 
@@ -1259,6 +1511,7 @@
     "m_DisplayName": "True",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "True",
     "m_StageCapability": 3,
     "m_Value": {
@@ -1272,7 +1525,8 @@
         "y": 0.0,
         "z": 0.0,
         "w": 0.0
-    }
+    },
+    "m_LiteralMode": false
 }
 
 {
@@ -1311,6 +1565,21 @@
     }
 }
 
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.BooleanMaterialSlot",
+    "m_ObjectId": "45f89a07e5ac41cdb9dd95bfe6073865",
+    "m_Id": 275395558,
+    "m_DisplayName": "Preview Value",
+    "m_SlotType": 0,
+    "m_Hidden": false,
+    "m_HideConnector": true,
+    "m_ShaderOutputName": "_Preview_Value",
+    "m_StageCapability": 3,
+    "m_Value": false,
+    "m_DefaultValue": false
+}
+
 {
     "m_SGVersion": 0,
     "m_Type": "UnityEditor.ShaderGraph.Vector2MaterialSlot",
@@ -1319,6 +1588,7 @@
     "m_DisplayName": "UV",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "_UV",
     "m_StageCapability": 3,
     "m_Value": {
@@ -1334,35 +1604,34 @@
 
 {
     "m_SGVersion": 0,
-    "m_Type": "UnityEditor.ShaderGraph.ToggleStateNode",
-    "m_ObjectId": "4bbd75861ad348b48471638def1a8136",
-    "m_Group": {
-        "m_Id": ""
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasSubTarget",
+    "m_ObjectId": "48f4b1e87a3c4f6885826e7b4fac6a55"
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.Vector4MaterialSlot",
+    "m_ObjectId": "49ce52a4baac48cd9884695797083284",
+    "m_Id": 0,
+    "m_DisplayName": "In",
+    "m_SlotType": 0,
+    "m_Hidden": false,
+    "m_HideConnector": false,
+    "m_ShaderOutputName": "In",
+    "m_StageCapability": 3,
+    "m_Value": {
+        "x": 0.0,
+        "y": 0.0,
+        "z": 0.0,
+        "w": 0.0
     },
-    "m_Name": "Toggle State",
-    "m_DrawState": {
-        "m_Expanded": true,
-        "m_Position": {
-            "serializedVersion": "2",
-            "x": -1794.0,
-            "y": 314.0,
-            "width": 118.0,
-            "height": 77.0
-        }
+    "m_DefaultValue": {
+        "x": 0.0,
+        "y": 0.0,
+        "z": 0.0,
+        "w": 0.0
     },
-    "m_Slots": [
-        {
-            "m_Id": "f2115f407dec4a39ac4140014414379e"
-        }
-    ],
-    "synonyms": [],
-    "m_Precision": 0,
-    "m_PreviewExpanded": true,
-    "m_DismissedVersion": 0,
-    "m_PreviewMode": 0,
-    "m_CustomColors": {
-        "m_SerializableColors": []
-    }
+    "m_Labels": []
 }
 
 {
@@ -1373,11 +1642,13 @@
     "m_DisplayName": "X",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "X",
     "m_StageCapability": 3,
     "m_Value": 0.0,
     "m_DefaultValue": 0.0,
-    "m_Labels": []
+    "m_Labels": [],
+    "m_LiteralMode": false
 }
 
 {
@@ -1388,13 +1659,15 @@
     "m_DisplayName": "Z",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "Z",
     "m_StageCapability": 3,
     "m_Value": 0.0,
     "m_DefaultValue": 0.0,
     "m_Labels": [
         "Z"
-    ]
+    ],
+    "m_LiteralMode": false
 }
 
 {
@@ -1405,11 +1678,13 @@
     "m_DisplayName": "Gradient",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "_Gradient",
     "m_StageCapability": 2,
     "m_Value": 0.0,
     "m_DefaultValue": 0.0,
-    "m_Labels": []
+    "m_Labels": [],
+    "m_LiteralMode": false
 }
 
 {
@@ -1420,6 +1695,7 @@
     "m_DisplayName": "",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "",
     "m_StageCapability": 3,
     "m_Value": {
@@ -1433,7 +1709,8 @@
         "y": 0.0,
         "z": 0.0,
         "w": 0.0
-    }
+    },
+    "m_LiteralMode": false
 }
 
 {
@@ -1444,6 +1721,7 @@
     "m_DisplayName": "Out",
     "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "Out",
     "m_StageCapability": 3,
     "m_Value": {
@@ -1492,11 +1770,13 @@
     "m_DisplayName": "Edge Max",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "_Edge_Max",
     "m_StageCapability": 3,
     "m_Value": 0.009999999776482582,
-    "m_DefaultValue": 0.0,
-    "m_Labels": []
+    "m_DefaultValue": 0.009999999776482582,
+    "m_Labels": [],
+    "m_LiteralMode": false
 }
 
 {
@@ -1507,11 +1787,13 @@
     "m_DisplayName": "Gradient",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "_Gradient",
     "m_StageCapability": 2,
     "m_Value": 0.0,
     "m_DefaultValue": 0.0,
-    "m_Labels": []
+    "m_Labels": [],
+    "m_LiteralMode": false
 }
 
 {
@@ -1540,7 +1822,7 @@
     },
     "m_Slots": [
         {
-            "m_Id": "f2261588d28d47169d7efe8d68ae6ee3"
+            "m_Id": "49ce52a4baac48cd9884695797083284"
         },
         {
             "m_Id": "2b40c842bade4bedb8356b56bdf43c4b"
@@ -1570,6 +1852,7 @@
     "m_DisplayName": "Out",
     "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "Out",
     "m_StageCapability": 3,
     "m_Value": {
@@ -1629,6 +1912,7 @@
     "m_DisplayName": "Out",
     "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "Out",
     "m_StageCapability": 3,
     "m_Value": {
@@ -1642,7 +1926,8 @@
         "y": 0.0,
         "z": 0.0,
         "w": 0.0
-    }
+    },
+    "m_LiteralMode": true
 }
 
 {
@@ -1653,6 +1938,7 @@
     "m_DisplayName": "Out",
     "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "Out",
     "m_StageCapability": 3,
     "m_Value": {
@@ -1678,6 +1964,7 @@
     "m_DisplayName": "Out",
     "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "Out",
     "m_StageCapability": 3,
     "m_Value": {
@@ -1691,7 +1978,8 @@
         "y": 0.0,
         "z": 0.0,
         "w": 0.0
-    }
+    },
+    "m_LiteralMode": true
 }
 
 {
@@ -1755,11 +2043,13 @@
     "m_DisplayName": "Cutoff",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "_Cutoff",
     "m_StageCapability": 2,
     "m_Value": 0.0,
-    "m_DefaultValue": 0.0,
-    "m_Labels": []
+    "m_DefaultValue": 0.5,
+    "m_Labels": [],
+    "m_LiteralMode": false
 }
 
 {
@@ -1770,6 +2060,7 @@
     "m_DisplayName": "False",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "False",
     "m_StageCapability": 3,
     "m_Value": {
@@ -1783,67 +2074,8 @@
         "y": 0.0,
         "z": 0.0,
         "w": 0.0
-    }
-}
-
-{
-    "m_SGVersion": 0,
-    "m_Type": "UnityEditor.ShaderGraph.RectTransformSizeNode",
-    "m_ObjectId": "6e28dc0a731b47a3bd532902ebfeede4",
-    "m_Group": {
-        "m_Id": ""
-    },
-    "m_Name": "RectTransform Size",
-    "m_DrawState": {
-        "m_Expanded": true,
-        "m_Position": {
-            "serializedVersion": "2",
-            "x": -1112.4998779296875,
-            "y": 693.5,
-            "width": 156.49993896484376,
-            "height": 76.99993896484375
-        }
     },
-    "m_Slots": [
-        {
-            "m_Id": "cd7b17cc88624bdea99850cc2ecf98c0"
-        },
-        {
-            "m_Id": "6f7a9d43fea44378a59156b9868c3f55"
-        },
-        {
-            "m_Id": "be751d676daf46a6b6a2f65530599514"
-        }
-    ],
-    "synonyms": [],
-    "m_Precision": 0,
-    "m_PreviewExpanded": true,
-    "m_DismissedVersion": 0,
-    "m_PreviewMode": 0,
-    "m_CustomColors": {
-        "m_SerializableColors": []
-    },
-    "previewSize": {
-        "x": 100.0,
-        "y": 100.0
-    },
-    "previewScaleFactor": 1.0,
-    "previewPixelsPerUnit": 100.0
-}
-
-{
-    "m_SGVersion": 0,
-    "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
-    "m_ObjectId": "6f7a9d43fea44378a59156b9868c3f55",
-    "m_Id": 1,
-    "m_DisplayName": "Scale Factor",
-    "m_SlotType": 1,
-    "m_Hidden": false,
-    "m_ShaderOutputName": "_CanvasScaleFactor",
-    "m_StageCapability": 3,
-    "m_Value": 1.0,
-    "m_DefaultValue": 1.0,
-    "m_Labels": []
+    "m_LiteralMode": false
 }
 
 {
@@ -1854,11 +2086,13 @@
     "m_DisplayName": "Stroke",
     "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "Stroke",
     "m_StageCapability": 3,
     "m_Value": 0.0,
     "m_DefaultValue": 0.0,
-    "m_Labels": []
+    "m_Labels": [],
+    "m_LiteralMode": false
 }
 
 {
@@ -1869,11 +2103,13 @@
     "m_DisplayName": "Out",
     "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "Out",
     "m_StageCapability": 2,
     "m_Value": 0.0,
     "m_DefaultValue": 0.0,
-    "m_Labels": []
+    "m_Labels": [],
+    "m_LiteralMode": false
 }
 
 {
@@ -1884,6 +2120,7 @@
     "m_DisplayName": "True",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "True",
     "m_StageCapability": 3,
     "m_Value": {
@@ -1897,7 +2134,8 @@
         "y": 0.0,
         "z": 0.0,
         "w": 0.0
-    }
+    },
+    "m_LiteralMode": false
 }
 
 {
@@ -1962,6 +2200,7 @@
     "m_DisplayName": "Out",
     "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "Out",
     "m_StageCapability": 3,
     "m_Value": {
@@ -1975,22 +2214,21 @@
         "y": 0.0,
         "z": 0.0,
         "w": 0.0
-    }
+    },
+    "m_LiteralMode": true
 }
 
 {
     "m_SGVersion": 0,
-    "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
-    "m_ObjectId": "7997b9eaed5042adb724726c5ab2b68f",
-    "m_Id": 1,
-    "m_DisplayName": "State",
-    "m_SlotType": 1,
-    "m_Hidden": false,
-    "m_ShaderOutputName": "State",
-    "m_StageCapability": 3,
-    "m_Value": 0.0,
-    "m_DefaultValue": 0.0,
-    "m_Labels": []
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasData",
+    "m_ObjectId": "770b75583f6740d3bff3f12c44630008",
+    "supportsMotionVectors": false
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasSubTarget",
+    "m_ObjectId": "786640f9ee3344dbb15a7654dbef302f"
 }
 
 {
@@ -2094,6 +2332,7 @@
     "m_DisplayName": "",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "",
     "m_StageCapability": 3,
     "m_Value": false,
@@ -2152,6 +2391,7 @@
     "m_DisplayName": "B",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "B",
     "m_StageCapability": 3,
     "m_Value": {
@@ -2200,11 +2440,13 @@
     "m_DisplayName": "Cutoff",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "_Cutoff",
     "m_StageCapability": 2,
     "m_Value": 0.0,
-    "m_DefaultValue": 0.0,
-    "m_Labels": []
+    "m_DefaultValue": 0.5,
+    "m_Labels": [],
+    "m_LiteralMode": false
 }
 
 {
@@ -2215,6 +2457,7 @@
     "m_DisplayName": "Out",
     "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "Out",
     "m_StageCapability": 3,
     "m_Value": {
@@ -2228,7 +2471,8 @@
         "y": 0.0,
         "z": 0.0,
         "w": 0.0
-    }
+    },
+    "m_LiteralMode": false
 }
 
 {
@@ -2239,11 +2483,30 @@
     "m_DisplayName": "Stroke Thickness",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "_Stroke_Thickness",
     "m_StageCapability": 3,
     "m_Value": 0.05000000074505806,
-    "m_DefaultValue": 0.0,
-    "m_Labels": []
+    "m_DefaultValue": 0.10000000149011612,
+    "m_Labels": [],
+    "m_LiteralMode": false
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
+    "m_ObjectId": "919e2eac97434e7683028cac7ea04376",
+    "m_Id": -2106065226,
+    "m_DisplayName": "PreviewPPU",
+    "m_SlotType": 0,
+    "m_Hidden": false,
+    "m_HideConnector": true,
+    "m_ShaderOutputName": "_PreviewPPU",
+    "m_StageCapability": 3,
+    "m_Value": 100.0,
+    "m_DefaultValue": 100.0,
+    "m_Labels": [],
+    "m_LiteralMode": false
 }
 
 {
@@ -2285,6 +2548,12 @@
     }
 }
 
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasSubTarget",
+    "m_ObjectId": "93d4f58b92b34b30a417d57972928aa3"
+}
+
 {
     "m_SGVersion": 0,
     "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
@@ -2293,11 +2562,13 @@
     "m_DisplayName": "Fill",
     "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "Fill",
     "m_StageCapability": 3,
     "m_Value": 0.0,
     "m_DefaultValue": 0.0,
-    "m_Labels": []
+    "m_Labels": [],
+    "m_LiteralMode": false
 }
 
 {
@@ -2308,6 +2579,7 @@
     "m_DisplayName": "A",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "A",
     "m_StageCapability": 3,
     "m_Value": {
@@ -2356,11 +2628,13 @@
     "m_DisplayName": "SDFStroke",
     "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "SDFStroke",
     "m_StageCapability": 3,
     "m_Value": 0.0,
     "m_DefaultValue": 0.0,
-    "m_Labels": []
+    "m_Labels": [],
+    "m_LiteralMode": false
 }
 
 {
@@ -2371,12 +2645,62 @@
     "m_DisplayName": "B",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "B",
     "m_StageCapability": 3,
     "m_Value": false,
     "m_DefaultValue": false
 }
 
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasData",
+    "m_ObjectId": "9faba2e0409944e4974405ecba3e0d98",
+    "supportsMotionVectors": false
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.SubGraphNode",
+    "m_ObjectId": "a150798fce484d34b3e927c0d81685b0",
+    "m_Group": {
+        "m_Id": ""
+    },
+    "m_Name": "Selectable State",
+    "m_DrawState": {
+        "m_Expanded": true,
+        "m_Position": {
+            "serializedVersion": "2",
+            "x": -2589.999755859375,
+            "y": 199.99998474121095,
+            "width": 256.0,
+            "height": 122.99998474121094
+        }
+    },
+    "m_Slots": [
+        {
+            "m_Id": "0f875bffc5c14c63b134e58a86face7a"
+        }
+    ],
+    "synonyms": [],
+    "m_Precision": 0,
+    "m_PreviewExpanded": false,
+    "m_DismissedVersion": 0,
+    "m_PreviewMode": 0,
+    "m_CustomColors": {
+        "m_SerializableColors": []
+    },
+    "m_SerializedSubGraph": "{\n    \"subGraph\": {\n        \"fileID\": -5475051401550479605,\n        \"guid\": \"9cc8eedec3988455885bdb12866a33d6\",\n        \"type\": 3\n    }\n}",
+    "m_PropertyGuids": [],
+    "m_PropertyIds": [],
+    "m_Dropdowns": [
+        "_Preview"
+    ],
+    "m_DropdownSelectedEntries": [
+        "Normal"
+    ]
+}
+
 {
     "m_SGVersion": 0,
     "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot",
@@ -2385,6 +2709,7 @@
     "m_DisplayName": "True",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "True",
     "m_StageCapability": 3,
     "m_Value": {
@@ -2398,7 +2723,8 @@
         "y": 0.0,
         "z": 0.0,
         "w": 0.0
-    }
+    },
+    "m_LiteralMode": false
 }
 
 {
@@ -2409,6 +2735,7 @@
     "m_DisplayName": "False",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "False",
     "m_StageCapability": 3,
     "m_Value": {
@@ -2422,7 +2749,8 @@
         "y": 0.0,
         "z": 0.0,
         "w": 0.0
-    }
+    },
+    "m_LiteralMode": false
 }
 
 {
@@ -2433,6 +2761,7 @@
     "m_DisplayName": "Width Height",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "_Width_Height",
     "m_StageCapability": 3,
     "m_Value": {
@@ -2454,12 +2783,19 @@
     "m_DisplayName": "IsNormal",
     "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "IsNormal",
     "m_StageCapability": 3,
     "m_Value": false,
     "m_DefaultValue": false
 }
 
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasSubTarget",
+    "m_ObjectId": "a73a4874f79b46329c1e3f2bad509a45"
+}
+
 {
     "m_SGVersion": 0,
     "m_Type": "UnityEditor.ShaderGraph.BooleanMaterialSlot",
@@ -2468,12 +2804,19 @@
     "m_DisplayName": "Keep Aspect Ratio",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "_Keep_Aspect_Ratio",
     "m_StageCapability": 3,
     "m_Value": true,
     "m_DefaultValue": false
 }
 
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasSubTarget",
+    "m_ObjectId": "ad0511b594294cf9ba9546e82b5dbf19"
+}
+
 {
     "m_SGVersion": 0,
     "m_Type": "UnityEditor.ShaderGraph.Vector2MaterialSlot",
@@ -2482,6 +2825,7 @@
     "m_DisplayName": "Size",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "_Size",
     "m_StageCapability": 3,
     "m_Value": {
@@ -2495,6 +2839,26 @@
     "m_Labels": []
 }
 
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.StickyNoteData",
+    "m_ObjectId": "afef8439bd5e4994845594c96b835f97",
+    "m_Title": "RectTransform Size",
+    "m_Content": "This subgraph promotes a hidden \"_RectTransformSize\" Vector4 property and allows changing the preview value with a slider.\n\nUse with the RectTransform Size component from the Samples.\nSize = RectTransform's Size in Canvas space.\nScale Factor = Canvas Scale Factor\nPixel Per Unit = Canvas PPU",
+    "m_TextSize": 0,
+    "m_Theme": 1,
+    "m_Position": {
+        "serializedVersion": "2",
+        "x": -1438.0,
+        "y": 759.0,
+        "width": 312.0,
+        "height": 159.0
+    },
+    "m_Group": {
+        "m_Id": ""
+    }
+}
+
 {
     "m_SGVersion": 0,
     "m_Type": "UnityEditor.ShaderGraph.ColorRGBMaterialSlot",
@@ -2503,6 +2867,7 @@
     "m_DisplayName": "Base Color",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "BaseColor",
     "m_StageCapability": 2,
     "m_Value": {
@@ -2533,6 +2898,7 @@
     "m_DisplayName": "In",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "In",
     "m_StageCapability": 3,
     "m_Value": {
@@ -2546,7 +2912,8 @@
         "y": 0.0,
         "z": 0.0,
         "w": 0.0
-    }
+    },
+    "m_LiteralMode": false
 }
 
 {
@@ -2557,6 +2924,7 @@
     "m_DisplayName": "",
     "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "",
     "m_StageCapability": 3,
     "m_Value": {
@@ -2570,7 +2938,8 @@
         "y": 0.0,
         "z": 0.0,
         "w": 0.0
-    }
+    },
+    "m_LiteralMode": true
 }
 
 {
@@ -2614,17 +2983,9 @@
 
 {
     "m_SGVersion": 0,
-    "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
-    "m_ObjectId": "be751d676daf46a6b6a2f65530599514",
-    "m_Id": 2,
-    "m_DisplayName": "Pixel Per Unit",
-    "m_SlotType": 1,
-    "m_Hidden": false,
-    "m_ShaderOutputName": "_CanvasPixelPerUnit",
-    "m_StageCapability": 3,
-    "m_Value": 100.0,
-    "m_DefaultValue": 100.0,
-    "m_Labels": []
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasData",
+    "m_ObjectId": "c1e7ee39856a45b3ab5d7e007395d447",
+    "supportsMotionVectors": false
 }
 
 {
@@ -2667,86 +3028,105 @@
 
 {
     "m_SGVersion": 0,
-    "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
-    "m_ObjectId": "c92cdb57714e452c86f5b0738d528c1f",
-    "m_Id": 0,
-    "m_DisplayName": "State",
-    "m_SlotType": 1,
-    "m_Hidden": false,
-    "m_ShaderOutputName": "_State",
-    "m_StageCapability": 3,
-    "m_Value": 0.0,
-    "m_DefaultValue": 0.0,
-    "m_Labels": []
-}
-
-{
-    "m_SGVersion": 0,
-    "m_Type": "UnityEditor.ShaderGraph.Vector2MaterialSlot",
-    "m_ObjectId": "cd7b17cc88624bdea99850cc2ecf98c0",
-    "m_Id": 0,
-    "m_DisplayName": "Size",
-    "m_SlotType": 1,
-    "m_Hidden": false,
-    "m_ShaderOutputName": "_RectTransformSize",
-    "m_StageCapability": 3,
-    "m_Value": {
-        "x": 1.0,
-        "y": 1.0
-    },
-    "m_DefaultValue": {
-        "x": 100.0,
-        "y": 100.0
-    },
-    "m_Labels": []
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasData",
+    "m_ObjectId": "c373f1894323494b8c901d0dde2cbffd",
+    "supportsMotionVectors": false
 }
 
 {
     "m_SGVersion": 0,
-    "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
-    "m_ObjectId": "cf4ba0b27baf40d09947e73f08e92126",
-    "m_Id": 747429537,
-    "m_DisplayName": "Edge Min",
-    "m_SlotType": 0,
-    "m_Hidden": false,
-    "m_ShaderOutputName": "_Edge_Min",
-    "m_StageCapability": 3,
-    "m_Value": 0.0,
-    "m_DefaultValue": 0.0,
-    "m_Labels": []
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasData",
+    "m_ObjectId": "cafe4dfb66fa41449a2bbf6804a520f5",
+    "supportsMotionVectors": false
 }
 
 {
     "m_SGVersion": 0,
-    "m_Type": "UnityEditor.ShaderGraph.SelectableStateNode",
-    "m_ObjectId": "d053b21c961d4995a06b47e74b4c2409",
+    "m_Type": "UnityEditor.ShaderGraph.SubGraphNode",
+    "m_ObjectId": "cba10278e71341cfa711a71ceff9e96c",
     "m_Group": {
         "m_Id": ""
     },
-    "m_Name": "Selectable State",
+    "m_Name": "Rect Transform Size",
     "m_DrawState": {
         "m_Expanded": true,
         "m_Position": {
             "serializedVersion": "2",
-            "x": -2716.0,
-            "y": 200.0,
-            "width": 140.0,
-            "height": 77.0
+            "x": -1120.9998779296875,
+            "y": 693.9999389648438,
+            "width": 164.99993896484376,
+            "height": 228.00006103515626
         }
     },
     "m_Slots": [
         {
-            "m_Id": "c92cdb57714e452c86f5b0738d528c1f"
+            "m_Id": "1b6ed496c51443959f30c26a222a881f"
+        },
+        {
+            "m_Id": "1a0e89db2d1a4800af8c6f950c630976"
+        },
+        {
+            "m_Id": "3ff640d3b74a4178b36a66cca7147aeb"
+        },
+        {
+            "m_Id": "919e2eac97434e7683028cac7ea04376"
+        },
+        {
+            "m_Id": "19d0ec887cd94777aa85d6aa1f1ab03d"
+        },
+        {
+            "m_Id": "0a9e22ff1bf245dc981597aa513eecb9"
+        },
+        {
+            "m_Id": "37878e68159948e3b166c731f742fa40"
         }
     ],
     "synonyms": [],
     "m_Precision": 0,
-    "m_PreviewExpanded": true,
+    "m_PreviewExpanded": false,
     "m_DismissedVersion": 0,
     "m_PreviewMode": 0,
     "m_CustomColors": {
         "m_SerializableColors": []
-    }
+    },
+    "m_SerializedSubGraph": "{\n    \"subGraph\": {\n        \"fileID\": -5475051401550479605,\n        \"guid\": \"aa041986c041b4dc1b5bf0b2cd2d86e8\",\n        \"type\": 3\n    }\n}",
+    "m_PropertyGuids": [
+        "975f2db3-e792-46e7-9bf8-3a4cbe4fb068",
+        "373c703c-395b-43d3-91ba-78b9497021e7",
+        "2747a643-8db3-4ffc-9923-55aa70fb2549",
+        "451bbdf7-6136-4a6e-a5c8-4918d2ea4b95"
+    ],
+    "m_PropertyIds": [
+        -181240572,
+        716604351,
+        -1949568231,
+        -2106065226
+    ],
+    "m_Dropdowns": [],
+    "m_DropdownSelectedEntries": []
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
+    "m_ObjectId": "cf4ba0b27baf40d09947e73f08e92126",
+    "m_Id": 747429537,
+    "m_DisplayName": "Edge Min",
+    "m_SlotType": 0,
+    "m_Hidden": false,
+    "m_HideConnector": false,
+    "m_ShaderOutputName": "_Edge_Min",
+    "m_StageCapability": 3,
+    "m_Value": 0.0,
+    "m_DefaultValue": 0.0,
+    "m_Labels": [],
+    "m_LiteralMode": false
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasSubTarget",
+    "m_ObjectId": "d0a4787e344f48f5a85fe74bb0000b0c"
 }
 
 {
@@ -2757,6 +3137,7 @@
     "m_DisplayName": "False",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "False",
     "m_StageCapability": 3,
     "m_Value": {
@@ -2770,7 +3151,8 @@
         "y": 0.0,
         "z": 0.0,
         "w": 0.0
-    }
+    },
+    "m_LiteralMode": false
 }
 
 {
@@ -2779,8 +3161,8 @@
     "m_ObjectId": "d23ccb49d0e14387b259d3fc88498036",
     "m_Title": "Emission",
     "m_Position": {
-        "x": -1454.66650390625,
-        "y": 41.333351135253909
+        "x": -1454.0001220703125,
+        "y": 40.99996566772461
     }
 }
 
@@ -2798,6 +3180,7 @@
     "m_DisplayName": "A",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "A",
     "m_StageCapability": 3,
     "m_Value": false,
@@ -2812,12 +3195,20 @@
     "m_DisplayName": "IsSelected",
     "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "IsSelected",
     "m_StageCapability": 3,
     "m_Value": false,
     "m_DefaultValue": false
 }
 
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasData",
+    "m_ObjectId": "dd2d0b7f72cd40b5b04a235ffee51a1b",
+    "supportsMotionVectors": false
+}
+
 {
     "m_SGVersion": 0,
     "m_Type": "UnityEditor.ShaderGraph.BooleanMaterialSlot",
@@ -2826,6 +3217,7 @@
     "m_DisplayName": "Stroke Thickness Relative",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "_Stroke_Thickness_Relative",
     "m_StageCapability": 3,
     "m_Value": true,
@@ -2840,6 +3232,7 @@
     "m_DisplayName": "B",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "B",
     "m_StageCapability": 3,
     "m_Value": {
@@ -2853,16 +3246,28 @@
         "y": 0.0,
         "z": 0.0,
         "w": 0.0
-    }
+    },
+    "m_LiteralMode": false
 }
 
 {
     "m_SGVersion": 0,
-    "m_Type": "UnityEditor.Rendering.Canvas.ShaderGraph.CanvasData",
-    "m_ObjectId": "e374f274ad5647f9975e02c32eea14bd",
-    "m_Version": 0,
-    "m_AlphaClip": false,
-    "m_DisableTint": true
+    "m_Type": "UnityEditor.ShaderGraph.StickyNoteData",
+    "m_ObjectId": "e044f5bf2e6c43478740e939da2a06d8",
+    "m_Title": "Graphic Color",
+    "m_Content": "A Subgraph using a Custom Function to convert Color Space if required, based on the Canvas Color Space.\n\nDisable Color Tint from the Graph Settings not to tint the final output.",
+    "m_TextSize": 0,
+    "m_Theme": 1,
+    "m_Position": {
+        "serializedVersion": "2",
+        "x": -873.0,
+        "y": 186.0,
+        "width": 170.0,
+        "height": 151.0
+    },
+    "m_Group": {
+        "m_Id": "41865192232b4142b0b2db733500ca91"
+    }
 }
 
 {
@@ -2965,71 +3370,33 @@
 
 {
     "m_SGVersion": 0,
-    "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
-    "m_ObjectId": "eaca5acb307b4e5cad2b5e2ae96e47e2",
-    "m_Id": 830530724,
-    "m_DisplayName": "State",
-    "m_SlotType": 0,
-    "m_Hidden": false,
-    "m_ShaderOutputName": "_State",
-    "m_StageCapability": 3,
-    "m_Value": 0.0,
-    "m_DefaultValue": 0.0,
-    "m_Labels": []
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasData",
+    "m_ObjectId": "ec0773b35401476ea81c2e6afc45d427",
+    "supportsMotionVectors": false
 }
 
 {
     "m_SGVersion": 0,
-    "m_Type": "UnityEditor.ShaderGraph.BooleanMaterialSlot",
-    "m_ObjectId": "f08e084ed8864ec28a3b0dcb652ccb03",
-    "m_Id": 0,
-    "m_DisplayName": "Predicate",
-    "m_SlotType": 0,
-    "m_Hidden": false,
-    "m_ShaderOutputName": "Predicate",
-    "m_StageCapability": 3,
-    "m_Value": false,
-    "m_DefaultValue": false
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasData",
+    "m_ObjectId": "ef3ad75715cb4c11b9e3357285c4829f",
+    "supportsMotionVectors": false
 }
 
 {
     "m_SGVersion": 0,
     "m_Type": "UnityEditor.ShaderGraph.BooleanMaterialSlot",
-    "m_ObjectId": "f2115f407dec4a39ac4140014414379e",
+    "m_ObjectId": "f08e084ed8864ec28a3b0dcb652ccb03",
     "m_Id": 0,
-    "m_DisplayName": "State",
-    "m_SlotType": 1,
+    "m_DisplayName": "Predicate",
+    "m_SlotType": 0,
     "m_Hidden": false,
-    "m_ShaderOutputName": "_isOn",
+    "m_HideConnector": false,
+    "m_ShaderOutputName": "Predicate",
     "m_StageCapability": 3,
     "m_Value": false,
     "m_DefaultValue": false
 }
 
-{
-    "m_SGVersion": 0,
-    "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot",
-    "m_ObjectId": "f2261588d28d47169d7efe8d68ae6ee3",
-    "m_Id": 0,
-    "m_DisplayName": "In",
-    "m_SlotType": 0,
-    "m_Hidden": false,
-    "m_ShaderOutputName": "In",
-    "m_StageCapability": 3,
-    "m_Value": {
-        "x": 0.0,
-        "y": 0.0,
-        "z": 0.0,
-        "w": 0.0
-    },
-    "m_DefaultValue": {
-        "x": 0.0,
-        "y": 0.0,
-        "z": 0.0,
-        "w": 0.0
-    }
-}
-
 {
     "m_SGVersion": 0,
     "m_Type": "UnityEditor.ShaderGraph.Vector4Node",
@@ -3086,6 +3453,19 @@
     }
 }
 
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasData",
+    "m_ObjectId": "f795741071454171a540b0e05ba89099",
+    "supportsMotionVectors": false
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDCanvasSubTarget",
+    "m_ObjectId": "f84934c605d0438b9d9b65af0e04993e"
+}
+
 {
     "m_SGVersion": 1,
     "m_Type": "UnityEditor.ShaderGraph.ColorNode",
@@ -3138,6 +3518,7 @@
     "m_DisplayName": "IsDisabled",
     "m_SlotType": 1,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "IsDisabled",
     "m_StageCapability": 3,
     "m_Value": false,
@@ -3202,6 +3583,7 @@
     "m_DisplayName": "Predicate",
     "m_SlotType": 0,
     "m_Hidden": false,
+    "m_HideConnector": false,
     "m_ShaderOutputName": "Predicate",
     "m_StageCapability": 3,
     "m_Value": false,
diff --git a/Packages/com.unity.shadergraph/Samples~/UGUIShaders/Scenes/UISampleScene.unity b/Packages/com.unity.shadergraph/Samples~/UGUIShaders/Scenes/UISampleScene.unity
index 535ec82ff0f..1b0673be55a 100644
--- a/Packages/com.unity.shadergraph/Samples~/UGUIShaders/Scenes/UISampleScene.unity
+++ b/Packages/com.unity.shadergraph/Samples~/UGUIShaders/Scenes/UISampleScene.unity
@@ -532,6 +532,7 @@ MonoBehaviour:
   m_VerticalAlignment: 512
   m_textAlignment: 65535
   m_characterSpacing: 0
+  m_characterHorizontalScale: 1
   m_wordSpacing: 0
   m_lineSpacing: 0
   m_lineSpacingMax: 0
@@ -1026,6 +1027,7 @@ MonoBehaviour:
   m_VerticalAlignment: 512
   m_textAlignment: 65535
   m_characterSpacing: 0
+  m_characterHorizontalScale: 1
   m_wordSpacing: 0
   m_lineSpacing: 0
   m_lineSpacingMax: 0
@@ -1475,6 +1477,7 @@ MonoBehaviour:
   m_VerticalAlignment: 512
   m_textAlignment: 65535
   m_characterSpacing: 0
+  m_characterHorizontalScale: 1
   m_wordSpacing: 0
   m_lineSpacing: 0
   m_lineSpacingMax: 0
@@ -2737,9 +2740,7 @@ PrefabInstance:
         memory, can be authored and edited directly in Shader Graph inside of Unity,
         automatically adapt to aspect ratio, and contain all visual states and behaviors.\r\n\nTo
         get started exploring the content, enter Play mode and then click on one
-        of the tabs to the left.\n\nNote: If you are using the New Input System,
-        you need to select the EventSystem GameObject and click on \"Replace with
-        InputSystemUIInputModule.\""
+        of the tabs to the left."
       objectReference: {fileID: 0}
     - target: {fileID: 4262581316619277117, guid: abd54f4572036c549b81c1816521a3b1, type: 3}
       propertyPath: m_SizeDelta.x
@@ -3134,17 +3135,28 @@ MonoBehaviour:
   m_GameObject: {fileID: 1084802477}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 4f231c4fb786f3946a6b90b886c48677, type: 3}
+  m_Script: {fileID: 11500000, guid: 01614664b831546d2ae94a42149d80ac, type: 3}
   m_Name: 
-  m_EditorClassIdentifier: 
+  m_EditorClassIdentifier: Unity.InputSystem::UnityEngine.InputSystem.UI.InputSystemUIInputModule
   m_SendPointerHoverToParent: 1
-  m_HorizontalAxis: Horizontal
-  m_VerticalAxis: Vertical
-  m_SubmitButton: Submit
-  m_CancelButton: Cancel
-  m_InputActionsPerSecond: 10
-  m_RepeatDelay: 0.5
-  m_ForceModuleActive: 0
+  m_MoveRepeatDelay: 0.5
+  m_MoveRepeatRate: 0.1
+  m_XRTrackingOrigin: {fileID: 0}
+  m_ActionsAsset: {fileID: -944628639613478452, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3}
+  m_PointAction: {fileID: -1654692200621890270, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3}
+  m_MoveAction: {fileID: -8784545083839296357, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3}
+  m_SubmitAction: {fileID: 392368643174621059, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3}
+  m_CancelAction: {fileID: 7727032971491509709, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3}
+  m_LeftClickAction: {fileID: 3001919216989983466, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3}
+  m_MiddleClickAction: {fileID: -2185481485913320682, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3}
+  m_RightClickAction: {fileID: -4090225696740746782, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3}
+  m_ScrollWheelAction: {fileID: 6240969308177333660, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3}
+  m_TrackedDevicePositionAction: {fileID: 6564999863303420839, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3}
+  m_TrackedDeviceOrientationAction: {fileID: 7970375526676320489, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3}
+  m_DeselectOnBackgroundClick: 1
+  m_PointerBehavior: 0
+  m_CursorLockBehavior: 0
+  m_ScrollDeltaPerTick: 6
 --- !u!1 &1096159063
 GameObject:
   m_ObjectHideFlags: 0
@@ -3767,6 +3779,7 @@ Canvas:
   m_OverridePixelPerfect: 0
   m_SortingBucketNormalizedSize: 0
   m_VertexColorAlwaysGammaSpace: 1
+  m_UseReflectionProbes: 0
   m_AdditionalShaderChannelsFlag: 25
   m_UpdateRectTransformForStandalone: 0
   m_SortingLayerID: 0
@@ -3859,6 +3872,8 @@ MeshRenderer:
   m_RayTracingAccelStructBuildFlagsOverride: 0
   m_RayTracingAccelStructBuildFlags: 1
   m_SmallMeshCulling: 1
+  m_ForceMeshLod: -1
+  m_MeshLodSelectionBias: 0
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
@@ -3880,9 +3895,11 @@ MeshRenderer:
   m_AutoUVMaxDistance: 0.5
   m_AutoUVMaxAngle: 89
   m_LightmapParameters: {fileID: 0}
+  m_GlobalIlluminationMeshLod: 0
   m_SortingLayerID: 0
   m_SortingLayer: 0
   m_SortingOrder: 0
+  m_MaskInteraction: 0
   m_AdditionalVertexStreams: {fileID: 0}
 --- !u!33 &1402949190
 MeshFilter:
diff --git a/Packages/com.unity.shadergraph/Samples~/UGUIShaders/ShaderGraphExtensions/ForceReloadSampleShaderGraphAssets.cs b/Packages/com.unity.shadergraph/Samples~/UGUIShaders/ShaderGraphExtensions/ForceReloadSampleShaderGraphAssets.cs
deleted file mode 100644
index 348fcb1632e..00000000000
--- a/Packages/com.unity.shadergraph/Samples~/UGUIShaders/ShaderGraphExtensions/ForceReloadSampleShaderGraphAssets.cs
+++ /dev/null
@@ -1,64 +0,0 @@
-using System.IO;
-using UnityEditor;
-using UnityEngine;
-using UnityEditor.PackageManager.Requests;
-using UnityEditor.PackageManager;
-
-// As Custom Nodes and Shader Graphs are imported as part of the same samples we need to refresh the assets after nodes have been compiled.
-public static class ForceReloadSampleShaderGraphAssets
-{
-    static readonly string samplesPath = "Assets/Samples/Shader Graph/version/UGUI Shaders";
-    static SearchRequest request;
-    
-    [InitializeOnLoadMethod]
-    static void Init()
-    {
-        request = Client.Search("com.unity.shadergraph", true);
-        EditorApplication.update += Progress;
-    }
-
-    static void Progress()
-    {
-        if (!request.IsCompleted)
-            return;
-        
-        var pkgInfo = request.Result;
-
-        if (request.Status == StatusCode.Success && pkgInfo.Length > 0)
-        {
-            var pkgVersion = pkgInfo[0].version;
-            var searchPath = samplesPath.Replace("version", pkgVersion);
-            var guids = AssetDatabase.FindAssets("t:Shader t:SubGraphAsset", new string[] {searchPath});
-            
-            try
-            {
-                AssetDatabase.StartAssetEditing();
-                foreach (var guid in guids)
-                {
-                    var path = AssetDatabase.GUIDToAssetPath(guid);
-                    var ext = Path.GetExtension(path);
-                    if (ext == ".shadergraph" || ext == ".shadersubgraph")
-                        AssetDatabase.ImportAsset(path, ImportAssetOptions.ForceUpdate | ImportAssetOptions.ForceSynchronousImport);
-                }
-            }
-            catch (System.Exception e)
-            {
-                Debug.LogError($"Error during scripted asset import: {e.Message}");
-            }
-            finally
-            {
-                AssetDatabase.StopAssetEditing();
-            }
-        }
-
-        EditorApplication.update -= Progress;
-
-        // self destruction
-        var thisGuid = AssetDatabase.FindAssets($"t:Script ForceReloadSampleShaderGraphAssets", new string[] {"Assets/Samples/Shader Graph"});
-        if (thisGuid.Length > 0)
-        {
-            AssetDatabase.DeleteAsset(AssetDatabase.GUIDToAssetPath(thisGuid[0]));
-            AssetDatabase.Refresh(ImportAssetOptions.ForceUpdate | ImportAssetOptions.ForceSynchronousImport);
-        }
-    }
-}
diff --git a/Packages/com.unity.shadergraph/Samples~/UGUIShaders/ShaderGraphExtensions/ForceReloadSampleShaderGraphAssets.cs.meta b/Packages/com.unity.shadergraph/Samples~/UGUIShaders/ShaderGraphExtensions/ForceReloadSampleShaderGraphAssets.cs.meta
deleted file mode 100644
index bae10ab24fd..00000000000
--- a/Packages/com.unity.shadergraph/Samples~/UGUIShaders/ShaderGraphExtensions/ForceReloadSampleShaderGraphAssets.cs.meta
+++ /dev/null
@@ -1,2 +0,0 @@
-fileFormatVersion: 2
-guid: b51b32763274e4d45b12638001ad32c8
\ No newline at end of file
diff --git a/Packages/com.unity.shadergraph/Samples~/UGUIShaders/ShaderGraphExtensions/ShaderGraph.Editor.meta b/Packages/com.unity.shadergraph/Samples~/UGUIShaders/ShaderGraphExtensions/ShaderGraph.Editor.meta
deleted file mode 100644
index 41a8808f85a..00000000000
--- a/Packages/com.unity.shadergraph/Samples~/UGUIShaders/ShaderGraphExtensions/ShaderGraph.Editor.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 1d9ff84023eafda4b8e19371e498aaaa
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/Packages/com.unity.shadergraph/Samples~/UGUIShaders/ShaderGraphExtensions/ShaderGraph.Editor/Nodes.meta b/Packages/com.unity.shadergraph/Samples~/UGUIShaders/ShaderGraphExtensions/ShaderGraph.Editor/Nodes.meta
deleted file mode 100644
index 38ecd4b2983..00000000000
--- a/Packages/com.unity.shadergraph/Samples~/UGUIShaders/ShaderGraphExtensions/ShaderGraph.Editor/Nodes.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: b0c9df719f4b6ba4489cca2083dfe221
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/Packages/com.unity.shadergraph/Samples~/UGUIShaders/ShaderGraphExtensions/ShaderGraph.Editor/Nodes/MeterValueNode.cs b/Packages/com.unity.shadergraph/Samples~/UGUIShaders/ShaderGraphExtensions/ShaderGraph.Editor/Nodes/MeterValueNode.cs
deleted file mode 100644
index f66015b83b2..00000000000
--- a/Packages/com.unity.shadergraph/Samples~/UGUIShaders/ShaderGraphExtensions/ShaderGraph.Editor/Nodes/MeterValueNode.cs
+++ /dev/null
@@ -1,48 +0,0 @@
-using System.Collections.Generic;
-using UnityEngine;
-using UnityEditor.Graphing;
-using UnityEditor.ShaderGraph.Internal;
-
-namespace UnityEditor.ShaderGraph
-{
-    [Title("Input", "UGUI", "Meter Value")]
-    class MeterValueNode : AbstractMaterialNode, IGeneratesBodyCode
-    {
-        public MeterValueNode()
-        {
-            name = "Meter Value";
-            UpdateNodeAfterDeserialization();
-        }
-
-        //public override string documentationURL => NodeUtils.GetDocumentationString("MeterValueNode");
-
-        public override bool hasPreview => false;
-
-        public sealed override void UpdateNodeAfterDeserialization()
-        {
-            var slots = new List<int>();
-            MaterialSlot slot0 = new Vector1MaterialSlot(0, "Value", "_MeterValue", SlotType.Output, 0);
-            AddSlot(slot0);
-            slots.Add(0);
-
-            RemoveSlotsNameNotMatching(slots, true);
-        }
-
-        public override void CollectShaderProperties(PropertyCollector properties, GenerationMode generationMode)
-        {
-            properties.AddShaderProperty(new Vector1ShaderProperty
-            {
-                hidden = true,
-                overrideHLSLDeclaration = true,
-                hlslDeclarationOverride = HLSLDeclaration.UnityPerMaterial,
-                value = 0.5f,
-                overrideReferenceName = "_MeterValue"
-            });
-        }
-
-        public void GenerateNodeCode(ShaderStringBuilder sb, GenerationMode generationMode)
-        {
-            sb.AppendLine($"$precision {GetVariableNameForSlot(0)} = _MeterValue;");
-        }
-    }
-}
diff --git a/Packages/com.unity.shadergraph/Samples~/UGUIShaders/ShaderGraphExtensions/ShaderGraph.Editor/Nodes/MeterValueNode.cs.meta b/Packages/com.unity.shadergraph/Samples~/UGUIShaders/ShaderGraphExtensions/ShaderGraph.Editor/Nodes/MeterValueNode.cs.meta
deleted file mode 100644
index efcc690d713..00000000000
--- a/Packages/com.unity.shadergraph/Samples~/UGUIShaders/ShaderGraphExtensions/ShaderGraph.Editor/Nodes/MeterValueNode.cs.meta
+++ /dev/null
@@ -1,2 +0,0 @@
-fileFormatVersion: 2
-guid: f1859b9b0672e3f43ba9b864efdcc473
diff --git a/Packages/com.unity.shadergraph/Samples~/UGUIShaders/ShaderGraphExtensions/ShaderGraph.Editor/Nodes/RangeBarValueNode.cs b/Packages/com.unity.shadergraph/Samples~/UGUIShaders/ShaderGraphExtensions/ShaderGraph.Editor/Nodes/RangeBarValueNode.cs
deleted file mode 100644
index a65da848459..00000000000
--- a/Packages/com.unity.shadergraph/Samples~/UGUIShaders/ShaderGraphExtensions/ShaderGraph.Editor/Nodes/RangeBarValueNode.cs
+++ /dev/null
@@ -1,58 +0,0 @@
-using System.Collections.Generic;
-using UnityEngine;
-using UnityEditor.Graphing;
-using UnityEditor.ShaderGraph.Internal;
-
-namespace UnityEditor.ShaderGraph
-{
-    [Title("Input", "UGUI", "RangeBar")]
-    class RangeBarNode : AbstractMaterialNode, IGeneratesBodyCode
-    {
-        public RangeBarNode()
-        {
-            name = "RangeBar";
-            UpdateNodeAfterDeserialization();
-        }
-
-        //public override string documentationURL => NodeUtils.GetDocumentationString("SliderValueNode");
-
-        public override bool hasPreview => false;
-
-        public sealed override void UpdateNodeAfterDeserialization()
-        {
-            var slots = new List<int>();
-            MaterialSlot slot0 = new Vector1MaterialSlot(0, "Min", "_RangeValueMin", SlotType.Output, 0);
-            AddSlot(slot0);
-            slots.Add(0);
-
-            MaterialSlot slot1 = new Vector1MaterialSlot(1, "Max", "_RangeValueMax", SlotType.Output, 1);
-            AddSlot(slot1);
-            slots.Add(1);
-
-            MaterialSlot slot2 = new Vector2MaterialSlot(2, "Direction", "_RangeDirection", SlotType.Output, Vector2.zero);
-            AddSlot(slot2);
-            slots.Add(2);
-
-            RemoveSlotsNameNotMatching(slots, true);
-        }
-
-        public override void CollectShaderProperties(PropertyCollector properties, GenerationMode generationMode)
-        {
-            properties.AddShaderProperty(new Vector4ShaderProperty
-            {
-                hidden = true,
-                overrideHLSLDeclaration = true,
-                hlslDeclarationOverride = HLSLDeclaration.UnityPerMaterial,
-                value = Vector4.zero,
-                overrideReferenceName = "_RangeBarValue"
-            });
-        }
-
-        public void GenerateNodeCode(ShaderStringBuilder sb, GenerationMode generationMode)
-        {
-            sb.AppendLine($"$precision {GetVariableNameForSlot(0)} = _RangeBarValue.x;");
-            sb.AppendLine($"$precision {GetVariableNameForSlot(1)} = _RangeBarValue.y;");
-            sb.AppendLine($"$precision2 {GetVariableNameForSlot(2)} = _RangeBarValue.zw;");
-        }
-    }
-}
diff --git a/Packages/com.unity.shadergraph/Samples~/UGUIShaders/ShaderGraphExtensions/ShaderGraph.Editor/Nodes/RangeBarValueNode.cs.meta b/Packages/com.unity.shadergraph/Samples~/UGUIShaders/ShaderGraphExtensions/ShaderGraph.Editor/Nodes/RangeBarValueNode.cs.meta
deleted file mode 100644
index 465d32eace1..00000000000
--- a/Packages/com.unity.shadergraph/Samples~/UGUIShaders/ShaderGraphExtensions/ShaderGraph.Editor/Nodes/RangeBarValueNode.cs.meta
+++ /dev/null
@@ -1,2 +0,0 @@
-fileFormatVersion: 2
-guid: 82221b3f1485d7d43a0bd638a3a5245c
diff --git a/Packages/com.unity.shadergraph/Samples~/UGUIShaders/ShaderGraphExtensions/ShaderGraph.Editor/Nodes/RectTransformSizeNode.cs b/Packages/com.unity.shadergraph/Samples~/UGUIShaders/ShaderGraphExtensions/ShaderGraph.Editor/Nodes/RectTransformSizeNode.cs
deleted file mode 100644
index 4d4d4bd07ee..00000000000
--- a/Packages/com.unity.shadergraph/Samples~/UGUIShaders/ShaderGraphExtensions/ShaderGraph.Editor/Nodes/RectTransformSizeNode.cs
+++ /dev/null
@@ -1,66 +0,0 @@
-using System.Collections.Generic;
-using UnityEngine;
-using UnityEditor.Graphing;
-using UnityEditor.ShaderGraph.Internal;
-
-namespace UnityEditor.ShaderGraph
-{
-    [Title("Input", "UGUI", "RectTransform Size")]
-    class RectTransformSizeNode : AbstractMaterialNode, IGeneratesBodyCode
-    {
-        [SerializeField] Vector2 previewSize = Vector2.one * 100;
-        public Vector2 PreviewSize { get => previewSize; set => previewSize = value; }
-
-        [SerializeField] float previewScaleFactor = 1.0f;
-        public float PreviewScaleFactor { get => previewScaleFactor; set => previewScaleFactor = value; }
-
-        [SerializeField] float previewPixelsPerUnit = 100f;
-        public float PreviewPixelsPerUnit { get => previewPixelsPerUnit; set => previewPixelsPerUnit = value; }
-
-        public Vector4 PreviewValue => new Vector4(previewSize.x, previewSize.y, previewScaleFactor, previewPixelsPerUnit);
-
-        public RectTransformSizeNode()
-        {
-            name = "RectTransform Size";
-            UpdateNodeAfterDeserialization();
-        }
-
-        //public override string documentationURL => NodeUtils.GetDocumentationString("RectTransformSizeNode");
-
-        public override bool hasPreview => false;
-
-        public sealed override void UpdateNodeAfterDeserialization()
-        {
-            var slots = new List<int>();
-            MaterialSlot slot = new Vector2MaterialSlot(0, "Size", "_RectTransformSize", SlotType.Output, PreviewSize);
-            AddSlot(slot);
-            slots.Add(0);
-            MaterialSlot slot1 = new Vector1MaterialSlot(1, "Scale Factor", "_CanvasScaleFactor", SlotType.Output, PreviewScaleFactor);
-            AddSlot(slot1);
-            slots.Add(1);
-            MaterialSlot slot2 = new Vector1MaterialSlot(2, "Pixel Per Unit", "_CanvasPixelPerUnit", SlotType.Output, PreviewPixelsPerUnit);
-            AddSlot(slot2);
-            slots.Add(2);
-            RemoveSlotsNameNotMatching(slots, true);
-        }
-
-        public override void CollectShaderProperties(PropertyCollector properties, GenerationMode generationMode)
-        {
-            properties.AddShaderProperty(new Vector4ShaderProperty
-            {
-                hidden = true,
-                overrideHLSLDeclaration = true,
-                hlslDeclarationOverride = HLSLDeclaration.UnityPerMaterial,
-                value = PreviewValue,
-                overrideReferenceName = "_RectTransformInfo"
-            });
-        }
-
-        public void GenerateNodeCode(ShaderStringBuilder sb, GenerationMode generationMode)
-        {
-            sb.AppendLine($"$precision2 {GetVariableNameForSlot(0)} = _RectTransformInfo.xy;");
-            sb.AppendLine($"$precision {GetVariableNameForSlot(1)} = _RectTransformInfo.z;");
-            sb.AppendLine($"$precision {GetVariableNameForSlot(2)} = _RectTransformInfo.w;");
-        }
-    }
-}
diff --git a/Packages/com.unity.shadergraph/Samples~/UGUIShaders/ShaderGraphExtensions/ShaderGraph.Editor/Nodes/RectTransformSizeNode.cs.meta b/Packages/com.unity.shadergraph/Samples~/UGUIShaders/ShaderGraphExtensions/ShaderGraph.Editor/Nodes/RectTransformSizeNode.cs.meta
deleted file mode 100644
index 664aa21d610..00000000000
--- a/Packages/com.unity.shadergraph/Samples~/UGUIShaders/ShaderGraphExtensions/ShaderGraph.Editor/Nodes/RectTransformSizeNode.cs.meta
+++ /dev/null
@@ -1,2 +0,0 @@
-fileFormatVersion: 2
-guid: ecdfa97f80983184d902b9311ebc6d5b
diff --git a/Packages/com.unity.shadergraph/Samples~/UGUIShaders/ShaderGraphExtensions/ShaderGraph.Editor/Nodes/SelectableBranchNode.cs b/Packages/com.unity.shadergraph/Samples~/UGUIShaders/ShaderGraphExtensions/ShaderGraph.Editor/Nodes/SelectableBranchNode.cs
deleted file mode 100644
index 1e7acaf388c..00000000000
--- a/Packages/com.unity.shadergraph/Samples~/UGUIShaders/ShaderGraphExtensions/ShaderGraph.Editor/Nodes/SelectableBranchNode.cs
+++ /dev/null
@@ -1,56 +0,0 @@
-using System.Reflection;
-
-namespace UnityEditor.ShaderGraph
-{
-    [Title("Utility", "UGUI", "Selectable State Switch")]
-    class SelectableBranchNode : CodeFunctionNode
-    {
-        public SelectableBranchNode()
-        {
-            name = "Selectable State Switch";
-            synonyms = new string[] { "switch", "ui", "selectable" };
-        }
-
-        protected override MethodInfo GetFunctionToConvert()
-        {
-            return GetType().GetMethod("Unity_Switch", BindingFlags.Static | BindingFlags.NonPublic);
-        }
-
-        static string Unity_Switch(
-            [Slot(0, Binding.None)] Vector1 State,
-            [Slot(1, Binding.None, 1, 1, 1, 1)] DynamicDimensionVector Normal,
-            [Slot(2, Binding.None, 0, 0, 0, 0)] DynamicDimensionVector Highlighted,
-            [Slot(3, Binding.None, 0, 0, 0, 0)] DynamicDimensionVector Pressed,
-            [Slot(4, Binding.None, 0, 0, 0, 0)] DynamicDimensionVector Selected,
-            [Slot(5, Binding.None, 0, 0, 0, 0)] DynamicDimensionVector Disabled,
-            [Slot(6, Binding.None)] out DynamicDimensionVector Out)
-        {
-            return
-@"
-{
-    [branch] switch(State)
-    {
-        case 0:
-            Out = Normal; 
-            break;
-        case 1:
-            Out = Highlighted; 
-           break;
-        case 2:
-            Out = Pressed; 
-           break;
-        case 3:
-            Out = Selected; 
-           break;
-        case 4:
-            Out = Disabled; 
-           break;
-        default:
-            Out = Normal; 
-           break;
-    }
-}
-";
-        }
-    }
-}
diff --git a/Packages/com.unity.shadergraph/Samples~/UGUIShaders/ShaderGraphExtensions/ShaderGraph.Editor/Nodes/SelectableBranchNode.cs.meta b/Packages/com.unity.shadergraph/Samples~/UGUIShaders/ShaderGraphExtensions/ShaderGraph.Editor/Nodes/SelectableBranchNode.cs.meta
deleted file mode 100644
index 7cb981537ee..00000000000
--- a/Packages/com.unity.shadergraph/Samples~/UGUIShaders/ShaderGraphExtensions/ShaderGraph.Editor/Nodes/SelectableBranchNode.cs.meta
+++ /dev/null
@@ -1,2 +0,0 @@
-fileFormatVersion: 2
-guid: 55796310c1fc60c4da5d8c08a3ca19d7
\ No newline at end of file
diff --git a/Packages/com.unity.shadergraph/Samples~/UGUIShaders/ShaderGraphExtensions/ShaderGraph.Editor/Nodes/SelectableStateNode.cs b/Packages/com.unity.shadergraph/Samples~/UGUIShaders/ShaderGraphExtensions/ShaderGraph.Editor/Nodes/SelectableStateNode.cs
deleted file mode 100644
index 52634a51bc8..00000000000
--- a/Packages/com.unity.shadergraph/Samples~/UGUIShaders/ShaderGraphExtensions/ShaderGraph.Editor/Nodes/SelectableStateNode.cs
+++ /dev/null
@@ -1,47 +0,0 @@
-using System.Collections.Generic;
-using UnityEditor.Graphing;
-using UnityEditor.ShaderGraph.Internal;
-
-namespace UnityEditor.ShaderGraph
-{
-    [Title("Input", "UGUI", "Selectable State")]
-    class SelectableStateNode : AbstractMaterialNode, IGeneratesBodyCode
-    {
-        public SelectableStateNode()
-        {
-            name = "Selectable State";
-            UpdateNodeAfterDeserialization();
-        }
-
-        //public override string documentationURL => NodeUtils.GetDocumentationString("SelectableStateNode");
-
-        public override bool hasPreview => false;
-
-        public sealed override void UpdateNodeAfterDeserialization()
-        {
-            var slots = new List<int>();
-            MaterialSlot slot = new Vector1MaterialSlot(0, "State", "_State", SlotType.Output, 0); // 0 = out value
-            AddSlot(slot);
-            slots.Add(0);
-            RemoveSlotsNameNotMatching(slots, true);
-        }
-
-        public override void CollectShaderProperties(PropertyCollector properties, GenerationMode generationMode)
-        {
-            properties.AddShaderProperty(new Vector1ShaderProperty
-            {
-                floatType = FloatType.Default,
-                hidden = true,
-                overrideHLSLDeclaration = true,
-                hlslDeclarationOverride = HLSLDeclaration.UnityPerMaterial,
-                value = 0,
-                overrideReferenceName = "_State"
-            });
-        }
-
-        public void GenerateNodeCode(ShaderStringBuilder sb, GenerationMode generationMode)
-        {
-            sb.AppendLine($"$precision {GetVariableNameForSlot(0)} = _State;");
-        }
-    }
-}
diff --git a/Packages/com.unity.shadergraph/Samples~/UGUIShaders/ShaderGraphExtensions/ShaderGraph.Editor/Nodes/SelectableStateNode.cs.meta b/Packages/com.unity.shadergraph/Samples~/UGUIShaders/ShaderGraphExtensions/ShaderGraph.Editor/Nodes/SelectableStateNode.cs.meta
deleted file mode 100644
index 86cf0054bad..00000000000
--- a/Packages/com.unity.shadergraph/Samples~/UGUIShaders/ShaderGraphExtensions/ShaderGraph.Editor/Nodes/SelectableStateNode.cs.meta
+++ /dev/null
@@ -1,2 +0,0 @@
-fileFormatVersion: 2
-guid: f03eb8a3e922c7b44b563347761bb55d
\ No newline at end of file
diff --git a/Packages/com.unity.shadergraph/Samples~/UGUIShaders/ShaderGraphExtensions/ShaderGraph.Editor/Nodes/SliderValueNode.cs b/Packages/com.unity.shadergraph/Samples~/UGUIShaders/ShaderGraphExtensions/ShaderGraph.Editor/Nodes/SliderValueNode.cs
deleted file mode 100644
index 478f3bed73e..00000000000
--- a/Packages/com.unity.shadergraph/Samples~/UGUIShaders/ShaderGraphExtensions/ShaderGraph.Editor/Nodes/SliderValueNode.cs
+++ /dev/null
@@ -1,53 +0,0 @@
-using System.Collections.Generic;
-using UnityEngine;
-using UnityEditor.Graphing;
-using UnityEditor.ShaderGraph.Internal;
-
-namespace UnityEditor.ShaderGraph
-{
-    [Title("Input", "UGUI", "Slider Value")]
-    class SliderValueNode : AbstractMaterialNode, IGeneratesBodyCode
-    {
-        public SliderValueNode()
-        {
-            name = "Slider Value";
-            UpdateNodeAfterDeserialization();
-        }
-
-        //public override string documentationURL => NodeUtils.GetDocumentationString("SliderValueNode");
-
-        public override bool hasPreview => false;
-
-        public sealed override void UpdateNodeAfterDeserialization()
-        {
-            var slots = new List<int>();
-            MaterialSlot slot0 = new Vector1MaterialSlot(0, "Value", "_Value", SlotType.Output, 0);
-            AddSlot(slot0);
-            slots.Add(0);
-
-            MaterialSlot slot1 = new Vector2MaterialSlot(1, "Direction", "_Direction", SlotType.Output, Vector2.zero);
-            AddSlot(slot1);
-            slots.Add(1);
-
-            RemoveSlotsNameNotMatching(slots, true);
-        }
-
-        public override void CollectShaderProperties(PropertyCollector properties, GenerationMode generationMode)
-        {
-            properties.AddShaderProperty(new Vector3ShaderProperty
-            {
-                hidden = true,
-                overrideHLSLDeclaration = true,
-                hlslDeclarationOverride = HLSLDeclaration.UnityPerMaterial,
-                value = Vector3.zero,
-                overrideReferenceName = "_SliderValue"
-            });
-        }
-
-        public void GenerateNodeCode(ShaderStringBuilder sb, GenerationMode generationMode)
-        {
-            sb.AppendLine($"$precision {GetVariableNameForSlot(0)} = _SliderValue.x;");
-            sb.AppendLine($"$precision2 {GetVariableNameForSlot(1)} = _SliderValue.yz;");
-        }
-    }
-}
diff --git a/Packages/com.unity.shadergraph/Samples~/UGUIShaders/ShaderGraphExtensions/ShaderGraph.Editor/Nodes/SliderValueNode.cs.meta b/Packages/com.unity.shadergraph/Samples~/UGUIShaders/ShaderGraphExtensions/ShaderGraph.Editor/Nodes/SliderValueNode.cs.meta
deleted file mode 100644
index 9e9e071723c..00000000000
--- a/Packages/com.unity.shadergraph/Samples~/UGUIShaders/ShaderGraphExtensions/ShaderGraph.Editor/Nodes/SliderValueNode.cs.meta
+++ /dev/null
@@ -1,2 +0,0 @@
-fileFormatVersion: 2
-guid: 51df076ed20fe6e46b25524ec09fd098
diff --git a/Packages/com.unity.shadergraph/Samples~/UGUIShaders/ShaderGraphExtensions/ShaderGraph.Editor/Nodes/ToggleStateNode.cs b/Packages/com.unity.shadergraph/Samples~/UGUIShaders/ShaderGraphExtensions/ShaderGraph.Editor/Nodes/ToggleStateNode.cs
deleted file mode 100644
index 7273151ce88..00000000000
--- a/Packages/com.unity.shadergraph/Samples~/UGUIShaders/ShaderGraphExtensions/ShaderGraph.Editor/Nodes/ToggleStateNode.cs
+++ /dev/null
@@ -1,40 +0,0 @@
-using System.Collections.Generic;
-using UnityEditor.Graphing;
-using UnityEditor.Rendering.Fullscreen.ShaderGraph;
-using UnityEditor.ShaderGraph.Internal;
-
-namespace UnityEditor.ShaderGraph
-{
-    [Title("Input", "UGUI", "Toggle State")]
-    class ToggleStateNode : AbstractMaterialNode, IGeneratesBodyCode
-    {
-        public ToggleStateNode()
-        {
-            name = "Toggle State";
-            UpdateNodeAfterDeserialization();
-        }
-
-        //public override string documentationURL => NodeUtils.GetDocumentationString("ToggleStateNode");
-
-        public override bool hasPreview => false;
-
-        public sealed override void UpdateNodeAfterDeserialization()
-        {
-            var slots = new List<int>();
-            MaterialSlot slot = new BooleanMaterialSlot(0, "State", "_isOn", SlotType.Output, false);
-            AddSlot(slot);
-            slots.Add(0);
-            RemoveSlotsNameNotMatching(slots, true);
-        }
-
-        public override void CollectShaderProperties(PropertyCollector properties, GenerationMode generationMode)
-        {
-            properties.AddBoolProperty("_isOn", false, HLSLDeclaration.UnityPerMaterial);
-        }
-
-        public void GenerateNodeCode(ShaderStringBuilder sb, GenerationMode generationMode)
-        {
-            sb.AppendLine($"$precision {GetVariableNameForSlot(0)} = _isOn;");
-        }
-    }
-}
diff --git a/Packages/com.unity.shadergraph/Samples~/UGUIShaders/ShaderGraphExtensions/ShaderGraph.Editor/Nodes/ToggleStateNode.cs.meta b/Packages/com.unity.shadergraph/Samples~/UGUIShaders/ShaderGraphExtensions/ShaderGraph.Editor/Nodes/ToggleStateNode.cs.meta
deleted file mode 100644
index 0c8ed7c3bb4..00000000000
--- a/Packages/com.unity.shadergraph/Samples~/UGUIShaders/ShaderGraphExtensions/ShaderGraph.Editor/Nodes/ToggleStateNode.cs.meta
+++ /dev/null
@@ -1,2 +0,0 @@
-fileFormatVersion: 2
-guid: a35ced0630b8fa5408b1d134506ea456
diff --git a/Packages/com.unity.shadergraph/Samples~/UGUIShaders/ShaderGraphExtensions/ShaderGraph.Editor/PropertyDrawers.meta b/Packages/com.unity.shadergraph/Samples~/UGUIShaders/ShaderGraphExtensions/ShaderGraph.Editor/PropertyDrawers.meta
deleted file mode 100644
index 791e1c58ed4..00000000000
--- a/Packages/com.unity.shadergraph/Samples~/UGUIShaders/ShaderGraphExtensions/ShaderGraph.Editor/PropertyDrawers.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 0630bbd3d00cea647b0054f791f7aa65
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/Packages/com.unity.shadergraph/Samples~/UGUIShaders/ShaderGraphExtensions/ShaderGraph.Editor/PropertyDrawers/RectTransformSizeDrawer.cs b/Packages/com.unity.shadergraph/Samples~/UGUIShaders/ShaderGraphExtensions/ShaderGraph.Editor/PropertyDrawers/RectTransformSizeDrawer.cs
deleted file mode 100644
index cdc8d19e579..00000000000
--- a/Packages/com.unity.shadergraph/Samples~/UGUIShaders/ShaderGraphExtensions/ShaderGraph.Editor/PropertyDrawers/RectTransformSizeDrawer.cs
+++ /dev/null
@@ -1,72 +0,0 @@
-using System;
-using System.Reflection;
-using UnityEditor.Graphing;
-using UnityEditor.ShaderGraph;
-using UnityEditor.ShaderGraph.Drawing;
-using UnityEditor.ShaderGraph.Drawing.Inspector;
-using UnityEngine.UIElements;
-using UnityEngine;
-using UnityEditor.ShaderGraph.Drawing.Inspector.PropertyDrawers;
-using FloatField = UnityEngine.UIElements.FloatField;
-
-[SGPropertyDrawer(typeof(RectTransformSizeNode))]
-public class RectTransformSizeDrawer : IPropertyDrawer, IGetNodePropertyDrawerPropertyData
-{
-    Action m_setNodesAsDirtyCallback;
-    Action m_updateNodeViewsCallback;
-
-    public Action inspectorUpdateDelegate { get; set; }
-
-    public void DisposePropertyDrawer()
-    {
-        
-    }
-
-    public VisualElement DrawProperty(PropertyInfo propertyInfo, object actualObject, InspectableAttribute attribute)
-    {
-        var node = (RectTransformSizeNode)actualObject;
-        var propertySheet = new PropertySheet(PropertyDrawerUtils.CreateLabel($"{node.name} Node", 0, FontStyle.Bold));
-        PropertyDrawerUtils.AddDefaultNodeProperties(propertySheet, node, m_setNodesAsDirtyCallback, m_updateNodeViewsCallback);
-
-        var previewSizeField = new Vector2Field("Preview Size") { value = node.PreviewSize };
-        previewSizeField.RegisterValueChangedCallback(v =>
-        {
-            m_setNodesAsDirtyCallback?.Invoke();
-            node.owner.owner.RegisterCompleteObjectUndo("Change Preview Size");
-            node.PreviewSize = v.newValue;
-            m_updateNodeViewsCallback?.Invoke();
-            node.Dirty(ModificationScope.Graph);
-        });
-        propertySheet.Add(previewSizeField);
-
-        var previewScaleFactorField = new FloatField("Preview Scale Factor") { value = node.PreviewScaleFactor };
-        previewScaleFactorField.RegisterValueChangedCallback(v =>
-        {
-            m_setNodesAsDirtyCallback?.Invoke();
-            node.owner.owner.RegisterCompleteObjectUndo("Change Preview Scale Factor");
-            node.PreviewScaleFactor = v.newValue;
-            m_updateNodeViewsCallback?.Invoke();
-            node.Dirty(ModificationScope.Graph);
-        });
-        propertySheet.Add(previewScaleFactorField);
-
-        var previewPPUField = new FloatField("Preview Pixels Per Units") { value = node.PreviewPixelsPerUnit };
-        previewPPUField.RegisterValueChangedCallback(v =>
-        {
-            m_setNodesAsDirtyCallback?.Invoke();
-            node.owner.owner.RegisterCompleteObjectUndo("Change Preview Pixels Per Units");
-            node.PreviewPixelsPerUnit = v.newValue;
-            m_updateNodeViewsCallback?.Invoke();
-            node.Dirty(ModificationScope.Graph);
-        });
-        propertySheet.Add(previewPPUField);
-
-        return propertySheet;
-    }
-
-    public void GetPropertyData(Action setNodesAsDirtyCallback, Action updateNodeViewsCallback)
-    {
-        m_setNodesAsDirtyCallback = setNodesAsDirtyCallback;
-        m_updateNodeViewsCallback = updateNodeViewsCallback;
-    }
-}
diff --git a/Packages/com.unity.shadergraph/Samples~/UGUIShaders/ShaderGraphExtensions/ShaderGraph.Editor/PropertyDrawers/RectTransformSizeDrawer.cs.meta b/Packages/com.unity.shadergraph/Samples~/UGUIShaders/ShaderGraphExtensions/ShaderGraph.Editor/PropertyDrawers/RectTransformSizeDrawer.cs.meta
deleted file mode 100644
index 4d17a97b318..00000000000
--- a/Packages/com.unity.shadergraph/Samples~/UGUIShaders/ShaderGraphExtensions/ShaderGraph.Editor/PropertyDrawers/RectTransformSizeDrawer.cs.meta
+++ /dev/null
@@ -1,2 +0,0 @@
-fileFormatVersion: 2
-guid: eb497357e5436cd41b4a78271149ccd5
\ No newline at end of file
diff --git a/Packages/com.unity.shadergraph/Samples~/UGUIShaders/ShaderGraphExtensions/ShaderGraph.Editor/ShaderGraph.Editor.asmref b/Packages/com.unity.shadergraph/Samples~/UGUIShaders/ShaderGraphExtensions/ShaderGraph.Editor/ShaderGraph.Editor.asmref
deleted file mode 100644
index 6f5b7c2733d..00000000000
--- a/Packages/com.unity.shadergraph/Samples~/UGUIShaders/ShaderGraphExtensions/ShaderGraph.Editor/ShaderGraph.Editor.asmref
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "reference": "GUID:be0903cd8e1546f498710afdc59db5eb"
-}
\ No newline at end of file
diff --git a/Packages/com.unity.shadergraph/Samples~/UGUIShaders/ShaderGraphExtensions/ShaderGraph.Editor/ShaderGraph.Editor.asmref.meta b/Packages/com.unity.shadergraph/Samples~/UGUIShaders/ShaderGraphExtensions/ShaderGraph.Editor/ShaderGraph.Editor.asmref.meta
deleted file mode 100644
index abc74214179..00000000000
--- a/Packages/com.unity.shadergraph/Samples~/UGUIShaders/ShaderGraphExtensions/ShaderGraph.Editor/ShaderGraph.Editor.asmref.meta
+++ /dev/null
@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 31a9141973c487c458a7b481265ab8d1
-AssemblyDefinitionReferenceImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/Packages/com.unity.shadergraph/Samples~/UGUIShaders/Subgraphs/Input.meta b/Packages/com.unity.shadergraph/Samples~/UGUIShaders/Subgraphs/Input.meta
new file mode 100644
index 00000000000..f3c5171c863
--- /dev/null
+++ b/Packages/com.unity.shadergraph/Samples~/UGUIShaders/Subgraphs/Input.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 9189f74b54dac2847a96d547b5eb8ffb
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Packages/com.unity.shadergraph/Samples~/UGUIShaders/Subgraphs/Input/MeterValue.shadersubgraph b/Packages/com.unity.shadergraph/Samples~/UGUIShaders/Subgraphs/Input/MeterValue.shadersubgraph
new file mode 100644
index 00000000000..87874c1c61c
--- /dev/null
+++ b/Packages/com.unity.shadergraph/Samples~/UGUIShaders/Subgraphs/Input/MeterValue.shadersubgraph
@@ -0,0 +1,494 @@
+{
+    "m_SGVersion": 3,
+    "m_Type": "UnityEditor.ShaderGraph.GraphData",
+    "m_ObjectId": "9f9c83fdb8c34e0e8f80e7327bfa0ba5",
+    "m_Properties": [
+        {
+            "m_Id": "5ffe6e807c254d53a8d8d996ca13f84e"
+        },
+        {
+            "m_Id": "89b20efb0bb04dc9b0d855388c9fa803"
+        }
+    ],
+    "m_Keywords": [],
+    "m_Dropdowns": [],
+    "m_CategoryData": [
+        {
+            "m_Id": "62163e7a53984e1c9054505848a8cd0d"
+        }
+    ],
+    "m_Nodes": [
+        {
+            "m_Id": "6364edad7b714d359902a484b8785b0b"
+        },
+        {
+            "m_Id": "1234e227bed3458cb06db236793dd352"
+        },
+        {
+            "m_Id": "8cc9f69b46cd41a492dfe0548e14a690"
+        },
+        {
+            "m_Id": "462354595cf44bd1be5dc75299df02af"
+        }
+    ],
+    "m_GroupDatas": [],
+    "m_StickyNoteDatas": [
+        {
+            "m_Id": "9798afd276a5422db2f796d67734fea1"
+        }
+    ],
+    "m_Edges": [
+        {
+            "m_OutputSlot": {
+                "m_Node": {
+                    "m_Id": "1234e227bed3458cb06db236793dd352"
+                },
+                "m_SlotId": 0
+            },
+            "m_InputSlot": {
+                "m_Node": {
+                    "m_Id": "462354595cf44bd1be5dc75299df02af"
+                },
+                "m_SlotId": 0
+            }
+        },
+        {
+            "m_OutputSlot": {
+                "m_Node": {
+                    "m_Id": "462354595cf44bd1be5dc75299df02af"
+                },
+                "m_SlotId": 1
+            },
+            "m_InputSlot": {
+                "m_Node": {
+                    "m_Id": "6364edad7b714d359902a484b8785b0b"
+                },
+                "m_SlotId": 1
+            }
+        },
+        {
+            "m_OutputSlot": {
+                "m_Node": {
+                    "m_Id": "8cc9f69b46cd41a492dfe0548e14a690"
+                },
+                "m_SlotId": 0
+            },
+            "m_InputSlot": {
+                "m_Node": {
+                    "m_Id": "462354595cf44bd1be5dc75299df02af"
+                },
+                "m_SlotId": 2
+            }
+        }
+    ],
+    "m_VertexContext": {
+        "m_Position": {
+            "x": 0.0,
+            "y": 0.0
+        },
+        "m_Blocks": []
+    },
+    "m_FragmentContext": {
+        "m_Position": {
+            "x": 0.0,
+            "y": 0.0
+        },
+        "m_Blocks": []
+    },
+    "m_PreviewData": {
+        "serializedMesh": {
+            "m_SerializedMesh": "{\"mesh\":{\"instanceID\":0}}",
+            "m_Guid": ""
+        },
+        "preventRotation": false
+    },
+    "m_Path": "Input/UGUI",
+    "m_GraphPrecision": 1,
+    "m_PreviewMode": 2,
+    "m_OutputNode": {
+        "m_Id": "6364edad7b714d359902a484b8785b0b"
+    },
+    "m_SubDatas": [],
+    "m_ActiveTargets": []
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.PropertyNode",
+    "m_ObjectId": "1234e227bed3458cb06db236793dd352",
+    "m_Group": {
+        "m_Id": ""
+    },
+    "m_Name": "Property",
+    "m_DrawState": {
+        "m_Expanded": true,
+        "m_Position": {
+            "serializedVersion": "2",
+            "x": -206.0,
+            "y": -1.0,
+            "width": 135.0,
+            "height": 34.0
+        }
+    },
+    "m_Slots": [
+        {
+            "m_Id": "ac119df19c1a4ecdae320c37ee245354"
+        }
+    ],
+    "synonyms": [],
+    "m_Precision": 0,
+    "m_PreviewExpanded": false,
+    "m_DismissedVersion": 0,
+    "m_PreviewMode": 0,
+    "m_CustomColors": {
+        "m_SerializableColors": []
+    },
+    "m_Property": {
+        "m_Id": "89b20efb0bb04dc9b0d855388c9fa803"
+    }
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
+    "m_ObjectId": "3117fa35f84e497b949e38bfea6c499c",
+    "m_Id": 1,
+    "m_DisplayName": "Out",
+    "m_SlotType": 0,
+    "m_Hidden": false,
+    "m_HideConnector": false,
+    "m_ShaderOutputName": "Out",
+    "m_StageCapability": 3,
+    "m_Value": 0.0,
+    "m_DefaultValue": 0.0,
+    "m_Labels": [],
+    "m_LiteralMode": false
+}
+
+{
+    "m_SGVersion": 1,
+    "m_Type": "UnityEditor.ShaderGraph.CustomFunctionNode",
+    "m_ObjectId": "462354595cf44bd1be5dc75299df02af",
+    "m_Group": {
+        "m_Id": ""
+    },
+    "m_Name": "IsPreviewFloat (Custom Function)",
+    "m_DrawState": {
+        "m_Expanded": true,
+        "m_Position": {
+            "serializedVersion": "2",
+            "x": -206.0,
+            "y": 33.0,
+            "width": 237.0,
+            "height": 118.0
+        }
+    },
+    "m_Slots": [
+        {
+            "m_Id": "f0648228409a4229b0b32a6fd7cb61fa"
+        },
+        {
+            "m_Id": "a2c2e058828043e1a53df8c6b172dbda"
+        },
+        {
+            "m_Id": "d81b19a16d7b448c94ee57a370e6d7df"
+        }
+    ],
+    "synonyms": [
+        "code",
+        "HLSL"
+    ],
+    "m_Precision": 0,
+    "m_PreviewExpanded": false,
+    "m_DismissedVersion": 0,
+    "m_PreviewMode": 0,
+    "m_CustomColors": {
+        "m_SerializableColors": []
+    },
+    "m_SourceType": 1,
+    "m_FunctionName": "IsPreviewFloat",
+    "m_FunctionSource": "",
+    "m_FunctionSourceUsePragmas": true,
+    "m_FunctionBody": "#if defined(SHADERGRAPH_PREVIEW_MAIN) || defined(SHADERGRAPH_PREVIEW)\nOut = Preview;\n#else\nOut = Final;\n#endif\n"
+}
+
+{
+    "m_SGVersion": 1,
+    "m_Type": "UnityEditor.ShaderGraph.Internal.Vector1ShaderProperty",
+    "m_ObjectId": "5ffe6e807c254d53a8d8d996ca13f84e",
+    "m_Guid": {
+        "m_GuidSerialized": "3da8ea4d-7749-407b-965b-ab3ca072dcc6"
+    },
+    "promotedFromAssetID": "",
+    "promotedFromCategoryName": "",
+    "promotedOrdering": -1,
+    "m_Name": "Preview Value",
+    "m_DefaultRefNameVersion": 1,
+    "m_RefNameGeneratedByDisplayName": "Preview Value",
+    "m_DefaultReferenceName": "_Preview_Value",
+    "m_OverrideReferenceName": "",
+    "m_GeneratePropertyBlock": true,
+    "m_UseCustomSlotLabel": false,
+    "m_CustomSlotLabel": "",
+    "m_DismissedVersion": 0,
+    "m_Precision": 0,
+    "overrideHLSLDeclaration": false,
+    "hlslDeclarationOverride": 0,
+    "hideConnector": true,
+    "m_Hidden": false,
+    "m_PerRendererData": false,
+    "m_customAttributes": [],
+    "m_Value": 0.5,
+    "m_FloatType": 1,
+    "m_LiteralFloatMode": false,
+    "m_RangeValues": {
+        "x": 0.0,
+        "y": 1.0
+    },
+    "m_SliderType": 0,
+    "m_SliderPower": 3.0,
+    "m_EnumType": 0,
+    "m_CSharpEnumString": "",
+    "m_EnumNames": [
+        "Default"
+    ],
+    "m_EnumValues": [
+        0
+    ]
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.CategoryData",
+    "m_ObjectId": "62163e7a53984e1c9054505848a8cd0d",
+    "m_Name": "",
+    "m_ChildObjectList": [
+        {
+            "m_Id": "89b20efb0bb04dc9b0d855388c9fa803"
+        },
+        {
+            "m_Id": "5ffe6e807c254d53a8d8d996ca13f84e"
+        }
+    ]
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.SubGraphOutputNode",
+    "m_ObjectId": "6364edad7b714d359902a484b8785b0b",
+    "m_Group": {
+        "m_Id": ""
+    },
+    "m_Name": "Output",
+    "m_DrawState": {
+        "m_Expanded": true,
+        "m_Position": {
+            "serializedVersion": "2",
+            "x": 31.0,
+            "y": 33.0,
+            "width": 86.0,
+            "height": 77.0
+        }
+    },
+    "m_Slots": [
+        {
+            "m_Id": "3117fa35f84e497b949e38bfea6c499c"
+        }
+    ],
+    "synonyms": [],
+    "m_Precision": 0,
+    "m_PreviewExpanded": false,
+    "m_DismissedVersion": 0,
+    "m_PreviewMode": 0,
+    "m_CustomColors": {
+        "m_SerializableColors": []
+    },
+    "IsFirstSlotValid": true
+}
+
+{
+    "m_SGVersion": 1,
+    "m_Type": "UnityEditor.ShaderGraph.Internal.Vector1ShaderProperty",
+    "m_ObjectId": "89b20efb0bb04dc9b0d855388c9fa803",
+    "m_Guid": {
+        "m_GuidSerialized": "d6b92199-1a80-4d6f-bd09-5f741b592345"
+    },
+    "promotedFromAssetID": "90192633207f24dc0927e116d7564452",
+    "promotedFromCategoryName": "",
+    "promotedOrdering": -1,
+    "m_Name": "MeterValue",
+    "m_DefaultRefNameVersion": 1,
+    "m_RefNameGeneratedByDisplayName": "MeterValue",
+    "m_DefaultReferenceName": "_MeterValue",
+    "m_OverrideReferenceName": "",
+    "m_GeneratePropertyBlock": false,
+    "m_UseCustomSlotLabel": false,
+    "m_CustomSlotLabel": "",
+    "m_DismissedVersion": 0,
+    "m_Precision": 0,
+    "overrideHLSLDeclaration": true,
+    "hlslDeclarationOverride": 2,
+    "hideConnector": false,
+    "m_Hidden": false,
+    "m_PerRendererData": false,
+    "m_customAttributes": [],
+    "m_Value": 0.5,
+    "m_FloatType": 0,
+    "m_LiteralFloatMode": false,
+    "m_RangeValues": {
+        "x": 0.0,
+        "y": 1.0
+    },
+    "m_SliderType": 0,
+    "m_SliderPower": 3.0,
+    "m_EnumType": 0,
+    "m_CSharpEnumString": "",
+    "m_EnumNames": [
+        "Default"
+    ],
+    "m_EnumValues": [
+        0
+    ]
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.PropertyNode",
+    "m_ObjectId": "8cc9f69b46cd41a492dfe0548e14a690",
+    "m_Group": {
+        "m_Id": ""
+    },
+    "m_Name": "Property",
+    "m_DrawState": {
+        "m_Expanded": true,
+        "m_Position": {
+            "serializedVersion": "2",
+            "x": -206.0,
+            "y": 151.0,
+            "width": 149.0,
+            "height": 34.0
+        }
+    },
+    "m_Slots": [
+        {
+            "m_Id": "f9a90669c4654e86b9a33f2caeb6f1e9"
+        }
+    ],
+    "synonyms": [],
+    "m_Precision": 0,
+    "m_PreviewExpanded": false,
+    "m_DismissedVersion": 0,
+    "m_PreviewMode": 0,
+    "m_CustomColors": {
+        "m_SerializableColors": []
+    },
+    "m_Property": {
+        "m_Id": "5ffe6e807c254d53a8d8d996ca13f84e"
+    }
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.StickyNoteData",
+    "m_ObjectId": "9798afd276a5422db2f796d67734fea1",
+    "m_Title": "Meter Value",
+    "m_Content": "This subgraph uses a Custom Function Node to switch between a hidden promoted property and a subgraph property with input port disabled used as the preview value.\n\nThis requires a Meter component on the element to feed the value.",
+    "m_TextSize": 0,
+    "m_Theme": 1,
+    "m_Position": {
+        "serializedVersion": "2",
+        "x": -453.0,
+        "y": 20.0,
+        "width": 200.0,
+        "height": 160.0
+    },
+    "m_Group": {
+        "m_Id": ""
+    }
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
+    "m_ObjectId": "a2c2e058828043e1a53df8c6b172dbda",
+    "m_Id": 2,
+    "m_DisplayName": "Preview",
+    "m_SlotType": 0,
+    "m_Hidden": false,
+    "m_HideConnector": false,
+    "m_ShaderOutputName": "Preview",
+    "m_StageCapability": 3,
+    "m_Value": 0.0,
+    "m_DefaultValue": 0.0,
+    "m_Labels": [],
+    "m_LiteralMode": false
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
+    "m_ObjectId": "ac119df19c1a4ecdae320c37ee245354",
+    "m_Id": 0,
+    "m_DisplayName": "MeterValue",
+    "m_SlotType": 1,
+    "m_Hidden": false,
+    "m_HideConnector": false,
+    "m_ShaderOutputName": "Out",
+    "m_StageCapability": 3,
+    "m_Value": 0.0,
+    "m_DefaultValue": 0.0,
+    "m_Labels": [],
+    "m_LiteralMode": false
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
+    "m_ObjectId": "d81b19a16d7b448c94ee57a370e6d7df",
+    "m_Id": 1,
+    "m_DisplayName": "Out",
+    "m_SlotType": 1,
+    "m_Hidden": false,
+    "m_HideConnector": false,
+    "m_ShaderOutputName": "Out",
+    "m_StageCapability": 3,
+    "m_Value": 0.0,
+    "m_DefaultValue": 0.0,
+    "m_Labels": [],
+    "m_LiteralMode": false
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
+    "m_ObjectId": "f0648228409a4229b0b32a6fd7cb61fa",
+    "m_Id": 0,
+    "m_DisplayName": "Final",
+    "m_SlotType": 0,
+    "m_Hidden": false,
+    "m_HideConnector": false,
+    "m_ShaderOutputName": "Final",
+    "m_StageCapability": 3,
+    "m_Value": 0.0,
+    "m_DefaultValue": 0.0,
+    "m_Labels": [],
+    "m_LiteralMode": false
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
+    "m_ObjectId": "f9a90669c4654e86b9a33f2caeb6f1e9",
+    "m_Id": 0,
+    "m_DisplayName": "Preview Value",
+    "m_SlotType": 1,
+    "m_Hidden": false,
+    "m_HideConnector": false,
+    "m_ShaderOutputName": "Out",
+    "m_StageCapability": 3,
+    "m_Value": 0.0,
+    "m_DefaultValue": 0.0,
+    "m_Labels": [],
+    "m_LiteralMode": false
+}
+
diff --git a/Packages/com.unity.shadergraph/Samples~/UGUIShaders/Subgraphs/Utilities/Selectable State Preview.shadersubgraph.meta b/Packages/com.unity.shadergraph/Samples~/UGUIShaders/Subgraphs/Input/MeterValue.shadersubgraph.meta
similarity index 80%
rename from Packages/com.unity.shadergraph/Samples~/UGUIShaders/Subgraphs/Utilities/Selectable State Preview.shadersubgraph.meta
rename to Packages/com.unity.shadergraph/Samples~/UGUIShaders/Subgraphs/Input/MeterValue.shadersubgraph.meta
index 23456f2e04d..1e167eb38c5 100644
--- a/Packages/com.unity.shadergraph/Samples~/UGUIShaders/Subgraphs/Utilities/Selectable State Preview.shadersubgraph.meta	
+++ b/Packages/com.unity.shadergraph/Samples~/UGUIShaders/Subgraphs/Input/MeterValue.shadersubgraph.meta
@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: b278edaff18e35342890339c5f0d2945
+guid: 90192633207f24dc0927e116d7564452
 ScriptedImporter:
   internalIDToNameTable: []
   externalObjects: {}
@@ -8,3 +8,4 @@ ScriptedImporter:
   assetBundleName: 
   assetBundleVariant: 
   script: {fileID: 11500000, guid: 60072b568d64c40a485e0fc55012dc9f, type: 3}
+  documentationPath: 
diff --git a/Packages/com.unity.shadergraph/Samples~/UGUIShaders/Subgraphs/Input/RangeBarValue.shadersubgraph b/Packages/com.unity.shadergraph/Samples~/UGUIShaders/Subgraphs/Input/RangeBarValue.shadersubgraph
new file mode 100644
index 00000000000..c206f240be8
--- /dev/null
+++ b/Packages/com.unity.shadergraph/Samples~/UGUIShaders/Subgraphs/Input/RangeBarValue.shadersubgraph
@@ -0,0 +1,1650 @@
+{
+    "m_SGVersion": 3,
+    "m_Type": "UnityEditor.ShaderGraph.GraphData",
+    "m_ObjectId": "e223ad31b8fe47fda6ebf1c1b165d43b",
+    "m_Properties": [
+        {
+            "m_Id": "096733e82ba24cfabc80b770de24fe57"
+        },
+        {
+            "m_Id": "5c5fcf7867734fff9749d05f9fcf1d39"
+        },
+        {
+            "m_Id": "945f7aca0366457398537ce7ef15e6f6"
+        }
+    ],
+    "m_Keywords": [],
+    "m_Dropdowns": [
+        {
+            "m_Id": "211f8ae3f4724fb3b7fe5683974bc90a"
+        }
+    ],
+    "m_CategoryData": [
+        {
+            "m_Id": "78037d5d3b28486dbc192e494a2fd6bc"
+        }
+    ],
+    "m_Nodes": [
+        {
+            "m_Id": "1bf98e5e35fd44948e89d67628d31d46"
+        },
+        {
+            "m_Id": "b53ce975fa294692a0d3c0eeb24e55be"
+        },
+        {
+            "m_Id": "bc85e665abea4b06b532dd86b35f9fff"
+        },
+        {
+            "m_Id": "1500bd04343d4d6dbe00ff833331d2a0"
+        },
+        {
+            "m_Id": "5941a0a08948413aac4f7ebb2e8ef5e9"
+        },
+        {
+            "m_Id": "a2aaffa943394fe384d09ff60dc2eec8"
+        },
+        {
+            "m_Id": "f92472fdb7634dd885ca5b91627131ca"
+        },
+        {
+            "m_Id": "b1809264eb37441a93b4f6b729d40ca2"
+        },
+        {
+            "m_Id": "33f1d95650364a0b8aa7c9e50df4295f"
+        },
+        {
+            "m_Id": "137619ae76ee416ca185dd3752bb7455"
+        },
+        {
+            "m_Id": "13e0d47bd42e4e3baa25eff4a0e45bd9"
+        },
+        {
+            "m_Id": "492a308e66df4650986641c17f4dfa54"
+        }
+    ],
+    "m_GroupDatas": [],
+    "m_StickyNoteDatas": [
+        {
+            "m_Id": "fbfeccf0145a45c19e682862a2abe4ad"
+        }
+    ],
+    "m_Edges": [
+        {
+            "m_OutputSlot": {
+                "m_Node": {
+                    "m_Id": "137619ae76ee416ca185dd3752bb7455"
+                },
+                "m_SlotId": 1
+            },
+            "m_InputSlot": {
+                "m_Node": {
+                    "m_Id": "1bf98e5e35fd44948e89d67628d31d46"
+                },
+                "m_SlotId": 3
+            }
+        },
+        {
+            "m_OutputSlot": {
+                "m_Node": {
+                    "m_Id": "13e0d47bd42e4e3baa25eff4a0e45bd9"
+                },
+                "m_SlotId": 0
+            },
+            "m_InputSlot": {
+                "m_Node": {
+                    "m_Id": "492a308e66df4650986641c17f4dfa54"
+                },
+                "m_SlotId": 3
+            }
+        },
+        {
+            "m_OutputSlot": {
+                "m_Node": {
+                    "m_Id": "1500bd04343d4d6dbe00ff833331d2a0"
+                },
+                "m_SlotId": 0
+            },
+            "m_InputSlot": {
+                "m_Node": {
+                    "m_Id": "a2aaffa943394fe384d09ff60dc2eec8"
+                },
+                "m_SlotId": 0
+            }
+        },
+        {
+            "m_OutputSlot": {
+                "m_Node": {
+                    "m_Id": "33f1d95650364a0b8aa7c9e50df4295f"
+                },
+                "m_SlotId": 1
+            },
+            "m_InputSlot": {
+                "m_Node": {
+                    "m_Id": "1bf98e5e35fd44948e89d67628d31d46"
+                },
+                "m_SlotId": 2
+            }
+        },
+        {
+            "m_OutputSlot": {
+                "m_Node": {
+                    "m_Id": "492a308e66df4650986641c17f4dfa54"
+                },
+                "m_SlotId": 0
+            },
+            "m_InputSlot": {
+                "m_Node": {
+                    "m_Id": "f92472fdb7634dd885ca5b91627131ca"
+                },
+                "m_SlotId": 1
+            }
+        },
+        {
+            "m_OutputSlot": {
+                "m_Node": {
+                    "m_Id": "5941a0a08948413aac4f7ebb2e8ef5e9"
+                },
+                "m_SlotId": 0
+            },
+            "m_InputSlot": {
+                "m_Node": {
+                    "m_Id": "a2aaffa943394fe384d09ff60dc2eec8"
+                },
+                "m_SlotId": 1
+            }
+        },
+        {
+            "m_OutputSlot": {
+                "m_Node": {
+                    "m_Id": "a2aaffa943394fe384d09ff60dc2eec8"
+                },
+                "m_SlotId": 2
+            },
+            "m_InputSlot": {
+                "m_Node": {
+                    "m_Id": "f92472fdb7634dd885ca5b91627131ca"
+                },
+                "m_SlotId": 0
+            }
+        },
+        {
+            "m_OutputSlot": {
+                "m_Node": {
+                    "m_Id": "b1809264eb37441a93b4f6b729d40ca2"
+                },
+                "m_SlotId": 1
+            },
+            "m_InputSlot": {
+                "m_Node": {
+                    "m_Id": "1bf98e5e35fd44948e89d67628d31d46"
+                },
+                "m_SlotId": 1
+            }
+        },
+        {
+            "m_OutputSlot": {
+                "m_Node": {
+                    "m_Id": "b53ce975fa294692a0d3c0eeb24e55be"
+                },
+                "m_SlotId": 0
+            },
+            "m_InputSlot": {
+                "m_Node": {
+                    "m_Id": "bc85e665abea4b06b532dd86b35f9fff"
+                },
+                "m_SlotId": 0
+            }
+        },
+        {
+            "m_OutputSlot": {
+                "m_Node": {
+                    "m_Id": "bc85e665abea4b06b532dd86b35f9fff"
+                },
+                "m_SlotId": 1
+            },
+            "m_InputSlot": {
+                "m_Node": {
+                    "m_Id": "137619ae76ee416ca185dd3752bb7455"
+                },
+                "m_SlotId": 0
+            }
+        },
+        {
+            "m_OutputSlot": {
+                "m_Node": {
+                    "m_Id": "bc85e665abea4b06b532dd86b35f9fff"
+                },
+                "m_SlotId": 1
+            },
+            "m_InputSlot": {
+                "m_Node": {
+                    "m_Id": "33f1d95650364a0b8aa7c9e50df4295f"
+                },
+                "m_SlotId": 0
+            }
+        },
+        {
+            "m_OutputSlot": {
+                "m_Node": {
+                    "m_Id": "bc85e665abea4b06b532dd86b35f9fff"
+                },
+                "m_SlotId": 1
+            },
+            "m_InputSlot": {
+                "m_Node": {
+                    "m_Id": "b1809264eb37441a93b4f6b729d40ca2"
+                },
+                "m_SlotId": 0
+            }
+        },
+        {
+            "m_OutputSlot": {
+                "m_Node": {
+                    "m_Id": "f92472fdb7634dd885ca5b91627131ca"
+                },
+                "m_SlotId": 2
+            },
+            "m_InputSlot": {
+                "m_Node": {
+                    "m_Id": "bc85e665abea4b06b532dd86b35f9fff"
+                },
+                "m_SlotId": 2
+            }
+        }
+    ],
+    "m_VertexContext": {
+        "m_Position": {
+            "x": 0.0,
+            "y": 0.0
+        },
+        "m_Blocks": []
+    },
+    "m_FragmentContext": {
+        "m_Position": {
+            "x": 0.0,
+            "y": 0.0
+        },
+        "m_Blocks": []
+    },
+    "m_PreviewData": {
+        "serializedMesh": {
+            "m_SerializedMesh": "{\"mesh\":{\"instanceID\":0}}",
+            "m_Guid": ""
+        },
+        "preventRotation": false
+    },
+    "m_Path": "Input/UGUI",
+    "m_GraphPrecision": 1,
+    "m_PreviewMode": 2,
+    "m_OutputNode": {
+        "m_Id": "1bf98e5e35fd44948e89d67628d31d46"
+    },
+    "m_SubDatas": [],
+    "m_ActiveTargets": []
+}
+
+{
+    "m_SGVersion": 1,
+    "m_Type": "UnityEditor.ShaderGraph.Internal.Vector4ShaderProperty",
+    "m_ObjectId": "096733e82ba24cfabc80b770de24fe57",
+    "m_Guid": {
+        "m_GuidSerialized": "bf50f33d-eafe-4f4d-b963-ca0358290e4d"
+    },
+    "promotedFromAssetID": "aa041986c041b4dc1b5bf0b2cd2d86e8",
+    "promotedFromCategoryName": "",
+    "promotedOrdering": -1,
+    "m_Name": "RangeBarValue",
+    "m_DefaultRefNameVersion": 1,
+    "m_RefNameGeneratedByDisplayName": "RangeBarValue",
+    "m_DefaultReferenceName": "_RangeBarValue",
+    "m_OverrideReferenceName": "",
+    "m_GeneratePropertyBlock": false,
+    "m_UseCustomSlotLabel": false,
+    "m_CustomSlotLabel": "",
+    "m_DismissedVersion": 0,
+    "m_Precision": 0,
+    "overrideHLSLDeclaration": true,
+    "hlslDeclarationOverride": 2,
+    "hideConnector": false,
+    "m_Hidden": false,
+    "m_PerRendererData": false,
+    "m_customAttributes": [],
+    "m_Value": {
+        "x": 0.0,
+        "y": 0.0,
+        "z": 0.0,
+        "w": 0.0
+    }
+}
+
+{
+    "m_SGVersion": 1,
+    "m_Type": "UnityEditor.ShaderGraph.SwizzleNode",
+    "m_ObjectId": "137619ae76ee416ca185dd3752bb7455",
+    "m_Group": {
+        "m_Id": ""
+    },
+    "m_Name": "Swizzle",
+    "m_DrawState": {
+        "m_Expanded": true,
+        "m_Position": {
+            "serializedVersion": "2",
+            "x": -258.0000305175781,
+            "y": 231.0,
+            "width": 132.0,
+            "height": 122.0
+        }
+    },
+    "m_Slots": [
+        {
+            "m_Id": "3bcac6956c3a45318411e22274926ac8"
+        },
+        {
+            "m_Id": "c54273bf0bb74c36b59a4a937d83c5ef"
+        }
+    ],
+    "synonyms": [
+        "swap",
+        "reorder",
+        "component mask"
+    ],
+    "m_Precision": 0,
+    "m_PreviewExpanded": false,
+    "m_DismissedVersion": 0,
+    "m_PreviewMode": 0,
+    "m_CustomColors": {
+        "m_SerializableColors": []
+    },
+    "_maskInput": "zw",
+    "convertedMask": "zw"
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.Vector2Node",
+    "m_ObjectId": "13e0d47bd42e4e3baa25eff4a0e45bd9",
+    "m_Group": {
+        "m_Id": ""
+    },
+    "m_Name": "Vector 2",
+    "m_DrawState": {
+        "m_Expanded": true,
+        "m_Position": {
+            "serializedVersion": "2",
+            "x": -1363.9998779296875,
+            "y": 126.9999771118164,
+            "width": 128.0,
+            "height": 100.9999771118164
+        }
+    },
+    "m_Slots": [
+        {
+            "m_Id": "7bc829cb94df4b09bb8d367cea139e22"
+        },
+        {
+            "m_Id": "2fdf945b490140e49da59ba4e37945a3"
+        },
+        {
+            "m_Id": "e5750f14156f4d7792ceddb4f6b3bd20"
+        }
+    ],
+    "synonyms": [
+        "2",
+        "v2",
+        "vec2",
+        "float2"
+    ],
+    "m_Precision": 0,
+    "m_PreviewExpanded": false,
+    "m_DismissedVersion": 0,
+    "m_PreviewMode": 0,
+    "m_CustomColors": {
+        "m_SerializableColors": []
+    },
+    "m_Value": {
+        "x": 0.0,
+        "y": 0.0
+    }
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.PropertyNode",
+    "m_ObjectId": "1500bd04343d4d6dbe00ff833331d2a0",
+    "m_Group": {
+        "m_Id": ""
+    },
+    "m_Name": "Property",
+    "m_DrawState": {
+        "m_Expanded": true,
+        "m_Position": {
+            "serializedVersion": "2",
+            "x": -1215.0,
+            "y": 37.4999885559082,
+            "width": 135.5,
+            "height": 34.00001907348633
+        }
+    },
+    "m_Slots": [
+        {
+            "m_Id": "251483410f654489ab778b2272619eec"
+        }
+    ],
+    "synonyms": [],
+    "m_Precision": 0,
+    "m_PreviewExpanded": false,
+    "m_DismissedVersion": 0,
+    "m_PreviewMode": 0,
+    "m_CustomColors": {
+        "m_SerializableColors": []
+    },
+    "m_Property": {
+        "m_Id": "5c5fcf7867734fff9749d05f9fcf1d39"
+    }
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot",
+    "m_ObjectId": "1a9a43053f4c4220a11351b88230ffe3",
+    "m_Id": 1,
+    "m_DisplayName": "Right To Left",
+    "m_SlotType": 0,
+    "m_Hidden": false,
+    "m_HideConnector": false,
+    "m_ShaderOutputName": "Right To Left",
+    "m_StageCapability": 3,
+    "m_Value": {
+        "x": -1.0,
+        "y": 0.0,
+        "z": 0.0,
+        "w": 0.0
+    },
+    "m_DefaultValue": {
+        "x": 0.0,
+        "y": 0.0,
+        "z": 0.0,
+        "w": 0.0
+    },
+    "m_LiteralMode": false
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
+    "m_ObjectId": "1ac6bdb6993c4ec9ab91eedd12a2922a",
+    "m_Id": 1,
+    "m_DisplayName": "Out",
+    "m_SlotType": 1,
+    "m_Hidden": false,
+    "m_HideConnector": false,
+    "m_ShaderOutputName": "Out",
+    "m_StageCapability": 3,
+    "m_Value": 0.0,
+    "m_DefaultValue": 0.0,
+    "m_Labels": [],
+    "m_LiteralMode": false
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.SubGraphOutputNode",
+    "m_ObjectId": "1bf98e5e35fd44948e89d67628d31d46",
+    "m_Group": {
+        "m_Id": ""
+    },
+    "m_Name": "Output",
+    "m_DrawState": {
+        "m_Expanded": true,
+        "m_Position": {
+            "serializedVersion": "2",
+            "x": -2.0,
+            "y": -15.5,
+            "width": 126.0,
+            "height": 125.0
+        }
+    },
+    "m_Slots": [
+        {
+            "m_Id": "bedd26cbeee14f8f9be83f035f34ef13"
+        },
+        {
+            "m_Id": "c21c23ae9fec4b779b743a4eec19bde8"
+        },
+        {
+            "m_Id": "4026c377cfa245dcaf9c1a40fae50a24"
+        }
+    ],
+    "synonyms": [],
+    "m_Precision": 0,
+    "m_PreviewExpanded": false,
+    "m_DismissedVersion": 0,
+    "m_PreviewMode": 0,
+    "m_CustomColors": {
+        "m_SerializableColors": []
+    },
+    "IsFirstSlotValid": true
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.ShaderDropdown",
+    "m_ObjectId": "211f8ae3f4724fb3b7fe5683974bc90a",
+    "m_Guid": {
+        "m_GuidSerialized": "de71c063-2582-4725-b5ec-78ac2f48c502"
+    },
+    "promotedFromAssetID": "",
+    "promotedFromCategoryName": "",
+    "promotedOrdering": -1,
+    "m_Name": "Preview Direction",
+    "m_DefaultRefNameVersion": 1,
+    "m_RefNameGeneratedByDisplayName": "Preview Direction",
+    "m_DefaultReferenceName": "_Preview_Direction",
+    "m_OverrideReferenceName": "",
+    "m_GeneratePropertyBlock": true,
+    "m_UseCustomSlotLabel": false,
+    "m_CustomSlotLabel": "",
+    "m_DismissedVersion": 0,
+    "m_Entries": [
+        {
+            "id": 3,
+            "displayName": "Left To Right"
+        },
+        {
+            "id": 1,
+            "displayName": "Right To Left"
+        },
+        {
+            "id": 5,
+            "displayName": "Bottom To Top"
+        },
+        {
+            "id": 2,
+            "displayName": "Top To Bottom"
+        }
+    ],
+    "m_Value": 0
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
+    "m_ObjectId": "251483410f654489ab778b2272619eec",
+    "m_Id": 0,
+    "m_DisplayName": "Preview Min",
+    "m_SlotType": 1,
+    "m_Hidden": false,
+    "m_HideConnector": false,
+    "m_ShaderOutputName": "Out",
+    "m_StageCapability": 3,
+    "m_Value": 0.0,
+    "m_DefaultValue": 0.0,
+    "m_Labels": [],
+    "m_LiteralMode": false
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
+    "m_ObjectId": "2fdf945b490140e49da59ba4e37945a3",
+    "m_Id": 2,
+    "m_DisplayName": "Y",
+    "m_SlotType": 0,
+    "m_Hidden": false,
+    "m_HideConnector": false,
+    "m_ShaderOutputName": "Y",
+    "m_StageCapability": 3,
+    "m_Value": 0.0,
+    "m_DefaultValue": 0.0,
+    "m_Labels": [
+        "Y"
+    ],
+    "m_LiteralMode": false
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.Vector4MaterialSlot",
+    "m_ObjectId": "32794528eef94b45943bed729877dba2",
+    "m_Id": 0,
+    "m_DisplayName": "Final",
+    "m_SlotType": 0,
+    "m_Hidden": false,
+    "m_HideConnector": false,
+    "m_ShaderOutputName": "Final",
+    "m_StageCapability": 3,
+    "m_Value": {
+        "x": 0.0,
+        "y": 0.0,
+        "z": 0.0,
+        "w": 0.0
+    },
+    "m_DefaultValue": {
+        "x": 0.0,
+        "y": 0.0,
+        "z": 0.0,
+        "w": 0.0
+    },
+    "m_Labels": []
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
+    "m_ObjectId": "338b78bdfe024e07a1e585908bd972f5",
+    "m_Id": 0,
+    "m_DisplayName": "Preview Max",
+    "m_SlotType": 1,
+    "m_Hidden": false,
+    "m_HideConnector": false,
+    "m_ShaderOutputName": "Out",
+    "m_StageCapability": 3,
+    "m_Value": 0.0,
+    "m_DefaultValue": 0.0,
+    "m_Labels": [],
+    "m_LiteralMode": false
+}
+
+{
+    "m_SGVersion": 1,
+    "m_Type": "UnityEditor.ShaderGraph.SwizzleNode",
+    "m_ObjectId": "33f1d95650364a0b8aa7c9e50df4295f",
+    "m_Group": {
+        "m_Id": ""
+    },
+    "m_Name": "Swizzle",
+    "m_DrawState": {
+        "m_Expanded": true,
+        "m_Position": {
+            "serializedVersion": "2",
+            "x": -258.0000305175781,
+            "y": 110.0,
+            "width": 129.00001525878907,
+            "height": 122.00001525878906
+        }
+    },
+    "m_Slots": [
+        {
+            "m_Id": "891dfeb33e8043158aa036dc045c6ab2"
+        },
+        {
+            "m_Id": "c46b6240cc13410c8057439ae66624ad"
+        }
+    ],
+    "synonyms": [
+        "swap",
+        "reorder",
+        "component mask"
+    ],
+    "m_Precision": 0,
+    "m_PreviewExpanded": false,
+    "m_DismissedVersion": 0,
+    "m_PreviewMode": 0,
+    "m_CustomColors": {
+        "m_SerializableColors": []
+    },
+    "_maskInput": "y",
+    "convertedMask": "y"
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.Vector4MaterialSlot",
+    "m_ObjectId": "3bcac6956c3a45318411e22274926ac8",
+    "m_Id": 0,
+    "m_DisplayName": "In",
+    "m_SlotType": 0,
+    "m_Hidden": false,
+    "m_HideConnector": false,
+    "m_ShaderOutputName": "In",
+    "m_StageCapability": 3,
+    "m_Value": {
+        "x": 0.0,
+        "y": 0.0,
+        "z": 0.0,
+        "w": 0.0
+    },
+    "m_DefaultValue": {
+        "x": 0.0,
+        "y": 0.0,
+        "z": 0.0,
+        "w": 0.0
+    },
+    "m_Labels": []
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.Vector2MaterialSlot",
+    "m_ObjectId": "4026c377cfa245dcaf9c1a40fae50a24",
+    "m_Id": 3,
+    "m_DisplayName": "Direction",
+    "m_SlotType": 0,
+    "m_Hidden": false,
+    "m_HideConnector": false,
+    "m_ShaderOutputName": "Direction",
+    "m_StageCapability": 3,
+    "m_Value": {
+        "x": 0.0,
+        "y": 0.0
+    },
+    "m_DefaultValue": {
+        "x": 0.0,
+        "y": 0.0
+    },
+    "m_Labels": []
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.DropdownNode",
+    "m_ObjectId": "492a308e66df4650986641c17f4dfa54",
+    "m_Group": {
+        "m_Id": ""
+    },
+    "m_Name": "Preview Direction",
+    "m_DrawState": {
+        "m_Expanded": true,
+        "m_Position": {
+            "serializedVersion": "2",
+            "x": -1079.0,
+            "y": 127.0000228881836,
+            "width": 198.0,
+            "height": 166.0
+        }
+    },
+    "m_Slots": [
+        {
+            "m_Id": "dc0f7c424b384564a0debb82bd45476f"
+        },
+        {
+            "m_Id": "f2ffa0fc59da462cb208d6d0b09fe4cf"
+        },
+        {
+            "m_Id": "1a9a43053f4c4220a11351b88230ffe3"
+        },
+        {
+            "m_Id": "aa4edd1e2f9e480896b7bb1259311b4c"
+        },
+        {
+            "m_Id": "c2a69f1611de49c19bc8ef037d61ce51"
+        }
+    ],
+    "synonyms": [],
+    "m_Precision": 0,
+    "m_PreviewExpanded": false,
+    "m_DismissedVersion": 0,
+    "m_PreviewMode": 0,
+    "m_CustomColors": {
+        "m_SerializableColors": []
+    },
+    "m_Dropdown": {
+        "m_Id": "211f8ae3f4724fb3b7fe5683974bc90a"
+    }
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot",
+    "m_ObjectId": "5314b32ab1ed498dbad8351f21a0f8e2",
+    "m_Id": 2,
+    "m_DisplayName": "Out",
+    "m_SlotType": 1,
+    "m_Hidden": false,
+    "m_HideConnector": false,
+    "m_ShaderOutputName": "Out",
+    "m_StageCapability": 3,
+    "m_Value": {
+        "x": 0.0,
+        "y": 0.0,
+        "z": 0.0,
+        "w": 0.0
+    },
+    "m_DefaultValue": {
+        "x": 0.0,
+        "y": 0.0,
+        "z": 0.0,
+        "w": 0.0
+    },
+    "m_LiteralMode": false
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.PropertyNode",
+    "m_ObjectId": "5941a0a08948413aac4f7ebb2e8ef5e9",
+    "m_Group": {
+        "m_Id": ""
+    },
+    "m_Name": "Property",
+    "m_DrawState": {
+        "m_Expanded": true,
+        "m_Position": {
+            "serializedVersion": "2",
+            "x": -1218.0,
+            "y": 71.50000762939453,
+            "width": 138.5,
+            "height": 33.99998474121094
+        }
+    },
+    "m_Slots": [
+        {
+            "m_Id": "338b78bdfe024e07a1e585908bd972f5"
+        }
+    ],
+    "synonyms": [],
+    "m_Precision": 0,
+    "m_PreviewExpanded": false,
+    "m_DismissedVersion": 0,
+    "m_PreviewMode": 0,
+    "m_CustomColors": {
+        "m_SerializableColors": []
+    },
+    "m_Property": {
+        "m_Id": "945f7aca0366457398537ce7ef15e6f6"
+    }
+}
+
+{
+    "m_SGVersion": 1,
+    "m_Type": "UnityEditor.ShaderGraph.Internal.Vector1ShaderProperty",
+    "m_ObjectId": "5c5fcf7867734fff9749d05f9fcf1d39",
+    "m_Guid": {
+        "m_GuidSerialized": "2747a643-8db3-4ffc-9923-55aa70fb2549"
+    },
+    "promotedFromAssetID": "",
+    "promotedFromCategoryName": "",
+    "promotedOrdering": -1,
+    "m_Name": "Preview Min",
+    "m_DefaultRefNameVersion": 1,
+    "m_RefNameGeneratedByDisplayName": "Preview Min",
+    "m_DefaultReferenceName": "_Preview_Min",
+    "m_OverrideReferenceName": "",
+    "m_GeneratePropertyBlock": true,
+    "m_UseCustomSlotLabel": false,
+    "m_CustomSlotLabel": "",
+    "m_DismissedVersion": 0,
+    "m_Precision": 0,
+    "overrideHLSLDeclaration": false,
+    "hlslDeclarationOverride": 0,
+    "hideConnector": true,
+    "m_Hidden": false,
+    "m_PerRendererData": false,
+    "m_customAttributes": [],
+    "m_Value": 0.0,
+    "m_FloatType": 1,
+    "m_LiteralFloatMode": false,
+    "m_RangeValues": {
+        "x": 0.0,
+        "y": 1.0
+    },
+    "m_SliderType": 0,
+    "m_SliderPower": 3.0,
+    "m_EnumType": 0,
+    "m_CSharpEnumString": "",
+    "m_EnumNames": [
+        "Default"
+    ],
+    "m_EnumValues": [
+        0
+    ]
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.CategoryData",
+    "m_ObjectId": "78037d5d3b28486dbc192e494a2fd6bc",
+    "m_Name": "",
+    "m_ChildObjectList": [
+        {
+            "m_Id": "096733e82ba24cfabc80b770de24fe57"
+        },
+        {
+            "m_Id": "5c5fcf7867734fff9749d05f9fcf1d39"
+        },
+        {
+            "m_Id": "945f7aca0366457398537ce7ef15e6f6"
+        },
+        {
+            "m_Id": "211f8ae3f4724fb3b7fe5683974bc90a"
+        }
+    ]
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
+    "m_ObjectId": "7bc829cb94df4b09bb8d367cea139e22",
+    "m_Id": 1,
+    "m_DisplayName": "X",
+    "m_SlotType": 0,
+    "m_Hidden": false,
+    "m_HideConnector": false,
+    "m_ShaderOutputName": "X",
+    "m_StageCapability": 3,
+    "m_Value": 1.0,
+    "m_DefaultValue": 0.0,
+    "m_Labels": [],
+    "m_LiteralMode": false
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot",
+    "m_ObjectId": "887dd89fec75487183334fbcc9573c20",
+    "m_Id": 1,
+    "m_DisplayName": "B",
+    "m_SlotType": 0,
+    "m_Hidden": false,
+    "m_HideConnector": false,
+    "m_ShaderOutputName": "B",
+    "m_StageCapability": 3,
+    "m_Value": {
+        "x": 0.0,
+        "y": 0.0,
+        "z": 0.0,
+        "w": 0.0
+    },
+    "m_DefaultValue": {
+        "x": 0.0,
+        "y": 0.0,
+        "z": 0.0,
+        "w": 0.0
+    },
+    "m_LiteralMode": false
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.Vector2MaterialSlot",
+    "m_ObjectId": "891dfeb33e8043158aa036dc045c6ab2",
+    "m_Id": 0,
+    "m_DisplayName": "In",
+    "m_SlotType": 0,
+    "m_Hidden": false,
+    "m_HideConnector": false,
+    "m_ShaderOutputName": "In",
+    "m_StageCapability": 3,
+    "m_Value": {
+        "x": 0.0,
+        "y": 0.0
+    },
+    "m_DefaultValue": {
+        "x": 0.0,
+        "y": 0.0
+    },
+    "m_Labels": []
+}
+
+{
+    "m_SGVersion": 1,
+    "m_Type": "UnityEditor.ShaderGraph.Internal.Vector1ShaderProperty",
+    "m_ObjectId": "945f7aca0366457398537ce7ef15e6f6",
+    "m_Guid": {
+        "m_GuidSerialized": "451bbdf7-6136-4a6e-a5c8-4918d2ea4b95"
+    },
+    "promotedFromAssetID": "",
+    "promotedFromCategoryName": "",
+    "promotedOrdering": -1,
+    "m_Name": "Preview Max",
+    "m_DefaultRefNameVersion": 1,
+    "m_RefNameGeneratedByDisplayName": "Preview Max",
+    "m_DefaultReferenceName": "_Preview_Max",
+    "m_OverrideReferenceName": "",
+    "m_GeneratePropertyBlock": true,
+    "m_UseCustomSlotLabel": false,
+    "m_CustomSlotLabel": "",
+    "m_DismissedVersion": 0,
+    "m_Precision": 0,
+    "overrideHLSLDeclaration": false,
+    "hlslDeclarationOverride": 0,
+    "hideConnector": true,
+    "m_Hidden": false,
+    "m_PerRendererData": false,
+    "m_customAttributes": [],
+    "m_Value": 1.0,
+    "m_FloatType": 1,
+    "m_LiteralFloatMode": false,
+    "m_RangeValues": {
+        "x": 0.0,
+        "y": 1.0
+    },
+    "m_SliderType": 0,
+    "m_SliderPower": 3.0,
+    "m_EnumType": 0,
+    "m_CSharpEnumString": "",
+    "m_EnumNames": [
+        "Default"
+    ],
+    "m_EnumValues": [
+        0
+    ]
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.Vector4MaterialSlot",
+    "m_ObjectId": "9da9e90e58fc428e996f1baa06b531fa",
+    "m_Id": 2,
+    "m_DisplayName": "Preview",
+    "m_SlotType": 0,
+    "m_Hidden": false,
+    "m_HideConnector": false,
+    "m_ShaderOutputName": "Preview",
+    "m_StageCapability": 3,
+    "m_Value": {
+        "x": 0.0,
+        "y": 0.0,
+        "z": 0.0,
+        "w": 0.0
+    },
+    "m_DefaultValue": {
+        "x": 0.0,
+        "y": 0.0,
+        "z": 0.0,
+        "w": 0.0
+    },
+    "m_Labels": []
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot",
+    "m_ObjectId": "a26d1b1cafc44c48a829a8326031d49b",
+    "m_Id": 2,
+    "m_DisplayName": "Out",
+    "m_SlotType": 1,
+    "m_Hidden": false,
+    "m_HideConnector": false,
+    "m_ShaderOutputName": "Out",
+    "m_StageCapability": 3,
+    "m_Value": {
+        "x": 0.0,
+        "y": 0.0,
+        "z": 0.0,
+        "w": 0.0
+    },
+    "m_DefaultValue": {
+        "x": 0.0,
+        "y": 0.0,
+        "z": 0.0,
+        "w": 0.0
+    },
+    "m_LiteralMode": false
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.AppendVectorNode",
+    "m_ObjectId": "a2aaffa943394fe384d09ff60dc2eec8",
+    "m_Group": {
+        "m_Id": ""
+    },
+    "m_Name": "Append",
+    "m_DrawState": {
+        "m_Expanded": true,
+        "m_Position": {
+            "serializedVersion": "2",
+            "x": -1008.4999389648438,
+            "y": 8.500000953674317,
+            "width": 129.5,
+            "height": 117.99996948242188
+        }
+    },
+    "m_Slots": [
+        {
+            "m_Id": "e57b7e6a14b8424a9aedda57389dc6b6"
+        },
+        {
+            "m_Id": "a7e7617af18d4509a7a74f7e5dd1e7f3"
+        },
+        {
+            "m_Id": "a26d1b1cafc44c48a829a8326031d49b"
+        }
+    ],
+    "synonyms": [
+        "join",
+        "combine"
+    ],
+    "m_Precision": 0,
+    "m_PreviewExpanded": false,
+    "m_DismissedVersion": 0,
+    "m_PreviewMode": 0,
+    "m_CustomColors": {
+        "m_SerializableColors": []
+    }
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot",
+    "m_ObjectId": "a7e7617af18d4509a7a74f7e5dd1e7f3",
+    "m_Id": 1,
+    "m_DisplayName": "B",
+    "m_SlotType": 0,
+    "m_Hidden": false,
+    "m_HideConnector": false,
+    "m_ShaderOutputName": "B",
+    "m_StageCapability": 3,
+    "m_Value": {
+        "x": 0.0,
+        "y": 0.0,
+        "z": 0.0,
+        "w": 0.0
+    },
+    "m_DefaultValue": {
+        "x": 0.0,
+        "y": 0.0,
+        "z": 0.0,
+        "w": 0.0
+    },
+    "m_LiteralMode": false
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot",
+    "m_ObjectId": "aa4edd1e2f9e480896b7bb1259311b4c",
+    "m_Id": 5,
+    "m_DisplayName": "Bottom To Top",
+    "m_SlotType": 0,
+    "m_Hidden": false,
+    "m_HideConnector": false,
+    "m_ShaderOutputName": "Bottom To Top",
+    "m_StageCapability": 3,
+    "m_Value": {
+        "x": 0.0,
+        "y": 1.0,
+        "z": 0.0,
+        "w": 0.0
+    },
+    "m_DefaultValue": {
+        "x": 0.0,
+        "y": 0.0,
+        "z": 0.0,
+        "w": 0.0
+    },
+    "m_LiteralMode": false
+}
+
+{
+    "m_SGVersion": 1,
+    "m_Type": "UnityEditor.ShaderGraph.SwizzleNode",
+    "m_ObjectId": "b1809264eb37441a93b4f6b729d40ca2",
+    "m_Group": {
+        "m_Id": ""
+    },
+    "m_Name": "Swizzle",
+    "m_DrawState": {
+        "m_Expanded": true,
+        "m_Position": {
+            "serializedVersion": "2",
+            "x": -258.0000305175781,
+            "y": -14.999998092651368,
+            "width": 128.00003051757813,
+            "height": 122.0
+        }
+    },
+    "m_Slots": [
+        {
+            "m_Id": "d328e4d1ee974979b4235fdd2386c8ac"
+        },
+        {
+            "m_Id": "1ac6bdb6993c4ec9ab91eedd12a2922a"
+        }
+    ],
+    "synonyms": [
+        "swap",
+        "reorder",
+        "component mask"
+    ],
+    "m_Precision": 0,
+    "m_PreviewExpanded": false,
+    "m_DismissedVersion": 0,
+    "m_PreviewMode": 0,
+    "m_CustomColors": {
+        "m_SerializableColors": []
+    },
+    "_maskInput": "x",
+    "convertedMask": "x"
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.PropertyNode",
+    "m_ObjectId": "b53ce975fa294692a0d3c0eeb24e55be",
+    "m_Group": {
+        "m_Id": ""
+    },
+    "m_Name": "Property",
+    "m_DrawState": {
+        "m_Expanded": true,
+        "m_Position": {
+            "serializedVersion": "2",
+            "x": -527.5,
+            "y": -49.5,
+            "width": 173.0,
+            "height": 34.0
+        }
+    },
+    "m_Slots": [
+        {
+            "m_Id": "ed35eb330dda4f8b915ee39a359f2dd5"
+        }
+    ],
+    "synonyms": [],
+    "m_Precision": 0,
+    "m_PreviewExpanded": false,
+    "m_DismissedVersion": 0,
+    "m_PreviewMode": 0,
+    "m_CustomColors": {
+        "m_SerializableColors": []
+    },
+    "m_Property": {
+        "m_Id": "096733e82ba24cfabc80b770de24fe57"
+    }
+}
+
+{
+    "m_SGVersion": 1,
+    "m_Type": "UnityEditor.ShaderGraph.CustomFunctionNode",
+    "m_ObjectId": "bc85e665abea4b06b532dd86b35f9fff",
+    "m_Group": {
+        "m_Id": ""
+    },
+    "m_Name": "IsPreviewFloat4 (Custom Function)",
+    "m_DrawState": {
+        "m_Expanded": true,
+        "m_Position": {
+            "serializedVersion": "2",
+            "x": -527.5,
+            "y": -15.5,
+            "width": 209.0,
+            "height": 101.0
+        }
+    },
+    "m_Slots": [
+        {
+            "m_Id": "32794528eef94b45943bed729877dba2"
+        },
+        {
+            "m_Id": "9da9e90e58fc428e996f1baa06b531fa"
+        },
+        {
+            "m_Id": "f0b5300b7ea149cd958f4c7eda0a19c3"
+        }
+    ],
+    "synonyms": [
+        "code",
+        "HLSL"
+    ],
+    "m_Precision": 0,
+    "m_PreviewExpanded": false,
+    "m_DismissedVersion": 0,
+    "m_PreviewMode": 0,
+    "m_CustomColors": {
+        "m_SerializableColors": []
+    },
+    "m_SourceType": 1,
+    "m_FunctionName": "IsPreviewFloat4",
+    "m_FunctionSource": "",
+    "m_FunctionSourceUsePragmas": true,
+    "m_FunctionBody": "#if defined(SHADERGRAPH_PREVIEW_MAIN) || defined(SHADERGRAPH_PREVIEW)\nOut = Preview;\n#else\nOut = Final;\n#endif\n"
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
+    "m_ObjectId": "bedd26cbeee14f8f9be83f035f34ef13",
+    "m_Id": 1,
+    "m_DisplayName": "Min",
+    "m_SlotType": 0,
+    "m_Hidden": false,
+    "m_HideConnector": false,
+    "m_ShaderOutputName": "Min",
+    "m_StageCapability": 3,
+    "m_Value": 0.0,
+    "m_DefaultValue": 0.0,
+    "m_Labels": [],
+    "m_LiteralMode": false
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
+    "m_ObjectId": "c21c23ae9fec4b779b743a4eec19bde8",
+    "m_Id": 2,
+    "m_DisplayName": "Max",
+    "m_SlotType": 0,
+    "m_Hidden": false,
+    "m_HideConnector": false,
+    "m_ShaderOutputName": "Max",
+    "m_StageCapability": 3,
+    "m_Value": 0.0,
+    "m_DefaultValue": 0.0,
+    "m_Labels": [],
+    "m_LiteralMode": false
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot",
+    "m_ObjectId": "c2a69f1611de49c19bc8ef037d61ce51",
+    "m_Id": 2,
+    "m_DisplayName": "Top To Bottom",
+    "m_SlotType": 0,
+    "m_Hidden": false,
+    "m_HideConnector": false,
+    "m_ShaderOutputName": "Top To Bottom",
+    "m_StageCapability": 3,
+    "m_Value": {
+        "x": 0.0,
+        "y": -1.0,
+        "z": 0.0,
+        "w": 0.0
+    },
+    "m_DefaultValue": {
+        "x": 0.0,
+        "y": 0.0,
+        "z": 0.0,
+        "w": 0.0
+    },
+    "m_LiteralMode": false
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
+    "m_ObjectId": "c46b6240cc13410c8057439ae66624ad",
+    "m_Id": 1,
+    "m_DisplayName": "Out",
+    "m_SlotType": 1,
+    "m_Hidden": false,
+    "m_HideConnector": false,
+    "m_ShaderOutputName": "Out",
+    "m_StageCapability": 3,
+    "m_Value": 0.0,
+    "m_DefaultValue": 0.0,
+    "m_Labels": [],
+    "m_LiteralMode": false
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.Vector2MaterialSlot",
+    "m_ObjectId": "c54273bf0bb74c36b59a4a937d83c5ef",
+    "m_Id": 1,
+    "m_DisplayName": "Out",
+    "m_SlotType": 1,
+    "m_Hidden": false,
+    "m_HideConnector": false,
+    "m_ShaderOutputName": "Out",
+    "m_StageCapability": 3,
+    "m_Value": {
+        "x": 0.0,
+        "y": 0.0
+    },
+    "m_DefaultValue": {
+        "x": 0.0,
+        "y": 0.0
+    },
+    "m_Labels": []
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot",
+    "m_ObjectId": "c6c25c95f7cf4ec4842b568b1cb6235c",
+    "m_Id": 0,
+    "m_DisplayName": "A",
+    "m_SlotType": 0,
+    "m_Hidden": false,
+    "m_HideConnector": false,
+    "m_ShaderOutputName": "A",
+    "m_StageCapability": 3,
+    "m_Value": {
+        "x": 0.0,
+        "y": 0.0,
+        "z": 0.0,
+        "w": 0.0
+    },
+    "m_DefaultValue": {
+        "x": 0.0,
+        "y": 0.0,
+        "z": 0.0,
+        "w": 0.0
+    },
+    "m_LiteralMode": false
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
+    "m_ObjectId": "d328e4d1ee974979b4235fdd2386c8ac",
+    "m_Id": 0,
+    "m_DisplayName": "In",
+    "m_SlotType": 0,
+    "m_Hidden": false,
+    "m_HideConnector": false,
+    "m_ShaderOutputName": "In",
+    "m_StageCapability": 3,
+    "m_Value": 0.0,
+    "m_DefaultValue": 0.0,
+    "m_Labels": [],
+    "m_LiteralMode": false
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot",
+    "m_ObjectId": "dc0f7c424b384564a0debb82bd45476f",
+    "m_Id": 0,
+    "m_DisplayName": "Out",
+    "m_SlotType": 1,
+    "m_Hidden": false,
+    "m_HideConnector": false,
+    "m_ShaderOutputName": "Out",
+    "m_StageCapability": 3,
+    "m_Value": {
+        "x": 0.0,
+        "y": 0.0,
+        "z": 0.0,
+        "w": 0.0
+    },
+    "m_DefaultValue": {
+        "x": 0.0,
+        "y": 0.0,
+        "z": 0.0,
+        "w": 0.0
+    },
+    "m_LiteralMode": true
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.Vector2MaterialSlot",
+    "m_ObjectId": "e5750f14156f4d7792ceddb4f6b3bd20",
+    "m_Id": 0,
+    "m_DisplayName": "Out",
+    "m_SlotType": 1,
+    "m_Hidden": false,
+    "m_HideConnector": false,
+    "m_ShaderOutputName": "Out",
+    "m_StageCapability": 3,
+    "m_Value": {
+        "x": 0.0,
+        "y": 0.0
+    },
+    "m_DefaultValue": {
+        "x": 0.0,
+        "y": 0.0
+    },
+    "m_Labels": []
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot",
+    "m_ObjectId": "e57b7e6a14b8424a9aedda57389dc6b6",
+    "m_Id": 0,
+    "m_DisplayName": "A",
+    "m_SlotType": 0,
+    "m_Hidden": false,
+    "m_HideConnector": false,
+    "m_ShaderOutputName": "A",
+    "m_StageCapability": 3,
+    "m_Value": {
+        "x": 0.0,
+        "y": 0.0,
+        "z": 0.0,
+        "w": 0.0
+    },
+    "m_DefaultValue": {
+        "x": 0.0,
+        "y": 0.0,
+        "z": 0.0,
+        "w": 0.0
+    },
+    "m_LiteralMode": false
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.Vector4MaterialSlot",
+    "m_ObjectId": "ed35eb330dda4f8b915ee39a359f2dd5",
+    "m_Id": 0,
+    "m_DisplayName": "RangeBarValue",
+    "m_SlotType": 1,
+    "m_Hidden": false,
+    "m_HideConnector": false,
+    "m_ShaderOutputName": "Out",
+    "m_StageCapability": 3,
+    "m_Value": {
+        "x": 0.0,
+        "y": 0.0,
+        "z": 0.0,
+        "w": 0.0
+    },
+    "m_DefaultValue": {
+        "x": 0.0,
+        "y": 0.0,
+        "z": 0.0,
+        "w": 0.0
+    },
+    "m_Labels": []
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.Vector4MaterialSlot",
+    "m_ObjectId": "f0b5300b7ea149cd958f4c7eda0a19c3",
+    "m_Id": 1,
+    "m_DisplayName": "Out",
+    "m_SlotType": 1,
+    "m_Hidden": false,
+    "m_HideConnector": false,
+    "m_ShaderOutputName": "Out",
+    "m_StageCapability": 3,
+    "m_Value": {
+        "x": 0.0,
+        "y": 0.0,
+        "z": 0.0,
+        "w": 0.0
+    },
+    "m_DefaultValue": {
+        "x": 0.0,
+        "y": 0.0,
+        "z": 0.0,
+        "w": 0.0
+    },
+    "m_Labels": []
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot",
+    "m_ObjectId": "f2ffa0fc59da462cb208d6d0b09fe4cf",
+    "m_Id": 3,
+    "m_DisplayName": "Left To Right",
+    "m_SlotType": 0,
+    "m_Hidden": false,
+    "m_HideConnector": false,
+    "m_ShaderOutputName": "Left To Right",
+    "m_StageCapability": 3,
+    "m_Value": {
+        "x": 0.0,
+        "y": 0.0,
+        "z": 0.0,
+        "w": 0.0
+    },
+    "m_DefaultValue": {
+        "x": 0.0,
+        "y": 0.0,
+        "z": 0.0,
+        "w": 0.0
+    },
+    "m_LiteralMode": false
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.AppendVectorNode",
+    "m_ObjectId": "f92472fdb7634dd885ca5b91627131ca",
+    "m_Group": {
+        "m_Id": ""
+    },
+    "m_Name": "Append",
+    "m_DrawState": {
+        "m_Expanded": true,
+        "m_Position": {
+            "serializedVersion": "2",
+            "x": -709.0000610351563,
+            "y": 8.50000286102295,
+            "width": 129.5,
+            "height": 118.00001525878906
+        }
+    },
+    "m_Slots": [
+        {
+            "m_Id": "c6c25c95f7cf4ec4842b568b1cb6235c"
+        },
+        {
+            "m_Id": "887dd89fec75487183334fbcc9573c20"
+        },
+        {
+            "m_Id": "5314b32ab1ed498dbad8351f21a0f8e2"
+        }
+    ],
+    "synonyms": [
+        "join",
+        "combine"
+    ],
+    "m_Precision": 0,
+    "m_PreviewExpanded": false,
+    "m_DismissedVersion": 0,
+    "m_PreviewMode": 0,
+    "m_CustomColors": {
+        "m_SerializableColors": []
+    }
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.StickyNoteData",
+    "m_ObjectId": "fbfeccf0145a45c19e682862a2abe4ad",
+    "m_Title": "Range Bar Value",
+    "m_Content": "This subgraph uses a Custom Function Node to switch between a hidden promoted property and  subgraph properties with input port disabled used as the preview min and max values, as well as a dropdown used to set the preview direction vector.\n\nThis requires a RangeBar component on the element to feed the value.",
+    "m_TextSize": 0,
+    "m_Theme": 1,
+    "m_Position": {
+        "serializedVersion": "2",
+        "x": -827.0,
+        "y": -183.0,
+        "width": 255.22808837890626,
+        "height": 160.0
+    },
+    "m_Group": {
+        "m_Id": ""
+    }
+}
+
diff --git a/Packages/com.unity.shadergraph/Samples~/UGUIShaders/Subgraphs/Utilities/Slider Direction Preview.shadersubgraph.meta b/Packages/com.unity.shadergraph/Samples~/UGUIShaders/Subgraphs/Input/RangeBarValue.shadersubgraph.meta
similarity index 80%
rename from Packages/com.unity.shadergraph/Samples~/UGUIShaders/Subgraphs/Utilities/Slider Direction Preview.shadersubgraph.meta
rename to Packages/com.unity.shadergraph/Samples~/UGUIShaders/Subgraphs/Input/RangeBarValue.shadersubgraph.meta
index 56c447b8be4..fa26a6857d6 100644
--- a/Packages/com.unity.shadergraph/Samples~/UGUIShaders/Subgraphs/Utilities/Slider Direction Preview.shadersubgraph.meta	
+++ b/Packages/com.unity.shadergraph/Samples~/UGUIShaders/Subgraphs/Input/RangeBarValue.shadersubgraph.meta
@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: b7b97b929f84d4c42ae877064f6d694a
+guid: 41e92803bd4fa4bb29936cc9c1016fb2
 ScriptedImporter:
   internalIDToNameTable: []
   externalObjects: {}
@@ -8,3 +8,4 @@ ScriptedImporter:
   assetBundleName: 
   assetBundleVariant: 
   script: {fileID: 11500000, guid: 60072b568d64c40a485e0fc55012dc9f, type: 3}
+  documentationPath: 
diff --git a/Packages/com.unity.shadergraph/Samples~/UGUIShaders/Subgraphs/Input/RectTransformSize.shadersubgraph b/Packages/com.unity.shadergraph/Samples~/UGUIShaders/Subgraphs/Input/RectTransformSize.shadersubgraph
new file mode 100644
index 00000000000..38012041ee4
--- /dev/null
+++ b/Packages/com.unity.shadergraph/Samples~/UGUIShaders/Subgraphs/Input/RectTransformSize.shadersubgraph
@@ -0,0 +1,1470 @@
+{
+    "m_SGVersion": 3,
+    "m_Type": "UnityEditor.ShaderGraph.GraphData",
+    "m_ObjectId": "e223ad31b8fe47fda6ebf1c1b165d43b",
+    "m_Properties": [
+        {
+            "m_Id": "096733e82ba24cfabc80b770de24fe57"
+        },
+        {
+            "m_Id": "3f4c91e7dbf347bcad569e309d43824a"
+        },
+        {
+            "m_Id": "e4dd1b7421e84c35a4aa2cb7908bc76c"
+        },
+        {
+            "m_Id": "5c5fcf7867734fff9749d05f9fcf1d39"
+        },
+        {
+            "m_Id": "945f7aca0366457398537ce7ef15e6f6"
+        }
+    ],
+    "m_Keywords": [],
+    "m_Dropdowns": [],
+    "m_CategoryData": [
+        {
+            "m_Id": "78037d5d3b28486dbc192e494a2fd6bc"
+        }
+    ],
+    "m_Nodes": [
+        {
+            "m_Id": "1bf98e5e35fd44948e89d67628d31d46"
+        },
+        {
+            "m_Id": "b53ce975fa294692a0d3c0eeb24e55be"
+        },
+        {
+            "m_Id": "2789c2ae4081437b85816a3af1420fd6"
+        },
+        {
+            "m_Id": "77dadbe595c54a479ed5810803a5da65"
+        },
+        {
+            "m_Id": "4f5a3b4c31fa4aeeb800df3051edc5f8"
+        },
+        {
+            "m_Id": "bc85e665abea4b06b532dd86b35f9fff"
+        },
+        {
+            "m_Id": "1500bd04343d4d6dbe00ff833331d2a0"
+        },
+        {
+            "m_Id": "5941a0a08948413aac4f7ebb2e8ef5e9"
+        },
+        {
+            "m_Id": "0a39ca4bc874478da078f61e0934fb8b"
+        },
+        {
+            "m_Id": "4fa0e2a4b9854da88da0f8f4ca6d8b44"
+        },
+        {
+            "m_Id": "d5f7638ba14342738c9e4651c7941b03"
+        }
+    ],
+    "m_GroupDatas": [],
+    "m_StickyNoteDatas": [
+        {
+            "m_Id": "c2d4583729814e17b99bbaab2a1c081a"
+        }
+    ],
+    "m_Edges": [
+        {
+            "m_OutputSlot": {
+                "m_Node": {
+                    "m_Id": "0a39ca4bc874478da078f61e0934fb8b"
+                },
+                "m_SlotId": 4
+            },
+            "m_InputSlot": {
+                "m_Node": {
+                    "m_Id": "bc85e665abea4b06b532dd86b35f9fff"
+                },
+                "m_SlotId": 2
+            }
+        },
+        {
+            "m_OutputSlot": {
+                "m_Node": {
+                    "m_Id": "1500bd04343d4d6dbe00ff833331d2a0"
+                },
+                "m_SlotId": 0
+            },
+            "m_InputSlot": {
+                "m_Node": {
+                    "m_Id": "0a39ca4bc874478da078f61e0934fb8b"
+                },
+                "m_SlotId": 2
+            }
+        },
+        {
+            "m_OutputSlot": {
+                "m_Node": {
+                    "m_Id": "2789c2ae4081437b85816a3af1420fd6"
+                },
+                "m_SlotId": 1
+            },
+            "m_InputSlot": {
+                "m_Node": {
+                    "m_Id": "1bf98e5e35fd44948e89d67628d31d46"
+                },
+                "m_SlotId": 1
+            }
+        },
+        {
+            "m_OutputSlot": {
+                "m_Node": {
+                    "m_Id": "4f5a3b4c31fa4aeeb800df3051edc5f8"
+                },
+                "m_SlotId": 1
+            },
+            "m_InputSlot": {
+                "m_Node": {
+                    "m_Id": "1bf98e5e35fd44948e89d67628d31d46"
+                },
+                "m_SlotId": 3
+            }
+        },
+        {
+            "m_OutputSlot": {
+                "m_Node": {
+                    "m_Id": "4fa0e2a4b9854da88da0f8f4ca6d8b44"
+                },
+                "m_SlotId": 0
+            },
+            "m_InputSlot": {
+                "m_Node": {
+                    "m_Id": "0a39ca4bc874478da078f61e0934fb8b"
+                },
+                "m_SlotId": 0
+            }
+        },
+        {
+            "m_OutputSlot": {
+                "m_Node": {
+                    "m_Id": "5941a0a08948413aac4f7ebb2e8ef5e9"
+                },
+                "m_SlotId": 0
+            },
+            "m_InputSlot": {
+                "m_Node": {
+                    "m_Id": "0a39ca4bc874478da078f61e0934fb8b"
+                },
+                "m_SlotId": 3
+            }
+        },
+        {
+            "m_OutputSlot": {
+                "m_Node": {
+                    "m_Id": "77dadbe595c54a479ed5810803a5da65"
+                },
+                "m_SlotId": 1
+            },
+            "m_InputSlot": {
+                "m_Node": {
+                    "m_Id": "1bf98e5e35fd44948e89d67628d31d46"
+                },
+                "m_SlotId": 2
+            }
+        },
+        {
+            "m_OutputSlot": {
+                "m_Node": {
+                    "m_Id": "b53ce975fa294692a0d3c0eeb24e55be"
+                },
+                "m_SlotId": 0
+            },
+            "m_InputSlot": {
+                "m_Node": {
+                    "m_Id": "bc85e665abea4b06b532dd86b35f9fff"
+                },
+                "m_SlotId": 0
+            }
+        },
+        {
+            "m_OutputSlot": {
+                "m_Node": {
+                    "m_Id": "bc85e665abea4b06b532dd86b35f9fff"
+                },
+                "m_SlotId": 1
+            },
+            "m_InputSlot": {
+                "m_Node": {
+                    "m_Id": "2789c2ae4081437b85816a3af1420fd6"
+                },
+                "m_SlotId": 0
+            }
+        },
+        {
+            "m_OutputSlot": {
+                "m_Node": {
+                    "m_Id": "bc85e665abea4b06b532dd86b35f9fff"
+                },
+                "m_SlotId": 1
+            },
+            "m_InputSlot": {
+                "m_Node": {
+                    "m_Id": "4f5a3b4c31fa4aeeb800df3051edc5f8"
+                },
+                "m_SlotId": 0
+            }
+        },
+        {
+            "m_OutputSlot": {
+                "m_Node": {
+                    "m_Id": "bc85e665abea4b06b532dd86b35f9fff"
+                },
+                "m_SlotId": 1
+            },
+            "m_InputSlot": {
+                "m_Node": {
+                    "m_Id": "77dadbe595c54a479ed5810803a5da65"
+                },
+                "m_SlotId": 0
+            }
+        },
+        {
+            "m_OutputSlot": {
+                "m_Node": {
+                    "m_Id": "d5f7638ba14342738c9e4651c7941b03"
+                },
+                "m_SlotId": 0
+            },
+            "m_InputSlot": {
+                "m_Node": {
+                    "m_Id": "0a39ca4bc874478da078f61e0934fb8b"
+                },
+                "m_SlotId": 1
+            }
+        }
+    ],
+    "m_VertexContext": {
+        "m_Position": {
+            "x": 0.0,
+            "y": 0.0
+        },
+        "m_Blocks": []
+    },
+    "m_FragmentContext": {
+        "m_Position": {
+            "x": 0.0,
+            "y": 0.0
+        },
+        "m_Blocks": []
+    },
+    "m_PreviewData": {
+        "serializedMesh": {
+            "m_SerializedMesh": "{\"mesh\":{\"instanceID\":0}}",
+            "m_Guid": ""
+        },
+        "preventRotation": false
+    },
+    "m_Path": "Input/UGUI",
+    "m_GraphPrecision": 1,
+    "m_PreviewMode": 2,
+    "m_OutputNode": {
+        "m_Id": "1bf98e5e35fd44948e89d67628d31d46"
+    },
+    "m_SubDatas": [],
+    "m_ActiveTargets": []
+}
+
+{
+    "m_SGVersion": 1,
+    "m_Type": "UnityEditor.ShaderGraph.Internal.Vector4ShaderProperty",
+    "m_ObjectId": "096733e82ba24cfabc80b770de24fe57",
+    "m_Guid": {
+        "m_GuidSerialized": "bf50f33d-eafe-4f4d-b963-ca0358290e4d"
+    },
+    "promotedFromAssetID": "aa041986c041b4dc1b5bf0b2cd2d86e8",
+    "promotedFromCategoryName": "",
+    "promotedOrdering": -1,
+    "m_Name": "RectTransformInfo",
+    "m_DefaultRefNameVersion": 1,
+    "m_RefNameGeneratedByDisplayName": "RectTransformInfo",
+    "m_DefaultReferenceName": "_RectTransformInfo",
+    "m_OverrideReferenceName": "",
+    "m_GeneratePropertyBlock": false,
+    "m_UseCustomSlotLabel": false,
+    "m_CustomSlotLabel": "",
+    "m_DismissedVersion": 0,
+    "m_Precision": 0,
+    "overrideHLSLDeclaration": true,
+    "hlslDeclarationOverride": 2,
+    "hideConnector": false,
+    "m_Hidden": false,
+    "m_PerRendererData": false,
+    "m_customAttributes": [],
+    "m_Value": {
+        "x": 0.0,
+        "y": 0.0,
+        "z": 0.0,
+        "w": 0.0
+    }
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.CombineNode",
+    "m_ObjectId": "0a39ca4bc874478da078f61e0934fb8b",
+    "m_Group": {
+        "m_Id": ""
+    },
+    "m_Name": "Combine",
+    "m_DrawState": {
+        "m_Expanded": true,
+        "m_Position": {
+            "serializedVersion": "2",
+            "x": -738.0,
+            "y": -59.0,
+            "width": 0.0,
+            "height": 0.0
+        }
+    },
+    "m_Slots": [
+        {
+            "m_Id": "b2b36719ce374b89b97b64eb5a09008f"
+        },
+        {
+            "m_Id": "1ae53d1484f34b559b049b0692c92ff8"
+        },
+        {
+            "m_Id": "b4514c21be164aa489d90e86f248b4a2"
+        },
+        {
+            "m_Id": "a49d7feda56e4f23afc504a6cc6187b3"
+        },
+        {
+            "m_Id": "4f2243ea6e514830b8db211598d8ca5b"
+        },
+        {
+            "m_Id": "c205cc45358c4964a6e16c3b9d068aaf"
+        },
+        {
+            "m_Id": "4a2dba1c2ad3472881aa2e63317bc074"
+        }
+    ],
+    "synonyms": [
+        "append"
+    ],
+    "m_Precision": 0,
+    "m_PreviewExpanded": false,
+    "m_DismissedVersion": 0,
+    "m_PreviewMode": 0,
+    "m_CustomColors": {
+        "m_SerializableColors": []
+    }
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.Vector3MaterialSlot",
+    "m_ObjectId": "100266bba97d4745bd0083a8049f668f",
+    "m_Id": 0,
+    "m_DisplayName": "In",
+    "m_SlotType": 0,
+    "m_Hidden": false,
+    "m_HideConnector": false,
+    "m_ShaderOutputName": "In",
+    "m_StageCapability": 3,
+    "m_Value": {
+        "x": 0.0,
+        "y": 0.0,
+        "z": 0.0
+    },
+    "m_DefaultValue": {
+        "x": 0.0,
+        "y": 0.0,
+        "z": 0.0
+    },
+    "m_Labels": []
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.PropertyNode",
+    "m_ObjectId": "1500bd04343d4d6dbe00ff833331d2a0",
+    "m_Group": {
+        "m_Id": ""
+    },
+    "m_Name": "Property",
+    "m_DrawState": {
+        "m_Expanded": true,
+        "m_Position": {
+            "serializedVersion": "2",
+            "x": -1087.0,
+            "y": 52.0,
+            "width": 179.0,
+            "height": 34.0
+        }
+    },
+    "m_Slots": [
+        {
+            "m_Id": "251483410f654489ab778b2272619eec"
+        }
+    ],
+    "synonyms": [],
+    "m_Precision": 0,
+    "m_PreviewExpanded": false,
+    "m_DismissedVersion": 0,
+    "m_PreviewMode": 0,
+    "m_CustomColors": {
+        "m_SerializableColors": []
+    },
+    "m_Property": {
+        "m_Id": "5c5fcf7867734fff9749d05f9fcf1d39"
+    }
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.Vector2MaterialSlot",
+    "m_ObjectId": "152fbb1448d241d0a0a1755bc0cb3795",
+    "m_Id": 0,
+    "m_DisplayName": "In",
+    "m_SlotType": 0,
+    "m_Hidden": false,
+    "m_HideConnector": false,
+    "m_ShaderOutputName": "In",
+    "m_StageCapability": 3,
+    "m_Value": {
+        "x": 0.0,
+        "y": 0.0
+    },
+    "m_DefaultValue": {
+        "x": 0.0,
+        "y": 0.0
+    },
+    "m_Labels": []
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
+    "m_ObjectId": "1ae53d1484f34b559b049b0692c92ff8",
+    "m_Id": 1,
+    "m_DisplayName": "G",
+    "m_SlotType": 0,
+    "m_Hidden": false,
+    "m_HideConnector": false,
+    "m_ShaderOutputName": "G",
+    "m_StageCapability": 3,
+    "m_Value": 0.0,
+    "m_DefaultValue": 0.0,
+    "m_Labels": [],
+    "m_LiteralMode": false
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.SubGraphOutputNode",
+    "m_ObjectId": "1bf98e5e35fd44948e89d67628d31d46",
+    "m_Group": {
+        "m_Id": ""
+    },
+    "m_Name": "Output",
+    "m_DrawState": {
+        "m_Expanded": true,
+        "m_Position": {
+            "serializedVersion": "2",
+            "x": -2.0,
+            "y": -15.5,
+            "width": 126.0,
+            "height": 125.0
+        }
+    },
+    "m_Slots": [
+        {
+            "m_Id": "a2214e059b3d4c2584101133b715ca3b"
+        },
+        {
+            "m_Id": "fa5945d1500a4c429e8c1605039ca16b"
+        },
+        {
+            "m_Id": "7d2e2f37274d4205a100dc3a97cb2b7c"
+        }
+    ],
+    "synonyms": [],
+    "m_Precision": 0,
+    "m_PreviewExpanded": false,
+    "m_DismissedVersion": 0,
+    "m_PreviewMode": 0,
+    "m_CustomColors": {
+        "m_SerializableColors": []
+    },
+    "IsFirstSlotValid": true
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
+    "m_ObjectId": "251483410f654489ab778b2272619eec",
+    "m_Id": 0,
+    "m_DisplayName": "PreviewScaleFactor",
+    "m_SlotType": 1,
+    "m_Hidden": false,
+    "m_HideConnector": false,
+    "m_ShaderOutputName": "Out",
+    "m_StageCapability": 3,
+    "m_Value": 0.0,
+    "m_DefaultValue": 0.0,
+    "m_Labels": [],
+    "m_LiteralMode": false
+}
+
+{
+    "m_SGVersion": 1,
+    "m_Type": "UnityEditor.ShaderGraph.SwizzleNode",
+    "m_ObjectId": "2789c2ae4081437b85816a3af1420fd6",
+    "m_Group": {
+        "m_Id": ""
+    },
+    "m_Name": "Swizzle",
+    "m_DrawState": {
+        "m_Expanded": true,
+        "m_Position": {
+            "serializedVersion": "2",
+            "x": -185.0,
+            "y": -15.5,
+            "width": 130.5,
+            "height": 121.5
+        }
+    },
+    "m_Slots": [
+        {
+            "m_Id": "152fbb1448d241d0a0a1755bc0cb3795"
+        },
+        {
+            "m_Id": "f72b58f1eb1e430a841bbc495a8c5a0e"
+        }
+    ],
+    "synonyms": [
+        "swap",
+        "reorder",
+        "component mask"
+    ],
+    "m_Precision": 0,
+    "m_PreviewExpanded": false,
+    "m_DismissedVersion": 0,
+    "m_PreviewMode": 0,
+    "m_CustomColors": {
+        "m_SerializableColors": []
+    },
+    "_maskInput": "xy",
+    "convertedMask": "xy"
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.Vector4MaterialSlot",
+    "m_ObjectId": "32794528eef94b45943bed729877dba2",
+    "m_Id": 0,
+    "m_DisplayName": "Final",
+    "m_SlotType": 0,
+    "m_Hidden": false,
+    "m_HideConnector": false,
+    "m_ShaderOutputName": "Final",
+    "m_StageCapability": 3,
+    "m_Value": {
+        "x": 0.0,
+        "y": 0.0,
+        "z": 0.0,
+        "w": 0.0
+    },
+    "m_DefaultValue": {
+        "x": 0.0,
+        "y": 0.0,
+        "z": 0.0,
+        "w": 0.0
+    },
+    "m_Labels": []
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
+    "m_ObjectId": "338b78bdfe024e07a1e585908bd972f5",
+    "m_Id": 0,
+    "m_DisplayName": "PreviewPPU",
+    "m_SlotType": 1,
+    "m_Hidden": false,
+    "m_HideConnector": false,
+    "m_ShaderOutputName": "Out",
+    "m_StageCapability": 3,
+    "m_Value": 0.0,
+    "m_DefaultValue": 0.0,
+    "m_Labels": [],
+    "m_LiteralMode": false
+}
+
+{
+    "m_SGVersion": 1,
+    "m_Type": "UnityEditor.ShaderGraph.Internal.Vector1ShaderProperty",
+    "m_ObjectId": "3f4c91e7dbf347bcad569e309d43824a",
+    "m_Guid": {
+        "m_GuidSerialized": "373c703c-395b-43d3-91ba-78b9497021e7"
+    },
+    "promotedFromAssetID": "",
+    "promotedFromCategoryName": "",
+    "promotedOrdering": -1,
+    "m_Name": "PreviewHeight",
+    "m_DefaultRefNameVersion": 1,
+    "m_RefNameGeneratedByDisplayName": "PreviewHeight",
+    "m_DefaultReferenceName": "_PreviewHeight",
+    "m_OverrideReferenceName": "",
+    "m_GeneratePropertyBlock": true,
+    "m_UseCustomSlotLabel": false,
+    "m_CustomSlotLabel": "",
+    "m_DismissedVersion": 0,
+    "m_Precision": 0,
+    "overrideHLSLDeclaration": false,
+    "hlslDeclarationOverride": 0,
+    "hideConnector": true,
+    "m_Hidden": false,
+    "m_PerRendererData": false,
+    "m_customAttributes": [],
+    "m_Value": 100.0,
+    "m_FloatType": 0,
+    "m_LiteralFloatMode": false,
+    "m_RangeValues": {
+        "x": 0.0,
+        "y": 1.0
+    },
+    "m_SliderType": 0,
+    "m_SliderPower": 3.0,
+    "m_EnumType": 0,
+    "m_CSharpEnumString": "",
+    "m_EnumNames": [
+        "Default"
+    ],
+    "m_EnumValues": [
+        0
+    ]
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.Vector2MaterialSlot",
+    "m_ObjectId": "4a2dba1c2ad3472881aa2e63317bc074",
+    "m_Id": 6,
+    "m_DisplayName": "RG",
+    "m_SlotType": 1,
+    "m_Hidden": false,
+    "m_HideConnector": false,
+    "m_ShaderOutputName": "RG",
+    "m_StageCapability": 3,
+    "m_Value": {
+        "x": 0.0,
+        "y": 0.0
+    },
+    "m_DefaultValue": {
+        "x": 0.0,
+        "y": 0.0
+    },
+    "m_Labels": []
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.Vector4MaterialSlot",
+    "m_ObjectId": "4f2243ea6e514830b8db211598d8ca5b",
+    "m_Id": 4,
+    "m_DisplayName": "RGBA",
+    "m_SlotType": 1,
+    "m_Hidden": false,
+    "m_HideConnector": false,
+    "m_ShaderOutputName": "RGBA",
+    "m_StageCapability": 3,
+    "m_Value": {
+        "x": 0.0,
+        "y": 0.0,
+        "z": 0.0,
+        "w": 0.0
+    },
+    "m_DefaultValue": {
+        "x": 0.0,
+        "y": 0.0,
+        "z": 0.0,
+        "w": 0.0
+    },
+    "m_Labels": []
+}
+
+{
+    "m_SGVersion": 1,
+    "m_Type": "UnityEditor.ShaderGraph.SwizzleNode",
+    "m_ObjectId": "4f5a3b4c31fa4aeeb800df3051edc5f8",
+    "m_Group": {
+        "m_Id": ""
+    },
+    "m_Name": "Swizzle",
+    "m_DrawState": {
+        "m_Expanded": true,
+        "m_Position": {
+            "serializedVersion": "2",
+            "x": -185.0,
+            "y": 227.5,
+            "width": 129.5,
+            "height": 121.5
+        }
+    },
+    "m_Slots": [
+        {
+            "m_Id": "dfea9bfe01ce4e02a2888d899a6854a5"
+        },
+        {
+            "m_Id": "b2244e97e9b447a0915451f883634954"
+        }
+    ],
+    "synonyms": [
+        "swap",
+        "reorder",
+        "component mask"
+    ],
+    "m_Precision": 0,
+    "m_PreviewExpanded": false,
+    "m_DismissedVersion": 0,
+    "m_PreviewMode": 0,
+    "m_CustomColors": {
+        "m_SerializableColors": []
+    },
+    "_maskInput": "w",
+    "convertedMask": "w"
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.PropertyNode",
+    "m_ObjectId": "4fa0e2a4b9854da88da0f8f4ca6d8b44",
+    "m_Group": {
+        "m_Id": ""
+    },
+    "m_Name": "Property",
+    "m_DrawState": {
+        "m_Expanded": true,
+        "m_Position": {
+            "serializedVersion": "2",
+            "x": -1130.0,
+            "y": -34.0,
+            "width": 0.0,
+            "height": 0.0
+        }
+    },
+    "m_Slots": [
+        {
+            "m_Id": "d4a780efd3bb476fbe515d19772d5676"
+        }
+    ],
+    "synonyms": [],
+    "m_Precision": 0,
+    "m_PreviewExpanded": false,
+    "m_DismissedVersion": 0,
+    "m_PreviewMode": 0,
+    "m_CustomColors": {
+        "m_SerializableColors": []
+    },
+    "m_Property": {
+        "m_Id": "e4dd1b7421e84c35a4aa2cb7908bc76c"
+    }
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.PropertyNode",
+    "m_ObjectId": "5941a0a08948413aac4f7ebb2e8ef5e9",
+    "m_Group": {
+        "m_Id": ""
+    },
+    "m_Name": "Property",
+    "m_DrawState": {
+        "m_Expanded": true,
+        "m_Position": {
+            "serializedVersion": "2",
+            "x": -957.0,
+            "y": 110.0,
+            "width": 139.0,
+            "height": 34.0
+        }
+    },
+    "m_Slots": [
+        {
+            "m_Id": "338b78bdfe024e07a1e585908bd972f5"
+        }
+    ],
+    "synonyms": [],
+    "m_Precision": 0,
+    "m_PreviewExpanded": false,
+    "m_DismissedVersion": 0,
+    "m_PreviewMode": 0,
+    "m_CustomColors": {
+        "m_SerializableColors": []
+    },
+    "m_Property": {
+        "m_Id": "945f7aca0366457398537ce7ef15e6f6"
+    }
+}
+
+{
+    "m_SGVersion": 1,
+    "m_Type": "UnityEditor.ShaderGraph.Internal.Vector1ShaderProperty",
+    "m_ObjectId": "5c5fcf7867734fff9749d05f9fcf1d39",
+    "m_Guid": {
+        "m_GuidSerialized": "2747a643-8db3-4ffc-9923-55aa70fb2549"
+    },
+    "promotedFromAssetID": "",
+    "promotedFromCategoryName": "",
+    "promotedOrdering": -1,
+    "m_Name": "PreviewScaleFactor",
+    "m_DefaultRefNameVersion": 1,
+    "m_RefNameGeneratedByDisplayName": "PreviewScaleFactor",
+    "m_DefaultReferenceName": "_PreviewScaleFactor",
+    "m_OverrideReferenceName": "",
+    "m_GeneratePropertyBlock": true,
+    "m_UseCustomSlotLabel": false,
+    "m_CustomSlotLabel": "",
+    "m_DismissedVersion": 0,
+    "m_Precision": 0,
+    "overrideHLSLDeclaration": false,
+    "hlslDeclarationOverride": 0,
+    "hideConnector": true,
+    "m_Hidden": false,
+    "m_PerRendererData": false,
+    "m_customAttributes": [],
+    "m_Value": 1.0,
+    "m_FloatType": 0,
+    "m_LiteralFloatMode": false,
+    "m_RangeValues": {
+        "x": 0.0,
+        "y": 1.0
+    },
+    "m_SliderType": 0,
+    "m_SliderPower": 3.0,
+    "m_EnumType": 0,
+    "m_CSharpEnumString": "",
+    "m_EnumNames": [
+        "Default"
+    ],
+    "m_EnumValues": [
+        0
+    ]
+}
+
+{
+    "m_SGVersion": 1,
+    "m_Type": "UnityEditor.ShaderGraph.SwizzleNode",
+    "m_ObjectId": "77dadbe595c54a479ed5810803a5da65",
+    "m_Group": {
+        "m_Id": ""
+    },
+    "m_Name": "Swizzle",
+    "m_DrawState": {
+        "m_Expanded": true,
+        "m_Position": {
+            "serializedVersion": "2",
+            "x": -185.0,
+            "y": 106.0,
+            "width": 129.5,
+            "height": 121.5
+        }
+    },
+    "m_Slots": [
+        {
+            "m_Id": "100266bba97d4745bd0083a8049f668f"
+        },
+        {
+            "m_Id": "dfa08c38f6044b33a8fd72e070847121"
+        }
+    ],
+    "synonyms": [
+        "swap",
+        "reorder",
+        "component mask"
+    ],
+    "m_Precision": 0,
+    "m_PreviewExpanded": false,
+    "m_DismissedVersion": 0,
+    "m_PreviewMode": 0,
+    "m_CustomColors": {
+        "m_SerializableColors": []
+    },
+    "_maskInput": "z",
+    "convertedMask": "z"
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.CategoryData",
+    "m_ObjectId": "78037d5d3b28486dbc192e494a2fd6bc",
+    "m_Name": "",
+    "m_ChildObjectList": [
+        {
+            "m_Id": "096733e82ba24cfabc80b770de24fe57"
+        },
+        {
+            "m_Id": "e4dd1b7421e84c35a4aa2cb7908bc76c"
+        },
+        {
+            "m_Id": "3f4c91e7dbf347bcad569e309d43824a"
+        },
+        {
+            "m_Id": "5c5fcf7867734fff9749d05f9fcf1d39"
+        },
+        {
+            "m_Id": "945f7aca0366457398537ce7ef15e6f6"
+        }
+    ]
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
+    "m_ObjectId": "7d2e2f37274d4205a100dc3a97cb2b7c",
+    "m_Id": 3,
+    "m_DisplayName": "Pixel_Per_Unit",
+    "m_SlotType": 0,
+    "m_Hidden": false,
+    "m_HideConnector": false,
+    "m_ShaderOutputName": "Pixel_Per_Unit",
+    "m_StageCapability": 3,
+    "m_Value": 0.0,
+    "m_DefaultValue": 0.0,
+    "m_Labels": [],
+    "m_LiteralMode": false
+}
+
+{
+    "m_SGVersion": 1,
+    "m_Type": "UnityEditor.ShaderGraph.Internal.Vector1ShaderProperty",
+    "m_ObjectId": "945f7aca0366457398537ce7ef15e6f6",
+    "m_Guid": {
+        "m_GuidSerialized": "451bbdf7-6136-4a6e-a5c8-4918d2ea4b95"
+    },
+    "promotedFromAssetID": "",
+    "promotedFromCategoryName": "",
+    "promotedOrdering": -1,
+    "m_Name": "PreviewPPU",
+    "m_DefaultRefNameVersion": 1,
+    "m_RefNameGeneratedByDisplayName": "PreviewPPU",
+    "m_DefaultReferenceName": "_PreviewPPU",
+    "m_OverrideReferenceName": "",
+    "m_GeneratePropertyBlock": true,
+    "m_UseCustomSlotLabel": false,
+    "m_CustomSlotLabel": "",
+    "m_DismissedVersion": 0,
+    "m_Precision": 0,
+    "overrideHLSLDeclaration": false,
+    "hlslDeclarationOverride": 0,
+    "hideConnector": true,
+    "m_Hidden": false,
+    "m_PerRendererData": false,
+    "m_customAttributes": [],
+    "m_Value": 100.0,
+    "m_FloatType": 0,
+    "m_LiteralFloatMode": false,
+    "m_RangeValues": {
+        "x": 0.0,
+        "y": 1.0
+    },
+    "m_SliderType": 0,
+    "m_SliderPower": 3.0,
+    "m_EnumType": 0,
+    "m_CSharpEnumString": "",
+    "m_EnumNames": [
+        "Default"
+    ],
+    "m_EnumValues": [
+        0
+    ]
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
+    "m_ObjectId": "952226e12f4a48eaa26ef65cf2911758",
+    "m_Id": 0,
+    "m_DisplayName": "PreviewHeight",
+    "m_SlotType": 1,
+    "m_Hidden": false,
+    "m_HideConnector": false,
+    "m_ShaderOutputName": "Out",
+    "m_StageCapability": 3,
+    "m_Value": 0.0,
+    "m_DefaultValue": 0.0,
+    "m_Labels": [],
+    "m_LiteralMode": false
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.Vector4MaterialSlot",
+    "m_ObjectId": "9da9e90e58fc428e996f1baa06b531fa",
+    "m_Id": 2,
+    "m_DisplayName": "Preview",
+    "m_SlotType": 0,
+    "m_Hidden": false,
+    "m_HideConnector": false,
+    "m_ShaderOutputName": "Preview",
+    "m_StageCapability": 3,
+    "m_Value": {
+        "x": 0.0,
+        "y": 0.0,
+        "z": 0.0,
+        "w": 0.0
+    },
+    "m_DefaultValue": {
+        "x": 0.0,
+        "y": 0.0,
+        "z": 0.0,
+        "w": 0.0
+    },
+    "m_Labels": []
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.Vector2MaterialSlot",
+    "m_ObjectId": "a2214e059b3d4c2584101133b715ca3b",
+    "m_Id": 1,
+    "m_DisplayName": "Size",
+    "m_SlotType": 0,
+    "m_Hidden": false,
+    "m_HideConnector": false,
+    "m_ShaderOutputName": "Size",
+    "m_StageCapability": 3,
+    "m_Value": {
+        "x": 0.0,
+        "y": 0.0
+    },
+    "m_DefaultValue": {
+        "x": 0.0,
+        "y": 0.0
+    },
+    "m_Labels": []
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
+    "m_ObjectId": "a49d7feda56e4f23afc504a6cc6187b3",
+    "m_Id": 3,
+    "m_DisplayName": "A",
+    "m_SlotType": 0,
+    "m_Hidden": false,
+    "m_HideConnector": false,
+    "m_ShaderOutputName": "A",
+    "m_StageCapability": 3,
+    "m_Value": 0.0,
+    "m_DefaultValue": 0.0,
+    "m_Labels": [],
+    "m_LiteralMode": false
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
+    "m_ObjectId": "b2244e97e9b447a0915451f883634954",
+    "m_Id": 1,
+    "m_DisplayName": "Out",
+    "m_SlotType": 1,
+    "m_Hidden": false,
+    "m_HideConnector": false,
+    "m_ShaderOutputName": "Out",
+    "m_StageCapability": 3,
+    "m_Value": 0.0,
+    "m_DefaultValue": 0.0,
+    "m_Labels": [],
+    "m_LiteralMode": false
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
+    "m_ObjectId": "b2b36719ce374b89b97b64eb5a09008f",
+    "m_Id": 0,
+    "m_DisplayName": "R",
+    "m_SlotType": 0,
+    "m_Hidden": false,
+    "m_HideConnector": false,
+    "m_ShaderOutputName": "R",
+    "m_StageCapability": 3,
+    "m_Value": 0.0,
+    "m_DefaultValue": 0.0,
+    "m_Labels": [],
+    "m_LiteralMode": false
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
+    "m_ObjectId": "b4514c21be164aa489d90e86f248b4a2",
+    "m_Id": 2,
+    "m_DisplayName": "B",
+    "m_SlotType": 0,
+    "m_Hidden": false,
+    "m_HideConnector": false,
+    "m_ShaderOutputName": "B",
+    "m_StageCapability": 3,
+    "m_Value": 0.0,
+    "m_DefaultValue": 0.0,
+    "m_Labels": [],
+    "m_LiteralMode": false
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.PropertyNode",
+    "m_ObjectId": "b53ce975fa294692a0d3c0eeb24e55be",
+    "m_Group": {
+        "m_Id": ""
+    },
+    "m_Name": "Property",
+    "m_DrawState": {
+        "m_Expanded": true,
+        "m_Position": {
+            "serializedVersion": "2",
+            "x": -527.5,
+            "y": -49.5,
+            "width": 173.0,
+            "height": 34.0
+        }
+    },
+    "m_Slots": [
+        {
+            "m_Id": "ed35eb330dda4f8b915ee39a359f2dd5"
+        }
+    ],
+    "synonyms": [],
+    "m_Precision": 0,
+    "m_PreviewExpanded": false,
+    "m_DismissedVersion": 0,
+    "m_PreviewMode": 0,
+    "m_CustomColors": {
+        "m_SerializableColors": []
+    },
+    "m_Property": {
+        "m_Id": "096733e82ba24cfabc80b770de24fe57"
+    }
+}
+
+{
+    "m_SGVersion": 1,
+    "m_Type": "UnityEditor.ShaderGraph.CustomFunctionNode",
+    "m_ObjectId": "bc85e665abea4b06b532dd86b35f9fff",
+    "m_Group": {
+        "m_Id": ""
+    },
+    "m_Name": "IsPreviewFloat4 (Custom Function)",
+    "m_DrawState": {
+        "m_Expanded": true,
+        "m_Position": {
+            "serializedVersion": "2",
+            "x": -527.5,
+            "y": -15.5,
+            "width": 209.0,
+            "height": 101.0
+        }
+    },
+    "m_Slots": [
+        {
+            "m_Id": "32794528eef94b45943bed729877dba2"
+        },
+        {
+            "m_Id": "9da9e90e58fc428e996f1baa06b531fa"
+        },
+        {
+            "m_Id": "f0b5300b7ea149cd958f4c7eda0a19c3"
+        }
+    ],
+    "synonyms": [
+        "code",
+        "HLSL"
+    ],
+    "m_Precision": 0,
+    "m_PreviewExpanded": false,
+    "m_DismissedVersion": 0,
+    "m_PreviewMode": 0,
+    "m_CustomColors": {
+        "m_SerializableColors": []
+    },
+    "m_SourceType": 1,
+    "m_FunctionName": "IsPreviewFloat4",
+    "m_FunctionSource": "",
+    "m_FunctionSourceUsePragmas": true,
+    "m_FunctionBody": "#if defined(SHADERGRAPH_PREVIEW_MAIN) || defined(SHADERGRAPH_PREVIEW)\nOut = Preview;\n#else\nOut = Final;\n#endif\n"
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.Vector3MaterialSlot",
+    "m_ObjectId": "c205cc45358c4964a6e16c3b9d068aaf",
+    "m_Id": 5,
+    "m_DisplayName": "RGB",
+    "m_SlotType": 1,
+    "m_Hidden": false,
+    "m_HideConnector": false,
+    "m_ShaderOutputName": "RGB",
+    "m_StageCapability": 3,
+    "m_Value": {
+        "x": 0.0,
+        "y": 0.0,
+        "z": 0.0
+    },
+    "m_DefaultValue": {
+        "x": 0.0,
+        "y": 0.0,
+        "z": 0.0
+    },
+    "m_Labels": []
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.StickyNoteData",
+    "m_ObjectId": "c2d4583729814e17b99bbaab2a1c081a",
+    "m_Title": "RectTransform Value",
+    "m_Content": "This subgraph uses a Custom Function Node to switch between a hidden promoted property and  subgraph properties with input port disabled used as the preview values.\n\nThis requires a RectTransform Size component on the element to feed the value.",
+    "m_TextSize": 0,
+    "m_Theme": 1,
+    "m_Position": {
+        "serializedVersion": "2",
+        "x": -537.0,
+        "y": -200.0,
+        "width": 259.0,
+        "height": 136.7796630859375
+    },
+    "m_Group": {
+        "m_Id": ""
+    }
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
+    "m_ObjectId": "d4a780efd3bb476fbe515d19772d5676",
+    "m_Id": 0,
+    "m_DisplayName": "PreviewWidth",
+    "m_SlotType": 1,
+    "m_Hidden": false,
+    "m_HideConnector": false,
+    "m_ShaderOutputName": "Out",
+    "m_StageCapability": 3,
+    "m_Value": 0.0,
+    "m_DefaultValue": 0.0,
+    "m_Labels": [],
+    "m_LiteralMode": false
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.PropertyNode",
+    "m_ObjectId": "d5f7638ba14342738c9e4651c7941b03",
+    "m_Group": {
+        "m_Id": ""
+    },
+    "m_Name": "Property",
+    "m_DrawState": {
+        "m_Expanded": true,
+        "m_Position": {
+            "serializedVersion": "2",
+            "x": -1087.0,
+            "y": 7.0,
+            "width": 0.0,
+            "height": 0.0
+        }
+    },
+    "m_Slots": [
+        {
+            "m_Id": "952226e12f4a48eaa26ef65cf2911758"
+        }
+    ],
+    "synonyms": [],
+    "m_Precision": 0,
+    "m_PreviewExpanded": false,
+    "m_DismissedVersion": 0,
+    "m_PreviewMode": 0,
+    "m_CustomColors": {
+        "m_SerializableColors": []
+    },
+    "m_Property": {
+        "m_Id": "3f4c91e7dbf347bcad569e309d43824a"
+    }
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
+    "m_ObjectId": "dfa08c38f6044b33a8fd72e070847121",
+    "m_Id": 1,
+    "m_DisplayName": "Out",
+    "m_SlotType": 1,
+    "m_Hidden": false,
+    "m_HideConnector": false,
+    "m_ShaderOutputName": "Out",
+    "m_StageCapability": 3,
+    "m_Value": 0.0,
+    "m_DefaultValue": 0.0,
+    "m_Labels": [],
+    "m_LiteralMode": false
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.Vector4MaterialSlot",
+    "m_ObjectId": "dfea9bfe01ce4e02a2888d899a6854a5",
+    "m_Id": 0,
+    "m_DisplayName": "In",
+    "m_SlotType": 0,
+    "m_Hidden": false,
+    "m_HideConnector": false,
+    "m_ShaderOutputName": "In",
+    "m_StageCapability": 3,
+    "m_Value": {
+        "x": 0.0,
+        "y": 0.0,
+        "z": 0.0,
+        "w": 0.0
+    },
+    "m_DefaultValue": {
+        "x": 0.0,
+        "y": 0.0,
+        "z": 0.0,
+        "w": 0.0
+    },
+    "m_Labels": []
+}
+
+{
+    "m_SGVersion": 1,
+    "m_Type": "UnityEditor.ShaderGraph.Internal.Vector1ShaderProperty",
+    "m_ObjectId": "e4dd1b7421e84c35a4aa2cb7908bc76c",
+    "m_Guid": {
+        "m_GuidSerialized": "975f2db3-e792-46e7-9bf8-3a4cbe4fb068"
+    },
+    "promotedFromAssetID": "",
+    "promotedFromCategoryName": "",
+    "promotedOrdering": -1,
+    "m_Name": "PreviewWidth",
+    "m_DefaultRefNameVersion": 1,
+    "m_RefNameGeneratedByDisplayName": "PreviewWidth",
+    "m_DefaultReferenceName": "_PreviewWidth",
+    "m_OverrideReferenceName": "",
+    "m_GeneratePropertyBlock": true,
+    "m_UseCustomSlotLabel": false,
+    "m_CustomSlotLabel": "",
+    "m_DismissedVersion": 0,
+    "m_Precision": 0,
+    "overrideHLSLDeclaration": false,
+    "hlslDeclarationOverride": 0,
+    "hideConnector": true,
+    "m_Hidden": false,
+    "m_PerRendererData": false,
+    "m_customAttributes": [],
+    "m_Value": 100.0,
+    "m_FloatType": 0,
+    "m_LiteralFloatMode": false,
+    "m_RangeValues": {
+        "x": 0.0,
+        "y": 1.0
+    },
+    "m_SliderType": 0,
+    "m_SliderPower": 3.0,
+    "m_EnumType": 0,
+    "m_CSharpEnumString": "",
+    "m_EnumNames": [
+        "Default"
+    ],
+    "m_EnumValues": [
+        0
+    ]
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.Vector4MaterialSlot",
+    "m_ObjectId": "ed35eb330dda4f8b915ee39a359f2dd5",
+    "m_Id": 0,
+    "m_DisplayName": "RectTransformInfo",
+    "m_SlotType": 1,
+    "m_Hidden": false,
+    "m_HideConnector": false,
+    "m_ShaderOutputName": "Out",
+    "m_StageCapability": 3,
+    "m_Value": {
+        "x": 0.0,
+        "y": 0.0,
+        "z": 0.0,
+        "w": 0.0
+    },
+    "m_DefaultValue": {
+        "x": 0.0,
+        "y": 0.0,
+        "z": 0.0,
+        "w": 0.0
+    },
+    "m_Labels": []
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.Vector4MaterialSlot",
+    "m_ObjectId": "f0b5300b7ea149cd958f4c7eda0a19c3",
+    "m_Id": 1,
+    "m_DisplayName": "Out",
+    "m_SlotType": 1,
+    "m_Hidden": false,
+    "m_HideConnector": false,
+    "m_ShaderOutputName": "Out",
+    "m_StageCapability": 3,
+    "m_Value": {
+        "x": 0.0,
+        "y": 0.0,
+        "z": 0.0,
+        "w": 0.0
+    },
+    "m_DefaultValue": {
+        "x": 0.0,
+        "y": 0.0,
+        "z": 0.0,
+        "w": 0.0
+    },
+    "m_Labels": []
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.Vector2MaterialSlot",
+    "m_ObjectId": "f72b58f1eb1e430a841bbc495a8c5a0e",
+    "m_Id": 1,
+    "m_DisplayName": "Out",
+    "m_SlotType": 1,
+    "m_Hidden": false,
+    "m_HideConnector": false,
+    "m_ShaderOutputName": "Out",
+    "m_StageCapability": 3,
+    "m_Value": {
+        "x": 0.0,
+        "y": 0.0
+    },
+    "m_DefaultValue": {
+        "x": 0.0,
+        "y": 0.0
+    },
+    "m_Labels": []
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
+    "m_ObjectId": "fa5945d1500a4c429e8c1605039ca16b",
+    "m_Id": 2,
+    "m_DisplayName": "Scale_Factor",
+    "m_SlotType": 0,
+    "m_Hidden": false,
+    "m_HideConnector": false,
+    "m_ShaderOutputName": "Scale_Factor",
+    "m_StageCapability": 3,
+    "m_Value": 0.0,
+    "m_DefaultValue": 0.0,
+    "m_Labels": [],
+    "m_LiteralMode": false
+}
+
diff --git a/Packages/com.unity.shadergraph/Samples~/UGUIShaders/Subgraphs/Input/RectTransformSize.shadersubgraph.meta b/Packages/com.unity.shadergraph/Samples~/UGUIShaders/Subgraphs/Input/RectTransformSize.shadersubgraph.meta
new file mode 100644
index 00000000000..a9cd8d8564b
--- /dev/null
+++ b/Packages/com.unity.shadergraph/Samples~/UGUIShaders/Subgraphs/Input/RectTransformSize.shadersubgraph.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: aa041986c041b4dc1b5bf0b2cd2d86e8
+ScriptedImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 2
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+  script: {fileID: 11500000, guid: 60072b568d64c40a485e0fc55012dc9f, type: 3}
+  documentationPath: 
diff --git a/Packages/com.unity.shadergraph/Samples~/UGUIShaders/Subgraphs/Input/SelectableState.shadersubgraph b/Packages/com.unity.shadergraph/Samples~/UGUIShaders/Subgraphs/Input/SelectableState.shadersubgraph
new file mode 100644
index 00000000000..e11da2db8f1
--- /dev/null
+++ b/Packages/com.unity.shadergraph/Samples~/UGUIShaders/Subgraphs/Input/SelectableState.shadersubgraph
@@ -0,0 +1,656 @@
+{
+    "m_SGVersion": 3,
+    "m_Type": "UnityEditor.ShaderGraph.GraphData",
+    "m_ObjectId": "50cfc4df60bd4dff81e295d28aaf3655",
+    "m_Properties": [
+        {
+            "m_Id": "265f1bebf86d48a9b32d46120b8a2f94"
+        }
+    ],
+    "m_Keywords": [],
+    "m_Dropdowns": [
+        {
+            "m_Id": "c2427350574b408a9ee54692f066fb43"
+        }
+    ],
+    "m_CategoryData": [
+        {
+            "m_Id": "cadd333478f44f6da751cb36dd44c6c8"
+        }
+    ],
+    "m_Nodes": [
+        {
+            "m_Id": "92235385d3ac412baa7b5aa94487b951"
+        },
+        {
+            "m_Id": "31618709ebb34d7ab4452d56e83b263e"
+        },
+        {
+            "m_Id": "c8b0c5a408624255ad06500afd1d80fc"
+        },
+        {
+            "m_Id": "3d48137ddabd464d9380c9a5087740b7"
+        }
+    ],
+    "m_GroupDatas": [],
+    "m_StickyNoteDatas": [
+        {
+            "m_Id": "908782b74acf4132821ab83df724057d"
+        }
+    ],
+    "m_Edges": [
+        {
+            "m_OutputSlot": {
+                "m_Node": {
+                    "m_Id": "31618709ebb34d7ab4452d56e83b263e"
+                },
+                "m_SlotId": 0
+            },
+            "m_InputSlot": {
+                "m_Node": {
+                    "m_Id": "3d48137ddabd464d9380c9a5087740b7"
+                },
+                "m_SlotId": 0
+            }
+        },
+        {
+            "m_OutputSlot": {
+                "m_Node": {
+                    "m_Id": "3d48137ddabd464d9380c9a5087740b7"
+                },
+                "m_SlotId": 1
+            },
+            "m_InputSlot": {
+                "m_Node": {
+                    "m_Id": "92235385d3ac412baa7b5aa94487b951"
+                },
+                "m_SlotId": 1
+            }
+        },
+        {
+            "m_OutputSlot": {
+                "m_Node": {
+                    "m_Id": "c8b0c5a408624255ad06500afd1d80fc"
+                },
+                "m_SlotId": 0
+            },
+            "m_InputSlot": {
+                "m_Node": {
+                    "m_Id": "3d48137ddabd464d9380c9a5087740b7"
+                },
+                "m_SlotId": 2
+            }
+        }
+    ],
+    "m_VertexContext": {
+        "m_Position": {
+            "x": 0.0,
+            "y": 0.0
+        },
+        "m_Blocks": []
+    },
+    "m_FragmentContext": {
+        "m_Position": {
+            "x": 0.0,
+            "y": 0.0
+        },
+        "m_Blocks": []
+    },
+    "m_PreviewData": {
+        "serializedMesh": {
+            "m_SerializedMesh": "{\"mesh\":{\"instanceID\":0}}",
+            "m_Guid": ""
+        },
+        "preventRotation": false
+    },
+    "m_Path": "Input/UGUI",
+    "m_GraphPrecision": 1,
+    "m_PreviewMode": 1,
+    "m_OutputNode": {
+        "m_Id": "92235385d3ac412baa7b5aa94487b951"
+    },
+    "m_SubDatas": [],
+    "m_ActiveTargets": []
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot",
+    "m_ObjectId": "17f663ce65d04896876462d46e829226",
+    "m_Id": 5,
+    "m_DisplayName": "Selected",
+    "m_SlotType": 0,
+    "m_Hidden": false,
+    "m_HideConnector": false,
+    "m_ShaderOutputName": "Selected",
+    "m_StageCapability": 3,
+    "m_Value": {
+        "x": 3.0,
+        "y": 0.0,
+        "z": 0.0,
+        "w": 0.0
+    },
+    "m_DefaultValue": {
+        "x": 0.0,
+        "y": 0.0,
+        "z": 0.0,
+        "w": 0.0
+    },
+    "m_LiteralMode": false
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
+    "m_ObjectId": "21921afa7e5143e3a4aed64541998e76",
+    "m_Id": 1,
+    "m_DisplayName": "State",
+    "m_SlotType": 0,
+    "m_Hidden": false,
+    "m_HideConnector": false,
+    "m_ShaderOutputName": "State",
+    "m_StageCapability": 3,
+    "m_Value": 0.0,
+    "m_DefaultValue": 0.0,
+    "m_Labels": [],
+    "m_LiteralMode": false
+}
+
+{
+    "m_SGVersion": 1,
+    "m_Type": "UnityEditor.ShaderGraph.Internal.Vector1ShaderProperty",
+    "m_ObjectId": "265f1bebf86d48a9b32d46120b8a2f94",
+    "m_Guid": {
+        "m_GuidSerialized": "0688cc2f-00bd-4f68-b297-894d722f0b4c"
+    },
+    "promotedFromAssetID": "9cc8eedec3988455885bdb12866a33d6",
+    "promotedFromCategoryName": "",
+    "promotedOrdering": -1,
+    "m_Name": "State",
+    "m_DefaultRefNameVersion": 1,
+    "m_RefNameGeneratedByDisplayName": "State",
+    "m_DefaultReferenceName": "_State",
+    "m_OverrideReferenceName": "",
+    "m_GeneratePropertyBlock": false,
+    "m_UseCustomSlotLabel": false,
+    "m_CustomSlotLabel": "",
+    "m_DismissedVersion": 0,
+    "m_Precision": 0,
+    "overrideHLSLDeclaration": true,
+    "hlslDeclarationOverride": 2,
+    "hideConnector": false,
+    "m_Hidden": false,
+    "m_PerRendererData": false,
+    "m_customAttributes": [],
+    "m_Value": 0.0,
+    "m_FloatType": 3,
+    "m_LiteralFloatMode": false,
+    "m_RangeValues": {
+        "x": 0.0,
+        "y": 1.0
+    },
+    "m_SliderType": 0,
+    "m_SliderPower": 3.0,
+    "m_EnumType": 0,
+    "m_CSharpEnumString": "",
+    "m_EnumNames": [
+        "Normal",
+        "Highlighted",
+        "Pressed",
+        "Selected",
+        "Disabled"
+    ],
+    "m_EnumValues": [
+        0,
+        1,
+        2,
+        3,
+        4
+    ]
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.PropertyNode",
+    "m_ObjectId": "31618709ebb34d7ab4452d56e83b263e",
+    "m_Group": {
+        "m_Id": ""
+    },
+    "m_Name": "Property",
+    "m_DrawState": {
+        "m_Expanded": true,
+        "m_Position": {
+            "serializedVersion": "2",
+            "x": 0.0,
+            "y": 219.0,
+            "width": 103.0,
+            "height": 34.0
+        }
+    },
+    "m_Slots": [
+        {
+            "m_Id": "b77de99290914323b11ee25ef045fa89"
+        }
+    ],
+    "synonyms": [],
+    "m_Precision": 0,
+    "m_PreviewExpanded": false,
+    "m_DismissedVersion": 0,
+    "m_PreviewMode": 0,
+    "m_CustomColors": {
+        "m_SerializableColors": []
+    },
+    "m_Property": {
+        "m_Id": "265f1bebf86d48a9b32d46120b8a2f94"
+    }
+}
+
+{
+    "m_SGVersion": 1,
+    "m_Type": "UnityEditor.ShaderGraph.CustomFunctionNode",
+    "m_ObjectId": "3d48137ddabd464d9380c9a5087740b7",
+    "m_Group": {
+        "m_Id": ""
+    },
+    "m_Name": "IsPreviewFloat (Custom Function)",
+    "m_DrawState": {
+        "m_Expanded": true,
+        "m_Position": {
+            "serializedVersion": "2",
+            "x": 0.0,
+            "y": 253.0,
+            "width": 209.0,
+            "height": 118.0
+        }
+    },
+    "m_Slots": [
+        {
+            "m_Id": "93304cfd400342329d3a79073644b9f0"
+        },
+        {
+            "m_Id": "8b758b7f7b684e7282dca35d0ffe2919"
+        },
+        {
+            "m_Id": "5a79bb0f94e34194b85745a05ee29860"
+        }
+    ],
+    "synonyms": [
+        "code",
+        "HLSL"
+    ],
+    "m_Precision": 0,
+    "m_PreviewExpanded": false,
+    "m_DismissedVersion": 0,
+    "m_PreviewMode": 0,
+    "m_CustomColors": {
+        "m_SerializableColors": []
+    },
+    "m_SourceType": 1,
+    "m_FunctionName": "IsPreviewFloat",
+    "m_FunctionSource": "",
+    "m_FunctionSourceUsePragmas": true,
+    "m_FunctionBody": "#if defined(SHADERGRAPH_PREVIEW_MAIN) || defined(SHADERGRAPH_PREVIEW)\nOut = Preview;\n#else\nOut = Final;\n#endif\n"
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
+    "m_ObjectId": "5a79bb0f94e34194b85745a05ee29860",
+    "m_Id": 1,
+    "m_DisplayName": "Out",
+    "m_SlotType": 1,
+    "m_Hidden": false,
+    "m_HideConnector": false,
+    "m_ShaderOutputName": "Out",
+    "m_StageCapability": 3,
+    "m_Value": 0.0,
+    "m_DefaultValue": 0.0,
+    "m_Labels": [],
+    "m_LiteralMode": false
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot",
+    "m_ObjectId": "80dbefee10e64c3fa6ea6b5caad46a43",
+    "m_Id": 4,
+    "m_DisplayName": "Pressed",
+    "m_SlotType": 0,
+    "m_Hidden": false,
+    "m_HideConnector": false,
+    "m_ShaderOutputName": "Pressed",
+    "m_StageCapability": 3,
+    "m_Value": {
+        "x": 2.0,
+        "y": 0.0,
+        "z": 0.0,
+        "w": 0.0
+    },
+    "m_DefaultValue": {
+        "x": 0.0,
+        "y": 0.0,
+        "z": 0.0,
+        "w": 0.0
+    },
+    "m_LiteralMode": false
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
+    "m_ObjectId": "8b758b7f7b684e7282dca35d0ffe2919",
+    "m_Id": 2,
+    "m_DisplayName": "Preview",
+    "m_SlotType": 0,
+    "m_Hidden": false,
+    "m_HideConnector": false,
+    "m_ShaderOutputName": "Preview",
+    "m_StageCapability": 3,
+    "m_Value": 0.0,
+    "m_DefaultValue": 0.0,
+    "m_Labels": [],
+    "m_LiteralMode": false
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.StickyNoteData",
+    "m_ObjectId": "908782b74acf4132821ab83df724057d",
+    "m_Title": "Selectable State",
+    "m_Content": "This subgraph uses a Custom Function Node to switch between a hidden promoted property and  subgraph properties with input port disabled used as the preview values.\n\nThis requires one of the custom components (CustomButton, CustomSlider, CustomToggle) on the element to feed the value.",
+    "m_TextSize": 0,
+    "m_Theme": 1,
+    "m_Position": {
+        "serializedVersion": "2",
+        "x": -319.0,
+        "y": 101.0,
+        "width": 259.0,
+        "height": 137.0
+    },
+    "m_Group": {
+        "m_Id": ""
+    }
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.SubGraphOutputNode",
+    "m_ObjectId": "92235385d3ac412baa7b5aa94487b951",
+    "m_Group": {
+        "m_Id": ""
+    },
+    "m_Name": "Output",
+    "m_DrawState": {
+        "m_Expanded": true,
+        "m_Position": {
+            "serializedVersion": "2",
+            "x": 237.00003051757813,
+            "y": 253.0,
+            "width": 85.99996948242188,
+            "height": 77.0
+        }
+    },
+    "m_Slots": [
+        {
+            "m_Id": "21921afa7e5143e3a4aed64541998e76"
+        }
+    ],
+    "synonyms": [],
+    "m_Precision": 0,
+    "m_PreviewExpanded": false,
+    "m_DismissedVersion": 0,
+    "m_PreviewMode": 0,
+    "m_CustomColors": {
+        "m_SerializableColors": []
+    },
+    "IsFirstSlotValid": true
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
+    "m_ObjectId": "93304cfd400342329d3a79073644b9f0",
+    "m_Id": 0,
+    "m_DisplayName": "Final",
+    "m_SlotType": 0,
+    "m_Hidden": false,
+    "m_HideConnector": false,
+    "m_ShaderOutputName": "Final",
+    "m_StageCapability": 3,
+    "m_Value": 0.0,
+    "m_DefaultValue": 0.0,
+    "m_Labels": [],
+    "m_LiteralMode": false
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot",
+    "m_ObjectId": "95d2ddb6938c4528a4f32e806d7e5e55",
+    "m_Id": 6,
+    "m_DisplayName": "Disabled",
+    "m_SlotType": 0,
+    "m_Hidden": false,
+    "m_HideConnector": false,
+    "m_ShaderOutputName": "Disabled",
+    "m_StageCapability": 3,
+    "m_Value": {
+        "x": 4.0,
+        "y": 0.0,
+        "z": 0.0,
+        "w": 0.0
+    },
+    "m_DefaultValue": {
+        "x": 0.0,
+        "y": 0.0,
+        "z": 0.0,
+        "w": 0.0
+    },
+    "m_LiteralMode": false
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot",
+    "m_ObjectId": "ad5a442221ef485388b42e303ff9014e",
+    "m_Id": 2,
+    "m_DisplayName": "Highlighted",
+    "m_SlotType": 0,
+    "m_Hidden": false,
+    "m_HideConnector": false,
+    "m_ShaderOutputName": "Highlighted",
+    "m_StageCapability": 3,
+    "m_Value": {
+        "x": 1.0,
+        "y": 0.0,
+        "z": 0.0,
+        "w": 0.0
+    },
+    "m_DefaultValue": {
+        "x": 0.0,
+        "y": 0.0,
+        "z": 0.0,
+        "w": 0.0
+    },
+    "m_LiteralMode": false
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot",
+    "m_ObjectId": "b6c6cb12496a40f7be541f9d7151a58c",
+    "m_Id": 0,
+    "m_DisplayName": "Out",
+    "m_SlotType": 1,
+    "m_Hidden": false,
+    "m_HideConnector": false,
+    "m_ShaderOutputName": "Out",
+    "m_StageCapability": 3,
+    "m_Value": {
+        "x": 0.0,
+        "y": 0.0,
+        "z": 0.0,
+        "w": 0.0
+    },
+    "m_DefaultValue": {
+        "x": 0.0,
+        "y": 0.0,
+        "z": 0.0,
+        "w": 0.0
+    },
+    "m_LiteralMode": true
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
+    "m_ObjectId": "b77de99290914323b11ee25ef045fa89",
+    "m_Id": 0,
+    "m_DisplayName": "State",
+    "m_SlotType": 1,
+    "m_Hidden": false,
+    "m_HideConnector": false,
+    "m_ShaderOutputName": "Out",
+    "m_StageCapability": 3,
+    "m_Value": 0.0,
+    "m_DefaultValue": 0.0,
+    "m_Labels": [],
+    "m_LiteralMode": false
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.ShaderDropdown",
+    "m_ObjectId": "c2427350574b408a9ee54692f066fb43",
+    "m_Guid": {
+        "m_GuidSerialized": "0c74d9a9-3643-4486-b032-d8d60ffb56e7"
+    },
+    "promotedFromAssetID": "",
+    "promotedFromCategoryName": "",
+    "promotedOrdering": -1,
+    "m_Name": "Preview",
+    "m_DefaultRefNameVersion": 1,
+    "m_RefNameGeneratedByDisplayName": "Preview",
+    "m_DefaultReferenceName": "_Preview",
+    "m_OverrideReferenceName": "",
+    "m_GeneratePropertyBlock": true,
+    "m_UseCustomSlotLabel": false,
+    "m_CustomSlotLabel": "",
+    "m_DismissedVersion": 0,
+    "m_Entries": [
+        {
+            "id": 3,
+            "displayName": "Normal"
+        },
+        {
+            "id": 2,
+            "displayName": "Highlighted"
+        },
+        {
+            "id": 4,
+            "displayName": "Pressed"
+        },
+        {
+            "id": 5,
+            "displayName": "Selected"
+        },
+        {
+            "id": 6,
+            "displayName": "Disabled"
+        }
+    ],
+    "m_Value": 0
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot",
+    "m_ObjectId": "c2d2665dcb8341b49512be75ce2580a7",
+    "m_Id": 3,
+    "m_DisplayName": "Normal",
+    "m_SlotType": 0,
+    "m_Hidden": false,
+    "m_HideConnector": false,
+    "m_ShaderOutputName": "Normal",
+    "m_StageCapability": 3,
+    "m_Value": {
+        "x": 0.0,
+        "y": 0.0,
+        "z": 0.0,
+        "w": 0.0
+    },
+    "m_DefaultValue": {
+        "x": 0.0,
+        "y": 0.0,
+        "z": 0.0,
+        "w": 0.0
+    },
+    "m_LiteralMode": false
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.DropdownNode",
+    "m_ObjectId": "c8b0c5a408624255ad06500afd1d80fc",
+    "m_Group": {
+        "m_Id": ""
+    },
+    "m_Name": "Preview",
+    "m_DrawState": {
+        "m_Expanded": true,
+        "m_Position": {
+            "serializedVersion": "2",
+            "x": -230.0,
+            "y": 276.0,
+            "width": 178.0,
+            "height": 190.0
+        }
+    },
+    "m_Slots": [
+        {
+            "m_Id": "b6c6cb12496a40f7be541f9d7151a58c"
+        },
+        {
+            "m_Id": "c2d2665dcb8341b49512be75ce2580a7"
+        },
+        {
+            "m_Id": "ad5a442221ef485388b42e303ff9014e"
+        },
+        {
+            "m_Id": "80dbefee10e64c3fa6ea6b5caad46a43"
+        },
+        {
+            "m_Id": "17f663ce65d04896876462d46e829226"
+        },
+        {
+            "m_Id": "95d2ddb6938c4528a4f32e806d7e5e55"
+        }
+    ],
+    "synonyms": [],
+    "m_Precision": 0,
+    "m_PreviewExpanded": false,
+    "m_DismissedVersion": 0,
+    "m_PreviewMode": 0,
+    "m_CustomColors": {
+        "m_SerializableColors": []
+    },
+    "m_Dropdown": {
+        "m_Id": "c2427350574b408a9ee54692f066fb43"
+    }
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.CategoryData",
+    "m_ObjectId": "cadd333478f44f6da751cb36dd44c6c8",
+    "m_Name": "",
+    "m_ChildObjectList": [
+        {
+            "m_Id": "265f1bebf86d48a9b32d46120b8a2f94"
+        },
+        {
+            "m_Id": "c2427350574b408a9ee54692f066fb43"
+        }
+    ]
+}
+
diff --git a/Packages/com.unity.shadergraph/Samples~/UGUIShaders/Subgraphs/Input/SelectableState.shadersubgraph.meta b/Packages/com.unity.shadergraph/Samples~/UGUIShaders/Subgraphs/Input/SelectableState.shadersubgraph.meta
new file mode 100644
index 00000000000..d4c9a602ba5
--- /dev/null
+++ b/Packages/com.unity.shadergraph/Samples~/UGUIShaders/Subgraphs/Input/SelectableState.shadersubgraph.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 9cc8eedec3988455885bdb12866a33d6
+ScriptedImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 2
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+  script: {fileID: 11500000, guid: 60072b568d64c40a485e0fc55012dc9f, type: 3}
+  documentationPath: 
diff --git a/Packages/com.unity.shadergraph/Samples~/UGUIShaders/Subgraphs/Input/SliderValue.shadersubgraph b/Packages/com.unity.shadergraph/Samples~/UGUIShaders/Subgraphs/Input/SliderValue.shadersubgraph
new file mode 100644
index 00000000000..fcc8268d57c
--- /dev/null
+++ b/Packages/com.unity.shadergraph/Samples~/UGUIShaders/Subgraphs/Input/SliderValue.shadersubgraph
@@ -0,0 +1,1250 @@
+{
+    "m_SGVersion": 3,
+    "m_Type": "UnityEditor.ShaderGraph.GraphData",
+    "m_ObjectId": "efd7cfd623ca44208dabb0b144628f02",
+    "m_Properties": [
+        {
+            "m_Id": "7b7e5088bf624a539ee3cbf0e6719610"
+        },
+        {
+            "m_Id": "4dbf558957b849e380b1875a621d195e"
+        }
+    ],
+    "m_Keywords": [],
+    "m_Dropdowns": [
+        {
+            "m_Id": "80626c7b9d8f4128b36d452e01453466"
+        }
+    ],
+    "m_CategoryData": [
+        {
+            "m_Id": "87ba7b34c8054d0aa07a3f969d450be6"
+        }
+    ],
+    "m_Nodes": [
+        {
+            "m_Id": "a372d995751b4f829dfed91788c82980"
+        },
+        {
+            "m_Id": "1902971be97c477489be5a0b30d7bdbc"
+        },
+        {
+            "m_Id": "103b7d00db024d7c8efa28eba0f68ab6"
+        },
+        {
+            "m_Id": "8955a83af65f4042ab967a143089885c"
+        },
+        {
+            "m_Id": "76154026d439420ebf6d5207e3399b7b"
+        },
+        {
+            "m_Id": "88493a32387e45e6b869db78cea875af"
+        },
+        {
+            "m_Id": "29ed92260cfa4f38b84fcb7b0cb6b03e"
+        },
+        {
+            "m_Id": "bd305e464ef743e3b7680f8467e5efcc"
+        },
+        {
+            "m_Id": "e7b2a541d62749a2ae74a651207be7b7"
+        }
+    ],
+    "m_GroupDatas": [],
+    "m_StickyNoteDatas": [
+        {
+            "m_Id": "643db992a0ca4d80a26c09a947d99148"
+        }
+    ],
+    "m_Edges": [
+        {
+            "m_OutputSlot": {
+                "m_Node": {
+                    "m_Id": "103b7d00db024d7c8efa28eba0f68ab6"
+                },
+                "m_SlotId": 1
+            },
+            "m_InputSlot": {
+                "m_Node": {
+                    "m_Id": "a372d995751b4f829dfed91788c82980"
+                },
+                "m_SlotId": 1
+            }
+        },
+        {
+            "m_OutputSlot": {
+                "m_Node": {
+                    "m_Id": "1902971be97c477489be5a0b30d7bdbc"
+                },
+                "m_SlotId": 0
+            },
+            "m_InputSlot": {
+                "m_Node": {
+                    "m_Id": "bd305e464ef743e3b7680f8467e5efcc"
+                },
+                "m_SlotId": 0
+            }
+        },
+        {
+            "m_OutputSlot": {
+                "m_Node": {
+                    "m_Id": "29ed92260cfa4f38b84fcb7b0cb6b03e"
+                },
+                "m_SlotId": 0
+            },
+            "m_InputSlot": {
+                "m_Node": {
+                    "m_Id": "e7b2a541d62749a2ae74a651207be7b7"
+                },
+                "m_SlotId": 0
+            }
+        },
+        {
+            "m_OutputSlot": {
+                "m_Node": {
+                    "m_Id": "76154026d439420ebf6d5207e3399b7b"
+                },
+                "m_SlotId": 0
+            },
+            "m_InputSlot": {
+                "m_Node": {
+                    "m_Id": "88493a32387e45e6b869db78cea875af"
+                },
+                "m_SlotId": 3
+            }
+        },
+        {
+            "m_OutputSlot": {
+                "m_Node": {
+                    "m_Id": "88493a32387e45e6b869db78cea875af"
+                },
+                "m_SlotId": 0
+            },
+            "m_InputSlot": {
+                "m_Node": {
+                    "m_Id": "e7b2a541d62749a2ae74a651207be7b7"
+                },
+                "m_SlotId": 1
+            }
+        },
+        {
+            "m_OutputSlot": {
+                "m_Node": {
+                    "m_Id": "8955a83af65f4042ab967a143089885c"
+                },
+                "m_SlotId": 1
+            },
+            "m_InputSlot": {
+                "m_Node": {
+                    "m_Id": "a372d995751b4f829dfed91788c82980"
+                },
+                "m_SlotId": 2
+            }
+        },
+        {
+            "m_OutputSlot": {
+                "m_Node": {
+                    "m_Id": "bd305e464ef743e3b7680f8467e5efcc"
+                },
+                "m_SlotId": 1
+            },
+            "m_InputSlot": {
+                "m_Node": {
+                    "m_Id": "103b7d00db024d7c8efa28eba0f68ab6"
+                },
+                "m_SlotId": 0
+            }
+        },
+        {
+            "m_OutputSlot": {
+                "m_Node": {
+                    "m_Id": "bd305e464ef743e3b7680f8467e5efcc"
+                },
+                "m_SlotId": 1
+            },
+            "m_InputSlot": {
+                "m_Node": {
+                    "m_Id": "8955a83af65f4042ab967a143089885c"
+                },
+                "m_SlotId": 0
+            }
+        },
+        {
+            "m_OutputSlot": {
+                "m_Node": {
+                    "m_Id": "e7b2a541d62749a2ae74a651207be7b7"
+                },
+                "m_SlotId": 2
+            },
+            "m_InputSlot": {
+                "m_Node": {
+                    "m_Id": "bd305e464ef743e3b7680f8467e5efcc"
+                },
+                "m_SlotId": 2
+            }
+        }
+    ],
+    "m_VertexContext": {
+        "m_Position": {
+            "x": 0.0,
+            "y": 0.0
+        },
+        "m_Blocks": []
+    },
+    "m_FragmentContext": {
+        "m_Position": {
+            "x": 0.0,
+            "y": 0.0
+        },
+        "m_Blocks": []
+    },
+    "m_PreviewData": {
+        "serializedMesh": {
+            "m_SerializedMesh": "{\"mesh\":{\"instanceID\":0}}",
+            "m_Guid": ""
+        },
+        "preventRotation": false
+    },
+    "m_Path": "Input/UGUI",
+    "m_GraphPrecision": 1,
+    "m_PreviewMode": 1,
+    "m_OutputNode": {
+        "m_Id": "a372d995751b4f829dfed91788c82980"
+    },
+    "m_SubDatas": [],
+    "m_ActiveTargets": []
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot",
+    "m_ObjectId": "017b6f54d3a14a82b8f063b3b263bd7c",
+    "m_Id": 3,
+    "m_DisplayName": "Left To Right",
+    "m_SlotType": 0,
+    "m_Hidden": false,
+    "m_HideConnector": false,
+    "m_ShaderOutputName": "Left To Right",
+    "m_StageCapability": 3,
+    "m_Value": {
+        "x": 0.0,
+        "y": 0.0,
+        "z": 0.0,
+        "w": 0.0
+    },
+    "m_DefaultValue": {
+        "x": 0.0,
+        "y": 0.0,
+        "z": 0.0,
+        "w": 0.0
+    },
+    "m_LiteralMode": false
+}
+
+{
+    "m_SGVersion": 1,
+    "m_Type": "UnityEditor.ShaderGraph.SwizzleNode",
+    "m_ObjectId": "103b7d00db024d7c8efa28eba0f68ab6",
+    "m_Group": {
+        "m_Id": ""
+    },
+    "m_Name": "Swizzle",
+    "m_DrawState": {
+        "m_Expanded": true,
+        "m_Position": {
+            "serializedVersion": "2",
+            "x": 75.99998474121094,
+            "y": 185.99996948242188,
+            "width": 127.99998474121094,
+            "height": 122.0
+        }
+    },
+    "m_Slots": [
+        {
+            "m_Id": "f63d5c881c2a4f179c7704f461af655f"
+        },
+        {
+            "m_Id": "ced6090d0588465f81763c23b21af9cd"
+        }
+    ],
+    "synonyms": [
+        "swap",
+        "reorder",
+        "component mask"
+    ],
+    "m_Precision": 0,
+    "m_PreviewExpanded": false,
+    "m_DismissedVersion": 0,
+    "m_PreviewMode": 0,
+    "m_CustomColors": {
+        "m_SerializableColors": []
+    },
+    "_maskInput": "x",
+    "convertedMask": "x"
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.PropertyNode",
+    "m_ObjectId": "1902971be97c477489be5a0b30d7bdbc",
+    "m_Group": {
+        "m_Id": ""
+    },
+    "m_Name": "Property",
+    "m_DrawState": {
+        "m_Expanded": true,
+        "m_Position": {
+            "serializedVersion": "2",
+            "x": -232.0,
+            "y": 216.99998474121095,
+            "width": 136.0,
+            "height": 33.99998474121094
+        }
+    },
+    "m_Slots": [
+        {
+            "m_Id": "639223781aca4bb4921063735bc79719"
+        }
+    ],
+    "synonyms": [],
+    "m_Precision": 0,
+    "m_PreviewExpanded": false,
+    "m_DismissedVersion": 0,
+    "m_PreviewMode": 0,
+    "m_CustomColors": {
+        "m_SerializableColors": []
+    },
+    "m_Property": {
+        "m_Id": "4dbf558957b849e380b1875a621d195e"
+    }
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.PropertyNode",
+    "m_ObjectId": "29ed92260cfa4f38b84fcb7b0cb6b03e",
+    "m_Group": {
+        "m_Id": ""
+    },
+    "m_Name": "Property",
+    "m_DrawState": {
+        "m_Expanded": true,
+        "m_Position": {
+            "serializedVersion": "2",
+            "x": -547.0,
+            "y": 300.0,
+            "width": 149.0,
+            "height": 34.0
+        }
+    },
+    "m_Slots": [
+        {
+            "m_Id": "8d37eb0b3aee44e2a239c2ee1ba99750"
+        }
+    ],
+    "synonyms": [],
+    "m_Precision": 0,
+    "m_PreviewExpanded": false,
+    "m_DismissedVersion": 0,
+    "m_PreviewMode": 0,
+    "m_CustomColors": {
+        "m_SerializableColors": []
+    },
+    "m_Property": {
+        "m_Id": "7b7e5088bf624a539ee3cbf0e6719610"
+    }
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.Vector2MaterialSlot",
+    "m_ObjectId": "471178fe064d4b72930076afad36d649",
+    "m_Id": 2,
+    "m_DisplayName": "Direction",
+    "m_SlotType": 0,
+    "m_Hidden": false,
+    "m_HideConnector": false,
+    "m_ShaderOutputName": "Direction",
+    "m_StageCapability": 3,
+    "m_Value": {
+        "x": 0.0,
+        "y": 0.0
+    },
+    "m_DefaultValue": {
+        "x": 0.0,
+        "y": 0.0
+    },
+    "m_Labels": []
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.Vector2MaterialSlot",
+    "m_ObjectId": "4b82a991c7b54cd1afbf838594d2d34b",
+    "m_Id": 1,
+    "m_DisplayName": "Out",
+    "m_SlotType": 1,
+    "m_Hidden": false,
+    "m_HideConnector": false,
+    "m_ShaderOutputName": "Out",
+    "m_StageCapability": 3,
+    "m_Value": {
+        "x": 0.0,
+        "y": 0.0
+    },
+    "m_DefaultValue": {
+        "x": 0.0,
+        "y": 0.0
+    },
+    "m_Labels": []
+}
+
+{
+    "m_SGVersion": 1,
+    "m_Type": "UnityEditor.ShaderGraph.Internal.Vector3ShaderProperty",
+    "m_ObjectId": "4dbf558957b849e380b1875a621d195e",
+    "m_Guid": {
+        "m_GuidSerialized": "8aab3f88-641d-40db-8ceb-81965df5837c"
+    },
+    "promotedFromAssetID": "b674f75227b22477ca93a09e82cd33d2",
+    "promotedFromCategoryName": "",
+    "promotedOrdering": -1,
+    "m_Name": "SliderValue",
+    "m_DefaultRefNameVersion": 1,
+    "m_RefNameGeneratedByDisplayName": "SliderValue",
+    "m_DefaultReferenceName": "_SliderValue",
+    "m_OverrideReferenceName": "",
+    "m_GeneratePropertyBlock": false,
+    "m_UseCustomSlotLabel": false,
+    "m_CustomSlotLabel": "",
+    "m_DismissedVersion": 0,
+    "m_Precision": 0,
+    "overrideHLSLDeclaration": true,
+    "hlslDeclarationOverride": 2,
+    "hideConnector": false,
+    "m_Hidden": false,
+    "m_PerRendererData": false,
+    "m_customAttributes": [],
+    "m_Value": {
+        "x": 0.0,
+        "y": 0.0,
+        "z": 0.0,
+        "w": 0.0
+    }
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
+    "m_ObjectId": "547df4a292264c389ecba78fc4f9850b",
+    "m_Id": 2,
+    "m_DisplayName": "Y",
+    "m_SlotType": 0,
+    "m_Hidden": false,
+    "m_HideConnector": false,
+    "m_ShaderOutputName": "Y",
+    "m_StageCapability": 3,
+    "m_Value": 0.0,
+    "m_DefaultValue": 0.0,
+    "m_Labels": [
+        "Y"
+    ],
+    "m_LiteralMode": false
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.Vector3MaterialSlot",
+    "m_ObjectId": "639223781aca4bb4921063735bc79719",
+    "m_Id": 0,
+    "m_DisplayName": "SliderValue",
+    "m_SlotType": 1,
+    "m_Hidden": false,
+    "m_HideConnector": false,
+    "m_ShaderOutputName": "Out",
+    "m_StageCapability": 3,
+    "m_Value": {
+        "x": 0.0,
+        "y": 0.0,
+        "z": 0.0
+    },
+    "m_DefaultValue": {
+        "x": 0.0,
+        "y": 0.0,
+        "z": 0.0
+    },
+    "m_Labels": []
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.StickyNoteData",
+    "m_ObjectId": "643db992a0ca4d80a26c09a947d99148",
+    "m_Title": "Slider Value",
+    "m_Content": "This subgraph uses a Custom Function Node to switch between a hidden promoted property and a subgraph property with input port disabled used as the preview value, as well as a dropdown used to set the preview direction vector..\n\nThis requires one CustomSlider component on the element to feed the value.",
+    "m_TextSize": 0,
+    "m_Theme": 1,
+    "m_Position": {
+        "serializedVersion": "2",
+        "x": -866.0,
+        "y": 136.0,
+        "width": 259.0,
+        "height": 166.72341918945313
+    },
+    "m_Group": {
+        "m_Id": ""
+    }
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.Vector3MaterialSlot",
+    "m_ObjectId": "6751d8d4884c4d92bcc1fba927c099ea",
+    "m_Id": 0,
+    "m_DisplayName": "Final",
+    "m_SlotType": 0,
+    "m_Hidden": false,
+    "m_HideConnector": false,
+    "m_ShaderOutputName": "Final",
+    "m_StageCapability": 3,
+    "m_Value": {
+        "x": 0.0,
+        "y": 0.0,
+        "z": 0.0
+    },
+    "m_DefaultValue": {
+        "x": 0.0,
+        "y": 0.0,
+        "z": 0.0
+    },
+    "m_Labels": []
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
+    "m_ObjectId": "75499ab6fff44050983bc5676376883a",
+    "m_Id": 1,
+    "m_DisplayName": "X",
+    "m_SlotType": 0,
+    "m_Hidden": false,
+    "m_HideConnector": false,
+    "m_ShaderOutputName": "X",
+    "m_StageCapability": 3,
+    "m_Value": 1.0,
+    "m_DefaultValue": 0.0,
+    "m_Labels": [],
+    "m_LiteralMode": false
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.Vector2Node",
+    "m_ObjectId": "76154026d439420ebf6d5207e3399b7b",
+    "m_Group": {
+        "m_Id": ""
+    },
+    "m_Name": "Vector 2",
+    "m_DrawState": {
+        "m_Expanded": true,
+        "m_Position": {
+            "serializedVersion": "2",
+            "x": -881.0,
+            "y": 334.0,
+            "width": 128.0,
+            "height": 101.0
+        }
+    },
+    "m_Slots": [
+        {
+            "m_Id": "75499ab6fff44050983bc5676376883a"
+        },
+        {
+            "m_Id": "547df4a292264c389ecba78fc4f9850b"
+        },
+        {
+            "m_Id": "8ded07ec452c4ab7865e9392dbd94f47"
+        }
+    ],
+    "synonyms": [
+        "2",
+        "v2",
+        "vec2",
+        "float2"
+    ],
+    "m_Precision": 0,
+    "m_PreviewExpanded": false,
+    "m_DismissedVersion": 0,
+    "m_PreviewMode": 0,
+    "m_CustomColors": {
+        "m_SerializableColors": []
+    },
+    "m_Value": {
+        "x": 0.0,
+        "y": 0.0
+    }
+}
+
+{
+    "m_SGVersion": 1,
+    "m_Type": "UnityEditor.ShaderGraph.Internal.Vector1ShaderProperty",
+    "m_ObjectId": "7b7e5088bf624a539ee3cbf0e6719610",
+    "m_Guid": {
+        "m_GuidSerialized": "c874690c-9084-423f-9768-5c99a5d92488"
+    },
+    "promotedFromAssetID": "",
+    "promotedFromCategoryName": "",
+    "promotedOrdering": -1,
+    "m_Name": "Preview Value",
+    "m_DefaultRefNameVersion": 1,
+    "m_RefNameGeneratedByDisplayName": "Preview Value",
+    "m_DefaultReferenceName": "_Preview_Value",
+    "m_OverrideReferenceName": "",
+    "m_GeneratePropertyBlock": true,
+    "m_UseCustomSlotLabel": false,
+    "m_CustomSlotLabel": "",
+    "m_DismissedVersion": 0,
+    "m_Precision": 0,
+    "overrideHLSLDeclaration": false,
+    "hlslDeclarationOverride": 0,
+    "hideConnector": true,
+    "m_Hidden": false,
+    "m_PerRendererData": false,
+    "m_customAttributes": [],
+    "m_Value": 0.5,
+    "m_FloatType": 1,
+    "m_LiteralFloatMode": false,
+    "m_RangeValues": {
+        "x": 0.0,
+        "y": 1.0
+    },
+    "m_SliderType": 0,
+    "m_SliderPower": 3.0,
+    "m_EnumType": 0,
+    "m_CSharpEnumString": "",
+    "m_EnumNames": [
+        "Default"
+    ],
+    "m_EnumValues": [
+        0
+    ]
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot",
+    "m_ObjectId": "7b93705e4c004a2297b9a72f89ed9e74",
+    "m_Id": 1,
+    "m_DisplayName": "B",
+    "m_SlotType": 0,
+    "m_Hidden": false,
+    "m_HideConnector": false,
+    "m_ShaderOutputName": "B",
+    "m_StageCapability": 3,
+    "m_Value": {
+        "x": 0.0,
+        "y": 0.0,
+        "z": 0.0,
+        "w": 0.0
+    },
+    "m_DefaultValue": {
+        "x": 0.0,
+        "y": 0.0,
+        "z": 0.0,
+        "w": 0.0
+    },
+    "m_LiteralMode": false
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot",
+    "m_ObjectId": "7c61ea46819048f39b79a495d485e11a",
+    "m_Id": 5,
+    "m_DisplayName": "Bottom To Top",
+    "m_SlotType": 0,
+    "m_Hidden": false,
+    "m_HideConnector": false,
+    "m_ShaderOutputName": "Bottom To Top",
+    "m_StageCapability": 3,
+    "m_Value": {
+        "x": 0.0,
+        "y": 1.0,
+        "z": 0.0,
+        "w": 0.0
+    },
+    "m_DefaultValue": {
+        "x": 0.0,
+        "y": 0.0,
+        "z": 0.0,
+        "w": 0.0
+    },
+    "m_LiteralMode": false
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.ShaderDropdown",
+    "m_ObjectId": "80626c7b9d8f4128b36d452e01453466",
+    "m_Guid": {
+        "m_GuidSerialized": "de71c063-2582-4725-b5ec-78ac2f48c502"
+    },
+    "promotedFromAssetID": "",
+    "promotedFromCategoryName": "",
+    "promotedOrdering": -1,
+    "m_Name": "Preview Direction",
+    "m_DefaultRefNameVersion": 1,
+    "m_RefNameGeneratedByDisplayName": "Preview Direction",
+    "m_DefaultReferenceName": "_Preview_Direction",
+    "m_OverrideReferenceName": "",
+    "m_GeneratePropertyBlock": true,
+    "m_UseCustomSlotLabel": false,
+    "m_CustomSlotLabel": "",
+    "m_DismissedVersion": 0,
+    "m_Entries": [
+        {
+            "id": 3,
+            "displayName": "Left To Right"
+        },
+        {
+            "id": 1,
+            "displayName": "Right To Left"
+        },
+        {
+            "id": 5,
+            "displayName": "Bottom To Top"
+        },
+        {
+            "id": 2,
+            "displayName": "Top To Bottom"
+        }
+    ],
+    "m_Value": 0
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.Vector3MaterialSlot",
+    "m_ObjectId": "82d75fcaf8cf490b8ebfe3742ea78696",
+    "m_Id": 1,
+    "m_DisplayName": "Out",
+    "m_SlotType": 1,
+    "m_Hidden": false,
+    "m_HideConnector": false,
+    "m_ShaderOutputName": "Out",
+    "m_StageCapability": 3,
+    "m_Value": {
+        "x": 0.0,
+        "y": 0.0,
+        "z": 0.0
+    },
+    "m_DefaultValue": {
+        "x": 0.0,
+        "y": 0.0,
+        "z": 0.0
+    },
+    "m_Labels": []
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.CategoryData",
+    "m_ObjectId": "87ba7b34c8054d0aa07a3f969d450be6",
+    "m_Name": "",
+    "m_ChildObjectList": [
+        {
+            "m_Id": "4dbf558957b849e380b1875a621d195e"
+        },
+        {
+            "m_Id": "80626c7b9d8f4128b36d452e01453466"
+        },
+        {
+            "m_Id": "7b7e5088bf624a539ee3cbf0e6719610"
+        }
+    ]
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.DropdownNode",
+    "m_ObjectId": "88493a32387e45e6b869db78cea875af",
+    "m_Group": {
+        "m_Id": ""
+    },
+    "m_Name": "Preview Direction",
+    "m_DrawState": {
+        "m_Expanded": true,
+        "m_Position": {
+            "serializedVersion": "2",
+            "x": -596.0,
+            "y": 334.0,
+            "width": 198.0,
+            "height": 166.0
+        }
+    },
+    "m_Slots": [
+        {
+            "m_Id": "fcaf331434fd4771866cb7e7535beaa7"
+        },
+        {
+            "m_Id": "017b6f54d3a14a82b8f063b3b263bd7c"
+        },
+        {
+            "m_Id": "be22c377349c4ad282318111e142ec77"
+        },
+        {
+            "m_Id": "7c61ea46819048f39b79a495d485e11a"
+        },
+        {
+            "m_Id": "9592aea2a49840dfb15f62d7102f53dc"
+        }
+    ],
+    "synonyms": [],
+    "m_Precision": 0,
+    "m_PreviewExpanded": false,
+    "m_DismissedVersion": 0,
+    "m_PreviewMode": 0,
+    "m_CustomColors": {
+        "m_SerializableColors": []
+    },
+    "m_Dropdown": {
+        "m_Id": "80626c7b9d8f4128b36d452e01453466"
+    }
+}
+
+{
+    "m_SGVersion": 1,
+    "m_Type": "UnityEditor.ShaderGraph.SwizzleNode",
+    "m_ObjectId": "8955a83af65f4042ab967a143089885c",
+    "m_Group": {
+        "m_Id": ""
+    },
+    "m_Name": "Swizzle",
+    "m_DrawState": {
+        "m_Expanded": true,
+        "m_Position": {
+            "serializedVersion": "2",
+            "x": 72.00000762939453,
+            "y": 308.0,
+            "width": 132.0,
+            "height": 122.0
+        }
+    },
+    "m_Slots": [
+        {
+            "m_Id": "ca0092f6b5874ae49308479c6d18c4ab"
+        },
+        {
+            "m_Id": "4b82a991c7b54cd1afbf838594d2d34b"
+        }
+    ],
+    "synonyms": [
+        "swap",
+        "reorder",
+        "component mask"
+    ],
+    "m_Precision": 0,
+    "m_PreviewExpanded": false,
+    "m_DismissedVersion": 0,
+    "m_PreviewMode": 0,
+    "m_CustomColors": {
+        "m_SerializableColors": []
+    },
+    "_maskInput": "yz",
+    "convertedMask": "yz"
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
+    "m_ObjectId": "8d37eb0b3aee44e2a239c2ee1ba99750",
+    "m_Id": 0,
+    "m_DisplayName": "Preview Value",
+    "m_SlotType": 1,
+    "m_Hidden": false,
+    "m_HideConnector": false,
+    "m_ShaderOutputName": "Out",
+    "m_StageCapability": 3,
+    "m_Value": 0.0,
+    "m_DefaultValue": 0.0,
+    "m_Labels": [],
+    "m_LiteralMode": false
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.Vector2MaterialSlot",
+    "m_ObjectId": "8ded07ec452c4ab7865e9392dbd94f47",
+    "m_Id": 0,
+    "m_DisplayName": "Out",
+    "m_SlotType": 1,
+    "m_Hidden": false,
+    "m_HideConnector": false,
+    "m_ShaderOutputName": "Out",
+    "m_StageCapability": 3,
+    "m_Value": {
+        "x": 0.0,
+        "y": 0.0
+    },
+    "m_DefaultValue": {
+        "x": 0.0,
+        "y": 0.0
+    },
+    "m_Labels": []
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot",
+    "m_ObjectId": "9592aea2a49840dfb15f62d7102f53dc",
+    "m_Id": 2,
+    "m_DisplayName": "Top To Bottom",
+    "m_SlotType": 0,
+    "m_Hidden": false,
+    "m_HideConnector": false,
+    "m_ShaderOutputName": "Top To Bottom",
+    "m_StageCapability": 3,
+    "m_Value": {
+        "x": 0.0,
+        "y": -1.0,
+        "z": 0.0,
+        "w": 0.0
+    },
+    "m_DefaultValue": {
+        "x": 0.0,
+        "y": 0.0,
+        "z": 0.0,
+        "w": 0.0
+    },
+    "m_LiteralMode": false
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.SubGraphOutputNode",
+    "m_ObjectId": "a372d995751b4f829dfed91788c82980",
+    "m_Group": {
+        "m_Id": ""
+    },
+    "m_Name": "Output",
+    "m_DrawState": {
+        "m_Expanded": true,
+        "m_Position": {
+            "serializedVersion": "2",
+            "x": 287.0000305175781,
+            "y": 253.99996948242188,
+            "width": 101.99996948242188,
+            "height": 101.00003051757813
+        }
+    },
+    "m_Slots": [
+        {
+            "m_Id": "d972923850b44919b1f219a1ae858aea"
+        },
+        {
+            "m_Id": "471178fe064d4b72930076afad36d649"
+        }
+    ],
+    "synonyms": [],
+    "m_Precision": 0,
+    "m_PreviewExpanded": false,
+    "m_DismissedVersion": 0,
+    "m_PreviewMode": 0,
+    "m_CustomColors": {
+        "m_SerializableColors": []
+    },
+    "IsFirstSlotValid": true
+}
+
+{
+    "m_SGVersion": 1,
+    "m_Type": "UnityEditor.ShaderGraph.CustomFunctionNode",
+    "m_ObjectId": "bd305e464ef743e3b7680f8467e5efcc",
+    "m_Group": {
+        "m_Id": ""
+    },
+    "m_Name": "IsPreviewFloat3 (Custom Function)",
+    "m_DrawState": {
+        "m_Expanded": true,
+        "m_Position": {
+            "serializedVersion": "2",
+            "x": -232.0,
+            "y": 250.99996948242188,
+            "width": 244.9999542236328,
+            "height": 118.0
+        }
+    },
+    "m_Slots": [
+        {
+            "m_Id": "6751d8d4884c4d92bcc1fba927c099ea"
+        },
+        {
+            "m_Id": "dad229f3e92c4753a47e5bda41700d2f"
+        },
+        {
+            "m_Id": "82d75fcaf8cf490b8ebfe3742ea78696"
+        }
+    ],
+    "synonyms": [
+        "code",
+        "HLSL"
+    ],
+    "m_Precision": 0,
+    "m_PreviewExpanded": false,
+    "m_DismissedVersion": 0,
+    "m_PreviewMode": 0,
+    "m_CustomColors": {
+        "m_SerializableColors": []
+    },
+    "m_SourceType": 1,
+    "m_FunctionName": "IsPreviewFloat3",
+    "m_FunctionSource": "",
+    "m_FunctionSourceUsePragmas": true,
+    "m_FunctionBody": "#if defined(SHADERGRAPH_PREVIEW_MAIN) || defined(SHADERGRAPH_PREVIEW)\nOut = Preview;\n#else\nOut = Final;\n#endif\n"
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot",
+    "m_ObjectId": "be22c377349c4ad282318111e142ec77",
+    "m_Id": 1,
+    "m_DisplayName": "Right To Left",
+    "m_SlotType": 0,
+    "m_Hidden": false,
+    "m_HideConnector": false,
+    "m_ShaderOutputName": "Right To Left",
+    "m_StageCapability": 3,
+    "m_Value": {
+        "x": -1.0,
+        "y": 0.0,
+        "z": 0.0,
+        "w": 0.0
+    },
+    "m_DefaultValue": {
+        "x": 0.0,
+        "y": 0.0,
+        "z": 0.0,
+        "w": 0.0
+    },
+    "m_LiteralMode": false
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.Vector3MaterialSlot",
+    "m_ObjectId": "ca0092f6b5874ae49308479c6d18c4ab",
+    "m_Id": 0,
+    "m_DisplayName": "In",
+    "m_SlotType": 0,
+    "m_Hidden": false,
+    "m_HideConnector": false,
+    "m_ShaderOutputName": "In",
+    "m_StageCapability": 3,
+    "m_Value": {
+        "x": 0.0,
+        "y": 0.0,
+        "z": 0.0
+    },
+    "m_DefaultValue": {
+        "x": 0.0,
+        "y": 0.0,
+        "z": 0.0
+    },
+    "m_Labels": []
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
+    "m_ObjectId": "ced6090d0588465f81763c23b21af9cd",
+    "m_Id": 1,
+    "m_DisplayName": "Out",
+    "m_SlotType": 1,
+    "m_Hidden": false,
+    "m_HideConnector": false,
+    "m_ShaderOutputName": "Out",
+    "m_StageCapability": 3,
+    "m_Value": 0.0,
+    "m_DefaultValue": 0.0,
+    "m_Labels": [],
+    "m_LiteralMode": false
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
+    "m_ObjectId": "d972923850b44919b1f219a1ae858aea",
+    "m_Id": 1,
+    "m_DisplayName": "Value",
+    "m_SlotType": 0,
+    "m_Hidden": false,
+    "m_HideConnector": false,
+    "m_ShaderOutputName": "Value",
+    "m_StageCapability": 3,
+    "m_Value": 0.0,
+    "m_DefaultValue": 0.0,
+    "m_Labels": [],
+    "m_LiteralMode": false
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.Vector3MaterialSlot",
+    "m_ObjectId": "dad229f3e92c4753a47e5bda41700d2f",
+    "m_Id": 2,
+    "m_DisplayName": "Preview",
+    "m_SlotType": 0,
+    "m_Hidden": false,
+    "m_HideConnector": false,
+    "m_ShaderOutputName": "Preview",
+    "m_StageCapability": 3,
+    "m_Value": {
+        "x": 0.0,
+        "y": 0.0,
+        "z": 0.0
+    },
+    "m_DefaultValue": {
+        "x": 0.0,
+        "y": 0.0,
+        "z": 0.0
+    },
+    "m_Labels": []
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot",
+    "m_ObjectId": "df28f2ad6c3e419d83d63847eaae6813",
+    "m_Id": 2,
+    "m_DisplayName": "Out",
+    "m_SlotType": 1,
+    "m_Hidden": false,
+    "m_HideConnector": false,
+    "m_ShaderOutputName": "Out",
+    "m_StageCapability": 3,
+    "m_Value": {
+        "x": 0.0,
+        "y": 0.0,
+        "z": 0.0,
+        "w": 0.0
+    },
+    "m_DefaultValue": {
+        "x": 0.0,
+        "y": 0.0,
+        "z": 0.0,
+        "w": 0.0
+    },
+    "m_LiteralMode": false
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.AppendVectorNode",
+    "m_ObjectId": "e7b2a541d62749a2ae74a651207be7b7",
+    "m_Group": {
+        "m_Id": ""
+    },
+    "m_Name": "Append",
+    "m_DrawState": {
+        "m_Expanded": true,
+        "m_Position": {
+            "serializedVersion": "2",
+            "x": -373.0,
+            "y": 275.0,
+            "width": 129.00001525878907,
+            "height": 118.00003051757813
+        }
+    },
+    "m_Slots": [
+        {
+            "m_Id": "fdac1a1995274d25a888d7dcd2fdce09"
+        },
+        {
+            "m_Id": "7b93705e4c004a2297b9a72f89ed9e74"
+        },
+        {
+            "m_Id": "df28f2ad6c3e419d83d63847eaae6813"
+        }
+    ],
+    "synonyms": [
+        "join",
+        "combine"
+    ],
+    "m_Precision": 0,
+    "m_PreviewExpanded": false,
+    "m_DismissedVersion": 0,
+    "m_PreviewMode": 0,
+    "m_CustomColors": {
+        "m_SerializableColors": []
+    }
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
+    "m_ObjectId": "f63d5c881c2a4f179c7704f461af655f",
+    "m_Id": 0,
+    "m_DisplayName": "In",
+    "m_SlotType": 0,
+    "m_Hidden": false,
+    "m_HideConnector": false,
+    "m_ShaderOutputName": "In",
+    "m_StageCapability": 3,
+    "m_Value": 0.0,
+    "m_DefaultValue": 0.0,
+    "m_Labels": [],
+    "m_LiteralMode": false
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot",
+    "m_ObjectId": "fcaf331434fd4771866cb7e7535beaa7",
+    "m_Id": 0,
+    "m_DisplayName": "Out",
+    "m_SlotType": 1,
+    "m_Hidden": false,
+    "m_HideConnector": false,
+    "m_ShaderOutputName": "Out",
+    "m_StageCapability": 3,
+    "m_Value": {
+        "x": 0.0,
+        "y": 0.0,
+        "z": 0.0,
+        "w": 0.0
+    },
+    "m_DefaultValue": {
+        "x": 0.0,
+        "y": 0.0,
+        "z": 0.0,
+        "w": 0.0
+    },
+    "m_LiteralMode": true
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot",
+    "m_ObjectId": "fdac1a1995274d25a888d7dcd2fdce09",
+    "m_Id": 0,
+    "m_DisplayName": "A",
+    "m_SlotType": 0,
+    "m_Hidden": false,
+    "m_HideConnector": false,
+    "m_ShaderOutputName": "A",
+    "m_StageCapability": 3,
+    "m_Value": {
+        "x": 0.0,
+        "y": 0.0,
+        "z": 0.0,
+        "w": 0.0
+    },
+    "m_DefaultValue": {
+        "x": 0.0,
+        "y": 0.0,
+        "z": 0.0,
+        "w": 0.0
+    },
+    "m_LiteralMode": false
+}
+
diff --git a/Packages/com.unity.shadergraph/Samples~/UGUIShaders/Subgraphs/Input/SliderValue.shadersubgraph.meta b/Packages/com.unity.shadergraph/Samples~/UGUIShaders/Subgraphs/Input/SliderValue.shadersubgraph.meta
new file mode 100644
index 00000000000..aed0dbbe716
--- /dev/null
+++ b/Packages/com.unity.shadergraph/Samples~/UGUIShaders/Subgraphs/Input/SliderValue.shadersubgraph.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: b674f75227b22477ca93a09e82cd33d2
+ScriptedImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 2
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+  script: {fileID: 11500000, guid: 60072b568d64c40a485e0fc55012dc9f, type: 3}
+  documentationPath: 
diff --git a/Packages/com.unity.shadergraph/Samples~/UGUIShaders/Subgraphs/Input/ToggleState.shadersubgraph b/Packages/com.unity.shadergraph/Samples~/UGUIShaders/Subgraphs/Input/ToggleState.shadersubgraph
new file mode 100644
index 00000000000..2da16d6dd14
--- /dev/null
+++ b/Packages/com.unity.shadergraph/Samples~/UGUIShaders/Subgraphs/Input/ToggleState.shadersubgraph
@@ -0,0 +1,450 @@
+{
+    "m_SGVersion": 3,
+    "m_Type": "UnityEditor.ShaderGraph.GraphData",
+    "m_ObjectId": "a92da9b814cf404f85ddbe3e7c40723d",
+    "m_Properties": [
+        {
+            "m_Id": "6a1e11891a0747379c6442655f6ecd2c"
+        },
+        {
+            "m_Id": "409c7cb5d8f344f3bfa3bf910701eabc"
+        }
+    ],
+    "m_Keywords": [],
+    "m_Dropdowns": [],
+    "m_CategoryData": [
+        {
+            "m_Id": "37243da13ef847258c57c945401da875"
+        }
+    ],
+    "m_Nodes": [
+        {
+            "m_Id": "545a4b0865f1448b90b195b2a98149c4"
+        },
+        {
+            "m_Id": "659ee2636e7549319737788bd8f6eb9f"
+        },
+        {
+            "m_Id": "42f0f4edbabd4804bb2342db7e8abd4f"
+        },
+        {
+            "m_Id": "e8ab947e9b9e44b0bbaf4ae733360b91"
+        }
+    ],
+    "m_GroupDatas": [],
+    "m_StickyNoteDatas": [
+        {
+            "m_Id": "069db23700974059b560db9dce6db235"
+        }
+    ],
+    "m_Edges": [
+        {
+            "m_OutputSlot": {
+                "m_Node": {
+                    "m_Id": "42f0f4edbabd4804bb2342db7e8abd4f"
+                },
+                "m_SlotId": 1
+            },
+            "m_InputSlot": {
+                "m_Node": {
+                    "m_Id": "545a4b0865f1448b90b195b2a98149c4"
+                },
+                "m_SlotId": 1
+            }
+        },
+        {
+            "m_OutputSlot": {
+                "m_Node": {
+                    "m_Id": "659ee2636e7549319737788bd8f6eb9f"
+                },
+                "m_SlotId": 0
+            },
+            "m_InputSlot": {
+                "m_Node": {
+                    "m_Id": "42f0f4edbabd4804bb2342db7e8abd4f"
+                },
+                "m_SlotId": 0
+            }
+        },
+        {
+            "m_OutputSlot": {
+                "m_Node": {
+                    "m_Id": "e8ab947e9b9e44b0bbaf4ae733360b91"
+                },
+                "m_SlotId": 0
+            },
+            "m_InputSlot": {
+                "m_Node": {
+                    "m_Id": "42f0f4edbabd4804bb2342db7e8abd4f"
+                },
+                "m_SlotId": 2
+            }
+        }
+    ],
+    "m_VertexContext": {
+        "m_Position": {
+            "x": 0.0,
+            "y": 0.0
+        },
+        "m_Blocks": []
+    },
+    "m_FragmentContext": {
+        "m_Position": {
+            "x": 0.0,
+            "y": 0.0
+        },
+        "m_Blocks": []
+    },
+    "m_PreviewData": {
+        "serializedMesh": {
+            "m_SerializedMesh": "{\"mesh\":{\"instanceID\":0}}",
+            "m_Guid": ""
+        },
+        "preventRotation": false
+    },
+    "m_Path": "Input/UGUI",
+    "m_GraphPrecision": 1,
+    "m_PreviewMode": 2,
+    "m_OutputNode": {
+        "m_Id": "545a4b0865f1448b90b195b2a98149c4"
+    },
+    "m_SubDatas": [],
+    "m_ActiveTargets": []
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.StickyNoteData",
+    "m_ObjectId": "069db23700974059b560db9dce6db235",
+    "m_Title": "Toggle State",
+    "m_Content": "This subgraph uses a Custom Function Node to switch between a hidden promoted property and a subgraph property with input port disabled used as the preview value.\n\nThis requires one CustomToggle component on the element to feed the value.",
+    "m_TextSize": 0,
+    "m_Theme": 1,
+    "m_Position": {
+        "serializedVersion": "2",
+        "x": -462.0,
+        "y": 22.0,
+        "width": 259.0,
+        "height": 144.0
+    },
+    "m_Group": {
+        "m_Id": ""
+    }
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.CategoryData",
+    "m_ObjectId": "37243da13ef847258c57c945401da875",
+    "m_Name": "",
+    "m_ChildObjectList": [
+        {
+            "m_Id": "6a1e11891a0747379c6442655f6ecd2c"
+        },
+        {
+            "m_Id": "409c7cb5d8f344f3bfa3bf910701eabc"
+        }
+    ]
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.BooleanMaterialSlot",
+    "m_ObjectId": "3f8bee3224d54693b26615a2aa0d1dea",
+    "m_Id": 2,
+    "m_DisplayName": "Preview",
+    "m_SlotType": 0,
+    "m_Hidden": false,
+    "m_HideConnector": false,
+    "m_ShaderOutputName": "Preview",
+    "m_StageCapability": 3,
+    "m_Value": false,
+    "m_DefaultValue": false
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.Internal.BooleanShaderProperty",
+    "m_ObjectId": "409c7cb5d8f344f3bfa3bf910701eabc",
+    "m_Guid": {
+        "m_GuidSerialized": "33920d31-0cc5-4286-b412-4e36a6203057"
+    },
+    "promotedFromAssetID": "",
+    "promotedFromCategoryName": "",
+    "promotedOrdering": -1,
+    "m_Name": "Preview Value",
+    "m_DefaultRefNameVersion": 1,
+    "m_RefNameGeneratedByDisplayName": "Preview Value",
+    "m_DefaultReferenceName": "_Preview_Value",
+    "m_OverrideReferenceName": "",
+    "m_GeneratePropertyBlock": true,
+    "m_UseCustomSlotLabel": false,
+    "m_CustomSlotLabel": "",
+    "m_DismissedVersion": 0,
+    "m_Precision": 0,
+    "overrideHLSLDeclaration": false,
+    "hlslDeclarationOverride": 0,
+    "hideConnector": true,
+    "m_Hidden": false,
+    "m_PerRendererData": false,
+    "m_customAttributes": [],
+    "m_Value": false
+}
+
+{
+    "m_SGVersion": 1,
+    "m_Type": "UnityEditor.ShaderGraph.CustomFunctionNode",
+    "m_ObjectId": "42f0f4edbabd4804bb2342db7e8abd4f",
+    "m_Group": {
+        "m_Id": ""
+    },
+    "m_Name": "IsPreviewBool (Custom Function)",
+    "m_DrawState": {
+        "m_Expanded": true,
+        "m_Position": {
+            "serializedVersion": "2",
+            "x": -187.0,
+            "y": 27.000003814697267,
+            "width": 233.99998474121095,
+            "height": 117.99998474121094
+        }
+    },
+    "m_Slots": [
+        {
+            "m_Id": "ff99b2b0cb7440b2a8c76c9862d8378c"
+        },
+        {
+            "m_Id": "3f8bee3224d54693b26615a2aa0d1dea"
+        },
+        {
+            "m_Id": "94110943dbea4ba684f68b965724621f"
+        }
+    ],
+    "synonyms": [
+        "code",
+        "HLSL"
+    ],
+    "m_Precision": 0,
+    "m_PreviewExpanded": false,
+    "m_DismissedVersion": 0,
+    "m_PreviewMode": 0,
+    "m_CustomColors": {
+        "m_SerializableColors": []
+    },
+    "m_SourceType": 1,
+    "m_FunctionName": "IsPreviewBool",
+    "m_FunctionSource": "",
+    "m_FunctionSourceUsePragmas": true,
+    "m_FunctionBody": "#if defined(SHADERGRAPH_PREVIEW_MAIN) || defined(SHADERGRAPH_PREVIEW)\nOut = Preview;\n#else\nOut = Final;\n#endif\n"
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.SubGraphOutputNode",
+    "m_ObjectId": "545a4b0865f1448b90b195b2a98149c4",
+    "m_Group": {
+        "m_Id": ""
+    },
+    "m_Name": "Output",
+    "m_DrawState": {
+        "m_Expanded": true,
+        "m_Position": {
+            "serializedVersion": "2",
+            "x": 46.99998092651367,
+            "y": 27.000003814697267,
+            "width": 86.0,
+            "height": 77.0
+        }
+    },
+    "m_Slots": [
+        {
+            "m_Id": "7ba7bf52fd9b4c008d0e1e8e6e00ab29"
+        }
+    ],
+    "synonyms": [],
+    "m_Precision": 0,
+    "m_PreviewExpanded": false,
+    "m_DismissedVersion": 0,
+    "m_PreviewMode": 0,
+    "m_CustomColors": {
+        "m_SerializableColors": []
+    },
+    "IsFirstSlotValid": true
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.PropertyNode",
+    "m_ObjectId": "659ee2636e7549319737788bd8f6eb9f",
+    "m_Group": {
+        "m_Id": ""
+    },
+    "m_Name": "Property",
+    "m_DrawState": {
+        "m_Expanded": true,
+        "m_Position": {
+            "serializedVersion": "2",
+            "x": -187.0,
+            "y": -6.999997615814209,
+            "width": 101.0,
+            "height": 34.0
+        }
+    },
+    "m_Slots": [
+        {
+            "m_Id": "7a879031327845b2838b5bbef00d9f9f"
+        }
+    ],
+    "synonyms": [],
+    "m_Precision": 0,
+    "m_PreviewExpanded": false,
+    "m_DismissedVersion": 0,
+    "m_PreviewMode": 0,
+    "m_CustomColors": {
+        "m_SerializableColors": []
+    },
+    "m_Property": {
+        "m_Id": "6a1e11891a0747379c6442655f6ecd2c"
+    }
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.Internal.BooleanShaderProperty",
+    "m_ObjectId": "6a1e11891a0747379c6442655f6ecd2c",
+    "m_Guid": {
+        "m_GuidSerialized": "35abcd06-4aa2-4bbc-ab03-eec0ee385257"
+    },
+    "promotedFromAssetID": "4f050eea90ae946c5a5a171b0df1d6a1",
+    "promotedFromCategoryName": "",
+    "promotedOrdering": -1,
+    "m_Name": "isOn",
+    "m_DefaultRefNameVersion": 1,
+    "m_RefNameGeneratedByDisplayName": "isOn",
+    "m_DefaultReferenceName": "_isOn",
+    "m_OverrideReferenceName": "",
+    "m_GeneratePropertyBlock": false,
+    "m_UseCustomSlotLabel": false,
+    "m_CustomSlotLabel": "",
+    "m_DismissedVersion": 0,
+    "m_Precision": 0,
+    "overrideHLSLDeclaration": true,
+    "hlslDeclarationOverride": 2,
+    "hideConnector": false,
+    "m_Hidden": false,
+    "m_PerRendererData": false,
+    "m_customAttributes": [],
+    "m_Value": false
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.BooleanMaterialSlot",
+    "m_ObjectId": "7a879031327845b2838b5bbef00d9f9f",
+    "m_Id": 0,
+    "m_DisplayName": "isOn",
+    "m_SlotType": 1,
+    "m_Hidden": false,
+    "m_HideConnector": false,
+    "m_ShaderOutputName": "Out",
+    "m_StageCapability": 3,
+    "m_Value": false,
+    "m_DefaultValue": false
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.BooleanMaterialSlot",
+    "m_ObjectId": "7ba7bf52fd9b4c008d0e1e8e6e00ab29",
+    "m_Id": 1,
+    "m_DisplayName": "Out",
+    "m_SlotType": 0,
+    "m_Hidden": false,
+    "m_HideConnector": false,
+    "m_ShaderOutputName": "Out",
+    "m_StageCapability": 3,
+    "m_Value": false,
+    "m_DefaultValue": false
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.BooleanMaterialSlot",
+    "m_ObjectId": "94110943dbea4ba684f68b965724621f",
+    "m_Id": 1,
+    "m_DisplayName": "Out",
+    "m_SlotType": 1,
+    "m_Hidden": false,
+    "m_HideConnector": false,
+    "m_ShaderOutputName": "Out",
+    "m_StageCapability": 3,
+    "m_Value": false,
+    "m_DefaultValue": false
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.BooleanMaterialSlot",
+    "m_ObjectId": "b3d1eb1364ea4e81a1cefce2b2fcb247",
+    "m_Id": 0,
+    "m_DisplayName": "Preview Value",
+    "m_SlotType": 1,
+    "m_Hidden": false,
+    "m_HideConnector": false,
+    "m_ShaderOutputName": "Out",
+    "m_StageCapability": 3,
+    "m_Value": false,
+    "m_DefaultValue": false
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.PropertyNode",
+    "m_ObjectId": "e8ab947e9b9e44b0bbaf4ae733360b91",
+    "m_Group": {
+        "m_Id": ""
+    },
+    "m_Name": "Property",
+    "m_DrawState": {
+        "m_Expanded": true,
+        "m_Position": {
+            "serializedVersion": "2",
+            "x": -186.99996948242188,
+            "y": 144.99996948242188,
+            "width": 150.99996948242188,
+            "height": 34.00001525878906
+        }
+    },
+    "m_Slots": [
+        {
+            "m_Id": "b3d1eb1364ea4e81a1cefce2b2fcb247"
+        }
+    ],
+    "synonyms": [],
+    "m_Precision": 0,
+    "m_PreviewExpanded": false,
+    "m_DismissedVersion": 0,
+    "m_PreviewMode": 0,
+    "m_CustomColors": {
+        "m_SerializableColors": []
+    },
+    "m_Property": {
+        "m_Id": "409c7cb5d8f344f3bfa3bf910701eabc"
+    }
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.BooleanMaterialSlot",
+    "m_ObjectId": "ff99b2b0cb7440b2a8c76c9862d8378c",
+    "m_Id": 0,
+    "m_DisplayName": "Final",
+    "m_SlotType": 0,
+    "m_Hidden": false,
+    "m_HideConnector": false,
+    "m_ShaderOutputName": "Final",
+    "m_StageCapability": 3,
+    "m_Value": false,
+    "m_DefaultValue": false
+}
+
diff --git a/Packages/com.unity.shadergraph/Samples~/UGUIShaders/Subgraphs/Input/ToggleState.shadersubgraph.meta b/Packages/com.unity.shadergraph/Samples~/UGUIShaders/Subgraphs/Input/ToggleState.shadersubgraph.meta
new file mode 100644
index 00000000000..982de6801ea
--- /dev/null
+++ b/Packages/com.unity.shadergraph/Samples~/UGUIShaders/Subgraphs/Input/ToggleState.shadersubgraph.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 4f050eea90ae946c5a5a171b0df1d6a1
+ScriptedImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 2
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+  script: {fileID: 11500000, guid: 60072b568d64c40a485e0fc55012dc9f, type: 3}
+  documentationPath: 
diff --git a/Packages/com.unity.shadergraph/Samples~/UGUIShaders/Subgraphs/Utilities/Selectable State Preview.shadersubgraph b/Packages/com.unity.shadergraph/Samples~/UGUIShaders/Subgraphs/Utilities/Selectable State Preview.shadersubgraph
deleted file mode 100644
index c1e36352b9f..00000000000
--- a/Packages/com.unity.shadergraph/Samples~/UGUIShaders/Subgraphs/Utilities/Selectable State Preview.shadersubgraph	
+++ /dev/null
@@ -1,854 +0,0 @@
-{
-    "m_SGVersion": 3,
-    "m_Type": "UnityEditor.ShaderGraph.GraphData",
-    "m_ObjectId": "bf0e5cd4c66c499cb0ece89cca18b3c9",
-    "m_Properties": [
-        {
-            "m_Id": "4ce2a3659a7a4255b0a9740ea6d912b2"
-        }
-    ],
-    "m_Keywords": [],
-    "m_Dropdowns": [
-        {
-            "m_Id": "1af3eb1743bd40d889bdfa68ecd4a647"
-        }
-    ],
-    "m_CategoryData": [
-        {
-            "m_Id": "a3a99a6001824cd6b43d606acec2a6f5"
-        }
-    ],
-    "m_Nodes": [
-        {
-            "m_Id": "9449855d3855413a8290ae113a757c4c"
-        },
-        {
-            "m_Id": "a199c269be804e1abc674bba5a3eb60b"
-        },
-        {
-            "m_Id": "04a10c2c46ce494dac60437ca4d1a9cb"
-        },
-        {
-            "m_Id": "65fbd4afb02d4046bee93496c96d52f6"
-        },
-        {
-            "m_Id": "550f398fdd9045ff883b6303d471b52b"
-        },
-        {
-            "m_Id": "338061c44f95492498b8b07f09eb4bd8"
-        }
-    ],
-    "m_GroupDatas": [],
-    "m_StickyNoteDatas": [],
-    "m_Edges": [
-        {
-            "m_OutputSlot": {
-                "m_Node": {
-                    "m_Id": "04a10c2c46ce494dac60437ca4d1a9cb"
-                },
-                "m_SlotId": 0
-            },
-            "m_InputSlot": {
-                "m_Node": {
-                    "m_Id": "65fbd4afb02d4046bee93496c96d52f6"
-                },
-                "m_SlotId": 0
-            }
-        },
-        {
-            "m_OutputSlot": {
-                "m_Node": {
-                    "m_Id": "04a10c2c46ce494dac60437ca4d1a9cb"
-                },
-                "m_SlotId": 0
-            },
-            "m_InputSlot": {
-                "m_Node": {
-                    "m_Id": "65fbd4afb02d4046bee93496c96d52f6"
-                },
-                "m_SlotId": 1
-            }
-        },
-        {
-            "m_OutputSlot": {
-                "m_Node": {
-                    "m_Id": "338061c44f95492498b8b07f09eb4bd8"
-                },
-                "m_SlotId": 1
-            },
-            "m_InputSlot": {
-                "m_Node": {
-                    "m_Id": "550f398fdd9045ff883b6303d471b52b"
-                },
-                "m_SlotId": 0
-            }
-        },
-        {
-            "m_OutputSlot": {
-                "m_Node": {
-                    "m_Id": "550f398fdd9045ff883b6303d471b52b"
-                },
-                "m_SlotId": 2
-            },
-            "m_InputSlot": {
-                "m_Node": {
-                    "m_Id": "9449855d3855413a8290ae113a757c4c"
-                },
-                "m_SlotId": 1
-            }
-        },
-        {
-            "m_OutputSlot": {
-                "m_Node": {
-                    "m_Id": "65fbd4afb02d4046bee93496c96d52f6"
-                },
-                "m_SlotId": 3
-            },
-            "m_InputSlot": {
-                "m_Node": {
-                    "m_Id": "550f398fdd9045ff883b6303d471b52b"
-                },
-                "m_SlotId": 1
-            }
-        },
-        {
-            "m_OutputSlot": {
-                "m_Node": {
-                    "m_Id": "a199c269be804e1abc674bba5a3eb60b"
-                },
-                "m_SlotId": 0
-            },
-            "m_InputSlot": {
-                "m_Node": {
-                    "m_Id": "338061c44f95492498b8b07f09eb4bd8"
-                },
-                "m_SlotId": 0
-            }
-        },
-        {
-            "m_OutputSlot": {
-                "m_Node": {
-                    "m_Id": "a199c269be804e1abc674bba5a3eb60b"
-                },
-                "m_SlotId": 0
-            },
-            "m_InputSlot": {
-                "m_Node": {
-                    "m_Id": "65fbd4afb02d4046bee93496c96d52f6"
-                },
-                "m_SlotId": 2
-            }
-        }
-    ],
-    "m_VertexContext": {
-        "m_Position": {
-            "x": 0.0,
-            "y": 0.0
-        },
-        "m_Blocks": []
-    },
-    "m_FragmentContext": {
-        "m_Position": {
-            "x": 0.0,
-            "y": 0.0
-        },
-        "m_Blocks": []
-    },
-    "m_PreviewData": {
-        "serializedMesh": {
-            "m_SerializedMesh": "{\"mesh\":{\"instanceID\":0}}",
-            "m_Guid": ""
-        },
-        "preventRotation": false
-    },
-    "m_Path": "Utility/UGUI",
-    "m_GraphPrecision": 1,
-    "m_PreviewMode": 1,
-    "m_OutputNode": {
-        "m_Id": "9449855d3855413a8290ae113a757c4c"
-    },
-    "m_SubDatas": [],
-    "m_ActiveTargets": []
-}
-
-{
-    "m_SGVersion": 0,
-    "m_Type": "UnityEditor.ShaderGraph.PropertyNode",
-    "m_ObjectId": "04a10c2c46ce494dac60437ca4d1a9cb",
-    "m_Group": {
-        "m_Id": ""
-    },
-    "m_Name": "Property",
-    "m_DrawState": {
-        "m_Expanded": true,
-        "m_Position": {
-            "serializedVersion": "2",
-            "x": -432.0,
-            "y": -132.0,
-            "width": 103.0,
-            "height": 34.0
-        }
-    },
-    "m_Slots": [
-        {
-            "m_Id": "80177d922b5a4be4a1da8099115a6042"
-        }
-    ],
-    "synonyms": [],
-    "m_Precision": 0,
-    "m_PreviewExpanded": true,
-    "m_DismissedVersion": 0,
-    "m_PreviewMode": 0,
-    "m_CustomColors": {
-        "m_SerializableColors": []
-    },
-    "m_Property": {
-        "m_Id": "4ce2a3659a7a4255b0a9740ea6d912b2"
-    }
-}
-
-{
-    "m_SGVersion": 0,
-    "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
-    "m_ObjectId": "099e937f9e5f458da66a3824b7a931d2",
-    "m_Id": 1,
-    "m_DisplayName": "State",
-    "m_SlotType": 0,
-    "m_Hidden": false,
-    "m_ShaderOutputName": "State",
-    "m_StageCapability": 3,
-    "m_Value": 0.0,
-    "m_DefaultValue": 0.0,
-    "m_Labels": []
-}
-
-{
-    "m_SGVersion": 0,
-    "m_Type": "UnityEditor.ShaderGraph.PropertyConnectionStateMaterialSlot",
-    "m_ObjectId": "0e3ba5f632c2440ab474831d16f1ab16",
-    "m_Id": 0,
-    "m_DisplayName": "Input",
-    "m_SlotType": 0,
-    "m_Hidden": false,
-    "m_ShaderOutputName": "Input",
-    "m_StageCapability": 3
-}
-
-{
-    "m_SGVersion": 0,
-    "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
-    "m_ObjectId": "0fc12dd54e88471a87acbf0fe55058bd",
-    "m_Id": 2,
-    "m_DisplayName": "Out",
-    "m_SlotType": 1,
-    "m_Hidden": false,
-    "m_ShaderOutputName": "Out",
-    "m_StageCapability": 3,
-    "m_Value": 0.0,
-    "m_DefaultValue": 0.0,
-    "m_Labels": []
-}
-
-{
-    "m_SGVersion": 0,
-    "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot",
-    "m_ObjectId": "1a9bcf8fc43d4c15a726e5f03be3eff4",
-    "m_Id": 2,
-    "m_DisplayName": "Highlighted",
-    "m_SlotType": 0,
-    "m_Hidden": false,
-    "m_ShaderOutputName": "Highlighted",
-    "m_StageCapability": 3,
-    "m_Value": {
-        "x": 1.0,
-        "y": 0.0,
-        "z": 0.0,
-        "w": 0.0
-    },
-    "m_DefaultValue": {
-        "x": 0.0,
-        "y": 0.0,
-        "z": 0.0,
-        "w": 0.0
-    }
-}
-
-{
-    "m_SGVersion": 0,
-    "m_Type": "UnityEditor.ShaderGraph.ShaderDropdown",
-    "m_ObjectId": "1af3eb1743bd40d889bdfa68ecd4a647",
-    "m_Guid": {
-        "m_GuidSerialized": "0c74d9a9-3643-4486-b032-d8d60ffb56e7"
-    },
-    "m_Name": "Preview",
-    "m_DefaultRefNameVersion": 1,
-    "m_RefNameGeneratedByDisplayName": "Preview",
-    "m_DefaultReferenceName": "_Preview",
-    "m_OverrideReferenceName": "",
-    "m_GeneratePropertyBlock": true,
-    "m_UseCustomSlotLabel": false,
-    "m_CustomSlotLabel": "",
-    "m_DismissedVersion": 0,
-    "m_Entries": [
-        {
-            "id": 3,
-            "displayName": "Normal"
-        },
-        {
-            "id": 2,
-            "displayName": "Highlighted"
-        },
-        {
-            "id": 4,
-            "displayName": "Pressed"
-        },
-        {
-            "id": 5,
-            "displayName": "Selected"
-        },
-        {
-            "id": 6,
-            "displayName": "Disabled"
-        }
-    ],
-    "m_Value": 0
-}
-
-{
-    "m_SGVersion": 0,
-    "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot",
-    "m_ObjectId": "2d75b34f63354430aef5611806bfb064",
-    "m_Id": 6,
-    "m_DisplayName": "Disabled",
-    "m_SlotType": 0,
-    "m_Hidden": false,
-    "m_ShaderOutputName": "Disabled",
-    "m_StageCapability": 3,
-    "m_Value": {
-        "x": 4.0,
-        "y": 0.0,
-        "z": 0.0,
-        "w": 0.0
-    },
-    "m_DefaultValue": {
-        "x": 0.0,
-        "y": 0.0,
-        "z": 0.0,
-        "w": 0.0
-    }
-}
-
-{
-    "m_SGVersion": 0,
-    "m_Type": "UnityEditor.ShaderGraph.RedirectNodeData",
-    "m_ObjectId": "338061c44f95492498b8b07f09eb4bd8",
-    "m_Group": {
-        "m_Id": ""
-    },
-    "m_Name": "Redirect Node",
-    "m_DrawState": {
-        "m_Expanded": true,
-        "m_Position": {
-            "serializedVersion": "2",
-            "x": -282.0,
-            "y": 71.0,
-            "width": 56.0,
-            "height": 24.0
-        }
-    },
-    "m_Slots": [
-        {
-            "m_Id": "e233c75976164c759c12a7f343f1635c"
-        },
-        {
-            "m_Id": "f1e85a7154ea474f81c0c7b375b4c78a"
-        }
-    ],
-    "synonyms": [],
-    "m_Precision": 0,
-    "m_PreviewExpanded": true,
-    "m_DismissedVersion": 0,
-    "m_PreviewMode": 0,
-    "m_CustomColors": {
-        "m_SerializableColors": []
-    }
-}
-
-{
-    "m_SGVersion": 1,
-    "m_Type": "UnityEditor.ShaderGraph.Internal.Vector1ShaderProperty",
-    "m_ObjectId": "4ce2a3659a7a4255b0a9740ea6d912b2",
-    "m_Guid": {
-        "m_GuidSerialized": "9c4cb347-e674-4393-bb26-07702c97589e"
-    },
-    "m_Name": "State",
-    "m_DefaultRefNameVersion": 1,
-    "m_RefNameGeneratedByDisplayName": "State",
-    "m_DefaultReferenceName": "_State",
-    "m_OverrideReferenceName": "",
-    "m_GeneratePropertyBlock": true,
-    "m_UseCustomSlotLabel": true,
-    "m_CustomSlotLabel": "Preview",
-    "m_DismissedVersion": 0,
-    "m_Precision": 0,
-    "overrideHLSLDeclaration": false,
-    "hlslDeclarationOverride": 0,
-    "m_Hidden": false,
-    "m_Value": 0.0,
-    "m_FloatType": 0,
-    "m_RangeValues": {
-        "x": 0.0,
-        "y": 1.0
-    }
-}
-
-{
-    "m_SGVersion": 1,
-    "m_Type": "UnityEditor.ShaderGraph.CustomFunctionNode",
-    "m_ObjectId": "550f398fdd9045ff883b6303d471b52b",
-    "m_Group": {
-        "m_Id": ""
-    },
-    "m_Name": "SelectableStateSgPreview (Custom Function)",
-    "m_DrawState": {
-        "m_Expanded": true,
-        "m_Position": {
-            "serializedVersion": "2",
-            "x": -194.0,
-            "y": -98.0,
-            "width": 304.0,
-            "height": 118.0
-        }
-    },
-    "m_Slots": [
-        {
-            "m_Id": "917980f8826941318e46f0c1b2990034"
-        },
-        {
-            "m_Id": "cb5df588471349af9fcb8b8859e9d4c8"
-        },
-        {
-            "m_Id": "0fc12dd54e88471a87acbf0fe55058bd"
-        }
-    ],
-    "synonyms": [
-        "code",
-        "HLSL"
-    ],
-    "m_Precision": 0,
-    "m_PreviewExpanded": false,
-    "m_DismissedVersion": 0,
-    "m_PreviewMode": 0,
-    "m_CustomColors": {
-        "m_SerializableColors": []
-    },
-    "m_SourceType": 1,
-    "m_FunctionName": "SelectableStateSgPreview",
-    "m_FunctionSource": "",
-    "m_FunctionSourceUsePragmas": true,
-    "m_FunctionBody": "#if SHADERGRAPH_PREVIEW\nOut = SGPreview;\n#else\nOut = Input;\n#endif\n"
-}
-
-{
-    "m_SGVersion": 0,
-    "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot",
-    "m_ObjectId": "59cd9498dd5a4e24b9199267c5d8603d",
-    "m_Id": 2,
-    "m_DisplayName": "NotConnected",
-    "m_SlotType": 0,
-    "m_Hidden": false,
-    "m_ShaderOutputName": "NotConnected",
-    "m_StageCapability": 3,
-    "m_Value": {
-        "x": 0.0,
-        "y": 0.0,
-        "z": 0.0,
-        "w": 0.0
-    },
-    "m_DefaultValue": {
-        "x": 0.0,
-        "y": 0.0,
-        "z": 0.0,
-        "w": 0.0
-    }
-}
-
-{
-    "m_SGVersion": 0,
-    "m_Type": "UnityEditor.ShaderGraph.BranchOnInputConnectionNode",
-    "m_ObjectId": "65fbd4afb02d4046bee93496c96d52f6",
-    "m_Group": {
-        "m_Id": ""
-    },
-    "m_Name": "Branch On Input Connection",
-    "m_DrawState": {
-        "m_Expanded": true,
-        "m_Position": {
-            "serializedVersion": "2",
-            "x": -432.0,
-            "y": -98.0,
-            "width": 206.0,
-            "height": 142.0
-        }
-    },
-    "m_Slots": [
-        {
-            "m_Id": "0e3ba5f632c2440ab474831d16f1ab16"
-        },
-        {
-            "m_Id": "e3e786cdfacd48bd8af42f487de1950b"
-        },
-        {
-            "m_Id": "59cd9498dd5a4e24b9199267c5d8603d"
-        },
-        {
-            "m_Id": "fe845c74b8524aa7a3062b56bbc29749"
-        }
-    ],
-    "synonyms": [],
-    "m_Precision": 0,
-    "m_PreviewExpanded": false,
-    "m_DismissedVersion": 0,
-    "m_PreviewMode": 0,
-    "m_CustomColors": {
-        "m_SerializableColors": []
-    }
-}
-
-{
-    "m_SGVersion": 0,
-    "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot",
-    "m_ObjectId": "683422178ac7411ba51c79d498963d28",
-    "m_Id": 5,
-    "m_DisplayName": "Selected",
-    "m_SlotType": 0,
-    "m_Hidden": false,
-    "m_ShaderOutputName": "Selected",
-    "m_StageCapability": 3,
-    "m_Value": {
-        "x": 3.0,
-        "y": 0.0,
-        "z": 0.0,
-        "w": 0.0
-    },
-    "m_DefaultValue": {
-        "x": 0.0,
-        "y": 0.0,
-        "z": 0.0,
-        "w": 0.0
-    }
-}
-
-{
-    "m_SGVersion": 0,
-    "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot",
-    "m_ObjectId": "7761ea1a833a415988271af601a95730",
-    "m_Id": 0,
-    "m_DisplayName": "Out",
-    "m_SlotType": 1,
-    "m_Hidden": false,
-    "m_ShaderOutputName": "Out",
-    "m_StageCapability": 3,
-    "m_Value": {
-        "x": 0.0,
-        "y": 0.0,
-        "z": 0.0,
-        "w": 0.0
-    },
-    "m_DefaultValue": {
-        "x": 0.0,
-        "y": 0.0,
-        "z": 0.0,
-        "w": 0.0
-    }
-}
-
-{
-    "m_SGVersion": 0,
-    "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
-    "m_ObjectId": "80177d922b5a4be4a1da8099115a6042",
-    "m_Id": 0,
-    "m_DisplayName": "State",
-    "m_SlotType": 1,
-    "m_Hidden": false,
-    "m_ShaderOutputName": "Out",
-    "m_StageCapability": 3,
-    "m_Value": 0.0,
-    "m_DefaultValue": 0.0,
-    "m_Labels": []
-}
-
-{
-    "m_SGVersion": 0,
-    "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot",
-    "m_ObjectId": "860d2413835f46ec8fb39a68b6df680e",
-    "m_Id": 3,
-    "m_DisplayName": "Normal",
-    "m_SlotType": 0,
-    "m_Hidden": false,
-    "m_ShaderOutputName": "Normal",
-    "m_StageCapability": 3,
-    "m_Value": {
-        "x": 0.0,
-        "y": 0.0,
-        "z": 0.0,
-        "w": 0.0
-    },
-    "m_DefaultValue": {
-        "x": 0.0,
-        "y": 0.0,
-        "z": 0.0,
-        "w": 0.0
-    }
-}
-
-{
-    "m_SGVersion": 0,
-    "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
-    "m_ObjectId": "917980f8826941318e46f0c1b2990034",
-    "m_Id": 1,
-    "m_DisplayName": "Input",
-    "m_SlotType": 0,
-    "m_Hidden": false,
-    "m_ShaderOutputName": "Input",
-    "m_StageCapability": 3,
-    "m_Value": 0.0,
-    "m_DefaultValue": 0.0,
-    "m_Labels": []
-}
-
-{
-    "m_SGVersion": 0,
-    "m_Type": "UnityEditor.ShaderGraph.SubGraphOutputNode",
-    "m_ObjectId": "9449855d3855413a8290ae113a757c4c",
-    "m_Group": {
-        "m_Id": ""
-    },
-    "m_Name": "Output",
-    "m_DrawState": {
-        "m_Expanded": true,
-        "m_Position": {
-            "serializedVersion": "2",
-            "x": 109.9999771118164,
-            "y": -97.9999771118164,
-            "width": 86.0000228881836,
-            "height": 76.99998474121094
-        }
-    },
-    "m_Slots": [
-        {
-            "m_Id": "099e937f9e5f458da66a3824b7a931d2"
-        }
-    ],
-    "synonyms": [],
-    "m_Precision": 0,
-    "m_PreviewExpanded": true,
-    "m_DismissedVersion": 0,
-    "m_PreviewMode": 0,
-    "m_CustomColors": {
-        "m_SerializableColors": []
-    },
-    "IsFirstSlotValid": true
-}
-
-{
-    "m_SGVersion": 0,
-    "m_Type": "UnityEditor.ShaderGraph.DropdownNode",
-    "m_ObjectId": "a199c269be804e1abc674bba5a3eb60b",
-    "m_Group": {
-        "m_Id": ""
-    },
-    "m_Name": "Preview",
-    "m_DrawState": {
-        "m_Expanded": true,
-        "m_Position": {
-            "serializedVersion": "2",
-            "x": -634.0,
-            "y": 25.0,
-            "width": 178.0,
-            "height": 190.0
-        }
-    },
-    "m_Slots": [
-        {
-            "m_Id": "7761ea1a833a415988271af601a95730"
-        },
-        {
-            "m_Id": "860d2413835f46ec8fb39a68b6df680e"
-        },
-        {
-            "m_Id": "1a9bcf8fc43d4c15a726e5f03be3eff4"
-        },
-        {
-            "m_Id": "db91226a6f3f4996849e193a75a1354c"
-        },
-        {
-            "m_Id": "683422178ac7411ba51c79d498963d28"
-        },
-        {
-            "m_Id": "2d75b34f63354430aef5611806bfb064"
-        }
-    ],
-    "synonyms": [],
-    "m_Precision": 0,
-    "m_PreviewExpanded": false,
-    "m_DismissedVersion": 0,
-    "m_PreviewMode": 0,
-    "m_CustomColors": {
-        "m_SerializableColors": []
-    },
-    "m_Dropdown": {
-        "m_Id": "1af3eb1743bd40d889bdfa68ecd4a647"
-    }
-}
-
-{
-    "m_SGVersion": 0,
-    "m_Type": "UnityEditor.ShaderGraph.CategoryData",
-    "m_ObjectId": "a3a99a6001824cd6b43d606acec2a6f5",
-    "m_Name": "",
-    "m_ChildObjectList": [
-        {
-            "m_Id": "4ce2a3659a7a4255b0a9740ea6d912b2"
-        },
-        {
-            "m_Id": "1af3eb1743bd40d889bdfa68ecd4a647"
-        }
-    ]
-}
-
-{
-    "m_SGVersion": 0,
-    "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
-    "m_ObjectId": "cb5df588471349af9fcb8b8859e9d4c8",
-    "m_Id": 0,
-    "m_DisplayName": "SGPreview",
-    "m_SlotType": 0,
-    "m_Hidden": false,
-    "m_ShaderOutputName": "SGPreview",
-    "m_StageCapability": 3,
-    "m_Value": 0.0,
-    "m_DefaultValue": 0.0,
-    "m_Labels": []
-}
-
-{
-    "m_SGVersion": 0,
-    "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot",
-    "m_ObjectId": "db91226a6f3f4996849e193a75a1354c",
-    "m_Id": 4,
-    "m_DisplayName": "Pressed",
-    "m_SlotType": 0,
-    "m_Hidden": false,
-    "m_ShaderOutputName": "Pressed",
-    "m_StageCapability": 3,
-    "m_Value": {
-        "x": 2.0,
-        "y": 0.0,
-        "z": 0.0,
-        "w": 0.0
-    },
-    "m_DefaultValue": {
-        "x": 0.0,
-        "y": 0.0,
-        "z": 0.0,
-        "w": 0.0
-    }
-}
-
-{
-    "m_SGVersion": 0,
-    "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot",
-    "m_ObjectId": "e233c75976164c759c12a7f343f1635c",
-    "m_Id": 0,
-    "m_DisplayName": "",
-    "m_SlotType": 0,
-    "m_Hidden": false,
-    "m_ShaderOutputName": "",
-    "m_StageCapability": 3,
-    "m_Value": {
-        "x": 0.0,
-        "y": 0.0,
-        "z": 0.0,
-        "w": 0.0
-    },
-    "m_DefaultValue": {
-        "x": 0.0,
-        "y": 0.0,
-        "z": 0.0,
-        "w": 0.0
-    }
-}
-
-{
-    "m_SGVersion": 0,
-    "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot",
-    "m_ObjectId": "e3e786cdfacd48bd8af42f487de1950b",
-    "m_Id": 1,
-    "m_DisplayName": "Connected",
-    "m_SlotType": 0,
-    "m_Hidden": false,
-    "m_ShaderOutputName": "Connected",
-    "m_StageCapability": 3,
-    "m_Value": {
-        "x": 1.0,
-        "y": 1.0,
-        "z": 1.0,
-        "w": 1.0
-    },
-    "m_DefaultValue": {
-        "x": 0.0,
-        "y": 0.0,
-        "z": 0.0,
-        "w": 0.0
-    }
-}
-
-{
-    "m_SGVersion": 0,
-    "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot",
-    "m_ObjectId": "f1e85a7154ea474f81c0c7b375b4c78a",
-    "m_Id": 1,
-    "m_DisplayName": "",
-    "m_SlotType": 1,
-    "m_Hidden": false,
-    "m_ShaderOutputName": "",
-    "m_StageCapability": 3,
-    "m_Value": {
-        "x": 0.0,
-        "y": 0.0,
-        "z": 0.0,
-        "w": 0.0
-    },
-    "m_DefaultValue": {
-        "x": 0.0,
-        "y": 0.0,
-        "z": 0.0,
-        "w": 0.0
-    }
-}
-
-{
-    "m_SGVersion": 0,
-    "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot",
-    "m_ObjectId": "fe845c74b8524aa7a3062b56bbc29749",
-    "m_Id": 3,
-    "m_DisplayName": "Out",
-    "m_SlotType": 1,
-    "m_Hidden": false,
-    "m_ShaderOutputName": "Out",
-    "m_StageCapability": 3,
-    "m_Value": {
-        "x": 0.0,
-        "y": 0.0,
-        "z": 0.0,
-        "w": 0.0
-    },
-    "m_DefaultValue": {
-        "x": 0.0,
-        "y": 0.0,
-        "z": 0.0,
-        "w": 0.0
-    }
-}
-
diff --git a/Packages/com.unity.shadergraph/Samples~/UGUIShaders/Subgraphs/Utilities/Slider Direction Preview.shadersubgraph b/Packages/com.unity.shadergraph/Samples~/UGUIShaders/Subgraphs/Utilities/Slider Direction Preview.shadersubgraph
deleted file mode 100644
index a4817a568ef..00000000000
--- a/Packages/com.unity.shadergraph/Samples~/UGUIShaders/Subgraphs/Utilities/Slider Direction Preview.shadersubgraph	
+++ /dev/null
@@ -1,971 +0,0 @@
-{
-    "m_SGVersion": 3,
-    "m_Type": "UnityEditor.ShaderGraph.GraphData",
-    "m_ObjectId": "bf0e5cd4c66c499cb0ece89cca18b3c9",
-    "m_Properties": [
-        {
-            "m_Id": "5e64e5f179a24af08b4c3f1bce187b06"
-        }
-    ],
-    "m_Keywords": [],
-    "m_Dropdowns": [
-        {
-            "m_Id": "1af3eb1743bd40d889bdfa68ecd4a647"
-        }
-    ],
-    "m_CategoryData": [
-        {
-            "m_Id": "a3a99a6001824cd6b43d606acec2a6f5"
-        }
-    ],
-    "m_Nodes": [
-        {
-            "m_Id": "9449855d3855413a8290ae113a757c4c"
-        },
-        {
-            "m_Id": "a199c269be804e1abc674bba5a3eb60b"
-        },
-        {
-            "m_Id": "65fbd4afb02d4046bee93496c96d52f6"
-        },
-        {
-            "m_Id": "550f398fdd9045ff883b6303d471b52b"
-        },
-        {
-            "m_Id": "338061c44f95492498b8b07f09eb4bd8"
-        },
-        {
-            "m_Id": "638ac78191b5447382895bb2d9044880"
-        },
-        {
-            "m_Id": "12446d43cd564a6db628c082ed73ecea"
-        }
-    ],
-    "m_GroupDatas": [],
-    "m_StickyNoteDatas": [],
-    "m_Edges": [
-        {
-            "m_OutputSlot": {
-                "m_Node": {
-                    "m_Id": "12446d43cd564a6db628c082ed73ecea"
-                },
-                "m_SlotId": 0
-            },
-            "m_InputSlot": {
-                "m_Node": {
-                    "m_Id": "a199c269be804e1abc674bba5a3eb60b"
-                },
-                "m_SlotId": 3
-            }
-        },
-        {
-            "m_OutputSlot": {
-                "m_Node": {
-                    "m_Id": "338061c44f95492498b8b07f09eb4bd8"
-                },
-                "m_SlotId": 1
-            },
-            "m_InputSlot": {
-                "m_Node": {
-                    "m_Id": "550f398fdd9045ff883b6303d471b52b"
-                },
-                "m_SlotId": 0
-            }
-        },
-        {
-            "m_OutputSlot": {
-                "m_Node": {
-                    "m_Id": "550f398fdd9045ff883b6303d471b52b"
-                },
-                "m_SlotId": 2
-            },
-            "m_InputSlot": {
-                "m_Node": {
-                    "m_Id": "9449855d3855413a8290ae113a757c4c"
-                },
-                "m_SlotId": 1
-            }
-        },
-        {
-            "m_OutputSlot": {
-                "m_Node": {
-                    "m_Id": "638ac78191b5447382895bb2d9044880"
-                },
-                "m_SlotId": 0
-            },
-            "m_InputSlot": {
-                "m_Node": {
-                    "m_Id": "65fbd4afb02d4046bee93496c96d52f6"
-                },
-                "m_SlotId": 0
-            }
-        },
-        {
-            "m_OutputSlot": {
-                "m_Node": {
-                    "m_Id": "638ac78191b5447382895bb2d9044880"
-                },
-                "m_SlotId": 0
-            },
-            "m_InputSlot": {
-                "m_Node": {
-                    "m_Id": "65fbd4afb02d4046bee93496c96d52f6"
-                },
-                "m_SlotId": 1
-            }
-        },
-        {
-            "m_OutputSlot": {
-                "m_Node": {
-                    "m_Id": "65fbd4afb02d4046bee93496c96d52f6"
-                },
-                "m_SlotId": 3
-            },
-            "m_InputSlot": {
-                "m_Node": {
-                    "m_Id": "550f398fdd9045ff883b6303d471b52b"
-                },
-                "m_SlotId": 1
-            }
-        },
-        {
-            "m_OutputSlot": {
-                "m_Node": {
-                    "m_Id": "a199c269be804e1abc674bba5a3eb60b"
-                },
-                "m_SlotId": 0
-            },
-            "m_InputSlot": {
-                "m_Node": {
-                    "m_Id": "338061c44f95492498b8b07f09eb4bd8"
-                },
-                "m_SlotId": 0
-            }
-        },
-        {
-            "m_OutputSlot": {
-                "m_Node": {
-                    "m_Id": "a199c269be804e1abc674bba5a3eb60b"
-                },
-                "m_SlotId": 0
-            },
-            "m_InputSlot": {
-                "m_Node": {
-                    "m_Id": "65fbd4afb02d4046bee93496c96d52f6"
-                },
-                "m_SlotId": 2
-            }
-        }
-    ],
-    "m_VertexContext": {
-        "m_Position": {
-            "x": 0.0,
-            "y": 0.0
-        },
-        "m_Blocks": []
-    },
-    "m_FragmentContext": {
-        "m_Position": {
-            "x": 0.0,
-            "y": 0.0
-        },
-        "m_Blocks": []
-    },
-    "m_PreviewData": {
-        "serializedMesh": {
-            "m_SerializedMesh": "{\"mesh\":{\"instanceID\":0}}",
-            "m_Guid": ""
-        },
-        "preventRotation": false
-    },
-    "m_Path": "Utility/UGUI",
-    "m_GraphPrecision": 1,
-    "m_PreviewMode": 1,
-    "m_OutputNode": {
-        "m_Id": "9449855d3855413a8290ae113a757c4c"
-    },
-    "m_SubDatas": [],
-    "m_ActiveTargets": []
-}
-
-{
-    "m_SGVersion": 0,
-    "m_Type": "UnityEditor.ShaderGraph.PropertyConnectionStateMaterialSlot",
-    "m_ObjectId": "0e3ba5f632c2440ab474831d16f1ab16",
-    "m_Id": 0,
-    "m_DisplayName": "Input",
-    "m_SlotType": 0,
-    "m_Hidden": false,
-    "m_ShaderOutputName": "Input",
-    "m_StageCapability": 3
-}
-
-{
-    "m_SGVersion": 0,
-    "m_Type": "UnityEditor.ShaderGraph.Vector2Node",
-    "m_ObjectId": "12446d43cd564a6db628c082ed73ecea",
-    "m_Group": {
-        "m_Id": ""
-    },
-    "m_Name": "Vector 2",
-    "m_DrawState": {
-        "m_Expanded": true,
-        "m_Position": {
-            "serializedVersion": "2",
-            "x": -830.9999389648438,
-            "y": 25.000028610229493,
-            "width": 128.0,
-            "height": 100.99998474121094
-        }
-    },
-    "m_Slots": [
-        {
-            "m_Id": "4d3339bc39ea4e8697e8a16b4b0a3a74"
-        },
-        {
-            "m_Id": "6051ced89fcb4085878d5c63c4337c06"
-        },
-        {
-            "m_Id": "836326224fd0412ab8c860923ed8d436"
-        }
-    ],
-    "synonyms": [
-        "2",
-        "v2",
-        "vec2",
-        "float2"
-    ],
-    "m_Precision": 0,
-    "m_PreviewExpanded": true,
-    "m_DismissedVersion": 0,
-    "m_PreviewMode": 0,
-    "m_CustomColors": {
-        "m_SerializableColors": []
-    },
-    "m_Value": {
-        "x": 0.0,
-        "y": 0.0
-    }
-}
-
-{
-    "m_SGVersion": 0,
-    "m_Type": "UnityEditor.ShaderGraph.ShaderDropdown",
-    "m_ObjectId": "1af3eb1743bd40d889bdfa68ecd4a647",
-    "m_Guid": {
-        "m_GuidSerialized": "0c74d9a9-3643-4486-b032-d8d60ffb56e7"
-    },
-    "m_Name": "Preview",
-    "m_DefaultRefNameVersion": 1,
-    "m_RefNameGeneratedByDisplayName": "Preview",
-    "m_DefaultReferenceName": "_Preview",
-    "m_OverrideReferenceName": "",
-    "m_GeneratePropertyBlock": true,
-    "m_UseCustomSlotLabel": false,
-    "m_CustomSlotLabel": "",
-    "m_DismissedVersion": 0,
-    "m_Entries": [
-        {
-            "id": 3,
-            "displayName": "Left To Right"
-        },
-        {
-            "id": 1,
-            "displayName": "Right To Left"
-        },
-        {
-            "id": 2,
-            "displayName": "Bottom To Top"
-        },
-        {
-            "id": 4,
-            "displayName": "Top To Bottom"
-        }
-    ],
-    "m_Value": 0
-}
-
-{
-    "m_SGVersion": 0,
-    "m_Type": "UnityEditor.ShaderGraph.RedirectNodeData",
-    "m_ObjectId": "338061c44f95492498b8b07f09eb4bd8",
-    "m_Group": {
-        "m_Id": ""
-    },
-    "m_Name": "Redirect Node",
-    "m_DrawState": {
-        "m_Expanded": true,
-        "m_Position": {
-            "serializedVersion": "2",
-            "x": -173.99998474121095,
-            "y": 71.00003051757813,
-            "width": 56.000038146972659,
-            "height": 23.999977111816408
-        }
-    },
-    "m_Slots": [
-        {
-            "m_Id": "e233c75976164c759c12a7f343f1635c"
-        },
-        {
-            "m_Id": "f1e85a7154ea474f81c0c7b375b4c78a"
-        }
-    ],
-    "synonyms": [],
-    "m_Precision": 0,
-    "m_PreviewExpanded": true,
-    "m_DismissedVersion": 0,
-    "m_PreviewMode": 0,
-    "m_CustomColors": {
-        "m_SerializableColors": []
-    }
-}
-
-{
-    "m_SGVersion": 0,
-    "m_Type": "UnityEditor.ShaderGraph.Vector2MaterialSlot",
-    "m_ObjectId": "420a961a31934af4a382f57f3b77466b",
-    "m_Id": 1,
-    "m_DisplayName": "Input",
-    "m_SlotType": 0,
-    "m_Hidden": false,
-    "m_ShaderOutputName": "Input",
-    "m_StageCapability": 3,
-    "m_Value": {
-        "x": 0.0,
-        "y": 0.0
-    },
-    "m_DefaultValue": {
-        "x": 0.0,
-        "y": 0.0
-    },
-    "m_Labels": []
-}
-
-{
-    "m_SGVersion": 0,
-    "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot",
-    "m_ObjectId": "4be0f682be164f9d8cf441da15cf6384",
-    "m_Id": 2,
-    "m_DisplayName": "Bottom To Top",
-    "m_SlotType": 0,
-    "m_Hidden": false,
-    "m_ShaderOutputName": "Bottom To Top",
-    "m_StageCapability": 3,
-    "m_Value": {
-        "x": 0.0,
-        "y": 1.0,
-        "z": 0.0,
-        "w": 0.0
-    },
-    "m_DefaultValue": {
-        "x": 0.0,
-        "y": 0.0,
-        "z": 0.0,
-        "w": 0.0
-    }
-}
-
-{
-    "m_SGVersion": 0,
-    "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
-    "m_ObjectId": "4d3339bc39ea4e8697e8a16b4b0a3a74",
-    "m_Id": 1,
-    "m_DisplayName": "X",
-    "m_SlotType": 0,
-    "m_Hidden": false,
-    "m_ShaderOutputName": "X",
-    "m_StageCapability": 3,
-    "m_Value": 1.0,
-    "m_DefaultValue": 0.0,
-    "m_Labels": []
-}
-
-{
-    "m_SGVersion": 0,
-    "m_Type": "UnityEditor.ShaderGraph.Vector2MaterialSlot",
-    "m_ObjectId": "4f13813f7c024cfcb452153d5c31510f",
-    "m_Id": 0,
-    "m_DisplayName": "SGPreview",
-    "m_SlotType": 0,
-    "m_Hidden": false,
-    "m_ShaderOutputName": "SGPreview",
-    "m_StageCapability": 3,
-    "m_Value": {
-        "x": 0.0,
-        "y": 0.0
-    },
-    "m_DefaultValue": {
-        "x": 0.0,
-        "y": 0.0
-    },
-    "m_Labels": []
-}
-
-{
-    "m_SGVersion": 1,
-    "m_Type": "UnityEditor.ShaderGraph.CustomFunctionNode",
-    "m_ObjectId": "550f398fdd9045ff883b6303d471b52b",
-    "m_Group": {
-        "m_Id": ""
-    },
-    "m_Name": "DirectionSgPreview (Custom Function)",
-    "m_DrawState": {
-        "m_Expanded": true,
-        "m_Position": {
-            "serializedVersion": "2",
-            "x": -85.99999237060547,
-            "y": -97.99995422363281,
-            "width": 215.00003051757813,
-            "height": 117.99996948242188
-        }
-    },
-    "m_Slots": [
-        {
-            "m_Id": "420a961a31934af4a382f57f3b77466b"
-        },
-        {
-            "m_Id": "4f13813f7c024cfcb452153d5c31510f"
-        },
-        {
-            "m_Id": "c3345dbee10a4ac9a3156ce4c3d79e58"
-        }
-    ],
-    "synonyms": [
-        "code",
-        "HLSL"
-    ],
-    "m_Precision": 0,
-    "m_PreviewExpanded": false,
-    "m_DismissedVersion": 0,
-    "m_PreviewMode": 0,
-    "m_CustomColors": {
-        "m_SerializableColors": []
-    },
-    "m_SourceType": 1,
-    "m_FunctionName": "DirectionSgPreview",
-    "m_FunctionSource": "",
-    "m_FunctionSourceUsePragmas": true,
-    "m_FunctionBody": "#if SHADERGRAPH_PREVIEW\nOut = SGPreview;\n#else\nOut = Input;\n#endif\n"
-}
-
-{
-    "m_SGVersion": 0,
-    "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot",
-    "m_ObjectId": "59cd9498dd5a4e24b9199267c5d8603d",
-    "m_Id": 2,
-    "m_DisplayName": "NotConnected",
-    "m_SlotType": 0,
-    "m_Hidden": false,
-    "m_ShaderOutputName": "NotConnected",
-    "m_StageCapability": 3,
-    "m_Value": {
-        "x": 0.0,
-        "y": 0.0,
-        "z": 0.0,
-        "w": 0.0
-    },
-    "m_DefaultValue": {
-        "x": 0.0,
-        "y": 0.0,
-        "z": 0.0,
-        "w": 0.0
-    }
-}
-
-{
-    "m_SGVersion": 1,
-    "m_Type": "UnityEditor.ShaderGraph.Internal.Vector2ShaderProperty",
-    "m_ObjectId": "5e64e5f179a24af08b4c3f1bce187b06",
-    "m_Guid": {
-        "m_GuidSerialized": "68cd7b82-08a0-457e-b8a5-138b398e335b"
-    },
-    "m_Name": "Slider Direction",
-    "m_DefaultRefNameVersion": 1,
-    "m_RefNameGeneratedByDisplayName": "Slider Direction",
-    "m_DefaultReferenceName": "_Slider_Direction",
-    "m_OverrideReferenceName": "",
-    "m_GeneratePropertyBlock": true,
-    "m_UseCustomSlotLabel": true,
-    "m_CustomSlotLabel": "Preview",
-    "m_DismissedVersion": 0,
-    "m_Precision": 0,
-    "overrideHLSLDeclaration": false,
-    "hlslDeclarationOverride": 0,
-    "m_Hidden": false,
-    "m_Value": {
-        "x": 1.0,
-        "y": 0.0,
-        "z": 0.0,
-        "w": 0.0
-    }
-}
-
-{
-    "m_SGVersion": 0,
-    "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
-    "m_ObjectId": "6051ced89fcb4085878d5c63c4337c06",
-    "m_Id": 2,
-    "m_DisplayName": "Y",
-    "m_SlotType": 0,
-    "m_Hidden": false,
-    "m_ShaderOutputName": "Y",
-    "m_StageCapability": 3,
-    "m_Value": 0.0,
-    "m_DefaultValue": 0.0,
-    "m_Labels": [
-        "Y"
-    ]
-}
-
-{
-    "m_SGVersion": 0,
-    "m_Type": "UnityEditor.ShaderGraph.PropertyNode",
-    "m_ObjectId": "638ac78191b5447382895bb2d9044880",
-    "m_Group": {
-        "m_Id": ""
-    },
-    "m_Name": "Property",
-    "m_DrawState": {
-        "m_Expanded": true,
-        "m_Position": {
-            "serializedVersion": "2",
-            "x": -323.9999694824219,
-            "y": -131.99998474121095,
-            "width": 156.0,
-            "height": 34.000030517578128
-        }
-    },
-    "m_Slots": [
-        {
-            "m_Id": "d5d86342e25a409bb68112aa9d404f35"
-        }
-    ],
-    "synonyms": [],
-    "m_Precision": 0,
-    "m_PreviewExpanded": true,
-    "m_DismissedVersion": 0,
-    "m_PreviewMode": 0,
-    "m_CustomColors": {
-        "m_SerializableColors": []
-    },
-    "m_Property": {
-        "m_Id": "5e64e5f179a24af08b4c3f1bce187b06"
-    }
-}
-
-{
-    "m_SGVersion": 0,
-    "m_Type": "UnityEditor.ShaderGraph.BranchOnInputConnectionNode",
-    "m_ObjectId": "65fbd4afb02d4046bee93496c96d52f6",
-    "m_Group": {
-        "m_Id": ""
-    },
-    "m_Name": "Branch On Input Connection",
-    "m_DrawState": {
-        "m_Expanded": true,
-        "m_Position": {
-            "serializedVersion": "2",
-            "x": -323.9999694824219,
-            "y": -97.99995422363281,
-            "width": 206.00003051757813,
-            "height": 142.0
-        }
-    },
-    "m_Slots": [
-        {
-            "m_Id": "0e3ba5f632c2440ab474831d16f1ab16"
-        },
-        {
-            "m_Id": "e3e786cdfacd48bd8af42f487de1950b"
-        },
-        {
-            "m_Id": "59cd9498dd5a4e24b9199267c5d8603d"
-        },
-        {
-            "m_Id": "fe845c74b8524aa7a3062b56bbc29749"
-        }
-    ],
-    "synonyms": [],
-    "m_Precision": 0,
-    "m_PreviewExpanded": false,
-    "m_DismissedVersion": 0,
-    "m_PreviewMode": 0,
-    "m_CustomColors": {
-        "m_SerializableColors": []
-    }
-}
-
-{
-    "m_SGVersion": 0,
-    "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot",
-    "m_ObjectId": "7761ea1a833a415988271af601a95730",
-    "m_Id": 0,
-    "m_DisplayName": "Out",
-    "m_SlotType": 1,
-    "m_Hidden": false,
-    "m_ShaderOutputName": "Out",
-    "m_StageCapability": 3,
-    "m_Value": {
-        "x": 0.0,
-        "y": 0.0,
-        "z": 0.0,
-        "w": 0.0
-    },
-    "m_DefaultValue": {
-        "x": 0.0,
-        "y": 0.0,
-        "z": 0.0,
-        "w": 0.0
-    }
-}
-
-{
-    "m_SGVersion": 0,
-    "m_Type": "UnityEditor.ShaderGraph.Vector2MaterialSlot",
-    "m_ObjectId": "836326224fd0412ab8c860923ed8d436",
-    "m_Id": 0,
-    "m_DisplayName": "Out",
-    "m_SlotType": 1,
-    "m_Hidden": false,
-    "m_ShaderOutputName": "Out",
-    "m_StageCapability": 3,
-    "m_Value": {
-        "x": 0.0,
-        "y": 0.0
-    },
-    "m_DefaultValue": {
-        "x": 0.0,
-        "y": 0.0
-    },
-    "m_Labels": []
-}
-
-{
-    "m_SGVersion": 0,
-    "m_Type": "UnityEditor.ShaderGraph.Vector2MaterialSlot",
-    "m_ObjectId": "83cde985e5b9443daee3c8eb669f0e6d",
-    "m_Id": 1,
-    "m_DisplayName": "State",
-    "m_SlotType": 0,
-    "m_Hidden": false,
-    "m_ShaderOutputName": "State",
-    "m_StageCapability": 3,
-    "m_Value": {
-        "x": 0.0,
-        "y": 0.0
-    },
-    "m_DefaultValue": {
-        "x": 0.0,
-        "y": 0.0
-    },
-    "m_Labels": []
-}
-
-{
-    "m_SGVersion": 0,
-    "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot",
-    "m_ObjectId": "879134a34c234089b9efb4fc9858d647",
-    "m_Id": 4,
-    "m_DisplayName": "Top To Bottom",
-    "m_SlotType": 0,
-    "m_Hidden": false,
-    "m_ShaderOutputName": "Top To Bottom",
-    "m_StageCapability": 3,
-    "m_Value": {
-        "x": 0.0,
-        "y": -1.0,
-        "z": 0.0,
-        "w": 0.0
-    },
-    "m_DefaultValue": {
-        "x": 0.0,
-        "y": 0.0,
-        "z": 0.0,
-        "w": 0.0
-    }
-}
-
-{
-    "m_SGVersion": 0,
-    "m_Type": "UnityEditor.ShaderGraph.SubGraphOutputNode",
-    "m_ObjectId": "9449855d3855413a8290ae113a757c4c",
-    "m_Group": {
-        "m_Id": ""
-    },
-    "m_Name": "Output",
-    "m_DrawState": {
-        "m_Expanded": true,
-        "m_Position": {
-            "serializedVersion": "2",
-            "x": 179.0,
-            "y": -98.0,
-            "width": 86.0,
-            "height": 77.0
-        }
-    },
-    "m_Slots": [
-        {
-            "m_Id": "83cde985e5b9443daee3c8eb669f0e6d"
-        }
-    ],
-    "synonyms": [],
-    "m_Precision": 0,
-    "m_PreviewExpanded": true,
-    "m_DismissedVersion": 0,
-    "m_PreviewMode": 0,
-    "m_CustomColors": {
-        "m_SerializableColors": []
-    },
-    "IsFirstSlotValid": true
-}
-
-{
-    "m_SGVersion": 0,
-    "m_Type": "UnityEditor.ShaderGraph.DropdownNode",
-    "m_ObjectId": "a199c269be804e1abc674bba5a3eb60b",
-    "m_Group": {
-        "m_Id": ""
-    },
-    "m_Name": "Preview",
-    "m_DrawState": {
-        "m_Expanded": true,
-        "m_Position": {
-            "serializedVersion": "2",
-            "x": -545.0,
-            "y": 25.000001907348634,
-            "width": 178.0,
-            "height": 190.00001525878907
-        }
-    },
-    "m_Slots": [
-        {
-            "m_Id": "7761ea1a833a415988271af601a95730"
-        },
-        {
-            "m_Id": "ff387baec14e4ef2b220402bb667c17a"
-        },
-        {
-            "m_Id": "cb85ae2349c7456d8f8536a569751fa1"
-        },
-        {
-            "m_Id": "4be0f682be164f9d8cf441da15cf6384"
-        },
-        {
-            "m_Id": "879134a34c234089b9efb4fc9858d647"
-        }
-    ],
-    "synonyms": [],
-    "m_Precision": 0,
-    "m_PreviewExpanded": false,
-    "m_DismissedVersion": 0,
-    "m_PreviewMode": 0,
-    "m_CustomColors": {
-        "m_SerializableColors": []
-    },
-    "m_Dropdown": {
-        "m_Id": "1af3eb1743bd40d889bdfa68ecd4a647"
-    }
-}
-
-{
-    "m_SGVersion": 0,
-    "m_Type": "UnityEditor.ShaderGraph.CategoryData",
-    "m_ObjectId": "a3a99a6001824cd6b43d606acec2a6f5",
-    "m_Name": "",
-    "m_ChildObjectList": [
-        {
-            "m_Id": "5e64e5f179a24af08b4c3f1bce187b06"
-        },
-        {
-            "m_Id": "1af3eb1743bd40d889bdfa68ecd4a647"
-        }
-    ]
-}
-
-{
-    "m_SGVersion": 0,
-    "m_Type": "UnityEditor.ShaderGraph.Vector2MaterialSlot",
-    "m_ObjectId": "c3345dbee10a4ac9a3156ce4c3d79e58",
-    "m_Id": 2,
-    "m_DisplayName": "Out",
-    "m_SlotType": 1,
-    "m_Hidden": false,
-    "m_ShaderOutputName": "Out",
-    "m_StageCapability": 3,
-    "m_Value": {
-        "x": 0.0,
-        "y": 0.0
-    },
-    "m_DefaultValue": {
-        "x": 0.0,
-        "y": 0.0
-    },
-    "m_Labels": []
-}
-
-{
-    "m_SGVersion": 0,
-    "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot",
-    "m_ObjectId": "cb85ae2349c7456d8f8536a569751fa1",
-    "m_Id": 1,
-    "m_DisplayName": "Right To Left",
-    "m_SlotType": 0,
-    "m_Hidden": false,
-    "m_ShaderOutputName": "Right To Left",
-    "m_StageCapability": 3,
-    "m_Value": {
-        "x": -1.0,
-        "y": 0.0,
-        "z": 0.0,
-        "w": 0.0
-    },
-    "m_DefaultValue": {
-        "x": 0.0,
-        "y": 0.0,
-        "z": 0.0,
-        "w": 0.0
-    }
-}
-
-{
-    "m_SGVersion": 0,
-    "m_Type": "UnityEditor.ShaderGraph.Vector2MaterialSlot",
-    "m_ObjectId": "d5d86342e25a409bb68112aa9d404f35",
-    "m_Id": 0,
-    "m_DisplayName": "Slider Direction",
-    "m_SlotType": 1,
-    "m_Hidden": false,
-    "m_ShaderOutputName": "Out",
-    "m_StageCapability": 3,
-    "m_Value": {
-        "x": 0.0,
-        "y": 0.0
-    },
-    "m_DefaultValue": {
-        "x": 0.0,
-        "y": 0.0
-    },
-    "m_Labels": []
-}
-
-{
-    "m_SGVersion": 0,
-    "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot",
-    "m_ObjectId": "e233c75976164c759c12a7f343f1635c",
-    "m_Id": 0,
-    "m_DisplayName": "",
-    "m_SlotType": 0,
-    "m_Hidden": false,
-    "m_ShaderOutputName": "",
-    "m_StageCapability": 3,
-    "m_Value": {
-        "x": 0.0,
-        "y": 0.0,
-        "z": 0.0,
-        "w": 0.0
-    },
-    "m_DefaultValue": {
-        "x": 0.0,
-        "y": 0.0,
-        "z": 0.0,
-        "w": 0.0
-    }
-}
-
-{
-    "m_SGVersion": 0,
-    "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot",
-    "m_ObjectId": "e3e786cdfacd48bd8af42f487de1950b",
-    "m_Id": 1,
-    "m_DisplayName": "Connected",
-    "m_SlotType": 0,
-    "m_Hidden": false,
-    "m_ShaderOutputName": "Connected",
-    "m_StageCapability": 3,
-    "m_Value": {
-        "x": 1.0,
-        "y": 1.0,
-        "z": 1.0,
-        "w": 1.0
-    },
-    "m_DefaultValue": {
-        "x": 0.0,
-        "y": 0.0,
-        "z": 0.0,
-        "w": 0.0
-    }
-}
-
-{
-    "m_SGVersion": 0,
-    "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot",
-    "m_ObjectId": "f1e85a7154ea474f81c0c7b375b4c78a",
-    "m_Id": 1,
-    "m_DisplayName": "",
-    "m_SlotType": 1,
-    "m_Hidden": false,
-    "m_ShaderOutputName": "",
-    "m_StageCapability": 3,
-    "m_Value": {
-        "x": 0.0,
-        "y": 0.0,
-        "z": 0.0,
-        "w": 0.0
-    },
-    "m_DefaultValue": {
-        "x": 0.0,
-        "y": 0.0,
-        "z": 0.0,
-        "w": 0.0
-    }
-}
-
-{
-    "m_SGVersion": 0,
-    "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot",
-    "m_ObjectId": "fe845c74b8524aa7a3062b56bbc29749",
-    "m_Id": 3,
-    "m_DisplayName": "Out",
-    "m_SlotType": 1,
-    "m_Hidden": false,
-    "m_ShaderOutputName": "Out",
-    "m_StageCapability": 3,
-    "m_Value": {
-        "x": 0.0,
-        "y": 0.0,
-        "z": 0.0,
-        "w": 0.0
-    },
-    "m_DefaultValue": {
-        "x": 0.0,
-        "y": 0.0,
-        "z": 0.0,
-        "w": 0.0
-    }
-}
-
-{
-    "m_SGVersion": 0,
-    "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot",
-    "m_ObjectId": "ff387baec14e4ef2b220402bb667c17a",
-    "m_Id": 3,
-    "m_DisplayName": "Left To Right",
-    "m_SlotType": 0,
-    "m_Hidden": false,
-    "m_ShaderOutputName": "Left To Right",
-    "m_StageCapability": 3,
-    "m_Value": {
-        "x": 0.0,
-        "y": 0.0,
-        "z": 0.0,
-        "w": 0.0
-    },
-    "m_DefaultValue": {
-        "x": 0.0,
-        "y": 0.0,
-        "z": 0.0,
-        "w": 0.0
-    }
-}
-
diff --git a/Packages/com.unity.shadergraph/Tests/Editor/ProviderTests.meta b/Packages/com.unity.shadergraph/Tests/Editor/ProviderTests.meta
new file mode 100644
index 00000000000..5c86776ebb5
--- /dev/null
+++ b/Packages/com.unity.shadergraph/Tests/Editor/ProviderTests.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: f77105f0477b74224805849ef79e3e83
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Packages/com.unity.shadergraph/Tests/Editor/ProviderTests/ExpressionTests.cs b/Packages/com.unity.shadergraph/Tests/Editor/ProviderTests/ExpressionTests.cs
new file mode 100644
index 00000000000..c8bded7b24b
--- /dev/null
+++ b/Packages/com.unity.shadergraph/Tests/Editor/ProviderTests/ExpressionTests.cs
@@ -0,0 +1,85 @@
+using System.Collections.Generic;
+using NUnit.Framework;
+
+namespace UnityEditor.ShaderGraph.ProviderSystem.Tests
+{
+    [TestFixture]
+    class ExpressionTests
+    {
+        private static void DoTest(string expression, string[] expectedParamNames, string expectedExpression = null)
+        {
+            List<IShaderField> fields = new();
+            var type = new ShaderType("float");
+            if (expectedParamNames != null)
+                foreach (var name in expectedParamNames)
+                    fields.Add(new ShaderField(name, true, false, type, null));
+
+            if (string.IsNullOrEmpty(expectedExpression))
+                expectedExpression = expression;
+
+
+
+            var expected = new ShaderFunction("Test", null, fields, type, $"return {expectedExpression};",
+                new Dictionary<string, string>() {
+                    { Hints.Common.kDisplayName, "Expression" },
+                });
+
+            // this operation produces a 'cleaned' expression; for now, we're just stripping comments
+            // For now, we allow keywords and illegal characters (even semicolons), though they ought to
+            // result in compilation failure and give appropriate feedback to the user.
+            var actual = ExpressionProvider.ExpressionToShaderFunction("Test", expression, "float", out var actualExpression);
+
+            Assert.AreEqual(expectedExpression, actualExpression);
+
+            // the code generated from the actual/expected shader functions should be identical.
+            string expectedCode = ShaderObjectUtils.GenerateCode(expected, false, false, false);
+            string actualCode = ShaderObjectUtils.GenerateCode(actual, false, false, false);
+
+            Assert.AreEqual(expectedCode, actualCode);
+
+            // check that we get the appropriate number of slots.
+            var node = new ExpressionNode();
+            node.InitializeFromProvider(new ExpressionProvider());
+            node.Expression = expression;
+            List<MaterialSlot> slots = new();
+            node.GetSlots(slots);
+
+            int expectedSlots = 1; // +1 for return output.
+            foreach (var i in expected.Parameters)
+                ++expectedSlots;
+
+            Assert.AreEqual(expectedSlots, slots.Count, $"Slots generated from {expression} was unexpected.");
+        }
+
+
+        [Test]
+        public void ExpressionTest()
+        {
+            // some basic binary operations
+            DoTest("a - b", new[] { "a", "b" });
+            DoTest("a * b", new[] { "a", "b" });
+            DoTest("a / b", new[] { "a", "b" });
+            DoTest("a % b", new[] { "a", "b" });
+            DoTest("a + b", new[] { "a", "b" });
+
+            // float literal and function calls
+            DoTest("asint(4.5f) + cos(45)", null);
+            DoTest("asint(4.5f) + cos(pi)", new[] { "pi" });
+
+            // check function call with multiple parametrs
+            DoTest("dot(a, b*c)", new[] { "a", "b", "c" });
+
+            // check that member access operators aren't treated as identifiers
+            DoTest("a + b.xyz * c.xyz[0]", new[] { "a", "b", "c" });
+
+            // check that comments are stripped
+            DoTest("a +/* b */ c// d", new[] { "a", "c" }, "a + c");
+
+            // check that keywords aren't interpreted as parameters
+            DoTest("(float)a", new[] { "a" });
+
+            // check that we deduplicate parameters
+            DoTest("a + a + a + b + b", new[] { "a", "b" });
+        }
+    }
+}
diff --git a/Packages/com.unity.shadergraph/Tests/Editor/ProviderTests/ExpressionTests.cs.meta b/Packages/com.unity.shadergraph/Tests/Editor/ProviderTests/ExpressionTests.cs.meta
new file mode 100644
index 00000000000..97c301a307d
--- /dev/null
+++ b/Packages/com.unity.shadergraph/Tests/Editor/ProviderTests/ExpressionTests.cs.meta
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: 4a239dffbe2cc4fcd83c1e3480f7d5c2
\ No newline at end of file
diff --git a/Packages/com.unity.shadergraph/Tests/Editor/ProviderTests/ReflectedFunctionTests.cs b/Packages/com.unity.shadergraph/Tests/Editor/ProviderTests/ReflectedFunctionTests.cs
new file mode 100644
index 00000000000..61635c3067b
--- /dev/null
+++ b/Packages/com.unity.shadergraph/Tests/Editor/ProviderTests/ReflectedFunctionTests.cs
@@ -0,0 +1,76 @@
+using System.Collections.Generic;
+using NUnit.Framework;
+
+namespace UnityEditor.ShaderGraph.ProviderSystem.Tests
+{
+    [TestFixture]
+    class ReflectedFunctionTests
+    {
+        readonly string kTestPath = "Assets/generated-ReflectionTest.hlsl";
+        Dictionary<string, ShaderFunction> lookup = new();
+
+
+        ShaderFunction[] functionsToTest = new[]
+        {
+            new ShaderFunction("BaseCase", new[] { "Namespace1" , "Namespace2" }, null, new ShaderType("float"), "return 1;", null),
+
+            new ShaderFunction("InAndOut", null,
+                new IShaderField[] {
+                    new ShaderField("Field", true, true, new ShaderType("float3"), null),
+                },
+                new ShaderType("void"),
+                "Field.xyz = float3(1,1,1);", null),
+
+            new ShaderFunction("ProviderName", null, null, new ShaderType("float"), "return 1;",
+                new Dictionary<string ,string>() {
+                    { Hints.Func.kProviderKey,"UniqueProviderName" },
+                }),            
+        };
+
+        [OneTimeSetUp]
+        public void Setup()
+        {
+            ShaderStringBuilder sb = new();
+            foreach (var func in functionsToTest)
+            {
+                lookup.Add(ShaderObjectUtils.EvaluateProviderKey(func), func);
+                sb.AppendLine(ShaderObjectUtils.GenerateCode(func));
+            }
+            FileUtilities.WriteToDisk(kTestPath, sb.ToString());
+
+            AssetDatabase.ImportAsset(kTestPath, ImportAssetOptions.ForceSynchronousImport | ImportAssetOptions.ForceUpdate);
+        }
+
+        [OneTimeTearDown]
+        public void Teardown()
+        {
+            AssetDatabase.DeleteAsset(kTestPath);
+        }
+
+        [Test]
+        public void ReflectionTest()
+        {
+            int count = 0;
+            HashSet<string> keysNotFound = new(lookup.Keys);
+            foreach(var provider in ProviderLibrary.Instance.AllProvidersByType<IShaderFunction>())
+            {
+                if (lookup.TryGetValue(provider.ProviderKey, out var actual))
+                {
+                    count++;
+                    keysNotFound.Remove(provider.ProviderKey);
+                    var expected = lookup[provider.ProviderKey];
+                    Assert.IsTrue(TestUtils.CompareFunction(actual, expected), $"Function found with key {provider.ProviderKey} does not match test case.");
+                    TestUtils.AssertNodeSetup(provider);
+                }
+            }
+            if (keysNotFound.Count > 0)
+            {
+                System.Text.StringBuilder sb = new();
+                foreach (var key in keysNotFound)
+                    sb.Append($"{key}, ");
+
+                Assert.Fail($"Expected keys could not be found: {sb.ToString()}");
+            }
+        }
+    }
+}
diff --git a/Packages/com.unity.shadergraph/Tests/Editor/ProviderTests/ReflectedFunctionTests.cs.meta b/Packages/com.unity.shadergraph/Tests/Editor/ProviderTests/ReflectedFunctionTests.cs.meta
new file mode 100644
index 00000000000..d0b7cb1ce20
--- /dev/null
+++ b/Packages/com.unity.shadergraph/Tests/Editor/ProviderTests/ReflectedFunctionTests.cs.meta
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: 645fc02044bcf4856950770ee6d1641e
\ No newline at end of file
diff --git a/Packages/com.unity.shadergraph/Tests/Editor/ProviderTests/TestUtils.cs b/Packages/com.unity.shadergraph/Tests/Editor/ProviderTests/TestUtils.cs
new file mode 100644
index 00000000000..876e42de6fb
--- /dev/null
+++ b/Packages/com.unity.shadergraph/Tests/Editor/ProviderTests/TestUtils.cs
@@ -0,0 +1,78 @@
+using System;
+using System.Collections.Generic;
+using NUnit.Framework;
+
+namespace UnityEditor.ShaderGraph.ProviderSystem.Tests
+{
+    internal static class TestUtils
+    {
+        internal static bool CompareSequence<T>(IEnumerable<T> a, IEnumerable<T> b, Func<T, T, bool> cmp)
+        {
+            if (a == null && b == null)
+                return true;
+            else if (a == null || b == null)
+                return false;
+
+            var ait = a.GetEnumerator();
+            var bit = b.GetEnumerator();
+
+            bool av;
+            bool bv;
+
+            do {
+                av = ait.MoveNext();
+                bv = bit.MoveNext();
+                if (av && bv && !cmp(ait.Current, bit.Current))
+                    return false;
+            } while (av && bv);
+            return av == bv;
+        }
+
+        internal static bool CompareBase(IShaderObject a, IShaderObject b)
+        {
+            return a.IsValid && b.IsValid && string.Equals(a.Name, b.Name)
+                && CompareSequence(a.Namespace, b.Namespace, string.Equals)
+                && CompareSequence(a.Hints, b.Hints, (e, f) => e.Key == f.Key && e.Value == f.Value);
+        }
+
+        internal static bool CompareType(IShaderType a, IShaderType b)
+        {
+            return CompareBase(a, b);
+        }
+
+        internal static bool CompareField(IShaderField a, IShaderField b)
+        {
+            return a.IsInput == b.IsInput && a.IsOutput == b.IsOutput && CompareType(a.ShaderType, b.ShaderType) && CompareBase(a, b);
+        }
+
+        internal static bool CompareFunction(IShaderFunction a, IShaderFunction b)
+        {
+            return CompareBase(a, b)
+                && CompareType(a.ReturnType, b.ReturnType)
+                && a.FunctionBody == b.FunctionBody
+                && CompareSequence(a.Parameters, b.Parameters, CompareField);
+        }
+
+        internal static void AssertNodeSetup(IProvider<IShaderFunction> provider)
+        {
+            Assert.IsNotNull(provider);
+            Assert.IsTrue(provider.IsValid);
+
+            var node = new ProviderNode();
+            node.InitializeFromProvider(provider);
+
+            List<MaterialSlot> slots = new();
+            node.GetSlots(slots);
+
+            int count = 0;
+
+            if (provider.Definition.ReturnType.Name != "void")
+                count++;
+
+            foreach (var param in node.Provider.Definition.Parameters)
+                count += (param.IsInput ? 1 : 0) + (param.IsOutput ? 1 : 0);
+
+            Assert.AreEqual(slots.Count, count, $"{provider.ProviderKey} has an unexpected number of slots.");
+        }
+    }
+}
diff --git a/Packages/com.unity.shadergraph/Tests/Editor/ProviderTests/TestUtils.cs.meta b/Packages/com.unity.shadergraph/Tests/Editor/ProviderTests/TestUtils.cs.meta
new file mode 100644
index 00000000000..81f0f34edfe
--- /dev/null
+++ b/Packages/com.unity.shadergraph/Tests/Editor/ProviderTests/TestUtils.cs.meta
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: cda199a8cac8e415ebec2dca28c8df30
\ No newline at end of file
diff --git a/Packages/com.unity.shadergraph/package.json b/Packages/com.unity.shadergraph/package.json
index c2959a0f529..b8d69e8cad4 100644
--- a/Packages/com.unity.shadergraph/package.json
+++ b/Packages/com.unity.shadergraph/package.json
@@ -1,11 +1,11 @@
 {
   "name": "com.unity.shadergraph",
   "description": "The Shader Graph package adds a visual Shader editing tool to Unity. You can use this tool to create Shaders in a visual way instead of writing code. Specific render pipelines can implement specific graph features. Currently, both the High Definition Rendering Pipeline and the Universal Rendering Pipeline support Shader Graph.",
-  "version": "17.5.0",
-  "unity": "6000.5",
+  "version": "17.6.0",
+  "unity": "6000.6",
   "displayName": "Shader Graph",
   "dependencies": {
-    "com.unity.render-pipelines.core": "17.5.0",
+    "com.unity.render-pipelines.core": "17.6.0",
     "com.unity.searcher": "4.9.3"
   },
   "samples": [
diff --git a/Packages/com.unity.visualeffectgraph/CHANGELOG.md b/Packages/com.unity.visualeffectgraph/CHANGELOG.md
index 71e114a10a1..d790b4c69ba 100644
--- a/Packages/com.unity.visualeffectgraph/CHANGELOG.md
+++ b/Packages/com.unity.visualeffectgraph/CHANGELOG.md
@@ -10,6 +10,12 @@ 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.
 
+## [17.5.0] - 2026-02-18
+
+This version is compatible with Unity 6000.6.0a7.
+
+For the release notes, refer to the [Unity download archive](https://unity.com/releases/editor/archive).
+
 ## [17.4.0] - 2025-10-22
 
 This version is compatible with Unity 6000.4.0a4.
diff --git a/Packages/com.unity.visualeffectgraph/Editor/Compiler/VFXGraphCompiledData.cs b/Packages/com.unity.visualeffectgraph/Editor/Compiler/VFXGraphCompiledData.cs
index 159915f54b0..827fac12367 100644
--- a/Packages/com.unity.visualeffectgraph/Editor/Compiler/VFXGraphCompiledData.cs
+++ b/Packages/com.unity.visualeffectgraph/Editor/Compiler/VFXGraphCompiledData.cs
@@ -1094,17 +1094,7 @@ public struct VFXCompileOutput
 
             public HashSet<string> sourceDependencies;
 
-            public VFXExpressionSheet sheet;
-            public VFXEditorSystemDesc[] systemDesc;
-            public VFXEventDesc[] eventDesc;
-            public VFXGPUBufferDesc[] gpuBufferDesc;
-            public VFXCPUBufferDesc[] cpuBufferDesc;
-            public VFXTemporaryGPUBufferDesc[] temporaryBufferDesc;
-            public VFXShaderSourceDesc[] shaderSourceDesc;
-            public VFXRendererSettings rendererSettings;
-            public VFXInstancingDisabledReason instancingDisabledReason;
-
-            public uint version;
+            public VisualEffectAssetDesc assetDesc;
         }
 
         public VFXCompileOutput Compile(VFXCompilationMode compilationMode, bool enableShaderDebugSymbols, VFXAnalytics analytics)
@@ -1125,8 +1115,8 @@ public VFXCompileOutput Compile(VFXCompilationMode compilationMode, bool enableS
             if (m_Graph.children.Count() == 0)
             {
                 output.success = true;
-                output.version = compiledVersion;
-                output.systemDesc = Array.Empty<VFXEditorSystemDesc>();
+                output.assetDesc.version = compiledVersion;
+                output.assetDesc.systemDesc = Array.Empty<VFXEditorSystemDesc>();
                 return output;
             }
 
@@ -1351,16 +1341,17 @@ public VFXCompileOutput Compile(VFXCompilationMode compilationMode, bool enableS
 
                 output.success = true;
 
-                output.sheet = expressionSheet;
-                output.systemDesc = systemDescs.ToArray();
-                output.eventDesc = vfxEventDesc;
-                output.gpuBufferDesc = bufferDescs.ToArray();
-                output.cpuBufferDesc = cpuBufferDescs.ToArray();
-                output.temporaryBufferDesc = temporaryBufferDescs.ToArray();
-                output.shaderSourceDesc = shaderSources;
-                output.rendererSettings = new() { shadowCastingMode = shadowCastingMode, motionVectorGenerationMode = motionVectorGenerationMode };
-                output.instancingDisabledReason = instancingDisabledReason;
-                output.version = compiledVersion;
+                output.assetDesc.sheet = expressionSheet;
+                output.assetDesc.systemDesc = systemDescs.ToArray();
+                output.assetDesc.eventDesc = vfxEventDesc;
+                output.assetDesc.gpuBufferDesc = bufferDescs.ToArray();
+                output.assetDesc.cpuBufferDesc = cpuBufferDescs.ToArray();
+                output.assetDesc.temporaryBufferDesc = temporaryBufferDescs.ToArray();
+                output.assetDesc.shaderSourceDesc = shaderSources;
+                output.assetDesc.rendererSettings = new() { shadowCastingMode = shadowCastingMode, motionVectorGenerationMode = motionVectorGenerationMode };
+                output.assetDesc.instancingDisabledReason = instancingDisabledReason;
+                output.assetDesc.compilationMode = compilationMode;
+                output.assetDesc.version = compiledVersion;
 
                 m_ExpressionValues = expressionSheet.values;
             }
diff --git a/Packages/com.unity.visualeffectgraph/Editor/Core/VFXSRPBinder.cs b/Packages/com.unity.visualeffectgraph/Editor/Core/VFXSRPBinder.cs
index 673d6ced16d..9fe3f23e7a3 100644
--- a/Packages/com.unity.visualeffectgraph/Editor/Core/VFXSRPBinder.cs
+++ b/Packages/com.unity.visualeffectgraph/Editor/Core/VFXSRPBinder.cs
@@ -21,6 +21,7 @@ public struct ShaderGraphBinder
             public DependencyCollection fieldDependencies;
             public (PragmaDescriptor oldDesc, PragmaDescriptor newDesc)[] pragmasReplacement;
             public (KeywordDescriptor oldDesc, KeywordDescriptor newDesc)[] keywordsReplacement;
+            public (KeywordDescriptor oldDesc, int value)[] keywordsToDefines;
             public bool useFragInputs;
         }
 
@@ -108,6 +109,11 @@ public virtual ShaderGraphBinder GetShaderGraphDescriptor(VFXContext context, VF
             return new ShaderGraphBinder();
         }
 
+        public virtual List<PassCollection.Item> FilterOutPasses(PassCollection passes, VFXContext context)
+        {
+            return passes.ToList();
+        }
+
         public virtual IEnumerable<GraphicsDeviceType> GetSupportedGraphicDevices()
         {
             yield return GraphicsDeviceType.Direct3D11;
@@ -124,5 +130,7 @@ public virtual IEnumerable<GraphicsDeviceType> GetSupportedGraphicDevices()
             yield return GraphicsDeviceType.Switch2;
             yield return GraphicsDeviceType.WebGPU;
         }
+
+
     }
 }
diff --git a/Packages/com.unity.visualeffectgraph/Editor/GraphCommon.meta b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon.meta
new file mode 100644
index 00000000000..87a53ea158a
--- /dev/null
+++ b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: f097ec224acb3bf44b7ddcad89076356
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Collections.meta b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Collections.meta
new file mode 100644
index 00000000000..b5050d70b5f
--- /dev/null
+++ b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Collections.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: aada4a9eaecd9f746b7b19ffa79474bf
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Collections/Deque.cs b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Collections/Deque.cs
new file mode 100644
index 00000000000..1ddcf031fee
--- /dev/null
+++ b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Collections/Deque.cs
@@ -0,0 +1,214 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+
+namespace Unity.GraphCommon.LowLevel.Editor
+{
+    /// <summary>
+    /// A double-ended queue (deque) implementation that allows adding and removing elements from both ends.
+    /// </summary>
+    /// <typeparam name="T">The type that the deque is holding.</typeparam>
+    /*public*/ class Deque<T> : IEnumerable<T>
+    {
+        private T[] m_Buffer;
+        private int m_Head;
+        private int m_Tail;
+        private int m_Count;
+        private const int DefaultCapacity = 4;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="Deque{T}"/> class with the default capacity.
+        /// </summary>
+        public Deque() : this(DefaultCapacity)
+        {
+        }
+
+        /// <summary>
+        ///  Initializes a new instance of the <see cref="Deque{T}"/> class with a specified capacity.
+        /// </summary>
+        /// <param name="capacity"> The initial capacity of the deque. </param>
+        /// <exception cref="ArgumentOutOfRangeException">Throws if capacity is negative.</exception>
+        public Deque(int capacity)
+        {
+            if (capacity < 0)
+                throw new ArgumentOutOfRangeException(nameof(capacity), "Capacity cannot be negative");
+
+            m_Buffer = new T[capacity];
+            m_Head = 0;
+            m_Tail = 0;
+            m_Count = 0;
+        }
+
+        /// <summary>
+        /// Gets the number of elements in the deque.
+        /// </summary>
+        public int Count => m_Count;
+
+        /// <summary>
+        /// Returns true if the deque is empty. False otherwise.
+        /// </summary>
+        public bool IsEmpty => m_Count == 0;
+
+        /// <summary>
+        /// Adds an element to the front of the deque.
+        /// </summary>
+        /// <param name="item">The element to add.</param>
+        public void AddFront(T item)
+        {
+            if (m_Count == m_Buffer.Length)
+            {
+                Resize();
+            }
+
+            m_Head = (m_Head - 1 + m_Buffer.Length) % m_Buffer.Length;
+            m_Buffer[m_Head] = item;
+            m_Count++;
+        }
+
+        /// <summary>
+        /// Adds an element to the back of the deque.
+        /// </summary>
+        /// <param name="item">The element to add.</param>
+        public void AddBack(T item)
+        {
+            if (m_Count == m_Buffer.Length)
+            {
+                Resize();
+            }
+
+            m_Buffer[m_Tail] = item;
+            m_Tail = (m_Tail + 1) % m_Buffer.Length;
+            m_Count++;
+        }
+
+        /// <summary>
+        /// Removes and returns the element at the front of the deque.
+        /// </summary>
+        /// <returns>The element removed from the front.</returns>
+        /// <exception cref="InvalidOperationException">Thrown if the deque is empty.</exception>
+        public T RemoveFront()
+        {
+            if (IsEmpty)
+                throw new InvalidOperationException("Deque is empty");
+
+            T item = m_Buffer[m_Head];
+            m_Buffer[m_Head] = default(T); // Clear reference
+            m_Head = (m_Head + 1) % m_Buffer.Length;
+            m_Count--;
+            return item;
+        }
+
+        /// <summary>
+        /// Removes and returns the element at the back of the deque.
+        /// </summary>
+        /// <returns>The element removed from the back.</returns>
+        /// <exception cref="InvalidOperationException">Thrown if the deque is empty.</exception>
+        public T RemoveBack()
+        {
+            if (IsEmpty)
+                throw new InvalidOperationException("Deque is empty");
+
+            m_Tail = (m_Tail - 1 + m_Buffer.Length) % m_Buffer.Length;
+            T item = m_Buffer[m_Tail];
+            m_Buffer[m_Tail] = default(T); // Clear reference
+            m_Count--;
+            return item;
+        }
+
+        /// <summary>
+        /// Returns the element at the front of the deque without removing it.
+        /// </summary>
+        /// <returns>The element at the front.</returns>
+        /// <exception cref="InvalidOperationException">Thrown if the deque is empty.</exception>
+        public T PeekFront()
+        {
+            if (IsEmpty)
+                throw new InvalidOperationException("Deque is empty");
+
+            return m_Buffer[m_Head];
+        }
+
+        /// <summary>
+        /// Returns the element at the back of the deque without removing it.
+        /// </summary>
+        /// <returns>The element at the back.</returns>
+        /// <exception cref="InvalidOperationException">Thrown if the deque is empty.</exception>
+        public T PeekBack()
+        {
+            if (IsEmpty)
+                throw new InvalidOperationException("Deque is empty");
+
+            int lastIndex = (m_Tail - 1 + m_Buffer.Length) % m_Buffer.Length;
+            return m_Buffer[lastIndex];
+        }
+
+        // Indexer for random access
+        private T this[int index]
+        {
+            get
+            {
+                if (index < 0 || index >= m_Count)
+                    throw new ArgumentOutOfRangeException(nameof(index));
+
+                int actualIndex = (m_Head + index) % m_Buffer.Length;
+                return m_Buffer[actualIndex];
+            }
+            set
+            {
+                if (index < 0 || index >= m_Count)
+                    throw new ArgumentOutOfRangeException(nameof(index));
+
+                int actualIndex = (m_Head + index) % m_Buffer.Length;
+                m_Buffer[actualIndex] = value;
+            }
+        }
+
+        /// <summary>
+        /// Removes all elements from the deque.
+        /// </summary>
+        public void Clear()
+        {
+            if (m_Count > 0)
+            {
+                Array.Clear(m_Buffer, 0, m_Buffer.Length);
+                m_Head = 0;
+                m_Tail = 0;
+                m_Count = 0;
+            }
+        }
+
+        // Resize the internal buffer when capacity is reached
+        private void Resize()
+        {
+            int newCapacity = m_Buffer.Length == 0 ? DefaultCapacity : m_Buffer.Length * 2;
+            T[] newBuffer = new T[newCapacity];
+
+            // Copy elements to new buffer in order
+            for (int i = 0; i < m_Count; i++)
+            {
+                newBuffer[i] = this[i];
+            }
+
+            m_Buffer = newBuffer;
+            m_Head = 0;
+            m_Tail = m_Count;
+        }
+
+        /// <summary>
+        /// Returns an enumerator that iterates through the deque.
+        /// </summary>
+        /// <returns>An enumerator for the deque.</returns>
+        public IEnumerator<T> GetEnumerator()
+        {
+            for (int i = 0; i < m_Count; i++)
+            {
+                yield return this[i];
+            }
+        }
+
+        IEnumerator IEnumerable.GetEnumerator()
+        {
+            return GetEnumerator();
+        }
+    }
+}
diff --git a/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Collections/Deque.cs.meta b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Collections/Deque.cs.meta
new file mode 100644
index 00000000000..33bec09b4e6
--- /dev/null
+++ b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Collections/Deque.cs.meta
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: dab3a87a2e444b94896fd802d3efe7bf
\ No newline at end of file
diff --git a/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Collections/GraphDataList.cs b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Collections/GraphDataList.cs
new file mode 100644
index 00000000000..a8c031df2a8
--- /dev/null
+++ b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Collections/GraphDataList.cs
@@ -0,0 +1,198 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+namespace Unity.GraphCommon.LowLevel.Editor
+{
+    /// <summary>
+    /// Represents a unique identifier for graph data elements.
+    /// </summary>
+    [Serializable]
+    /*public*/ readonly struct GraphDataId : IEquatable<GraphDataId>
+    {
+        /// <summary>
+        /// Represents an invalid graph data identifier.
+        /// </summary>
+        public static readonly GraphDataId Invalid = new GraphDataId(-1);
+
+        readonly int m_Value;
+
+        /// <summary>
+        /// Gets the zero-based index of this graph data element.
+        /// Index is offset by 1 to have 0 (default) as the invalid value.
+        /// </summary>
+        public int Index => m_Value - 1;
+
+        /// <summary>
+        /// Gets a value indicating whether this identifier is valid.
+        /// </summary>
+        public bool IsValid => Index != Invalid.Index;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="GraphDataId"/> struct.
+        /// </summary>
+        /// <param name="index">The zero-based index of the graph data element.</param>
+        internal GraphDataId(int index)
+        {
+            m_Value = index + 1;
+        }
+
+        /// <summary>
+        /// Determines whether this instance is equal to another <see cref="GraphDataId"/>.
+        /// </summary>
+        /// <param name="other">The <see cref="GraphDataId"/> to compare with.</param>
+        /// <returns><c>true</c> if the identifiers are equal; otherwise, <c>false</c>.</returns>
+        public bool Equals(GraphDataId other) => Index == other.Index;
+
+        /// <summary>
+        /// Returns a hash code for this instance.
+        /// </summary>
+        /// <returns>A hash code for this instance.</returns>
+        public override int GetHashCode() => Index;
+
+        /// <summary>
+        /// Returns a string representation of this instance.
+        /// </summary>
+        /// <returns>A string representation of this instance.</returns>
+        public override string ToString() => Index.ToString();
+    }
+
+    /// <summary>
+    /// Represents a collection of graph data elements with optional cached information.
+    /// </summary>
+    /// <typeparam name="T">The type of the graph data elements.</typeparam>
+    /// <typeparam name="TCacheInfo">The type of the cached information.</typeparam>
+    [Serializable]
+    class GraphDataList<T> : ICountable, IEnumerable<T> where T : struct
+    {
+        [SerializeField]
+        T[] m_Items = new T[0];
+
+        public int Count { get; private set; }
+
+        /// <summary>
+        /// Gets or sets the capacity of the collection.
+        /// </summary>
+        public int Capacity
+        {
+            get => m_Items.Length;
+            set
+            {
+                Debug.Assert(value >= Count);
+                Array.Resize(ref m_Items, value);
+            }
+        }
+
+        /// <summary>
+        /// Gets a reference to the element at the specified identifier.
+        /// </summary>
+        /// <param name="id">The identifier of the element to get.</param>
+        /// <returns>A reference to the element at the specified identifier.</returns>
+        public ref T this[GraphDataId id]
+        {
+            get
+            {
+                int index = id.Index;
+                Debug.Assert(index < Count);
+                return ref m_Items[index];
+            }
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="GraphDataList{T, TCacheInfo}"/> class with the specified capacity.
+        /// </summary>
+        /// <param name="capacity">The initial capacity of the collection.</param>
+        public GraphDataList(int capacity = 0)
+        {
+            Capacity = capacity;
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="GraphDataList{T, TCacheInfo}"/> class by copying another instance.
+        /// </summary>
+        /// <param name="list">The instance to copy.</param>
+        /// <param name="copyCache">Whether to copy cache information.</param>
+        public GraphDataList(GraphDataList<T> list, bool copyCache = true) : this(list.Count)
+        {
+            Count = list.Count;
+            Array.Copy(list.m_Items, m_Items, Count);
+        }
+
+        /// <summary>
+        /// Clears all elements from the collection.
+        /// </summary>
+        public void Clear()
+        {
+            Count = 0;
+        }
+
+        /// <summary>
+        /// Releases all resources used by the collection.
+        /// </summary>
+        public void Release()
+        {
+            m_Items = new T[0];
+        }
+
+        /// <summary>
+        /// Allocates a new element in the collection.
+        /// </summary>
+        /// <param name="id">When this method returns, contains the identifier of the allocated element.</param>
+        /// <returns>A reference to the allocated element.</returns>
+        public ref T Allocate(out GraphDataId id)
+        {
+            if (Count >= Capacity)
+            {
+                Grow(Count + 1);
+            }
+
+            id = new GraphDataId(Count++);
+            return ref this[id];
+        }
+
+        /// <summary>
+        /// Increases the capacity of the collection to at least the specified value.
+        /// </summary>
+        /// <param name="minCapacity">The minimum capacity to ensure.</param>
+        public void Grow(int minCapacity)
+        {
+            Capacity = Math.Max(2 * Capacity, minCapacity);
+        }
+
+        public IEnumerator<T> GetEnumerator() => new Enumerator(this);
+        IEnumerator IEnumerable.GetEnumerator() => new Enumerator(this);
+
+        struct Enumerator : IEnumerator<T>
+        {
+            GraphDataList<T> m_List;
+            int m_Index;
+
+            public T Current => m_List.m_Items[m_Index];
+            object IEnumerator.Current => Current;
+
+            public Enumerator(GraphDataList<T> list)
+            {
+                m_List = list;
+                m_Index = -1;
+            }
+
+            public bool MoveNext()
+            {
+                return ++m_Index < m_List.Count;
+            }
+
+            public void Reset()
+            {
+                m_Index = -1;
+            }
+
+            public void Dispose()
+            {
+                m_List = null;
+            }
+        }
+    }
+
+
+}
diff --git a/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Collections/GraphDataList.cs.meta b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Collections/GraphDataList.cs.meta
new file mode 100644
index 00000000000..813788918c4
--- /dev/null
+++ b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Collections/GraphDataList.cs.meta
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: 3adbc57cd4e2d1c4bb6f0c292678a38a
\ No newline at end of file
diff --git a/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Collections/LinearEnumerator.cs b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Collections/LinearEnumerator.cs
new file mode 100644
index 00000000000..7c5c68c48e1
--- /dev/null
+++ b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Collections/LinearEnumerator.cs
@@ -0,0 +1,162 @@
+
+namespace Unity.GraphCommon.LowLevel.Editor
+{
+    /// <summary>
+    /// Represents an object that can be indexed using a single key.
+    /// </summary>
+    /// <typeparam name="TIndex">The type of the index key.</typeparam>
+    /// <typeparam name="TValue">The type of the value associated with the index.</typeparam>
+    /*public*/ interface IIndexable<TIndex, TValue>
+    {
+        /// <summary>
+        /// Gets the value associated with the specified index.
+        /// </summary>
+        /// <param name="index">The index for the value.</param>
+        /// <value>The value at the specified index.</value>
+        public TValue this[TIndex index] { get; }
+    }
+
+    /// <summary>
+    /// Represents an object that can be indexed using two keys.
+    /// </summary>
+    /// <typeparam name="TIndex0">The type of the first index key.</typeparam>
+    /// <typeparam name="TIndex1">The type of the second index key.</typeparam>
+    /// <typeparam name="TValue">The type of the value associated with the indices.</typeparam>
+    /*public*/ interface IIndexable<TIndex0, TIndex1, TValue>
+    {
+        /// <summary>
+        /// Gets the value associated with the specified indices.
+        /// </summary>
+        /// <param name="index0">The first index key.</param>
+        /// <param name="index1">The second index key.</param>
+        /// <value>The value at the specified indices.</value>
+        public TValue this[TIndex0 index0, TIndex1 index1] { get; }
+    }
+
+    /// <summary>
+    /// Represents an object that provides a count of its items.
+    /// </summary>
+    /*public*/ interface ICountable
+    {
+        /// <summary>
+        /// Gets the number of items in the collection.
+        /// </summary>
+        public int Count { get; }
+    }
+
+    /// <summary>
+    /// Provides a subset view into an indexed enumerable source.
+    /// </summary>
+    /// <typeparam name="T">The type of elements in the enumerable.</typeparam>
+    /*public*/ readonly struct SubEnumerable<T> : IIndexable<int, T>, ICountable
+    {
+        /// <summary>
+        /// The indexed source this enumerable is referencing.
+        /// </summary>
+        readonly IIndexable<int, int, T> m_Source;
+
+        /// <summary>
+        /// The index of the subset.
+        /// </summary>
+        readonly int m_SubsetIndex;
+
+        /// <summary>
+        /// Gets the number of items in the subset.
+        /// </summary>
+        public int Count { get; }
+
+        /// <summary>
+        /// Gets the item at the specified index within the subset.
+        /// </summary>
+        /// <param name="index">The index within the subset.</param>
+        /// <value>The item at the specified index.</value>
+        public T this[int index] => m_Source[m_SubsetIndex, index];
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="SubEnumerable{T}"/> struct.
+        /// </summary>
+        /// <param name="source">The indexed source.</param>
+        /// <param name="index">The index of the subset.</param>
+        /// <param name="count">The size of the subset.</param>
+        public SubEnumerable(IIndexable<int, int, T> source, int index, int count)
+        {
+            m_Source = source;
+            m_SubsetIndex = index;
+            Count = count;
+        }
+    }
+
+    /// <summary>
+    /// Provides an indirect view into an indexed enumerable source.
+    /// </summary>
+    /*public*/ readonly struct IndirectEnumerable : IIndexable<int, int>, ICountable
+    {
+        /// <summary>
+        /// The indirection source for the enumerable.
+        /// </summary>
+        readonly IIndexable<int, int> m_Indirection;
+
+        /// <summary>
+        /// Gets the number of items in the enumerable.
+        /// </summary>
+        public int Count { get; }
+
+        /// <summary>
+        /// Gets the item at the specified index.
+        /// </summary>
+        /// <param name="index">The index in the enumerable.</param>
+        /// <value>The item at the specified index.</value>
+        public int this[int index] => m_Indirection[index];
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="IndirectEnumerable"/> struct.
+        /// </summary>
+        /// <param name="indirection">The indexed source for indirection.</param>
+        /// <param name="count">The number of items in the enumerable.</param>
+        public IndirectEnumerable(IIndexable<int, int> indirection, int count)
+        {
+            m_Indirection = indirection;
+            Count = count;
+        }
+    }
+
+    /// <summary>
+    /// Provides a linear enumerator for a <see cref="IIndexable{TIndex, TValue}"/> and <see cref="ICountable"/>.
+    /// </summary>
+    /// <typeparam name="TEnumerable">The type of the enumerable being enumerated.</typeparam>
+    /// <typeparam name="T">The type of elements in the enumerable.</typeparam>
+    /*public*/ struct LinearEnumerator<TEnumerable, T>
+        where TEnumerable : IIndexable<int, T>, ICountable
+    {
+        /// <summary>
+        /// The enumerable being enumerated.
+        /// </summary>
+        readonly TEnumerable m_Enumerable;
+
+        /// <summary>
+        /// The current index of the enumeration.
+        /// </summary>
+        int m_Index;
+
+        /// <summary>
+        /// Gets the current value in the enumeration.
+        /// </summary>
+        public T Current => m_Enumerable[m_Index];
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="LinearEnumerator{TEnumerable, T}"/> struct.
+        /// </summary>
+        /// <param name="enumerable">The enumerable to iterate over.</param>
+        public LinearEnumerator(TEnumerable enumerable)
+        {
+            m_Enumerable = enumerable;
+            m_Index = -1;
+        }
+
+        /// <summary>
+        /// Moves to the next item in the enumeration.
+        /// </summary>
+        /// <returns><see langword="true"/> if there are more items; otherwise, <see langword="false"/>.</returns>
+        public bool MoveNext() => ++m_Index < m_Enumerable.Count;
+    }
+}
diff --git a/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Collections/LinearEnumerator.cs.meta b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Collections/LinearEnumerator.cs.meta
new file mode 100644
index 00000000000..275164b5ae1
--- /dev/null
+++ b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Collections/LinearEnumerator.cs.meta
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: aeb886c21f589994e9692429e1853a2f
\ No newline at end of file
diff --git a/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Collections/LinearGraph.cs b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Collections/LinearGraph.cs
new file mode 100644
index 00000000000..2268dcc5a20
--- /dev/null
+++ b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Collections/LinearGraph.cs
@@ -0,0 +1,93 @@
+using System;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEngine.Assertions;
+
+namespace Unity.GraphCommon.LowLevel.Editor
+{
+    [Serializable]
+    class LinearGraph<T> : IGraph<T>
+    {
+        [SerializeField]
+        List<T> m_Data = new();
+
+        [SerializeField]
+        LinearMultiList<int> m_Parents = new();
+
+        [SerializeField]
+        LinearMultiList<int> m_Children = new();
+
+        /// <summary>Gets the number of nodes in the graph.</summary>
+        public int Count => m_Data.Count;
+
+        /// <summary>Gets the current version of the graph, incremented when the graph structure changes.</summary>
+        public uint Version { get; private set; } = 1;
+
+        /// <summary>Gets the graph node at the specified index.</summary>
+        /// <param name="index">The zero-based index of the node to get.</param>
+        /// <returns>The graph node at the specified index.</returns>
+        public GraphNode<T> this[int index] => new(this, index);
+
+        /// <summary>
+        /// Adds a new item to the graph.
+        /// </summary>
+        /// <param name="item">The item to add.</param>
+        /// <param name="parentCapacity">Initial capacity for parent connections. Default is 0.</param>
+        /// <param name="childCapacity">Initial capacity for child connections. Default is 0.</param>
+        /// <returns>The index of the newly added item.</returns>
+        public int AddItem(T item, int parentCapacity = 0, int childCapacity = 0)        {
+            int index = m_Data.Count;
+            m_Data.Add(item);
+            m_Parents.AddList(parentCapacity);
+            m_Children.AddList(childCapacity);
+            return index;
+        }
+
+        /// <summary>
+        /// Creates a connection between two nodes, establishing a parent-child relationship.
+        /// </summary>
+        /// <param name="parentIndex">The index of the parent node.</param>
+        /// <param name="childIndex">The index of the child node.</param>
+        public void Connect(int parentIndex, int childIndex)
+        {
+            Assert.IsFalse(m_Parents.FindItem(childIndex, parentIndex, out _));
+            m_Parents.AddItem(childIndex, parentIndex);
+
+            Assert.IsFalse(m_Children.FindItem(parentIndex, childIndex, out _));
+            m_Children.AddItem(parentIndex, childIndex);
+        }
+
+        /// <summary>
+        /// Removes a connection between two nodes, breaking the parent-child relationship.
+        /// </summary>
+        /// <param name="parentIndex">The index of the parent node.</param>
+        /// <param name="childIndex">The index of the child node.</param>
+        public void Disconnect(int parentIndex, int childIndex)
+        {
+            int itemIndex = 0;
+
+            if (m_Parents.FindItem(childIndex, parentIndex, out itemIndex))
+                m_Parents.RemoveItem(childIndex, itemIndex);
+
+            if (m_Children.FindItem(parentIndex, childIndex, out itemIndex))
+                m_Children.RemoveItem(parentIndex, itemIndex);
+        }
+
+        /// <summary>Gets the capacity of the parents list for the specified node.</summary>
+        /// <param name="index">The index of the node.</param>
+        /// <returns>The capacity of the parents list.</returns>
+        public int GetParentsCapacity(int index) => m_Parents[index].Capacity;
+
+        /// <summary>Gets the capacity of the children list for the specified node.</summary>
+        /// <param name="index">The index of the node.</param>
+        /// <returns>The capacity of the children list.</returns>
+        public int GetChildrenCapacity(int index) => m_Children[index].Capacity;
+
+        /// <summary>Returns an enumerator that iterates through the graph nodes.</summary>
+        /// <returns>An enumerator for the graph.</returns>
+        public LinearEnumerator<LinearGraph<T>, GraphNode<T>> GetEnumerator() => new(this);
+        T IGraph<T>.GetData(int index) => m_Data[index];
+        GraphNodeLinks<T> IGraph<T>.GetParents(int index) => new GraphNodeLinks<T>(this, m_Parents, index, m_Parents[index].Count);
+        GraphNodeLinks<T> IGraph<T>.GetChildren(int index) => new GraphNodeLinks<T>(this, m_Children, index, m_Children[index].Count);
+    }
+}
diff --git a/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Collections/LinearGraph.cs.meta b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Collections/LinearGraph.cs.meta
new file mode 100644
index 00000000000..fc1ce080fe9
--- /dev/null
+++ b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Collections/LinearGraph.cs.meta
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: 8efcb011f865ad44c94445c33382f85b
\ No newline at end of file
diff --git a/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Collections/LinearMultiList.cs b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Collections/LinearMultiList.cs
new file mode 100644
index 00000000000..5cb86f2ad5d
--- /dev/null
+++ b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Collections/LinearMultiList.cs
@@ -0,0 +1,346 @@
+using System;
+using System.Collections.Generic;
+using UnityEngine;
+
+namespace Unity.GraphCommon.LowLevel.Editor
+{
+    /// <summary>
+    /// A Linearized List of Lists
+    /// </summary>
+    /// <remarks>
+    /// - All items contiguous in memory
+    /// - Access O(1)
+    /// - Insert/remove at end (last item of last list) amortized O(1)Linearized list of list
+    /// - Random insert/remove O(n)all items contiguous in memory
+    /// </remarks>
+    [Serializable]
+    class LinearMultiList<T> : IIndexable<int, int, T>
+    {
+        [SerializeField]
+        List<int> m_ListOffsets = new();
+        [SerializeField]
+        List<int> m_ListCounts = new();
+        [SerializeField]
+        List<T> m_Items = new();
+
+        /// <summary>
+        /// Gets the number of lists in the collection.
+        /// </summary>
+        public int ListCount => m_ListOffsets.Count;
+
+        /// <summary>
+        /// Gets the number of items in the specified list.
+        /// </summary>
+        /// <param name="listIndex">The index of the list.</param>
+        /// <returns>The number of items in the list.</returns>
+        public int CountInList(int listIndex) => GetCount(listIndex);
+
+        /// <summary>
+        /// Gets or sets the item at the specified list and item indices.
+        /// </summary>
+        /// <param name="listIndex">The index of the list.</param>
+        /// <param name="itemIndex">The index of the item within the list.</param>
+        /// <returns>The item at the specified indices.</returns>
+        /// <exception cref="IndexOutOfRangeException">Thrown when the indices are out of range.</exception>
+        public T this[int listIndex, int itemIndex]
+        {
+            get
+            {
+                int flatIndex = GetFlatIndex(listIndex, itemIndex);
+                return m_Items[flatIndex];
+            }
+            set
+            {
+                int flatIndex = GetFlatIndex(listIndex, itemIndex);
+                m_Items[flatIndex] = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets a view of the list at the specified index.
+        /// </summary>
+        /// <param name="listIndex">The index of the list.</param>
+        /// <returns>A <see cref="Sublist"/> providing access to the list.</returns>
+        public Sublist this[int listIndex] => new Sublist(this, listIndex);
+
+        /// <summary>
+        /// Adds a new empty list with the specified capacity.
+        /// </summary>
+        /// <param name="capacity">The initial capacity of the list. Default is 0.</param>
+        public void AddList(int capacity = 0)
+        {
+            m_Items.Capacity = m_Items.Count + capacity;
+            for (int i = 0; i < capacity; ++i)
+                m_Items.Add(default);
+
+            m_ListOffsets.Add(m_Items.Count);
+            m_ListCounts.Add(0);
+        }
+
+        /// <summary>
+        /// Adds a new list and populates it with the specified items.
+        /// </summary>
+        /// <param name="items">The items to add to the new list.</param>
+        public void AddList(IEnumerable<T> items)
+        {
+            var oldCount = m_Items.Count;
+            m_Items.AddRange(items);
+
+            m_ListOffsets.Add(m_Items.Count);
+            m_ListCounts.Add(m_Items.Count - oldCount);
+        }
+
+        /// <summary>
+        /// Removes the list at the specified index.
+        /// </summary>
+        /// <param name="listIndex">The index of the list to remove.</param>
+        /// <remarks>This operation invalidates all subsequent list indices.</remarks>
+        public void RemoveList(int listIndex) // Invalidate all subsequent list indices
+        {
+            var offset = GetOffset(listIndex);
+            var count = GetCount(listIndex);
+
+            m_Items.RemoveRange(offset, count);
+
+            for (var i = listIndex; i < m_ListOffsets.Count - 1; ++i)
+                m_ListOffsets[i] = m_ListOffsets[i + 1] - count;
+            m_ListOffsets.RemoveAt(m_ListOffsets.Count - 1);
+
+            m_ListCounts.RemoveAt(listIndex);
+        }
+
+        /// <summary>
+        /// Adds an item to the end of the specified list.
+        /// </summary>
+        /// <param name="listIndex">The index of the list to add the item to.</param>
+        /// <param name="item">The item to add.</param>
+        /// <returns>The flat index of the added item in the underlying array.</returns>
+        public int AddItem(int listIndex, in T item)
+        {
+            var count = GetCount(listIndex);
+            var (offset, capacity) = GetOffsetAndCapacity(listIndex);
+
+            var index = offset + count;
+            if (count < capacity)
+            {
+                m_Items[index] = item;
+            }
+            else
+            {
+                for (var i = listIndex; i < m_ListOffsets.Count; ++i)
+                    ++m_ListOffsets[i];
+                m_Items.Insert(index, item);
+            }
+
+            m_ListCounts[listIndex]++;
+
+            return index;
+        }
+
+        /// <summary>
+        /// Removes the item at the specified index from the specified list.
+        /// </summary>
+        /// <param name="listIndex">The index of the list containing the item.</param>
+        /// <param name="itemIndex">The index of the item within the list.</param>
+        /// <exception cref="IndexOutOfRangeException">Thrown when the list is empty.</exception>
+        public void RemoveItem(int listIndex, int itemIndex)
+        {
+            var count = GetCount(listIndex);
+            if (count <= 0)
+                throw new IndexOutOfRangeException();
+
+            int index = GetFlatIndex(listIndex, itemIndex);
+            var lastIndex = m_ListOffsets[listIndex] - 1;
+            for (int i = index; i < lastIndex; ++i)
+            {
+                m_Items[i] = m_Items[i + 1];
+            }
+            m_Items[lastIndex] = default;
+
+            m_ListCounts[listIndex] = count - 1;
+        }
+
+        /// <summary>
+        /// Finds an item in the specified list.
+        /// </summary>
+        /// <param name="listIndex">The index of the list to search.</param>
+        /// <param name="value">The value to find.</param>
+        /// <param name="itemIndex">When this method returns, contains the index of the item if found; otherwise, -1.</param>
+        /// <returns><c>true</c> if the item was found; otherwise, <c>false</c>.</returns>
+        public bool FindItem(int listIndex, T value, out int itemIndex)
+        {
+            var offset = GetOffset(listIndex);
+            var count = GetCount(listIndex);
+            for (int i = 0; i < count; ++i)
+            {
+                if (m_Items[offset + i].Equals(value))
+                {
+                    itemIndex = i;
+                    return true;
+                }
+            }
+            itemIndex = -1;
+            return false;
+        }
+
+        /// <summary>
+        /// Optimizes the internal storage by removing unused capacity and making the collection more compact.
+        /// </summary>
+        public void Pack()
+        {
+            int oldOffset = 0;
+            int newOffset = 0;
+            for (int listIndex = 0; listIndex < m_ListCounts.Count; ++listIndex)
+            {
+                int count = m_ListCounts[listIndex];
+                for (int index = 0; index < count; ++index)
+                {
+                    m_Items[newOffset + index] = m_Items[oldOffset + index];
+                }
+                oldOffset = m_ListOffsets[listIndex];
+                newOffset += count;
+                m_ListOffsets[listIndex] = newOffset;
+            }
+            m_Items.RemoveRange(newOffset, oldOffset - newOffset);
+        }
+
+        /// <summary>
+        /// Returns an enumerator that iterates through the lists in the collection.
+        /// </summary>
+        /// <returns>An enumerator that can be used to iterate through the lists.</returns>
+        public Enumerator GetEnumerator() => new Enumerator(this);
+
+        int GetOffset(int listIndex)
+        {
+            var offset = listIndex == 0 ? 0 : m_ListOffsets[listIndex - 1];
+            return offset;
+        }
+
+        int GetCapacity(int listIndex)
+        {
+            var offset = GetOffset(listIndex);
+            return m_ListOffsets[listIndex] - offset;
+        }
+
+        (int offset, int capacity) GetOffsetAndCapacity(int listIndex)
+        {
+            var offset = GetOffset(listIndex);
+            var capacity = m_ListOffsets[listIndex] - offset;
+            return (offset, capacity);
+        }
+
+        int GetCount(int listIndex)
+        {
+            return m_ListCounts[listIndex];
+        }
+
+        int GetFlatIndex(int listIndex, int itemIndex)
+        {
+            var (offset, capacity) = GetOffsetAndCapacity(listIndex);
+
+            if (itemIndex >= capacity)
+                throw new IndexOutOfRangeException();
+
+            return offset + itemIndex;
+        }
+
+    /// <summary>
+        /// Represents a view of a single list within the <see cref="LinearMultiList{T}"/>.
+        /// </summary>
+        public struct Sublist
+        {
+            /// <summary>
+            /// Gets the parent <see cref="LinearMultiList{T}"/> that contains this list.
+            /// </summary>
+            public LinearMultiList<T> Owner { get; }
+
+            /// <summary>
+            /// Gets the index of this list within the parent collection.
+            /// </summary>
+            public int ListIndex { get; }
+
+            /// <summary>
+            /// Gets the number of items in this list.
+            /// </summary>
+            public int Count => Owner.GetCount(ListIndex);
+
+            /// <summary>
+            /// Gets the capacity of this list.
+            /// </summary>
+            public int Capacity => Owner.GetCapacity(ListIndex);
+
+            /// <summary>
+            /// Initializes a new instance of the <see cref="Sublist"/> struct.
+            /// </summary>
+            /// <param name="owner">The parent collection.</param>
+            /// <param name="listIndex">The index of the list within the parent collection.</param>
+            public Sublist(LinearMultiList<T> owner, int listIndex)
+            {
+                Owner = owner;
+                ListIndex = listIndex;
+            }
+
+            /// <summary>
+            /// Gets the item at the specified index within this list.
+            /// </summary>
+            /// <param name="index">The index of the item.</param>
+            /// <returns>The item at the specified index.</returns>
+            public T this[int index] => Owner[ListIndex, index];
+
+            /// <summary>
+            /// Returns an enumerator that iterates through the items in this list.
+            /// </summary>
+            /// <returns>An enumerator that can be used to iterate through the items.</returns>
+            public ListRangeEnumerator<T> GetEnumerator() => new(Owner.m_Items, Owner.GetOffset(ListIndex), Owner.GetCount(ListIndex));
+        }
+
+        /// <summary>
+        /// Enumerates the lists in a <see cref="LinearMultiList{T}"/>.
+        /// </summary>
+        public struct Enumerator
+        {
+            LinearMultiList<T> m_Owner;
+            int m_Index;
+
+            /// <summary>
+            /// Gets the current list in the enumeration.
+            /// </summary>
+            public Sublist Current => m_Owner[m_Index];
+
+            /// <summary>
+            /// Initializes a new instance of the <see cref="Enumerator"/> struct.
+            /// </summary>
+            /// <param name="owner">The collection to enumerate.</param>
+            public Enumerator(LinearMultiList<T> owner)
+            {
+                m_Owner = owner;
+                m_Index = -1;
+            }
+
+            /// <summary>
+            /// Advances the enumerator to the next list in the collection.
+            /// </summary>
+            /// <returns><c>true</c> if the enumerator was successfully advanced to the next element; <c>false</c> if the enumerator has passed the end of the collection.</returns>
+            public bool MoveNext()
+            {
+                return ++m_Index < m_Owner.ListCount;
+            }
+
+            /// <summary>
+            /// Sets the enumerator to its initial position, which is before the first element in the collection.
+            /// </summary>
+            public void Reset()
+            {
+                m_Index = -1;
+            }
+
+            /// <summary>
+            /// Releases any resources used by the enumerator.
+            /// </summary>
+            public void Dispose()
+            {
+                m_Owner = null;
+            }
+        }
+    }
+}
diff --git a/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Collections/LinearMultiList.cs.meta b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Collections/LinearMultiList.cs.meta
new file mode 100644
index 00000000000..21559eb4e82
--- /dev/null
+++ b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Collections/LinearMultiList.cs.meta
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: 7c8e9e0e26773ab48af7bde67f0d4af5
\ No newline at end of file
diff --git a/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Collections/LinearMultiTree.cs b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Collections/LinearMultiTree.cs
new file mode 100644
index 00000000000..8c3c8cb00bd
--- /dev/null
+++ b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Collections/LinearMultiTree.cs
@@ -0,0 +1,108 @@
+using System;
+using System.Collections.Generic;
+using UnityEngine;
+
+namespace Unity.GraphCommon.LowLevel.Editor
+{
+    [Serializable]
+    class LinearMultiTree<T> : IMultiTree<T>
+    {
+        [SerializeField]
+        List<T> m_Data = new();
+
+        [SerializeField]
+        LinearMultiList<int> m_Children = new();
+
+        [SerializeField]
+        List<int> m_Parents = new();
+
+        [SerializeField]
+        List<int> m_RootIndices = new();
+
+        [SerializeField]
+        RootList m_RootList = new();
+
+        public uint Version { get; private set; }
+
+        public int Count => m_Data.Count;
+
+        public override string ToString()
+        {
+            System.Text.StringBuilder sb = new();
+            sb.AppendLine("LinearMultiTree:");
+
+            void DrawNode(int index, string indent, bool isLast)
+            {
+                sb.Append(indent);
+                sb.Append(isLast ? "└── " : "├── ");
+                sb.AppendLine(m_Data[index]?.ToString());
+
+                var children = m_Children[index];
+                for (int i = 0; i < children.Count; i++)
+                {
+                    bool lastChild = i == children.Count - 1;
+                    DrawNode(children[i], indent + (isLast ? "    " : "│   "), lastChild);
+                }
+            }
+
+            var roots = m_RootList.Roots;
+            for (int i = 0; i < roots.Count; i++)
+            {
+                bool lastRoot = i == roots.Count - 1;
+                DrawNode(roots[i], $"{i}", lastRoot);
+            }
+
+            return sb.ToString();
+        }
+        public MultiTreeNodeEnumerable<IndirectEnumerable, T> RootNodes => new(this, new IndirectEnumerable(m_RootList, m_RootList.Count));
+
+        public MultiTreeNode<T> this[int index] => new(this, index);
+
+        public int AddItem(T item, int parentIndex, int childCapacity = 0)
+        {
+            int index = m_Data.Count;
+            m_Data.Add(item);
+            m_Children.AddList(childCapacity);
+            m_Parents.Add(parentIndex);
+            int rootIndex = index;
+            if (parentIndex >= 0)
+            {
+                m_Children.AddItem(parentIndex, index);
+                rootIndex = m_RootIndices[parentIndex];
+            }
+            else
+            {
+                m_RootList.Roots.Add(index);
+            }
+            m_RootIndices.Add(rootIndex);
+            Version++;
+            return index;
+        }
+
+        public T GetData(int index) => m_Data[index];
+        public void SetData(int index, T data) => m_Data[index] = data;
+
+        MultiTreeNode<T> IMultiTree<T>.GetRootNode(int index) => new(this, m_RootIndices[index]);
+
+        MultiTreeNode<T>? IMultiTree<T>.GetParentNode(int index) => m_Parents[index] >= 0 ? new (this, m_Parents[index]) : null;
+
+        MultiTreeNodeEnumerable <SubEnumerable<int>, T> IMultiTree<T>.GetChildren(int index) => new(this, new SubEnumerable<int>(m_Children, index, m_Children[index].Count));
+
+        [Serializable]
+        class RootList : IIndexable<int, int>, ICountable
+        {
+            [SerializeField]
+            List<int> m_Roots = new();
+
+            public int Count => m_Roots.Count;
+
+            public List<int> Roots => m_Roots;
+
+            public int this[int index]
+            {
+                get => m_Roots[index];
+                set => m_Roots[index] = value;
+            }
+        }
+    }
+}
diff --git a/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Collections/LinearMultiTree.cs.meta b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Collections/LinearMultiTree.cs.meta
new file mode 100644
index 00000000000..15d480c5086
--- /dev/null
+++ b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Collections/LinearMultiTree.cs.meta
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: 2d54f184883027048bbbe867c641e32e
\ No newline at end of file
diff --git a/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Collections/LinearPool.cs b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Collections/LinearPool.cs
new file mode 100644
index 00000000000..e54e70031cf
--- /dev/null
+++ b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Collections/LinearPool.cs
@@ -0,0 +1,292 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+
+namespace Unity.GraphCommon.LowLevel.Editor
+{
+    struct LinearValueChunkId<T>
+    {
+        public int Start { get; set; }
+        public int Length { get; set; }
+        public int End => Start + Length; // not inclusive
+
+        public LinearValueChunkId(int start, int length)
+        {
+            if (start < 0)
+                throw new ArgumentException();
+            if (length <= 0)
+                throw new ArgumentException();
+
+            Start = start;
+            Length = length;
+        }
+    }
+
+    class LinearValuePool<T> : IEnumerable<T>, ICloneable
+    {
+        T[] m_Items;
+        List<LinearValueChunkId<T>> m_FreeChunks;
+        int m_AcquiredCount;
+
+        public int Capacity => m_Items.Length;
+        public int FreeChunkCount => m_FreeChunks.Count; // allow to check for fragmentation
+        public int AcquiredCount => m_AcquiredCount;
+        public int FreeCount => m_Items.Length - m_AcquiredCount;
+
+        public LinearValuePool(int capacity = 32)
+        {
+            m_Items = new T[capacity];
+            m_FreeChunks = new();  
+            if (capacity > 0)
+                m_FreeChunks.Add(new(0, capacity));
+            m_AcquiredCount = 0;
+        }
+
+        public LinearValuePool(LinearValuePool<T> other)
+        {
+            m_Items = (T[])other.m_Items.Clone();
+            m_FreeChunks = new(other.m_FreeChunks);
+            m_AcquiredCount = other.m_AcquiredCount;
+        }
+
+        public ref T this[int index] => ref m_Items[index];
+
+        public Span<T> GetSpan(int index, int count) => new Span<T>(m_Items, index, count);
+        public ReadOnlySpan<T> GetReadOnlySpan(int index, int count) => new ReadOnlySpan<T>(m_Items, index, count);
+
+        public IEnumerator<T> GetEnumerator() => new Enumerator(this);
+        IEnumerator IEnumerable.GetEnumerator() => new Enumerator(this);
+
+        public int Acquire(int count, out Span<T> span)
+        {
+            int index = Acquire(count);
+            span = GetSpan(index, count);
+            return index;
+        }
+
+        public int Acquire(int count = 1)
+        {
+            if (count <= 0)
+                throw new ArgumentOutOfRangeException();
+
+            int chunkIndex = GetBigEnoughFreeChunk(count);
+            if (chunkIndex == -1)
+            {
+                Reallocate(count);
+                chunkIndex = m_FreeChunks.Count - 1;
+            }
+
+            var freeChunk = m_FreeChunks[chunkIndex];
+            int itemIndex = freeChunk.Start;
+
+            if (freeChunk.Length == count)
+            {
+                m_FreeChunks.RemoveAt(chunkIndex);
+            }
+            else
+            {
+                freeChunk.Start += count;
+                freeChunk.Length -= count;
+                m_FreeChunks[chunkIndex] = freeChunk;
+            }
+
+            m_AcquiredCount += count;
+            return itemIndex;
+        }
+
+        public void Release(int index, int count = 1)
+        {
+            Release(index, count, true);
+        }
+
+        public int AcquireAndExpand(int index, int count, int newCount)
+        {
+            if (newCount <= count)
+                throw new ArgumentException();
+
+            Release(index, count, false); // don't clear now
+            int newIndex = Acquire(newCount);
+
+            Array.Copy(m_Items, index, m_Items, newIndex, newCount);
+            // TODO clear what's not reused
+
+            return newIndex;
+        }
+
+        public void ReleaseAndShrink(int index, int count, int totalCount)
+        {
+            if (index < 0 || index >= index + totalCount)
+                throw new ArgumentOutOfRangeException();
+            if (totalCount <= count)
+                throw new ArgumentException();
+
+            Release(index + count, totalCount - count, false);
+            Array.Copy(m_Items, index, m_Items, index + count, totalCount - index);
+        }
+
+        public void Reallocate(int minNewSlotCount = 1)
+        {
+            if (minNewSlotCount <= 0)
+                throw new ArgumentException();
+
+            int oldCapacity = m_Items.Length;
+            int newCapacity = oldCapacity + Math.Max(oldCapacity, minNewSlotCount);
+
+            if (m_FreeChunks.Count > 0 && m_FreeChunks[m_FreeChunks.Count - 1].End == oldCapacity)
+            {
+                var chunk = m_FreeChunks[m_FreeChunks.Count - 1];
+                chunk.Length += newCapacity - oldCapacity;
+                m_FreeChunks[m_FreeChunks.Count - 1] = chunk;
+            }
+            else
+            {
+                m_FreeChunks.Add(new(oldCapacity, newCapacity - oldCapacity));
+            }
+
+            T[] newItems = new T[newCapacity];
+            Array.Copy(m_Items, newItems, m_Items.Length);
+            m_Items = newItems;
+        }
+
+        public void Clear()
+        {
+            Array.Clear(m_Items, 0, m_Items.Length);
+            m_FreeChunks.Clear();
+            m_FreeChunks.Add(new(0, m_Items.Length));
+            m_AcquiredCount = 0;
+        }
+
+        public object Clone()
+        {
+            return new LinearValuePool<T>(this);
+        }
+
+        void Release(int index, int count, bool clear)
+        {
+            if (index < 0 || index + count >= m_Items.Length)
+                throw new ArgumentOutOfRangeException();
+            if (count <= 0)
+                throw new ArgumentException();
+
+            int chunkIndex = 0;
+            bool mergeInPrevChunk = false;
+            bool mergeInNextChunk = false;
+
+            var chunks = m_FreeChunks;
+            int chunkCount = m_FreeChunks.Count;
+
+            while (chunkIndex < chunkCount)
+            {
+                // TODO add checks for not releasing not acquired items
+                var chunk = chunks[chunkIndex];
+                if (chunk.End == index)
+                {
+                    mergeInPrevChunk = true;
+                }
+                else if (chunk.Start >= index + count)
+                {
+                    mergeInNextChunk = chunk.Start == index + count;
+                    break;
+                }
+                ++chunkIndex;
+            }
+
+            if (mergeInPrevChunk)
+            {
+                var chunk = chunks[chunkIndex - 1];
+                chunk.Length += count + (mergeInNextChunk ? chunks[chunkIndex].Length : 0);
+                chunks[chunkIndex - 1] = chunk;
+                if (mergeInNextChunk)
+                    chunks.RemoveAt(chunkIndex);
+            }
+            else if (mergeInNextChunk)
+            {
+                var chunk = chunks[chunkIndex];
+                chunk.Start -= count;
+                chunk.Length += count;
+                chunks[chunkIndex] = chunk;
+            }
+            else
+            {
+                chunks.Insert(chunkIndex, new(index, count));
+            }
+
+            if (clear)
+            {
+                for (int i = 0; i < count; ++i)
+                    m_Items[index + i] = default(T); // Reset released object to avoid holding ref
+            }
+            m_AcquiredCount -= count;
+        }
+
+        int GetBigEnoughFreeChunk(int length)
+        {
+            var chunks = m_FreeChunks;
+            int chunkCount = chunks.Count;
+            for (int i = 0; i < chunkCount; ++i) // linear search but fine if fragmentation is under control
+            {
+                if (chunks[i].Length >= length)
+                    return i;
+            }
+            return -1;
+        }
+
+        struct FreeChunk
+        {
+            public int Start { get; set; }
+            public int Length { get; set; }
+            public int End => Start + Length; // not inclusive
+
+            public FreeChunk(int start, int length)
+            {
+                if (start < 0)
+                    throw new ArgumentException();
+                if (length <= 0)
+                    throw new ArgumentException();
+
+                Start = start;
+                Length = length;
+            }
+        }
+
+        struct Enumerator : IEnumerator<T>
+        {
+            LinearValuePool<T> m_Pool;
+            int m_Index;
+            int m_ChunkPos;
+
+            public T Current => m_Pool.m_Items[m_Index];
+            object IEnumerator.Current => Current;
+
+            public Enumerator(LinearValuePool<T> pool)
+            {
+                m_Pool = pool;
+                m_Index = -1;
+                m_ChunkPos = 0;
+            }
+
+            public bool MoveNext()
+            {
+                ++m_Index;
+                if (m_ChunkPos < m_Pool.m_FreeChunks.Count)
+                {
+                    var freeChunk = m_Pool.m_FreeChunks[m_ChunkPos];
+                    if (m_Index == freeChunk.Start)
+                    {
+                        m_Index += freeChunk.Length;
+                        ++m_ChunkPos;
+                    }
+                }
+                return m_Index < m_Pool.m_Items.Length;
+            }
+
+            public void Reset()
+            {
+                m_Index = -1;
+                m_ChunkPos = 0;
+            }
+
+            public void Dispose() { }
+        }
+    }
+}
diff --git a/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Collections/LinearPool.cs.meta b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Collections/LinearPool.cs.meta
new file mode 100644
index 00000000000..1dbcbab7610
--- /dev/null
+++ b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Collections/LinearPool.cs.meta
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: 0668fd520c455264686a52b4d6e8c4dc
\ No newline at end of file
diff --git a/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Collections/LinearRangeEnumerator.cs b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Collections/LinearRangeEnumerator.cs
new file mode 100644
index 00000000000..382c0e0cc42
--- /dev/null
+++ b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Collections/LinearRangeEnumerator.cs
@@ -0,0 +1,73 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+namespace Unity.GraphCommon.LowLevel.Editor
+{
+    /// <summary>
+    /// Provides an enumerator for a specific range of elements in a <see cref="List{T}"/>.
+    /// </summary>
+    /// <typeparam name="T">The type of elements in the list.</typeparam>
+    /*public*/ struct ListRangeEnumerator<T> : IEnumerator<T>
+    {
+        /// <summary>
+        /// Gets the total number of elements in the enumeration range.
+        /// </summary>
+        public int Count => m_LastIndex - m_FirstIndex;
+
+        List<T> m_Items;
+        int m_FirstIndex;
+        int m_LastIndex;
+        int m_Index;
+
+        /// <summary>
+        /// Gets the element at the current position of the enumerator.
+        /// </summary>
+        public T Current => m_Items[m_Index];
+
+        /// <summary>
+        /// Gets the element at the current position of the enumerator as an <see cref="object"/>.
+        /// </summary>
+        object IEnumerator.Current => Current;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ListRangeEnumerator{T}"/> struct for a specific range of elements in a list.
+        /// </summary>
+        /// <param name="items">The list containing the elements to enumerate.</param>
+        /// <param name="offset">The starting index of the range to enumerate.</param>
+        /// <param name="count">The number of elements in the range to enumerate.</param>
+        public ListRangeEnumerator(List<T> items, int offset, int count)
+        {
+            Debug.Assert(offset + count <= items.Count);
+            m_Items = items;
+            m_FirstIndex = offset;
+            m_LastIndex = offset + count;
+            m_Index = m_FirstIndex - 1;
+        }
+
+        /// <summary>
+        /// Advances the enumerator to the next element in the range.
+        /// </summary>
+        /// <returns><c>true</c> if the enumerator successfully advanced to the next element; <c>false</c> if the end of the range has been reached.</returns>
+        public bool MoveNext()
+        {
+            return ++m_Index < m_LastIndex;
+        }
+
+        /// <summary>
+        /// Sets the enumerator to its initial position, which is before the first element in the range.
+        /// </summary>
+        public void Reset()
+        {
+            m_Index = m_FirstIndex - 1;
+        }
+
+        /// <summary>
+        /// Releases all resources used by the enumerator.
+        /// </summary>
+        public void Dispose()
+        {
+            m_Items = null;
+        }
+    }
+}
diff --git a/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Collections/LinearRangeEnumerator.cs.meta b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Collections/LinearRangeEnumerator.cs.meta
new file mode 100644
index 00000000000..5f8ad35ffc1
--- /dev/null
+++ b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Collections/LinearRangeEnumerator.cs.meta
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: 46af0d786db919647aea973112610970
\ No newline at end of file
diff --git a/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Collections/ReadOnlyList.cs b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Collections/ReadOnlyList.cs
new file mode 100644
index 00000000000..ee950b06f87
--- /dev/null
+++ b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Collections/ReadOnlyList.cs
@@ -0,0 +1,55 @@
+using System.Collections;
+using System.Collections.Generic;
+
+namespace Unity.GraphCommon.LowLevel
+{
+    /// <summary>
+    /// A readonly wrapper to a List
+    /// </summary>
+    /// <remarks>
+    /// This allows to get a read only enumerator that does not allocate (contrary to IReadOnlyList interface).
+    /// </remarks>
+    /// <typeparam name="T">The element type stored in the wrapped List.</typeparam>
+    /*public*/ readonly struct ReadOnlyList<T> : IReadOnlyList<T>
+    {
+        readonly List<T> m_List;
+
+        /// <summary>
+        /// Construct a new ReadOnlyList wrapped for the passed List.
+        /// </summary>
+        /// <param name="list">The List to wrap as read only.</param>
+        public ReadOnlyList(List<T> list)
+        {
+            m_List = list;
+        }
+
+        /// <summary>
+        /// Gets the element at the specified index in the read-only list.
+        /// </summary>
+        /// <param name="index">The zero-based index of the element to get.</param>
+        /// <value>The element at the specified index in the read-only list.</value>
+        public T this[int index] => m_List[index];
+
+        /// <summary>
+        /// Gets the number of elements in the collection.
+        /// </summary>
+        /// <value>The number of elements in the collection.</value>
+        public int Count => m_List.Count;
+
+        /// <summary>
+        /// Returns an enumerator that iterates through the wrapped List.
+        /// </summary>
+        /// <returns>A List Enumerator for the wrapped list</returns>
+        public List<T>.Enumerator GetEnumerator() => m_List.GetEnumerator();
+
+        IEnumerator<T> IEnumerable<T>.GetEnumerator() => GetEnumerator();
+        IEnumerator IEnumerable.GetEnumerator() => GetEnumerator();
+
+        /// <summary>
+        /// Converts a System.Collections.Generic.List into a ReadOnlyList.
+        /// </summary>
+        /// <param name="list">The List to convert to ReadOnlyList.</param>
+        /// <returns>A ReadOnlyList encapsulating the list.</returns>
+        public static implicit operator ReadOnlyList<T>(List<T> list) => new ReadOnlyList<T>(list);
+    }
+}
diff --git a/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Collections/ReadOnlyList.cs.meta b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Collections/ReadOnlyList.cs.meta
new file mode 100644
index 00000000000..d73fb3ddfe4
--- /dev/null
+++ b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Collections/ReadOnlyList.cs.meta
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: c4812d0e55d89214e80a688ff4fde806
\ No newline at end of file
diff --git a/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Collections/SubordinateList.cs b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Collections/SubordinateList.cs
new file mode 100644
index 00000000000..00fc7b09a5f
--- /dev/null
+++ b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Collections/SubordinateList.cs
@@ -0,0 +1,64 @@
+using System;
+
+namespace Unity.GraphCommon.LowLevel.Editor
+{
+    /// <summary>
+    /// Represents a list of subordinate items with a capacity provided by an <see cref="ICountable"/> provider.
+    /// </summary>
+    /// <typeparam name="T">The value type of the items in the list.</typeparam>
+    internal class SubordinateList<T> where T : struct
+    {
+        private ICountable m_CapacityProvider;
+        private T[] m_Items;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="SubordinateList{T}"/> class with the specified capacity provider.
+        /// </summary>
+        /// <param name="capacityProvider">The provider that determines the capacity of the list.</param>
+        public SubordinateList(ICountable capacityProvider)
+        {
+            m_CapacityProvider = capacityProvider;
+            m_Items = new T[m_CapacityProvider.Count];
+        }
+
+        /// <summary>
+        /// Gets a reference to the item at the specified <see cref="GraphDataId"/>.
+        /// Resizes the internal array if the index is within the provider's capacity but exceeds the current array length.
+        /// </summary>
+        /// <param name="id">The <see cref="GraphDataId"/> identifying the item.</param>
+        /// <returns>A reference to the item at the specified index.</returns>
+        public ref T this[GraphDataId id]
+        {
+            get
+            {
+                int index = id.Index;
+                if (index >= m_Items.Length)
+                {
+                    if (index < m_CapacityProvider.Count)
+                    {
+                        Resize(m_CapacityProvider.Count);
+                    }
+                }
+
+                return ref m_Items[index];
+            }
+        }
+
+        /// <summary>
+        /// Resizes the internal array to the specified capacity.
+        /// </summary>
+        /// <param name="capacity">The new capacity for the internal array.</param>
+        public void Resize(int capacity)
+        {
+            Array.Resize(ref m_Items, capacity);
+        }
+
+        /// <summary>
+        /// Releases the resources used by the list and clears its contents.
+        /// </summary>
+        public void Release()
+        {
+            m_Items = Array.Empty<T>();
+        }
+    }
+}
diff --git a/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Collections/SubordinateList.cs.meta b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Collections/SubordinateList.cs.meta
new file mode 100644
index 00000000000..a7be8acb59e
--- /dev/null
+++ b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Collections/SubordinateList.cs.meta
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: 3e56c632da6f4ab2ade6147ca5fd57df
\ No newline at end of file
diff --git a/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Compiler.meta b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Compiler.meta
new file mode 100644
index 00000000000..2085bae5318
--- /dev/null
+++ b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Compiler.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 122909a087e7cbe4e87f78ad5e77ff81
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Compiler/CodeGeneration.meta b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Compiler/CodeGeneration.meta
new file mode 100644
index 00000000000..3f810555839
--- /dev/null
+++ b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Compiler/CodeGeneration.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 003240f7123e4cb4f843fac31f113980
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Compiler/CodeGeneration/ComputeShaderWriter.cs b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Compiler/CodeGeneration/ComputeShaderWriter.cs
new file mode 100644
index 00000000000..383c5cc3f34
--- /dev/null
+++ b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Compiler/CodeGeneration/ComputeShaderWriter.cs
@@ -0,0 +1,28 @@
+using UnityEngine;
+
+namespace Unity.GraphCommon.LowLevel.Editor
+{
+    class ComputeShaderWriter : ShaderWriter
+    {
+        public override void Begin(string name)
+        {
+            base.Begin(name);
+
+            Pragma("kernel CSMain");
+            Pragma("only_renderers d3d11 glcore gles3 metal vulkan xboxone xboxone xboxseries playstation ps5 switch webgpu");
+            //Pragma("enable_d3d11_debug_symbols");
+            NewLine();
+        }
+
+        public override string End()
+        {
+            return base.End();
+        }
+
+        public void WriteMainFunction(uint x, uint y, uint z)
+        {
+            WriteLine($"[numthreads({x}, {y}, {z})]");
+            WriteLine("void CSMain(uint3 groupId : SV_GroupID, uint3 groupThreadId : SV_GroupThreadID)");
+        }
+    }
+}
diff --git a/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Compiler/CodeGeneration/ComputeShaderWriter.cs.meta b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Compiler/CodeGeneration/ComputeShaderWriter.cs.meta
new file mode 100644
index 00000000000..b44edf6fc06
--- /dev/null
+++ b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Compiler/CodeGeneration/ComputeShaderWriter.cs.meta
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: 339bbd674259e2148a2948e2d591cbd2
\ No newline at end of file
diff --git a/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Compiler/CodeGeneration/DataDescriptionWriterRegistry.cs b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Compiler/CodeGeneration/DataDescriptionWriterRegistry.cs
new file mode 100644
index 00000000000..0efb797082f
--- /dev/null
+++ b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Compiler/CodeGeneration/DataDescriptionWriterRegistry.cs
@@ -0,0 +1,63 @@
+using System.Collections.Generic;
+using UnityEngine;
+
+namespace Unity.GraphCommon.LowLevel.Editor
+{
+    class DataDescriptionWriterRegistry
+    {
+        Dictionary<System.Type, IDataDescriptionWriter> m_Writers = new();
+
+        public void Register(IDataDescriptionWriter writer)
+        {
+            var type = writer.DataDescriptionType;
+            Debug.Assert(!m_Writers.ContainsKey(type));
+            m_Writers.Add(type, writer);
+        }
+
+        public bool TryGetDataDescriptionWriter(IDataDescription dataDescription, out IDataDescriptionWriter dataDescriptionWriter)
+        {
+            return m_Writers.TryGetValue(dataDescription.GetType(), out dataDescriptionWriter);
+        }
+
+        public string GetSubdataName(DataView dataView, IDataKey subDataKey)
+        {
+            return m_Writers.TryGetValue(dataView.DataDescription.GetType(), out var writer) ? writer.GetSubdataName(subDataKey) : null;
+        }
+
+        public string GetSubdataTypeName(DataView dataView, IDataKey subDataKey)
+        {
+            return m_Writers.TryGetValue(dataView.DataDescription.GetType(), out var writer) ? writer.GetSubdataTypeName(subDataKey) : null;
+        }
+
+        public string FindDynamicDataTypeName(DataView dataView)
+        {
+            if (dataView.Parent.HasValue)
+            {
+                return FindDynamicDataTypeName(dataView.Parent.Value) + GetSubdataTypeName(dataView.Parent.Value, dataView.SubDataKey);
+            }
+            else
+            {
+                return dataView.DataContainer.Name;
+            }
+        }
+
+        public string FindDataTypeName(DataView dataView)
+        {
+            if (TryGetDataDescriptionWriter(dataView.DataDescription, out var _))
+            {
+                return FindDynamicDataTypeName(dataView);
+            }
+            else if (dataView.DataDescription is ValueData valueData)
+            {
+                if (typeof(Texture).IsAssignableFrom(valueData.Type)) // TODO: Binding resources directly, instead of declaring and initializing
+                    return $"{HlslCodeHelper.GetTypeName(valueData.Type)}";
+                else
+                    return $"static {HlslCodeHelper.GetTypeName(valueData.Type)}";
+            }
+            else
+            {
+                return "UnknownType";
+            }
+        }
+    }
+}
diff --git a/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Compiler/CodeGeneration/DataDescriptionWriterRegistry.cs.meta b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Compiler/CodeGeneration/DataDescriptionWriterRegistry.cs.meta
new file mode 100644
index 00000000000..36d82a0a06f
--- /dev/null
+++ b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Compiler/CodeGeneration/DataDescriptionWriterRegistry.cs.meta
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: 1c5ee58c3b2e5854d9c5894105ed891c
\ No newline at end of file
diff --git a/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Compiler/CodeGeneration/HlslCodeHelper.cs b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Compiler/CodeGeneration/HlslCodeHelper.cs
new file mode 100644
index 00000000000..03dbb4c4202
--- /dev/null
+++ b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Compiler/CodeGeneration/HlslCodeHelper.cs
@@ -0,0 +1,52 @@
+using System.Collections.Generic;
+using UnityEngine;
+
+namespace Unity.GraphCommon.LowLevel.Editor
+{
+    static class HlslCodeHelper
+    {
+        static Dictionary<System.Type, string> s_TypeNames;
+        static HlslCodeHelper()
+        {
+            s_TypeNames = new()
+            {
+                { typeof(bool), "bool" },
+                { typeof(float), "float" },
+                { typeof(Vector2), "float2" },
+                { typeof(Vector3), "float3" },
+                { typeof(Vector4), "float4" },
+                { typeof(int), "int" },
+                { typeof(Vector2Int), "int2" },
+                { typeof(Vector3Int), "int3" },
+                //{ typeof(Vector4Int), "int4" },
+                { typeof(uint), "uint" },
+                //{ typeof(uint), "uint2" },
+                //{ typeof(uint), "uint3" },
+                //{ typeof(uint), "uint4" },
+                { typeof(Color), "float4" },
+                { typeof(Matrix4x4), "float4x4" },
+                { typeof(Quaternion), "float4" },
+                { typeof(Texture2D), "texture2D" },
+            };
+        }
+
+        public static string GetTypeName(System.Type type) => s_TypeNames.TryGetValue(type, out var typeName) ? typeName : type.Name;
+
+        public static string GetValueString(object o)
+        {
+            return o switch
+            {
+                bool b => b ? "true" : "false",
+                float f => GetValueString(f),
+                Vector2 f2 => $"float2({GetValueString(f2.x)}, {GetValueString(f2.y)})",
+                Vector3 f3 => $"float3({GetValueString(f3.x)}, {GetValueString(f3.y)}, {GetValueString(f3.z)})",
+                Vector4 f4 => $"float4({GetValueString(f4.x)}, {GetValueString(f4.y)}, {GetValueString(f4.z)}, {GetValueString(f4.w)})",
+                Color c => $"float4({GetValueString(c.r)}, {GetValueString(c.g)}, {GetValueString(c.b)}, {GetValueString(c.a)})",
+                uint u => $"{u}u",
+                _ => o != null ? o.ToString() : "null"
+            };
+        }
+
+        static string GetValueString(float f) => $"{f:0.0#####}f";
+    }
+}
diff --git a/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Compiler/CodeGeneration/HlslCodeHelper.cs.meta b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Compiler/CodeGeneration/HlslCodeHelper.cs.meta
new file mode 100644
index 00000000000..0721e875631
--- /dev/null
+++ b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Compiler/CodeGeneration/HlslCodeHelper.cs.meta
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: 8e0fb05d6901c6747b543d890dff58f7
\ No newline at end of file
diff --git a/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Compiler/CodeGeneration/IncludeFileShaderWriter.cs b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Compiler/CodeGeneration/IncludeFileShaderWriter.cs
new file mode 100644
index 00000000000..b6e431ece25
--- /dev/null
+++ b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Compiler/CodeGeneration/IncludeFileShaderWriter.cs
@@ -0,0 +1,60 @@
+using System.Text;
+using UnityEngine;
+
+namespace Unity.GraphCommon.LowLevel.Editor
+{
+    class IncludeFileShaderWriter : ShaderWriter
+    {
+        private string m_GuardName;
+        private StringBuilder m_Builder = new();
+
+        public override void Begin(string name)
+        {
+            base.Begin(name);
+
+            Debug.Assert(m_GuardName == null);
+
+            m_GuardName = BuildGuardName(name);
+
+            WriteLine($"#ifndef {m_GuardName}");
+            WriteLine($"#define {m_GuardName}");
+            NewLine();
+        }
+
+        public override string End()
+        {
+            NewLine();
+            WriteLine($"#endif // {m_GuardName}");
+            m_GuardName = null;
+            return base.End();
+        }
+
+        string BuildGuardName(string name)
+        {
+            int index = 0;
+            bool wasLowercase = false;
+
+            Debug.Assert(ShaderBuilder.Length == 0);
+            m_Builder.Append("VFX");
+            for (int i = 0; i <= name.Length; ++i)
+            {
+                bool split = i == name.Length;
+                if (!split)
+                {
+                    bool isLowercase = char.IsLower(name[i]);
+                    split = wasLowercase && !isLowercase;
+                    wasLowercase = isLowercase;
+                }
+                if (split)
+                {
+                    m_Builder.Append('_');
+                    m_Builder.Append(name.Substring(index, i - index).ToUpperInvariant());
+                    index = i;
+                }
+            }
+            string guardName = m_Builder.ToString();
+            m_Builder.Clear();
+            return guardName;
+        }
+    }
+}
diff --git a/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Compiler/CodeGeneration/IncludeFileShaderWriter.cs.meta b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Compiler/CodeGeneration/IncludeFileShaderWriter.cs.meta
new file mode 100644
index 00000000000..63339019f0c
--- /dev/null
+++ b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Compiler/CodeGeneration/IncludeFileShaderWriter.cs.meta
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: 20c95f605e6175443bdd037763b74dd4
\ No newline at end of file
diff --git a/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Compiler/CodeGeneration/RenderingShaderWriter.cs b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Compiler/CodeGeneration/RenderingShaderWriter.cs
new file mode 100644
index 00000000000..e815c2ebfdc
--- /dev/null
+++ b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Compiler/CodeGeneration/RenderingShaderWriter.cs
@@ -0,0 +1,118 @@
+using System;
+
+namespace Unity.GraphCommon.LowLevel.Editor
+{
+    class RenderingShaderWriter : ShaderWriter
+    {
+        public override void Begin(string name)
+        {
+            base.Begin(name);
+            WriteLine($"Shader \"{name}\"");
+            OpenBlock();
+        }
+        public override string End()
+        {
+            CloseBlock();
+            return base.End();
+        }
+        public void SubShaderBegin()
+        {
+            WriteLine("SubShader");
+            OpenBlock();
+            WriteLine("Tags { \"Queue\"=\"Transparent\" \"RenderType\"=\"Transparent\"  \"IgnoreProjector\"=\"True\"}");
+            WriteLine("LOD 100");
+            WriteLine("Cull Off");
+            WriteLine("ZWrite Off");
+            WriteLine("Blend SrcAlpha OneMinusSrcAlpha");
+        }
+
+        public void SubShaderEnd()
+        {
+            CloseBlock();
+        }
+
+        public void BeginHlslInclude()
+        {
+            WriteLine("HLSLINCLUDE");
+        }
+
+        public void EndHlslInclude()
+        {
+            WriteLine("ENDHLSL");
+        }
+
+        public void PassBegin(string name)
+        {
+            WriteLine("Pass");
+            OpenBlock();
+            WriteLine("HLSLPROGRAM");
+            Pragma("target 5.0");
+            Pragma("enable_d3d11_debug_symbols");
+            Pragma("vertex VFXVertex");
+            Pragma("fragment VFXFragment");
+
+        }
+
+        public void PassEnd()
+        {
+            WriteLine("ENDHLSL");
+            CloseBlock();
+        }
+
+        public void WriteVertexFunction()
+        {
+            // TODO: the signature should be customizable
+            WriteLine("Varyings VFXVertex(uint id : SV_VertexID, VertexInput input)");
+        }
+
+        public void WriteFragmentFunction()
+        {
+            WriteLine("float4 VFXFragment(Varyings input) : SV_Target");
+        }
+
+        public SubShaderScope CreateSubShaderScope() => new(this);
+        public HlslIncludeScope CreateHlslIncludeScope() => new(this);
+        public PassScope CreatePassScope(string name) => new(this, name);
+        public readonly struct SubShaderScope : IDisposable
+        {
+            private readonly RenderingShaderWriter _writer;
+            public SubShaderScope(RenderingShaderWriter writer)
+            {
+                _writer = writer;
+                _writer.SubShaderBegin();
+            }
+            public void Dispose()
+            {
+                _writer.SubShaderEnd();
+            }
+        }
+
+        public readonly struct HlslIncludeScope : IDisposable
+        {
+            private readonly RenderingShaderWriter _writer;
+            public HlslIncludeScope(RenderingShaderWriter writer)
+            {
+                _writer = writer;
+                _writer.BeginHlslInclude();
+            }
+            public void Dispose()
+            {
+                _writer.EndHlslInclude();
+            }
+        }
+
+        public readonly struct PassScope : IDisposable
+        {
+            private readonly RenderingShaderWriter _writer;
+            public PassScope(RenderingShaderWriter writer, string name)
+            {
+                _writer = writer;
+                _writer.PassBegin(name);
+            }
+            public void Dispose()
+            {
+                _writer.PassEnd();
+            }
+        }
+    }
+}
diff --git a/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Compiler/CodeGeneration/RenderingShaderWriter.cs.meta b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Compiler/CodeGeneration/RenderingShaderWriter.cs.meta
new file mode 100644
index 00000000000..8da7a7200c6
--- /dev/null
+++ b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Compiler/CodeGeneration/RenderingShaderWriter.cs.meta
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: c3da6f3ff2fe4557b5602679261b2cf3
\ No newline at end of file
diff --git a/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Compiler/CodeGeneration/ShaderWriter.cs b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Compiler/CodeGeneration/ShaderWriter.cs
new file mode 100644
index 00000000000..a4fa1e58ec8
--- /dev/null
+++ b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Compiler/CodeGeneration/ShaderWriter.cs
@@ -0,0 +1,137 @@
+using System;
+using System.Text;
+using UnityEngine;
+
+namespace Unity.GraphCommon.LowLevel.Editor
+{
+    abstract class ShaderWriter
+    {
+        protected StringBuilder ShaderBuilder { get; } = new();
+        public uint IndentLevel { get; protected set; }
+
+        public virtual void Begin(string name)
+        {
+            Debug.Assert(ShaderBuilder.Length == 0, $"ShaderBuilder should be empty when beginning a new shader. Now contains: {ShaderBuilder}");
+            Debug.Assert(IndentLevel == 0, "IndentLevel should be 0 when beginning a new shader.");
+        }
+
+        public virtual string End()
+        {
+            Debug.Assert(IndentLevel == 0);
+            string shader = ShaderBuilder.ToString();
+
+            ShaderBuilder.Clear();
+
+            return shader;
+        }
+
+        public void NewLine()
+        {
+            ShaderBuilder.AppendLine();
+        }
+
+        public void Indent()
+        {
+            for (uint i = 0; i < IndentLevel; ++i)
+            {
+                ShaderBuilder.Append("\t");
+            }
+        }
+
+        public void Write(string text)
+        {
+            ShaderBuilder.Append(text);
+        }
+
+        [Flags]
+        public enum WriteLineOptions
+        {
+            None = 0,
+            NoIndent = 1 << 0,
+            NoNewLine = 1 << 1,
+            Multiline = 1 << 2
+        }
+
+        public void WriteLine(string line, WriteLineOptions writeLineOptions = WriteLineOptions.None)
+        {
+            if (writeLineOptions.HasFlag(WriteLineOptions.Multiline))
+            {
+                WriteLineOptions writeLineOptionsInner = writeLineOptions;
+                writeLineOptionsInner &= ~WriteLineOptions.Multiline;
+                writeLineOptionsInner &= ~WriteLineOptions.NoNewLine;
+
+                var lines = line.Split(Environment.NewLine, StringSplitOptions.RemoveEmptyEntries);
+                if (lines.Length > 0)
+                {
+                    for (int i = 0; i < lines.Length - 1; ++i)
+                    {
+                        WriteLine(lines[i], writeLineOptionsInner);
+                    }
+                    line = lines[^1];
+                }
+            }
+
+            if (!writeLineOptions.HasFlag(WriteLineOptions.NoIndent))
+            {
+                Indent();
+            }
+
+            if (writeLineOptions.HasFlag(WriteLineOptions.NoNewLine))
+            {
+                ShaderBuilder.Append(line);
+            }
+            else
+            {
+                ShaderBuilder.AppendLine(line);
+            }
+        }
+
+        public void OpenBlock(bool newLine = true)
+        {
+            WriteLine("{", newLine ? WriteLineOptions.None : WriteLineOptions.NoNewLine);
+            IndentLevel++;
+        }
+
+        public void CloseBlock(bool newLine = true)
+        {
+            Debug.Assert(IndentLevel > 0);
+            IndentLevel--;
+            WriteLine("}", newLine ? WriteLineOptions.None : WriteLineOptions.NoNewLine);
+        }
+
+        public void IncludeFile(string filePath)
+        {
+            //Debug.Assert(IndentLevel == 0); TODO: Move the assert to compute only ?
+            WriteLine($"#include \"{filePath}\"");
+        }
+
+        public void Pragma(string pragma)
+        {
+            //Debug.Assert(IndentLevel == 0);  TODO: Move the assert to compute only ?
+            WriteLine($"#pragma {pragma}");
+        }
+
+        public void Define(string define, string value = null)
+        {
+            //Debug.Assert(IndentLevel == 0);  TODO: Move the assert to compute only ?
+            if (string.IsNullOrEmpty(value))
+                WriteLine($"#define {define}");
+            else
+                WriteLine($"#define {define} {value}");
+        }
+
+        public void Undefine(string define)
+        {
+            //Debug.Assert(IndentLevel == 0);  TODO: Move the assert to compute only ?
+            WriteLine($"#undef {define}");
+        }
+
+        public void WriteTemplateSubtask(TemplateSubtask subtask)
+        {
+            WriteLine($"// {subtask.Name}"); // Temp name for debug purposes
+            OpenBlock();
+            WriteLine(subtask.Code, WriteLineOptions.Multiline);
+            CloseBlock();
+        }
+    }
+}
diff --git a/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Compiler/CodeGeneration/ShaderWriter.cs.meta b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Compiler/CodeGeneration/ShaderWriter.cs.meta
new file mode 100644
index 00000000000..bc83ee93bbc
--- /dev/null
+++ b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Compiler/CodeGeneration/ShaderWriter.cs.meta
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: ab13b40ad6705ff418a3741748d2b38a
\ No newline at end of file
diff --git a/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Compiler/CompilationData.cs b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Compiler/CompilationData.cs
new file mode 100644
index 00000000000..fa5636d967b
--- /dev/null
+++ b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Compiler/CompilationData.cs
@@ -0,0 +1,68 @@
+using System;
+using System.Collections.Generic;
+
+namespace Unity.GraphCommon.LowLevel.Editor
+{
+    /// <summary>
+    /// A class holding all transient data needed during compilation.
+    /// This is designed in a generic way. Any type of compilation data can be added.
+    /// Compilation passes can create and read generic compilation data (by type).
+    /// </summary>
+    /*public*/ class CompilationData
+    {
+        Dictionary<Type, object> m_Data = new();
+
+        /// <summary>
+        /// Gets the compilation data of a given type.
+        /// This will throw if no data of the given type has been previously created.
+        /// </summary>
+        /// <typeparam name="T">The type of compilation data to get.</typeparam>
+        /// <returns>the compilation data of type T.</returns>
+        public T Get<T>()
+        {
+            return (T)m_Data[typeof(T)];
+        }
+
+        /// <summary>
+        /// Gets the compilation data of a given type.
+        /// Creates it if not already existing.
+        /// </summary>
+        /// <typeparam name="T">The type of compilation data to get or create.</typeparam>
+        /// <returns>the compilation data of type T.</returns>
+        public T GetOrCreate<T>() where T : new()
+        {
+            var key = typeof(T);
+            object value;
+            m_Data.TryGetValue(key, out value);
+            if (value == null)
+            {
+                value = new T();
+                m_Data.Add(key, value);
+            }
+            return (T)value;
+        }
+
+        /// <summary>
+        /// Creates a compilation data of a given type.
+        /// This throws if compilation data of this type already exists.
+        /// </summary>
+        /// <typeparam name="T">The type of compilation data to create.</typeparam>
+        /// <param name="t">The initial value of the compilation data.</param>
+        public void Create<T>(T t)
+        {
+            var key = typeof(T);
+            if (m_Data.ContainsKey(key))
+                throw new ArgumentException("CompilationData already exists");
+
+            m_Data.Add(key, t);
+        }
+
+        /// <summary>
+        /// Clears all compilation data.
+        /// </summary>
+        public void Clear()
+        {
+            m_Data.Clear();
+        }
+    }
+}
diff --git a/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Compiler/CompilationData.cs.meta b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Compiler/CompilationData.cs.meta
new file mode 100644
index 00000000000..89c43eb1ad1
--- /dev/null
+++ b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Compiler/CompilationData.cs.meta
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: c52b398aa24d01e44acd6e80860fdda2
\ No newline at end of file
diff --git a/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Compiler/CompilationReport.cs b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Compiler/CompilationReport.cs
new file mode 100644
index 00000000000..3ce9040007d
--- /dev/null
+++ b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Compiler/CompilationReport.cs
@@ -0,0 +1,12 @@
+
+namespace Unity.GraphCommon.LowLevel.Editor
+{
+    /// <summary>
+    /// The Compilation report.
+    /// This holds all the relevant information about a given graph compilation.
+    /// </summary>
+    /*public*/ class CompilationReport
+    {
+        // TODO
+    }
+}
diff --git a/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Compiler/CompilationReport.cs.meta b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Compiler/CompilationReport.cs.meta
new file mode 100644
index 00000000000..f9a62046593
--- /dev/null
+++ b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Compiler/CompilationReport.cs.meta
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: 30b5289cbd2510b418a7a2f438f34c64
\ No newline at end of file
diff --git a/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Compiler/Compiler.cs b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Compiler/Compiler.cs
new file mode 100644
index 00000000000..05fe5037e77
--- /dev/null
+++ b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Compiler/Compiler.cs
@@ -0,0 +1,162 @@
+using System;
+using UnityEngine;
+
+namespace Unity.GraphCommon.LowLevel.Editor
+{
+    /// <summary>
+    /// A compilation pass is an independent and indivisible step to be performed at graph compilation.
+    /// It's registered when instantiating a compiler.
+    /// Compilation pass should have no side effect and are just mutating passed graph and compilation data.
+    /// Compilation is typically made up of several compilation passes.
+    /// </summary>
+    /*public*/ interface CompilationPass
+    {
+        /// <summary>
+        /// Executes the compilation pass.
+        /// This is called internally by the graph compiler.
+        /// </summary>
+        /// <param name="context">The compilation context.</param>
+        /// <returns>true if the pass execution succeeded, false otherwise.</returns>
+        public bool Execute(ref CompilationContext context);
+    }
+
+    /// <summary>
+    /// A special compilation pass responsible for generating the compiled data.
+    /// This is typically the last pass executed during the graph compilation pipe.
+    /// </summary>
+    /// <typeparam name="T">The type of the generated data.</typeparam>
+    /*public*/ interface DataGenerationPass<T>
+    {
+        /// <summary>
+        /// Executes the data generation pass.
+        /// This is called internally by the graph compiler.
+        /// </summary>
+        /// <param name="context">The compilation context.</param>
+        /// <returns>the generated data of type T, or null if the pass failed</returns>
+        public T Execute(ref CompilationContext context);
+    }
+
+    /// <summary>
+    /// A struct holding data passed through compilation passes during a graph compilation.
+    /// </summary>
+    /*public*/ struct CompilationContext
+    {
+        /// <summary>
+        /// The mutable graph to be transformed.
+        /// </summary>
+        public IMutableGraph graph;
+        /// <summary>
+        /// The compilation data carried aside the graph.
+        /// </summary>
+        public CompilationData data;
+        /// <summary>
+        /// The compilation report.
+        /// </summary>
+        public CompilationReport report;
+    }
+
+    /// <summary>
+    /// A struct holding outputs to a graph compilation.
+    /// </summary>
+    /// <typeparam name="T">The type of the generated data.</typeparam>
+    /*public*/ struct CompilationResult<T>
+    {
+        /// <summary>
+        /// The generated data.
+        /// This is the actual result of the graph compilation.
+        /// </summary>
+        public T result;
+        /// <summary>
+        /// The input graph required to be compiled.
+        /// </summary>
+        public IReadOnlyGraph source;
+        /// <summary>
+        /// The final graph after transformations during the compilation.
+        /// </summary>
+        public IReadOnlyGraph finalGraph;
+        /// <summary>
+        /// The compilation report.
+        /// </summary>
+        public CompilationReport report;
+    }
+
+    /// <summary>
+    /// The compiler is responsible to transform a graph into compiled data for runtime.
+    /// It is designed in a modular way and comprised of a series of independent compilation passes.
+    /// The last pass is a special one responsible for generating the generic compiled data.
+    /// </summary>
+    /// <typeparam name="T">The type of the generated data.</typeparam>
+    /*public*/ class Compiler<T>
+    {
+        CompilationPass[] m_Passes;
+        DataGenerationPass<T> m_FinalPass;
+
+        /// <summary>
+        /// The constructor of Compiler.
+        /// </summary>
+        /// <param name="dataGenerationPass">The data generation pass (the final pass).</param>
+        /// <param name="passList">The list of compilation passes.</param>
+        public Compiler(DataGenerationPass<T> dataGenerationPass, params CompilationPass[] passList)
+        {
+            if (dataGenerationPass == null || passList == null)
+                throw new ArgumentNullException();
+
+            m_Passes = passList;
+            m_FinalPass = dataGenerationPass;
+        }
+
+        /// <summary>
+        /// Compiles a given graph.
+        /// Note that the passed graph is readonly and unaltered by the compilation.
+        /// </summary>
+        /// <param name="graph">The input graph to compile.</param>
+        /// <returns>The result if the compilation.</returns>
+        public CompilationResult<T> Compile(IReadOnlyGraph graph)
+        {
+            if (graph == null)
+                throw new ArgumentNullException("Trying to compile a null graph");
+
+            var context = new CompilationContext
+            {
+                graph = graph.Copy(),
+                data = new CompilationData(),
+                report = new CompilationReport(),
+            };
+
+            bool error = false;
+            foreach (var pass in m_Passes)
+            {
+                try
+                {
+                    if (!pass.Execute(ref context))
+                    {
+                        error = true;
+                        break;
+                    }
+                }
+                catch (Exception e)
+                {
+                    Debug.Log($"Exception in Compilation Pass {pass} : {e.Message}. Compilation aborted {e.StackTrace}");
+                    error = true;
+                    break;
+                }
+            }
+
+            T compiledGraph = default(T);
+            IReadOnlyGraph finalGraph = null;
+            if (!error)
+            {
+                compiledGraph = m_FinalPass.Execute(ref context);
+                finalGraph = context.graph;
+            }
+
+            return new CompilationResult<T>
+            {
+                result = compiledGraph,
+                source = graph,
+                finalGraph = finalGraph,
+                report = context.report,
+            };
+        }
+    }
+}
diff --git a/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Compiler/Compiler.cs.meta b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Compiler/Compiler.cs.meta
new file mode 100644
index 00000000000..698bf072449
--- /dev/null
+++ b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Compiler/Compiler.cs.meta
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: af50eebdc5ec49f4a96073b40f83a2b9
\ No newline at end of file
diff --git a/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Compiler/Passes.meta b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Compiler/Passes.meta
new file mode 100644
index 00000000000..4c1980b3392
--- /dev/null
+++ b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Compiler/Passes.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 572520532423f7749a91d687a82bff91
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Compiler/Passes/AttributeLayoutPass.cs b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Compiler/Passes/AttributeLayoutPass.cs
new file mode 100644
index 00000000000..7ed5f00b1a8
--- /dev/null
+++ b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Compiler/Passes/AttributeLayoutPass.cs
@@ -0,0 +1,277 @@
+using System.Collections.Generic;
+using UnityEngine;
+
+namespace Unity.GraphCommon.LowLevel.Editor
+{
+    internal class AttributeLayoutPass : CompilationPass
+    {
+        static bool Contains(IEnumerable<DataView> dataViews, DataViewId dataViewId)
+        {
+            foreach (var dataView in dataViews)
+            {
+                if(dataView.Id.Equals(dataViewId)) return true;
+            }
+            return false;
+        }
+        public bool Execute(ref CompilationContext context)
+        {
+            // Gather all attribute set datas
+            // For each attribute set :
+            //  Gather attributes
+            //  Detect local-only attributes, else stored
+            //  Compute affinities between stored attributes
+            //  Group attributes based on affinities
+            //  Generate attribute layout description
+
+            var attributeSetLayoutCompilationData = context.data.GetOrCreate<AttributeSetLayoutCompilationData>();
+
+            List<DataView> attributeSetDataViews = new List<DataView>();
+            // Gather attribute set data
+            foreach (var dataView in context.graph.DataViews)
+            {
+                if (dataView.DataDescription is AttributeData attributeData)
+                {
+                    attributeSetDataViews.Add(dataView);
+                }
+            }
+            var traverser = context.graph.CreateTraverser();
+            foreach (var attributeSetDataView in attributeSetDataViews)
+            {
+                var attributeSetLayout = GenerateAttributeLayout(traverser, attributeSetDataView, context.graph);
+                var attributeData = attributeSetDataView.DataDescription as AttributeData;
+                attributeSetLayoutCompilationData[attributeData] = attributeSetLayout;
+            }
+            return true;
+        }
+
+        private static AttributeSetLayout GenerateAttributeLayout(GraphTraverser traverser, DataView attributeSetDataView, IReadOnlyGraph graph)
+        {
+            Dictionary<DataViewId, long> attributeKeys = new Dictionary<DataViewId, long>();
+            HashSet<DataViewId> storedAttributes = new HashSet<DataViewId>();
+
+            foreach (var rootDataNode in traverser.TraverseDataRoots())
+            {
+                if (rootDataNode.DataContainer.RootDataView.DataDescription != attributeSetDataView.Root.DataDescription)
+                    continue;
+
+                foreach (var dataNode in traverser.TraverseDataDownwards(rootDataNode))
+                {
+                    foreach (var dataView in dataNode.UsedDataViews)
+                    {
+                        if (!dataView.Parent.HasValue || !dataView.Parent.Value.Id.Equals(attributeSetDataView.Id)) continue;
+
+                        attributeKeys.TryAdd(dataView.Id, 0);
+
+                        bool isRead = Contains(dataNode.ReadDataViews, dataView.Id);
+                        bool isWritten = Contains(dataNode.WrittenDataViews, dataView.Id);
+
+                        long readWriteValue = 0;
+                        if (isRead)
+                            readWriteValue |= 0x01;
+                        if (isWritten)
+                            readWriteValue |= 0x02;
+                        int shift = dataNode.TaskNode.Id.Index << 1;
+                        attributeKeys[dataView.Id] |= readWriteValue << shift;
+                        if (isRead)
+                        {
+                            if (isWritten)
+                            {
+                                storedAttributes.Add(dataView.Id);
+                                continue;
+                            }
+                            foreach (var parentDataNode in traverser.TraverseDataUpwards(dataNode))
+                            {
+                                if(dataNode.Id.Equals(parentDataNode.Id))
+                                    continue;
+                                if (Contains(parentDataNode.WrittenDataViews, dataView.Id))
+                                {
+                                    storedAttributes.Add(dataView.Id);
+                                    break;
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+
+            var attributeGroups = new Dictionary<long, List<Attribute>>();
+
+            foreach (var kvp in attributeKeys)
+            {
+                var dataViewId = kvp.Key;
+                if (storedAttributes.Contains(dataViewId))
+                {
+                    if (!attributeGroups.TryGetValue(kvp.Value, out var attributeGroup))
+                    {
+                        attributeGroup = new List<Attribute>();
+                        attributeGroups.Add(kvp.Value, attributeGroup);
+                    }
+
+                    AttributeKey attributeKey = graph.DataViews[dataViewId].SubDataKey as AttributeKey;
+                    if (attributeKey == null)
+                    {
+                        Debug.LogWarning($"Attribute {dataViewId} does not have an AttributeKey as sub data key");
+                    }
+                    Attribute attribute = attributeKey.Attribute;
+
+                    attributeGroup.Add(attribute);
+                }
+            }
+            var attributeDataDesc = attributeSetDataView.DataDescription as AttributeData;
+            var attributeSetLayout = new AttributeSetLayout(attributeDataDesc.Capacity);
+
+            foreach (var group in attributeGroups)
+            {
+                attributeSetLayout.AddGroup(group.Value);
+            }
+            return attributeSetLayout;
+        }
+    }
+
+    struct AttributeBucket
+    {
+        public uint m_Offset;
+        public uint m_Size;
+
+        public AttributeBucket(uint bucketOffset, uint bucketSize)
+        {
+            m_Offset = bucketOffset;
+            m_Size = bucketSize;
+        }
+    }
+
+    struct AttributeSetLayout
+    {
+        private struct AttributeLayoutInfo
+        {
+            public uint bucket;
+            public uint offset;
+
+            public AttributeLayoutInfo(uint bucket, uint offset)
+            {
+                this.bucket = bucket;
+                this.offset = offset;
+            }
+        }
+        private List<AttributeBucket> m_AttributeBuckets;
+        public uint Capacity { get; }
+        private Dictionary<Attribute, AttributeLayoutInfo> m_AttributeLayouts;
+
+        public bool Valid => m_AttributeBuckets != null && m_AttributeLayouts != null;
+        public IEnumerable<Attribute> Attributes => m_AttributeLayouts.Keys;
+
+        public AttributeSetLayout(uint capacity)
+        {
+            m_AttributeBuckets = new List<AttributeBucket>();
+            m_AttributeLayouts = new Dictionary<Attribute, AttributeLayoutInfo>();
+            Capacity = capacity;
+        }
+
+        public void AddGroup(IEnumerable<Attribute> attributes)
+        {
+            //TODO: For now all attributes with the same key in the same bucket.
+            AddBucket(attributes);
+        }
+
+        void AddBucket(IEnumerable<Attribute> attributes)
+        {
+            uint bucketOffset = m_AttributeBuckets.Count == 0 ? 0u :(uint)(m_AttributeBuckets[^1].m_Offset + Capacity * m_AttributeBuckets[^1].m_Size);
+            uint currentOffset = 0;
+            foreach (var attribute in attributes)
+            {
+                m_AttributeLayouts.Add(attribute, new AttributeLayoutInfo((uint)m_AttributeBuckets.Count, currentOffset));
+                currentOffset += (uint)System.Runtime.InteropServices.Marshal.SizeOf(attribute.DefaultValue)/sizeof(uint);
+            }
+
+            uint bucketSize = currentOffset;
+            var attributeBucket = new AttributeBucket(bucketOffset, bucketSize);
+            m_AttributeBuckets.Add(attributeBucket);
+        }
+
+        public uint GetBufferSize()
+        {
+            return m_AttributeBuckets.Count > 0 ? m_AttributeBuckets[^1].m_Offset + Capacity * m_AttributeBuckets[^1].m_Size : 0;
+        }
+
+        public bool ContainsAttribute(Attribute attribute)
+        {
+            return m_AttributeLayouts.ContainsKey(attribute);
+        }
+
+        public (uint offset, uint stride) GetAttributeLocation(Attribute attrib)
+        {
+            AttributeLayoutInfo layoutInfo;
+            if (!m_AttributeLayouts.TryGetValue(attrib, out layoutInfo))
+            {
+                Debug.LogError($"Could not find layout for attribute {attrib.Name}");
+            }
+            return GetAttributeLocation(layoutInfo);
+        }
+
+        private (uint offset, uint stride) GetAttributeLocation(AttributeLayoutInfo layoutInfo)
+        {
+            return (m_AttributeBuckets[(int)layoutInfo.bucket].m_Offset + layoutInfo.offset,
+                m_AttributeBuckets[(int)layoutInfo.bucket].m_Size);
+        }
+
+        public (uint bucketOffset, uint bucketSize, uint elementOffset) GetBucketLocation(Attribute attrib)
+        {
+            AttributeLayoutInfo layoutInfo;
+            if (!m_AttributeLayouts.TryGetValue(attrib, out layoutInfo))
+            {
+                Debug.LogError($"Could not find layout for attribute {attrib.Name}");
+            }
+
+            return (m_AttributeBuckets[(int)layoutInfo.bucket].m_Offset,
+                m_AttributeBuckets[(int)layoutInfo.bucket].m_Size,
+                layoutInfo.offset);
+        }
+
+        // Iterates the attributes, with their corresponding offset and stride
+        public struct Enumerator
+        {
+            AttributeSetLayout m_Owner;
+            Dictionary<Attribute, AttributeLayoutInfo>.Enumerator m_Inner;
+
+            public Enumerator(AttributeSetLayout owner)
+            {
+                m_Owner = owner;
+                m_Inner = owner.m_AttributeLayouts.GetEnumerator();
+            }
+
+            public (Attribute, uint, uint) Current
+            {
+                get
+                {
+                    var current = m_Inner.Current;
+                    (uint offset, uint stride) = m_Owner.GetAttributeLocation(current.Value);
+                    return (current.Key, offset, stride);
+                }
+            }
+
+            public void Dispose() => m_Inner.Dispose();
+            public bool MoveNext() => m_Inner.MoveNext();
+
+        }
+        public Enumerator GetEnumerator() => new Enumerator(this);
+    }
+
+    class AttributeSetLayoutCompilationData
+    {
+        Dictionary<AttributeData, AttributeSetLayout> m_layouts = new();
+
+        public AttributeSetLayout this[AttributeData attributeData]
+        {
+            get
+            {
+                return m_layouts.TryGetValue(attributeData, out AttributeSetLayout layout) ? layout : new AttributeSetLayout();
+            }
+            set
+            {
+                m_layouts[attributeData] = value;
+            }
+        }
+
+        public Dictionary<AttributeData, AttributeSetLayout>.Enumerator GetEnumerator() => m_layouts.GetEnumerator();
+    }
+}
diff --git a/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Compiler/Passes/AttributeLayoutPass.cs.meta b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Compiler/Passes/AttributeLayoutPass.cs.meta
new file mode 100644
index 00000000000..f62f72a09d2
--- /dev/null
+++ b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Compiler/Passes/AttributeLayoutPass.cs.meta
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: a3a088f23a794f05b4f4e5bed4d91205
\ No newline at end of file
diff --git a/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Compiler/Passes/GraphVisualizerPasses.cs b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Compiler/Passes/GraphVisualizerPasses.cs
new file mode 100644
index 00000000000..ac04843b611
--- /dev/null
+++ b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Compiler/Passes/GraphVisualizerPasses.cs
@@ -0,0 +1,327 @@
+using System.Collections.Generic;
+using System.Text;
+using UnityEngine;
+
+namespace Unity.GraphCommon.LowLevel.Editor
+{
+    class GraphVisualizerTaskPass : CompilationPass
+    {
+        private string Path { get; }
+
+        public GraphVisualizerTaskPass(string path)
+        {
+            Debug.Assert(path != null);
+            Path = path;
+        }
+
+        public bool Execute(ref CompilationContext context)
+        {
+            StringBuilder sb = new StringBuilder();
+            using (new GraphVisualizer.GraphScope(sb))
+            {
+                foreach (var taskNode in context.graph.TaskNodes)
+                {
+                    var taskLabel = GraphVisualizerPassesHelpers.TaskLabel(taskNode);
+                    GraphVisualizer.AddNode(sb, taskNode.Id.Index, taskLabel);
+                    foreach (var child in taskNode.Children)
+                    {
+                        GraphVisualizer.AddLink(sb, taskNode.Id.Index, child.Id.Index);
+                    }
+                }
+            }
+            GraphVisualizer.SaveFile(sb, Path);
+            return true;
+        }
+    }
+
+    class GraphVisualizerDataPass : CompilationPass
+    {
+        private string Path { get; }
+
+        public GraphVisualizerDataPass(string path)
+        {
+            Debug.Assert(path != null);
+            Path = path;
+        }
+
+        public bool Execute(ref CompilationContext context)
+        {
+            StringBuilder sb = new StringBuilder();
+            using (new GraphVisualizer.GraphScope(sb))
+            {
+                foreach (var dataNode in context.graph.DataNodes)
+                {
+                    var taskLabel = $"{(dataNode.TaskNode.Task is Task task ? task.DebugName : dataNode.TaskNode.Task.GetType().Name)} - {dataNode.TaskNode.Id}";
+                    var dataLabel = $"{dataNode.Id} ({taskLabel})";
+                    GraphVisualizer.AddNode(sb, dataNode.Id.Index, dataLabel);
+                    foreach (var child in dataNode.Children)
+                    {
+                        GraphVisualizer.AddLink(sb, dataNode.Id.Index, child.Id.Index);
+                    }
+                }
+            }
+            GraphVisualizer.SaveFile(sb, Path);
+            return true;
+        }
+    }
+
+    class GraphVisualizerDataViewAccessesPass : CompilationPass
+    {
+        private string Path { get; }
+        public GraphVisualizerDataViewAccessesPass(string path)
+        {
+            Debug.Assert(path != null);
+            Path = path;
+        }
+
+        //TODO: this is a temporary solution, should be replaced with a more generic way to check if a data view is used
+        static bool Contains(IEnumerable<DataView> dataViews, DataViewId dataViewId)
+        {
+            foreach (var dataView in dataViews)
+            {
+                if(dataView.Id.Equals(dataViewId)) return true;
+            }
+            return false;
+        }
+        public bool Execute(ref CompilationContext context)
+        {
+            StringBuilder sb = new StringBuilder();
+
+            Dictionary<DataViewId, LinearGraph<DataNodeId>> accessGraphs = new Dictionary<DataViewId, LinearGraph<DataNodeId>>();
+            Dictionary<DataViewId, Dictionary<DataNodeId, int>> idToIndex = new ();
+
+            var traverser = context.graph.CreateTraverser();
+
+            foreach (var rootDataNode in traverser.TraverseDataRoots())
+            {
+                foreach (var dataNode in traverser.TraverseDataDownwards(rootDataNode))
+                {
+                    foreach (var dataView in dataNode.UsedDataViews)
+                    {
+                        if (!accessGraphs.ContainsKey(dataView.Id))
+                        {
+                            accessGraphs.Add(dataView.Id, new LinearGraph<DataNodeId>());
+                            idToIndex.Add(dataView.Id, new Dictionary<DataNodeId, int>());
+                        }
+
+                        int index = accessGraphs[dataView.Id].AddItem(dataNode.Id);
+                        idToIndex[dataView.Id].Add(dataNode.Id, index);
+
+                        // TODO: probably should unify "used" data view + an enum for read/write
+                        if (Contains(dataNode.ReadDataViews, dataView.Id))
+                        {
+                            foreach (var parentDataNode in traverser.TraverseDataUpwards(dataNode))
+                            {
+                                if(dataNode.Id.Equals(parentDataNode.Id))
+                                    continue;
+                                if (Contains(parentDataNode.WrittenDataViews, dataView.Id))
+                                {
+                                    accessGraphs[dataView.Id].Connect(idToIndex[dataView.Id][parentDataNode.Id],
+                                        idToIndex[dataView.Id][dataNode.Id]);
+                                    break;
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+
+
+            using (new GraphVisualizer.GraphScope(sb))
+            {
+                foreach (var (dataViewId, graph) in accessGraphs)
+                {
+                    string nodeLabel = $"{context.graph.DataViews[dataViewId].DataDescription.Name} ({dataViewId})";
+                    using (new GraphVisualizer.ClusterScope(dataViewId.Index, nodeLabel, sb))
+                    {
+                        foreach (var node in graph)
+                        {
+                            int nodeIndex = node.Data.Index | dataViewId.Index << 16;
+
+                            GraphVisualizer.AddNode(sb, nodeIndex, node.Data.ToString());
+                            foreach (var parentNode in node.Parents)
+                            {
+                                int parentNodeIndex = parentNode.Data.Index | dataViewId.Index << 16;
+                                GraphVisualizer.AddLink(sb, parentNodeIndex, nodeIndex);
+                            }
+                        }
+                    }
+                }
+            }
+
+            GraphVisualizer.SaveFile(sb, Path);
+            return true;
+        }
+    }
+    class GraphVisualizerDataViewInTaskPass : CompilationPass
+    {
+        private string Path { get; }
+        public GraphVisualizerDataViewInTaskPass(string path)
+        {
+            Debug.Assert(path != null);
+            Path = path;
+        }
+        public bool Execute(ref CompilationContext context)
+        {
+            var traverser = context.graph.CreateTraverser();
+
+            StringBuilder sb = new StringBuilder();
+            using (new GraphVisualizer.GraphScope(sb))
+            {
+                foreach (var taskNode in context.graph.TaskNodes)
+                {
+                    var taskLabel = GraphVisualizerPassesHelpers.TaskLabel(taskNode);
+
+                    using (new GraphVisualizer.ClusterScope(taskNode.Id.Index, taskLabel, sb))
+                    {
+                        foreach (var dataNode in taskNode.DataNodes)
+                        {
+                            foreach (var dataView in dataNode.UsedDataViews)
+                            {
+                                int nodeIndex = dataNode.Id.Index | dataView.Id.Index << 16;
+                                var dataLabel = $"{dataView.DataContainer.Name}/{dataView.SubDataKey} ({dataView.Id})";
+                                GraphVisualizer.AddNode(sb, nodeIndex, dataLabel);
+                            }
+                        }
+                    }
+                }
+
+                foreach (var dataNode in context.graph.DataNodes)
+                {
+                    foreach (var dataView in dataNode.UsedDataViews)
+                    {
+                        int nodeIndex = dataNode.Id.Index | dataView.Id.Index << 16;
+                        traverser.TraverseDataUpwards(dataNode,
+                            parentDataNode =>
+                            {
+                                if (parentDataNode.Id.Equals(dataNode.Id))
+                                    return true;
+                                foreach (var parentDataView in parentDataNode.WrittenDataViews)
+                                {
+                                    if (dataView.Id.Equals(parentDataView.Id))
+                                    {
+                                        int parentNodeIndex = parentDataNode.Id.Index | parentDataView.Id.Index << 16;
+                                        GraphVisualizer.AddLink(sb, parentNodeIndex, nodeIndex);
+                                        return false;
+                                    }
+                                }
+                                return true;
+                                 }).Execute();
+                    }
+                }
+            }
+            GraphVisualizer.SaveFile(sb, Path);
+            return true;
+        }
+    }
+    class GraphVisualizerDataViewTreePass : CompilationPass
+    {
+        private string Path { get; }
+
+        public GraphVisualizerDataViewTreePass(string path)
+        {
+            Debug.Assert(path != null);
+            Path = path;
+        }
+
+        private static void AddNodeRecursive(StringBuilder sb, DataView dataView)
+        {
+            var dataLabel = $"{dataView.Id} ({dataView.SubDataKey})";
+            GraphVisualizer.AddNode(sb, dataView.Id.Index, dataLabel);
+            foreach (var child in dataView.Children)
+            {
+                AddNodeRecursive(sb, child);
+                GraphVisualizer.AddLink(sb, dataView.Id.Index, child.Id.Index);
+            }
+        }
+        public bool Execute(ref CompilationContext context)
+        {
+            StringBuilder sb = new StringBuilder();
+            using (new GraphVisualizer.GraphScope(sb))
+            {
+                foreach (var dataView in context.graph.DataViews)
+                {
+                    if (dataView.Parent == null)
+                    {
+                        AddNodeRecursive(sb, dataView);
+                    }
+                }
+            }
+            GraphVisualizer.SaveFile(sb, Path);
+            return true;
+        }
+    }
+
+    class GraphVisualizerDataInTaskPass : CompilationPass
+    {
+        private string Path { get; }
+
+        public GraphVisualizerDataInTaskPass(string path)
+        {
+            Debug.Assert(path != null);
+            Path = path;
+        }
+
+        public bool Execute(ref CompilationContext context)
+        {
+            StringBuilder sb = new StringBuilder();
+            using (new GraphVisualizer.GraphScope(sb))
+            {
+                foreach (var taskNode in context.graph.TaskNodes)
+                {
+                    var taskLabel = GraphVisualizerPassesHelpers.TaskLabel(taskNode);
+
+                    using (new GraphVisualizer.ClusterScope(taskNode.Id.Index, taskLabel, sb))
+                    {
+                        foreach (var dataNode in taskNode.DataNodes)
+                        {
+                            var dataLabel = $"{dataNode.Id} (R:";
+                            foreach (var dataView in dataNode.ReadDataViews)
+                            {
+                                dataLabel += $"{dataView.Id} ";
+                            }
+                            dataLabel += "|W:";
+                            foreach (var dataView in dataNode.WrittenDataViews)
+                            {
+                                dataLabel += $"{dataView.Id} ";
+                            }
+                            dataLabel += ")";
+                            GraphVisualizer.AddNode(sb, dataNode.Id.Index, dataLabel);
+                        }
+                    }
+                }
+
+                foreach (var dataNode in context.graph.DataNodes)
+                {
+                    foreach (var parent in dataNode.Parents)
+                    {
+                        GraphVisualizer.AddLink(sb, parent.Id.Index, dataNode.Id.Index);
+                    }
+                }
+            }
+            GraphVisualizer.SaveFile(sb, Path);
+            return true;
+        }
+
+
+    }
+
+    static class GraphVisualizerPassesHelpers
+    {
+        public static string TaskLabel(TaskNode taskNode)
+        {
+            string taskName;
+            if(taskNode.Task is Task task)
+                taskName = task.DebugName;
+            else if (taskNode.Task is ExpressionTask expressionTask)
+                taskName = $"{expressionTask.GetType().Name}-{expressionTask.Expression.ResultType.Name}";
+            else if (taskNode.Task is TemplatedTask templatedTask)
+                taskName = $"TemplatedTask-{templatedTask.TemplateName}";
+            else
+                taskName = taskNode.Task.GetType().Name;
+            var taskLabel =
+                $"{taskName}({taskNode.Id})";
+            return taskLabel;
+        }
+    }
+}
diff --git a/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Compiler/Passes/GraphVisualizerPasses.cs.meta b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Compiler/Passes/GraphVisualizerPasses.cs.meta
new file mode 100644
index 00000000000..065d9a8b8a4
--- /dev/null
+++ b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Compiler/Passes/GraphVisualizerPasses.cs.meta
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: 46efba797d20493429ccebfd34fb3441
\ No newline at end of file
diff --git a/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Compiler/Passes/StructuredDataLayoutPass.cs b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Compiler/Passes/StructuredDataLayoutPass.cs
new file mode 100644
index 00000000000..c503e29efc4
--- /dev/null
+++ b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Compiler/Passes/StructuredDataLayoutPass.cs
@@ -0,0 +1,193 @@
+using System;
+using System.Collections.Generic;
+using UnityEngine;
+
+namespace Unity.GraphCommon.LowLevel.Editor
+{
+    class StructuredDataLayoutPass : CompilationPass
+    {
+        public bool Execute(ref CompilationContext context)
+        {
+            StructuredDataLayoutContainer structuredDataLayoutContainer = context.data.GetOrCreate<StructuredDataLayoutContainer>();
+
+            foreach (var dataView in context.graph.DataViews)
+            {
+                if (dataView.DataDescription is StructuredData structuredData)
+                {
+                    ValueBufferLayout valueBufferLayout = structuredDataLayoutContainer.CreateLayout(structuredData);
+                    foreach (var subData in structuredData.SubDataDescriptions)
+                    {
+                        if (subData is ValueData valueData && !typeof(Texture).IsAssignableFrom(valueData.Type))
+                        {
+                            valueBufferLayout.AddValueData(valueData);
+                        }
+                    }
+                    valueBufferLayout.ComputeOffsets();
+                }
+            }
+            return true;
+        }
+    }
+
+
+
+    class ValueBufferLayout
+    {
+        private List<ValueData> m_ValueDatas = new();
+        private Dictionary<ValueData, int> m_ValueDataOffsets = new();
+        private List<Bucket> m_BucketedValueDatas = new();
+        private int m_TotalSize;
+        private static readonly int kAlignement = 4;
+
+        public IEnumerable<ValueData> ValueDatas => m_ValueDatas;
+
+        public uint GetBufferSize()
+        {
+            if (m_ValueDataOffsets.Count == 0)
+            {
+                throw new Exception("Value data offsets have not been initialized.");
+            }
+
+            return (uint)m_TotalSize;
+        }
+
+        public void AddValueData(ValueData value)
+        {
+            m_ValueDatas.Add(value);
+        }
+
+        public int GetValueOffset(ValueData valueData)
+        {
+            if (m_ValueDataOffsets.Count == 0)
+            {
+                throw new Exception("Value data offsets have not been initialized.");
+            }
+
+            return m_ValueDataOffsets.GetValueOrDefault(valueData, -1);
+        }
+
+        public bool ContainsValueData(ValueData valueData)
+        {
+            return m_ValueDataOffsets.ContainsKey(valueData);
+        }
+
+        struct OffsetValueData
+        {
+            public ValueData ValueData { get; }
+            public int OffsetInBucket { get; }
+
+            public OffsetValueData(ValueData valueData, int offsetInBucket)
+            {
+                ValueData = valueData;
+                OffsetInBucket = offsetInBucket;
+            }
+        }
+        class Bucket
+        {
+            List<OffsetValueData> m_BucketValueDatas;
+            int m_CurrentSize;
+
+            public Bucket(ValueData valueData)
+            {
+                m_BucketValueDatas = new List<OffsetValueData>();
+                m_BucketValueDatas.Add(new OffsetValueData(valueData, 0));
+                int valueSize = ValueSize(valueData);
+                m_CurrentSize = valueSize;
+            }
+
+            public bool TryAdd(ValueData valueData)
+            {
+                int valueSize = ValueSize(valueData);
+                if(m_CurrentSize + valueSize <= kAlignement)
+                {
+                    m_BucketValueDatas.Add(new OffsetValueData(valueData, m_CurrentSize));
+                    m_CurrentSize += valueSize;
+                    return true;
+                }
+                return false;
+            }
+
+            public int CurrentSize => m_CurrentSize;
+            public IEnumerable<OffsetValueData> OffsetValueDatas => m_BucketValueDatas;
+        }
+        List<Bucket> CreateBuckets()
+        {
+            List<Bucket> buckets = new();
+
+            foreach (var valueData in m_ValueDatas)
+            {
+                bool bucketFound = false;
+                foreach (var bucket in buckets)
+                {
+                    if (bucket.TryAdd(valueData))
+                    {
+                        bucketFound = true;
+                        break;
+                    }
+                }
+                if (bucketFound)
+                    continue;
+                // Suitable bucket not found, create a new one
+                var newBucket = new Bucket(valueData);
+                buckets.Add(newBucket);
+            }
+
+            return buckets;
+        }
+        public void ComputeOffsets()
+        {
+            m_ValueDataOffsets.Clear();
+            m_BucketedValueDatas = CreateBuckets();
+            int currentBucketOffset = 0;
+            foreach (var bucket in m_BucketedValueDatas)
+            {
+                foreach (var offsetValueData in bucket.OffsetValueDatas)
+                {
+                    m_ValueDataOffsets[offsetValueData.ValueData] = currentBucketOffset + offsetValueData.OffsetInBucket;
+                }
+                currentBucketOffset += kAlignement;
+            }
+            m_TotalSize = currentBucketOffset;
+        }
+
+        //TODO: Temporary method to get the sorted list of value datas
+        public List<ValueData> GetSortedValueDatas()
+        {
+            List<ValueData> sortedValueDatas = new();
+            foreach (var bucket in m_BucketedValueDatas)
+            {
+                foreach (var offsetValueData in bucket.OffsetValueDatas)
+                {
+                    sortedValueDatas.Add(offsetValueData.ValueData);
+                }
+            }
+            return sortedValueDatas;
+        }
+
+        static int ValueSize(ValueData valueData)
+        {
+            return System.Runtime.InteropServices.Marshal.SizeOf(valueData.Type) / sizeof(uint);
+        }
+    }
+
+    class StructuredDataLayoutContainer
+    {
+        Dictionary<StructuredData, ValueBufferLayout> m_GraphValuesLayouts = new();
+
+        internal ValueBufferLayout CreateLayout(StructuredData structuredData)
+        {
+            if (!m_GraphValuesLayouts.TryGetValue(structuredData, out var layout))
+            {
+                layout = new ValueBufferLayout();
+                m_GraphValuesLayouts[structuredData] = layout;
+            }
+
+            return layout;
+        }
+
+        internal bool TryGetLayout(StructuredData structuredData, out ValueBufferLayout layout)
+        {
+            return m_GraphValuesLayouts.TryGetValue(structuredData, out layout);
+        }
+    }
+}
diff --git a/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Compiler/Passes/StructuredDataLayoutPass.cs.meta b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Compiler/Passes/StructuredDataLayoutPass.cs.meta
new file mode 100644
index 00000000000..9a6fb3df08a
--- /dev/null
+++ b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Compiler/Passes/StructuredDataLayoutPass.cs.meta
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: 64bd43bbb86748c48156829c412bac5d
\ No newline at end of file
diff --git a/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Compiler/Passes/TemplateCodeGenerationPass.cs b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Compiler/Passes/TemplateCodeGenerationPass.cs
new file mode 100644
index 00000000000..0831b20d8e3
--- /dev/null
+++ b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Compiler/Passes/TemplateCodeGenerationPass.cs
@@ -0,0 +1,455 @@
+using System;
+using System.Reflection;
+using System.Collections.Generic;
+using UnityEditor;
+using UnityEngine;
+
+namespace Unity.GraphCommon.LowLevel.Editor
+{
+    class TemplateCodeGenerationPass : CompilationPass
+    {
+        readonly IncludeFileShaderWriter m_IncludeFileShaderWriter = new();
+        readonly ComputeShaderWriter m_ComputeShaderWriter = new();
+        readonly RenderingShaderWriter m_RenderingShaderWriter = new();
+
+        readonly DataDescriptionWriterRegistry m_DataWriter;
+
+        HashSet<DataBindingId> m_DataBindingsWithView = new();
+
+        public TemplateCodeGenerationPass(DataDescriptionWriterRegistry dataWriter)
+        {
+            m_DataWriter = dataWriter;
+        }
+
+        static readonly MethodInfo k_CreateComputeShaderAsset = typeof(ShaderUtil).GetMethod("CreateComputeShaderAsset", BindingFlags.Static | BindingFlags.NonPublic, null, new Type[] { typeof(string) }, null);
+        ComputeShader CreateComputeShaderAsset(string sourceCode)
+        {
+            if (k_CreateComputeShaderAsset == null)
+                throw new NullReferenceException();
+            return (ComputeShader)k_CreateComputeShaderAsset.Invoke(null, new object[] {sourceCode});
+        }
+
+        public bool Execute(ref CompilationContext context)
+        {
+            var generatedCodeContainer = context.data.GetOrCreate<GeneratedCodeContainer>();
+
+            foreach (var dataContainer in context.graph.DataContainers)
+            {
+                if (!IsResource(dataContainer.RootDataView.DataDescription))
+                {
+                    string sourceCode = GenerateContainerSourceCode(dataContainer, context);
+                    generatedCodeContainer.Add(dataContainer.Id, sourceCode);
+                }
+            }
+
+            foreach (var taskNode in context.graph.TaskNodes)
+            {
+                if (taskNode.Task is TemplatedTask templatedTask)
+                {
+                    //TODO: The ImportContext, when present, must be accounted for during compilation (see usage of CreateShaderAsset & CreateComputeShaderAsset)
+                    string sourceCode;
+                    if (templatedTask.IsCompute)
+                    {
+                        sourceCode = GenerateTemplatedTaskSourceCode_Compute(taskNode, context);
+
+                        var computeShader = CreateComputeShaderAsset(sourceCode);
+                        computeShader.name = templatedTask.TemplateName;
+                        var task = new GpuKernelTask(computeShader, 0);
+                        context.graph.SetTask(taskNode.Id, task);
+                    }
+                    else
+                    {
+                        sourceCode = GenerateTemplatedTaskSourceCode_Rendering(taskNode, context);
+                        Shader shader = ShaderUtil.CreateShaderAsset(sourceCode);
+                        shader.name = templatedTask.TemplateName;
+                        Material material = new Material(shader);
+                        var task = new RenderingTask(material);
+                        context.graph.SetTask(taskNode.Id, task);
+                    }
+                    generatedCodeContainer.Add(taskNode.Id, sourceCode);
+                }
+            }
+            return true;
+        }
+
+        string GenerateContainerSourceCode(DataContainer dataContainer, CompilationContext context)
+        {
+            var containerName = dataContainer.Name;
+            m_IncludeFileShaderWriter.Begin(containerName);
+            if (m_DataWriter.TryGetDataDescriptionWriter(dataContainer.RootDataView.DataDescription, out var dataDescriptionWriter))
+            {
+                foreach (var resource in dataDescriptionWriter.GetUsedResources(dataContainer.Name, dataContainer.RootDataView))
+                {
+                    if (resource.Item2 != null)
+                    {
+                        m_IncludeFileShaderWriter.WriteLine($"{resource.Item1} {resource.Item2};");
+                        m_IncludeFileShaderWriter.NewLine();
+                    }
+                }
+
+                dataDescriptionWriter.WriteDescription(m_IncludeFileShaderWriter, dataContainer.RootDataView, containerName, context);
+            }
+            return m_IncludeFileShaderWriter.End();
+        }
+
+        string GenerateTemplatedTaskSourceCode_Compute(TaskNode taskNode, CompilationContext context)
+        {
+            TemplatedTask templatedTask = taskNode.Task as TemplatedTask;
+            //TODO: Generate proper name
+            string shaderName = templatedTask.TemplateName;
+
+            m_ComputeShaderWriter.Begin(shaderName);
+
+            m_ComputeShaderWriter.WriteLine("#include \"Shaders/Data/ThreadData.hlsl\"");
+
+            IncludeData(m_ComputeShaderWriter, taskNode, context);
+
+            GenerateAttributeSets(m_ComputeShaderWriter, taskNode, templatedTask, context);
+
+            GenerateDataViews(m_ComputeShaderWriter, taskNode, templatedTask, context);
+
+            ForwardDeclarations(m_ComputeShaderWriter, templatedTask);
+
+            IncludeTemplateFile(m_ComputeShaderWriter, templatedTask.TemplateName);
+
+            GenerateEntryPoint_Compute(m_ComputeShaderWriter, taskNode, context);
+
+            GenerateSnippetFunctions(m_ComputeShaderWriter, templatedTask);
+
+            return m_ComputeShaderWriter.End();
+        }
+
+        string GenerateTemplatedTaskSourceCode_Rendering(TaskNode taskNode, CompilationContext context)
+        {
+            TemplatedTask templatedTask = taskNode.Task as TemplatedTask;
+            //TODO: Generate proper name
+            string shaderName = templatedTask.TemplateName;
+
+            m_RenderingShaderWriter.Begin(shaderName);
+
+            using (m_RenderingShaderWriter.CreateSubShaderScope())
+            {
+                using (m_RenderingShaderWriter.CreateHlslIncludeScope())
+                {
+                    IncludeData(m_RenderingShaderWriter, taskNode, context);
+
+                    GenerateAttributeSets(m_RenderingShaderWriter, taskNode, templatedTask, context);
+
+                    GenerateDataViews(m_RenderingShaderWriter, taskNode, templatedTask, context);
+
+                    ForwardDeclarations(m_RenderingShaderWriter, templatedTask);
+
+                    IncludeTemplateFile(m_RenderingShaderWriter, templatedTask.TemplateName);
+
+                    GenerateSnippetFunctions(m_RenderingShaderWriter, templatedTask);
+                }
+
+                using (m_RenderingShaderWriter.CreatePassScope(""))
+                {
+                    GenerateEntryPoints_Rendering(m_RenderingShaderWriter, taskNode, context);
+                }
+            }
+            return m_RenderingShaderWriter.End();
+        }
+
+        void IncludeData(ShaderWriter shaderWriter, TaskNode taskNode, CompilationContext context)
+        {
+            var generatedCodeContainer = context.data.Get<GeneratedCodeContainer>();
+
+            foreach (var dataNode in taskNode.DataNodes)
+            {
+                var dataDescription = dataNode.DataContainer.RootDataView.DataDescription;
+                if (!IsResource(dataDescription))
+                {
+                    m_DataWriter.TryGetDataDescriptionWriter(dataDescription, out var dataDescriptionWriter);
+
+                    shaderWriter.NewLine();
+                    //shaderWriter.IncludeFile($"{dataNode.DataContainer.Name}.hlsl");
+                    shaderWriter.WriteLine($"// Begin {dataNode.DataContainer.Name}");
+                    dataDescriptionWriter.DefineResourceUsage(shaderWriter, dataNode.UsedDataViewsRoot, dataNode.ReadDataViewsRoot, dataNode.WrittenDataViewsRoot);
+                    shaderWriter.WriteLine(generatedCodeContainer.Find(dataNode.DataContainer.Id), ShaderWriter.WriteLineOptions.Multiline);
+                    dataDescriptionWriter.UndefineResourceUsage(shaderWriter, dataNode.UsedDataViewsRoot, dataNode.ReadDataViewsRoot, dataNode.WrittenDataViewsRoot);
+                    shaderWriter.WriteLine($"// End   {dataNode.DataContainer.Name}");
+                }
+            }
+        }
+
+        void GenerateAttributeSets(ShaderWriter shaderWriter, TaskNode taskNode, TemplatedTask templatedTask,
+            CompilationContext context)
+        {
+            var attributeSourceManager = context.data.GetOrCreate<AttributeSourceManager>();
+            foreach (var attributeKeyMapping in templatedTask.AttributeKeyMappings)
+            {
+                var structType = attributeKeyMapping.Key.ToString();
+                var bindingRelativePath = attributeKeyMapping.Value;
+                DataView dataView = new();
+                foreach (var binding in taskNode.DataBindings) // TODO: refactor linear search method?
+                {
+                    if (binding.BindingDataKey == bindingRelativePath.BindingKey)
+                    {
+                        bool found = binding.DataNode.UsedDataViewsRoot.FindSubData(bindingRelativePath.SubDataPath, out dataView);
+                        Debug.Assert(found);
+                        break;
+                    }
+                }
+
+                attributeSourceManager.Add(dataView.Id, attributeKeyMapping.Key);
+
+                shaderWriter.NewLine();
+                shaderWriter.WriteLine($"struct {structType}");
+                shaderWriter.OpenBlock();
+                foreach (var attributeDataView in dataView.Children)
+                {
+                    var attribute = (attributeDataView.SubDataKey as AttributeKey).Attribute;
+                    shaderWriter.WriteLine($"{HlslCodeHelper.GetTypeName(attribute.Type)} {attribute.Name};");
+                }
+                shaderWriter.NewLine();
+                shaderWriter.WriteLine("void Init()");
+                shaderWriter.OpenBlock();
+                foreach (var attributeDataView in dataView.Children)
+                {
+                    var attribute = (attributeDataView.SubDataKey as AttributeKey).Attribute;
+                    shaderWriter.WriteLine($"{attribute.Name} = {HlslCodeHelper.GetValueString(attribute.DefaultValue)};");
+                }
+                shaderWriter.CloseBlock();
+                shaderWriter.CloseBlock(false);
+                shaderWriter.WriteLine(";", ShaderWriter.WriteLineOptions.NoIndent);
+            }
+        }
+
+        void GenerateDataViews(ShaderWriter shaderWriter, TaskNode taskNode, TemplatedTask templatedTask,
+            CompilationContext context)
+        {
+            void LocateDataView(DataView dataView, ref DataView usedDataView, ref DataView readDataView, ref DataView writtenDataView)
+            {
+                if (dataView.Parent.HasValue)
+                {
+                    LocateDataView(dataView.Parent.Value, ref usedDataView, ref readDataView, ref writtenDataView);
+                    var subDataKey = dataView.SubDataKey;
+                    usedDataView.FindSubData(subDataKey, out usedDataView);
+                    readDataView.FindSubData(subDataKey, out readDataView);
+                    writtenDataView.FindSubData(subDataKey, out writtenDataView);
+                }
+            }
+
+            m_DataBindingsWithView.Clear();
+
+            var dataBindings = taskNode.DataBindings;
+            foreach(var dataBinding in dataBindings)
+            {
+                var dataView = dataBinding.DataView;
+                var dataNode = dataBinding.DataNode;
+
+                var usedDataView = dataNode.UsedDataViewsRoot;
+                var readDataView = dataNode.ReadDataViewsRoot;
+                var writtenDataView = dataNode.WrittenDataViewsRoot;
+                LocateDataView(dataView, ref usedDataView, ref readDataView, ref writtenDataView);
+
+                var dataDescription = dataView.DataDescription;
+
+                Debug.Assert(!usedDataView.Id.IsValid || usedDataView.DataDescription == dataDescription);
+                Debug.Assert(!readDataView.Id.IsValid || readDataView.DataDescription == dataDescription);
+                Debug.Assert(!writtenDataView.Id.IsValid || writtenDataView.DataDescription == dataDescription);
+
+                shaderWriter.NewLine();
+
+                bool hasView = false;
+                string sourceName = m_DataWriter.FindDataTypeName(dataView);
+                string bindingName = dataBinding.BindingDataKey.ToString();
+                if (m_DataWriter.TryGetDataDescriptionWriter(dataDescription, out var dataDescriptionWriter))
+                {
+                    hasView = dataDescriptionWriter.WriteView(shaderWriter, usedDataView, readDataView, writtenDataView, bindingName, sourceName, context);
+                }
+                if (hasView)
+                {
+                    m_DataBindingsWithView.Add(dataBinding.Id);
+                }
+                else
+                {
+                    shaderWriter.WriteLine($"{sourceName} {bindingName};");
+                }
+            }
+            var attributeSourceManager = context.data.GetOrCreate<AttributeSourceManager>();
+            attributeSourceManager.Clear();
+        }
+
+        void WriteProcessBlocksDeclaration(ShaderWriter shaderWriter, TemplatedTask templatedTask)
+        {
+            shaderWriter.Indent();
+            shaderWriter.Write("void VFXProcessBlocks(");
+            foreach (var attributeKeyMapping in templatedTask.AttributeKeyMappings)
+            {
+                var structType = attributeKeyMapping.Key.ToString();
+                var structName = attributeKeyMapping.Key == templatedTask.DefaultAttributeKey ? "attributes" : $"{char.ToLowerInvariant(structType[0])}{structType.Substring(1)}";
+                //m_ComputeShaderWriter.Write(", ");
+                shaderWriter.Write("inout ");
+                shaderWriter.Write(structType);
+                shaderWriter.Write(" ");
+                shaderWriter.Write(structName);
+            }
+            shaderWriter.Write(")");
+        }
+
+        void ForwardDeclarations(ShaderWriter shaderWriter, TemplatedTask templatedTask)
+        {
+            shaderWriter.NewLine();
+            WriteProcessBlocksDeclaration(shaderWriter, templatedTask);
+            shaderWriter.Write(";");
+            shaderWriter.NewLine();
+        }
+
+        void IncludeTemplateFile(ShaderWriter shaderWriter, string templateName)
+        {
+            shaderWriter.NewLine();
+            shaderWriter.IncludeFile($"Shaders/Templates/{templateName}.hlsl"); // TODO: Template should have full path
+        }
+
+        void GenerateEntryPoint_Compute(ComputeShaderWriter computeShaderWriter, TaskNode taskNode,
+            CompilationContext context)
+        {
+            computeShaderWriter.NewLine();
+            uint threadCount = 64u;
+            computeShaderWriter.WriteMainFunction(threadCount, 1, 1);
+            computeShaderWriter.OpenBlock();
+            InitMainData(computeShaderWriter, taskNode, context);
+            computeShaderWriter.NewLine();
+            computeShaderWriter.WriteLine("// Template entry point");
+            computeShaderWriter.WriteLine("ThreadData threadData;");
+            computeShaderWriter.WriteLine($"threadData.Init(groupId.x * {threadCount} + groupThreadId.x);");
+            computeShaderWriter.WriteLine("main(threadData);");
+            computeShaderWriter.CloseBlock();
+        }
+
+        void GenerateEntryPoints_Rendering(RenderingShaderWriter renderingShaderWriter, TaskNode taskNode, CompilationContext context)
+        {
+            renderingShaderWriter.NewLine();
+            renderingShaderWriter.WriteVertexFunction();
+            renderingShaderWriter.OpenBlock();
+            InitMainData(renderingShaderWriter, taskNode, context);
+            renderingShaderWriter.NewLine();
+            renderingShaderWriter.WriteLine("return vert(id, input);");
+            renderingShaderWriter.CloseBlock();
+
+            renderingShaderWriter.NewLine();
+            renderingShaderWriter.WriteFragmentFunction();
+            renderingShaderWriter.OpenBlock();
+            InitMainData(renderingShaderWriter, taskNode, context);
+            renderingShaderWriter.NewLine();
+            renderingShaderWriter.WriteLine("return frag(input);");
+            renderingShaderWriter.CloseBlock();
+        }
+
+        void InitMainData(ShaderWriter shaderWriter, TaskNode taskNode, CompilationContext context)
+        {
+            bool initContainers = false;
+            foreach (var dataNode in taskNode.DataNodes)
+            {
+                var dataContainer = dataNode.DataContainer;
+                if (!IsResource(dataContainer.RootDataView.DataDescription))
+                {
+                    shaderWriter.NewLine();
+                    if (!initContainers)
+                    {
+                        shaderWriter.WriteLine("// Init containers");
+                        initContainers = true;
+                    }
+
+                    var typeName = dataContainer.Name;
+                    var variableName = char.ToLowerInvariant(typeName[0]) + typeName.Substring(1);
+                    shaderWriter.WriteLine($"{typeName} {variableName};");
+                    shaderWriter.WriteLine($"{variableName}.Init();");
+                }
+            }
+
+            bool initBindings = false;
+            foreach (var dataBinding in taskNode.DataBindings)
+            {
+                if (dataBinding.DataView.DataDescription is ConstantValueData valueData)
+                {
+                    if (typeof(Texture).IsAssignableFrom(valueData.Type))
+                        continue;
+                }
+
+                shaderWriter.NewLine();
+                if (!initBindings)
+                {
+                    shaderWriter.WriteLine("// Init bindings");
+                    initBindings = true;
+                }
+
+                bool hasView = m_DataBindingsWithView.Contains(dataBinding.Id);
+                shaderWriter.Indent();
+                shaderWriter.Write(dataBinding.BindingDataKey.ToString());
+                shaderWriter.Write(hasView ? ".Init(" : " = ");
+                if (dataBinding.DataView.DataDescription is ConstantValueData constantValueData)
+                {
+                    shaderWriter.Write(HlslCodeHelper.GetValueString(constantValueData.ObjectValue));
+                }
+                else
+                {
+                    var container = dataBinding.DataNode.DataContainer;
+                    var containerName = container.Name;
+                    var variableName = char.ToLowerInvariant(containerName[0]) + containerName.Substring(1);
+                    shaderWriter.Write(variableName);
+                    WriteSubdataPath(shaderWriter, container.RootDataView, dataBinding.DataView);
+                }
+                shaderWriter.WriteLine(hasView ? ");" : ";", ShaderWriter.WriteLineOptions.NoIndent);
+            }
+        }
+
+        void WriteSubdataPath(ShaderWriter shaderWriter, DataView fromDataView, DataView toDataView)
+        {
+            if (fromDataView.Id.Index != toDataView.Id.Index)
+            {
+                var parentDataView = toDataView.Parent.GetValueOrDefault();
+                Debug.Assert(parentDataView.Id.IsValid);
+                if (parentDataView.Id.Index != fromDataView.Id.Index)
+                {
+                    WriteSubdataPath(shaderWriter, fromDataView, parentDataView);
+                }
+                shaderWriter.Write(m_DataWriter.GetSubdataName(parentDataView, toDataView.SubDataKey));
+            }
+        }
+
+        void GenerateSnippetFunctions(ShaderWriter shaderWriter, TemplatedTask templatedTask)
+        {
+            shaderWriter.NewLine();
+            WriteProcessBlocksDeclaration(shaderWriter, templatedTask);
+            shaderWriter.NewLine();
+            shaderWriter.OpenBlock();
+            foreach (var block in templatedTask.Subtasks)
+            {
+                if (block.Task is TemplateSubtask templateSubtask)
+                {
+                    shaderWriter.WriteTemplateSubtask(templateSubtask);
+                }
+            }
+            shaderWriter.CloseBlock();
+        }
+
+        bool IsResource(IDataDescription dataDescription) => dataDescription is ValueData; // TODO: Temp
+    }
+
+    class GeneratedCodeContainer
+    {
+        readonly Dictionary<DataContainerId, string> m_DataContainerSourceCodes = new();
+        readonly Dictionary<TaskNodeId, string> m_TaskNodeSourceCodes = new();
+
+        public void Add(DataContainerId dataContainerId, string sourceCode) => m_DataContainerSourceCodes.Add(dataContainerId, sourceCode);
+        public void Add(TaskNodeId taskNodeId, string sourceCode) => m_TaskNodeSourceCodes.Add(taskNodeId, sourceCode);
+
+        public string Find(DataContainerId dataContainerId) => m_DataContainerSourceCodes.TryGetValue(dataContainerId, out string sourceCode) ? sourceCode : null;
+        public string Find(TaskNodeId taskNodeId) => m_TaskNodeSourceCodes.TryGetValue(taskNodeId, out string sourceCode) ? sourceCode : null;
+    }
+
+    class AttributeSourceManager
+    {
+        readonly Dictionary<DataViewId, IDataKey> m_AttributeSources = new();
+
+        public void Add(DataViewId dataViewId, IDataKey attributeSourceKey) => m_AttributeSources.Add(dataViewId, attributeSourceKey);
+
+        public bool TryGetAttributeSource(DataViewId dataViewId, out IDataKey attributeSourceKey) => m_AttributeSources.TryGetValue(dataViewId, out attributeSourceKey);
+
+        public void Clear() => m_AttributeSources.Clear();
+    }
+}
diff --git a/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Compiler/Passes/TemplateCodeGenerationPass.cs.meta b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Compiler/Passes/TemplateCodeGenerationPass.cs.meta
new file mode 100644
index 00000000000..d66d38b4765
--- /dev/null
+++ b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Compiler/Passes/TemplateCodeGenerationPass.cs.meta
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: 395c88f899628644db23f4e7d35ae3f3
\ No newline at end of file
diff --git a/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Data.meta b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Data.meta
new file mode 100644
index 00000000000..06b4ee858ee
--- /dev/null
+++ b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Data.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: be2e87691c944db9bfd495f0a567bb99
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Data/Attribute.cs b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Data/Attribute.cs
new file mode 100644
index 00000000000..c3f93ea9264
--- /dev/null
+++ b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Data/Attribute.cs
@@ -0,0 +1,63 @@
+using System;
+using UnityEngine;
+
+namespace Unity.GraphCommon.LowLevel.Editor
+{
+    /// <summary>
+    /// Defines an attribute that constitutes the payload of a system.
+    /// </summary>
+    [Serializable]
+    /*public*/ class Attribute
+    {
+        [SerializeField]
+        private string m_Name;
+
+        [SerializeReference]
+        private object m_Value;
+
+        /// <summary>
+        /// The name of the attribute.
+        /// </summary>
+        public string Name => m_Name;
+
+        /// <summary>
+        /// Gets the default value of the attribute.
+        /// </summary>
+        public object DefaultValue => m_Value;
+
+        /// <summary>
+        /// Gets the runtime type of the default value.
+        /// </summary>
+        public Type Type => DefaultValue?.GetType();
+
+        /// <summary>
+        /// Constructs an attribute with a given name and a default value
+        /// </summary>
+        /// <param name="name">The name of the created attribute.</param>
+        /// <param name="defaultValue">The default value of the created attribute.</param>
+        public Attribute(string name, object defaultValue)
+        {
+            m_Name = name;
+            m_Value = defaultValue;
+        }
+    }
+    /// <summary>
+    /// Specifies how an attribute is going to be accessed, i.e. read, write, or both.
+    /// </summary>
+    [Flags]
+    /*public*/ enum AttributeUsage
+    {
+        /// <summary>
+        /// Attribute is read.
+        /// </summary>
+        Read = 1 << 0,
+        /// <summary>
+        /// Attribute is written.
+        /// </summary>
+        Write = 1 << 1,
+        /// <summary>
+        /// Attribute is both read and written.
+        /// </summary>
+        ReadWrite = Read | Write,
+    }
+}
diff --git a/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Data/Attribute.cs.meta b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Data/Attribute.cs.meta
new file mode 100644
index 00000000000..7f6c4dcee2a
--- /dev/null
+++ b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Data/Attribute.cs.meta
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: 5e9b2b399ef1483a845385fe3013b14d
\ No newline at end of file
diff --git a/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Data/AttributeSet.cs b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Data/AttributeSet.cs
new file mode 100644
index 00000000000..8b25a91c15a
--- /dev/null
+++ b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Data/AttributeSet.cs
@@ -0,0 +1,82 @@
+using System.Collections.Generic;
+using System.Text;
+
+namespace Unity.GraphCommon.LowLevel.Editor
+{
+    /// <summary>
+    /// A class that aggregates attributes and their usage.
+    /// </summary>
+    /*public*/ class AttributeSet
+    {
+        private HashSet<Attribute> readAttributes = new();
+        private HashSet<Attribute> writeAttributes = new();
+        /// <summary>
+        /// An enumerable containing all the attributes that are read.
+        /// </summary>
+        public IEnumerable<Attribute> ReadAttributes => readAttributes;
+        /// <summary>
+        /// An enumerable containing all the attributes that are written to.
+        /// </summary>
+        public IEnumerable<Attribute> WriteAttributes => writeAttributes;
+
+        /// <summary>
+        /// Adds an attribute to the attribute set, with its usage.
+        /// </summary>
+        /// <param name="attribute"> The attribute to add to the set.</param>
+        /// <param name="usage">The attribute usage of the added attribute.</param>
+        public void AddAttribute(Attribute attribute, AttributeUsage usage)
+        {
+            if (usage.HasFlag(AttributeUsage.Read))
+            {
+                readAttributes.Add(attribute);
+            }
+            if (usage.HasFlag(AttributeUsage.Write))
+            {
+                writeAttributes.Add(attribute);
+            }
+        }
+
+        /// <summary>
+        /// Aggregates an attribute set to the current attribute set.
+        /// </summary>
+        /// <param name="attributeSet">The attribute set to whose elements will be added to the current attribute set.</param>
+        public void Append(AttributeSet attributeSet)
+        {
+            foreach (var attribute in attributeSet.ReadAttributes)
+                AddAttribute(attribute, AttributeUsage.Read);
+
+            foreach (var attribute in attributeSet.WriteAttributes)
+                AddAttribute(attribute, AttributeUsage.Write);
+        }
+
+        /// <summary>
+        /// Checks if the attribute set contains any attribute.
+        /// </summary>
+        /// <returns>True if the attribute set does not contain any attribute.</returns>
+        public bool IsEmpty()
+        {
+            return readAttributes.Count == 0 && writeAttributes.Count == 0;
+        }
+
+        /// <summary>
+        /// Generates a string listing all the attributes that are read and written.
+        /// </summary>
+        /// <returns>A string listing all the attributes that are read and written.</returns>
+        public override string ToString()
+        {
+            StringBuilder sb = new StringBuilder();
+            foreach (var attribute in ReadAttributes)
+            {
+                sb.Append($"\tAttribute read : {attribute.Name}");
+                sb.AppendLine();
+            }
+
+            foreach (var attribute in WriteAttributes)
+            {
+                sb.Append($"\tAttribute written : {attribute.Name}");
+                sb.AppendLine();
+            }
+            return sb.ToString();
+        }
+    }
+}
diff --git a/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Data/AttributeSet.cs.meta b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Data/AttributeSet.cs.meta
new file mode 100644
index 00000000000..6204da4efd2
--- /dev/null
+++ b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Data/AttributeSet.cs.meta
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: 975a083bf2684736ac3c74716abc04af
\ No newline at end of file
diff --git a/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Data/ConstantData.cs b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Data/ConstantData.cs
new file mode 100644
index 00000000000..95cd514d65e
--- /dev/null
+++ b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Data/ConstantData.cs
@@ -0,0 +1,78 @@
+using UnityEngine;
+
+namespace Unity.GraphCommon.LowLevel.Editor
+{
+    /// <summary>
+    /// Abstract base class describing a constant value of data.
+    /// </summary>
+    /*public*/ abstract class ConstantValueData : ValueData
+    {
+        /// <summary>
+        /// Gets the constant value as an object.
+        /// </summary>
+        public abstract object ObjectValue { get; }
+
+        /// <summary>
+        /// Creates an instance of <see cref="ConstantValueData{T}"/> for the specified value.
+        /// The type of the value is inferred from the object provided.
+        /// </summary>
+        /// <param name="value">
+        /// The constant value to be encapsulated.
+        /// </param>
+        /// <returns>
+        /// A new instance of <see cref="ConstantValueData{T}"/> containing the provided value.
+        /// </returns>
+        public static ConstantValueData Create(object value)
+        {
+            Debug.Assert(value != null);
+            return Create(value, value.GetType());
+        }
+
+        /// <summary>
+        /// Creates an instance of <see cref="ConstantValueData{T}"/> for the specified value and type.
+        /// </summary>
+        /// <param name="value">
+        /// The constant value to be encapsulated.
+        /// </param>
+        /// <param name="type">
+        /// The type parameter for the generic instantiation of <see cref="ConstantValueData{T}"/>.
+        /// </param>
+        /// <returns>
+        /// A new instance of <see cref="ConstantValueData{T}"/> with the specified type parameter and value.
+        /// </returns>
+        public static ConstantValueData Create(object value, System.Type type)
+        {
+            var genericType = typeof(ConstantValueData<>).MakeGenericType(type);
+            return (ConstantValueData)System.Activator.CreateInstance(genericType, value);
+        }
+    }
+
+    /// <summary>
+    /// Describes a constant data element of type <typeparamref name="T"/>.
+    /// </summary>
+    /// <typeparam name="T">The type of the constant value described by this instance.</typeparam>
+    /*public*/ class ConstantValueData<T> : ConstantValueData
+    {
+        /// <inheritdoc cref="ValueData.Type"/>
+        public override System.Type Type => typeof(T);
+
+        /// <inheritdoc cref="ConstantValueData.ObjectValue"/>
+        public override object ObjectValue => Value;
+
+        /// <summary>
+        /// Gets the constant value of type <typeparamref name="T"/>.
+        /// </summary>
+        public T Value { get; }
+
+        /// <summary>
+        /// Initializes a new instance of <see cref="ConstantValueData{T}"/> with the specified value.
+        /// </summary>
+        /// <param name="value">
+        /// The constant value to be encapsulated.
+        /// </param>
+        public ConstantValueData(T value)
+        {
+            Value = value;
+        }
+    }
+}
diff --git a/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Data/ConstantData.cs.meta b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Data/ConstantData.cs.meta
new file mode 100644
index 00000000000..66fafe2760f
--- /dev/null
+++ b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Data/ConstantData.cs.meta
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: a772d20f97275714f9f5ac2da753e3be
\ No newline at end of file
diff --git a/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Data/DataPath.cs b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Data/DataPath.cs
new file mode 100644
index 00000000000..8ba8dbd89dd
--- /dev/null
+++ b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Data/DataPath.cs
@@ -0,0 +1,159 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Unity.GraphCommon.LowLevel.Editor
+{
+    /// <summary>
+    /// Represents a hierarchical data path composed of a sequence of <see cref="IDataKey"/> elements.
+    /// </summary>
+    /*public*/ class DataPath : IEquatable<DataPath>
+    {
+        /// <summary>
+        /// Represents an empty data path.
+        /// </summary>
+        public static DataPath Empty = new DataPath();
+
+        /// <summary>
+        /// Checks if this data path is empty.
+        /// </summary>
+        /// <returns>
+        /// <see langword="true"/> if the path contains no elements; otherwise, <see langword="false"/>.
+        /// </returns>
+        public bool IsEmpty()
+        {
+            return this.Equals(Empty);
+        }
+
+        /// <summary>
+        /// Gets the sequence of data keys that make up this path, from root to leaf.
+        /// </summary>
+        /// <value>
+        /// A read-only span containing the sequence of <see cref="IDataKey"/> elements.
+        /// </value>
+        public ReadOnlySpan<IDataKey> PathSequence
+        {
+            get
+            {
+                s_PathSequenceScratch[m_Depth] = m_SelfDataKey;
+                var parentPath = m_ParentDataPath;
+                while(parentPath != null)
+                {
+                    s_PathSequenceScratch[parentPath.m_Depth] = parentPath.m_SelfDataKey;
+                    parentPath = parentPath.m_ParentDataPath;
+                }
+
+                return new ReadOnlySpan<IDataKey>(s_PathSequenceScratch, 0, (int)(m_Depth + 1));
+            }
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="DataPath"/> class with a parent path and a data key.
+        /// </summary>
+        /// <param name="parentDataPath">The parent data path.</param>
+        /// <param name="selfDataKey">The data key for this path segment.</param>
+        public DataPath(DataPath parentDataPath, IDataKey selfDataKey)
+        {
+            m_ParentDataPath = parentDataPath;
+            m_SelfDataKey = selfDataKey;
+            m_Depth = m_ParentDataPath.m_Depth + 1;
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="DataPath"/> class with a single data key.
+        /// </summary>
+        /// <param name="selfDataKey">The data key for this path.</param>
+        public DataPath(IDataKey selfDataKey)
+        {
+            m_ParentDataPath = Empty;
+            m_SelfDataKey = selfDataKey;
+            m_Depth = m_ParentDataPath.m_Depth + 1;
+        }
+
+        internal DataPath(ReadOnlySpan<IDataKey> pathSequence)
+        {
+            var parentDataPath = Empty;
+            foreach (var key in pathSequence)
+            {
+                var dataPath = new DataPath(parentDataPath, key);
+                parentDataPath = dataPath;
+            }
+
+            m_ParentDataPath = parentDataPath.m_ParentDataPath;
+            m_SelfDataKey = parentDataPath.m_SelfDataKey;
+            m_Depth = parentDataPath.m_Depth;
+        }
+
+        /// <summary>
+        /// Returns a partial data path starting from the specified index.
+        /// </summary>
+        /// <param name="start">The zero-based index to start the partial path from (exclusive).</param>
+        /// <returns>
+        /// A new <see cref="DataPath"/> representing the partial path sequence starting after the specified index.
+        /// </returns>
+        public DataPath GetPartialPath(int start)
+        {
+            ReadOnlySpan<IDataKey> partialSequence = PathSequence.Slice(start + 1);
+            return new DataPath(partialSequence);
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="DataPath"/> is equal to the current <see cref="DataPath"/>.
+        /// </summary>
+        /// <param name="other">The <see cref="DataPath"/> to compare with the current <see cref="DataPath"/>.</param>
+        /// <returns>
+        /// <see langword="true"/> if the specified <see cref="DataPath"/> is equal to the current <see cref="DataPath"/>;
+        /// otherwise, <see langword="false"/>.
+        /// </returns>
+        public bool Equals(DataPath other)
+        {
+            return m_SelfDataKey == other.m_SelfDataKey && (m_ParentDataPath == other.m_ParentDataPath || m_ParentDataPath.Equals(other.m_ParentDataPath));
+        }
+
+        /// <summary>
+        /// Returns a hash code for this instance.
+        /// </summary>
+        /// <returns>
+        /// A hash code for this instance, suitable for use in hashing algorithms and data structures like a hash table.
+        /// </returns>
+        public override int GetHashCode()
+        {
+            return HashCode.Combine(m_SelfDataKey, m_ParentDataPath);
+        }
+
+        /// <summary>
+        /// Returns the string representation of this data path.
+        /// </summary>
+        /// <returns>
+        /// A string representing the sequence of <see cref="IDataKey"/> elements, separated by "/".
+        /// If the path is empty, "All" is returned.
+        /// </returns>
+        public override string ToString()
+        {
+            if (IsEmpty())
+                return "All";
+
+            StringBuilder sb = new StringBuilder();
+            foreach (var dataKey in PathSequence)
+            {
+                sb.Append(dataKey == null ? "Root" : dataKey);
+                sb.Append("/");
+            }
+            return sb.ToString(0, sb.Length - 1);
+        }
+
+        /// <summary>
+        /// Initializes a new, empty instance of the <see cref="DataPath"/> class.
+        /// </summary>
+        private DataPath()
+        {
+            m_ParentDataPath = null;
+            m_SelfDataKey = null;
+        }
+
+        private static IDataKey[] s_PathSequenceScratch = new IDataKey[8];
+        private readonly DataPath m_ParentDataPath;
+        private readonly IDataKey m_SelfDataKey;
+        private readonly uint m_Depth = 0;
+    }
+}
diff --git a/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Data/DataPath.cs.meta b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Data/DataPath.cs.meta
new file mode 100644
index 00000000000..cbfdc3a78af
--- /dev/null
+++ b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Data/DataPath.cs.meta
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: 06f5332260ba49cda5e450e63e797142
\ No newline at end of file
diff --git a/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Data/DataPathSet.cs b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Data/DataPathSet.cs
new file mode 100644
index 00000000000..9bd2db04d25
--- /dev/null
+++ b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Data/DataPathSet.cs
@@ -0,0 +1,106 @@
+using System.Collections.Generic;
+
+namespace Unity.GraphCommon.LowLevel.Editor
+{
+    /// <summary>
+    /// Represents a set of unique <see cref="DataPath"/> objects, with utilities for set operations such as union and intersection.
+    /// </summary>
+    /*public*/ class DataPathSet
+    {
+        /// <summary>
+        /// Check if the set is empty.
+        /// </summary>
+        public bool Empty => m_DataPaths.Count == 0;
+
+        /// <summary>
+        /// Gets an enumerable collection of all <see cref="IDataKey"/> objects in the set.
+        /// </summary>
+        public IEnumerable<DataPath> DataPaths => m_DataPaths;
+
+        /// <summary>
+        /// Determines whether the set contains the specified <see cref="IDataKey"/>.
+        /// </summary>
+        /// <param name="path">The <see cref="DataPath"/> to check for containment.</param>
+        /// <returns>
+        /// <see langword="true"/> if the set contains the specified <see cref="IDataKey"/>; otherwise, <see langword="false"/>.
+        /// </returns>
+        public bool Contains(DataPath path) => m_DataPaths.Contains(path);
+
+        /// <summary>
+        /// Adds the specified <see cref="IDataKey"/> to the set.
+        /// </summary>
+        /// <param name="path">The <see cref="DataPath"/> to add to the set.</param>
+        /// <returns>
+        /// <see langword="true"/> if the <see cref="IDataKey"/> was added;
+        /// <see langword="false"/> if it was already in the set.
+        /// </returns>
+        public bool Add(DataPath path) => m_DataPaths.Add(path);
+
+        /// <summary>
+        /// Adds all <see cref="IDataKey"/> objects from the provided <see cref="DataPathSet"/> to the current set.
+        /// </summary>
+        /// <param name="dataPathSet">The set of <see cref="IDataKey"/> objects to add.</param>
+        public void Add(DataPathSet dataPathSet)
+        {
+            foreach (var path in dataPathSet.DataPaths)
+            {
+                m_DataPaths.Add(path);
+            }
+        }
+
+        /// <summary>
+        /// Removes all <see cref="DataPath"/> objects from the current set that exist in the provided <see cref="DataPathSet"/>.
+        /// </summary>
+        /// <param name="dataPathSet">The set of <see cref="DataPath"/> objects to remove.</param>
+        public void Remove(DataPathSet dataPathSet)
+        {
+            foreach (var path in dataPathSet.DataPaths)
+            {
+                m_DataPaths.Remove(path);
+            }
+        }
+
+        /// <summary>
+        /// Creates a new <see cref="DataPathSet"/> containing the union of two sets.
+        /// </summary>
+        /// <param name="setA">The first set.</param>
+        /// <param name="setB">The second set.</param>
+        /// <returns>
+        /// A new <see cref="DataPathSet"/> that contains all <see cref="DataPath"/> objects from both <paramref name="setA"/> and <paramref name="setB"/>.
+        /// </returns>
+        public static DataPathSet Union(DataPathSet setA, DataPathSet setB)
+        {
+            DataPathSet union = new DataPathSet();
+            union.Add(setA);
+            union.Add(setB);
+            return union;
+        }
+
+        /// <summary>
+        /// Creates a new <see cref="DataPathSet"/> containing the intersection of two sets.
+        /// </summary>
+        /// <param name="setA">The first set.</param>
+        /// <param name="setB">The second set.</param>
+        /// <returns>
+        /// A new <see cref="DataPathSet"/> that contains only the <see cref="DataPath"/> objects present in both <paramref name="setA"/> and <paramref name="setB"/>.
+        /// </returns>
+        public static DataPathSet Intersection(DataPathSet setA, DataPathSet setB)
+        {
+            DataPathSet intersection = new DataPathSet();
+            foreach (var path in setA.DataPaths)
+            {
+                if (setB.Contains(path))
+                {
+                    intersection.Add(path);
+                }
+            }
+            return intersection;
+        }
+
+        /// <summary>
+        /// The internal hash set that stores the <see cref="DataPath"/> objects.
+        /// </summary>
+        private HashSet<DataPath> m_DataPaths = new();
+    }
+}
+
diff --git a/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Data/DataPathSet.cs.meta b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Data/DataPathSet.cs.meta
new file mode 100644
index 00000000000..c3e323ee024
--- /dev/null
+++ b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Data/DataPathSet.cs.meta
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: 5f51024b5f7615f4da916c8503bf5427
\ No newline at end of file
diff --git a/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Data/Description.meta b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Data/Description.meta
new file mode 100644
index 00000000000..359f3016f08
--- /dev/null
+++ b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Data/Description.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: f17d6929b5c5b884d822d8be45eafe6a
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Data/Description/ArrayData.cs b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Data/Description/ArrayData.cs
new file mode 100644
index 00000000000..df8a9c76332
--- /dev/null
+++ b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Data/Description/ArrayData.cs
@@ -0,0 +1,43 @@
+using UnityEngine;
+
+namespace Unity.GraphCommon.LowLevel.Editor
+{
+    /// <summary>
+    /// Data collection with several elements of the same type.
+    /// </summary>
+    /*public*/ class ArrayData : IDataDescription
+    {
+        /// <summary>
+        /// Number of elements contained by the collection.
+        /// </summary>
+        public int Capacity { get; }
+
+        /// <summary>
+        /// Data description of a single element of the collection.
+        /// </summary>
+        public IDataDescription Data { get; }
+
+        /// <summary>
+        /// Creates a new ArrayData, specifying the capacity and the data description of the elements.
+        /// </summary>
+        /// <param name="capacity">The number of elements contained by the collection.</param>
+        /// <param name="data">The data description of a single element of the collection.</param>
+        public ArrayData(int capacity, IDataDescription data)
+        {
+            Debug.Assert(capacity >= 0);
+            Debug.Assert(data != null);
+            Capacity = capacity;
+            Data = data;
+        }
+
+        /// <inheritdoc cref="IDataDescription"/>
+        public IDataDescription GetSubdata(IDataKey dataKey)
+        {
+            if (dataKey is IndexDataKey indexId && indexId.Index >= 0 && indexId.Index < Capacity)
+            {
+                return Data;
+            }
+            return null;
+        }
+    }
+}
diff --git a/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Data/Description/ArrayData.cs.meta b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Data/Description/ArrayData.cs.meta
new file mode 100644
index 00000000000..1154ecfca55
--- /dev/null
+++ b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Data/Description/ArrayData.cs.meta
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: d73bfcfdbf172a544acbb64123c0196a
\ No newline at end of file
diff --git a/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Data/Description/AttributeData.cs b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Data/Description/AttributeData.cs
new file mode 100644
index 00000000000..9e324d54795
--- /dev/null
+++ b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Data/Description/AttributeData.cs
@@ -0,0 +1,38 @@
+
+namespace Unity.GraphCommon.LowLevel.Editor
+{
+    /// <summary>
+    /// Represents an attribute data container with a specified capacity.
+    /// </summary>
+    /*public*/ class AttributeData : IDataDescription
+    {
+        /// <summary>
+        /// The default key for attribute data.
+        /// </summary>
+        public static readonly UniqueDataKey DefaultKey = new UniqueDataKey("Attributes");
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="AttributeData"/> class with the given capacity.
+        /// </summary>
+        /// <param name="capacity">The capacity of the attribute data.</param>
+        public AttributeData(uint capacity)
+        {
+            Capacity = capacity;
+        }
+
+        /// <summary>
+        /// Gets the capacity of the attribute data.
+        /// </summary>
+        public uint Capacity { get; }
+
+        /// <inheritdoc />
+        public IDataDescription GetSubdata(IDataKey dataKey)
+        {
+            if (dataKey is AttributeKey attributeKey)
+            {
+                return ValueData.Create(attributeKey.Attribute.DefaultValue.GetType());
+            }
+            return null;
+        }
+    }
+}
diff --git a/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Data/Description/AttributeData.cs.meta b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Data/Description/AttributeData.cs.meta
new file mode 100644
index 00000000000..48138914d9e
--- /dev/null
+++ b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Data/Description/AttributeData.cs.meta
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: 4104f37ad05c0614eb6fbe8771dba667
\ No newline at end of file
diff --git a/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Data/Description/ListData.cs b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Data/Description/ListData.cs
new file mode 100644
index 00000000000..167c7f4dfac
--- /dev/null
+++ b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Data/Description/ListData.cs
@@ -0,0 +1,36 @@
+using System.Collections.Generic;
+
+namespace Unity.GraphCommon.LowLevel.Editor
+{
+    /// <summary>
+    /// Ordered data collection with elements of different types, referenced by index.
+    /// </summary>
+    /*public*/ class ListData : IDataDescription
+    {
+        List<IDataDescription> m_Datas = new();
+
+        /// <summary>
+        /// List of the data descriptions for each element.
+        /// </summary>
+        public ReadOnlyList<IDataDescription> Datas => m_Datas;
+
+        /// <summary>
+        /// Creates a new ListData, specifying the data description of all the elements.
+        /// </summary>
+        /// <param name="datas">The data description of every element of the collection.</param>
+        public ListData(IEnumerable<IDataDescription> datas)
+        {
+            m_Datas = new(datas);
+        }
+
+        /// <inheritdoc cref="IDataDescription"/>
+        public IDataDescription GetSubdata(IDataKey dataKey)
+        {
+            if (dataKey is IndexDataKey indexId && indexId.Index >= 0 && indexId.Index < m_Datas.Count)
+            {
+                return m_Datas[indexId.Index];
+            }
+            return null;
+        }
+    }
+}
diff --git a/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Data/Description/ListData.cs.meta b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Data/Description/ListData.cs.meta
new file mode 100644
index 00000000000..ffab1609fdd
--- /dev/null
+++ b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Data/Description/ListData.cs.meta
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: 3d55e19e52f68ff41bace72b1674c576
\ No newline at end of file
diff --git a/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Data/Description/StructuredData.cs b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Data/Description/StructuredData.cs
new file mode 100644
index 00000000000..143af1c00c1
--- /dev/null
+++ b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Data/Description/StructuredData.cs
@@ -0,0 +1,40 @@
+using System.Collections.Generic;
+
+namespace Unity.GraphCommon.LowLevel.Editor
+{
+    /// <summary>
+    /// Unordered data collection with elements of different types, referenced by any data identifier.
+    /// </summary>
+    /*public*/ class StructuredData : IDataDescription
+    {
+        Dictionary<IDataKey, IDataDescription> m_Datas = new();
+
+        /// <summary>
+        /// Adds a data element, providing the data identifier and the data description.
+        /// </summary>
+        /// <param name="dataKey">The data identifier for this element.</param>
+        /// <param name="data">The data description for this element.</param>
+        /// <returns>True if the data element was added, false otherwise (for instance, if it was already present).</returns>
+        public bool AddSubdata(IDataKey dataKey, IDataDescription data)
+        {
+            return m_Datas.TryAdd(dataKey, data);
+        }
+
+        /// <inheritdoc cref="IDataDescription"/>
+        public IDataDescription GetSubdata(IDataKey dataKey)
+        {
+            return m_Datas.GetValueOrDefault(dataKey);
+        }
+
+        /// <summary>
+        /// Enumerates all the subdata descriptions included in this data description.
+        /// </summary>
+        public IEnumerable<IDataDescription> SubDataDescriptions => m_Datas.Values;
+
+        /// <summary>
+        /// Enumerates all the subdata descriptions included in this data description.
+        /// </summary>
+        public IEnumerable<KeyValuePair<IDataKey, IDataDescription>> SubDatas => m_Datas;
+    }
+}
+
diff --git a/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Data/Description/StructuredData.cs.meta b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Data/Description/StructuredData.cs.meta
new file mode 100644
index 00000000000..fac2e97695e
--- /dev/null
+++ b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Data/Description/StructuredData.cs.meta
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: d420b861ffb8ecf469940460fcbae191
\ No newline at end of file
diff --git a/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Data/Description/ValueData.cs b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Data/Description/ValueData.cs
new file mode 100644
index 00000000000..6dcafc5d978
--- /dev/null
+++ b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Data/Description/ValueData.cs
@@ -0,0 +1,39 @@
+
+namespace Unity.GraphCommon.LowLevel.Editor
+{
+    /// <summary>
+    /// Abstract base class describing a single data value.
+    /// </summary>
+    /*public*/ abstract class ValueData : IDataDescription
+    {
+        /// <summary>
+        /// Gets the type of the data described by this object.
+        /// </summary>
+        public abstract System.Type Type { get; }
+
+        /// <summary>
+        /// Creates an instance of <see cref="ValueData{T}"/> for the specified data type.
+        /// </summary>
+        /// <param name="type">
+        /// The type parameter for the generic instantiation of <see cref="ValueData{T}"/>.
+        /// </param>
+        /// <returns>
+        /// A new instance of <see cref="ValueData{T}"/> with the specified type parameter.
+        /// </returns>
+        public static ValueData Create(System.Type type)
+        {
+            var genericType = typeof(ValueData<>).MakeGenericType(type);
+            return (ValueData)System.Activator.CreateInstance(genericType);
+        }
+    }
+
+    /// <summary>
+    /// Describes a data element of type <typeparamref name="T"/>.
+    /// </summary>
+    /// <typeparam name="T">The type of the data described by this instance.</typeparam>
+    /*public*/ class ValueData<T> : ValueData
+    {
+        /// <inheritdoc cref="ValueData"/>
+        public override System.Type Type => typeof(T);
+    }
+}
diff --git a/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Data/Description/ValueData.cs.meta b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Data/Description/ValueData.cs.meta
new file mode 100644
index 00000000000..a837c07a180
--- /dev/null
+++ b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Data/Description/ValueData.cs.meta
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: 317f19cce9dae3447ae658f29fce216d
\ No newline at end of file
diff --git a/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Data/DescriptionWriter.meta b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Data/DescriptionWriter.meta
new file mode 100644
index 00000000000..33de97993bb
--- /dev/null
+++ b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Data/DescriptionWriter.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: e76c3b01951593a42a33e98e9c48ca23
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Data/DescriptionWriter/AttributeDataDescriptionWriter.cs b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Data/DescriptionWriter/AttributeDataDescriptionWriter.cs
new file mode 100644
index 00000000000..32e055d9ef1
--- /dev/null
+++ b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Data/DescriptionWriter/AttributeDataDescriptionWriter.cs
@@ -0,0 +1,119 @@
+
+namespace Unity.GraphCommon.LowLevel.Editor
+{
+    class AttributeDataDescriptionWriter : IDataDescriptionWriter<AttributeData>
+    {
+        public void WriteDescription(ShaderWriter shaderWriter, DataView dataView, AttributeData attributeData, string name, CompilationContext context)
+        {
+            shaderWriter.IncludeFile("Packages/com.unity.vfxgraph/Shaders/Data/AttributeBuffer.hlsl");
+
+            shaderWriter.NewLine();
+            shaderWriter.WriteLine($"struct {name}");
+            shaderWriter.OpenBlock();
+            shaderWriter.WriteLine("VFXAttributeBuffer attributeBuffer;");
+            shaderWriter.NewLine();
+
+            var layoutCompilationData = context.data.Get<AttributeSetLayoutCompilationData>();
+            var layout = layoutCompilationData[attributeData];
+            foreach (var attributeLocation in layout)
+            {
+                var attribute = attributeLocation.Item1;
+                var offset = attributeLocation.Item2;
+                var stride = attributeLocation.Item3;
+                shaderWriter.WriteLine($"VFX_ATTRIBUTE_DECLARE({HlslCodeHelper.GetTypeName(attribute.Type)}, {attribute.Name}, {HlslCodeHelper.GetValueString(attribute.DefaultValue)}, {offset}u, {stride}u);");
+            }
+            shaderWriter.NewLine();
+
+            foreach (var attributeView in dataView.Children)
+            {
+                var attributeKey = attributeView.SubDataKey as AttributeKey;
+                var attribute = attributeKey.Attribute;
+                if (!layout.ContainsAttribute(attribute))
+                {
+                    shaderWriter.WriteLine($"VFX_ATTRIBUTE_IGNORE({HlslCodeHelper.GetTypeName(attribute.Type)}, {attribute.Name}, {HlslCodeHelper.GetValueString(attribute.DefaultValue)});");
+                }
+            }
+            shaderWriter.NewLine();
+
+            shaderWriter.WriteLine("void Init(VFXByteAddressBuffer buffer)");
+            shaderWriter.OpenBlock();
+            shaderWriter.WriteLine("attributeBuffer.Init(buffer);");
+            shaderWriter.CloseBlock();
+            shaderWriter.WriteLine("void StoreDefault(uint index)");
+            shaderWriter.OpenBlock();
+            foreach (var attributeLocation in layout)
+            {
+                var attribute = attributeLocation.Item1;
+                shaderWriter.WriteLine($"Store_{attribute.Name}({HlslCodeHelper.GetValueString(attribute.DefaultValue)}, index);");
+            }
+            shaderWriter.CloseBlock();
+            shaderWriter.CloseBlock(false);
+            shaderWriter.WriteLine(";", ShaderWriter.WriteLineOptions.NoIndent);
+        }
+
+        public bool WriteView(ShaderWriter shaderWriter, DataView usedDataView, DataView readDataView, DataView writtenDataView, string name, string sourceName, CompilationContext context)
+        {
+            var variableName = "data";
+
+            shaderWriter.WriteLine($"struct {name}");
+            shaderWriter.OpenBlock();
+            shaderWriter.WriteLine($"{sourceName} buffer;");
+
+            shaderWriter.NewLine();
+            shaderWriter.WriteLine($"void Init({sourceName} buffer)");
+            shaderWriter.OpenBlock();
+            shaderWriter.WriteLine("this.buffer = buffer;");
+            shaderWriter.CloseBlock();
+
+            var attributeSourceManager = context.data.Get<AttributeSourceManager>();
+            if (attributeSourceManager != null && attributeSourceManager.TryGetAttributeSource(usedDataView.Id, out var attributeSource))
+            {
+                // TODO: Detach attribute sources from attribute buffers?
+                // That would allow multiple attribute sources for each attribute buffer, overloading the methods
+                // If detached, the attribute set to be used would be included on each attributeSource (.AttributeSet)
+                var attributeSourceTypename = attributeSource.ToString();
+                if (readDataView.Children.Count > 0)
+                {
+                    shaderWriter.NewLine();
+                    shaderWriter.WriteLine($"void LoadData(out {attributeSourceTypename} {variableName}, uint index)");
+                    shaderWriter.OpenBlock();
+                    shaderWriter.WriteLine($"{variableName}.Init();");
+                    foreach (var attributeDataView in readDataView.Children)
+                    {
+                        var attribute = (attributeDataView.SubDataKey as AttributeKey).Attribute;
+                        shaderWriter.WriteLine($"{variableName}.{attribute.Name} = buffer.Load_{attribute.Name}(index);");
+                    }
+                    shaderWriter.CloseBlock();
+                }
+                if (writtenDataView.Children.Count > 0)
+                {
+                    shaderWriter.NewLine();
+                    shaderWriter.WriteLine($"void StoreData({attributeSourceTypename} {variableName}, uint index)");
+                    shaderWriter.OpenBlock();
+                    foreach (var attributeDataView in writtenDataView.Children)
+                    {
+                        var attribute = (attributeDataView.SubDataKey as AttributeKey).Attribute;
+                        shaderWriter.WriteLine($"buffer.Store_{attribute.Name}({variableName}.{attribute.Name}, index);");
+                    }
+                    shaderWriter.CloseBlock();
+                }
+            }
+
+            shaderWriter.CloseBlock(false);
+            shaderWriter.WriteLine(";", ShaderWriter.WriteLineOptions.NoIndent);
+            return true;
+        }
+
+        public void DefineResourceUsage(ShaderWriter shaderWriter, DataView usedDataView, DataView readDataView,
+            DataView writtenDataView)
+        {
+            throw new System.NotImplementedException();
+        }
+
+        public void UndefineResourceUsage(ShaderWriter shaderWriter, DataView usedDataView, DataView readDataView,
+            DataView writtenDataView)
+        {
+            throw new System.NotImplementedException();
+        }
+    }
+}
diff --git a/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Data/DescriptionWriter/AttributeDataDescriptionWriter.cs.meta b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Data/DescriptionWriter/AttributeDataDescriptionWriter.cs.meta
new file mode 100644
index 00000000000..62594c3a805
--- /dev/null
+++ b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Data/DescriptionWriter/AttributeDataDescriptionWriter.cs.meta
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: 041a7bb77a7cf4c4798c8ad7d8186d26
\ No newline at end of file
diff --git a/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Data/DescriptionWriter/StructuredDataDescriptionWriter.cs b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Data/DescriptionWriter/StructuredDataDescriptionWriter.cs
new file mode 100644
index 00000000000..02dc7d8efbf
--- /dev/null
+++ b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Data/DescriptionWriter/StructuredDataDescriptionWriter.cs
@@ -0,0 +1,118 @@
+using System.Collections.Generic;
+
+namespace Unity.GraphCommon.LowLevel.Editor
+{
+    class StructuredDataDescriptionWriter : IDataDescriptionWriter<StructuredData>
+    {
+        private static readonly string StructuredBufferTypeDefine = "STRUCTURED_BUFFER_TYPE";
+
+        public void WriteDescription(ShaderWriter shaderWriter, DataView dataView, StructuredData structuredData, string name, CompilationContext context)
+        {
+            shaderWriter.WriteLine($"struct {name}");
+            shaderWriter.OpenBlock();
+            shaderWriter.WriteLine("VFXByteAddressBuffer buffer;");
+            shaderWriter.NewLine();
+
+            var layoutCompilationData = context.data.Get<StructuredDataLayoutContainer>();
+            layoutCompilationData.TryGetLayout(structuredData, out var layout);
+
+            shaderWriter.WriteLine("void Init()");
+            shaderWriter.OpenBlock();
+            shaderWriter.WriteLine($"buffer.Init(_{name}_buffer, 0u, {layout.GetBufferSize()});");
+            shaderWriter.CloseBlock();
+            shaderWriter.NewLine();
+
+            foreach (var subDataView in dataView.Children)
+            {
+                if (subDataView.DataDescription is not ValueData valueData)
+                    continue;
+                var offset = layout.GetValueOffset(valueData);
+                var typeString = HlslCodeHelper.GetTypeName(valueData.Type);
+                var subDataName  = subDataView.SubDataKey.ToString();
+                DeclareMember(shaderWriter, typeString, subDataName, (uint)offset);
+            }
+
+            shaderWriter.CloseBlock(false);
+            shaderWriter.WriteLine(";", ShaderWriter.WriteLineOptions.NoIndent);
+        }
+
+        void DeclareMember(ShaderWriter shaderWriter, string type, string name, uint offset)
+        {
+            shaderWriter.WriteLine($"{type} Load_{name}()");
+            shaderWriter.OpenBlock();
+            shaderWriter.WriteLine($"{type} value;");
+            shaderWriter.WriteLine($"buffer.LoadData(value, {offset}u);");
+            shaderWriter.WriteLine("return value;");
+            shaderWriter.CloseBlock();
+            shaderWriter.NewLine();
+            shaderWriter.WriteLine($"void Store_{name}({type} value)");
+            shaderWriter.OpenBlock();
+            shaderWriter.WriteLine($"buffer.StoreData(value, {offset}u);");
+            shaderWriter.CloseBlock();
+        }
+
+        public bool WriteView(ShaderWriter shaderWriter, DataView usedDataView, DataView readDataView, DataView writtenDataView,
+            string name, string sourceName, CompilationContext context)
+        {
+            shaderWriter.WriteLine($"struct {name}View");
+            shaderWriter.OpenBlock();
+            foreach (var subDataView in readDataView.Children)
+            {
+                var subData = subDataView.DataDescription;
+                if (subData is ValueData valueData)
+                {
+                    var typeString = HlslCodeHelper.GetTypeName(valueData.Type);
+                    shaderWriter.WriteLine($"{typeString} {subDataView.SubDataKey};");
+                }
+            }
+
+            shaderWriter.WriteLine($"void Init({sourceName} buffer)");
+            shaderWriter.OpenBlock();
+
+            foreach (var subDataView in readDataView.Children)
+            {
+                var subData = subDataView.DataDescription;
+                if (subData is ValueData)
+                {
+                    var memberName = subDataView.SubDataKey;
+                    shaderWriter.WriteLine($"{memberName} = buffer.Load_{memberName}();");
+                }
+            }
+            shaderWriter.CloseBlock();
+            shaderWriter.CloseBlock(false);
+            shaderWriter.WriteLine(";", ShaderWriter.WriteLineOptions.NoIndent);
+            shaderWriter.WriteLine($"{name}View {name};"); // TODO: probably externally only for the actual binding, not inner types
+            return true;
+        }
+
+        public string GetSubdataName(IDataKey subDataKey)
+        {
+            return $".Load_{subDataKey}()";
+        }
+
+        public void DefineResourceUsage(ShaderWriter shaderWriter, DataView usedDataView, DataView readDataView,
+            DataView writtenDataView)
+        {
+            if (writtenDataView.Id.IsValid)
+            {
+                shaderWriter.Define(StructuredBufferTypeDefine, "RWByteAddressBuffer");
+                return;
+            }
+
+            shaderWriter.Define(StructuredBufferTypeDefine, "ByteAddressBuffer");
+        }
+
+        public void UndefineResourceUsage(ShaderWriter shaderWriter, DataView usedDataView, DataView readDataView,
+            DataView writtenDataView)
+        {
+            if (usedDataView.Id.IsValid)
+            {
+                shaderWriter.Undefine(StructuredBufferTypeDefine);
+            }
+        }
+        public IEnumerable<(string, string)> GetUsedResources(string name, DataView usedDataView)
+        {
+            yield return (StructuredBufferTypeDefine, $"_{name}_buffer");
+        }
+    }
+}
diff --git a/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Data/DescriptionWriter/StructuredDataDescriptionWriter.cs.meta b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Data/DescriptionWriter/StructuredDataDescriptionWriter.cs.meta
new file mode 100644
index 00000000000..821bafd0a65
--- /dev/null
+++ b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Data/DescriptionWriter/StructuredDataDescriptionWriter.cs.meta
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: dd3b8b42a29da614f8419fc68a28eb4b
\ No newline at end of file
diff --git a/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Data/IDataDescription.cs b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Data/IDataDescription.cs
new file mode 100644
index 00000000000..4ef1c74f817
--- /dev/null
+++ b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Data/IDataDescription.cs
@@ -0,0 +1,70 @@
+namespace Unity.GraphCommon.LowLevel.Editor
+{
+    /// <summary>
+    /// Interface that represents any data used by the graph.
+    /// </summary>
+    /*public*/ interface IDataDescription
+    {
+        /// <summary>
+        /// Retrieves a subdata element corresponding to the specified <see cref="IDataKey"/>.
+        /// </summary>
+        /// <param name="dataKey">The identifier of the subdata to retrieve.</param>
+        /// <returns>
+        /// The subdata object associated with the given <see cref="IDataKey"/>, or <see langword="null"/> if not found.
+        /// </returns>
+        IDataDescription GetSubdata(IDataKey dataKey) => dataKey == null ? this : null;
+
+        /// <summary>
+        /// Retrieves a subdata element by traversing the data hierarchy using the specified <see cref="DataPath"/>.
+        /// </summary>
+        /// <param name="dataPath">The path that specifies the sequence of <see cref="IDataKey"/> objects to navigate.</param>
+        /// <returns>
+        /// The resulting subdata object at the end of the specified <paramref name="dataPath"/>, or <see langword="null"/>
+        /// if no matching subdata is found during traversal.
+        /// </returns>
+        IDataDescription GetSubdata(DataPath dataPath)
+        {
+            IDataDescription data = this;
+            foreach (var dataKey in dataPath.PathSequence)
+            {
+                data = data.GetSubdata(dataKey);
+
+                if (data == null)
+                    return null;
+            }
+            return data;
+        }
+
+        /// <summary>
+        /// Gets the type of the subdata corresponding to the specified <see cref="IDataKey"/>.
+        /// </summary>
+        /// <param name="dataKey">The identifier of the subdata whose type is requested.</param>
+        /// <returns>
+        /// A <see cref="System.Type"/> representing the type of the subdata, or <see langword="null"/> if the subdata does not exist.
+        /// </returns>
+        System.Type GetSubdataType(IDataKey dataKey) => GetSubdata(dataKey)?.GetType();
+
+        /// <summary>
+        /// Gets the type of the subdata at the end of the specified <see cref="DataPath"/>.
+        /// </summary>
+        /// <param name="dataPath">The data path used to traverse the hierarchy to retrieve the subdata type.</param>
+        /// <returns>
+        /// A <see cref="System.Type"/> representing the type of the subdata, or <see langword="null"/> if the subdata does not exist.
+        /// </returns>
+        System.Type GetSubdataType(DataPath dataPath) => GetSubdata(dataPath)?.GetType();
+
+        /// <summary>
+        /// Determines if other data description can be used in places where this data description is expected.
+        /// </summary>
+        /// <param name="other">The data description to be used instead of this.</param>
+        /// <returns>
+        /// True if the other data is compatible with this, false otherwise.
+        /// </returns>
+        bool IsCompatible(IDataDescription other) => Equals(other);
+
+        /// <summary>
+        /// Gets the name of this data object.
+        /// </summary>
+        string Name => "";
+    }
+}
diff --git a/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Data/IDataDescription.cs.meta b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Data/IDataDescription.cs.meta
new file mode 100644
index 00000000000..6ff6a61ca7a
--- /dev/null
+++ b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Data/IDataDescription.cs.meta
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: a2af3b1dba914ca9b21054b3a355200c
\ No newline at end of file
diff --git a/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Data/IDataDescriptionWriter.cs b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Data/IDataDescriptionWriter.cs
new file mode 100644
index 00000000000..e78a45a3c4e
--- /dev/null
+++ b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Data/IDataDescriptionWriter.cs
@@ -0,0 +1,31 @@
+using System.Collections.Generic;
+
+namespace Unity.GraphCommon.LowLevel.Editor
+{
+    interface IDataDescriptionWriter
+    {
+        System.Type DataDescriptionType { get; }
+
+        void WriteDescription(ShaderWriter writer, DataView dataView, string name, CompilationContext context);
+
+        bool WriteView(ShaderWriter shaderWriter, DataView usedDataView, DataView readDataView, DataView writtenDataView, string name, string sourceName, CompilationContext context) => false;
+
+        string GetSubdataName(IDataKey subDataKey) => throw new System.NotImplementedException();
+
+        string GetSubdataTypeName(IDataKey subDataKey) => throw new System.NotImplementedException();
+
+        public void DefineResourceUsage(ShaderWriter shaderWriter, DataView usedDataView, DataView readDataView, DataView writtenDataView) { }
+
+        public void UndefineResourceUsage(ShaderWriter shaderWriter, DataView usedDataView, DataView readDataView, DataView writtenDataView) { }
+
+        IEnumerable<(string, string)> GetUsedResources(string name, DataView usedDataView) => System.Array.Empty<(string, string)>();
+    }
+
+    interface IDataDescriptionWriter<T> : IDataDescriptionWriter where T : class, IDataDescription
+    {
+        System.Type IDataDescriptionWriter.DataDescriptionType => typeof(T);
+
+        void IDataDescriptionWriter.WriteDescription(ShaderWriter writer, DataView dataView, string name, CompilationContext context) => WriteDescription(writer, dataView, dataView.DataDescription as T, name, context);
+        void WriteDescription(ShaderWriter writer, DataView dataView, T dataDescription, string name, CompilationContext context);
+    }
+}
diff --git a/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Data/IDataDescriptionWriter.cs.meta b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Data/IDataDescriptionWriter.cs.meta
new file mode 100644
index 00000000000..85e0ebc9561
--- /dev/null
+++ b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Data/IDataDescriptionWriter.cs.meta
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: 60b0c67cc1f1ca44ead35f2254fdcfa2
\ No newline at end of file
diff --git a/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Data/IDataKey.cs b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Data/IDataKey.cs
new file mode 100644
index 00000000000..a401feccec5
--- /dev/null
+++ b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Data/IDataKey.cs
@@ -0,0 +1,187 @@
+namespace Unity.GraphCommon.LowLevel.Editor
+{
+    /// <summary>
+    /// Represents a generic identifier for data in the Visual Effects Graph.
+    /// </summary>
+    /*public*/ interface IDataKey
+    {
+    }
+
+    /// <summary>
+    /// Represents a unique identifier for data.
+    /// </summary>
+    /*public*/ class UniqueDataKey : IDataKey
+    {
+        /// <summary>
+        /// Returns the string representation of the unique data identifier.
+        /// </summary>
+        /// <returns>A string representing the unique ID ("UniqueID").</returns>
+        public override string ToString()
+        {
+            return debugName;
+        }
+
+        private string debugName;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="UniqueDataKey"/> class with the specified debug name.
+        /// </summary>
+        /// <param name="debugName">An optional debug name to associate with this unique identifier.</param>
+        public UniqueDataKey(string debugName = null)
+        {
+            this.debugName = debugName;
+        }
+    }
+
+    /// <summary>
+    /// Represents a data identifier with a textual name.
+    /// </summary>
+    /*public*/ record NameDataKey : IDataKey
+    {
+        /// <summary>
+        /// Gets the name associated with this data identifier.
+        /// </summary>
+        public string Name { get; }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="NameDataKey"/> class with the specified name.
+        /// </summary>
+        /// <param name="name">The name to associate with this data identifier.</param>
+        public NameDataKey(string name)
+        {
+            Name = name;
+        }
+
+        /// <summary>
+        /// Returns the string representation of this data identifier.
+        /// </summary>
+        /// <returns>The name associated with this data identifier.</returns>
+        public override string ToString()
+        {
+            return Name;
+        }
+    }
+
+    /// <summary>
+    /// Represents a data identifier with an index value.
+    /// </summary>
+    /*public*/ record IndexDataKey : IDataKey
+    {
+        /// <summary>
+        /// Gets the index associated with this data identifier.
+        /// </summary>
+        public int Index { get; }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="IndexDataKey"/> class with the specified index.
+        /// </summary>
+        /// <param name="index">The index to associate with this data identifier.</param>
+        public IndexDataKey(int index)
+        {
+            Index = index;
+        }
+
+        /// <summary>
+        /// Returns the string representation of this data identifier.
+        /// </summary>
+        /// <returns>A string representation of the index.</returns>
+        public override string ToString()
+        {
+            return Index.ToString();
+        }
+    }
+
+    /// <summary>
+    /// Represents a ranged data identifier, defined by a start and end value.
+    /// </summary>
+    /*public*/ record RangeDataKey : IDataKey
+    {
+        /// <summary>
+        /// Gets the starting value of the range.
+        /// </summary>
+        public int From { get; }
+
+        /// <summary>
+        /// Gets the ending value of the range.
+        /// </summary>
+        public int To { get; }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RangeDataKey"/> class with the specified range.
+        /// </summary>
+        /// <param name="from">The starting value of the range.</param>
+        /// <param name="to">The ending value of the range.</param>
+        public RangeDataKey(int from, int to)
+        {
+            From = from;
+            To = to;
+        }
+
+        /// <summary>
+        /// Returns the string representation of this data identifier.
+        /// </summary>
+        /// <returns>A string in the format "[From,To]".</returns>
+        public override string ToString()
+        {
+            return $"[{From},{To}]";
+        }
+    }
+
+    /// <summary>
+    /// Represents a data identifier based on a type.
+    /// </summary>
+    /*public*/ record TypeDataKey : IDataKey
+    {
+        /// <summary>
+        /// Gets the type associated with this data identifier.
+        /// </summary>
+        public System.Type Type { get; }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="TypeDataKey"/> class with the specified type.
+        /// </summary>
+        /// <param name="type">The type to associate with this data identifier.</param>
+        public TypeDataKey(System.Type type)
+        {
+            Type = type;
+        }
+
+        /// <summary>
+        /// Returns the string representation of this data identifier.
+        /// </summary>
+        /// <returns>A string representation of the type.</returns>
+        public override string ToString()
+        {
+            return Type.ToString();
+        }
+    }
+
+    /// <summary>
+    /// Represents a data identifier based on an attribute.
+    /// </summary>
+    /*public*/ record AttributeKey : IDataKey
+    {
+        /// <summary>
+        /// Gets the attribute associated with this data identifier.
+        /// </summary>
+        public Attribute Attribute { get; }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="AttributeKey"/> class with the specified attribute.
+        /// </summary>
+        /// <param name="attribute">The attribute to associate with this data identifier.</param>
+        public AttributeKey(Attribute attribute)
+        {
+            Attribute = attribute;
+        }
+
+        /// <summary>
+        /// Returns the string representation of this data identifier.
+        /// </summary>
+        /// <returns>The name of the attribute.</returns>
+        public override string ToString()
+        {
+            return Attribute.Name;
+        }
+    }
+}
diff --git a/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Data/IDataKey.cs.meta b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Data/IDataKey.cs.meta
new file mode 100644
index 00000000000..4c157422111
--- /dev/null
+++ b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Data/IDataKey.cs.meta
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: 926726d6bd42f26439aec0b7be6a87f3
\ No newline at end of file
diff --git a/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Data/ResourceDescription.cs b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Data/ResourceDescription.cs
new file mode 100644
index 00000000000..81221800ca4
--- /dev/null
+++ b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Data/ResourceDescription.cs
@@ -0,0 +1,77 @@
+using UnityEngine;
+
+namespace Unity.GraphCommon.LowLevel.Editor
+{
+    /// <summary>
+    /// A description of an actual resource, necessary for its creation an access.
+    /// </summary>
+    interface IResourceDescription
+    {
+        /// <summary>
+        /// The invalid ResourceDescription.
+        /// </summary>
+        public static IResourceDescription Invalid;
+
+        /// <summary>
+        /// Checks if the ResouceDescription reprensents a valid resource.
+        /// </summary>
+        public bool IsValid { get; }
+
+    }
+
+    struct BufferDescription : IResourceDescription
+    {
+        /// <summary>
+        /// The capacity of the resource.
+        /// </summary>
+        public uint Capacity { get; }
+
+        /// <summary>
+        /// The stride of the resource.
+        /// </summary>
+        public uint Stride { get; }
+
+        public GraphicsBuffer.Target Target { get; }
+        /// <summary>
+        /// Checks if the ResouceDescription reprensents a valid resource.
+        /// </summary>
+        public bool IsValid => Stride != 0;
+
+        /// <summary>
+        /// Constructs a BufferDescription
+        /// </summary>
+        /// <param name="capacity">The capacity of the buffer.</param>
+        /// <param name="stride">The stride of the buffer.</param>
+        /// <param name="target"> The GraphicsBuffer target of the buffer.</param>
+        public BufferDescription(uint capacity, uint stride, GraphicsBuffer.Target target)
+        {
+            Capacity = capacity;
+            Stride = stride;
+            Target = target;
+        }
+
+        /// <summary>
+        /// Generates a string with the description of the resource.
+        /// </summary>
+        /// <returns>A string with the description of the resource.</returns>
+        public override string ToString()
+        {
+            if (IsValid)
+                return $"Capacity : {Capacity} - Stride : {Stride}";
+            return "Invalid Resource Description (will not lead to a real resource created)";
+
+        }
+    }
+
+    struct RenderTextureDescription : IResourceDescription
+    {
+        public RenderTextureDescriptor RtDescriptor { get; }
+        public bool IsValid => RtDescriptor.height > 0;
+
+        public RenderTextureDescription(RenderTextureDescriptor rtDesc)
+        {
+            RtDescriptor = rtDesc;
+        }
+    }
+
+}
diff --git a/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Data/ResourceDescription.cs.meta b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Data/ResourceDescription.cs.meta
new file mode 100644
index 00000000000..a6b4993afd1
--- /dev/null
+++ b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Data/ResourceDescription.cs.meta
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: e7ff3f77998642f0920db241f8589f79
\ No newline at end of file
diff --git a/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Expression.meta b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Expression.meta
new file mode 100644
index 00000000000..9f6da7c9b69
--- /dev/null
+++ b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Expression.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 3518cb781eb08a44a91b25c6c52b174e
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Expression/ConvertExpression.cs b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Expression/ConvertExpression.cs
new file mode 100644
index 00000000000..ae629cacaff
--- /dev/null
+++ b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Expression/ConvertExpression.cs
@@ -0,0 +1,433 @@
+
+using UnityEngine;
+
+namespace Unity.GraphCommon.LowLevel.Editor
+{
+    /// <summary>
+    /// Expression that does a casting of the parent expression to a different result type.
+    /// </summary>
+    /// <typeparam name="T">The result type to cast to.</typeparam>
+    /*public*/ abstract class CastExpression<T> : Expression<T>
+    {
+        /// <summary>
+        /// String representing a valid type in HLSL to cast the result to.
+        /// </summary>
+        protected abstract string CastType { get; }
+
+        /// <summary>
+        /// Creates a new expression using the parent expression that will be converted.
+        /// </summary>
+        /// <param name="expression">The expression to cast to a new result type.</param>
+        protected CastExpression(IExpression expression) : base(expression)
+        {
+        }
+
+        /// <inheritdoc cref="IExpression"/>
+        public override IValueExpression Evaluate(ReadOnlyList<IValueExpression> parents) => Evaluate(parents[0]);
+
+        /// <summary>
+        /// Creates a new value expression that is equivalent to applying the expression to the provided parent.
+        /// If the evaluation is not possible, it will throw an exception.
+        /// </summary>
+        /// <param name="parent">Expression to be converted.</param>
+        /// <returns>A new value expression equivalent to applying the expression to the provided parent.</returns>
+        public virtual IValueExpression Evaluate(IValueExpression parent) => throw new System.InvalidCastException();
+
+        /// <inheritdoc cref="IExpression"/>
+        public override string GetCodeString(ReadOnlyList<string> parents) => $"({CastType})({parents[0]})";
+    }
+
+    /// <summary>
+    /// Expression that converts the result of a parent expression to bool.
+    /// </summary>
+    /*public*/ class ConvertToBoolExpression : CastExpression<bool>
+    {
+        /// <inheritdoc cref="CastExpression{T}"/>
+        protected override string CastType => "bool";
+
+        /// <summary>
+        /// Creates a new expression using the parent expression that will be converted.
+        /// </summary>
+        /// <param name="expression">The expression to convert.</param>
+        public ConvertToBoolExpression(IExpression expression) : base(expression)
+        {
+        }
+
+        /// <inheritdoc cref="CastExpression{T}"/>
+        public override IValueExpression Evaluate(IValueExpression parent)
+        {
+            if (parent.TryGetValue(out bool value))
+            {
+                return parent;
+            }
+            if (parent.TryGetValue(out float floatValue))
+            {
+                value = floatValue != 0.0f;
+            }
+            if (parent.TryGetValue(out double doubleValue))
+            {
+                value = doubleValue != 0.0;
+            }
+            else if (parent.TryGetValue(out int intValue))
+            {
+                value = intValue != 0;
+            }
+            else if (parent.TryGetValue(out uint uintValue))
+            {
+                value = uintValue != 0;
+            }
+            else
+            {
+                base.Evaluate(parent);
+            }
+
+            return (Expression)value as IValueExpression;
+        }
+    }
+
+    /// <summary>
+    /// Expression that converts the result of a parent expression to float.
+    /// </summary>
+    /*public*/ class ConvertToFloatExpression : CastExpression<float>
+    {
+        /// <inheritdoc cref="CastExpression{T}"/>
+        protected override string CastType => "float";
+
+        /// <summary>
+        /// Creates a new expression using the parent expression that will be converted.
+        /// </summary>
+        /// <param name="expression">The expression to convert.</param>
+        public ConvertToFloatExpression(IExpression expression) : base(expression)
+        {
+        }
+
+        /// <inheritdoc cref="CastExpression{T}"/>
+        public override IValueExpression Evaluate(IValueExpression parent)
+        {
+            if (parent.TryGetValue(out float value))
+            {
+                return parent;
+            }
+            if (parent.TryGetValue(out double doubleValue))
+            {
+                value = (float)doubleValue;
+            }
+            else if (parent.TryGetValue(out int intValue))
+            {
+                value = intValue;
+            }
+            else if (parent.TryGetValue(out uint uintValue))
+            {
+                value = uintValue;
+            }
+            else
+            {
+                base.Evaluate(parent);
+            }
+
+            return (Expression)value as IValueExpression;
+        }
+    }
+
+    /// <summary>
+    /// Expression that converts the result of a parent expression to double.
+    /// </summary>
+    /*public*/ class ConvertToDoubleExpression : CastExpression<double>
+    {
+        /// <inheritdoc cref="CastExpression{T}"/>
+        protected override string CastType => "double";
+
+        /// <summary>
+        /// Creates a new expression using the parent expression that will be converted.
+        /// </summary>
+        /// <param name="expression">The expression to convert.</param>
+        public ConvertToDoubleExpression(IExpression expression) : base(expression)
+        {
+        }
+
+        /// <inheritdoc cref="CastExpression{T}"/>
+        public override IValueExpression Evaluate(IValueExpression parent)
+        {
+            if (parent.TryGetValue(out double value))
+            {
+                return parent;
+            }
+            if (parent.TryGetValue(out float floatValue))
+            {
+                value = floatValue;
+            }
+            else if (parent.TryGetValue(out int intValue))
+            {
+                value = intValue;
+            }
+            else if (parent.TryGetValue(out uint uintValue))
+            {
+                value = uintValue;
+            }
+            else
+            {
+                base.Evaluate(parent);
+            }
+
+            return (Expression)value as IValueExpression;
+        }
+    }
+
+    /// <summary>
+    /// Expression that converts the result of a parent expression to int.
+    /// </summary>
+    /*public*/ class ConvertToIntExpression : CastExpression<int>
+    {
+        /// <inheritdoc cref="CastExpression{T}"/>
+        protected override string CastType => "int";
+
+        /// <summary>
+        /// Creates a new expression using the parent expression that will be converted.
+        /// </summary>
+        /// <param name="expression">The expression to convert.</param>
+        public ConvertToIntExpression(IExpression expression) : base(expression)
+        {
+        }
+
+        /// <inheritdoc cref="CastExpression{T}"/>
+        public override IValueExpression Evaluate(IValueExpression parent)
+        {
+            if (parent.TryGetValue(out int value))
+            {
+                return parent;
+            }
+            else if (parent.TryGetValue(out uint uintValue))
+            {
+                value = (int)uintValue;
+            }
+            else if (parent.TryGetValue(out float floatValue))
+            {
+                value = Mathf.RoundToInt(floatValue);
+            }
+            else if (parent.TryGetValue(out double doubleValue))
+            {
+                value = Mathf.RoundToInt((float)doubleValue);
+            }
+            else
+            {
+                base.Evaluate(parent);
+            }
+
+            return (Expression)value as IValueExpression;
+        }
+    }
+
+    /// <summary>
+    /// Expression that converts the result of a parent expression to uint.
+    /// </summary>
+    /*public*/ class ConvertToUintExpression : CastExpression<uint>
+    {
+        /// <inheritdoc cref="CastExpression{T}"/>
+        protected override string CastType => "uint";
+
+        /// <summary>
+        /// Creates a new expression using the parent expression that will be converted.
+        /// </summary>
+        /// <param name="expression">The expression to convert.</param>
+        public ConvertToUintExpression(IExpression expression) : base(expression)
+        {
+        }
+
+        /// <inheritdoc cref="CastExpression{T}"/>
+        public override IValueExpression Evaluate(IValueExpression parent)
+        {
+            if (parent.TryGetValue(out uint value))
+            {
+                return parent;
+            }
+            else if (parent.TryGetValue(out int intValue))
+            {
+                value = (uint)intValue;
+            }
+            else if (parent.TryGetValue(out float floatValue))
+            {
+                value = (uint)Mathf.RoundToInt(floatValue);
+            }
+            else if (parent.TryGetValue(out double doubleValue))
+            {
+                value = (uint)Mathf.RoundToInt((float)doubleValue);
+            }
+            else
+            {
+                base.Evaluate(parent);
+            }
+
+            return (Expression)value as IValueExpression;
+        }
+    }
+
+    /// <summary>
+    /// Expression that converts the result of a parent expression to Vector2.
+    /// </summary>
+    /*public*/ class ConvertToVector2Expression : CastExpression<Vector2>
+    {
+        /// <inheritdoc cref="CastExpression{T}"/>
+        protected override string CastType => "float2";
+
+        /// <summary>
+        /// Creates a new expression using the parent expression that will be converted.
+        /// </summary>
+        /// <param name="expression">The expression to convert.</param>
+        public ConvertToVector2Expression(IExpression expression) : base(expression)
+        {
+        }
+
+        /// <inheritdoc cref="CastExpression{T}"/>
+        public override IValueExpression Evaluate(IValueExpression parent)
+        {
+            if (parent.TryGetValue(out Vector2 value))
+            {
+                return parent;
+            }
+            else 
+            {
+                // var floatExpression = ConvertToFloatExpression.Evaluate(parent) as IValueExpression<float>; // TODO: Evaluate should be static. Change when we support C#11
+                var floatExpression = new ConvertToFloatExpression(parent).Evaluate(parent) as IValueExpression<float>;
+                float floatValue = floatExpression.Value;
+                value = new Vector2(floatValue, floatValue);
+            }
+            return (Expression)value as IValueExpression;
+        }
+    }
+
+    /// <summary>
+    /// Expression that converts the result of a parent expression to Vector3.
+    /// </summary>
+    /*public*/ class ConvertToVector3Expression : CastExpression<Vector3>
+    {
+        /// <inheritdoc cref="CastExpression{T}"/>
+        protected override string CastType => "float3";
+
+        /// <summary>
+        /// Creates a new expression using the parent expression that will be converted.
+        /// </summary>
+        /// <param name="expression">The expression to convert.</param>
+        public ConvertToVector3Expression(IExpression expression) : base(expression)
+        {
+        }
+
+        /// <inheritdoc cref="CastExpression{T}"/>
+        public override IValueExpression Evaluate(IValueExpression parent)
+        {
+            if (parent.TryGetValue(out Vector3 value))
+            {
+                return parent;
+            }
+            else
+            {
+                // var floatExpression = ConvertToFloatExpression.Evaluate(parent) as IValueExpression<float>; // TODO: Evaluate should be static. Change when we support C#11
+                var floatExpression = new ConvertToFloatExpression(parent).Evaluate(parent) as IValueExpression<float>;
+                float floatValue = floatExpression.Value;
+                value = new Vector3(floatValue, floatValue, floatValue);
+            }
+            return (Expression)value as IValueExpression;
+        }
+    }
+
+    /// <summary>
+    /// Expression that converts the result of a parent expression to Vector4.
+    /// </summary>
+    /*public*/ class ConvertToVector4Expression : CastExpression<Vector4>
+    {
+        /// <inheritdoc cref="CastExpression{T}"/>
+        protected override string CastType => "float4";
+
+        /// <summary>
+        /// Creates a new expression using the parent expression that will be converted.
+        /// </summary>
+        /// <param name="expression">The expression to convert.</param>
+        public ConvertToVector4Expression(IExpression expression) : base(expression)
+        {
+        }
+
+        /// <inheritdoc cref="CastExpression{T}"/>
+        public override IValueExpression Evaluate(IValueExpression parent)
+        {
+            if (parent.TryGetValue(out Vector4 value))
+            {
+                return parent;
+            }
+            else
+            {
+                // var floatExpression = ConvertToFloatExpression.Evaluate(parent) as IValueExpression<float>; // TODO: Evaluate should be static. Change when we support C#11
+                var floatExpression = new ConvertToFloatExpression(parent).Evaluate(parent) as IValueExpression<float>;
+                float floatValue = floatExpression.Value;
+                value = new Vector4(floatValue, floatValue, floatValue, floatValue);
+            }
+            return (Expression)value as IValueExpression;
+        }
+    }
+
+    /// <summary>
+    /// Expression that converts the result of a parent expression to Vector2Int.
+    /// </summary>
+    /*public*/ class ConvertToVector2IntExpression : CastExpression<Vector2Int>
+    {
+        /// <inheritdoc cref="CastExpression{T}"/>
+        protected override string CastType => "int2";
+
+        /// <summary>
+        /// Creates a new expression using the parent expression that will be converted.
+        /// </summary>
+        /// <param name="expression">The expression to convert.</param>
+        public ConvertToVector2IntExpression(IExpression expression) : base(expression)
+        {
+        }
+
+        /// <inheritdoc cref="CastExpression{T}"/>
+        public override IValueExpression Evaluate(IValueExpression parent)
+        {
+            if (parent.TryGetValue(out Vector2Int value))
+            {
+                return parent;
+            }
+            else
+            {
+                // var intExpression = ConvertToIntExpression.Evaluate(parent) as IValueExpression<int>; // TODO: Evaluate should be static. Change when we support C#11
+                var intExpression = new ConvertToIntExpression(parent).Evaluate(parent) as IValueExpression<int>;
+                int intValue = intExpression.Value;
+                value = new Vector2Int(intValue, intValue);
+            }
+            return (Expression)value as IValueExpression;
+        }
+    }
+
+    /// <summary>
+    /// Expression that converts the result of a parent expression to Vector3Int.
+    /// </summary>
+    /*public*/ class ConvertToVector3IntExpression : CastExpression<Vector3Int>
+    {
+        /// <inheritdoc cref="CastExpression{T}"/>
+        protected override string CastType => "int3";
+
+        /// <summary>
+        /// Creates a new expression using the parent expression that will be converted.
+        /// </summary>
+        /// <param name="expression">The expression to convert.</param>
+        public ConvertToVector3IntExpression(IExpression expression) : base(expression)
+        {
+        }
+
+        /// <inheritdoc cref="CastExpression{T}"/>
+        public override IValueExpression Evaluate(IValueExpression parent)
+        {
+            if (parent.TryGetValue(out Vector3Int value))
+            {
+                return parent;
+            }
+            else
+            {
+                // var intExpression = ConvertToIntExpression.Evaluate(parent) as IValueExpression<int>; // TODO: Evaluate should be static. Change when we support C#11
+                var intExpression = new ConvertToIntExpression(parent).Evaluate(parent) as IValueExpression<int>;
+                int intValue = intExpression.Value;
+                value = new Vector3Int(intValue, intValue, intValue);
+            }
+            return (Expression)value as IValueExpression;
+        }
+    }
+}
diff --git a/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Expression/ConvertExpression.cs.meta b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Expression/ConvertExpression.cs.meta
new file mode 100644
index 00000000000..127f5a8819b
--- /dev/null
+++ b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Expression/ConvertExpression.cs.meta
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: 9f3ce859b5bf0ae46afa37cc715ce60a
\ No newline at end of file
diff --git a/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Expression/Expression.cs b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Expression/Expression.cs
new file mode 100644
index 00000000000..36028ab7a9a
--- /dev/null
+++ b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Expression/Expression.cs
@@ -0,0 +1,279 @@
+
+using UnityEngine;
+using System.Collections.Generic;
+
+namespace Unity.GraphCommon.LowLevel.Editor
+{
+    [System.Flags]
+    enum ExpressionFlags // To be defined, currently just a copy of what is in VFX Graph 1
+    {
+        None = 0,
+        Value = 1 << 0, // Expression is a value, get/set can be called on it
+        Foldable = 1 << 1, // Expression is not a constant but can be folded anyway
+        Constant = 1 << 2, // Expression is a constant, it can be folded
+        InvalidOnGPU = 1 << 3, // Expression can be evaluated on GPU
+        InvalidOnCPU = 1 << 4, // Expression can be evaluated on CPU
+        InvalidConstant = 1 << 5, // Expression can be folded (for UI) but constant folding is forbidden
+        PerElement = 1 << 6, // Expression is per element
+        PerSpawn = 1 << 7, // Expression relies on event attribute or spawn context
+        NotCompilableOnCPU = InvalidOnCPU | PerElement //Helper to filter out invalid expression on CPU
+    }
+
+    /// <summary>
+    /// IExpression base class implementation to simplify code common to most expressions.
+    /// </summary>
+    /*public*/ abstract class Expression : IExpression
+    {
+        readonly List<IExpression> m_Parents;
+
+        /// <inheritdoc cref="IExpression"/>
+        public virtual System.Type ResultType => throw new System.NotImplementedException();
+
+        internal ExpressionFlags Flags { get; set; }
+
+        /// <inheritdoc cref="IExpression"/>
+        public bool IsConstant => Flags.HasFlag(ExpressionFlags.Constant);
+
+        /// <inheritdoc cref="IExpression"/>
+        public ReadOnlyList<IExpression> Parents => m_Parents;
+
+        static readonly Dictionary<System.Type, System.Func<IExpression, IExpression>> s_Converters = new();
+
+        /// <summary>
+        /// Creates a new expression that uses other expressions as parents.
+        /// Currently there is a max limit of 4 parents.
+        /// </summary>
+        /// <param name="parents">List of parents to use as parameters.</param>
+        public Expression(params IExpression[] parents)
+        {
+            Debug.Assert(parents.Length <= 4);
+            m_Parents = new(parents);
+        }
+
+        static Expression()
+        {
+            Register<bool>((expression) => new ConvertToBoolExpression(expression));
+            Register<float>((expression) => new ConvertToFloatExpression(expression));
+            Register<double>((expression) => new ConvertToDoubleExpression(expression));
+            Register<int>((expression) => new ConvertToIntExpression(expression));
+            Register<uint>((expression) => new ConvertToUintExpression(expression));
+            Register<Vector2>((expression) => new ConvertToVector2Expression(expression));
+            Register<Vector3>((expression) => new ConvertToVector3Expression(expression));
+            Register<Vector4>((expression) => new ConvertToVector4Expression(expression));
+            Register<Vector2Int>((expression) => new ConvertToVector2IntExpression(expression));
+            Register<Vector3Int>((expression) => new ConvertToVector3IntExpression(expression));
+        }
+
+        /// <summary>
+        /// Tests if the expression is valid with the current parents.
+        /// </summary>
+        /// <returns>True if the expression is valid for the current parent expressions.</returns>
+        public bool Validate() => Validate(m_Parents);
+
+        /// <inheritdoc cref="IExpression"/>
+        public virtual bool Validate(ReadOnlyList<IExpression> parents) => true;
+
+        /// <inheritdoc cref="IExpression"/>
+        public abstract IValueExpression Evaluate(ReadOnlyList<IValueExpression> parents);
+
+        /// <inheritdoc cref="IExpression"/>
+        public virtual IExpression Reduce(ReadOnlyList<IExpression> parents) => this;
+
+        /// <inheritdoc cref="IExpression"/>
+        public abstract string GetCodeString(ReadOnlyList<string> parents);
+
+        /// <inheritdoc cref="IExpression"/>
+        public IExpression Convert(System.Type type)
+        {
+            if (ResultType == type) return this;
+
+            if (!s_Converters.TryGetValue(type, out var converter))
+            {
+                throw new System.InvalidCastException();
+            }
+
+            return converter(this);
+        }
+
+        /// <summary>
+        /// Registers a new conversion function for expression types.
+        /// </summary>
+        /// <typeparam name="T">The result type of the expression to convert to.</typeparam>
+        /// <param name="converter">Function that converts any expression to the desired type.</param>
+        public static void Register<T>(System.Func<IExpression, IExpression> converter)
+        {
+            Debug.Assert(converter != null);
+            Debug.Assert(!s_Converters.ContainsKey(typeof(T)));
+            s_Converters.Add(typeof(T), converter);
+        }
+
+        /// <summary>
+        /// Converts a boolean value into an expression.
+        /// </summary>
+        /// <param name="value">The value to be transformed into an expression.</param>
+        /// <returns>A new expression containing the value.</returns>
+        public static explicit operator Expression(bool value) => new LiteralExpression<bool>(value);
+
+        /// <summary>
+        /// Converts a float value into an expression.
+        /// </summary>
+        /// <param name="value">The value to be transformed into an expression.</param>
+        /// <returns>A new expression containing the value.</returns>
+        public static explicit operator Expression(float value) => new LiteralExpression<float>(value);
+
+        /// <summary>
+        /// Converts a double value into an expression.
+        /// </summary>
+        /// <param name="value">The value to be transformed into an expression.</param>
+        /// <returns>A new expression containing the value.</returns>
+        public static explicit operator Expression(double value) => new LiteralExpression<double>(value);
+
+        /// <summary>
+        /// Converts an int value into an expression.
+        /// </summary>
+        /// <param name="value">The value to be transformed into an expression.</param>
+        /// <returns>A new expression containing the value.</returns>
+        public static explicit operator Expression(int value) => new LiteralExpression<int>(value);
+
+        /// <summary>
+        /// Converts a uint value into an expression.
+        /// </summary>
+        /// <param name="value">The value to be transformed into an expression.</param>
+        /// <returns>A new expression containing the value.</returns>
+        public static explicit operator Expression(uint value) => new LiteralExpression<uint>(value);
+
+        /// <summary>
+        /// Converts a Vector2 value into an expression.
+        /// </summary>
+        /// <param name="value">The value to be transformed into an expression.</param>
+        /// <returns>A new expression containing the value.</returns>
+        public static explicit operator Expression(Vector2 value) => new LiteralExpression<Vector2>(value);
+
+        /// <summary>
+        /// Converts a Vector3 value into an expression.
+        /// </summary>
+        /// <param name="value">The value to be transformed into an expression.</param>
+        /// <returns>A new expression containing the value.</returns>
+        public static explicit operator Expression(Vector3 value) => new LiteralExpression<Vector3>(value);
+
+        /// <summary>
+        /// Converts a Vector4 value into an expression.
+        /// </summary>
+        /// <param name="value">The value to be transformed into an expression.</param>
+        /// <returns>A new expression containing the value.</returns>
+        public static explicit operator Expression(Vector4 value) => new LiteralExpression<Vector4>(value);
+
+        /// <summary>
+        /// Converts a Vector2Int value into an expression.
+        /// </summary>
+        /// <param name="value">The value to be transformed into an expression.</param>
+        /// <returns>A new expression containing the value.</returns>
+        public static explicit operator Expression(Vector2Int value) => new LiteralExpression<Vector2Int>(value);
+
+        /// <summary>
+        /// Converts a Vector3Int value into an expression.
+        /// </summary>
+        /// <param name="value">The value to be transformed into an expression.</param>
+        /// <returns>A new expression containing the value.</returns>
+        public static explicit operator Expression(Vector3Int value) => new LiteralExpression<Vector3Int>(value);
+
+        /// <summary>
+        /// Creates a new expression representing a literal value of a specific type.
+        /// </summary>
+        /// <param name="type">The type of the value contained in the expression.</param>
+        /// <param name="value">The value to be transformed into an expression.</param>
+        /// <returns>A new expression representing the literal value.</returns>
+        public static Expression CreateLiteral(System.Type type, object value)
+        {
+            Debug.Assert(type.IsAssignableFrom(value.GetType()));
+            var genericType = typeof(LiteralExpression<>).MakeGenericType(type);
+            return (Expression)System.Activator.CreateInstance(genericType, value);
+        }
+    }
+
+    /// <summary>
+    /// IExpression base class implementation to simplify code common to most expressions, specialized for a specific result type.
+    /// </summary>
+    /// <typeparam name="T">The result type of the expression.</typeparam>
+    /*public*/ abstract class Expression<T> : Expression, IExpression<T>
+    {
+        /// <inheritdoc cref="IExpression"/>
+        public sealed override System.Type ResultType => typeof(T);
+
+        /// <summary>
+        /// Creates a new expression that uses other expressions as parents.
+        /// Currently there is a max limit of 4 parents.
+        /// </summary>
+        /// <param name="parents">List of parents to use as parameters.</param>
+        public Expression(params IExpression[] parents) : base (parents)
+        {
+        }
+
+        /// <summary>
+        /// Converts a generic value into an expression of the same type.
+        /// </summary>
+        /// <param name="value">The value to be transformed into an expression.</param>
+        /// <returns>A new expression containing the value.</returns>
+        public static implicit operator Expression<T>(T value) => new LiteralExpression<T>(value);
+    }
+
+    /// <summary>
+    /// Expression containing a single value.
+    /// </summary>
+    /// <typeparam name="T">The result type of the expression.</typeparam>
+    /*public*/ abstract class ValueExpression<T> : Expression<T>, IValueExpression<T>
+    {
+        /// <inheritdoc cref="IValueExpression{T}"/>
+        public abstract T Value { get; }
+
+        /// <inheritdoc cref="IExpression"/>
+        public override IValueExpression Evaluate(ReadOnlyList<IValueExpression> parents) => this;
+
+        /// <inheritdoc cref="IExpression"/>
+        public override string GetCodeString(ReadOnlyList<string> parents) => Value.ToString();
+    }
+
+    /// <summary>
+    /// Expression containing a delegate that evaluates to a single value.
+    /// </summary>
+    /// <typeparam name="T">The result type of the expression.</typeparam>
+    /*public*/ sealed class DelegateValueExpression<T> : ValueExpression<T>
+    {
+        /// <inheritdoc cref="ValueExpression{T}"/>
+        public override T Value => ValueFunction();
+
+        /// <summary>
+        /// Returns the delegate to compute the value of the expression
+        /// </summary>
+        public System.Func<T> ValueFunction { get; }
+
+        /// <summary>
+        /// Creates a new DelegateValueExpression containing the provided delegate.
+        /// </summary>
+        /// <param name="valueFunction">The delegate that returns the value of the expression.</param>
+        public DelegateValueExpression(System.Func<T> valueFunction)
+        {
+            ValueFunction = valueFunction;
+        }
+    }
+
+    /// <summary>
+    /// Expression containing a single constant value.
+    /// </summary>
+    /// <typeparam name="T">The result type of the expression.</typeparam>
+    /*public*/ sealed class LiteralExpression<T> : ValueExpression<T>
+    {
+        /// <inheritdoc cref="ValueExpression{T}"/>
+        public override T Value { get; }
+
+        /// <summary>
+        /// Creates a new LiteralExpression containing the provided value.
+        /// </summary>
+        /// <param name="value">The value that will be stored in the expression.</param>
+        public LiteralExpression(T value)
+        {
+            Value = value;
+            Flags |= ExpressionFlags.Constant;
+        }
+    }
+}
diff --git a/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Expression/Expression.cs.meta b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Expression/Expression.cs.meta
new file mode 100644
index 00000000000..764a881b282
--- /dev/null
+++ b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Expression/Expression.cs.meta
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: cea2f99d8de872843a81ada2c59e3640
\ No newline at end of file
diff --git a/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Expression/IExpression.cs b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Expression/IExpression.cs
new file mode 100644
index 00000000000..118801813f9
--- /dev/null
+++ b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Expression/IExpression.cs
@@ -0,0 +1,128 @@
+
+namespace Unity.GraphCommon.LowLevel.Editor
+{
+    /// <summary>
+    /// Interface describing an expression to be evaluated by the graph.
+    /// Expressions represent individual operations that need to be performed by the graph. They can receive other expressions as parameters, forming an expression tree.
+    /// Expressions can be evaluated or simplified during compilation, if they have constant parameters. Otherwise, they will be evaluated on the CPU or GPU, depending on the task.
+    /// </summary>
+    /*public*/ interface IExpression
+    {
+        /// <summary>
+        /// Type of the resulting value of the expression.
+        /// </summary>
+        System.Type ResultType { get; }
+
+        /// <summary>
+        /// Returns true if the expression is always constant.
+        /// </summary>
+        bool IsConstant { get; }
+
+        /// <summary>
+        /// List of parent expressions used as arguments.
+        /// </summary>
+        ReadOnlyList<IExpression> Parents { get; }
+
+        /// <summary>
+        /// Tests if the expression is valid for the provided parents.
+        /// </summary>
+        /// <param name="parents">List of parents to use as parameters.</param>
+        /// <returns>True if the expression is valid for the parent expressions.</returns>
+        bool Validate(ReadOnlyList<IExpression> parents) => true;
+
+        /// <summary>
+        /// Creates a new value expression that is equivalent to applying the expression to the provided parents.
+        /// If the evaluation is not possible, it will throw an exception.
+        /// </summary>
+        /// <param name="parents">List of parents to use as parameters.</param>
+        /// <returns>A new value expression equivalent to applying the expression to the provided parents.</returns>
+        IValueExpression Evaluate(ReadOnlyList<IValueExpression> parents);
+
+        /// <summary>
+        /// Creates a new expression of the same type with the provided parents, or a reduced equivalent expression when it is possible.
+        /// </summary>
+        /// <param name="parents">List of parents to use as parameters.</param>
+        /// <returns>A new expression of the same type with the provided parents, or a reduced equivalent expression.</returns>
+        IExpression Reduce(ReadOnlyList<IExpression> parents) => (IExpression)System.Activator.CreateInstance(GetType(), parents);
+
+        /// <summary>
+        /// Obtains the HLSL code that evaluates this expression tree.
+        /// </summary>
+        /// <param name="parents">List of code strings produced by each parent expression.</param>
+        /// <returns>The HLSL code that evaluates this expression tree.</returns>
+        string GetCodeString(ReadOnlyList<string> parents);
+
+        /// <summary>
+        /// Converts this expression to an equivalent expression with result type T.
+        /// </summary>
+        /// <typeparam name="T">The result type of the returned expression.</typeparam>
+        /// <returns>An equivalent expression with result type T, or null if the conversion is not possible.</returns>
+        IExpression<T> Convert<T>() => Convert(typeof(T)) as IExpression<T>;
+
+        /// <summary>
+        /// Converts this expression to an equivalent expression with provided result type.
+        /// </summary>
+        /// <param name="type">Result type of the expression to be converted to.</param>
+        /// <returns>An equivalent expression with provided result type, or null if the conversion is not possible.</returns>
+        IExpression Convert(System.Type type);
+    }
+
+    /// <summary>
+    /// Interface describing an expression to be evaluated by the graph, specialized for a specific result type.
+    /// Expressions represent individual operations that need to be performed by the graph. They can receive other expressions as parameters, forming an expression tree.
+    /// Expressions can be evaluated or simplified during compilation, if they have constant parameters. Otherwise, they will be evaluated on the CPU or GPU, depending on the task.
+    /// </summary>
+    /// <typeparam name="T">The result type of the expression.</typeparam>
+    /*public*/ interface IExpression<T> : IExpression
+    {
+        /// <inheritdoc cref="IExpression"/>
+        System.Type IExpression.ResultType => typeof(T);
+    }
+
+    /// <summary>
+    /// Interface describing an expression which holds a fixed value.
+    /// </summary>
+    /*public*/ interface IValueExpression : IExpression
+    {
+        /// <summary>
+        /// Fixed value of the expression as an object.
+        /// </summary>
+        object Value { get; }
+
+        /// <summary>
+        /// Tries to obtain the value of the expression as a specific type TValue.
+        /// </summary>
+        /// <typeparam name="TValue">The desired value type.</typeparam>
+        /// <param name="value">The value of the expression if the TValue is compatible.</param>
+        /// <returns>True if it is possible to convert the expression value to TValue, false otherwise.</returns>
+        bool TryGetValue<TValue>(out TValue value);
+    }
+
+    /// <summary>
+    /// Interface describing an expression which holds a fixed value.
+    /// </summary>
+    /// <typeparam name="T">The result type of the expression.</typeparam>
+    /*public*/ interface IValueExpression<T> : IValueExpression, IExpression<T>
+    {
+        /// <inheritdoc cref="IValueExpression"/>
+        bool IValueExpression.TryGetValue<TValue>(out TValue value)
+        {
+            if (Value is TValue convertedValue)
+            {
+                value = convertedValue;
+                return true;
+            }
+            else
+            {
+                value = default;
+                return false;
+            }
+        }
+
+        /// <summary>
+        /// Fixed value of the expression.
+        /// </summary>
+        new T Value { get; }
+        object IValueExpression.Value => Value;
+    }
+}
diff --git a/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Expression/IExpression.cs.meta b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Expression/IExpression.cs.meta
new file mode 100644
index 00000000000..0c1448441fb
--- /dev/null
+++ b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Expression/IExpression.cs.meta
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: 6dc562e67af5a6246953f9a8967b073e
\ No newline at end of file
diff --git a/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Expression/MathExpression.cs b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Expression/MathExpression.cs
new file mode 100644
index 00000000000..4eb65be0f83
--- /dev/null
+++ b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Expression/MathExpression.cs
@@ -0,0 +1,283 @@
+using UnityEngine;
+
+namespace Unity.GraphCommon.LowLevel.Editor
+{
+    /// <summary>
+    /// Base expression for generic math operations.
+    /// Splits the Evaluate function in different functions depending on the result type.
+    /// </summary>
+    /// <typeparam name="T">The result type of the expression.</typeparam>
+    /*public*/ abstract class MathExpression<T> : Expression<T>
+    {
+        /// <summary>
+        /// True if the result type is a floating point type (scalar or vector).
+        /// </summary>
+        public bool IsFloatingPoint => default(T) is float or double or Vector2 or Vector3 or Vector4;
+
+        /// <summary>
+        /// True if the result type is a vector.
+        /// </summary>
+        public bool IsVector => default(T) is Vector2 or Vector3 or Vector4 or Vector2Int or Vector3Int;
+
+        /// <summary>
+        /// Creates a new math expression with the parameter expressions as parents.
+        /// </summary>
+        /// <param name="parents">List of parents to use as parameters.</param>
+        protected MathExpression(params IExpression[] parents) : base(parents)
+        {
+            // TODO: Convert parents to T?
+        }
+
+        /// <inheritdoc cref="IExpression"/>
+        public override IValueExpression Evaluate(ReadOnlyList<IValueExpression> parents)
+        {
+            var values = new T[parents.Count]; // TODO: Could remove the alloc with some extra work
+            for (int i = 0; i < parents.Count; ++i)
+            {
+                if (!parents[i].TryGetValue(out values[i]))
+                {
+                    throw new System.InvalidCastException();
+                }
+            }
+            return values switch
+            {
+                bool[] v => (Expression)EvaluateOperation(v) as IValueExpression,
+                float[] v => (Expression)EvaluateOperation(v) as IValueExpression,
+                double[] v => (Expression)EvaluateOperation(v) as IValueExpression,
+                int[] v => (Expression)EvaluateOperation(v) as IValueExpression,
+                uint[] v => (Expression)EvaluateOperation(v) as IValueExpression,
+                Vector2[] v => (Expression)EvaluateOperation(v) as IValueExpression,
+                Vector3[] v => (Expression)EvaluateOperation(v) as IValueExpression,
+                Vector4[] v => (Expression)EvaluateOperation(v) as IValueExpression,
+                Vector2Int[] v => (Expression)EvaluateOperation(v) as IValueExpression,
+                Vector3Int[] v => (Expression)EvaluateOperation(v) as IValueExpression,
+                _ => default
+            };
+        }
+
+        /// <summary>
+        /// Evaluates the operation using the values from the parent expressions converted to bool.
+        /// </summary>
+        /// <param name="parents">List of values taken from the parent expressions.</param>
+        /// <returns>The value of the operation applied to the parents.</returns>
+        protected virtual bool EvaluateOperation(bool[] parents) => throw new System.NotImplementedException();
+
+        /// <summary>
+        /// Evaluates the operation using the values from the parent expressions converted to float.
+        /// </summary>
+        /// <param name="parents">List of values taken from the parent expressions.</param>
+        /// <returns>The value of the operation applied to the parents.</returns>
+        protected virtual float EvaluateOperation(float[] parents) => throw new System.NotImplementedException();
+
+        /// <summary>
+        /// Evaluates the operation using the values from the parent expressions converted to double.
+        /// </summary>
+        /// <param name="parents">List of values taken from the parent expressions.</param>
+        /// <returns>The value of the operation applied to the parents.</returns>
+        protected virtual double EvaluateOperation(double[] parents) => throw new System.NotImplementedException();
+
+        /// <summary>
+        /// Evaluates the operation using the values from the parent expressions converted to int.
+        /// </summary>
+        /// <param name="parents">List of values taken from the parent expressions.</param>
+        /// <returns>The value of the operation applied to the parents.</returns>
+        protected virtual int EvaluateOperation(int[] parents) => throw new System.NotImplementedException();
+
+        /// <summary>
+        /// Evaluates the operation using the values from the parent expressions converted to uint.
+        /// </summary>
+        /// <param name="parents">List of values taken from the parent expressions.</param>
+        /// <returns>The value of the operation applied to the parents.</returns>
+        protected virtual uint EvaluateOperation(uint[] parents) => throw new System.NotImplementedException();
+
+        /// <summary>
+        /// Evaluates the operation using the values from the parent expressions converted to Vector2.
+        /// </summary>
+        /// <param name="parents">List of values taken from the parent expressions.</param>
+        /// <returns>The value of the operation applied to the parents.</returns>
+        protected virtual Vector2 EvaluateOperation(Vector2[] parents)
+        {
+            Vector2 result = new Vector2();
+            var values = new float[parents.Length];
+            for (int j = 0; j < 2; ++j)
+            {
+                for (int i = 0; i < parents.Length; ++i)
+                {
+                    values[i] = parents[i][j];
+                }
+                result[j] = EvaluateOperation(values);
+            }
+            return result;
+        }
+
+        /// <summary>
+        /// Evaluates the operation using the values from the parent expressions converted to Vector3.
+        /// </summary>
+        /// <param name="parents">List of values taken from the parent expressions.</param>
+        /// <returns>The value of the operation applied to the parents.</returns>
+        protected virtual Vector3 EvaluateOperation(Vector3[] parents)
+        {
+            Vector3 result = new Vector3();
+            var values = new float[parents.Length];
+            for (int j = 0; j < 3; ++j)
+            {
+                for (int i = 0; i < parents.Length; ++i)
+                {
+                    values[i] = parents[i][j];
+                }
+                result[j] = EvaluateOperation(values);
+            }
+            return result;
+        }
+
+        /// <summary>
+        /// Evaluates the operation using the values from the parent expressions converted to Vector4.
+        /// </summary>
+        /// <param name="parents">List of values taken from the parent expressions.</param>
+        /// <returns>The value of the operation applied to the parents.</returns>
+        protected virtual Vector4 EvaluateOperation(Vector4[] parents)
+        {
+            Vector4 result = new Vector4();
+            var values = new float[parents.Length];
+            for (int j = 0; j < 4; ++j)
+            {
+                for (int i = 0; i < parents.Length; ++i)
+                {
+                    values[i] = parents[i][j];
+                }
+                result[j] = EvaluateOperation(values);
+            }
+            return result;
+        }
+
+        /// <summary>
+        /// Evaluates the operation using the values from the parent expressions converted to Vector2Int.
+        /// </summary>
+        /// <param name="parents">List of values taken from the parent expressions.</param>
+        /// <returns>The value of the operation applied to the parents.</returns>
+        protected virtual Vector2Int EvaluateOperation(Vector2Int[] parents)
+        {
+            Vector2Int result = new Vector2Int();
+            var values = new int[parents.Length];
+            for (int j = 0; j < 2; ++j)
+            {
+                for (int i = 0; i < parents.Length; ++i)
+                {
+                    values[i] = parents[i][j];
+                }
+                result[j] = EvaluateOperation(values);
+            }
+            return result;
+        }
+
+        /// <summary>
+        /// Evaluates the operation using the values from the parent expressions converted to Vector3sInt.
+        /// </summary>
+        /// <param name="parents">List of values taken from the parent expressions.</param>
+        /// <returns>The value of the operation applied to the parents.</returns>
+        protected virtual Vector3Int EvaluateOperation(Vector3Int[] parents)
+        {
+            Vector3Int result = new Vector3Int();
+            var values = new int[parents.Length];
+            for (int j = 0; j < 3; ++j)
+            {
+                for (int i = 0; i < parents.Length; ++i)
+                {
+                    values[i] = parents[i][j];
+                }
+                result[j] = EvaluateOperation(values);
+            }
+            return result;
+        }
+    }
+
+    /// <summary>
+    /// Expression that adds the result of two parent expressions.
+    /// </summary>
+    /// <typeparam name="T">The result type of the expression.</typeparam>
+    /*public*/ class AddExpression<T> : MathExpression<T>
+    {
+        /// <summary>
+        /// Creates a new expression with the two parent expressions.
+        /// </summary>
+        /// <param name="expression0">The first parent expression.</param>
+        /// <param name="expression1">The second parent expression.</param>
+        public AddExpression(IExpression expression0, IExpression expression1) : base(expression0.Convert<T>(), expression1.Convert<T>())
+        {
+        }
+
+        /// <inheritdoc cref="IExpression"/>
+        public override bool Validate(ReadOnlyList<IExpression> parents) => parents.Count == 2;
+
+        /// <inheritdoc cref="IExpression"/>
+        public override IExpression Reduce(ReadOnlyList<IExpression> parents)
+        {
+            Expression<T> zero = default(T);
+
+            if (parents[0] == zero)
+                return parents[1];
+
+            if (parents[1] == zero)
+                return parents[0];
+
+            return base.Reduce(parents);
+        }
+
+        /// <inheritdoc cref="MathExpression{T}"/>
+        protected override float EvaluateOperation(float[] parents) => parents[0] + parents[1];
+
+        /// <inheritdoc cref="MathExpression{T}"/>
+        protected override double EvaluateOperation(double[] parents) => parents[0] + parents[1];
+
+        /// <inheritdoc cref="MathExpression{T}"/>
+        protected override int EvaluateOperation(int[] parents) => parents[0] + parents[1];
+
+        /// <inheritdoc cref="MathExpression{T}"/>
+        protected override uint EvaluateOperation(uint[] parents) => parents[0] + parents[1];
+
+        /// <inheritdoc cref="MathExpression{T}"/>
+        protected override Vector2 EvaluateOperation(Vector2[] parents) => parents[0] + parents[1];
+
+        /// <inheritdoc cref="MathExpression{T}"/>
+        protected override Vector3 EvaluateOperation(Vector3[] parents) => parents[0] + parents[1];
+
+        /// <inheritdoc cref="MathExpression{T}"/>
+        protected override Vector4 EvaluateOperation(Vector4[] parents) => parents[0] + parents[1];
+
+        /// <inheritdoc cref="MathExpression{T}"/>
+        protected override Vector2Int EvaluateOperation(Vector2Int[] parents) => parents[0] + parents[1];
+
+        /// <inheritdoc cref="MathExpression{T}"/>
+        protected override Vector3Int EvaluateOperation(Vector3Int[] parents) => parents[0] + parents[1];
+
+        /// <inheritdoc cref="IExpression"/>
+        public override string GetCodeString(ReadOnlyList<string> parents) => $"{parents[0]} + {parents[1]}";
+    }
+
+    /// <summary>
+    /// Expression that computes the cosine of the parent expression.
+    /// </summary>
+    /// <typeparam name="T">The result type of the expression.</typeparam>
+    /*public*/ class CosineExpression<T> : MathExpression<T>
+    {
+        /// <summary>
+        /// Creates a new expression with the parent expression.
+        /// </summary>
+        /// <param name="expression">The parent expression.</param>
+        public CosineExpression(IExpression expression) : base(expression.Convert<T>())
+        {
+        }
+
+        /// <inheritdoc cref="IExpression"/>
+        public override bool Validate(ReadOnlyList<IExpression> parents) => parents.Count == 1 && IsFloatingPoint;
+
+        /// <inheritdoc cref="MathExpression{T}"/>
+        protected override float EvaluateOperation(float[] parents) => Mathf.Cos(parents[0]);
+
+        /// <inheritdoc cref="MathExpression{T}"/>
+        protected override double EvaluateOperation(double[] parents) => System.Math.Cos(parents[0]);
+
+        /// <inheritdoc cref="IExpression"/>
+        public override string GetCodeString(ReadOnlyList<string> parents) => $"{parents[0]}";
+    }
+}
diff --git a/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Expression/MathExpression.cs.meta b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Expression/MathExpression.cs.meta
new file mode 100644
index 00000000000..1fae3437b8f
--- /dev/null
+++ b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Expression/MathExpression.cs.meta
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: 44a11295bd32dd3418690b0be3d3d051
\ No newline at end of file
diff --git a/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Expression/TimeExpression.cs b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Expression/TimeExpression.cs
new file mode 100644
index 00000000000..46493fd5337
--- /dev/null
+++ b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Expression/TimeExpression.cs
@@ -0,0 +1,23 @@
+using System;
+using UnityEngine;
+
+namespace Unity.GraphCommon.LowLevel.Editor
+{
+    /// <summary>
+    /// Expression that, when evaluated, returns the current delta time.
+    /// </summary>
+    /*public*/ class DeltaTimeExpression : ValueExpression<float>
+    {
+        /// <inheritdoc cref="ValueExpression{T}"/>
+        public override float Value => Time.deltaTime;
+    }
+
+    /// <summary>
+    /// Expression that, when evaluated, returns the total time since the start of the effect.
+    /// </summary>
+    /*public*/ class TotalTimeExpression : ValueExpression<float>
+    {
+        /// <inheritdoc cref="ValueExpression{T}"/>
+        public override float Value => Time.time;
+    }
+}
diff --git a/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Expression/TimeExpression.cs.meta b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Expression/TimeExpression.cs.meta
new file mode 100644
index 00000000000..6097335dd0f
--- /dev/null
+++ b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Expression/TimeExpression.cs.meta
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: 8125b502b066433aa64372425179fd94
\ No newline at end of file
diff --git a/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Graph.meta b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Graph.meta
new file mode 100644
index 00000000000..2fbade69b3f
--- /dev/null
+++ b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Graph.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: ea62fc52b6c77584588ab1d9acdedf2d
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Graph/DataBinding.cs b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Graph/DataBinding.cs
new file mode 100644
index 00000000000..985d94e97ca
--- /dev/null
+++ b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Graph/DataBinding.cs
@@ -0,0 +1,162 @@
+
+using System;
+
+namespace Unity.GraphCommon.LowLevel.Editor
+{
+    /// <summary>
+    /// An Id associated to a DataBinding in a graph.
+    /// </summary>
+    /*public*/ readonly struct DataBindingId : IEquatable<DataBindingId>
+    {
+        /// <summary>
+        /// Defines an invalid DataBindingId.
+        /// </summary>
+        public static readonly DataBindingId Invalid = new DataBindingId(-1);
+
+        /// <summary>
+        /// Implicitly converts a <see cref="DataBindingId"/> to a <see cref="GraphDataId"/>.
+        /// </summary>
+        /// <param name="id">The data binding ID to convert.</param>
+        /// <returns>A new graph data ID with the same index value.</returns>
+        public static implicit operator GraphDataId(DataBindingId id) => new GraphDataId(id.Index);
+        /// <summary>
+        /// Implicitly converts a <see cref="GraphDataId"/> to a <see cref="DataBindingId"/>.
+        /// </summary>
+        /// <param name="id">The graph data ID to convert.</param>
+        /// <returns>A new data binding ID with the same index value.</returns>
+        public static implicit operator DataBindingId(GraphDataId id) => new DataBindingId(id.Index);
+
+        /// <summary>
+        /// Gets the wrapped int index.
+        /// </summary>
+        public int Index { get; }
+        /// <summary>
+        /// Returns true if this Id is valid, false otherwise.
+        /// </summary>
+        public bool IsValid => Index != Invalid.Index;
+
+        internal DataBindingId(int index)
+        {
+            Index = index;
+        }
+
+        /// <inheritdoc cref="IEquatable"/>
+        public bool Equals(DataBindingId other) => Index == other.Index;
+        /// <inheritdoc cref="ValueType"/>
+        public override int GetHashCode() => Index;
+        /// <inheritdoc cref="ValueType"/>
+        public override string ToString() => Index.ToString();
+    }
+
+    readonly struct DataBindingInfo
+    {
+        public DataBindingInfo(DataBindingId id, TaskNodeId taskNodeId, DataViewId dataViewId, IDataKey bindingDataKey, BindingUsage usage)
+        {
+            Id = id;
+            TaskNodeId = taskNodeId;
+            DataViewId = dataViewId;
+            BindingDataKey = bindingDataKey;
+            Usage = usage;
+        }
+
+        public DataBindingId Id { get; }
+        public TaskNodeId TaskNodeId { get; }
+        public DataViewId DataViewId { get; }
+        public IDataKey BindingDataKey { get; }
+        public BindingUsage Usage { get; }
+    }
+
+    /// <summary>
+    /// Represents a data binding
+    /// </summary>
+    /*public*/ readonly struct DataBinding
+    {
+        readonly IIndexable<DataBindingId, DataBinding> m_Source;
+
+        readonly Handle<IReadOnlyGraph> m_Graph;
+        readonly DataBindingInfo m_Info;
+
+        /// <summary>
+        /// Gets the unique identifier for this <see cref="DataBinding"/>.
+        /// Returns <see cref="DataBindingId.Invalid"/> if the graph is not valid.
+        /// </summary>
+        public DataBindingId Id => m_Graph.Valid ? m_Info.Id : DataBindingId.Invalid;
+
+        /// <summary>
+        /// Gets the TaskNode that owns this binding.
+        /// </summary>
+        public TaskNode TaskNode => m_Graph.Ref.TaskNodes[m_Info.TaskNodeId];
+
+        /// <summary>
+        /// Gets the DataView associated with this binding.
+        /// </summary>
+        public DataView DataView => m_Graph.Ref.DataViews[m_Info.DataViewId];
+
+        /// <summary>
+        /// Gets the BindingDataKey used in this binding.
+        /// Returns null if the graph is not valid.
+        /// </summary>
+        public IDataKey BindingDataKey => m_Graph.Valid ? m_Info.BindingDataKey : null;
+
+        /// <summary>
+        /// Gets the BindingDataKey used in this binding.
+        /// Returns BindingUsage.Unknown if the graph is not valid.
+        /// </summary>
+        public BindingUsage Usage => m_Graph.Valid ? m_Info.Usage : BindingUsage.Unknown;
+
+        /// <summary>
+        /// Gets the DataNode associated with this binding.
+        /// </summary>
+        public DataNode DataNode => m_Graph.Ref.GetDataNode(m_Info.Id);
+
+        internal DataBinding(IIndexable<DataBindingId, DataBinding> source, IReadOnlyGraph graph, DataBindingInfo info)
+        {
+            m_Source = source;
+            m_Graph = new(graph);
+            m_Info = info;
+        }
+    }
+
+    /// <summary>
+    /// Represents an enumerable collection of <see cref="DataView"/> instances, based on an indexed source of IDs.
+    /// Combines ID enumeration with the ability to resolve and access <see cref="DataView"/> objects.
+    /// </summary>
+    /// <typeparam name="T">
+    /// The type of the indexed source providing the IDs.
+    /// Must implement both <see cref="IIndexable{TIndex, TValue}"/> and <see cref="ICountable"/>.
+    /// </typeparam>
+    /*public*/ readonly struct DataBindingEnumerable<T> : IIndexable<int, DataBinding>, ICountable where T : IIndexable<int, DataBindingId>, ICountable
+    {
+        readonly IIndexable<DataBindingId, DataBinding> m_Provider;
+        readonly T m_IdSource;
+
+        /// <summary>
+        /// Gets the number of items in the enumerable, sourced from the number of IDs in the <typeparamref name="T"/> source.
+        /// </summary>
+        public int Count => m_IdSource.Count;
+
+        /// <summary>
+        /// Gets the <see cref="DataBinding"/> at the specified index, resolving its associated ID.
+        /// </summary>
+        /// <param name="index">The zero-based index of the <see cref="DataBinding"/>.</param>
+        /// <value>The <see cref="DataBinding"/> associated with the ID at the specified index.</value>
+        public DataBinding this[int index] => m_Provider[m_IdSource[index]];
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="DataViewEnumerable{T}"/> struct.
+        /// </summary>
+        /// <param name="provider">The provider that resolves <see cref="DataBindingId"/> to <see cref="DataBinding"/> instances.</param>
+        /// <param name="idSource">The source of <see cref="DataBindingId"/> identifiers.</param>
+        public DataBindingEnumerable(IIndexable<DataBindingId, DataBinding> provider, T idSource)
+        {
+            m_Provider = provider;
+            m_IdSource = idSource;
+        }
+
+        /// <summary>
+        /// Returns an enumerator that iterates through the <see cref="DataBindingEnumerable{T}"/>.
+        /// </summary>
+        /// <returns>A <see cref="LinearEnumerator{TEnumerable, T}"/> for iterating through the <see cref="DataBinding"/> instances.</returns>
+        public LinearEnumerator<DataBindingEnumerable<T>, DataBinding> GetEnumerator() => new(this);
+    }
+}
diff --git a/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Graph/DataBinding.cs.meta b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Graph/DataBinding.cs.meta
new file mode 100644
index 00000000000..0f32ba5a65d
--- /dev/null
+++ b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Graph/DataBinding.cs.meta
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: 66e3c0b0579278549b036396a08df7af
\ No newline at end of file
diff --git a/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Graph/DataContainer.cs b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Graph/DataContainer.cs
new file mode 100644
index 00000000000..ddc93286aaf
--- /dev/null
+++ b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Graph/DataContainer.cs
@@ -0,0 +1,140 @@
+
+using System;
+
+namespace Unity.GraphCommon.LowLevel.Editor
+{
+    /// <summary>
+    /// An Id associated to a DataContainer in a graph.
+    /// </summary>
+    /*public*/ readonly struct DataContainerId : IEquatable<DataContainerId>
+    {
+        /// <summary>
+        /// Defines an invalid DataContainerId.
+        /// </summary>
+        public static readonly DataContainerId Invalid = new DataContainerId(-1);
+
+        /// <summary>
+        /// Implicitly converts a <see cref="DataContainerId"/> to a <see cref="GraphDataId"/>.
+        /// </summary>
+        /// <param name="id">The data container ID to convert.</param>
+        /// <returns>A new graph data ID with the same index value.</returns>
+        public static implicit operator GraphDataId(DataContainerId id) => new GraphDataId(id.Index);
+
+        /// <summary>
+        /// Implicitly converts a <see cref="GraphDataId"/> to a <see cref="DataContainerId"/>.
+        /// </summary>
+        /// <param name="id">The graph data ID to convert.</param>
+        /// <returns>A new data container ID with the same index value.</returns>
+        public static implicit operator DataContainerId(GraphDataId id) => new DataContainerId(id.Index);
+
+        /// <summary>
+        /// Gets the wrapped int index.
+        /// </summary>
+        public int Index { get; }
+        /// <summary>
+        /// Returns true if this Id is valid, false otherwise.
+        /// </summary>
+        public bool IsValid => Index != Invalid.Index;
+
+        internal DataContainerId(int index)
+        {
+            Index = index;
+        }
+
+        /// <inheritdoc cref="IEquatable"/>
+        public bool Equals(DataContainerId other) => Index == other.Index;
+        /// <inheritdoc cref="ValueType"/>
+        public override int GetHashCode() => Index;
+        /// <inheritdoc cref="ValueType"/>
+        public override string ToString() => Index.ToString();
+    }
+
+    readonly struct DataContainerInfo
+    {
+        public DataContainerInfo(DataContainerId id, string name, DataViewId rootDataViewId)
+        {
+            Id = id;
+            Name = name;
+            RootDataViewId = rootDataViewId;
+        }
+
+        public DataContainerId Id { get; }
+        public string Name { get; }
+        public DataViewId RootDataViewId { get; }
+    }
+
+    /// <summary>
+    /// Represents a data container
+    /// </summary>
+    /*public*/ readonly struct DataContainer
+    {
+        readonly Handle<IReadOnlyGraph> m_Graph;
+        readonly DataContainerInfo m_Info;
+
+        /// <summary>
+        /// Gets the unique identifier for this <see cref="DataContainer"/>.
+        /// Returns <see cref="DataContainerId.Invalid"/> if the graph is not valid.
+        /// </summary>
+        public DataContainerId Id => m_Graph.Valid ? m_Info.Id : DataContainerId.Invalid;
+
+        /// <summary>
+        /// Gets the name of this container. Returns null if the graph is not valid.
+        /// </summary>
+        public string Name => m_Graph.Valid ? m_Info.Name : null;
+
+        /// <summary>
+        /// Gets the root DataView of this container.
+        /// </summary>
+        public DataView RootDataView => m_Graph.Ref.DataViews[m_Info.RootDataViewId];
+
+        internal DataContainer(IReadOnlyGraph graph, DataContainerInfo info)
+        {
+            m_Graph = new(graph);
+            m_Info = info;
+        }
+    }
+
+    /// <summary>
+    /// Represents an enumerable collection of <see cref="DataView"/> instances, based on an indexed source of IDs.
+    /// Combines ID enumeration with the ability to resolve and access <see cref="DataView"/> objects.
+    /// </summary>
+    /// <typeparam name="T">
+    /// The type of the indexed source providing the IDs.
+    /// Must implement both <see cref="IIndexable{TIndex, TValue}"/> and <see cref="ICountable"/>.
+    /// </typeparam>
+    /*public*/ readonly struct DataContainerEnumerable<T> : IIndexable<int, DataContainer>, ICountable where T : IIndexable<int, DataContainerId>, ICountable
+    {
+        readonly IIndexable<DataContainerId, DataContainer> m_Provider;
+        readonly T m_IdSource;
+
+        /// <summary>
+        /// Gets the number of items in the enumerable, sourced from the number of IDs in the <typeparamref name="T"/> source.
+        /// </summary>
+        public int Count => m_IdSource.Count;
+
+        /// <summary>
+        /// Gets the <see cref="DataContainer"/> at the specified index, resolving its associated ID.
+        /// </summary>
+        /// <param name="index">The zero-based index of the <see cref="DataContainer"/>.</param>
+        /// <value>The <see cref="DataContainer"/> associated with the ID at the specified index.</value>
+        public DataContainer this[int index] => m_Provider[m_IdSource[index]];
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="DataContainerEnumerable{T}"/> struct.
+        /// Initializes a new instance of the <see cref="DataContainerEnumerable{T}"/> struct.
+        /// </summary>
+        /// <param name="provider">The provider that resolves <see cref="DataContainerId"/> to <see cref="DataContainer"/> instances.</param>
+        /// <param name="idSource">The source of <see cref="DataContainerId"/> identifiers.</param>
+        public DataContainerEnumerable(IIndexable<DataContainerId, DataContainer> provider, T idSource)
+        {
+            m_Provider = provider;
+            m_IdSource = idSource;
+        }
+
+        /// <summary>
+        /// Returns an enumerator that iterates through the <see cref="DataContainerEnumerable{T}"/>.
+        /// </summary>
+        /// <returns>A <see cref="LinearEnumerator{TEnumerable, T}"/> for iterating through the <see cref="DataContainer"/> instances.</returns>
+        public LinearEnumerator<DataContainerEnumerable<T>, DataContainer> GetEnumerator() => new(this);
+    }
+}
diff --git a/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Graph/DataContainer.cs.meta b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Graph/DataContainer.cs.meta
new file mode 100644
index 00000000000..d533ddfb036
--- /dev/null
+++ b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Graph/DataContainer.cs.meta
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: 4b6df75f97c25b74c9fd430e9f283f4d
\ No newline at end of file
diff --git a/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Graph/DataNode.cs b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Graph/DataNode.cs
new file mode 100644
index 00000000000..e6ad204c4df
--- /dev/null
+++ b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Graph/DataNode.cs
@@ -0,0 +1,218 @@
+
+using System;
+using System.Collections.Generic;
+
+namespace Unity.GraphCommon.LowLevel.Editor
+{
+    /// <summary>
+    /// An Id associated to a given DataNode in a graph.
+    /// </summary>
+    /*public*/ readonly struct DataNodeId : IEquatable<DataNodeId>
+    {
+        /// <summary>
+        /// Defines an invalid DataNodeId.
+        /// </summary>
+        public static readonly DataNodeId Invalid = new DataNodeId(-1);
+
+        /// <summary>
+        /// Implicitly converts a <see cref="DataNodeId"/> to a <see cref="GraphDataId"/>.
+        /// </summary>
+        /// <param name="id">The data node ID to convert.</param>
+        /// <returns>A new graph data ID with the same index value.</returns>
+        public static implicit operator GraphDataId(DataNodeId id) => new GraphDataId(id.Index);
+
+        /// <summary>
+        /// Implicitly converts a <see cref="GraphDataId"/> to a <see cref="DataNodeId"/>.
+        /// </summary>
+        /// <param name="id">The graph data ID to convert.</param>
+        /// <returns>A new data node ID with the same index value.</returns>
+        public static implicit operator DataNodeId(GraphDataId id) => new DataNodeId(id.Index);
+
+        /// <summary>
+        /// Gets the wrapped int index.
+        /// </summary>
+        public int Index { get; }
+        /// <summary>
+        /// Returns true if this Id is valid, false otherwise.
+        /// </summary>
+        public bool IsValid => Index != Invalid.Index;
+
+        internal DataNodeId(int index)
+        {
+            Index = index;
+        }
+
+        /// <inheritdoc cref="IEquatable"/>
+        public bool Equals(DataNodeId other) => Index == other.Index;
+        /// <inheritdoc cref="ValueType"/>
+        public override int GetHashCode() => Index;
+        /// <inheritdoc cref="ValueType"/>
+        public override string ToString() => Index.ToString();
+    }
+
+    readonly struct DataNodeInfo
+    {
+        public DataNodeInfo(DataNodeId id, TaskNodeId taskNodeId, DataContainerId dataContainerId)
+        {
+            Id = id;
+            TaskNodeId = taskNodeId;
+            DataContainerId = dataContainerId;
+        }
+
+        public DataNodeId Id { get; }
+        public TaskNodeId TaskNodeId { get; }
+        public DataContainerId DataContainerId { get; }
+    }
+
+    /// <summary>
+    /// Represents a node in the graph that contains a data.
+    /// </summary>
+    /*public*/ readonly struct DataNode
+    {
+        readonly IIndexable<GraphNode<DataNodeId>, DataNode> m_NodeConverter;
+        readonly GraphNode<DataNodeId> m_Node;
+
+        readonly Handle<IReadOnlyGraph> m_Graph;
+        readonly DataNodeInfo m_Info;
+
+        /// <summary>
+        /// Gets the unique identifier for this data node. Returns an invalid ID if the graph is not valid.
+        /// </summary>
+        public DataNodeId Id => m_Graph.Valid ? m_Info.Id : DataNodeId.Invalid;
+
+        /// <summary>
+        /// Gets the parent data nodes connected to this data node.
+        /// </summary>
+        public DataNodeLinks Parents => new(m_NodeConverter, m_Node.Parents);
+        /// <summary>
+        /// Gets the child data nodes connected to this data node.
+        /// </summary>
+        public DataNodeLinks Children => new(m_NodeConverter, m_Node.Children);
+
+        /// <summary>
+        /// Gets the task node this data node belongs to.
+        /// </summary>
+        public TaskNode TaskNode => m_Graph.Ref.TaskNodes[m_Info.TaskNodeId];
+
+        /// <summary>
+        /// Gets the data container represented by this data node.
+        /// </summary>
+        public DataContainer DataContainer => m_Graph.Ref.DataContainers[m_Info.DataContainerId];
+
+        /// <summary>
+        /// Gets the data views used by this data node, as a tree.
+        /// </summary>
+        public DataView UsedDataViewsRoot => m_Graph.Ref.GetUsedDataViews(Id);
+
+        /// <summary>
+        /// Gets the data views used by this data node, as an enumerable.
+        /// </summary>
+        public DataViewFlatTreeEnumerable UsedDataViews => UsedDataViewsRoot.Flat;
+
+        /// <summary>
+        /// Gets the data views read by this data node, as a tree.
+        /// </summary>
+        public DataView ReadDataViewsRoot => m_Graph.Ref.GetReadDataViews(Id);
+
+        /// <summary>
+        /// Gets the data views read by this data node, as an enumerable.
+        /// </summary>
+        public DataViewFlatTreeEnumerable ReadDataViews => ReadDataViewsRoot.Flat;
+
+        /// <summary>
+        /// Gets the data views written by this data node, as a tree.
+        /// </summary>
+        public DataView WrittenDataViewsRoot => m_Graph.Ref.GetWrittenDataViews(Id);
+
+        /// <summary>
+        /// Gets the data views written by this data node, as an enumerable.
+        /// </summary>
+        public DataViewFlatTreeEnumerable WrittenDataViews => WrittenDataViewsRoot.Flat;
+        
+        internal DataNode(IIndexable<GraphNode<DataNodeId>, DataNode> nodeConverter, GraphNode<DataNodeId> node, IReadOnlyGraph graph, DataNodeInfo info)
+        {
+            m_NodeConverter = nodeConverter;
+            m_Node = node;
+            m_Graph = new(graph);
+            m_Info = info;
+        }
+    }
+
+    /// <summary>
+    /// Represents a collection of links to data nodes in the graph.
+    /// </summary>
+    /*public*/ readonly struct DataNodeLinks : IIndexable<int, DataNode>, ICountable
+    {
+        readonly IIndexable<GraphNode<DataNodeId>, DataNode> m_NodeConverter;
+        readonly GraphNodeLinks<DataNodeId> m_Links;
+
+        /// <summary>
+        /// Gets the number of data node links in this collection.
+        /// </summary>
+        public int Count => m_Links.Count;
+
+        /// <summary>
+        /// Gets the data node at the specified index in the collection.
+        /// </summary>
+        /// <param name="index">The zero-based index of the data node to get.</param>
+        /// <value>The data node at the specified index.</value>
+        public DataNode this[int index] => m_NodeConverter[m_Links[index]];
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="DataNodeLinks"/> struct.
+        /// </summary>
+        /// <param name="nodeConverter">The converter used to convert graph nodes to data nodes.</param>
+        /// <param name="links">The underlying graph node links.</param>
+        public DataNodeLinks(IIndexable<GraphNode<DataNodeId>, DataNode> nodeConverter, GraphNodeLinks<DataNodeId> links)
+        {
+            m_NodeConverter = nodeConverter;
+            m_Links = links;
+        }
+
+        /// <summary>
+        /// Returns an enumerator that iterates through the data node links.
+        /// </summary>
+        /// <returns>An enumerator that can be used to iterate through the data node links.</returns>
+        public LinearEnumerator<DataNodeLinks, DataNode> GetEnumerator() => new(this);
+    }
+
+    /// <summary>
+    /// Represents an enumerable collection of data nodes.
+    /// </summary>
+    /// <typeparam name="T">The type of the source collection that contains data node IDs.</typeparam>
+    /*public*/ readonly struct DataNodeEnumerable<T> : IIndexable<int, DataNode>, ICountable where T : IIndexable<int, DataNodeId>, ICountable
+    {
+        readonly IIndexable<DataNodeId, DataNode> m_Provider;
+        readonly T m_IdSource;
+
+        /// <summary>
+        /// Gets the number of data nodes in the collection.
+        /// </summary>
+        public int Count => m_IdSource.Count;
+
+        /// <summary>
+        /// Gets the data node at the specified index in the collection.
+        /// </summary>
+        /// <param name="index">The zero-based index of the data node to get.</param>
+        /// <value>The data node at the specified index.</value>
+        public DataNode this[int index] => m_Provider[m_IdSource[index]];
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="DataNodeEnumerable{T}"/> struct.
+        /// </summary>
+        /// <param name="provider">The provider that can retrieve data nodes by ID.</param>
+        /// <param name="idSource">The source collection of data node IDs.</param>
+        public DataNodeEnumerable(IIndexable<DataNodeId, DataNode> provider, T idSource)
+        {
+            m_Provider = provider;
+            m_IdSource = idSource;
+        }
+
+        /// <summary>
+        /// Returns an enumerator that iterates through the data nodes.
+        /// </summary>
+        /// <returns>An enumerator that can be used to iterate through the data nodes.</returns>
+        public LinearEnumerator<DataNodeEnumerable<T>, DataNode> GetEnumerator() => new(this);
+    }
+
+}
diff --git a/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Graph/DataNode.cs.meta b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Graph/DataNode.cs.meta
new file mode 100644
index 00000000000..2894cce30fc
--- /dev/null
+++ b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Graph/DataNode.cs.meta
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: 9171430ad279ad2448f9c6e2d0734a70
\ No newline at end of file
diff --git a/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Graph/DataView.cs b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Graph/DataView.cs
new file mode 100644
index 00000000000..da3eab30ba6
--- /dev/null
+++ b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Graph/DataView.cs
@@ -0,0 +1,366 @@
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+
+namespace Unity.GraphCommon.LowLevel.Editor
+{
+    /// <summary>
+    /// An Id associated to a DataView in a graph.
+    /// </summary>
+    /*public*/ readonly struct DataViewId : IEquatable<DataViewId>
+    {
+        /// <summary>
+        /// Defines an invalid DataViewId.
+        /// </summary>
+        public static readonly DataViewId Invalid = new DataViewId(-1);
+
+        /// <summary>
+        /// Implicitly converts a <see cref="DataViewId"/> to a <see cref="GraphDataId"/>.
+        /// </summary>
+        /// <param name="id">The data view ID to convert.</param>
+        /// <returns>A new graph data ID with the same index value.</returns>
+        public static implicit operator GraphDataId(DataViewId id) => new GraphDataId(id.Index);
+        /// <summary>
+        /// Implicitly converts a <see cref="GraphDataId"/> to a <see cref="DataViewId"/>.
+        /// </summary>
+        /// <param name="id">The graph data ID to convert.</param>
+        /// <returns>A new data view ID with the same index value.</returns>
+        public static implicit operator DataViewId(GraphDataId id) => new DataViewId(id.Index);
+
+        /// <summary>
+        /// Gets the wrapped int index.
+        /// </summary>
+        public int Index { get; }
+        /// <summary>
+        /// Returns true if this Id is valid, false otherwise.
+        /// </summary>
+        public bool IsValid => Index != Invalid.Index;
+
+        internal DataViewId(int index)
+        {
+            Index = index;
+        }
+
+        /// <inheritdoc cref="IEquatable"/>
+        public bool Equals(DataViewId other) => Index == other.Index;
+        /// <inheritdoc cref="ValueType"/>
+        public override int GetHashCode() => Index;
+        /// <inheritdoc cref="ValueType"/>
+        public override string ToString() => Index.ToString();
+    }
+
+    readonly struct DataViewInfo
+    {
+        public DataViewInfo(DataViewId id, IDataDescription dataDescription)
+        {
+            Id = id;
+            DataDescription = dataDescription;
+            ParentDataViewId = DataViewId.Invalid;
+            SubDataKey = null;
+        }
+
+        public DataViewInfo(DataViewId id, IDataDescription dataDescription, DataViewId parentDataViewId, IDataKey subDataKey)
+        {
+            Id = id;
+            DataDescription = dataDescription;
+            ParentDataViewId = parentDataViewId;
+            SubDataKey = subDataKey;
+        }
+
+        public DataViewId Id { get; }
+        public IDataDescription DataDescription { get; }
+        public DataViewId ParentDataViewId { get; }
+        public IDataKey SubDataKey { get; }
+    }
+
+    /// <summary>
+    /// Represents a data view in a hierarchical structure.
+    /// </summary>
+    /*public*/ readonly struct DataView
+    {
+        readonly IIndexable<MultiTreeNode<DataViewId>, DataView> m_Source;
+        readonly MultiTreeNode<DataViewId> m_Node;
+
+        readonly Handle<IReadOnlyGraph> m_Graph;
+        readonly DataViewInfo m_Info;
+
+        /// <summary>
+        /// Gets the unique identifier for this <see cref="DataView"/>.
+        /// Returns <see cref="DataViewId.Invalid"/> if the graph is not valid.
+        /// </summary>
+        public DataViewId Id => m_Graph.Valid ? m_Info.Id : DataViewId.Invalid;
+
+        /// <summary>
+        /// Gets the parent <see cref="DataView"/> of this view, if it exists.
+        /// Returns <c>null</c> if the graph is not valid or if there is no valid parent.
+        /// </summary>
+        public DataView? Parent
+        {
+            get
+            {
+                var parent = m_Graph.Valid ? m_Node.Parent : null;
+                return parent.HasValue ? m_Source[parent.Value] : null;
+            }
+        }
+
+        /// <summary>
+        /// Gets the root <see cref="DataView"/> of the current data view's hierarchy.
+        /// </summary>
+        public DataView Root => m_Source[m_Node.Root];
+
+        /// <summary>
+        /// Gets the IDataDescription associated with this data view.
+        /// Returns null if the graph is not valid.
+        /// </summary>
+        public IDataDescription DataDescription => m_Graph.Valid ? m_Info.DataDescription : null;
+
+        /// <summary>
+        /// Gets the sub-data key associated with this data view.
+        /// Returns null if the graph is not valid.
+        /// </summary>
+        public IDataKey SubDataKey => m_Graph.Valid ? m_Info.SubDataKey : null;
+
+        /// <summary>
+        /// Gets an enumerable collection of children <see cref="DataView"/> instances of this view.
+        /// </summary>
+        public DataViewChildren Children => m_Graph.Valid ? new(m_Source, m_Node.Children) : new();
+
+        /// <summary>
+        /// Enumerates all the data views in this data view tree.
+        /// </summary>
+        public DataViewFlatTreeEnumerable Flat => new(this);
+
+        /// <summary>
+        /// Gets the DataContainer where this DataView is stored.
+        /// </summary>
+        public DataContainer DataContainer => m_Graph.Ref.GetDataContainer(Id);
+
+        /// <summary>
+        /// Tries to find a child data view with the specified data key.
+        /// </summary>
+        /// <param name="subdataKey">The data key used by the child data view.</param>
+        /// <param name="subDataView">The child data view, if found. Invalid data view otherwise.</param>
+        /// <returns>True if the child data view was found, false otherwise.</returns>
+        public bool FindSubData(IDataKey subdataKey, out DataView subDataView)
+        {
+            foreach (var child in Children)
+            {
+                if (child.SubDataKey.Equals(subdataKey))
+                {
+                    subDataView = child;
+                    return true;
+                }
+            }
+            subDataView = new DataView();
+            return false;
+        }
+
+        /// <summary>
+        /// Tries to find a child data view with the specified data path.
+        /// </summary>
+        /// <param name="subdataPath">The data path used by the child data view.</param>
+        /// <param name="subDataView">The child data view, if found. Invalid data view otherwise.</param>
+        /// <returns>True if the child data view was found, false otherwise.</returns>
+        public bool FindSubData(DataPath subdataPath, out DataView subDataView)
+        {
+            subDataView = this;
+            foreach (var key in subdataPath.PathSequence)
+            {
+                if (key == null) continue; // TODO: Hack to make it work, investigate DataPath class
+                if (!subDataView.FindSubData(key, out subDataView))
+                {
+                    return false;
+                }
+            }
+            return true;
+        }
+
+        internal DataView(IIndexable<MultiTreeNode<DataViewId>, DataView> source, MultiTreeNode<DataViewId> node, IReadOnlyGraph graph, DataViewInfo info)
+        {
+            m_Source = source;
+            m_Node = node;
+            m_Graph = new(graph);
+            m_Info = info;
+        }
+    }
+
+    /// <summary>
+    /// Represents the children of a <see cref="DataView"/> in a hierarchical structure.
+    /// Provides indexed access to the child views and implements enumeration functionality.
+    /// </summary>
+    /*public*/ readonly struct DataViewChildren : IIndexable<int, DataView>, ICountable
+    {
+        readonly IIndexable<MultiTreeNode<DataViewId>, DataView> m_Source;
+        readonly MultiTreeNodeEnumerable<SubEnumerable<int>, DataViewId> m_Children;
+
+        /// <summary>
+        /// Gets the number of children for the parent <see cref="DataView"/>.
+        /// </summary>
+        public int Count => m_Children.Count;
+
+        /// <summary>
+        /// Gets the child <see cref="DataView"/> at the specified index.
+        /// </summary>
+        /// <param name="index">The zero-based index of the child view.</param>
+        /// <value>The <see cref="DataView"/> at the specified index.</value>
+        public DataView this[int index] => m_Source[m_Children[index]];
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="DataViewChildren"/> struct.
+        /// </summary>
+        /// <param name="source">The provider mapping <see cref="DataViewId"/> to <see cref="DataView"/> instances.</param>
+        /// <param name="children">The enumerable collection of child nodes.</param>
+        public DataViewChildren(IIndexable<MultiTreeNode<DataViewId>, DataView> source, MultiTreeNodeEnumerable<SubEnumerable<int>, DataViewId> children)
+        {
+            m_Source = source;
+            m_Children = children;
+        }
+
+        /// <summary>
+        /// Returns an enumerator that iterates through the <see cref="DataViewChildren"/>.
+        /// </summary>
+        /// <returns>A <see cref="LinearEnumerator{TEnumerable, T}"/> to iterate over the <see cref="DataView"/> children.</returns>
+        public LinearEnumerator<DataViewChildren, DataView> GetEnumerator() => new(this);
+    }
+
+    /// <summary>
+    /// Represents an enumerable collection of <see cref="DataView"/> instances, based on an indexed source of IDs.
+    /// Combines ID enumeration with the ability to resolve and access <see cref="DataView"/> objects.
+    /// </summary>
+    /// <typeparam name="T">
+    /// The type of the indexed source providing the IDs.
+    /// Must implement both <see cref="IIndexable{TIndex, TValue}"/> and <see cref="ICountable"/>.
+    /// </typeparam>
+    /*public*/ readonly struct DataViewEnumerable<T> : IIndexable<int, DataView>, ICountable where T : IIndexable<int, DataViewId>, ICountable
+    {
+        readonly IIndexable<DataViewId, DataView> m_Provider;
+        readonly T m_IdSource;
+
+        /// <summary>
+        /// Gets the number of items in the enumerable, sourced from the number of IDs in the <typeparamref name="T"/> source.
+        /// </summary>
+        public int Count => m_IdSource.Count;
+
+        /// <summary>
+        /// Gets the <see cref="DataView"/> at the specified index, resolving its associated ID.
+        /// </summary>
+        /// <param name="index">The zero-based index of the <see cref="DataView"/>.</param>
+        /// <value>The <see cref="DataView"/> associated with the ID at the specified index.</value>
+        public DataView this[int index] => m_Provider[m_IdSource[index]];
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="DataViewEnumerable{T}"/> struct.
+        /// </summary>
+        /// <param name="provider">The provider that resolves <see cref="DataViewId"/> to <see cref="DataView"/> instances.</param>
+        /// <param name="idSource">The source of <see cref="DataViewId"/> identifiers.</param>
+        public DataViewEnumerable(IIndexable<DataViewId, DataView> provider, T idSource)
+        {
+            m_Provider = provider;
+            m_IdSource = idSource;
+        }
+
+        /// <summary>
+        /// Returns an enumerator that iterates through the <see cref="DataViewEnumerable{T}"/>.
+        /// </summary>
+        /// <returns>A <see cref="LinearEnumerator{TEnumerable, T}"/> for iterating through the <see cref="DataView"/> instances.</returns>
+        public LinearEnumerator<DataViewEnumerable<T>, DataView> GetEnumerator() => new(this);
+    }
+
+    /// <summary>
+    /// Flat representation of a <see cref="DataView"/> tree.
+    /// </summary>
+    /*public*/ readonly struct DataViewFlatTreeEnumerable : IEnumerable<DataView>
+    {
+        readonly DataView m_RootDataView;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="DataViewFlatTreeEnumerable"/> struct.
+        /// </summary>
+        /// <param name="rootDataView">The root of the <see cref="DataView"/> tree to be enumerated.</param>
+        public DataViewFlatTreeEnumerable(DataView rootDataView)
+        {
+            m_RootDataView = rootDataView;
+        }
+
+        /// <summary>
+        /// Returns an enumerator that iterates through the <see cref="DataViewFlatTreeEnumerable"/>.
+        /// </summary>
+        /// <returns>A <see cref="DataViewFlatTreeEnumerator"/> to iterate over the <see cref="DataView"/> children.</returns>
+        public DataViewFlatTreeEnumerator GetEnumerator() => new(m_RootDataView);
+        IEnumerator<DataView> IEnumerable<DataView>.GetEnumerator() => GetEnumerator();
+        IEnumerator IEnumerable.GetEnumerator() => GetEnumerator();
+    }
+
+    /// <summary>
+    /// Enumerator that iterates over all elements of a <see cref="DataView"/> tree.
+    /// </summary>
+    /*public*/ struct DataViewFlatTreeEnumerator : IEnumerator<DataView>
+    {
+        readonly DataView m_RootDataView;
+        Stack<DataView> m_Stack;
+        DataView m_Current;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="DataViewFlatTreeEnumerator"/> struct.
+        /// </summary>
+        /// <param name="rootDataView">The root of the <see cref="DataView"/> tree to be enumerated.</param>
+        public DataViewFlatTreeEnumerator(DataView rootDataView)
+        {
+            m_Stack = new();
+            m_RootDataView = rootDataView;
+            m_Current = new DataView();
+            if(m_RootDataView.Id.IsValid)
+                m_Stack.Push(m_RootDataView);
+        }
+
+        /// <summary>
+        /// Gets the current value in the enumeration.
+        /// </summary>
+        public DataView Current
+        {
+            get
+            {
+                return m_Current.Id.IsValid ? m_Current : default;
+            }
+        }
+        object IEnumerator.Current => Current;
+
+        /// <summary>
+        /// Disposes the resources used by the enumerator.
+        /// </summary>
+        public void Dispose()
+        {
+        }
+
+        /// <summary>
+        /// Moves to the next item in the enumeration.
+        /// </summary>
+        /// <returns><see langword="true"/> if there are more items; otherwise, <see langword="false"/>.</returns>
+        public bool MoveNext()
+        {
+            while (m_Stack.Count > 0)
+            {
+                m_Current = m_Stack.Pop();
+                var connections = m_Current.Children;
+                for (int i = 0; i < connections.Count; i++)
+                {
+                    var childrenDataView = connections[connections.Count - 1 - i];
+                    m_Stack.Push(childrenDataView);
+                }
+
+                return true;
+            }
+            m_Current = default;
+            return false;
+        }
+
+        /// <summary>
+        /// Resets the enumeration.
+        /// </summary>
+        public void Reset()
+        {
+            m_Stack.Clear();
+        }
+    }
+}
diff --git a/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Graph/DataView.cs.meta b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Graph/DataView.cs.meta
new file mode 100644
index 00000000000..9be8310e61a
--- /dev/null
+++ b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Graph/DataView.cs.meta
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: db632514394907944b0bd1a5e8b4ae00
\ No newline at end of file
diff --git a/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Graph/DebugVisualisation.meta b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Graph/DebugVisualisation.meta
new file mode 100644
index 00000000000..88e0a408286
--- /dev/null
+++ b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Graph/DebugVisualisation.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 3fd04950cc9743cd8f2eb919ae498675
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Graph/DebugVisualisation/GraphVisualizer.cs b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Graph/DebugVisualisation/GraphVisualizer.cs
new file mode 100644
index 00000000000..3f072e90493
--- /dev/null
+++ b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Graph/DebugVisualisation/GraphVisualizer.cs
@@ -0,0 +1,82 @@
+using System;
+using System.IO;
+using System.Text;
+
+namespace Unity.GraphCommon.LowLevel.Editor
+{
+    static class GraphVisualizer
+    {
+        /// <summary>
+        /// Generates a safe identifier for GraphViz by replacing invalid characters.
+        /// </summary>
+        /// <param name="id">The graph element id.</param>
+        /// <returns>A string that can be used as a GraphViz node identifier.</returns>
+        private static string SafeId(object id)
+        {
+            return $"node_{id.ToString().Replace("-", "_")}";
+        }
+
+        public static void AddNode(StringBuilder sb, int id, string label, string colorStr = "black")
+        {
+            sb.AppendLine($"        {SafeId(id)} [shape=ellipse, label=\"{label}\", color={colorStr}];");
+        }
+
+        public static void AddLink(StringBuilder sb, int from, int to)
+        {
+            sb.AppendLine($"    {SafeId(from)} -> {SafeId(to)} [label=\"\", color=green];");
+        }
+
+        public static void SaveFile(StringBuilder sb, string filePath)
+        {
+            Directory.CreateDirectory(Path.GetDirectoryName(filePath));
+            File.WriteAllText(filePath, sb.ToString());
+        }
+        public abstract class GraphVizScope : IDisposable
+        {
+            protected StringBuilder sb;
+            protected GraphVizScope(StringBuilder sb)
+            {
+                this.sb = sb;
+            }
+            public void Dispose()
+            {
+                CloseScope();
+            }
+            protected virtual void CloseScope()
+            {
+            }
+        }
+
+        public class GraphScope : GraphVizScope
+        {
+            public GraphScope(StringBuilder sb) : base(sb)
+            {
+                sb.AppendLine("digraph G {");
+                sb.AppendLine("    rankdir=TB;"); // Specify top-to-bottom layout
+                sb.AppendLine("    compound=true;"); // Allow edges between clusters
+            }
+
+            protected override void CloseScope()
+            {
+                sb.AppendLine("}"); // End graph
+            }
+        }
+
+        public class ClusterScope : GraphVizScope
+        {
+            public ClusterScope(int id, string label, StringBuilder sb) : base(sb)
+            {
+                sb.AppendLine($"    subgraph cluster_{SafeId(id)} {{");
+                sb.AppendLine($"        rankdir=LR;"); // Specify left-to-right layout
+                sb.AppendLine($"        label=\"{label}\";");
+                sb.AppendLine($"        style=rounded;"); // Rounded cluster border
+                sb.AppendLine($"        color=black;"); // Cluster border color
+            }
+            protected override void CloseScope()
+            {
+                sb.AppendLine("    }"); // Close TaskNode cluster
+            }
+        }
+
+        }
+}
diff --git a/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Graph/DebugVisualisation/GraphVisualizer.cs.meta b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Graph/DebugVisualisation/GraphVisualizer.cs.meta
new file mode 100644
index 00000000000..de29fed1879
--- /dev/null
+++ b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Graph/DebugVisualisation/GraphVisualizer.cs.meta
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: 8a77eb04c8de435387ac36159e5624f9
\ No newline at end of file
diff --git a/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Graph/GraphCacheData.cs b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Graph/GraphCacheData.cs
new file mode 100644
index 00000000000..df781e3ca8d
--- /dev/null
+++ b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Graph/GraphCacheData.cs
@@ -0,0 +1,108 @@
+
+namespace Unity.GraphCommon.LowLevel.Editor
+{
+    /// <summary>
+    /// Abstract base class for managing cache data associated with a graph.
+    /// Provides caching capabilities with on-demand rebuilding of the data.
+    /// </summary>
+    /// <typeparam name="T">The type of cache data being managed. Must be a reference type.</typeparam>
+    /*public*/ abstract class GraphCacheData<T> where T : class
+    {
+        /// <summary>
+        /// Weak reference to the graph owning the cached data.
+        /// </summary>
+        protected Handle<IReadOnlyGraph> m_Owner;
+
+        /// <summary>
+        /// Cached data, if it has been generated.
+        /// </summary>
+        protected T m_Cache;
+
+        /// <summary>
+        /// Gets whether the cache data is valid. Data is considered valid when both
+        /// the owner graph reference is valid and the cache contains a non-null value.
+        /// </summary>
+        public bool Valid => m_Owner.Valid && m_Cache != null;
+
+        /// <summary>
+        /// Gets the cache data, automatically rebuilding it if it's not valid.
+        /// </summary>
+        public T Data
+        {
+            get
+            {
+                if (!Valid)
+                {
+                    Rebuild();
+                }
+                return m_Cache;
+            }
+        }
+
+        internal GraphCacheData(TaskGraph owner)
+        {
+            m_Owner = owner;
+        }
+
+        /// <summary>
+        /// Implicitly converts the cache data object to its underlying data type.
+        /// </summary>
+        /// <param name="cacheData">The cache data object to convert.</param>
+        /// <returns>The underlying data of type T.</returns>
+        public static implicit operator T(GraphCacheData<T> cacheData) => cacheData.Data;
+
+        /// <summary>
+        /// Manually rebuilds the cache data by updating the owner reference and
+        /// invoking the <see cref="Build"/> method.
+        /// </summary>
+        public void Rebuild()
+        {
+            m_Owner.Update();
+            m_Cache = Build();
+        }
+
+        /// <summary>
+        /// Builds an updated version of the cache data.
+        /// </summary>
+        /// <returns>The update version of the cache data.</returns>
+        protected abstract T Build();
+    }
+
+    /// <summary>
+    /// A concrete implementation of <see cref="GraphCacheData{T}"/> that uses a delegate
+    /// to build the cache data.
+    /// </summary>
+    /// <typeparam name="T">The type of cache data being managed. Must be a reference type.</typeparam>
+    /*public*/ class DelegateGraphCacheData<T> : GraphCacheData<T> where T : class
+    {
+        System.Func<IReadOnlyGraph, T> m_Builder;
+
+        internal DelegateGraphCacheData(TaskGraph owner, System.Func<IReadOnlyGraph, T> builder, bool build = false) : base(owner)
+        {
+            m_Builder = builder;
+            if (build)
+            {
+                Rebuild();
+            }
+        }
+
+        /// <summary>
+        /// Updates the owner reference and returns the current instance.
+        /// </summary>
+        /// <returns>The current <see cref="DelegateGraphCacheData{T}"/> instance.</returns>
+        public DelegateGraphCacheData<T> Refresh()
+        {
+            m_Owner.Update();
+            return this;
+        }
+
+        /// <summary>
+        /// Builds an updated version of the cache data. Uses the provided delegate to build the cache data.
+        /// </summary>
+        /// <returns>The update version of the cache data.</returns>
+        protected override T Build()
+        {
+            return m_Builder(m_Owner.Ref);
+        }
+    }
+}
diff --git a/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Graph/GraphCacheData.cs.meta b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Graph/GraphCacheData.cs.meta
new file mode 100644
index 00000000000..6f3ef029705
--- /dev/null
+++ b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Graph/GraphCacheData.cs.meta
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: 61386c452e4ef2d45a2cccdfc618d70d
\ No newline at end of file
diff --git a/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Graph/GraphElement.cs b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Graph/GraphElement.cs
new file mode 100644
index 00000000000..10c25381207
--- /dev/null
+++ b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Graph/GraphElement.cs
@@ -0,0 +1,58 @@
+using System;
+
+namespace Unity.GraphCommon.LowLevel.Editor
+{
+    readonly struct TaskDependency : IEquatable<TaskDependency>
+    {
+        public TaskDependency(TaskNodeId nodeId, TaskNodeId parentNodeId)
+        {
+            NodeId = nodeId;
+            ParentNodeId = parentNodeId;
+        }
+
+        public TaskNodeId NodeId { get; }
+        public TaskNodeId ParentNodeId { get; }
+
+        public bool Equals(TaskDependency other)
+        {
+            return NodeId.Equals(other.NodeId) && ParentNodeId.Equals(other.ParentNodeId);
+        }
+
+        public override bool Equals(object obj)
+        {
+            return obj is TaskDependency other && Equals(other);
+        }
+
+        public override int GetHashCode()
+        {
+            return HashCode.Combine(NodeId, ParentNodeId);
+        }
+    }
+
+    readonly struct DataDependency : IEquatable<DataDependency>
+    {
+        public DataDependency(DataNodeId nodeId, DataNodeId parentNodeId)
+        {
+            NodeId = nodeId;
+            ParentNodeId = parentNodeId;
+        }
+
+        public DataNodeId NodeId { get; }
+        public DataNodeId ParentNodeId { get; }
+
+        public bool Equals(DataDependency other)
+        {
+            return NodeId.Equals(other.NodeId) && ParentNodeId.Equals(other.ParentNodeId);
+        }
+
+        public override bool Equals(object obj)
+        {
+            return obj is DataDependency other && Equals(other);
+        }
+
+        public override int GetHashCode()
+        {
+            return HashCode.Combine(NodeId, ParentNodeId);
+        }
+    }
+}
diff --git a/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Graph/GraphElement.cs.meta b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Graph/GraphElement.cs.meta
new file mode 100644
index 00000000000..16ac817c6d5
--- /dev/null
+++ b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Graph/GraphElement.cs.meta
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: b8ee10daf0167124cad6a50a150d81b2
\ No newline at end of file
diff --git a/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Graph/Handle.cs b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Graph/Handle.cs
new file mode 100644
index 00000000000..89151a2613c
--- /dev/null
+++ b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Graph/Handle.cs
@@ -0,0 +1,77 @@
+using UnityEngine;
+
+namespace Unity.GraphCommon.LowLevel.Editor
+{
+    /// <summary>
+    /// Defines an interface for objects that have versioning capabilities.
+    /// </summary>
+    /*public*/ interface IVersioned
+    {
+        /// <summary>
+        /// Gets the current version of the object.
+        /// </summary>
+        uint Version { get; }
+    }
+
+    /// <summary>
+    /// Represents a weak reference to a versioned object that can detect if the target object has changed.
+    /// </summary>
+    /// <typeparam name="T">The type of the referenced object, which must implement <see cref="IVersioned"/>.</typeparam>
+    /*public*/ struct Handle<T> where T : class, IVersioned
+    {
+        T m_Owner;
+        uint m_Version;
+
+        /// <summary>
+        /// Gets a value indicating whether the weak reference is still valid.
+        /// A reference is valid when the owner exists and has the same version as when the reference was created.
+        /// </summary>
+        public bool Valid => m_Owner != null && m_Owner.Version == m_Version;
+
+        /// <summary>
+        /// Gets the referenced object if the reference is valid, or null otherwise.
+        /// </summary>
+        public T Ref => Valid ? m_Owner : null;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="Weak{T}"/> struct with the specified owner.
+        /// </summary>
+        /// <param name="owner">The object to reference.</param>
+        public Handle(T owner)
+        {
+            Debug.Assert(owner != null);
+            m_Owner = owner;
+            m_Version = owner.Version;
+        }
+
+        /// <summary>
+        /// Implicitly converts an object to a weak reference to that object.
+        /// </summary>
+        /// <param name="owner">The object to create a weak reference to.</param>
+        /// <returns>A new weak reference to the specified object.</returns>
+        public static implicit operator Handle<T>(T owner) => new(owner);
+
+        /// <summary>
+        /// Implicitly converts a weak reference to its target object if the reference is valid.
+        /// </summary>
+        /// <param name="weak">The weak reference to convert.</param>
+        /// <returns>The referenced object, or null if the reference is invalid.</returns>
+        public static implicit operator T(Handle<T> weak) => weak.Ref;
+
+        /// <summary>
+        /// Invalidates the weak reference by setting its version to zero.
+        /// </summary>
+        public void Invalidate()
+        {
+            m_Version = 0;
+        }
+
+        /// <summary>
+        /// Updates the version of the weak reference to match the current version of the referenced object.
+        /// </summary>
+        public void Update()
+        {
+            m_Version = m_Owner.Version;
+        }
+    }
+}
diff --git a/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Graph/Handle.cs.meta b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Graph/Handle.cs.meta
new file mode 100644
index 00000000000..07a1fd83b30
--- /dev/null
+++ b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Graph/Handle.cs.meta
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: 339a5e4fcf093be44b8bae26dad8bc07
\ No newline at end of file
diff --git a/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Graph/IGraph.cs b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Graph/IGraph.cs
new file mode 100644
index 00000000000..4907442933f
--- /dev/null
+++ b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Graph/IGraph.cs
@@ -0,0 +1,717 @@
+using System;
+using System.Collections.Generic;
+
+namespace Unity.GraphCommon.LowLevel.Editor
+{
+    /// <summary>
+    /// A read only graph.
+    /// </summary>
+    /*public*/ interface IReadOnlyGraph : IVersioned
+    {
+        /// <summary>
+        /// Gets an enumerable of all task nodes in the graph.
+        /// </summary>
+        ITaskNodeProvider TaskNodes { get; }
+
+        /// <summary>
+        /// Gets an enumerable of all data nodes in the graph.
+        /// </summary>
+        IDataNodeProvider DataNodes { get; }
+
+        /// <summary>
+        /// Gets an enumerable of all data views in the graph.
+        /// </summary>
+        IDataViewProvider DataViews { get; }
+
+        /// <summary>
+        /// Gets an enumerable of all data containers in the graph.
+        /// </summary>
+        IDataBindingProvider DataBindings { get; }
+
+        /// <summary>
+        /// Gets an enumerable of all data containers in the graph.
+        /// </summary>
+        IDataContainerProvider DataContainers { get; }
+
+        /// <summary>
+        /// Creates a new GraphTraverser for the graph.
+        /// </summary>
+        /// <returns>A new GraphTraverser.</returns>
+        GraphTraverser CreateTraverser();
+
+        /// <summary>
+        /// Copies this graph into a new IMutableGraph.
+        /// </summary>
+        /// <returns>A new IMutableGraph, with the same contents of this graph.</returns>
+        IMutableGraph Copy();
+
+        /// <summary>
+        /// Creates a new empty graph of the same type.
+        /// </summary>
+        /// <returns>A new empty IMutableGraph.</returns>
+        IMutableGraph EmptyCopy();
+
+        /// <summary>
+        /// Retrieves an enumerable collection of data nodes associated with a specified task node.
+        /// </summary>
+        /// <param name="taskNodeId">The identifier of the task node for which data nodes are to be retrieved.</param>
+        /// <returns>
+        /// A <see cref="DataNodeEnumerable{SubEnumerable{DataNodeId}}"/> containing the data nodes
+        /// related to the specified <paramref name="taskNodeId"/>.
+        /// </returns>
+        DataNodeEnumerable<SubEnumerable<DataNodeId>> GetDataNodes(TaskNodeId taskNodeId);
+
+        /// <summary>
+        /// Retrieves the data node corresponding to the specified data binding.
+        /// </summary>
+        /// <param name="dataBindingId">The identifier of the data binding for which the data node is to be retrieved.</param>
+        /// <returns>
+        /// The data node corresponding to the specified <paramref name="dataBindingId"/>.
+        /// </returns>
+        public DataNode GetDataNode(DataBindingId dataBindingId);
+
+        /// <summary>
+        /// Retrieves an enumerable collection of data bindings associated with a specified task node.
+        /// </summary>
+        /// <param name="taskNodeId">The identifier of the task node for which data bindings are to be retrieved.</param>
+        /// <returns>
+        /// A <see cref="DataNodeEnumerable{SubEnumerable{DataBindingId}}"/> containing the data bindings
+        /// related to the specified <paramref name="taskNodeId"/>.
+        /// </returns>
+        DataBindingEnumerable<SubEnumerable<DataBindingId>> GetDataBindings(TaskNodeId taskNodeId);
+
+        /// <summary>
+        /// Retrieves an enumerable collection of data views used in the specified data node.
+        /// </summary>
+        /// <param name="dataNodeId">The identifier of the data node.</param>
+        /// <returns>
+        /// The <see cref="DataView"/> subtree containing the data views used by the specified <paramref name="dataNodeId"/>.
+        /// </returns>
+        DataView GetUsedDataViews(DataNodeId dataNodeId);
+
+        /// <summary>
+        /// Retrieves an enumerable collection of data views read in the specified data node.
+        /// </summary>
+        /// <param name="dataNodeId">The identifier of the data node.</param>
+        /// <returns>
+        /// The <see cref="DataView"/> subtree containing the data views read by the specified <paramref name="dataNodeId"/>.
+        /// </returns>
+        DataView GetReadDataViews(DataNodeId dataNodeId);
+
+        /// <summary>
+        /// Retrieves an enumerable collection of data views written in the specified data node.
+        /// </summary>
+        /// <param name="dataNodeId">The identifier of the data node.</param>
+        /// <returns>
+        /// The <see cref="DataView"/> subtree containing the data views written by the specified <paramref name="dataNodeId"/>.
+        /// </returns>
+        DataView GetWrittenDataViews(DataNodeId dataNodeId);
+
+        /// <summary>
+        /// Retrieves the data container where the specified data view is stored.
+        /// </summary>
+        /// <param name="dataViewId">The identifier of the data view.</param>
+        /// <returns>
+        /// The <see cref="DataContainer"/> where the specified <paramref name="dataNodeId"/> is stored.
+        /// </returns>
+        DataContainer GetDataContainer(DataViewId dataViewId);
+    }
+
+    /// <summary>
+    /// Provides access to task nodes in a graph.
+    /// </summary>
+    /*public*/ interface ITaskNodeProvider : IIndexable<int, TaskNode>, IIndexable<TaskNodeId, TaskNode>, ICountable
+    {
+        /// <summary>
+        /// Gets whether the provider contains valid data.
+        /// </summary>
+        bool Valid { get; }
+
+        /// <summary>
+        /// Returns an enumerator that iterates through the task nodes.
+        /// </summary>
+        /// <returns>A linear enumerator for task nodes.</returns>
+        LinearEnumerator<ITaskNodeProvider, TaskNode> GetEnumerator();
+    }
+
+    /// <summary>
+    /// Provides access to data nodes in a graph.
+    /// </summary>
+    /*public*/ interface IDataNodeProvider : IIndexable<int, DataNode>, IIndexable<DataNodeId, DataNode>, ICountable
+    {
+        /// <summary>
+        /// Gets whether the provider contains valid data.
+        /// </summary>
+        bool Valid { get; }
+
+        /// <summary>
+        /// Returns an enumerator that iterates through the data nodes.
+        /// </summary>
+        /// <returns>A linear enumerator for data nodes.</returns>
+        LinearEnumerator<IDataNodeProvider, DataNode> GetEnumerator();
+    }
+
+    /// <summary>
+    /// Provides access to data views in a graph.
+    /// </summary>
+    /*public*/ interface IDataViewProvider : IIndexable<int, DataView>, IIndexable<DataViewId, DataView>, ICountable
+    {
+        /// <summary>
+        /// Gets whether the provider contains valid data.
+        /// </summary>
+        bool Valid { get; }
+
+        /// <summary>
+        /// Returns an enumerator that iterates through the data views.
+        /// </summary>
+        /// <returns>A linear enumerator for data views.</returns>
+        LinearEnumerator<IDataViewProvider, DataView> GetEnumerator();
+    }
+
+    /// <summary>
+    /// Provides access to data bindings in a graph.
+    /// </summary>
+    /*public*/ interface IDataBindingProvider : IIndexable<int, DataBinding>, IIndexable<DataBindingId, DataBinding>, ICountable
+    {
+        /// <summary>
+        /// Gets whether the provider contains valid data.
+        /// </summary>
+        bool Valid { get; }
+
+        /// <summary>
+        /// Returns an enumerator that iterates through the data bindings.
+        /// </summary>
+        /// <returns>A linear enumerator for data bindings.</returns>
+        LinearEnumerator<IDataBindingProvider, DataBinding> GetEnumerator();
+    }
+
+    /// <summary>
+    /// Provides access to data containers in a graph.
+    /// </summary>
+    /*public*/ interface IDataContainerProvider : IIndexable<int, DataContainer>, IIndexable<DataContainerId, DataContainer>, ICountable
+    {
+        /// <summary>
+        /// Gets whether the provider contains valid data.
+        /// </summary>
+        bool Valid { get; }
+
+        /// <summary>
+        /// Returns an enumerator that iterates through the data containers.
+        /// </summary>
+        /// <returns>A linear enumerator for data containers.</returns>
+        LinearEnumerator<IDataContainerProvider, DataContainer> GetEnumerator();
+    }
+
+    /// <summary>
+    /// Specifies how a task uses data associated with a binding.
+    /// </summary>
+    [Flags]
+    /*public*/ enum BindingUsage
+    {
+        /// <summary>
+        /// The binding usage is undefined or unspecified.
+        /// </summary>
+        Unknown = 0,
+
+        /// <summary>
+        /// The task reads from the data but does not modify it.
+        /// </summary>
+        Read = 1 << 0,
+
+        /// <summary>
+        /// The task writes to the data, potentially modifying its contents.
+        /// </summary>
+        Write = 1 << 1,
+
+        /// <summary>
+        /// The task both reads from and writes to the data.
+        /// </summary>
+        ReadWrite = Read | Write,
+    }
+
+    /// <summary>
+    /// A buildable graph.
+    /// </summary>
+    /// <remarks>
+    /// This interface allows to add elements to a graph but not to remove them (or all at once with Clear()).
+    /// Meaning element Ids remain valid in the graph.
+    /// </remarks>
+    /*public*/ interface IBuildableGraph
+    {
+        /// <summary>
+        /// Clears the graph.
+        /// Effectively removing all elements in it.
+        /// </summary>
+        void Clear();
+
+        /// <summary>
+        /// Adds a new task node to the graph.
+        /// </summary>
+        /// <param name="task">The task to wrap in a node.</param>
+        /// <returns>The Id associated with the new task node.</returns>
+        TaskNodeId AddTask(ITask task);
+
+        /// <summary>
+        /// Add a new data node to the graph, from a new data.
+        /// </summary>
+        /// <param name="name">Name of the new container being created.</param>
+        /// <param name="dataDescription">The description of the data added to the graph.</param>
+        /// <returns>The Id associated with the new data node.</returns>
+        DataViewId AddData(string name, IDataDescription dataDescription);
+
+        //TODO: TEMPORARY, we don't really support mutability as of now
+        /// <summary>
+        /// Temporary. Overrides the data description of a data view.
+        /// </summary>
+        /// <param name="dataViewId">The ID of the data view to be overriden.</param>
+        /// <param name="dataDescription">The new description of the data.</param>
+        void OverrideDataDescription(DataViewId dataViewId, IDataDescription dataDescription);
+
+        /// <summary>
+        /// Retrieves or creates a subdata view using a data key to navigate within a parent data view.
+        /// </summary>
+        /// <param name="parentDataViewId">The ID of the parent data view.</param>
+        /// <param name="subdataKey">The key identifying the subdata within the parent.</param>
+        /// <param name="dataDescription">Optional data description, used to create the subdata if it is not created, or to validate it if it is.</param>
+        /// <returns>The ID of the subdata view.</returns>
+        DataViewId GetSubdata(DataViewId parentDataViewId, IDataKey subdataKey, IDataDescription dataDescription = null);
+
+        /// <summary>
+        /// Retrieves or creates a subdata view using a data path to navigate within a parent data view.
+        /// </summary>
+        /// <param name="parentDataViewId">The ID of the parent data view.</param>
+        /// <param name="subdataPath">The path identifying the subdata within the parent.</param>
+        /// <returns>The ID of the subdata view.</returns>
+        DataViewId GetSubdata(DataViewId parentDataViewId, DataPath subdataPath);
+
+        /// <summary>
+        /// Creates a binding between a task node and a data view through a specific binding key.
+        /// </summary>
+        /// <param name="taskNodeId">The ID of the task node to bind.</param>
+        /// <param name="bindingKey">The key identifying which binding point on the task to use.</param>
+        /// <param name="dataViewId">The ID of the data view to bind to the task.</param>
+        /// <param name="usage">How the data will be used by the task (read, write, or both).</param>
+        void BindData(TaskNodeId taskNodeId, IDataKey bindingKey, DataViewId dataViewId, BindingUsage usage = BindingUsage.Unknown);
+
+        /// <summary>
+        /// Finalizes the graph building process and returns a read-only version of the graph.
+        /// </summary>
+        /// <returns>A read-only representation of the built graph.</returns>
+        public IReadOnlyGraph EndBuilding();
+    }
+
+    /// <summary>
+    /// A mutable graph.
+    /// </summary>
+    /// <remarks>
+    /// This interface allows to change elements in the graph.
+    /// </remarks>
+    /*public*/ interface IMutableGraph : IBuildableGraph, IReadOnlyGraph
+    {
+        /// <summary>
+        /// Sets the task used for a specific TaskNodeId.
+        /// </summary>
+        /// <param name="id">The TaskNodeId of the task being set.</param>
+        /// <param name="task">The task to be set for this id.</param>
+        void SetTask(TaskNodeId id, ITask task);
+
+        /// <summary>
+        /// Sets the data used for a specific DataNodeId.
+        /// </summary>
+        /// <param name="id">The DataNodeId of the data being set.</param>
+        /// <param name="dataId">The data id to be set for this id.</param>
+        void SetData(DataNodeId id, DataContainerId dataId);
+
+        /// <summary>
+        /// Binds data to a task node with explicit parent data nodes.
+        /// </summary>
+        /// <param name="taskNodeId">The ID of the task node to bind to.</param>
+        /// <param name="bindingKey">The key identifying the binding point in the task.</param>
+        /// <param name="dataViewId">The ID of the data view to bind.</param>
+        /// <param name="usage">The usage mode for the binding.</param>
+        /// <param name="parentNodeIds">The explicit parent data nodes to establish dependencies with.</param>
+        void BindData(TaskNodeId taskNodeId, IDataKey bindingKey, DataViewId dataViewId, BindingUsage usage, IEnumerable<DataNodeId> parentNodeIds);
+
+        //void RemoveTaskNode(TaskNodeId id);
+        //void RemoveDataNode(DataNodeId id);
+        //void RemoveData(DataId id);
+
+        //void Apply(GraphCommandList graph);
+    }
+
+    /// <summary>
+    /// Represents a graph structure.
+    /// Provides methods to access node data, parent nodes, and child nodes.
+    /// </summary>
+    /// <typeparam name="T">The type of data stored in each graph node.</typeparam>
+    /*public*/ interface IGraph<T> : IIndexable<int, GraphNode<T>>, ICountable, IVersioned
+    {
+        /// <summary>
+        /// Gets the data associated with the specified node index.
+        /// </summary>
+        /// <param name="index">The index of the node.</param>
+        /// <returns>The data of type <typeparamref name="T"/> stored in the specified node.</returns>
+        T GetData(int index);
+
+        /// <summary>
+        /// Gets the parent nodes for the specified node index in the graph.
+        /// </summary>
+        /// <param name="index">The index of the node whose parents are to be retrieved.</param>
+        /// <returns>
+        /// A <see cref="GraphNodeLinks{T}"/> containing the parent nodes of the specified node.
+        /// </returns>
+        GraphNodeLinks<T> GetParents(int index);
+
+        /// <summary>
+        /// Gets the child nodes for the specified node index in the graph.
+        /// </summary>
+        /// <param name="index">The index of the node whose children are to be retrieved.</param>
+        /// <returns>
+        /// A <see cref="GraphNodeLinks{T}"/> containing the child nodes of the specified node.
+        /// </returns>
+        GraphNodeLinks<T> GetChildren(int index);
+
+        /// <summary>
+        /// Returns an enumerator that iterates through all nodes in the graph.
+        /// </summary>
+        /// <returns>A <see cref="LinearEnumerator{TEnumerable, T}"/> for iterating through the graph nodes.</returns>
+        LinearEnumerator<IGraph<T>, GraphNode<T>> GetEnumerator() => new(this);
+    }
+
+    /// <summary>
+    /// Represents a node within the graph, providing access to its associated data,
+    /// parent nodes, and child nodes.
+    /// </summary>
+    /// <typeparam name="T">The type of data stored in the node.</typeparam>
+    /*public*/ readonly struct GraphNode<T>
+    {
+        /// <summary>
+        /// Weak reference to the graph containing this node.
+        /// Prevents ownership cycles and retains memory safety.
+        /// </summary>
+        readonly Handle<IGraph<T>> m_Owner;
+
+        /// <summary>
+        /// The index of this node within its graph.
+        /// </summary>
+        readonly int m_Index;
+
+        /// <summary>
+        /// Gets the graph to which this node belongs.
+        /// </summary>
+        public IGraph<T> Graph => m_Owner.Ref;
+
+        /// <summary>
+        /// Gets the data of type <typeparamref name="T"/> associated with this node.
+        /// </summary>
+        public T Data => Graph.GetData(m_Index);
+
+        /// <summary>
+        /// Gets the parent nodes linked to this node within the graph.
+        /// </summary>
+        public GraphNodeLinks<T> Parents => Graph.GetParents(m_Index);
+
+        /// <summary>
+        /// Gets the child nodes linked to this node within the graph.
+        /// </summary>
+        public GraphNodeLinks<T> Children => Graph.GetChildren(m_Index);
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="GraphNode{T}"/> struct.
+        /// </summary>
+        /// <param name="graph">The graph to which this node belongs.</param>
+        /// <param name="index">The index of this node within the graph.</param>
+        public GraphNode(IGraph<T> graph, int index)
+        {
+            m_Owner = new(graph);
+            m_Index = index;
+        }
+    }
+
+    /// <summary>
+    /// Represents a collection of links (parents or children) associated with a graph node.
+    /// Provides indexed access to linked nodes.
+    /// </summary>
+    /// <typeparam name="T">The type of data stored in the linked nodes.</typeparam>
+    /*public*/ readonly struct GraphNodeLinks<T> : IIndexable<int, GraphNode<T>>, ICountable
+    {
+        /// <summary>
+        /// Weak reference to the graph containing these links.
+        /// </summary>
+        readonly Handle<IGraph<T>> m_Owner;
+
+        /// <summary>
+        /// Source mapping indices of links (parent or child IDs) for resolution.
+        /// </summary>
+        readonly IIndexable<int, int, int> m_Source;
+
+        /// <summary>
+        /// The index of the current node within the graph.
+        /// </summary>
+        readonly int m_Index;
+
+        /// <summary>
+        /// The total number of links (parents or children) associated with the node.
+        /// </summary>
+        public int Count { get; }
+
+        /// <summary>
+        /// Gets the linked <see cref="GraphNode{T}"/> at the specified index.
+        /// </summary>
+        /// <param name="index">The zero-based index of the link.</param>
+        /// <value>The linked <see cref="GraphNode{T}"/>.</value>
+        public GraphNode<T> this[int index] => m_Owner.Ref[m_Source[m_Index, index]];
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="GraphNodeLinks{T}"/> struct.
+        /// </summary>
+        /// <param name="owner">The graph containing these links.</param>
+        /// <param name="source">
+        /// The source mapping indices to resolve links (parent or child IDs).
+        /// </param>
+        /// <param name="index">The index of the current node within the graph.</param>
+        /// <param name="count">The total number of links associated with this node.</param>
+        public GraphNodeLinks(IGraph<T> owner, IIndexable<int, int, int> source, int index, int count)
+        {
+            m_Owner = new(owner);
+            m_Source = source;
+            m_Index = index;
+            Count = count;
+        }
+
+        /// <summary>
+        /// Returns an enumerator that iterates through the links associated with this node.
+        /// </summary>
+        /// <returns>
+        /// A <see cref="LinearEnumerator{TEnumerable, T}"/> for iterating through the linked nodes.
+        /// </returns>
+        public LinearEnumerator<GraphNodeLinks<T>, GraphNode<T>> GetEnumerator() => new(this);
+    }
+
+    /// <summary>
+    /// Represents a multi-rooted hierarchical tree structure where nodes can be indexed, counted, and versioned.
+    /// Provides methods to access node data, root nodes, and child nodes.
+    /// </summary>
+    /// <typeparam name="T">The type of data stored in each tree node.</typeparam>
+    /*public*/ interface IMultiTree<T> : IIndexable<int, MultiTreeNode<T>>, ICountable, IVersioned
+    {
+        /// <summary>
+        /// Gets the enumerable collection of root nodes in the tree.
+        /// </summary>
+        MultiTreeNodeEnumerable<IndirectEnumerable, T> RootNodes { get; }
+
+        /// <summary>
+        /// Gets the data associated with the specified node index.
+        /// </summary>
+        /// <param name="index">The index of the node.</param>
+        /// <returns>The data of type <typeparamref name="T"/> stored in the specified node.</returns>
+        T GetData(int index);
+
+        /// <summary>
+        /// Gets the data associated with the specified node index.
+        /// </summary>
+        /// <param name="index">The index of the node.</param>
+        /// <param name="data">.</param>
+        void SetData(int index, T data);
+
+        /// <summary>
+        /// Gets the root node associated with the specified node index.
+        /// </summary>
+        /// <param name="index">The index of the node.</param>
+        /// <returns>The root node of type <see cref="MultiTreeNode{T}"/>.</returns>
+        MultiTreeNode<T> GetRootNode(int index);
+
+        /// <summary>
+        /// Gets the parent node associated with the specified node index.
+        /// </summary>
+        /// <param name="index">The index of the node.</param>
+        /// <returns>The parent node of type <see cref="MultiTreeNode{T}"/>.</returns>
+        MultiTreeNode<T>? GetParentNode(int index);
+
+        /// <summary>
+        /// Gets the enumerable collection of children for the specified node index.
+        /// </summary>
+        /// <param name="index">The index of the node.</param>
+        /// <returns>
+        /// A <see cref="MultiTreeNodeEnumerable{TEnumerable, T}"/> containing the child nodes of the specified node.
+        /// </returns>
+        MultiTreeNodeEnumerable<SubEnumerable<int>, T> GetChildren(int index);
+
+        /// <summary>
+        /// Returns an enumerator that iterates through all nodes in the tree.
+        /// </summary>
+        /// <returns>A <see cref="LinearEnumerator{TEnumerable, T}"/> for iterating through the tree nodes.</returns>
+        LinearEnumerator<IMultiTree<T>, MultiTreeNode<T>> GetEnumerator() => new(this);
+    }
+
+    /// <summary>
+    /// Represents a node in a multi-rooted hierarchical tree.
+    /// Provides access to the node's data, its root node, and its child nodes.
+    /// </summary>
+    /// <typeparam name="T">The type of data stored in the tree node.</typeparam>
+    /*public*/ readonly struct MultiTreeNode<T>
+    {
+        /// <summary>
+        /// Weak reference to the tree containing this node.
+        /// Prevents ownership cycles and retains memory safety.
+        /// </summary>
+        readonly Handle<IMultiTree<T>> m_Owner;
+
+        /// <summary>
+        /// The index of this node within its tree.
+        /// </summary>
+        readonly int m_Index;
+
+        /// <summary>
+        /// Gets the tree to which this node belongs.
+        /// </summary>
+        public IMultiTree<T> Tree => m_Owner.Ref;
+
+        /// <summary>
+        /// Gets the data of type <typeparamref name="T"/> associated with this node.
+        /// </summary>
+        public T Data => Tree.GetData(m_Index);
+
+        /// <summary>
+        /// Gets the root node associated with this node.
+        /// </summary>
+        public MultiTreeNode<T> Root => Tree.GetRootNode(m_Index);
+
+        /// <summary>
+        /// Gets the parent node associated with this node.
+        /// </summary>
+        public MultiTreeNode<T>? Parent => Tree.GetParentNode(m_Index);
+
+        /// <summary>
+        /// Gets the enumerable collection of child nodes associated with this node.
+        /// </summary>
+        public MultiTreeNodeEnumerable<SubEnumerable<int>, T> Children => Tree.GetChildren(m_Index);
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="MultiTreeNode{T}"/> struct.
+        /// </summary>
+        /// <param name="tree">The tree to which this node belongs.</param>
+        /// <param name="index">The index of this node within the tree.</param>
+        public MultiTreeNode(IMultiTree<T> tree, int index)
+        {
+            m_Owner = new(tree);
+            m_Index = index;
+        }
+    }
+
+    /// <summary>
+    /// Represents an enumerable collection of tree nodes.
+    /// Provides indexed and counted access to nodes.
+    /// </summary>
+    /// <typeparam name="TEnumerable">
+    /// The type of the source providing indices for nodes.
+    /// Must implement both <see cref="IIndexable{TIndex, TValue}"/> and <see cref="ICountable"/>.
+    /// </typeparam>
+    /// <typeparam name="T">The type of data stored in the nodes.</typeparam>
+    /*public*/ readonly struct MultiTreeNodeEnumerable<TEnumerable, T> : IIndexable<int, MultiTreeNode<T>>, ICountable where TEnumerable : IIndexable<int, int>, ICountable
+    {
+        /// <summary>
+        /// Weak reference to the tree containing these nodes.
+        /// </summary>
+        readonly Handle<IMultiTree<T>> m_Owner;
+
+        /// <summary>
+        /// The source providing indices for the nodes in the enumerable.
+        /// </summary>
+        readonly TEnumerable m_Source;
+
+        /// <summary>
+        /// Gets the tree to which this enumerable belongs.
+        /// </summary>
+        public IMultiTree<T> Tree => m_Owner.Ref;
+
+        /// <summary>
+        /// Gets the number of nodes in the enumerable.
+        /// </summary>
+        public int Count => m_Source.Count;
+
+        /// <summary>
+        /// Gets the <see cref="MultiTreeNode{T}"/> at the specified index.
+        /// </summary>
+        /// <param name="index">The zero-based index of the node.</param>
+        /// <value>The node of type <see cref="MultiTreeNode{T}"/> at the specified index.</value>
+        public MultiTreeNode<T> this[int index] => Tree[m_Source[index]];
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="MultiTreeNodeEnumerable{TEnumerable, T}"/> struct.
+        /// </summary>
+        /// <param name="tree">The tree containing these nodes.</param>
+        /// <param name="source">The source providing indices for the nodes.</param>
+        public MultiTreeNodeEnumerable(IMultiTree<T> tree, TEnumerable source)
+        {
+            m_Owner = new(tree);
+            m_Source = source;
+        }
+
+        /// <summary>
+        /// Returns an enumerator that iterates through the nodes in this enumerable.
+        /// </summary>
+        /// <returns>
+        /// A <see cref="LinearEnumerator{TEnumerable, T}"/> for iterating through the nodes.
+        /// </returns>
+        public LinearEnumerator<MultiTreeNodeEnumerable<TEnumerable, T>, MultiTreeNode<T>> GetEnumerator() => new(this);
+    }
+
+    /// <summary>
+    /// Represents an enumerable collection of data associated with tree nodes.
+    /// Provides indexed and counted access to node data.
+    /// </summary>
+    /// <typeparam name="TEnumerable">
+    /// The type of the source providing indices for the data.
+    /// Must implement both <see cref="IIndexable{TIndex, TValue}"/> and <see cref="ICountable"/>.
+    /// </typeparam>
+    /// <typeparam name="T">The type of data stored in tree nodes.</typeparam>
+    /*public*/ readonly struct MultiTreeDataEnumerable<TEnumerable, T> : IIndexable<int, T>, ICountable where TEnumerable : IIndexable<int, int>, ICountable
+    {
+        /// <summary>
+        /// Weak reference to the tree containing these data nodes.
+        /// </summary>
+        readonly Handle<IMultiTree<T>> m_Owner;
+
+        /// <summary>
+        /// The source providing indices for the data nodes in the enumerable.
+        /// </summary>
+        readonly TEnumerable m_Source;
+
+        /// <summary>
+        /// Gets the tree to which this enumerable belongs.
+        /// </summary>
+        public IMultiTree<T> Tree => m_Owner.Ref;
+
+        /// <summary>
+        /// Gets the number of data nodes in the enumerable.
+        /// </summary>
+        public int Count => m_Source.Count;
+
+        /// <summary>
+        /// Gets the data of type <typeparamref name="T"/> at the specified index.
+        /// </summary>
+        /// <param name="index">The zero-based index of the data.</param>
+        /// <value>The data of type <typeparamref name="T"/> at the specified index.</value>
+        public T this[int index] => Tree[index].Data;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="MultiTreeDataEnumerable{TEnumerable, T}"/> struct.
+        /// </summary>
+        /// <param name="tree">The tree containing these data nodes.</param>
+        /// <param name="source">The source providing indices for the data nodes.</param>
+        public MultiTreeDataEnumerable(IMultiTree<T> tree, TEnumerable source)
+        {
+            m_Owner = new(tree);
+            m_Source = source;
+        }
+
+        /// <summary>
+        /// Returns an enumerator that iterates through the data nodes in this enumerable.
+        /// </summary>
+        /// <returns>
+        /// A <see cref="LinearEnumerator{TEnumerable, T}"/> for iterating through the data nodes.
+        /// </returns>
+        public LinearEnumerator<MultiTreeDataEnumerable<TEnumerable, T>, T> GetEnumerator() => new(this);
+    }
+}
diff --git a/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Graph/IGraph.cs.meta b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Graph/IGraph.cs.meta
new file mode 100644
index 00000000000..221d0150591
--- /dev/null
+++ b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Graph/IGraph.cs.meta
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: 57d7aadcd149f124ead6a30ad1c49743
\ No newline at end of file
diff --git a/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Graph/TaskGraph.cs b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Graph/TaskGraph.cs
new file mode 100644
index 00000000000..666fc6ef8f6
--- /dev/null
+++ b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Graph/TaskGraph.cs
@@ -0,0 +1,744 @@
+using System;
+using System.Collections.Generic;
+using UnityEngine;
+
+namespace Unity.GraphCommon.LowLevel.Editor
+{
+    /// <summary>
+    /// Represents a graph of tasks and data nodes with their dependencies.
+    /// </summary>
+    sealed partial class TaskGraph : IMutableGraph
+    {
+        readonly GraphDataList<TaskNodeInfo> m_TaskNodes = new();
+        readonly GraphDataList<DataNodeInfo> m_DataNodes = new();
+        readonly GraphDataList<DataContainerInfo> m_DataContainers = new();
+        readonly GraphDataList<DataViewInfo> m_DataViews = new();
+        readonly GraphDataList<DataBindingInfo> m_DataBindings = new();
+
+        readonly DelegateGraphCacheData<SubordinateList<TaskNodeCacheInfo>> m_TaskNodesCacheInfo;
+        readonly DelegateGraphCacheData<SubordinateList<DataNodeCacheInfo>> m_DataNodesCacheInfo;
+        readonly DelegateGraphCacheData<SubordinateList<DataViewCacheInfo>> m_DataViewsCacheInfo;
+        readonly DelegateGraphCacheData<SubordinateList<DataViewWriteCacheInfo>> m_DataViewsWriteCacheInfo;
+
+        readonly HashSet<TaskDependency> m_TaskDependencies = new();
+        readonly HashSet<DataDependency> m_DataDependencies = new();
+
+        readonly Dictionary<(DataViewId, IDataKey), DataViewId> m_DataViewIdDictionary = new();
+        readonly Dictionary<(TaskNodeId, DataContainerId), DataNodeId> m_DataNodeIdDictionary = new();
+
+        readonly TaskNodeProvider m_TaskNodeProvider;
+        readonly DataNodeProvider m_DataNodeProvider;
+        readonly DataViewProvider m_DataViewProvider;
+        readonly DataBindingProvider m_DataBindingProvider;
+        readonly DataContainerProvider m_DataContainerProvider;
+
+        /// <summary>
+        /// Gets the current version of the graph. Increases whenever the graph is modified.
+        /// </summary>
+        public uint Version { get; private set; } = 1u; // 0u reserved for null/invalid version
+
+        /// <inheritdoc cref="IGraph{T}"/>
+        public ITaskNodeProvider TaskNodes => m_TaskNodeProvider.Refresh();
+
+        /// <inheritdoc cref="IGraph{T}"/>
+        public IDataNodeProvider DataNodes => m_DataNodeProvider.Refresh();
+
+        /// <inheritdoc cref="IGraph{T}"/>
+        public IDataViewProvider DataViews => m_DataViewProvider.Refresh();
+
+        /// <inheritdoc cref="IGraph{T}"/>
+        public IDataBindingProvider DataBindings => m_DataBindingProvider.Refresh();
+
+        /// <inheritdoc cref="IGraph{T}"/>
+        public IDataContainerProvider DataContainers => m_DataContainerProvider.Refresh();
+
+        DelegateGraphCacheData<LinearGraph<TaskNodeId>> TaskNodeGraph { get; }
+        DelegateGraphCacheData<LinearGraph<DataNodeId>> DataNodeGraph { get; }
+        DelegateGraphCacheData<LinearMultiTree<DataViewId>> DataViewTrees { get; }
+        DelegateGraphCacheData<LinearMultiList<DataNodeId>> TaskNodeToDataNodes { get; }
+        DelegateGraphCacheData<LinearMultiList<DataBindingId>> TaskNodeToDataBindings { get; }
+        DelegateGraphCacheData<LinearMultiList<DataContainerId>> TaskNodeToDataContainers { get; }
+        DelegateGraphCacheData<LinearMultiTree<DataViewId>> DataNodeToDataViews { get; }
+        DelegateGraphCacheData<LinearMultiTree<DataViewId>> DataNodeToReadDataViews { get; }
+        DelegateGraphCacheData<LinearMultiTree<DataViewId>> DataNodeToWrittenDataViews { get; }
+        DelegateGraphCacheData<LinearMultiList<DataBindingId>> DataNodeToDataBindings { get; }
+        DelegateGraphCacheData<LinearMultiList<DataNodeId>> DataViewToDataNodes { get; }
+        DelegateGraphCacheData<List<DataContainerId>> DataViewToDataContainer { get; }
+        DelegateGraphCacheData<List<DataNodeId>> DataBindingToDataNodes { get; }
+        DelegateGraphCacheData<LinearMultiList<DataViewId>> DataContainerToDataViews { get; }
+        DelegateGraphCacheData<LinearMultiList<TaskNodeId>> DataContainerToTaskNodes { get; }
+
+        DelegateGraphCacheData<SubordinateList<TaskNodeCacheInfo>> TaskNodesCacheInfo => m_TaskNodesCacheInfo.Refresh();
+
+        DelegateGraphCacheData<SubordinateList<DataNodeCacheInfo>> DataNodesCacheInfo => m_DataNodesCacheInfo.Refresh();
+
+        DelegateGraphCacheData<SubordinateList<DataViewCacheInfo>> DataViewsCacheInfo => m_DataViewsCacheInfo.Refresh();
+
+        DelegateGraphCacheData<SubordinateList<DataViewWriteCacheInfo>> DataViewsWriteCacheInfo => m_DataViewsWriteCacheInfo.Refresh();
+
+        /// <summary>
+        /// Creates a new instance of the <see cref="TaskGraph"/>.
+        /// </summary>
+        public TaskGraph()
+        {
+            m_TaskNodeProvider = new TaskNodeProvider(this);
+            m_DataNodeProvider = new DataNodeProvider(this);
+            m_DataViewProvider = new DataViewProvider(this);
+            m_DataBindingProvider = new DataBindingProvider(this);
+            m_DataContainerProvider = new DataContainerProvider(this);
+
+            TaskNodeGraph = new(this, graph => (graph as TaskGraph).BuildTaskNodeGraph());
+            DataNodeGraph = new(this, graph => (graph as TaskGraph).BuildDataNodeGraph());
+            DataViewTrees = new(this, graph => (graph as TaskGraph).BuildDataViewTrees());
+            TaskNodeToDataNodes = new(this, graph => (graph as TaskGraph).BuildTaskNodeToDataNodes());
+            TaskNodeToDataBindings = new(this, graph => (graph as TaskGraph).BuildTaskNodeToDataBindings());
+            TaskNodeToDataContainers = new(this, graph => (graph as TaskGraph).BuildTaskNodeToDataContainers());
+            DataNodeToDataViews = new(this, graph => (graph as TaskGraph).BuildDataNodeToUsedDataViews());
+            DataNodeToReadDataViews = new(this, graph => (graph as TaskGraph).BuildDataNodeToReadDataViews());
+            DataNodeToWrittenDataViews = new(this, graph => (graph as TaskGraph).BuildDataNodeToWrittenDataViews());
+            DataNodeToDataBindings = new(this, graph => (graph as TaskGraph).BuildDataNodeToDataBindings());
+            DataViewToDataNodes = new(this, graph => (graph as TaskGraph).BuildDataViewToDataNodes());
+            DataViewToDataContainer = new(this, graph => (graph as TaskGraph).BuildDataViewToDataContainers());
+            DataBindingToDataNodes = new(this, graph => (graph as TaskGraph).BuildDataBindingToDataNodes());
+            DataContainerToDataViews = new(this, graph => (graph as TaskGraph).BuildDataContainerToDataViews());
+            DataContainerToTaskNodes = new(this, graph => (graph as TaskGraph).BuildDataContainerToTaskNodes());
+            m_DataNodesCacheInfo = new(this, graph => (graph as TaskGraph).BuildDataNodesCacheInfo());
+            m_TaskNodesCacheInfo = new(this, graph => (graph as TaskGraph).BuildTaskNodesCacheInfo());
+            m_DataViewsCacheInfo = new(this, graph => (graph as TaskGraph).BuildDataViewsCacheInfo());
+            m_DataViewsWriteCacheInfo = new(this, graph => (graph as TaskGraph).BuildDataViewsWriteCacheInfo());
+        }
+
+        private TaskGraph(TaskGraph taskGraph, bool copyCache = true) : this()
+        {
+            m_TaskNodes = new(taskGraph.m_TaskNodes, copyCache);
+            m_DataNodes = new(taskGraph.m_DataNodes, copyCache);
+            m_DataContainers = new(taskGraph.m_DataContainers);
+            m_DataViews = new(taskGraph.m_DataViews, copyCache);
+            m_DataBindings = new(taskGraph.m_DataBindings);
+
+            m_TaskDependencies = new(taskGraph.m_TaskDependencies);
+            m_DataDependencies = new(taskGraph.m_DataDependencies);
+
+            // Cache, can be rebuilt any time
+            m_DataViewIdDictionary = new(taskGraph.m_DataViewIdDictionary);
+            m_DataNodeIdDictionary = new(taskGraph.m_DataNodeIdDictionary);
+        }
+
+        /// <summary>
+        /// Clears all nodes and dependencies from the graph.
+        /// </summary>
+        public void Clear()
+        {
+            m_TaskNodes.Clear();
+            m_DataNodes.Clear();
+            m_DataContainers.Clear();
+            m_DataViews.Clear();
+
+            m_TaskDependencies.Clear();
+            m_DataDependencies.Clear();
+
+            m_DataViewIdDictionary.Clear();
+
+            Version = 1u;
+        }
+
+        /// <summary>
+        /// Adds a task to the graph.
+        /// </summary>
+        /// <param name="task">The task to add.</param>
+        /// <returns>The ID of the newly created task node.</returns>
+        public TaskNodeId AddTask(ITask task)
+        {
+            Version++;
+            m_TaskNodes.Allocate(out var taskNodeId) = new TaskNodeInfo(taskNodeId, task);
+            return taskNodeId;
+        }
+
+        /// <inheritdoc cref="IBuildableGraph"/>
+        public DataViewId AddData(string name, IDataDescription dataDescription)
+        {
+            Version++;
+            DataViewsCacheInfo.Refresh();
+            DataViewsWriteCacheInfo.Refresh();
+
+            m_DataViews.Allocate(out var dataViewId) = new DataViewInfo(dataViewId, dataDescription);
+            m_DataContainers.Allocate(out var dataContainerId) = new DataContainerInfo(dataContainerId, name, dataViewId);
+
+            DataViewsCacheInfo.Data[dataViewId].DataContainerId = dataContainerId;
+            DataViewsWriteCacheInfo.Data[dataViewId].LastWrite = DataNodeId.Invalid;
+
+            return dataViewId;
+        }
+
+        //TODO: TEMPORARY, we don't really support mutability as of now
+        /// <inheritdoc cref="IMutableGraph"/>
+        public void OverrideDataDescription(DataViewId dataViewId, IDataDescription dataDescription)
+        {
+            DataViewInfo dataViewInfo = m_DataViews[dataViewId];
+            Debug.Assert(dataViewInfo.DataDescription.IsCompatible(dataDescription));
+            m_DataViews[dataViewId] = new DataViewInfo(dataViewInfo.Id, dataDescription, dataViewInfo.ParentDataViewId, dataViewInfo.SubDataKey );
+        }
+
+        /// <inheritdoc cref="IBuildableGraph"/>
+        public DataViewId GetSubdata(DataViewId parentDataViewId, IDataKey subDataKey, IDataDescription dataDescription = null)
+        {
+            if (!m_DataViewIdDictionary.TryGetValue((parentDataViewId, subDataKey), out DataViewId dataViewId))
+            {
+                dataViewId = DataViewId.Invalid;
+                IDataDescription targetDataDescription = m_DataViews[parentDataViewId].DataDescription.GetSubdata(subDataKey);
+                if (targetDataDescription != null)
+                {
+                    if (dataDescription == null)
+                    {
+                        dataDescription = targetDataDescription;
+                    }
+                    else
+                    {
+                        Debug.Assert(targetDataDescription.IsCompatible(dataDescription));
+                    }
+                    Version++;
+                    m_DataViews.Allocate(out var newDataViewId) = new DataViewInfo(newDataViewId, dataDescription, parentDataViewId, subDataKey);
+                    dataViewId = newDataViewId;
+                    DataViewsCacheInfo.Data[dataViewId].DataContainerId = DataViewsCacheInfo.Data[parentDataViewId].DataContainerId;
+                    DataViewsCacheInfo.Data[parentDataViewId].ChildCount++;
+
+                    m_DataViewIdDictionary.Add((parentDataViewId, subDataKey), dataViewId);
+                }
+            }
+            else if (dataDescription != null)
+            {
+                Debug.Assert(m_DataViews[dataViewId].DataDescription.IsCompatible(dataDescription));
+            }
+
+            return dataViewId;
+        }
+
+        /// <inheritdoc cref="IBuildableGraph"/>
+        public DataViewId GetSubdata(DataViewId parentDataViewId, DataPath subdataPath)
+        {
+            var currentDataViewId = parentDataViewId;
+            foreach (var subDataKey in subdataPath.PathSequence)
+            {
+                currentDataViewId = subDataKey != null ? GetSubdata(currentDataViewId, subDataKey) : currentDataViewId;
+                //currentDataViewId = GetSubdata(currentDataViewId, subDataKey);
+                if (!currentDataViewId.IsValid)
+                    break;
+            }
+            return currentDataViewId;
+        }
+
+        /// <inheritdoc cref="IBuildableGraph"/>
+        public void BindData(TaskNodeId taskNodeId, IDataKey bindingKey, DataViewId dataViewId, BindingUsage usage = BindingUsage.Unknown)
+        {
+            Debug.Assert(DataViewsCacheInfo.Valid);
+
+            IEnumerable<DataNodeId> parentNodeIds = Array.Empty<DataNodeId>();
+            if (usage.HasFlag(BindingUsage.Read))
+            {
+                parentNodeIds = FindImplicitParentDataNodes(dataViewId);
+            }
+
+            BindData(taskNodeId, bindingKey, dataViewId, usage, parentNodeIds);
+        }
+
+        /// <inheritdoc cref="IMutableGraph"/>
+        public void BindData(TaskNodeId taskNodeId, IDataKey bindingKey, DataViewId dataViewId, BindingUsage usage,
+            IEnumerable<DataNodeId> parentNodeIds)
+        {
+            Version++;
+
+            if (!m_TaskNodes[taskNodeId].Task.GetBindingUsage(bindingKey, out var usageFromTask))
+            {
+                Debug.LogWarning("The task is not using this data. Skipping binding data.");
+                return;
+            }
+            if (usage == BindingUsage.Unknown)
+            {
+                usage = usageFromTask;
+            }
+            else if (usageFromTask != BindingUsage.Unknown && usage != usageFromTask)
+            {
+                Debug.LogWarning($"Provided binding usage {usage} doesn't match binding usage {usageFromTask} from task node");
+                return;
+            }
+            if (usage == BindingUsage.Unknown)
+            {
+                Debug.LogWarning("Binding usage cannot be determined. Skipping binding data.");
+                return;
+            }
+
+            Debug.Assert(usage != BindingUsage.Unknown);
+
+            m_DataBindings.Allocate(out var dataBindingId) =
+                new DataBindingInfo(dataBindingId, taskNodeId, dataViewId, bindingKey, usage);
+
+            var dataContainerId = DataViewsCacheInfo.Data[dataViewId].DataContainerId;
+            if (!m_DataNodeIdDictionary.TryGetValue((taskNodeId, dataContainerId), out var dataNodeId))
+            {
+                m_DataNodes.Allocate(out var newDataNodeId) = new DataNodeInfo(newDataNodeId, taskNodeId, dataContainerId);
+                dataNodeId = newDataNodeId;
+                m_DataNodeIdDictionary.Add((taskNodeId, dataContainerId), dataNodeId);
+            }
+
+            foreach (var parentNodeId in parentNodeIds)
+            {
+                AddDataDependency(dataNodeId, parentNodeId);
+            }
+
+            var task = m_TaskNodes[taskNodeId].Task;
+            bool usesData = task.GetDataUsage(bindingKey, out DataPathSet readUsage, out DataPathSet writeUsage);
+            if (usesData)
+            {
+                foreach (var path in readUsage.DataPaths)
+                {
+                    var currentDataViewId = dataViewId;
+                    foreach (var key in path.PathSequence)
+                    {
+                        currentDataViewId = key != null ? GetSubdata(currentDataViewId, key) : currentDataViewId;
+                        if (!currentDataViewId.IsValid)
+                            break;
+                    }
+                }
+
+                foreach (var path in writeUsage.DataPaths)
+                {
+                    var currentDataViewId = dataViewId;
+                    foreach (var key in path.PathSequence)
+                    {
+                        currentDataViewId = key != null ? GetSubdata(currentDataViewId, key) : currentDataViewId;
+                        if (!currentDataViewId.IsValid)
+                            break;
+                    }
+                }
+            }
+
+            //if (TaskNodesCacheInfo.Valid)
+            {
+                TaskNodesCacheInfo.Data[taskNodeId].BindingCount++;
+            }
+
+            if (/*DataViewsWriteCacheInfo.Valid && */usage.HasFlag(BindingUsage.Write))
+            {
+                ref DataViewWriteCacheInfo cacheInfo = ref DataViewsWriteCacheInfo.Data[dataViewId];
+                cacheInfo.LastWrite = dataNodeId;
+                cacheInfo.SubWrites.Clear();
+
+                // Propagate subwrites up
+                var subDataViewId = dataViewId;
+                var parentDataViewId = m_DataViews[subDataViewId].ParentDataViewId;
+                while (parentDataViewId.IsValid)
+                {
+                    ref DataViewWriteCacheInfo parentCacheInfo = ref DataViewsWriteCacheInfo.Data[parentDataViewId];
+                    parentCacheInfo.SubWrites.Add(subDataViewId);
+                    subDataViewId = parentDataViewId;
+                    parentDataViewId = m_DataViews[subDataViewId].ParentDataViewId;
+                }
+            }
+        }
+
+        /// <summary>
+        /// Adds a dependency relationship between two data nodes.
+        /// </summary>
+        /// <param name="dataNodeId">The ID of the dependent data node.</param>
+        /// <param name="parentDataNodeId">The ID of the parent data node.</param>
+        /// <returns>True if the dependency was added, false if it already existed.</returns>
+        public bool AddDataDependency(DataNodeId dataNodeId, DataNodeId parentDataNodeId)
+        {
+            Debug.Assert(dataNodeId.IsValid);
+            Debug.Assert(parentDataNodeId.IsValid);
+            bool added = m_DataDependencies.Add(new DataDependency(dataNodeId, parentDataNodeId));
+            if (added)
+            {
+                Version++;
+
+                //if (DataNodesCacheInfo.Valid)
+                {
+                    DataNodesCacheInfo.Data[dataNodeId].ParentCount++;
+                    DataNodesCacheInfo.Data[parentDataNodeId].ChildCount++;
+                }
+
+                bool generateTaskDependencies = true;
+                if (generateTaskDependencies)
+                {
+                    AddTaskDependency(m_DataNodes[dataNodeId].TaskNodeId, m_DataNodes[parentDataNodeId].TaskNodeId);
+                }
+            }
+
+            return added;
+        }
+
+        /// <summary>
+        /// Adds a dependency relationship between two task nodes.
+        /// </summary>
+        /// <param name="taskNodeId">The ID of the dependent task node.</param>
+        /// <param name="parentTaskNodeId">The ID of the parent task node.</param>
+        /// <returns>True if the dependency was added, false if it already existed.</returns>
+        public bool AddTaskDependency(TaskNodeId taskNodeId, TaskNodeId parentTaskNodeId)
+        {
+            Debug.Assert(taskNodeId.IsValid);
+            Debug.Assert(parentTaskNodeId.IsValid);
+            bool added = m_TaskDependencies.Add(new TaskDependency(taskNodeId, parentTaskNodeId));
+            if (added)
+            {
+                if (TaskNodesCacheInfo.Valid)
+                {
+                    TaskNodesCacheInfo.Data[taskNodeId].ParentCount++;
+                    TaskNodesCacheInfo.Data[parentTaskNodeId].ChildCount++;
+                }
+            }
+
+            return added;
+        }
+
+        /// <inheritdoc cref="IReadOnlyGraph"/>
+        public IMutableGraph Copy()
+        {
+            return new TaskGraph(this);
+        }
+
+        /// <inheritdoc cref="IBuildableGraph"/>
+        public IReadOnlyGraph EndBuilding()
+        {
+            return this;
+        }
+
+        /// <inheritdoc cref="IReadOnlyGraph"/>
+        public DataNodeEnumerable<SubEnumerable<DataNodeId>> GetDataNodes(TaskNodeId taskNodeId)
+        {
+            var container = TaskNodeToDataNodes.Data;
+            SubEnumerable<DataNodeId> subEnumerable = new(container, taskNodeId.Index, container[taskNodeId.Index].Count);
+            return new(DataNodes, subEnumerable);
+        }
+
+        /// <inheritdoc cref="IReadOnlyGraph"/>
+        public DataNode GetDataNode(DataBindingId dataBindingId)
+        {
+            var dataNodeId = DataBindingToDataNodes.Data[dataBindingId.Index];
+            return DataNodes[dataNodeId];
+        }
+
+        /// <inheritdoc cref="IReadOnlyGraph"/>
+        public DataBindingEnumerable<SubEnumerable<DataBindingId>> GetDataBindings(TaskNodeId taskNodeId)
+        {
+            var container = TaskNodeToDataBindings.Data;
+            SubEnumerable<DataBindingId> subEnumerable = new(container, taskNodeId.Index, container[taskNodeId.Index].Count);
+            return new(DataBindings, subEnumerable);
+        }
+
+        /// <inheritdoc cref="IReadOnlyGraph.GetUsedDataViews"/>
+        public DataView GetUsedDataViews(DataNodeId dataNodeId)
+        {
+            var treeNode = DataNodeToDataViews.Data[dataNodeId.Index];
+            return treeNode.Data.IsValid ? new(m_DataViewProvider, treeNode, this, m_DataViews[treeNode.Data]) : new();
+        }
+
+        /// <inheritdoc cref="IReadOnlyGraph.GetReadDataViews"/>
+        public DataView GetReadDataViews(DataNodeId dataNodeId)
+        {
+            var treeNode = DataNodeToReadDataViews.Data[dataNodeId.Index];
+            return treeNode.Data.IsValid ? new(m_DataViewProvider, treeNode, this, m_DataViews[treeNode.Data]) : new();
+        }
+
+        /// <inheritdoc cref="IReadOnlyGraph.GetWrittenDataViews"/>
+        public DataView GetWrittenDataViews(DataNodeId dataNodeId)
+        {
+            var treeNode = DataNodeToWrittenDataViews.Data[dataNodeId.Index];
+            return treeNode.Data.IsValid ? new(m_DataViewProvider, treeNode, this, m_DataViews[treeNode.Data]) : new();
+        }
+
+        /// <inheritdoc cref="IReadOnlyGraph.GetDataContainer"/>
+        public DataContainer GetDataContainer(DataViewId dataViewId)
+        {
+            var dataContainerId = DataViewToDataContainer.Data[dataViewId.Index];
+            return DataContainers[dataContainerId];
+        }
+
+        IEnumerable<DataNodeId> FindImplicitParentDataNodes(DataViewId dataViewId)
+        {
+            // Find the most recent data nodes in parents
+            DataNodeId parentDataNodeId = DataNodeId.Invalid;
+            DataViewId parentDataViewId = dataViewId;
+            while (parentDataViewId.IsValid)
+            {
+                DataNodeId dataNodeId = DataViewsWriteCacheInfo.Data[parentDataViewId].LastWrite;
+                if (dataNodeId.IsValid && (!parentDataNodeId.IsValid || parentDataNodeId.Index < dataNodeId.Index))
+                {
+                    parentDataNodeId = dataNodeId;
+                }
+
+                parentDataViewId = m_DataViews[parentDataViewId].ParentDataViewId;
+            }
+
+            if (parentDataNodeId.IsValid)
+            {
+                yield return parentDataNodeId;
+
+                // Find more recent data nodes in subdata
+                foreach (DataNodeId subdataNodeId in FindSubdataParentDataNodes(dataViewId, parentDataNodeId))
+                {
+                    yield return subdataNodeId;
+                }
+            }
+
+            // TODO: Look to siblings if there is data overlap
+        }
+
+        IEnumerable<DataNodeId> FindSubdataParentDataNodes(DataViewId dataViewId, DataNodeId parentDataNodeId)
+        {
+            foreach (var subdataViewId in DataViewsWriteCacheInfo.Data[dataViewId].SubWrites)
+            {
+                DataNodeId dataNodeId = DataViewsWriteCacheInfo.Data[subdataViewId].LastWrite;
+                if (parentDataNodeId.Index < dataNodeId.Index)
+                {
+                    yield return dataNodeId;
+                    foreach (DataNodeId subdataNodeId in FindSubdataParentDataNodes(subdataViewId, dataNodeId))
+                    {
+                        yield return subdataNodeId;
+                    }
+                }
+            }
+        }
+
+        GraphTraverser IReadOnlyGraph.CreateTraverser() => new GraphTraverser(this);
+
+        IMutableGraph IReadOnlyGraph.EmptyCopy()
+        {
+            throw new NotImplementedException();
+        }
+
+        void IMutableGraph.SetData(DataNodeId id, DataContainerId dataId)
+        {
+            Version++;
+
+            throw new NotImplementedException();
+        }
+
+        void IMutableGraph.SetTask(TaskNodeId id, ITask task)
+        {
+            m_TaskNodes[id] = new TaskNodeInfo(id, task);
+        }
+
+
+        struct TaskNodeCacheInfo
+        {
+            public int BindingCount { get; set; }
+            public int ParentCount { get; set; }
+            public int ChildCount { get; set; }
+        }
+
+        struct DataNodeCacheInfo
+        {
+            public int ParentCount { get; set; }
+            public int ChildCount { get; set; }
+        }
+
+        struct DataViewCacheInfo
+        {
+            public DataContainerId DataContainerId { get; set; }
+            public int ChildCount { get; set; }
+        }
+        struct DataViewWriteCacheInfo
+        {
+            public DataNodeId LastWrite { get; set; }
+
+            HashSet<DataViewId> m_Subwrites;
+            public HashSet<DataViewId> SubWrites
+            {
+                get
+                {
+                    if (m_Subwrites == null)
+                    {
+                        m_Subwrites = new();
+                    }
+                    return m_Subwrites;
+                }
+            }
+        }
+
+        class TaskNodeProvider : ITaskNodeProvider, IIndexable<GraphNode<TaskNodeId>, TaskNode>
+        {
+            Handle<TaskGraph> m_Owner;
+
+            /// <inheritdoc cref="ITaskNodeProvider"/>
+            public bool Valid => m_Owner.Valid;
+
+            /// <summary>
+            /// Gets the number of task nodes in the graph.
+            /// </summary>
+            public int Count => m_Owner.Ref.m_TaskNodes.Count;
+
+            /// <summary>
+            /// Gets the task node at the specified index in the graph.
+            /// </summary>
+            /// <param name="index">The zero-based index of the task node to get.</param>
+            /// <returns>The task node at the specified index.</returns>
+            public TaskNode this[int index] => this[m_Owner.Ref.TaskNodeGraph.Data[index]];
+
+            /// <summary>
+            /// Gets the task node from the specified ID.
+            /// </summary>
+            /// <param name="taskNodeId">The ID of the task node to get.</param>
+            /// <returns>The task node with the specified ID.</returns>
+            public TaskNode this[TaskNodeId taskNodeId] => this[m_Owner.Ref.TaskNodeGraph.Data[taskNodeId.Index]];
+
+            /// <summary>
+            /// Gets the data node from a graph node.
+            /// </summary>
+            /// <param name="node">The graph node to convert.</param>
+            /// <returns>A task node representing the graph node.</returns>
+            public TaskNode this[GraphNode<TaskNodeId> node] => new(this, node, m_Owner.Ref, m_Owner.Ref.m_TaskNodes[node.Data]);
+
+            /// <summary>
+            /// Initializes a new instance of the <see cref="TaskNodeProvider"/> class.
+            /// </summary>
+            /// <param name="owner">The task graph that owns this provider.</param>
+            public TaskNodeProvider(TaskGraph owner)
+            {
+                m_Owner = owner;
+            }
+
+            /// <inheritdoc cref="ITaskNodeProvider"/>
+            public LinearEnumerator<ITaskNodeProvider, TaskNode> GetEnumerator() => new(this);
+
+            /// <summary>
+            /// Refreshes the provider to ensure it has the latest data from the graph.
+            /// </summary>
+            /// <returns>This provider instance.</returns>
+            public TaskNodeProvider Refresh()
+            {
+                m_Owner.Update();
+                return this;
+            }
+        }
+
+        class DataNodeProvider : IDataNodeProvider, IIndexable<GraphNode<DataNodeId>, DataNode>
+        {
+            Handle<TaskGraph> m_Owner;
+
+            /// <inheritdoc cref="IDataNodeProvider"/>
+            public bool Valid => m_Owner.Valid;
+
+            /// <summary>
+            /// Gets the number of data nodes in the graph.
+            /// </summary>
+            public int Count => m_Owner.Ref.m_DataNodes.Count;
+
+            /// <summary>
+            /// Gets the data node at the specified index in the graph.
+            /// </summary>
+            /// <param name="index">The zero-based index of the data node to get.</param>
+            /// <returns>The data node at the specified index.</returns>
+            public DataNode this[int index] => this[m_Owner.Ref.DataNodeGraph.Data[index]];
+            /// <summary>
+            /// Gets the data node from the specified ID.
+            /// </summary>
+            /// <param name="dataNodeId">The ID of the data node to get.</param>
+            /// <returns>The data node with the specified ID.</returns>
+            public DataNode this[DataNodeId DataNodeId] => this[m_Owner.Ref.DataNodeGraph.Data[DataNodeId.Index]];
+            /// <summary>
+            /// Gets the data node from a graph node.
+            /// </summary>
+            /// <param name="node">The graph node to convert.</param>
+            /// <returns>A data node representing the graph node.</returns>
+            public DataNode this[GraphNode<DataNodeId> node] => new(this, node, m_Owner.Ref, m_Owner.Ref.m_DataNodes[node.Data]);
+
+            /// <summary>
+            /// Initializes a new instance of the <see cref="DataNodeProvider"/> class.
+            /// </summary>
+            /// <param name="owner">The data graph that owns this provider.</param>
+            public DataNodeProvider(TaskGraph owner)
+            {
+                m_Owner = owner;
+            }
+
+            /// <inheritdoc cref="IDataNodeProvider"/>
+            public LinearEnumerator<IDataNodeProvider, DataNode> GetEnumerator() => new(this);
+
+            /// <summary>
+            /// Refreshes the provider to ensure it has the latest data from the graph.
+            /// </summary>
+            /// <returns>This provider instance.</returns>
+            public DataNodeProvider Refresh()
+            {
+                m_Owner.Update();
+                return this;
+            }
+        }
+
+        class DataViewProvider : IDataViewProvider, IIndexable<MultiTreeNode<DataViewId>, DataView>
+        {
+            Handle<TaskGraph> m_Owner;
+
+            public bool Valid => m_Owner.Valid;
+
+            public int Count => m_Owner.Ref.m_DataViews.Count;
+
+            public DataView this[int index] => this[new DataViewId(index)];
+            public DataView this[DataViewId dataViewId] => new(this, m_Owner.Ref.DataViewTrees.Data[dataViewId.Index], m_Owner.Ref, m_Owner.Ref.m_DataViews[dataViewId]);
+            public DataView this[MultiTreeNode<DataViewId> node] => new(this, node, m_Owner.Ref, m_Owner.Ref.m_DataViews[node.Data]);
+
+            public DataViewProvider(TaskGraph owner)
+            {
+                m_Owner = owner;
+            }
+
+            public LinearEnumerator<IDataViewProvider, DataView> GetEnumerator() => new(this);
+
+            public DataViewProvider Refresh()
+            {
+                m_Owner.Update();
+                return this;
+            }
+        }
+
+        class DataBindingProvider : IDataBindingProvider
+        {
+            Handle<TaskGraph> m_Owner;
+
+            public bool Valid => m_Owner.Valid;
+
+            public int Count => m_Owner.Ref.m_DataBindings.Count;
+
+            public DataBinding this[int index] => this[new DataBindingId(index)];
+            public DataBinding this[DataBindingId dataBindingId] => new(this, m_Owner.Ref, m_Owner.Ref.m_DataBindings[dataBindingId]);
+
+            public DataBindingProvider(TaskGraph owner)
+            {
+                m_Owner = owner;
+            }
+
+            public LinearEnumerator<IDataBindingProvider, DataBinding> GetEnumerator() => new(this);
+
+            public DataBindingProvider Refresh()
+            {
+                m_Owner.Update();
+                return this;
+            }
+        }
+
+        class DataContainerProvider : IDataContainerProvider
+        {
+            Handle<TaskGraph> m_Owner;
+
+            public bool Valid => m_Owner.Valid;
+
+            public int Count => m_Owner.Ref.m_DataContainers.Count;
+
+            public DataContainer this[int index] => this[new DataContainerId(index)];
+            public DataContainer this[DataContainerId dataContainerId] => new(m_Owner.Ref, m_Owner.Ref.m_DataContainers[dataContainerId]);
+
+            public DataContainerProvider(TaskGraph owner)
+            {
+                m_Owner = owner;
+            }
+
+            public LinearEnumerator<IDataContainerProvider, DataContainer> GetEnumerator() => new(this);
+
+            public DataContainerProvider Refresh()
+            {
+                m_Owner.Update();
+                return this;
+            }
+        }
+    }
+}
diff --git a/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Graph/TaskGraph.cs.meta b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Graph/TaskGraph.cs.meta
new file mode 100644
index 00000000000..292f8a9ea43
--- /dev/null
+++ b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Graph/TaskGraph.cs.meta
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: 44e5122fce53f3d459a4c896920a906e
\ No newline at end of file
diff --git a/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Graph/TaskGraphCache.cs b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Graph/TaskGraphCache.cs
new file mode 100644
index 00000000000..805fd51bf39
--- /dev/null
+++ b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Graph/TaskGraphCache.cs
@@ -0,0 +1,457 @@
+using System;
+using System.Collections.Generic;
+using UnityEngine;
+
+namespace Unity.GraphCommon.LowLevel.Editor
+{
+    partial class TaskGraph
+    {
+        DataViewId FindRootDataViewId(DataViewId dataViewId)
+        {
+            // Could be just a look-up if LinearTree enable O(1) root query
+            var parentDataView = m_DataViews[dataViewId];
+            while (parentDataView.ParentDataViewId.IsValid)
+            {
+                parentDataView = m_DataViews[parentDataView.ParentDataViewId];
+            }
+            return parentDataView.Id;
+        }
+
+        LinearMultiList<DataNodeId> BuildTaskNodeToDataNodes()
+        {
+            LinearMultiList<DataNodeId> taskNodeToDataNodes = new();
+            foreach (var taskNode in m_TaskNodes)
+            {
+                var cacheInfo = TaskNodesCacheInfo.Valid ? TaskNodesCacheInfo.Data[taskNode.Id] : default;
+                taskNodeToDataNodes.AddList(cacheInfo.BindingCount);
+            }
+            foreach (var dataNode in m_DataNodes)
+            {
+                taskNodeToDataNodes.AddItem(dataNode.TaskNodeId.Index, dataNode.Id);
+            }
+            taskNodeToDataNodes.Pack();
+            return taskNodeToDataNodes;
+        }
+
+        LinearMultiList<DataBindingId> BuildTaskNodeToDataBindings()
+        {
+            LinearMultiList<DataBindingId> taskNodeToDataBindings = new();
+            foreach (var taskNode in m_TaskNodes)
+            {
+                var cacheInfo = TaskNodesCacheInfo.Valid ? TaskNodesCacheInfo.Data[taskNode.Id] : default;
+                taskNodeToDataBindings.AddList(cacheInfo.BindingCount);
+            }
+            foreach (var dataBinding in m_DataBindings)
+            {
+                int taskIndex = dataBinding.TaskNodeId.Index;
+                taskNodeToDataBindings.AddItem(taskIndex, dataBinding.Id);
+            }
+            return taskNodeToDataBindings;
+        }
+
+        LinearMultiList<DataContainerId> BuildTaskNodeToDataContainers()
+        {
+            LinearMultiList<DataContainerId> taskNodeToDataContainers = new();
+            foreach (var taskNode in m_TaskNodes)
+            {
+                //Reserve with decent estimate if info is available
+                var cacheInfo = TaskNodesCacheInfo.Valid ? TaskNodesCacheInfo.Data[taskNode.Id] : default;
+                taskNodeToDataContainers.AddList(cacheInfo.BindingCount);
+            }
+            foreach (var dataNode in m_DataNodes)
+            {
+                taskNodeToDataContainers.AddItem(dataNode.TaskNodeId.Index, dataNode.DataContainerId);
+            }
+            taskNodeToDataContainers.Pack();
+            return taskNodeToDataContainers;
+        }
+
+        LinearMultiTree<DataViewId> BuildDataNodeToDataViews(Func<ITask, DataBindingInfo, (bool success, DataPathSet usage)> getUsage)
+        {
+            Dictionary<DataViewId, int> addedDataViewIds = new();
+            LinearMultiTree<DataViewId> dataNodeToDataViews = new();
+
+            int InsertDataView(DataViewId dataViewId, LinearMultiTree<DataViewId> dataNodeToDataViews, Dictionary<DataViewId, int> addedDataViewIds)
+            {
+                int index = -1;
+                if (addedDataViewIds.TryGetValue(dataViewId, out index))
+                    return index;
+
+                int parentIndex = -1;
+                var parentDataViewId = m_DataViews[dataViewId].ParentDataViewId;
+                if (parentDataViewId.IsValid)
+                {
+                    parentIndex = InsertDataView(parentDataViewId, dataNodeToDataViews, addedDataViewIds);
+                }
+
+                int childCount = 0;
+                if (DataViewTrees.Valid)
+                {
+                    childCount = DataViewTrees.Data[dataViewId.Index].Children.Count;
+                }
+
+                //Debug.Log($"Adding data view {dataViewId} with parent {parentDataViewId} and child count {childCount}");
+                index = dataNodeToDataViews.AddItem(dataViewId, parentIndex, childCount);
+                addedDataViewIds.Add(dataViewId, index);
+                return index;
+            }
+
+            // Insert the root data views first, to enforce that the index of the dataNode matches the index in the LinearMultiTree
+            foreach (var dataNode in m_DataNodes)
+            {
+                var dataViewId = m_DataContainers[dataNode.DataContainerId].RootDataViewId;
+
+                int childCount = 0;
+                if (DataViewTrees.Valid)
+                {
+                    childCount = DataViewTrees.Data[dataViewId.Index].Children.Count;
+                }
+                int index = dataNodeToDataViews.AddItem(dataViewId, -1, childCount);
+                Debug.Assert(dataNode.Id.Index == index);
+            }
+
+            // Insert data views from bindings
+            foreach (var dataNode in m_DataNodes)
+            {
+                addedDataViewIds.Clear();
+                var dataNodeContainerDataView = m_DataContainers[dataNode.DataContainerId].RootDataViewId;
+                addedDataViewIds.Add(dataNodeContainerDataView, dataNode.Id.Index);
+
+                bool used = false;
+                foreach (var dataBinding in m_DataBindings)
+                {
+                    if (!dataBinding.TaskNodeId.Equals(dataNode.TaskNodeId))
+                        continue;
+
+                    var bindingDataViewRoot = FindRootDataViewId(dataBinding.DataViewId);
+                    if (!bindingDataViewRoot.Equals(dataNodeContainerDataView))
+                        continue;
+
+                    var dataViewId = dataBinding.DataViewId;
+                    var task = m_TaskNodes[dataNode.TaskNodeId].Task;
+                    var (success, usage) = getUsage(task, dataBinding);
+                    if (success)
+                    {
+                        foreach (var path in usage.DataPaths)
+                        {
+                            var subdataViewId = GetSubdata(dataViewId, path);
+                            if (!subdataViewId.IsValid)
+                            {
+                                Debug.LogWarning(
+                                    $"Task {dataNode.TaskNodeId}({task})  expects to access a sub-data ({path}) that does not exist.");
+                                break;
+                            }
+                            used = true;
+
+                            InsertDataView(subdataViewId, dataNodeToDataViews, addedDataViewIds);
+                        }
+                    }
+                }
+                if (!used)
+                {
+                    // Remove root data view if there is no usage
+                    dataNodeToDataViews.SetData(dataNode.Id.Index, DataViewId.Invalid);
+                }
+            }
+
+            if (DataViewTrees.Valid)
+            {
+                //TODO: Fix
+                //dataNodeToDataViews.Pack();
+            }
+            return dataNodeToDataViews;
+        }
+
+        LinearMultiTree<DataViewId> BuildDataNodeToReadDataViews()
+        {
+            return BuildDataNodeToDataViews((task, dataBinding) =>
+            {
+                bool success = task.GetDataUsage(dataBinding.BindingDataKey, out DataPathSet readUsage, out _);
+                return (success, readUsage);
+            });
+        }
+
+        LinearMultiTree<DataViewId> BuildDataNodeToWrittenDataViews()
+        {
+            return BuildDataNodeToDataViews((task, dataBinding) =>
+            {
+                bool success = task.GetDataUsage(dataBinding.BindingDataKey, out _, out DataPathSet writeUsage);
+                return (success, writeUsage);
+            });
+        }
+
+        LinearMultiTree<DataViewId> BuildDataNodeToUsedDataViews()
+        {
+            LinearMultiTree<DataViewId> dataNodeToDataViews = new();
+            Dictionary<DataViewId, int> addedDataViewIds = new();
+
+            void InsertDataViewTree(MultiTreeNode<DataViewId> dataViewTree, int parentIndex, LinearMultiTree<DataViewId> dataNodeToDataViews, Dictionary<DataViewId, int> addedDataViewIds)
+            {
+                if (!dataViewTree.Data.IsValid)
+                    return;
+                if (!addedDataViewIds.TryGetValue(dataViewTree.Data, out var index))
+                {
+                    index = dataNodeToDataViews.AddItem(dataViewTree.Data, parentIndex, dataViewTree.Children.Count);
+                    addedDataViewIds.Add(dataViewTree.Data, index);
+                }
+                foreach (var child in dataViewTree.Children)
+                {
+                    InsertDataViewTree(child, index, dataNodeToDataViews, addedDataViewIds);
+                }
+            }
+
+            var dataNodeToReadDataViews = DataNodeToReadDataViews.Data;
+            var dataNodeToWrittenDataViews = DataNodeToWrittenDataViews.Data;
+
+            foreach (var dataNode in m_DataNodes)
+            {
+                dataNodeToDataViews.AddItem(DataViewId.Invalid, -1);
+            }
+            foreach (var dataNode in m_DataNodes)
+            {
+                int dataNodeIndex = dataNode.Id.Index;
+                var readRootDataView = dataNodeToReadDataViews[dataNodeIndex];
+                var writtenRootDataView = dataNodeToWrittenDataViews[dataNodeIndex];
+
+                var rootDataViewId = readRootDataView.Data.IsValid ? readRootDataView.Data : writtenRootDataView.Data;
+                Debug.Assert(!readRootDataView.Data.IsValid || readRootDataView.Data.Index == rootDataViewId.Index);
+                Debug.Assert(!writtenRootDataView.Data.IsValid || writtenRootDataView.Data.Index == rootDataViewId.Index);
+
+                addedDataViewIds.Clear();
+                if (rootDataViewId.IsValid)
+                {
+                    addedDataViewIds.Add(rootDataViewId, dataNodeIndex);
+                    dataNodeToDataViews.SetData(dataNodeIndex, rootDataViewId);
+                }
+
+                InsertDataViewTree(readRootDataView, -1, dataNodeToDataViews, addedDataViewIds);
+                InsertDataViewTree(writtenRootDataView, -1, dataNodeToDataViews, addedDataViewIds);
+            }
+
+            Debug.Assert(dataNodeToReadDataViews.RootNodes.Count == dataNodeToDataViews.RootNodes.Count);
+            return dataNodeToDataViews;
+        }
+
+        LinearMultiList<DataBindingId> BuildDataNodeToDataBindings()
+        {
+            LinearMultiList<DataBindingId> dataNodeToDataBindings = new();
+            foreach (var dataNode in m_DataNodes)
+            {
+                dataNodeToDataBindings.AddList();
+                foreach (var dataBinding in m_DataBindings)
+                {
+                    if (dataBinding.TaskNodeId.Equals(dataNode.TaskNodeId)
+                        && FindRootDataViewId(dataBinding.DataViewId).Equals(m_DataContainers[dataNode.DataContainerId].RootDataViewId))
+                    {
+                        dataNodeToDataBindings.AddItem(dataNode.Id.Index, dataBinding.Id);
+                    }
+                }
+            }
+            return dataNodeToDataBindings;
+        }
+
+        LinearMultiList<DataNodeId> BuildDataViewToDataNodes()
+        {
+            LinearMultiList<DataNodeId> dataViewToDataNodes = new();
+            foreach (var dataView in m_DataViews)
+            {
+                dataViewToDataNodes.AddList();
+            }
+
+            void AddToDataViews(DataNodeId dataNodeId, MultiTreeNode<DataViewId> dataViewTreeNode)
+            {
+                dataViewToDataNodes.AddItem(dataViewTreeNode.Data.Index, dataNodeId);
+                foreach (var child in dataViewTreeNode.Children)
+                {
+                    AddToDataViews(dataNodeId, dataViewTreeNode);
+                }
+            }
+
+            foreach (var dataNode in m_DataNodes)
+            {
+                AddToDataViews(dataNode.Id, DataNodeToDataViews.Data[dataNode.Id.Index]);
+            }
+            return dataViewToDataNodes;
+        }
+
+        List<DataContainerId> BuildDataViewToDataContainers()
+        {
+            List<DataContainerId> dataViewToDataContainer = new(m_DataViews.Count);
+            foreach (var dataView in m_DataViews)
+            {
+                DataContainerId dataContainerId = DataContainerId.Invalid;
+                var rootDataViewId = FindRootDataViewId(dataView.Id);
+                foreach (var dataContainer in m_DataContainers)
+                {
+                    if (rootDataViewId.Equals(dataContainer.RootDataViewId))
+                    {
+                        dataContainerId = dataContainer.Id;
+                        break;
+                    }
+                }
+                dataViewToDataContainer.Add(dataContainerId);
+            }
+            return dataViewToDataContainer;
+        }
+
+        List<DataNodeId> BuildDataBindingToDataNodes()
+        {
+            List<DataNodeId> dataBindingToDataNodes = new(m_DataBindings.Count);
+            foreach (var dataBinding in m_DataBindings)
+            {
+                DataNodeId dataNodeId = DataNodeId.Invalid;
+                DataViewId rootDataViewId = DataViewId.Invalid;
+                foreach (var dataNode in m_DataNodes)
+                {
+                    if (dataBinding.TaskNodeId.Equals(dataNode.TaskNodeId))
+                    {
+                        if (!rootDataViewId.IsValid)
+                        {
+                            rootDataViewId = FindRootDataViewId(dataBinding.DataViewId);
+                        }
+                        var dataContainer = m_DataContainers[dataNode.DataContainerId];
+                        if (rootDataViewId.Equals(dataContainer.RootDataViewId))
+                        {
+                            dataNodeId = dataNode.Id;
+                            break;
+                        }
+                    }
+                }
+                Debug.Assert(dataNodeId.IsValid);
+                Debug.Assert(dataBindingToDataNodes.Count == dataBinding.Id.Index);
+                dataBindingToDataNodes.Add(dataNodeId);
+            }
+            return dataBindingToDataNodes;
+        }
+
+        LinearMultiList<DataViewId> BuildDataContainerToDataViews()
+        {
+            LinearMultiList<DataViewId> dataContainerToDataViews = new();
+            foreach (var dataContainer in m_DataContainers)
+            {
+                dataContainerToDataViews.AddList();
+                foreach (var dataView in m_DataViews)
+                {
+                    if(FindRootDataViewId(dataView.Id).Equals(dataContainer.RootDataViewId))
+                        dataContainerToDataViews.AddItem(dataContainer.Id.Index, dataView.Id);
+                }
+            }
+            return dataContainerToDataViews;
+        }
+
+        LinearMultiList<TaskNodeId> BuildDataContainerToTaskNodes()
+        {
+            LinearMultiList<TaskNodeId> dataContainerToTaskNodes = new();
+            foreach (var dataContainer in m_DataContainers)
+            {
+                dataContainerToTaskNodes.AddList();
+            }
+
+            LinearMultiList<DataNodeId> taskNodeToDataNodes = TaskNodeToDataNodes;
+            foreach (var dataNodes in taskNodeToDataNodes)
+            {
+                foreach (var dataNodeId in dataNodes)
+                {
+                    var dataNode = m_DataNodes[dataNodeId];
+                    dataContainerToTaskNodes.AddItem(dataNode.DataContainerId.Index, dataNode.TaskNodeId);
+                }
+            }
+            return dataContainerToTaskNodes;
+        }
+
+        LinearGraph<TaskNodeId> BuildTaskNodeGraph()
+        {
+            LinearGraph<TaskNodeId> graph = new();
+            foreach (var taskNode in m_TaskNodes)
+            {
+                var cacheInfo = TaskNodesCacheInfo.Valid ? TaskNodesCacheInfo.Data[taskNode.Id] : default;
+                graph.AddItem(taskNode.Id, cacheInfo.ParentCount, cacheInfo.ChildCount);
+            }
+            foreach (var taskDependency in m_TaskDependencies)
+            {
+                graph.Connect(taskDependency.ParentNodeId.Index, taskDependency.NodeId.Index); // Normally we should use the index returned by AddItem
+            }
+            return graph;
+        }
+
+        LinearGraph<DataNodeId> BuildDataNodeGraph()
+        {
+            LinearGraph<DataNodeId> graph = new();
+            foreach (var dataNode in m_DataNodes)
+            {
+                var cacheInfo = DataNodesCacheInfo.Valid ? DataNodesCacheInfo.Data[dataNode.Id] : default;
+                graph.AddItem(dataNode.Id, cacheInfo.ParentCount, cacheInfo.ChildCount);
+            }
+            foreach (var dataDependency in m_DataDependencies)
+            {
+                graph.Connect(dataDependency.ParentNodeId.Index, dataDependency.NodeId.Index); // Normally we should use the index returned by AddItem
+            }
+
+            return graph;
+        }
+
+        LinearMultiTree<DataViewId> BuildDataViewTrees()
+        {
+            LinearMultiTree<DataViewId> tree = new();
+            foreach (var dataView in m_DataViews)
+            {
+                int childCapacity = DataViewsCacheInfo.Valid ? DataViewsCacheInfo.Data[dataView.Id].ChildCount : 0;
+                tree.AddItem(dataView.Id, dataView.ParentDataViewId.Index, childCapacity); // Normally we should use the parent index returned by AddItem
+            }
+
+            return tree;
+        }
+
+        SubordinateList<DataNodeCacheInfo> BuildDataNodesCacheInfo()
+        {
+            SubordinateList<DataNodeCacheInfo> dataNodesCacheInfo = new(m_DataNodes);
+
+            foreach (var dataDependency in m_DataDependencies)
+            {
+                dataNodesCacheInfo[dataDependency.NodeId].ParentCount++;
+                dataNodesCacheInfo[dataDependency.ParentNodeId].ChildCount++;
+            }
+            return dataNodesCacheInfo;
+        }
+
+        SubordinateList<TaskNodeCacheInfo> BuildTaskNodesCacheInfo()
+        {
+            SubordinateList<TaskNodeCacheInfo> taskNodesCacheInfo = new(m_TaskNodes);
+
+            foreach (var taskDependency in m_TaskDependencies)
+            {
+                taskNodesCacheInfo[taskDependency.NodeId].ParentCount++;
+                taskNodesCacheInfo[taskDependency.ParentNodeId].ChildCount++;
+            }
+
+            foreach (var binding in m_DataBindings)
+            {
+                taskNodesCacheInfo[binding.TaskNodeId].BindingCount++;
+            }
+            return taskNodesCacheInfo;
+        }
+
+        SubordinateList<DataViewCacheInfo> BuildDataViewsCacheInfo()
+        {
+            SubordinateList<DataViewCacheInfo> dataViewsCacheInfo = new(m_DataViews);
+
+            foreach (var dataView in m_DataViews)
+            {
+                if(dataView.ParentDataViewId.IsValid)
+                    dataViewsCacheInfo[dataView.ParentDataViewId].ChildCount++;
+            }
+            return dataViewsCacheInfo;
+        }
+
+        SubordinateList<DataViewWriteCacheInfo> BuildDataViewsWriteCacheInfo()
+        {
+            SubordinateList<DataViewWriteCacheInfo> dataViewsCacheInfo = new(m_DataViews);
+
+            /*foreach (var dataView in m_DataViews)
+            {
+                dataViewsCacheInfo[dataView.ParentDataViewId].ChildCount++;
+            }*/
+            return dataViewsCacheInfo;
+        }
+    }
+}
diff --git a/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Graph/TaskGraphCache.cs.meta b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Graph/TaskGraphCache.cs.meta
new file mode 100644
index 00000000000..d6a6fd440ad
--- /dev/null
+++ b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Graph/TaskGraphCache.cs.meta
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: 1884e5e0cffa4e84b574d872c52c201b
\ No newline at end of file
diff --git a/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Graph/TaskNode.cs b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Graph/TaskNode.cs
new file mode 100644
index 00000000000..e3dcdca769d
--- /dev/null
+++ b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Graph/TaskNode.cs
@@ -0,0 +1,186 @@
+
+namespace Unity.GraphCommon.LowLevel.Editor
+{
+    /// <summary>
+    /// An Id associated to a given TaskNode in a graph.
+    /// </summary>
+    /*public*/ readonly struct TaskNodeId : System.IEquatable<TaskNodeId>
+    {
+        /// <summary>
+        /// Defines an invalid TaskNodeId.
+        /// </summary>
+        public static readonly TaskNodeId Invalid = new TaskNodeId(-1);
+
+        /// <summary>
+        /// Implicitly converts a <see cref="TaskNodeId"/> to a <see cref="GraphDataId"/>.
+        /// </summary>
+        /// <param name="id">The task node ID to convert.</param>
+        /// <returns>A new graph data ID with the same index value.</returns>
+        public static implicit operator GraphDataId(TaskNodeId id) => new GraphDataId(id.Index);
+
+        /// <summary>
+        /// Implicitly converts a <see cref="GraphDataId"/> to a <see cref="TaskNodeId"/>.
+        /// </summary>
+        /// <param name="id">The graph data ID to convert.</param>
+        /// <returns>A new task node ID with the same index value.</returns>
+        public static implicit operator TaskNodeId(GraphDataId id) => new TaskNodeId(id.Index);
+
+        /// <summary>
+        /// Gets the wrapped int index.
+        /// </summary>
+        public int Index { get; }
+        /// <summary>
+        /// Returns true if this Id is valid, false otherwise.
+        /// </summary>
+        public bool IsValid => Index != Invalid.Index;
+
+        internal TaskNodeId(int index)
+        {
+            Index = index;
+        }
+
+        /// <inheritdoc cref="IEquatable"/>
+        public bool Equals(TaskNodeId other) => Index == other.Index;
+        /// <inheritdoc cref="ValueType"/>
+        public override int GetHashCode() => Index;
+        /// <inheritdoc cref="ValueType"/>
+        public override string ToString() => Index.ToString();
+    }
+
+    readonly struct TaskNodeInfo
+    {
+        public TaskNodeInfo(TaskNodeId id, ITask task)
+        {
+            Id = id;
+            Task = task;
+        }
+
+        public TaskNodeId Id { get; }
+        public ITask Task { get; }
+    }
+
+    /// <summary>
+    /// Represents a node in the graph that contains a task.
+    /// </summary>
+    /*public*/ readonly struct TaskNode
+    {
+        readonly IIndexable<GraphNode<TaskNodeId>, TaskNode> m_NodeConverter;
+        readonly GraphNode<TaskNodeId> m_Node;
+
+        readonly Handle<IReadOnlyGraph> m_Graph;
+        readonly TaskNodeInfo m_Info;
+
+        /// <summary>
+        /// Gets the unique identifier for this task node. Returns an invalid ID if the graph is not valid.
+        /// </summary>
+        public TaskNodeId Id => m_Graph.Valid ? m_Info.Id : TaskNodeId.Invalid;
+
+        /// <summary>
+        /// Gets the task associated with this node. Returns null if the graph is not valid.
+        /// </summary>
+        public ITask Task => m_Graph.Valid ? m_Info.Task : null;
+
+        /// <summary>
+        /// Gets the parent task nodes connected to this task node.
+        /// </summary>
+        public TaskNodeLinks Parents => new(m_NodeConverter, m_Node.Parents);
+
+        /// <summary>
+        /// Gets the child task nodes connected to this task node.
+        /// </summary>
+        public TaskNodeLinks Children => new(m_NodeConverter, m_Node.Children);
+
+        /// <summary>
+        /// Gets the data nodes used by this task node.
+        /// </summary>
+        public DataNodeEnumerable<SubEnumerable<DataNodeId>> DataNodes => m_Graph.Ref.GetDataNodes(Id);
+
+        /// <summary>
+        /// Gets the data bindings used by this task node.
+        /// </summary>
+        public DataBindingEnumerable<SubEnumerable<DataBindingId>> DataBindings => m_Graph.Ref.GetDataBindings(Id);
+
+        internal TaskNode(IIndexable<GraphNode<TaskNodeId>, TaskNode> nodeConverter, GraphNode<TaskNodeId> node, IReadOnlyGraph graph, TaskNodeInfo info)
+        {
+            m_NodeConverter = nodeConverter;
+            m_Node = node;
+            m_Graph = new(graph);
+            m_Info = info;
+        }
+    }
+
+    /// <summary>
+    /// Represents a collection of links to task nodes in the graph.
+    /// </summary>
+    /*public*/ readonly struct TaskNodeLinks : IIndexable<int, TaskNode>, ICountable
+    {
+        readonly IIndexable<GraphNode<TaskNodeId>, TaskNode> m_NodeConverter;
+        readonly GraphNodeLinks<TaskNodeId> m_Links;
+
+        /// <summary>
+        /// Gets the number of task node links in this collection.
+        /// </summary>
+        public int Count => m_Links.Count;
+
+        /// <summary>
+        /// Gets the task node at the specified index in the collection.
+        /// </summary>
+        /// <param name="index">The zero-based index of the task node to get.</param>
+        /// <value>The task node at the specified index.</value>
+        public TaskNode this[int index] => m_NodeConverter[m_Links[index]];
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="TaskNodeLinks"/> struct.
+        /// </summary>
+        /// <param name="nodeConverter">The converter used to convert graph nodes to task nodes.</param>
+        /// <param name="links">The underlying graph node links.</param>
+        public TaskNodeLinks(IIndexable<GraphNode<TaskNodeId>, TaskNode> nodeConverter, GraphNodeLinks<TaskNodeId> links)
+        {
+            m_NodeConverter = nodeConverter;
+            m_Links = links;
+        }
+
+        /// <summary>
+        /// Returns an enumerator that iterates through the task node links.
+        /// </summary>
+        /// <returns>An enumerator that can be used to iterate through the task node links.</returns>
+        public LinearEnumerator<TaskNodeLinks, TaskNode> GetEnumerator() => new(this);    }
+
+    /// <summary>
+    /// Represents an enumerable collection of task nodes.
+    /// </summary>
+    /// <typeparam name="T">The type of the source collection that contains task node IDs.</typeparam>
+    /*public*/ readonly struct TaskNodeEnumerable<T> : IIndexable<int, TaskNode>, ICountable where T : IIndexable<int, TaskNodeId>, ICountable
+    {
+        readonly IIndexable<TaskNodeId, TaskNode> m_Provider;
+        readonly T m_IdSource;
+
+        /// <summary>
+        /// Gets the number of task nodes in the collection.
+        /// </summary>
+        public int Count => m_IdSource.Count;
+
+        /// <summary>
+        /// Gets the task node at the specified index in the collection.
+        /// </summary>
+        /// <param name="index">The zero-based index of the task node to get.</param>
+        /// <value>The task node at the specified index.</value>
+        public TaskNode this[int index] => m_Provider[m_IdSource[index]];
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="TaskNodeEnumerable{T}"/> struct.
+        /// </summary>
+        /// <param name="provider">The provider that can retrieve task nodes by ID.</param>
+        /// <param name="idSource">The source collection of task node IDs.</param>
+        public TaskNodeEnumerable(IIndexable<TaskNodeId, TaskNode> provider, T idSource)
+        {
+            m_Provider = provider;
+            m_IdSource = idSource;
+        }
+
+        /// <summary>
+        /// Returns an enumerator that iterates through the task nodes.
+        /// </summary>
+        /// <returns>An enumerator that can be used to iterate through the task nodes.</returns>
+        public LinearEnumerator<TaskNodeEnumerable<T>, TaskNode> GetEnumerator() => new(this);    }
+}
diff --git a/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Graph/TaskNode.cs.meta b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Graph/TaskNode.cs.meta
new file mode 100644
index 00000000000..7f153347ca4
--- /dev/null
+++ b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Graph/TaskNode.cs.meta
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: b556921856daf264f8d8d75c4fc74b5a
\ No newline at end of file
diff --git a/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Graph/Traversal.meta b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Graph/Traversal.meta
new file mode 100644
index 00000000000..09f2bb6a3a4
--- /dev/null
+++ b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Graph/Traversal.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: bd0ff0d36ca9bf74e9eb8c82700ad883
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Graph/Traversal/GraphTraverser.cs b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Graph/Traversal/GraphTraverser.cs
new file mode 100644
index 00000000000..e142afff7aa
--- /dev/null
+++ b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Graph/Traversal/GraphTraverser.cs
@@ -0,0 +1,161 @@
+using System;
+using System.Collections.Generic;
+using UnityEngine.Pool;
+
+namespace Unity.GraphCommon.LowLevel.Editor
+{
+    /// <summary>
+    /// Struct used by Filter delegate as return value to control graph traversal.
+    /// </summary>
+    /*public*/ readonly struct TraversalControl
+    {
+        /// <summary>
+        /// Accept the current node and continue traversal.
+        /// </summary>
+        public static TraversalControl AcceptAndContinue => new TraversalControl(true,true);
+        /// <summary>
+        /// Accept the current node and stop traversal.
+        /// </summary>
+        public static TraversalControl AcceptAndBreak => new TraversalControl(true, false);
+        /// <summary>
+        /// Reject the current node and continue traversal.
+        /// </summary>
+        public static TraversalControl RejectAndContinue => new TraversalControl(false, true);
+        /// <summary>
+        /// Reject the current node and stop traversal.
+        /// </summary>
+        public static TraversalControl RejectAndBreak => new TraversalControl(false, false);
+
+        /// <summary>
+        /// True is current node is accepted, false otherwise.
+        /// </summary>
+        public bool Accept { get; }
+        /// <summary>
+        /// True is traversal continues, false otherwise.
+        /// </summary>
+        public bool Continue { get; }
+
+        /// <summary>
+        /// Constructor for TraversalControl struct.
+        /// </summary>
+        /// <param name="acceptElement">true to accept node, false to reject.</param>
+        /// <param name="continueTraversal">true to continue graph traversal, false to stop it.</param>
+        public TraversalControl(bool acceptElement, bool continueTraversal)
+        {
+            Accept = acceptElement;
+            Continue = continueTraversal;
+        }
+    }
+
+    /// <summary>
+    /// A class that allows efficient traversal of a <see cref = "IReadOnlyGraph"/>.
+    /// To create a new traverser, use <see cref = "IReadOnlyGraph.CreateTraverser"/>.
+    /// </summary>
+    /*public*/ partial class GraphTraverser
+    {
+        ObjectPool<Deque<TaskNode>> m_TaskDequePool = new(() => new Deque<TaskNode>());
+        ObjectPool<HashSet<TaskNodeId>> m_TaskVisitedPool = new(() => new HashSet<TaskNodeId>());
+
+        ObjectPool<Deque<DataNode>> m_DataDequePool = new(() => new Deque<DataNode>());
+        ObjectPool<HashSet<DataNodeId>> m_DataVisitedPool = new(() => new HashSet<DataNodeId>());
+        HashSet<DataNodeId> m_DataVisited;
+        HashSet<TaskNodeId> m_TaskVisited;
+
+        private IReadOnlyGraph m_Graph;
+
+        internal GraphTraverser(IReadOnlyGraph graph)
+        {
+            m_Graph = graph;
+        }
+
+        /// <summary>Specifies the direction for traversing the graph.</summary>
+        public enum Direction
+        {
+            /// <summary>
+            /// Traverses from parent nodes to child nodes (following dependencies).
+            /// </summary>
+            Downwards,
+            /// <summary>
+            /// Traverses from child nodes to parent nodes (against dependencies).
+            /// </summary>
+            Upwards,
+        }
+
+        /// <summary>
+        /// Specifies the order for traversing the graph.
+        /// </summary>
+        public enum TraversalOrder
+        {
+            /// <summary>
+            /// Traverses in the depth-first order
+            /// </summary>
+            DepthFirst,
+
+            /// <summary>
+            /// Traverses in the breadth-first order
+            /// </summary>
+            BreadthFirst,
+        }
+
+        /// <summary>
+        /// Provides a context for sharing visited node sets during graph traversal,
+        /// allowing multiple traversals to reuse the same visited sets.
+        /// This IDisposable struct manages the lifecycle of the visited sets, acquiring them from
+        /// the pool on construction and releasing them on disposal. Nested contexts are not allowed.
+        /// </summary>
+        public struct SharedVisitedContext : IDisposable
+        {
+            private GraphTraverser m_GraphTraverser;
+            private bool m_Data;
+            private bool m_Task;
+
+            /// <summary>
+            /// Initializes a new instance of the <see cref="SharedVisitedContext"/> struct.
+            /// Acquires visited sets for data and/or task nodes from the pool.
+            /// </summary>
+            /// <param name="traverser">The <see cref="GraphTraverser"/> to use.</param>
+            /// <param name="data">Whether to acquire a visited set for data nodes.</param>
+            /// <param name="task">Whether to acquire a visited set for task nodes.</param>
+            /// <exception cref="Exception">Thrown if a context is already active (nested contexts are not allowed).</exception>
+            public SharedVisitedContext(GraphTraverser traverser, bool data, bool task)
+            {
+                m_GraphTraverser = traverser;
+                m_Data = data;
+                m_Task = task;
+                if (m_Data)
+                {
+                    if(m_GraphTraverser.m_DataVisited != null)
+                        throw new Exception("Cannot have nested SharedVisitedContext");
+                    m_GraphTraverser.m_DataVisited = m_GraphTraverser.m_DataVisitedPool.Get();
+                }
+
+                if (m_Task)
+                {
+                    if(m_GraphTraverser.m_TaskVisited != null)
+                        throw new Exception("Cannot have nested SharedVisitedContext");
+                    m_GraphTraverser.m_TaskVisited = m_GraphTraverser.m_TaskVisitedPool.Get();
+                }
+            }
+
+            /// <summary>
+            /// Releases the visited sets back to the pool and clears the context.
+            /// </summary>
+            public void Dispose()
+            {
+                if (m_Data)
+                {
+                    m_GraphTraverser.m_DataVisited.Clear();
+                    m_GraphTraverser.m_DataVisitedPool.Release(m_GraphTraverser.m_DataVisited);
+                    m_GraphTraverser.m_DataVisited = null;
+                }
+
+                if (m_Task)
+                {
+                    m_GraphTraverser.m_TaskVisited.Clear();
+                    m_GraphTraverser.m_TaskVisitedPool.Release(m_GraphTraverser.m_TaskVisited);
+                    m_GraphTraverser.m_TaskVisited = null;
+                }
+            }
+        }
+    }
+}
diff --git a/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Graph/Traversal/GraphTraverser.cs.meta b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Graph/Traversal/GraphTraverser.cs.meta
new file mode 100644
index 00000000000..98e43100cc2
--- /dev/null
+++ b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Graph/Traversal/GraphTraverser.cs.meta
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: 5c484903480966b44a1903e29cf6dce9
\ No newline at end of file
diff --git a/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Graph/Traversal/GraphTraverserData.cs b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Graph/Traversal/GraphTraverserData.cs
new file mode 100644
index 00000000000..c13e81dfc08
--- /dev/null
+++ b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Graph/Traversal/GraphTraverserData.cs
@@ -0,0 +1,323 @@
+using System;
+using System.Collections.Generic;
+
+namespace Unity.GraphCommon.LowLevel.Editor
+{
+    /*public*/ partial class GraphTraverser
+    {
+        /// <summary>
+        /// Traverses all root data nodes in the graph.
+        /// </summary>
+        /// <returns> An enumerable object </returns>
+        public LinearDataEnumerable TraverseDataRoots()
+        {
+            return new LinearDataEnumerable(m_Graph, node =>
+            {
+                if (node.Parents.Count == 0)
+                    return TraversalControl.AcceptAndContinue;
+                return TraversalControl.RejectAndContinue;
+            });
+        }
+
+        /// <summary>
+        /// Traverses all leaf data nodes in the graph.
+        /// </summary>
+        /// <returns> An enumerable object </returns>
+        public LinearDataEnumerable TraverseDataLeaves()
+        {
+            return new LinearDataEnumerable(m_Graph, node =>
+            {
+                if (node.Children.Count == 0)
+                    return TraversalControl.AcceptAndContinue;
+                return TraversalControl.RejectAndContinue;
+            });
+        }
+
+        /// <summary>
+        /// Traverses data nodes recursively, starting from the specified node.
+        /// </summary>
+        /// <param name="node">The starting data node for traversal.</param>
+        /// <param name="order">The traversal order (depth or breadth first).</param>
+        /// <param name="direction">The traversal direction (downwards or upwards).</param>
+        /// <param name="onVisit">Optional callback that is invoked when visiting each node. Return false to skip child traversal.</param>
+        /// <returns>An enumerable object that can be used to traverse the data nodes.</returns>
+        public DataTraversalEnumerable TraverseDataRecursive(DataNode node, Direction direction = Direction.Downwards,
+            TraversalOrder order = TraversalOrder.DepthFirst, OnVisitDataNode onVisit = null)
+        {
+            return new DataTraversalEnumerable(node, direction, order, this, onVisit);
+        }
+
+        /// <summary>
+        /// Traverses data nodes in a depth-first manner, starting from the specified node and moving downwards.
+        /// </summary>
+        /// <param name="node">The starting data node for traversal.</param>
+        /// <param name="onVisit">Optional callback that is invoked when visiting each node. Return false to skip child traversal.</param>
+        /// <returns>An enumerable object that can be used to traverse the data nodes.</returns>
+        public DataTraversalEnumerable TraverseDataDownwards(DataNode node, OnVisitDataNode onVisit = null)
+        {
+            return TraverseDataRecursive(node, Direction.Downwards, TraversalOrder.DepthFirst, onVisit);
+        }
+
+        /// <summary>
+        /// Traverses data nodes in a breadth-first manner, starting from the specified node and moving downwards.
+        /// </summary>
+        /// <param name="node">The starting data node for traversal.</param>
+        /// <param name="onVisit">Optional callback that is invoked when visiting each node. Return false to skip child traversal.</param>
+        /// <returns>An enumerable object that can be used to traverse the data nodes.</returns>
+        public DataTraversalEnumerable TraverseDataDownwardsBreadthFirst(DataNode node, OnVisitDataNode onVisit = null)
+        {
+            return TraverseDataRecursive(node, Direction.Downwards, TraversalOrder.BreadthFirst, onVisit);
+        }
+
+        /// <summary>
+        /// Traverses data nodes in a depth-first manner, starting from the specified node and moving upwards.
+        /// </summary>
+        /// <param name="node">The starting data node for traversal.</param>
+        /// <param name="onVisit">Optional callback that is invoked when visiting each node. Return false to skip parent traversal.</param>
+        /// <returns>An enumerable object that can be used to traverse the data nodes.</returns>
+        public DataTraversalEnumerable TraverseDataUpwards(DataNode node, OnVisitDataNode onVisit = null)
+        {
+            return TraverseDataRecursive(node, Direction.Upwards, TraversalOrder.DepthFirst, onVisit);
+        }
+
+        /// <summary>
+        /// Traverses data nodes in a breadth-first manner, starting from the specified node and moving upwards.
+        /// </summary>
+        /// <param name="node">The starting data node for traversal.</param>
+        /// <param name="onVisit">Optional callback that is invoked when visiting each node. Return false to skip parent traversal.</param>
+        /// <returns>An enumerable object that can be used to traverse the data nodes.</returns>
+        public DataTraversalEnumerable TraverseDataUpwardsBreadthFirst(DataNode node, OnVisitDataNode onVisit = null)
+        {
+            return TraverseDataRecursive(node, Direction.Upwards, TraversalOrder.BreadthFirst, onVisit);
+        }
+
+
+        /// <summary>
+        /// Represents an enumerable collection for depth-first traversal of data nodes.
+        /// </summary>
+        public struct DataTraversalEnumerable
+        {
+            /// <summary>
+            /// Initializes a new instance of the DataDepthFirstEnumerable struct.
+            /// </summary>
+            /// <param name="node">The starting node for traversal.</param>
+            /// <param name="direction">The direction of traversal (Upwards or Downwards).</param>
+            /// <param name="order"> The order of traversal (depth first or breadth first).</param>
+            /// <param name="traverser">The graph traverser object in use.</param>
+            /// <param name="onVisit">Optional callback that is invoked when visiting each node.</param>
+            public DataTraversalEnumerable(DataNode node, Direction direction, TraversalOrder order,
+                GraphTraverser traverser, OnVisitDataNode onVisit = null)
+            {
+                m_Node = node;
+                m_GraphTraverser = traverser;
+                m_Direction = direction;
+                m_Order = order;
+                m_OnVisit = onVisit;
+            }
+
+            private DataNode m_Node;
+            private GraphTraverser m_GraphTraverser;
+            private Direction m_Direction;
+            private TraversalOrder m_Order;
+            private OnVisitDataNode m_OnVisit;
+
+            /// <summary>
+            /// Gets an enumerator for traversing the data nodes in depth-first order.
+            /// </summary>
+            /// <returns>An enumerator that can be used to traverse the data nodes.</returns>
+            public Enumerator GetEnumerator() =>
+                new Enumerator(m_Node, m_Direction, m_Order, m_GraphTraverser, m_OnVisit);
+
+
+            /// <summary>
+            /// Executes the traversal by iterating through all nodes using the enumerator.
+            /// </summary>
+            public void Execute()
+            {
+                using var enumerator = GetEnumerator();
+                while (enumerator.MoveNext()) { }
+            }
+
+            /// <summary>
+            /// Enumerator for depth-first traversal of data nodes.
+            /// </summary>
+            public struct Enumerator : IDisposable
+            {
+                private Deque<DataNode> m_Deque;
+                private HashSet<DataNodeId> m_Visited;
+                private bool m_OwnsVisited;
+                private GraphTraverser m_GraphTraverser;
+                private DataNode m_Current;
+                private Direction m_Direction;
+                private TraversalOrder m_Order;
+                private OnVisitDataNode m_OnVisit;
+
+                /// <summary>
+                /// Initializes a new instance of the Enumerator struct.
+                /// </summary>
+                /// <param name="startNode">The starting node for traversal.</param>
+                /// <param name="direction">The direction of traversal.</param>
+                /// <param name="order"> The order of traversal (depth first or breadth first).</param>
+                /// <param name="traverser">The graph traverser object in use.</param>
+                /// <param name="onVisit">Optional callback that is invoked when visiting each node.</param>
+                public Enumerator(DataNode startNode, Direction direction, TraversalOrder order,
+                    GraphTraverser traverser, OnVisitDataNode onVisit = null)
+                {
+                    m_Direction = direction;
+                    m_Order = order;
+                    m_GraphTraverser = traverser;
+                    m_OwnsVisited = traverser.m_DataVisited == null;
+                    m_Visited = m_OwnsVisited ? m_GraphTraverser.m_DataVisitedPool.Get() : traverser.m_DataVisited;
+                    m_Deque = m_GraphTraverser.m_DataDequePool.Get();
+                    m_Current = new DataNode();
+                    m_OnVisit = onVisit;
+                    m_Deque.AddFront(startNode);
+                }
+
+                /// <summary>
+                /// Advances the enumerator to the next data node in the depth-first traversal.
+                /// </summary>
+                /// <returns>true if the enumerator was successfully advanced to the next element; false if the enumerator has passed the end of the collection.</returns>
+                public bool MoveNext()
+                {
+                    while (m_Deque.Count > 0)
+                    {
+                        m_Current = m_Order == TraversalOrder.DepthFirst ? m_Deque.RemoveFront() : m_Deque.RemoveBack();
+                        if (m_Visited.Add(m_Current.Id) && (m_OnVisit == null || m_OnVisit.Invoke(m_Current)))
+                        {
+                            var connections = m_Direction == Direction.Downwards
+                                ? m_Current.Children
+                                : m_Current.Parents;
+
+                            for (int i = 0; i < connections.Count; i++)
+                            {
+                                var neighbor = m_Order == TraversalOrder.DepthFirst
+                                    ? connections[connections.Count - 1 - i]
+                                    : connections[i];
+                                if (!m_Visited.Contains(neighbor.Id))
+                                {
+                                    if (m_Order == TraversalOrder.DepthFirst)
+                                        m_Deque.AddFront(neighbor);
+                                    else
+                                        m_Deque.AddBack(neighbor);
+                                }
+                            }
+
+                            return true;
+                        }
+                    }
+
+                    m_Current = new DataNode();
+                    return false;
+                }
+
+                /// <summary>
+                /// Gets the current data node in the traversal.
+                /// </summary>
+                public DataNode Current => m_Current.Id.IsValid ? m_Current : default;
+
+                /// <summary>
+                /// Releases all resources used by the enumerator.
+                /// </summary>
+                public void Dispose()
+                {
+                    if (m_OwnsVisited)
+                    {
+                        m_Visited.Clear();
+                        m_GraphTraverser.m_DataVisitedPool.Release(m_Visited);
+                    }
+
+                    m_Deque.Clear();
+                    m_GraphTraverser.m_DataDequePool.Release(m_Deque);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Represents an enumerable collection for linear traversal of data nodes with optional filtering.
+        /// </summary>
+        public struct LinearDataEnumerable
+        {
+            private IReadOnlyGraph m_Graph;
+            private OnFilterDataNode m_OnFilter;
+
+            /// <summary>
+            /// Initializes a new instance of the <see cref="LinearDataEnumerable"/> struct.
+            /// </summary>
+            /// <param name="graph">The graph to traverse.</param>
+            /// <param name="onFilter">Optional filter callback to control traversal and acceptance of nodes.</param>
+            public LinearDataEnumerable(IReadOnlyGraph graph, OnFilterDataNode onFilter = null)
+            {
+                m_Graph = graph;
+                m_OnFilter = onFilter;
+            }
+
+            /// <summary>
+            /// Gets an enumerator for traversing the data nodes linearly.
+            /// </summary>
+            /// <returns>An enumerator for the data nodes.</returns>
+            public Enumerator GetEnumerator() => new Enumerator(m_Graph, m_OnFilter);
+
+            /// <summary>
+            /// Executes the traversal, iterating through all nodes.
+            /// </summary>
+            public void Execute()
+            {
+                var enumerator = GetEnumerator();
+                while (enumerator.MoveNext()) { }
+            }
+
+            /// <summary>
+            /// Enumerator for linear traversal of data nodes with filtering.
+            /// </summary>
+            public struct Enumerator
+            {
+                private IReadOnlyGraph m_Graph;
+                private OnFilterDataNode m_OnFilter;
+                private int m_Index;
+
+                /// <summary>
+                /// Initializes a new instance of the <see cref="Enumerator"/> struct.
+                /// </summary>
+                /// <param name="graph">The graph to traverse.</param>
+                /// <param name="onFilter">Optional filter callback to control traversal and acceptance of nodes.</param>
+                public Enumerator(IReadOnlyGraph graph, OnFilterDataNode onFilter)
+                {
+                    m_Graph = graph;
+                    m_OnFilter = onFilter;
+                    m_Index = -1;
+                }
+
+                /// <summary>
+                /// Gets the current data node in the traversal.
+                /// </summary>
+                public DataNode Current => m_Graph.DataNodes[m_Index];
+
+                /// <summary>
+                /// Advances the enumerator to the next data node that matches the filter.
+                /// </summary>
+                /// <returns>True if a node was found; otherwise, false.</returns>
+                public bool MoveNext()
+                {
+                    while (m_Index < m_Graph.DataNodes.Count - 1)
+                    {
+                        m_Index++;
+                        var node = m_Graph.DataNodes[m_Index];
+                        var control = m_OnFilter(node);
+                        if (!control.Continue)
+                        {
+                            m_Index = m_Graph.DataNodes.Count;
+                        }
+
+                        if (control.Accept)
+                        {
+                            return true;
+                        }
+                    }
+
+                    return false;
+                }
+            }
+        }
+    }
+}
diff --git a/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Graph/Traversal/GraphTraverserData.cs.meta b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Graph/Traversal/GraphTraverserData.cs.meta
new file mode 100644
index 00000000000..139f3256d9e
--- /dev/null
+++ b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Graph/Traversal/GraphTraverserData.cs.meta
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: 1c3c49e468b70d444b9bd1014b7deb02
\ No newline at end of file
diff --git a/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Graph/Traversal/GraphTraverserDelegates.cs b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Graph/Traversal/GraphTraverserDelegates.cs
new file mode 100644
index 00000000000..0cebf4741e2
--- /dev/null
+++ b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Graph/Traversal/GraphTraverserDelegates.cs
@@ -0,0 +1,35 @@
+
+
+namespace Unity.GraphCommon.LowLevel.Editor
+{
+    /*public*/ partial class GraphTraverser
+    {
+        /// <summary>
+        /// Delegate called when visiting a <see cref="TaskNode"/>.
+        /// </summary>
+        /// <param name="taskNode">The node being visited.</param>
+        /// <returns>true to continue traversal, false to stop.</returns>
+        public delegate bool OnVisitTaskNode(TaskNode taskNode);
+
+        /// <summary>
+        /// Delegate called when visiting a <see cref="DataNode"/>.
+        /// </summary>
+        /// <param name="dataNode">The node being visited.</param>
+        /// <returns>true to continue traversal, false to stop.</returns>
+        public delegate bool OnVisitDataNode(DataNode dataNode);
+
+        /// <summary>
+        /// Delegate called to filter a <see cref="TaskNode"/>.
+        /// </summary>
+        /// <param name="taskNode">The node being filtered.</param>
+        /// <returns>The traversal control used to determine whether to visit the node and/or continue graph traversal.</returns>
+        public delegate TraversalControl OnFilterTaskNode(TaskNode taskNode);
+
+        /// <summary>
+        /// Delegate called to filter a <see cref="DataNode"/>.
+        /// </summary>
+        /// <param name="dataNode">Thhe node being filtered.</param>
+        /// <returns>The traversal control used to determine whether to visit the node and/or continue graph traversal.</returns>
+        public delegate TraversalControl OnFilterDataNode(DataNode dataNode);
+    }
+}
diff --git a/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Graph/Traversal/GraphTraverserDelegates.cs.meta b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Graph/Traversal/GraphTraverserDelegates.cs.meta
new file mode 100644
index 00000000000..0c73e8d5827
--- /dev/null
+++ b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Graph/Traversal/GraphTraverserDelegates.cs.meta
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: 0c612d02bdabde34b85b7eb8a63d4c0e
\ No newline at end of file
diff --git a/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Graph/Traversal/GraphTraverserTasks.cs b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Graph/Traversal/GraphTraverserTasks.cs
new file mode 100644
index 00000000000..26e1d3d1e3a
--- /dev/null
+++ b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Graph/Traversal/GraphTraverserTasks.cs
@@ -0,0 +1,306 @@
+using System;
+using System.Collections.Generic;
+
+namespace Unity.GraphCommon.LowLevel.Editor
+{
+    /*public*/ partial class GraphTraverser
+    {
+        /// <summary>
+        /// Traverses all root task nodes in the graph.
+        /// </summary>
+        /// <returns> An enumerable object </returns>
+        public LinearTaskEnumerable TraverseTaskRoots()
+        {
+            return new LinearTaskEnumerable(m_Graph, node =>
+            {
+                if(node.Parents.Count == 0)
+                    return TraversalControl.AcceptAndContinue;
+                return TraversalControl.RejectAndContinue;
+            });
+        }
+
+        /// <summary>
+        /// Traverses all leaf task nodes in the graph.
+        /// </summary>
+        /// <returns> An enumerable object </returns>
+        public LinearTaskEnumerable TraverseTaskLeaves()
+        {
+            return new LinearTaskEnumerable(m_Graph, node =>
+            {
+                if(node.Children.Count == 0)
+                    return TraversalControl.AcceptAndContinue;
+                return TraversalControl.RejectAndContinue;
+            });
+        }
+
+        /// <summary>
+        /// Traverses task nodes recursively, starting from the specified node.
+        /// </summary>
+        /// <param name="node">The starting task node for traversal.</param>
+        /// <param name="order">The traversal order (depth or breadth first).</param>
+        /// <param name="direction">The traversal direction (downwards or upwards).</param>
+        /// <param name="onVisit">Optional callback that is invoked when visiting each node. Return false to skip child traversal.</param>
+        /// <returns>An enumerable object that can be used to traverse the task nodes.</returns>
+        public TaskTraversalEnumerable TraverseTaskRecursive(TaskNode node, Direction direction = Direction.Downwards,
+            TraversalOrder order = TraversalOrder.DepthFirst, OnVisitTaskNode onVisit = null)
+        {
+            return new TaskTraversalEnumerable(node, direction, order, this, onVisit);
+        }
+        /// <summary>
+        /// Traverses task nodes in a depth-first manner, starting from the specified node and moving downwards.
+        /// </summary>
+        /// <param name="node">The starting task node for traversal.</param>
+        /// <param name="onVisit">Optional callback that is invoked when visiting each node. Return false to skip child traversal.</param>
+        /// <returns>An enumerable object that can be used to traverse the task nodes.</returns>
+        public TaskTraversalEnumerable TraverseTaskDownwards(TaskNode node, OnVisitTaskNode onVisit = null)
+        {
+            return TraverseTaskRecursive(node, Direction.Downwards, TraversalOrder.DepthFirst, onVisit);
+        }
+
+        /// <summary>
+        /// Traverses task nodes in a breadth-first manner, starting from the specified node and moving downwards.
+        /// </summary>
+        /// <param name="node">The starting task node for traversal.</param>
+        /// <param name="onVisit">Optional callback that is invoked when visiting each node. Return false to skip child traversal.</param>
+        /// <returns>An enumerable object that can be used to traverse the task nodes.</returns>
+        public TaskTraversalEnumerable TraverseTaskDownwardsBreadthFirst(TaskNode node, OnVisitTaskNode onVisit = null)
+        {
+            return TraverseTaskRecursive(node, Direction.Downwards, TraversalOrder.BreadthFirst, onVisit);
+        }
+
+        /// <summary>
+        /// Traverses task nodes in a depth-first manner, starting from the specified node and moving upwards.
+        /// </summary>
+        /// <param name="node">The starting task node for traversal.</param>
+        /// <param name="onVisit">Optional callback that is invoked when visiting each node. Return false to skip parent traversal.</param>
+        /// <returns>An enumerable object that can be used to traverse the task nodes.</returns>
+        public TaskTraversalEnumerable TraverseTaskUpwards(TaskNode node, OnVisitTaskNode onVisit = null)
+        {
+            return TraverseTaskRecursive(node, Direction.Upwards, TraversalOrder.DepthFirst, onVisit);
+        }
+
+        /// <summary>
+        /// Traverses task nodes in a breadth-first manner, starting from the specified node and moving upwards.
+        /// </summary>
+        /// <param name="node">The starting task node for traversal.</param>
+        /// <param name="onVisit">Optional callback that is invoked when visiting each node. Return false to skip parent traversal.</param>
+        /// <returns>An enumerable object that can be used to traverse the task nodes.</returns>
+        public TaskTraversalEnumerable TraverseTaskUpwardsBreadthFirst(TaskNode node, OnVisitTaskNode onVisit = null)
+        {
+            return TraverseTaskRecursive(node, Direction.Upwards, TraversalOrder.BreadthFirst, onVisit);
+        }
+
+        /// <summary>
+        /// Represents an enumerable collection for depth-first traversal of task nodes.
+        /// </summary>
+        public struct TaskTraversalEnumerable
+        {
+            /// <summary>
+            /// Initializes a new instance of the <see cref="TaskTraversalEnumerable"/> struct.
+            /// </summary>
+            /// <param name="node">The starting node for traversal</param>
+            /// <param name="direction">The direction of traversal (upwards or downwards)</param>
+            /// <param name="order"> The order of traversal (depth first or breadth first).</param>
+            /// <param name="traverser">The graph traverser object in use.</param>
+            /// <param name="onVisit">Optional callback invoked when visiting nodes</param>
+            public TaskTraversalEnumerable(TaskNode node, Direction direction, TraversalOrder order,  GraphTraverser traverser, OnVisitTaskNode onVisit = null)            {
+                m_Node = node;
+                m_GraphTraverser = traverser;
+                m_Direction = direction;
+                m_Order = order;
+                m_OnVisit = onVisit;
+            }
+
+            private TaskNode m_Node;
+            private GraphTraverser m_GraphTraverser;
+            private Direction m_Direction;
+            private TraversalOrder m_Order;
+            private OnVisitTaskNode m_OnVisit;
+
+            /// <summary>
+            /// Gets the enumerator for traversing the task nodes.
+            /// </summary>
+            /// <returns>An enumerator that can be used to traverse the task nodes</returns>
+            public Enumerator GetEnumerator() => new Enumerator(m_Node, m_Direction, m_Order, m_GraphTraverser, m_OnVisit);
+
+            /// <summary>
+            /// Executes the traversal, iterating through all nodes.
+            /// </summary>
+            public void Execute()
+            {
+                using var enumerator = GetEnumerator();
+                while (enumerator.MoveNext()) { }
+            }
+            /// <summary>
+            /// Enumerator for traversal of task nodes.
+            /// </summary>
+            public struct Enumerator : IDisposable
+            {
+                private Deque<TaskNode> m_Deque;
+                private HashSet<TaskNodeId> m_Visited;
+                private bool m_OwnsVisited;
+                private GraphTraverser m_GraphTraverser;
+                private TaskNode m_Current;
+                private Direction m_Direction;
+                private TraversalOrder m_Order;
+                private OnVisitTaskNode m_OnVisit;
+
+                /// <summary>
+                /// Initializes a new instance of the Enumerator struct.
+                /// </summary>
+                /// <param name="startNode">The starting node for traversal.</param>
+                /// <param name="direction">The direction of traversal.</param>
+                /// <param name="order"> The order of traversal (depth first or breadth first).</param>
+                /// <param name="traverser">The graph traverser object in use.</param>
+                /// <param name="onVisit">Optional callback that is invoked when visiting each node.</param>
+                public Enumerator(TaskNode startNode, Direction direction, TraversalOrder order, GraphTraverser traverser, OnVisitTaskNode onVisit = null)
+                {
+                    m_Direction = direction;
+                    m_Order = order;
+                    m_GraphTraverser = traverser;
+                    m_OwnsVisited = traverser.m_TaskVisited == null;
+                    m_Visited = m_OwnsVisited ? m_GraphTraverser.m_TaskVisitedPool.Get() : traverser.m_TaskVisited;
+                    m_Deque = m_GraphTraverser.m_TaskDequePool.Get();
+                    m_Current = new TaskNode();
+                    m_OnVisit = onVisit;
+                    m_Deque.AddFront(startNode);
+                }
+
+                /// <summary>
+                /// Advances the enumerator to the next task node in the depth-first traversal.
+                /// </summary>
+                /// <returns>true if the enumerator was successfully advanced to the next element; false if the enumerator has passed the end of the collection.</returns>
+                public bool MoveNext()
+                {
+                    while (m_Deque.Count > 0)
+                    {
+                        m_Current = m_Order == TraversalOrder.DepthFirst ? m_Deque.RemoveFront() : m_Deque.RemoveBack();
+                        if (m_Visited.Add(m_Current.Id) && (m_OnVisit == null || m_OnVisit.Invoke(m_Current)))
+                        {
+                            var connections = m_Direction == Direction.Downwards ? m_Current.Children : m_Current.Parents;
+                            for (int i = 0; i < connections.Count; i++)
+                            {
+                                var neighbor = m_Order == TraversalOrder.DepthFirst ? connections[connections.Count - 1 - i] : connections[i];
+                                if (!m_Visited.Contains(neighbor.Id))
+                                {
+                                    if (m_Order == TraversalOrder.DepthFirst)
+                                        m_Deque.AddFront(neighbor);
+                                    else
+                                        m_Deque.AddBack(neighbor);
+                                }
+                            }
+                            return true;
+                        }
+                    }
+
+                    m_Current = new TaskNode();
+                    return false;
+                }
+
+                /// <summary>
+                /// Gets the current task node in the traversal.
+                /// </summary>
+                public TaskNode Current => m_Current.Id.IsValid ? m_Current : default;
+
+                /// <summary>
+                /// Releases all resources used by the enumerator.
+                /// </summary>
+                public void Dispose()
+                {
+                    if (m_OwnsVisited)
+                    {
+                        m_Visited.Clear();
+                        m_GraphTraverser.m_TaskVisitedPool.Release(m_Visited);
+                    }
+                    m_Deque.Clear();
+                    m_GraphTraverser.m_TaskDequePool.Release(m_Deque);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Represents an enumerable collection for linear traversal of task nodes with optional filtering.
+        /// </summary>
+        public struct LinearTaskEnumerable
+        {
+            IReadOnlyGraph m_Graph;
+            OnFilterTaskNode m_OnFilter;
+            /// <summary>
+            /// Initializes a new instance of the <see cref="LinearTaskEnumerable"/> struct.
+            /// </summary>
+            /// <param name="graph">The graph to traverse.</param>
+            /// <param name="onFilter">Optional filter callback to control traversal and acceptance of nodes.</param>
+            public LinearTaskEnumerable(IReadOnlyGraph graph, OnFilterTaskNode onFilter = null)
+            {
+                m_Graph = graph;
+                m_OnFilter = onFilter;
+            }
+
+            /// <summary>
+            /// Gets an enumerator for traversing the task nodes linearly.
+            /// </summary>
+            /// <returns>An enumerator for the task nodes.</returns>
+            public Enumerator GetEnumerator() => new Enumerator(m_Graph, m_OnFilter);
+
+
+            /// <summary>
+            /// Executes the traversal, iterating through all nodes.
+            /// </summary>
+            public void Execute()
+            {
+                var enumerator = GetEnumerator();
+                while (enumerator.MoveNext()) { }
+            }
+
+            /// <summary>
+            /// Enumerator for linear traversal of task nodes with filtering.
+            /// </summary>
+            public struct Enumerator
+            {
+                IReadOnlyGraph m_Graph;
+                OnFilterTaskNode m_OnFilter;
+                private int m_Index;
+
+                /// <summary>
+                /// Initializes a new instance of the <see cref="Enumerator"/> struct.
+                /// </summary>
+                /// <param name="graph">The graph to traverse.</param>
+                /// <param name="onFilter">Optional filter callback to control traversal and acceptance of nodes.</param>
+                public Enumerator(IReadOnlyGraph graph,  OnFilterTaskNode onFilter)
+                {
+                    m_Graph = graph;
+                    m_OnFilter = onFilter;
+                    m_Index = -1;
+                }
+
+                /// <summary>
+                /// Gets the current task node in the traversal.
+                /// </summary>
+                public TaskNode Current => m_Graph.TaskNodes[m_Index];
+
+                /// <summary>
+                /// Advances the enumerator to the next task node that matches the filter.
+                /// </summary>
+                /// <returns>True if a node was found; otherwise, false.</returns>
+                public bool MoveNext()
+                {
+                    while (m_Index < m_Graph.TaskNodes.Count - 1)
+                    {
+                        m_Index++;
+                        var node = m_Graph.TaskNodes[m_Index];
+                        var control = m_OnFilter(node);
+                        if (!control.Continue)
+                        {
+                            m_Index = m_Graph.TaskNodes.Count;
+                        }
+                        if(control.Accept)
+                        {
+                            return true;
+                        }
+                    }
+                    return false;
+                }
+            }
+        }
+    }
+}
diff --git a/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Graph/Traversal/GraphTraverserTasks.cs.meta b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Graph/Traversal/GraphTraverserTasks.cs.meta
new file mode 100644
index 00000000000..038441464ca
--- /dev/null
+++ b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Graph/Traversal/GraphTraverserTasks.cs.meta
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: e9faa17921f798e45b47c94a037b92b2
\ No newline at end of file
diff --git a/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Task.meta b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Task.meta
new file mode 100644
index 00000000000..e1afe0fdd7b
--- /dev/null
+++ b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Task.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 7896f38492d449dc91e325cd9c4c43ad
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Task/ExpressionTask.cs b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Task/ExpressionTask.cs
new file mode 100644
index 00000000000..b7918b0203e
--- /dev/null
+++ b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Task/ExpressionTask.cs
@@ -0,0 +1,41 @@
+
+namespace Unity.GraphCommon.LowLevel.Editor
+{
+    class ExpressionTask : ITask
+    {
+        public IExpression Expression { get; }
+
+        public static UniqueDataKey Value { get; } = new();
+
+        public ExpressionTask(IExpression expression)
+        {
+            Expression = expression;
+        }
+
+        public bool GetDataUsage(IDataKey dataKey, out DataPathSet readUsage, out DataPathSet writeUsage)
+        {
+            if (dataKey is IndexDataKey indexDataKey)
+            {
+                if (indexDataKey.Index < Expression.Parents.Count)
+                {
+                    readUsage = new DataPathSet();
+                    writeUsage = new DataPathSet();
+                    readUsage.Add(DataPath.Empty);
+                    return true;
+                }
+            }
+
+            if (dataKey == Value)
+            {
+                readUsage = new DataPathSet();
+                writeUsage = new DataPathSet();
+                writeUsage.Add(DataPath.Empty);
+                return true;
+            }
+
+            readUsage = null;
+            writeUsage = null;
+            return false;
+        }
+    }
+}
diff --git a/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Task/ExpressionTask.cs.meta b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Task/ExpressionTask.cs.meta
new file mode 100644
index 00000000000..80bfa64fcb6
--- /dev/null
+++ b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Task/ExpressionTask.cs.meta
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: 9bd68503993359141ace2ecc721d5235
\ No newline at end of file
diff --git a/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Task/GpuKernelTask.cs b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Task/GpuKernelTask.cs
new file mode 100644
index 00000000000..c33d3f2759e
--- /dev/null
+++ b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Task/GpuKernelTask.cs
@@ -0,0 +1,39 @@
+using UnityEngine;
+
+namespace Unity.GraphCommon.LowLevel.Editor
+{
+    /// <summary>
+    /// Represents a GPU kernel task that utilizes a specific kernel within a compute shader.
+    /// </summary>
+    /*public*/ class GpuKernelTask : ITask
+    {
+        /// <summary>
+        /// Gets the compute shader associated with this GPU kernel task.
+        /// </summary>
+        public ComputeShader Shader { get; }
+
+        /// <summary>
+        /// Gets the index of the kernel within the associated compute shader.
+        /// </summary>
+        public int KernelIndex { get; }
+
+        /// <summary>
+        /// UniqueDataId to bind the count data.
+        /// </summary>
+        public static UniqueDataKey Count { get; } = new();
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="GPUKernelTask"/> class.
+        /// </summary>
+        /// <param name="computeShader">The compute shader associated with the task.</param>
+        /// <param name="kernelIndex">The index of the kernel in the compute shader.</param>
+        public GpuKernelTask(ComputeShader computeShader, int kernelIndex)
+        {
+            Shader = computeShader;
+            KernelIndex = kernelIndex;
+
+            // Read the binders or perform additional initializations
+        }
+    }
+
+}
diff --git a/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Task/GpuKernelTask.cs.meta b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Task/GpuKernelTask.cs.meta
new file mode 100644
index 00000000000..f0d1d103270
--- /dev/null
+++ b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Task/GpuKernelTask.cs.meta
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: 910520c7ef4e9c14889a9025b85d2430
\ No newline at end of file
diff --git a/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Task/ITask.cs b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Task/ITask.cs
new file mode 100644
index 00000000000..fc802ff8f93
--- /dev/null
+++ b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Task/ITask.cs
@@ -0,0 +1,71 @@
+
+using System;
+using System.Collections.Generic;
+
+namespace Unity.GraphCommon.LowLevel.Editor
+{
+    /// <summary>
+    /// Placeholder interface for tasks.
+    /// </summary>
+    /*public*/ interface ITask
+    {
+        /// <summary>
+        /// Gets the expected data type for the specified data identifier.
+        /// </summary>
+        /// <param name="dataKey">The data identifier to check.</param>
+        /// <returns>
+        /// The <see cref="System.Type"/> representing the expected data type for <paramref name="dataKey"/>,
+        /// or null if unsupported.
+        /// </returns>
+        public System.Type GetExpectedDataType(IDataKey dataKey) => null;
+
+        /// <summary>
+        /// Validates the data associated with a specific data identifier.
+        /// </summary>
+        /// <param name="dataKey">The data identifier to validate.</param>
+        /// <param name="data">The data to validate.</param>
+        /// <returns>
+        /// True if the data identifier is supported by the task and the provided data is valid for that identifier, false otherwise
+        /// </returns>
+        public bool ValidateData(IDataKey dataKey, IDataDescription data) => false;
+
+        /// <summary>
+        /// Gets the binding usage information for a specific data identifier within the task.
+        /// </summary>
+        /// <param name="dataKey">The data identifier whose binding usage is being queried.</param>
+        /// <param name="usage">
+        /// When this method returns, contains the binding usage type for the specified data key,
+        /// indicating how the task interacts with the binding.
+        /// </param>
+        /// <returns>
+        /// True if the data identifier is supported by the task and binding usage is determined successfully, false otherwise.
+        /// </returns>
+        public bool GetBindingUsage(IDataKey dataKey, out BindingUsage usage)
+        {
+            usage = BindingUsage.Unknown;
+            return true;
+        }
+
+        /// <summary>
+        /// Gets the read and write usage for a specific data identifier within the task.
+        /// </summary>
+        /// <param name="dataKey">The data identifier whose usage is being queried.</param>
+        /// <param name="readUsage">
+        /// When this method returns, contains the set of data identifiers read by the task,
+        /// or null if data is not read from.
+        /// </param>
+        /// <param name="writeUsage">
+        /// When this method returns, contains the set of data identifiers written by the task,
+        /// or null if data is not written to.
+        /// </param>
+        /// <returns>
+        /// True if the data identifier is supported by the task
+        /// </returns>
+        public bool GetDataUsage(IDataKey dataKey, out DataPathSet readUsage, out DataPathSet writeUsage)
+        {
+            readUsage = null;
+            writeUsage = null;
+            return false;
+        }
+    }
+}
diff --git a/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Task/ITask.cs.meta b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Task/ITask.cs.meta
new file mode 100644
index 00000000000..a7c3db6f83b
--- /dev/null
+++ b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Task/ITask.cs.meta
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: 87eea8b153f342d382ec4f5f2d6f9b0b
\ No newline at end of file
diff --git a/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Task/RenderingTask.cs b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Task/RenderingTask.cs
new file mode 100644
index 00000000000..20a7a0274b7
--- /dev/null
+++ b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Task/RenderingTask.cs
@@ -0,0 +1,24 @@
+using UnityEngine;
+
+namespace Unity.GraphCommon.LowLevel.Editor
+{
+    /// <summary>
+    /// Task that renders geometry using a specific material.
+    /// </summary>
+    /*public*/ class RenderingTask : ITask
+    {
+        /// <summary>
+        /// Gets the material used to render the geometry.
+        /// </summary>
+        public Material Material { get; }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RenderingTask"/> class.
+        /// </summary>
+        /// <param name="material">The material used by the task.</param>
+        public RenderingTask(Material material)
+        {
+            Material = material;
+        }
+    }
+}
diff --git a/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Task/RenderingTask.cs.meta b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Task/RenderingTask.cs.meta
new file mode 100644
index 00000000000..15f8a81c4a4
--- /dev/null
+++ b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Task/RenderingTask.cs.meta
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: b0d5198ab7546dd45a598d5c7106abbd
\ No newline at end of file
diff --git a/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Task/ResourceBinding.cs b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Task/ResourceBinding.cs
new file mode 100644
index 00000000000..ae499e160ca
--- /dev/null
+++ b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Task/ResourceBinding.cs
@@ -0,0 +1,38 @@
+namespace Unity.GraphCommon.LowLevel.Editor
+{
+    /// <summary>
+    /// A struct tying a resource's name to an index.
+    /// </summary>
+    /*public*/ readonly struct ResourceBinding
+    {
+        /// <summary>
+        /// The name used to reference the resource in a task.
+        /// </summary>
+        public string Name { get; }
+
+        /// <summary>
+        /// The index where this resource can be retrieved.
+        /// </summary>
+        public int Index { get; }
+
+        /// <summary>
+        /// Constructs a ResourceBinding from a name and an index.
+        /// </summary>
+        /// <param name="name">The name used to reference the resource in a task.</param>
+        /// <param name="index">The index where this resource can be retrieved.</param>
+        public ResourceBinding(string name, int index)
+        {
+            Name = name;
+            Index = index;
+        }
+
+        /// <summary>
+        /// Generates a string with the name and index of the ResourceBinding.
+        /// </summary>
+        /// <returns>A string with the name and index of the ResourceBinding.</returns>
+        public override string ToString()
+        {
+            return $"Name : {Name} - Index : {Index}";
+        }
+    }
+}
diff --git a/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Task/ResourceBinding.cs.meta b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Task/ResourceBinding.cs.meta
new file mode 100644
index 00000000000..5c49c02b901
--- /dev/null
+++ b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Task/ResourceBinding.cs.meta
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: 1109fab545fa499dbfee9363de910df7
\ No newline at end of file
diff --git a/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Task/SubtaskDescription.cs b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Task/SubtaskDescription.cs
new file mode 100644
index 00000000000..27ac1b1d7c1
--- /dev/null
+++ b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Task/SubtaskDescription.cs
@@ -0,0 +1,25 @@
+using System.Collections.Generic;
+
+namespace Unity.GraphCommon.LowLevel.Editor
+{
+    /// <summary>
+    /// Describes a subtask within a templated task, including its name, associated expressions, and the task instance.
+    /// </summary>
+    /*public*/ struct SubtaskDescription
+    {
+        /// <summary>
+        /// The name of the subtask.
+        /// </summary>
+        public string Name { get; set; }
+
+        /// <summary>
+        /// The list of expressions associated with the subtask, each paired with a data binding key.
+        /// </summary>
+        public List<(IDataKey, IExpression)> Expressions { get; set; }
+
+        /// <summary>
+        /// The actual task description.
+        /// </summary>
+        public ITask Task { get; set; }
+    }
+}
diff --git a/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Task/SubtaskDescription.cs.meta b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Task/SubtaskDescription.cs.meta
new file mode 100644
index 00000000000..0a26244706d
--- /dev/null
+++ b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Task/SubtaskDescription.cs.meta
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: 3e7abb5b0314f1c43ba8d96d7d55b417
\ No newline at end of file
diff --git a/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Task/Task.cs b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Task/Task.cs
new file mode 100644
index 00000000000..b8b9e6799e3
--- /dev/null
+++ b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Task/Task.cs
@@ -0,0 +1,13 @@
+
+namespace Unity.GraphCommon.LowLevel.Editor
+{
+    class Task : ITask
+    {
+        public string DebugName { get; set; } = "";
+
+        public Task(string name)
+        {
+            DebugName = name;
+        }
+    }
+}
diff --git a/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Task/Task.cs.meta b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Task/Task.cs.meta
new file mode 100644
index 00000000000..8b6a2b49b6b
--- /dev/null
+++ b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Task/Task.cs.meta
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: c3d7f5fd6a07eff4098f017da97727aa
\ No newline at end of file
diff --git a/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Task/TaskParameter.cs b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Task/TaskParameter.cs
new file mode 100644
index 00000000000..426fee1a094
--- /dev/null
+++ b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Task/TaskParameter.cs
@@ -0,0 +1,31 @@
+using UnityEngine;
+
+namespace Unity.GraphCommon.LowLevel.Editor
+{
+    /// <summary>
+    /// Represents a named parameter associated with an expression, which can be used in tasks.
+    /// </summary>
+    /*public*/ class TaskParameter
+    {
+        /// <summary>
+        /// Gets the name of the parameter.
+        /// </summary>
+        public string Name { get; }
+
+        /// <summary>
+        /// Gets the expression associated with the parameter.
+        /// </summary>
+        public IExpression Expression { get; }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="TaskParameter"/> class with the specified name and expression.
+        /// </summary>
+        /// <param name="name">The name of the parameter.</param>
+        /// <param name="expression">The expression associated with the parameter.</param>
+        public TaskParameter(string name, IExpression expression)
+        {
+            Name = name;
+            Expression = expression;
+        }
+    }
+}
diff --git a/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Task/TaskParameter.cs.meta b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Task/TaskParameter.cs.meta
new file mode 100644
index 00000000000..f1bbe9997b3
--- /dev/null
+++ b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Task/TaskParameter.cs.meta
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: 617597fda36dca8428d744134c0cc286
\ No newline at end of file
diff --git a/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Task/TemplateSubtask.cs b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Task/TemplateSubtask.cs
new file mode 100644
index 00000000000..bf2ae8c391f
--- /dev/null
+++ b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Task/TemplateSubtask.cs
@@ -0,0 +1,42 @@
+using System.Collections.Generic;
+
+namespace Unity.GraphCommon.LowLevel.Editor
+{
+    class TemplateSubtask : ITask
+    {
+        public string Name { get; }
+
+        public string Code { get; }
+
+        public Dictionary<IDataKey, AttributeSet> AttributeSets { get; }
+
+        public TemplateSubtask(string name, string code, Dictionary<IDataKey, AttributeSet> attributeSets)
+        {
+            Name = name;
+            Code = code;
+            AttributeSets = attributeSets;
+        }
+
+        public bool GetDataUsage(IDataKey dataKey, out DataPathSet readUsage, out DataPathSet writeUsage)
+        {
+            if (AttributeSets.TryGetValue(dataKey, out var attributeSet))
+            {
+                DataPath dataPath = new(dataKey);
+                readUsage = new DataPathSet();
+                foreach (var attribute in attributeSet.ReadAttributes)
+                {
+                    readUsage.Add(new DataPath(dataPath, new AttributeKey(attribute)));
+                }
+                writeUsage = new DataPathSet();
+                foreach (var attribute in attributeSet.WriteAttributes)
+                {
+                    writeUsage.Add(new DataPath(dataPath, new AttributeKey(attribute)));
+                }
+                return true;
+            }
+            readUsage = null;
+            writeUsage = null;
+            return false;
+        }
+    }
+}
diff --git a/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Task/TemplateSubtask.cs.meta b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Task/TemplateSubtask.cs.meta
new file mode 100644
index 00000000000..3c8d47c386c
--- /dev/null
+++ b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Task/TemplateSubtask.cs.meta
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: 4998c0a6fdf636646bd6bf6c0dac07ec
\ No newline at end of file
diff --git a/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Task/TemplatedTask.cs b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Task/TemplatedTask.cs
new file mode 100644
index 00000000000..dac645dad9f
--- /dev/null
+++ b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Task/TemplatedTask.cs
@@ -0,0 +1,373 @@
+using System.Collections.Generic;
+using UnityEngine;
+
+namespace Unity.GraphCommon.LowLevel.Editor
+{
+    /// <summary>
+    /// Represents a set of attributes located at a specific relative path within a data structure.
+    /// </summary>
+    /*public*/ struct LocatedAttributeSet
+    {
+        /// <summary>
+        /// The relative path that binds the attribute set to a specific location.
+        /// </summary>
+        public BindingRelativePath BindingRelativePath;
+
+        /// <summary>
+        /// The set of attributes associated with the specified binding path.
+        /// </summary>
+        public AttributeSet AttributeSet;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="LocatedAttributeSet"/> struct.
+        /// </summary>
+        /// <param name="bindingKey">The key used to bind the attribute set.</param>
+        /// <param name="attributePath">The relative path within the data structure where the attributes are located.</param>
+        /// <param name="attributeSet">The set of attributes to associate with the binding.</param>
+        public LocatedAttributeSet(IDataKey bindingKey, DataPath attributePath, AttributeSet attributeSet)
+        {
+            BindingRelativePath = new BindingRelativePath(bindingKey, attributePath);
+            AttributeSet = attributeSet;
+        }
+    }
+
+    /// <summary>
+    /// Represents a relative path used to bind data within a data structure.
+    /// </summary>
+    /*public*/ struct BindingRelativePath
+    {
+        /// <summary>
+        /// The key used to identify the binding within the data structure.
+        /// </summary>
+        public IDataKey BindingKey;
+
+        /// <summary>
+        /// The relative path within the data structure where the binding applies.
+        /// </summary>
+        public DataPath SubDataPath;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="BindingRelativePath"/> struct.
+        /// </summary>
+        /// <param name="bindingKey">The key used to identify the binding.</param>
+        /// <param name="subDataPath">The relative path within the data structure where the binding applies.</param>
+        public BindingRelativePath(IDataKey bindingKey, DataPath subDataPath)
+        {
+            BindingKey = bindingKey;
+            SubDataPath = subDataPath;
+        }
+    }
+
+    /// <summary>
+    /// Represents the paths used for reading and writing data bindings within a system.
+    /// </summary>
+    /*public*/ class BindingUsagePaths
+    {
+        /// <summary>
+        /// The set of paths used for reading data bindings.
+        /// </summary>
+        public DataPathSet Read { get; } = new();
+
+        /// <summary>
+        /// The set of paths used for writing data bindings.
+        /// </summary>
+        public DataPathSet Write { get; } = new();
+
+        /// <summary>
+        /// Adds the read and write paths from another <see cref="BindingUsagePaths"/> instance
+        /// to this instance.
+        /// </summary>
+        /// <param name="other">
+        /// The <see cref="BindingUsagePaths"/> instance whose paths will be added.
+        /// </param>
+        public void Add(BindingUsagePaths other)
+        {
+            Read.Add(other.Read);
+            Write.Add(other.Write);
+        }
+
+        /// <summary>
+        /// Adds attribute read and write paths for the specified attribute set, using the provided base data path.
+        /// </summary>
+        /// <param name="attributesPath">
+        /// The base <see cref="DataPath"/> under which attribute keys will be added.
+        /// </param>
+        /// <param name="attributeSet">
+        /// The <see cref="AttributeSet"/> containing the attributes to be read and written.
+        /// </param>
+        public void Add(DataPath attributesPath, AttributeSet attributeSet)
+        {
+            foreach (var attribute in attributeSet.ReadAttributes)
+            {
+                Read.Add(new DataPath(attributesPath, new AttributeKey(attribute)));
+            }
+            foreach (var attribute in attributeSet.WriteAttributes)
+            {
+                Write.Add(new DataPath(attributesPath, new AttributeKey(attribute)));
+            }
+        }
+    }
+
+    /// <summary>
+    /// Represents a binding for a templated task, associating a data type with its usage paths.
+    /// </summary>
+    /*public*/ class TemplatedTaskBinding
+    {
+        /// <summary>
+        /// Gets the type of data associated with this binding.
+        /// Must implement <see cref="IDataDescription"/>.
+        /// </summary>
+        public System.Type DataType { get; }
+
+        /// <summary>
+        /// Gets the <see cref="BindingUsagePaths"/> describing how the data is read and written.
+        /// </summary>
+        public BindingUsagePaths UsagePaths { get; } = new();
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="TemplatedTaskBinding"/> class
+        /// with the specified data type and usage paths.
+        /// </summary>
+        /// <param name="dataType">
+        /// The type of data to bind, which must implement <see cref="IDataDescription"/>.
+        /// </param>
+        /// <param name="usagePaths">
+        /// The usage paths indicating how the data is read and written. If not null, its paths are added to <see cref="UsagePaths"/>.
+        /// </param>
+        /// <exception cref="System.ArgumentException">
+        /// Thrown if <paramref name="dataType"/> does not implement <see cref="IDataDescription"/>.
+        /// </exception>
+        public TemplatedTaskBinding(System.Type dataType, BindingUsagePaths usagePaths)
+        {
+            Debug.Assert(typeof(IDataDescription).IsAssignableFrom(dataType));
+            DataType = dataType;
+
+            if (usagePaths != null)
+            {
+                UsagePaths.Add(usagePaths);
+            }
+        }
+    }
+
+    /// <summary>
+    /// Arguments used to initialize a <see cref="TemplatedTask"/>.
+    /// </summary>
+    /*public*/ struct TemplatedTaskArgs
+    {
+        /// <summary>
+        /// The collection of subtasks to compose the task.
+        /// </summary>
+        public IEnumerable<SubtaskDescription> Subtasks;
+
+        /// <summary>
+        /// The data key used for the default attribute set.
+        /// </summary>
+        public IDataKey DefaultAttributeKey;
+
+        /// <summary>
+        /// Mappings from generic attribute keys to their corresponding data paths.
+        /// </summary>
+        public Dictionary<IDataKey, BindingRelativePath> AttributeKeyMappings;
+
+        /// <summary>
+        /// List of all the task bindings and their subdata path.
+        /// </summary>
+        public Dictionary<IDataKey, TemplatedTaskBinding> Bindings;
+
+        /// <summary>
+        /// List of all the expressions used by the task.
+        /// </summary>
+        public List<(IDataKey bindingKey, IExpression expression)> Expressions;
+
+    }
+
+    /// <summary>
+    /// Represents a task generated using a template and a list of subtask.
+    /// </summary>
+    /*public*/ class TemplatedTask : ITask
+    {
+        readonly Dictionary<IDataKey, BindingUsagePaths> m_BindingToUsage = new();
+        readonly Dictionary<IDataKey, BindingRelativePath> m_AttributeKeyMappings;
+
+        readonly Dictionary<IDataKey, IExpression> m_Expressions = new();
+
+        /// <summary>
+        /// Gets the name of the template associated with the task.
+        /// </summary>
+        public string TemplateName { get; }
+
+        /// <summary>
+        /// Gets the collection of subtasks that compose the task.
+        /// </summary>
+        public List<SubtaskDescription> Subtasks { get; } = new();
+
+        /// <summary>
+        /// Gets a value indicating whether the task is a compute task.
+        /// </summary>
+        public bool IsCompute { get; } = true;
+
+        /// <summary>
+        /// The data key used for the default attribute set.
+        /// </summary>
+        public IDataKey DefaultAttributeKey { get; }
+
+        /// <summary>
+        /// Gets the mappings from attribute keys to their corresponding binding relative paths.
+        /// </summary>
+        public IEnumerable<KeyValuePair<IDataKey, BindingRelativePath>> AttributeKeyMappings => m_AttributeKeyMappings;
+
+        /// <inheritdoc />
+        public IEnumerable<KeyValuePair<IDataKey, IExpression>> Expressions => m_Expressions;
+
+        //TODO: These two keys are legacy and should be moved somewhere else.
+        /// <summary>
+        /// Unique data key that represents the graph values data used by this task.
+        /// </summary>
+        public static UniqueDataKey GraphValuesKey { get; } = new UniqueDataKey("GraphValues");
+        /// <summary>
+        /// Unique data key that represents the (legacy) context data used by this task.
+        /// </summary>
+        public static UniqueDataKey ContextDataKey { get; } = new UniqueDataKey("ContextData");
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="TemplatedTask"/> class using the specified template name and arguments.
+        /// </summary>
+        /// <param name="templateName">The name of the template associated with the task.</param>
+        /// <param name="args">The parameters to setup the templated task <see cref="TemplatedTaskArgs"/>.</param>
+        public TemplatedTask(string templateName, TemplatedTaskArgs args) : this(templateName, args, true) { }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="TemplatedTask"/> class using the specified template name, arguments, and compute flag.
+        /// </summary>
+        /// <param name="templateName">The name of the template associated with the task.</param>
+        /// <param name="args">The parameters to setup the templated task <see cref="TemplatedTaskArgs"/>.</param>
+        /// <param name="isCompute">Indicates if the task is a compute task.</param>
+        public TemplatedTask(string templateName, TemplatedTaskArgs args, bool isCompute)
+        {
+            TemplateName = templateName;
+            Subtasks.AddRange(args.Subtasks);
+
+            IsCompute = isCompute;
+
+            m_AttributeKeyMappings = args.AttributeKeyMappings != null ? new(args.AttributeKeyMappings) : new();
+
+            if (args.Expressions != null)
+            {
+                AddExpressions(args.Expressions);
+            }
+
+            if (args.Bindings != null)
+            {
+                foreach (var binding in args.Bindings)
+                {
+                    if (!m_BindingToUsage.TryGetValue(binding.Key, out var bindingToUsage))
+                    {
+                        bindingToUsage = new();
+                        m_BindingToUsage.Add(binding.Key, bindingToUsage);
+                    }
+                    bindingToUsage.Add(binding.Value.UsagePaths);
+                }
+            }
+
+            DefaultAttributeKey = args.DefaultAttributeKey;
+
+            foreach (var attributeKeyMapping in args.AttributeKeyMappings)
+            {
+                Debug.Assert(m_BindingToUsage.ContainsKey(attributeKeyMapping.Value.BindingKey));
+            }
+
+            foreach (var block in args.Subtasks)
+            {
+                if (block.Task is TemplateSubtask subtask)
+                {
+                    foreach (var kvp in subtask.AttributeSets)
+                    {
+                        var attributeKey = kvp.Key;
+                        if (attributeKey == AttributeData.DefaultKey)
+                        {
+                            //attributeKey = default attribute mapping
+                        }
+                        if (m_AttributeKeyMappings.TryGetValue(attributeKey, out var mappedKeyPath))
+                        {
+                            IDataKey bindingKey = mappedKeyPath.BindingKey;
+                            DataPath attributesPath = mappedKeyPath.SubDataPath;
+
+                            var snippetAttributeSet = kvp.Value;
+                            if (!m_BindingToUsage.ContainsKey(bindingKey))
+                            {
+                                m_BindingToUsage.Add(bindingKey, new());
+                            }
+                            //TODO MAYBE ?: Consider attributes that are written and THEN read as write only in the scope of the task.
+                            foreach (var attribute in snippetAttributeSet.ReadAttributes)
+                            {
+                                m_BindingToUsage[bindingKey].Read
+                                    .Add(new DataPath(attributesPath, new AttributeKey(attribute)));
+                            }
+
+                            foreach (var attribute in snippetAttributeSet.WriteAttributes)
+                            {
+                                m_BindingToUsage[bindingKey].Write
+                                    .Add(new DataPath(attributesPath, new AttributeKey(attribute)));
+                            }
+                        }
+                        else
+                        {
+                            Debug.LogWarning($"Attribute set \"{kvp.Key}\" not found in task {this}");
+                        }
+                    }
+                }
+                AddExpressions(block.Expressions);
+            }
+
+            foreach (var (bindingKey, _) in Expressions)
+            {
+                var bindingUsagePath = new BindingUsagePaths();
+                bindingUsagePath.Read.Add(DataPath.Empty);
+                m_BindingToUsage.TryAdd(bindingKey, bindingUsagePath);
+            }
+        }
+
+        /// <inheritdoc />
+        public bool GetDataUsage(IDataKey dataKey, out DataPathSet readUsage, out DataPathSet writeUsage)
+        {
+            if (m_BindingToUsage.ContainsKey(dataKey))
+            {
+                readUsage = m_BindingToUsage[dataKey].Read;
+                writeUsage = m_BindingToUsage[dataKey].Write;
+                return true;
+            }
+
+            readUsage = null;
+            writeUsage = null;
+            return false;
+        }
+
+        /// <inheritdoc />
+        public bool GetBindingUsage(IDataKey dataKey, out BindingUsage usage)
+        {
+            if(GetDataUsage(dataKey, out var readUsage, out var writeUsage))
+            {
+                usage = BindingUsage.Unknown;
+                if (readUsage != null && !readUsage.Empty)
+                {
+                    usage |= BindingUsage.Read;
+                }
+                if (writeUsage != null && !writeUsage.Empty)
+                {
+                    usage |= BindingUsage.Write;
+                }
+                return true;
+            }
+            usage = BindingUsage.Unknown;
+            return true;
+        }
+
+        void AddExpressions(List<(IDataKey, IExpression)> expressions)
+        {
+            foreach (var (bindingKey, expression) in expressions)
+            {
+                m_Expressions.TryAdd(bindingKey, expression); // TODO: What to do on name collision
+            }
+        }
+    }
+}
diff --git a/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Task/TemplatedTask.cs.meta b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Task/TemplatedTask.cs.meta
new file mode 100644
index 00000000000..a026729f8b5
--- /dev/null
+++ b/Packages/com.unity.visualeffectgraph/Editor/GraphCommon/Task/TemplatedTask.cs.meta
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: 9ea476a776f52f741b28f1b98688dc8a
\ No newline at end of file
diff --git a/Packages/com.unity.visualeffectgraph/Editor/GraphView/VFXViewPreference.cs b/Packages/com.unity.visualeffectgraph/Editor/GraphView/VFXViewPreference.cs
index 8f64919fe18..84598856b28 100644
--- a/Packages/com.unity.visualeffectgraph/Editor/GraphView/VFXViewPreference.cs
+++ b/Packages/com.unity.visualeffectgraph/Editor/GraphView/VFXViewPreference.cs
@@ -24,6 +24,7 @@ static class VFXViewPreference
         private static VFXMainCameraBufferFallback m_CameraBuffersFallback = VFXMainCameraBufferFallback.PreferMainCamera;
         private static bool m_MultithreadUpdateEnabled = true;
         private static bool m_InstancingEnabled = true;
+        private static bool m_UseNewCompiler = false;
         private static bool m_ShowPackageIndexingBanner = true;
         private static int m_AuthoringPrewarmStepCountPerSeconds = kAuthoringPrewarmStepCountPerSecondsDefault;
         private static float m_AuthoringPrewarmMaxTime = kAuthoringPrewarmMaxTimeDefault;
@@ -101,6 +102,15 @@ public static bool instancingEnabled
             }
         }
 
+        internal static bool useNewCompiler
+        {
+            get
+            {
+                LoadIfNeeded();
+                return m_UseNewCompiler;
+            }
+        }
+
         public static bool showPackageIndexingBanner
         {
             get
@@ -156,6 +166,7 @@ public static void SetDirty()
         public const string cameraBuffersFallbackKey = "VFX.CameraBuffersFallback";
         public const string multithreadUpdateEnabledKey = "VFX.MultithreadUpdateEnabled";
         public const string instancingEnabledKey = "VFX.InstancingEnabled";
+        public const string useNewCompilerKey = "VFX.UseNewCompiler";
         public const string showPackageIndexingBannerKey = "VFX.ShowPackageIndexingBanner";
         public const string authoringPrewarmStepCountPerSecondsKey = "VFX.AuthoringPrewarmStepCountPerSeconds";
         public const string authoringPrewarmMaxTimeKey = "VFX.AuthoringPrewarmMaxTimeKey";
@@ -172,8 +183,12 @@ private static void LoadIfNeeded()
                 m_GenerateShadersWithDebugSymbols = EditorPrefs.GetBool(generateShadersWithDebugSymbolsKey, false);
                 m_AdvancedLogs = EditorPrefs.GetBool(advancedLogsKey, false);
                 m_CameraBuffersFallback = (VFXMainCameraBufferFallback)EditorPrefs.GetInt(cameraBuffersFallbackKey, (int)VFXMainCameraBufferFallback.PreferMainCamera);
+
                 m_MultithreadUpdateEnabled = EditorPrefs.GetBool(multithreadUpdateEnabledKey, true);
                 m_InstancingEnabled = EditorPrefs.GetBool(instancingEnabledKey, true);
+
+                m_UseNewCompiler = EditorPrefs.GetBool(useNewCompilerKey, false);
+
                 m_ShowPackageIndexingBanner = EditorPrefs.GetBool(showPackageIndexingBannerKey, true);
 
                 m_AuthoringPrewarmStepCountPerSeconds = EditorPrefs.GetInt(authoringPrewarmStepCountPerSecondsKey, kAuthoringPrewarmStepCountPerSecondsDefault);
@@ -249,6 +264,7 @@ public override void OnGUI(string searchContext)
                     {
                         m_MultithreadUpdateEnabled = EditorGUILayout.Toggle(new GUIContent("Multithread Update Enabled", "When enabled, visual effects will be updated in parallel when possible."), m_MultithreadUpdateEnabled);
                         m_InstancingEnabled = EditorGUILayout.Toggle(new GUIContent("Instancing Enabled", "When enabled, visual effects will be processed in batches when possible."), m_InstancingEnabled);
+                        m_UseNewCompiler = EditorGUILayout.Toggle(new GUIContent("Use new VFX Graph compiler", "When enabled, the new VFX Graph compiler will be used for any newly compiled VFX."), m_UseNewCompiler);
                     }
 #endif
 
@@ -271,6 +287,9 @@ public override void OnGUI(string searchContext)
                         EditorPrefs.SetInt(cameraBuffersFallbackKey, (int)m_CameraBuffersFallback);
                         EditorPrefs.SetBool(multithreadUpdateEnabledKey, m_MultithreadUpdateEnabled);
                         EditorPrefs.SetBool(instancingEnabledKey, m_InstancingEnabled);
+
+                        EditorPrefs.SetBool(useNewCompilerKey, m_UseNewCompiler);
+
                         EditorPrefs.SetBool(showPackageIndexingBannerKey, m_ShowPackageIndexingBanner);
 
                         m_AuthoringPrewarmStepCountPerSeconds = Mathf.Clamp(m_AuthoringPrewarmStepCountPerSeconds, 0, kAuthoringPrewarmStepCountPerSecondsMax);
diff --git a/Packages/com.unity.visualeffectgraph/Editor/Inspector/VisualEffectEditor.cs b/Packages/com.unity.visualeffectgraph/Editor/Inspector/VisualEffectEditor.cs
index ff31ffd3590..617541e3f39 100644
--- a/Packages/com.unity.visualeffectgraph/Editor/Inspector/VisualEffectEditor.cs
+++ b/Packages/com.unity.visualeffectgraph/Editor/Inspector/VisualEffectEditor.cs
@@ -1403,12 +1403,14 @@ public void OnInspectorGUI()
                                 m_LightProbeUsage.intValue = (int)(LightProbeUsage)newValue;
                             EditorGUI.EndProperty();
 
+#pragma warning disable CS0618
                             if (!m_LightProbeUsage.hasMultipleDifferentValues && m_LightProbeUsage.intValue == (int)LightProbeUsage.UseProxyVolume)
                             {
                                 if (!LightProbeProxyVolume.isFeatureSupported || !SupportedRenderingFeatures.active.lightProbeProxyVolumes)
                                     EditorGUILayout.HelpBox(Contents.lightProbeVolumeUnsupportedNote.text, MessageType.Warning);
                                 EditorGUILayout.PropertyField(m_LightProbeVolumeOverride, Contents.lightProbeVolumeOverrideStyle);
                             }
+#pragma warning restore CS0618
                         }
 
                         bool useReflectionProbes = m_ReflectionProbeUsage != null && !m_ReflectionProbeUsage.hasMultipleDifferentValues && (ReflectionProbeUsage)m_ReflectionProbeUsage.intValue != ReflectionProbeUsage.Off;
diff --git a/Packages/com.unity.visualeffectgraph/Editor/Models/Contexts/Implementations/VFXBasicUpdate.cs b/Packages/com.unity.visualeffectgraph/Editor/Models/Contexts/Implementations/VFXBasicUpdate.cs
index 80812b460ef..e7b9702dbfa 100644
--- a/Packages/com.unity.visualeffectgraph/Editor/Models/Contexts/Implementations/VFXBasicUpdate.cs
+++ b/Packages/com.unity.visualeffectgraph/Editor/Models/Contexts/Implementations/VFXBasicUpdate.cs
@@ -274,7 +274,8 @@ public override IEnumerable<VFXMapping> additionalMappings
             }
         }
 
-        public IEnumerable<string> rayTracingDefines = null;
+        public IEnumerable<string> rayTracingDefines { get; set; } = null;
+
         public override IEnumerable<string> additionalDefines
         {
             get
diff --git a/Packages/com.unity.visualeffectgraph/Editor/Models/Contexts/VFXAbstractParticleOutput.cs b/Packages/com.unity.visualeffectgraph/Editor/Models/Contexts/VFXAbstractParticleOutput.cs
index 735c96046e3..cb291e38ca0 100644
--- a/Packages/com.unity.visualeffectgraph/Editor/Models/Contexts/VFXAbstractParticleOutput.cs
+++ b/Packages/com.unity.visualeffectgraph/Editor/Models/Contexts/VFXAbstractParticleOutput.cs
@@ -722,7 +722,8 @@ public override IEnumerable<KeyValuePair<string, VFXShaderWriter>> additionalRep
                 var shaderTags = new VFXShaderWriter();
                 var renderQueueStr = subOutput.GetRenderQueueStr();
                 var renderTypeStr = isBlendModeOpaque ? "Opaque" : "Transparent";
-                shaderTags.Write(string.Format("Tags {{ \"Queue\"=\"{0}\" \"IgnoreProjector\"=\"{1}\" \"RenderType\"=\"{2}\" }}", renderQueueStr, !isBlendModeOpaque, renderTypeStr));
+                var renderPipelineTagStr = subOutput.GetRenderPipelineTagStr();
+                shaderTags.Write($"Tags {{ \"Queue\"=\"{renderQueueStr}\" \"IgnoreProjector\"=\"{!isBlendModeOpaque}\" \"RenderType\"=\"{renderTypeStr}\" \"RenderPipeline\" = \"{renderPipelineTagStr}\" }}");
                 yield return new KeyValuePair<string, VFXShaderWriter>("${VFXShaderTags}", shaderTags);
 
                 foreach (var additionnalStencilReplacement in subOutput.GetStencilStateOverridesStr())
diff --git a/Packages/com.unity.visualeffectgraph/Editor/Models/Contexts/VFXSRPSubOutput.cs b/Packages/com.unity.visualeffectgraph/Editor/Models/Contexts/VFXSRPSubOutput.cs
index fd463d88621..96420e620f3 100644
--- a/Packages/com.unity.visualeffectgraph/Editor/Models/Contexts/VFXSRPSubOutput.cs
+++ b/Packages/com.unity.visualeffectgraph/Editor/Models/Contexts/VFXSRPSubOutput.cs
@@ -60,6 +60,11 @@ public virtual string GetBlendModeStr()
             }
         }
 
+        public virtual string GetRenderPipelineTagStr()
+        {
+            return "";
+        }
+
         public virtual string GetRenderQueueStr()
         {
             var baseRenderQueue = string.Empty;
diff --git a/Packages/com.unity.visualeffectgraph/Editor/Models/VFXAttributesManager.cs b/Packages/com.unity.visualeffectgraph/Editor/Models/VFXAttributesManager.cs
index a0fa32f7f47..a46504454cf 100644
--- a/Packages/com.unity.visualeffectgraph/Editor/Models/VFXAttributesManager.cs
+++ b/Packages/com.unity.visualeffectgraph/Editor/Models/VFXAttributesManager.cs
@@ -257,6 +257,11 @@ public static IEnumerable<string> GetBuiltInNamesAndCombination(bool includeVari
             }
         }
 
+        public static Unity.GraphCommon.LowLevel.Editor.Attribute ConvertToNewCompiler(VFXAttribute vfxAttribute)
+        {
+            return new Unity.GraphCommon.LowLevel.Editor.Attribute(vfxAttribute.name, vfxAttribute.value.GetContent());
+        }
+
         /****************************************************************/
 
         public static IEnumerable<VFXAttribute> LocalOnlyAttributes => s_LocalOnlyAttributes;
diff --git a/Packages/com.unity.visualeffectgraph/Editor/Models/VFXGraph.cs b/Packages/com.unity.visualeffectgraph/Editor/Models/VFXGraph.cs
index f749b2ab5f9..89215970bdc 100644
--- a/Packages/com.unity.visualeffectgraph/Editor/Models/VFXGraph.cs
+++ b/Packages/com.unity.visualeffectgraph/Editor/Models/VFXGraph.cs
@@ -1443,7 +1443,12 @@ public void SanitizeForImport()
 
         internal VFXGraphCompiledData.VFXCompileOutput Compile()
         {
-            return compiledData.Compile(m_CompilationMode, VFXViewPreference.generateShadersWithDebugSymbols || m_ForceShaderDebugSymbols, VFXAnalytics.GetInstance());
+            bool generateShadersDebugSymbols = VFXViewPreference.generateShadersWithDebugSymbols || m_ForceShaderDebugSymbols;
+
+            if (VFXViewPreference.useNewCompiler)
+                return m_NewCompiler.Compile(this, m_CompilationMode, generateShadersDebugSymbols);
+            else
+                return compiledData.Compile(m_CompilationMode, generateShadersDebugSymbols, VFXAnalytics.GetInstance());
         }
 
         private static System.Reflection.PropertyInfo kGetAllowLocking = typeof(Material).GetProperty("allowLocking", System.Reflection.BindingFlags.Instance | System.Reflection.BindingFlags.NonPublic);
@@ -1473,7 +1478,7 @@ internal UnityObject[] CompileAndUpdateAsset(VisualEffectAsset asset)
                 bool instancingEnabled = asset.instancingMode != VFXInstancingMode.Disabled;
 
                 var overridenSystemDesc = new List<VFXEditorSystemDesc>();
-                foreach (var system in compilationOutput.systemDesc)
+                foreach (var system in compilationOutput.assetDesc.systemDesc)
                 {
                     var overridenTask = new List<VFXEditorTaskDesc>();
                     if (system.tasks != null) foreach (var task in system.tasks)
@@ -1481,7 +1486,7 @@ internal UnityObject[] CompileAndUpdateAsset(VisualEffectAsset asset)
                         UnityObject currentProcessor = null;
                         if (task.shaderSourceIndex >= 0)
                         {
-                            var shaderSource = compilationOutput.shaderSourceDesc[task.shaderSourceIndex];
+                            var shaderSource = compilationOutput.assetDesc.shaderSourceDesc[task.shaderSourceIndex];
                             if (shaderSource.compute)
                             {
                                 currentProcessor = ShaderUtil.CreateComputeShaderAsset(shaderSource.source);
@@ -1558,21 +1563,21 @@ internal UnityObject[] CompileAndUpdateAsset(VisualEffectAsset asset)
                     overridenSystemDesc.Add(newSystem);
                 }
 
-                if (compilationOutput.systemDesc.Length != overridenSystemDesc.Count)
+                if (compilationOutput.assetDesc.systemDesc.Length != overridenSystemDesc.Count)
                     throw new InvalidOperationException("Unexpected copy of system");
 
                 var desc = new VisualEffectAssetDesc()
                 {
-                    sheet = compilationOutput.sheet,
+                    sheet = compilationOutput.assetDesc.sheet,
                     systemDesc = overridenSystemDesc.ToArray(),
-                    eventDesc = compilationOutput.eventDesc,
-                    gpuBufferDesc = compilationOutput.gpuBufferDesc,
-                    cpuBufferDesc = compilationOutput.cpuBufferDesc,
-                    temporaryBufferDesc = compilationOutput.temporaryBufferDesc,
-                    shaderSourceDesc = compilationOutput.shaderSourceDesc,
-                    rendererSettings = compilationOutput.rendererSettings,
+                    eventDesc = compilationOutput.assetDesc.eventDesc,
+                    gpuBufferDesc = compilationOutput.assetDesc.gpuBufferDesc,
+                    cpuBufferDesc = compilationOutput.assetDesc.cpuBufferDesc,
+                    temporaryBufferDesc = compilationOutput.assetDesc.temporaryBufferDesc,
+                    shaderSourceDesc = compilationOutput.assetDesc.shaderSourceDesc,
+                    rendererSettings = compilationOutput.assetDesc.rendererSettings,
                     compilationMode = m_CompilationMode,
-                    version = compilationOutput.version
+                    version = compilationOutput.assetDesc.version
                 };
 
                 VisualEffectAssetUtility.SetVisualEffectAssetDesc(asset, desc);
@@ -1608,18 +1613,18 @@ public void CompileForImport()
                 if (compilationOutput.success)
                 {
                     resource.SetRuntimeData(
-                        compilationOutput.sheet,
-                        compilationOutput.systemDesc,
-                        compilationOutput.eventDesc,
-                        compilationOutput.gpuBufferDesc,
-                        compilationOutput.cpuBufferDesc,
-                        compilationOutput.temporaryBufferDesc,
-                        compilationOutput.shaderSourceDesc,
-                        compilationOutput.rendererSettings.shadowCastingMode,
-                        compilationOutput.rendererSettings.motionVectorGenerationMode,
-                        compilationOutput.instancingDisabledReason,
-                        m_CompilationMode,
-                        compilationOutput.version);
+                        compilationOutput.assetDesc.sheet,
+                        compilationOutput.assetDesc.systemDesc,
+                        compilationOutput.assetDesc.eventDesc,
+                        compilationOutput.assetDesc.gpuBufferDesc,
+                        compilationOutput.assetDesc.cpuBufferDesc,
+                        compilationOutput.assetDesc.temporaryBufferDesc,
+                        compilationOutput.assetDesc.shaderSourceDesc,
+                        compilationOutput.assetDesc.rendererSettings.shadowCastingMode,
+                        compilationOutput.assetDesc.rendererSettings.motionVectorGenerationMode,
+                        compilationOutput.assetDesc.instancingDisabledReason,
+                        compilationOutput.assetDesc.compilationMode,
+                        compilationOutput.assetDesc.version);
 
                     resource.ClearSourceDependencies();
                     foreach (var dependency in compilationOutput.sourceDependencies)
@@ -1721,6 +1726,7 @@ private VFXGraphCompiledData compiledData
         private bool m_CustomAttributesDirty = false;
 
         private VFXGraphCompiledData m_CompiledData;
+        private VfxGraphCompiler m_NewCompiler = new();
 
         private VFXCompilationMode m_CompilationMode = VFXCompilationMode.Runtime;
         private bool m_ForceShaderDebugSymbols = false;
diff --git a/Packages/com.unity.visualeffectgraph/Editor/NewCompiler.meta b/Packages/com.unity.visualeffectgraph/Editor/NewCompiler.meta
new file mode 100644
index 00000000000..fcd758fd909
--- /dev/null
+++ b/Packages/com.unity.visualeffectgraph/Editor/NewCompiler.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: a218c1f1cab4d0944bba51343cbcde7b
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Packages/com.unity.visualeffectgraph/Editor/NewCompiler/Data.meta b/Packages/com.unity.visualeffectgraph/Editor/NewCompiler/Data.meta
new file mode 100644
index 00000000000..9c424de319e
--- /dev/null
+++ b/Packages/com.unity.visualeffectgraph/Editor/NewCompiler/Data.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: bd7b984a727b3dd468b13196f9123eff
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Packages/com.unity.visualeffectgraph/Editor/NewCompiler/Data/DeadListData.cs b/Packages/com.unity.visualeffectgraph/Editor/NewCompiler/Data/DeadListData.cs
new file mode 100644
index 00000000000..2202782d57b
--- /dev/null
+++ b/Packages/com.unity.visualeffectgraph/Editor/NewCompiler/Data/DeadListData.cs
@@ -0,0 +1,10 @@
+
+namespace UnityEditor.VFX
+{
+    /// <summary>
+    /// Data structured used for ID generation, storing all the valid IDs in a stack.
+    /// </summary>
+    /*public*/ class DeadListData : IdGeneratorData
+    {
+    }
+}
diff --git a/Packages/com.unity.visualeffectgraph/Editor/NewCompiler/Data/DeadListData.cs.meta b/Packages/com.unity.visualeffectgraph/Editor/NewCompiler/Data/DeadListData.cs.meta
new file mode 100644
index 00000000000..98a3b8d96b1
--- /dev/null
+++ b/Packages/com.unity.visualeffectgraph/Editor/NewCompiler/Data/DeadListData.cs.meta
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: 320c06e3ba8a2914eb232418861a99a8
\ No newline at end of file
diff --git a/Packages/com.unity.visualeffectgraph/Editor/NewCompiler/Data/DescriptionWriter.meta b/Packages/com.unity.visualeffectgraph/Editor/NewCompiler/Data/DescriptionWriter.meta
new file mode 100644
index 00000000000..0b524ac7b41
--- /dev/null
+++ b/Packages/com.unity.visualeffectgraph/Editor/NewCompiler/Data/DescriptionWriter.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: faf739d20abefc54c88a1abff07200ec
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Packages/com.unity.visualeffectgraph/Editor/NewCompiler/Data/DescriptionWriter/ParticleSystemDataDescriptionWriter.cs b/Packages/com.unity.visualeffectgraph/Editor/NewCompiler/Data/DescriptionWriter/ParticleSystemDataDescriptionWriter.cs
new file mode 100644
index 00000000000..55a49af9f6d
--- /dev/null
+++ b/Packages/com.unity.visualeffectgraph/Editor/NewCompiler/Data/DescriptionWriter/ParticleSystemDataDescriptionWriter.cs
@@ -0,0 +1,227 @@
+using System.Collections.Generic;
+using Unity.GraphCommon.LowLevel.Editor;
+using UnityEngine;
+
+namespace UnityEditor.VFX
+{
+    class ParticleSystemDataDescriptionWriter : IDataDescriptionWriter<ParticleData>
+    {
+        IDataDescriptionWriter<AttributeData> m_AttributeDataWriter;
+        private static readonly string DeadlistBufferTypeDefine = "DEADLIST_BUFFER_TYPE";
+        private static readonly string AttributeBufferTypeDefine = "ATTRIBUTE_BUFFER_TYPE";
+
+        public ParticleSystemDataDescriptionWriter(IDataDescriptionWriter<AttributeData> attributeDataWriter)
+        {
+            Debug.Assert(attributeDataWriter != null);
+            m_AttributeDataWriter = attributeDataWriter;
+        }
+
+        public void WriteDescription(ShaderWriter shaderWriter, DataView dataView, ParticleData particleSystemData, string name, CompilationContext context)
+        {
+            var layoutCompilationData = context.data.Get<AttributeSetLayoutCompilationData>();
+
+            shaderWriter.IncludeFile("Packages/com.unity.vfxgraph/Shaders/Data/ParticleSystemData.hlsl");
+
+            var attributeData = dataView.FindSubData(ParticleData.AttributeDataKey, out var attributeDataView) ? attributeDataView.DataDescription as AttributeData : null;
+            var deadlist = dataView.FindSubData(ParticleData.DeadlistKey, out var deadlistDataView) ? deadlistDataView.DataDescription : null;
+
+            if (deadlist != null)
+            {
+                shaderWriter.IncludeFile("Packages/com.unity.vfxgraph/Shaders/Data/DeadListData.hlsl");
+            }
+
+            if (attributeData != null)
+            {
+                shaderWriter.NewLine();
+                m_AttributeDataWriter.WriteDescription(shaderWriter, attributeDataView, name + "_ParticleAttributeBuffer", context);
+            }
+            shaderWriter.NewLine();
+            shaderWriter.WriteLine($"struct {name}");
+            shaderWriter.OpenBlock();
+            shaderWriter.WriteLine("VFXParticleSystemData particleSystem;");
+            shaderWriter.WriteLine($"{name}_ParticleAttributeBuffer particleAttributeBuffer;");
+            if (deadlist != null)
+            {
+                shaderWriter.WriteLine("VFXDeadListData deadList;");
+            }
+            shaderWriter.NewLine();
+            shaderWriter.WriteLine("void Init()");
+            shaderWriter.OpenBlock();
+            shaderWriter.WriteLine($"uint capacity = {particleSystemData.Capacity}u;");
+            shaderWriter.WriteLine("particleSystem.Init(capacity);");
+            if (attributeData != null)
+            {
+                shaderWriter.NewLine();
+                shaderWriter.WriteLine("VFXByteAddressBuffer particleBuffer;");
+                shaderWriter.WriteLine($"particleBuffer.Init(_{name}_attributeBuffer, {0}u, {layoutCompilationData[attributeData].GetBufferSize()}u);");
+                shaderWriter.WriteLine("particleAttributeBuffer.Init(particleBuffer);");
+            }
+            if (deadlist != null)
+            {
+                shaderWriter.NewLine();
+                shaderWriter.WriteLine("VFXStructuredBuffer_uint deadListCounter;");
+                shaderWriter.WriteLine("VFXStructuredBuffer_uint deadListCounterCopy;");
+                shaderWriter.WriteLine("VFXStructuredBuffer_uint deadListBuffer;");
+                shaderWriter.WriteLine($"deadListCounter.Init(_{name}_deadListBuffer, {0}u, {1}u);");
+                shaderWriter.WriteLine($"deadListCounterCopy.Init(_{name}_deadListBuffer, {1}u, {1}u);");
+                shaderWriter.WriteLine($"deadListBuffer.Init(_{name}_deadListBuffer, {2}u, {particleSystemData.Capacity}u);");
+                shaderWriter.WriteLine("deadList.Init(deadListCounter, deadListCounterCopy, deadListBuffer);");
+            }
+            shaderWriter.CloseBlock();
+
+            shaderWriter.NewLine();
+            shaderWriter.WriteLine("bool NewParticle(uint threadIndex, out uint particleIndex)");
+            shaderWriter.OpenBlock();
+            if (deadlist != null)
+            {
+                shaderWriter.WriteLine("bool success = deadList.NewIndex(threadIndex, particleIndex);");
+                shaderWriter.WriteLine("if(success)");
+                shaderWriter.OpenBlock();
+                shaderWriter.WriteLine("particleAttributeBuffer.StoreDefault(particleIndex);");
+                shaderWriter.CloseBlock();
+                shaderWriter.WriteLine("return success;");
+            }
+            else
+            {
+                shaderWriter.WriteLine("index = 0;");
+                shaderWriter.WriteLine("return true;");
+            }
+            shaderWriter.CloseBlock();
+
+            shaderWriter.NewLine();
+            shaderWriter.WriteLine("bool DeleteParticle(uint index)");
+            shaderWriter.OpenBlock();
+            if (deadlist != null)
+            {
+                shaderWriter.WriteLine("particleAttributeBuffer.Store_alive(false, index);");
+                shaderWriter.WriteLine("return deadList.DeleteIndex(index);");
+            }
+            else
+            {
+                shaderWriter.WriteLine("return true;");
+            }
+            shaderWriter.CloseBlock();
+
+            shaderWriter.CloseBlock(false);
+            shaderWriter.WriteLine(";", ShaderWriter.WriteLineOptions.NoIndent);
+        }
+
+        public bool WriteView(ShaderWriter shaderWriter, DataView usedDataView, DataView readDataView, DataView writtenDataView, string name, string sourceName, CompilationContext context)
+        {
+            usedDataView.FindSubData(ParticleData.AttributeDataKey, out var attributeUsedDataView);
+            bool needsParticleAttributeData = attributeUsedDataView.Id.IsValid;
+            if (needsParticleAttributeData)
+            {
+                readDataView.FindSubData(ParticleData.AttributeDataKey, out var attributeReadDataView);
+                writtenDataView.FindSubData(ParticleData.AttributeDataKey, out var attributeWrittenDataView);
+                m_AttributeDataWriter.WriteView(shaderWriter, attributeUsedDataView, attributeReadDataView, attributeWrittenDataView, name + "_ParticleAttributeBuffer", sourceName + "_ParticleAttributeBuffer", context);
+                shaderWriter.NewLine();
+            }
+            shaderWriter.WriteLine($"struct {name}View");
+            shaderWriter.OpenBlock();
+            shaderWriter.WriteLine($"{sourceName} container;");
+            if (needsParticleAttributeData)
+            {
+                shaderWriter.WriteLine($"{name}_ParticleAttributeBuffer particleAttributeBuffer;");
+            }
+            shaderWriter.NewLine();
+            shaderWriter.WriteLine($"void Init({sourceName} particleData)");
+            shaderWriter.OpenBlock();
+            shaderWriter.WriteLine("container = particleData;");
+            if (needsParticleAttributeData)
+            {
+                shaderWriter.WriteLine("particleAttributeBuffer.Init(particleData.particleAttributeBuffer);");
+            }
+            shaderWriter.CloseBlock();
+
+            shaderWriter.NewLine();
+            shaderWriter.WriteLine("bool NewParticle(uint threadIndex, out uint particleIndex) { return container.NewParticle(threadIndex, particleIndex); }");
+
+            shaderWriter.NewLine();
+            shaderWriter.WriteLine("bool DeleteParticle(uint index) { return container.DeleteParticle(index); }");
+
+            shaderWriter.CloseBlock(false);
+            shaderWriter.WriteLine(";", ShaderWriter.WriteLineOptions.NoIndent);
+            shaderWriter.WriteLine($"{name}View {name};"); // TODO: probably externally only for the actual binding, not inner types
+            return true;
+        }
+
+        public string GetSubdataName(IDataKey subDataKey)
+        {
+            if (subDataKey == ParticleData.AttributeDataKey)
+            {
+                return ".particleAttributeBuffer";
+            }
+            else
+            {
+                throw new System.NotImplementedException();
+            }
+        }
+
+        public string GetSubdataTypeName(IDataKey subDataKey)
+        {
+            if (subDataKey == ParticleData.AttributeDataKey)
+            {
+                return "_ParticleAttributeBuffer";
+            }
+            else
+            {
+                throw new System.NotImplementedException();
+            }
+        }
+
+        public void DefineResourceUsage(ShaderWriter shaderWriter, DataView usedDataView, DataView readDataView,
+            DataView writtenDataView)
+        {
+            if(writtenDataView.FindSubData(ParticleData.AttributeDataKey, out var attributeWrittenDataView))
+            {
+                shaderWriter.Define(AttributeBufferTypeDefine, "RWByteAddressBuffer");
+            }
+            else
+            {
+                shaderWriter.Define(AttributeBufferTypeDefine, "ByteAddressBuffer");
+            }
+
+            if (writtenDataView.FindSubData(ParticleData.DeadlistKey, out var _))
+            {
+                shaderWriter.Define(DeadlistBufferTypeDefine, "RWStructuredBuffer<uint>");
+            }
+            else
+            {
+                shaderWriter.Define(DeadlistBufferTypeDefine, "StructuredBuffer<uint>");
+            }
+        }
+
+        public void UndefineResourceUsage(ShaderWriter shaderWriter, DataView usedDataView, DataView readDataView,
+            DataView writtenDataView)
+        {
+            if (usedDataView.FindSubData(ParticleData.AttributeDataKey, out var _))
+            {
+                shaderWriter.Undefine(AttributeBufferTypeDefine);
+            }
+
+            if (usedDataView.FindSubData(ParticleData.DeadlistKey, out var _))
+            {
+                shaderWriter.Undefine(DeadlistBufferTypeDefine);
+            }
+        }
+
+        public IEnumerable<(string, string)> GetUsedResources(string name, DataView usedDataView)
+        {
+            if (usedDataView.FindSubData(ParticleData.AttributeDataKey, out var _))
+            {
+                string attributeBufferType = AttributeBufferTypeDefine; //TODO: Define actual resource types
+                string attributeBufferName = $"_{name}_attributeBuffer";
+                yield return (attributeBufferType, attributeBufferName);
+            }
+
+            if (usedDataView.FindSubData(ParticleData.DeadlistKey, out var _))
+            {
+                string deadlistBufferType = DeadlistBufferTypeDefine; //TODO: Define actual resource types
+                string deadlistBufferName = $"_{name}_deadListBuffer";
+                yield return (deadlistBufferType, deadlistBufferName);
+            }
+        }
+    }
+}
+
diff --git a/Packages/com.unity.visualeffectgraph/Editor/NewCompiler/Data/DescriptionWriter/ParticleSystemDataDescriptionWriter.cs.meta b/Packages/com.unity.visualeffectgraph/Editor/NewCompiler/Data/DescriptionWriter/ParticleSystemDataDescriptionWriter.cs.meta
new file mode 100644
index 00000000000..167b614bb4c
--- /dev/null
+++ b/Packages/com.unity.visualeffectgraph/Editor/NewCompiler/Data/DescriptionWriter/ParticleSystemDataDescriptionWriter.cs.meta
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: 2ad49fcf842916847b1d2ef673bef493
\ No newline at end of file
diff --git a/Packages/com.unity.visualeffectgraph/Editor/NewCompiler/Data/DescriptionWriter/SpawnerDataDescriptionWriter.cs b/Packages/com.unity.visualeffectgraph/Editor/NewCompiler/Data/DescriptionWriter/SpawnerDataDescriptionWriter.cs
new file mode 100644
index 00000000000..a0ef456a6e0
--- /dev/null
+++ b/Packages/com.unity.visualeffectgraph/Editor/NewCompiler/Data/DescriptionWriter/SpawnerDataDescriptionWriter.cs
@@ -0,0 +1,36 @@
+using System.Collections.Generic;
+using Unity.GraphCommon.LowLevel.Editor;
+
+namespace UnityEditor.VFX
+{
+    class SpawnerDataDescriptionWriter : IDataDescriptionWriter<SpawnData>
+    {
+        public void WriteDescription(ShaderWriter shaderWriter, DataView dataView, SpawnData structuredData, string name, CompilationContext context)
+        {
+            shaderWriter.IncludeFile("Packages/com.unity.vfxgraph/Shaders/Data/SpawnerData.hlsl");
+            shaderWriter.NewLine();
+
+            shaderWriter.WriteLine($"struct {name}");
+            shaderWriter.OpenBlock();
+            shaderWriter.WriteLine("SpawnerData spawner;");
+            shaderWriter.NewLine();
+            shaderWriter.WriteLine("void Init()");
+            shaderWriter.OpenBlock();
+            shaderWriter.WriteLine("VFXStructuredBuffer_uint instancingPrefixSum;");
+            shaderWriter.WriteLine($"instancingPrefixSum.Init(_{name}_instancingPrefixSum, {0}u,  {2}u) ;"); //TODO size = 2??
+            shaderWriter.WriteLine($"spawner.Init(instancingPrefixSum);");
+            shaderWriter.CloseBlock();
+            shaderWriter.CloseBlock(false);
+            shaderWriter.WriteLine(";", ShaderWriter.WriteLineOptions.NoIndent);
+        }
+
+        public IEnumerable<(string, string)> GetUsedResources(string name, DataView usedDataView)
+        {
+            if (usedDataView.Id.IsValid)
+            {
+                yield return ("StructuredBuffer<uint>", $"_{name}_instancingPrefixSum");
+            }
+        }
+
+    }
+}
diff --git a/Packages/com.unity.visualeffectgraph/Editor/NewCompiler/Data/DescriptionWriter/SpawnerDataDescriptionWriter.cs.meta b/Packages/com.unity.visualeffectgraph/Editor/NewCompiler/Data/DescriptionWriter/SpawnerDataDescriptionWriter.cs.meta
new file mode 100644
index 00000000000..ed3cff2665a
--- /dev/null
+++ b/Packages/com.unity.visualeffectgraph/Editor/NewCompiler/Data/DescriptionWriter/SpawnerDataDescriptionWriter.cs.meta
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: 9715c0984536c4943931ea733110eee8
\ No newline at end of file
diff --git a/Packages/com.unity.visualeffectgraph/Editor/NewCompiler/Data/IdGeneratorData.cs b/Packages/com.unity.visualeffectgraph/Editor/NewCompiler/Data/IdGeneratorData.cs
new file mode 100644
index 00000000000..1030261b224
--- /dev/null
+++ b/Packages/com.unity.visualeffectgraph/Editor/NewCompiler/Data/IdGeneratorData.cs
@@ -0,0 +1,16 @@
+using Unity.GraphCommon.LowLevel.Editor;
+
+namespace UnityEditor.VFX
+{
+    /// <summary>
+    /// Data structure that can handle creation and deletion of IDs.
+    /// </summary>
+    /*public*/ class IdGeneratorData : IDataDescription
+    {
+        /// <inheritdoc cref="IDataDescription"/>
+        public bool IsCompatible(IDataDescription other)
+        {
+            return other is IdGeneratorData;
+        }
+    }
+}
diff --git a/Packages/com.unity.visualeffectgraph/Editor/NewCompiler/Data/IdGeneratorData.cs.meta b/Packages/com.unity.visualeffectgraph/Editor/NewCompiler/Data/IdGeneratorData.cs.meta
new file mode 100644
index 00000000000..30040b8674d
--- /dev/null
+++ b/Packages/com.unity.visualeffectgraph/Editor/NewCompiler/Data/IdGeneratorData.cs.meta
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: 83f58eb4da477fd4d96ad3bb32a88c2a
\ No newline at end of file
diff --git a/Packages/com.unity.visualeffectgraph/Editor/NewCompiler/Data/ParticleData.cs b/Packages/com.unity.visualeffectgraph/Editor/NewCompiler/Data/ParticleData.cs
new file mode 100644
index 00000000000..e0f6a25ba2c
--- /dev/null
+++ b/Packages/com.unity.visualeffectgraph/Editor/NewCompiler/Data/ParticleData.cs
@@ -0,0 +1,67 @@
+using Unity.GraphCommon.LowLevel.Editor;
+using UnityEngine;
+using UnityEngine.VFX;
+
+namespace UnityEditor.VFX
+{
+    /// <summary>
+    /// A data type representing a set of particle tied to a simulation space and bounds.
+    /// </summary>
+    /*public*/ class ParticleData : IDataDescription
+    {
+        /// <summary>
+        /// The key used to identify the particle attribute data.
+        /// </summary>
+        public static readonly UniqueDataKey AttributeDataKey = new UniqueDataKey("AttributeData");
+
+        /// <summary>
+        /// The key used to identify the dead list.
+        /// </summary>
+        public static readonly UniqueDataKey DeadlistKey = new UniqueDataKey("Deadlist");
+
+        /// <inheritdoc cref="IDataModel"/>
+        public string Name { get; }
+
+        /// <summary>
+        /// The maximum number of particles held by this ParticleData.
+        /// </summary>
+        ///
+        public uint Capacity { get; }
+        /// <summary>
+        /// The simulation space of the particles.
+        /// </summary>
+        public VFXSpace Space { get; }
+        /// <summary>
+        /// The initial bounds of the particles.
+        /// </summary>
+        public Bounds Bounds { get; }
+
+
+        /// <summary>
+        /// Constructs a named ParticleData with initial bounds, a space and a capacity.
+        /// </summary>
+        /// <param name="name">The name of the ParticleData</param>
+        /// <param name="bounds">The initial bounds of the particles.</param>
+        /// <param name="space">The simulation space of the particles.</param>
+        /// <param name="capacity">The maximum number of particles handled by the ParticleData.</param>
+        public ParticleData(string name, Bounds bounds, VFXSpace space, uint capacity)
+        {
+            Name = name;
+            Bounds = bounds;
+            Space = space;
+            Capacity = capacity;
+        }
+
+        /// <inheritdoc />
+        public IDataDescription GetSubdata(IDataKey dataKey)
+        {
+            if (dataKey.Equals(AttributeDataKey))
+                return new AttributeData(Capacity);
+
+            if (dataKey.Equals(DeadlistKey))
+                return new IdGeneratorData();
+
+            return null;
+        }
+    }
+}
diff --git a/Packages/com.unity.visualeffectgraph/Editor/NewCompiler/Data/ParticleData.cs.meta b/Packages/com.unity.visualeffectgraph/Editor/NewCompiler/Data/ParticleData.cs.meta
new file mode 100644
index 00000000000..443a8f070ee
--- /dev/null
+++ b/Packages/com.unity.visualeffectgraph/Editor/NewCompiler/Data/ParticleData.cs.meta
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: c5ed0745943a69a4aa9e30f3cffad732
\ No newline at end of file
diff --git a/Packages/com.unity.visualeffectgraph/Editor/NewCompiler/Data/ParticleStripData.cs b/Packages/com.unity.visualeffectgraph/Editor/NewCompiler/Data/ParticleStripData.cs
new file mode 100644
index 00000000000..33c5c01d8bb
--- /dev/null
+++ b/Packages/com.unity.visualeffectgraph/Editor/NewCompiler/Data/ParticleStripData.cs
@@ -0,0 +1,51 @@
+using Unity.GraphCommon.LowLevel.Editor;
+using UnityEngine.VFX;
+using UnityEngine;
+
+namespace UnityEditor.VFX
+{
+    /// <summary>
+    /// A data type representing a set of particle strips tied to a simulation space and bounds.
+    /// </summary>
+    /*public*/ class ParticleStripData : IDataDescription
+    {
+        /// <inheritdoc cref="IDataModel"/>
+        public string Name { get; }
+        /// <summary>
+        /// The maximum number of strips held by this ParticleStripData.
+        /// </summary>
+        public uint StripCapacity { get; }
+        /// <summary>
+        /// The maximum number of particle composing each strip.
+        /// </summary>
+        public uint PerStripCapacity { get; }
+
+        /// <summary>
+        /// The initial bounds of the particles.
+        /// </summary>
+        public Bounds Bounds { get; }
+
+        /// <summary>
+        /// The simulation space of the particles.
+        /// </summary>
+        public VFXSpace Space { get; }
+
+        /// <summary>
+        /// Constructs a named ParticleData with initial bounds, a space and a capacity.
+        /// </summary>
+        /// <param name="name">The name of the ParticleStripData</param>
+        /// <param name="bounds">The initial bounds of the particles.</param>
+        /// <param name="space">The simulation space of the particles.</param>
+        /// <param name="stripCapacity">The maximum number of strips held by this ParticleStripData.</param>
+        /// <param name="perStripCapacity">The maximum number of particle composing each strip.</param>
+        public ParticleStripData(string name, Bounds bounds, VFXSpace space, uint stripCapacity, uint perStripCapacity)
+        {
+            Name = name;
+            Bounds = bounds;
+            Space = space;
+            StripCapacity = stripCapacity;
+            PerStripCapacity = perStripCapacity;
+        }
+
+    }
+}
diff --git a/Packages/com.unity.visualeffectgraph/Editor/NewCompiler/Data/ParticleStripData.cs.meta b/Packages/com.unity.visualeffectgraph/Editor/NewCompiler/Data/ParticleStripData.cs.meta
new file mode 100644
index 00000000000..538a94673ac
--- /dev/null
+++ b/Packages/com.unity.visualeffectgraph/Editor/NewCompiler/Data/ParticleStripData.cs.meta
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: d150bc48a07cd9546b89e3d706a8f896
\ No newline at end of file
diff --git a/Packages/com.unity.visualeffectgraph/Editor/NewCompiler/Data/SpawnData.cs b/Packages/com.unity.visualeffectgraph/Editor/NewCompiler/Data/SpawnData.cs
new file mode 100644
index 00000000000..ff5f132afa1
--- /dev/null
+++ b/Packages/com.unity.visualeffectgraph/Editor/NewCompiler/Data/SpawnData.cs
@@ -0,0 +1,37 @@
+using Unity.GraphCommon.LowLevel.Editor;
+
+namespace UnityEditor.VFX
+{
+    /// <summary>
+    /// A data type representing data driving the spawning in other data types.
+    /// </summary>
+    /*public*/ class SpawnData : IDataDescription
+    {
+
+        /// <summary>
+        /// The key used to identify the source attribute data.
+        /// </summary>
+        public static readonly UniqueDataKey SourceAttributeDataKey = new UniqueDataKey("SourceAttributeData");
+
+        /// <inheritdoc cref="IDataDescription"/>
+        public string Name { get; }
+
+        /// <summary>
+        /// Constructs a named SpawnData.
+        /// </summary>
+        /// <param name="name">The name of the SpawnData.</param>
+        public SpawnData(string name)
+        {
+            Name = name;
+        }
+
+        /// <inheritdoc />
+        public IDataDescription GetSubdata(IDataKey dataKey)
+        {
+            if (dataKey.Equals(SourceAttributeDataKey))
+                return new AttributeData(1);
+
+            return null;
+        }
+    }
+}
diff --git a/Packages/com.unity.visualeffectgraph/Editor/NewCompiler/Data/SpawnData.cs.meta b/Packages/com.unity.visualeffectgraph/Editor/NewCompiler/Data/SpawnData.cs.meta
new file mode 100644
index 00000000000..f5054d6a8b5
--- /dev/null
+++ b/Packages/com.unity.visualeffectgraph/Editor/NewCompiler/Data/SpawnData.cs.meta
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: 71ee36c52b9d2974791cdaa56cec03ed
\ No newline at end of file
diff --git a/Packages/com.unity.visualeffectgraph/Editor/NewCompiler/Passes.meta b/Packages/com.unity.visualeffectgraph/Editor/NewCompiler/Passes.meta
new file mode 100644
index 00000000000..f4b2e05b92f
--- /dev/null
+++ b/Packages/com.unity.visualeffectgraph/Editor/NewCompiler/Passes.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: a2b9f031e02eb12469eb929b91746ed3
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Packages/com.unity.visualeffectgraph/Editor/NewCompiler/Passes/VfxGraphLegacyCompilationOutputExtensions.cs b/Packages/com.unity.visualeffectgraph/Editor/NewCompiler/Passes/VfxGraphLegacyCompilationOutputExtensions.cs
new file mode 100644
index 00000000000..766d8dd2fec
--- /dev/null
+++ b/Packages/com.unity.visualeffectgraph/Editor/NewCompiler/Passes/VfxGraphLegacyCompilationOutputExtensions.cs
@@ -0,0 +1,261 @@
+using System.Text;
+
+namespace UnityEditor.VFX
+{
+    static class VFXGraphLegacyCompilationOutputExtensions
+    {
+        internal static string ToDetailedString(this VfxGraphLegacyCompilationOutput output)
+        {
+            var sb = new StringBuilder();
+
+            sb.AppendLine("VFXGraphLegacyCompilationOutput:");
+            sb.AppendLine($"  Version: {output.Version}");
+            sb.AppendLine($"  Compilation Mode: {output.CompilationMode}");
+
+            sb.AppendLine("  Expression Sheet:");
+            if (output.SheetExpressions != null)
+            {
+                sb.AppendLine($"    Expressions Count: {output.SheetExpressions.Count}");
+                for (int i = 0; i < output.SheetExpressions.Count; i++)
+                {
+                    var expr = output.SheetExpressions[i];
+                    sb.AppendLine($"      Expression {i}: {expr.op}");
+                }
+            }
+            else
+            {
+                sb.AppendLine("    Expressions: null");
+            }
+
+            if (output.SheetExpressionsPerSpawnEventAttribute != null)
+            {
+                sb.AppendLine($"    PerSpawnEventAttribute Count: {output.SheetExpressionsPerSpawnEventAttribute.Count}");
+                for (int i = 0; i < output.SheetExpressionsPerSpawnEventAttribute.Count; i++)
+                {
+                    var expr = output.SheetExpressionsPerSpawnEventAttribute[i];
+                    sb.AppendLine($"      Expression {i}: {expr.op}");
+                }
+            }
+            else
+            {
+                sb.AppendLine("    PerSpawnEventAttribute: null");
+            }
+
+            if (output.SheetValues != null)
+            {
+                sb.AppendLine($"    Values Count: {output.SheetValues.Count}");
+                for (int i = 0; i < output.SheetValues.Count; i++)
+                {
+                    var value = output.SheetValues[i];
+                    sb.AppendLine($"      Value {i}: {value} - {value.expressionIndex}");
+                }
+            }
+            else
+            {
+                sb.AppendLine("    Values: null");
+            }
+
+            if (output.SheetExposed != null)
+            {
+                sb.AppendLine($"    Exposed Count: {output.SheetExposed.Count}");
+                for (int i = 0; i < output.SheetExposed.Count; i++)
+                {
+                    var value = output.SheetExposed[i];
+                    sb.AppendLine($"      Exposed Value {i}: {value.mapping}");
+                }
+            }
+            else
+            {
+                sb.AppendLine("    Exposed Values: null");
+
+            }
+
+            if (output.SystemDescs != null)
+            {
+                sb.AppendLine("  System Descriptions:");
+                for (int i = 0; i < output.SystemDescs.Count; i++)
+                {
+                    var systemDesc = output.SystemDescs[i];
+                    sb.AppendLine($"    System {i}:");
+                    sb.AppendLine($"      Name: {systemDesc.name}");
+                    sb.AppendLine($"      Type: {systemDesc.type}");
+                    sb.AppendLine($"      Flags: {systemDesc.flags}");
+                    sb.AppendLine($"      Layer: {systemDesc.layer}");
+
+                    if (systemDesc.buffers != null)
+                    {
+                        sb.AppendLine($"      Buffers Count: {systemDesc.buffers.Length}");
+                        for (int j = 0; j < systemDesc.buffers.Length; j++)
+                        {
+                            var buffer = systemDesc.buffers[j];
+                            sb.AppendLine($"        Buffer {j}: Name={buffer.name}, Index={buffer.index}");
+                        }
+                    }
+                    else
+                    {
+                        sb.AppendLine("      Buffers: null");
+                    }
+
+                    if (systemDesc.values != null)
+                    {
+                        sb.AppendLine($"      Values Count: {systemDesc.values.Length}");
+                        for (int j = 0; j < systemDesc.values.Length; j++)
+                        {
+                            var value = systemDesc.values[j];
+                            sb.AppendLine($"        Value {j}: Name={value.name}, Index={value.index}");
+                        }
+                    }
+                    else
+                    {
+                        sb.AppendLine("      Values: null");
+                    }
+
+                    if (systemDesc.tasks != null)
+                    {
+                        sb.AppendLine($"      Tasks Count: {systemDesc.tasks.Length}");
+                        for (int j = 0; j < systemDesc.tasks.Length; j++)
+                        {
+                            var task = systemDesc.tasks[j];
+                            sb.AppendLine(
+                                $"        Task {j}: Type={task.type}, ShaderSourceIndex={task.shaderSourceIndex}");
+                            sb.AppendLine($"        Processor: {task.processor?.GetType().Name ?? "None"}");
+
+                            //Add task buffers mapping
+                            if (task.buffers != null)
+                            {
+                                sb.AppendLine($"          Task Buffers Count: {task.buffers.Length}");
+                                for (int k = 0; k < task.buffers.Length; k++)
+                                {
+                                    var buffer = task.buffers[k];
+                                    sb.AppendLine($"            Task Buffer {k}: Name={buffer.name}, Index={buffer.index}");
+                                }
+                            }
+                            else
+                            {
+                                sb.AppendLine("          Task Buffers: null");
+                            }
+
+                            if (task.values != null)
+                            {
+                                sb.AppendLine($"          Task Values Count: {task.values.Length}");
+                                for (int k = 0; k < task.values.Length; k++)
+                                {
+                                    var value = task.values[k];
+                                    sb.AppendLine($"            Task Value {k}: Name={value.name}, Index={value.index}");
+                                }
+                            }
+                            else
+                            {
+                                sb.AppendLine("          Task Values: null");
+                            }
+                        }
+                    }
+                }
+            }
+            else
+            {
+                sb.AppendLine("  System Descriptions: null");
+            }
+
+            if (output.EventDescs != null)
+            {
+                sb.AppendLine("  Event Descriptions:");
+                for (int i = 0; i < output.EventDescs.Count; i++)
+                {
+                    var eventDesc = output.EventDescs[i];
+                    sb.AppendLine($"    Event {i}: Name={eventDesc.name}");
+                    sb.AppendLine($"      Init Systems Count: {eventDesc.initSystems?.Length ?? 0}");
+                    sb.AppendLine($"      Start Systems Count: {eventDesc.startSystems?.Length ?? 0}");
+                    sb.AppendLine($"      Stop Systems Count: {eventDesc.stopSystems?.Length ?? 0}");
+                }
+            }
+            else
+            {
+                sb.AppendLine("  Event Descriptions: null");
+            }
+
+            if (output.GpuBufferDescs != null)
+            {
+                sb.AppendLine("  GPU Buffer Descriptions:");
+                for (int i = 0; i < output.GpuBufferDescs.Count; i++)
+                {
+                    var bufferDesc = output.GpuBufferDescs[i];
+                    sb.AppendLine($"    Buffer {i}: Target={bufferDesc.target}, Size={bufferDesc.size}, Capacity={bufferDesc.capacity}, Stride={bufferDesc.stride}");
+                    if (bufferDesc.layout != null && bufferDesc.layout.Length > 0)
+                    {
+                        sb.AppendLine($"      Layout elements Count: {bufferDesc.layout.Length}");
+                        foreach (var layoutDesc in bufferDesc.layout)
+                        {
+                            sb.AppendLine($"        Name={layoutDesc.name}, Type={layoutDesc.type}, Offset (bucket, structure, element) ={layoutDesc.offset.bucket}, {layoutDesc.offset.structure}, {layoutDesc.offset.element}");
+                        }
+                    }
+                }
+            }
+            else
+            {
+                sb.AppendLine("  GPU Buffer Descriptions: null");
+            }
+
+            if (output.CpuBufferDescs != null)
+            {
+                sb.AppendLine("  CPU Buffer Descriptions:");
+                for (int i = 0; i < output.CpuBufferDescs.Count; i++)
+                {
+                    var bufferDesc = output.CpuBufferDescs[i];
+                    sb.AppendLine($"    Buffer {i}: Capacity={bufferDesc.capacity}, Stride={bufferDesc.stride}");
+                }
+            }
+            else
+            {
+                sb.AppendLine("  CPU Buffer Descriptions: null");
+            }
+
+            if (output.TemporaryBufferDescs != null)
+            {
+                sb.AppendLine("  Temporary GPU Buffer Descriptions:");
+                for (int i = 0; i < output.TemporaryBufferDescs.Count; i++)
+                {
+                    var tempBufferDesc = output.TemporaryBufferDescs[i];
+                    var bufferDesc = tempBufferDesc.desc;
+                    sb.AppendLine($"    Buffer {i}: FrameCount={tempBufferDesc.frameCount},Target={bufferDesc.target}, Capacity={bufferDesc.capacity}, Size={bufferDesc.size}, Stride={bufferDesc.stride}");
+                }
+            }
+            else
+            {
+                sb.AppendLine("  Temporary GPU Buffer Descriptions: null");
+            }
+
+            if (output.ShaderSourceDescs != null)
+            {
+                sb.AppendLine("  Shader Source Descriptions:");
+                for (int i = 0; i < output.ShaderSourceDescs.Count; i++)
+                {
+                    var shaderDesc = output.ShaderSourceDescs[i];
+                    sb.AppendLine($"    Shader {i}: Name={shaderDesc.name}, Compute={shaderDesc.compute}");
+                    // Be careful with large shader sources!
+                    // sb.AppendLine($"    Shader {i} Source:\n{shaderDesc.source}\n");
+                }
+            }
+            else
+            {
+                sb.AppendLine("  Shader Source Descriptions: null");
+            }
+
+            if (output.Objects != null)
+            {
+                sb.AppendLine("  Objects:");
+                for (int i = 0; i < output.Objects.Count; ++i)
+                {
+                    var obj = output.Objects[i];
+                    sb.AppendLine($"    Object {i}: Name={obj?.name}, Type={obj?.GetType().Name}");
+                }
+            }
+            else
+            {
+                sb.AppendLine("  Objects: null");
+            }
+
+            return sb.ToString();
+        }
+    }
+}
diff --git a/Packages/com.unity.visualeffectgraph/Editor/NewCompiler/Passes/VfxGraphLegacyCompilationOutputExtensions.cs.meta b/Packages/com.unity.visualeffectgraph/Editor/NewCompiler/Passes/VfxGraphLegacyCompilationOutputExtensions.cs.meta
new file mode 100644
index 00000000000..3d44dfb399b
--- /dev/null
+++ b/Packages/com.unity.visualeffectgraph/Editor/NewCompiler/Passes/VfxGraphLegacyCompilationOutputExtensions.cs.meta
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: 743861908f7281046add6c1c7002c71f
\ No newline at end of file
diff --git a/Packages/com.unity.visualeffectgraph/Editor/NewCompiler/Passes/VfxGraphLegacyOutputPass.cs b/Packages/com.unity.visualeffectgraph/Editor/NewCompiler/Passes/VfxGraphLegacyOutputPass.cs
new file mode 100644
index 00000000000..a8bff421ec2
--- /dev/null
+++ b/Packages/com.unity.visualeffectgraph/Editor/NewCompiler/Passes/VfxGraphLegacyOutputPass.cs
@@ -0,0 +1,742 @@
+using System;
+using System.Collections.Generic;
+using Unity.GraphCommon.LowLevel;
+using Unity.GraphCommon.LowLevel.Editor;
+using UnityEngine;
+using UnityEngine.Rendering;
+using UnityEngine.VFX;
+
+namespace UnityEditor.VFX
+{
+    class VfxGraphLegacyCompilationOutput
+    {
+        public List<UnityEditor.VFX.VFXExpressionDesc> SheetExpressions { get; } = new();
+        public List<UnityEditor.VFX.VFXExpressionDesc> SheetExpressionsPerSpawnEventAttribute { get; } = new();
+        public List<UnityEditor.VFX.VFXExpressionValueContainerDesc> SheetValues { get; } = new();
+        public List<UnityEditor.VFX.VFXExposedMapping> SheetExposed { get; } = new();
+        public List<UnityEditor.VFX.VFXEditorSystemDesc> SystemDescs { get; } = new();
+        public List<UnityEditor.VFX.VFXEventDesc> EventDescs { get; } = new();
+        public List<UnityEditor.VFX.VFXGPUBufferDesc> GpuBufferDescs { get; } = new();
+        public List<UnityEditor.VFX.VFXCPUBufferDesc> CpuBufferDescs { get; } = new();
+        public List<UnityEditor.VFX.VFXTemporaryGPUBufferDesc> TemporaryBufferDescs { get; } = new();
+        public List<UnityEditor.VFX.VFXShaderSourceDesc> ShaderSourceDescs { get; } = new();
+        public UnityEngine.VFX.VFXCompilationMode CompilationMode { get; set; } = UnityEngine.VFX.VFXCompilationMode.Edition;
+        public List<UnityEngine.Object> Objects { get; } = new();
+        public uint Version { get; set; }
+
+        public VisualEffectAssetDesc GenerateAssetDesc()
+        {
+            var vfxAssetDesc = new VisualEffectAssetDesc();
+            vfxAssetDesc.compilationMode = VFXCompilationMode.Runtime;
+            vfxAssetDesc.systemDesc = SystemDescs.ToArray();
+            vfxAssetDesc.cpuBufferDesc = CpuBufferDescs.ToArray();
+            vfxAssetDesc.gpuBufferDesc = GpuBufferDescs.ToArray();
+            vfxAssetDesc.temporaryBufferDesc = TemporaryBufferDescs.ToArray();
+            vfxAssetDesc.shaderSourceDesc = ShaderSourceDescs.ToArray();
+            vfxAssetDesc.sheet = new VFXExpressionSheet()
+            {
+                exposed = SheetExposed.ToArray(),
+                expressions = SheetExpressions.ToArray(),
+                expressionsPerSpawnEventAttribute = SheetExpressionsPerSpawnEventAttribute.ToArray(),
+                values = SheetValues.ToArray()
+            };
+            vfxAssetDesc.eventDesc = EventDescs.ToArray();
+            vfxAssetDesc.rendererSettings = new()
+            {
+                motionVectorGenerationMode = MotionVectorGenerationMode.Camera,
+                shadowCastingMode = ShadowCastingMode.Off
+            };
+            vfxAssetDesc.instancingDisabledReason = VFXInstancingDisabledReason.Unknown;
+            vfxAssetDesc.version = Version;
+
+            return vfxAssetDesc;
+        }
+    }
+
+    class VfxGraphLegacyOutputPass : DataGenerationPass<VfxGraphLegacyCompilationOutput>
+    {
+        VfxGraphLegacyCompilationOutput m_currentOutput;
+
+        static readonly Dictionary<System.Type, UnityEngine.VFX.VFXValueType> s_ValueTypeConversion = new()
+        {
+            { typeof(float), UnityEngine.VFX.VFXValueType.Float },
+            { typeof(Vector2), UnityEngine.VFX.VFXValueType.Float2 },
+            { typeof(Vector3), UnityEngine.VFX.VFXValueType.Float3 },
+            { typeof(Vector4), UnityEngine.VFX.VFXValueType.Float4 },
+            { typeof(Color), UnityEngine.VFX.VFXValueType.Float4 },
+            { typeof(int), UnityEngine.VFX.VFXValueType.Int32 },
+            { typeof(uint), UnityEngine.VFX.VFXValueType.Uint32 },
+            { typeof(EntityId), UnityEngine.VFX.VFXValueType.EntityId },
+            { typeof(Texture2D), UnityEngine.VFX.VFXValueType.Texture2D },
+            { typeof(Texture2DArray), UnityEngine.VFX.VFXValueType.Texture2DArray },
+            { typeof(Texture3D), UnityEngine.VFX.VFXValueType.Texture3D },
+            { typeof(Cubemap), UnityEngine.VFX.VFXValueType.TextureCube },
+            { typeof(CubemapArray), UnityEngine.VFX.VFXValueType.TextureCubeArray },
+            { typeof(Matrix4x4), UnityEngine.VFX.VFXValueType.Matrix4x4 },
+            { typeof(AnimationCurve), UnityEngine.VFX.VFXValueType.Curve },
+            { typeof(Gradient), UnityEngine.VFX.VFXValueType.ColorGradient },
+            { typeof(Mesh), UnityEngine.VFX.VFXValueType.Mesh },
+            { typeof(SkinnedMeshRenderer), UnityEngine.VFX.VFXValueType.SkinnedMeshRenderer },
+            { typeof(bool), UnityEngine.VFX.VFXValueType.Boolean },
+            { typeof(GraphicsBuffer), UnityEngine.VFX.VFXValueType.Buffer },
+        };
+
+        delegate uint OnAddExpression(VfxGraphLegacyOutputPass pass, IExpression expression, VFXExpressionOperation op, List<uint> parentExpressionIndices);
+
+        struct ExpressionHandler
+        {
+            VFXExpressionOperation operation;
+            OnAddExpression onAddExpression;
+            public ExpressionHandler(VFXExpressionOperation operation, OnAddExpression onAddExpression)
+            {
+                this.operation = operation;
+                this.onAddExpression = onAddExpression;
+            }
+
+            public uint AddExpression(VfxGraphLegacyOutputPass pass, IExpression expression, List<uint> parentExpressionIndices)
+            {
+                return onAddExpression(pass, expression, operation, parentExpressionIndices);
+            }
+        }
+        static uint AddOperationExpression(VfxGraphLegacyOutputPass pass, IExpression expression, VFXExpressionOperation op, List<uint> parentExpressionIndices)
+        {
+            Type resultType = expression.ResultType;
+            var valueType = GetVFXValueTypeFromType(resultType);
+            int[] data = { -1, -1, -1 };
+            for(int i = 0; i < parentExpressionIndices.Count; i++)
+                data[i] = (int)parentExpressionIndices[ i];
+            return pass.AddExpression(op, data[0], data[1], data[2], (int)valueType);
+        }
+
+        static uint AddBuiltinExpression(VfxGraphLegacyOutputPass pass, IExpression expression, VFXExpressionOperation op, List<uint> parentExpressionIndices)
+        {
+            int[] data = { -1, -1, -1, -1 };
+            for(int i = 0; i < parentExpressionIndices.Count; i++)
+                data[i] = (int)parentExpressionIndices[ i];
+            return  pass.AddExpression(op, data[0], data[1], data[2], data[3]);
+        }
+
+        static uint AddValueExpression(VfxGraphLegacyOutputPass pass, IExpression expression, VFXExpressionOperation op, List<uint> parentExpressionIndices)
+        {
+            return pass.AddValueExpression((IValueExpression)expression);
+        }
+
+        ExpressionHandler _valueExpressionHandler = new(VFXExpressionOperation.Value, AddValueExpression);
+
+        static readonly Dictionary<Type, ExpressionHandler> s_PredefinedExpressions = new()
+        {
+            { typeof(DeltaTimeExpression), new ExpressionHandler(VFXExpressionOperation.DeltaTime, AddBuiltinExpression)},
+            { typeof(TotalTimeExpression), new ExpressionHandler(VFXExpressionOperation.TotalTime, AddBuiltinExpression)},
+            { typeof(CosineExpression<float>), new ExpressionHandler(VFXExpressionOperation.Cos, AddOperationExpression)},
+            { typeof(AddExpression<float>), new ExpressionHandler(VFXExpressionOperation.Add, AddOperationExpression)},
+        };
+
+        readonly Dictionary<IDataDescription, uint> m_GpuBufferDescIndices = new();
+        readonly Dictionary<IDataDescription, uint> m_CpuBufferDescIndices = new();
+        readonly Dictionary<DataNodeId, uint> m_ValuesExpressionIndices = new();
+
+        static UnityEngine.VFX.VFXValueType GetVFXValueTypeFromType(System.Type type) => s_ValueTypeConversion.TryGetValue(type, out var valueType) ? valueType : UnityEngine.VFX.VFXValueType.None;
+
+        public VfxGraphLegacyCompilationOutput Execute(ref CompilationContext context)
+        {
+            VfxGraphLegacyCompilationOutput output = new();
+
+            m_currentOutput = output;
+            m_currentOutput.Version = 7;
+
+            AddDataContainerSources(ref context);
+
+            GenerateExpressionSheet(ref context);
+            GenerateBufferDescriptions(ref context);
+            GenerateSystemDescs(ref context);
+
+            output.EventDescs.Add(new() { name = UnityEngine.VFX.VisualEffectAsset.PlayEventName, startSystems = new[] { 0u }, stopSystems = Array.Empty<uint>(), initSystems = Array.Empty<uint>() });
+            output.EventDescs.Add(new() { name = UnityEngine.VFX.VisualEffectAsset.StopEventName, startSystems = Array.Empty<uint>(), stopSystems = new[] { 0u }, initSystems = Array.Empty<uint>() });
+
+            foreach (var buffer in output.CpuBufferDescs)
+            {
+                //Debug.Log("Buffer " + buffer.capacity);
+            }
+
+            Cleanup();
+
+            return output;
+        }
+
+        IValueExpression EvaluateExpressionRecursively(IExpression expression)
+        {
+            List<IValueExpression> parentExpressionValues = new();
+            foreach (var parentExpression in expression.Parents)
+            {
+                var parentExpressionValue = EvaluateExpressionRecursively(parentExpression);
+                parentExpressionValues.Add(parentExpressionValue);
+            }
+            return expression.Evaluate(parentExpressionValues);
+        }
+
+        uint AddExpressionRecursively(IExpression expression)
+        {
+            List<uint> parentExpressionIndices = new();
+            foreach (var parentExpression in expression.Parents)
+            {
+                var parentExpressionValue = AddExpressionRecursively(parentExpression);
+                parentExpressionIndices.Add(parentExpressionValue);
+            }
+
+            uint vfxExpressionIndex;
+            if (s_PredefinedExpressions.TryGetValue(expression.GetType(), out var expressionAdder))
+            {
+                vfxExpressionIndex = expressionAdder.AddExpression(this, expression, parentExpressionIndices);
+            }
+            else if (expression is IValueExpression valueExpression)
+            {
+                vfxExpressionIndex = _valueExpressionHandler.AddExpression(this, valueExpression, parentExpressionIndices);
+            }
+            else
+            {
+                throw new NotImplementedException($"Expression of type {expression.GetType()} is not supported");
+            }
+            return vfxExpressionIndex;
+        }
+
+        void AddDataContainerSources(ref CompilationContext context)
+        {
+            var generatedCodeContainer = context.data.Get<GeneratedCodeContainer>();
+            foreach (var dataContainer in context.graph.DataContainers)
+            {
+                string sourceCode = generatedCodeContainer.Find(dataContainer.Id);
+                if (sourceCode != null)
+                {
+                    AddShaderSourceDesc($"{dataContainer.Name}.hlsl", sourceCode, false);
+                }
+            }
+        }
+
+        void GenerateExpressionSheet(ref CompilationContext context)
+        {
+            foreach (var dataNode in context.graph.DataNodes)
+            {
+                if (dataNode.TaskNode.Task is ExpressionTask expressionTask)
+                {
+                    foreach (var childDataNode in dataNode.Children)
+                    {
+                        if (childDataNode.TaskNode.Task is GpuKernelTask or PlaceholderSystemTask or RenderingTask)
+                        {
+                            uint vfxExpressionIndex = AddExpressionRecursively(expressionTask.Expression);
+                            m_ValuesExpressionIndices.Add(childDataNode.Id, vfxExpressionIndex);
+                        }
+                    }
+                }
+            }
+        }
+
+        void GenerateBufferDescriptions(ref CompilationContext context)
+        {
+            GenerateAttributeBufferDescriptions(ref context);
+            GenerateGraphValuesBufferDescriptions(ref context);
+            GenerateDeadListBuffersDescription(ref context);
+            GenerateSpawnBuffersDescriptions(ref context);
+        }
+
+        void GenerateAttributeBufferDescriptions(ref CompilationContext context)
+        {
+            AttributeSetLayoutCompilationData attributeSetLayouts = context.data.Get<AttributeSetLayoutCompilationData>();
+            foreach (var kvp in attributeSetLayouts)
+            {
+                AttributeData attributeData = kvp.Key;
+                var attributeSetLayout = kvp.Value;
+                uint capacity = attributeSetLayout.Capacity;
+
+                var layoutElementDescs = new List<VFXLayoutElementDesc>();
+                foreach (var attribute in attributeSetLayout.Attributes)
+                {
+                    (uint bucketOffset, uint bucketSize, uint elementOffset) = attributeSetLayout.GetBucketLocation(attribute);
+                    layoutElementDescs.Add(new VFXLayoutElementDesc()
+                    {
+                        name = attribute.Name,
+                        type = GetVFXValueTypeFromType(attribute.Type),
+                        offset = new VFXLayoutOffset()
+                        {
+                            bucket = bucketOffset,
+                            element = elementOffset,
+                            structure = bucketSize
+                        },
+                    });
+                }
+
+                VFXGPUBufferDesc bufferDesc = new VFXGPUBufferDesc()
+                {
+                    target = GraphicsBuffer.Target.Raw,
+                    size = attributeSetLayout.GetBufferSize(),
+                    stride = 4u,
+                    capacity = capacity,
+                    mode = ComputeBufferMode.Immutable,
+                    layout = layoutElementDescs.ToArray(),
+                };
+                uint bufferIndex = AddGPUBufferData(bufferDesc);
+                m_GpuBufferDescIndices[attributeData] = bufferIndex;
+            }
+        }
+
+        void GenerateGraphValuesBufferDescriptions(ref CompilationContext context)
+        {
+            var structuredDataLayoutContainer = context.data.Get<StructuredDataLayoutContainer>();
+
+            foreach (var dataView in context.graph.DataViews)
+            {
+                if (dataView.DataDescription is StructuredData structuredData)
+                {
+                    if (structuredDataLayoutContainer.TryGetLayout(structuredData, out var valueBufferLayout))
+                    {
+                        uint bufferIndex = AddGPUBufferData(new VFXGPUBufferDesc()
+                        {
+                            target = GraphicsBuffer.Target.Raw,
+                            size = valueBufferLayout.GetBufferSize(),
+                            stride = 4u,
+                            mode = ComputeBufferMode.Dynamic,
+                        });
+
+                        m_GpuBufferDescIndices[structuredData] = bufferIndex;
+                    }
+                }
+            }
+        }
+
+        void GenerateDeadListBuffersDescription(ref CompilationContext context)
+        {
+            foreach (var dataView in context.graph.DataViews)
+            {
+                if (dataView.DataDescription is DeadListData deadListData)
+                {
+                    Debug.Assert(dataView.Parent.HasValue);
+                    if (dataView.Parent.Value.DataDescription is ParticleData particleData)
+                    {
+                        uint bufferIndex = AddGPUBufferData(new VFXGPUBufferDesc()
+                        {
+                            target = GraphicsBuffer.Target.Structured,
+                            size = particleData.Capacity + 2,
+                            stride = 4u,
+                            mode = ComputeBufferMode.Dynamic,
+                        });
+
+                        m_GpuBufferDescIndices[deadListData] = bufferIndex;
+                    }
+                }
+            }
+        }
+
+        void GenerateSpawnBuffersDescriptions(ref CompilationContext context)
+        {
+            foreach (var dataView in context.graph.DataViews)
+            {
+                if (dataView.DataDescription is SpawnData spawnData)
+                {
+                    uint bufferIndex = AddGPUBufferData(new VFXGPUBufferDesc()
+                    {
+                        target = GraphicsBuffer.Target.Structured,
+                        size = 2,
+                        stride = 4u,
+                        mode = ComputeBufferMode.Dynamic,
+                    });
+                    m_GpuBufferDescIndices[spawnData] = bufferIndex;
+                }
+            }
+        }
+
+        void GenerateSystemDescs(ref CompilationContext context)
+        {
+            foreach (var taskNode in context.graph.TaskNodes)
+            {
+                if (taskNode.Task is SpawnerTask spawnerTask && GenerateSpawnerSystemDesc(ref context, taskNode, spawnerTask, out var systemDesc))
+                {
+                    m_currentOutput.SystemDescs.Add(systemDesc);
+                }
+            }
+
+            var particleSystemContainer = context.data.Get<VfxGraphLegacyParticleSystemContainer>();
+            foreach (var particleSystem in particleSystemContainer)
+            {
+                if (GenerateParticleSystemDesc(ref context, particleSystem, out var systemDesc))
+                {
+                    m_currentOutput.SystemDescs.Add(systemDesc);
+                }
+            }
+        }
+
+        bool GenerateSpawnerSystemDesc(ref CompilationContext context, TaskNode taskNode, SpawnerTask task, out UnityEditor.VFX.VFXEditorSystemDesc systemDesc)
+        {
+            systemDesc = new();
+
+            SpawnData spawnData = null;
+            foreach (var dataNode in taskNode.DataNodes)
+            {
+                foreach (var dataView in dataNode.UsedDataViews)
+                {
+                    if (dataView.DataDescription is SpawnData spawnDataDescription)
+                    {
+                        spawnData = spawnDataDescription;
+                    }
+                }
+            }
+
+            var cpuData = new UnityEditor.VFX.VFXCPUBufferData();
+            cpuData.PushFloat(1.0f);
+            var spawnerOutputIndex = AddCPUBufferData(new()
+            {
+                capacity = 1u,
+                stride = 1u,
+                initialData = cpuData,
+                layout = new[]
+                    {
+                        new UnityEditor.VFX.VFXLayoutElementDesc()
+                        {
+                            name = VFXAttribute.SpawnCount.name,
+                            offset = new () { bucket = 0u, element = 0u, structure = 1u},
+                            type = UnityEngine.VFX.VFXValueType.Float
+                        }
+                    }
+            });
+            m_CpuBufferDescIndices[spawnData] = spawnerOutputIndex;
+
+            systemDesc.name = task.TemplateName;
+            systemDesc.type = UnityEngine.VFX.VFXSystemType.Spawner;
+
+            List<UnityEditor.VFX.VFXEditorTaskDesc> tasks = new();
+            foreach (var block in task.Blocks)
+            {
+                if (GenerateSpawnerTask(ref context, block, out var taskDesc))
+                {
+                    tasks.Add(taskDesc);
+                }
+            }
+
+            systemDesc.tasks = tasks.ToArray();
+            systemDesc.type = UnityEngine.VFX.VFXSystemType.Spawner;
+            systemDesc.buffers = new[] { new UnityEditor.VFX.VFXMapping("spawner_output", (int)spawnerOutputIndex) };
+            return true;
+        }
+
+        bool GenerateSpawnerTask(ref CompilationContext context, SubtaskDescription block, out UnityEditor.VFX.VFXEditorTaskDesc taskDesc)
+        {
+            taskDesc = new();
+
+            if (block.Name == "ConstantRate") // TODO: remove this hack
+            {
+                var rateExpression = block.Expressions[0].Item2.Evaluate(new ReadOnlyList<IValueExpression>());
+                var enabledExpression = block.Expressions[1].Item2.Evaluate(new ReadOnlyList<IValueExpression>());
+                if (rateExpression != null && enabledExpression != null)
+                {
+                    var vfxEnableIndex = AddValueExpression(enabledExpression);
+                    var rateExpressionIndex = AddValueExpression(rateExpression);
+                    taskDesc = new()
+                    {
+                        type = UnityEngine.VFX.VFXTaskType.ConstantRateSpawner,
+                        values = new UnityEditor.VFX.VFXMapping[]
+                        {
+                            new() { name = "_vfx_enabled", index = (int)vfxEnableIndex },
+                            new() { name = "Rate", index = (int)rateExpressionIndex }
+                        },
+                        shaderSourceIndex = -1,
+                    };
+                    return true;
+                }
+            }
+
+            return false;
+        }
+
+        bool GenerateParticleSystemDesc(ref CompilationContext context, VfxGraphLegacyParticleSystemContainer.ParticleSystem particleSystem, out UnityEditor.VFX.VFXEditorSystemDesc systemDesc)
+        {
+            systemDesc = new();
+            systemDesc.type = UnityEngine.VFX.VFXSystemType.Particle;
+            systemDesc.capacity = particleSystem.Capacity;
+
+            var bufferMappings = GenerateSystemBuffersMappings(context, particleSystem);
+            systemDesc.buffers = bufferMappings;
+
+            List<UnityEditor.VFX.VFXEditorTaskDesc> taskDescs = new();
+            List<UnityEditor.VFX.VFXInstanceSplitDesc> instanceSplitDescs = new();
+            foreach (var task in particleSystem.Tasks)
+            {
+                if (GenerateParticleSystemTask(ref context, task, out var taskDesc))
+                {
+                    taskDescs.Add(taskDesc);
+                }
+                instanceSplitDescs.Add(new UnityEditor.VFX.VFXInstanceSplitDesc()
+                {
+                    values = Array.Empty<uint>(),
+                });
+            }
+            systemDesc.values = GenerateSystemValuesMappings(context, particleSystem);
+            systemDesc.tasks = taskDescs.ToArray();
+            systemDesc.instanceSplitDescs = instanceSplitDescs.ToArray();
+
+            foreach(var dataView in context.graph.DataViews)
+            {
+                if (dataView.DataDescription is DeadListData)
+                {
+                    systemDesc.flags |= VFXSystemFlag.SystemHasKill;
+                    break;
+                }
+
+            }
+
+
+            return true;
+        }
+
+        VFXMapping[] GenerateSystemValuesMappings(CompilationContext context, VfxGraphLegacyParticleSystemContainer.ParticleSystem particleSystem)
+        {
+            var valueMappings = new List<VFXMapping>();
+            var graphValueMappings = new Dictionary<ValueData, VFXMapping>();
+            var taskNode = context.graph.TaskNodes[particleSystem.SystemTask.Id];
+
+            ValueBufferLayout graphValueBufferLayout = new ValueBufferLayout();
+
+            foreach (var dataBinding in taskNode.DataBindings)
+            {
+                if (m_ValuesExpressionIndices.TryGetValue(dataBinding.DataNode.Id, out var index))
+                {
+                    var name = dataBinding.BindingDataKey.ToString();
+                    // Dirty approach for renaming some specific values to match the expected names in the VFX system
+                    switch (name)
+                    {
+                        case "BoundsCenter":
+                            name = "bounds_center";
+                            valueMappings.Add(new VFXMapping(name, (int)index));
+                            continue;
+                        case "BoundsSize":
+                            name = "bounds_size";
+                            valueMappings.Add(new VFXMapping(name, (int)index));
+                            continue;
+                        case "BoundsPadding":
+                            name = "boundsPadding";
+                            valueMappings.Add(new VFXMapping(name, (int)index));
+                            continue;
+                    }
+
+                    graphValueMappings.Add(dataBinding.DataView.DataDescription as ValueData, new VFXMapping(name, (int)index));
+                    graphValueBufferLayout.AddValueData(dataBinding.DataView.DataDescription as ValueData);
+                }
+            }
+            List<VFXMapping> mappings = new();
+            foreach (var mapping in valueMappings)
+            {
+                mappings.Add(mapping);
+            }
+            mappings.Add(new VFXMapping("graphValuesOffset", valueMappings.Count + 1));
+
+            //Need to add the graph value mapping in the order of graph value layout for the runtime to work correctly
+            graphValueBufferLayout.ComputeOffsets();
+            graphValueBufferLayout.GetSortedValueDatas();
+            foreach (var valueData in graphValueBufferLayout.GetSortedValueDatas())
+            {
+                mappings.Add(graphValueMappings[valueData]);
+            }
+            return mappings.ToArray();
+        }
+        VFXMapping[] GenerateSystemBuffersMappings(CompilationContext context, VfxGraphLegacyParticleSystemContainer.ParticleSystem particleSystem)
+        {
+            HashSet<VFXMapping> bufferMappings = new();
+            foreach (var task in particleSystem.Tasks)
+            {
+                var taskNode = context.graph.TaskNodes[task.Id];
+                foreach (var dataBinding in taskNode.DataBindings)
+                {
+                    foreach (var dataView in dataBinding.DataNode.UsedDataViews)
+                    {
+                        if (m_GpuBufferDescIndices.TryGetValue(dataView.DataDescription, out var gpuIndex))
+                        {
+                            //TODO: Get the mapping name from the data view or data binding or something
+                            if(dataView.DataDescription is AttributeData)
+                            {
+                                if(dataBinding.BindingDataKey.ToString().Equals("SpawnDataBinding"))
+                                    bufferMappings.Add(new VFXMapping("sourceAttributeBuffer", (int)gpuIndex));
+                                else if (dataBinding.BindingDataKey.ToString().Equals("ParticleDataBinding"))
+                                    bufferMappings.Add(new VFXMapping("attributeBuffer", (int)gpuIndex));
+                            }
+                            else if(dataView.DataDescription is StructuredData)
+                            {
+                                bufferMappings.Add(new VFXMapping("graphValuesBuffer", (int)gpuIndex));
+                            }
+                            else if (dataView.DataDescription is DeadListData)
+                            {
+                                bufferMappings.Add(new VFXMapping("deadList", (int)gpuIndex));
+                            }
+                            else if (dataView.DataDescription is SpawnData)
+                            {
+                                bufferMappings.Add(new VFXMapping("instancingPrefixSum", (int)gpuIndex));
+                            }
+                        }
+
+                        if (m_CpuBufferDescIndices.TryGetValue(dataView.DataDescription, out var cpuIndex))
+                        {
+                            bufferMappings.Add(new VFXMapping("spawner_input", (int)cpuIndex));
+                        }
+                    }
+                }
+            }
+            return HashSetToArray(bufferMappings);
+        }
+
+        bool GenerateParticleSystemTask(ref CompilationContext context, VfxGraphLegacyParticleSystemContainer.Task task, out UnityEditor.VFX.VFXEditorTaskDesc taskDesc)
+        {
+            taskDesc = new();
+
+            var generatedCodeContainer = context.data.Get<GeneratedCodeContainer>();
+            string sourceCode = generatedCodeContainer.Find(task.Id);
+            bool isCompute = !task.TaskType.HasFlag(UnityEngine.VFX.VFXTaskType.Output);
+            taskDesc.shaderSourceIndex = (int)AddShaderSourceDesc(task.Name, sourceCode, isCompute);
+            taskDesc.type = task.TaskType;
+
+            HashSet<VFXMapping> bufferMappings = new();
+            List<VFXMapping> valueMappings = new();
+            var taskNode = context.graph.TaskNodes[task.Id];
+            foreach (var dataBinding in taskNode.DataBindings)
+            {
+                foreach (var dataView in dataBinding.DataNode.UsedDataViews)
+                {
+                    // TODO: VFXMapping name should be linked to what is done in the description writers
+                    if (m_GpuBufferDescIndices.TryGetValue(dataView.DataDescription, out var gpuIndex))
+                    {
+                        if(dataView.DataDescription is AttributeData)
+                        {
+                            bufferMappings.Add(new VFXMapping($"_{dataView.DataContainer.Name}_attributeBuffer", (int)gpuIndex));
+                        }
+                        else if (dataView.DataDescription is DeadListData)
+                        {
+                            bufferMappings.Add(new VFXMapping($"_{dataView.DataContainer.Name}_deadListBuffer", (int)gpuIndex));
+                        }
+                        else if(dataView.Root.DataDescription is StructuredData)
+                        {
+                            bufferMappings.Add(new VFXMapping($"_{dataView.DataContainer.Name}_buffer", (int)gpuIndex));
+                        }
+                        else if (dataView.DataDescription is SpawnData)
+                        {
+                            bufferMappings.Add(new VFXMapping($"_{dataView.DataContainer.Name}_instancingPrefixSum", (int)gpuIndex));
+                        }
+                    }
+
+                    if (m_ValuesExpressionIndices.TryGetValue(dataBinding.DataNode.Id, out var expressionIndex))
+                    {
+                        string name = dataBinding.BindingDataKey.ToString();
+                        valueMappings.Add(new VFXMapping( name, (int)expressionIndex));
+                    }
+                }
+            }
+            if (taskNode.Task is GpuKernelTask gpuKernelTask)
+            {
+                taskDesc.processor = gpuKernelTask.Shader;
+            }
+            else if (taskNode.Task is RenderingTask renderingTask)
+            {
+                taskDesc.processor = renderingTask.Material;
+            }
+
+            taskDesc.values = valueMappings.ToArray();
+            taskDesc.buffers = HashSetToArray(bufferMappings);
+
+            return true;
+        }
+
+        VFXExpressionValueContainerDesc CreateValueContainerDesc(IValueExpression exp, uint expressionIndex)
+        {
+            Type resultType = exp.ResultType;
+
+            if(resultType == typeof(bool) && exp.TryGetValue<bool>(out var boolVal))
+                return new VFXExpressionValueContainerDesc<bool>() { expressionIndex = expressionIndex, value = boolVal };
+            if (resultType == typeof(float) && exp.TryGetValue<float>(out var floatVal))
+                return new VFXExpressionValueContainerDesc<float>() { expressionIndex = expressionIndex, value = floatVal };
+            if (resultType == typeof(Vector2) && exp.TryGetValue<Vector2>(out var vector2Val))
+                return new VFXExpressionValueContainerDesc<Vector2>() { expressionIndex = expressionIndex, value = vector2Val };
+            if (resultType == typeof(Vector3) && exp.TryGetValue<Vector3>(out var vector3Val))
+                return new VFXExpressionValueContainerDesc<Vector3>() { expressionIndex = expressionIndex, value = vector3Val };
+            if (resultType == typeof(Vector4) && exp.TryGetValue<Vector4>(out var vector4Val))
+                return new VFXExpressionValueContainerDesc<Vector4>() { expressionIndex = expressionIndex, value = vector4Val };
+            if (resultType == typeof(int) && exp.TryGetValue<int>(out var intVal))
+                return new VFXExpressionValueContainerDesc<int>() { expressionIndex = expressionIndex, value = intVal };
+            if (resultType == typeof(uint) && exp.TryGetValue<uint>(out var uintVal))
+                return new VFXExpressionValueContainerDesc<uint>() { expressionIndex = expressionIndex, value = uintVal };
+            if (resultType == typeof(Color) && exp.TryGetValue<Color>(out var colorVal))
+                return new VFXExpressionValueContainerDesc<Vector4>() { expressionIndex = expressionIndex, value = (Vector4)colorVal };
+            if (resultType == typeof(Texture) && exp.TryGetValue<Texture>(out var textureVal))
+                return new VFXExpressionObjectValueContainerDesc<Texture>() { expressionIndex = expressionIndex, entityId = textureVal ? textureVal.GetEntityId() : EntityId.None};
+            if (resultType == typeof(Texture2D) && (exp.TryGetValue<Texture>(out var texture2DVal) || true))
+                return new VFXExpressionObjectValueContainerDesc<Texture>() { expressionIndex = expressionIndex, entityId = texture2DVal ? texture2DVal.GetEntityId() : EntityId.None };
+
+
+            throw new NotSupportedException($"Unsupported result type {resultType}");
+        }
+
+        uint AddExpression(VFXExpressionOperation op, int data0, int data1, int data2, int data3)
+        {
+            UnityEditor.VFX.VFXExpressionDesc vfxExpression = new(){ op = op };
+            vfxExpression.data = new[] { data0, data1, data2, data3 };
+            var vfxExpressionIndex = (uint)m_currentOutput.SheetExpressions.Count;
+            m_currentOutput.SheetExpressions.Add(vfxExpression);
+
+            return vfxExpressionIndex;
+        }
+
+        uint AddValueExpression(IValueExpression exp)
+        {
+            Debug.Assert(exp != null);
+            Type resultType = exp.ResultType;
+            if (!s_ValueTypeConversion.ContainsKey(resultType))
+                throw new NotSupportedException($"Unsupported result type {resultType}");
+
+            var valueType = GetVFXValueTypeFromType(resultType);
+
+            uint vfxExpressionIndex = AddExpression(VFXExpressionOperation.Value, -1, -1, -1, (int)valueType);
+
+            m_currentOutput.SheetValues.Add(CreateValueContainerDesc(exp, vfxExpressionIndex));
+            return vfxExpressionIndex;
+        }
+
+        uint AddCPUBufferData(UnityEditor.VFX.VFXCPUBufferDesc data)
+        {
+            uint bufferDataIndex = (uint)m_currentOutput.CpuBufferDescs.Count;
+            m_currentOutput.CpuBufferDescs.Add(data);
+            return bufferDataIndex;
+        }
+
+        uint AddGPUBufferData(UnityEditor.VFX.VFXGPUBufferDesc data)
+        {
+            uint bufferDataIndex = (uint)m_currentOutput.GpuBufferDescs.Count;
+            m_currentOutput.GpuBufferDescs.Add(data);
+            return bufferDataIndex;
+        }
+
+        uint AddShaderSourceDesc(string name, string sourceCode, bool isCompute)
+        {
+            uint shaderSourceIndex = (uint)m_currentOutput.ShaderSourceDescs.Count;
+
+            UnityEditor.VFX.VFXShaderSourceDesc shaderSourceDesc = new();
+            shaderSourceDesc.name = name;
+            shaderSourceDesc.source = sourceCode;
+            shaderSourceDesc.compute = isCompute;
+
+            m_currentOutput.ShaderSourceDescs.Add(shaderSourceDesc);
+            return shaderSourceIndex;
+        }
+
+        void Cleanup()
+        {
+            m_GpuBufferDescIndices.Clear();
+            m_CpuBufferDescIndices.Clear();
+            m_ValuesExpressionIndices.Clear();
+            m_currentOutput = null;
+        }
+
+        T[] HashSetToArray<T>(HashSet<T> hashSet)
+        {
+            T[] array = new T[hashSet.Count];
+            int index = 0;
+            foreach (T value in hashSet)
+            {
+                array[index++] = value;
+            }
+            return array;
+        }
+    }
+}
diff --git a/Packages/com.unity.visualeffectgraph/Editor/NewCompiler/Passes/VfxGraphLegacyOutputPass.cs.meta b/Packages/com.unity.visualeffectgraph/Editor/NewCompiler/Passes/VfxGraphLegacyOutputPass.cs.meta
new file mode 100644
index 00000000000..86a61c5f701
--- /dev/null
+++ b/Packages/com.unity.visualeffectgraph/Editor/NewCompiler/Passes/VfxGraphLegacyOutputPass.cs.meta
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: e2b16d4155921934abe1000781c80c8b
\ No newline at end of file
diff --git a/Packages/com.unity.visualeffectgraph/Editor/NewCompiler/Passes/VfxGraphLegacyParticleSystemPass.cs b/Packages/com.unity.visualeffectgraph/Editor/NewCompiler/Passes/VfxGraphLegacyParticleSystemPass.cs
new file mode 100644
index 00000000000..2dfc07feca1
--- /dev/null
+++ b/Packages/com.unity.visualeffectgraph/Editor/NewCompiler/Passes/VfxGraphLegacyParticleSystemPass.cs
@@ -0,0 +1,133 @@
+using Unity.GraphCommon.LowLevel.Editor;
+using System.Collections;
+using System.Collections.Generic;
+
+namespace UnityEditor.VFX
+{
+    class VfxGraphLegacyParticleSystemPass : CompilationPass
+    {
+        public bool Execute(ref CompilationContext context)
+        {
+            var particleSystemContainer = context.data.GetOrCreate<VfxGraphLegacyParticleSystemContainer>();
+            var traverser = context.graph.CreateTraverser();
+
+            List<DataViewId> particleDataViewIds = new(); //TODO: Temp
+
+            foreach (var taskNode in context.graph.TaskNodes)
+            {
+                if (taskNode.Task is PlaceholderSystemTask systemTask)
+                {
+                    var particleDataView = taskNode.DataBindings[0].DataView;
+                    if (particleDataView.DataDescription is ParticleData particleData)
+                    {
+                        var particleSystem = new VfxGraphLegacyParticleSystemContainer.ParticleSystem($"ParticleSystem{particleSystemContainer.Count + 1}");
+                        particleSystem.Capacity = particleData.Capacity;
+                        CollectTasks(traverser, taskNode, particleSystem);
+                        particleSystemContainer.Add(particleSystem);
+
+                        if (particleDataView.FindSubData(ParticleData.AttributeDataKey, out var attributeDataView))
+                        {
+                            var attributeData = attributeDataView.DataDescription as AttributeData;
+                            var layoutCompilationData = context.data.Get<AttributeSetLayoutCompilationData>();
+                            var layout = layoutCompilationData[attributeData];
+                            if (layout.ContainsAttribute(VFXAttributesManager.ConvertToNewCompiler(VFXAttribute.Alive)))
+                            {
+                                particleDataViewIds.Add(particleDataView.Id); // TODO: Temp, get deadlist subdata here directly, when data change does not invalidate task iterators
+                            }
+                        }
+                    }
+                }
+            }
+            // TODO: Temp
+            foreach(var particleDataViewId in particleDataViewIds)
+            {
+                var deadListDataId = context.graph.GetSubdata(particleDataViewId, ParticleData.DeadlistKey);
+                if(deadListDataId.IsValid)
+                    context.graph.OverrideDataDescription(deadListDataId, new DeadListData());
+            }
+            return true;
+        }
+
+        void CollectTasks(GraphTraverser traverser, TaskNode rootTaskNode, VfxGraphLegacyParticleSystemContainer.ParticleSystem particleSystem)
+        {
+            foreach (var taskNode in traverser.TraverseTaskDownwards(rootTaskNode))
+            {
+                if (taskNode.Task is TemplatedTask templatedTask)
+                {
+                    UnityEngine.VFX.VFXTaskType taskType = UnityEngine.VFX.VFXTaskType.None;
+                    switch (templatedTask.TemplateName)
+                    {
+                        case "Init":
+                            taskType = UnityEngine.VFX.VFXTaskType.Initialize;
+                            break;
+                        case "Update":
+                            taskType = UnityEngine.VFX.VFXTaskType.Update;
+                            break;
+                        case "Output":
+                            taskType = UnityEngine.VFX.VFXTaskType.ParticleQuadOutput;
+                            break;
+                        default:
+                            continue;
+                    }
+                    var task = new VfxGraphLegacyParticleSystemContainer.Task(templatedTask.TemplateName, taskNode.Id, taskType);
+                    particleSystem.Tasks.Add(task);
+                }
+
+                if (taskNode.Task is PlaceholderSystemTask)
+                {
+                    var task = new VfxGraphLegacyParticleSystemContainer.Task("System", taskNode.Id, UnityEngine.VFX.VFXTaskType.None);
+                    particleSystem.SetSystemTask(task);
+                }
+            }
+        }
+    }
+
+    class VfxGraphLegacyParticleSystemContainer : IEnumerable, IEnumerable<VfxGraphLegacyParticleSystemContainer.ParticleSystem>
+    {
+        readonly List<ParticleSystem> m_ParticleSystems = new();
+
+        public int Count => m_ParticleSystems.Count;
+
+        public void Add(ParticleSystem particleSystem)
+        {
+            m_ParticleSystems.Add(particleSystem);
+        }
+
+        IEnumerator IEnumerable.GetEnumerator() => GetEnumerator();
+        IEnumerator<ParticleSystem> IEnumerable<ParticleSystem>.GetEnumerator() => GetEnumerator();
+        public List<ParticleSystem>.Enumerator GetEnumerator() => m_ParticleSystems.GetEnumerator();
+
+        public class ParticleSystem
+        {
+            public string Name { get; }
+            public uint Capacity { get; set; }
+            public List<Task> Tasks { get; } = new();
+
+            public Task SystemTask { get; private set; }
+
+            public void SetSystemTask(Task systemTask)
+            {
+                SystemTask = systemTask;
+            }
+
+            public ParticleSystem(string name)
+            {
+                Name = name;
+            }
+        }
+
+        public struct Task
+        {
+            public string Name { get; }
+            public TaskNodeId Id { get; }
+            public UnityEngine.VFX.VFXTaskType TaskType { get; }
+
+            public Task(string name, TaskNodeId id, UnityEngine.VFX.VFXTaskType taskType)
+            {
+                Name = name;
+                Id = id;
+                TaskType = taskType;
+            }
+        }
+    }
+}
diff --git a/Packages/com.unity.visualeffectgraph/Editor/NewCompiler/Passes/VfxGraphLegacyParticleSystemPass.cs.meta b/Packages/com.unity.visualeffectgraph/Editor/NewCompiler/Passes/VfxGraphLegacyParticleSystemPass.cs.meta
new file mode 100644
index 00000000000..a3b5b461b30
--- /dev/null
+++ b/Packages/com.unity.visualeffectgraph/Editor/NewCompiler/Passes/VfxGraphLegacyParticleSystemPass.cs.meta
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: 3f69622ea111c23428879149dd2d1b5b
\ No newline at end of file
diff --git a/Packages/com.unity.visualeffectgraph/Editor/NewCompiler/Passes/VfxGraphLegacyTemplatedTaskPass.cs b/Packages/com.unity.visualeffectgraph/Editor/NewCompiler/Passes/VfxGraphLegacyTemplatedTaskPass.cs
new file mode 100644
index 00000000000..857ad998bcc
--- /dev/null
+++ b/Packages/com.unity.visualeffectgraph/Editor/NewCompiler/Passes/VfxGraphLegacyTemplatedTaskPass.cs
@@ -0,0 +1,111 @@
+using System.Collections.Generic;
+using Unity.GraphCommon.LowLevel.Editor;
+using UnityEngine;
+
+namespace UnityEditor.VFX
+{
+    class VfxGraphLegacyTemplatedTaskPass : CompilationPass
+    {
+        struct TemplatedTaskNodeCache
+        {
+            public TaskNodeId taskNodeId;
+            public TemplatedTask task;
+        }
+        struct SystemTaskNodeCache
+        {
+            public TaskNodeId taskNodeId;
+            public PlaceholderSystemTask task;
+        }
+        public bool Execute(ref CompilationContext context)
+        {
+            Dictionary<ParticleData, List<TemplatedTaskNodeCache>> taskNodesGroups = new();
+            Dictionary<ParticleData, SystemTaskNodeCache> systemTasks = new();
+            foreach (var taskNode in context.graph.TaskNodes)
+            {
+                if (taskNode.Task is TemplatedTask or PlaceholderSystemTask)
+                {
+                    foreach (var dataNode in taskNode.DataNodes)
+                    {
+                        if (dataNode.DataContainer.RootDataView.DataDescription is ParticleData particleData)
+                        {
+                            if (taskNode.Task is TemplatedTask templatedTask)
+                            {
+                                if (!taskNodesGroups.ContainsKey(particleData))
+                                {
+                                    taskNodesGroups.Add(particleData, new());
+                                }
+
+                                taskNodesGroups[particleData].Add(new() { taskNodeId = taskNode.Id, task = templatedTask });
+                            }
+                            else if (taskNode.Task is PlaceholderSystemTask systemTask)
+                            {
+                                systemTasks.Add(particleData, new() { taskNodeId = taskNode.Id, task = systemTask });
+                            }
+                        }
+                    }
+                }
+            }
+
+            foreach (var particleData in systemTasks.Keys)
+            {
+                var systemTask = systemTasks[particleData];
+
+                StructuredData graphValuesBuffer = new StructuredData();
+                var graphValuesId = context.graph.AddData("GraphValuesBuffer", graphValuesBuffer);
+                context.graph.BindData(systemTask.taskNodeId, TemplatedTask.GraphValuesKey, graphValuesId, BindingUsage.Write);
+
+                // Add a default subdata for ContextData, which is expected from the C++ runtime.
+                graphValuesBuffer.AddSubdata(TemplatedTask.ContextDataKey, ValueData.Create(typeof(Vector4)));
+
+                foreach (var taskNode in taskNodesGroups[particleData])
+                {
+                    foreach (var (subDatakey, expression) in taskNode.task.Expressions)
+                    {
+                        if (graphValuesBuffer.GetSubdata(subDatakey) != null) continue; //Duplicate subdata, skip
+
+                        var inputDataViewId = BuildExpressionGraph(context.graph, expression);
+
+                        if (expression.IsConstant || typeof(Texture).IsAssignableFrom(expression.ResultType)) // Do not go through graphValues
+                        {
+                            context.graph.BindData(taskNode.taskNodeId, subDatakey, inputDataViewId, BindingUsage.Read);
+                        }
+                        else
+                        {
+                            if (graphValuesBuffer.AddSubdata(subDatakey, ValueData.Create(expression.ResultType)))
+                            {
+                                context.graph.BindData(systemTask.taskNodeId, subDatakey, inputDataViewId, BindingUsage.Read);
+                            }
+                            var subdataViewId = context.graph.GetSubdata(graphValuesId, subDatakey);
+                            context.graph.BindData(taskNode.taskNodeId, subDatakey, subdataViewId, BindingUsage.Read);
+                        }
+                    }
+                    var contextDataViewId = context.graph.GetSubdata(graphValuesId, TemplatedTask.ContextDataKey);
+                    context.graph.BindData(taskNode.taskNodeId, TemplatedTask.ContextDataKey,  contextDataViewId, BindingUsage.Read);
+                }
+                foreach (var (subDatakey, expression) in systemTask.task.Expressions)
+                {
+                    var inputDataViewId = BuildExpressionGraph(context.graph, expression);
+                    context.graph.BindData(systemTask.taskNodeId, subDatakey, inputDataViewId, BindingUsage.Read);
+                }
+            }
+
+            return true;
+        }
+
+        private DataViewId BuildExpressionGraph(IMutableGraph graph, IExpression expression)
+        {
+            // TODO: This is duplicated code (see BlockBuilder). Find a proper place for expression graph
+            // TODO: Cache expressions per-task?
+            var taskId = graph.AddTask(new ExpressionTask(expression));
+            var parents = expression.Parents;
+            for (int i = 0; i < parents.Count; ++i)
+            {
+                graph.BindData(taskId, new IndexDataKey(i),BuildExpressionGraph(graph, parents[i]), BindingUsage.Read);
+            }
+            var dataDescription = expression is IValueExpression valueExpression && expression.IsConstant ? ConstantValueData.Create(valueExpression.Value, expression.ResultType) : ValueData.Create(expression.ResultType);
+            var dataId = graph.AddData(expression.GetType().Name, dataDescription);
+            graph.BindData(taskId, ExpressionTask.Value, dataId, BindingUsage.Write);
+            return dataId;
+        }
+    }
+}
diff --git a/Packages/com.unity.visualeffectgraph/Editor/NewCompiler/Passes/VfxGraphLegacyTemplatedTaskPass.cs.meta b/Packages/com.unity.visualeffectgraph/Editor/NewCompiler/Passes/VfxGraphLegacyTemplatedTaskPass.cs.meta
new file mode 100644
index 00000000000..f2ded974733
--- /dev/null
+++ b/Packages/com.unity.visualeffectgraph/Editor/NewCompiler/Passes/VfxGraphLegacyTemplatedTaskPass.cs.meta
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: 534c436956f747047bf69f9d1cf6dd21
\ No newline at end of file
diff --git a/Packages/com.unity.visualeffectgraph/Editor/NewCompiler/Tasks.meta b/Packages/com.unity.visualeffectgraph/Editor/NewCompiler/Tasks.meta
new file mode 100644
index 00000000000..8687f13c27b
--- /dev/null
+++ b/Packages/com.unity.visualeffectgraph/Editor/NewCompiler/Tasks.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 6ef846450a0cbe443aa039caa5835f2c
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Packages/com.unity.visualeffectgraph/Editor/NewCompiler/Tasks/PlaceholderTask.cs b/Packages/com.unity.visualeffectgraph/Editor/NewCompiler/Tasks/PlaceholderTask.cs
new file mode 100644
index 00000000000..683124b7027
--- /dev/null
+++ b/Packages/com.unity.visualeffectgraph/Editor/NewCompiler/Tasks/PlaceholderTask.cs
@@ -0,0 +1,73 @@
+using System.Collections.Generic;
+using Unity.GraphCommon.LowLevel.Editor;
+
+namespace UnityEditor.VFX
+{
+    class PlaceholderSystemTask : ITask
+    {
+        Dictionary<IDataKey, BindingUsagePaths> m_BindingToUsage = new();
+
+        private List<KeyValuePair<IDataKey, IExpression>> m_Expressions = new();
+
+        /// <inheritdoc />
+        public IEnumerable<KeyValuePair<IDataKey, IExpression>> Expressions => m_Expressions;
+
+        public PlaceholderSystemTask(IEnumerable<(IDataKey bindingKey, IExpression expression)> inputExpressions,
+            IEnumerable<BindingRelativePath> bindingUsages)
+        {
+            foreach (var (bindingKey, expression) in inputExpressions)
+            {
+                m_Expressions.Add(new KeyValuePair<IDataKey, IExpression>(bindingKey, expression));
+                if (!m_BindingToUsage.ContainsKey(bindingKey))
+                {
+                    m_BindingToUsage.Add(bindingKey, new());
+                }
+
+                m_BindingToUsage[bindingKey].Read.Add(DataPath.Empty);
+            }
+
+            foreach (var bindingUsage in bindingUsages)
+            {
+                if (!m_BindingToUsage.ContainsKey(bindingUsage.BindingKey))
+                {
+                    m_BindingToUsage.Add(bindingUsage.BindingKey, new());
+                }
+
+                m_BindingToUsage[bindingUsage.BindingKey].Write.Add(bindingUsage.SubDataPath);
+            }
+        }
+        public bool GetDataUsage(IDataKey dataKey, out DataPathSet readUsage, out DataPathSet writeUsage)
+        {
+            if (m_BindingToUsage.ContainsKey(dataKey))
+            {
+                readUsage = m_BindingToUsage[dataKey].Read;
+                writeUsage = m_BindingToUsage[dataKey].Write;
+                return true;
+            }
+
+            readUsage = null;
+            writeUsage = null;
+            return false;
+        }
+
+        /// <inheritdoc />
+        public bool GetBindingUsage(IDataKey dataKey, out BindingUsage usage)
+        {
+            if(GetDataUsage(dataKey, out var readUsage, out var writeUsage))
+            {
+                usage = BindingUsage.Unknown;
+                if (readUsage != null && !readUsage.Empty)
+                {
+                    usage |= BindingUsage.Read;
+                }
+                if (writeUsage != null && !writeUsage.Empty)
+                {
+                    usage |= BindingUsage.Write;
+                }
+                return true;
+            }
+            usage = BindingUsage.Unknown;
+            return true;
+        }
+    }
+}
diff --git a/Packages/com.unity.visualeffectgraph/Editor/NewCompiler/Tasks/PlaceholderTask.cs.meta b/Packages/com.unity.visualeffectgraph/Editor/NewCompiler/Tasks/PlaceholderTask.cs.meta
new file mode 100644
index 00000000000..7afda84d955
--- /dev/null
+++ b/Packages/com.unity.visualeffectgraph/Editor/NewCompiler/Tasks/PlaceholderTask.cs.meta
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: ef276cfadd804c31b4c1b548673fe997
\ No newline at end of file
diff --git a/Packages/com.unity.visualeffectgraph/Editor/NewCompiler/Tasks/SpawnerTask.cs b/Packages/com.unity.visualeffectgraph/Editor/NewCompiler/Tasks/SpawnerTask.cs
new file mode 100644
index 00000000000..1be6483dd35
--- /dev/null
+++ b/Packages/com.unity.visualeffectgraph/Editor/NewCompiler/Tasks/SpawnerTask.cs
@@ -0,0 +1,53 @@
+using System.Collections.Generic;
+using Unity.GraphCommon.LowLevel.Editor;
+
+namespace UnityEditor.VFX
+{
+    /// <summary>
+    /// Represents a task generated using a template and a list of snippets.
+    /// </summary>
+    /*public*/ class SpawnerTask : ITask
+    {
+        /// <summary>
+        /// Gets the name of the template associated with the task.
+        /// </summary>
+        public string TemplateName { get; }
+
+        /// <summary>
+        /// Gets the collection of task snippets that compose the task.
+        /// </summary>
+        public List<SubtaskDescription> Blocks { get; } = new();
+
+        IDataKey m_SpawnDataKey;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="TemplatedTask"/> class using the specified template name
+        /// and task snippets.
+        /// </summary>
+        /// <param name="templateName">The name of the template associated with the task.</param>
+        /// <param name="blocks">The initial collection of <see cref="SubtaskDescription"/> objects that compose the task.</param>
+        /// <param name="spawnDataKey"> The data key for the spawn data</param>
+        public SpawnerTask(string templateName, IEnumerable<SubtaskDescription> blocks, IDataKey spawnDataKey)
+        {
+            TemplateName = templateName;
+            Blocks.AddRange(blocks);
+            m_SpawnDataKey = spawnDataKey;
+        }
+
+        /// <inheritdoc />
+        public bool GetDataUsage(IDataKey dataKey, out DataPathSet readUsage, out DataPathSet writeUsage)
+        {
+            if (dataKey.Equals(m_SpawnDataKey))
+            {
+                readUsage = new DataPathSet();
+                writeUsage = new DataPathSet();
+                writeUsage.Add(DataPath.Empty);
+                writeUsage.Add(new DataPath(SpawnData.SourceAttributeDataKey));
+                return true;
+            }
+            readUsage = null;
+            writeUsage = null;
+            return false;
+        }
+    }
+}
diff --git a/Packages/com.unity.visualeffectgraph/Editor/NewCompiler/Tasks/SpawnerTask.cs.meta b/Packages/com.unity.visualeffectgraph/Editor/NewCompiler/Tasks/SpawnerTask.cs.meta
new file mode 100644
index 00000000000..ce5ababc01d
--- /dev/null
+++ b/Packages/com.unity.visualeffectgraph/Editor/NewCompiler/Tasks/SpawnerTask.cs.meta
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: 772e5f6a15f31134395321277cd1cedd
\ No newline at end of file
diff --git a/Packages/com.unity.visualeffectgraph/Editor/NewCompiler/VfxGraphCompiler.cs b/Packages/com.unity.visualeffectgraph/Editor/NewCompiler/VfxGraphCompiler.cs
new file mode 100644
index 00000000000..5ce1d1935b1
--- /dev/null
+++ b/Packages/com.unity.visualeffectgraph/Editor/NewCompiler/VfxGraphCompiler.cs
@@ -0,0 +1,52 @@
+using Unity.GraphCommon.LowLevel.Editor;
+using UnityEngine.VFX;
+
+namespace UnityEditor.VFX
+{
+    class VfxGraphCompiler
+    {
+        private Compiler<VfxGraphLegacyCompilationOutput> m_GraphCompiler;
+
+        private DataDescriptionWriterRegistry m_DataWriter;
+
+        public VfxGraphCompiler()
+        {
+            var attributeDataWriter = new AttributeDataDescriptionWriter();
+
+            m_DataWriter = new();
+            m_DataWriter.Register(attributeDataWriter);
+            m_DataWriter.Register(new ParticleSystemDataDescriptionWriter(attributeDataWriter));
+            m_DataWriter.Register(new StructuredDataDescriptionWriter());
+            m_DataWriter.Register(new SpawnerDataDescriptionWriter());
+
+            m_GraphCompiler = new(new VfxGraphLegacyOutputPass(),
+                new VfxGraphLegacyTemplatedTaskPass(),
+                new AttributeLayoutPass(),
+                new VfxGraphLegacyParticleSystemPass(),
+                new StructuredDataLayoutPass(),
+                new TemplateCodeGenerationPass(m_DataWriter));
+        }
+
+        public VFXGraphCompiledData.VFXCompileOutput Compile(VFXGraph graph, VFXCompilationMode compilationMode, bool generateShadersDebugSymbols)
+        {
+            var intermediateGraph = BuildGraph(graph);
+
+            // TODO: setup compilation mode and shader debug symbols
+            var compilationResult = m_GraphCompiler.Compile(intermediateGraph);
+
+            VFXGraphCompiledData.VFXCompileOutput output = new()
+            {
+                success = true, // TODO
+                sourceDependencies = new(), // TODO
+                assetDesc = compilationResult.result.GenerateAssetDesc()
+            };
+
+            return output;
+        }
+
+        IReadOnlyGraph BuildGraph(VFXGraph graph)
+        {
+            return new TaskGraph();
+        }
+    }
+}
diff --git a/Packages/com.unity.visualeffectgraph/Editor/NewCompiler/VfxGraphCompiler.cs.meta b/Packages/com.unity.visualeffectgraph/Editor/NewCompiler/VfxGraphCompiler.cs.meta
new file mode 100644
index 00000000000..73070baacf8
--- /dev/null
+++ b/Packages/com.unity.visualeffectgraph/Editor/NewCompiler/VfxGraphCompiler.cs.meta
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: ab7da1aea48a56a4f84fa62cab43ecea
\ No newline at end of file
diff --git a/Packages/com.unity.visualeffectgraph/Editor/ShaderGraph/VFXSubTarget.cs b/Packages/com.unity.visualeffectgraph/Editor/ShaderGraph/VFXSubTarget.cs
index b45f105ac4e..80110192b38 100644
--- a/Packages/com.unity.visualeffectgraph/Editor/ShaderGraph/VFXSubTarget.cs
+++ b/Packages/com.unity.visualeffectgraph/Editor/ShaderGraph/VFXSubTarget.cs
@@ -407,6 +407,38 @@ static KeywordCollection ApplyKeywordModifier(KeywordCollection keywords, VFXSRP
             return keywords;
         }
 
+        static (KeywordCollection keywords, DefineCollection defines) ApplyKeywordToDefines(KeywordCollection inputKeywords, DefineCollection inputDefines, VFXSRPBinder.ShaderGraphBinder shaderGraphSRPInfo)
+        {
+            if (inputKeywords != null)
+            {
+                var keywordsToDefines = shaderGraphSRPInfo.keywordsToDefines;
+                if(keywordsToDefines == null || keywordsToDefines.Length == 0)
+                    return (inputKeywords, inputDefines);
+
+                var overridenKeywords = new KeywordCollection();
+                var overridenDefines = inputDefines != null ? new DefineCollection(inputDefines) : new DefineCollection();
+                foreach (var inputKeyword in inputKeywords)
+                {
+                    bool hasReplacement = false;
+                    foreach (var replacementCandidate in keywordsToDefines)
+                    {
+                        if (replacementCandidate.oldDesc.referenceName == inputKeyword.descriptor.referenceName)
+                        {
+                            hasReplacement = true;
+                            overridenDefines.Add(replacementCandidate.oldDesc, replacementCandidate.value);
+                            break;
+                        }
+                    }
+                    if(!hasReplacement)
+                    {
+                        overridenKeywords.Add(inputKeyword.descriptor, inputKeyword.fieldConditions);
+                    }
+                }
+                return (overridenKeywords, overridenDefines);
+            }
+            return (inputKeywords, inputDefines);
+        }
+
         static DefineCollection ApplyDefineModifier(DefineCollection inputDefines, VFXSRPBinder.ShaderGraphBinder shaderGraphSRPInfo, VFXTaskCompiledData data)
         {
             var defineReplacement = k_CommonDefineReplacement;
@@ -490,33 +522,22 @@ internal static SubShaderDescriptor PostProcessSubShader(SubShaderDescriptor sub
                 out var fragInputsDescriptor
             );
 
-            // Omit META and MV or Shadow Pass if disabled on the context.
-            var filteredPasses = subShaderDescriptor.passes.AsEnumerable();
-
-            filteredPasses = filteredPasses.Where(o => o.descriptor.lightMode != "META");
-            var outputContext = (VFXAbstractParticleOutput)context;
-            if (!outputContext.hasMotionVector)
-                filteredPasses = filteredPasses.Where(o => o.descriptor.lightMode != "MotionVectors");
-
-            if (!outputContext.hasShadowCasting)
-                filteredPasses = filteredPasses.Where(o => o.descriptor.lightMode != "ShadowCaster");
-
-            // SPACEWARP DOES NOT SUPPORT VFX GRAPH FOR NOW, SO WE DISABLE IT HERE
-            filteredPasses = filteredPasses.Where(o => o.descriptor.lightMode != "XRMotionVectors");
-
-            var passes = filteredPasses.ToArray();
+            var passes = srp.FilterOutPasses(subShaderDescriptor.passes, context);
 
             var addPragmaRequireCubeArray = data.uniformMapper.textures.Any(o => o.valueType == VFXValueType.TextureCubeArray);
 
             PassCollection vfxPasses = new PassCollection();
             var cachedVFXInterpolators = GetVFXInterpolators(context, data).ToList();
-            for (int i = 0; i < passes.Length; i++)
+            for (int i = 0; i < passes.Count; i++)
             {
                 var passDescriptor = passes[i].descriptor;
 
                 passDescriptor.pragmas = ApplyPragmaModifier(passDescriptor.pragmas, shaderGraphSRPInfo, addPragmaRequireCubeArray);
                 passDescriptor.keywords = ApplyKeywordModifier(passDescriptor.keywords, shaderGraphSRPInfo);
                 passDescriptor.defines = ApplyDefineModifier(passDescriptor.defines, shaderGraphSRPInfo, data);
+                var (keywords, defines) = ApplyKeywordToDefines(passDescriptor.keywords, passDescriptor.defines, shaderGraphSRPInfo);
+                passDescriptor.keywords = keywords;
+                passDescriptor.defines = defines;
 
                 // Warning: We are replacing the struct provided in the regular pass. It is ok as for now the VFX editor don't support
                 // tessellation or raytracing
diff --git a/Packages/com.unity.visualeffectgraph/Editor/Utilities/EventTester/VFXEventTesterWindow.cs b/Packages/com.unity.visualeffectgraph/Editor/Utilities/EventTester/VFXEventTesterWindow.cs
index 2f548b0c9d5..9b73f6b71de 100644
--- a/Packages/com.unity.visualeffectgraph/Editor/Utilities/EventTester/VFXEventTesterWindow.cs
+++ b/Packages/com.unity.visualeffectgraph/Editor/Utilities/EventTester/VFXEventTesterWindow.cs
@@ -53,9 +53,7 @@ private void OnSelectionChanged()
 
         static bool s_Visible;
 
-        [SerializeField]
         static string m_CustomEvent = "CustomEvent";
-        [SerializeField]
         static List<EventAttribute> m_Attributes;
 
         static VisualEffect[] m_Effects;
@@ -145,7 +143,6 @@ static void AddColor(object name)
             m_Attributes.Add(new EventAttribute(name as string, EventAttributeType.Color, Color.white));
         }
 
-        [System.Serializable]
         enum EventAttributeType
         {
             Float = 0,
@@ -155,7 +152,6 @@ enum EventAttributeType
             Bool = 4
         }
 
-        [System.Serializable]
         class EventAttribute
         {
             public string name;
diff --git a/Packages/com.unity.visualeffectgraph/Runtime/Utilities/EventBinding/VFXEventBinderBase.cs b/Packages/com.unity.visualeffectgraph/Runtime/Utilities/EventBinding/VFXEventBinderBase.cs
index 7b66966e914..c9af4d7e9f9 100644
--- a/Packages/com.unity.visualeffectgraph/Runtime/Utilities/EventBinding/VFXEventBinderBase.cs
+++ b/Packages/com.unity.visualeffectgraph/Runtime/Utilities/EventBinding/VFXEventBinderBase.cs
@@ -10,7 +10,6 @@ abstract class VFXEventBinderBase : MonoBehaviour
         protected VisualEffect target;
         public string EventName = "Event";
 
-        [SerializeField, HideInInspector]
         protected VFXEventAttribute eventAttribute;
 
         protected virtual void OnEnable()
diff --git a/Packages/com.unity.visualeffectgraph/Samples~/Common/Meshes/Chomper.FBX b/Packages/com.unity.visualeffectgraph/Samples~/Common/Meshes/Chomper.fbx
similarity index 100%
rename from Packages/com.unity.visualeffectgraph/Samples~/Common/Meshes/Chomper.FBX
rename to Packages/com.unity.visualeffectgraph/Samples~/Common/Meshes/Chomper.fbx
diff --git a/Packages/com.unity.visualeffectgraph/Shaders/ParticleLines/PassSelection.template b/Packages/com.unity.visualeffectgraph/Shaders/ParticleLines/PassSelection.template
index e541a13edb8..e93cac6897a 100644
--- a/Packages/com.unity.visualeffectgraph/Shaders/ParticleLines/PassSelection.template
+++ b/Packages/com.unity.visualeffectgraph/Shaders/ParticleLines/PassSelection.template
@@ -1,5 +1,6 @@
 Pass
-{		
+{
+    Name "SceneSelectionPass"
 	Tags { "LightMode"="SceneSelectionPass" }
 
 	ZWrite On
@@ -12,7 +13,8 @@ Pass
 }
 
 Pass
-{		
+{
+    Name "Picking"
 	Tags { "LightMode"="Picking" }
 
 	ZWrite On
diff --git a/Packages/com.unity.visualeffectgraph/package.json b/Packages/com.unity.visualeffectgraph/package.json
index 2aa47f4d9a8..18d74fd7e73 100644
--- a/Packages/com.unity.visualeffectgraph/package.json
+++ b/Packages/com.unity.visualeffectgraph/package.json
@@ -1,8 +1,8 @@
 {
   "name": "com.unity.visualeffectgraph",
   "displayName": "Visual Effect Graph",
-  "version": "17.5.0",
-  "unity": "6000.5",
+  "version": "17.6.0",
+  "unity": "6000.6",
   "description": "The Visual Effect Graph is a node based visual effect editor. It allows you to author next generation visual effects that Unity simulates directly on the GPU. The Visual Effect Graph is production-ready for the High Definition Render Pipeline and runs on all platforms supported by it. Full support for the Universal Render Pipeline and compatible mobile devices is still in development.",
   "keywords": [
     "vfx",
@@ -12,8 +12,8 @@
     "particles"
   ],
   "dependencies": {
-    "com.unity.shadergraph": "17.5.0",
-    "com.unity.render-pipelines.core": "17.5.0"
+    "com.unity.shadergraph": "17.6.0",
+    "com.unity.render-pipelines.core": "17.6.0"
   },
   "samples": [
     {
diff --git a/Tests/SRPTests/Packages/com.unity.testing.xr/.buginfo b/Tests/SRPTests/Packages/com.unity.testing.xr/.buginfo
index 701b4cbc25d..f6d9eecbd20 100644
--- a/Tests/SRPTests/Packages/com.unity.testing.xr/.buginfo
+++ b/Tests/SRPTests/Packages/com.unity.testing.xr/.buginfo
@@ -1 +1 @@
-area: SRP XR
+area: Graphics XR
diff --git a/Tests/SRPTests/Projects/BuiltInGraphicsTest_Foundation/Assets/Test/Runtime/CustomRenderPipeline/CustomRenderGraph.asset b/Tests/SRPTests/Projects/BuiltInGraphicsTest_Foundation/Assets/Test/Runtime/CustomRenderPipeline/CustomRenderGraph.asset
deleted file mode 100644
index 3205ff3c52a..00000000000
--- a/Tests/SRPTests/Projects/BuiltInGraphicsTest_Foundation/Assets/Test/Runtime/CustomRenderPipeline/CustomRenderGraph.asset
+++ /dev/null
@@ -1,15 +0,0 @@
-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
---- !u!114 &11400000
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 19dda12d58f1fbb4e9ef172721391ff2, type: 3}
-  m_Name: CustomRenderGraph
-  m_EditorClassIdentifier: 
-  m_RendererFeatures: []
diff --git a/Tests/SRPTests/Projects/BuiltInGraphicsTest_Foundation/Assets/Test/Runtime/CustomRenderPipeline/CustomRenderGraph.asset.meta b/Tests/SRPTests/Projects/BuiltInGraphicsTest_Foundation/Assets/Test/Runtime/CustomRenderPipeline/CustomRenderGraph.asset.meta
deleted file mode 100644
index 50e353b4a73..00000000000
--- a/Tests/SRPTests/Projects/BuiltInGraphicsTest_Foundation/Assets/Test/Runtime/CustomRenderPipeline/CustomRenderGraph.asset.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: e46834cadfc4eb241bd46a362765a390
-NativeFormatImporter:
-  externalObjects: {}
-  mainObjectFileID: 11400000
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/Tests/SRPTests/Projects/BuiltInGraphicsTest_Foundation/Assets/Test/Runtime/CustomRenderPipeline/CustomRenderGraphData.cs b/Tests/SRPTests/Projects/BuiltInGraphicsTest_Foundation/Assets/Test/Runtime/CustomRenderPipeline/CustomRenderGraphData.cs
deleted file mode 100644
index 46822c13fa9..00000000000
--- a/Tests/SRPTests/Projects/BuiltInGraphicsTest_Foundation/Assets/Test/Runtime/CustomRenderPipeline/CustomRenderGraphData.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-namespace UnityEngine.Rendering.Universal
-{
-    //[CreateAssetMenu()]
-    public class CustomRenderGraphData : ScriptableRendererData
-    {
-        protected override ScriptableRenderer Create()
-        {
-            return new CustomRenderer(this);
-        }
-    }
-}
diff --git a/Tests/SRPTests/Projects/BuiltInGraphicsTest_Foundation/Assets/Test/Runtime/CustomRenderPipeline/CustomRenderGraphData.cs.meta b/Tests/SRPTests/Projects/BuiltInGraphicsTest_Foundation/Assets/Test/Runtime/CustomRenderPipeline/CustomRenderGraphData.cs.meta
deleted file mode 100644
index c8591e6eca1..00000000000
--- a/Tests/SRPTests/Projects/BuiltInGraphicsTest_Foundation/Assets/Test/Runtime/CustomRenderPipeline/CustomRenderGraphData.cs.meta
+++ /dev/null
@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: 19dda12d58f1fbb4e9ef172721391ff2
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/Tests/SRPTests/Projects/BuiltInGraphicsTest_Foundation/Assets/Test/Runtime/CustomRenderPipeline/CustomRenderer.cs b/Tests/SRPTests/Projects/BuiltInGraphicsTest_Foundation/Assets/Test/Runtime/CustomRenderPipeline/CustomRenderer.cs
deleted file mode 100644
index 3dcfc7b1019..00000000000
--- a/Tests/SRPTests/Projects/BuiltInGraphicsTest_Foundation/Assets/Test/Runtime/CustomRenderPipeline/CustomRenderer.cs
+++ /dev/null
@@ -1,31 +0,0 @@
-using UnityEngine.Rendering.Universal.Internal;
-
-namespace UnityEngine.Rendering.Universal
-{
-    public class CustomRenderer : ScriptableRenderer
-    {
-        private DrawObjectsPass m_RenderOpaqueForwardPass;
-
-        ForwardLights m_ForwardLights;
-
-        public CustomRenderer(CustomRenderGraphData data) : base(data)
-        {
-            m_RenderOpaqueForwardPass = new DrawObjectsPass("Render Opaques", true, RenderPassEvent.BeforeRenderingOpaques + 1, RenderQueueRange.opaque, -1, StencilState.defaultValue, 0);
-            m_ForwardLights = new ForwardLights();
-        }
-
-        public override void Setup(ScriptableRenderContext context, ref RenderingData renderingData)
-        {
-            ConfigureCameraTarget(k_CameraTarget, k_CameraTarget);
-
-            foreach (var feature in rendererFeatures)
-                feature.AddRenderPasses(this, ref renderingData);
-            EnqueuePass(m_RenderOpaqueForwardPass);
-        }
-
-        public override void SetupLights(ScriptableRenderContext context, ref RenderingData renderingData)
-        {
-            m_ForwardLights.Setup(context, ref renderingData);
-        }
-    }
-}
diff --git a/Tests/SRPTests/Projects/BuiltInGraphicsTest_Foundation/Assets/Test/Runtime/CustomRenderPipeline/CustomRenderer.cs.meta b/Tests/SRPTests/Projects/BuiltInGraphicsTest_Foundation/Assets/Test/Runtime/CustomRenderPipeline/CustomRenderer.cs.meta
deleted file mode 100644
index aabda3faa95..00000000000
--- a/Tests/SRPTests/Projects/BuiltInGraphicsTest_Foundation/Assets/Test/Runtime/CustomRenderPipeline/CustomRenderer.cs.meta
+++ /dev/null
@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: 7e0da365be9e44c3bae8da691ccd8de6
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/Tests/SRPTests/Projects/BuiltInGraphicsTest_Foundation/Packages/manifest.json b/Tests/SRPTests/Projects/BuiltInGraphicsTest_Foundation/Packages/manifest.json
index d0df42a2883..3b579cbe242 100644
--- a/Tests/SRPTests/Projects/BuiltInGraphicsTest_Foundation/Packages/manifest.json
+++ b/Tests/SRPTests/Projects/BuiltInGraphicsTest_Foundation/Packages/manifest.json
@@ -5,6 +5,7 @@
     "com.unity.2d.sprite": "1.0.0",
     "com.unity.2d.tilemap": "1.0.0",
     "com.unity.ext.nunit": "1.0.0",
+    "com.unity.ide.rider": "3.0.38",
     "com.unity.ide.visualstudio": "2.0.7",
     "com.unity.ide.vscode": "1.1.3",
     "com.unity.nuget.newtonsoft-json": "2.0.1-preview.1",
@@ -50,4 +51,4 @@
   "testables": [
     "com.unity.testing.xr"
   ]
-}
\ No newline at end of file
+}
diff --git a/Tests/SRPTests/Projects/BuiltInGraphicsTest_Lighting/Assets/Scenes/105_MRT.meta b/Tests/SRPTests/Projects/BuiltInGraphicsTest_Lighting/Assets/Scenes/105_MRT.meta
deleted file mode 100644
index 38455b115ae..00000000000
--- a/Tests/SRPTests/Projects/BuiltInGraphicsTest_Lighting/Assets/Scenes/105_MRT.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 310323cd2c241407fb820d4f12bee4e8
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/Tests/SRPTests/Projects/BuiltInGraphicsTest_Lighting/Assets/Scenes/105_MRT/CopyToViewportRenderPass.cs b/Tests/SRPTests/Projects/BuiltInGraphicsTest_Lighting/Assets/Scenes/105_MRT/CopyToViewportRenderPass.cs
deleted file mode 100644
index 26087c289f4..00000000000
--- a/Tests/SRPTests/Projects/BuiltInGraphicsTest_Lighting/Assets/Scenes/105_MRT/CopyToViewportRenderPass.cs
+++ /dev/null
@@ -1,49 +0,0 @@
-using UnityEngine;
-using UnityEngine.Rendering;
-using UnityEngine.Rendering.Universal;
-
-// Same as CopyColorPass but downsampling is not supported, while viewport can be specified
-internal class CopyToViewportRenderPass : ScriptableRenderPass
-{
-    const string m_ProfilerTag = "Copy To Viewport";
-
-    static readonly int m_SrcTexShaderPropertyId = Shader.PropertyToID("_SrcTex");
-
-    RTHandle m_Source;
-    RTHandle m_Destination;
-
-    Material m_CopyToViewportMaterial;
-
-    Rect m_Viewport;
-
-    public CopyToViewportRenderPass(Material copyToViewportMaterial)
-    {
-        m_CopyToViewportMaterial = copyToViewportMaterial;
-        renderPassEvent = RenderPassEvent.BeforeRenderingTransparents;
-    }
-
-    public void Setup(RTHandle source, RTHandle destination, Rect viewport)
-    {
-        m_Source = source;
-        m_Destination = destination;
-        m_Viewport = viewport;
-    }
-
-    public override void Configure(CommandBuffer cmd, RenderTextureDescriptor cameraTextureDescriptor)
-    {
-        RenderingUtils.ReAllocateHandleIfNeeded(ref m_Destination, cameraTextureDescriptor, FilterMode.Point, TextureWrapMode.Clamp, name: m_Destination.name);
-    }
-
-    public override void Execute(ScriptableRenderContext context, ref RenderingData renderingData)
-    {
-        CommandBuffer cmd = CommandBufferPool.Get(m_ProfilerTag);
-
-        cmd.SetRenderTarget(m_Destination.nameID);
-        cmd.SetGlobalTexture(m_SrcTexShaderPropertyId, m_Source);
-        cmd.SetViewport(m_Viewport); // cmd.Blit would override SetViewport with the Rect of m_Destination
-        cmd.DrawMesh(RenderingUtils.fullscreenMesh, Matrix4x4.identity, m_CopyToViewportMaterial);
-
-        context.ExecuteCommandBuffer(cmd);
-        CommandBufferPool.Release(cmd);
-    }
-}
diff --git a/Tests/SRPTests/Projects/BuiltInGraphicsTest_Lighting/Assets/Scenes/105_MRT/CopyToViewportRenderPass.cs.meta b/Tests/SRPTests/Projects/BuiltInGraphicsTest_Lighting/Assets/Scenes/105_MRT/CopyToViewportRenderPass.cs.meta
deleted file mode 100644
index 06343db3b32..00000000000
--- a/Tests/SRPTests/Projects/BuiltInGraphicsTest_Lighting/Assets/Scenes/105_MRT/CopyToViewportRenderPass.cs.meta
+++ /dev/null
@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: 8fd9965681daae7418a01d950a01cce2
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/Tests/SRPTests/Projects/BuiltInGraphicsTest_Lighting/Assets/Scenes/105_MRT/OutputColorsToMRTs.shader b/Tests/SRPTests/Projects/BuiltInGraphicsTest_Lighting/Assets/Scenes/105_MRT/OutputColorsToMRTs.shader
deleted file mode 100644
index ebe7924aa80..00000000000
--- a/Tests/SRPTests/Projects/BuiltInGraphicsTest_Lighting/Assets/Scenes/105_MRT/OutputColorsToMRTs.shader
+++ /dev/null
@@ -1,54 +0,0 @@
-Shader "Test/OutputColorsToMRTs"
-{
-    Properties
-    {
-    }
-    SubShader
-    {
-        // No culling or depth
-        Cull Off ZWrite Off ZTest Always
-
-        Pass
-        {
-            HLSLPROGRAM
-            #include "Packages/com.unity.render-pipelines.universal/ShaderLibrary/SurfaceInput.hlsl"
-
-            struct Attributes
-            {
-                float4 positionOS       : POSITION;
-            };
-
-            struct Varyings
-            {
-                float4 vertex : SV_POSITION;
-            };
-
-            struct FragmentOutput
-            {
-                half4 dest0 : SV_Target0;
-                half4 dest1 : SV_Target1;
-            };
-
-            Varyings vert(Attributes input)
-            {
-                Varyings output = (Varyings)0;
-                VertexPositionInputs vertexInput = GetVertexPositionInputs(input.positionOS.xyz);
-                output.vertex = vertexInput.positionCS;
-                return output;
-            }
-
-            FragmentOutput frag(Varyings input)
-            {
-                FragmentOutput o;
-                o.dest0 = half4(0, 0, 1, 1);
-                o.dest1 = half4(1, 0, 0, 1);
-                return o;
-            }
-
-            #pragma vertex vert
-            #pragma fragment frag
-
-            ENDHLSL
-        }
-    }
-}
diff --git a/Tests/SRPTests/Projects/BuiltInGraphicsTest_Lighting/Assets/Scenes/105_MRT/OutputColorsToMRTs.shader.meta b/Tests/SRPTests/Projects/BuiltInGraphicsTest_Lighting/Assets/Scenes/105_MRT/OutputColorsToMRTs.shader.meta
deleted file mode 100644
index ec2a3f19693..00000000000
--- a/Tests/SRPTests/Projects/BuiltInGraphicsTest_Lighting/Assets/Scenes/105_MRT/OutputColorsToMRTs.shader.meta
+++ /dev/null
@@ -1,9 +0,0 @@
-fileFormatVersion: 2
-guid: 19eba126951878a4caf1e3fbecdaa299
-ShaderImporter:
-  externalObjects: {}
-  defaultTextures: []
-  nonModifiableTextures: []
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/Tests/SRPTests/Projects/BuiltInGraphicsTest_Lighting/Assets/Scenes/105_MRT/OutputColorsToMRTsRenderPass.cs b/Tests/SRPTests/Projects/BuiltInGraphicsTest_Lighting/Assets/Scenes/105_MRT/OutputColorsToMRTsRenderPass.cs
deleted file mode 100644
index 615fa88eee0..00000000000
--- a/Tests/SRPTests/Projects/BuiltInGraphicsTest_Lighting/Assets/Scenes/105_MRT/OutputColorsToMRTsRenderPass.cs
+++ /dev/null
@@ -1,61 +0,0 @@
-using UnityEngine;
-using UnityEngine.Rendering;
-using UnityEngine.Rendering.Universal;
-
-// Copy input color buffer's channel to several output color buffers
-// Used to test MRT support
-internal class OutputColorsToMRTsRenderPass : ScriptableRenderPass
-{
-    private RTHandle source { get; set; }
-    private RTHandle[] destination { get; set; }
-    public RenderTextureDescriptor destDescriptor;
-
-    string profilerTag = "Split Color";
-    Material colorToMrtMaterial;
-
-    public OutputColorsToMRTsRenderPass(Material colorToMrtMaterial)
-    {
-        renderPassEvent = RenderPassEvent.AfterRenderingSkybox;
-
-        destination = new RTHandle[2];
-
-        destDescriptor = new RenderTextureDescriptor(1920, 1080, UnityEngine.Experimental.Rendering.GraphicsFormat.R8G8B8A8_SRGB, 0);
-
-        this.colorToMrtMaterial = colorToMrtMaterial;
-    }
-
-    // Configure the pass with the source and destination to execute on.
-    public void Setup(ref RenderingData renderingData, RTHandle source, RTHandle[] destination)
-    {
-        this.source = source;
-        this.destination[0] = destination[0];
-        this.destination[1] = destination[1];
-        destDescriptor.width = renderingData.cameraData.cameraTargetDescriptor.width;
-        destDescriptor.height = renderingData.cameraData.cameraTargetDescriptor.height;
-    }
-
-    public override void Configure(CommandBuffer cmd, RenderTextureDescriptor cameraTextureDescriptor)
-    {
-        cmd.SetGlobalTexture(destination[0].name, destination[0].nameID);
-        cmd.SetGlobalTexture(destination[1].name, destination[1].nameID);
-
-        ConfigureTarget(destination);
-        //ConfigureClear(m_HasDepthPrepass ? ClearFlag.None : ClearFlag.Depth, Color.black);
-
-        ConfigureClear(ClearFlag.Color, Color.yellow);
-    }
-
-    Matrix4x4 scaleMatrix = Matrix4x4.Scale(new Vector3(0.85f, 0.85f, 0.85f));
-
-    public override void Execute(ScriptableRenderContext context, ref RenderingData renderingData)
-    {
-        CommandBuffer cmd = CommandBufferPool.Get(profilerTag);
-
-        cmd.SetViewProjectionMatrices(Matrix4x4.identity, Matrix4x4.identity);
-        //  cmd.SetGlobalTexture(shaderPropertyId_srcTex, source);
-        cmd.DrawMesh(RenderingUtils.fullscreenMesh, scaleMatrix, colorToMrtMaterial);
-
-        context.ExecuteCommandBuffer(cmd);
-        CommandBufferPool.Release(cmd);
-    }
-}
diff --git a/Tests/SRPTests/Projects/BuiltInGraphicsTest_Lighting/Assets/Scenes/105_MRT/OutputColorsToMRTsRenderPass.cs.meta b/Tests/SRPTests/Projects/BuiltInGraphicsTest_Lighting/Assets/Scenes/105_MRT/OutputColorsToMRTsRenderPass.cs.meta
deleted file mode 100644
index 5589fe22a1a..00000000000
--- a/Tests/SRPTests/Projects/BuiltInGraphicsTest_Lighting/Assets/Scenes/105_MRT/OutputColorsToMRTsRenderPass.cs.meta
+++ /dev/null
@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: 8675f8656e91c4f41a2452b5d8ce16b7
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/Tests/SRPTests/Projects/BuiltInGraphicsTest_Lighting/Assets/Scenes/105_MRT/Test105Renderer.cs b/Tests/SRPTests/Projects/BuiltInGraphicsTest_Lighting/Assets/Scenes/105_MRT/Test105Renderer.cs
deleted file mode 100644
index 24948970ab6..00000000000
--- a/Tests/SRPTests/Projects/BuiltInGraphicsTest_Lighting/Assets/Scenes/105_MRT/Test105Renderer.cs
+++ /dev/null
@@ -1,106 +0,0 @@
-using UnityEngine.Rendering.Universal.Internal;
-
-namespace UnityEngine.Rendering.Universal
-{
-    // This test illustrates that ScriptableRenderer.ExecuteRenderPass will also use the clearFlag defined as renderPass.clearFlag when the renderPass target is an MRT setup.
-    // See also test 106.
-    public sealed class Test105Renderer : ScriptableRenderer
-    {
-        RTHandle m_CameraColor;
-        RTHandle m_CameraDepth;
-
-        OutputColorsToMRTsRenderPass m_ColorsToMrtsPass;
-        RTHandle[] m_ColorToMrtOutputs; // outputs of render pass "OutputColorsToMRTs"
-
-        CopyToViewportRenderPass[] m_CopyToViewportPasses;
-        Rect m_Viewport = new Rect(660, 200, 580, 320); // viewport to copy the results into
-
-        FinalBlitPass m_FinalBlitPass;
-
-        Material m_ColorToMrtMaterial;
-        Material m_CopyToViewportMaterial;
-        Material m_BlitMaterial;
-
-        string m_profilerTag = "Test 105 Renderer";
-
-        public Test105Renderer(Test105RendererData data) : base(data)
-        {
-            m_ColorToMrtMaterial = CoreUtils.CreateEngineMaterial(data.shaders.colorToMrtPS);
-            m_ColorsToMrtsPass = new OutputColorsToMRTsRenderPass(m_ColorToMrtMaterial);
-
-            // Create and declare the render targets used in the pass
-            m_ColorToMrtOutputs = new RTHandle[2];
-            m_ColorToMrtOutputs[0] = RTHandles.Alloc(m_ColorsToMrtsPass.destDescriptor, FilterMode.Point, TextureWrapMode.Clamp, name: "_ColorToMrtOutput0");
-            m_ColorToMrtOutputs[1] = RTHandles.Alloc(m_ColorsToMrtsPass.destDescriptor, FilterMode.Point, TextureWrapMode.Clamp, name: "_ColorToMrtOutput1");
-
-            m_CopyToViewportMaterial = CoreUtils.CreateEngineMaterial(data.shaders.copyToViewportPS);
-            m_CopyToViewportPasses = new CopyToViewportRenderPass[2];
-            m_CopyToViewportPasses[0] = new CopyToViewportRenderPass(m_CopyToViewportMaterial);
-            m_CopyToViewportPasses[1] = new CopyToViewportRenderPass(m_CopyToViewportMaterial);
-
-            m_BlitMaterial = CoreUtils.CreateEngineMaterial(data.shaders.blitPS);
-            m_FinalBlitPass = new FinalBlitPass(RenderPassEvent.AfterRendering, m_BlitMaterial, null);
-        }
-
-        /// <inheritdoc />
-        public override void Setup(ScriptableRenderContext context, ref RenderingData renderingData)
-        {
-            CommandBuffer cmd = CommandBufferPool.Get(m_profilerTag);
-
-            int width = renderingData.cameraData.cameraTargetDescriptor.width;
-            int height = renderingData.cameraData.cameraTargetDescriptor.height;
-
-            var colorDescriptor = new RenderTextureDescriptor(width, height);
-            var depthDescriptor = new RenderTextureDescriptor(width, height, RenderTextureFormat.Depth, 16);
-            RenderingUtils.ReAllocateHandleIfNeeded(ref m_CameraColor, colorDescriptor, FilterMode.Point, TextureWrapMode.Clamp, name: "_CameraColor");
-            RenderingUtils.ReAllocateHandleIfNeeded(ref m_CameraDepth, depthDescriptor, FilterMode.Point, TextureWrapMode.Clamp, name: "_CameraDepth");
-
-            context.ExecuteCommandBuffer(cmd);
-            CommandBufferPool.Release(cmd);
-
-            ConfigureCameraTarget(m_CameraColor, m_CameraDepth);
-
-            // 1) Render different colors to the MRT outputs (render a blue quad to output#0 and a red quad to output#1)
-
-            //m_ColorToMrtOutputs[0] = m_CameraColor;
-            m_ColorsToMrtsPass.Setup(ref renderingData, cameraColorTargetHandle, m_ColorToMrtOutputs);
-            EnqueuePass(m_ColorsToMrtsPass);
-            // Notice that the renderPass clearColor (yellow) is applied.
-
-
-            // 2) Copy results to the camera target
-
-            // layout (margin/blit/margin/..)
-            // x: <-0.04-><-0.44-><-0.04-><-0.44-><-0.04->
-            // y: <-0.25-><-0.50-><-0.25->
-
-            m_Viewport.x = 0.04f * width;
-            m_Viewport.width = 0.44f * width;
-            m_Viewport.y = 0.25f * height;
-            m_Viewport.height = 0.50f * height;
-
-            m_CopyToViewportPasses[0].Setup(m_ColorToMrtOutputs[0], m_CameraColor, m_Viewport);
-            EnqueuePass(m_CopyToViewportPasses[0]);
-
-            m_Viewport.x = (0.04f + 0.44f + 0.04f) * width;
-            m_CopyToViewportPasses[1].Setup(m_ColorToMrtOutputs[1], m_CameraColor, m_Viewport);
-            EnqueuePass(m_CopyToViewportPasses[1]);
-
-
-            // 3) Final blit to the backbuffer
-            m_FinalBlitPass.Setup(renderingData.cameraData.cameraTargetDescriptor, m_CameraColor);
-            EnqueuePass(m_FinalBlitPass);
-        }
-
-        protected override void Dispose(bool disposing)
-        {
-            m_ColorToMrtOutputs[0]?.Release();
-            m_ColorToMrtOutputs[1]?.Release();
-            m_CameraColor?.Release();
-            m_CameraDepth?.Release();
-            CoreUtils.Destroy(m_ColorToMrtMaterial);
-            CoreUtils.Destroy(m_CopyToViewportMaterial);
-            CoreUtils.Destroy(m_BlitMaterial);
-        }
-    }
-}
diff --git a/Tests/SRPTests/Projects/BuiltInGraphicsTest_Lighting/Assets/Scenes/105_MRT/Test105Renderer.cs.meta b/Tests/SRPTests/Projects/BuiltInGraphicsTest_Lighting/Assets/Scenes/105_MRT/Test105Renderer.cs.meta
deleted file mode 100644
index 822d402f9ea..00000000000
--- a/Tests/SRPTests/Projects/BuiltInGraphicsTest_Lighting/Assets/Scenes/105_MRT/Test105Renderer.cs.meta
+++ /dev/null
@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: 5345e6d1aa197a848aab02971a9e1c86
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/Tests/SRPTests/Projects/BuiltInGraphicsTest_Lighting/Assets/Scenes/105_MRT/Test105RendererData.cs b/Tests/SRPTests/Projects/BuiltInGraphicsTest_Lighting/Assets/Scenes/105_MRT/Test105RendererData.cs
deleted file mode 100644
index 9dbfeb18c0e..00000000000
--- a/Tests/SRPTests/Projects/BuiltInGraphicsTest_Lighting/Assets/Scenes/105_MRT/Test105RendererData.cs
+++ /dev/null
@@ -1,87 +0,0 @@
-#if UNITY_EDITOR
-using UnityEditor;
-using UnityEditor.ProjectWindowCallback;
-#endif
-using System;
-using UnityEngine.Scripting.APIUpdating;
-
-namespace UnityEngine.Rendering.Universal
-{
-    [Serializable, ReloadGroup]
-    public class Test105RendererData : ScriptableRendererData
-    {
-#if UNITY_EDITOR
-        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Performance", "CA1812")]
-        internal class CreateTest105RendererAsset : EndNameEditAction
-        {
-            public override void Action(int instanceId, string pathName, string resourceFile)
-            {
-                var instance = CreateInstance<Test105RendererData>();
-                AssetDatabase.CreateAsset(instance, pathName);
-                ResourceReloader.ReloadAllNullIn(instance, UniversalRenderPipelineAsset.packagePath);
-                Selection.activeObject = instance;
-            }
-        }
-
-        [MenuItem("Assets/Create/Rendering/Universal Render Pipeline/Tests/Test 105 Renderer", priority = CoreUtils.assetCreateMenuPriority1)]
-        static void CreateTest105RendererData()
-        {
-            ProjectWindowUtil.StartNameEditingIfProjectWindowExists(0, CreateInstance<CreateTest105RendererAsset>(), "Test105RendererData.asset", null, null);
-        }
-
-#endif
-
-        [Serializable, ReloadGroup]
-        public sealed class ShaderResources
-        {
-            //[Reload("TestProjects/UniversalGraphicsTest/Assets/Scenes/105_MRT/OutputColorsToMRTs.shader")]
-            // Path outside of scope supported by ResourceReloader - we manually load this one
-            public Shader colorToMrtPS;
-
-            //[Reload("TestProjects/UniversalGraphicsTest/Assets/Scenes/105_MRT/CopyToViewport.shader")]
-            // Path outside of scope supported by ResourceReloader - we manually load this one
-            public Shader copyToViewportPS;
-
-            [Reload("Shaders/Utils/Blit.shader")]
-            public Shader blitPS;
-        }
-
-        public ShaderResources shaders = null;
-
-        protected override ScriptableRenderer Create()
-        {
-#if UNITY_EDITOR
-            if (!Application.isPlaying)
-            {
-                ResourceReloader.ReloadAllNullIn(this, UniversalRenderPipelineAsset.packagePath);
-            }
-#endif
-            shaders.colorToMrtPS = Shader.Find("Test/OutputColorsToMRTs");
-            shaders.copyToViewportPS = Shader.Find("Test/CopyToViewport");
-
-            return new Test105Renderer(this);
-        }
-
-        protected override void OnEnable()
-        {
-            base.OnEnable();
-
-            // Upon asset creation, OnEnable is called and `shaders` reference is not yet initialized
-            // We need to call the OnEnable for data migration when updating from old versions of LWRP that
-            // serialized resources in a different format. Early returning here when OnEnable is called
-            // upon asset creation is fine because we guarantee new assets get created with all resources initialized.
-            if (shaders == null)
-                return;
-
-#if UNITY_EDITOR
-            try
-            {
-                ResourceReloader.ReloadAllNullIn(this, UniversalRenderPipelineAsset.packagePath);
-                shaders.colorToMrtPS = Shader.Find("Test/OutputColorsToMRTs");
-                shaders.copyToViewportPS = Shader.Find("Test/CopyToViewport");
-            }
-            catch {}
-#endif
-        }
-    }
-}
diff --git a/Tests/SRPTests/Projects/BuiltInGraphicsTest_Lighting/Assets/Scenes/105_MRT/Test105RendererData.cs.meta b/Tests/SRPTests/Projects/BuiltInGraphicsTest_Lighting/Assets/Scenes/105_MRT/Test105RendererData.cs.meta
deleted file mode 100644
index 9f27faadad0..00000000000
--- a/Tests/SRPTests/Projects/BuiltInGraphicsTest_Lighting/Assets/Scenes/105_MRT/Test105RendererData.cs.meta
+++ /dev/null
@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: 70e5bd97224ace04996a22cc46a3e23d
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/Tests/SRPTests/Projects/BuiltInGraphicsTest_Lighting/Assets/Scenes/105_MRT/Test105RendererDataAsset.asset b/Tests/SRPTests/Projects/BuiltInGraphicsTest_Lighting/Assets/Scenes/105_MRT/Test105RendererDataAsset.asset
deleted file mode 100644
index 14232a04997..00000000000
--- a/Tests/SRPTests/Projects/BuiltInGraphicsTest_Lighting/Assets/Scenes/105_MRT/Test105RendererDataAsset.asset
+++ /dev/null
@@ -1,19 +0,0 @@
-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
---- !u!114 &11400000
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 70e5bd97224ace04996a22cc46a3e23d, type: 3}
-  m_Name: Test105RendererDataAsset
-  m_EditorClassIdentifier: 
-  m_RendererFeatures: []
-  shaders:
-    splitColorPS: {fileID: 4800000, guid: 19eba126951878a4caf1e3fbecdaa299, type: 3}
-    samplingPS: {fileID: 4800000, guid: 04c410c9937594faa893a11dceb85f7e, type: 3}
-    blitPS: {fileID: 4800000, guid: c17132b1f77d20942aa75f8429c0f8bc, type: 3}
diff --git a/Tests/SRPTests/Projects/BuiltInGraphicsTest_Lighting/Assets/Scenes/106_MRT_CameraClearFlag.meta b/Tests/SRPTests/Projects/BuiltInGraphicsTest_Lighting/Assets/Scenes/106_MRT_CameraClearFlag.meta
deleted file mode 100644
index 21f876c44a1..00000000000
--- a/Tests/SRPTests/Projects/BuiltInGraphicsTest_Lighting/Assets/Scenes/106_MRT_CameraClearFlag.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 64cc6db32ac424fc0a956b6810b688b5
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/Tests/SRPTests/Projects/BuiltInGraphicsTest_Lighting/Assets/Scenes/106_MRT_CameraClearFlag/Test106Renderer.cs b/Tests/SRPTests/Projects/BuiltInGraphicsTest_Lighting/Assets/Scenes/106_MRT_CameraClearFlag/Test106Renderer.cs
deleted file mode 100644
index 5779feaa765..00000000000
--- a/Tests/SRPTests/Projects/BuiltInGraphicsTest_Lighting/Assets/Scenes/106_MRT_CameraClearFlag/Test106Renderer.cs
+++ /dev/null
@@ -1,100 +0,0 @@
-using UnityEngine.Rendering.Universal.Internal;
-
-namespace UnityEngine.Rendering.Universal
-{
-    // This tests is a variation of test 105.
-    // It illustrates that ScriptableRenderer.ExecuteRenderPass will use the camera clearFlag if the camera target is one of the renderTargets in the MRT setup
-    public sealed class Test106Renderer : ScriptableRenderer
-    {
-        RTHandle m_CameraColor;
-        RTHandle m_CameraDepth;
-
-        OutputColorsToMRTsRenderPass m_ColorsToMrtsPass;
-        RTHandle[] m_ColorToMrtOutputs; // outputs of render pass "OutputColorsToMRTs"
-
-        CopyToViewportRenderPass[] m_CopyToViewportPasses;
-        Rect m_Viewport = new Rect(660, 200, 580, 320); // viewport to copy the results into
-
-        FinalBlitPass m_FinalBlitPass;
-
-        public Test106Renderer(Test106RendererData data) : base(data)
-        {
-            Material colorToMrtMaterial = CoreUtils.CreateEngineMaterial(data.shaders.colorToMrtPS);
-            m_ColorsToMrtsPass = new OutputColorsToMRTsRenderPass(colorToMrtMaterial);
-
-            m_ColorToMrtOutputs = new RTHandle[2];
-            // m_ColorToMrtOutputs[0] = RTHandles.Alloc(m_ColorsToMrtsPass.destDescriptor, FilterMode.Point, TextureWrapMode.Clamp, name: "_ColorToMrtOutput0");
-            m_ColorToMrtOutputs[1] = RTHandles.Alloc(m_ColorsToMrtsPass.destDescriptor, FilterMode.Point, TextureWrapMode.Clamp, name: "_ColorToMrtOutput1");
-
-            Material copyToViewportMaterial = CoreUtils.CreateEngineMaterial(data.shaders.copyToViewportPS);
-            m_CopyToViewportPasses = new CopyToViewportRenderPass[2];
-            //m_CopyToViewportPasses[0] = new CopyToViewportRenderPass(copyToViewportMaterial);
-            m_CopyToViewportPasses[1] = new CopyToViewportRenderPass(copyToViewportMaterial);
-
-            Material blitMaterial = CoreUtils.CreateEngineMaterial(data.shaders.blitPS);
-            m_FinalBlitPass = new FinalBlitPass(RenderPassEvent.AfterRendering, blitMaterial, null);
-        }
-
-        string m_profilerTag = "Test 106 Renderer";
-
-        /// <inheritdoc />
-        public override void Setup(ScriptableRenderContext context, ref RenderingData renderingData)
-        {
-            CommandBuffer cmd = CommandBufferPool.Get(m_profilerTag);
-
-            int width = renderingData.cameraData.cameraTargetDescriptor.width;
-            int height = renderingData.cameraData.cameraTargetDescriptor.height;
-
-            var colorDescriptor = new RenderTextureDescriptor(width, height);
-            var depthDescriptor = new RenderTextureDescriptor(width, height, RenderTextureFormat.Depth, 16);
-            RenderingUtils.ReAllocateHandleIfNeeded(ref m_CameraColor, colorDescriptor, FilterMode.Point, TextureWrapMode.Clamp, name: "_CameraColor");
-            RenderingUtils.ReAllocateHandleIfNeeded(ref m_CameraDepth, depthDescriptor, FilterMode.Point, TextureWrapMode.Clamp, name: "_CameraDepth");
-
-            context.ExecuteCommandBuffer(cmd);
-            CommandBufferPool.Release(cmd);
-
-            ConfigureCameraTarget(m_CameraColor, m_CameraDepth);
-
-
-            // 1) Render different colors to the MRT outputs (render a blue quad to output#0 and a red quad to output#1)
-            m_ColorToMrtOutputs[0] = m_CameraColor;
-            m_ColorsToMrtsPass.Setup(ref renderingData, cameraColorTargetHandle, m_ColorToMrtOutputs);
-            EnqueuePass(m_ColorsToMrtsPass);
-            // Notice that the renderPass clearColor (yellow) is applied for output#1
-            // Notice that the camera     clearColor (green)  is applied for output#0 (because output#0 is the camera target)
-
-
-            // 2) Copy results to the camera target
-
-            // layout (margin/blit/margin/..)
-            // x: <-0.04-><-0.44-><-0.04-><-0.44-><-0.04->
-            // y: <-0.25-><-0.50-><-0.25->
-
-            //m_Viewport.x = 0.04f * width;
-            m_Viewport.width = 0.44f * width;
-            m_Viewport.y = 0.25f * height;
-            m_Viewport.height = 0.50f * height;
-
-            //m_CopyToViewportPasses[0].Setup(m_ColorToMrtOutputs[0].Identifier(), m_CameraColor, m_Viewport);
-            //EnqueuePass(m_CopyToViewportPasses[0]);
-
-            m_Viewport.x = (0.04f + 0.44f + 0.04f) * width;
-            m_CopyToViewportPasses[1].Setup(m_ColorToMrtOutputs[1], m_CameraColor, m_Viewport);
-            EnqueuePass(m_CopyToViewportPasses[1]);
-
-
-            // 3) Final blit to the backbuffer
-            m_FinalBlitPass.Setup(renderingData.cameraData.cameraTargetDescriptor, m_CameraColor);
-            EnqueuePass(m_FinalBlitPass);
-        }
-
-        protected override void Dispose(bool disposing)
-        {
-            // m_ColorToMrtOutputs[0]?.Release();
-            m_ColorToMrtOutputs[1]?.Release();
-            m_CameraColor?.Release();
-            m_CameraDepth?.Release();
-            m_FinalBlitPass.Dispose();
-        }
-    }
-}
diff --git a/Tests/SRPTests/Projects/BuiltInGraphicsTest_Lighting/Assets/Scenes/106_MRT_CameraClearFlag/Test106Renderer.cs.meta b/Tests/SRPTests/Projects/BuiltInGraphicsTest_Lighting/Assets/Scenes/106_MRT_CameraClearFlag/Test106Renderer.cs.meta
deleted file mode 100644
index 440a14e4a19..00000000000
--- a/Tests/SRPTests/Projects/BuiltInGraphicsTest_Lighting/Assets/Scenes/106_MRT_CameraClearFlag/Test106Renderer.cs.meta
+++ /dev/null
@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: 0df98b0ce1b3d3c48a1b2b7e612631a2
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/Tests/SRPTests/Projects/BuiltInGraphicsTest_Lighting/Assets/Scenes/106_MRT_CameraClearFlag/Test106RendererData.cs b/Tests/SRPTests/Projects/BuiltInGraphicsTest_Lighting/Assets/Scenes/106_MRT_CameraClearFlag/Test106RendererData.cs
deleted file mode 100644
index 52e3cb1e0d6..00000000000
--- a/Tests/SRPTests/Projects/BuiltInGraphicsTest_Lighting/Assets/Scenes/106_MRT_CameraClearFlag/Test106RendererData.cs
+++ /dev/null
@@ -1,87 +0,0 @@
-#if UNITY_EDITOR
-using UnityEditor;
-using UnityEditor.ProjectWindowCallback;
-#endif
-using System;
-using UnityEngine.Scripting.APIUpdating;
-
-namespace UnityEngine.Rendering.Universal
-{
-    [Serializable, ReloadGroup]
-    public class Test106RendererData : ScriptableRendererData
-    {
-#if UNITY_EDITOR
-        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Performance", "CA1812")]
-        internal class CreateTest106RendererAsset : EndNameEditAction
-        {
-            public override void Action(int instanceId, string pathName, string resourceFile)
-            {
-                var instance = CreateInstance<Test106RendererData>();
-                AssetDatabase.CreateAsset(instance, pathName);
-                ResourceReloader.ReloadAllNullIn(instance, UniversalRenderPipelineAsset.packagePath);
-                Selection.activeObject = instance;
-            }
-        }
-
-        [MenuItem("Assets/Create/Rendering/Universal Render Pipeline/Tests/Test 106 Renderer", priority = CoreUtils.assetCreateMenuPriority1)]
-        static void CreateTest106RendererData()
-        {
-            ProjectWindowUtil.StartNameEditingIfProjectWindowExists(0, CreateInstance<CreateTest106RendererAsset>(), "Test106RendererData.asset", null, null);
-        }
-
-#endif
-
-        [Serializable, ReloadGroup]
-        public sealed class ShaderResources
-        {
-            //[Reload("TestProjects/UniversalGraphicsTest/Assets/Scenes/105_MRT/OutputColorsToMRTs.shader")]
-            // Path outside of scope supported by ResourceReloader - we manually load this one
-            public Shader colorToMrtPS;
-
-            //[Reload("TestProjects/UniversalGraphicsTest/Assets/Scenes/105_MRT/CopyToViewport.shader")]
-            // Path outside of scope supported by ResourceReloader - we manually load this one
-            public Shader copyToViewportPS;
-
-            [Reload("Shaders/Utils/Blit.shader")]
-            public Shader blitPS;
-        }
-
-        public ShaderResources shaders = null;
-
-        protected override ScriptableRenderer Create()
-        {
-#if UNITY_EDITOR
-            if (!Application.isPlaying)
-            {
-                ResourceReloader.ReloadAllNullIn(this, UniversalRenderPipelineAsset.packagePath);
-            }
-#endif
-            shaders.colorToMrtPS = Shader.Find("Test/OutputColorsToMRTs");
-            shaders.copyToViewportPS = Shader.Find("Test/CopyToViewport");
-
-            return new Test106Renderer(this);
-        }
-
-        protected override void OnEnable()
-        {
-            base.OnEnable();
-
-            // Upon asset creation, OnEnable is called and `shaders` reference is not yet initialized
-            // We need to call the OnEnable for data migration when updating from old versions of LWRP that
-            // serialized resources in a different format. Early returning here when OnEnable is called
-            // upon asset creation is fine because we guarantee new assets get created with all resources initialized.
-            if (shaders == null)
-                return;
-
-#if UNITY_EDITOR
-            try
-            {
-                ResourceReloader.ReloadAllNullIn(this, UniversalRenderPipelineAsset.packagePath);
-                shaders.colorToMrtPS = Shader.Find("Test/OutputColorsToMRTs");
-                shaders.copyToViewportPS = Shader.Find("Test/CopyToViewport");
-            }
-            catch {}
-#endif
-        }
-    }
-}
diff --git a/Tests/SRPTests/Projects/BuiltInGraphicsTest_Lighting/Assets/Scenes/106_MRT_CameraClearFlag/Test106RendererData.cs.meta b/Tests/SRPTests/Projects/BuiltInGraphicsTest_Lighting/Assets/Scenes/106_MRT_CameraClearFlag/Test106RendererData.cs.meta
deleted file mode 100644
index a989e114402..00000000000
--- a/Tests/SRPTests/Projects/BuiltInGraphicsTest_Lighting/Assets/Scenes/106_MRT_CameraClearFlag/Test106RendererData.cs.meta
+++ /dev/null
@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: 13db91318120ded488cfb39bae256bd3
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/Tests/SRPTests/Projects/BuiltInGraphicsTest_Lighting/Assets/Scenes/106_MRT_CameraClearFlag/Test106RendererDataAsset.asset b/Tests/SRPTests/Projects/BuiltInGraphicsTest_Lighting/Assets/Scenes/106_MRT_CameraClearFlag/Test106RendererDataAsset.asset
deleted file mode 100644
index 4d2679545e6..00000000000
--- a/Tests/SRPTests/Projects/BuiltInGraphicsTest_Lighting/Assets/Scenes/106_MRT_CameraClearFlag/Test106RendererDataAsset.asset
+++ /dev/null
@@ -1,20 +0,0 @@
-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
---- !u!114 &11400000
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 13db91318120ded488cfb39bae256bd3, type: 3}
-  m_Name: Test106RendererDataAsset
-  m_EditorClassIdentifier: 
-  m_RendererFeatures: []
-  shaders:
-    splitColorPS: {fileID: 0}
-    scaledCopyColorPS: {fileID: 0}
-    samplingPS: {fileID: 4800000, guid: 04c410c9937594faa893a11dceb85f7e, type: 3}
-    blitPS: {fileID: 4800000, guid: c17132b1f77d20942aa75f8429c0f8bc, type: 3}
diff --git a/Tests/SRPTests/Projects/BuiltInGraphicsTest_Lighting/Packages/manifest.json b/Tests/SRPTests/Projects/BuiltInGraphicsTest_Lighting/Packages/manifest.json
index d0df42a2883..3b579cbe242 100644
--- a/Tests/SRPTests/Projects/BuiltInGraphicsTest_Lighting/Packages/manifest.json
+++ b/Tests/SRPTests/Projects/BuiltInGraphicsTest_Lighting/Packages/manifest.json
@@ -5,6 +5,7 @@
     "com.unity.2d.sprite": "1.0.0",
     "com.unity.2d.tilemap": "1.0.0",
     "com.unity.ext.nunit": "1.0.0",
+    "com.unity.ide.rider": "3.0.38",
     "com.unity.ide.visualstudio": "2.0.7",
     "com.unity.ide.vscode": "1.1.3",
     "com.unity.nuget.newtonsoft-json": "2.0.1-preview.1",
@@ -50,4 +51,4 @@
   "testables": [
     "com.unity.testing.xr"
   ]
-}
\ No newline at end of file
+}
diff --git a/Tests/SRPTests/Projects/HDRP_DXR_Tests/Assets/Tests/HDRP_DXR_Graphics_Tests.cs b/Tests/SRPTests/Projects/HDRP_DXR_Tests/Assets/Tests/HDRP_DXR_Graphics_Tests.cs
index b826b47f4f3..858aa5b31ea 100644
--- a/Tests/SRPTests/Projects/HDRP_DXR_Tests/Assets/Tests/HDRP_DXR_Graphics_Tests.cs
+++ b/Tests/SRPTests/Projects/HDRP_DXR_Tests/Assets/Tests/HDRP_DXR_Graphics_Tests.cs
@@ -101,6 +101,14 @@ public class HDRP_Graphics_Tests
 			"Disabled for Instability ",
 			runtimePlatforms: new RuntimePlatform[] { RuntimePlatform.GameCoreXboxSeries }
 		)]
+        [IgnoreGraphicsTest(
+            "10002_TerrainReflectionQuality",
+            "Disabled for Instability https://jira.unity3d.com/browse/UUM-134774",
+            runtimePlatforms: new RuntimePlatform[]
+            {
+                RuntimePlatform.GameCoreXboxSeries
+            }
+        )]
         public IEnumerator Run(SceneGraphicsTestCase testCase)
         {
             yield return HDRP_GraphicTestRunner.Run(testCase);
diff --git a/Tests/SRPTests/Projects/HDRP_RuntimeTests/Assets/Tests/HDRP_Runtime_Graphics_Tests.cs b/Tests/SRPTests/Projects/HDRP_RuntimeTests/Assets/Tests/HDRP_Runtime_Graphics_Tests.cs
index 91f3cfef4f0..a8e906fa010 100644
--- a/Tests/SRPTests/Projects/HDRP_RuntimeTests/Assets/Tests/HDRP_Runtime_Graphics_Tests.cs
+++ b/Tests/SRPTests/Projects/HDRP_RuntimeTests/Assets/Tests/HDRP_Runtime_Graphics_Tests.cs
@@ -62,7 +62,7 @@ public void SetDefaultResolution()
     [IgnoreGraphicsTest(
         "003-VirtualTexturing$",
         "https://jira.unity3d.com/browse/UUM-131182 Both Switches fail on MultiThreaded (pass on Native Jobs)",
-        runtimePlatforms: new RuntimePlatform[] { RuntimePlatform.Switch, RuntimePlatform.Switch2 },
+        runtimePlatforms: new RuntimePlatform[] { RuntimePlatform.Switch, RuntimePlatform.Switch2, RuntimePlatform.PS4 }, // Also unstable on PS4: https://jira.unity3d.com/browse/UUM-135501
         renderingThreadingModes: new RenderingThreadingMode[] { RenderingThreadingMode.MultiThreaded }
     )]
     [IgnoreGraphicsTest(
@@ -83,6 +83,11 @@ public void SetDefaultResolution()
         graphicsDeviceTypes: new GraphicsDeviceType[] { GraphicsDeviceType.Metal },
         architectures: new Architecture[] { Architecture.X64 }
     )]
+    [IgnoreGraphicsTest(
+        "010-BRG-Simple",
+        "Unstable: https://jira.unity3d.com/browse/UUM-134572",
+        runtimePlatforms: new RuntimePlatform[] { RuntimePlatform.PS5 }
+    )]
     [IgnoreGraphicsTest(
         "012-SVL_Check$",
         "https://jira.unity3d.com/browse/UUM-70791",
diff --git a/Tests/SRPTests/Projects/HDRP_RuntimeTests/ProjectSettings/TagManager.asset b/Tests/SRPTests/Projects/HDRP_RuntimeTests/ProjectSettings/TagManager.asset
index 1c92a7840ec..ea8b1a4ba01 100644
--- a/Tests/SRPTests/Projects/HDRP_RuntimeTests/ProjectSettings/TagManager.asset
+++ b/Tests/SRPTests/Projects/HDRP_RuntimeTests/ProjectSettings/TagManager.asset
@@ -2,7 +2,7 @@
 %TAG !u! tag:unity3d.com,2011:
 --- !u!78 &1
 TagManager:
-  serializedVersion: 2
+  serializedVersion: 3
   tags: []
   layers:
   - Default
@@ -12,11 +12,11 @@ TagManager:
   - Water
   - UI
   - 
-  - 
-  - 
-  - 
-  - 
-  - 
+  - Composite Layer 0 - Background
+  - Composite Layer 0 - Foreground
+  - Composite Layer 1
+  - Transparent 1
+  - Transparent 2
   - 
   - 
   - 
@@ -41,3 +41,6 @@ TagManager:
   - name: Default
     uniqueID: 0
     locked: 0
+  m_RenderingLayers:
+  - Default
+  m_MigratedRenderPipelines: []
diff --git a/Tests/SRPTests/Projects/HDRP_Tests/Assets/GraphicTests/HDRP_EditModeTests/PreviewTests.cs b/Tests/SRPTests/Projects/HDRP_Tests/Assets/GraphicTests/HDRP_EditModeTests/PreviewTests.cs
index 410df310541..94cbe89ecaf 100644
--- a/Tests/SRPTests/Projects/HDRP_Tests/Assets/GraphicTests/HDRP_EditModeTests/PreviewTests.cs
+++ b/Tests/SRPTests/Projects/HDRP_Tests/Assets/GraphicTests/HDRP_EditModeTests/PreviewTests.cs
@@ -153,6 +153,7 @@ Mesh CreateUniqueMiniMesh()
 
 
         [UnityTest]
+        [Timeout(360000)]
         public IEnumerator AssetPreviewIsCorrect()
         {
             EditorSceneManager.OpenScene("Assets/GraphicTests/Scenes/1x_Materials/1101_Unlit.unity"); // Ensure the opened scene doesn't have any error.
diff --git a/Tests/SRPTests/Projects/HDRP_Tests/Assets/GraphicTests/Tests/HDRP_Graphics_Tests.cs b/Tests/SRPTests/Projects/HDRP_Tests/Assets/GraphicTests/Tests/HDRP_Graphics_Tests.cs
index c6296701411..1dfcc72f25d 100644
--- a/Tests/SRPTests/Projects/HDRP_Tests/Assets/GraphicTests/Tests/HDRP_Graphics_Tests.cs
+++ b/Tests/SRPTests/Projects/HDRP_Tests/Assets/GraphicTests/Tests/HDRP_Graphics_Tests.cs
@@ -196,6 +196,11 @@ public void SetUpContext()
             "Outdated ref-images.",
             graphicsDeviceTypes: new[] { GraphicsDeviceType.Metal }
         )]
+        [IgnoreGraphicsTest(
+            "3005_VertexDensity",
+            "Unstable: https://jira.unity3d.com/browse/UUM-135177",
+            runtimePlatforms: new[] { RuntimePlatform.WindowsEditor }
+        )]
         [IgnoreGraphicsTest(
             "3008_ShadowDebugMode$",
             "(Intel Mac) Clear color of the debug-view seems to be black instead of white. Probably just an outdated ref-image.",
@@ -209,27 +214,107 @@ public void SetUpContext()
             graphicsDeviceTypes: new[] { GraphicsDeviceType.Vulkan },
             runtimePlatforms: new[] { RuntimePlatform.LinuxEditor }
         )]
+        [IgnoreGraphicsTest(
+            "4088_DRS-DLSS-Hardware",
+            "Unstable: https://jira.unity3d.com/browse/UUM-135194",
+            runtimePlatforms: new[] { RuntimePlatform.WindowsEditor }
+        )]
+        [IgnoreGraphicsTest(
+            "4089_DRS-DLSS-Software",
+            "Unstable: https://jira.unity3d.com/browse/UUM-135194",
+            runtimePlatforms: new[] { RuntimePlatform.WindowsEditor }
+        )]
+        [IgnoreGraphicsTest(
+            "4090_DRS-Hardware",
+            "Unstable: https://jira.unity3d.com/browse/UUM-135195",
+            runtimePlatforms: new[] { RuntimePlatform.WindowsEditor }
+        )]
+        [IgnoreGraphicsTest(
+            "4091_DRS-Software",
+            "Unstable: https://jira.unity3d.com/browse/UUM-135195",
+            runtimePlatforms: new[] { RuntimePlatform.WindowsEditor }
+        )]
         [IgnoreGraphicsTest(
             "4096_DRS-TAAU-Hardware$",
             "Very small fringing across edges. Maybe a sampling artifact?",
             graphicsDeviceTypes: new[] { GraphicsDeviceType.Metal }
         )]
+        [IgnoreGraphicsTest(
+            "4096_DRS-TAAU-Hardware",
+            "Unstable: https://jira.unity3d.com/browse/UUM-135200",
+            runtimePlatforms: new[] { RuntimePlatform.WindowsEditor }
+        )]
+        [IgnoreGraphicsTest(
+            "4097_DRS-TAAU-Software",
+            "Unstable: https://jira.unity3d.com/browse/UUM-135200",
+            runtimePlatforms: new[] { RuntimePlatform.WindowsEditor }
+        )]
+        [IgnoreGraphicsTest(
+            "4099_DRS-STP-Software",
+            "Unstable: https://jira.unity3d.com/browse/UUM-135197",
+            runtimePlatforms: new[] { RuntimePlatform.WindowsEditor }
+        )]
+        [IgnoreGraphicsTest(
+            "4100_DRS-STP-Hardware",
+            "Unstable: https://jira.unity3d.com/browse/UUM-135197",
+            runtimePlatforms: new[] { RuntimePlatform.WindowsEditor }
+        )]
         [IgnoreGraphicsTest(
             "4101_FP16Alpha$",
             "Outdated ref-image.",
             graphicsDeviceTypes: new[] { GraphicsDeviceType.Metal }
         )]
+        [IgnoreGraphicsTest(
+            "4102_DRS-CAS-AfterPost",
+            "Unstable: https://jira.unity3d.com/browse/UUM-135195",
+            runtimePlatforms: new[] { RuntimePlatform.WindowsEditor }
+        )]
+        [IgnoreGraphicsTest(
+            "4103_DRS-DLSS-AfterPost",
+            "Unstable: https://jira.unity3d.com/browse/UUM-135195",
+            runtimePlatforms: new[] { RuntimePlatform.WindowsEditor }
+        )]
+        [IgnoreGraphicsTest(
+            "4104_DRS-STP-AfterPost",
+            "Unstable: https://jira.unity3d.com/browse/UUM-135197",
+            runtimePlatforms: new[] { RuntimePlatform.WindowsEditor }
+        )]
         [IgnoreGraphicsTest(
             "4105_LensFlareScreenSpace$",
             "(Intel Mac) Lens-flare behaviour seems to be different from all the other platforms.",
             graphicsDeviceTypes: new[] { GraphicsDeviceType.Metal },
             architectures: new[] { Architecture.X64 }
         )]
+        [IgnoreGraphicsTest(
+            "4106_DRS-TAAU-AfterPost",
+            "Unstable: https://jira.unity3d.com/browse/UUM-135200",
+            runtimePlatforms: new[] { RuntimePlatform.WindowsEditor }
+        )]
         [IgnoreGraphicsTest(
             "4106_DRS-TAAU-AfterPost$",
             "Very small fringing across edges. Maybe a sampling artifact?",
             graphicsDeviceTypes: new[] { GraphicsDeviceType.Metal }
         )]
+        [IgnoreGraphicsTest(
+            "4107_DRS-FSR2-Hardware",
+            "Unstable: https://jira.unity3d.com/browse/UUM-135188",
+            runtimePlatforms: new[] { RuntimePlatform.WindowsEditor }
+        )]
+        [IgnoreGraphicsTest(
+            "4108_DRS-FSR2-Software",
+            "Unstable: https://jira.unity3d.com/browse/UUM-135188",
+            runtimePlatforms: new[] { RuntimePlatform.WindowsEditor }
+        )]
+        [IgnoreGraphicsTest(
+            "4109_DRS-FSR2-AfterPost",
+            "Unstable: https://jira.unity3d.com/browse/UUM-135188",
+            runtimePlatforms: new[] { RuntimePlatform.WindowsEditor }
+        )]
+        [IgnoreGraphicsTest(
+            "4111_DRS-DLSS-With-CustomPass",
+            "Unstable: https://jira.unity3d.com/browse/UUM-135188",
+            runtimePlatforms: new[] { RuntimePlatform.WindowsEditor }
+        )]
         [IgnoreGraphicsTest(
             "5006_Pbr_Sky_Low_Altitude$",
             "Differences in banding around the horizon.",
@@ -313,6 +398,21 @@ public void SetUpContext()
             "Diverges in the wave-modifier edges.",
             graphicsDeviceTypes: new[] { GraphicsDeviceType.Metal }
         )]
+        [IgnoreGraphicsTest(
+            "9921_UnderWater",
+            "Unstable - see https://jira.unity3d.com/browse/UUM-134223",
+            runtimePlatforms: new[] { RuntimePlatform.WindowsEditor }
+        )]
+        [IgnoreGraphicsTest(
+            "9921_UnderWater_Back",
+            "Unstable - see https://jira.unity3d.com/browse/UUM-134223",
+            runtimePlatforms: new[] { RuntimePlatform.WindowsEditor }
+        )]
+        [IgnoreGraphicsTest(
+            "9922_WaterPrefab",
+            "Unstable - see https://jira.unity3d.com/browse/UUM-134223",
+            runtimePlatforms: new[] { RuntimePlatform.WindowsEditor }
+        )]
         [IgnoreGraphicsTest(
             "9922_WaterPrefab$",
             "Minor divergence across the waves' crests.",
@@ -398,6 +498,26 @@ public void SetUpContext()
             graphicsDeviceTypes: new[] { GraphicsDeviceType.Direct3D12, GraphicsDeviceType.Direct3D11, GraphicsDeviceType.Vulkan },
             runtimePlatforms: new[] { RuntimePlatform.WindowsEditor, RuntimePlatform.WindowsPlayer }
         )]
+        [IgnoreGraphicsTest(
+            "3009_MaterialOverrides",
+            "https://jira.unity3d.com/browse/UUM-134370 - Weird artifacts on NVIDIA A10",
+            graphicsDeviceTypes: new[] { GraphicsDeviceType.Direct3D11 },
+            runtimePlatforms: new[] { RuntimePlatform.WindowsEditor }
+        )]
+        [IgnoreGraphicsTest(
+            "3004_QuadOverdraw",
+            "Disabled for Instability https://jira.unity3d.com/browse/UUM-134754",
+            runtimePlatforms: new [] { RuntimePlatform.WindowsEditor },
+            graphicsDeviceTypes: new[] { GraphicsDeviceType.Direct3D12 }
+        )]
+        [IgnoreGraphicsTest(
+            "4075_PhysicalCamera-gateFit|4111_DRS-DLSS-With-CustomPass",
+            "Disabled for Instability https://jira.unity3d.com/browse/UUM-134786",
+            runtimePlatforms: new RuntimePlatform[]
+            {
+                RuntimePlatform.WindowsEditor
+            }
+        )]
         public IEnumerator Run(SceneGraphicsTestCase testCase)
         {
             yield return HDRP_GraphicTestRunner.Run(testCase);
diff --git a/Tests/SRPTests/Projects/MultipleSRP_Tests/Assets/Tests/EditMode/Framework/WorkerLogAnalyzer.cs b/Tests/SRPTests/Projects/MultipleSRP_Tests/Assets/Tests/EditMode/Framework/WorkerLogAnalyzer.cs
index ed9cd194007..88f27d7ce2f 100644
--- a/Tests/SRPTests/Projects/MultipleSRP_Tests/Assets/Tests/EditMode/Framework/WorkerLogAnalyzer.cs
+++ b/Tests/SRPTests/Projects/MultipleSRP_Tests/Assets/Tests/EditMode/Framework/WorkerLogAnalyzer.cs
@@ -75,7 +75,7 @@ public static WorkerLogSnapshot SnapshotWorkerLogs(string assetPath)
                 return snapshot;
             }
 
-            var logFiles = Directory.GetFiles(logsDirectory, "AssetImportWorker*.log")
+            var logFiles = Directory.GetFiles(logsDirectory, "AssetImportWorkerHW*.log")
                 .Where(f => !Path.GetFileName(f).Contains("-prev")) // Ignore previous run logs
                 .ToArray();
 
@@ -103,7 +103,7 @@ public static WorkerLogSnapshot SnapshotWorkerLogs(string assetPath)
         private static int ExtractWorkerIdFromFilename(string logFilePath)
         {
             var filename = Path.GetFileName(logFilePath);
-            var match = Regex.Match(filename, @"AssetImportWorker(\d+)\.log");
+            var match = Regex.Match(filename, @"AssetImportWorkerHW(\d+)\.log");
             return match.Success ? int.Parse(match.Groups[1].Value) : -1;
         }
 
@@ -124,45 +124,12 @@ private static int CountAssetImportsInLog(string logFilePath, string assetPath)
                 return 0;
 
             int count = 0;
-            try
+            const int maxRetries = 2;
+            for (int attempt = 0; attempt < maxRetries; attempt++)
             {
-                // Use FileStream with FileShare.ReadWrite to allow reading while the worker has the file open for writing
-                using (var fileStream = new FileStream(logFilePath, FileMode.Open, FileAccess.Read, FileShare.ReadWrite))
-                using (var reader = new StreamReader(fileStream))
-                {
-                    var lines = new List<string>();
-                    string line;
-                    while ((line = reader.ReadLine()) != null)
-                    {
-                        lines.Add(line);
-                    }
-
-                    for (int i = 0; i < lines.Count; i++)
-                    {
-                        // Look for the "Received Import Request." line
-                        if (lines[i].Contains("Received Import Request."))
-                        {
-                            // Check the next few lines for the path
-                            for (int j = i + 1; j < Math.Min(i + 5, lines.Count); j++)
-                            {
-                                if (lines[j].Contains($"path: {assetPath}"))
-                                {
-                                    count++;
-                                    break; // Found the path, move to next import request
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-            catch (IOException ex) when (ex.Message.Contains("sharing violation") || ex.Message.Contains("being used by another process"))
-            {
-                Debug.LogWarning($"Worker log {logFilePath} is currently in use by another process. Retrying...");
-
-                // Retry after a short delay - the worker might have just finished writing
-                System.Threading.Thread.Sleep(100);
                 try
                 {
+                    // Use FileStream with FileShare.ReadWrite to allow reading while the worker has the file open for writing
                     using (var fileStream = new FileStream(logFilePath, FileMode.Open, FileAccess.Read, FileShare.ReadWrite))
                     using (var reader = new StreamReader(fileStream))
                     {
@@ -175,28 +142,34 @@ private static int CountAssetImportsInLog(string logFilePath, string assetPath)
 
                         for (int i = 0; i < lines.Count; i++)
                         {
+                            // Look for the "Received Import Request." line
                             if (lines[i].Contains("Received Import Request."))
                             {
+                                // Check the next few lines for the path
                                 for (int j = i + 1; j < Math.Min(i + 5, lines.Count); j++)
                                 {
-                                    if (lines[j].Contains($"path: {assetPath}"))
+                                    if (lines[j].Contains($"Path: {assetPath}"))
                                     {
                                         count++;
-                                        break;
+                                        break; // Found the path, move to next import request
                                     }
                                 }
                             }
                         }
                     }
+                    break; // Success, exit retry loop
                 }
-                catch (Exception retryEx)
+                catch (IOException ex) when ((ex.Message.Contains("sharing violation") || ex.Message.Contains("being used by another process")) && attempt < maxRetries - 1)
                 {
-                    Debug.LogWarning($"Failed to read worker log {logFilePath} after retry: {retryEx.Message}");
+                    Debug.LogWarning($"Worker log {logFilePath} is currently in use by another process. Retrying...");
+                    // Retry after a short delay - the worker might have just finished writing
+                    System.Threading.Thread.Sleep(100);
+                }
+                catch (Exception ex)
+                {
+                    Debug.LogError($"Failed to read worker log {logFilePath}{(attempt > 0 ? " after retry" : "")}: {ex.Message}");
+                    break; // Non-retryable exception, exit loop
                 }
-            }
-            catch (Exception ex)
-            {
-                Debug.LogWarning($"Failed to read worker log {logFilePath}: {ex.Message}");
             }
 
             return count;
@@ -223,28 +196,5 @@ public static void AssertSingleWorkerUsedAtLeastTwice(WorkerLogSnapshot importDi
             Assert.AreEqual(expectedImports, sumImports,
                 $"Expected a total of {expectedImports} imports for {assetPath}, but found {sumImports} imports across all workers");
         }
-
-        /// <summary>
-        /// Asserts that all imports in the difference snapshot occurred on a single worker
-        /// without checking the exact count (useful when the expected count is unknown).
-        /// </summary>
-        /// <param name="importDifference">The difference snapshot showing new imports</param>
-        /// <param name="assetPath">The asset path being imported</param>
-        /// <returns>The worker ID that performed all imports</returns>
-        public static int AssertSingleWorkerUsed(WorkerLogSnapshot importDifference, string assetPath)
-        {
-            var workersWithImports = importDifference.WorkerImportCounts.Where(kvp => kvp.Value > 0).ToList();
-
-            Assert.IsTrue(workersWithImports.Count > 0,
-                $"Expected at least one worker to have processed imports for {assetPath}, but found none");
-
-            Assert.AreEqual(1, workersWithImports.Count,
-                $"Expected all imports for {assetPath} to occur on a single worker, but found imports on {workersWithImports.Count} workers: {string.Join(", ", workersWithImports.Select(kvp => $"Worker{kvp.Key}({kvp.Value} imports)"))}");
-
-            var singleWorker = workersWithImports.First();
-            Debug.Log($"✓ All {singleWorker.Value} imports for {assetPath} occurred on Worker{singleWorker.Key} as expected");
-
-            return singleWorker.Key;
-        }
     }
 }
diff --git a/Tests/SRPTests/Projects/MultipleSRP_Tests/Assets/Tests/EditMode/Preview/AssetPreviewTests.cs b/Tests/SRPTests/Projects/MultipleSRP_Tests/Assets/Tests/EditMode/Preview/AssetPreviewTests.cs
index 1a0f30fe81c..6579be825f5 100644
--- a/Tests/SRPTests/Projects/MultipleSRP_Tests/Assets/Tests/EditMode/Preview/AssetPreviewTests.cs
+++ b/Tests/SRPTests/Projects/MultipleSRP_Tests/Assets/Tests/EditMode/Preview/AssetPreviewTests.cs
@@ -65,7 +65,8 @@ public class AssetPreviewTests
                 .Returns(null),
             new TestCaseData(new MaterialFactory($"TestMaterial-{nameof(HDRenderPipelineAsset)}"), typeof(HDRenderPipelineAsset))
                 .SetName($"Preview generation for Material {nameof(HDRenderPipelineAsset)} with PreviewImporter")
-                .Returns(null),
+                .Returns(null)
+                .Ignore("Reports incompatible keyword space errors"),
             new TestCaseData(new GameObjectFactory($"Hammer.fbx"), null)
                 .SetName($"Preview generation for Model Built-In with PreviewImporter")
                 .Returns(null),
@@ -74,7 +75,8 @@ public class AssetPreviewTests
                 .Returns(null),
             new TestCaseData(new GameObjectFactory($"Hammer.fbx"), typeof(HDRenderPipelineAsset))
                 .SetName($"Preview generation for Model {nameof(HDRenderPipelineAsset)} with PreviewImporter")
-                .Returns(null),
+                .Returns(null)
+                .Ignore("Reports incompatible keyword space errors"),
             new TestCaseData(new GameObjectFactory($"Hammer.prefab"), null)
                 .SetName($"Preview generation for Prefab Built-In with PreviewImporter")
                 .Returns(null),
@@ -83,7 +85,8 @@ public class AssetPreviewTests
                 .Returns(null),
             new TestCaseData(new GameObjectFactory($"Hammer.prefab"), typeof(HDRenderPipelineAsset))
                 .SetName($"Preview generation for Prefab {nameof(HDRenderPipelineAsset)} with PreviewImporter")
-                .Returns(null),
+                .Returns(null)
+                .Ignore("Reports incompatible keyword space errors"),
         };
 
         string m_CreatedObjectPath;
@@ -116,7 +119,6 @@ public IEnumerator CreatePreview(AssetFactory objectFactory, Type renderPipeline
             }
         }
 
-        [Ignore("issue: no worker when launching AssertSingleWorkerUsedAtLeastTwice https://jira.unity3d.com/browse/UUM-131927")]
         [UnityTest]
         [TestCaseSource(nameof(s_TestCaseDataPreviewImporter))]
         /// <summary>
diff --git a/Tests/SRPTests/Projects/MultipleSRP_Tests/Packages/manifest.json b/Tests/SRPTests/Projects/MultipleSRP_Tests/Packages/manifest.json
index 3b5cee67345..476ecb01bdc 100644
--- a/Tests/SRPTests/Projects/MultipleSRP_Tests/Packages/manifest.json
+++ b/Tests/SRPTests/Projects/MultipleSRP_Tests/Packages/manifest.json
@@ -11,7 +11,7 @@
     "com.unity.shadergraph": "file:../../../../../Packages/com.unity.shadergraph",
     "com.unity.test-framework": "file:../../../../../Packages/com.unity.test-framework",
     "com.unity.testframework.graphics": "file:../../../Packages/com.unity.test-framework.graphics",
-    "com.unity.timeline": "1.8.0",
+    "com.unity.timeline": "1.8.9",
     "com.unity.ugui": "2.0.0",
     "com.unity.visualeffectgraph": "file:../../../../../Packages/com.unity.visualeffectgraph",
     "com.unity.visualscripting": "1.7.8",
@@ -46,4 +46,4 @@
     "com.unity.modules.wind": "1.0.0",
     "com.unity.modules.xr": "1.0.0"
   }
-}
\ No newline at end of file
+}
diff --git a/Tests/SRPTests/Projects/ShaderGraph/Assets/CommonAssets/Scripts/ShaderGraphGraphicsTests.cs b/Tests/SRPTests/Projects/ShaderGraph/Assets/CommonAssets/Scripts/ShaderGraphGraphicsTests.cs
index 3493d456f57..6d0fe08d4df 100644
--- a/Tests/SRPTests/Projects/ShaderGraph/Assets/CommonAssets/Scripts/ShaderGraphGraphicsTests.cs
+++ b/Tests/SRPTests/Projects/ShaderGraph/Assets/CommonAssets/Scripts/ShaderGraphGraphicsTests.cs
@@ -9,6 +9,7 @@
 public class ShaderGraphGraphicsTests
 {
     [IgnoreGraphicsTest("InputNodes|SamplerStateTests|UVNodes", "GLES3 renders these tests incorrectly (FB: 1354427)", runtimePlatforms: new RuntimePlatform[] { RuntimePlatform.Android }, graphicsDeviceTypes: new GraphicsDeviceType[] { GraphicsDeviceType.OpenGLES3 })]
+    [IgnoreGraphicsTest("InputNodes", "UUM-134140", runtimePlatforms: new RuntimePlatform[] { RuntimePlatform.WindowsEditor }, graphicsDeviceTypes: new GraphicsDeviceType[] { GraphicsDeviceType.Direct3D12 })]
     [IgnoreGraphicsTest("InstanceIDWithKeywords", "Platform Independent", graphicsDeviceTypes: new GraphicsDeviceType[] { GraphicsDeviceType.OpenGLES3 })]
     [IgnoreGraphicsTest("InstanceIDWithKeywords", "Platform Independent", graphicsDeviceTypes: new GraphicsDeviceType[] { GraphicsDeviceType.PlayStation4 })]
     [IgnoreGraphicsTest("InstanceIDWithKeywords", "Platform Independent", graphicsDeviceTypes: new GraphicsDeviceType[] { GraphicsDeviceType.XboxOne })]
diff --git a/Tests/SRPTests/Projects/ShaderGraph/Assets/Testing/IntegrationTests/Graphs/ProviderSystem/AllHints.hlsl b/Tests/SRPTests/Projects/ShaderGraph/Assets/Testing/IntegrationTests/Graphs/ProviderSystem/AllHints.hlsl
new file mode 100644
index 00000000000..3a8ae21cc50
--- /dev/null
+++ b/Tests/SRPTests/Projects/ShaderGraph/Assets/Testing/IntegrationTests/Graphs/ProviderSystem/AllHints.hlsl
@@ -0,0 +1,110 @@
+#include "ShaderApiReflectionSupport.hlsl"
+
+namespace Namespace {
+
+struct CustomStruct
+{
+    float Value;
+};
+
+///<funchints>
+///     <sg:ProviderKey>AllHintsUniqueStableID</sg:ProviderKey>
+///     <sg:DisplayName>All Known Hints</sg:DisplayName>
+///     <sg:ReturnDisplayName>Final Result</sg:ReturnDisplayName>
+///     <sg:SearchCategory>Hints/All</sg:SearchCategory>
+///     <sg:SearchTerms>Features, Reflected, Every, Hint</sg:SearchTerms>
+///     <sg:SearchName>All Hints Search Name</sg:SearchName>
+///</funchints>
+///<paramhints name = "a">
+///     <sg:DisplayName>Custom Struct Value</sg:DisplayName>
+///     <sg:Default>0.5</sg:Default>
+///     <sg:External>Namespace</sg:External>
+///</paramhints>
+///<paramhints name = "c3">
+///     <sg:DisplayName>Color 3</sg:DisplayName>
+///     <sg:Color />
+///     <sg:Default>1,1,0</sg:Default>
+///</paramhints>
+///<paramhints name = "c4">
+///     <sg:DisplayName>Color 4</sg:DisplayName>
+///     <sg:Color />
+///     <sg:Default>1,1,0,1</sg:Default>
+///</paramhints>
+///<paramhints name = "sc3">
+///     <sg:DisplayName>Static Color 3</sg:DisplayName>
+///     <sg:Color />
+///     <sg:Static />
+///     <sg:Default>1,1,0</sg:Default>
+///</paramhints>
+///<paramhints name = "sc4">
+///     <sg:DisplayName>Static Color 4</sg:DisplayName>
+///     <sg:Color />
+///     <sg:Static />
+///     <sg:Default>1,1,0,1</sg:Default>
+///</paramhints>
+///<paramhints name = "d">
+///     <sg:DisplayName>Dropdown</sg:DisplayName>
+///     <sg:Dropdown>OptionA, OptionB, OptionC</sg:Dropdown>
+///     <sg:Default>1</sg:Default>
+///</paramhints>
+///<paramhints name = "sd">
+///     <sg:DisplayName>Dropdown</sg:DisplayName>
+///     <sg:Dropdown>OptionA, OptionB, OptionC</sg:Dropdown>
+///     <sg:Static />
+///     <sg:Default>2</sg:Default>
+///</paramhints>
+///<paramhints name = "r">
+///     <sg:DisplayName>Range</sg:DisplayName>
+///     <sg:Range>0, 1</sg:Range>
+///     <sg:Default>0.75</sg:Default>
+///</paramhints>
+///<paramhints name = "sr">
+///     <sg:DisplayName>Range</sg:DisplayName>
+///     <sg:Static />
+///     <sg:Range>0, 1</sg:Range>
+///     <sg:Default>0.25</sg:Default>
+///</paramhints>
+///<paramhints name = "sb">
+///     <sg:DisplayName>Toggle</sg:DisplayName>
+///     <sg:Static />
+///     <sg:Default>1</sg:Default>
+///</paramhints>
+///<paramhints name = "si">
+///     <sg:DisplayName>Integer</sg:DisplayName>
+///     <sg:Static />
+///     <sg:Default>5</sg:Default>
+///</paramhints>
+UNITY_EXPORT_REFLECTION float3 AllHints(
+    inout CustomStruct a,
+    float3 c3,
+    inout float4 c4,
+    float3 sc3,
+    float4 sc4,
+    inout uint d,
+    uint sd,
+    float r,
+    float sr,
+    bool sb,
+    int si
+)
+{
+    return float3(a.Value, sr, sc4.r);
+}
+
+///<paramhints name = "result">
+///     <sg:External>Namespace</sg:External>
+///</paramhints>
+UNITY_EXPORT_REFLECTION void MakeCustomStruct(float a, out CustomStruct result)
+{
+    result.Value = a;
+}
+
+namespace NamespaceAsCategory
+{
+    UNITY_EXPORT_REFLECTION float3 NamespacedFunction()
+    {
+        return float3(1,1,0);
+    }
+}
+
+} // Namespace
\ No newline at end of file
diff --git a/Tests/SRPTests/Projects/ShaderGraph/Assets/Testing/IntegrationTests/Graphs/ProviderSystem/AllHints.hlsl.meta b/Tests/SRPTests/Projects/ShaderGraph/Assets/Testing/IntegrationTests/Graphs/ProviderSystem/AllHints.hlsl.meta
new file mode 100644
index 00000000000..1b2c94109a9
--- /dev/null
+++ b/Tests/SRPTests/Projects/ShaderGraph/Assets/Testing/IntegrationTests/Graphs/ProviderSystem/AllHints.hlsl.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 4060428cd4c114edab3647f50d95506a
+ShaderIncludeImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Tests/SRPTests/Projects/ShaderGraph/Assets/Testing/IntegrationTests/Graphs/ProviderSystem/ShouldCompileProperlyOnImport.shadergraph b/Tests/SRPTests/Projects/ShaderGraph/Assets/Testing/IntegrationTests/Graphs/ProviderSystem/ShouldCompileProperlyOnImport.shadergraph
new file mode 100644
index 00000000000..cf755427f6e
--- /dev/null
+++ b/Tests/SRPTests/Projects/ShaderGraph/Assets/Testing/IntegrationTests/Graphs/ProviderSystem/ShouldCompileProperlyOnImport.shadergraph
@@ -0,0 +1,1247 @@
+{
+    "m_SGVersion": 3,
+    "m_Type": "UnityEditor.ShaderGraph.GraphData",
+    "m_ObjectId": "5986f6de68144d5fb24cd905ef9caa8c",
+    "m_Properties": [],
+    "m_Keywords": [],
+    "m_Dropdowns": [],
+    "m_CategoryData": [
+        {
+            "m_Id": "58527e023b7745bd9800e3548b857ccd"
+        }
+    ],
+    "m_Nodes": [
+        {
+            "m_Id": "bf761c536bd04fbaacb943564862d899"
+        },
+        {
+            "m_Id": "55c129e19a6b4204bb696f0769b957be"
+        },
+        {
+            "m_Id": "6f0a51ebf1704b26874463c4a99d68bc"
+        },
+        {
+            "m_Id": "5784e5f7edb64ab6a719b6f7dccea574"
+        },
+        {
+            "m_Id": "de69fe023db044b588133cac8130c0a5"
+        },
+        {
+            "m_Id": "793a050e313d4f05a8b27a0ed15541ce"
+        },
+        {
+            "m_Id": "b3455fdb91704dd2b4d6498433e11a3f"
+        },
+        {
+            "m_Id": "9bfa1c63ad7a47cca1d428fd2664b0a1"
+        },
+        {
+            "m_Id": "79827555378b43b4b8a46317eabcb8b1"
+        },
+        {
+            "m_Id": "abc179ee5107447ca5495532006b435e"
+        },
+        {
+            "m_Id": "d715a4d08d6e4e77b8fe8c816d434bac"
+        }
+    ],
+    "m_GroupDatas": [],
+    "m_StickyNoteDatas": [],
+    "m_Edges": [
+        {
+            "m_OutputSlot": {
+                "m_Node": {
+                    "m_Id": "abc179ee5107447ca5495532006b435e"
+                },
+                "m_SlotId": 0
+            },
+            "m_InputSlot": {
+                "m_Node": {
+                    "m_Id": "5784e5f7edb64ab6a719b6f7dccea574"
+                },
+                "m_SlotId": 0
+            }
+        },
+        {
+            "m_OutputSlot": {
+                "m_Node": {
+                    "m_Id": "d715a4d08d6e4e77b8fe8c816d434bac"
+                },
+                "m_SlotId": 2
+            },
+            "m_InputSlot": {
+                "m_Node": {
+                    "m_Id": "abc179ee5107447ca5495532006b435e"
+                },
+                "m_SlotId": 1
+            }
+        }
+    ],
+    "m_VertexContext": {
+        "m_Position": {
+            "x": -98.49996948242188,
+            "y": -535.0
+        },
+        "m_Blocks": [
+            {
+                "m_Id": "bf761c536bd04fbaacb943564862d899"
+            },
+            {
+                "m_Id": "55c129e19a6b4204bb696f0769b957be"
+            },
+            {
+                "m_Id": "6f0a51ebf1704b26874463c4a99d68bc"
+            }
+        ]
+    },
+    "m_FragmentContext": {
+        "m_Position": {
+            "x": -65.49999237060547,
+            "y": -287.49993896484377
+        },
+        "m_Blocks": [
+            {
+                "m_Id": "5784e5f7edb64ab6a719b6f7dccea574"
+            },
+            {
+                "m_Id": "de69fe023db044b588133cac8130c0a5"
+            },
+            {
+                "m_Id": "793a050e313d4f05a8b27a0ed15541ce"
+            },
+            {
+                "m_Id": "b3455fdb91704dd2b4d6498433e11a3f"
+            },
+            {
+                "m_Id": "9bfa1c63ad7a47cca1d428fd2664b0a1"
+            },
+            {
+                "m_Id": "79827555378b43b4b8a46317eabcb8b1"
+            }
+        ]
+    },
+    "m_PreviewData": {
+        "serializedMesh": {
+            "m_SerializedMesh": "{\"mesh\":{\"instanceID\":0}}",
+            "m_Guid": ""
+        },
+        "preventRotation": false
+    },
+    "m_Path": "Shader Graphs",
+    "m_GraphPrecision": 1,
+    "m_PreviewMode": 2,
+    "m_OutputNode": {
+        "m_Id": ""
+    },
+    "m_SubDatas": [],
+    "m_ActiveTargets": [
+        {
+            "m_Id": "0afb71d0a00c40ce9ef24adc614b3682"
+        }
+    ]
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.ProviderSystem.ExternalMaterialSlot",
+    "m_ObjectId": "0754487883424571af380987bf510ff7",
+    "m_Id": 2,
+    "m_DisplayName": "Result",
+    "m_SlotType": 1,
+    "m_Hidden": false,
+    "m_HideConnector": false,
+    "m_ShaderOutputName": "result",
+    "m_StageCapability": 3,
+    "m_typeName": "Namespace::CustomStruct",
+    "m_rawDefaultValueString": "0"
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.BooleanMaterialSlot",
+    "m_ObjectId": "087d2f43197440c3b961acc319f9bd5a",
+    "m_Id": 13,
+    "m_DisplayName": "Toggle",
+    "m_SlotType": 0,
+    "m_Hidden": false,
+    "m_HideConnector": true,
+    "m_ShaderOutputName": "sb",
+    "m_StageCapability": 3,
+    "m_Value": true,
+    "m_DefaultValue": true
+}
+
+{
+    "m_SGVersion": 1,
+    "m_Type": "UnityEditor.Rendering.Universal.ShaderGraph.UniversalTarget",
+    "m_ObjectId": "0afb71d0a00c40ce9ef24adc614b3682",
+    "m_Datas": [],
+    "m_ActiveSubTarget": {
+        "m_Id": "d5d43ab2cfd24d14ac874c98f494699e"
+    },
+    "m_AllowMaterialOverride": false,
+    "m_SurfaceType": 0,
+    "m_ZTestMode": 4,
+    "m_ZWriteControl": 0,
+    "m_AlphaMode": 0,
+    "m_RenderFace": 2,
+    "m_AlphaClip": false,
+    "m_CastShadows": true,
+    "m_ReceiveShadows": true,
+    "m_DisableTint": false,
+    "m_Sort3DAs2DCompatible": false,
+    "m_AdditionalMotionVectorMode": 0,
+    "m_AlembicMotionVectors": false,
+    "m_SupportsLODCrossFade": false,
+    "m_CustomEditorGUI": "",
+    "m_SupportVFX": false
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
+    "m_ObjectId": "1f332c5cdfb74eeda1fd9bfa573e141e",
+    "m_Id": 0,
+    "m_DisplayName": "Metallic",
+    "m_SlotType": 0,
+    "m_Hidden": false,
+    "m_HideConnector": false,
+    "m_ShaderOutputName": "Metallic",
+    "m_StageCapability": 2,
+    "m_Value": 0.0,
+    "m_DefaultValue": 0.0,
+    "m_Labels": [],
+    "m_LiteralMode": false
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialIntegerSlot",
+    "m_ObjectId": "2450c748c904403996d4d20cc478b2c2",
+    "m_Id": 14,
+    "m_DisplayName": "Integer",
+    "m_SlotType": 0,
+    "m_Hidden": false,
+    "m_HideConnector": true,
+    "m_ShaderOutputName": "si",
+    "m_StageCapability": 3,
+    "m_Value": 5.0,
+    "m_DefaultValue": 5.0,
+    "m_Labels": [],
+    "m_LiteralMode": false,
+    "m_unsigned": false
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialEnumSlot",
+    "m_ObjectId": "26052c8287894b9f8382692f5497322a",
+    "m_Id": 8,
+    "m_DisplayName": "Dropdown",
+    "m_SlotType": 0,
+    "m_Hidden": false,
+    "m_HideConnector": false,
+    "m_ShaderOutputName": "d",
+    "m_StageCapability": 3,
+    "m_Value": 1.0,
+    "m_DefaultValue": 1.0,
+    "m_Labels": [],
+    "m_LiteralMode": false,
+    "options": [
+        "OptionA",
+        "OptionB",
+        "OptionC"
+    ],
+    "values": [
+        0,
+        1,
+        2
+    ]
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.ColorRGBMaterialSlot",
+    "m_ObjectId": "3486de34952c4b7c857056075f789ed1",
+    "m_Id": 0,
+    "m_DisplayName": "Base Color",
+    "m_SlotType": 0,
+    "m_Hidden": false,
+    "m_HideConnector": false,
+    "m_ShaderOutputName": "BaseColor",
+    "m_StageCapability": 2,
+    "m_Value": {
+        "x": 0.5,
+        "y": 0.5,
+        "z": 0.5
+    },
+    "m_DefaultValue": {
+        "x": 0.5,
+        "y": 0.5,
+        "z": 0.5
+    },
+    "m_Labels": [],
+    "m_ColorMode": 0,
+    "m_DefaultColor": {
+        "r": 0.5,
+        "g": 0.5,
+        "b": 0.5,
+        "a": 1.0
+    }
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.TangentMaterialSlot",
+    "m_ObjectId": "3cf4bae4141b4566a405cf0e50c6e600",
+    "m_Id": 0,
+    "m_DisplayName": "Tangent",
+    "m_SlotType": 0,
+    "m_Hidden": false,
+    "m_HideConnector": false,
+    "m_ShaderOutputName": "Tangent",
+    "m_StageCapability": 1,
+    "m_Value": {
+        "x": 0.0,
+        "y": 0.0,
+        "z": 0.0
+    },
+    "m_DefaultValue": {
+        "x": 0.0,
+        "y": 0.0,
+        "z": 0.0
+    },
+    "m_Labels": [],
+    "m_Space": 0
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.ColorRGBMaterialSlot",
+    "m_ObjectId": "4552d16fd3154640b455494b60d7728a",
+    "m_Id": 0,
+    "m_DisplayName": "Emission",
+    "m_SlotType": 0,
+    "m_Hidden": false,
+    "m_HideConnector": false,
+    "m_ShaderOutputName": "Emission",
+    "m_StageCapability": 2,
+    "m_Value": {
+        "x": 0.0,
+        "y": 0.0,
+        "z": 0.0
+    },
+    "m_DefaultValue": {
+        "x": 0.0,
+        "y": 0.0,
+        "z": 0.0
+    },
+    "m_Labels": [],
+    "m_ColorMode": 1,
+    "m_DefaultColor": {
+        "r": 0.0,
+        "g": 0.0,
+        "b": 0.0,
+        "a": 1.0
+    }
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialEnumSlot",
+    "m_ObjectId": "4e7192094bdb4399accaa088b8b78eb3",
+    "m_Id": 9,
+    "m_DisplayName": "Dropdown",
+    "m_SlotType": 1,
+    "m_Hidden": false,
+    "m_HideConnector": false,
+    "m_ShaderOutputName": "d",
+    "m_StageCapability": 3,
+    "m_Value": 1.0,
+    "m_DefaultValue": 1.0,
+    "m_Labels": [],
+    "m_LiteralMode": false,
+    "options": [
+        "OptionA",
+        "OptionB",
+        "OptionC"
+    ],
+    "values": [
+        0,
+        1,
+        2
+    ]
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.BlockNode",
+    "m_ObjectId": "55c129e19a6b4204bb696f0769b957be",
+    "m_Group": {
+        "m_Id": ""
+    },
+    "m_Name": "VertexDescription.Normal",
+    "m_DrawState": {
+        "m_Expanded": true,
+        "m_Position": {
+            "serializedVersion": "2",
+            "x": 0.0,
+            "y": 0.0,
+            "width": 0.0,
+            "height": 0.0
+        }
+    },
+    "m_Slots": [
+        {
+            "m_Id": "cf0d43ee886345429f2696eed42016b9"
+        }
+    ],
+    "synonyms": [],
+    "m_Precision": 0,
+    "m_PreviewExpanded": true,
+    "m_DismissedVersion": 0,
+    "m_PreviewMode": 0,
+    "m_CustomColors": {
+        "m_SerializableColors": []
+    },
+    "m_SerializedDescriptor": "VertexDescription.Normal"
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.BlockNode",
+    "m_ObjectId": "5784e5f7edb64ab6a719b6f7dccea574",
+    "m_Group": {
+        "m_Id": ""
+    },
+    "m_Name": "SurfaceDescription.BaseColor",
+    "m_DrawState": {
+        "m_Expanded": true,
+        "m_Position": {
+            "serializedVersion": "2",
+            "x": 0.0,
+            "y": 0.0,
+            "width": 0.0,
+            "height": 0.0
+        }
+    },
+    "m_Slots": [
+        {
+            "m_Id": "3486de34952c4b7c857056075f789ed1"
+        }
+    ],
+    "synonyms": [],
+    "m_Precision": 0,
+    "m_PreviewExpanded": true,
+    "m_DismissedVersion": 0,
+    "m_PreviewMode": 0,
+    "m_CustomColors": {
+        "m_SerializableColors": []
+    },
+    "m_SerializedDescriptor": "SurfaceDescription.BaseColor"
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.CategoryData",
+    "m_ObjectId": "58527e023b7745bd9800e3548b857ccd",
+    "m_Name": "",
+    "m_ChildObjectList": []
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.PositionMaterialSlot",
+    "m_ObjectId": "6a4122c7f131462699d33eedffc8b834",
+    "m_Id": 0,
+    "m_DisplayName": "Position",
+    "m_SlotType": 0,
+    "m_Hidden": false,
+    "m_HideConnector": false,
+    "m_ShaderOutputName": "Position",
+    "m_StageCapability": 1,
+    "m_Value": {
+        "x": 0.0,
+        "y": 0.0,
+        "z": 0.0
+    },
+    "m_DefaultValue": {
+        "x": 0.0,
+        "y": 0.0,
+        "z": 0.0
+    },
+    "m_Labels": [],
+    "m_Space": 0
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.BlockNode",
+    "m_ObjectId": "6f0a51ebf1704b26874463c4a99d68bc",
+    "m_Group": {
+        "m_Id": ""
+    },
+    "m_Name": "VertexDescription.Tangent",
+    "m_DrawState": {
+        "m_Expanded": true,
+        "m_Position": {
+            "serializedVersion": "2",
+            "x": 0.0,
+            "y": 0.0,
+            "width": 0.0,
+            "height": 0.0
+        }
+    },
+    "m_Slots": [
+        {
+            "m_Id": "3cf4bae4141b4566a405cf0e50c6e600"
+        }
+    ],
+    "synonyms": [],
+    "m_Precision": 0,
+    "m_PreviewExpanded": true,
+    "m_DismissedVersion": 0,
+    "m_PreviewMode": 0,
+    "m_CustomColors": {
+        "m_SerializableColors": []
+    },
+    "m_SerializedDescriptor": "VertexDescription.Tangent"
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.NormalMaterialSlot",
+    "m_ObjectId": "7296f28828ef48e8a03494f77532d2d8",
+    "m_Id": 0,
+    "m_DisplayName": "Normal (Tangent Space)",
+    "m_SlotType": 0,
+    "m_Hidden": false,
+    "m_HideConnector": false,
+    "m_ShaderOutputName": "NormalTS",
+    "m_StageCapability": 2,
+    "m_Value": {
+        "x": 0.0,
+        "y": 0.0,
+        "z": 0.0
+    },
+    "m_DefaultValue": {
+        "x": 0.0,
+        "y": 0.0,
+        "z": 0.0
+    },
+    "m_Labels": [],
+    "m_Space": 3
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.ProviderSystem.ExternalMaterialSlot",
+    "m_ObjectId": "73ae370ae0c0438d8268613bee620fcd",
+    "m_Id": 2,
+    "m_DisplayName": "Custom Struct Value",
+    "m_SlotType": 1,
+    "m_Hidden": false,
+    "m_HideConnector": false,
+    "m_ShaderOutputName": "a",
+    "m_StageCapability": 3,
+    "m_typeName": "Namespace::CustomStruct",
+    "m_rawDefaultValueString": "0.5"
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.BlockNode",
+    "m_ObjectId": "793a050e313d4f05a8b27a0ed15541ce",
+    "m_Group": {
+        "m_Id": ""
+    },
+    "m_Name": "SurfaceDescription.Metallic",
+    "m_DrawState": {
+        "m_Expanded": true,
+        "m_Position": {
+            "serializedVersion": "2",
+            "x": 0.0,
+            "y": 0.0,
+            "width": 0.0,
+            "height": 0.0
+        }
+    },
+    "m_Slots": [
+        {
+            "m_Id": "1f332c5cdfb74eeda1fd9bfa573e141e"
+        }
+    ],
+    "synonyms": [],
+    "m_Precision": 0,
+    "m_PreviewExpanded": true,
+    "m_DismissedVersion": 0,
+    "m_PreviewMode": 0,
+    "m_CustomColors": {
+        "m_SerializableColors": []
+    },
+    "m_SerializedDescriptor": "SurfaceDescription.Metallic"
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.BlockNode",
+    "m_ObjectId": "79827555378b43b4b8a46317eabcb8b1",
+    "m_Group": {
+        "m_Id": ""
+    },
+    "m_Name": "SurfaceDescription.Occlusion",
+    "m_DrawState": {
+        "m_Expanded": true,
+        "m_Position": {
+            "serializedVersion": "2",
+            "x": 0.0,
+            "y": 0.0,
+            "width": 0.0,
+            "height": 0.0
+        }
+    },
+    "m_Slots": [
+        {
+            "m_Id": "bf61e113654141fc9b4996ad024424e5"
+        }
+    ],
+    "synonyms": [],
+    "m_Precision": 0,
+    "m_PreviewExpanded": true,
+    "m_DismissedVersion": 0,
+    "m_PreviewMode": 0,
+    "m_CustomColors": {
+        "m_SerializableColors": []
+    },
+    "m_SerializedDescriptor": "SurfaceDescription.Occlusion"
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.ProviderSystem.ExternalMaterialSlot",
+    "m_ObjectId": "7a42f5ac5a944351b622af4fbb230bd9",
+    "m_Id": 1,
+    "m_DisplayName": "Custom Struct Value",
+    "m_SlotType": 0,
+    "m_Hidden": false,
+    "m_HideConnector": false,
+    "m_ShaderOutputName": "a",
+    "m_StageCapability": 3,
+    "m_typeName": "Namespace::CustomStruct",
+    "m_rawDefaultValueString": "0.5"
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialEnumSlot",
+    "m_ObjectId": "7c920fa72c7e4e2eafbe4cf0aaabb426",
+    "m_Id": 10,
+    "m_DisplayName": "Dropdown",
+    "m_SlotType": 0,
+    "m_Hidden": false,
+    "m_HideConnector": true,
+    "m_ShaderOutputName": "sd",
+    "m_StageCapability": 3,
+    "m_Value": 2.0,
+    "m_DefaultValue": 2.0,
+    "m_Labels": [],
+    "m_LiteralMode": false,
+    "options": [
+        "OptionA",
+        "OptionB",
+        "OptionC"
+    ],
+    "values": [
+        0,
+        1,
+        2
+    ]
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.ColorRGBMaterialSlot",
+    "m_ObjectId": "87a0f49c5732479ab274c007f0753efa",
+    "m_Id": 3,
+    "m_DisplayName": "Color 3",
+    "m_SlotType": 0,
+    "m_Hidden": false,
+    "m_HideConnector": false,
+    "m_ShaderOutputName": "c3",
+    "m_StageCapability": 3,
+    "m_Value": {
+        "x": 1.0,
+        "y": 1.0,
+        "z": 0.0
+    },
+    "m_DefaultValue": {
+        "x": 1.0,
+        "y": 1.0,
+        "z": 0.0
+    },
+    "m_Labels": [],
+    "m_ColorMode": 0,
+    "m_DefaultColor": {
+        "r": 1.0,
+        "g": 1.0,
+        "b": 0.0,
+        "a": 1.0
+    }
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
+    "m_ObjectId": "9aeaec8d58e742e6874131e1d39c8aa6",
+    "m_Id": 1,
+    "m_DisplayName": "A",
+    "m_SlotType": 0,
+    "m_Hidden": false,
+    "m_HideConnector": false,
+    "m_ShaderOutputName": "a",
+    "m_StageCapability": 3,
+    "m_Value": 0.0,
+    "m_DefaultValue": 0.0,
+    "m_Labels": [],
+    "m_LiteralMode": false
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.BlockNode",
+    "m_ObjectId": "9bfa1c63ad7a47cca1d428fd2664b0a1",
+    "m_Group": {
+        "m_Id": ""
+    },
+    "m_Name": "SurfaceDescription.Emission",
+    "m_DrawState": {
+        "m_Expanded": true,
+        "m_Position": {
+            "serializedVersion": "2",
+            "x": 0.0,
+            "y": 0.0,
+            "width": 0.0,
+            "height": 0.0
+        }
+    },
+    "m_Slots": [
+        {
+            "m_Id": "4552d16fd3154640b455494b60d7728a"
+        }
+    ],
+    "synonyms": [],
+    "m_Precision": 0,
+    "m_PreviewExpanded": true,
+    "m_DismissedVersion": 0,
+    "m_PreviewMode": 0,
+    "m_CustomColors": {
+        "m_SerializableColors": []
+    },
+    "m_SerializedDescriptor": "SurfaceDescription.Emission"
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.ColorRGBAMaterialSlot",
+    "m_ObjectId": "a7f8847024b34a678219b3a4aa52ef1b",
+    "m_Id": 7,
+    "m_DisplayName": "Static Color 4",
+    "m_SlotType": 0,
+    "m_Hidden": false,
+    "m_HideConnector": true,
+    "m_ShaderOutputName": "sc4",
+    "m_StageCapability": 3,
+    "m_Value": {
+        "x": 1.0,
+        "y": 1.0,
+        "z": 0.0,
+        "w": 1.0
+    },
+    "m_DefaultValue": {
+        "x": 1.0,
+        "y": 1.0,
+        "z": 0.0,
+        "w": 1.0
+    },
+    "m_Labels": []
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.ProviderSystem.ProviderNode",
+    "m_ObjectId": "abc179ee5107447ca5495532006b435e",
+    "m_Group": {
+        "m_Id": ""
+    },
+    "m_Name": "All Known Hints",
+    "m_DrawState": {
+        "m_Expanded": true,
+        "m_Position": {
+            "serializedVersion": "2",
+            "x": -489.5,
+            "y": -353.9999694824219,
+            "width": 316.0,
+            "height": 491.5000305175781
+        }
+    },
+    "m_Slots": [
+        {
+            "m_Id": "d2f9a4c5e5594ca9bbb0da08fbbc2672"
+        },
+        {
+            "m_Id": "7a42f5ac5a944351b622af4fbb230bd9"
+        },
+        {
+            "m_Id": "73ae370ae0c0438d8268613bee620fcd"
+        },
+        {
+            "m_Id": "87a0f49c5732479ab274c007f0753efa"
+        },
+        {
+            "m_Id": "b562783b180f4c2e85820fc8a48c6815"
+        },
+        {
+            "m_Id": "db491031d1f647e09b27504acb2d0c93"
+        },
+        {
+            "m_Id": "b84dd6b7a91943b9a245b31d9dfa8789"
+        },
+        {
+            "m_Id": "a7f8847024b34a678219b3a4aa52ef1b"
+        },
+        {
+            "m_Id": "26052c8287894b9f8382692f5497322a"
+        },
+        {
+            "m_Id": "4e7192094bdb4399accaa088b8b78eb3"
+        },
+        {
+            "m_Id": "7c920fa72c7e4e2eafbe4cf0aaabb426"
+        },
+        {
+            "m_Id": "adb46ec4abb54d9abdf31c4f1b4c4c0f"
+        },
+        {
+            "m_Id": "ee98c1bdfb8743deae8a0719435e7e08"
+        },
+        {
+            "m_Id": "087d2f43197440c3b961acc319f9bd5a"
+        },
+        {
+            "m_Id": "2450c748c904403996d4d20cc478b2c2"
+        }
+    ],
+    "synonyms": [
+        "All Hints Search Name"
+    ],
+    "m_Precision": 0,
+    "m_PreviewExpanded": true,
+    "m_DismissedVersion": 0,
+    "m_PreviewMode": 0,
+    "m_CustomColors": {
+        "m_SerializableColors": []
+    },
+    "m_provider": {
+        "rid": 1000
+    },
+    "references": {
+        "version": 2,
+        "RefIds": [
+            {
+                "rid": 1000,
+                "type": {
+                    "class": "ReflectedFunctionProvider",
+                    "ns": "UnityEditor.ShaderGraph.ProviderSystem",
+                    "asm": "Unity.ShaderGraph.Editor"
+                },
+                "data": {
+                    "m_providerKey": "AllHintsUniqueStableID",
+                    "m_sourceAssetId": "4060428cd4c114edab3647f50d95506a"
+                }
+            }
+        ]
+    }
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialRangeSlot",
+    "m_ObjectId": "adb46ec4abb54d9abdf31c4f1b4c4c0f",
+    "m_Id": 11,
+    "m_DisplayName": "Range",
+    "m_SlotType": 0,
+    "m_Hidden": false,
+    "m_HideConnector": false,
+    "m_ShaderOutputName": "r",
+    "m_StageCapability": 3,
+    "m_Value": 0.75,
+    "m_DefaultValue": 0.75,
+    "m_Labels": [],
+    "m_LiteralMode": false,
+    "m_sliderRange": {
+        "x": 0.0,
+        "y": 1.0
+    },
+    "m_SliderType": 0,
+    "m_SliderPower": 3.0
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.BlockNode",
+    "m_ObjectId": "b3455fdb91704dd2b4d6498433e11a3f",
+    "m_Group": {
+        "m_Id": ""
+    },
+    "m_Name": "SurfaceDescription.Smoothness",
+    "m_DrawState": {
+        "m_Expanded": true,
+        "m_Position": {
+            "serializedVersion": "2",
+            "x": 0.0,
+            "y": 0.0,
+            "width": 0.0,
+            "height": 0.0
+        }
+    },
+    "m_Slots": [
+        {
+            "m_Id": "cfad1bb65f9a4cb2bfa7b302f7b8a7fc"
+        }
+    ],
+    "synonyms": [],
+    "m_Precision": 0,
+    "m_PreviewExpanded": true,
+    "m_DismissedVersion": 0,
+    "m_PreviewMode": 0,
+    "m_CustomColors": {
+        "m_SerializableColors": []
+    },
+    "m_SerializedDescriptor": "SurfaceDescription.Smoothness"
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.ColorRGBAMaterialSlot",
+    "m_ObjectId": "b562783b180f4c2e85820fc8a48c6815",
+    "m_Id": 4,
+    "m_DisplayName": "Color 4",
+    "m_SlotType": 0,
+    "m_Hidden": false,
+    "m_HideConnector": false,
+    "m_ShaderOutputName": "c4",
+    "m_StageCapability": 3,
+    "m_Value": {
+        "x": 1.0,
+        "y": 1.0,
+        "z": 0.0,
+        "w": 1.0
+    },
+    "m_DefaultValue": {
+        "x": 1.0,
+        "y": 1.0,
+        "z": 0.0,
+        "w": 1.0
+    },
+    "m_Labels": []
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.ColorRGBMaterialSlot",
+    "m_ObjectId": "b84dd6b7a91943b9a245b31d9dfa8789",
+    "m_Id": 6,
+    "m_DisplayName": "Static Color 3",
+    "m_SlotType": 0,
+    "m_Hidden": false,
+    "m_HideConnector": true,
+    "m_ShaderOutputName": "sc3",
+    "m_StageCapability": 3,
+    "m_Value": {
+        "x": 1.0,
+        "y": 1.0,
+        "z": 0.0
+    },
+    "m_DefaultValue": {
+        "x": 1.0,
+        "y": 1.0,
+        "z": 0.0
+    },
+    "m_Labels": [],
+    "m_ColorMode": 0,
+    "m_DefaultColor": {
+        "r": 1.0,
+        "g": 1.0,
+        "b": 0.0,
+        "a": 1.0
+    }
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
+    "m_ObjectId": "bf61e113654141fc9b4996ad024424e5",
+    "m_Id": 0,
+    "m_DisplayName": "Ambient Occlusion",
+    "m_SlotType": 0,
+    "m_Hidden": false,
+    "m_HideConnector": false,
+    "m_ShaderOutputName": "Occlusion",
+    "m_StageCapability": 2,
+    "m_Value": 1.0,
+    "m_DefaultValue": 1.0,
+    "m_Labels": [],
+    "m_LiteralMode": false
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.BlockNode",
+    "m_ObjectId": "bf761c536bd04fbaacb943564862d899",
+    "m_Group": {
+        "m_Id": ""
+    },
+    "m_Name": "VertexDescription.Position",
+    "m_DrawState": {
+        "m_Expanded": true,
+        "m_Position": {
+            "serializedVersion": "2",
+            "x": 0.0,
+            "y": 0.0,
+            "width": 0.0,
+            "height": 0.0
+        }
+    },
+    "m_Slots": [
+        {
+            "m_Id": "6a4122c7f131462699d33eedffc8b834"
+        }
+    ],
+    "synonyms": [],
+    "m_Precision": 0,
+    "m_PreviewExpanded": true,
+    "m_DismissedVersion": 0,
+    "m_PreviewMode": 0,
+    "m_CustomColors": {
+        "m_SerializableColors": []
+    },
+    "m_SerializedDescriptor": "VertexDescription.Position"
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.NormalMaterialSlot",
+    "m_ObjectId": "cf0d43ee886345429f2696eed42016b9",
+    "m_Id": 0,
+    "m_DisplayName": "Normal",
+    "m_SlotType": 0,
+    "m_Hidden": false,
+    "m_HideConnector": false,
+    "m_ShaderOutputName": "Normal",
+    "m_StageCapability": 1,
+    "m_Value": {
+        "x": 0.0,
+        "y": 0.0,
+        "z": 0.0
+    },
+    "m_DefaultValue": {
+        "x": 0.0,
+        "y": 0.0,
+        "z": 0.0
+    },
+    "m_Labels": [],
+    "m_Space": 0
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
+    "m_ObjectId": "cfad1bb65f9a4cb2bfa7b302f7b8a7fc",
+    "m_Id": 0,
+    "m_DisplayName": "Smoothness",
+    "m_SlotType": 0,
+    "m_Hidden": false,
+    "m_HideConnector": false,
+    "m_ShaderOutputName": "Smoothness",
+    "m_StageCapability": 2,
+    "m_Value": 0.5,
+    "m_DefaultValue": 0.5,
+    "m_Labels": [],
+    "m_LiteralMode": false
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.Vector3MaterialSlot",
+    "m_ObjectId": "d2f9a4c5e5594ca9bbb0da08fbbc2672",
+    "m_Id": 0,
+    "m_DisplayName": "Final Result",
+    "m_SlotType": 1,
+    "m_Hidden": false,
+    "m_HideConnector": false,
+    "m_ShaderOutputName": "Final Result",
+    "m_StageCapability": 3,
+    "m_Value": {
+        "x": 0.0,
+        "y": 0.0,
+        "z": 0.0
+    },
+    "m_DefaultValue": {
+        "x": 0.0,
+        "y": 0.0,
+        "z": 0.0
+    },
+    "m_Labels": []
+}
+
+{
+    "m_SGVersion": 2,
+    "m_Type": "UnityEditor.Rendering.Universal.ShaderGraph.UniversalLitSubTarget",
+    "m_ObjectId": "d5d43ab2cfd24d14ac874c98f494699e",
+    "m_WorkflowMode": 1,
+    "m_NormalDropOffSpace": 0,
+    "m_ClearCoat": false,
+    "m_BlendModePreserveSpecular": true
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.ProviderSystem.ProviderNode",
+    "m_ObjectId": "d715a4d08d6e4e77b8fe8c816d434bac",
+    "m_Group": {
+        "m_Id": ""
+    },
+    "m_Name": "Make Custom Struct",
+    "m_DrawState": {
+        "m_Expanded": true,
+        "m_Position": {
+            "serializedVersion": "2",
+            "x": -742.5,
+            "y": -414.9999694824219,
+            "width": 162.0,
+            "height": 86.0
+        }
+    },
+    "m_Slots": [
+        {
+            "m_Id": "9aeaec8d58e742e6874131e1d39c8aa6"
+        },
+        {
+            "m_Id": "0754487883424571af380987bf510ff7"
+        }
+    ],
+    "synonyms": [
+        "MakeCustomStruct"
+    ],
+    "m_Precision": 0,
+    "m_PreviewExpanded": false,
+    "m_DismissedVersion": 0,
+    "m_PreviewMode": 0,
+    "m_CustomColors": {
+        "m_SerializableColors": []
+    },
+    "m_provider": {
+        "rid": 1000
+    },
+    "references": {
+        "version": 2,
+        "RefIds": [
+            {
+                "rid": 1000,
+                "type": {
+                    "class": "ReflectedFunctionProvider",
+                    "ns": "UnityEditor.ShaderGraph.ProviderSystem",
+                    "asm": "Unity.ShaderGraph.Editor"
+                },
+                "data": {
+                    "m_providerKey": "Namespace::MakeCustomStruct(float,CustomStruct)",
+                    "m_sourceAssetId": "4060428cd4c114edab3647f50d95506a"
+                }
+            }
+        ]
+    }
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.ColorRGBAMaterialSlot",
+    "m_ObjectId": "db491031d1f647e09b27504acb2d0c93",
+    "m_Id": 5,
+    "m_DisplayName": "Color 4",
+    "m_SlotType": 1,
+    "m_Hidden": false,
+    "m_HideConnector": false,
+    "m_ShaderOutputName": "c4",
+    "m_StageCapability": 3,
+    "m_Value": {
+        "x": 1.0,
+        "y": 1.0,
+        "z": 0.0,
+        "w": 1.0
+    },
+    "m_DefaultValue": {
+        "x": 1.0,
+        "y": 1.0,
+        "z": 0.0,
+        "w": 1.0
+    },
+    "m_Labels": []
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.BlockNode",
+    "m_ObjectId": "de69fe023db044b588133cac8130c0a5",
+    "m_Group": {
+        "m_Id": ""
+    },
+    "m_Name": "SurfaceDescription.NormalTS",
+    "m_DrawState": {
+        "m_Expanded": true,
+        "m_Position": {
+            "serializedVersion": "2",
+            "x": 0.0,
+            "y": 0.0,
+            "width": 0.0,
+            "height": 0.0
+        }
+    },
+    "m_Slots": [
+        {
+            "m_Id": "7296f28828ef48e8a03494f77532d2d8"
+        }
+    ],
+    "synonyms": [],
+    "m_Precision": 0,
+    "m_PreviewExpanded": true,
+    "m_DismissedVersion": 0,
+    "m_PreviewMode": 0,
+    "m_CustomColors": {
+        "m_SerializableColors": []
+    },
+    "m_SerializedDescriptor": "SurfaceDescription.NormalTS"
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialRangeSlot",
+    "m_ObjectId": "ee98c1bdfb8743deae8a0719435e7e08",
+    "m_Id": 12,
+    "m_DisplayName": "Range",
+    "m_SlotType": 0,
+    "m_Hidden": false,
+    "m_HideConnector": true,
+    "m_ShaderOutputName": "sr",
+    "m_StageCapability": 3,
+    "m_Value": 0.25,
+    "m_DefaultValue": 0.25,
+    "m_Labels": [],
+    "m_LiteralMode": false,
+    "m_sliderRange": {
+        "x": 0.0,
+        "y": 1.0
+    },
+    "m_SliderType": 0,
+    "m_SliderPower": 3.0
+}
+
diff --git a/Tests/SRPTests/Projects/ShaderGraph/Assets/Testing/IntegrationTests/Graphs/ProviderSystem/ShouldCompileProperlyOnImport.shadergraph.meta b/Tests/SRPTests/Projects/ShaderGraph/Assets/Testing/IntegrationTests/Graphs/ProviderSystem/ShouldCompileProperlyOnImport.shadergraph.meta
new file mode 100644
index 00000000000..a54c3f9ae05
--- /dev/null
+++ b/Tests/SRPTests/Projects/ShaderGraph/Assets/Testing/IntegrationTests/Graphs/ProviderSystem/ShouldCompileProperlyOnImport.shadergraph.meta
@@ -0,0 +1,20 @@
+fileFormatVersion: 2
+guid: 0af07439258a942f3adfa7d48e3f6b36
+ScriptedImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 2
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+  script: {fileID: 11500000, guid: 625f186215c104763be7675aa2d941aa, type: 3}
+  useAsTemplate: 0
+  exposeTemplateAsShader: 0
+  indexedData: {instanceID: 0}
+  template:
+    name: 
+    category: 
+    description: 
+    icon: {instanceID: 0}
+    thumbnail: {instanceID: 0}
+    order: 0
diff --git a/Tests/SRPTests/Projects/UniversalGraphicsTest_2D/Assets/Scenes/020_ShadowInterop/SimpleShadowProvider.cs b/Tests/SRPTests/Projects/UniversalGraphicsTest_2D/Assets/Scenes/020_ShadowInterop/SimpleShadowProvider.cs
index aab81f7ddef..7159d64b7ff 100644
--- a/Tests/SRPTests/Projects/UniversalGraphicsTest_2D/Assets/Scenes/020_ShadowInterop/SimpleShadowProvider.cs
+++ b/Tests/SRPTests/Projects/UniversalGraphicsTest_2D/Assets/Scenes/020_ShadowInterop/SimpleShadowProvider.cs
@@ -3,29 +3,31 @@
 using UnityEngine;
 using Unity.Collections;
 using UnityEngine.Rendering.Universal;
+using System;
 
+[Serializable]
 internal class SimpleShadowProvider : ShadowShape2DProvider
 {
-    public override string ProviderName(string componentName)
+    public override GUIContent ProviderName(string componentName)
     {
-        return "Simple Shadow Provider";
+        return new GUIContent("Simple Shadow Provider");
     }
 
-    public override bool IsShapeSource(Component sourceComponent)
+    public override bool IsRequiredComponentData(Component sourceComponent)
     {
         return sourceComponent is Transform;
     }
 
-    public override void OnPersistantDataCreated(Component sourceComponent, ShadowShape2D persistantShadowShape)
+    public override void OnInitialized(Component sourceComponent, ShadowShape2D persistantShadowShape)
     {
         NativeArray<Vector3> vertices = new NativeArray<Vector3>(4, Allocator.Persistent);
         NativeArray<int> indices = new NativeArray<int>(8, Allocator.Persistent);
 
         // Square
-        vertices[0] = new Vector3(  5, 10);
-        vertices[1] = new Vector3( 10, 10);
-        vertices[2] = new Vector3( 10,  5);
-        vertices[3] = new Vector3(  5,  5);
+        vertices[0] = new Vector3(5, 10);
+        vertices[1] = new Vector3(10, 10);
+        vertices[2] = new Vector3(10, 5);
+        vertices[3] = new Vector3(5, 5);
 
         // Square
         indices[0] = 0;
diff --git a/Tests/SRPTests/Projects/UniversalGraphicsTest_2D/Assets/Scenes/032_RenderSprite.meta b/Tests/SRPTests/Projects/UniversalGraphicsTest_2D/Assets/Scenes/032_RenderSprite.meta
new file mode 100644
index 00000000000..76e9b247d17
--- /dev/null
+++ b/Tests/SRPTests/Projects/UniversalGraphicsTest_2D/Assets/Scenes/032_RenderSprite.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 83f96c78311d63c46959e83b4c28b1c0
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Tests/SRPTests/Projects/UniversalGraphicsTest_2D/Assets/Scenes/032_RenderSprite.unity b/Tests/SRPTests/Projects/UniversalGraphicsTest_2D/Assets/Scenes/032_RenderSprite.unity
new file mode 100644
index 00000000000..1cbfb9681dd
--- /dev/null
+++ b/Tests/SRPTests/Projects/UniversalGraphicsTest_2D/Assets/Scenes/032_RenderSprite.unity
@@ -0,0 +1,587 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!29 &1
+OcclusionCullingSettings:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_OcclusionBakeSettings:
+    smallestOccluder: 5
+    smallestHole: 0.25
+    backfaceThreshold: 100
+  m_SceneGUID: 00000000000000000000000000000000
+  m_OcclusionCullingData: {fileID: 0}
+--- !u!104 &2
+RenderSettings:
+  m_ObjectHideFlags: 0
+  serializedVersion: 10
+  m_Fog: 0
+  m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1}
+  m_FogMode: 3
+  m_FogDensity: 0.01
+  m_LinearFogStart: 0
+  m_LinearFogEnd: 300
+  m_AmbientSkyColor: {r: 0.212, g: 0.227, b: 0.259, a: 1}
+  m_AmbientEquatorColor: {r: 0.114, g: 0.125, b: 0.133, a: 1}
+  m_AmbientGroundColor: {r: 0.047, g: 0.043, b: 0.035, a: 1}
+  m_AmbientIntensity: 1
+  m_AmbientMode: 3
+  m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1}
+  m_SkyboxMaterial: {fileID: 0}
+  m_HaloStrength: 0.5
+  m_FlareStrength: 1
+  m_FlareFadeSpeed: 3
+  m_HaloTexture: {fileID: 0}
+  m_SpotCookie: {fileID: 10001, guid: 0000000000000000e000000000000000, type: 0}
+  m_DefaultReflectionMode: 0
+  m_DefaultReflectionResolution: 128
+  m_ReflectionBounces: 1
+  m_ReflectionIntensity: 1
+  m_CustomReflection: {fileID: 0}
+  m_Sun: {fileID: 0}
+  m_UseRadianceAmbientProbe: 0
+--- !u!157 &3
+LightmapSettings:
+  m_ObjectHideFlags: 0
+  serializedVersion: 13
+  m_BakeOnSceneLoad: 0
+  m_GISettings:
+    serializedVersion: 2
+    m_BounceScale: 1
+    m_IndirectOutputScale: 1
+    m_AlbedoBoost: 1
+    m_EnvironmentLightingMode: 0
+    m_EnableBakedLightmaps: 0
+    m_EnableRealtimeLightmaps: 0
+  m_LightmapEditorSettings:
+    serializedVersion: 12
+    m_Resolution: 2
+    m_BakeResolution: 40
+    m_AtlasSize: 1024
+    m_AO: 0
+    m_AOMaxDistance: 1
+    m_CompAOExponent: 1
+    m_CompAOExponentDirect: 0
+    m_ExtractAmbientOcclusion: 0
+    m_Padding: 2
+    m_LightmapParameters: {fileID: 0}
+    m_LightmapsBakeMode: 1
+    m_TextureCompression: 1
+    m_ReflectionCompression: 2
+    m_MixedBakeMode: 2
+    m_BakeBackend: 2
+    m_PVRSampling: 1
+    m_PVRDirectSampleCount: 32
+    m_PVRSampleCount: 512
+    m_PVRBounces: 2
+    m_PVREnvironmentSampleCount: 256
+    m_PVREnvironmentReferencePointCount: 2048
+    m_PVRFilteringMode: 1
+    m_PVRDenoiserTypeDirect: 1
+    m_PVRDenoiserTypeIndirect: 1
+    m_PVRDenoiserTypeAO: 1
+    m_PVRFilterTypeDirect: 0
+    m_PVRFilterTypeIndirect: 0
+    m_PVRFilterTypeAO: 0
+    m_PVREnvironmentMIS: 1
+    m_PVRCulling: 1
+    m_PVRFilteringGaussRadiusDirect: 1
+    m_PVRFilteringGaussRadiusIndirect: 1
+    m_PVRFilteringGaussRadiusAO: 1
+    m_PVRFilteringAtrousPositionSigmaDirect: 0.5
+    m_PVRFilteringAtrousPositionSigmaIndirect: 2
+    m_PVRFilteringAtrousPositionSigmaAO: 1
+    m_ExportTrainingData: 0
+    m_TrainingDataDestination: TrainingData
+    m_LightProbeSampleCountMultiplier: 4
+  m_LightingDataAsset: {fileID: 20201, guid: 0000000000000000f000000000000000, type: 0}
+  m_LightingSettings: {fileID: 0}
+--- !u!196 &4
+NavMeshSettings:
+  serializedVersion: 2
+  m_ObjectHideFlags: 0
+  m_BuildSettings:
+    serializedVersion: 3
+    agentTypeID: 0
+    agentRadius: 0.5
+    agentHeight: 2
+    agentSlope: 45
+    agentClimb: 0.4
+    ledgeDropHeight: 0
+    maxJumpAcrossDistance: 0
+    minRegionArea: 2
+    manualCellSize: 0
+    cellSize: 0.16666667
+    manualTileSize: 0
+    tileSize: 256
+    buildHeightMesh: 0
+    maxJobWorkers: 0
+    preserveTilesOutsideBounds: 0
+    debug:
+      m_Flags: 0
+  m_NavMeshData: {fileID: 0}
+--- !u!1 &552063972
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 552063974}
+  - component: {fileID: 552063973}
+  m_Layer: 0
+  m_Name: RenderSpriteInstancedDrawer Shadergraph
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!114 &552063973
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 552063972}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 17b893b44cf284b409275a57996e9e60, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: Universal2DGraphicsTests::RenderParamsInstancedDrawer
+  drawSprite: {fileID: 21300000, guid: 803bd3331724e514cbb16c45ce27b1c5, type: 3}
+  drawMaterial: {fileID: 2100000, guid: 4da613ca97d323a4da07bb58873d2ee5, type: 2}
+  gridCount: 3
+  offset: 3
+  useInstancing: 1
+  maskInteraction: 0
+--- !u!4 &552063974
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 552063972}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 2.2, y: -2, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &1034731507
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1034731510}
+  - component: {fileID: 1034731509}
+  - component: {fileID: 1034731508}
+  - component: {fileID: 1034731511}
+  - component: {fileID: 1034731512}
+  m_Layer: 0
+  m_Name: Main Camera
+  m_TagString: MainCamera
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!81 &1034731508
+AudioListener:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1034731507}
+  m_Enabled: 1
+--- !u!20 &1034731509
+Camera:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1034731507}
+  m_Enabled: 1
+  serializedVersion: 2
+  m_ClearFlags: 2
+  m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 1}
+  m_projectionMatrixMode: 1
+  m_GateFitMode: 2
+  m_FOVAxisMode: 0
+  m_Iso: 200
+  m_ShutterSpeed: 0.005
+  m_Aperture: 16
+  m_FocusDistance: 10
+  m_FocalLength: 50
+  m_BladeCount: 5
+  m_Curvature: {x: 2, y: 11}
+  m_BarrelClipping: 0.25
+  m_Anamorphism: 0
+  m_SensorSize: {x: 36, y: 24}
+  m_LensShift: {x: 0, y: 0}
+  m_NormalizedViewPortRect:
+    serializedVersion: 2
+    x: 0
+    y: 0
+    width: 1
+    height: 1
+  near clip plane: 0.3
+  far clip plane: 1000
+  field of view: 60
+  orthographic: 1
+  orthographic size: 9
+  m_Depth: -1
+  m_CullingMask:
+    serializedVersion: 2
+    m_Bits: 4294967295
+  m_RenderingPath: -1
+  m_TargetTexture: {fileID: 0}
+  m_TargetDisplay: 0
+  m_TargetEye: 3
+  m_HDR: 1
+  m_AllowMSAA: 1
+  m_AllowDynamicResolution: 0
+  m_ForceIntoRT: 0
+  m_OcclusionCulling: 1
+  m_StereoConvergence: 10
+  m_StereoSeparation: 0.022
+--- !u!4 &1034731510
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1034731507}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: -10}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &1034731511
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1034731507}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: a79441f348de89743a2939f4d699eac1, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: Unity.RenderPipelines.Universal.Runtime::UnityEngine.Rendering.Universal.UniversalAdditionalCameraData
+  m_RenderShadows: 1
+  m_RequiresDepthTextureOption: 2
+  m_RequiresOpaqueTextureOption: 2
+  m_CameraType: 0
+  m_Cameras: []
+  m_RendererIndex: -1
+  m_VolumeLayerMask:
+    serializedVersion: 2
+    m_Bits: 1
+  m_VolumeTrigger: {fileID: 0}
+  m_VolumeFrameworkUpdateModeOption: 2
+  m_RenderPostProcessing: 0
+  m_Antialiasing: 0
+  m_AntialiasingQuality: 2
+  m_StopNaN: 0
+  m_Dithering: 0
+  m_ClearDepth: 1
+  m_AllowXRRendering: 1
+  m_AllowHDROutput: 1
+  m_UseScreenCoordOverride: 0
+  m_ScreenSizeOverride: {x: 0, y: 0, z: 0, w: 0}
+  m_ScreenCoordScaleBias: {x: 0, y: 0, z: 0, w: 0}
+  m_RequiresDepthTexture: 0
+  m_RequiresColorTexture: 0
+  m_TaaSettings:
+    m_Quality: 3
+    m_FrameInfluence: 0.1
+    m_JitterScale: 1
+    m_MipBias: 0
+    m_VarianceClampScale: 0.9
+    m_ContrastAdaptiveSharpening: 0
+  m_Version: 2
+--- !u!114 &1034731512
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1034731507}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 73231aa468d81ea49bc3d914080de185, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: UniversalGraphicsTests::UniversalGraphicsTestSettings
+  ImageComparisonSettings:
+    TargetWidth: 512
+    TargetHeight: 512
+    TargetMSAASamples: 1
+    PerPixelCorrectnessThreshold: 0.001
+    PerPixelGammaThreshold: 0.003921569
+    PerPixelAlphaThreshold: 0.003921569
+    RMSEThreshold: 0
+    AverageCorrectnessThreshold: 0.005
+    IncorrectPixelsThreshold: 0.0000038146973
+    UseHDR: 0
+    UseBackBuffer: 0
+    ImageResolution: 0
+    ActiveImageTests: 1
+    ActivePixelTests: 7
+  WaitFrames: 15
+  XRCompatible: 0
+  gpuDrivenCompatible: 0
+  CheckMemoryAllocation: 1
+  renderBackendCompatibility: 2
+  SetBackBufferResolution: 0
+--- !u!1 &1218736712
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1218736714}
+  - component: {fileID: 1218736713}
+  m_Layer: 0
+  m_Name: RenderSpriteInstancedDrawer
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!114 &1218736713
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1218736712}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 17b893b44cf284b409275a57996e9e60, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: Universal2DGraphicsTests::RenderParamsInstancedDrawer
+  drawSprite: {fileID: 21300000, guid: 803bd3331724e514cbb16c45ce27b1c5, type: 3}
+  drawMaterial: {fileID: 2100000, guid: 3f5575fc185028542a3f30b3b4b1911a, type: 2}
+  gridCount: 3
+  offset: 3
+  useInstancing: 1
+  maskInteraction: 0
+--- !u!4 &1218736714
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1218736712}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 2.2, y: 2, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &1481681362
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1481681364}
+  - component: {fileID: 1481681363}
+  m_Layer: 0
+  m_Name: RenderSpriteDrawer Shadergraph
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!114 &1481681363
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1481681362}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 17b893b44cf284b409275a57996e9e60, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: Universal2DGraphicsTests::RenderParamsInstancedDrawer
+  drawSprite: {fileID: -6091329584399971573, guid: 734039631e6f77248b04a79e9dded059,
+    type: 3}
+  drawMaterial: {fileID: 2100000, guid: 4da613ca97d323a4da07bb58873d2ee5, type: 2}
+  gridCount: 3
+  offset: 3
+  useInstancing: 0
+  maskInteraction: 0
+--- !u!4 &1481681364
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1481681362}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: -2.2, y: -2, z: 0}
+  m_LocalScale: {x: 0.4, y: 0.4, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &1655946128
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1655946130}
+  - component: {fileID: 1655946129}
+  m_Layer: 0
+  m_Name: RenderSpriteDrawer
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!114 &1655946129
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1655946128}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 17b893b44cf284b409275a57996e9e60, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: Universal2DGraphicsTests::RenderParamsInstancedDrawer
+  drawSprite: {fileID: 21300000, guid: 86ce912717672b8429c58e6960c12e25, type: 3}
+  drawMaterial: {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2}
+  gridCount: 3
+  offset: 3
+  useInstancing: 0
+  maskInteraction: 0
+--- !u!4 &1655946130
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1655946128}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: -2.2, y: 2, z: 0}
+  m_LocalScale: {x: 2, y: 2, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &1852367347
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1852367348}
+  - component: {fileID: 1852367349}
+  m_Layer: 0
+  m_Name: Spot Light 2D
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &1852367348
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1852367347}
+  serializedVersion: 2
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 2, y: 2, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &1852367349
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1852367347}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 073797afb82c5a1438f328866b10b3f0, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: Unity.RenderPipelines.Universal.2D.Runtime::UnityEngine.Rendering.Universal.Light2D
+  m_ComponentVersion: 2
+  m_LightType: 3
+  m_BlendStyleIndex: 0
+  m_FalloffIntensity: 0.5
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_Intensity: 1
+  m_LightVolumeIntensity: 1
+  m_LightVolumeEnabled: 0
+  m_ApplyToSortingLayers: eb0feddf00000000e980ef06
+  m_LightCookieSprite: {fileID: 0}
+  m_DeprecatedPointLightCookieSprite: {fileID: 0}
+  m_LightOrder: 0
+  m_AlphaBlendOnOverlap: 0
+  m_OverlapOperation: 0
+  m_NormalMapDistance: 3
+  m_NormalMapQuality: 1
+  m_UseNormalMap: 0
+  m_ShadowsEnabled: 1
+  m_ShadowIntensity: 0.75
+  m_ShadowSoftness: 0.3
+  m_ShadowSoftnessFalloffIntensity: 0.5
+  m_ShadowVolumeIntensityEnabled: 0
+  m_ShadowVolumeIntensity: 0.75
+  m_LocalBounds:
+    m_Center: {x: 0, y: -0.00000011920929, z: 0}
+    m_Extent: {x: 0.9985302, y: 0.99853027, z: 0}
+  m_PointLightInnerAngle: 360
+  m_PointLightOuterAngle: 360
+  m_PointLightInnerRadius: 10
+  m_PointLightOuterRadius: 12
+  m_ShapeLightParametricSides: 5
+  m_ShapeLightParametricAngleOffset: 0
+  m_ShapeLightParametricRadius: 1
+  m_ShapeLightFalloffSize: 0.5
+  m_ShapeLightFalloffOffset: {x: 0, y: 0}
+  m_ShapePath:
+  - {x: -0.5, y: -0.5, z: 0}
+  - {x: 0.5, y: -0.5, z: 0}
+  - {x: 0.5, y: 0.5, z: 0}
+  - {x: -0.5, y: 0.5, z: 0}
+--- !u!1660057539 &9223372036854775807
+SceneRoots:
+  m_ObjectHideFlags: 0
+  m_Roots:
+  - {fileID: 1034731510}
+  - {fileID: 1852367348}
+  - {fileID: 1655946130}
+  - {fileID: 1218736714}
+  - {fileID: 1481681364}
+  - {fileID: 552063974}
diff --git a/Tests/SRPTests/Projects/UniversalGraphicsTest_2D/Assets/Scenes/032_RenderSprite.unity.meta b/Tests/SRPTests/Projects/UniversalGraphicsTest_2D/Assets/Scenes/032_RenderSprite.unity.meta
new file mode 100644
index 00000000000..67a1046aba9
--- /dev/null
+++ b/Tests/SRPTests/Projects/UniversalGraphicsTest_2D/Assets/Scenes/032_RenderSprite.unity.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: d89649a3a172da7419f8f0e2f7858052
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Tests/SRPTests/Projects/UniversalGraphicsTest_2D/Assets/Scenes/032_RenderSprite/Glow Rock Normal Map.png b/Tests/SRPTests/Projects/UniversalGraphicsTest_2D/Assets/Scenes/032_RenderSprite/Glow Rock Normal Map.png
new file mode 100644
index 00000000000..f759e416243
Binary files /dev/null and b/Tests/SRPTests/Projects/UniversalGraphicsTest_2D/Assets/Scenes/032_RenderSprite/Glow Rock Normal Map.png differ
diff --git a/Tests/SRPTests/Projects/UniversalGraphicsTest_2D/Assets/Scenes/032_RenderSprite/Glow Rock Normal Map.png.meta b/Tests/SRPTests/Projects/UniversalGraphicsTest_2D/Assets/Scenes/032_RenderSprite/Glow Rock Normal Map.png.meta
new file mode 100644
index 00000000000..db8dd66ce17
--- /dev/null
+++ b/Tests/SRPTests/Projects/UniversalGraphicsTest_2D/Assets/Scenes/032_RenderSprite/Glow Rock Normal Map.png.meta	
@@ -0,0 +1,143 @@
+fileFormatVersion: 2
+guid: 51de18ea48a82a44886b78ffd4f4efe5
+TextureImporter:
+  internalIDToNameTable:
+  - first:
+      213: -5321421104639177684
+    second: Glow Rock Normal Map_0
+  externalObjects: {}
+  serializedVersion: 13
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 1
+    sRGBTexture: 0
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+    flipGreenChannel: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMipmapLimit: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 2
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 0
+  spriteTessellationDetail: -1
+  textureType: 1
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  swizzle: 50462976
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 4
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 4
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites:
+    - serializedVersion: 2
+      name: Glow Rock Normal Map_0
+      rect:
+        serializedVersion: 2
+        x: 0
+        y: 0
+        width: 249
+        height: 213
+      alignment: 0
+      pivot: {x: 0, y: 0}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      customData: 
+      outline: []
+      physicsShape: []
+      tessellationDetail: -1
+      bones: []
+      spriteID: c2c07bd03b38626b0800000000000000
+      internalID: -5321421104639177684
+      vertices: []
+      indices: 
+      edges: []
+      weights: []
+    outline: []
+    customData: 
+    physicsShape: []
+    bones: []
+    spriteID: 
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    spriteCustomMetadata:
+      entries: []
+    nameFileIdTable:
+      Glow Rock Normal Map_0: -5321421104639177684
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Tests/SRPTests/Projects/UniversalGraphicsTest_2D/Assets/Scenes/032_RenderSprite/Glow Rock.png b/Tests/SRPTests/Projects/UniversalGraphicsTest_2D/Assets/Scenes/032_RenderSprite/Glow Rock.png
new file mode 100644
index 00000000000..d55a07ccc97
Binary files /dev/null and b/Tests/SRPTests/Projects/UniversalGraphicsTest_2D/Assets/Scenes/032_RenderSprite/Glow Rock.png differ
diff --git a/Tests/SRPTests/Projects/UniversalGraphicsTest_2D/Assets/Scenes/032_RenderSprite/Glow Rock.png.meta b/Tests/SRPTests/Projects/UniversalGraphicsTest_2D/Assets/Scenes/032_RenderSprite/Glow Rock.png.meta
new file mode 100644
index 00000000000..14e34a9ab89
--- /dev/null
+++ b/Tests/SRPTests/Projects/UniversalGraphicsTest_2D/Assets/Scenes/032_RenderSprite/Glow Rock.png.meta	
@@ -0,0 +1,197 @@
+fileFormatVersion: 2
+guid: 803bd3331724e514cbb16c45ce27b1c5
+TextureImporter:
+  internalIDToNameTable:
+  - first:
+      213: -8004898147434844477
+    second: Glow Rock_0
+  externalObjects: {}
+  serializedVersion: 13
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+    flipGreenChannel: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMipmapLimit: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  swizzle: 50462976
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 4
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 4
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 4
+    buildTarget: GameCoreXboxOne
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 4
+    buildTarget: CloudRendering
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 4
+    buildTarget: Switch
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 4
+    buildTarget: GameCoreScarlett
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites:
+    - serializedVersion: 2
+      name: Glow Rock_0
+      rect:
+        serializedVersion: 2
+        x: 22
+        y: 22
+        width: 207
+        height: 175
+      alignment: 0
+      pivot: {x: 0.5, y: 0.5}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      customData: 
+      outline: []
+      physicsShape: []
+      tessellationDetail: -1
+      bones: []
+      spriteID: 3cea6f2fb83e8e090800000000000000
+      internalID: -8004898147434844477
+      vertices: []
+      indices: 
+      edges: []
+      weights: []
+    outline: []
+    customData: 
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 1537655665
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures:
+    - texture: {fileID: 2800000, guid: 51de18ea48a82a44886b78ffd4f4efe5, type: 3}
+      name: _NormalMap
+    spriteCustomMetadata:
+      entries: []
+    nameFileIdTable:
+      Glow Rock_0: -8004898147434844477
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Tests/SRPTests/Projects/UniversalGraphicsTest_2D/Assets/Scenes/032_RenderSprite/RenderSpriteDrawer.cs b/Tests/SRPTests/Projects/UniversalGraphicsTest_2D/Assets/Scenes/032_RenderSprite/RenderSpriteDrawer.cs
new file mode 100644
index 00000000000..08958b8871a
--- /dev/null
+++ b/Tests/SRPTests/Projects/UniversalGraphicsTest_2D/Assets/Scenes/032_RenderSprite/RenderSpriteDrawer.cs
@@ -0,0 +1,82 @@
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEngine.Rendering;
+
+public class RenderParamsInstancedDrawer : MonoBehaviour
+{
+    public Sprite drawSprite;
+    public Material drawMaterial;
+    public int gridCount;
+    public float offset;
+    public bool useInstancing;
+    public SpriteMaskInteraction maskInteraction;
+    public string sortingLayerName = "Default";
+    public int sortingOrder = 0;
+
+    private int instanceCount;
+    MyInstanceData[] instanceData;
+
+    struct MyInstanceData
+    {
+        public Matrix4x4 objectToWorld;
+        public Color spriteColor;
+        //public uint renderingLayerMask;
+    };
+
+    private void Start()
+    {
+        Random.InitState(1001);
+
+        instanceCount = gridCount * gridCount;
+
+        instanceData = new MyInstanceData[instanceCount];
+
+        var startOffset = gridCount / 2 * offset;
+        if (gridCount % 2 == 0)
+            startOffset -= offset / 2;
+
+        var startPos = new Vector3(transform.position.x - startOffset, transform.position.y - startOffset, 0f);
+
+        // Prepare some random transforms for our instances
+        for (int y = 0; y < gridCount; y++)
+        {
+            for (int x = 0; x < gridCount; x++)
+            {
+                var pos = new Vector3(startPos.x + x * offset, startPos.y + y * offset, 0f);
+                instanceData[y * gridCount + x].objectToWorld = Matrix4x4.TRS(pos + transform.position, transform.rotation, transform.localScale);
+                instanceData[y * gridCount + x].spriteColor = new Color(Random.Range(0, 1f), Random.Range(0, 1f), Random.Range(0, 1f), 1);
+            }
+        }
+
+        RenderPipelineManager.beginContextRendering += OnBeginContextRendering;
+    }
+
+    private void OnDestroy()
+    {
+        RenderPipelineManager.beginContextRendering -= OnBeginContextRendering;
+    }
+
+    void OnBeginContextRendering(ScriptableRenderContext context, List<Camera> cameras)
+    {
+        if (instanceData != null && instanceData.Length != 0)
+        {
+            RenderParams rp = new RenderParams(drawMaterial);
+            rp.sortingLayerID = SortingLayer.NameToID(sortingLayerName);
+            rp.sortingOrder = sortingOrder;
+
+            if (useInstancing)
+            {
+                SpriteParams sp = new SpriteParams(drawSprite, Color.white, maskInteraction);
+                Graphics.RenderSpriteInstanced(rp, sp, 0, instanceData);
+            }
+            else
+            {
+                for (int i = 0; i < instanceData.Length; i++)
+                {
+                    SpriteParams sp = new SpriteParams(drawSprite, instanceData[i].spriteColor, maskInteraction);
+                    Graphics.RenderSprite(rp, sp, 0, instanceData[i].objectToWorld);
+                }
+            }
+        }
+    }
+}
diff --git a/Tests/SRPTests/Projects/UniversalGraphicsTest_2D/Assets/Scenes/032_RenderSprite/RenderSpriteDrawer.cs.meta b/Tests/SRPTests/Projects/UniversalGraphicsTest_2D/Assets/Scenes/032_RenderSprite/RenderSpriteDrawer.cs.meta
new file mode 100644
index 00000000000..d84020b6df0
--- /dev/null
+++ b/Tests/SRPTests/Projects/UniversalGraphicsTest_2D/Assets/Scenes/032_RenderSprite/RenderSpriteDrawer.cs.meta
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: 17b893b44cf284b409275a57996e9e60
\ No newline at end of file
diff --git a/Tests/SRPTests/Projects/UniversalGraphicsTest_2D/Assets/Scenes/032_RenderSprite/RenderSpriteInstancedLit.mat b/Tests/SRPTests/Projects/UniversalGraphicsTest_2D/Assets/Scenes/032_RenderSprite/RenderSpriteInstancedLit.mat
new file mode 100644
index 00000000000..0134b710245
--- /dev/null
+++ b/Tests/SRPTests/Projects/UniversalGraphicsTest_2D/Assets/Scenes/032_RenderSprite/RenderSpriteInstancedLit.mat
@@ -0,0 +1,50 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!21 &2100000
+Material:
+  serializedVersion: 8
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: RenderSpriteInstancedLit
+  m_Shader: {fileID: 4800000, guid: e260cfa7296ee7642b167f1eb5be5023, type: 3}
+  m_Parent: {fileID: 0}
+  m_ModifiedSerializedProperties: 0
+  m_ValidKeywords: []
+  m_InvalidKeywords: []
+  m_LightmapFlags: 4
+  m_EnableInstancingVariants: 1
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: -1
+  stringTagMap: {}
+  disabledShaderPasses: []
+  m_LockedProperties: 
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs:
+    - _AlphaTex:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MainTex:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MaskTex:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _NormalMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Ints: []
+    m_Floats:
+    - _EnableExternalAlpha: 0
+    - _ZWrite: 0
+    m_Colors:
+    - _Color: {r: 1, g: 1, b: 1, a: 1}
+    - _RendererColor: {r: 1, g: 1, b: 1, a: 1}
+  m_BuildTextureStacks: []
+  m_AllowLocking: 1
diff --git a/Tests/SRPTests/Projects/BuiltInGraphicsTest_Lighting/Assets/Scenes/105_MRT/Test105RendererDataAsset.asset.meta b/Tests/SRPTests/Projects/UniversalGraphicsTest_2D/Assets/Scenes/032_RenderSprite/RenderSpriteInstancedLit.mat.meta
similarity index 64%
rename from Tests/SRPTests/Projects/BuiltInGraphicsTest_Lighting/Assets/Scenes/105_MRT/Test105RendererDataAsset.asset.meta
rename to Tests/SRPTests/Projects/UniversalGraphicsTest_2D/Assets/Scenes/032_RenderSprite/RenderSpriteInstancedLit.mat.meta
index c855a4ca40b..73d876d062a 100644
--- a/Tests/SRPTests/Projects/BuiltInGraphicsTest_Lighting/Assets/Scenes/105_MRT/Test105RendererDataAsset.asset.meta
+++ b/Tests/SRPTests/Projects/UniversalGraphicsTest_2D/Assets/Scenes/032_RenderSprite/RenderSpriteInstancedLit.mat.meta
@@ -1,8 +1,8 @@
 fileFormatVersion: 2
-guid: f384dd0947066cc4486f0444a39bf749
+guid: 3f5575fc185028542a3f30b3b4b1911a
 NativeFormatImporter:
   externalObjects: {}
-  mainObjectFileID: 0
+  mainObjectFileID: 2100000
   userData: 
   assetBundleName: 
   assetBundleVariant: 
diff --git a/Tests/SRPTests/Projects/UniversalGraphicsTest_2D/Assets/Scenes/032_RenderSprite/RenderSprite_Shadergraph.shadergraph b/Tests/SRPTests/Projects/UniversalGraphicsTest_2D/Assets/Scenes/032_RenderSprite/RenderSprite_Shadergraph.shadergraph
new file mode 100644
index 00000000000..8ceff73e556
--- /dev/null
+++ b/Tests/SRPTests/Projects/UniversalGraphicsTest_2D/Assets/Scenes/032_RenderSprite/RenderSprite_Shadergraph.shadergraph
@@ -0,0 +1,1212 @@
+{
+    "m_SGVersion": 3,
+    "m_Type": "UnityEditor.ShaderGraph.GraphData",
+    "m_ObjectId": "586930851e494e80887579d9c75172e1",
+    "m_Properties": [
+        {
+            "m_Id": "31b4b452a3354da0b678a0720ced1d9e"
+        },
+        {
+            "m_Id": "0755bf70e97540488b2a795beb57be87"
+        }
+    ],
+    "m_Keywords": [],
+    "m_Dropdowns": [],
+    "m_CategoryData": [
+        {
+            "m_Id": "723a0f4478534bde9e762e8c0d59ab52"
+        }
+    ],
+    "m_Nodes": [
+        {
+            "m_Id": "feecc8e9555240c595e65a546b8a0800"
+        },
+        {
+            "m_Id": "f5940013eb90412eb8cf7c6a498139d8"
+        },
+        {
+            "m_Id": "5d6ceca8af0d43e3b879322c2a0584ee"
+        },
+        {
+            "m_Id": "0aa389cd937c42ab9a4b6b3057058183"
+        },
+        {
+            "m_Id": "d83c2ccdc3694a71810d18c2e3b78385"
+        },
+        {
+            "m_Id": "f9ae43f35dcf4825a0cf87c8e9059929"
+        },
+        {
+            "m_Id": "241010d6733441e8a2fb7f0389aae4f1"
+        },
+        {
+            "m_Id": "6d32ab1b2adc4edb9502ffac2e5a8b08"
+        },
+        {
+            "m_Id": "d9af055288d1461d92f6330305bf50ee"
+        },
+        {
+            "m_Id": "e8ae4105a3954825991ec11bf4cadfe3"
+        },
+        {
+            "m_Id": "5e8ea239b3154b16a8d688a481ad4d4f"
+        }
+    ],
+    "m_GroupDatas": [],
+    "m_StickyNoteDatas": [],
+    "m_Edges": [
+        {
+            "m_OutputSlot": {
+                "m_Node": {
+                    "m_Id": "5e8ea239b3154b16a8d688a481ad4d4f"
+                },
+                "m_SlotId": 0
+            },
+            "m_InputSlot": {
+                "m_Node": {
+                    "m_Id": "f9ae43f35dcf4825a0cf87c8e9059929"
+                },
+                "m_SlotId": 0
+            }
+        },
+        {
+            "m_OutputSlot": {
+                "m_Node": {
+                    "m_Id": "6d32ab1b2adc4edb9502ffac2e5a8b08"
+                },
+                "m_SlotId": 0
+            },
+            "m_InputSlot": {
+                "m_Node": {
+                    "m_Id": "d9af055288d1461d92f6330305bf50ee"
+                },
+                "m_SlotId": 1
+            }
+        },
+        {
+            "m_OutputSlot": {
+                "m_Node": {
+                    "m_Id": "d9af055288d1461d92f6330305bf50ee"
+                },
+                "m_SlotId": 0
+            },
+            "m_InputSlot": {
+                "m_Node": {
+                    "m_Id": "0aa389cd937c42ab9a4b6b3057058183"
+                },
+                "m_SlotId": 0
+            }
+        },
+        {
+            "m_OutputSlot": {
+                "m_Node": {
+                    "m_Id": "d9af055288d1461d92f6330305bf50ee"
+                },
+                "m_SlotId": 7
+            },
+            "m_InputSlot": {
+                "m_Node": {
+                    "m_Id": "241010d6733441e8a2fb7f0389aae4f1"
+                },
+                "m_SlotId": 0
+            }
+        },
+        {
+            "m_OutputSlot": {
+                "m_Node": {
+                    "m_Id": "e8ae4105a3954825991ec11bf4cadfe3"
+                },
+                "m_SlotId": 0
+            },
+            "m_InputSlot": {
+                "m_Node": {
+                    "m_Id": "5e8ea239b3154b16a8d688a481ad4d4f"
+                },
+                "m_SlotId": 1
+            }
+        }
+    ],
+    "m_VertexContext": {
+        "m_Position": {
+            "x": 0.0,
+            "y": 0.0
+        },
+        "m_Blocks": [
+            {
+                "m_Id": "feecc8e9555240c595e65a546b8a0800"
+            },
+            {
+                "m_Id": "f5940013eb90412eb8cf7c6a498139d8"
+            },
+            {
+                "m_Id": "5d6ceca8af0d43e3b879322c2a0584ee"
+            }
+        ]
+    },
+    "m_FragmentContext": {
+        "m_Position": {
+            "x": 0.0,
+            "y": 200.0
+        },
+        "m_Blocks": [
+            {
+                "m_Id": "0aa389cd937c42ab9a4b6b3057058183"
+            },
+            {
+                "m_Id": "d83c2ccdc3694a71810d18c2e3b78385"
+            },
+            {
+                "m_Id": "f9ae43f35dcf4825a0cf87c8e9059929"
+            },
+            {
+                "m_Id": "241010d6733441e8a2fb7f0389aae4f1"
+            }
+        ]
+    },
+    "m_PreviewData": {
+        "serializedMesh": {
+            "m_SerializedMesh": "{\"mesh\":{\"instanceID\":0}}",
+            "m_Guid": ""
+        },
+        "preventRotation": false
+    },
+    "m_Path": "Shader Graphs",
+    "m_GraphPrecision": 1,
+    "m_PreviewMode": 2,
+    "m_OutputNode": {
+        "m_Id": ""
+    },
+    "m_SubDatas": [],
+    "m_ActiveTargets": [
+        {
+            "m_Id": "579c7870d0c842e08e5fd6fbb9ceed39"
+        }
+    ]
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.UVMaterialSlot",
+    "m_ObjectId": "00cfa14ec3254a0e95ef789efd89941c",
+    "m_Id": 2,
+    "m_DisplayName": "UV",
+    "m_SlotType": 0,
+    "m_Hidden": false,
+    "m_ShaderOutputName": "UV",
+    "m_StageCapability": 3,
+    "m_Value": {
+        "x": 0.0,
+        "y": 0.0
+    },
+    "m_DefaultValue": {
+        "x": 0.0,
+        "y": 0.0
+    },
+    "m_Labels": [],
+    "m_Channel": 0
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.Internal.Texture2DShaderProperty",
+    "m_ObjectId": "0755bf70e97540488b2a795beb57be87",
+    "m_Guid": {
+        "m_GuidSerialized": "6c95e45b-f4a0-47e6-b523-5d3fd5e0734c"
+    },
+    "promotedFromAssetID": "",
+    "promotedFromCategoryName": "",
+    "promotedOrdering": -1,
+    "m_Name": "NormalMap",
+    "m_DefaultRefNameVersion": 1,
+    "m_RefNameGeneratedByDisplayName": "NormalMap",
+    "m_DefaultReferenceName": "_NormalMap",
+    "m_OverrideReferenceName": "",
+    "m_GeneratePropertyBlock": true,
+    "m_UseCustomSlotLabel": false,
+    "m_CustomSlotLabel": "",
+    "m_DismissedVersion": 0,
+    "m_Precision": 0,
+    "overrideHLSLDeclaration": false,
+    "hlslDeclarationOverride": 0,
+    "m_Hidden": false,
+    "m_PerRendererData": false,
+    "m_customAttributes": [],
+    "m_Value": {
+        "m_SerializedTexture": "",
+        "m_Guid": ""
+    },
+    "isMainTexture": false,
+    "useTilingAndOffset": false,
+    "useTexelSize": true,
+    "m_Modifiable": true,
+    "m_DefaultType": 0
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.UVMaterialSlot",
+    "m_ObjectId": "081abc247df543c898d83950be03d2d6",
+    "m_Id": 2,
+    "m_DisplayName": "UV",
+    "m_SlotType": 0,
+    "m_Hidden": false,
+    "m_ShaderOutputName": "UV",
+    "m_StageCapability": 3,
+    "m_Value": {
+        "x": 0.0,
+        "y": 0.0
+    },
+    "m_DefaultValue": {
+        "x": 0.0,
+        "y": 0.0
+    },
+    "m_Labels": [],
+    "m_Channel": 0
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.BlockNode",
+    "m_ObjectId": "0aa389cd937c42ab9a4b6b3057058183",
+    "m_Group": {
+        "m_Id": ""
+    },
+    "m_Name": "SurfaceDescription.BaseColor",
+    "m_DrawState": {
+        "m_Expanded": true,
+        "m_Position": {
+            "serializedVersion": "2",
+            "x": 0.0,
+            "y": 0.0,
+            "width": 0.0,
+            "height": 0.0
+        }
+    },
+    "m_Slots": [
+        {
+            "m_Id": "6edf48bfe9284ba6b86d424a024e3c83"
+        }
+    ],
+    "synonyms": [],
+    "m_Precision": 0,
+    "m_PreviewExpanded": true,
+    "m_DismissedVersion": 0,
+    "m_PreviewMode": 0,
+    "m_CustomColors": {
+        "m_SerializableColors": []
+    },
+    "m_SerializedDescriptor": "SurfaceDescription.BaseColor"
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
+    "m_ObjectId": "0bbc7c2f9e8942d8b727746b3e5876e5",
+    "m_Id": 4,
+    "m_DisplayName": "R",
+    "m_SlotType": 1,
+    "m_Hidden": false,
+    "m_ShaderOutputName": "R",
+    "m_StageCapability": 2,
+    "m_Value": 0.0,
+    "m_DefaultValue": 0.0,
+    "m_Labels": [],
+    "m_LiteralMode": false
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
+    "m_ObjectId": "0c49eb39e07541b39d6e61a2b06247b8",
+    "m_Id": 0,
+    "m_DisplayName": "Alpha",
+    "m_SlotType": 0,
+    "m_Hidden": false,
+    "m_ShaderOutputName": "Alpha",
+    "m_StageCapability": 2,
+    "m_Value": 1.0,
+    "m_DefaultValue": 1.0,
+    "m_Labels": [],
+    "m_LiteralMode": false
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.NormalMaterialSlot",
+    "m_ObjectId": "10d2cb876bfc4f6dba9b60411a027a9b",
+    "m_Id": 0,
+    "m_DisplayName": "Normal (Tangent Space)",
+    "m_SlotType": 0,
+    "m_Hidden": false,
+    "m_ShaderOutputName": "NormalTS",
+    "m_StageCapability": 2,
+    "m_Value": {
+        "x": 0.0,
+        "y": 0.0,
+        "z": 0.0
+    },
+    "m_DefaultValue": {
+        "x": 0.0,
+        "y": 0.0,
+        "z": 0.0
+    },
+    "m_Labels": [],
+    "m_Space": 3
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.SamplerStateMaterialSlot",
+    "m_ObjectId": "1d570de16eed4abd8b51b3a899f20684",
+    "m_Id": 3,
+    "m_DisplayName": "Sampler",
+    "m_SlotType": 0,
+    "m_Hidden": false,
+    "m_ShaderOutputName": "Sampler",
+    "m_StageCapability": 3,
+    "m_BareResource": false
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.BlockNode",
+    "m_ObjectId": "241010d6733441e8a2fb7f0389aae4f1",
+    "m_Group": {
+        "m_Id": ""
+    },
+    "m_Name": "SurfaceDescription.Alpha",
+    "m_DrawState": {
+        "m_Expanded": true,
+        "m_Position": {
+            "serializedVersion": "2",
+            "x": 0.0,
+            "y": 0.0,
+            "width": 0.0,
+            "height": 0.0
+        }
+    },
+    "m_Slots": [
+        {
+            "m_Id": "0c49eb39e07541b39d6e61a2b06247b8"
+        }
+    ],
+    "synonyms": [],
+    "m_Precision": 0,
+    "m_PreviewExpanded": true,
+    "m_DismissedVersion": 0,
+    "m_PreviewMode": 0,
+    "m_CustomColors": {
+        "m_SerializableColors": []
+    },
+    "m_SerializedDescriptor": "SurfaceDescription.Alpha"
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
+    "m_ObjectId": "26d7cc7afd16455fad82b24619c2764a",
+    "m_Id": 5,
+    "m_DisplayName": "G",
+    "m_SlotType": 1,
+    "m_Hidden": false,
+    "m_ShaderOutputName": "G",
+    "m_StageCapability": 2,
+    "m_Value": 0.0,
+    "m_DefaultValue": 0.0,
+    "m_Labels": [],
+    "m_LiteralMode": false
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.PositionMaterialSlot",
+    "m_ObjectId": "2920c8f1f1fd4d329be139c96269964f",
+    "m_Id": 0,
+    "m_DisplayName": "Position",
+    "m_SlotType": 0,
+    "m_Hidden": false,
+    "m_ShaderOutputName": "Position",
+    "m_StageCapability": 1,
+    "m_Value": {
+        "x": 0.0,
+        "y": 0.0,
+        "z": 0.0
+    },
+    "m_DefaultValue": {
+        "x": 0.0,
+        "y": 0.0,
+        "z": 0.0
+    },
+    "m_Labels": [],
+    "m_Space": 0
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.Internal.Texture2DShaderProperty",
+    "m_ObjectId": "31b4b452a3354da0b678a0720ced1d9e",
+    "m_Guid": {
+        "m_GuidSerialized": "7a1f1fdc-5622-4aa7-9954-46dfc502412a"
+    },
+    "promotedFromAssetID": "",
+    "promotedFromCategoryName": "",
+    "promotedOrdering": -1,
+    "m_Name": "MainTex",
+    "m_DefaultRefNameVersion": 1,
+    "m_RefNameGeneratedByDisplayName": "MainTex",
+    "m_DefaultReferenceName": "_MainTex",
+    "m_OverrideReferenceName": "",
+    "m_GeneratePropertyBlock": true,
+    "m_UseCustomSlotLabel": false,
+    "m_CustomSlotLabel": "",
+    "m_DismissedVersion": 0,
+    "m_Precision": 0,
+    "overrideHLSLDeclaration": false,
+    "hlslDeclarationOverride": 0,
+    "m_Hidden": false,
+    "m_PerRendererData": false,
+    "m_customAttributes": [],
+    "m_Value": {
+        "m_SerializedTexture": "",
+        "m_Guid": ""
+    },
+    "isMainTexture": false,
+    "useTilingAndOffset": false,
+    "useTexelSize": true,
+    "m_Modifiable": true,
+    "m_DefaultType": 0
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.Texture2DMaterialSlot",
+    "m_ObjectId": "31daaf37794f40d08bb33ffa152ed984",
+    "m_Id": 0,
+    "m_DisplayName": "MainTex",
+    "m_SlotType": 1,
+    "m_Hidden": false,
+    "m_ShaderOutputName": "Out",
+    "m_StageCapability": 3,
+    "m_BareResource": false
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.NormalMaterialSlot",
+    "m_ObjectId": "378feb07efd44359a2e175febf48ddd6",
+    "m_Id": 0,
+    "m_DisplayName": "Normal",
+    "m_SlotType": 0,
+    "m_Hidden": false,
+    "m_ShaderOutputName": "Normal",
+    "m_StageCapability": 1,
+    "m_Value": {
+        "x": 0.0,
+        "y": 0.0,
+        "z": 0.0
+    },
+    "m_DefaultValue": {
+        "x": 0.0,
+        "y": 0.0,
+        "z": 0.0
+    },
+    "m_Labels": [],
+    "m_Space": 0
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.SamplerStateMaterialSlot",
+    "m_ObjectId": "3f7d582ae2084a0999d49d7ae0b122d7",
+    "m_Id": 3,
+    "m_DisplayName": "Sampler",
+    "m_SlotType": 0,
+    "m_Hidden": false,
+    "m_ShaderOutputName": "Sampler",
+    "m_StageCapability": 3,
+    "m_BareResource": false
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
+    "m_ObjectId": "4f41777719d14f3b9cfa4922dfd1494f",
+    "m_Id": 7,
+    "m_DisplayName": "A",
+    "m_SlotType": 1,
+    "m_Hidden": false,
+    "m_ShaderOutputName": "A",
+    "m_StageCapability": 2,
+    "m_Value": 0.0,
+    "m_DefaultValue": 0.0,
+    "m_Labels": [],
+    "m_LiteralMode": false
+}
+
+{
+    "m_SGVersion": 1,
+    "m_Type": "UnityEditor.Rendering.Universal.ShaderGraph.UniversalTarget",
+    "m_ObjectId": "579c7870d0c842e08e5fd6fbb9ceed39",
+    "m_Datas": [],
+    "m_ActiveSubTarget": {
+        "m_Id": "5e4acd61ba9849118ee0367c76c7e2ce"
+    },
+    "m_AllowMaterialOverride": false,
+    "m_SurfaceType": 0,
+    "m_ZTestMode": 4,
+    "m_ZWriteControl": 0,
+    "m_AlphaMode": 0,
+    "m_RenderFace": 2,
+    "m_AlphaClip": false,
+    "m_CastShadows": true,
+    "m_ReceiveShadows": true,
+    "m_DisableTint": false,
+    "m_Sort3DAs2DCompatible": false,
+    "m_AdditionalMotionVectorMode": 0,
+    "m_AlembicMotionVectors": false,
+    "m_SupportsLODCrossFade": false,
+    "m_CustomEditorGUI": "",
+    "m_SupportVFX": false
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.BlockNode",
+    "m_ObjectId": "5d6ceca8af0d43e3b879322c2a0584ee",
+    "m_Group": {
+        "m_Id": ""
+    },
+    "m_Name": "VertexDescription.Tangent",
+    "m_DrawState": {
+        "m_Expanded": true,
+        "m_Position": {
+            "serializedVersion": "2",
+            "x": 0.0,
+            "y": 0.0,
+            "width": 0.0,
+            "height": 0.0
+        }
+    },
+    "m_Slots": [
+        {
+            "m_Id": "9954d90c90164d6f9d5119035be9fcb9"
+        }
+    ],
+    "synonyms": [],
+    "m_Precision": 0,
+    "m_PreviewExpanded": true,
+    "m_DismissedVersion": 0,
+    "m_PreviewMode": 0,
+    "m_CustomColors": {
+        "m_SerializableColors": []
+    },
+    "m_SerializedDescriptor": "VertexDescription.Tangent"
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.Rendering.Universal.ShaderGraph.UniversalSpriteLitSubTarget",
+    "m_ObjectId": "5e4acd61ba9849118ee0367c76c7e2ce"
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.SampleTexture2DNode",
+    "m_ObjectId": "5e8ea239b3154b16a8d688a481ad4d4f",
+    "m_Group": {
+        "m_Id": ""
+    },
+    "m_Name": "Sample Texture 2D",
+    "m_DrawState": {
+        "m_Expanded": true,
+        "m_Position": {
+            "serializedVersion": "2",
+            "x": -451.0,
+            "y": 373.0,
+            "width": 207.99998474121095,
+            "height": 433.00006103515627
+        }
+    },
+    "m_Slots": [
+        {
+            "m_Id": "be17cd2e181b43cab80526cc8d539d6e"
+        },
+        {
+            "m_Id": "0bbc7c2f9e8942d8b727746b3e5876e5"
+        },
+        {
+            "m_Id": "26d7cc7afd16455fad82b24619c2764a"
+        },
+        {
+            "m_Id": "b94c9c40108b4d1e8afe38e1fe521430"
+        },
+        {
+            "m_Id": "f78731e30b73424b858be8203db56ac4"
+        },
+        {
+            "m_Id": "972d64b95569436fa7c800575c83e15f"
+        },
+        {
+            "m_Id": "00cfa14ec3254a0e95ef789efd89941c"
+        },
+        {
+            "m_Id": "1d570de16eed4abd8b51b3a899f20684"
+        }
+    ],
+    "synonyms": [
+        "tex2d"
+    ],
+    "m_Precision": 0,
+    "m_PreviewExpanded": false,
+    "m_DismissedVersion": 0,
+    "m_PreviewMode": 0,
+    "m_CustomColors": {
+        "m_SerializableColors": []
+    },
+    "m_TextureType": 1,
+    "m_NormalMapSpace": 0,
+    "m_EnableGlobalMipBias": true,
+    "m_MipSamplingMode": 0
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.PropertyNode",
+    "m_ObjectId": "6d32ab1b2adc4edb9502ffac2e5a8b08",
+    "m_Group": {
+        "m_Id": ""
+    },
+    "m_Name": "Property",
+    "m_DrawState": {
+        "m_Expanded": true,
+        "m_Position": {
+            "serializedVersion": "2",
+            "x": -659.0,
+            "y": 71.0,
+            "width": 127.0,
+            "height": 34.0
+        }
+    },
+    "m_Slots": [
+        {
+            "m_Id": "31daaf37794f40d08bb33ffa152ed984"
+        }
+    ],
+    "synonyms": [],
+    "m_Precision": 0,
+    "m_PreviewExpanded": true,
+    "m_DismissedVersion": 0,
+    "m_PreviewMode": 0,
+    "m_CustomColors": {
+        "m_SerializableColors": []
+    },
+    "m_Property": {
+        "m_Id": "31b4b452a3354da0b678a0720ced1d9e"
+    }
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.ColorRGBMaterialSlot",
+    "m_ObjectId": "6edf48bfe9284ba6b86d424a024e3c83",
+    "m_Id": 0,
+    "m_DisplayName": "Base Color",
+    "m_SlotType": 0,
+    "m_Hidden": false,
+    "m_ShaderOutputName": "BaseColor",
+    "m_StageCapability": 2,
+    "m_Value": {
+        "x": 0.5,
+        "y": 0.5,
+        "z": 0.5
+    },
+    "m_DefaultValue": {
+        "x": 0.5,
+        "y": 0.5,
+        "z": 0.5
+    },
+    "m_Labels": [],
+    "m_ColorMode": 0,
+    "m_DefaultColor": {
+        "r": 0.5,
+        "g": 0.5,
+        "b": 0.5,
+        "a": 1.0
+    }
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.CategoryData",
+    "m_ObjectId": "723a0f4478534bde9e762e8c0d59ab52",
+    "m_Name": "",
+    "m_ChildObjectList": [
+        {
+            "m_Id": "31b4b452a3354da0b678a0720ced1d9e"
+        },
+        {
+            "m_Id": "0755bf70e97540488b2a795beb57be87"
+        }
+    ]
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.Texture2DInputMaterialSlot",
+    "m_ObjectId": "7c05e0a9f04940c48385e1e3f4946007",
+    "m_Id": 1,
+    "m_DisplayName": "Texture",
+    "m_SlotType": 0,
+    "m_Hidden": false,
+    "m_ShaderOutputName": "Texture",
+    "m_StageCapability": 3,
+    "m_BareResource": false,
+    "m_Texture": {
+        "m_SerializedTexture": "",
+        "m_Guid": ""
+    },
+    "m_DefaultType": 0
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
+    "m_ObjectId": "86dc3df31103449ab4af8c29e1d49eb6",
+    "m_Id": 5,
+    "m_DisplayName": "G",
+    "m_SlotType": 1,
+    "m_Hidden": false,
+    "m_ShaderOutputName": "G",
+    "m_StageCapability": 2,
+    "m_Value": 0.0,
+    "m_DefaultValue": 0.0,
+    "m_Labels": [],
+    "m_LiteralMode": false
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.Texture2DInputMaterialSlot",
+    "m_ObjectId": "972d64b95569436fa7c800575c83e15f",
+    "m_Id": 1,
+    "m_DisplayName": "Texture",
+    "m_SlotType": 0,
+    "m_Hidden": false,
+    "m_ShaderOutputName": "Texture",
+    "m_StageCapability": 3,
+    "m_BareResource": false,
+    "m_Texture": {
+        "m_SerializedTexture": "",
+        "m_Guid": ""
+    },
+    "m_DefaultType": 3
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
+    "m_ObjectId": "98d5d919f459462eb9bc59c8823575ad",
+    "m_Id": 6,
+    "m_DisplayName": "B",
+    "m_SlotType": 1,
+    "m_Hidden": false,
+    "m_ShaderOutputName": "B",
+    "m_StageCapability": 2,
+    "m_Value": 0.0,
+    "m_DefaultValue": 0.0,
+    "m_Labels": [],
+    "m_LiteralMode": false
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.TangentMaterialSlot",
+    "m_ObjectId": "9954d90c90164d6f9d5119035be9fcb9",
+    "m_Id": 0,
+    "m_DisplayName": "Tangent",
+    "m_SlotType": 0,
+    "m_Hidden": false,
+    "m_ShaderOutputName": "Tangent",
+    "m_StageCapability": 1,
+    "m_Value": {
+        "x": 0.0,
+        "y": 0.0,
+        "z": 0.0
+    },
+    "m_DefaultValue": {
+        "x": 0.0,
+        "y": 0.0,
+        "z": 0.0
+    },
+    "m_Labels": [],
+    "m_Space": 0
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
+    "m_ObjectId": "b94c9c40108b4d1e8afe38e1fe521430",
+    "m_Id": 6,
+    "m_DisplayName": "B",
+    "m_SlotType": 1,
+    "m_Hidden": false,
+    "m_ShaderOutputName": "B",
+    "m_StageCapability": 2,
+    "m_Value": 0.0,
+    "m_DefaultValue": 0.0,
+    "m_Labels": [],
+    "m_LiteralMode": false
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.Vector4MaterialSlot",
+    "m_ObjectId": "be17cd2e181b43cab80526cc8d539d6e",
+    "m_Id": 0,
+    "m_DisplayName": "RGBA",
+    "m_SlotType": 1,
+    "m_Hidden": false,
+    "m_ShaderOutputName": "RGBA",
+    "m_StageCapability": 2,
+    "m_Value": {
+        "x": 0.0,
+        "y": 0.0,
+        "z": 0.0,
+        "w": 0.0
+    },
+    "m_DefaultValue": {
+        "x": 0.0,
+        "y": 0.0,
+        "z": 0.0,
+        "w": 0.0
+    },
+    "m_Labels": []
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.ColorRGBAMaterialSlot",
+    "m_ObjectId": "ce468a8661384b5b8cdeb773fe46f3e0",
+    "m_Id": 0,
+    "m_DisplayName": "Sprite Mask",
+    "m_SlotType": 0,
+    "m_Hidden": false,
+    "m_ShaderOutputName": "SpriteMask",
+    "m_StageCapability": 2,
+    "m_Value": {
+        "x": 1.0,
+        "y": 1.0,
+        "z": 1.0,
+        "w": 1.0
+    },
+    "m_DefaultValue": {
+        "x": 1.0,
+        "y": 1.0,
+        "z": 1.0,
+        "w": 1.0
+    },
+    "m_Labels": []
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.Texture2DMaterialSlot",
+    "m_ObjectId": "d6c012bd4311471696eea58d794276ec",
+    "m_Id": 0,
+    "m_DisplayName": "NormalMap",
+    "m_SlotType": 1,
+    "m_Hidden": false,
+    "m_ShaderOutputName": "Out",
+    "m_StageCapability": 3,
+    "m_BareResource": false
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.BlockNode",
+    "m_ObjectId": "d83c2ccdc3694a71810d18c2e3b78385",
+    "m_Group": {
+        "m_Id": ""
+    },
+    "m_Name": "SurfaceDescription.SpriteMask",
+    "m_DrawState": {
+        "m_Expanded": true,
+        "m_Position": {
+            "serializedVersion": "2",
+            "x": 0.0,
+            "y": 0.0,
+            "width": 0.0,
+            "height": 0.0
+        }
+    },
+    "m_Slots": [
+        {
+            "m_Id": "ce468a8661384b5b8cdeb773fe46f3e0"
+        }
+    ],
+    "synonyms": [],
+    "m_Precision": 0,
+    "m_PreviewExpanded": true,
+    "m_DismissedVersion": 0,
+    "m_PreviewMode": 0,
+    "m_CustomColors": {
+        "m_SerializableColors": []
+    },
+    "m_SerializedDescriptor": "SurfaceDescription.SpriteMask"
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.SampleTexture2DNode",
+    "m_ObjectId": "d9af055288d1461d92f6330305bf50ee",
+    "m_Group": {
+        "m_Id": ""
+    },
+    "m_Name": "Sample Texture 2D",
+    "m_DrawState": {
+        "m_Expanded": true,
+        "m_Position": {
+            "serializedVersion": "2",
+            "x": -470.0,
+            "y": 83.0,
+            "width": 208.0,
+            "height": 433.0
+        }
+    },
+    "m_Slots": [
+        {
+            "m_Id": "fd59ece0eb124b21ae398577dd0fda05"
+        },
+        {
+            "m_Id": "e776cae96d8b4f93902c8965b9780d5c"
+        },
+        {
+            "m_Id": "86dc3df31103449ab4af8c29e1d49eb6"
+        },
+        {
+            "m_Id": "98d5d919f459462eb9bc59c8823575ad"
+        },
+        {
+            "m_Id": "4f41777719d14f3b9cfa4922dfd1494f"
+        },
+        {
+            "m_Id": "7c05e0a9f04940c48385e1e3f4946007"
+        },
+        {
+            "m_Id": "081abc247df543c898d83950be03d2d6"
+        },
+        {
+            "m_Id": "3f7d582ae2084a0999d49d7ae0b122d7"
+        }
+    ],
+    "synonyms": [
+        "tex2d"
+    ],
+    "m_Precision": 0,
+    "m_PreviewExpanded": false,
+    "m_DismissedVersion": 0,
+    "m_PreviewMode": 0,
+    "m_CustomColors": {
+        "m_SerializableColors": []
+    },
+    "m_TextureType": 0,
+    "m_NormalMapSpace": 0,
+    "m_EnableGlobalMipBias": true,
+    "m_MipSamplingMode": 0
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
+    "m_ObjectId": "e776cae96d8b4f93902c8965b9780d5c",
+    "m_Id": 4,
+    "m_DisplayName": "R",
+    "m_SlotType": 1,
+    "m_Hidden": false,
+    "m_ShaderOutputName": "R",
+    "m_StageCapability": 2,
+    "m_Value": 0.0,
+    "m_DefaultValue": 0.0,
+    "m_Labels": [],
+    "m_LiteralMode": false
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.PropertyNode",
+    "m_ObjectId": "e8ae4105a3954825991ec11bf4cadfe3",
+    "m_Group": {
+        "m_Id": ""
+    },
+    "m_Name": "Property",
+    "m_DrawState": {
+        "m_Expanded": true,
+        "m_Position": {
+            "serializedVersion": "2",
+            "x": -644.0,
+            "y": 378.0000305175781,
+            "width": 144.0,
+            "height": 33.999969482421878
+        }
+    },
+    "m_Slots": [
+        {
+            "m_Id": "d6c012bd4311471696eea58d794276ec"
+        }
+    ],
+    "synonyms": [],
+    "m_Precision": 0,
+    "m_PreviewExpanded": true,
+    "m_DismissedVersion": 0,
+    "m_PreviewMode": 0,
+    "m_CustomColors": {
+        "m_SerializableColors": []
+    },
+    "m_Property": {
+        "m_Id": "0755bf70e97540488b2a795beb57be87"
+    }
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.BlockNode",
+    "m_ObjectId": "f5940013eb90412eb8cf7c6a498139d8",
+    "m_Group": {
+        "m_Id": ""
+    },
+    "m_Name": "VertexDescription.Normal",
+    "m_DrawState": {
+        "m_Expanded": true,
+        "m_Position": {
+            "serializedVersion": "2",
+            "x": 0.0,
+            "y": 0.0,
+            "width": 0.0,
+            "height": 0.0
+        }
+    },
+    "m_Slots": [
+        {
+            "m_Id": "378feb07efd44359a2e175febf48ddd6"
+        }
+    ],
+    "synonyms": [],
+    "m_Precision": 0,
+    "m_PreviewExpanded": true,
+    "m_DismissedVersion": 0,
+    "m_PreviewMode": 0,
+    "m_CustomColors": {
+        "m_SerializableColors": []
+    },
+    "m_SerializedDescriptor": "VertexDescription.Normal"
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
+    "m_ObjectId": "f78731e30b73424b858be8203db56ac4",
+    "m_Id": 7,
+    "m_DisplayName": "A",
+    "m_SlotType": 1,
+    "m_Hidden": false,
+    "m_ShaderOutputName": "A",
+    "m_StageCapability": 2,
+    "m_Value": 0.0,
+    "m_DefaultValue": 0.0,
+    "m_Labels": [],
+    "m_LiteralMode": false
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.BlockNode",
+    "m_ObjectId": "f9ae43f35dcf4825a0cf87c8e9059929",
+    "m_Group": {
+        "m_Id": ""
+    },
+    "m_Name": "SurfaceDescription.NormalTS",
+    "m_DrawState": {
+        "m_Expanded": true,
+        "m_Position": {
+            "serializedVersion": "2",
+            "x": 0.0,
+            "y": 0.0,
+            "width": 0.0,
+            "height": 0.0
+        }
+    },
+    "m_Slots": [
+        {
+            "m_Id": "10d2cb876bfc4f6dba9b60411a027a9b"
+        }
+    ],
+    "synonyms": [],
+    "m_Precision": 0,
+    "m_PreviewExpanded": true,
+    "m_DismissedVersion": 0,
+    "m_PreviewMode": 0,
+    "m_CustomColors": {
+        "m_SerializableColors": []
+    },
+    "m_SerializedDescriptor": "SurfaceDescription.NormalTS"
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.Vector4MaterialSlot",
+    "m_ObjectId": "fd59ece0eb124b21ae398577dd0fda05",
+    "m_Id": 0,
+    "m_DisplayName": "RGBA",
+    "m_SlotType": 1,
+    "m_Hidden": false,
+    "m_ShaderOutputName": "RGBA",
+    "m_StageCapability": 2,
+    "m_Value": {
+        "x": 0.0,
+        "y": 0.0,
+        "z": 0.0,
+        "w": 0.0
+    },
+    "m_DefaultValue": {
+        "x": 0.0,
+        "y": 0.0,
+        "z": 0.0,
+        "w": 0.0
+    },
+    "m_Labels": []
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.BlockNode",
+    "m_ObjectId": "feecc8e9555240c595e65a546b8a0800",
+    "m_Group": {
+        "m_Id": ""
+    },
+    "m_Name": "VertexDescription.Position",
+    "m_DrawState": {
+        "m_Expanded": true,
+        "m_Position": {
+            "serializedVersion": "2",
+            "x": 0.0,
+            "y": 0.0,
+            "width": 0.0,
+            "height": 0.0
+        }
+    },
+    "m_Slots": [
+        {
+            "m_Id": "2920c8f1f1fd4d329be139c96269964f"
+        }
+    ],
+    "synonyms": [],
+    "m_Precision": 0,
+    "m_PreviewExpanded": true,
+    "m_DismissedVersion": 0,
+    "m_PreviewMode": 0,
+    "m_CustomColors": {
+        "m_SerializableColors": []
+    },
+    "m_SerializedDescriptor": "VertexDescription.Position"
+}
+
diff --git a/Tests/SRPTests/Projects/UniversalGraphicsTest_2D/Assets/Scenes/032_RenderSprite/RenderSprite_Shadergraph.shadergraph.meta b/Tests/SRPTests/Projects/UniversalGraphicsTest_2D/Assets/Scenes/032_RenderSprite/RenderSprite_Shadergraph.shadergraph.meta
new file mode 100644
index 00000000000..6290599989f
--- /dev/null
+++ b/Tests/SRPTests/Projects/UniversalGraphicsTest_2D/Assets/Scenes/032_RenderSprite/RenderSprite_Shadergraph.shadergraph.meta
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: 95c87530794c26d438c683b1dbd7c05c
+ScriptedImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 2
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+  script: {fileID: 11500000, guid: 625f186215c104763be7675aa2d941aa, type: 3}
+  useAsTemplate: 0
+  exposeTemplateAsShader: 0
+  template:
+    name: 
+    category: 
+    description: 
+    icon: {instanceID: 0}
+    thumbnail: {instanceID: 0}
diff --git a/Tests/SRPTests/Projects/UniversalGraphicsTest_2D/Assets/Scenes/032_RenderSprite/RenderSprite_Shadergraph_Material.mat b/Tests/SRPTests/Projects/UniversalGraphicsTest_2D/Assets/Scenes/032_RenderSprite/RenderSprite_Shadergraph_Material.mat
new file mode 100644
index 00000000000..e1a47092f28
--- /dev/null
+++ b/Tests/SRPTests/Projects/UniversalGraphicsTest_2D/Assets/Scenes/032_RenderSprite/RenderSprite_Shadergraph_Material.mat
@@ -0,0 +1,65 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &-7105236373623228706
+MonoBehaviour:
+  m_ObjectHideFlags: 11
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: Unity.RenderPipelines.Universal.Editor::UnityEditor.Rendering.Universal.AssetVersion
+  version: 10
+--- !u!21 &2100000
+Material:
+  serializedVersion: 8
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: RenderSprite_Shadergraph_Material
+  m_Shader: {fileID: -6465566751694194690, guid: 95c87530794c26d438c683b1dbd7c05c,
+    type: 3}
+  m_Parent: {fileID: 0}
+  m_ModifiedSerializedProperties: 0
+  m_ValidKeywords: []
+  m_InvalidKeywords: []
+  m_LightmapFlags: 4
+  m_EnableInstancingVariants: 1
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: -1
+  stringTagMap: {}
+  disabledShaderPasses: []
+  m_LockedProperties: 
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs:
+    - _MainTex:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _NormalMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Ints: []
+    m_Floats: []
+    m_Colors:
+    - White: {r: 1, g: 1, b: 1, a: 1}
+  m_BuildTextureStacks: []
+  m_AllowLocking: 1
diff --git a/Tests/SRPTests/Projects/BuiltInGraphicsTest_Lighting/Assets/Scenes/106_MRT_CameraClearFlag/Test106RendererDataAsset.asset.meta b/Tests/SRPTests/Projects/UniversalGraphicsTest_2D/Assets/Scenes/032_RenderSprite/RenderSprite_Shadergraph_Material.mat.meta
similarity index 64%
rename from Tests/SRPTests/Projects/BuiltInGraphicsTest_Lighting/Assets/Scenes/106_MRT_CameraClearFlag/Test106RendererDataAsset.asset.meta
rename to Tests/SRPTests/Projects/UniversalGraphicsTest_2D/Assets/Scenes/032_RenderSprite/RenderSprite_Shadergraph_Material.mat.meta
index 58366f78970..b323b8fcb50 100644
--- a/Tests/SRPTests/Projects/BuiltInGraphicsTest_Lighting/Assets/Scenes/106_MRT_CameraClearFlag/Test106RendererDataAsset.asset.meta
+++ b/Tests/SRPTests/Projects/UniversalGraphicsTest_2D/Assets/Scenes/032_RenderSprite/RenderSprite_Shadergraph_Material.mat.meta
@@ -1,8 +1,8 @@
 fileFormatVersion: 2
-guid: fe9d770af9e3d124d88e918ce9b153be
+guid: 4da613ca97d323a4da07bb58873d2ee5
 NativeFormatImporter:
   externalObjects: {}
-  mainObjectFileID: 0
+  mainObjectFileID: 2100000
   userData: 
   assetBundleName: 
   assetBundleVariant: 
diff --git a/Tests/SRPTests/Projects/UniversalGraphicsTest_2D/Assets/Scenes/032_RenderSprite_DrawDynamic.unity b/Tests/SRPTests/Projects/UniversalGraphicsTest_2D/Assets/Scenes/032_RenderSprite_DrawDynamic.unity
new file mode 100644
index 00000000000..650a0b0a31c
--- /dev/null
+++ b/Tests/SRPTests/Projects/UniversalGraphicsTest_2D/Assets/Scenes/032_RenderSprite_DrawDynamic.unity
@@ -0,0 +1,600 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!29 &1
+OcclusionCullingSettings:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_OcclusionBakeSettings:
+    smallestOccluder: 5
+    smallestHole: 0.25
+    backfaceThreshold: 100
+  m_SceneGUID: 00000000000000000000000000000000
+  m_OcclusionCullingData: {fileID: 0}
+--- !u!104 &2
+RenderSettings:
+  m_ObjectHideFlags: 0
+  serializedVersion: 10
+  m_Fog: 0
+  m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1}
+  m_FogMode: 3
+  m_FogDensity: 0.01
+  m_LinearFogStart: 0
+  m_LinearFogEnd: 300
+  m_AmbientSkyColor: {r: 0.212, g: 0.227, b: 0.259, a: 1}
+  m_AmbientEquatorColor: {r: 0.114, g: 0.125, b: 0.133, a: 1}
+  m_AmbientGroundColor: {r: 0.047, g: 0.043, b: 0.035, a: 1}
+  m_AmbientIntensity: 1
+  m_AmbientMode: 3
+  m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1}
+  m_SkyboxMaterial: {fileID: 0}
+  m_HaloStrength: 0.5
+  m_FlareStrength: 1
+  m_FlareFadeSpeed: 3
+  m_HaloTexture: {fileID: 0}
+  m_SpotCookie: {fileID: 10001, guid: 0000000000000000e000000000000000, type: 0}
+  m_DefaultReflectionMode: 0
+  m_DefaultReflectionResolution: 128
+  m_ReflectionBounces: 1
+  m_ReflectionIntensity: 1
+  m_CustomReflection: {fileID: 0}
+  m_Sun: {fileID: 0}
+  m_UseRadianceAmbientProbe: 0
+--- !u!157 &3
+LightmapSettings:
+  m_ObjectHideFlags: 0
+  serializedVersion: 13
+  m_BakeOnSceneLoad: 0
+  m_GISettings:
+    serializedVersion: 2
+    m_BounceScale: 1
+    m_IndirectOutputScale: 1
+    m_AlbedoBoost: 1
+    m_EnvironmentLightingMode: 0
+    m_EnableBakedLightmaps: 0
+    m_EnableRealtimeLightmaps: 0
+  m_LightmapEditorSettings:
+    serializedVersion: 12
+    m_Resolution: 2
+    m_BakeResolution: 40
+    m_AtlasSize: 1024
+    m_AO: 0
+    m_AOMaxDistance: 1
+    m_CompAOExponent: 1
+    m_CompAOExponentDirect: 0
+    m_ExtractAmbientOcclusion: 0
+    m_Padding: 2
+    m_LightmapParameters: {fileID: 0}
+    m_LightmapsBakeMode: 1
+    m_TextureCompression: 1
+    m_ReflectionCompression: 2
+    m_MixedBakeMode: 2
+    m_BakeBackend: 2
+    m_PVRSampling: 1
+    m_PVRDirectSampleCount: 32
+    m_PVRSampleCount: 512
+    m_PVRBounces: 2
+    m_PVREnvironmentSampleCount: 256
+    m_PVREnvironmentReferencePointCount: 2048
+    m_PVRFilteringMode: 1
+    m_PVRDenoiserTypeDirect: 1
+    m_PVRDenoiserTypeIndirect: 1
+    m_PVRDenoiserTypeAO: 1
+    m_PVRFilterTypeDirect: 0
+    m_PVRFilterTypeIndirect: 0
+    m_PVRFilterTypeAO: 0
+    m_PVREnvironmentMIS: 1
+    m_PVRCulling: 1
+    m_PVRFilteringGaussRadiusDirect: 1
+    m_PVRFilteringGaussRadiusIndirect: 1
+    m_PVRFilteringGaussRadiusAO: 1
+    m_PVRFilteringAtrousPositionSigmaDirect: 0.5
+    m_PVRFilteringAtrousPositionSigmaIndirect: 2
+    m_PVRFilteringAtrousPositionSigmaAO: 1
+    m_ExportTrainingData: 0
+    m_TrainingDataDestination: TrainingData
+    m_LightProbeSampleCountMultiplier: 4
+  m_LightingDataAsset: {fileID: 20201, guid: 0000000000000000f000000000000000, type: 0}
+  m_LightingSettings: {fileID: 0}
+--- !u!196 &4
+NavMeshSettings:
+  serializedVersion: 2
+  m_ObjectHideFlags: 0
+  m_BuildSettings:
+    serializedVersion: 3
+    agentTypeID: 0
+    agentRadius: 0.5
+    agentHeight: 2
+    agentSlope: 45
+    agentClimb: 0.4
+    ledgeDropHeight: 0
+    maxJumpAcrossDistance: 0
+    minRegionArea: 2
+    manualCellSize: 0
+    cellSize: 0.16666667
+    manualTileSize: 0
+    tileSize: 256
+    buildHeightMesh: 0
+    maxJobWorkers: 0
+    preserveTilesOutsideBounds: 0
+    debug:
+      m_Flags: 0
+  m_NavMeshData: {fileID: 0}
+--- !u!1 &552063972
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 552063974}
+  - component: {fileID: 552063973}
+  m_Layer: 0
+  m_Name: RenderSpriteInstancedDrawer Shadergraph
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!114 &552063973
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 552063972}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 17b893b44cf284b409275a57996e9e60, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: Universal2DGraphicsTests::RenderParamsInstancedDrawer
+  drawSprite: {fileID: 21300000, guid: 803bd3331724e514cbb16c45ce27b1c5, type: 3}
+  drawMaterial: {fileID: 2100000, guid: 4da613ca97d323a4da07bb58873d2ee5, type: 2}
+  gridCount: 3
+  offset: 3
+  useInstancing: 1
+  maskInteraction: 0
+--- !u!4 &552063974
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 552063972}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 2.2, y: -2, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &1034731507
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1034731510}
+  - component: {fileID: 1034731509}
+  - component: {fileID: 1034731508}
+  - component: {fileID: 1034731511}
+  - component: {fileID: 1034731512}
+  - component: {fileID: 1034731513}
+  m_Layer: 0
+  m_Name: Main Camera
+  m_TagString: MainCamera
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!81 &1034731508
+AudioListener:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1034731507}
+  m_Enabled: 1
+--- !u!20 &1034731509
+Camera:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1034731507}
+  m_Enabled: 1
+  serializedVersion: 2
+  m_ClearFlags: 2
+  m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 1}
+  m_projectionMatrixMode: 1
+  m_GateFitMode: 2
+  m_FOVAxisMode: 0
+  m_Iso: 200
+  m_ShutterSpeed: 0.005
+  m_Aperture: 16
+  m_FocusDistance: 10
+  m_FocalLength: 50
+  m_BladeCount: 5
+  m_Curvature: {x: 2, y: 11}
+  m_BarrelClipping: 0.25
+  m_Anamorphism: 0
+  m_SensorSize: {x: 36, y: 24}
+  m_LensShift: {x: 0, y: 0}
+  m_NormalizedViewPortRect:
+    serializedVersion: 2
+    x: 0
+    y: 0
+    width: 1
+    height: 1
+  near clip plane: 0.3
+  far clip plane: 1000
+  field of view: 60
+  orthographic: 1
+  orthographic size: 9
+  m_Depth: -1
+  m_CullingMask:
+    serializedVersion: 2
+    m_Bits: 4294967295
+  m_RenderingPath: -1
+  m_TargetTexture: {fileID: 0}
+  m_TargetDisplay: 0
+  m_TargetEye: 3
+  m_HDR: 1
+  m_AllowMSAA: 1
+  m_AllowDynamicResolution: 0
+  m_ForceIntoRT: 0
+  m_OcclusionCulling: 1
+  m_StereoConvergence: 10
+  m_StereoSeparation: 0.022
+--- !u!4 &1034731510
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1034731507}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: -10}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &1034731511
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1034731507}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: a79441f348de89743a2939f4d699eac1, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: Unity.RenderPipelines.Universal.Runtime::UnityEngine.Rendering.Universal.UniversalAdditionalCameraData
+  m_RenderShadows: 1
+  m_RequiresDepthTextureOption: 2
+  m_RequiresOpaqueTextureOption: 2
+  m_CameraType: 0
+  m_Cameras: []
+  m_RendererIndex: -1
+  m_VolumeLayerMask:
+    serializedVersion: 2
+    m_Bits: 1
+  m_VolumeTrigger: {fileID: 0}
+  m_VolumeFrameworkUpdateModeOption: 2
+  m_RenderPostProcessing: 0
+  m_Antialiasing: 0
+  m_AntialiasingQuality: 2
+  m_StopNaN: 0
+  m_Dithering: 0
+  m_ClearDepth: 1
+  m_AllowXRRendering: 1
+  m_AllowHDROutput: 1
+  m_UseScreenCoordOverride: 0
+  m_ScreenSizeOverride: {x: 0, y: 0, z: 0, w: 0}
+  m_ScreenCoordScaleBias: {x: 0, y: 0, z: 0, w: 0}
+  m_RequiresDepthTexture: 0
+  m_RequiresColorTexture: 0
+  m_TaaSettings:
+    m_Quality: 3
+    m_FrameInfluence: 0.1
+    m_JitterScale: 1
+    m_MipBias: 0
+    m_VarianceClampScale: 0.9
+    m_ContrastAdaptiveSharpening: 0
+  m_Version: 2
+--- !u!114 &1034731512
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1034731507}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 8c967615a7994bc49a3a77f079e6a859, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: Universal2DGraphicsTests::DisableSRPBatching
+--- !u!114 &1034731513
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1034731507}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 73231aa468d81ea49bc3d914080de185, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: UniversalGraphicsTests::UniversalGraphicsTestSettings
+  ImageComparisonSettings:
+    TargetWidth: 512
+    TargetHeight: 512
+    TargetMSAASamples: 1
+    PerPixelCorrectnessThreshold: 0.001
+    PerPixelGammaThreshold: 0.003921569
+    PerPixelAlphaThreshold: 0.003921569
+    RMSEThreshold: 0
+    AverageCorrectnessThreshold: 0.005
+    IncorrectPixelsThreshold: 0.0000038146973
+    UseHDR: 0
+    UseBackBuffer: 0
+    ImageResolution: 0
+    ActiveImageTests: 1
+    ActivePixelTests: 7
+  WaitFrames: 0
+  XRCompatible: 0
+  gpuDrivenCompatible: 0
+  CheckMemoryAllocation: 1
+  renderBackendCompatibility: 2
+  SetBackBufferResolution: 0
+--- !u!1 &1218736712
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1218736714}
+  - component: {fileID: 1218736713}
+  m_Layer: 0
+  m_Name: RenderSpriteInstancedDrawer
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!114 &1218736713
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1218736712}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 17b893b44cf284b409275a57996e9e60, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: Universal2DGraphicsTests::RenderParamsInstancedDrawer
+  drawSprite: {fileID: 21300000, guid: 803bd3331724e514cbb16c45ce27b1c5, type: 3}
+  drawMaterial: {fileID: 2100000, guid: 3f5575fc185028542a3f30b3b4b1911a, type: 2}
+  gridCount: 3
+  offset: 3
+  useInstancing: 1
+  maskInteraction: 0
+--- !u!4 &1218736714
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1218736712}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 2.2, y: 2, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &1481681362
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1481681364}
+  - component: {fileID: 1481681363}
+  m_Layer: 0
+  m_Name: RenderSpriteDrawer Shadergraph
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!114 &1481681363
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1481681362}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 17b893b44cf284b409275a57996e9e60, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: Universal2DGraphicsTests::RenderParamsInstancedDrawer
+  drawSprite: {fileID: -6091329584399971573, guid: 734039631e6f77248b04a79e9dded059,
+    type: 3}
+  drawMaterial: {fileID: 2100000, guid: 4da613ca97d323a4da07bb58873d2ee5, type: 2}
+  gridCount: 3
+  offset: 3
+  useInstancing: 0
+  maskInteraction: 0
+--- !u!4 &1481681364
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1481681362}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: -2.2, y: -2, z: 0}
+  m_LocalScale: {x: 0.4, y: 0.4, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &1655946128
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1655946130}
+  - component: {fileID: 1655946129}
+  m_Layer: 0
+  m_Name: RenderSpriteDrawer
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!114 &1655946129
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1655946128}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 17b893b44cf284b409275a57996e9e60, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: Universal2DGraphicsTests::RenderParamsInstancedDrawer
+  drawSprite: {fileID: 21300000, guid: 86ce912717672b8429c58e6960c12e25, type: 3}
+  drawMaterial: {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2}
+  gridCount: 3
+  offset: 3
+  useInstancing: 0
+  maskInteraction: 0
+--- !u!4 &1655946130
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1655946128}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: -2.2, y: 2, z: 0}
+  m_LocalScale: {x: 2, y: 2, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &1852367347
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1852367348}
+  - component: {fileID: 1852367349}
+  m_Layer: 0
+  m_Name: Spot Light 2D
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &1852367348
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1852367347}
+  serializedVersion: 2
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 2, y: 2, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &1852367349
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1852367347}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 073797afb82c5a1438f328866b10b3f0, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: Unity.RenderPipelines.Universal.2D.Runtime::UnityEngine.Rendering.Universal.Light2D
+  m_ComponentVersion: 2
+  m_LightType: 3
+  m_BlendStyleIndex: 0
+  m_FalloffIntensity: 0.5
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_Intensity: 1
+  m_LightVolumeIntensity: 1
+  m_LightVolumeEnabled: 0
+  m_ApplyToSortingLayers: eb0feddf00000000e980ef06
+  m_LightCookieSprite: {fileID: 0}
+  m_DeprecatedPointLightCookieSprite: {fileID: 0}
+  m_LightOrder: 0
+  m_AlphaBlendOnOverlap: 0
+  m_OverlapOperation: 0
+  m_NormalMapDistance: 3
+  m_NormalMapQuality: 1
+  m_UseNormalMap: 0
+  m_ShadowsEnabled: 1
+  m_ShadowIntensity: 0.75
+  m_ShadowSoftness: 0.3
+  m_ShadowSoftnessFalloffIntensity: 0.5
+  m_ShadowVolumeIntensityEnabled: 0
+  m_ShadowVolumeIntensity: 0.75
+  m_LocalBounds:
+    m_Center: {x: 0, y: -0.00000011920929, z: 0}
+    m_Extent: {x: 0.9985302, y: 0.99853027, z: 0}
+  m_PointLightInnerAngle: 360
+  m_PointLightOuterAngle: 360
+  m_PointLightInnerRadius: 10
+  m_PointLightOuterRadius: 12
+  m_ShapeLightParametricSides: 5
+  m_ShapeLightParametricAngleOffset: 0
+  m_ShapeLightParametricRadius: 1
+  m_ShapeLightFalloffSize: 0.5
+  m_ShapeLightFalloffOffset: {x: 0, y: 0}
+  m_ShapePath:
+  - {x: -0.5, y: -0.5, z: 0}
+  - {x: 0.5, y: -0.5, z: 0}
+  - {x: 0.5, y: 0.5, z: 0}
+  - {x: -0.5, y: 0.5, z: 0}
+--- !u!1660057539 &9223372036854775807
+SceneRoots:
+  m_ObjectHideFlags: 0
+  m_Roots:
+  - {fileID: 1034731510}
+  - {fileID: 1852367348}
+  - {fileID: 1655946130}
+  - {fileID: 1218736714}
+  - {fileID: 1481681364}
+  - {fileID: 552063974}
diff --git a/Tests/SRPTests/Projects/UniversalGraphicsTest_2D/Assets/Scenes/032_RenderSprite_DrawDynamic.unity.meta b/Tests/SRPTests/Projects/UniversalGraphicsTest_2D/Assets/Scenes/032_RenderSprite_DrawDynamic.unity.meta
new file mode 100644
index 00000000000..f333563f3d3
--- /dev/null
+++ b/Tests/SRPTests/Projects/UniversalGraphicsTest_2D/Assets/Scenes/032_RenderSprite_DrawDynamic.unity.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 9311c67be8fad8b4b89aee01d6e06141
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Tests/SRPTests/Projects/UniversalGraphicsTest_2D/Assets/Scenes/032_RenderSprite_SpriteMask.unity b/Tests/SRPTests/Projects/UniversalGraphicsTest_2D/Assets/Scenes/032_RenderSprite_SpriteMask.unity
new file mode 100644
index 00000000000..25b95bf1e55
--- /dev/null
+++ b/Tests/SRPTests/Projects/UniversalGraphicsTest_2D/Assets/Scenes/032_RenderSprite_SpriteMask.unity
@@ -0,0 +1,680 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!29 &1
+OcclusionCullingSettings:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_OcclusionBakeSettings:
+    smallestOccluder: 5
+    smallestHole: 0.25
+    backfaceThreshold: 100
+  m_SceneGUID: 00000000000000000000000000000000
+  m_OcclusionCullingData: {fileID: 0}
+--- !u!104 &2
+RenderSettings:
+  m_ObjectHideFlags: 0
+  serializedVersion: 10
+  m_Fog: 0
+  m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1}
+  m_FogMode: 3
+  m_FogDensity: 0.01
+  m_LinearFogStart: 0
+  m_LinearFogEnd: 300
+  m_AmbientSkyColor: {r: 0.212, g: 0.227, b: 0.259, a: 1}
+  m_AmbientEquatorColor: {r: 0.114, g: 0.125, b: 0.133, a: 1}
+  m_AmbientGroundColor: {r: 0.047, g: 0.043, b: 0.035, a: 1}
+  m_AmbientIntensity: 1
+  m_AmbientMode: 3
+  m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1}
+  m_SkyboxMaterial: {fileID: 0}
+  m_HaloStrength: 0.5
+  m_FlareStrength: 1
+  m_FlareFadeSpeed: 3
+  m_HaloTexture: {fileID: 0}
+  m_SpotCookie: {fileID: 10001, guid: 0000000000000000e000000000000000, type: 0}
+  m_DefaultReflectionMode: 0
+  m_DefaultReflectionResolution: 128
+  m_ReflectionBounces: 1
+  m_ReflectionIntensity: 1
+  m_CustomReflection: {fileID: 0}
+  m_Sun: {fileID: 0}
+  m_UseRadianceAmbientProbe: 0
+--- !u!157 &3
+LightmapSettings:
+  m_ObjectHideFlags: 0
+  serializedVersion: 13
+  m_BakeOnSceneLoad: 0
+  m_GISettings:
+    serializedVersion: 2
+    m_BounceScale: 1
+    m_IndirectOutputScale: 1
+    m_AlbedoBoost: 1
+    m_EnvironmentLightingMode: 0
+    m_EnableBakedLightmaps: 0
+    m_EnableRealtimeLightmaps: 0
+  m_LightmapEditorSettings:
+    serializedVersion: 12
+    m_Resolution: 2
+    m_BakeResolution: 40
+    m_AtlasSize: 1024
+    m_AO: 0
+    m_AOMaxDistance: 1
+    m_CompAOExponent: 1
+    m_CompAOExponentDirect: 0
+    m_ExtractAmbientOcclusion: 0
+    m_Padding: 2
+    m_LightmapParameters: {fileID: 0}
+    m_LightmapsBakeMode: 1
+    m_TextureCompression: 1
+    m_ReflectionCompression: 2
+    m_MixedBakeMode: 2
+    m_BakeBackend: 2
+    m_PVRSampling: 1
+    m_PVRDirectSampleCount: 32
+    m_PVRSampleCount: 512
+    m_PVRBounces: 2
+    m_PVREnvironmentSampleCount: 256
+    m_PVREnvironmentReferencePointCount: 2048
+    m_PVRFilteringMode: 1
+    m_PVRDenoiserTypeDirect: 1
+    m_PVRDenoiserTypeIndirect: 1
+    m_PVRDenoiserTypeAO: 1
+    m_PVRFilterTypeDirect: 0
+    m_PVRFilterTypeIndirect: 0
+    m_PVRFilterTypeAO: 0
+    m_PVREnvironmentMIS: 1
+    m_PVRCulling: 1
+    m_PVRFilteringGaussRadiusDirect: 1
+    m_PVRFilteringGaussRadiusIndirect: 1
+    m_PVRFilteringGaussRadiusAO: 1
+    m_PVRFilteringAtrousPositionSigmaDirect: 0.5
+    m_PVRFilteringAtrousPositionSigmaIndirect: 2
+    m_PVRFilteringAtrousPositionSigmaAO: 1
+    m_ExportTrainingData: 0
+    m_TrainingDataDestination: TrainingData
+    m_LightProbeSampleCountMultiplier: 4
+  m_LightingDataAsset: {fileID: 20201, guid: 0000000000000000f000000000000000, type: 0}
+  m_LightingSettings: {fileID: 0}
+--- !u!196 &4
+NavMeshSettings:
+  serializedVersion: 2
+  m_ObjectHideFlags: 0
+  m_BuildSettings:
+    serializedVersion: 3
+    agentTypeID: 0
+    agentRadius: 0.5
+    agentHeight: 2
+    agentSlope: 45
+    agentClimb: 0.4
+    ledgeDropHeight: 0
+    maxJumpAcrossDistance: 0
+    minRegionArea: 2
+    manualCellSize: 0
+    cellSize: 0.16666667
+    manualTileSize: 0
+    tileSize: 256
+    buildHeightMesh: 0
+    maxJobWorkers: 0
+    preserveTilesOutsideBounds: 0
+    debug:
+      m_Flags: 0
+  m_NavMeshData: {fileID: 0}
+--- !u!1 &552063972
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 552063974}
+  - component: {fileID: 552063973}
+  m_Layer: 0
+  m_Name: RenderSpriteInstancedDrawer Shadergraph
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!114 &552063973
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 552063972}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 17b893b44cf284b409275a57996e9e60, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: Universal2DGraphicsTests::RenderParamsInstancedDrawer
+  drawSprite: {fileID: 21300000, guid: 803bd3331724e514cbb16c45ce27b1c5, type: 3}
+  drawMaterial: {fileID: 2100000, guid: 4da613ca97d323a4da07bb58873d2ee5, type: 2}
+  gridCount: 3
+  offset: 3
+  useInstancing: 1
+  maskInteraction: 2
+--- !u!4 &552063974
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 552063972}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 2.2, y: -2, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &1034731507
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1034731510}
+  - component: {fileID: 1034731509}
+  - component: {fileID: 1034731508}
+  - component: {fileID: 1034731511}
+  - component: {fileID: 1034731512}
+  m_Layer: 0
+  m_Name: Main Camera
+  m_TagString: MainCamera
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!81 &1034731508
+AudioListener:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1034731507}
+  m_Enabled: 1
+--- !u!20 &1034731509
+Camera:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1034731507}
+  m_Enabled: 1
+  serializedVersion: 2
+  m_ClearFlags: 2
+  m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 1}
+  m_projectionMatrixMode: 1
+  m_GateFitMode: 2
+  m_FOVAxisMode: 0
+  m_Iso: 200
+  m_ShutterSpeed: 0.005
+  m_Aperture: 16
+  m_FocusDistance: 10
+  m_FocalLength: 50
+  m_BladeCount: 5
+  m_Curvature: {x: 2, y: 11}
+  m_BarrelClipping: 0.25
+  m_Anamorphism: 0
+  m_SensorSize: {x: 36, y: 24}
+  m_LensShift: {x: 0, y: 0}
+  m_NormalizedViewPortRect:
+    serializedVersion: 2
+    x: 0
+    y: 0
+    width: 1
+    height: 1
+  near clip plane: 0.3
+  far clip plane: 1000
+  field of view: 60
+  orthographic: 1
+  orthographic size: 9
+  m_Depth: -1
+  m_CullingMask:
+    serializedVersion: 2
+    m_Bits: 4294967295
+  m_RenderingPath: -1
+  m_TargetTexture: {fileID: 0}
+  m_TargetDisplay: 0
+  m_TargetEye: 3
+  m_HDR: 1
+  m_AllowMSAA: 1
+  m_AllowDynamicResolution: 0
+  m_ForceIntoRT: 0
+  m_OcclusionCulling: 1
+  m_StereoConvergence: 10
+  m_StereoSeparation: 0.022
+--- !u!4 &1034731510
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1034731507}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: -10}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &1034731511
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1034731507}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: a79441f348de89743a2939f4d699eac1, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: Unity.RenderPipelines.Universal.Runtime::UnityEngine.Rendering.Universal.UniversalAdditionalCameraData
+  m_RenderShadows: 1
+  m_RequiresDepthTextureOption: 2
+  m_RequiresOpaqueTextureOption: 2
+  m_CameraType: 0
+  m_Cameras: []
+  m_RendererIndex: -1
+  m_VolumeLayerMask:
+    serializedVersion: 2
+    m_Bits: 1
+  m_VolumeTrigger: {fileID: 0}
+  m_VolumeFrameworkUpdateModeOption: 2
+  m_RenderPostProcessing: 0
+  m_Antialiasing: 0
+  m_AntialiasingQuality: 2
+  m_StopNaN: 0
+  m_Dithering: 0
+  m_ClearDepth: 1
+  m_AllowXRRendering: 1
+  m_AllowHDROutput: 1
+  m_UseScreenCoordOverride: 0
+  m_ScreenSizeOverride: {x: 0, y: 0, z: 0, w: 0}
+  m_ScreenCoordScaleBias: {x: 0, y: 0, z: 0, w: 0}
+  m_RequiresDepthTexture: 0
+  m_RequiresColorTexture: 0
+  m_TaaSettings:
+    m_Quality: 3
+    m_FrameInfluence: 0.1
+    m_JitterScale: 1
+    m_MipBias: 0
+    m_VarianceClampScale: 0.9
+    m_ContrastAdaptiveSharpening: 0
+  m_Version: 2
+--- !u!114 &1034731512
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1034731507}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 73231aa468d81ea49bc3d914080de185, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: UniversalGraphicsTests::UniversalGraphicsTestSettings
+  ImageComparisonSettings:
+    TargetWidth: 512
+    TargetHeight: 512
+    TargetMSAASamples: 1
+    PerPixelCorrectnessThreshold: 0.001
+    PerPixelGammaThreshold: 0.003921569
+    PerPixelAlphaThreshold: 0.003921569
+    RMSEThreshold: 0
+    AverageCorrectnessThreshold: 0.005
+    IncorrectPixelsThreshold: 0.0000038146973
+    UseHDR: 0
+    UseBackBuffer: 0
+    ImageResolution: 0
+    ActiveImageTests: 1
+    ActivePixelTests: 7
+  WaitFrames: 0
+  XRCompatible: 0
+  gpuDrivenCompatible: 0
+  CheckMemoryAllocation: 1
+  renderBackendCompatibility: 2
+  SetBackBufferResolution: 0
+--- !u!1 &1129056342
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1129056344}
+  - component: {fileID: 1129056343}
+  m_Layer: 0
+  m_Name: Sprite Mask
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!331 &1129056343
+SpriteMask:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1129056342}
+  m_Enabled: 1
+  m_CastShadows: 1
+  m_ReceiveShadows: 1
+  m_DynamicOccludee: 1
+  m_StaticShadowCaster: 0
+  m_MotionVectors: 1
+  m_LightProbeUsage: 1
+  m_ReflectionProbeUsage: 1
+  m_RayTracingMode: 0
+  m_RayTraceProcedural: 0
+  m_RayTracingAccelStructBuildFlagsOverride: 0
+  m_RayTracingAccelStructBuildFlags: 1
+  m_SmallMeshCulling: 1
+  m_ForceMeshLod: -1
+  m_MeshLodSelectionBias: 0
+  m_RenderingLayerMask: 1
+  m_RendererPriority: 0
+  m_Materials:
+  - {fileID: 2100000, guid: 15d0c3709176029428a0da2f8cecf0b5, type: 2}
+  m_StaticBatchInfo:
+    firstSubMesh: 0
+    subMeshCount: 0
+  m_StaticBatchRoot: {fileID: 0}
+  m_ProbeAnchor: {fileID: 0}
+  m_LightProbeVolumeOverride: {fileID: 0}
+  m_ScaleInLightmap: 1
+  m_ReceiveGI: 1
+  m_PreserveUVs: 0
+  m_IgnoreNormalsForChartDetection: 0
+  m_ImportantGI: 0
+  m_StitchLightmapSeams: 1
+  m_SelectedEditorRenderState: 3
+  m_MinimumChartSize: 4
+  m_AutoUVMaxDistance: 0.5
+  m_AutoUVMaxAngle: 89
+  m_LightmapParameters: {fileID: 0}
+  m_GlobalIlluminationMeshLod: 0
+  m_SortingLayerID: 0
+  m_SortingLayer: 0
+  m_SortingOrder: 0
+  m_MaskInteraction: 0
+  m_Sprite: {fileID: 8177471321811730583, guid: 87aaca0a643d54397ba969dab4fc8875,
+    type: 3}
+  m_MaskAlphaCutoff: 0.2
+  m_FrontSortingLayerID: 0
+  m_BackSortingLayerID: 0
+  m_FrontSortingLayer: 0
+  m_BackSortingLayer: 0
+  m_FrontSortingOrder: 0
+  m_BackSortingOrder: 0
+  m_IsCustomRangeActive: 0
+  m_SpriteSortPoint: 0
+  m_MaskSource: 0
+--- !u!4 &1129056344
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1129056342}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 15, y: 15, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &1218736712
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1218736714}
+  - component: {fileID: 1218736713}
+  m_Layer: 0
+  m_Name: RenderSpriteInstancedDrawer
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!114 &1218736713
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1218736712}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 17b893b44cf284b409275a57996e9e60, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: Universal2DGraphicsTests::RenderParamsInstancedDrawer
+  drawSprite: {fileID: 21300000, guid: 803bd3331724e514cbb16c45ce27b1c5, type: 3}
+  drawMaterial: {fileID: 2100000, guid: 3f5575fc185028542a3f30b3b4b1911a, type: 2}
+  gridCount: 3
+  offset: 3
+  useInstancing: 1
+  maskInteraction: 2
+--- !u!4 &1218736714
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1218736712}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 2.2, y: 2, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &1481681362
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1481681364}
+  - component: {fileID: 1481681363}
+  m_Layer: 0
+  m_Name: RenderSpriteDrawer Shadergraph
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!114 &1481681363
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1481681362}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 17b893b44cf284b409275a57996e9e60, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: Universal2DGraphicsTests::RenderParamsInstancedDrawer
+  drawSprite: {fileID: -6091329584399971573, guid: 734039631e6f77248b04a79e9dded059,
+    type: 3}
+  drawMaterial: {fileID: 2100000, guid: 4da613ca97d323a4da07bb58873d2ee5, type: 2}
+  gridCount: 3
+  offset: 3
+  useInstancing: 0
+  maskInteraction: 2
+--- !u!4 &1481681364
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1481681362}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: -2.2, y: -2, z: 0}
+  m_LocalScale: {x: 0.4, y: 0.4, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &1655946128
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1655946130}
+  - component: {fileID: 1655946129}
+  m_Layer: 0
+  m_Name: RenderSpriteDrawer
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!114 &1655946129
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1655946128}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 17b893b44cf284b409275a57996e9e60, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: Universal2DGraphicsTests::RenderParamsInstancedDrawer
+  drawSprite: {fileID: 21300000, guid: 86ce912717672b8429c58e6960c12e25, type: 3}
+  drawMaterial: {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2}
+  gridCount: 3
+  offset: 3
+  useInstancing: 0
+  maskInteraction: 2
+--- !u!4 &1655946130
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1655946128}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: -2.2, y: 2, z: 0}
+  m_LocalScale: {x: 2, y: 2, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &1852367347
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1852367348}
+  - component: {fileID: 1852367349}
+  m_Layer: 0
+  m_Name: Spot Light 2D
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &1852367348
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1852367347}
+  serializedVersion: 2
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 2, y: 2, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &1852367349
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1852367347}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 073797afb82c5a1438f328866b10b3f0, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: Unity.RenderPipelines.Universal.2D.Runtime::UnityEngine.Rendering.Universal.Light2D
+  m_ComponentVersion: 2
+  m_LightType: 3
+  m_BlendStyleIndex: 0
+  m_FalloffIntensity: 0.5
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_Intensity: 1
+  m_LightVolumeIntensity: 1
+  m_LightVolumeEnabled: 0
+  m_ApplyToSortingLayers: eb0feddf00000000e980ef06
+  m_LightCookieSprite: {fileID: 0}
+  m_DeprecatedPointLightCookieSprite: {fileID: 0}
+  m_LightOrder: 0
+  m_AlphaBlendOnOverlap: 0
+  m_OverlapOperation: 0
+  m_NormalMapDistance: 3
+  m_NormalMapQuality: 1
+  m_UseNormalMap: 0
+  m_ShadowsEnabled: 1
+  m_ShadowIntensity: 0.75
+  m_ShadowSoftness: 0.3
+  m_ShadowSoftnessFalloffIntensity: 0.5
+  m_ShadowVolumeIntensityEnabled: 0
+  m_ShadowVolumeIntensity: 0.75
+  m_LocalBounds:
+    m_Center: {x: 0, y: -0.00000011920929, z: 0}
+    m_Extent: {x: 0.9985302, y: 0.99853027, z: 0}
+  m_PointLightInnerAngle: 360
+  m_PointLightOuterAngle: 360
+  m_PointLightInnerRadius: 10
+  m_PointLightOuterRadius: 12
+  m_ShapeLightParametricSides: 5
+  m_ShapeLightParametricAngleOffset: 0
+  m_ShapeLightParametricRadius: 1
+  m_ShapeLightFalloffSize: 0.5
+  m_ShapeLightFalloffOffset: {x: 0, y: 0}
+  m_ShapePath:
+  - {x: -0.5, y: -0.5, z: 0}
+  - {x: 0.5, y: -0.5, z: 0}
+  - {x: 0.5, y: 0.5, z: 0}
+  - {x: -0.5, y: 0.5, z: 0}
+--- !u!1660057539 &9223372036854775807
+SceneRoots:
+  m_ObjectHideFlags: 0
+  m_Roots:
+  - {fileID: 1034731510}
+  - {fileID: 1852367348}
+  - {fileID: 1655946130}
+  - {fileID: 1218736714}
+  - {fileID: 1481681364}
+  - {fileID: 552063974}
+  - {fileID: 1129056344}
diff --git a/Tests/SRPTests/Projects/UniversalGraphicsTest_2D/Assets/Scenes/032_RenderSprite_SpriteMask.unity.meta b/Tests/SRPTests/Projects/UniversalGraphicsTest_2D/Assets/Scenes/032_RenderSprite_SpriteMask.unity.meta
new file mode 100644
index 00000000000..87a7d1d6a15
--- /dev/null
+++ b/Tests/SRPTests/Projects/UniversalGraphicsTest_2D/Assets/Scenes/032_RenderSprite_SpriteMask.unity.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 0acd9f4dc21cc474c9a2063c3113dee9
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Tests/SRPTests/Projects/UniversalGraphicsTest_2D/Assets/Test/Editor/RenderSpriteTests.cs b/Tests/SRPTests/Projects/UniversalGraphicsTest_2D/Assets/Test/Editor/RenderSpriteTests.cs
new file mode 100644
index 00000000000..a49c13ccf1f
--- /dev/null
+++ b/Tests/SRPTests/Projects/UniversalGraphicsTest_2D/Assets/Test/Editor/RenderSpriteTests.cs
@@ -0,0 +1,188 @@
+using System.Collections.Generic;
+using NUnit.Framework;
+using Unity.Collections;
+using UnityEditor;
+using UnityEngine;
+using UnityEngine.Rendering;
+using UnityEngine.Rendering.Universal;
+
+[TestFixture]
+class RenderSpriteTests
+{
+    GameObject m_BaseObj;
+    Camera m_BaseCamera;
+    Sprite m_Sprite;
+    Material m_Material;
+    int m_InstanceCount = 3;
+
+    struct InstanceData
+    {
+        public Matrix4x4 objectToWorld;
+        public Color spriteColor;
+    };
+
+    [SetUp]
+    public void Setup()
+    {
+        m_BaseObj = new GameObject();
+        m_BaseCamera = m_BaseObj.AddComponent<Camera>();
+        m_BaseCamera.transform.position = new Vector3(0, 0, -10);
+        var baseCameraData = m_BaseObj.AddComponent<UniversalAdditionalCameraData>();
+
+        m_BaseCamera.allowHDR = false;
+        baseCameraData.SetRenderer(2);    // 2D Renderer. See the list of Renderers in CommonAssets/UniversalRPAsset.
+        baseCameraData.renderType = CameraRenderType.Base;
+        baseCameraData.renderPostProcessing = false;
+        m_BaseCamera.targetTexture = new RenderTexture(m_BaseCamera.pixelWidth, m_BaseCamera.pixelHeight, 24);
+
+        m_Sprite = AssetDatabase.LoadAssetAtPath<Sprite>("Packages/com.unity.2d.sprite/Editor/ObjectMenuCreation/DefaultAssets/Textures/v2/Square.png");
+
+        if (GraphicsSettings.TryGetRenderPipelineSettings<Renderer2DResources>(out var resources))
+            m_Material = resources.defaultLitMaterial;
+        else
+            m_Material = AssetDatabase.LoadAssetAtPath<Material>("Packages/com.unity.render-pipelines.universal/Runtime/Materials/Sprite-Lit-Default.mat");
+    }
+
+    [TearDown]
+    public void Cleanup()
+    {
+        Object.DestroyImmediate(m_BaseObj);
+    }
+
+    void OnRenderSpriteSingle(ScriptableRenderContext context, Camera camera)
+    {
+        m_Material.enableInstancing = false;
+        var renderParams = new RenderParams(m_Material);
+        var spriteParams = new SpriteParams(m_Sprite);
+
+        Graphics.RenderSprite(renderParams, spriteParams, 0, Matrix4x4.identity);
+    }
+
+    [Test]
+    public void RenderSprite_Single()
+    {
+        RenderPipelineManager.beginCameraRendering += OnRenderSpriteSingle;
+
+        m_BaseCamera.Render();
+
+        RenderPipelineManager.beginCameraRendering -= OnRenderSpriteSingle;
+    }
+
+    void OnRenderSpriteInstanced_Managed(ScriptableRenderContext context, Camera camera)
+    {
+        InstanceData[] instanceData = new InstanceData[m_InstanceCount];
+
+        for (int i = 0; i < instanceData.Length; i++)
+        {
+            instanceData[i].objectToWorld = Matrix4x4.TRS(Vector3.zero + new Vector3(1 * i, 0, 0), Quaternion.identity, Vector3.one);
+            instanceData[i].spriteColor = new Color(Random.Range(0, 1f), Random.Range(0, 1f), Random.Range(0, 1f), 1);
+        }
+
+        m_Material.enableInstancing = true;
+        var renderParams = new RenderParams(m_Material);
+        var spriteParams = new SpriteParams(m_Sprite);
+
+        Graphics.RenderSpriteInstanced(renderParams, spriteParams, 0, instanceData);
+    }
+
+    [Test]
+    public void RenderSpriteInstanced_Managed()
+    {
+        RenderPipelineManager.beginCameraRendering += OnRenderSpriteInstanced_Managed;
+
+        m_BaseCamera.Render();
+
+        RenderPipelineManager.beginCameraRendering -= OnRenderSpriteInstanced_Managed;
+    }
+
+    void OnRenderSpriteInstanced_List(ScriptableRenderContext context, Camera camera)
+    {
+        List<InstanceData> instanceData = new List<InstanceData>(m_InstanceCount);
+
+        for (int i = 0; i < m_InstanceCount; i++)
+        {
+            InstanceData data;
+            data.objectToWorld = Matrix4x4.TRS(Vector3.zero + new Vector3(1 * i, 0, 0), Quaternion.identity, Vector3.one);
+            data.spriteColor = new Color(Random.Range(0, 1f), Random.Range(0, 1f), Random.Range(0, 1f), 1);
+
+            instanceData.Add(data);
+        }
+
+        m_Material.enableInstancing = true;
+        var renderParams = new RenderParams(m_Material);
+        var spriteParams = new SpriteParams(m_Sprite);
+
+        Graphics.RenderSpriteInstanced(renderParams, spriteParams, 0, instanceData);
+    }
+
+    [Test]
+    public void RenderSpriteInstanced_List()
+    {
+        RenderPipelineManager.beginCameraRendering += OnRenderSpriteInstanced_List;
+
+        m_BaseCamera.Render();
+
+        RenderPipelineManager.beginCameraRendering -= OnRenderSpriteInstanced_List;
+    }
+
+
+    void OnRenderSpriteInstanced_NativeArray(ScriptableRenderContext context, Camera camera)
+    {
+        NativeArray<InstanceData> instanceData = new NativeArray<InstanceData>(m_InstanceCount, Allocator.Temp);
+
+        for (int i = 0; i < instanceData.Length; i++)
+        {
+            InstanceData data;
+            data.objectToWorld = Matrix4x4.TRS(Vector3.zero + new Vector3(1 * i, 0, 0), Quaternion.identity, Vector3.one);
+            data.spriteColor = new Color(Random.Range(0, 1f), Random.Range(0, 1f), Random.Range(0, 1f), 1);
+
+            instanceData[i] = data;
+        }
+
+        m_Material.enableInstancing = true;
+        var renderParams = new RenderParams(m_Material);
+        var spriteParams = new SpriteParams(m_Sprite);
+
+        Graphics.RenderSpriteInstanced(renderParams, spriteParams, 0, instanceData);
+    }
+
+    [Test]
+    public void RenderSpriteInstanced_NativeArray()
+    {
+        RenderPipelineManager.beginCameraRendering += OnRenderSpriteInstanced_NativeArray;
+
+        m_BaseCamera.Render();
+
+        RenderPipelineManager.beginCameraRendering -= OnRenderSpriteInstanced_NativeArray;
+    }
+
+    void OnRenderSpriteInstanced_ReadOnlySpan(ScriptableRenderContext context, Camera camera)
+    {
+        InstanceData[] instanceData = new InstanceData[m_InstanceCount];
+
+        for (int i = 0; i < instanceData.Length; i++)
+        {
+            instanceData[i].objectToWorld = Matrix4x4.TRS(Vector3.zero + new Vector3(1 * i, 0, 0), Quaternion.identity, Vector3.one);
+            instanceData[i].spriteColor = new Color(Random.Range(0, 1f), Random.Range(0, 1f), Random.Range(0, 1f), 1);
+        }
+
+        var spanData = new System.ReadOnlySpan<InstanceData>(instanceData);
+
+        m_Material.enableInstancing = true;
+        var renderParams = new RenderParams(m_Material);
+        var spriteParams = new SpriteParams(m_Sprite);
+
+        Graphics.RenderSpriteInstanced(renderParams, spriteParams, 0, spanData);
+    }
+
+    [Test]
+    public void RenderSpriteInstanced_ReadOnlySpan()
+    {
+        RenderPipelineManager.beginCameraRendering += OnRenderSpriteInstanced_ReadOnlySpan;
+
+        m_BaseCamera.Render();
+
+        RenderPipelineManager.beginCameraRendering -= OnRenderSpriteInstanced_ReadOnlySpan;
+    }
+
+}
diff --git a/Tests/SRPTests/Projects/UniversalGraphicsTest_2D/Assets/Test/Editor/RenderSpriteTests.cs.meta b/Tests/SRPTests/Projects/UniversalGraphicsTest_2D/Assets/Test/Editor/RenderSpriteTests.cs.meta
new file mode 100644
index 00000000000..1a95cca13b8
--- /dev/null
+++ b/Tests/SRPTests/Projects/UniversalGraphicsTest_2D/Assets/Test/Editor/RenderSpriteTests.cs.meta
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: dba0156a2a81e604684758827d10fc55
\ No newline at end of file
diff --git a/Tests/SRPTests/Projects/VisualEffectGraph_HDRP/Assets/AllTests/Editor/Tests/VFXAttributeTests.cs b/Tests/SRPTests/Projects/VisualEffectGraph_HDRP/Assets/AllTests/Editor/Tests/VFXAttributeTests.cs
index 2cb2f6bdc91..14fdaff7ee8 100644
--- a/Tests/SRPTests/Projects/VisualEffectGraph_HDRP/Assets/AllTests/Editor/Tests/VFXAttributeTests.cs
+++ b/Tests/SRPTests/Projects/VisualEffectGraph_HDRP/Assets/AllTests/Editor/Tests/VFXAttributeTests.cs
@@ -30,7 +30,7 @@ public override IEnumerable<VFXAttributeInfo> attributes
                 get { return attributeInfos; }
             }
 
-            public List<VFXAttributeInfo> attributeInfos = new List<VFXAttributeInfo>();
+            public List<VFXAttributeInfo> attributeInfos { get; } = new List<VFXAttributeInfo>();
         }
 
         private class ContextTestInit : ContextTest
diff --git a/Tests/SRPTests/Projects/VisualEffectGraph_HDRP/Assets/Tests/HDRP_VisualEffectsGraph_GraphicsTests.cs b/Tests/SRPTests/Projects/VisualEffectGraph_HDRP/Assets/Tests/HDRP_VisualEffectsGraph_GraphicsTests.cs
index 191bb2e18e9..4faf68ebe36 100644
--- a/Tests/SRPTests/Projects/VisualEffectGraph_HDRP/Assets/Tests/HDRP_VisualEffectsGraph_GraphicsTests.cs
+++ b/Tests/SRPTests/Projects/VisualEffectGraph_HDRP/Assets/Tests/HDRP_VisualEffectsGraph_GraphicsTests.cs
@@ -30,8 +30,9 @@ public class VFXGraphicsTests
         [IgnoreGraphicsTest("39_SmokeLighting_APV", "Too many bindings when using APVs", runtimePlatforms: new RuntimePlatform[] { RuntimePlatform.Switch })]
         [IgnoreGraphicsTest("102_ShadergraphShadow", "See UUM-96202", runtimePlatforms: new RuntimePlatform[] { RuntimePlatform.Switch })]
         [IgnoreGraphicsTest("015_FixedTime", "See UUM-109089", runtimePlatforms: new RuntimePlatform[] { RuntimePlatform.Switch })]
-        [IgnoreGraphicsTest("DistortionTest", "Unstable: https://jira.unity3d.com/browse/UUM-134091")]
-        [IgnoreGraphicsTest("HDRP_VolumetricOutput", "Unstable: https://jira.unity3d.com/browse/UUM-134091")]
+        [IgnoreGraphicsTest("DebugAlbedo", "Onscreen assert", runtimePlatforms: new RuntimePlatform[] { RuntimePlatform.Switch2 })]
+        [IgnoreGraphicsTest("36_SkinnedSDF", "Onscreen assert", runtimePlatforms: new RuntimePlatform[] { RuntimePlatform.Switch2 })]
+        [IgnoreGraphicsTest("015_FixedTime", "Onscreen assert", runtimePlatforms: new RuntimePlatform[] { RuntimePlatform.Switch2 })]
         [IgnoreGraphicsTest("Repro_SampleGradient_Branch_Instancing", "Compute shader ([Repro_SampleGradient_Branch_Instancing] [Minimal] Update Particles): Property (Repro_SampleGradient_Branch_Instancing_Buffer) at kernel index (0) is not set")]
         [IgnoreGraphicsTest("Empty", "No reference images provided")]
         [IgnoreGraphicsTest("Empty_With_Camera", "No reference images provided")]
diff --git a/Tests/SRPTests/Projects/VisualEffectGraph_HDRP/Packages/manifest.json b/Tests/SRPTests/Projects/VisualEffectGraph_HDRP/Packages/manifest.json
index 125930c63f5..05eb201415d 100644
--- a/Tests/SRPTests/Projects/VisualEffectGraph_HDRP/Packages/manifest.json
+++ b/Tests/SRPTests/Projects/VisualEffectGraph_HDRP/Packages/manifest.json
@@ -15,9 +15,9 @@
     "com.unity.testing.common-graphics": "file:../../../Packages/com.unity.testing.common-graphics",
     "com.unity.testing.visualeffectgraph": "file:../../../Packages/com.unity.testing.visualeffectgraph",
     "com.unity.testing.xr": "file:../../../Packages/com.unity.testing.xr",
-    "com.unity.timeline": "1.8.8",
+    "com.unity.timeline": "1.8.9",
     "com.unity.ugui": "2.0.0",
-    "com.unity.ui.test-framework": "6.5.0",
+    "com.unity.ui.test-framework": "6.6.0",
     "com.unity.visualeffectgraph": "file:../../../../../Packages/com.unity.visualeffectgraph",
     "com.unity.testframework.graphics": "file:../../../Packages/com.unity.test-framework.graphics",
     "com.unity.test-framework": "file:../../../../../Packages/com.unity.test-framework",