New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[VFX] 10.2 fixes #2290

Merged

julienf-unity merged 190 commits into master from vfx/staging

Oct 23, 2020

Mesh Sampling (revival) (#1)

* Squashed commit of the following:

commit 4cd4cb244d720c87580c3386a75209532f2b8629
Author: Paul Demeulenaere <pauld@unity3d.com>
Date:   Thu Apr 2 18:13:24 2020 +0200

    Minor change to ease graphViz output view

commit a6f9f78ecff57045899508f8a7bb03c9cc731c29
Author: Paul Demeulenaere <pauld@unity3d.com>
Date:   Thu Apr 2 18:11:09 2020 +0200

    Fix VFXObjectValue initial flag (cc @tristan) : Store ContentType & return it in VFXObjectValue directly (VFXObjectValue become an extension of VFXValue)

    Fix regression introduced by my change at 7abaf9bbf27c587033ad621301778b15748793e4 (due to missing in PropagateParentsFlags)
    Add OuputExpression_From_Slot_Mesh_Should_Be_Invalid_Constant & OuputExpression_From_Slot_Mesh_Should_Be_Invalid_Constant_Propagation to ease the check of expected behavior

commit 7c11de30553cbc378926e3a1d6775f361921ad7a
Author: Paul Demeulenaere <pauld@unity3d.com>
Date:   Thu Apr 2 14:54:57 2020 +0200

    *Update 007 SampleMesh to cover more cases

commit 0baa1401f6fad276323d6369eb4330ef717c978f
Merge: 40749ce2ba a9338688a6
Author: Paul Demeulenaere <pauld@unity3d.com>
Date:   Tue Mar 31 18:04:49 2020 +0200

    Merge branch 'vfx/staging' into vfx/feature/mesh-sampling

commit 40749ce2ba015f004c6e161d75c4063edefd0f3a
Author: Paul Demeulenaere <pauld@unity3d.com>
Date:   Thu Mar 26 21:50:40 2020 +0100

    *Reupdate Image (HDRP, there was an issue with shaderGraph)

commit fa7ecbf9656db5316a60aadd450414b4d790e9ff
Author: Paul Demeulenaere <pauld@unity3d.com>
Date:   Thu Mar 26 21:46:02 2020 +0100

    *Update reference Image & .vfx (always in HDRP project)

commit 7abaf9bbf27c587033ad621301778b15748793e4
Author: Paul Demeulenaere <pauld@unity3d.com>
Date:   Thu Mar 26 15:13:20 2020 +0100

    Fix issue https://github.cds.internal.unity3d.com/unity/vfx-graph/pull/197#discussion_r44714 : set InvalidConstant directly on VFXValueType of Mesh

commit c5a7a3ed477af8732da0095091c080692c9c64b2
Author: Paul Demeulenaere <pauld@unity3d.com>
Date:   Thu Mar 26 14:52:07 2020 +0100

    Add graphic test to cover constant folding (TODO : Update all images)

commit 27e3c7464d60659905f13f172c79a79a94b7ac56
Author: Paul Demeulenaere <pauld@unity3d.com>
Date:   Thu Mar 26 13:37:38 2020 +0100

    Fix issue https://github.cds.internal.unity3d.com/unity/vfx-graph/pull/197#discussion_r44714

commit 128101bc638d98d9628dc90be078450e1f706534
Author: Paul Demeulenaere <pauld@unity3d.com>
Date:   Tue Mar 24 12:39:39 2020 +0100

    Minor : forgot a punctation

commit 8c395cd600dfd8301cf6c83d1354ba457e49e889
Author: Paul Demeulenaere <pauld@unity3d.com>
Date:   Tue Mar 24 11:01:30 2020 +0100

    *Update documentation from @Lewis feedback https://github.cds.internal.unity3d.com/unity/vfx-graph/pull/197#issuecomment-18488

commit 28f0ca20a0c422c5a5f1e64e1401271f63762ade
Author: Paul Demeulenaere <pauld@unity3d.com>
Date:   Mon Mar 23 09:33:39 2020 +0100

    Fix documentation image link (bis)

commit 1b102c1c1ef3d3da69c9aa4332737e3f935959fa
Author: Paul Demeulenaere <pauld@unity3d.com>
Date:   Mon Mar 23 09:24:13 2020 +0100

    *Fix path in documentation

commit 662d086481c228491536d1463dfe61198048a263
Author: Paul Demeulenaere <pauld@unity3d.com>
Date:   Mon Mar 23 09:06:12 2020 +0100

    Fix issue https://github.cds.internal.unity3d.com/unity/vfx-graph/pull/197#discussion_r43790

commit 241ca5edf7451345ecce30da9310b19e24ee37d5
Author: Paul Demeulenaere <pauld@unity3d.com>
Date:   Mon Mar 23 08:21:56 2020 +0100

    *Update documentation

commit d89f307aca40f88bdda2dc0e9a0324556e296400
Author: Paul Demeulenaere <pauld@unity3d.com>
Date:   Fri Mar 20 17:50:44 2020 +0100

    *Update documentation

commit 9f79d5a48e22881011ccf978217b21ce44ed9a37
Author: Paul Demeulenaere <pauld@unity3d.com>
Date:   Fri Mar 20 15:59:56 2020 +0100

    first draft of documentation

commit f84300e560bfd3698e27da58a4e93236209ac513
Merge: 9c5bd4e887 c04b64c1b3
Author: Paul Demeulenaere <pauld@unity3d.com>
Date:   Fri Mar 20 13:22:28 2020 +0100

    Merge branch 'vfx/staging' into vfx/feature/mesh-sampling

commit 9c5bd4e88764d91371d0551fdf3fe64654c2e63f
Merge: f8284406c8 ec959d5de3
Author: Paul Demeulenaere <pauld@unity3d.com>
Date:   Mon Mar 16 10:13:09 2020 +0100

    Merge branch 'vfx/staging' into vfx/feature/mesh-sampling

commit f8284406c8a99ceb442c13e20049ca14efd3cd7d
Author: Paul Demeulenaere <pauld@unity3d.com>
Date:   Mon Mar 16 10:12:08 2020 +0100

    Fix issue : https://github.cds.internal.unity3d.com/unity/vfx-graph/pull/197#discussion_r43071 & https://github.cds.internal.unity3d.com/unity/vfx-graph/pull/197#discussion_r43068 & https://github.cds.internal.unity3d.com/unity/vfx-graph/pull/197#discussion_r43067 & https://github.cds.internal.unity3d.com/unity/vfx-graph/pull/197#pullrequestreview-50944

    Split Texture & Buffer

commit 39328fb09e1d470727becea05842cd48ceb7c5e2
Author: Tristan Genevet <tristan@unity3d.com>
Date:   Wed Mar 11 11:42:23 2020 +0100

    Fix delegate set that must not be postponed

commit 9ddac63551eea34f630ddea0380035728b97bf3a
Author: Paul Demeulenaere <pauld@unity3d.com>
Date:   Tue Mar 10 17:48:44 2020 +0100

    Add sample test for case 1226578 (TODO : fix HDRP 007_SimpleMaterial)

commit e04224320d5404e44c969e49470eec827622916f
Author: Paul Demeulenaere <pauld@unity3d.com>
Date:   Tue Mar 10 15:30:46 2020 +0100

    Fix after merge

commit fb7dbd291fc063640295b35a24caf87ddccef1f9
Merge: 302ae40d59 5bdcd30bd9
Author: Paul Demeulenaere <pauld@unity3d.com>
Date:   Tue Mar 10 15:15:42 2020 +0100

    Merge branch 'vfx/staging' into vfx/feature/mesh-sampling

commit 302ae40d59ec0c3dd214405392853de8097373ca
Author: Paul Demeulenaere <pauld@unity3d.com>
Date:   Tue Feb 25 10:48:54 2020 +0100

    Fix build & behavior

commit 61ce50e6dd9e08987bb7273f678e064edc01d110
Merge: 70c93148d4 5d2dfe278f
Author: Paul Demeulenaere <pauld@unity3d.com>
Date:   Tue Feb 25 10:18:17 2020 +0100

    Merge branch 'vfx/staging' into vfx/feature/mesh-sampling

    # Conflicts:
    #	com.unity.visualeffectgraph/Editor/Compiler/VFXShaderWriter.cs

commit 70c93148d49f776dc68a47c28053258f8a713f54
Author: Paul Demeulenaere <pauld@unity3d.com>
Date:   Wed Feb 12 09:04:23 2020 +0100

    Relate to issue https://github.cds.internal.unity3d.com/unity/vfx-graph/pull/197#discussion_r36772

    Add adressing mode in Position (Mesh) too & Update Tooltips

commit e5d35ed0d6b6398c7d25d02166a32ca7d2afec65
Author: Paul Demeulenaere <pauld@unity3d.com>
Date:   Tue Feb 11 17:18:28 2020 +0100

    *Update reference image for HDRP (clear color isn't exactly the same)

commit 65883b0f521cd1e1438890084593081400d594a2
Author: Paul Demeulenaere <pauld@unity3d.com>
Date:   Tue Feb 11 16:09:18 2020 +0100

    Fix Color Sampling test

commit 3e7ab2cddca5556855280709d18395df1229be57
Author: Paul Demeulenaere <pauld@unity3d.com>
Date:   Tue Feb 11 15:54:25 2020 +0100

    *Update Mesh Sampling vfx

commit b46ffc745a55347e4d310e617afd1a40f2c2a804
Author: Paul Demeulenaere <pauld@unity3d.com>
Date:   Tue Feb 11 15:47:06 2020 +0100

    Resolve issue https://github.cds.internal.unity3d.com/unity/vfx-graph/pull/197#issuecomment-15567

commit 03dff8383f4cc7acb383a630f0745871db2b7303
Author: Paul Demeulenaere <pauld@unity3d.com>
Date:   Tue Feb 11 15:31:48 2020 +0100

    Resolve issue : https://github.cds.internal.unity3d.com/unity/vfx-graph/pull/197#issuecomment-15555

    Remove output count from the SampleMesh for consistency

commit 0d6620339efc53b56906226e78b005ab06a0ab53
Author: Paul Demeulenaere <pauld@unity3d.com>
Date:   Tue Feb 11 15:26:24 2020 +0100

    *Update test using vertex mesh sampling

commit 33433a4ccacc91c5861957b4f1d414d91eb1abb5
Author: Paul Demeulenaere <pauld@unity3d.com>
Date:   Tue Feb 11 15:17:00 2020 +0100

    *Use flag in inspector as @julienf suggested

commit f6d9f3ab494b50dcd15ad7104ff0ea40f398cee9
Author: Paul Demeulenaere <pauld@unity3d.com>
Date:   Tue Feb 11 11:22:36 2020 +0100

    Resolve issue : https://github.cds.internal.unity3d.com/unity/vfx-graph/pull/197#discussion_r36772

    Add adressingMode in Custom Sampling

commit 00444271a0c3c1efda6373f16432cad3659d8238
Author: Paul Demeulenaere <pauld@unity3d.com>
Date:   Tue Feb 11 10:29:07 2020 +0100

    Resolve issue : https://github.cds.internal.unity3d.com/unity/vfx-graph/pull/197#discussion_r36771 & https://github.cds.internal.unity3d.com/unity/vfx-graph/pull/197#discussion_r36770

commit d4422c88b66f0cf67c561086798b176db69b3d1a
Merge: a7052746e1 0e325d7de5
Author: Paul Demeulenaere <pauld@unity3d.com>
Date:   Tue Feb 11 09:05:59 2020 +0100

    Merge branch 'vfx/staging' into vfx/feature/mesh-sampling

    # Conflicts:
    #	com.unity.visualeffectgraph/CHANGELOG.md

commit a7052746e10326979c3e4c4d69ddc4004bcad83b
Author: Paul Demeulenaere <pauld@unity3d.com>
Date:   Tue Feb 11 09:04:44 2020 +0100

    Unexpected change in upm-ci-vfxmain.yml

commit 3fa67e367aeda4f85025886d53729111a0d841e6
Author: Paul Demeulenaere <pauld@unity3d.com>
Date:   Mon Dec 23 10:34:57 2019 +0100

    Update upm-ci-vfxmain.yml

commit 8abf8e07dbe96fb4f02ab0733e3f22fa30622a7d
Merge: 442c3cd4e0 1758e4de4b
Author: Paul Demeulenaere <pauld@unity3d.com>
Date:   Mon Dec 23 10:34:28 2019 +0100

    Merge branch 'vfx/staging' into vfx/feature/mesh-sampling

commit 442c3cd4e0264a0ef2942ebbe4c1476da370d848
Author: Paul Demeulenaere <pauld@unity3d.com>
Date:   Mon Dec 9 08:59:41 2019 +0100

    Fix experimental & add mesh vertex count output as suggested by @vlad

commit 7e306fe26a8839a9d72f4625a61e91814b4105ce
Author: Paul Demeulenaere <pauld@unity3d.com>
Date:   Thu Nov 28 13:13:04 2019 +0100

    Update upm-ci-vfxmain.yml

commit 31604a66ff6f0b2031681bf26ac7f59d047d493d
Author: Paul Demeulenaere <pauld@unity3d.com>
Date:   Thu Nov 28 13:12:46 2019 +0100

    Revert upm-ci-vfxmain.yml

commit 9f8cdafdbc98f084453894897b54858a67e75483
Author: Paul Demeulenaere <pauld@unity3d.com>
Date:   Thu Nov 28 13:11:49 2019 +0100

    Revert upm-ci-vfx_lwrp.yml

commit e95e7659b7f0a5a6cf1fc15ee8aef9a207038573
Merge: 858f1a94ed 5b678082c5
Author: Paul Demeulenaere <pauld@unity3d.com>
Date:   Tue Nov 26 16:55:52 2019 +0100

    Merge branch 'vfx/staging' into vfx/feature/mesh-sampling

commit 858f1a94edfc88756a43b41d4652624939a6ab57
Author: Paul Demeulenaere <pauld@unity3d.com>
Date:   Tue Nov 26 16:49:20 2019 +0100

    Restrict constant folding on mesh operation

commit 1b5216571e1a8b6d21787f10f33c4a819729c0ba
Author: Paul Demeulenaere <pauld@unity3d.com>
Date:   Tue Nov 26 16:04:40 2019 +0100

    *Update ChangeLog.md

commit 651ce34b5baa57c43b2aff6b10f602f4643ec13a
Author: Paul Demeulenaere <pauld@unity3d.com>
Date:   Tue Nov 26 14:21:01 2019 +0100

    Clean useless code

commit 8e2e438886de3db5b8ba6c2613102a38947461aa
Author: Paul Demeulenaere <pauld@unity3d.com>
Date:   Tue Nov 26 13:45:51 2019 +0100

    Use name expression to compute vertex index

commit 8349f56e96668f3656113850048e427859602583
Author: Paul Demeulenaere <pauld@unity3d.com>
Date:   Tue Nov 26 09:03:17 2019 +0100

    Rename "texture_" to "mesh_" when expression is actually a mesh

    Remove useless sampler for mesh

commit 51f1e01943e4d221a7323363c39656b861a94fe7
Author: Paul Demeulenaere <pauld@unity3d.com>
Date:   Tue Nov 26 08:39:31 2019 +0100

    Update Canvas to include test in graphicTest

commit fff4b79856a215bc1d13cb08752f88e40549ddbb
Merge: ca39c0d6ec efba8dad57
Author: Paul Demeulenaere <pauld@unity3d.com>
Date:   Tue Nov 26 07:49:14 2019 +0100

    Merge branch 'refs/heads/vfx/staging' into vfx/feature/mesh-sampling

    # Conflicts:
    #	TestProjects/VisualEffectGraph/ProjectSettings/EditorBuildSettings.asset
    #	TestProjects/VisualEffectGraph_LWRP/ProjectSettings/EditorBuildSettings.asset

commit ca39c0d6ece391081f786e10e96aa6007af6b18e
Author: Paul Demeulenaere <pauld@unity3d.com>
Date:   Tue Nov 19 11:22:36 2019 +0100

    Remove shape test

commit 2aedcdd8bcee3342fc2a43be759f7c31d77628d4
Author: Paul Demeulenaere <pauld@unity3d.com>
Date:   Mon Nov 18 15:02:58 2019 +0100

    Temporary : change yamato target to graphics/vfx/fix/mesh-sampling

commit aea552d59b018fbf7c217b37d8846e02bfefb349
Author: Paul Demeulenaere <pauld@unity3d.com>
Date:   Mon Nov 18 14:59:04 2019 +0100

    *Update player reference images

commit b0ab2685f7bdbd0b859a010422e8074bc95bfbc3
Author: Paul Demeulenaere <pauld@unity3d.com>
Date:   Mon Nov 18 14:36:49 2019 +0100

    Fix PositionMesh

commit 05aec35f9a430497583f5b952fa97ce6784c676d
Author: Paul Demeulenaere <pauld@unity3d.com>
Date:   Thu Nov 14 17:01:52 2019 +0100

    *Update graphicTest

commit 052cb87133878404390365f0403b6faa44821133
Author: Paul Demeulenaere <pauld@unity3d.com>
Date:   Thu Nov 14 15:30:46 2019 +0100

    Fix mesh color sampling

commit c2db4d2ebe41d1ba0648b439bb167e486fd318ff
Author: Paul Demeulenaere <pauld@unity3d.com>
Date:   Thu Nov 14 11:41:59 2019 +0100

    Use explicit VFXExpressionMesh.GetVertexCount which handle in unified way to mesh nullity

commit 2ecdcc54480aa17665db6b980a5ba797539931e9
Author: Paul Demeulenaere <pauld@unity3d.com>
Date:   Wed Nov 13 10:28:19 2019 +0100

    Add MeshVertexCount operator

commit c5b144214270c741bc61a6bc0994c0c5098ba39a
Author: Paul Demeulenaere <pauld@unity3d.com>
Date:   Wed Nov 13 10:08:14 2019 +0100

    Add a true embedded random in SampleMesh

commit d4e9dcf5a9abbc6ad79315cc1c60afe79f94af87
Author: Paul Demeulenaere <pauld@unity3d.com>
Date:   Tue Nov 12 18:35:35 2019 +0100

    Fix unexpected cast int to uint

commit 0fc7ed15c61435dbe917a56da4c939de35b57f2c
Author: Paul Demeulenaere <pauld@unity3d.com>
Date:   Fri Nov 8 14:39:06 2019 +0100

    Add WIP TODOPAUL

commit 6ff729e50e85204a597c0628be601a2b8064cc3e
Author: Paul Demeulenaere <pauld@unity3d.com>
Date:   Fri Nov 8 13:55:20 2019 +0100

    Use uint instead of int & remove RandInt

commit 22770d8cfef4135a054e0ed7194ee4a45b1497b4
Author: Paul Demeulenaere <pauld@unity3d.com>
Date:   Mon Nov 4 15:09:22 2019 +0100

    *Update Shape.vfx

commit 5d17343ddd478986d867e6d0f499cb5bd6c93d52
Author: Paul Demeulenaere <pauld@unity3d.com>
Date:   Mon Nov 4 15:07:11 2019 +0100

    Fix build

commit 3a2729fb19b09fda873eff06ebad83b38b84ceb6
Author: Paul Demeulenaere <pauld@unity3d.com>
Date:   Mon Nov 4 14:46:47 2019 +0100

    Report changes from https://github.cds.internal.unity3d.com/unity/vfx-graph/blob/bd366e5cf8dc25b725a4f064ad65577d26d1f51f/com.unity.visualeffectgraph/Shaders/VFXCommon.cginc

commit cc0a36b42965c6e04f9b088d363f68ec8b2d41ae
Merge: bd366e5cf8 d2bacd6482
Author: Paul Demeulenaere <pauld@unity3d.com>
Date:   Mon Nov 4 14:43:23 2019 +0100

    Merge branch 'vfx/staging' into vfx/feature/mesh-sampling

    # Conflicts:
    #	TestProjects/VisualEffectGraph/ProjectSettings/EditorBuildSettings.asset
    #	com.unity.visualeffectgraph/Editor/Compiler/VFXCodeGenerator.cs
    #	com.unity.visualeffectgraph/Editor/Compiler/VFXShaderWriter.cs
    #	com.unity.visualeffectgraph/Shaders/VFXCommon.cginc

commit bd366e5cf8dc25b725a4f064ad65577d26d1f51f
Author: Richard Kettlewell <richardk@unity3d.com>
Date:   Wed Dec 12 12:53:50 2018 +0000

    Fix mesh sampling stride and remove fmod when not needed

commit 706aa48a4a98b76f5f2a4d190b4df9250e0896dc
Author: Richard Kettlewell <richardk@unity3d.com>
Date:   Tue Dec 11 16:40:06 2018 +0000

    color space fix

commit 3df16fe0c60a235e3991249553ccf4167bd7d736
Author: Richard Kettlewell <richardk@unity3d.com>
Date:   Tue Dec 11 16:03:25 2018 +0000

    Shape gfx test

commit ceef2e0410503647eb1f997f217e9442fb50b823
Author: Richard Kettlewell <richardk@unity3d.com>
Date:   Tue Dec 11 12:32:36 2018 +0000

    Remove baking prototype and fix channel offsets

commit 39d518807d279fd328cc4408d5f85667f60e719b
Author: Richard Kettlewell <richardk@unity3d.com>
Date:   Mon Dec 10 15:26:55 2018 +0000

    Mesh sampling

* Commit data files as lfs

* Resolve issue https://github.cds.internal.unity3d.com/unity/vfx-graphics/pull/1#discussion_r47935

Rename IsTypeCanBeConstantFolded into IsTypeConstantFoldable

* Resolve issue https://github.cds.internal.unity3d.com/unity/vfx-graphics/pull/1#discussion_r47933

Use simpler & explicit definition of propagated flags

* Fix several issue/comment

Fix issue https://github.cds.internal.unity3d.com/unity/vfx-graphics/pull/1#discussion_r50761
Fix issue https://github.cds.internal.unity3d.com/unity/vfx-graphics/pull/1#discussion_r50762
Fix issue https://github.cds.internal.unity3d.com/unity/vfx-graphics/pull/1#discussion_r50764
Fix issue https://github.cds.internal.unity3d.com/unity/vfx-graphics/pull/1#discussion_r50765

* Switch 007_SimpleMaterial from Lit to Unlit to avoid any change from shadergraph

* Fix tooltip issue from @LewisJordan

Fix issue from https://github.cds.internal.unity3d.com/unity/vfx-graphics/pull/1#discussion_r51380
Fix issue from https://github.cds.internal.unity3d.com/unity/vfx-graphics/pull/1#discussion_r51381
Fix issue from https://github.cds.internal.unity3d.com/unity/vfx-graphics/pull/1#discussion_r51382
Fix issue from https://github.cds.internal.unity3d.com/unity/vfx-graphics/pull/1#discussion_r51383
Fix issue from https://github.cds.internal.unity3d.com/unity/vfx-graphics/pull/1#discussion_r51384
Fix issue from https://github.cds.internal.unity3d.com/unity/vfx-graphics/pull/1#discussion_r51385
Fix issue from https://github.cds.internal.unity3d.com/unity/vfx-graphics/pull/1#discussion_r51386
Side note : use mode instead of "addressingMode" in PositionMesh as well.

* Fix issue : https://github.cds.internal.unity3d.com/unity/vfx-graphics/pull/1#discussion_r51553

* As suggested by @julienf default VFXOperatorUtility.SequentialAddressingMode to Clamp for performance in https://github.cds.internal.unity3d.com/unity/vfx-graphics/pull/1#issuecomment-20777

* Add composition for Position (Mesh) as suggested by @thomasi

Co-authored-by: Tristan Genevet <tristan@unity3d.com>

Loading branch information

2 people authored and GitHub Enterprise committed May 14, 2020

commit c0f55293072ef2af5755b9deadd0ca0c9b146ac1

TestProjects/VisualEffectGraph/Assets/AllTests/Editor/Tests/VFXExpressionTests.cs

-Original file line number
+Diff line change
@@ Expand Up / @@ -236,6 +236,53 @@ public void ProcessExpressionMatrixToVector4s() @@
                 Assert.AreEqual(new Vector4(1, 0, 0, 0), reduced.Get<Vector4>());
             }
+            [Test]
+            public void OuputExpression_From_Slot_Mesh_Should_Be_Invalid_Constant()
+            {
+                var source = ScriptableObject.CreateInstance<VFXInlineOperator>();
+                source.SetSettingValue("m_Type", (SerializableType)typeof(Mesh));
+                var expressionOutput = source.outputSlots[0].GetExpression();
+                var context = new VFXExpression.Context(VFXExpressionContextOption.ConstantFolding);
+                var reduced = context.Compile(expressionOutput);
+                Assert.IsTrue(expressionOutput.Is(VFXExpression.Flags.InvalidConstant));
+            }
+            [Test]
+            public void OuputExpression_From_Slot_Mesh_Should_Be_Invalid_Constant_Propagation()
+            {
+                var source = ScriptableObject.CreateInstance<VFXInlineOperator>();
+                source.SetSettingValue("m_Type", (SerializableType)typeof(Mesh));
+                var meshCount = ScriptableObject.CreateInstance<Operator.MeshVertexCount>();
+                meshCount.inputSlots[0].Link(source.outputSlots[0]);
+                var add = ScriptableObject.CreateInstance<Operator.Add>();
+                add.SetOperandType(0, typeof(uint));
+                add.SetOperandType(1, typeof(uint));
+                add.inputSlots[1].value = 8u;
+                var expressionOutputBefore = add.outputSlots[0].GetExpression();
+                var contextBefore = new VFXExpression.Context(VFXExpressionContextOption.ConstantFolding); //Used by runtime
+                var reducedBeforeLink = contextBefore.Compile(expressionOutputBefore);
+                bool success = add.inputSlots[0].Link(meshCount.outputSlots[0]);
+                Assert.IsTrue(success);
+                var expressionOutputAfter = add.outputSlots[0].GetExpression();
+                var contextAfter = new VFXExpression.Context(VFXExpressionContextOption.ConstantFolding); //Used by runtime
+                var reducedAfterLink = contextAfter.Compile(expressionOutputAfter);
+                var contextAfterCPUEvaluation = new VFXExpression.Context(VFXExpressionContextOption.CPUEvaluation | VFXExpressionContextOption.ConstantFolding); //Used by GUI
+                var reducedAfterLinkCPUEvaluation = contextAfterCPUEvaluation.Compile(expressionOutputAfter);
+                Assert.IsAssignableFrom(typeof(VFXValue<uint>), reducedBeforeLink);
+                Assert.IsAssignableFrom(typeof(VFXExpressionAdd), reducedAfterLink);
+                Assert.IsAssignableFrom(typeof(VFXValue<uint>), reducedAfterLinkCPUEvaluation);
+            }
         }
     }
     #endif

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[VFX] 10.2 fixes #2290

Diff view

Diff view

There are no files selected for viewing