[Port] [6000.3] [ShaderGraph] Fix Enum Labels and a few other issues

Author: svc-reach-platform-support

Packages/com.unity.shadergraph/Editor/Data/Nodes/Channel/SwizzleNode.cs

@@ -36,7 +36,7 @@ public string maskInput
             get { return _maskInput; }
             set
             {
-                if (_maskInput.Equals(value))
+                if (value == null || _maskInput.Equals(value))
                     return;
                 _maskInput = value;
                 UpdateNodeAfterDeserialization();

Packages/com.unity.shadergraph/Editor/Data/Nodes/Utility/KeywordNode.cs

@@ -154,8 +154,9 @@ public void GenerateNodeCode(ShaderStringBuilder sb, GenerationMode generationMo
                         sb.AppendLine(string.Format($"{outputSlot.concreteValueType.ToShaderString()} {GetVariableNameForSlot(OutputSlotId)};"));
                         for(int i = 0; i < keyword.entries.Count; ++i)
                         {
-                            string keywordName = $"{keyword.referenceName}_{keyword.entries[i].referenceName}";
-                            var value = GetSlotValue(i + 1, generationMode);
+                            var keywordEntry = keyword.entries[i];
+                            string keywordName = $"{keyword.referenceName}_{keywordEntry.referenceName}";
+                            var value = GetSlotValue(keywordEntry.id, generationMode);
                             sb.AppendLine(string.Format($"{(i != 0 ? "else" : "")} if({keywordName}) {GetVariableNameForSlot(OutputSlotId)} = {value};"));
                         }
                         break;

Packages/com.unity.shadergraph/Editor/Drawing/Inspector/PropertyDrawers/ShaderInputPropertyDrawer.cs

@@ -1600,7 +1600,8 @@ void BuildKeywordFields(PropertySheet propertySheet, ShaderInput shaderInput)
                         return;
                     keyword.keywordDefinition = (KeywordDefinition)newValue;
                     UpdateEnableState();
-                    this._postChangeValueCallback(true, ModificationScope.Nothing);
+                    this._postChangeValueCallback(true);
+                    this._keywordChangedCallback();
                 },
                 keyword.keywordDefinition,
                 "Definition",
@@ -1960,6 +1961,7 @@ void KeywordAddCallbacks()
                         keyword.entries[index] = new KeywordEntry(entry.id, displayName, referenceName);
 
                     this._postChangeValueCallback(true);
+                    this._keywordChangedCallback();
                 }
             };
 
@@ -2066,6 +2068,8 @@ void KeywordReorderEntries(ReorderableList list)
         {
             this._preChangeValueCallback("Reorder Keyword Entry");
             this._postChangeValueCallback(true);
+            this._keywordChangedCallback();
+
         }
 
         public string GetDuplicateSafeEnumDisplayName(int id, string name)

Packages/com.unity.shadergraph/Editor/Generation/Processors/Generator.cs

@@ -597,10 +597,7 @@ void ProcessStackForPass(ContextData contextData, BlockFieldDescriptor[] passBlo
                     List<AbstractMaterialNode> nodeList, List<MaterialSlot> slotList)
                 {
                     if (passBlockMask == null)
-                    {
-                        Profiler.EndSample();
                         return;
-                    }
 
                     Profiler.BeginSample("ProcessStackForPass");
                     foreach (var blockFieldDescriptor in passBlockMask)
@@ -832,7 +829,6 @@ void ProcessStackForPass(ContextData contextData, BlockFieldDescriptor[] passBlo
             // Generated structs and Packing code
             Profiler.BeginSample("StructsAndPacking");
             var interpolatorBuilder = new ShaderStringBuilder(humanReadable: m_HumanReadable);
-
             if (passStructs != null)
             {
                 var packedStructs = new List<StructDescriptor>();