Skip to content
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

[VFX] Staging to master #2804

Merged
merged 266 commits into from
Dec 15, 2020
Merged

[VFX] Staging to master #2804

merged 266 commits into from
Dec 15, 2020

Conversation

julienf-unity
Copy link
Collaborator

@julienf-unity julienf-unity commented Dec 1, 2020

Purpose of this PR

Added

  • Added new setting to output nodes to exclude from TAA
  • New Sample Point cache & Sample Attribute map operators

Changed

  • Changed the "Edit" button so it becomes "New" when no asset is set on a Visual Effect component, in order to save a new visual effect graph asset.

Fixed

  • Forbid incorrect link between incompatible context Case 1269756
  • Serialization issue with VFXSpawnerCallbacks
  • Unexpected exception while trying to display capacity warning Case 1294180
  • Exclude Operator, Context, Block and Subgraph from Preset Case 1232309
  • Fix Case 1212002
  • Fix LPPV not working in deferred
  • Spaceship specific warnings
  • Fix incorrect compilation condition for linux build

Testing status

Green locally (except known failures from trunk)


Comments to reviewers

Notes for the reviewers you have assigned.

PaulDemeulenaere and others added 30 commits April 30, 2020 08:31
This reverts commit f26a487.
* Fix for Initial Event field height, that were clipping the bottom of legged letters

* Update CHANGELOG.md
* Fix color field height

* changelog
* 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>
* Updated experimental disclaimers

* Removed link and added description instead.
* Support WRITE_MSAA_DEPTH Unlit template

* Fix MSAA for lit output

* *Update changelog

* Fix SSAO (among other passes) integrating WRITE_MSAA_DEPTH

TODO : Fix Sphere output as well

* Fix typo in ParticlePoint

* Factorize common fragment Lit & unlit for depth alike passes.

* Fix particle hexadreon wrong depth with alpha clip

* Revert "Fix particle hexadreon wrong depth with alpha clip"

This reverts commit b16bd570440087984c2c8c48279bebb088f748e8.
* Allow an object slot to have null as its value

* changelog
* Prevent capacity change in the debug ui when editing a read only asset such as templates in package mode

* changelog
# Conflicts:
#	com.unity.render-pipelines.high-definition/CHANGELOG.md
* Prevent capacity from being 0

* Fix strip capacity as well
* Fix for dragged parameters order when there are categories

* changelog

Co-authored-by: Julien Fryer <julienf@unity3d.com>
Co-authored-by: Julien Fryer <julienf@unity3d.com>
* Prevent from creating a context in VisualEffectSugraphOperator by draggingfrom an output slot.

* changelog
* Don't show block windows when context cant have blocks (output mesh )

* changelog
* Fix for binder when null asset & fix for binder while resetting

* Call ClearPropertyBinders while resetting
* Squashed commit of the following:

commit d77638ba4188bfb03c81130b82cacb2a719f03be
Merge: 49eaeadff7 a9338688a6
Author: Paul Demeulenaere <pauld@unity3d.com>
Date:   Thu Apr 2 09:46:59 2020 +0200

    Merge branch 'vfx/staging' into vfx/feature/add-time-update-modes

commit 49eaeadff7b22d48f26d3b1aa528a9c650ec1cc5
Author: Paul Demeulenaere <pauld@unity3d.com>
Date:   Thu Mar 19 14:53:09 2020 +0100

    Update UX for new time access (#260)

    https://github.cds.internal.unity3d.com/unity/vfx-graph/pull/256#issuecomment-18280
    See slack discussion : https://unity.slack.com/archives/G1BTWN88Z/p1584622775185300?thread_ts=1584523980.160500&cid=G1BTWN88Z

commit 78d5d9938d9896d517efa89662764afd44ef12fc
Author: Paul Demeulenaere <pauld@unity3d.com>
Date:   Fri Mar 13 16:03:26 2020 +0100

    Fix issue https://github.cds.internal.unity3d.com/unity/vfx-graph/pull/256/files#r43060

commit bc7e715b0e41b55126fdf171b7459b680e3e3824
Merge: 9a82a52bfe ec959d5de3
Author: Paul Demeulenaere <pauld@unity3d.com>
Date:   Fri Mar 13 14:52:03 2020 +0100

    Merge branch 'vfx/staging' into vfx/feature/add-time-update-modes

commit 9a82a52bfe2384ef5f03344f8c68516f9fd57d88
Merge: f56986d415 66df0debfc
Author: Paul Demeulenaere <pauld@unity3d.com>
Date:   Fri Mar 13 09:17:53 2020 +0100

    Merge branch 'vfx/staging' into vfx/feature/add-time-update-modes

commit f56986d4157f140ca84b039d97c8b7064a18214e
Merge: 047820690f 5d2dfe278f
Author: Paul Demeulenaere <pauld@unity3d.com>
Date:   Tue Feb 25 13:25:07 2020 +0100

    Merge branch 'vfx/staging' into vfx/feature/add-time-update-modes

commit 047820690fa496bd43d3a60df16dd0932502c7cb
Merge: d6d17dfbbc e6fd39c7a2
Author: Paul Demeulenaere <pauld@unity3d.com>
Date:   Fri Jan 24 14:56:39 2020 +0100

    Merge branch 'vfx/staging' into vfx/feature/add-time-update-modes

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

commit d6d17dfbbc65aaa32712b5b16dfa1bf871b5c979
Author: Paul Demeulenaere <pauld@unity3d.com>
Date:   Tue Jan 14 16:59:15 2020 +0100

    Squashed commit of the following:

    commit ec0f1a18fb986005c13e1147938cb5de7fa0f7f8
    Author: Paul Demeulenaere <pauld@unity3d.com>
    Date:   Tue Jan 14 13:37:05 2020 +0100

        Use implicit block for old position backup

    commit e786cf3ade7d7515da4569dde9455881af02f282
    Author: Paul Demeulenaere <pauld@unity3d.com>
    Date:   Sun Jan 12 15:05:03 2020 +0100

        WIP : Add option to skip zero delta per update context

commit e864fae742120fbfebabb26b605ddedfd184b02b
Merge: 4eecc0b90b fb12af4c28
Author: Paul Demeulenaere <pauld@unity3d.com>
Date:   Tue Jan 14 16:47:57 2020 +0100

    Merge branch 'vfx/staging' into vfx/feature/add-time-update-modes

commit 4eecc0b90bbcf60eb7254c55f23a040ddd2a72a5
Author: Paul Demeulenaere <pauld@unity3d.com>
Date:   Mon Jan 13 16:08:07 2020 +0100

    Rename ProcessEveryFrame in ExactFixedTimeStep

commit 9d3e36a36ad4e79b3f6e6315658e3735196b81ba
Author: Paul Demeulenaere <pauld@unity3d.com>
Date:   Fri Jan 10 16:21:50 2020 +0100

    Fix ManagerMaxDeltaTime (was GameDeltaTime)

commit eaebe2649e93a5083fd62c91ac92185794b908e5
Merge: 98e7dcfcdc 276c02f29a
Author: Paul Demeulenaere <pauld@unity3d.com>
Date:   Fri Jan 10 13:42:08 2020 +0100

    Merge remote-tracking branch 'vfxgraph/vfx/staging' into vfx/feature/add-time-update-modes

commit 98e7dcfcdceb710c252e4d1a257815a724539e68
Merge: 248004d55a 0737eb535c
Author: Paul Demeulenaere <pauld@unity3d.com>
Date:   Fri Jan 10 13:26:54 2020 +0100

    Merge branch 'vfx/staging' into vfx/feature/add-time-update-modes

commit 248004d55a7b96c6532cd3c197e175b751d6f3fe
Merge: 2bbadae355 8ab634f533
Author: Paul Demeulenaere <pauld@unity3d.com>
Date:   Thu Jan 9 13:12:50 2020 +0100

    Merge branch 'vfx/staging' into vfx/feature/add-time-update-modes

commit 2bbadae355bb3c4a308b8d4e020e96127fa94818
Author: Paul Demeulenaere <pauld@unity3d.com>
Date:   Mon Dec 23 10:07:46 2019 +0100

    Add tooltip to VFXTime.cs

commit 9dc7ea790327b44ffde94bbf783d588e74c50174
Merge: bf48ba84eb 1758e4de4b
Author: Paul Demeulenaere <pauld@unity3d.com>
Date:   Thu Dec 19 17:29:13 2019 +0100

    Merge branch 'vfx/staging' into vfx/feature/add-time-update-modes

commit bf48ba84ebfd1472d041966ba4be627e3a1ef427
Author: Paul Demeulenaere <pauld@unity3d.com>
Date:   Thu Dec 19 17:26:30 2019 +0100

    *Update changelog.md

commit b5d76d5d5d65584fde771213d9a01adc6dd9b856
Author: Paul Demeulenaere <pauld@unity3d.com>
Date:   Thu Dec 19 16:10:19 2019 +0100

    Add operator to enable time accesses

commit 1a2fe7b8dc5072dd49d985f045f276385e08287f
Author: Paul Demeulenaere <pauld@unity3d.com>
Date:   Thu Dec 19 11:25:52 2019 +0100

    Add built-in expression (but not listed)

commit b0d0e64ee04036adf48f4481bfd22eace649bac3
Author: Paul Demeulenaere <pauld@unity3d.com>
Date:   Thu Dec 19 10:37:50 2019 +0100

    Add some header

commit 490a441046a227bb1cc1b98418d0559da17d3771
Author: Paul Demeulenaere <pauld@unity3d.com>
Date:   Thu Dec 19 10:36:57 2019 +0100

    Add tooltip & text content

commit 621c5b2b78545800b2e94921b9314ef860992059
Author: Paul Demeulenaere <pauld@unity3d.com>
Date:   Thu Dec 19 10:09:32 2019 +0100

    *Add custom inspector to edit update flags efficiently

* Fix build (VFXPropertyAttribute.Create isn't needed anymore)
* Squashed commit of the following:

commit 9d42330b20431b0ff5c4a5e5a90bf293635ab4a2
Author: Paul Demeulenaere <pauld@unity3d.com>
Date:   Fri Apr 3 11:14:14 2020 +0200

    *Update image reference (having issue with standalone, not sure of the result)

commit 275c22de35f08ada783c96c625b12475f0c42337
Merge: 85254f1ec4 a9338688a6
Author: Paul Demeulenaere <pauld@unity3d.com>
Date:   Fri Apr 3 09:59:48 2020 +0200

    Merge branch 'vfx/staging' into vfx/fix/read-attribute-in-spawner

    # Conflicts:
    #	TestProjects/VisualEffectGraph/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/20_SpawnerChainingAndLoop.png
    #	TestProjects/VisualEffectGraph/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/20_SpawnerChainingAndLoop.png
    #	com.unity.visualeffectgraph/CHANGELOG.md

commit 85254f1ec4ffb2c4d0014a2baa52f49f0b97d0f8
Author: Paul Demeulenaere <pauld@unity3d.com>
Date:   Tue Mar 17 16:21:39 2020 +0100

    *Update image reference due to fix with grapicTest update

commit e361ecfed65e61f07db4af32f4dd22a9d3cb9caf
Merge: d8db341bfb 47b17e444b
Author: Paul Demeulenaere <pauld@unity3d.com>
Date:   Tue Mar 17 11:51:43 2020 +0100

    Merge branch 'vfx/staging' into vfx/fix/read-attribute-in-spawner

    # Conflicts:
    #	TestProjects/VisualEffectGraph/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/20_SpawnerChainingAndLoop.png
    #	TestProjects/VisualEffectGraph/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/20_SpawnerChainingAndLoop.png
    #	TestProjects/VisualEffectGraph/ProjectSettings/EditorBuildSettings.asset

commit d8db341bfbd9257e1a5285d200e3eabe24857b01
Author: Paul Demeulenaere <pauld@unity3d.com>
Date:   Thu Mar 5 17:57:38 2020 +0100

    *Apply Formatting

commit f80441dd6b30ef726d46ae2fe32bcf05d208b760
Merge: b3d858ffe1 01f176355a
Author: Paul Demeulenaere <pauld@unity3d.com>
Date:   Thu Mar 5 17:32:49 2020 +0100

    Merge branch 'vfx/staging' into vfx/fix/read-attribute-in-spawner

commit b3d858ffe13b19dc42e1874d8393cf9829a5e2c7
Merge: 0bce44dc9a 5d2dfe278f
Author: Paul Demeulenaere <pauld@unity3d.com>
Date:   Tue Feb 25 13:18:58 2020 +0100

    Merge branch 'vfx/staging' into vfx/fix/read-attribute-in-spawner

    # Conflicts:
    #	.yamato/upm-ci-vfx_lwrp.yml
    #	.yamato/upm-ci-vfxmain.yml
    #	com.unity.visualeffectgraph/CHANGELOG.md

commit 0bce44dc9a694bf36b849efb894e999fa9dc959e
Author: Paul Demeulenaere <pauld@unity3d.com>
Date:   Fri Jan 24 14:20:03 2020 +0100

    *Fix build

commit 03b0b05d4f86168f97d9e5e34757b79cae6c39df
Merge: 2130ea0ef2 e6fd39c7a2
Author: Paul Demeulenaere <pauld@unity3d.com>
Date:   Fri Jan 24 09:47:09 2020 +0100

    Merge branch 'vfx/staging' into vfx/fix/read-attribute-in-spawner

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

commit 2130ea0ef2186ecdc5692878940d5d6635dca31b
Author: Paul Demeulenaere <pauld@unity3d.com>
Date:   Mon Jan 13 14:09:13 2020 +0100

    *Update tooltips (thanks @vlad)

commit f8cdb95f5d2075848e530d997551b69de43f39e0
Author: Paul Demeulenaere <pauld@unity3d.com>
Date:   Mon Jan 13 14:01:44 2020 +0100

    Rename SpawnerState in SpawnState

commit 3e2b4fd67c4776907e96a8cfa1b9985ee3fab2fd
Author: Paul Demeulenaere <pauld@unity3d.com>
Date:   Mon Jan 13 13:54:24 2020 +0100

    Improve ReadAttribute test to cover NewLoop state

commit 2c515bfde823bfbce87df8a1444e19e5c2327e32
Merge: a9efee24ff bff1b74b59
Author: Paul Demeulenaere <pauld@unity3d.com>
Date:   Mon Dec 23 16:32:45 2019 +0100

    Merge branch 'vfx/staging' into vfx/fix/read-attribute-in-spawner

commit a9efee24ff84131c53dc2ba93f1985b02217e3d7
Author: Paul Demeulenaere <pauld@unity3d.com>
Date:   Mon Dec 16 14:54:25 2019 +0100

    *Update comment

commit 6b17879881555cd72b3af4463fd907423f92ad7f
Author: Paul Demeulenaere <pauld@unity3d.com>
Date:   Mon Dec 16 14:53:11 2019 +0100

    Throws an exception while detecting unexpected expression flag

commit cbad9212075ec6776cf9d892185dd6ee64f8fab2
Author: Paul Demeulenaere <pauld@unity3d.com>
Date:   Mon Dec 16 09:43:33 2019 +0100

    Reorder spawner state operator

commit e2357ac0dee8d71fe9d4a1ad877aa5fe19a5222a
Author: Paul Demeulenaere <pauld@unity3d.com>
Date:   Mon Dec 16 09:35:30 2019 +0100

    Fix issue "Cannot plug in attribute-derived nodes into a spawner block."

commit b06d7f0708e5178cae51e9e8b96f547fc2f4c6b2
Author: Paul Demeulenaere <pauld@unity3d.com>
Date:   Mon Dec 9 15:58:30 2019 +0100

    *Update changelog

commit 61bd2e5871f23002dd1add024858efdef5e09372
Author: Paul Demeulenaere <pauld@unity3d.com>
Date:   Mon Dec 9 15:46:52 2019 +0100

    Update _CCCC test & Rename Spawner State library name

commit 4942912123d795023aacb0363c8e462a2da29943
Author: Paul Demeulenaere <pauld@unity3d.com>
Date:   Fri Dec 6 16:58:17 2019 +0100

    Fix test & clean useless code in VFXExpression.Initialize

commit e6d6c593eb27c612a225340615dabe7692f76a00
Author: Paul Demeulenaere <pauld@unity3d.com>
Date:   Fri Dec 6 15:22:31 2019 +0100

    Switch to graphics/vfx/fix/read-attribute-in-spawner for testing purpose

commit f00f740b775f67e9378072744513f3ff920f470d
Author: Paul Demeulenaere <pauld@unity3d.com>
Date:   Fri Dec 6 15:16:39 2019 +0100

    Update 20_SpawnerChainingAndLoop (this is the only test affected by compilation order change)

commit b7d8e238dd7e05bf99114a980c8584da7985dcf8
Author: Paul Demeulenaere <pauld@unity3d.com>
Date:   Fri Dec 6 14:45:56 2019 +0100

    Clean test data & add reference images

commit 6ddb3389f8e62da44ef50de621884b0526e1b8aa
Author: Paul Demeulenaere <pauld@unity3d.com>
Date:   Fri Dec 6 14:17:51 2019 +0100

    Move graphicTest to common files

commit fa21846e7787fec9068c5a18a33dc568df3f7cc9
Author: Paul Demeulenaere <pauld@unity3d.com>
Date:   Fri Dec 6 11:53:18 2019 +0100

    Separate cleanly per event attribute expressions

commit 80e5259674a011e864e65f13c77ce06f92f33b7f
Author: Paul Demeulenaere <pauld@unity3d.com>
Date:   Fri Dec 6 08:38:41 2019 +0100

    New test for chaining & read attributes

commit 97473daecd146b85eb3c232fffe8141bd0a7f3a1
Author: Paul Demeulenaere <pauld@unity3d.com>
Date:   Thu Dec 5 18:47:20 2019 +0100

    Add read attribute for loop settings (context evaluation)

commit a41a4a6095e9d5791fdbf3e26baf1d871cfc0fab
Author: Paul Demeulenaere <pauld@unity3d.com>
Date:   Thu Dec 5 15:30:56 2019 +0100

    Clean expression patching

commit 9af80d22f70443ef0eb1a8d29aef1d0b3bc64ca0
Author: Paul Demeulenaere <pauld@unity3d.com>
Date:   Thu Dec 5 11:45:06 2019 +0100

    Clarify compatibility code for spawner order & random implication

commit 0dcf774f623fb93eb7bc19b06407b88669472443
Author: Paul Demeulenaere <pauld@unity3d.com>
Date:   Wed Dec 4 18:42:30 2019 +0100

    Add tricky case in test vfx & fix compatibility code

    TODO : Optimize it & reserve cleaner solution when change graphicTest result is expected

commit 92b5328ab0ea225d0dd86d1443af0e64bae1963e
Author: Paul Demeulenaere <pauld@unity3d.com>
Date:   Wed Dec 4 16:49:42 2019 +0100

    *Up local test

commit 0984d8a89b5cc8e0daa79765b00392fa4dfff5d4
Author: Paul Demeulenaere <pauld@unity3d.com>
Date:   Wed Dec 4 15:22:03 2019 +0100

    Detect & Compute partial evaluation

commit 2d9e7a250a0437c13e5f180e4feb4cc97d47aa5b
Author: Paul Demeulenaere <pauld@unity3d.com>
Date:   Tue Dec 3 15:16:29 2019 +0100

    Add spawner State Operator & SpawnCount (even if it's actually an attribute)

commit 0b1c1982a8ed4bb61182aa070561b7f6036bc07d
Author: Paul Demeulenaere <pauld@unity3d.com>
Date:   Tue Dec 3 15:04:04 2019 +0100

    Add spawner state accessor

commit adb1d6d66172f2d187b577facaf7b2aea4677d13
Author: Paul Demeulenaere <pauld@unity3d.com>
Date:   Tue Dec 3 11:24:20 2019 +0100

    Add VFXDataSpawner & Use this helper to retrieve read attribute per context while compiling

commit d43ad0e1395d0e51f3583ce9627a72006356e117
Author: Paul Demeulenaere <pauld@unity3d.com>
Date:   Mon Dec 2 16:19:05 2019 +0100

    Store m_GlobalEventAttributes in VFXExpressionGraph : this data is used to patch VFXReadAttribute

commit 8a25b5fbed33569529d30379fce2acd4da7de88d
Author: Paul Demeulenaere <pauld@unity3d.com>
Date:   Fri Nov 29 16:14:32 2019 +0100

    Backup test asset (temporarily)

commit dcb3efaf885dbbdec317f5a42ace9ace336fded9
Author: Paul Demeulenaere <pauld@unity3d.com>
Date:   Thu Nov 28 16:37:48 2019 +0100

    WIP : experimenting new concept of Read Attribute expression

* Merge with vfx/staging
* Fix strips outputs, spawnIndex and default metallic value

* Increase threshold in particle strip unlit test
* *WIP* add test

* Actually add a more legit "prefab" test

* Prepare fix later fix of 1206890 : can't change the C++ without updating this test

* Fix editor test (todo : graft this change to master to anticipate the C++ change)
# Conflicts:
#	TestProjects/VisualEffectGraph/Assets/AllTests/VFXTests/GraphicsTests/Shadergraph/SampleScene/ShadergraphSampleScene/LightingData.asset
julienf-unity and others added 20 commits December 1, 2020 15:13
* Update Pass.template

* Update CHANGELOG.md
* Enable LPPV in HDRP test project

* Fix LPPV for gbuffer pass

* Add graphics test

* Update changelog
* Avoid implicit trucation in template + safe normalize setting

* Update CHANGELOG.md

* Added variants

* Delete conditioning on GPU evaluation + conservative safe normalize

Co-authored-by: Julien Fryer <julienf@unity3d.com>
# Conflicts:
#	TestProjects/VisualEffectGraph_HDRP/Assets/ReferenceImages/Linear/LinuxEditor/Vulkan/None/09_AttributeMaps.png
Instability detected.
# Conflicts:
#	TestProjects/VisualEffectGraph_HDRP/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D12/None/25_PerParticleLOD.png
#	TestProjects/VisualEffectGraph_HDRP/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D12/None/27_SampleSDF.png
#	TestProjects/VisualEffectGraph_HDRP/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D12/None/30_PositionOnSDF.png
#	TestProjects/VisualEffectGraph_HDRP/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D12/None/ShadergraphSampleScene.png
#	TestProjects/VisualEffectGraph_HDRP/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D12/None/ShadergraphShadowLit.png
Copy link
Contributor

@PaulDemeulenaere PaulDemeulenaere left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

All 🟢 in Yamato (at least for VFX)

@julienf-unity julienf-unity merged commit 90a9a43 into master Dec 15, 2020
@julienf-unity julienf-unity deleted the vfx/staging branch December 15, 2020 15:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants