Fix for cross-pipeline work (#1851)

* making sure unknown node types are always disallowed by targets

* cleaning up target node filtering

* adding meta

* Update CHANGELOG.md

Author: elizabeth-legros

com.unity.render-pipelines.high-definition/Editor/Material/ShaderGraph/HDTarget.cs

@@ -63,7 +63,8 @@ sealed class HDTarget : Target, IHasMetadata, ILegacyTarget
         public override bool IsNodeAllowedByTarget(Type nodeType)
         {
             SRPFilterAttribute srpFilter = NodeClassCache.GetAttributeOnNodeType<SRPFilterAttribute>(nodeType);
-            return srpFilter == null || srpFilter.srpTypes.Contains(typeof(HDRenderPipeline));
+            bool worksWithThisSrp = srpFilter == null || srpFilter.srpTypes.Contains(typeof(HDRenderPipeline));
+            return worksWithThisSrp && base.IsNodeAllowedByTarget(nodeType);
         }
 
         public HDTarget()

com.unity.render-pipelines.universal/Editor/ShaderGraph/Targets/UniversalTarget.cs

@@ -153,7 +153,8 @@ public override bool IsActive()
         public override bool IsNodeAllowedByTarget(Type nodeType)
         {
             SRPFilterAttribute srpFilter = NodeClassCache.GetAttributeOnNodeType<SRPFilterAttribute>(nodeType);
-            return srpFilter == null || srpFilter.srpTypes.Contains(typeof(UniversalRenderPipeline));
+            bool worksWithThisSrp = srpFilter == null || srpFilter.srpTypes.Contains(typeof(UniversalRenderPipeline));
+            return worksWithThisSrp && base.IsNodeAllowedByTarget(nodeType);
         }
         public override void Setup(ref TargetSetupContext context)
         {

com.unity.shadergraph/CHANGELOG.md

@@ -29,6 +29,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 - Fixed an issue in ShaderGraph with integer-mode Vector1 properties throwing errors when the value is changed [1264930]
 - Fixed a bug where ShaderGraph would not load graphs using Procedural VT nodes when the nodes were the project had them disabled [1271598]
 - Fixed an issue where the ProceduralVT node was not updating any connected SampleVT nodes when the number of layers was changed [1274288]
+- Fixed an issue with how unknown nodes were treated during validation
 - Fixed an issue where ShaderGraph shaders did not reimport automatically when some of the included files changed [1269634]
 - Fixed an issue where building a context menu on a dragging block node would leave it floating and undo/redo would result in a soft-lock
 - Fixed an issue where ShaderGraph was logging error when edited in play mode [1274148].

com.unity.shadergraph/Editor/Data/Attributes/NeverAllowedByTargetAttribute.cs

@@ -0,0 +1,9 @@
+using System;
+
+namespace UnityEditor.ShaderGraph
+{
+    [AttributeUsage(AttributeTargets.Class, AllowMultiple = false, Inherited = false)]
+    internal class NeverAllowedByTargetAttribute : ContextFilterableAttribute
+    {
+    }
+}

com.unity.shadergraph/Editor/Data/Attributes/NeverAllowedByTargetAttribute.cs.meta

@@ -13,6 +13,7 @@
 namespace UnityEditor.ShaderGraph
 {
     [Serializable]
+    [NeverAllowedByTarget]
     class LegacyUnknownTypeNode : AbstractMaterialNode
     {
         public string serializedType;
@@ -42,7 +43,6 @@ public override void OnAfterDeserialize(string json)
         public override void ValidateNode()
         {
             base.ValidateNode();
-
             owner.AddValidationError(objectId, "This node type could not be found. No function will be generated in the shader.", ShaderCompilerMessageSeverity.Warning);
         }
     }

com.unity.shadergraph/Editor/Data/Nodes/LegacyUnknownTypeNode.cs

@@ -21,7 +21,11 @@ internal abstract class Target : JsonObject
         public virtual void CollectShaderProperties(PropertyCollector collector, GenerationMode generationMode) { }
         public virtual void ProcessPreviewMaterial(Material material) { }
         public virtual object saveContext => null;
-        public virtual bool IsNodeAllowedByTarget(Type nodeType) => true;
+        public virtual bool IsNodeAllowedByTarget(Type nodeType)
+        {
+            NeverAllowedByTargetAttribute never = NodeClassCache.GetAttributeOnNodeType<NeverAllowedByTargetAttribute>(nodeType);
+            return never == null;
+        }
 
         public abstract bool WorksWithSRP(RenderPipelineAsset scriptableRenderPipeline);
 

com.unity.shadergraph/Editor/Generation/Target.cs

@@ -51,7 +51,7 @@ public override void GetFields(ref TargetFieldContext context)
 
         public override bool IsNodeAllowedByTarget(Type nodeType)
         {
-            return true;
+            return base.IsNodeAllowedByTarget(nodeType);
         }
 
         public override void GetActiveBlocks(ref TargetActiveBlockContext context)

com.unity.shadergraph/Editor/Generation/Targets/VFXTarget.cs

@@ -212,6 +212,7 @@ public override void Setup(ref TargetSetupContext context)
             }
         }
 
+        [NeverAllowedByTarget]
         class UnknownNodeType : AbstractMaterialNode
         {
             public string jsonData;
@@ -245,8 +246,7 @@ public override string Serialize()
 
             public override void ValidateNode()
             {
-                isValid = false;
-                SetOverrideActiveState(ActiveState.ExplicitInactive, false);
+                base.ValidateNode();
                 owner.AddValidationError(objectId, "This node type could not be found. No function will be generated in the shader.", ShaderCompilerMessageSeverity.Warning);
             }
         }