Fix merge.

com.unity.render-pipelines.high-definition/HDRP/Editor/RenderPipeline/HDEditorUtils.cs

             { "HDRenderPipeline/Lit", LitGUI.SetupMaterialKeywordsAndPass },
             { "HDRenderPipeline/LitTessellation", LitGUI.SetupMaterialKeywordsAndPass },
             { "HDRenderPipeline/Unlit", UnlitGUI.SetupMaterialKeywordsAndPass },
-            { "HDRenderPipeline/Decal", DecalUI.SetupMaterialKeywordsAndPass }
+            { "HDRenderPipeline/Decal", DecalUI.SetupMaterialKeywordsAndPass },
+            { "HDRenderPipeline/TerrainLit", TerrainLitGUI.SetupMaterialKeywordsAndPass }
         };
 
         public static string GetHDRenderPipelinePath()

com.unity.render-pipelines.high-definition/HDRP/Editor/Upgraders/UpgradeMenuItem.cs

                         mat.shader.name == "HDRenderPipeline/LayeredLitTessellation" ||
                         mat.shader.name == "HDRenderPipeline/StackLit" ||
                         mat.shader.name == "HDRenderPipeline/Unlit" ||
-                        mat.shader.name == "HDRenderPipeline/Decal"
+                        mat.shader.name == "HDRenderPipeline/Decal" ||
+                        mat.shader.name == "HDRenderPipeline/TerrainLit"
                          )
                     {
                         // We don't handle embed material as we can't rewrite fbx files

com.unity.render-pipelines.high-definition/HDRP/Material/TerrainLit/TerrainLitData.hlsl

     surfaceData.atDistance = 1000000.0;
     surfaceData.transmittanceMask = 0.0;
 
-    GetNormalWS(input, V, normalTS, surfaceData.normalWS);
+    GetNormalWS(input, normalTS, surfaceData.normalWS);
     float3 bentNormalWS = surfaceData.normalWS;
 
     // By default we use the ambient occlusion with Tri-ace trick (apply outside) for specular occlusion.
     }
 #endif
 
-    GetBuiltinData(input, surfaceData, 1, bentNormalWS, 0, builtinData);
+    GetBuiltinData(input, V, posInput, surfaceData, 1, bentNormalWS, 0, builtinData);
 }

com.unity.render-pipelines.high-definition/HDRP/Material/TerrainLit/TerrainLitData_Basemap.hlsl

     float3 normalTS = float3(0.0, 0.0, 1.0);
 #endif
 
-    GetNormalWS(input, V, normalTS, surfaceData.normalWS);
+    GetNormalWS(input, normalTS, surfaceData.normalWS);
     float3 bentNormalWS = surfaceData.normalWS;
 
     if (surfaceData.ambientOcclusion != 1.0f)
     }
 #endif
 
-    GetBuiltinData(input, surfaceData, 1, bentNormalWS, 0, builtinData);
+    GetBuiltinData(input, V, posInput, surfaceData, 1, bentNormalWS, 0, builtinData);
 }