[6000.5][VFX][UUM-133319] Fix subgraph dependencies

Author: julienf-unity

Packages/com.unity.visualeffectgraph/Editor/Models/Blocks/VFXSubgraphBlock.cs

@@ -31,6 +31,15 @@ public override void GetImportDependentAssets(HashSet<EntityId> dependencies)
             }
         }
 
+        public override void GetSourceDependentAssets(HashSet<string> dependencies)
+        {
+            base.GetSourceDependentAssets(dependencies);
+            if (!object.ReferenceEquals(m_Subgraph, null) && AssetDatabase.TryGetGUIDAndLocalFileIdentifier(m_Subgraph, out var guid, out _))
+            {
+                dependencies.Add(guid);
+            }
+        }
+
         public override void CheckGraphBeforeImport()
         {
             base.CheckGraphBeforeImport();

Packages/com.unity.visualeffectgraph/Editor/Models/Contexts/VFXSubgraphContext.cs

@@ -48,6 +48,15 @@ public override void GetImportDependentAssets(HashSet<EntityId> dependencies)
             }
         }
 
+        public override void GetSourceDependentAssets(HashSet<string> dependencies)
+        {
+            base.GetSourceDependentAssets(dependencies);
+            if (!object.ReferenceEquals(m_Subgraph, null) && AssetDatabase.TryGetGUIDAndLocalFileIdentifier(m_Subgraph, out var guid, out _))
+            {
+                dependencies.Add(guid);
+            }
+        }
+
         void GraphParameterChanged(VFXGraph graph)
         {
             VisualEffectAsset asset = graph != null && graph.GetResource() != null ? graph.GetResource().asset : null;

Packages/com.unity.visualeffectgraph/Editor/Models/Operators/VFXSubgraphOperator.cs

@@ -195,6 +195,15 @@ public override void GetImportDependentAssets(HashSet<EntityId> dependencies)
             }
         }
 
+        public override void GetSourceDependentAssets(HashSet<string> dependencies)
+        {
+            base.GetSourceDependentAssets(dependencies);
+            if (!object.ReferenceEquals(m_Subgraph, null) && AssetDatabase.TryGetGUIDAndLocalFileIdentifier(m_Subgraph, out var guid, out _ ))
+            {
+                dependencies.Add(guid);
+            }
+        }
+
         protected internal override void Invalidate(VFXModel model, InvalidationCause cause)
         {
             if (cause == InvalidationCause.kSettingChanged)

Tests/SRPTests/Packages/com.unity.testing.visualeffectgraph/Tests/Editor/Data/Repro_Simplest_Subgraph_Chain.unitypackage

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:943a0117d5abb20763f0313ec036a10bf78ffc6a3138d4af9086d528db9ef5be
+size 8726

Tests/SRPTests/Packages/com.unity.testing.visualeffectgraph/Tests/Editor/Data/Repro_Simplest_Subgraph_Chain.unitypackage.meta

@@ -355,5 +355,44 @@ public IEnumerator Change_VFX_Exposed_Properties_With_Order_Two_Subgraph([ValueS
 
             yield return null;
         }
+        
+        static bool FindInShaderSource(VisualEffectResource vfxResource, string match)
+        {
+            for (int shaderIndex = 0; shaderIndex < vfxResource.GetShaderSourceCount(); ++shaderIndex)
+            {
+                var shaderSource = vfxResource.GetShaderSource(shaderIndex);
+                if (shaderSource.Contains(match))
+                    return true;
+            }
+
+            return false;
+        }
+
+        [UnityTest, Description("Cover UUM-133319")]
+        public IEnumerator Repro_Simplest_Subgraph_Chain()
+        {
+            VFXViewWindow.GetAllWindows().ToList().ForEach(x => { x.Close(); });
+            AssetDatabase.ImportPackageImmediately("Packages/com.unity.testing.visualeffectgraph/Tests/Editor/Data/Repro_Simplest_Subgraph_Chain.unitypackage");
+            AssetDatabase.Refresh();
+            yield return null;
+
+            var mainGraphPath = Path.Combine(VFXTestCommon.tempBasePath, "Repro_Simplest_Subgraph_Chain.vfx");
+            var subGraphPath = Path.Combine(VFXTestCommon.tempBasePath, "Repro_Simplest_Subgraph_Chain.vfxblock");
+
+            var mainGraphAsset = AssetDatabase.LoadAssetAtPath<VisualEffectAsset>(mainGraphPath);
+            var subGraphAsset = AssetDatabase.LoadAssetAtPath<VisualEffectSubgraph>(subGraphPath);
+            Assert.IsNotNull(mainGraphAsset);
+            Assert.IsNotNull(subGraphAsset);
+
+            Assert.IsTrue(FindInShaderSource(mainGraphAsset.GetResource(), "void Gravity"));
+
+            var subgraphContext = subGraphAsset.GetResource().GetOrCreateGraph().children.Single();
+            var gravity = subgraphContext.children.OfType<Block.Gravity>().Single();
+            subgraphContext.RemoveChild(gravity);
+            subGraphAsset.GetResource().WriteAsset();
+            yield return null;
+
+            Assert.IsFalse(FindInShaderSource(mainGraphAsset.GetResource(), "void Gravity"));
+        }
     }
 }