Merge pull request #1485 from Unity-Technologies/sg/fix-hd-declaration-order

Fix HD sub-shaders declaration order

com.unity.render-pipelines.high-definition/HDRP/Editor/ShaderGraph/HDPBRSubShader.cs

                 graph.AddShaderChunk("// Shared Graph Properties (uniform inputs)");
                 graph.AddShaderChunk(sharedProperties.GetPropertiesDeclaration(1));
 
-                graph.AddShaderChunk("// Shared Graph Node Functions");
-                graph.AddShaderChunk(graphNodeFunctions.ToString());
-
                 if (vertexActive)
                 {
                     graph.AddShaderChunk("// Vertex Graph Inputs");
                     graph.Indent();
                     graph.AddShaderChunk(vertexGraphOutputs.ToString());
                     graph.Deindent();
-                    graph.AddShaderChunk("// Vertex Graph Evaluation");
-                    graph.Indent();
-                    graph.AddShaderChunk(vertexGraphEvalFunction.ToString());
-                    graph.Deindent();
                 }
 
                 graph.AddShaderChunk("// Pixel Graph Inputs");
                 graph.Indent();
                 graph.AddShaderChunk(pixelGraphOutputs.ToString());
                 graph.Deindent();
+
+                graph.AddShaderChunk("// Shared Graph Node Functions");
+                graph.AddShaderChunk(graphNodeFunctions.ToString());
+
+                if (vertexActive)
+                {
+                    graph.AddShaderChunk("// Vertex Graph Evaluation");
+                    graph.Indent();
+                    graph.AddShaderChunk(vertexGraphEvalFunction.ToString());
+                    graph.Deindent();
+                }
 
                 graph.AddShaderChunk("// Pixel Graph Evaluation");
                 graph.Indent();

com.unity.render-pipelines.high-definition/HDRP/Editor/ShaderGraph/HDUnlitSubShader.cs

                 graph.AddShaderChunk("// Shared Graph Properties (uniform inputs)");
                 graph.AddShaderChunk(sharedProperties.GetPropertiesDeclaration(1));
 
-                graph.AddShaderChunk("// Shared Graph Node Functions");
-                graph.AddShaderChunk(graphNodeFunctions.ToString());
-
                 if (vertexActive)
                 {
                     graph.AddShaderChunk("// Vertex Graph Inputs");
                     graph.Indent();
                     graph.AddShaderChunk(vertexGraphOutputs.ToString());
                     graph.Deindent();
-                    graph.AddShaderChunk("// Vertex Graph Evaluation");
-                    graph.Indent();
-                    graph.AddShaderChunk(vertexGraphEvalFunction.ToString());
-                    graph.Deindent();
                 }
 
                 graph.AddShaderChunk("// Pixel Graph Inputs");
                 graph.Indent();
                 graph.AddShaderChunk(pixelGraphOutputs.ToString());
                 graph.Deindent();
+
+                graph.AddShaderChunk("// Shared Graph Node Functions");
+                graph.AddShaderChunk(graphNodeFunctions.ToString());
+
+                if (vertexActive)
+                {
+                    graph.AddShaderChunk("// Vertex Graph Evaluation");
+                    graph.Indent();
+                    graph.AddShaderChunk(vertexGraphEvalFunction.ToString());
+                    graph.Deindent();
+                }
 
                 graph.AddShaderChunk("// Pixel Graph Evaluation");
                 graph.Indent();