[Port] [6000.1] [Fix][VFX] Prevent some useless VFX recompilation/reimport in some cases

Author: svc-reach-platform-support

Packages/com.unity.visualeffectgraph/Editor/GraphView/Views/VFXConvertSubgraph.cs

@@ -248,6 +248,8 @@ public void ConvertToSubgraphContext(VFXView sourceView, IEnumerable<Controller>
                 TransferEdges();
                 //TransferContextsFlowEdges();
                 UninitSmart();
+
+                m_TargetSubgraph.GetResource()?.WriteAssetWithSubAssets();
             }
 
             public void ConvertToSubgraphOperator(VFXView sourceView, IEnumerable<Controller> controllers, Rect rect, string path)
@@ -282,6 +284,8 @@ public void ConvertToSubgraphOperator(VFXView sourceView, IEnumerable<Controller
                 var subGraphOperator = m_SourceNode as VFXSubgraphOperator;
                 subGraphOperator.RecreateCopy();
                 subGraphOperator.ResyncSlots(true);
+
+                m_TargetSubgraph.GetResource()?.WriteAssetWithSubAssets();
             }
 
             List<VFXBlockController> m_SourceBlockControllers;
@@ -374,6 +378,8 @@ public void ConvertToSubgraphBlock(VFXView sourceView, IEnumerable<Controller> c
                 TransferEdges();
                 m_SourceControllers = m_SourceControllersWithBlocks.ToList();
                 UninitSmart();
+
+                m_TargetSubgraph.GetResource()?.WriteAssetWithSubAssets();
             }
 
             bool CreateUniqueSubgraph(string typeName, string extension, Func<string, VisualEffectObject> createFunc)

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

@@ -1812,27 +1812,7 @@ internal void OnSave()
         {
             m_ComponentBoard?.DeactivateBoundsRecordingIfNeeded(); //Avoids saving the graph with unnecessary bounds computations
 
-            var graphToSave = new HashSet<VFXGraph>();
-            GetGraphsRecursively(controller.graph, graphToSave);
-            foreach (var graph in graphToSave)
-            {
-                if (EditorUtility.IsDirty(graph) || UnityEngine.Object.ReferenceEquals(graph, controller.graph))
-                {
-                    graph.UpdateSubAssets();
-                    try
-                    {
-                        VFXGraph.compilingInEditMode = !m_IsRuntimeMode;
-                        graph.visualEffectResource.WriteAsset();
-                    }
-                    finally
-                    {
-                        VFXGraph.compilingInEditMode = false;
-                    }
-                }
-            }
-
-            // Only for testing purpose
-            //VFXAnalytics.GetInstance().OnSaveVFXAsset(this);
+            controller.graph.visualEffectResource.WriteAssetWithSubAssets();
         }
 
         internal void SaveAs(string newPath)
@@ -1848,46 +1828,6 @@ internal void SaveAs(string newPath)
             }
         }
 
-        void GetGraphsRecursively(VFXGraph start, HashSet<VFXGraph> graphs)
-        {
-            if (graphs.Contains(start))
-                return;
-            graphs.Add(start);
-            foreach (var child in start.children)
-            {
-                if (child is VFXSubgraphOperator ope)
-                {
-                    if (ope.subgraph != null)
-                    {
-                        var graph = ope.subgraph.GetResource().GetOrCreateGraph();
-                        GetGraphsRecursively(graph, graphs);
-                    }
-                }
-                else if (child is VFXSubgraphContext subCtx)
-                {
-                    if (subCtx.subgraph != null)
-                    {
-                        var graph = subCtx.subgraph.GetResource().GetOrCreateGraph();
-                        GetGraphsRecursively(graph, graphs);
-                    }
-                }
-                else if (child is VFXContext ctx)
-                {
-                    foreach (var block in ctx.children.Cast<VFXBlock>())
-                    {
-                        if (block is VFXSubgraphBlock subBlock)
-                        {
-                            if (subBlock.subgraph != null)
-                            {
-                                var graph = subBlock.subgraph.GetResource().GetOrCreateGraph();
-                                GetGraphsRecursively(graph, graphs);
-                            }
-                        }
-                    }
-                }
-            }
-        }
-
         public EventPropagation OnCompile()
         {
             Compile();

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

@@ -374,19 +374,7 @@ static string[] OnWillSaveAssets(string[] paths)
                         AssetDatabase.StartAssetEditing();
                     }
                     var vfxResource = VisualEffectResource.GetResourceAtPath(path);
-                    if (vfxResource != null)
-                    {
-                        vfxResource.GetOrCreateGraph().UpdateSubAssets();
-                        try
-                        {
-                            VFXGraph.compilingInEditMode = vfxResource.GetOrCreateGraph().GetCompilationMode() == VFXCompilationMode.Edition;
-                            vfxResource.WriteAsset(); // write asset as the AssetDatabase won't do it.
-                        }
-                        finally
-                        {
-                            VFXGraph.compilingInEditMode = false;
-                        }
-                    }
+                    vfxResource?.WriteAssetWithSubAssets();
                 }
             }
             finally
@@ -432,6 +420,13 @@ public static void UpdateSubAssets(this VisualEffectResource resource)
             resource.GetOrCreateGraph().UpdateSubAssets();
         }
 
+        public static void WriteAssetWithSubAssets(this VisualEffectResource resource)
+        {
+            var graph = resource.GetOrCreateGraph();
+            graph.UpdateSubAssets();
+            resource.WriteAsset();
+        }
+
         public static bool IsAssetEditable(this VisualEffectResource resource)
         {
             return AssetDatabase.IsOpenForEdit((UnityEngine.Object)resource.asset ?? resource.subgraph, StatusQueryOptions.UseCachedIfPossible);
@@ -488,15 +483,6 @@ class VFXGraph : VFXModel
         // 18: Change ProbabilitySampling m_IntegratedRandomDeprecated changed to m_Mode
         public static readonly int CurrentVersion = 18;
 
-        [NonSerialized]
-        internal static bool compilingInEditMode = false;
-
-        public override void OnEnable()
-        {
-            base.OnEnable();
-            m_ExpressionGraphDirty = true;
-        }
-
         public override void OnSRPChanged()
         {
             m_GraphSanitized = false;
@@ -1139,7 +1125,7 @@ public uint FindReducedExpressionIndexFromSlotCPU(VFXSlot slot)
 
         public void SetCompilationMode(VFXCompilationMode mode, bool reimport = true)
         {
-            if (m_CompilationMode != mode)
+            if (m_CompilationMode != mode && !GetResource().isSubgraph)
             {
                 m_CompilationMode = mode;
                 SetExpressionGraphDirty();
@@ -1400,11 +1386,10 @@ public void SanitizeForImport()
 
         public void CompileForImport()
         {
-            if (compilingInEditMode)
-                m_CompilationMode = VFXCompilationMode.Edition;
+            bool isSubgraph = GetResource().isSubgraph;
 
             SyncCustomAttributes();
-            if (!GetResource().isSubgraph)
+            if (!isSubgraph)
             {
                 // Check Graph Before Import can be needed to synchronize modified shaderGraph
                 foreach (var child in children)
@@ -1492,21 +1477,15 @@ private VFXGraphCompiledData compiledData
         [SerializeField]
         private int m_ResourceVersion;
 
-        [NonSerialized]
         private bool m_GraphSanitized = false;
-        [NonSerialized]
         private bool m_ExpressionGraphDirty = true;
-        [NonSerialized]
         private bool m_ExpressionValuesDirty = true;
-        [NonSerialized]
         private bool m_DependentDirty = true;
-        [NonSerialized]
         private bool m_MaterialsDirty = false;
-        [NonSerialized]
         private bool m_CustomAttributesDirty = false;
 
-        [NonSerialized]
         private VFXGraphCompiledData m_CompiledData;
+
         private VFXCompilationMode m_CompilationMode = VFXCompilationMode.Runtime;
         private bool m_ForceShaderDebugSymbols = false;
         private bool m_ForceShaderValidation = false;