Skip to content

Commit 080c2bf

Browse files
PaulDemeulenaerePaulDemeulenaere
committed
Squashed commit of the following:
commit 481f1e5499d1e7d74d6c85e05934cef128078a95 Merge: 3be3f278448 2346c7ef489 Author: Paul Demeulenaere <pauld@unity3d.com> Date: Wed Sep 15 13:48:51 2021 +0200 Merge branch 'master' into HDRP/sg-vfx-integration-improved-to-urp commit 3be3f27844801bcb76a7c2200ee170e9ede61b0a Author: Paul Demeulenaere <pauld@unity3d.com> Date: Wed Sep 15 13:47:30 2021 +0200 Move "VFX: New shadergraph support directly on Universal target" to 13.x.x commit dcda9b765cae5945e42b6f0343569320f0febbf4 Author: Paul Demeulenaere <pauld@unity3d.com> Date: Fri Sep 10 21:31:00 2021 +0200 *Update URP test to integrate sample texture Related to this PR: https://github.com/Unity-Technologies/Graphics/pull/5416 Merged at d6c964a7ec5e537150ce9de42ac72b9dcee2b652 commit 5d3d140dc68bdd3ba99419dab22af80682692213 Author: Paul Demeulenaere <pauld@unity3d.com> Date: Fri Sep 10 12:18:43 2021 +0200 Reapply changes from https://github.com/Unity-Technologies/Graphics/pull/5416 TODO: Update coverage in URP as well commit d82114912fee35799378ccd53f6920dc0d491c57 Merge: 54b2a5b6d79 84967897e7f Author: Paul Demeulenaere <pauld@unity3d.com> Date: Fri Sep 10 12:04:23 2021 +0200 Merge branch 'master' into HDRP/sg-vfx-integration-improved-to-urp # Conflicts: # com.unity.render-pipelines.high-definition/Editor/VFXGraph/VFXHDRPSubTarget.cs commit 54b2a5b6d797f3880e573eda16cc30752657637e Author: Paul Demeulenaere <pauld@unity3d.com> Date: Wed Sep 8 22:17:03 2021 +0200 Minor suggestion from @alex-vazquez Thanks Add an internal static in hdrp for vfx path - https://github.com/Unity-Technologies/Graphics/pull/5448#discussion_r703350206 Use string.IsNullOrEmpty - https://github.com/Unity-Technologies/Graphics/pull/5448#discussion_r703351260 - https://github.com/Unity-Technologies/Graphics/pull/5448#discussion_r703351572 - https://github.com/Unity-Technologies/Graphics/pull/5448#discussion_r703397046 - https://github.com/Unity-Technologies/Graphics/pull/5448#discussion_r703397142 Simplify materialFilter declaration - https://github.com/Unity-Technologies/Graphics/pull/5448#discussion_r703396211 commit e37845b9ce9b75335d370e1f794306bf2dd7442b Merge: bbed247a856 793949bb762 Author: Paul Demeulenaere <pauld@unity3d.com> Date: Wed Sep 8 21:35:03 2021 +0200 Merge branch 'master' into HDRP/sg-vfx-integration-improved-to-urp commit bbed247a85648b878aed3fc0754e62c40bb4ff5f Author: Paul Demeulenaere <pauld@unity3d.com> Date: Tue Sep 7 10:31:00 2021 +0200 Implement GetShaderName in URP - Display target output name in output context name - Fix naming of HDRP Lit Output & URP Lit Output commit 8b90b7bd8fea2c89ec05caa55561776fcd80f28e Merge: 5ccf5540ddd 285d55f3b63 Author: Paul Demeulenaere <pauld@unity3d.com> Date: Tue Sep 7 10:29:56 2021 +0200 Merge branch 'master' into HDRP/sg-vfx-integration-improved-to-urp commit 5ccf5540ddd57c92a7f2db175ec8f78f52ca248b Author: Paul Demeulenaere <pauld@unity3d.com> Date: Mon Sep 6 16:36:14 2021 +0200 *Update documentation cc @ValGrimm-U3D I used the documentation sentence from @ JordanL8 https://github.com/Unity-Technologies/Graphics/blob/5e335c0df9d04dabcbe29eb22352f7c5153496f0/com.unity.render-pipelines.high-definition/Documentation~/snippets/shader-properties/support-vfx-graph.md commit 0c43a5a0975748950d07fcc727d9487004a5d7a2 Merge: 7721e4bcb8e bf9517249cd Author: Paul Demeulenaere <pauld@unity3d.com> Date: Fri Sep 3 16:39:38 2021 +0200 Merge branch 'master' into HDRP/sg-vfx-integration-improved-to-urp commit 7721e4bcb8e573901a1d936a02edce403fbaa899 Author: Paul Demeulenaere <pauld@unity3d.com> Date: Fri Sep 3 14:08:16 2021 +0200 Minor: Fix tab vs. space commit 0a1e17396563b0d3269c8e5da555057a87927cd1 Author: Paul Demeulenaere <pauld@unity3d.com> Date: Fri Sep 3 14:00:56 2021 +0200 *Update changelog.md Revert unexpected change commit c3a2422103bb92a50d267b06f0ce461ca4c76ffc Author: Paul Demeulenaere <pauld@unity3d.com> Date: Fri Sep 3 10:38:58 2021 +0200 Add vulkan image reference It validates the correct support of null geometry (see c11b91fc195073919267aea73b5e12cb3b0e407f ) commit 1f1b261330fbfcb5d66c0bdd8874ed8d6d9b66de Merge: f4b9e0506d6 22574185f58 Author: Paul Demeulenaere <pauld@unity3d.com> Date: Fri Sep 3 10:01:36 2021 +0200 Merge branch 'master' into HDRP/sg-vfx-integration-improved-to-urp commit f4b9e0506d62f6565d3a3d8b6f948c6d78e1d147 Merge: 8e3ae420fc0 27fb36e1d7a Author: Paul Demeulenaere <pauld@unity3d.com> Date: Fri Sep 3 09:38:07 2021 +0200 Merge branch 'master' into HDRP/sg-vfx-integration-improved-to-urp commit 8e3ae420fc05d4fe100e7aa4385106a17c7281fd Author: Paul Demeulenaere <pauld@unity3d.com> Date: Fri Sep 3 09:02:27 2021 +0200 Revert unexpected change in BaseShaderGUI.cs @VitaSkruibyte The problem was occuring because I linked the wrong callback using the one from default lit on shader lit (and same for unlit) commit 434d7df7039fb15b6c16f41adafa6734d2907830 Author: Paul Demeulenaere <pauld@unity3d.com> Date: Fri Sep 3 08:27:45 2021 +0200 Suggestion from @gabrieldelacruz: better format The ShaderGraph material is overriding some settings: - castShadow = false - materialOffset = 0 Actually, thinking twice, I removed the "hidden" because it can be visible in inspector (but in a different place than usual) https://github.com/Unity-Technologies/Graphics/commit/6a69bca2aaea064ebf2a7269eda0586ce2ee9d9c#r55841908 commit da991a504d880d7a0ebcbcf554537ed4532fc447 Author: Paul Demeulenaere <pauld@unity3d.com> Date: Thu Sep 2 17:22:59 2021 +0200 Fix target selection When trying to use a shaderGraph with several target (builtin + hdrp + urp) N.B.: I didn't test the srp switch commit 6a69bca2aaea064ebf2a7269eda0586ce2ee9d9c Author: Paul Demeulenaere <pauld@unity3d.com> Date: Thu Sep 2 16:34:29 2021 +0200 Handle correctly MaterialOffset & CastShadow override When a shaderGraph override castShadow and/or material offset, hide this settings and display a warning. Alternatively, we could let the setting displayed but it would be inactive (but still enabled) commit 42b8498ff7503d638d22c19e898b5663938fe869 Author: Paul Demeulenaere <pauld@unity3d.com> Date: Thu Sep 2 12:09:07 2021 +0200 Minor: Safest way of filter UniversalTarget I'm anticipating sprite & decal target refactor commit 4ff719086a5bf2e0523d7c5266a5f55717f14bed Author: Paul Demeulenaere <pauld@unity3d.com> Date: Wed Sep 1 17:43:52 2021 +0200 Fix issue with allow material override set to false The blendMode is correctly retrieved thanks to a saved property in metadata TODO: See with @cdxntchou if it's a viable approach commit 61ebca16d50e3eec30164e9520d4a68ea02a584b Author: Paul Demeulenaere <pauld@unity3d.com> Date: Tue Aug 31 15:09:39 2021 +0200 Fix case https://fogbugz.unity3d.com/f/cases/1361601/ Cherry Pick from https://github.com/Unity-Technologies/Graphics/pull/5475/commits/f62f1b672d635a221abb96636ecd38ca52c49df6 commit 78460783b248d6423471ca1d4773b759eb8b056f Merge: d68357d35b6 2116818d3fb Author: Paul Demeulenaere <pauld@unity3d.com> Date: Mon Aug 30 14:09:52 2021 +0200 Merge branch 'master' into HDRP/sg-vfx-integration-improved-to-urp commit d68357d35b6230ddf93c393db23e351b353ab0c1 Author: Paul Demeulenaere <pauld@unity3d.com> Date: Fri Aug 27 17:03:08 2021 +0200 Move template from SRP to VFX implementation \o/ Move ConfigMesh & ConfigPlanarPrimitive to the vfx package + Factorize template path declaration in HDRP No more per SRP vfx template Factorize Config.template.hlsl \o/ Add VFX suffix in SG template store in VFX to prevent future naming conflicts commit 64c94409df84589ad4f80443d7ad0a8ccdc665ce Author: Paul Demeulenaere <pauld@unity3d.com> Date: Thu Aug 26 16:17:07 2021 +0200 *Add reference image for player & OSX editor commit b2088d901aaa7afc4e934708bd27943a3e7a9d52 Author: Paul Demeulenaere <pauld@unity3d.com> Date: Thu Aug 26 15:49:27 2021 +0200 Clean TODOPAUL about multiply blendState Tested locally : see https://unity.slack.com/archives/C01Q3N39UEB/p1629985747005600 commit 78eae3f098d4a6cdc3d9ccfa4ddebfe3e34224b2 Author: Paul Demeulenaere <pauld@unity3d.com> Date: Thu Aug 26 12:23:32 2021 +0200 Fix decal compilation when creating a new SG commit a9df082743f52cc2912fd4ccb1ecc88abab6252c Author: Paul Demeulenaere <pauld@unity3d.com> Date: Thu Aug 26 11:43:44 2021 +0200 Use kUberTemplatePath for all UniversalTarget pass used in UniversalSubTarget => Revert vfx graph changes in the shadergraph package (see https://unity.slack.com/archives/C01Q3N39UEB/p1629905352013200?thread_ts=1629904359.011800&cid=C01Q3N39UEB) It only affects these passes: - SceneSelectionPass - ScenePickingPass Next step to support Sprite SG generation in VFX: - Use ShaderPass.template (declared in URP) instead of PassMesh.template (declared in SG): It requires some change in template declaration. - Factorize the implementation of UniversalSprite.* with UniversalSubTarget instead of SubTarget<UniversalTarget> commit f9d801ea8092bf636615aaa92b8c89b28e58c8c7 Author: Paul Demeulenaere <pauld@unity3d.com> Date: Wed Aug 25 17:27:55 2021 +0200 Add TODOPAUL See this conversation commit c11b91fc195073919267aea73b5e12cb3b0e407f Author: Paul Demeulenaere <pauld@unity3d.com> Date: Wed Aug 25 16:08:03 2021 +0200 Fix null geometry support It was causing an issue on vulkan & d3d12 (and a warning in dx11) for planar primitive. Took inspiration from the initial (dead code) "ModifyVertexEntry" : https://github.com/Unity-Technologies/Graphics/blob/2773810e9fb5e893e2d207ff048586414cc387e4/com.unity.render-pipelines.high-definition/Editor/VFXGraph/VFXHDRPSubTarget.cs#L132 There isn't a common factorization like @sebastienlagarde did with https://github.com/Unity-Technologies/Graphics/commit/2773810e9fb5e893e2d207ff048586414cc387e4#diff-7174c990ca8df27503bf5973a949e19bc00cf239832d30b20b2a69167667272eL102 in URP, so, I'm restoring an optionnal "description" driven replacement of pragmas. See also this thread https://unity.slack.com/archives/C01Q3N39UEB/p1629821649001500 commit 2cadcdb6c9037c2e4e6793a7206e0dd29030e4dc Merge: 574e5d079e3 060f09b1e44 Author: Paul Demeulenaere <pauld@unity3d.com> Date: Tue Aug 24 18:04:19 2021 +0200 Merge branch 'master' into HDRP/sg-vfx-integration-improved-to-urp commit 574e5d079e324ed45e96eeaaa43162f1e73627a8 Author: Paul Demeulenaere <pauld@unity3d.com> Date: Tue Aug 24 16:56:28 2021 +0200 Add test target compatibility (same behavior than HDRP) commit 59d82e2c471db77d2fc37dc9c9f51790ee27b893 Author: Paul Demeulenaere <pauld@unity3d.com> Date: Tue Aug 24 16:43:06 2021 +0200 Remove temp test data commit c860d4aa22b1a7a7ff57934f12a83e06f411e381 Author: Paul Demeulenaere <pauld@unity3d.com> Date: Tue Aug 24 16:39:44 2021 +0200 Remove old workaround Adds also a comment about empty behavior commit da0fd67877dd22da163d7fa3c6faf00bf10162f0 Author: Paul Demeulenaere <pauld@unity3d.com> Date: Tue Aug 24 16:24:49 2021 +0200 Correct URPBinder implementation commit 3608cdbdae6710596bbf8dd109c81fdde7275bb8 Author: Paul Demeulenaere <pauld@unity3d.com> Date: Tue Aug 24 16:01:26 2021 +0200 Move IsGraphDataValid to common srp binder implementation + Some renaming commit c9475ea1111f0ad842d78135736f037ad05a601f Author: Paul Demeulenaere <pauld@unity3d.com> Date: Tue Aug 24 15:33:25 2021 +0200 Clean TODOPAUL Condition for _LightDirection is actually pretty clear commit 531fff801e890c79740ab6f1907fb60102d9acab Author: Paul Demeulenaere <pauld@unity3d.com> Date: Tue Aug 24 15:30:48 2021 +0200 Workaround fix when a property is named "_Color" commit 0a053b405b686217cb01e7096df13d74af768b7d Author: Paul Demeulenaere <pauld@unity3d.com> Date: Tue Aug 24 15:18:09 2021 +0200 Move ApplyCameraTranslationToMatrix to VFXCommon.hlsl commit 548780885c3c1c3d19df06eeef11b4a8dcfeba53 Author: Paul Demeulenaere <pauld@unity3d.com> Date: Tue Aug 24 14:51:19 2021 +0200 *Add note (doesn't work on vulkan/dx12 -_-') commit b74fd0ff2a59f19acdb68ef78de80ff844118088 Author: Paul Demeulenaere <pauld@unity3d.com> Date: Tue Aug 24 14:15:41 2021 +0200 Minor : Remove VaryingsMeshType & use directly Varyings It's more straighforward in URP commit 7b77afaf49abdc400fa92a5cccd3f671e25351e5 Author: Paul Demeulenaere <pauld@unity3d.com> Date: Tue Aug 24 12:47:54 2021 +0200 Minor : add comment commit 02cb1eeacc9161ce2702ebbcd072169c041a5bb0 Author: Paul Demeulenaere <pauld@unity3d.com> Date: Tue Aug 24 12:47:33 2021 +0200 Removing completly the fragsInput declaration commit eade2a328addec964617458c8888e770552f501f Author: Paul Demeulenaere <pauld@unity3d.com> Date: Tue Aug 24 12:23:26 2021 +0200 Factorize VisualEffectMatrices moving it to VFX package commit 75c7fc14ec20ab7284c1ff7e7fa8c67f32899bab Author: Paul Demeulenaere <pauld@unity3d.com> Date: Tue Aug 24 11:05:14 2021 +0200 Remove deprecated comment We aren't using this anyway commit cc2a0e39949f1ca54782685984839d2893356f45 Author: Paul Demeulenaere <pauld@unity3d.com> Date: Tue Aug 24 11:00:29 2021 +0200 Remove FragInputsVFX, not needed in URP But keep commented declaration for parity with HDRP commit 1970d87f63f319a471137e097d3cbdcd7c632372 Author: Paul Demeulenaere <pauld@unity3d.com> Date: Tue Aug 24 10:38:26 2021 +0200 Proper way to filter unsupported target commit 816b1d15df5d35de282f6153924b91587f9bb94a Author: Paul Demeulenaere <pauld@unity3d.com> Date: Tue Aug 24 10:13:37 2021 +0200 Remove TODOPAUL This surfaceDescription constructor is actually correctly placed commit 00d9da6e024aabb11d855a28fb03bb96779f1956 Author: Paul Demeulenaere <pauld@unity3d.com> Date: Tue Aug 24 10:06:37 2021 +0200 Proper way to support fragInputs variant from HDRP Adding `useFragInputs` in descriptor commit 88d899b2f3527d5e72f5395c752d7727575f145f Merge: 9d2ba9f14fc fcbf6a4484b Author: Paul Demeulenaere <pauld@unity3d.com> Date: Mon Aug 23 18:35:16 2021 +0200 Merge branch 'master' into HDRP/sg-vfx-integration-improved-to-urp commit 9d2ba9f14fc5f70f2991daf05f62253f9aa0033f Author: Paul Demeulenaere <pauld@unity3d.com> Date: Mon Aug 23 18:33:22 2021 +0200 *Add reference image before cleaning TODOPAUL commit 8b9371c94f1b31dc7960c9ca4b76449fbdebeee2 Author: Paul Demeulenaere <pauld@unity3d.com> Date: Mon Aug 23 18:27:34 2021 +0200 Rename ShaderGraphGenerationFTP commit 9d2f08710afb5bd6fade77deeec2a441871729f3 Author: Paul Demeulenaere <pauld@unity3d.com> Date: Thu Aug 19 19:04:34 2021 +0200 Fix missing integration to revert object matrice override in URP commit de912734aa60c455d1fe72696e945c607c9d07ca Merge: 9b2d20ab2a1 7d292932bec Author: Paul Demeulenaere <pauld@unity3d.com> Date: Thu Aug 19 13:50:16 2021 +0200 Merge branch 'master' into HDRP/sg-vfx-integration-improved-to-urp # Conflicts: # com.unity.render-pipelines.universal/Editor/ShaderGraph/Targets/UniversalTarget.cs # com.unity.visualeffectgraph/Editor/Core/VFXLibrary.cs commit 9b2d20ab2a1dc7100894c418f41d54c3a7a1e26f Merge: ccc82964b46 f93bf2d6efd Author: Paul Demeulenaere <pauld@unity3d.com> Date: Mon Aug 16 09:26:18 2021 +0200 Merge branch 'master' into HDRP/sg-vfx-integration-improved-to-urp # Conflicts: # com.unity.render-pipelines.universal/Editor/ShaderGUI/BaseShaderGUI.cs commit ccc82964b46356f27bb9bff322fb74bb1055d40e Merge: 0280d89beee 42b15b6afc5 Author: Paul Demeulenaere <pauld@unity3d.com> Date: Wed Jul 28 16:35:51 2021 +0200 Merge branch 'master' into HDRP/sg-vfx-integration-improved-to-urp commit 0280d89beee235d2da60d4744f0328ee0de7a09a Author: Paul Demeulenaere <pauld@unity3d.com> Date: Tue Jul 27 19:06:21 2021 +0200 Fix custom interpolator in URP commit 8cbb5d007ae80306d74230e354c30fd562790596 Author: Paul Demeulenaere <pauld@unity3d.com> Date: Tue Jul 27 11:13:18 2021 +0200 Fix build after merge commit 3b1a8f68945fc86eda8287cfc3b2a2089cbbb6b4 Merge: c00bf947407 94f598a5f01 Author: Paul Demeulenaere <pauld@unity3d.com> Date: Tue Jul 27 10:56:40 2021 +0200 Merge branch 'master' into HDRP/sg-vfx-integration-improved-to-urp # Conflicts: # com.unity.shadergraph/Editor/Generation/Templates/PassMesh.template commit c00bf947407dbea48d856fef35fcf02b687b660c Author: Paul Demeulenaere <pauld@unity3d.com> Date: Fri Jul 23 09:59:36 2021 +0200 Revert "Revert "Clean deprecated code / comment"" This reverts commit 25353d18270ca85cbd2e08e4b00205acbd8a2ce0. commit 25cdc128a5e2b5765112f967931d7c830d0a8c1f Author: Paul Demeulenaere <pauld@unity3d.com> Date: Fri Jul 23 09:59:14 2021 +0200 Fix World/Element consideration The BuildElementToWorld must be done *before* any SurfaceDescriptionInputs computation commit 25353d18270ca85cbd2e08e4b00205acbd8a2ce0 Author: Paul Demeulenaere <pauld@unity3d.com> Date: Fri Jul 23 09:37:55 2021 +0200 Revert "Clean deprecated code / comment" This reverts commit 7ae9ec9c9697760866c99debe7160d7b6aa8e89e. commit 4f3ebc0d5250d42c7a2f088e983b30883928941b Author: Paul Demeulenaere <pauld@unity3d.com> Date: Thu Jul 22 17:21:14 2021 +0200 *WIP* Investigation about failure to reach the object space commit 7ae9ec9c9697760866c99debe7160d7b6aa8e89e Author: Paul Demeulenaere <pauld@unity3d.com> Date: Thu Jul 22 16:05:22 2021 +0200 Clean deprecated code / comment commit 1e37ff6b736a185d50c758b87c70a9cf41687645 Author: Paul Demeulenaere <pauld@unity3d.com> Date: Thu Jul 22 15:52:18 2021 +0200 Rename "Attributes" in "VFXAttribute" It's a pretty huge change but probably the safest way to avoid conflict with the URP vertex attribute structure commit 1873a91c0b7e8b4490b873ef41599be4c2c050ab Author: Paul Demeulenaere <pauld@unity3d.com> Date: Thu Jul 22 12:20:08 2021 +0200 Simple temp strip test commit ae283a8ae728d68c720c06a61917d1083d755ee4 Author: Paul Demeulenaere <pauld@unity3d.com> Date: Thu Jul 22 12:05:22 2021 +0200 Update Strips VFX & Other Space VFX Some result seems wrong commit 2b8a0ae71ab364f3f271ce3b2f3db339cb93abf9 Author: Paul Demeulenaere <pauld@unity3d.com> Date: Thu Jul 22 11:11:18 2021 +0200 Migrate Vertex Rotation test commit ff181433655655ef16160b0d6f1fb99734a77ba2 Author: Paul Demeulenaere <pauld@unity3d.com> Date: Thu Jul 22 10:58:50 2021 +0200 Porting 35_FTP test : Legacy SG migration commit 68549e8bcec20af3c0167ca762acbfcbc18fc5bd Author: Paul Demeulenaere <pauld@unity3d.com> Date: Thu Jul 22 10:45:06 2021 +0200 Copy 35_ShaderGenerationFTP in URP project commit 021b5b3cb85b6a447edf71e759f2b0419fbb49df Author: Paul Demeulenaere <pauld@unity3d.com> Date: Thu Jul 22 10:39:53 2021 +0200 Move 35_ShaderGraphGeneration to HDRP (will actually duplicate in URP) commit 3888719eef69b3824c1f105d019fb628a2e68186 Author: Paul Demeulenaere <pauld@unity3d.com> Date: Thu Jul 22 10:29:27 2021 +0200 *Add note about the conflicting color commit b90c5e85b79277dd7beb5c0efdcd00ff383526fb Author: Paul Demeulenaere <pauld@unity3d.com> Date: Thu Jul 22 10:20:14 2021 +0200 Add ShaderGUI excluder in BaseShaderGUI for URP I'm not sure it's the best approach, it requires validation/discussion with URP/SG team commit b2646fd8f6b9f6e7f181c16a6717cc0bbcc02f59 Author: Paul Demeulenaere <pauld@unity3d.com> Date: Wed Jul 21 11:24:58 2021 +0200 *Commit Test Data (will be deleted) commit 335ddc43eea930927e97312a4c44f8f332202b22 Author: Paul Demeulenaere <pauld@unity3d.com> Date: Wed Jul 21 11:20:33 2021 +0200 Fix case 1349894 Issue with Lit Quad Output using ShaderGraph in URP commit 5bdf7387708364a194bed763a859e2a7be67ffee Author: Paul Demeulenaere <pauld@unity3d.com> Date: Wed Jul 21 10:26:33 2021 +0200 Fix shadow compilation + use same pattern than BuildSurfaceDescription for BuildVertexDescription commit d4f5eb9f10b22df67abd52ae0af038fba4a4ef1e Author: Paul Demeulenaere <pauld@unity3d.com> Date: Wed Jul 21 10:24:57 2021 +0200 Remove unexpected change from PassMesh.template commit f5dfb127f1c1f25480b00227497a70d4310501a6 Author: Paul Demeulenaere <pauld@unity3d.com> Date: Wed Jul 21 10:13:24 2021 +0200 Fix missing vfx graph integration in PassMesh.template It affects the support of sceneselection & picking passes commit d68df4215f4ab0c295b75ebbed24d2462fa4c05b Author: Paul Demeulenaere <pauld@unity3d.com> Date: Tue Jul 20 17:40:41 2021 +0200 Use BuildSurfaceDescription instead of BuildSurfaceDescriptionInputs/SurfaceDescriptionFunction couple It ease the VFX integration commit fbfbb8f833817eb66eaed40d0490b5a97efb8a09 Author: Paul Demeulenaere <pauld@unity3d.com> Date: Tue Jul 20 17:08:34 2021 +0200 Easier integration using BuildSurfaceDescription & existing BuildVaryings commit 37c760630cae16cbf717c866e46f8e5d321b302b Author: Paul Demeulenaere <pauld@unity3d.com> Date: Tue Jul 20 16:53:15 2021 +0200 *Revert unexpected change in LitSubTarget commit 22bb0808fde5e69c98ee6289905d5aa5f052da63 Author: Paul Demeulenaere <pauld@unity3d.com> Date: Tue Jul 20 16:25:08 2021 +0200 Add forward pass integration for VFX TODO : Factorize this somewhere commit 60ea4d40b18f117e03bc20f5971b49dbca6d97c5 Author: Paul Demeulenaere <pauld@unity3d.com> Date: Tue Jul 20 15:17:16 2021 +0200 Move IRequireVFXContext to global UniversalSubTarget commit 88fd0c777fa1a95fed4c34551f703ccc149f8d04 Author: Paul Demeulenaere <pauld@unity3d.com> Date: Tue Jul 20 13:41:05 2021 +0200 Move 35_ShaderGraphGenerationFTP to common asset commit 19a1b2b23791a3fd6854d8c31cf1d2186b525ec5 Author: Paul Demeulenaere <pauld@unity3d.com> Date: Tue Jul 20 13:38:46 2021 +0200 *Add URP target to 35_ShaderGraphGenerationFTP commit db514b561751aee6931808c323a5b1828c00ac98 Author: Paul Demeulenaere <pauld@unity3d.com> Date: Tue Jul 20 11:57:39 2021 +0200 Minor : Use double face culling in _A.shadergraph commit c93b7882050d2c90b22d3946bbb9d6e2d9788950 Author: Paul Demeulenaere <pauld@unity3d.com> Date: Tue Jul 20 11:55:32 2021 +0200 Move all common code from VFXHDRPSubTarget to VFXSubTarget The actual srp specific is provided by the current SRPBinder commit c986c731ec8d42f99b763c7bdda95191b6d8f7f2 Author: Paul Demeulenaere <pauld@unity3d.com> Date: Tue Jul 20 10:10:20 2021 +0200 Fix hacky workaround commit 9fa1ba25692836f56b5a3aaf1faf67b9f4815c20 Author: Paul Demeulenaere <pauld@unity3d.com> Date: Tue Jul 20 09:26:44 2021 +0200 Clean Some code to anticipate factorization commit e058cdf2bd779f99e1d64f881892f8f99f76c0c5 Merge: fe6fd2ac2c6 07739ff4a80 Author: Paul Demeulenaere <pauld@unity3d.com> Date: Sun Jul 18 20:21:43 2021 +0200 Merge branch 'master' into HDRP/sg-vfx-integration-improved-to-urp # Conflicts: # com.unity.render-pipelines.universal/Editor/ShaderGraph/Targets/UniversalUnlitSubTarget.cs # com.unity.render-pipelines.universal/Editor/VFXGraph/VFXURPBinder.cs commit fe6fd2ac2c6f2223b0b4c3e6195996d494a1bd12 Author: Paul Demeulenaere <pauld@unity3d.com> Date: Fri May 14 17:48:51 2021 +0200 Fix build after merge commit 9cf097405cf1a8e68ce4e883ec86285523f04043 Author: Paul Demeulenaere <pauld@unity3d.com> Date: Fri May 14 15:10:56 2021 +0200 *Fix after merge commit 91d6d81072c31748977e464ffdd52dabad869e9c Merge: 3d3d23438e1 2826ce5c97d Author: Paul Demeulenaere <pauld@unity3d.com> Date: Fri May 14 14:28:12 2021 +0200 Merge branch 'master' into HDRP/sg-vfx-integration-improved-to-urp # Conflicts: # TestProjects/VisualEffectGraph_HDRP/Assets/AllTests/VFXTests/GraphicsTests/34_ShaderGraphGeneration.unity # TestProjects/VisualEffectGraph_HDRP/Assets/AllTests/VFXTests/GraphicsTests/34_ShaderGraphGeneration.vfx # TestProjects/VisualEffectGraph_HDRP/Assets/ReferenceImages/Linear/LinuxEditor/Vulkan/None/34_ShaderGraphGeneration.png # TestProjects/VisualEffectGraph_HDRP/Assets/ReferenceImages/Linear/LinuxPlayer/Vulkan/None/34_ShaderGraphGeneration.png # TestProjects/VisualEffectGraph_HDRP/Assets/ReferenceImages/Linear/OSXEditor/Metal/None/34_ShaderGraphGeneration.png # TestProjects/VisualEffectGraph_HDRP/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/None/34_ShaderGraphGeneration.png # TestProjects/VisualEffectGraph_HDRP/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D12/None/34_ShaderGraphGeneration.png # TestProjects/VisualEffectGraph_HDRP/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D12/None/34_ShaderGraphGeneration.png.meta # TestProjects/VisualEffectGraph_HDRP/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/None/34_ShaderGraphGeneration.png # TestProjects/VisualEffectGraph_HDRP/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/None/34_ShaderGraphGeneration.png.meta # TestProjects/VisualEffectGraph_HDRP/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/None/34_ShaderGraphGeneration.png # TestProjects/VisualEffectGraph_HDRP/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D12/None/34_ShaderGraphGeneration.png # TestProjects/VisualEffectGraph_HDRP/Assets/ReferenceImages/Linear/WindowsPlayer/Vulkan/None/34_ShaderGraphGeneration.png # TestProjects/VisualEffectGraph_HDRP/ProjectSettings/EditorBuildSettings.asset # com.unity.render-pipelines.high-definition/Editor/Material/ShaderGraph/HDShaderPasses.cs # com.unity.render-pipelines.high-definition/Editor/Material/ShaderGraph/HDSubTarget.cs # com.unity.render-pipelines.high-definition/Editor/Material/ShaderGraph/Templates/ShaderPass.template # com.unity.render-pipelines.high-definition/Editor/Material/ShaderGraph/Templates/SharedCode.template.hlsl # com.unity.render-pipelines.high-definition/Editor/Material/ShaderGraph/Templates/VFX/ConfigMesh.template.hlsl # com.unity.render-pipelines.high-definition/Editor/Material/ShaderGraph/Templates/VertexAnimation.template.hlsl # com.unity.render-pipelines.high-definition/Editor/VFXGraph/VFXHDRPSubTarget.cs # com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/ShaderPass/MotionVectorVertexShaderCommon.hlsl # com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/ShaderPass/VertMesh.hlsl # com.unity.render-pipelines.high-definition/Runtime/ShaderLibrary/VisualEffectVertex.hlsl # com.unity.render-pipelines.universal/Editor/ShaderGraph/Targets/UniversalTarget.cs # com.unity.render-pipelines.universal/Editor/ShaderGraph/Targets/UniversalUnlitSubTarget.cs # com.unity.render-pipelines.universal/Editor/ShaderGraph/Templates/ShaderPass.template # com.unity.render-pipelines.universal/Editor/Unity.RenderPipelines.Universal.Editor.asmdef # com.unity.render-pipelines.universal/Editor/VFXGraph.meta # com.unity.shadergraph/Editor/Data/Graphs/AbstractShaderProperty.cs # com.unity.shadergraph/Editor/Drawing/Inspector/PropertyDrawers/GraphDataPropertyDrawer.cs # com.unity.shadergraph/Editor/Generation/Processors/GenerationUtils.cs # com.unity.shadergraph/Editor/Generation/Processors/Generator.cs # com.unity.shadergraph/Editor/Generation/TargetResources/Fields.cs # com.unity.visualeffectgraph/Editor/Compiler/VFXCodeGenerator.cs # com.unity.visualeffectgraph/Editor/Models/Contexts/IVFXSubRenderer.cs # com.unity.visualeffectgraph/Editor/PackageInfo.cs # com.unity.visualeffectgraph/Editor/ShaderGraph/VFXShaderGraphParticleOutput.cs commit 3d3d23438e1bfc7d89371c0cbb7bf18bd54ab8d3 Merge: 8d5966d4453 6c5a9f51679 Author: Paul Demeulenaere <pauld@unity3d.com> Date: Wed Apr 21 17:10:23 2021 +0200 Merge branch 'HDRP/sg-vfx-integration-improved' into HDRP/sg-vfx-integration-improved-to-urp commit 6c5a9f516790b25243973dccb23be56f2d9ae6c9 Merge: 8034ae7d6ad 8bdb1521bd8 Author: John Parsaie <johnpa@unity3d.com> Date: Tue Apr 20 17:18:06 2021 -0400 Merge Shader Graph hotfix for interpolation modifiers commit 8bdb1521bd82ddbd89211a268bc4b0751493ade6 Author: Esmeralda Salamone <esmeralda.salamone@unity3d.com> Date: Tue Apr 20 13:56:33 2021 -0700 interpolation function wasn't updated correctly. commit 766242b4f9f0385adf7d309706678b4657e1d6eb Author: Esmeralda Salamone <esmeralda.salamone@unity3d.com> Date: Tue Apr 20 13:47:59 2021 -0700 accidentally mixed up some fields. commit 1977e6fd84cb3b471ee7b05f2f7107c77b33be65 Merge: 69ba752249d 6f709cff0ee Author: Esmeralda Salamone <esmeralda.salamone@unity3d.com> Date: Tue Apr 20 12:32:10 2021 -0700 Merge remote-tracking branch 'origin/master' into sg/fix-intmod-semantics commit 8d5966d4453a9e2b84d76168aff1fae63f788b3e Merge: 017d7bc1047 8034ae7d6ad Author: Paul Demeulenaere <pauld@unity3d.com> Date: Tue Apr 20 21:22:04 2021 +0200 Merge remote-tracking branch 'public/HDRP/sg-vfx-integration-improved' into HDRP/sg-vfx-integration-improved-to-urp commit 017d7bc1047340d0fba7b628d9a4b1f7f312d589 Author: Paul Demeulenaere <pauld@unity3d.com> Date: Tue Apr 20 21:14:05 2021 +0200 Adding an error when NeedSync always returns true We should double check from 60ff3cb0c27a81945db2d8ce444230bd850deec8 I don't know why the m_PropertyMap is always empty (probably a wrong implementation from the URP side) commit 6ef3efdeee9f27dc9a3492d22cce50d57a8e0e09 Author: Paul Demeulenaere <pauld@unity3d.com> Date: Tue Apr 20 20:59:27 2021 +0200 Workaround infinite compilation loop (to investigate !!) commit 34480108618419a95ed11eb1ee1c9045efafc48c Author: Paul Demeulenaere <pauld@unity3d.com> Date: Tue Apr 20 20:49:58 2021 +0200 *Update test data commit db66805cbe9cacceba2707c1b050bb4039c3d9d4 Author: Paul Demeulenaere <pauld@unity3d.com> Date: Tue Apr 20 20:49:20 2021 +0200 Catching up on hdrp implementation TODO : Missing appropriate integration from c68e99e88e43dbd70b68c274c640230c2436adca commit 8034ae7d6add11eb4f3291143780b6e2ebfba062 Author: John Parsaie <johnpa@unity3d.com> Date: Tue Apr 20 14:32:32 2021 -0400 Fix the graphics test commit 69ba752249d6a9e454b73080b5cafe6cc58e2769 Author: Esmeralda Salamone <esmeralda.salamone@unity3d.com> Date: Tue Apr 20 11:26:50 2021 -0700 interpolation modifiers without a semantic now generate one to avoid packing issues commit 5fedbe4af325632983613c77d5dbfc32aaf21266 Merge: b6f6ed5ae5f 63f72789143 Author: Paul Demeulenaere <pauld@unity3d.com> Date: Tue Apr 20 20:20:31 2021 +0200 Merge branch 'HDRP/sg-vfx-integration-improved' into HDRP/sg-vfx-integration-improved-to-urp commit 63f72789143313fc28029b9a97c754c86d1967a2 Author: John Parsaie <johnpa@unity3d.com> Date: Tue Apr 20 14:16:51 2021 -0400 Fix interpolator for boolean type commit 0e7b8717700888d2f1def8187df5287123b353f3 Merge: 1395d4df902 7a1d1cffa10 Author: John Parsaie <johnpa@unity3d.com> Date: Tue Apr 20 14:10:34 2021 -0400 Merge Master commit 1395d4df902d307819b0653b0d9906390b9fca16 Author: John Parsaie <johnpa@unity3d.com> Date: Tue Apr 20 13:35:33 2021 -0400 Fix Vulkan related interpolator issue commit c68e99e88e43dbd70b68c274c640230c2436adca Author: John Parsaie <johnpa@unity3d.com> Date: Tue Apr 20 12:55:03 2021 -0400 Fix various DX12 + Vulkan issue for null geometry input (draw procedural) commit b6f6ed5ae5fa810cae2ff73de581b87e84b19b01 Author: Paul Demeulenaere <pauld@unity3d.com> Date: Tue Apr 13 11:52:24 2021 +0200 *Push temporary debug symbols commit 7dfeb3b6b243c7a8e4bf16eb183a154ab1830d42 Author: Paul Demeulenaere <pauld@unity3d.com> Date: Mon Apr 12 19:50:26 2021 +0200 Fix model matrix override commit f3ccf69f8973fb92b82727aabfd62c088b63ba2f Author: Paul Demeulenaere <pauld@unity3d.com> Date: Mon Apr 12 19:23:35 2021 +0200 *Catching up on HDRP implementation - Still using fragsInput == SurfaceDescriptionInput (requires some dirty trick in code generator) - Integrate the new elementToWorld/worldToElement behavior : doesn't work for now, all particle are in 0,0,0, I'm missing an assignation/transform somewhere - Getting an infinite compilation commit ea3699cb9a333e7881b09ac3b94ba36982f52780 Merge: e313903329c c9ca639112c Author: Paul Demeulenaere <pauld@unity3d.com> Date: Sun Apr 11 17:55:38 2021 +0200 Merge branch 'HDRP/sg-vfx-integration-improved' into HDRP/sg-vfx-integration-improved-to-urp commit c9ca639112c0a55188e4781e2bd74730267ed28c Merge: 161915fab02 b6d93cbbfdc Author: John Parsaie <johnpa@unity3d.com> Date: Thu Apr 8 12:28:02 2021 -0400 Merge branch 'HDRP/sg-vfx-integration-improved' of https://github.com/Unity-Technologies/Graphics into HDRP/sg-vfx-integration-improved commit 161915fab0255e63df08fe00c08f341ff2a29b81 Author: John Parsaie <johnpa@unity3d.com> Date: Thu Apr 8 12:27:29 2021 -0400 Fix the stubborn matrix define compiler bug commit a6765719bb1cfc508b1d02aeb075e952cd3d2fc7 Author: John Parsaie <johnpa@unity3d.com> Date: Thu Apr 8 11:51:49 2021 -0400 Remove frag inputs vfx template commit b6d93cbbfdc3db28c0cd4b334cea8db6d4f74048 Author: noreply@unity3d.com <noreply@unity3d.com> Date: Wed Apr 7 03:09:17 2021 +0000 [CI] Updated pinned editor versions commit 8fc2f7530b15d9af6ebfc6798193292e60b8dfd8 Merge: bdded158a0f 4fd7de29157 Author: John Parsaie <johnpa@unity3d.com> Date: Tue Apr 6 08:48:46 2021 -0400 Merge branch 'master' into HDRP/sg-vfx-integration-improved commit bdded158a0f42a3e309e92c7331a7a0950650c7a Author: John Parsaie <johnpa@unity3d.com> Date: Fri Apr 2 13:41:53 2021 -0400 Fix generic struct name for strips commit b013321d5d2d4276525827b65a957153c5c73094 Author: John Parsaie <johnpa@unity3d.com> Date: Fri Apr 2 13:41:12 2021 -0400 Move VFX inputs to frag inputs substruct commit a4d29f4ca488414083a0d35decca9509d5c365da Author: John Parsaie <johnpa@unity3d.com> Date: Fri Apr 2 12:35:29 2021 -0400 Rename Attributes to less generic InternalAttributesElement commit b96c81d267f3c57c8ce047e09ae04db5fde635f2 Author: John Parsaie <johnpa@unity3d.com> Date: Fri Apr 2 08:36:40 2021 -0400 Require transform for custom function node commit f1875cf7046eb748d8b1ea52539e4b1a7f7caf39 Author: John Parsaie <johnpa@unity3d.com> Date: Thu Apr 1 12:56:02 2021 -0400 SUpport CameraNode and extend IMayRequireTransform to return a list commit 2d40eef8dd6d5e63d1b522501b12bf382b0cefc4 Author: John Parsaie <johnpa@unity3d.com> Date: Thu Apr 1 12:38:23 2021 -0400 Add support for ObjectNode commit 25d0c05d7477d84cfcc0073f61a1bbdd8d335cfe Author: John Parsaie <johnpa@unity3d.com> Date: Thu Apr 1 12:10:59 2021 -0400 Fix strips commit 750722936d136d412fd318cfc22c068f13d1b82d Author: John Parsaie <johnpa@unity3d.com> Date: Thu Apr 1 11:59:10 2021 -0400 Fix VFX orientation nodes that use the abstracted matrices commit 5f53b92de6a3b57569e49202218b46e2844b205f Author: John Parsaie <johnpa@unity3d.com> Date: Thu Apr 1 11:42:03 2021 -0400 Fix inverse world for local space VFX commit 77b24ea8459d5d1c779e470b3fe46fccd28c6f03 Author: John Parsaie <johnpa@unity3d.com> Date: Thu Apr 1 00:04:50 2021 -0400 Initial commit of VFX matrix abstraction commit 93fa9cbb2a9d2c0680f93b3600649a127bc464c9 Author: John Parsaie <johnpa@unity3d.com> Date: Wed Mar 31 22:48:54 2021 -0400 Add additional interface implementation for transformation matrix node commit 9938fe933b843ef5d491a0cd30c718f959bb7d53 Author: John Parsaie <johnpa@unity3d.com> Date: Wed Mar 31 19:09:45 2021 -0400 Introduction of IMayRequireTransform commit d78ca0ff4a0a5bfcdb3a674ca5352397d032a27c Author: John Parsaie <johnpa@unity3d.com> Date: Wed Mar 31 16:51:54 2021 -0400 Fix custom interpolator port properties commit 444571a6c58ea7e7c6f87cecbc19576a55fb208f Author: John Parsaie <johnpa@unity3d.com> Date: Wed Mar 31 13:16:19 2021 -0400 Hide normal bending for shader graph generation mode commit 3d34c1b856500884d4cfb28070a675969a1ad0cc Author: John Parsaie <johnpa@unity3d.com> Date: Wed Mar 31 11:24:38 2021 -0400 Fix HDRP field dependency assignment commit 1b5259a43d27cd3ba07df07d3d0c77f501a8b60a Author: John Parsaie <johnpa@unity3d.com> Date: Wed Mar 31 10:57:13 2021 -0400 Clean up predicate for HDRP VFX settings commit 3fd62d6b60328caa45df6239c0e01768cc25d53e Author: John Parsaie <johnpa@unity3d.com> Date: Wed Mar 31 10:49:10 2021 -0400 Fix test project build settings commit cd19be30f28022a337c1ebdd38fac5b3e1f9736d Author: John Parsaie <johnpa@unity3d.com> Date: Tue Mar 30 12:29:16 2021 -0400 Fix preprocessor for VFX motion vector commit 4742e9bfb000d61fc937468e201b90569e68452a Author: John Parsaie <johnpa@unity3d.com> Date: Mon Mar 29 16:43:44 2021 -0400 Address some minor code comments commit 6b78324512ee351915be13ecf347fc14fbdeb365 Author: John Parsaie <johnpa@unity3d.com> Date: Mon Mar 29 16:38:42 2021 -0400 Bump shader graph importer version commit dd934e9f8cf0d122ebf264a4174b06efac41fd6d Author: John Parsaie <johnpa@unity3d.com> Date: Mon Mar 29 16:34:25 2021 -0400 Append VFX field dependencies in a safer way commit 0128cef4e89228dd6b8b44d436fc7171061b9d25 Author: John Parsaie <johnpa@unity3d.com> Date: Mon Mar 29 16:22:42 2021 -0400 First past removal of static global vfx generation configuration in favor of target configuration commit 8a7d91ba85198759bb5afb03109974ae6dbb2c63 Author: John Parsaie <johnpa@unity3d.com> Date: Mon Mar 29 15:58:57 2021 -0400 Introduce IRequiresVFXContext commit ae768333ca8db4718c2f27e4502eb6914e396629 Author: John Parsaie <johnpa@unity3d.com> Date: Mon Mar 29 15:13:08 2021 -0400 Introduce IMaySupportVFX and removal of WorksWithVFX from Target API commit 5aa790571958777d4729139c456a9e0592266e02 Merge: 937b26f576b 51fe46e5141 Author: John Parsaie <johnpa@unity3d.com> Date: Mon Mar 29 09:47:14 2021 -0400 Merge master in hopes of resolving yamato formatting failure commit 937b26f576b471371c96c6a241a5d0eb7e1162d9 Author: John Parsaie <johnpa@unity3d.com> Date: Fri Mar 26 13:11:37 2021 -0400 Initial work to generate a graph with external target inputs commit c86e228051f1be9c72bd88e8d3b72519679b5f38 Author: John Parsaie <johnpa@unity3d.com> Date: Fri Mar 26 10:13:38 2021 -0400 Fix random node for vertex stage commit f51b66562ac6ab331a510d0accddbe7fb9a48f5c Author: John Parsaie <johnpa@unity3d.com> Date: Thu Mar 25 17:51:00 2021 -0400 Fix custom interpolator support for VFX commit 3f5895d39d1df9631f313f8079ba92c6312c3bad Author: John Parsaie <johnpa@unity3d.com> Date: Thu Mar 25 16:34:52 2021 -0400 Fix MV for Eye VFX commit 2494ef2357c7ea28919c67bb0ddb4e2f8a395501 Author: John Parsaie <johnpa@unity3d.com> Date: Thu Mar 25 16:23:06 2021 -0400 Fix random node non-constant commit 47dd600122779898a9321c6d951d34b1a1b121fa Author: John Parsaie <johnpa@unity3d.com> Date: Wed Mar 24 19:25:27 2021 -0400 Add new shader graph generation test (more robust testing will be done in FTP) commit 0518a9b1a9cec67c7b3749f50800e632d4380252 Author: John Parsaie <johnpa@unity3d.com> Date: Wed Mar 24 18:47:45 2021 -0400 Fix more issues with VFX vertex properties generation commit e936a10d5800913f9869d10bd5cb6a8a46e7d1ae Author: John Parsaie <johnpa@unity3d.com> Date: Wed Mar 24 18:25:56 2021 -0400 Fix an issue with vertex properties generation and assignment commit a250059e4bad5a1bdbfa6fad435de3533ee18b3d Author: John Parsaie <johnpa@unity3d.com> Date: Wed Mar 24 17:24:23 2021 -0400 Fix output context system naming commit d5bebb468dcf2cb43f0e579705d384575885fb27 Merge: cd96d3fe401 a16b1bfd09c Author: John Parsaie <johnpa@unity3d.com> Date: Wed Mar 24 16:36:00 2021 -0400 Merge branch 'master' into HDRP/sg-vfx-integration-improved commit cd96d3fe401dd52de93db7461cabe1fc3647fbc2 Merge: ab63ef22bf2 e5b75da0471 Author: John Parsaie <johnpa@unity3d.com> Date: Wed Mar 24 14:04:17 2021 -0400 Merge branch 'HDRP/fix-rendering-debug-ui' into HDRP/sg-vfx-integration-improved commit e5b75da047153a316dd1d23eaaf0382c58cecbac Author: John Parsaie <johnpa@unity3d.com> Date: Wed Mar 24 13:35:48 2021 -0400 Changelog commit 5e95e3fbdad4f45e46ce46adb4eeb6f5e29e52b9 Author: John Parsaie <johnpa@unity3d.com> Date: Wed Mar 24 13:33:10 2021 -0400 Fix commit ab63ef22bf2a51b3f2b1abbbe70232cae8b4b3b2 Author: John Parsaie <johnpa@unity3d.com> Date: Tue Mar 23 15:59:02 2021 -0400 Fix the hasOnlyVFXTarget predicate to fix shader graph importing for VFX commit b186f61a97ec9e2bced0b4ed6fd2ef81d35ee892 Merge: 99d61dcf417 4be65379dec Author: John Parsaie <johnpa@unity3d.com> Date: Mon Mar 22 18:14:14 2021 -0400 Merge master (remove this PR's interpolation modifier since it has been added on master) commit 99d61dcf417c88e1e0060ceb047f47c35b3b18c9 Author: John Parsaie <johnpa@unity3d.com> Date: Mon Mar 22 17:49:50 2021 -0400 Make less generic function names commit 0091153649557f99ad45025bd5f67f085f2ca5f7 Author: John Parsaie <johnpa@unity3d.com> Date: Mon Mar 22 17:46:09 2021 -0400 Fix MV for object space is particle space commit 08cc749af67a049347d1784f7c32c56f19e401ec Author: John Parsaie <johnpa@unity3d.com> Date: Mon Mar 22 16:57:07 2021 -0400 Particle space as object space commit 43aeeb39e362f9781f13a014d17abe569502b55b Author: John Parsaie <johnpa@unity3d.com> Date: Fri Mar 19 15:08:23 2021 -0400 Disable sorting for strips commit dd8eba74f6340371a6827bae49fe3057e6a6a220 Author: John Parsaie <johnpa@unity3d.com> Date: Fri Mar 19 14:08:57 2021 -0400 Update the info message box for visual effect target deprecation commit 96dd9c3d0c8a664e87d735db0551e75dbf3189f1 Author: John Parsaie <johnpa@unity3d.com> Date: Thu Mar 18 16:27:39 2021 -0400 Fix tangent support commit d49925ef3f7dd35f2c838c938470915fadd65eb3 Author: John Parsaie <johnpa@unity3d.com> Date: Thu Mar 18 15:30:42 2021 -0400 Add tooltips and new ui prototype that accepts a property tooltip commit ee4573b7a67274c0fb2bdc0162b5aaee0fe81e5c Author: John Parsaie <johnpa@unity3d.com> Date: Thu Mar 18 14:55:11 2021 -0400 Remove the hiding of the Visual Target and instead display warning box if user is using both commit 2152f8fb02fd50deaed6abb18f350f84d067b99a Author: John Parsaie <johnpa@unity3d.com> Date: Wed Mar 17 14:40:09 2021 -0400 Correct some of the wording of the generation warning message commit 5f2259324303c4761907e9eef688e0e70dda925d Author: John Parsaie <johnpa@unity3d.com> Date: Wed Mar 17 14:18:45 2021 -0400 Add Gradients to the list of unsupported properties commit fac2979b812f481a780263e2cce3d10ca1195114 Author: John Parsaie <johnpa@unity3d.com> Date: Tue Mar 16 17:14:24 2021 -0400 Validity check on the graph data for (currently) unsupported property or keyword types commit 00127eff4f3648ba51e0bf5d5f8cae4d4cd92886 Author: John Parsaie <johnpa@unity3d.com> Date: Tue Mar 16 17:13:45 2021 -0400 Check if default material has the setting as sometimes this is not the casE commit 60ff3cb0c27a81945db2d8ce444230bd850deec8 Author: John Parsaie <johnpa@unity3d.com> Date: Tue Mar 16 13:09:04 2021 -0400 Fix sorting for new SG VFX contexts commit 8699729ecda7a636cd893b43396fcbdf337f65b6 Author: John Parsaie <johnpa@unity3d.com> Date: Fri Mar 12 15:14:51 2021 -0500 Fix Shader.SetGlobalX commit da14e9af9a70f81358bb72ca70cde265facbe3ce Author: John Parsaie <johnpa@unity3d.com> Date: Fri Mar 12 10:58:59 2021 -0500 Omit DXR SubShader for VFX commit 0cb6532619ed921454b385f48ea43f183bccb0e6 Author: John Parsaie <johnpa@unity3d.com> Date: Fri Mar 12 10:52:21 2021 -0500 Invest the injection of TBN for unlit shadow matte depth pass commit c37d6decc00cf62bfec88ded63171341c25a414a Author: John Parsaie <johnpa@unity3d.com> Date: Fri Mar 12 10:48:47 2021 -0500 Fix regression with legacy vfx target inspector commit 2b79cd83ed1a93d26993b3964514b913a8ec64be Author: John Parsaie <johnpa@unity3d.com> Date: Thu Mar 11 18:46:34 2021 -0500 Hide the alpha threshold when in SG generation mode commit 70054aea9e8f96f56b2198a09bc9a5bfde7b45de Author: John Parsaie <johnpa@unity3d.com> Date: Thu Mar 11 18:03:55 2021 -0500 Revert previous artifact fix and implement it to handle unlit shadow matte vfx case commit 2483e18ac047cdd5066fba827456bdebad610bd1 Author: John Parsaie <johnpa@unity3d.com> Date: Thu Mar 11 14:36:21 2021 -0500 Fix nulref for resync of context name commit e019db27636362f803e48da75c1f710303000955 Author: John Parsaie <johnpa@unity3d.com> Date: Thu Mar 11 12:14:35 2021 -0500 Improve the dynamic context naming commit e313903329c0be2acadc6f77a592373330b41106 Author: Paul Demeulenaere <pauld@unity3d.com> Date: Thu Mar 11 17:53:37 2021 +0100 *Update test data commit c4ef07ed8574eba5f485b070d3bc13c6dfd25f33 Author: Paul Demeulenaere <pauld@unity3d.com> Date: Thu Mar 11 17:50:08 2021 +0100 Fix copying & init varying commit 11d674a81f9d89028149224dd5a421fb5994ddcb Author: Paul Demeulenaere <pauld@unity3d.com> Date: Thu Mar 11 14:06:34 2021 +0100 Fix & Sync after merge commit 292bbd48364a6a09486d5e2e605a14fb9499d0ed Merge: 25ac3dd192d 335b02f3c86 Author: Paul Demeulenaere <pauld@unity3d.com> Date: Thu Mar 11 13:39:47 2021 +0100 Merge branch 'HDRP/sg-vfx-integration-improved' into HDRP/sg-vfx-integration-improved-to-urp commit 25ac3dd192d80a7d4136d4069d0cc94bfd562d86 Author: Paul Demeulenaere <pauld@unity3d.com> Date: Thu Mar 11 11:29:50 2021 +0100 *Other test data (will be removed) commit 520b1bac13b8e656f6c1bafee2966b36982bd17b Author: Paul Demeulenaere <pauld@unity3d.com> Date: Thu Mar 11 11:29:26 2021 +0100 *test data commit 26f46c067d17bfce491ac629b1187ba31ee718dd Author: Paul Demeulenaere <pauld@unity3d.com> Date: Thu Mar 11 11:27:51 2021 +0100 *Minor : fill expected content of VFXUniversalBinder.SetupMaterial & GetBlendModeFromMaterial commit 335b02f3c86b064644fc92aacff2a695c78528bb Author: John Parsaie <johnpa@unity3d.com> Date: Wed Mar 10 18:30:27 2021 -0500 Make context output name dynamic to shader graph ID commit 93c9e5eecec8f5a85fc532b18ea6bf09c9948e6a Author: John Parsaie <johnpa@unity3d.com> Date: Wed Mar 10 17:54:18 2021 -0500 Hide the Visual Effect target commit f5b599b3950aa127b6b5d14045677d6a5499699b Author: John Parsaie <johnpa@unity3d.com> Date: Wed Mar 10 17:25:59 2021 -0500 Filter out MV + Shadows if disabled on context commit dc8388d62008800e81ed5dfd3bd507259464a138 Author: John Parsaie <johnpa@unity3d.com> Date: Wed Mar 10 14:55:17 2021 -0500 Add warning message box for transparent MV write disabled commit 875f45f61e1b938b5876beffa275947b3d46a209 Author: John Parsaie <johnpa@unity3d.com> Date: Wed Mar 10 14:05:46 2021 -0500 Fix the artifacts for VFX Unlit commit e1a11171d1b7c93f8e2dcf5497347e081829ba49 Author: Paul Demeulenaere <pauld@unity3d.com> Date: Wed Mar 10 19:32:26 2021 +0100 Integrate TransformMeshToElement & co commit 9d94fd344c6cb910339cbd12ce9a3c81d66f74fd Author: John Parsaie <johnpa@unity3d.com> Date: Tue Mar 9 13:59:16 2021 -0500 Integrate UI feedback for VFX preference toggle commit 5b5882f93af17fe32a0d8c61e481bc68fc257230 Author: John Parsaie <johnpa@unity3d.com> Date: Tue Mar 9 13:58:21 2021 -0500 Integrate feedback for function prototype define commit 68b5e87df439f2a62e654ae0a5a0c80d414f5d2d Author: John Parsaie <johnpa@unity3d.com> Date: Tue Mar 9 13:27:33 2021 -0500 Make Shadows/MV setup work with new material serialization setup commit 7bca2819f27557af42c6b8cc93fb105b15e4a2e1 Author: John Parsaie <johnpa@unity3d.com> Date: Tue Mar 9 13:16:23 2021 -0500 Fix nulref for destroyed vfx material commit 7cad459f13d104a24ce80e0117736999d4138d25 Author: John Parsaie <johnpa@unity3d.com> Date: Tue Mar 9 12:34:34 2021 -0500 Re-use attributes element for motion vectors commit df09c5f23f7a639110d69e8bb3dbc9a7199e8fbe Author: Paul Demeulenaere <pauld@unity3d.com> Date: Tue Mar 9 18:19:14 2021 +0100 Fix UnlitPass (and only this one) commit 26940f4712611f0046f2a3aea9b8247b4f7d3a53 Author: Paul Demeulenaere <pauld@unity3d.com> Date: Tue Mar 9 18:16:42 2021 +0100 Rename Attribute => VFXAttribute Use Attribute for AttribtueMesh commit f6fe0d968d0b94192246a33b94218670bd7046a0 Merge: b2ae9c1c54e e82bded624a Author: John Parsaie <johnpa@unity3d.com> Date: Tue Mar 9 10:41:59 2021 -0500 Merge branch 'HDRP/sg-vfx-integration-improved' of https://github.com/Unity-Technologies/Graphics into HDRP/sg-vfx-integration-improved commit 7f4661accc14f00846a8eb13d6d9afba50167430 Author: Paul Demeulenaere <pauld@unity3d.com> Date: Tue Mar 9 15:30:04 2021 +0100 Use correct VertexDescriptionFunction See https://github.com/Unity-Technologies/Graphics/pull/3467/files#diff-37a93ace4b27e3443e890505c3b81eb5fd0daedbb793a363188800a9727f30fdR71 commit e82bded624a4488a014ce48e12a3fa025796c219 Author: Lewis Jordan <lewis.jordan@hotmail.co.uk> Date: Tue Mar 9 12:42:14 2021 +0000 Added vfx graph documentation commit 3c2bb2f177cce6c9132aabd1475547c37c8d9e3a Author: Lewis Jordan <lewis.jordan@hotmail.co.uk> Date: Tue Mar 9 12:29:02 2021 +0000 Fixed a bug with incorrect formatting for headers in the build commit 5d6e232a19495f6e3e84054361c2c00d5b8bcd97 Author: Lewis Jordan <lewis.jordan@hotmail.co.uk> Date: Tue Mar 9 12:19:17 2021 +0000 Added support vfx graph checkbox to master stack docs commit 876a92ead5e5df47f54d0c706ace2929bcb587db Author: Paul Demeulenaere <pauld@unity3d.com> Date: Tue Mar 9 12:48:03 2021 +0100 Fix SurfaceDescriptionInputs vs FragInputs in URP commit 093c87f13e937c9e1231ad36be03e2a6ffd1cd43 Author: Lewis Jordan <lewis.jordan@hotmail.co.uk> Date: Tue Mar 9 10:29:33 2021 +0000 Updated the shared output settings with the shader graph property commit aad058779d3e9906b7219f868d8686a7de0d7ee4 Author: Paul Demeulenaere <pauld@unity3d.com> Date: Tue Mar 9 11:27:35 2021 +0100 Merge SurfaceDescriptionInputs & FragInput concept for URP See https://unity.slack.com/archives/C01Q3N39UEB/p1615282627011800?thread_ts=1615282039.009200&cid=C01Q3N39UEB commit 56d6111710465d9f57579da7d7ec906c51c85703 Author: Paul Demeulenaere <pauld@unity3d.com> Date: Tue Mar 9 11:08:23 2021 +0100 *Basic template integration (keeping change as minimal in URP template) Probably other change needed in this template, it's mainly a copy/past from HDRP commit b2ae9c1c54e718fc0eeb0d0d27a2562f9d5d0065 Author: John Parsaie <johnpa@unity3d.com> Date: Mon Mar 8 16:47:53 2021 -0500 Remove redundant zero initialize commit b70fe6e23945e14b87e6919cb3c4ac1ecd449422 Author: Paul Demeulenaere <pauld@unity3d.com> Date: Mon Mar 8 17:19:29 2021 +0100 Basic integration of PostProcessSubShader & GetFields TODOPAUL : should be refactored to share this code among all template commit 445d869fa03658b3eb0a5941e99cae069feeafa8 Author: Paul Demeulenaere <pauld@unity3d.com> Date: Mon Mar 8 17:14:09 2021 +0100 *Add local test data commit a474563c7201286b74e15c9128c25d5cc7541d3b Author: Paul Demeulenaere <pauld@unity3d.com> Date: Mon Mar 8 11:34:32 2021 +0100 *Add missing meta commit 22e7d2b5ac2c01701394069925db3904525eabb5 Author: Paul Demeulenaere <pauld@unity3d.com> Date: Mon Mar 8 11:31:06 2021 +0100 *WIP* Stupid migration from HD to Universal : fix build - HDStructs corresponds UniversalStructs.cs (HDStructs.VaryingsMeshToPS == UniversalStructs.Varyings) - From what I understand in https://github.com/Unity-Technologies/Graphics/blob/master/com.unity.render-pipelines.universal/Editor/ShaderGraph/UniversalStructs.cs#L14 it uses mostly default field expect for some specific vayring https://github.com/Unity-Technologies/Graphics/blob/66c2183d1901fb08367d717352deb7a500756f27/com.unity.render-pipelines.universal/Editor/ShaderGraph/UniversalStructFields.cs#L5 - HDStructFields.FragInputs correspond to StructFields.SurfaceDescriptionInputs commit be109e43cb5c62612066af03fdd997b9ff17798c Author: Paul Demeulenaere <pauld@unity3d.com> Date: Mon Mar 8 11:11:13 2021 +0100 Move target to actual VFXUniversalBinder (using USE_VFX) commit 2c9a5299e927ea5f20187b87f8a834c97d36aa4b Author: Paul Demeulenaere <pauld@unity3d.com> Date: Mon Mar 8 10:28:38 2021 +0100 Add specific define for VFX & integrate toggle to m_SupportVFX commit 4fdfed3c239aef64ddfbcc2ab078f4d4f3cbf2f8 Author: John Parsaie <johnpa@unity3d.com> Date: Fri Mar 5 10:08:04 2021 -0500 Fix particle strip custom texcoord commit b428bc45ed5a09637e44d863cc7c35ba3025476b Author: John Parsaie <johnpa@unity3d.com> Date: Fri Mar 5 09:52:13 2021 -0500 Fix strips commit a760fd44928829bdae6506df68bb09160040253e Merge: 865b97cdf5c 658dacd2bfd Author: John Parsaie <johnpa@unity3d.com> Date: Fri Mar 5 09:16:48 2021 -0500 Merge latest VFX branch to fix asset editor commit 658dacd2bfd148b0835646665d7dcad8516ddc0b Author: jfryer_unity <julienf@unity3D.com> Date: Fri Mar 5 12:53:18 2021 +0100 Formatting commit 8269ee31d2b90d2e433d0162d0bd92ed65efd8ef Author: jfryer_unity <julienf@unity3D.com> Date: Fri Mar 5 12:03:21 2021 +0100 Fix "show generated" shader commit 865b97cdf5c085bc485d9d7e46703f44837d5516 Author: John Parsaie <johnpa@unity3d.com> Date: Thu Mar 4 18:20:05 2021 -0500 Trigger full recompile on blend mode change commit 8c00f35dbcd7433acb92db2dbf1f9c78c767ca22 Author: John Parsaie <johnpa@unity3d.com> Date: Thu Mar 4 17:35:00 2021 -0500 Use the new material settings to get the vfx blend mode commit 3b0fc6f482f146eb272a945fbd289f7200b7c706 Author: John Parsaie <johnpa@unity3d.com> Date: Thu Mar 4 17:33:38 2021 -0500 Update sub renderer to maintain dictioary instead to mimic material API commit 33acc43d0e0f1be021b2f59ff1b2db5bef96b8a9 Author: jfryer_unity <julienf@unity3D.com> Date: Thu Mar 4 17:05:44 2021 +0100 Change ResyncMaterials editor API a bit commit 02b788fccad30a3c8a8280564a85d981f5c4088f Author: jfryer_unity <julienf@unity3D.com> Date: Thu Mar 4 12:47:00 2021 +0100 Add a way to resync material without recompiling (test) commit 515b79a812258af087819ea2f7bcd85b406ff668 Author: jfryer_unity <julienf@unity3D.com> Date: Thu Mar 4 17:05:44 2021 +0100 Change ResyncMaterials editor API a bit commit fdc2b299a3d7a14e82065bd381a20008819707f7 Author: jfryer_unity <julienf@unity3D.com> Date: Thu Mar 4 12:47:00 2021 +0100 Add a way to resync material without recompiling (test) commit 242ddb0679cdccfa1161e72b0afcd6436b4f7cbe Merge: 0256f8dde15 52a65b2088c Author: John Parsaie <johnpa@unity3d.com> Date: Wed Mar 3 17:02:22 2021 -0500 Merge branch 'HDRP/sg-vfx-integration-improved' of https://github.com/Unity-Technologies/Graphics into HDRP/sg-vfx-integration-improved commit 0256f8dde15938cce641a9417cd0970e9a6408c3 Author: John Parsaie <johnpa@unity3d.com> Date: Wed Mar 3 17:01:24 2021 -0500 Initial commit of the new material mechanism on top of the new C++ commit 52a65b2088c928d1967e489b3d8d42ce399028a1 Author: Paul Demeulenaere <pauld@unity3d.com> Date: Wed Mar 3 17:16:22 2021 +0100 Fix build of URP project - WorksWithVFX is optionnal, implement default behavior - Unexpected HighDefinition in VFXCodeGenerator commit d1d550d13126a28b2b2b88eb5dc172fa75b67db3 Merge: 0e394f0e297 bda976f81d3 Author: John Parsaie <johnpa@unity3d.com> Date: Wed Mar 3 11:11:14 2021 -0500 Merge branch 'vfx/feature/material-serialization' into HDRP/sg-vfx-integration-improved commit 0e394f0e29786777205e54875f4d36acdc0eb37b Merge: 609cf3ccf75 0ad3440fc02 Author: John Parsaie <johnpa@unity3d.com> Date: Wed Mar 3 11:08:31 2021 -0500 Merge branch 'master' into HDRP/sg-vfx-integration-improved commit bda976f81d35e6e1804897e47ee0289f67716f55 Author: jfryer_unity <julienf@unity3D.com> Date: Wed Mar 3 15:26:30 2021 +0100 Forgot to remove some code from old path for mesh output commit 9b41c532b60dfcf6f1d56337dc9392c86de12a60 Author: jfryer_unity <julienf@unity3D.com> Date: Wed Mar 3 15:23:28 2021 +0100 Reformating commit 3654462ff52bf52c34edafbb32cf1808efdbdf6e Author: jfryer_unity <julienf@unity3D.com> Date: Wed Mar 3 15:07:48 2021 +0100 Deactivate a check because it fails with subgraphs :( commit 21a0a2c389ab390be808f68d2ee88b37c70b1d32 Author: jfryer_unity <julienf@unity3D.com> Date: Wed Mar 3 14:02:27 2021 +0100 Serialize only hidden float properties + add editor test commit 77f0227a4db9c9be3e9abcf51f2c3e2b97d3ba6a Author: jfryer_unity <julienf@unity3D.com> Date: Wed Mar 3 11:32:43 2021 +0100 Add VFXMaterialSerializedSettings commit 093b6ceb4e3f9785dbd21e4c30f180595a9cff44 Author: jfryer_unity <julienf@unity3D.com> Date: Tue Mar 2 23:26:47 2021 +0100 Implement SetupMaterial callback commit 609cf3ccf7511581d01c9b416a88ace36f5ed886 Author: John Parsaie <johnpa@unity3d.com> Date: Mon Mar 1 17:08:56 2021 -0500 Support octagon crop factor commit 14ee9933a10eebfe6e12c598c795b532f1a279d7 Author: John Parsaie <johnpa@unity3d.com> Date: Mon Mar 1 17:08:39 2021 -0500 Clean up the predicates for apply mesh modification commit d2f6a324eb00322dfaf6c434d07ca914e442a798 Author: John Parsaie <johnpa@unity3d.com> Date: Fri Feb 26 18:18:40 2021 -0500 Resolve conflicts (mostly with the new custom interpolator work) commit 2b1e5858324d5150875b157b107e354884fb19ac Merge: 5b275a90deb bf2c9fc7be8 Author: John Parsaie <johnpa@unity3d.com> Date: Fri Feb 26 18:18:12 2021 -0500 Merge Master commit 5b275a90deb675e333522df27e40c11489464206 Author: John Parsaie <johnpa@unity3d.com> Date: Fri Feb 26 15:12:52 2021 -0500 Syncronize material state on VFX compilation commit d6c36be00f3b16f561025817824a321d04002a04 Author: John Parsaie <johnpa@unity3d.com> Date: Fri Feb 26 11:04:25 2021 -0500 Configure VFX Sort Mode by the shadergraph material blend mode commit f078b385eb0761388eb759b86b1e8bca626eb95c Author: John Parsaie <johnpa@unity3d.com> Date: Thu Feb 25 17:40:29 2021 -0500 Filter the builtin VFX output settings (defer to material inspector) commit 6d969b8f2fc1a728c407ea4c1177c8a9dc49c4c8 Author: John Parsaie <johnpa@unity3d.com> Date: Tue Feb 23 17:26:39 2021 -0500 Fix up some nullrefs commit f90951b39732aa26850d1030e31cb323f8c18e20 Author: John Parsaie <johnpa@unity3d.com> Date: Tue Feb 23 17:13:46 2021 -0500 Ommit HLSL Object Types from GraphProperties struct commit ef2d791456f8a6002fc273c41eb8c7de60372591 Author: John Parsaie <johnpa@unity3d.com> Date: Tue Feb 23 12:01:30 2021 -0500 Remove the debug symbol pragma commit 161a48bed946fb542c95af2d5a608cafc024f3ae Author: John Parsaie <johnpa@unity3d.com> Date: Mon Feb 22 10:13:38 2021 -0500 Sanitize branch of stale functionality (no longer used). commit b4c60fd17ebbd8129cc4cb20c5e30a7785e1b794 Author: John Parsaie <johnpa@unity3d.com> Date: Fri Feb 19 17:19:41 2021 -0500 Support vertex graph support for per-element data commit a168f5e3d1165c471ed8e8a9758e52aeda214839 Author: John Parsaie <johnpa@unity3d.com> Date: Thu Feb 18 18:42:56 2021 -0500 Integrate SG vertex properties for VFX commit da73ba88e6b2697ba17636529c6328ed040cfd3f Author: John Parsaie <johnpa@unity3d.com> Date: Thu Feb 18 10:45:34 2021 -0500 Fixed issue with VFXTarget not using the previous generation path commit 8ec0e4844d2f460a02212b84dbb4dde5aa84e0bd Author: John Parsaie <johnpa@unity3d.com> Date: Wed Feb 17 18:31:50 2021 -0500 Disable motion vectors on a material level commit 63dd2aa2cfd37f7a2f1d3fb56bbd1b5cf0c9b3fb Author: John Parsaie <johnpa@unity3d.com> Date: Wed Feb 17 17:35:41 2021 -0500 Refactor for attributeselement container (to pass around strip data etc.) commit debc4b22fbc6d89edd0f3972d0b78d811582c375 Author: John Parsaie <johnpa@unity3d.com> Date: Wed Feb 17 16:35:38 2021 -0500 Splice in the last of the VFX defines (source/current directives) commit 617c907ff04b27b512ccb918ef52069fdc778e1c Author: John Parsaie <johnpa@unity3d.com> Date: Wed Feb 17 16:11:27 2021 -0500 Reintroduce culling for dead particle vertices commit 77e520481da3757ed7391c6709d7e0e94649c246 Author: John Parsaie <johnpa@unity3d.com> Date: Wed Feb 17 14:12:11 2021 -0500 Refactor vertex transformations so that particle space is considered as object space commit 67ad00e2b1641db12daee63a6b5ad06da8618e5f Author: John Parsaie <johnpa@unity3d.com> Date: Wed Feb 17 09:06:09 2021 -0500 Initial commit adding vertex transformation flow for VFX (motion vector, mesh modification) commit 768ccee0757ce3908a3f839a65779dd1bcab1fac Author: John Parsaie <johnpa@unity3d.com> Date: Thu Feb 11 15:04:19 2021 -0500 Small change to regain compatibility with merged vfx work commit bc3c765dee3e869370dc71884a4578b6206e7442 Merge: 18f932dce4c f7536f0ecdd Author: John Parsaie <johnpa@unity3d.com> Date: Thu Feb 11 14:10:54 2021 -0500 Merge master for latest vfx staging commit 18f932dce4c7673fdfbe063956272f16a02be690 Author: John Parsaie <johnpa@unity3d.com> Date: Thu Feb 11 10:01:28 2021 -0500 Add back the support for debug commit 20d983c87f17865eb9650f7f43784eb18554d8f5 Author: John Parsaie <johnpa@unity3d.com> Date: Wed Feb 10 18:35:27 2021 -0500 Skip the lit/unlit check if the SGVFX asset is marked for SG generation commit 9a90eff58a845b18d7bb486e12ca3222aa7367cb Author: John Parsaie <johnpa@unity3d.com> Date: Wed Feb 10 18:24:02 2021 -0500 Support the rest of the planar primitives (UV, Normal, Position) commit 608f4cd20f5451287bfc3d296ca2ef0354614bb9 Author: John Parsaie <johnpa@unity3d.com> Date: Tue Feb 9 18:00:21 2021 -0500 Initial support for planar primitives + particle strip quads commit 47fd0797874eb609585a860f94f8aea1454b37bc Author: John Parsaie <johnpa@unity3d.com> Date: Tue Feb 9 15:46:02 2021 -0500 Do not append fields if not configured commit 1fba1cebff018280e43eabcd66eee1c6c65f06ed Author: John Parsaie <johnpa@unity3d.com> Date: Tue Feb 9 15:14:17 2021 -0500 Begin to use generation predicates to support the primitive types commit 60861141d00e8da105f8efc6a2cce42ecf4e142b Author: John Parsaie <johnpa@unity3d.com> Date: Tue Feb 9 14:40:04 2021 -0500 Begin initial support for the various VFX primitives commit 789f9a3c32c469979db99a868f615abf2712add2 Author: John Parsaie <johnpa@unity3d.com> Date: Tue Feb 9 13:17:36 2021 -0500 Fixup the context inspector if no shadergraph is linked commit 46f24d310c2c92a4ad7401fa5d49c893126cdf42 Author: John Parsaie <johnpa@unity3d.com> Date: Tue Feb 9 13:17:11 2021 -0500 Splice all VFX context defines commit ee18527f8114eed089a416556643baf4ea60a9eb Author: John Parsaie <johnpa@unity3d.com> Date: Tue Feb 9 09:56:28 2021 -0500 Reorganize some VFX HDRP files into the proper directory commit f8c19794eee5c019fc75a89eb31335134e61938b Author: John Parsaie <johnpa@unity3d.com> Date: Tue Feb 9 09:50:10 2021 -0500 Only offer the vfx graph support if the preference is enabled commit 9ad3c1e189fd8bc3c1c715d72750ddf468c004f3 Author: John Parsaie <johnpa@unity3d.com> Date: Mon Feb 8 18:39:10 2021 -0500 Add the supports VFX toggle to HDRP target commit 392fae959319e4b732888d9e09aff2ec1c8f6c5e Author: John Parsaie <johnpa@unity3d.com> Date: Mon Feb 8 12:39:53 2021 -0500 Add vfx support option to system data commit 8245aa616576a5d89c55043afe0e6edf33bc84a1 Merge: be93c713c57 3a309b5d719 Author: John Parsaie <johnpa@unity3d.com> Date: Fri Feb 5 16:06:48 2021 -0500 Merge master for bugfixes commit be93c713c575f7fd051526530c3ceccb659e9625 Author: John Parsaie <johnpa@unity3d.com> Date: Fri Feb 5 13:41:46 2021 -0500 Add support for all HDRP sub targets commit 58019336cd60aac30662678102d01b7340d6fa0c Author: John Parsaie <johnpa@unity3d.com> Date: Thu Feb 4 12:49:01 2021 -0500 Make PostProcessSubShaderVFX reuseable commit f583724a095c34af096a6a8ab3c3c55179f424a2 Author: John Parsaie <johnpa@unity3d.com> Date: Sun Jan 31 19:58:54 2021 -0500 merge everything into ShaderPass.template and remove ShaderPassVFX.template commit df00b7e7e8b0b45aca112021ca47492449d9b075 Author: John Parsaie <johnpa@unity3d.com> Date: Sun Jan 31 19:41:50 2021 -0500 Remove the explicit vfx property declaraction in SG generator in favor of command descriptor. This allows padding. commit 5b7324220a19bb46d95dcb730027d610aabff94f Author: John Parsaie <johnpa@unity3d.com> Date: Sun Jan 31 19:23:09 2021 -0500 Begin to collapse the VFX code into a feature so that we can merge into the shaderpass.template commit 211ab6da5926328121235835b051ba1dd659c5ef Author: John Parsaie <johnpa@unity3d.com> Date: Sun Jan 31 16:57:12 2021 -0500 Inject the remaining material state info (pass, queue) commit 7fadceb1f8c3f175ca79550cb1c7bcdb7234fc1d Author: John Parsaie <johnpa@unity3d.com> Date: Thu Jan 28 16:14:06 2021 -0500 Write the render state properties to the task parameters commit 4a5e6f3912584226914b278e704903870b081ddd Author: John Parsaie <j…
1 parent 6c19563 commit 080c2bf

File tree

164 files changed

+81980
-687
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

164 files changed

+81980
-687
lines changed

‎TestProjects/VisualEffectGraph_HDRP/Assets/AllTests/VFXTests/GraphicsTests/35_ShaderGraphGenerationFTP/Shaders/Legacy_VFX_Lit.shadergraph

Lines changed: 133 additions & 6 deletions
Large diffs are not rendered by default.

‎TestProjects/VisualEffectGraph_HDRP/Assets/AllTests/VFXTests/GraphicsTests/35_ShaderGraphGenerationFTP/Shaders/Legacy_VFX_Unlit.shadergraph

Lines changed: 107 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"m_SGVersion": 2,
2+
"m_SGVersion": 3,
33
"m_Type": "UnityEditor.ShaderGraph.GraphData",
44
"m_ObjectId": "5b72b3ed6ff94e1dbadc4c2b9314cf05",
55
"m_Properties": [
@@ -38,6 +38,12 @@
3838
}
3939
],
4040
"m_Keywords": [],
41+
"m_Dropdowns": [],
42+
"m_CategoryData": [
43+
{
44+
"m_Id": "76e42e16a21945d88fa18d613ddffcb6"
45+
}
46+
],
4147
"m_Nodes": [
4248
{
4349
"m_Id": "525da8ca6a015b8ebbfb5dd0d578794c"
@@ -362,10 +368,11 @@
362368
"serializedMesh": {
363369
"m_SerializedMesh": "{\"mesh\":{\"instanceID\":0}}",
364370
"m_Guid": ""
365-
}
371+
},
372+
"preventRotation": false
366373
},
367374
"m_Path": "Shader Graphs",
368-
"m_ConcretePrecision": 0,
375+
"m_GraphPrecision": 0,
369376
"m_PreviewMode": 2,
370377
"m_OutputNode": {
371378
"m_Id": ""
@@ -540,9 +547,13 @@
540547
"m_GuidSerialized": "14771a08-6dbe-46a8-b6ac-dbe1ad8ea942"
541548
},
542549
"m_Name": "TextureSlice",
550+
"m_DefaultRefNameVersion": 0,
551+
"m_RefNameGeneratedByDisplayName": "",
543552
"m_DefaultReferenceName": "Vector1_61C7B6DF",
544553
"m_OverrideReferenceName": "TextureSlice",
545554
"m_GeneratePropertyBlock": true,
555+
"m_UseCustomSlotLabel": false,
556+
"m_CustomSlotLabel": "",
546557
"m_Precision": 0,
547558
"overrideHLSLDeclaration": false,
548559
"hlslDeclarationOverride": 0,
@@ -576,9 +587,13 @@
576587
"m_GuidSerialized": "140186c3-e9ce-4659-8272-132b9d411200"
577588
},
578589
"m_Name": "Alpha",
590+
"m_DefaultRefNameVersion": 0,
591+
"m_RefNameGeneratedByDisplayName": "",
579592
"m_DefaultReferenceName": "Vector1_FDFDB2D",
580593
"m_OverrideReferenceName": "Alpha",
581594
"m_GeneratePropertyBlock": true,
595+
"m_UseCustomSlotLabel": false,
596+
"m_CustomSlotLabel": "",
582597
"m_Precision": 0,
583598
"overrideHLSLDeclaration": false,
584599
"hlslDeclarationOverride": 0,
@@ -647,9 +662,13 @@
647662
"m_GuidSerialized": "98328d96-0098-4b8f-91a4-14d2fae21028"
648663
},
649664
"m_Name": "Texture2D Array",
665+
"m_DefaultRefNameVersion": 0,
666+
"m_RefNameGeneratedByDisplayName": "",
650667
"m_DefaultReferenceName": "Texture2DArray_3BA5FE5B",
651668
"m_OverrideReferenceName": "",
652669
"m_GeneratePropertyBlock": true,
670+
"m_UseCustomSlotLabel": false,
671+
"m_CustomSlotLabel": "",
653672
"m_Precision": 0,
654673
"overrideHLSLDeclaration": false,
655674
"hlslDeclarationOverride": 0,
@@ -898,9 +917,13 @@
898917
"m_GuidSerialized": "3d5dd2b6-1b28-4124-8f6d-5ae8c2236eba"
899918
},
900919
"m_Name": "Normals",
920+
"m_DefaultRefNameVersion": 0,
921+
"m_RefNameGeneratedByDisplayName": "",
901922
"m_DefaultReferenceName": "Texture2D_47BCFF26",
902923
"m_OverrideReferenceName": "Normals",
903924
"m_GeneratePropertyBlock": true,
925+
"m_UseCustomSlotLabel": false,
926+
"m_CustomSlotLabel": "",
904927
"m_Precision": 0,
905928
"overrideHLSLDeclaration": false,
906929
"hlslDeclarationOverride": 0,
@@ -909,6 +932,8 @@
909932
"m_SerializedTexture": "{\"texture\":{\"instanceID\":0}}",
910933
"m_Guid": ""
911934
},
935+
"isMainTexture": false,
936+
"useTilingAndOffset": false,
912937
"m_Modifiable": true,
913938
"m_DefaultType": 0
914939
}
@@ -1021,9 +1046,13 @@
10211046
"m_GuidSerialized": "93f62363-7e2e-4102-9dde-f16d8ca9a868"
10221047
},
10231048
"m_Name": "NormalStrength",
1049+
"m_DefaultRefNameVersion": 0,
1050+
"m_RefNameGeneratedByDisplayName": "",
10241051
"m_DefaultReferenceName": "Vector1_3A2EC07",
10251052
"m_OverrideReferenceName": "NormalStrength",
10261053
"m_GeneratePropertyBlock": true,
1054+
"m_UseCustomSlotLabel": false,
1055+
"m_CustomSlotLabel": "",
10271056
"m_Precision": 0,
10281057
"overrideHLSLDeclaration": false,
10291058
"hlslDeclarationOverride": 0,
@@ -1069,9 +1098,13 @@
10691098
"m_GuidSerialized": "1bd333e3-2b9c-421b-8cfd-6351bd35211f"
10701099
},
10711100
"m_Name": "VFXTime",
1101+
"m_DefaultRefNameVersion": 0,
1102+
"m_RefNameGeneratedByDisplayName": "",
10721103
"m_DefaultReferenceName": "",
10731104
"m_OverrideReferenceName": "VFXTime",
10741105
"m_GeneratePropertyBlock": true,
1106+
"m_UseCustomSlotLabel": false,
1107+
"m_CustomSlotLabel": "",
10751108
"m_Precision": 0,
10761109
"overrideHLSLDeclaration": false,
10771110
"hlslDeclarationOverride": 0,
@@ -1376,7 +1409,8 @@
13761409
"m_SerializableColors": []
13771410
},
13781411
"m_TextureType": 0,
1379-
"m_NormalMapSpace": 0
1412+
"m_NormalMapSpace": 0,
1413+
"m_EnableGlobalMipBias": true
13801414
}
13811415

13821416
{
@@ -1489,6 +1523,48 @@
14891523
"m_Channel": 0
14901524
}
14911525

1526+
{
1527+
"m_SGVersion": 0,
1528+
"m_Type": "UnityEditor.ShaderGraph.CategoryData",
1529+
"m_ObjectId": "76e42e16a21945d88fa18d613ddffcb6",
1530+
"m_Name": "",
1531+
"m_ChildObjectList": [
1532+
{
1533+
"m_Id": "ef37b7946fdca68b906b753d5b79192c"
1534+
},
1535+
{
1536+
"m_Id": "9de5f4a2023970829c20155062bcc0df"
1537+
},
1538+
{
1539+
"m_Id": "3fb32aa957fef385b31cf457c12ce18d"
1540+
},
1541+
{
1542+
"m_Id": "4e9e9578d27c3e8194775bf79a226b24"
1543+
},
1544+
{
1545+
"m_Id": "2460f8e8cb948988be7b17bbd3ec0648"
1546+
},
1547+
{
1548+
"m_Id": "1024545e1c66688392d0e81441668607"
1549+
},
1550+
{
1551+
"m_Id": "e0b8736d9984de80a0891446ab2f68e2"
1552+
},
1553+
{
1554+
"m_Id": "8a4b9f4fd5662d828f76bac15365708f"
1555+
},
1556+
{
1557+
"m_Id": "1a3481478340918ca46510c59a1fd132"
1558+
},
1559+
{
1560+
"m_Id": "e0b7a0fb26627f8a90574a37bfd46ef3"
1561+
},
1562+
{
1563+
"m_Id": "5013029479e649839069437352c93cc2"
1564+
}
1565+
]
1566+
}
1567+
14921568
{
14931569
"m_SGVersion": 0,
14941570
"m_Type": "UnityEditor.ShaderGraph.PropertyNode",
@@ -1626,9 +1702,13 @@
16261702
"m_GuidSerialized": "a9f8093e-e241-4a55-b1d0-037301857fda"
16271703
},
16281704
"m_Name": "Smoothness",
1705+
"m_DefaultRefNameVersion": 0,
1706+
"m_RefNameGeneratedByDisplayName": "",
16291707
"m_DefaultReferenceName": "Vector1_11918013",
16301708
"m_OverrideReferenceName": "Smoothness",
16311709
"m_GeneratePropertyBlock": true,
1710+
"m_UseCustomSlotLabel": false,
1711+
"m_CustomSlotLabel": "",
16321712
"m_Precision": 0,
16331713
"overrideHLSLDeclaration": false,
16341714
"hlslDeclarationOverride": 0,
@@ -1719,9 +1799,13 @@
17191799
"m_GuidSerialized": "f9127805-64af-4885-ae2a-e0ef065023b4"
17201800
},
17211801
"m_Name": "Texture2D",
1802+
"m_DefaultRefNameVersion": 0,
1803+
"m_RefNameGeneratedByDisplayName": "",
17221804
"m_DefaultReferenceName": "Texture2D_4AF90627",
17231805
"m_OverrideReferenceName": "",
17241806
"m_GeneratePropertyBlock": true,
1807+
"m_UseCustomSlotLabel": false,
1808+
"m_CustomSlotLabel": "",
17251809
"m_Precision": 0,
17261810
"overrideHLSLDeclaration": false,
17271811
"hlslDeclarationOverride": 0,
@@ -1730,6 +1814,8 @@
17301814
"m_SerializedTexture": "{\"texture\":{\"fileID\":2800000,\"guid\":\"276d9e395ae18fe40a9b4988549f2349\",\"type\":3}}",
17311815
"m_Guid": ""
17321816
},
1817+
"isMainTexture": false,
1818+
"useTilingAndOffset": false,
17331819
"m_Modifiable": true,
17341820
"m_DefaultType": 0
17351821
}
@@ -1817,7 +1903,8 @@
18171903
"m_PreviewMode": 0,
18181904
"m_CustomColors": {
18191905
"m_SerializableColors": []
1820-
}
1906+
},
1907+
"m_EnableGlobalMipBias": false
18211908
}
18221909

18231910
{
@@ -1983,7 +2070,8 @@
19832070
"m_SerializableColors": []
19842071
},
19852072
"m_TextureType": 1,
1986-
"m_NormalMapSpace": 0
2073+
"m_NormalMapSpace": 0,
2074+
"m_EnableGlobalMipBias": true
19872075
}
19882076

19892077
{
@@ -2335,9 +2423,13 @@
23352423
"m_GuidSerialized": "65c04bbf-f700-47de-8630-f011c1aa9e12"
23362424
},
23372425
"m_Name": "Rotate",
2426+
"m_DefaultRefNameVersion": 0,
2427+
"m_RefNameGeneratedByDisplayName": "",
23382428
"m_DefaultReferenceName": "Boolean_582FD63D",
23392429
"m_OverrideReferenceName": "DoRotate",
23402430
"m_GeneratePropertyBlock": true,
2431+
"m_UseCustomSlotLabel": false,
2432+
"m_CustomSlotLabel": "",
23412433
"m_Precision": 0,
23422434
"overrideHLSLDeclaration": false,
23432435
"hlslDeclarationOverride": 0,
@@ -2353,9 +2445,13 @@
23532445
"m_GuidSerialized": "45617ab4-4dd4-45f0-8952-b063fcf925e2"
23542446
},
23552447
"m_Name": "Metallic",
2448+
"m_DefaultRefNameVersion": 0,
2449+
"m_RefNameGeneratedByDisplayName": "",
23562450
"m_DefaultReferenceName": "Vector1_CE8EA66A",
23572451
"m_OverrideReferenceName": "Metallic",
23582452
"m_GeneratePropertyBlock": true,
2453+
"m_UseCustomSlotLabel": false,
2454+
"m_CustomSlotLabel": "",
23592455
"m_Precision": 0,
23602456
"overrideHLSLDeclaration": false,
23612457
"hlslDeclarationOverride": 0,
@@ -2446,9 +2542,13 @@
24462542
"m_GuidSerialized": "dfa24336-cabf-43f9-b98d-9beec5d999bd"
24472543
},
24482544
"m_Name": "Color",
2545+
"m_DefaultRefNameVersion": 0,
2546+
"m_RefNameGeneratedByDisplayName": "",
24492547
"m_DefaultReferenceName": "Color_1DAF5C7C",
24502548
"m_OverrideReferenceName": "",
24512549
"m_GeneratePropertyBlock": true,
2550+
"m_UseCustomSlotLabel": false,
2551+
"m_CustomSlotLabel": "",
24522552
"m_Precision": 0,
24532553
"overrideHLSLDeclaration": false,
24542554
"hlslDeclarationOverride": 0,
@@ -2459,6 +2559,7 @@
24592559
"b": 0.0,
24602560
"a": 0.0
24612561
},
2562+
"isMainColor": false,
24622563
"m_ColorMode": 0
24632564
}
24642565

0 commit comments

Comments
 (0)