[VFX] reimport on SRP changed + remove built-in support and notify

com.unity.visualeffectgraph/Editor/Compiler/VFXGraphCompiledData.cs

@@ -992,17 +992,22 @@ static IEnumerable<uint> ConvertDataToSystemIndex(IEnumerable<VFXContext> input,
                     yield return index;
         }
 
+        private void CleanRuntimeData()
+        {
+            if (m_Graph.visualEffectResource != null)
+                m_Graph.visualEffectResource.ClearRuntimeData();
+
+            m_ExpressionGraph = new VFXExpressionGraph();
+            m_ExpressionValues = new VFXExpressionValueContainerDesc[] {};
+        }
+
         public void Compile(VFXCompilationMode compilationMode, bool forceShaderValidation)
         {
-            // Prevent doing anything ( and especially showing progress) in an empty graph.
-            if (m_Graph.children.Count() < 1)
+            // Early out in case: (Not even displaying the popup)
+            if (m_Graph.children.Count() < 1 ||         // Graph is empty
+                VFXLibrary.currentSRPBinder == null)    // One of supported SRPs is not current SRP
             {
-                // Cleaning
-                if (m_Graph.visualEffectResource != null)
-                    m_Graph.visualEffectResource.ClearRuntimeData();
-
-                m_ExpressionGraph = new VFXExpressionGraph();
-                m_ExpressionValues = new VFXExpressionValueContainerDesc[] {};
+                CleanRuntimeData();
                 return;
             }
 
@@ -1213,12 +1218,7 @@ public void Compile(VFXCompilationMode compilationMode, bool forceShaderValidati
 
                 Debug.LogError(string.Format("{2} : Exception while compiling expression graph: {0}: {1}", e, e.StackTrace, (asset != null) ? asset.name : "(Null Asset)"), asset);
 
-                // Cleaning
-                if (m_Graph.visualEffectResource != null)
-                    m_Graph.visualEffectResource.ClearRuntimeData();
-
-                m_ExpressionGraph = new VFXExpressionGraph();
-                m_ExpressionValues = new VFXExpressionValueContainerDesc[] {};
+                CleanRuntimeData();
             }
             finally
             {

com.unity.visualeffectgraph/Editor/Core/VFXLibrary.cs

@@ -7,6 +7,7 @@
 using UnityEngine;
 using UnityEngine.Rendering;
 using Object = System.Object;
+using System.Reflection;
 
 namespace UnityEditor.VFX
 {
@@ -176,14 +177,6 @@ public virtual VFXAbstractRenderedOutput.BlendMode GetBlendModeFromMaterial(VFXM
         public virtual bool IsGraphDataValid(GraphData graph) => false;
     }
 
-    // This is the default binder used if no SRP is used in the project
-    class VFXLegacyBinder : VFXSRPBinder
-    {
-        public override string templatePath { get { return "Packages/com.unity.visualeffectgraph/Shaders/RenderPipeline/Legacy"; } }
-        public override string SRPAssetTypeStr { get { return "None"; } }
-        public override Type SRPOutputDataType { get { return null; } }
-    }
-
     static class VFXLibrary
     {
         public static IEnumerable<VFXModelDescriptor<VFXContext>> GetContexts() { LoadIfNeeded(); return VFXViewPreference.displayExperimentalOperator ? m_ContextDescs : m_ContextDescs.Where(o => !o.info.experimental); }
@@ -475,21 +468,67 @@ private static void LoadSRPBindersIfNeeded()
             }
         }
 
+        private static bool unsupportedSRPWarningIssued = false;
+
+        private static void LogUnsupportedSRP(VFXSRPBinder binder, bool forceLog)
+        {
+            if (binder == null && (forceLog || !unsupportedSRPWarningIssued))
+            {
+                Debug.LogWarning("The Visual Effect Graph is supported in the High Definition Render Pipeline (HDRP) and the Universal Render Pipeline (URP). Please assign your chosen Render Pipeline Asset in the Graphics Settings to use it.");
+                unsupportedSRPWarningIssued = true;
+            }
+        }
+
+        public static void LogUnsupportedSRP(bool forceLog = true)
+        {
+            bool logIssued = unsupportedSRPWarningIssued;
+            var binder = currentSRPBinder;
+
+            if (logIssued || !unsupportedSRPWarningIssued) // Don't reissue warning if inner currentSRPBinder call has already logged it
+                LogUnsupportedSRP(binder, forceLog);
+        }
+
         public static VFXSRPBinder currentSRPBinder
         {
             get
             {
                 LoadSRPBindersIfNeeded();
+
                 VFXSRPBinder binder = null;
-                srpBinders.TryGetValue(GraphicsSettings.currentRenderPipeline == null ? "None" : GraphicsSettings.currentRenderPipeline.GetType().Name, out binder);
+                var currentSRP = QualitySettings.renderPipeline ?? GraphicsSettings.currentRenderPipeline;
+                if (currentSRP != null)
+                    srpBinders.TryGetValue(currentSRP.GetType().Name, out binder);
 
-                if (binder == null)
-                    throw new NullReferenceException("The SRP was not registered in VFX: " + GraphicsSettings.currentRenderPipeline.GetType());
+                LogUnsupportedSRP(binder, false);
 
                 return binder;
             }
         }
 
+        [InitializeOnLoadMethod]
+        private static void RegisterSRPChangeCallback()
+        {
+            EventInfo onRPChanged = typeof(RenderPipelineManager).GetEvent("activeRenderPipelineTypeChanged", BindingFlags.NonPublic | BindingFlags.Static);
+            if (onRPChanged != null)
+            {
+                MethodInfo addHandler = onRPChanged.GetAddMethod(nonPublic: true);
+                addHandler.Invoke(null, new Action[] { SRPChanged });
+            }
+
+            // Once activeRenderPipelineTypeChanged is public don't use reflection anymore
+            //RenderPipelineManager.activeRenderPipelineTypeChanged += OnSRPChanged;
+        }
+
+        public delegate void OnSRPChangedEvent();
+        public static event OnSRPChangedEvent OnSRPChanged;
+
+        private static void SRPChanged()
+        {
+            unsupportedSRPWarningIssued = false;
+            OnSRPChanged?.Invoke();
+            VFXAssetManager.Build();
+        }
+
         private static LibrarySentinel m_Sentinel = null;
 
         private static volatile List<VFXModelDescriptor<VFXContext>> m_ContextDescs;

com.unity.visualeffectgraph/Editor/Data/VFXDataMesh.cs

@@ -46,6 +46,8 @@ public override void OnEnable()
         {
             base.OnEnable();
 
+            VFXLibrary.OnSRPChanged += OnSRPChanged;
+
             if (object.ReferenceEquals(shader, null)) shader = VFXResources.defaultResources.shader;
 
             if (m_Shader != null)
@@ -58,6 +60,17 @@ public override void OnEnable()
             }
         }
 
+        public virtual void OnDisable()
+        {
+            VFXLibrary.OnSRPChanged -= OnSRPChanged;
+            DestroyCachedMaterial();
+        }
+
+        private void OnSRPChanged()
+        {
+            DestroyCachedMaterial();
+        }
+
         public void RefreshShader()
         {
             DestroyCachedMaterial();
@@ -70,11 +83,6 @@ private void DestroyCachedMaterial()
             m_CachedMaterial = null;
         }
 
-        public void OnDisable()
-        {
-            DestroyCachedMaterial();
-        }
-
         public override void CopySettings<T>(T dst)
         {
             VFXDataMesh other = dst as VFXDataMesh;
@@ -98,7 +106,8 @@ public Material GetOrCreateMaterial()
             {
                 m_CachedMaterial = new Material(shader);
                 m_CachedMaterial.hideFlags = HideFlags.HideAndDontSave;
-                VFXLibrary.currentSRPBinder.SetupMaterial(m_CachedMaterial);
+
+                VFXLibrary.currentSRPBinder?.SetupMaterial(m_CachedMaterial);
             }
 
             return m_CachedMaterial;

com.unity.visualeffectgraph/Editor/GraphView/VFXViewWindow.cs

@@ -46,6 +46,8 @@ protected void SetupFramingShortcutHandler(VFXView view)
         [MenuItem("Window/Visual Effects/Visual Effect Graph", false, 3011)]
         public static void ShowWindow()
         {
+            VFXLibrary.LogUnsupportedSRP();
+
             GetWindow<VFXViewWindow>();
         }
 
@@ -55,6 +57,8 @@ public VFXView graphView
         }
         public void LoadAsset(VisualEffectAsset asset, VisualEffect effectToAttach)
         {
+            VFXLibrary.LogUnsupportedSRP();
+
             string assetPath = AssetDatabase.GetAssetPath(asset);
 
             VisualEffectResource resource = VisualEffectResource.GetResourceAtPath(assetPath);

com.unity.visualeffectgraph/Editor/GraphView/Views/VFXView.cs

@@ -1420,6 +1420,8 @@ void OnResyncMaterial()
 
         void OnCompile()
         {
+            VFXLibrary.LogUnsupportedSRP();
+
             if (controller.model.isSubgraph)
                 controller.graph.RecompileIfNeeded(false, false);
             else

com.unity.visualeffectgraph/Editor/Inspector/VFXManagerEditor.cs

@@ -53,7 +53,7 @@ public override void OnInspectorGUI()
 
         GUI.enabled = AssetDatabase.IsOpenForEdit(target, StatusQueryOptions.UseCachedIfPossible);
 
-        EditorGUILayout.LabelField("Current Scriptable Render Pipeline: " + VFXLibrary.currentSRPBinder.SRPAssetTypeStr);
+        EditorGUILayout.LabelField("Current Scriptable Render Pipeline: " + VFXLibrary.currentSRPBinder?.SRPAssetTypeStr);
 
         foreach (var property in m_TimeProperties)
         {

com.unity.visualeffectgraph/Editor/Inspector/VisualEffectEditor.cs

@@ -1333,7 +1333,7 @@ public void OnInspectorGUI()
                     if (m_RenderingLayerMask != null)
                     {
                         string[] layerNames = null;
-                        var srpAsset = GraphicsSettings.currentRenderPipeline;
+                        var srpAsset = QualitySettings.renderPipeline ?? GraphicsSettings.currentRenderPipeline;
                         if (srpAsset != null)
                             layerNames = srpAsset.renderingLayerMaskNames;
 

com.unity.visualeffectgraph/Editor/Models/Contexts/Implementations/VFXAbstractRenderedOutput.cs

@@ -80,7 +80,7 @@ public VFXSRPSubOutput subOutput
             get
             {
                 if (m_CurrentSubOutput == null)
-                    GetOrCreateSubOutput();
+                    m_CurrentSubOutput = GetOrCreateSubOutput();
                 return m_CurrentSubOutput;
             }
         }
@@ -117,10 +117,21 @@ private VFXSRPSubOutput GetOrCreateSubOutput()
 
         public override void OnEnable()
         {
+            VFXLibrary.OnSRPChanged += OnSRPChanged;
             InitSubOutputs(m_SubOutputs, false);
             base.OnEnable();
         }
 
+        public virtual void OnDisable()
+        {
+            VFXLibrary.OnSRPChanged -= OnSRPChanged;
+        }
+
+        private void OnSRPChanged()
+        {
+            m_CurrentSubOutput = null;
+        }
+
         public List<VFXSRPSubOutput> GetSubOutputs()
         {
             return m_SubOutputs;

com.unity.visualeffectgraph/Editor/Models/VFXGraph.cs

@@ -128,9 +128,9 @@ static void CheckCompilationVersion()
             }
         }
     }
-    class VFXCacheManager : EditorWindow
+    class VFXAssetManager : EditorWindow
     {
-        private static List<VisualEffectObject> GetAllVisualEffectObjects()
+        public static List<VisualEffectObject> GetAllVisualEffectObjects()
         {
             var vfxObjects = new List<VisualEffectObject>();
             var vfxObjectsGuid = AssetDatabase.FindAssets("t:VisualEffectObject");
@@ -146,8 +146,7 @@ private static List<VisualEffectObject> GetAllVisualEffectObjects()
             return vfxObjects;
         }
 
-        [MenuItem("Edit/VFX/Rebuild And Save All VFX Graphs", priority = 320)]
-        public static void Build()
+        public static void Build(bool forceDirty = false)
         {
             var vfxObjects = GetAllVisualEffectObjects();
 
@@ -161,11 +160,18 @@ public static void Build()
                 {
                     VFXGraph graph = resource.GetOrCreateGraph();
                     AssetDatabase.ImportAsset(AssetDatabase.GetAssetPath(graph));
-                    EditorUtility.SetDirty(resource);
+                    if (forceDirty)
+                        EditorUtility.SetDirty(resource);
                 }
             }
 
             VFXExpression.ClearCache();
+        }
+
+        [MenuItem("Edit/VFX/Rebuild And Save All VFX Graphs", priority = 320)]
+        public static void BuildAndSave()
+        {
+            Build(true);
             AssetDatabase.SaveAssets();
         }
     }
@@ -283,6 +289,18 @@ class VFXGraph : VFXModel
         public override void OnEnable()
         {
             base.OnEnable();
+            VFXLibrary.OnSRPChanged += OnSRPChanged;
+            m_ExpressionGraphDirty = true;
+        }
+
+        public virtual void OnDisable()
+        {
+            VFXLibrary.OnSRPChanged -= OnSRPChanged;
+        }
+
+        private void OnSRPChanged()
+        {
+            m_GraphSanitized = false;
             m_ExpressionGraphDirty = true;
         }
 

com.unity.visualeffectgraph/Editor/ShaderGraph/VFXShaderGraphParticleOutput.cs

@@ -168,7 +168,7 @@ public BlendMode GetMaterialBlendMode()
             var blendMode = BlendMode.Opaque;
 
             var shaderGraph = GetOrRefreshShaderGraphObject();
-            if (shaderGraph != null && shaderGraph.generatesWithShaderGraph)
+            if (shaderGraph != null && shaderGraph.generatesWithShaderGraph && VFXLibrary.currentSRPBinder != null)
             {
                 // VFX Blend Mode state configures important systems like sorting and indirect buffer.
                 // In the case of SG Generation path, we need to know the blend mode state of the SRP
@@ -303,7 +303,7 @@ protected string shaderName
             {
                 var shaderGraph = GetOrRefreshShaderGraphObject();
 
-                if (shaderGraph == null || !shaderGraph.generatesWithShaderGraph)
+                if (shaderGraph == null || !shaderGraph.generatesWithShaderGraph || VFXLibrary.currentSRPBinder == null)
                     return string.Empty;
 
                 return VFXLibrary.currentSRPBinder.GetShaderName(shaderGraph);

com.unity.visualeffectgraph/Editor/Utils/VFXDebugWindow.cs

@@ -23,7 +23,7 @@ private void OnGUI()
                     VFXCacheManager.Clear();*/
 
                 if (GUILayout.Button("Recompile All"))
-                    VFXCacheManager.Build();
+                    VFXAssetManager.Build();
             }
             EditorGUILayout.Space();
             /*

com.unity.visualeffectgraph/Editor/VFXAssetEditorUtility.cs

@@ -108,6 +108,8 @@ public static T CreateNew<T>(string path) where T : UnityObject
         [MenuItem("Assets/Create/Visual Effects/Visual Effect Graph", false, 306)]
         public static void CreateVisualEffectAsset()
         {
+            VFXLibrary.LogUnsupportedSRP();
+
             string templateString = "";
             try
             {