[VFX] Staging to Master

TestProjects/VisualEffectGraph_HDRP/Assets/AllTests/Editor/Tests/CopyPasteTest.vfx

@@ -605,7 +605,7 @@ MonoBehaviour:
   useAlphaClipping: 0
   generateMotionVector: 0
   excludeFromTAA: 0
-  materialOffset: 0
+  sortingPriority: 0
   m_SubOutputs:
   - {fileID: 8926484042661614564}
   cullMode: 0
@@ -614,7 +614,7 @@ MonoBehaviour:
   colorMapping: 0
   uvMode: 0
   useSoftParticle: 0
-  sortPriority: 0
+  vfxSystemSortPriority: 0
   sort: 0
   indirectDraw: 0
   computeCulling: 0

TestProjects/VisualEffectGraph_HDRP/Assets/AllTests/Editor/Tests/Indeterminate Test.vfx

@@ -9669,7 +9669,7 @@ MonoBehaviour:
         m_SerializableType: UnityEditor.VFX.Transform, Unity.VisualEffectGraph.Editor,
           Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
       m_SerializableObject: '{"position":{"x":NaN,"y":NaN,"z":NaN},"angles":{"x":326.0874938964844,"y":321.98138427734377,"z":321.98138427734377},"scale":{"x":0.0,"y":0.0,"z":0.0}}'
-    m_Space: 0
+    m_Space: 1
   m_Property:
     name: World To Local
     m_serializedType:

TestProjects/VisualEffectGraph_HDRP/Assets/AllTests/Editor/Tests/Modify_SG_Property.vfx

@@ -559,7 +559,7 @@ MonoBehaviour:
   useAlphaClipping: 0
   generateMotionVector: 0
   excludeFromTAA: 0
-  materialOffset: 0
+  sortingPriority: 0
   m_SubOutputs:
   - {fileID: 8926484042661614590}
   cullMode: 0
@@ -568,7 +568,7 @@ MonoBehaviour:
   colorMapping: 0
   uvMode: 0
   useSoftParticle: 0
-  sortPriority: 0
+  vfxSystemSortPriority: 0
   sort: 0
   indirectDraw: 0
   computeCulling: 0
@@ -669,40 +669,6 @@ MonoBehaviour:
     - 4
   primitiveType: 1
   useGeometryShader: 0
---- !u!114 &8926484042661614586
-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: 70a331b1d86cc8d4aa106ccbe0da5852, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_UIIgnoredErrors: []
-  m_Parent: {fileID: 0}
-  m_Children: []
-  m_UIPosition: {x: 0, y: 0}
-  m_UICollapsed: 1
-  m_UISuperCollapsed: 0
-  m_MasterSlot: {fileID: 8926484042661614586}
-  m_MasterData:
-    m_Owner: {fileID: 0}
-    m_Value:
-      m_Type:
-        m_SerializableType: UnityEngine.Texture2D, UnityEngine.CoreModule, Version=0.0.0.0,
-          Culture=neutral, PublicKeyToken=null
-      m_SerializableObject: '{"obj":{"fileID":2800000,"guid":"276d9e395ae18fe40a9b4988549f2349","type":3}}'
-    m_Space: 2147483647
-  m_Property:
-    name: mainTexture
-    m_serializedType:
-      m_SerializableType: UnityEngine.Texture2D, UnityEngine.CoreModule, Version=0.0.0.0,
-        Culture=neutral, PublicKeyToken=null
-  m_Direction: 0
-  m_LinkedSlots: []
 --- !u!114 &8926484042661614590
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -744,33 +710,6 @@ MonoBehaviour:
   title: 
   m_Owners:
   - {fileID: 8926484042661614555}
---- !u!114 &8926484042661614596
-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: d78581a96eae8bf4398c282eb0b098bd, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_UIIgnoredErrors: []
-  m_Parent: {fileID: 0}
-  m_Children: []
-  m_UIPosition: {x: 0, y: 0}
-  m_UICollapsed: 1
-  m_UISuperCollapsed: 0
-  title: 
-  m_Owners: []
-  dataType: 0
-  capacity: 128
-  stripCapacity: 1
-  particlePerStripCount: 128
-  needsComputeBounds: 0
-  boundsSettingMode: 0
-  m_Space: 0
 --- !u!114 &8926484042661614597
 MonoBehaviour:
   m_ObjectHideFlags: 0

TestProjects/VisualEffectGraph_HDRP/Assets/AllTests/Editor/Tests/VFXContextTests.cs

@@ -203,6 +203,83 @@ public void Link_Fail_From_Event_To_OutputEvent()
             Assert.IsFalse(VFXContext.CanLink(from, to));
         }
 
+        [Test]
+        public void Link_Fail_From_GPUEvent_To_Spawn()
+        {
+            var from = ScriptableObject.CreateInstance<VFXBasicGPUEvent>();
+            var to = ScriptableObject.CreateInstance<VFXBasicSpawner>();
+            Assert.IsFalse(VFXContext.CanLink(from, to));
+        }
+
+        [Test]
+        public void Link_Mixing_GPUEvent_And_Spawn_To_Init()
+        {
+            var fromA = ScriptableObject.CreateInstance<VFXBasicGPUEvent>();
+            var fromB = ScriptableObject.CreateInstance<VFXBasicSpawner>();
+            var to = ScriptableObject.CreateInstance<VFXBasicInitialize>();
+            Assert.IsTrue(VFXContext.CanLink(fromA, to));
+            Assert.IsTrue(VFXContext.CanLink(fromB, to));
+
+            to.LinkFrom(fromA);
+            Assert.AreEqual(1u, to.inputFlowSlot[0].link.Count());
+            Assert.IsTrue(VFXContext.CanLink(fromB, to));
+
+            //Expected disconnection of previous link in that case
+            to.LinkFrom(fromB);
+            Assert.IsTrue(VFXContext.CanLink(fromA, to));
+            Assert.AreEqual(1u, to.inputFlowSlot[0].link.Count());
+            Assert.AreEqual(fromB, to.inputFlowSlot[0].link.First().context);
+        }
+
+        [Test]
+        public void Link_Mixing_Spawn_And_GPUEvent_To_Init()
+        {
+            var fromA = ScriptableObject.CreateInstance<VFXBasicGPUEvent>();
+            var fromB = ScriptableObject.CreateInstance<VFXBasicSpawner>();
+            var to = ScriptableObject.CreateInstance<VFXBasicInitialize>();
+            Assert.IsTrue(VFXContext.CanLink(fromA, to));
+            Assert.IsTrue(VFXContext.CanLink(fromB, to));
+
+            to.LinkFrom(fromB);
+            Assert.AreEqual(1u, to.inputFlowSlot[0].link.Count());
+            Assert.IsTrue(VFXContext.CanLink(fromA, to));
+
+            //Expected disconnection of previous link in that case
+            to.LinkFrom(fromA);
+            Assert.IsTrue(VFXContext.CanLink(fromB, to));
+            Assert.AreEqual(1u, to.inputFlowSlot[0].link.Count());
+            Assert.AreEqual(fromA, to.inputFlowSlot[0].link.First().context);
+        }
+
+        [Test]
+        public void MultiLink_Spawn_To_Output_And_Initialize()
+        {
+            var from = ScriptableObject.CreateInstance<VFXBasicSpawner>();
+            var toA = ScriptableObject.CreateInstance<VFXBasicInitialize>();
+            var toB = ScriptableObject.CreateInstance<VFXOutputEvent>();
+
+            toA.LinkFrom(from);
+            toB.LinkFrom(from);
+
+            Assert.AreEqual(2, from.outputContexts.Count());
+        }
+
+        [Test]
+        public void MultiLink_Spawner_Mixing_OutputEvent_And_Initialize()
+        {
+            var from = ScriptableObject.CreateInstance<VFXBasicSpawner>();
+
+            var toA = ScriptableObject.CreateInstance<VFXBasicInitialize>();
+            var toB = ScriptableObject.CreateInstance<VFXOutputEvent>();
+            var toC = ScriptableObject.CreateInstance<VFXBasicInitialize>();
+
+            toA.LinkFrom(from);
+            toB.LinkFrom(from);
+            toC.LinkFrom(from);
+
+            Assert.AreEqual(3, from.outputContexts.Count());
+        }
+
         [Test]
         public void MultiLink_Spawn_And_Event_To_Initialize()
         {
@@ -229,6 +306,63 @@ public void MultiLink_Event_And_Spawn_To_Initialize()
             Assert.AreEqual(2, to.inputContexts.Count());
         }
 
+        [Test]
+        public void Link_Success_From_Update_To_Update()
+        {
+            var from = ScriptableObject.CreateInstance<VFXBasicUpdate>();
+            var to = ScriptableObject.CreateInstance<VFXBasicUpdate>();
+            Assert.IsTrue(VFXContext.CanLink(from, to));
+        }
+
+        [Test]
+        public void Link_Initialize_Cant_Mix_Update_And_Output()
+        {
+            var init = ScriptableObject.CreateInstance<VFXBasicInitialize>();
+            var update = ScriptableObject.CreateInstance<VFXBasicUpdate>();
+            var outputA = ScriptableObject.CreateInstance<VFXPlanarPrimitiveOutput>();
+            var outputB = ScriptableObject.CreateInstance<VFXPlanarPrimitiveOutput>();
+
+            update.LinkFrom(init);
+            outputA.LinkFrom(update);
+
+            Assert.AreEqual(1, init.outputContexts.Count());
+            Assert.AreEqual(1, update.outputContexts.Count());
+
+            outputB.LinkFrom(init);
+            Assert.AreEqual(1, init.outputContexts.Count());
+            Assert.AreEqual(outputB, init.outputContexts.First());
+
+            update.LinkFrom(init);
+            Assert.AreEqual(1, init.outputContexts.Count());
+            Assert.AreEqual(update, init.outputContexts.First());
+        }
+
+        [Test]
+        public void Link_Update_Cant_Mix_Update_And_Output()
+        {
+            var init = ScriptableObject.CreateInstance<VFXBasicInitialize>();
+            var updateA = ScriptableObject.CreateInstance<VFXBasicUpdate>();
+            var updateB = ScriptableObject.CreateInstance<VFXBasicUpdate>();
+            var outputA = ScriptableObject.CreateInstance<VFXPlanarPrimitiveOutput>();
+            var outputB = ScriptableObject.CreateInstance<VFXPlanarPrimitiveOutput>();
+
+            updateA.LinkFrom(init);
+            updateB.LinkFrom(updateA);
+            outputA.LinkFrom(updateB);
+
+            Assert.AreEqual(1, init.outputContexts.Count());
+            Assert.AreEqual(1, updateA.outputContexts.Count());
+            Assert.AreEqual(1, updateB.outputContexts.Count());
+
+            outputB.LinkFrom(updateA);
+            Assert.AreEqual(1, updateA.outputContexts.Count());
+            Assert.AreEqual(outputB, updateA.outputContexts.First());
+
+            updateB.LinkFrom(updateA);
+            Assert.AreEqual(1, updateA.outputContexts.Count());
+            Assert.AreEqual(updateB, updateA.outputContexts.First());
+        }
+
         [Test]
         public void Link_Fail_From_Event_To_Initialize()
         {

TestProjects/VisualEffectGraph_HDRP/Assets/AllTests/Editor/Tests/VFXControllerTests.cs

@@ -1099,7 +1099,6 @@ public IEnumerator ConvertToSubGraphOperator_And_ModifySubgraph()
             Assert.AreNotEqual(oneOutputState, twoOutputState);
             Assert.IsTrue(twoOutputState.Contains(otherParamName));
 
-            window.graphView.controller = null;
             for (int i = 0; i < 16; ++i)
                 yield return null;
 

TestProjects/VisualEffectGraph_HDRP/Assets/AllTests/VFXTests/GraphicsTests/05_MotionVectors.vfx

@@ -2694,7 +2694,7 @@ MonoBehaviour:
   useAlphaClipping: 1
   generateMotionVector: 0
   excludeFromTAA: 0
-  materialOffset: 0
+  sortingPriority: 0
   m_SubOutputs:
   - {fileID: 8926484042661614542}
   cullMode: 3
@@ -2703,7 +2703,7 @@ MonoBehaviour:
   colorMapping: 0
   uvMode: 0
   useSoftParticle: 0
-  sortPriority: 0
+  vfxSystemSortPriority: 0
   sort: 0
   indirectDraw: 0
   computeCulling: 0

TestProjects/VisualEffectGraph_HDRP/Assets/AllTests/VFXTests/GraphicsTests/06_LineOutput.vfx

@@ -2086,7 +2086,7 @@ MonoBehaviour:
   useAlphaClipping: 0
   generateMotionVector: 0
   excludeFromTAA: 0
-  materialOffset: 0
+  sortingPriority: 0
   m_SubOutputs:
   - {fileID: 8926484042661614584}
   cullMode: 3
@@ -2095,7 +2095,7 @@ MonoBehaviour:
   colorMapping: 0
   uvMode: 0
   useSoftParticle: 0
-  sortPriority: 0
+  vfxSystemSortPriority: 0
   sort: 0
   indirectDraw: 0
   computeCulling: 0

TestProjects/VisualEffectGraph_HDRP/Assets/AllTests/VFXTests/GraphicsTests/07_UnityLogo.vfx

@@ -2406,7 +2406,7 @@ MonoBehaviour:
   useAlphaClipping: 0
   generateMotionVector: 0
   excludeFromTAA: 0
-  materialOffset: 0
+  sortingPriority: 0
   m_SubOutputs:
   - {fileID: 8926484042661614696}
   cullMode: 0
@@ -2415,7 +2415,7 @@ MonoBehaviour:
   colorMapping: 0
   uvMode: 0
   useSoftParticle: 0
-  sortPriority: 0
+  vfxSystemSortPriority: 0
   sort: 0
   indirectDraw: 0
   computeCulling: 0